From 2322641be19e928c1dae0e2536f43f154d5c73a6 Mon Sep 17 00:00:00 2001
From: Jamie Tanna <jamie@jamietanna.co.uk>
Date: Thu, 2 Sep 2021 13:31:46 +0100
Subject: [PATCH 0001/2068] Add a Gherkin formatter

As part of #907, we want to be able to format our Gherkin source files
automagically.

To do this, we can utilise the upstream gherkin-formatter project to do
the heavy lifting, and add a few test cases within this project to make
sure that functionality looks correct.

We're calling this a `simple` formatter as it doesn't allow much to be
configured other than the indentation size in spaces.
---
 .../spotless/gherkin/GherkinSimpleStep.java   |  77 +++++++++++
 .../gherkin/complex_backgroundAfter.feature   |  24 ++++
 .../gherkin/complex_backgroundBefore.feature  |  24 ++++
 .../gherkin/descriptionsAfter.feature         |  47 +++++++
 .../gherkin/descriptionsBefore.feature        |  51 ++++++++
 .../main/resources/gherkin/emptyAfter.feature |   0
 .../resources/gherkin/emptyBefore.feature     |   1 +
 .../gherkin/invalidGherkinAfter.feature       |   0
 .../gherkin/invalidGherkinBefore.feature      |   9 ++
 .../resources/gherkin/minimalAfter.feature    |   4 +
 .../gherkin/minimalAfter0Spaces.feature       |   4 +
 .../gherkin/minimalAfter6Spaces.feature       |   4 +
 .../resources/gherkin/minimalBefore.feature   |   3 +
 .../resources/gherkin/notGherkinAfter.feature |   0
 .../gherkin/notGherkinBefore.feature          |   1 +
 .../gherkin/rule_with_tagAfter.feature        |  19 +++
 .../gherkin/rule_with_tagBefore.feature       |  19 +++
 .../gherkin/GherkinSimpleStepTest.java        | 120 ++++++++++++++++++
 18 files changed, 407 insertions(+)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/gherkin/GherkinSimpleStep.java
 create mode 100644 testlib/src/main/resources/gherkin/complex_backgroundAfter.feature
 create mode 100644 testlib/src/main/resources/gherkin/complex_backgroundBefore.feature
 create mode 100644 testlib/src/main/resources/gherkin/descriptionsAfter.feature
 create mode 100644 testlib/src/main/resources/gherkin/descriptionsBefore.feature
 create mode 100644 testlib/src/main/resources/gherkin/emptyAfter.feature
 create mode 100644 testlib/src/main/resources/gherkin/emptyBefore.feature
 create mode 100644 testlib/src/main/resources/gherkin/invalidGherkinAfter.feature
 create mode 100644 testlib/src/main/resources/gherkin/invalidGherkinBefore.feature
 create mode 100644 testlib/src/main/resources/gherkin/minimalAfter.feature
 create mode 100644 testlib/src/main/resources/gherkin/minimalAfter0Spaces.feature
 create mode 100644 testlib/src/main/resources/gherkin/minimalAfter6Spaces.feature
 create mode 100644 testlib/src/main/resources/gherkin/minimalBefore.feature
 create mode 100644 testlib/src/main/resources/gherkin/notGherkinAfter.feature
 create mode 100644 testlib/src/main/resources/gherkin/notGherkinBefore.feature
 create mode 100644 testlib/src/main/resources/gherkin/rule_with_tagAfter.feature
 create mode 100644 testlib/src/main/resources/gherkin/rule_with_tagBefore.feature
 create mode 100644 testlib/src/test/java/com/diffplug/spotless/gherkin/GherkinSimpleStepTest.java

diff --git a/lib/src/main/java/com/diffplug/spotless/gherkin/GherkinSimpleStep.java b/lib/src/main/java/com/diffplug/spotless/gherkin/GherkinSimpleStep.java
new file mode 100644
index 0000000000..1f41835c04
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/gherkin/GherkinSimpleStep.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2021 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.gherkin;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Objects;
+
+import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.JarState;
+import com.diffplug.spotless.Provisioner;
+
+public class GherkinSimpleStep {
+	private static final String MAVEN_COORDINATE = "me.jvt.cucumber:gherkin-formatter:";
+	private static final String DEFAULT_VERSION = "1.1.0";
+
+	public static FormatterStep create(int indent, Provisioner provisioner) {
+		Objects.requireNonNull(provisioner, "provisioner cannot be null");
+		return FormatterStep.createLazy("gherkin", () -> new GherkinSimpleStep.State(indent, provisioner), GherkinSimpleStep.State::toFormatter);
+	}
+
+	private static final class State implements Serializable {
+		private static final long serialVersionUID = 1L;
+
+		private final int indentSpaces;
+		private final JarState jarState;
+
+		private State(int indent, Provisioner provisioner) throws IOException {
+			this.indentSpaces = indent;
+			this.jarState = JarState.from(MAVEN_COORDINATE + DEFAULT_VERSION, provisioner);
+		}
+
+		FormatterFunc toFormatter() {
+			Method format;
+			Object formatter;
+			try {
+				ClassLoader classLoader = jarState.getClassLoader();
+				Class<?> prettyFormatter = classLoader.loadClass("me.jvt.cucumber.gherkinformatter.PrettyFormatter");
+				Class<?>[] constructorArguments = new Class[]{int.class};
+				Constructor<?> constructor = prettyFormatter.getConstructor(constructorArguments);
+				format = prettyFormatter.getMethod("format", String.class);
+				formatter = constructor.newInstance(indentSpaces);
+			} catch (ClassNotFoundException | NoSuchMethodException | InstantiationException | IllegalAccessException | InvocationTargetException e) {
+				throw new IllegalStateException(String.format("There was a problem preparing %s dependencies", MAVEN_COORDINATE), e);
+			}
+
+			return s -> {
+				try {
+					return (String) format.invoke(formatter, s);
+				} catch (InvocationTargetException ex) {
+					throw new AssertionError("Unable to format Gherkin", ex.getCause());
+				}
+			};
+		}
+	}
+
+	private GherkinSimpleStep() {
+		// cannot be directly instantiated
+	}
+}
diff --git a/testlib/src/main/resources/gherkin/complex_backgroundAfter.feature b/testlib/src/main/resources/gherkin/complex_backgroundAfter.feature
new file mode 100644
index 0000000000..eb4d4de89a
--- /dev/null
+++ b/testlib/src/main/resources/gherkin/complex_backgroundAfter.feature
@@ -0,0 +1,24 @@
+Feature: Complex background
+  We want to ensure PickleStep all have different IDs
+
+  Background: a simple background
+    Given the minimalism inside a background
+
+  Scenario: minimalistic
+    Given the minimalism
+
+  Scenario: also minimalistic
+    Given the minimalism
+
+  Rule: My Rule
+
+    Background:
+      Given a rule background step
+
+    Scenario: with examples
+      Given the <value> minimalism
+
+      Examples:
+        | value |
+        | 1     |
+        | 2     |
diff --git a/testlib/src/main/resources/gherkin/complex_backgroundBefore.feature b/testlib/src/main/resources/gherkin/complex_backgroundBefore.feature
new file mode 100644
index 0000000000..fde7c94d9b
--- /dev/null
+++ b/testlib/src/main/resources/gherkin/complex_backgroundBefore.feature
@@ -0,0 +1,24 @@
+Feature: Complex background
+  We want to ensure PickleStep all have different IDs
+
+  Background: a simple background
+    Given the minimalism inside a background
+
+  Scenario: minimalistic
+    Given the minimalism
+
+  Scenario: also minimalistic
+    Given the minimalism
+
+  Rule: My Rule
+
+    Background:
+      Given a rule background step
+
+    Scenario: with examples
+      Given the <value> minimalism
+
+      Examples:
+      | value |
+      | 1     |
+      | 2     |
diff --git a/testlib/src/main/resources/gherkin/descriptionsAfter.feature b/testlib/src/main/resources/gherkin/descriptionsAfter.feature
new file mode 100644
index 0000000000..e7998a203a
--- /dev/null
+++ b/testlib/src/main/resources/gherkin/descriptionsAfter.feature
@@ -0,0 +1,47 @@
+Feature: Descriptions everywhere
+  This is a single line description
+
+  Scenario: two lines
+  This description
+  has two lines and indented with two spaces
+    Given the minimalism
+
+  Scenario: without indentation
+  This is a description without indentation
+    Given the minimalism
+
+  Scenario: empty lines in the middle
+  This description
+
+  has an empty line in the middle
+    Given the minimalism
+
+  Scenario: empty lines around
+  This description
+  has an empty lines around
+    Given the minimalism
+
+  Scenario: comment after description
+  This description
+  has a comment after
+    # this is a comment
+    Given the minimalism
+
+  Scenario: comment right after description
+  This description
+  has a comment right after
+    #  this is another comment
+    Given the minimalism
+
+  Scenario: description with escaped docstring separator
+  This description has an \"\"\" (escaped docstring sparator)
+    Given the minimalism
+
+  Scenario Outline: scenario outline with a description
+  This is a scenario outline description
+    Given the minimalism
+
+    Examples: examples with description
+    This is an examples description
+      | foo |
+      | bar |
diff --git a/testlib/src/main/resources/gherkin/descriptionsBefore.feature b/testlib/src/main/resources/gherkin/descriptionsBefore.feature
new file mode 100644
index 0000000000..690ae3a754
--- /dev/null
+++ b/testlib/src/main/resources/gherkin/descriptionsBefore.feature
@@ -0,0 +1,51 @@
+Feature: Descriptions everywhere
+  This is a single line description
+
+  Scenario: two lines
+  This description
+  has two lines and indented with two spaces
+    Given the minimalism
+
+Scenario: without indentation
+This is a description without indentation
+  Given the minimalism
+
+  Scenario: empty lines in the middle
+  This description
+
+  has an empty line in the middle
+    Given the minimalism
+
+  Scenario: empty lines around
+
+  This description
+  has an empty lines around
+
+    Given the minimalism
+
+  Scenario: comment after description
+  This description
+  has a comment after
+
+# this is a comment
+    Given the minimalism
+
+  Scenario: comment right after description
+  This description
+  has a comment right after
+    #  this is another comment
+    Given the minimalism
+
+  Scenario: description with escaped docstring separator
+  This description has an \"\"\" (escaped docstring sparator)
+
+    Given the minimalism
+
+  Scenario Outline: scenario outline with a description
+This is a scenario outline description
+    Given the minimalism
+
+  Examples: examples with description
+This is an examples description
+    | foo |
+    | bar |
diff --git a/testlib/src/main/resources/gherkin/emptyAfter.feature b/testlib/src/main/resources/gherkin/emptyAfter.feature
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/testlib/src/main/resources/gherkin/emptyBefore.feature b/testlib/src/main/resources/gherkin/emptyBefore.feature
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/testlib/src/main/resources/gherkin/emptyBefore.feature
@@ -0,0 +1 @@
+
diff --git a/testlib/src/main/resources/gherkin/invalidGherkinAfter.feature b/testlib/src/main/resources/gherkin/invalidGherkinAfter.feature
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/testlib/src/main/resources/gherkin/invalidGherkinBefore.feature b/testlib/src/main/resources/gherkin/invalidGherkinBefore.feature
new file mode 100644
index 0000000000..665bf227ca
--- /dev/null
+++ b/testlib/src/main/resources/gherkin/invalidGherkinBefore.feature
@@ -0,0 +1,9 @@
+
+invalid line here
+
+Feature: Multiple parser errors
+
+	Scenario: minimalistic
+		Given the minimalism
+
+	another invalid line here
diff --git a/testlib/src/main/resources/gherkin/minimalAfter.feature b/testlib/src/main/resources/gherkin/minimalAfter.feature
new file mode 100644
index 0000000000..44467df367
--- /dev/null
+++ b/testlib/src/main/resources/gherkin/minimalAfter.feature
@@ -0,0 +1,4 @@
+Feature: Minimal
+
+    Scenario: minimalistic
+        Given the minimalism
diff --git a/testlib/src/main/resources/gherkin/minimalAfter0Spaces.feature b/testlib/src/main/resources/gherkin/minimalAfter0Spaces.feature
new file mode 100644
index 0000000000..aa94821bbc
--- /dev/null
+++ b/testlib/src/main/resources/gherkin/minimalAfter0Spaces.feature
@@ -0,0 +1,4 @@
+Feature: Minimal
+
+Scenario: minimalistic
+Given the minimalism
diff --git a/testlib/src/main/resources/gherkin/minimalAfter6Spaces.feature b/testlib/src/main/resources/gherkin/minimalAfter6Spaces.feature
new file mode 100644
index 0000000000..cbad451b45
--- /dev/null
+++ b/testlib/src/main/resources/gherkin/minimalAfter6Spaces.feature
@@ -0,0 +1,4 @@
+Feature: Minimal
+
+      Scenario: minimalistic
+            Given the minimalism
diff --git a/testlib/src/main/resources/gherkin/minimalBefore.feature b/testlib/src/main/resources/gherkin/minimalBefore.feature
new file mode 100644
index 0000000000..a474cf1418
--- /dev/null
+++ b/testlib/src/main/resources/gherkin/minimalBefore.feature
@@ -0,0 +1,3 @@
+Feature: Minimal
+Scenario: minimalistic
+Given the minimalism
diff --git a/testlib/src/main/resources/gherkin/notGherkinAfter.feature b/testlib/src/main/resources/gherkin/notGherkinAfter.feature
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/testlib/src/main/resources/gherkin/notGherkinBefore.feature b/testlib/src/main/resources/gherkin/notGherkinBefore.feature
new file mode 100644
index 0000000000..517db4bd1e
--- /dev/null
+++ b/testlib/src/main/resources/gherkin/notGherkinBefore.feature
@@ -0,0 +1 @@
+not gherkin
diff --git a/testlib/src/main/resources/gherkin/rule_with_tagAfter.feature b/testlib/src/main/resources/gherkin/rule_with_tagAfter.feature
new file mode 100644
index 0000000000..bba6b044ac
--- /dev/null
+++ b/testlib/src/main/resources/gherkin/rule_with_tagAfter.feature
@@ -0,0 +1,19 @@
+@tag_feature
+Feature: Some tagged rules
+
+  Rule: Untagged rule
+  The untagged rule description
+
+    Scenario: Scenario with only a feature tag
+      Given a
+
+  @tag_rule
+  Rule: Tagged rule
+  The tagged rule description
+
+    Scenario: Scenario with feature and rule tags
+      Given b
+
+    @tag_scenario
+    Scenario: Scenario with feature, rule and scenario tags
+      Given b
diff --git a/testlib/src/main/resources/gherkin/rule_with_tagBefore.feature b/testlib/src/main/resources/gherkin/rule_with_tagBefore.feature
new file mode 100644
index 0000000000..bba6b044ac
--- /dev/null
+++ b/testlib/src/main/resources/gherkin/rule_with_tagBefore.feature
@@ -0,0 +1,19 @@
+@tag_feature
+Feature: Some tagged rules
+
+  Rule: Untagged rule
+  The untagged rule description
+
+    Scenario: Scenario with only a feature tag
+      Given a
+
+  @tag_rule
+  Rule: Tagged rule
+  The tagged rule description
+
+    Scenario: Scenario with feature and rule tags
+      Given b
+
+    @tag_scenario
+    Scenario: Scenario with feature, rule and scenario tags
+      Given b
diff --git a/testlib/src/test/java/com/diffplug/spotless/gherkin/GherkinSimpleStepTest.java b/testlib/src/test/java/com/diffplug/spotless/gherkin/GherkinSimpleStepTest.java
new file mode 100644
index 0000000000..1210bf21dd
--- /dev/null
+++ b/testlib/src/test/java/com/diffplug/spotless/gherkin/GherkinSimpleStepTest.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2021 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.gherkin;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import org.junit.Test;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.SerializableEqualityTester;
+import com.diffplug.spotless.StepHarness;
+import com.diffplug.spotless.TestProvisioner;
+
+public class GherkinSimpleStepTest {
+
+	private static final int INDENT = 2;
+
+	private final FormatterStep step = GherkinSimpleStep.create(INDENT, TestProvisioner.mavenCentral());
+	private final StepHarness stepHarness = StepHarness.forStep(step);
+
+	@Test
+	public void cannotProvidedNullProvisioner() {
+		assertThatThrownBy(() -> GherkinSimpleStep.create(INDENT, null)).isInstanceOf(NullPointerException.class).hasMessage("provisioner cannot be null");
+	}
+
+	@Test
+	public void handlesEmptyFeature() throws Exception {
+		doWithResource(stepHarness, "empty");
+	}
+
+	@Test
+	public void handlesComplexBackground() throws Exception {
+		doWithResource(stepHarness, "complex_background");
+	}
+
+	@Test
+	public void handlesDescriptions() throws Exception {
+		doWithResource(stepHarness, "descriptions");
+	}
+
+	@Test
+	public void handlesRuleWithTag() throws Exception {
+		doWithResource(stepHarness, "rule_with_tag");
+	}
+
+	@Test
+	public void handlesInvalidGherkin() {
+		assertThatThrownBy(() -> doWithResource(stepHarness, "invalidGherkin"))
+				.isInstanceOf(AssertionError.class)
+				.hasMessage("Unable to format Gherkin");
+	}
+
+	@Test
+	public void handlesNotGherkin() {
+		assertThatThrownBy(() -> doWithResource(stepHarness, "notGherkin"))
+				.isInstanceOf(AssertionError.class)
+				.hasMessage("Unable to format Gherkin");
+	}
+
+	@Test
+	public void canSetCustomIndentationLevel() throws Exception {
+		FormatterStep step = GherkinSimpleStep.create(6, TestProvisioner.mavenCentral());
+		StepHarness stepHarness = StepHarness.forStep(step);
+
+		String before = "gherkin/minimalBefore.feature";
+		String after = "gherkin/minimalAfter6Spaces.feature";
+		stepHarness.testResource(before, after);
+	}
+
+	@Test
+	public void canSetIndentationLevelTo0() throws Exception {
+		FormatterStep step = GherkinSimpleStep.create(0, TestProvisioner.mavenCentral());
+		StepHarness stepHarness = StepHarness.forStep(step);
+
+		String before = "gherkin/minimalBefore.feature";
+		String after = "gherkin/minimalAfter0Spaces.feature";
+		stepHarness.testResource(before, after);
+	}
+
+	@Test
+	public void equality() {
+		new SerializableEqualityTester() {
+			int spaces = 0;
+
+			@Override
+			protected void setupTest(API api) {
+				// no changes, are the same
+				api.areDifferentThan();
+
+				// with different spacing
+				spaces = 1;
+				api.areDifferentThan();
+			}
+
+			@Override
+			protected FormatterStep create() {
+				return GherkinSimpleStep.create(spaces, TestProvisioner.mavenCentral());
+			}
+		}.testEquals();
+	}
+
+	private static void doWithResource(StepHarness stepHarness, String name) throws Exception {
+		String before = String.format("gherkin/%sBefore.feature", name);
+		String after = String.format("gherkin/%sAfter.feature", name);
+		stepHarness.testResource(before, after);
+	}
+}

From 184aa5ed29e7d4cde02e00e63dd17468baa401de Mon Sep 17 00:00:00 2001
From: Jamie Tanna <jamie@jamietanna.co.uk>
Date: Thu, 2 Sep 2021 17:16:37 +0100
Subject: [PATCH 0002/2068] Add Gradle bindings for Gherkin formatter

As we've created a Gherkin formatter as part of #907, we should make it
possible to use it natively in Gradle, which requires we add it as a new
supported type in `SpotlessExtension`.
---
 plugin-gradle/README.md                       | 29 +++++++++
 .../gradle/spotless/GherkinExtension.java     | 62 +++++++++++++++++++
 .../gradle/spotless/SpotlessExtension.java    |  6 ++
 .../gradle/spotless/GherkinExtensionTest.java | 62 +++++++++++++++++++
 4 files changed, 159 insertions(+)
 create mode 100644 plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java
 create mode 100644 plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GherkinExtensionTest.java

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 28f8f85b54..92d8b1553f 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -69,6 +69,7 @@ Spotless supports all of Gradle's built-in performance features (incremental bui
   - [SQL](#sql) ([dbeaver](#dbeaver), [prettier](#prettier))
   - [Typescript](#typescript) ([tsfmt](#tsfmt), [prettier](#prettier))
   - [JSON](#json)
+  - [Gherkin](#gherkin)
   - Multiple languages
     - [Prettier](#prettier) ([plugins](#prettier-plugins), [npm detection](#npm-detection), [`.npmrc` detection](#npmrc-detection))
       - javascript, jsx, angular, vue, flow, typescript, css, less, scss, html, json, graphql, markdown, ymaml
@@ -558,6 +559,34 @@ spotless {
 }
 ```
 
+## Gherkin
+
+- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/5.15.0/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
+
+```gradle
+spotless {
+  gherkin {
+    target 'src/**/*.feature' // you have to set the target manually
+    simple() // has its own section below
+  }
+}
+```
+
+### simple
+
+Uses a Gherkin pretty-printer that optionally allows configuring the number of spaces that are used to pretty print objects:
+
+```gradle
+spotless {
+  gherkin {
+    target 'src/**/*.feature'
+    simple()
+    // optional: specify the number of spaces to use
+    simple().indentWithSpaces(6)
+  }
+}
+```
+
 <a name="applying-prettier-to-javascript--flow--typescript--css--scss--less--jsx--graphql--yaml--etc"></a>
 
 ## Prettier
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java
new file mode 100644
index 0000000000..59ff16805f
--- /dev/null
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2016-2021 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.gradle.spotless;
+
+import javax.inject.Inject;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.gherkin.GherkinSimpleStep;
+
+public class GherkinExtension extends FormatExtension {
+	private static final int DEFAULT_INDENTATION = 4;
+	static final String NAME = "gherkin";
+
+	@Inject
+	public GherkinExtension(SpotlessExtension spotless) {
+		super(spotless);
+	}
+
+	@Override
+	protected void setupTask(SpotlessTask task) {
+		if (target == null) {
+			throw noDefaultTargetException();
+		}
+		super.setupTask(task);
+	}
+
+	public SimpleConfig simple() {
+		return new SimpleConfig(DEFAULT_INDENTATION);
+	}
+
+	public class SimpleConfig {
+		private int indent;
+
+		public SimpleConfig(int indent) {
+			this.indent = indent;
+			addStep(createStep());
+		}
+
+		public void indentWithSpaces(int indent) {
+			this.indent = indent;
+			replaceStep(createStep());
+		}
+
+		private FormatterStep createStep() {
+			return GherkinSimpleStep.create(indent, provisioner());
+		}
+	}
+
+}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
index 7959bdc71d..ba42d75958 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
@@ -175,6 +175,12 @@ public void json(Action<JsonExtension> closure) {
 		format(JsonExtension.NAME, JsonExtension.class, closure);
 	}
 
+	/** Configures the special Gherkin-specific extension. */
+	public void gherkin(Action<GherkinExtension> closure) {
+		requireNonNull(closure);
+		format(GherkinExtension.NAME, GherkinExtension.class, closure);
+	}
+
 	/** Configures a custom extension. */
 	public void format(String name, Action<FormatExtension> closure) {
 		requireNonNull(name, "name");
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GherkinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GherkinExtensionTest.java
new file mode 100644
index 0000000000..4b1fdc7efe
--- /dev/null
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GherkinExtensionTest.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2021 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.gradle.spotless;
+
+import java.io.IOException;
+
+import org.junit.Test;
+
+public class GherkinExtensionTest extends GradleIntegrationHarness {
+	@Test
+	public void defaultFormatting() throws IOException {
+		setFile("build.gradle").toLines(
+				"buildscript { repositories { mavenCentral() } }",
+				"plugins {",
+				"    id 'java'",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"spotless {",
+				"    gherkin {",
+				"    target 'examples/**/*.feature'",
+				"    simple()",
+				"}",
+				"}");
+		setFile("src/main/resources/example.feature").toResource("gherkin/minimalBefore.feature");
+		setFile("examples/main/resources/example.feature").toResource("gherkin/minimalBefore.feature");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("src/main/resources/example.feature").sameAsResource("gherkin/minimalBefore.feature");
+		assertFile("examples/main/resources/example.feature").sameAsResource("gherkin/minimalAfter.feature");
+	}
+
+	@Test
+	public void formattingWithCustomNumberOfSpaces() throws IOException {
+		setFile("build.gradle").toLines(
+				"buildscript { repositories { mavenCentral() } }",
+				"plugins {",
+				"    id 'java'",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"spotless {",
+				"    gherkin {",
+				"    target 'src/**/*.feature'",
+				"    simple().indentWithSpaces(6)",
+				"}",
+				"}");
+		setFile("src/main/resources/example.feature").toResource("gherkin/minimalBefore.feature");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("src/main/resources/example.feature").sameAsResource("gherkin/minimalAfter6Spaces.feature");
+	}
+}

From 6f0a35c1f603744e3063711fab8d643141a11ae8 Mon Sep 17 00:00:00 2001
From: Jamie Tanna <jamie@jamietanna.co.uk>
Date: Mon, 6 Sep 2021 22:12:58 +0100
Subject: [PATCH 0003/2068] Add Gherkin formatter changes to CHANGES

---
 CHANGES.md               | 4 ++++
 plugin-gradle/CHANGES.md | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index ea30ad2eaf..ae96f58b94 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,6 +11,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 
+### Added
+* Added formatter for [Gherkin feature files](https://github.com/diffplug/spotless/issues/928)
+* Added Gradle configuration for Gherkin feature files
+
 ## [2.16.0] - 2021-09-04
 ### Added
 * Added support for `google-java-format`'s `skip-reflowing-long-strings` option ([#929](https://github.com/diffplug/spotless/pull/929))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 162d8fbe6a..677e9d9d33 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]
 
+### Added
+* Added Gradle configuration for Gherkin feature files
+
 ## [5.15.0] - 2021-09-04
 ### Added
 * Added support for `google-java-format`'s `skip-reflowing-long-strings` option ([#929](https://github.com/diffplug/spotless/pull/929))

From 0be284494f88b514699a45a948612a19be33461f Mon Sep 17 00:00:00 2001
From: Lorenz Leutgeb <lorenz@leutgeb.xyz>
Date: Mon, 15 Nov 2021 08:31:38 +0100
Subject: [PATCH 0004/2068] Upgrade Message: Print current version

---
 lib/src/main/java/com/diffplug/spotless/Jvm.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/Jvm.java b/lib/src/main/java/com/diffplug/spotless/Jvm.java
index e22e0c6339..858d9d8d6c 100644
--- a/lib/src/main/java/com/diffplug/spotless/Jvm.java
+++ b/lib/src/main/java/com/diffplug/spotless/Jvm.java
@@ -198,8 +198,9 @@ private String buildUpgradeFormatterMessage(V fmtVersion) {
 			StringBuilder builder = new StringBuilder();
 			V recommendedFmtVersionOrNull = getRecommendedFormatterVersion();
 			if (null != recommendedFmtVersionOrNull && (fmtVersionComparator.compare(fmtVersion, recommendedFmtVersionOrNull) < 0)) {
-				builder.append(String.format("You are not using latest version on JVM %d+.%n", getRequiredJvmVersion(recommendedFmtVersionOrNull)));
-				builder.append(String.format("Try to upgrade to %s %s, which may have fixed this problem.", fmtName, getRecommendedFormatterVersion()));
+				builder.append(String.format("%s %s is currently being used, but outdated.%n", fmtName, fmtVersion));
+				builder.append(String.format("%s %s is the recommended version, which may have fixed this problem.%n", fmtName, recommendedFmtVersionOrNull));
+				builder.append(String.format("%s %s requires JVM %d+.", fmtName, recommendedFmtVersionOrNull, getRequiredJvmVersion(recommendedFmtVersionOrNull)));
 			} else {
 				V higherFormatterVersionOrNull = fmt2jvmVersion.higherKey(fmtVersion);
 				if (null != higherFormatterVersionOrNull) {

From a9dbab2b0dd35e99e8c98df3f4d2afb23613d3de Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jan 2022 12:03:36 +0000
Subject: [PATCH 0005/2068] Bump com.diffplug.spotless from 6.1.2 to 6.2.0

Bumps com.diffplug.spotless from 6.1.2 to 6.2.0.

---
updated-dependencies:
- dependency-name: com.diffplug.spotless
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index f335936482..daa066cc15 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,6 @@
 pluginManagement {
 	plugins {
-		id 'com.diffplug.spotless'                 version '6.1.2'
+		id 'com.diffplug.spotless'                 version '6.2.0'
 		// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
 		id 'com.gradle.plugin-publish'             version '0.19.0'
 		// https://github.com/gradle-nexus/publish-plugin/releases

From aad410dbe6aae4310062b1f6a9ca0d4460aae92a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Jan 2022 12:02:38 +0000
Subject: [PATCH 0006/2068] Bump com.gradle.plugin-publish from 0.19.0 to
 0.20.0

Bumps com.gradle.plugin-publish from 0.19.0 to 0.20.0.

---
updated-dependencies:
- dependency-name: com.gradle.plugin-publish
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index daa066cc15..dcf764a0ba 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,7 +2,7 @@ pluginManagement {
 	plugins {
 		id 'com.diffplug.spotless'                 version '6.2.0'
 		// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
-		id 'com.gradle.plugin-publish'             version '0.19.0'
+		id 'com.gradle.plugin-publish'             version '0.20.0'
 		// https://github.com/gradle-nexus/publish-plugin/releases
 		id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
 		// https://github.com/spotbugs/spotbugs-gradle-plugin/releases

From 17cdc8f05bb92ee940a6e4e7edea5e4780b9d5f0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Jan 2022 12:02:44 +0000
Subject: [PATCH 0007/2068] Bump com.github.spotbugs from 5.0.4 to 5.0.5

Bumps com.github.spotbugs from 5.0.4 to 5.0.5.

---
updated-dependencies:
- dependency-name: com.github.spotbugs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index daa066cc15..7649718595 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
 		// https://github.com/gradle-nexus/publish-plugin/releases
 		id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
 		// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
-		id 'com.github.spotbugs'                   version '5.0.4'
+		id 'com.github.spotbugs'                   version '5.0.5'
 		// https://github.com/diffplug/spotless-changelog
 		id 'com.diffplug.spotless-changelog'       version '2.3.2'
 		// https://github.com/diffplug/goomph/blob/main/CHANGES.md

From c753fae23d60bd99270ff0adb6328d3cd52a13ec Mon Sep 17 00:00:00 2001
From: Noorul Islam K M <noorul@noorul.com>
Date: Mon, 24 Jan 2022 12:22:28 +0530
Subject: [PATCH 0008/2068] Fixed typo in groovy sample configuration

---
 plugin-maven/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index bbb2f10792..0df3254aeb 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -279,7 +279,7 @@ This is a workaround to a [pending issue](https://github.com/diffplug/spotless/i
     <licenseHeader>
       <content>/* (C)$YEAR */</content>  <!-- or <file>${project.basedir}/license-header</file> -->
     </licenseHeader>
-  </java>
+  </groovy>
 </configuration>
 ```
 

From b69a31306642772323a7662e7442e1f2a2123f01 Mon Sep 17 00:00:00 2001
From: Roland Weisleder <roland.weisleder@googlemail.com>
Date: Sun, 30 Jan 2022 20:33:13 +0100
Subject: [PATCH 0009/2068] Add support for git's `core.autocrlf`

Among others, Spotless uses .gitattributes to determine the line ending
of files. In the absence of this file, Spotless falls back to `core.eol`
from git config.

Before this commit, Spotless ignored the `core.autocrlf` property. Git
behaves in such a way that it ignores `core.eol` if `core.autocrlf` is
set to `true` or `input`. This commit aligns the behavior of Spotless to
favor `core.autocrlf` over `core.eol`.

Fixes #540

Signed-off-by: Roland Weisleder <roland.weisleder@googlemail.com>
---
 .../extra/GitAttributesLineEndings.java       | 25 +++++++++++++++++--
 .../spotless/extra/GitAttributesTest.java     | 15 +++++++++++
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
index 70fca79027..e70482e66e 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
@@ -38,6 +38,7 @@
 import org.eclipse.jgit.lib.Config;
 import org.eclipse.jgit.lib.ConfigConstants;
 import org.eclipse.jgit.lib.Constants;
+import org.eclipse.jgit.lib.CoreConfig.AutoCRLF;
 import org.eclipse.jgit.lib.CoreConfig.EOL;
 import org.eclipse.jgit.storage.file.FileBasedConfig;
 import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
@@ -56,7 +57,7 @@
 
 /**
  * Uses <a href="https://git-scm.com/docs/gitattributes">.gitattributes</a> to determine
- * the appropriate line ending. Falls back to the {@code core.eol} property in the
+ * the appropriate line ending. Falls back to the {@code core.eol} and {@code core.autocrlf} properties in the
  * git config if there are no applicable git attributes, then finally falls
  * back to the platform native.
  */
@@ -224,7 +225,7 @@ static class Runtime {
 		private Runtime(List<AttributesRule> infoRules, @Nullable File workTree, Config config, List<AttributesRule> globalRules) {
 			this.infoRules = Objects.requireNonNull(infoRules);
 			this.workTree = workTree;
-			this.defaultEnding = fromEol(config.getEnum(ConfigConstants.CONFIG_CORE_SECTION, null, ConfigConstants.CONFIG_KEY_EOL, EOL.NATIVE)).str();
+			this.defaultEnding = findDefaultLineEnding(config).str();
 			this.globalRules = Objects.requireNonNull(globalRules);
 		}
 
@@ -273,6 +274,26 @@ private static String convertEolToLineEnding(String eol, File file) {
 			}
 		}
 
+		private LineEnding findDefaultLineEnding(Config config) {
+			// handle core.autocrlf, whose values "true" and "input" override core.eol
+			AutoCRLF autoCRLF = config.getEnum(ConfigConstants.CONFIG_CORE_SECTION, null, ConfigConstants.CONFIG_KEY_AUTOCRLF, AutoCRLF.FALSE);
+			if (autoCRLF == AutoCRLF.TRUE) {
+				// autocrlf=true converts CRLF->LF during commit
+				//               and converts LF->CRLF during checkout
+				// so CRLF is the default line ending
+				return LineEnding.WINDOWS;
+			} else if (autoCRLF == AutoCRLF.INPUT) {
+				// autocrlf=input converts CRLF->LF during commit
+				//                and does no conversion during checkout
+				// mostly used on Unix, so LF is the default encoding
+				return LineEnding.UNIX;
+			}
+
+			// handle core.eol
+			EOL eol = config.getEnum(ConfigConstants.CONFIG_CORE_SECTION, null, ConfigConstants.CONFIG_KEY_EOL, EOL.NATIVE);
+			return fromEol(eol);
+		}
+
 		/** Creates a LineEnding from an EOL. */
 		private static LineEnding fromEol(EOL eol) {
 			// @formatter:off
diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/GitAttributesTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/GitAttributesTest.java
index 35ac58ee85..f6c3f7aac2 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/GitAttributesTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/GitAttributesTest.java
@@ -22,6 +22,8 @@
 import java.util.List;
 
 import org.assertj.core.api.Assertions;
+import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.api.errors.GitAPIException;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.common.base.Errors;
@@ -87,4 +89,17 @@ void policyTest() throws IOException {
 		Assertions.assertThat(policy.getEndingFor(newFile("MANIFEST.MF"))).isEqualTo("\r\n");
 		Assertions.assertThat(policy.getEndingFor(newFile("subfolder/MANIFEST.MF"))).isEqualTo("\r\n");
 	}
+
+	@Test
+	void policyDefaultLineEndingTest() throws GitAPIException, IOException {
+		Git git = Git.init().setDirectory(rootFolder()).call();
+		git.close();
+		setFile(".git/config").toContent(StringPrinter.buildStringFromLines(
+			"[core]",
+			"autocrlf=true",
+			"eol=lf"
+		));
+		LineEnding.Policy policy = LineEnding.GIT_ATTRIBUTES.createPolicy(rootFolder(), () -> testFiles());
+		Assertions.assertThat(policy.getEndingFor(newFile("someFile"))).isEqualTo("\r\n");
+	}
 }

From 3e04c153bb2063e6b976b0a7f22baf2325b04fb6 Mon Sep 17 00:00:00 2001
From: Roland Weisleder <roland.weisleder@googlemail.com>
Date: Sun, 30 Jan 2022 20:43:40 +0100
Subject: [PATCH 0010/2068] Add change to CHANGES.md

Signed-off-by: Roland Weisleder <roland.weisleder@googlemail.com>
---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 1 +
 plugin-maven/CHANGES.md  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 0a9b6ff2fc..98ce03f6e8 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,6 +15,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default versions of formatters ([#1095](https://github.com/diffplug/spotless/pull/1095)).
   * google-java-format `1.12.0` -> `1.13.0`
   * ktfmt `0.29` -> `0.30`
+* Added support for git property `core.autocrlf` ([#540](https://github.com/diffplug/spotless/issues/540))
 
 ## [2.22.0] - 2022-01-13
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 4d9d131e82..dfd3133f2f 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -7,6 +7,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default versions of formatters ([#1095](https://github.com/diffplug/spotless/pull/1095)).
   * google-java-format `1.12.0` -> `1.13.0`
   * ktfmt `0.29` -> `0.30`
+* Added support for git property `core.autocrlf` ([#540](https://github.com/diffplug/spotless/issues/540))
 
 ## [6.2.0] - 2022-01-13
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index c5ca50d936..0a0de0dbee 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -6,6 +6,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default versions of formatters ([#1095](https://github.com/diffplug/spotless/pull/1095)).
   * google-java-format `1.12.0` -> `1.13.0`
   * ktfmt `0.29` -> `0.30`
+* Added support for git property `core.autocrlf` ([#540](https://github.com/diffplug/spotless/issues/540))
 
 ## [2.20.0] - 2022-01-13
 ### Added

From fb849bd8f5cc585dad0c50390fe4988d36a4b9e2 Mon Sep 17 00:00:00 2001
From: Roland Weisleder <roland.weisleder@googlemail.com>
Date: Tue, 1 Feb 2022 21:05:32 +0100
Subject: [PATCH 0011/2068] Make all enum cases explicit

Signed-off-by: Roland Weisleder <roland.weisleder@googlemail.com>
---
 .../spotless/extra/GitAttributesLineEndings.java       | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
index e70482e66e..b71fa80f2a 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
@@ -287,11 +287,13 @@ private LineEnding findDefaultLineEnding(Config config) {
 				//                and does no conversion during checkout
 				// mostly used on Unix, so LF is the default encoding
 				return LineEnding.UNIX;
+			} else if (autoCRLF == AutoCRLF.FALSE) {
+				// handle core.eol
+				EOL eol = config.getEnum(ConfigConstants.CONFIG_CORE_SECTION, null, ConfigConstants.CONFIG_KEY_EOL, EOL.NATIVE);
+				return fromEol(eol);
+			} else {
+				throw new IllegalStateException("Unexpected value for autoCRLF " + autoCRLF);
 			}
-
-			// handle core.eol
-			EOL eol = config.getEnum(ConfigConstants.CONFIG_CORE_SECTION, null, ConfigConstants.CONFIG_KEY_EOL, EOL.NATIVE);
-			return fromEol(eol);
 		}
 
 		/** Creates a LineEnding from an EOL. */

From 2b0db7f6d20f5bcd6301b5cc6033b795e864dddd Mon Sep 17 00:00:00 2001
From: Roland Weisleder <roland.weisleder@googlemail.com>
Date: Tue, 1 Feb 2022 21:09:01 +0100
Subject: [PATCH 0012/2068] Apply formatting

Signed-off-by: Roland Weisleder <roland.weisleder@googlemail.com>
---
 .../spotless/extra/GitAttributesLineEndings.java         | 2 +-
 .../com/diffplug/spotless/extra/GitAttributesTest.java   | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
index b71fa80f2a..11ed730e6d 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/GitAttributesTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/GitAttributesTest.java
index f6c3f7aac2..330a432d40 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/GitAttributesTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/GitAttributesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -95,10 +95,9 @@ void policyDefaultLineEndingTest() throws GitAPIException, IOException {
 		Git git = Git.init().setDirectory(rootFolder()).call();
 		git.close();
 		setFile(".git/config").toContent(StringPrinter.buildStringFromLines(
-			"[core]",
-			"autocrlf=true",
-			"eol=lf"
-		));
+				"[core]",
+				"autocrlf=true",
+				"eol=lf"));
 		LineEnding.Policy policy = LineEnding.GIT_ATTRIBUTES.createPolicy(rootFolder(), () -> testFiles());
 		Assertions.assertThat(policy.getEndingFor(newFile("someFile"))).isEqualTo("\r\n");
 	}

From 3344bc4e11969c3e26f924c412262ea487c83416 Mon Sep 17 00:00:00 2001
From: circleci <circleci@6021138f4c6d>
Date: Tue, 1 Feb 2022 21:18:57 +0000
Subject: [PATCH 0013/2068] Published lib/2.22.1

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 98ce03f6e8..cc19ae2acc 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.22.1] - 2022-02-01
 ### Changed
 * Bump CI from Java 15 to 17 ([#1094](https://github.com/diffplug/spotless/pull/1094)).
 * Bump default versions of formatters ([#1095](https://github.com/diffplug/spotless/pull/1095)).

From daf59fd5a8cb20472ed47c7a2767ca5008cf4f30 Mon Sep 17 00:00:00 2001
From: circleci <circleci@6021138f4c6d>
Date: Tue, 1 Feb 2022 21:19:43 +0000
Subject: [PATCH 0014/2068] Published gradle/6.2.1

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 46 ++++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index dfd3133f2f..bf3d46dbd6 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [6.2.1] - 2022-02-01
 ### Changed
 * Bump default versions of formatters ([#1095](https://github.com/diffplug/spotless/pull/1095)).
   * google-java-format `1.12.0` -> `1.13.0`
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 9515bb0381..df4c67c113 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -18,9 +18,9 @@ output = [
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
 [![Maven central](https://img.shields.io/badge/mavencentral-yes-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.0/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/index.html)
 [![License Apache](https://img.shields.io/badge/license-apache-blue.svg)](https://tldrlegal.com/license/apache-license-2.0-(apache-2.0))
-[![Changelog](https://img.shields.io/badge/changelog-6.2.0-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-6.2.1-blue.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)
@@ -126,10 +126,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -141,7 +141,7 @@ If you're stuck on an older version of Gradle, `id 'com.diffplug.gradle.spotless
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -248,8 +248,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -300,8 +300,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -359,7 +359,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -391,7 +391,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -423,7 +423,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -457,7 +457,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -478,7 +478,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -503,7 +503,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -543,7 +543,7 @@ sql.formatter.indent.size=4
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -586,7 +586,7 @@ For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#n
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -786,7 +786,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -853,9 +853,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -888,11 +888,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From 98d6ee9d55fddae4897ffd554b9d84cb2f07d2ac Mon Sep 17 00:00:00 2001
From: circleci <circleci@6021138f4c6d>
Date: Tue, 1 Feb 2022 21:21:03 +0000
Subject: [PATCH 0015/2068] Published maven/2.20.1

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 0a0de0dbee..583d5ce426 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.20.1] - 2022-02-01
 * Bump default versions of formatters ([#1095](https://github.com/diffplug/spotless/pull/1095)).
   * google-java-format `1.12.0` -> `1.13.0`
   * ktfmt `0.29` -> `0.30`
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 0df3254aeb..986fa6c783 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -12,8 +12,8 @@ output = [
   ].join('\n');
 -->
 [![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.20.0/index.html)
-[![Changelog](https://img.shields.io/badge/changelog-2.20.0-brightgreen.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.20.1/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.20.1-brightgreen.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)

From 8ec9caacdc3244dbdc49e09a80bfc6125977edb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Segovia=20C=C3=B3rdoba?=
 <javier@segoviacordoba.com>
Date: Fri, 4 Feb 2022 00:48:03 +0100
Subject: [PATCH 0016/2068] Bump ktfmt 0.30 -> 0.31.

---
 .../diffplug/spotless/kotlin/KtfmtStep.java   | 34 ++++++++++++++-----
 plugin-gradle/CHANGES.md                      |  2 ++
 plugin-maven/CHANGES.md                       |  2 ++
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
index b3ad0041f6..9f3b62dadb 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
@@ -32,7 +32,7 @@ public class KtfmtStep {
 	// prevent direct instantiation
 	private KtfmtStep() {}
 
-	private static final String DEFAULT_VERSION = "0.30";
+	private static final String DEFAULT_VERSION = "0.31";
 	static final String NAME = "ktfmt";
 	static final String PACKAGE = "com.facebook";
 	static final String MAVEN_COORDINATE = PACKAGE + ":ktfmt:";
@@ -120,18 +120,16 @@ static final class State implements Serializable {
 
 		FormatterFunc createFormat() throws Exception {
 			ClassLoader classLoader = jarState.getClassLoader();
-			Class<?> formatterClazz = classLoader.loadClass(pkg + ".ktfmt.FormatterKt");
 			return input -> {
 				try {
 					if (style == DEFAULT) {
-						Method formatterMethod = formatterClazz.getMethod(FORMATTER_METHOD, String.class);
-						return (String) formatterMethod.invoke(formatterClazz, input);
+						Method formatterMethod = getFormatterClazz(classLoader).getMethod(FORMATTER_METHOD, String.class);
+						return (String) formatterMethod.invoke(getFormatterClazz(classLoader), input);
 					} else {
-						Class<?> formattingOptionsClazz = classLoader.loadClass(pkg + ".ktfmt.FormattingOptions");
-						Method formatterMethod = formatterClazz.getMethod(FORMATTER_METHOD, formattingOptionsClazz,
+						Method formatterMethod = getFormatterClazz(classLoader).getMethod(FORMATTER_METHOD, getFormattingOptionsClazz(classLoader),
 								String.class);
 						Object formattingOptions = getCustomFormattingOptions(classLoader, style);
-						return (String) formatterMethod.invoke(formatterClazz, formattingOptions, input);
+						return (String) formatterMethod.invoke(getFormatterClazz(classLoader), formattingOptions, input);
 					}
 				} catch (InvocationTargetException e) {
 					throw ThrowingEx.unwrapCause(e);
@@ -146,7 +144,7 @@ private Object getCustomFormattingOptions(ClassLoader classLoader, Style style)
 
 			try {
 				// ktfmt v0.19 and later
-				return classLoader.loadClass(pkg + ".ktfmt.FormatterKt").getField(style.getFormat()).get(null);
+				return getFormatterClazz(classLoader).getField(style.getFormat()).get(null);
 			} catch (NoSuchFieldException ignored) {}
 
 			// fallback to old, pre-0.19 ktfmt interface.
@@ -159,5 +157,25 @@ private Object getCustomFormattingOptions(ClassLoader classLoader, Style style)
 				throw new IllegalStateException("Versions pre-0.19 can only use Default and Dropbox styles");
 			}
 		}
+
+		private Class<?> getFormatterClazz(ClassLoader classLoader) throws Exception {
+			Class<?> formatterClazz;
+			if (BadSemver.version(version) >= BadSemver.version(0, 31)) {
+				formatterClazz = classLoader.loadClass(pkg + ".ktfmt.format.Formatter");
+			} else {
+				formatterClazz = classLoader.loadClass(pkg + ".ktfmt.FormatterKt");
+			}
+			return formatterClazz;
+		}
+
+		private Class<?> getFormattingOptionsClazz(ClassLoader classLoader) throws Exception {
+			Class<?> formattingOptionsClazz;
+			if (BadSemver.version(version) >= BadSemver.version(0, 31)) {
+				formattingOptionsClazz = classLoader.loadClass(pkg + ".ktfmt.format.FormattingOptions");
+			} else {
+				formattingOptionsClazz = classLoader.loadClass(pkg + ".ktfmt.FormattingOptions");
+			}
+			return formattingOptionsClazz;
+		}
 	}
 }
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index bf3d46dbd6..69dc1bae1e 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Changed
+* ktfmt `0.30` -> `0.31`
 
 ## [6.2.1] - 2022-02-01
 ### Changed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 583d5ce426..61aba5d796 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Changed
+* ktfmt `0.30` -> `0.31`
 
 ## [2.20.1] - 2022-02-01
 * Bump default versions of formatters ([#1095](https://github.com/diffplug/spotless/pull/1095)).

From c3a32ee26afa83ff04425b58736a0e4f8812563f Mon Sep 17 00:00:00 2001
From: Anton Klaren <anton.klaren@neotechnology.com>
Date: Fri, 28 Jan 2022 12:05:28 +0100
Subject: [PATCH 0017/2068] Add support for worktrees

Git supports using the same local repository for multiple checked-out worktrees. JGit does not fully support this, so we have to do some workarounds for it to work.

The previous workaround provided by #965 did not take `commondir` into consideration, which is the location of a few files.
---
 .../extra/GitAttributesLineEndings.java       |  40 ++--
 .../spotless/extra/GitWorkarounds.java        | 172 +++++++++++++++---
 .../spotless/extra/GitAttributesTest.java     |  51 +++++-
 .../spotless/extra/GitWorkaroundsTest.java    | 124 +++++++++++++
 4 files changed, 330 insertions(+), 57 deletions(-)
 create mode 100644 lib-extra/src/test/java/com/diffplug/spotless/extra/GitWorkaroundsTest.java

diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
index 11ed730e6d..4aab23e142 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
@@ -38,10 +38,10 @@
 import org.eclipse.jgit.lib.Config;
 import org.eclipse.jgit.lib.ConfigConstants;
 import org.eclipse.jgit.lib.Constants;
+import org.eclipse.jgit.lib.CoreConfig;
 import org.eclipse.jgit.lib.CoreConfig.AutoCRLF;
 import org.eclipse.jgit.lib.CoreConfig.EOL;
 import org.eclipse.jgit.storage.file.FileBasedConfig;
-import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
 import org.eclipse.jgit.util.FS;
 import org.eclipse.jgit.util.SystemReader;
 
@@ -52,6 +52,7 @@
 import com.diffplug.spotless.FileSignature;
 import com.diffplug.spotless.LazyForwardingEquality;
 import com.diffplug.spotless.LineEnding;
+import com.diffplug.spotless.extra.GitWorkarounds.RepositorySpecificResolver;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
@@ -132,8 +133,11 @@ public String endingFor(File file) {
 	}
 
 	static class RuntimeInit {
-		/** /etc/gitconfig (system-global), ~/.gitconfig, project/.git/config (each might-not exist). */
-		final FileBasedConfig systemConfig, userConfig, repoConfig;
+		/** /etc/gitconfig (system-global), ~/.gitconfig (each might-not exist). */
+		final FileBasedConfig systemConfig, userConfig;
+
+		/** Repository specific config, can be $GIT_COMMON_DIR/config, project/.git/config or .git/worktrees/<id>/config.worktree if enabled by extension */
+		final Config repoConfig;
 
 		/** Global .gitattributes file pointed at by systemConfig or userConfig, and the file in the repo. */
 		final @Nullable File globalAttributesFile, repoAttributesFile;
@@ -142,7 +146,7 @@ static class RuntimeInit {
 		final @Nullable File workTree;
 
 		@SuppressFBWarnings("SIC_INNER_SHOULD_BE_STATIC_ANON")
-		RuntimeInit(File projectDir, Iterable<File> toFormat) throws IOException {
+		RuntimeInit(File projectDir, Iterable<File> toFormat) {
 			requireElementsNonNull(toFormat);
 			/////////////////////////////////
 			// USER AND SYSTEM-WIDE VALUES //
@@ -152,9 +156,8 @@ static class RuntimeInit {
 			userConfig = SystemReader.getInstance().openUserConfig(systemConfig, FS.DETECTED);
 			Errors.log().run(userConfig::load);
 
-			// copy-pasted from org.eclipse.jgit.lib.CoreConfig
-			String globalAttributesPath = userConfig.getString(ConfigConstants.CONFIG_CORE_SECTION, null, ConfigConstants.CONFIG_KEY_ATTRIBUTESFILE);
 			// copy-pasted from org.eclipse.jgit.internal.storage.file.GlobalAttributesNode
+			String globalAttributesPath = userConfig.get(CoreConfig.KEY).getAttributesFile();
 			if (globalAttributesPath != null) {
 				FS fs = FS.detect();
 				if (globalAttributesPath.startsWith("~/")) { //$NON-NLS-1$
@@ -169,29 +172,16 @@ static class RuntimeInit {
 			//////////////////////////
 			// REPO-SPECIFIC VALUES //
 			//////////////////////////
-			FileRepositoryBuilder builder = GitWorkarounds.fileRepositoryBuilderForProject(projectDir);
-			if (builder.getGitDir() != null) {
-				workTree = builder.getWorkTree();
-				repoConfig = new FileBasedConfig(userConfig, new File(builder.getGitDir(), Constants.CONFIG), FS.DETECTED);
-				repoAttributesFile = new File(builder.getGitDir(), Constants.INFO_ATTRIBUTES);
+			RepositorySpecificResolver repositoryResolver = GitWorkarounds.fileRepositoryResolverForProject(projectDir);
+			if (repositoryResolver.getGitDir() != null) {
+				workTree = repositoryResolver.getWorkTree();
+				repoConfig = repositoryResolver.getRepositoryConfig();
+				repoAttributesFile = repositoryResolver.resolveWithCommonDir(Constants.INFO_ATTRIBUTES);
 			} else {
 				workTree = null;
-				// null would make repoConfig.getFile() bomb below
-				repoConfig = new FileBasedConfig(userConfig, null, FS.DETECTED) {
-					@Override
-					public void load() {
-						// empty, do not load
-					}
-
-					@Override
-					public boolean isOutdated() {
-						// regular class would bomb here
-						return false;
-					}
-				};
+				repoConfig = new Config();
 				repoAttributesFile = null;
 			}
-			Errors.log().run(repoConfig::load);
 		}
 
 		private Runtime atRuntime() {
diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitWorkarounds.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitWorkarounds.java
index ee13fefc81..123ca64510 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitWorkarounds.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitWorkarounds.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 DiffPlug
+ * Copyright 2020-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,17 +17,25 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
 
 import javax.annotation.Nullable;
 
+import org.eclipse.jgit.errors.ConfigInvalidException;
+import org.eclipse.jgit.lib.Config;
+import org.eclipse.jgit.lib.ConfigConstants;
+import org.eclipse.jgit.lib.Constants;
+import org.eclipse.jgit.storage.file.FileBasedConfig;
 import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
+import org.eclipse.jgit.util.IO;
+import org.eclipse.jgit.util.RawParseUtils;
+import org.eclipse.jgit.util.SystemReader;
+
+import com.diffplug.common.base.Errors;
 
 /**
  * Utility methods for Git workarounds.
  */
-public class GitWorkarounds {
+public final class GitWorkarounds {
 	private GitWorkarounds() {}
 
 	/**
@@ -40,46 +48,154 @@ private GitWorkarounds() {}
 	 * @return the path to the .git directory.
 	 */
 	static @Nullable File getDotGitDir(File projectDir) {
-		return fileRepositoryBuilderForProject(projectDir).getGitDir();
+		return fileRepositoryResolverForProject(projectDir).getGitDir();
 	}
 
 	/**
-	 * Creates a {@link FileRepositoryBuilder} for the given project directory.
+	 * Creates a {@link RepositorySpecificResolver} for the given project directory.
 	 *
 	 * This applies a workaround for JGit not supporting worktrees properly.
 	 *
 	 * @param projectDir the project directory.
 	 * @return the builder.
 	 */
-	static FileRepositoryBuilder fileRepositoryBuilderForProject(File projectDir) {
-		FileRepositoryBuilder builder = new FileRepositoryBuilder();
-		builder.findGitDir(projectDir);
-		File gitDir = builder.getGitDir();
-		if (gitDir != null) {
-			builder.setGitDir(resolveRealGitDirIfWorktreeDir(gitDir));
+	static RepositorySpecificResolver fileRepositoryResolverForProject(File projectDir) {
+		RepositorySpecificResolver repositoryResolver = new RepositorySpecificResolver();
+		repositoryResolver.findGitDir(projectDir);
+		repositoryResolver.readEnvironment();
+		if (repositoryResolver.getGitDir() != null || repositoryResolver.getWorkTree() != null) {
+			Errors.rethrow().get(repositoryResolver::setup);
 		}
-		return builder;
+		return repositoryResolver;
 	}
 
 	/**
-	 * If the dir is a worktree directory (typically .git/worktrees/something) then
-	 * returns the actual .git directory.
+	 * Piggyback on the {@link FileRepositoryBuilder} mechanics for finding the git directory.
 	 *
-	 * @param dir the directory which may be a worktree directory or may be a .git directory.
-	 * @return the .git directory.
+	 * Here we take into account that git repositories can share a common directory. This directory
+	 * will contain ./config ./objects/, ./info/, and ./refs/.
 	 */
-	private static File resolveRealGitDirIfWorktreeDir(File dir) {
-		File pointerFile = new File(dir, "gitdir");
-		if (pointerFile.isFile()) {
-			try {
-				String content = new String(Files.readAllBytes(pointerFile.toPath()), StandardCharsets.UTF_8).trim();
-				return new File(content);
-			} catch (IOException e) {
-				System.err.println("failed to parse git meta: " + e.getMessage());
-				return dir;
+	static class RepositorySpecificResolver extends FileRepositoryBuilder {
+		/**
+		 * The common directory file is used to define $GIT_COMMON_DIR if environment variable is not set.
+		 * https://github.com/git/git/blob/b23dac905bde28da47543484320db16312c87551/Documentation/gitrepository-layout.txt#L259
+		 */
+		private static final String COMMON_DIR = "commondir";
+		private static final String GIT_COMMON_DIR_ENV_KEY = "GIT_COMMON_DIR";
+
+		/**
+		 * Using an extension it is possible to have per-worktree config.
+		 * https://github.com/git/git/blob/b23dac905bde28da47543484320db16312c87551/Documentation/git-worktree.txt#L366
+		 */
+		private static final String EXTENSIONS_WORKTREE_CONFIG = "worktreeConfig";
+		private static final String EXTENSIONS_WORKTREE_CONFIG_FILENAME = "config.worktree";
+
+		private File commonDirectory;
+
+		/** @return the repository specific configuration. */
+		Config getRepositoryConfig() {
+			return Errors.rethrow().get(this::getConfig);
+		}
+
+		/**
+		 * @return the repository's configuration.
+		 * @throws IOException on errors accessing the configuration file.
+		 * @throws IllegalArgumentException on malformed configuration.
+		 */
+		@Override
+		protected Config loadConfig() throws IOException {
+			if (getGitDir() != null) {
+				File path = resolveWithCommonDir(Constants.CONFIG);
+				FileBasedConfig cfg = new FileBasedConfig(path, safeFS());
+				try {
+					cfg.load();
+
+					// Check for per-worktree config, it should be parsed after the common config
+					if (cfg.getBoolean(ConfigConstants.CONFIG_EXTENSIONS_SECTION, EXTENSIONS_WORKTREE_CONFIG, false)) {
+						File worktreeSpecificConfig = safeFS().resolve(getGitDir(), EXTENSIONS_WORKTREE_CONFIG_FILENAME);
+						if (safeFS().exists(worktreeSpecificConfig) && safeFS().isFile(worktreeSpecificConfig)) {
+							// It is important to base this on the common config, as both the common config and the per-worktree config should be used
+							cfg = new FileBasedConfig(cfg, worktreeSpecificConfig, safeFS());
+							try {
+								cfg.load();
+							} catch (ConfigInvalidException err) {
+								throw new IllegalArgumentException("Failed to parse config " + worktreeSpecificConfig.getAbsolutePath(), err);
+							}
+						}
+					}
+				} catch (ConfigInvalidException err) {
+					throw new IllegalArgumentException("Failed to parse config " + path.getAbsolutePath(), err);
+				}
+				return cfg;
+			}
+			return super.loadConfig();
+		}
+
+		@Override
+		protected void setupGitDir() throws IOException {
+			super.setupGitDir();
+
+			// Setup common directory
+			if (commonDirectory == null) {
+				File commonDirFile = safeFS().resolve(getGitDir(), COMMON_DIR);
+				if (safeFS().exists(commonDirFile) && safeFS().isFile(commonDirFile)) {
+					byte[] content = IO.readFully(commonDirFile);
+					if (content.length < 1) {
+						throw emptyFile(commonDirFile);
+					}
+
+					int lineEnd = RawParseUtils.nextLF(content, 0);
+					while (content[lineEnd - 1] == '\n' || (content[lineEnd - 1] == '\r' && SystemReader.getInstance().isWindows())) {
+						lineEnd--;
+					}
+					if (lineEnd <= 1) {
+						throw emptyFile(commonDirFile);
+					}
+
+					String commonPath = RawParseUtils.decode(content, 0, lineEnd);
+					File common = new File(commonPath);
+					if (common.isAbsolute()) {
+						commonDirectory = common;
+					} else {
+						commonDirectory = safeFS().resolve(getGitDir(), commonPath).getCanonicalFile();
+					}
+				}
+			}
+
+			// Setup object directory
+			if (getObjectDirectory() == null) {
+				setObjectDirectory(resolveWithCommonDir(Constants.OBJECTS));
+			}
+		}
+
+		private static IOException emptyFile(File commonDir) {
+			return new IOException("Empty 'commondir' file: " + commonDir.getAbsolutePath());
+		}
+
+		@Override
+		public FileRepositoryBuilder readEnvironment(SystemReader sr) {
+			super.readEnvironment(sr);
+
+			// Always overwrite, will trump over the common dir file
+			String val = sr.getenv(GIT_COMMON_DIR_ENV_KEY);
+			if (val != null) {
+				commonDirectory = new File(val);
+			}
+
+			return self();
+		}
+
+		/**
+		 * For repository with multiple linked worktrees some data might be shared in a "common" directory.
+		 *
+		 * @param target the file we want to resolve.
+		 * @return a file resolved from the {@link #getGitDir()}, or possibly in the path specified by $GIT_COMMON_DIR or {@code commondir} file.
+		 */
+		File resolveWithCommonDir(String target) {
+			if (commonDirectory != null) {
+				return safeFS().resolve(commonDirectory, target);
 			}
-		} else {
-			return dir;
+			return safeFS().resolve(getGitDir(), target);
 		}
 	}
 }
diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/GitAttributesTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/GitAttributesTest.java
index 330a432d40..ed657c365a 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/GitAttributesTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/GitAttributesTest.java
@@ -32,12 +32,13 @@
 import com.diffplug.spotless.ResourceHarness;
 
 class GitAttributesTest extends ResourceHarness {
-	private List<File> testFiles() {
+	private List<File> testFiles(String prefix) {
 		try {
 			List<File> result = new ArrayList<>();
 			for (String path : TEST_PATHS) {
-				setFile(path).toContent("");
-				result.add(newFile(path));
+				String prefixedPath = prefix + path;
+				setFile(prefixedPath).toContent("");
+				result.add(newFile(prefixedPath));
 			}
 			return result;
 		} catch (IOException e) {
@@ -45,7 +46,11 @@ private List<File> testFiles() {
 		}
 	}
 
-	private static List<String> TEST_PATHS = Arrays.asList("someFile", "subfolder/someFile", "MANIFEST.MF", "subfolder/MANIFEST.MF");
+	private List<File> testFiles() {
+		return testFiles("");
+	}
+
+	private static final List<String> TEST_PATHS = Arrays.asList("someFile", "subfolder/someFile", "MANIFEST.MF", "subfolder/MANIFEST.MF");
 
 	@Test
 	void cacheTest() throws IOException {
@@ -101,4 +106,42 @@ void policyDefaultLineEndingTest() throws GitAPIException, IOException {
 		LineEnding.Policy policy = LineEnding.GIT_ATTRIBUTES.createPolicy(rootFolder(), () -> testFiles());
 		Assertions.assertThat(policy.getEndingFor(newFile("someFile"))).isEqualTo("\r\n");
 	}
+
+	@Test
+	void policyTestWithExternalGitDir() throws IOException, GitAPIException {
+		File projectFolder = newFolder("project");
+		File gitDir = newFolder("project.git");
+		Git.init().setDirectory(projectFolder).setGitDir(gitDir).call();
+
+		setFile("project.git/info/attributes").toContent(StringPrinter.buildStringFromLines(
+				"* eol=lf",
+				"*.MF eol=crlf"));
+		LineEnding.Policy policy = LineEnding.GIT_ATTRIBUTES.createPolicy(projectFolder, () -> testFiles("project/"));
+		Assertions.assertThat(policy.getEndingFor(newFile("project/someFile"))).isEqualTo("\n");
+		Assertions.assertThat(policy.getEndingFor(newFile("project/subfolder/someFile"))).isEqualTo("\n");
+		Assertions.assertThat(policy.getEndingFor(newFile("project/MANIFEST.MF"))).isEqualTo("\r\n");
+		Assertions.assertThat(policy.getEndingFor(newFile("project/subfolder/MANIFEST.MF"))).isEqualTo("\r\n");
+	}
+
+	@Test
+	void policyTestWithCommonDir() throws IOException, GitAPIException {
+		File projectFolder = newFolder("project");
+		File commonGitDir = newFolder("project.git");
+		Git.init().setDirectory(projectFolder).setGitDir(commonGitDir).call();
+		newFolder("project.git/worktrees/");
+
+		File projectGitDir = newFolder("project.git/worktrees/project/");
+		setFile("project.git/worktrees/project/gitdir").toContent(projectFolder.getAbsolutePath() + "/.git");
+		setFile("project.git/worktrees/project/commondir").toContent("../..");
+		setFile("project/.git").toContent("gitdir: " + projectGitDir.getAbsolutePath());
+
+		setFile("project.git/info/attributes").toContent(StringPrinter.buildStringFromLines(
+				"* eol=lf",
+				"*.MF eol=crlf"));
+		LineEnding.Policy policy = LineEnding.GIT_ATTRIBUTES.createPolicy(projectFolder, () -> testFiles("project/"));
+		Assertions.assertThat(policy.getEndingFor(newFile("project/someFile"))).isEqualTo("\n");
+		Assertions.assertThat(policy.getEndingFor(newFile("project/subfolder/someFile"))).isEqualTo("\n");
+		Assertions.assertThat(policy.getEndingFor(newFile("project/MANIFEST.MF"))).isEqualTo("\r\n");
+		Assertions.assertThat(policy.getEndingFor(newFile("project/subfolder/MANIFEST.MF"))).isEqualTo("\r\n");
+	}
 }
diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/GitWorkaroundsTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/GitWorkaroundsTest.java
new file mode 100644
index 0000000000..a90716f5de
--- /dev/null
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/GitWorkaroundsTest.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.extra;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.assertj.core.api.Assertions;
+import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.api.errors.GitAPIException;
+import org.eclipse.jgit.lib.Constants;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+import com.diffplug.spotless.ResourceHarness;
+import com.diffplug.spotless.extra.GitWorkarounds.RepositorySpecificResolver;
+
+class GitWorkaroundsTest extends ResourceHarness {
+	@Test
+	void inline() throws IOException, GitAPIException {
+		File projectFolder = newFolder("project");
+		Git.init().setDirectory(projectFolder).call();
+
+		RepositorySpecificResolver repositorySpecificResolver = GitWorkarounds.fileRepositoryResolverForProject(projectFolder);
+		Assertions.assertThat(repositorySpecificResolver.getGitDir()).isEqualTo(new File(projectFolder, ".git"));
+	}
+
+	@Test
+	void external() throws IOException, GitAPIException {
+		File projectFolder = newFolder("project");
+		File gitDir = newFolder("project.git");
+		Git.init().setDirectory(projectFolder).setGitDir(gitDir).call();
+
+		RepositorySpecificResolver repositorySpecificResolver = GitWorkarounds.fileRepositoryResolverForProject(projectFolder);
+		Assertions.assertThat(repositorySpecificResolver.getGitDir()).isEqualTo(gitDir);
+	}
+
+	@Nested
+	@DisplayName("Worktrees")
+	class Worktrees {
+		private File project1Tree;
+		private File project1GitDir;
+		private File project2Tree;
+		private File project2GitDir;
+		private File commonGitDir;
+
+		@BeforeEach
+		void setUp() throws IOException, GitAPIException {
+			project1Tree = newFolder("project-w1");
+			project2Tree = newFolder("project-w2");
+			commonGitDir = newFolder("project.git");
+			Git.init().setDirectory(project1Tree).setGitDir(commonGitDir).call();
+
+			// Setup worktrees manually since JGit does not support it
+			newFolder("project.git/worktrees/");
+
+			project1GitDir = newFolder("project.git/worktrees/project-w1/");
+			setFile("project.git/worktrees/project-w1/gitdir").toContent(project1Tree.getAbsolutePath() + "/.git");
+			setFile("project.git/worktrees/project-w1/commondir").toContent("../.."); // Relative path
+			setFile("project-w1/.git").toContent("gitdir: " + project1GitDir.getAbsolutePath());
+
+			project2GitDir = newFolder("project.git/worktrees/project-w2/");
+			setFile("project.git/worktrees/project-w2/gitdir").toContent(project2Tree.getAbsolutePath() + "/.git");
+			setFile("project.git/worktrees/project-w2/commondir").toContent(commonGitDir.getAbsolutePath()); // Absolute path
+			setFile("project-w2/.git").toContent("gitdir: " + project2GitDir.getAbsolutePath());
+		}
+
+		@Test
+		void resolveGitDir() {
+			// Test worktree 1
+			{
+				RepositorySpecificResolver repositorySpecificResolver = GitWorkarounds.fileRepositoryResolverForProject(project1Tree);
+				Assertions.assertThat(repositorySpecificResolver.getGitDir()).isEqualTo(project1GitDir);
+				Assertions.assertThat(repositorySpecificResolver.resolveWithCommonDir(Constants.CONFIG)).isEqualTo(new File(commonGitDir, Constants.CONFIG));
+			}
+
+			// Test worktree 2
+			{
+				RepositorySpecificResolver repositorySpecificResolver = GitWorkarounds.fileRepositoryResolverForProject(project2Tree);
+				Assertions.assertThat(repositorySpecificResolver.getGitDir()).isEqualTo(project2GitDir);
+				Assertions.assertThat(repositorySpecificResolver.resolveWithCommonDir(Constants.CONFIG)).isEqualTo(new File(commonGitDir, Constants.CONFIG));
+			}
+		}
+
+		@Test
+		void perWorktreeConfig() throws IOException {
+			setFile("project.git/config").toLines("[core]", "mySetting = true");
+
+			Assertions.assertThat(getMySetting(project1Tree)).isTrue();
+			Assertions.assertThat(getMySetting(project2Tree)).isTrue();
+
+			// Override setting for project 1, but don't enable extension yet
+			setFile("project.git/worktrees/project-w1/config.worktree").toLines("[core]", "mySetting = false");
+
+			Assertions.assertThat(getMySetting(project1Tree)).isTrue();
+			Assertions.assertThat(getMySetting(project2Tree)).isTrue();
+
+			// Enable extension
+			setFile("project.git/config").toLines("[core]", "mySetting = true", "[extensions]", "worktreeConfig = true");
+
+			Assertions.assertThat(getMySetting(project1Tree)).isFalse(); // Should now be overridden by config.worktree
+			Assertions.assertThat(getMySetting(project2Tree)).isTrue();
+		}
+
+		private boolean getMySetting(File projectDir) {
+			return GitWorkarounds.fileRepositoryResolverForProject(projectDir).getRepositoryConfig().getBoolean("core", "mySetting", false);
+		}
+	}
+}

From 4b47e1c6d7e3d9d6d9968631c47a843bd18f782f Mon Sep 17 00:00:00 2001
From: Anton Klaren <anton.klaren@neotechnology.com>
Date: Fri, 4 Feb 2022 13:51:29 +0100
Subject: [PATCH 0018/2068] Update changelog

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 1 +
 plugin-maven/CHANGES.md  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index cc19ae2acc..f64b05cb26 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,7 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+# Add full support for git worktrees ([#1119](https://github.com/diffplug/spotless/pull/1119))
 
 ## [2.22.1] - 2022-02-01
 ### Changed
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index bf3d46dbd6..8a68af888d 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,7 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+# Add full support for git worktrees ([#1119](https://github.com/diffplug/spotless/pull/1119))
 
 ## [6.2.1] - 2022-02-01
 ### Changed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 583d5ce426..113a6d580c 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,7 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+# Add full support for git worktrees ([#1119](https://github.com/diffplug/spotless/pull/1119))
 
 ## [2.20.1] - 2022-02-01
 * Bump default versions of formatters ([#1095](https://github.com/diffplug/spotless/pull/1095)).

From 9d3a4bdf7d9ad1aa391496acace9e95eaab33995 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 8 Feb 2022 15:46:02 -0800
Subject: [PATCH 0019/2068] Update changelogs.

---
 CHANGES.md               | 2 ++
 plugin-gradle/CHANGES.md | 2 +-
 plugin-maven/CHANGES.md  | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index cc19ae2acc..a431ee8c18 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Changed
+* Bump default ktfmt `0.30` -> `0.31` ([#1118](https://github.com/diffplug/spotless/pull/1118)).
 
 ## [2.22.1] - 2022-02-01
 ### Changed
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 69dc1bae1e..265b77084f 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -4,7 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Changed
-* ktfmt `0.30` -> `0.31`
+* Bump default ktfmt `0.30` -> `0.31` ([#1118](https://github.com/diffplug/spotless/pull/1118)).
 
 ## [6.2.1] - 2022-02-01
 ### Changed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 61aba5d796..a506bf17d1 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -4,7 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Changed
-* ktfmt `0.30` -> `0.31`
+* Bump default ktfmt `0.30` -> `0.31` ([#1118](https://github.com/diffplug/spotless/pull/1118)).
 
 ## [2.20.1] - 2022-02-01
 * Bump default versions of formatters ([#1095](https://github.com/diffplug/spotless/pull/1095)).

From 68893214eee8569219e695a26771b15e41305ccc Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 8 Feb 2022 16:07:07 -0800
Subject: [PATCH 0020/2068] Fix spotbugs warning.

---
 .../main/java/com/diffplug/spotless/extra/GitWorkarounds.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitWorkarounds.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitWorkarounds.java
index 123ca64510..a66650b38f 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitWorkarounds.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitWorkarounds.java
@@ -32,6 +32,8 @@
 
 import com.diffplug.common.base.Errors;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 /**
  * Utility methods for Git workarounds.
  */
@@ -172,6 +174,7 @@ private static IOException emptyFile(File commonDir) {
 			return new IOException("Empty 'commondir' file: " + commonDir.getAbsolutePath());
 		}
 
+		@SuppressFBWarnings(value = "BC_UNCONFIRMED_CAST_OF_RETURN_VALUE")
 		@Override
 		public FileRepositoryBuilder readEnvironment(SystemReader sr) {
 			super.readEnvironment(sr);

From 27d16456d0fb32ea7f842ca08e0cddfe0698118f Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 8 Feb 2022 16:16:29 -0800
Subject: [PATCH 0021/2068] Oops, fix the changelog entries.

---
 CHANGES.md               | 2 ++
 plugin-gradle/CHANGES.md | 2 ++
 plugin-maven/CHANGES.md  | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index a431ee8c18..64f1e42e37 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changed
 * Bump default ktfmt `0.30` -> `0.31` ([#1118](https://github.com/diffplug/spotless/pull/1118)).
+### Fixed
+* Add full support for git worktrees ([#1119](https://github.com/diffplug/spotless/pull/1119)).
 
 ## [2.22.1] - 2022-02-01
 ### Changed
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 265b77084f..ee6a753893 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,6 +5,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changed
 * Bump default ktfmt `0.30` -> `0.31` ([#1118](https://github.com/diffplug/spotless/pull/1118)).
+### Fixed
+* Add full support for git worktrees ([#1119](https://github.com/diffplug/spotless/pull/1119)).
 
 ## [6.2.1] - 2022-02-01
 ### Changed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index a506bf17d1..07021c68ef 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,6 +5,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changed
 * Bump default ktfmt `0.30` -> `0.31` ([#1118](https://github.com/diffplug/spotless/pull/1118)).
+### Fixed
+* Add full support for git worktrees ([#1119](https://github.com/diffplug/spotless/pull/1119)).
 
 ## [2.20.1] - 2022-02-01
 * Bump default versions of formatters ([#1095](https://github.com/diffplug/spotless/pull/1095)).

From 6a03212a6fdb8417b41b54c5e1436558e798cb9b Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 8 Feb 2022 16:16:44 -0800
Subject: [PATCH 0022/2068] Double the Gradle metaspace to help with flaky CI.

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index fcad5c5ed4..032beae95c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 # To fix metaspace errors
-org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=1024m -Dfile.encoding=UTF-8
 name=spotless
 description=Spotless - keep your code spotless with Gradle
 org=diffplug

From 19d271c641aab4b16af67287ed835d91e5e076e0 Mon Sep 17 00:00:00 2001
From: circleci <circleci@e55414248460>
Date: Wed, 9 Feb 2022 00:59:32 +0000
Subject: [PATCH 0023/2068] Published lib/2.22.2

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 64f1e42e37..29fd6d9375 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.22.2] - 2022-02-09
 ### Changed
 * Bump default ktfmt `0.30` -> `0.31` ([#1118](https://github.com/diffplug/spotless/pull/1118)).
 ### Fixed

From 87861ac19be3c206f97332e6a19e3c912620c050 Mon Sep 17 00:00:00 2001
From: circleci <circleci@e55414248460>
Date: Wed, 9 Feb 2022 01:00:29 +0000
Subject: [PATCH 0024/2068] Published gradle/6.2.2

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 46 ++++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index ee6a753893..6c2a6cd4da 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [6.2.2] - 2022-02-09
 ### Changed
 * Bump default ktfmt `0.30` -> `0.31` ([#1118](https://github.com/diffplug/spotless/pull/1118)).
 ### Fixed
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index df4c67c113..ffc52bd923 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -18,9 +18,9 @@ output = [
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
 [![Maven central](https://img.shields.io/badge/mavencentral-yes-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/index.html)
 [![License Apache](https://img.shields.io/badge/license-apache-blue.svg)](https://tldrlegal.com/license/apache-license-2.0-(apache-2.0))
-[![Changelog](https://img.shields.io/badge/changelog-6.2.1-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-6.2.2-blue.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)
@@ -126,10 +126,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -141,7 +141,7 @@ If you're stuck on an older version of Gradle, `id 'com.diffplug.gradle.spotless
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -248,8 +248,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -300,8 +300,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -359,7 +359,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -391,7 +391,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -423,7 +423,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -457,7 +457,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -478,7 +478,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -503,7 +503,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -543,7 +543,7 @@ sql.formatter.indent.size=4
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -586,7 +586,7 @@ For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#n
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -786,7 +786,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -853,9 +853,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -888,11 +888,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.1/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From b26f0972b185995d7c6a7aefa726c146d24d9a82 Mon Sep 17 00:00:00 2001
From: circleci <circleci@e55414248460>
Date: Wed, 9 Feb 2022 01:01:56 +0000
Subject: [PATCH 0025/2068] Published maven/2.20.2

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 07021c68ef..8d277d1703 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.20.2] - 2022-02-09
 ### Changed
 * Bump default ktfmt `0.30` -> `0.31` ([#1118](https://github.com/diffplug/spotless/pull/1118)).
 ### Fixed
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 986fa6c783..01688eb9b7 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -12,8 +12,8 @@ output = [
   ].join('\n');
 -->
 [![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.20.1/index.html)
-[![Changelog](https://img.shields.io/badge/changelog-2.20.1-brightgreen.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.20.2/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.20.2-brightgreen.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)

From cf449b88ab0277ba69e5700faac0e28703d8b0bd Mon Sep 17 00:00:00 2001
From: Abel Keszei <keszeiabel@gmail.com>
Date: Sun, 30 Jan 2022 22:06:11 +0100
Subject: [PATCH 0026/2068] add gson support to json extension

---
 .../diffplug/spotless/json/gson/GsonStep.java | 74 +++++++++++++++++++
 .../spotless/json/gson/GsonWrapper.java       | 33 +++++++++
 .../spotless/json/gson/GsonWrapperBase.java   | 56 ++++++++++++++
 .../json/gson/JsonElementWrapper.java         | 27 +++++++
 .../spotless/json/gson/JsonObjectWrapper.java | 46 ++++++++++++
 .../spotless/json/gson/JsonWriterWrapper.java | 33 +++++++++
 .../gradle/spotless/JsonExtension.java        | 41 ++++++++++
 7 files changed, 310 insertions(+)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
 create mode 100644 lib/src/main/java/com/diffplug/spotless/json/gson/GsonWrapper.java
 create mode 100644 lib/src/main/java/com/diffplug/spotless/json/gson/GsonWrapperBase.java
 create mode 100644 lib/src/main/java/com/diffplug/spotless/json/gson/JsonElementWrapper.java
 create mode 100644 lib/src/main/java/com/diffplug/spotless/json/gson/JsonObjectWrapper.java
 create mode 100644 lib/src/main/java/com/diffplug/spotless/json/gson/JsonWriterWrapper.java

diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
new file mode 100644
index 0000000000..5035953289
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
@@ -0,0 +1,74 @@
+package com.diffplug.spotless.json.gson;
+
+import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.JarState;
+import com.diffplug.spotless.Provisioner;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.io.StringWriter;
+import java.util.Collections;
+import java.util.Objects;
+
+public class GsonStep {
+	private static final String MAVEN_COORDINATES = "com.google.code.gson:gson";
+
+	public static FormatterStep create(int indentSpaces, boolean sortByKeys, String version, Provisioner provisioner) {
+		Objects.requireNonNull(provisioner, "provisioner cannot be null");
+		return FormatterStep.createLazy("gson", () -> new State(indentSpaces, sortByKeys, version, provisioner), State::toFormatter);
+	}
+
+	private static final class State implements Serializable {
+		private static final long serialVersionUID = 6540876150977107116L;
+
+		private final int indentSpaces;
+		private final boolean sortByKeys;
+		private final JarState jarState;
+
+		private State(int indentSpaces, boolean sortByKeys, String version, Provisioner provisioner) throws IOException {
+			this.indentSpaces = indentSpaces;
+			this.sortByKeys = sortByKeys;
+			this.jarState = JarState.from(MAVEN_COORDINATES + ":" + version, provisioner);
+		}
+
+		FormatterFunc toFormatter() {
+			JsonWriterWrapper jsonWriterWrapper = new JsonWriterWrapper(jarState);
+			JsonElementWrapper jsonElementWrapper = new JsonElementWrapper(jarState);
+			JsonObjectWrapper jsonObjectWrapper = new JsonObjectWrapper(jarState, jsonElementWrapper);
+			GsonWrapper gsonWrapper = new GsonWrapper(jarState, jsonElementWrapper, jsonWriterWrapper);
+			Object gson = gsonWrapper.createGson();
+
+			return inputString -> {
+				Object jsonElement = gsonWrapper.fromJson(gson, inputString, jsonElementWrapper.getWrappedClass());
+				if (sortByKeys && jsonElementWrapper.isJsonObject(jsonElement)) {
+					jsonElement = sortByKeys(jsonObjectWrapper, jsonElementWrapper, jsonElement);
+				}
+				try (StringWriter stringWriter = new StringWriter()) {
+					Object jsonWriter = jsonWriterWrapper.createJsonWriter(stringWriter);
+					jsonWriterWrapper.setIndent(jsonWriter, generateIndent(indentSpaces));
+					gsonWrapper.toJson(gson, jsonElement, jsonWriter);
+					return stringWriter.toString();
+				}
+			};
+		}
+
+		private Object sortByKeys(JsonObjectWrapper jsonObjectWrapper, JsonElementWrapper jsonElementWrapper, Object jsonObject) {
+			Object result = jsonObjectWrapper.createJsonObject();
+			jsonObjectWrapper.keySet(jsonObject).stream().sorted()
+				.forEach(key -> {
+					Object element = jsonObjectWrapper.get(jsonObject, key);
+					if (jsonElementWrapper.isJsonObject(element)) {
+						element = sortByKeys(jsonObjectWrapper, jsonElementWrapper, element);
+					}
+					jsonObjectWrapper.add(result, key, element);
+				});
+			return result;
+		}
+
+		private String generateIndent(int indentSpaces) {
+			return String.join("", Collections.nCopies(indentSpaces, " "));
+		}
+	}
+
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonWrapper.java b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonWrapper.java
new file mode 100644
index 0000000000..53e765fa04
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonWrapper.java
@@ -0,0 +1,33 @@
+package com.diffplug.spotless.json.gson;
+
+import com.diffplug.spotless.JarState;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+
+public class GsonWrapper extends GsonWrapperBase {
+
+	private final Constructor<?> constructor;
+	private final Method fromJsonMethod;
+	private final Method toJsonMethod;
+
+	public GsonWrapper(JarState jarState, JsonElementWrapper jsonElementWrapper, JsonWriterWrapper jsonWriterWrapper) {
+		Class<?> clazz = loadClass(jarState.getClassLoader(), "com.google.gson.Gson");
+		this.constructor = getConstructor(clazz);
+		this.fromJsonMethod = getMethod(clazz, "fromJson", String.class, Class.class);
+		this.toJsonMethod = getMethod(clazz, "toJson", jsonElementWrapper.getWrappedClass(), jsonWriterWrapper.getWrappedClass());
+	}
+
+	public Object createGson() {
+		return newInstance(constructor);
+	}
+
+	public Object fromJson(Object gson, String json, Class<?> type) {
+		return invoke(fromJsonMethod, gson, json, type);
+	}
+
+	public void toJson(Object gson, Object jsonElement, Object jsonWriter) {
+		invoke(toJsonMethod, gson, jsonElement, jsonWriter);
+	}
+
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonWrapperBase.java b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonWrapperBase.java
new file mode 100644
index 0000000000..182011c960
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonWrapperBase.java
@@ -0,0 +1,56 @@
+package com.diffplug.spotless.json.gson;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+public abstract class GsonWrapperBase {
+
+	public static final String INCOMPATIBLE_ERROR_MESSAGE = "There was a problem interacting with Gson; maybe you set an incompatible version?";
+	public static final String FAILED_TO_PARSE_ERROR_MESSAGE = "Failed to parse JSON";
+
+	protected final Class<?> loadClass(ClassLoader classLoader, String className) {
+		try {
+			return classLoader.loadClass(className);
+		} catch (ClassNotFoundException cause) {
+			throw new IllegalStateException(INCOMPATIBLE_ERROR_MESSAGE, cause);
+		}
+	}
+
+	protected final Constructor<?> getConstructor(Class<?> clazz, Class<?>... argumentTypes) {
+		try {
+			return clazz.getConstructor(argumentTypes);
+		} catch (NoSuchMethodException cause) {
+			throw new IllegalStateException(INCOMPATIBLE_ERROR_MESSAGE, cause);
+		}
+	}
+
+	protected final Method getMethod(Class<?> clazz, String name, Class<?>... argumentTypes) {
+		try {
+			return clazz.getMethod(name, argumentTypes);
+		} catch (NoSuchMethodException cause) {
+			throw new IllegalStateException(INCOMPATIBLE_ERROR_MESSAGE, cause);
+		}
+	}
+
+	protected final <T> T newInstance(Constructor<T> constructor, Object... args) {
+		try {
+			return constructor.newInstance(args);
+		} catch (InstantiationException | IllegalAccessException cause) {
+			throw new IllegalStateException(INCOMPATIBLE_ERROR_MESSAGE, cause);
+		} catch (InvocationTargetException cause) {
+			throw new IllegalStateException(FAILED_TO_PARSE_ERROR_MESSAGE, cause.getCause());
+		}
+	}
+
+	protected Object invoke(Method method, Object targetObject, Object... args) {
+		try {
+			return method.invoke(targetObject, args);
+		} catch (IllegalAccessException cause) {
+			throw new IllegalStateException(INCOMPATIBLE_ERROR_MESSAGE, cause);
+		} catch (InvocationTargetException cause) {
+			throw new IllegalStateException(FAILED_TO_PARSE_ERROR_MESSAGE, cause.getCause());
+		}
+	}
+
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/JsonElementWrapper.java b/lib/src/main/java/com/diffplug/spotless/json/gson/JsonElementWrapper.java
new file mode 100644
index 0000000000..a45225b411
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/json/gson/JsonElementWrapper.java
@@ -0,0 +1,27 @@
+package com.diffplug.spotless.json.gson;
+
+import com.diffplug.spotless.JarState;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.util.Set;
+
+public class JsonElementWrapper extends GsonWrapperBase {
+
+	private final Class<?> clazz;
+	private final Method isJsonObjectMethod;
+
+	public JsonElementWrapper(JarState jarState) {
+		this.clazz = loadClass(jarState.getClassLoader(), "com.google.gson.JsonElement");
+		this.isJsonObjectMethod = getMethod(clazz, "isJsonObject");
+	}
+
+	public boolean isJsonObject(Object jsonElement) {
+		return (boolean) invoke(isJsonObjectMethod, jsonElement);
+	}
+
+	public Class<?> getWrappedClass() {
+		return clazz;
+	}
+
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/JsonObjectWrapper.java b/lib/src/main/java/com/diffplug/spotless/json/gson/JsonObjectWrapper.java
new file mode 100644
index 0000000000..7d3151b489
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/json/gson/JsonObjectWrapper.java
@@ -0,0 +1,46 @@
+package com.diffplug.spotless.json.gson;
+
+import com.diffplug.spotless.JarState;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.util.Set;
+
+public class JsonObjectWrapper extends GsonWrapperBase {
+
+	private final Class<?> clazz;
+	private final Constructor<?> constructor;
+	private final Method keySetMethod;
+	private final Method getMethod;
+	private final Method addMethod;
+
+	public JsonObjectWrapper(JarState jarState, JsonElementWrapper jsonElementWrapper) {
+		this.clazz = loadClass(jarState.getClassLoader(), "com.google.gson.JsonObject");
+		this.constructor = getConstructor(clazz);
+		this.keySetMethod = getMethod(clazz, "keySet");
+		this.getMethod = getMethod(clazz, "get", String.class);
+		this.addMethod = getMethod(clazz, "add", String.class, jsonElementWrapper.getWrappedClass());
+	}
+
+	public Object createJsonObject() {
+		return newInstance(constructor);
+	}
+
+	@SuppressWarnings("unchecked")
+	public Set<String> keySet(Object jsonObject) {
+		return (Set<String>) invoke(keySetMethod, jsonObject);
+	}
+
+	public Object get(Object jsonObject, String key) {
+		return invoke(getMethod, jsonObject, key);
+	}
+
+	public void add(Object jsonObject, String key, Object element) {
+		invoke(addMethod, jsonObject, key, element);
+	}
+
+	public Class<?> getWrappedClass() {
+		return clazz;
+	}
+
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/JsonWriterWrapper.java b/lib/src/main/java/com/diffplug/spotless/json/gson/JsonWriterWrapper.java
new file mode 100644
index 0000000000..580e075e77
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/json/gson/JsonWriterWrapper.java
@@ -0,0 +1,33 @@
+package com.diffplug.spotless.json.gson;
+
+import com.diffplug.spotless.JarState;
+
+import java.io.Writer;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+
+public class JsonWriterWrapper extends GsonWrapperBase {
+
+	private final Class<?> clazz;
+	private final Constructor<?> constructor;
+	private final Method setIndentMethod;
+
+	public JsonWriterWrapper(JarState jarState) {
+		this.clazz = loadClass(jarState.getClassLoader(), "com.google.gson.stream.JsonWriter");
+		this.constructor = getConstructor(clazz, Writer.class);
+		this.setIndentMethod = getMethod(clazz, "setIndent", String.class);
+	}
+
+	public Object createJsonWriter(Writer writer) {
+		return newInstance(constructor, writer);
+	}
+
+	public void setIndent(Object jsonWriter, String indent) {
+		invoke(setIndentMethod, jsonWriter, indent);
+	}
+
+	public Class<?> getWrappedClass() {
+		return clazz;
+	}
+
+}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
index e15d395f3b..e3aeaca9d6 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
@@ -19,9 +19,11 @@
 
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.json.JsonSimpleStep;
+import com.diffplug.spotless.json.gson.GsonStep;
 
 public class JsonExtension extends FormatExtension {
 	private static final int DEFAULT_INDENTATION = 4;
+	private static final String DEFAULT_GSON_VERSION = "2.8.9";
 	static final String NAME = "json";
 
 	@Inject
@@ -41,6 +43,10 @@ public SimpleConfig simple() {
 		return new SimpleConfig(DEFAULT_INDENTATION);
 	}
 
+	public GsonConfig gson() {
+		return new GsonConfig();
+	}
+
 	public class SimpleConfig {
 		private int indent;
 
@@ -59,4 +65,39 @@ private FormatterStep createStep() {
 		}
 	}
 
+	public class GsonConfig {
+		private int indentSpaces;
+		private boolean sortByKeys;
+		private String version;
+
+		public GsonConfig() {
+			this.indentSpaces = DEFAULT_INDENTATION;
+			this.sortByKeys = false;
+			this.version = DEFAULT_GSON_VERSION;
+			addStep(createStep());
+		}
+
+		public GsonConfig indentWithSpaces(int indentSpaces) {
+			this.indentSpaces = indentSpaces;
+			replaceStep(createStep());
+			return this;
+		}
+
+		public GsonConfig sortByKeys() {
+			this.sortByKeys = true;
+			replaceStep(createStep());
+			return this;
+		}
+
+		public GsonConfig version(String version) {
+			this.version = version;
+			replaceStep(createStep());
+			return this;
+		}
+
+		private FormatterStep createStep() {
+			return GsonStep.create(indentSpaces, sortByKeys, version, provisioner());
+		}
+	}
+
 }

From ecbbda3113a7955874d206a39d227a1e927f2a20 Mon Sep 17 00:00:00 2001
From: Abel Keszei <keszeiabel@gmail.com>
Date: Sun, 30 Jan 2022 22:21:27 +0100
Subject: [PATCH 0027/2068] add gson support to README

---
 plugin-gradle/README.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index ffc52bd923..b3821d5277 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -595,6 +595,7 @@ spotless {
     simple() // has its own section below
     prettier().config(['parser': 'json']) // see Prettier section below
     eclipseWtp('json') // see Eclipse web tools platform section
+    gson() // has its own section below
   }
 }
 ```
@@ -614,6 +615,22 @@ spotless {
 }
 ```
 
+### Gson
+
+Uses Google Gson to also allow sorting by keys besides custom indentation - useful for i18n files.
+
+```gradle
+spotless {
+  json {
+    target 'src/**/*.json'
+    gson()
+      .indentWithSpaces(6) // optional: specify the number of spaces to use
+      .sortByKeys()        // optional: sort JSON by its keys
+      .version('2.8.1')    // optional: specify version
+  }
+}
+```
+
 <a name="applying-prettier-to-javascript--flow--typescript--css--scss--less--jsx--graphql--yaml--etc"></a>
 
 ## Prettier

From a62ff120995b09ba9f7a018ac01b61ea7466da7c Mon Sep 17 00:00:00 2001
From: Abel Keszei <keszeiabel@gmail.com>
Date: Sat, 12 Feb 2022 18:03:04 +0100
Subject: [PATCH 0028/2068] update unit tests for gson support

---
 .../json/gson/GsonBuilderWrapper.java         |  39 ++
 .../diffplug/spotless/json/gson/GsonStep.java |  45 +-
 .../spotless/json/gson/GsonWrapperBase.java   |   6 +-
 .../spotless/json/gson/JsonObjectWrapper.java |   7 +-
 .../gradle/spotless/JsonExtension.java        |  10 +-
 .../json/cucumberJsonSampleGsonAfter.json     | 660 ++++++++++++++++++
 .../json/cucumberJsonSampleGsonBefore.json    | 660 ++++++++++++++++++
 .../resources/json/escapeHtmlGsonAfter.json   |   4 +
 .../json/escapeHtmlGsonAfterDisabled.json     |   4 +
 .../resources/json/escapeHtmlGsonBefore.json  |   4 +
 .../json/objectWithNullGsonAfter.json         |   4 +
 .../json/objectWithNullGsonBefore.json        |   4 +
 .../main/resources/json/sortByKeysAfter.json  |  19 +
 .../json/sortByKeysAfterDisabled.json         |  19 +
 .../main/resources/json/sortByKeysBefore.json |  19 +
 .../diffplug/spotless/json/GsonStepTest.java  |  85 +++
 .../json/JsonFormatterStepCommonTests.java    |  89 +++
 .../spotless/json/JsonSimpleStepTest.java     | 107 +--
 18 files changed, 1672 insertions(+), 113 deletions(-)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/json/gson/GsonBuilderWrapper.java
 create mode 100644 testlib/src/main/resources/json/cucumberJsonSampleGsonAfter.json
 create mode 100644 testlib/src/main/resources/json/cucumberJsonSampleGsonBefore.json
 create mode 100644 testlib/src/main/resources/json/escapeHtmlGsonAfter.json
 create mode 100644 testlib/src/main/resources/json/escapeHtmlGsonAfterDisabled.json
 create mode 100644 testlib/src/main/resources/json/escapeHtmlGsonBefore.json
 create mode 100644 testlib/src/main/resources/json/objectWithNullGsonAfter.json
 create mode 100644 testlib/src/main/resources/json/objectWithNullGsonBefore.json
 create mode 100644 testlib/src/main/resources/json/sortByKeysAfter.json
 create mode 100644 testlib/src/main/resources/json/sortByKeysAfterDisabled.json
 create mode 100644 testlib/src/main/resources/json/sortByKeysBefore.json
 create mode 100644 testlib/src/test/java/com/diffplug/spotless/json/GsonStepTest.java
 create mode 100644 testlib/src/test/java/com/diffplug/spotless/json/JsonFormatterStepCommonTests.java

diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonBuilderWrapper.java b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonBuilderWrapper.java
new file mode 100644
index 0000000000..1693a5f9da
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonBuilderWrapper.java
@@ -0,0 +1,39 @@
+package com.diffplug.spotless.json.gson;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+
+import com.diffplug.spotless.JarState;
+
+public class GsonBuilderWrapper extends GsonWrapperBase {
+
+	private final Constructor<?> constructor;
+	private final Method serializeNullsMethod;
+	private final Method disableHtmlEscapingMethod;
+	private final Method createMethod;
+
+	public GsonBuilderWrapper(JarState jarState) {
+		Class<?> clazz = loadClass(jarState.getClassLoader(), "com.google.gson.GsonBuilder");
+		this.constructor = getConstructor(clazz);
+		this.serializeNullsMethod = getMethod(clazz, "serializeNulls");
+		this.disableHtmlEscapingMethod = getMethod(clazz, "disableHtmlEscaping");
+		this.createMethod = getMethod(clazz, "create");
+	}
+
+	public Object createGsonBuilder() {
+		return newInstance(constructor);
+	}
+
+	public Object serializeNulls(Object gsonBuilder) {
+		return invoke(serializeNullsMethod, gsonBuilder);
+	}
+
+	public Object disableHtmlEscaping(Object gsonBuilder) {
+		return invoke(disableHtmlEscapingMethod, gsonBuilder);
+	}
+
+	public Object create(Object gsonBuilder) {
+		return invoke(createMethod, gsonBuilder);
+	}
+
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
index 5035953289..40ca84eeb7 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
@@ -14,21 +14,23 @@
 public class GsonStep {
 	private static final String MAVEN_COORDINATES = "com.google.code.gson:gson";
 
-	public static FormatterStep create(int indentSpaces, boolean sortByKeys, String version, Provisioner provisioner) {
+	public static FormatterStep create(int indentSpaces, boolean sortByKeys, boolean escapeHtml, String version, Provisioner provisioner) {
 		Objects.requireNonNull(provisioner, "provisioner cannot be null");
-		return FormatterStep.createLazy("gson", () -> new State(indentSpaces, sortByKeys, version, provisioner), State::toFormatter);
+		return FormatterStep.createLazy("gson", () -> new State(indentSpaces, sortByKeys, escapeHtml, version, provisioner), State::toFormatter);
 	}
 
 	private static final class State implements Serializable {
-		private static final long serialVersionUID = 6540876150977107116L;
+		private static final long serialVersionUID = -1493479043249379485L;
 
 		private final int indentSpaces;
 		private final boolean sortByKeys;
+		private final boolean escapeHtml;
 		private final JarState jarState;
 
-		private State(int indentSpaces, boolean sortByKeys, String version, Provisioner provisioner) throws IOException {
+		private State(int indentSpaces, boolean sortByKeys, boolean escapeHtml, String version, Provisioner provisioner) throws IOException {
 			this.indentSpaces = indentSpaces;
 			this.sortByKeys = sortByKeys;
+			this.escapeHtml = escapeHtml;
 			this.jarState = JarState.from(MAVEN_COORDINATES + ":" + version, provisioner);
 		}
 
@@ -36,20 +38,35 @@ FormatterFunc toFormatter() {
 			JsonWriterWrapper jsonWriterWrapper = new JsonWriterWrapper(jarState);
 			JsonElementWrapper jsonElementWrapper = new JsonElementWrapper(jarState);
 			JsonObjectWrapper jsonObjectWrapper = new JsonObjectWrapper(jarState, jsonElementWrapper);
+			GsonBuilderWrapper gsonBuilderWrapper = new GsonBuilderWrapper(jarState);
 			GsonWrapper gsonWrapper = new GsonWrapper(jarState, jsonElementWrapper, jsonWriterWrapper);
-			Object gson = gsonWrapper.createGson();
+
+			Object gsonBuilder = gsonBuilderWrapper.serializeNulls(gsonBuilderWrapper.createGsonBuilder());
+			if (!escapeHtml) {
+				gsonBuilder = gsonBuilderWrapper.disableHtmlEscaping(gsonBuilder);
+			}
+			Object gson = gsonBuilderWrapper.create(gsonBuilder);
 
 			return inputString -> {
-				Object jsonElement = gsonWrapper.fromJson(gson, inputString, jsonElementWrapper.getWrappedClass());
-				if (sortByKeys && jsonElementWrapper.isJsonObject(jsonElement)) {
-					jsonElement = sortByKeys(jsonObjectWrapper, jsonElementWrapper, jsonElement);
-				}
-				try (StringWriter stringWriter = new StringWriter()) {
-					Object jsonWriter = jsonWriterWrapper.createJsonWriter(stringWriter);
-					jsonWriterWrapper.setIndent(jsonWriter, generateIndent(indentSpaces));
-					gsonWrapper.toJson(gson, jsonElement, jsonWriter);
-					return stringWriter.toString();
+				String result;
+				if (inputString.isEmpty()) {
+					result = "";
+				} else {
+					Object jsonElement = gsonWrapper.fromJson(gson, inputString, jsonElementWrapper.getWrappedClass());
+					if (jsonElement == null) {
+						throw new AssertionError(GsonWrapperBase.FAILED_TO_PARSE_ERROR_MESSAGE);
+					}
+					if (sortByKeys && jsonElementWrapper.isJsonObject(jsonElement)) {
+						jsonElement = sortByKeys(jsonObjectWrapper, jsonElementWrapper, jsonElement);
+					}
+					try (StringWriter stringWriter = new StringWriter()) {
+						Object jsonWriter = jsonWriterWrapper.createJsonWriter(stringWriter);
+						jsonWriterWrapper.setIndent(jsonWriter, generateIndent(indentSpaces));
+						gsonWrapper.toJson(gson, jsonElement, jsonWriter);
+						result = stringWriter + "\n";
+					}
 				}
+				return result;
 			};
 		}
 
diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonWrapperBase.java b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonWrapperBase.java
index 182011c960..31e22d53d0 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonWrapperBase.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonWrapperBase.java
@@ -7,7 +7,7 @@
 public abstract class GsonWrapperBase {
 
 	public static final String INCOMPATIBLE_ERROR_MESSAGE = "There was a problem interacting with Gson; maybe you set an incompatible version?";
-	public static final String FAILED_TO_PARSE_ERROR_MESSAGE = "Failed to parse JSON";
+	public static final String FAILED_TO_PARSE_ERROR_MESSAGE = "Unable to format JSON";
 
 	protected final Class<?> loadClass(ClassLoader classLoader, String className) {
 		try {
@@ -39,7 +39,7 @@ protected final <T> T newInstance(Constructor<T> constructor, Object... args) {
 		} catch (InstantiationException | IllegalAccessException cause) {
 			throw new IllegalStateException(INCOMPATIBLE_ERROR_MESSAGE, cause);
 		} catch (InvocationTargetException cause) {
-			throw new IllegalStateException(FAILED_TO_PARSE_ERROR_MESSAGE, cause.getCause());
+			throw new AssertionError(FAILED_TO_PARSE_ERROR_MESSAGE, cause.getCause());
 		}
 	}
 
@@ -49,7 +49,7 @@ protected Object invoke(Method method, Object targetObject, Object... args) {
 		} catch (IllegalAccessException cause) {
 			throw new IllegalStateException(INCOMPATIBLE_ERROR_MESSAGE, cause);
 		} catch (InvocationTargetException cause) {
-			throw new IllegalStateException(FAILED_TO_PARSE_ERROR_MESSAGE, cause.getCause());
+			throw new AssertionError(FAILED_TO_PARSE_ERROR_MESSAGE, cause.getCause());
 		}
 	}
 
diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/JsonObjectWrapper.java b/lib/src/main/java/com/diffplug/spotless/json/gson/JsonObjectWrapper.java
index 7d3151b489..5485ce2ffc 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/gson/JsonObjectWrapper.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/gson/JsonObjectWrapper.java
@@ -8,14 +8,13 @@
 
 public class JsonObjectWrapper extends GsonWrapperBase {
 
-	private final Class<?> clazz;
 	private final Constructor<?> constructor;
 	private final Method keySetMethod;
 	private final Method getMethod;
 	private final Method addMethod;
 
 	public JsonObjectWrapper(JarState jarState, JsonElementWrapper jsonElementWrapper) {
-		this.clazz = loadClass(jarState.getClassLoader(), "com.google.gson.JsonObject");
+		Class<?> clazz = loadClass(jarState.getClassLoader(), "com.google.gson.JsonObject");
 		this.constructor = getConstructor(clazz);
 		this.keySetMethod = getMethod(clazz, "keySet");
 		this.getMethod = getMethod(clazz, "get", String.class);
@@ -39,8 +38,4 @@ public void add(Object jsonObject, String key, Object element) {
 		invoke(addMethod, jsonObject, key, element);
 	}
 
-	public Class<?> getWrappedClass() {
-		return clazz;
-	}
-
 }
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
index e3aeaca9d6..bce3a68060 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
@@ -68,11 +68,13 @@ private FormatterStep createStep() {
 	public class GsonConfig {
 		private int indentSpaces;
 		private boolean sortByKeys;
+		private boolean escapeHtml;
 		private String version;
 
 		public GsonConfig() {
 			this.indentSpaces = DEFAULT_INDENTATION;
 			this.sortByKeys = false;
+			this.escapeHtml = false;
 			this.version = DEFAULT_GSON_VERSION;
 			addStep(createStep());
 		}
@@ -89,6 +91,12 @@ public GsonConfig sortByKeys() {
 			return this;
 		}
 
+		public GsonConfig escapeHtml() {
+			this.escapeHtml = true;
+			replaceStep(createStep());
+			return this;
+		}
+
 		public GsonConfig version(String version) {
 			this.version = version;
 			replaceStep(createStep());
@@ -96,7 +104,7 @@ public GsonConfig version(String version) {
 		}
 
 		private FormatterStep createStep() {
-			return GsonStep.create(indentSpaces, sortByKeys, version, provisioner());
+			return GsonStep.create(indentSpaces, sortByKeys, escapeHtml, version, provisioner());
 		}
 	}
 
diff --git a/testlib/src/main/resources/json/cucumberJsonSampleGsonAfter.json b/testlib/src/main/resources/json/cucumberJsonSampleGsonAfter.json
new file mode 100644
index 0000000000..07e87bfd38
--- /dev/null
+++ b/testlib/src/main/resources/json/cucumberJsonSampleGsonAfter.json
@@ -0,0 +1,660 @@
+[
+    {
+        "id": "account-holder-withdraws-cash",
+        "tags": [
+            {
+                "name": "@featureTag",
+                "line": 1
+            }
+        ],
+        "description": "This is description of the feature",
+        "name": "1st feature",
+        "keyword": "Feature",
+        "line": 2,
+        "elements": [
+            {
+                "description": "Perfect background",
+                "name": "Activate Credit Card",
+                "keyword": "Background",
+                "line": 7,
+                "steps": [
+                    {
+                        "result": {
+                            "duration": 99107447000,
+                            "status": "passed"
+                        },
+                        "name": "I have a new credit card",
+                        "keyword": "Given ",
+                        "line": 8,
+                        "match": {
+                            "location": "ATMScenario.I_have_a_new_credit_card()"
+                        },
+                        "embeddings": [
+                            {
+                                "mime_type": "image/url",
+                                "data": ""
+                            },
+                            {
+                                "data": "",
+                                "media": {
+                                    "type": "text/plain"
+                                }
+                            }
+                        ]
+                    },
+                    {
+                        "result": {
+                            "duration": 9520000,
+                            "status": "passed"
+                        },
+                        "name": "My credit card is described as follow:",
+                        "keyword": "And ",
+                        "line": 9,
+                        "match": {
+                            "location": "ATMScenario.My_credit_card_is_described_as_follow"
+                        },
+                        "doc_string": {
+                            "content_type": "",
+                            "line": 10,
+                            "value": "{\n\"issuer\": {\n\"name\": \"Real Bank Inc.\",\n\"isn:\": \"RB55800093842N\"\n},\n\"card_number\": \"4896 0215 8478 6325\",\n\"holder\": \"A guy\"\n}"
+                        }
+                    },
+                    {
+                        "result": {
+                            "duration": 7040000,
+                            "status": "passed"
+                        },
+                        "name": "I confirm my pin number",
+                        "keyword": "When ",
+                        "line": 18,
+                        "match": {
+                            "location": "ATMScenario.I_confirm_my_pin_number()"
+                        },
+                        "rows": [
+                            {
+                                "cells": [
+                                    "Müller",
+                                    "Deutschland"
+                                ],
+                                "line": 2
+                            },
+                            {
+                                "cells": [
+                                    "Nováková",
+                                    "Česko"
+                                ],
+                                "line": 3
+                            },
+                            {
+                                "cells": [
+                                    "Kovačević",
+                                    "Hrvatska"
+                                ],
+                                "line": 4
+                            },
+                            {
+                                "cells": [
+                                    "Παπαδόπουλος",
+                                    "Παπαδόπουλος"
+                                ],
+                                "line": 5
+                            },
+                            {
+                                "cells": [
+                                    "罗/羅",
+                                    "中國"
+                                ],
+                                "line": 6
+                            }
+                        ]
+                    },
+                    {
+                        "result": {
+                            "duration": 111111,
+                            "status": "passed"
+                        },
+                        "name": "the card should be activated",
+                        "keyword": "Then ",
+                        "line": 19,
+                        "match": {
+                            "location": "ATMScenario.the_card_should_be_activated()"
+                        }
+                    }
+                ],
+                "type": "background"
+            },
+            {
+                "id": "account-holder-withdraws-cash;account-has-'sufficient-funds';;2",
+                "tags": [
+                    {
+                        "name": "@fast",
+                        "line": 21
+                    },
+                    {
+                        "name": "@featureTag",
+                        "line": 1
+                    },
+                    {
+                        "name": "@checkout",
+                        "line": 21
+                    }
+                ],
+                "description": "Account holder withdraws cash",
+                "name": "Account has <sufficient funds>",
+                "keyword": "Scenario Outline",
+                "line": 33,
+                "steps": [
+                    {
+                        "result": {
+                            "duration": 17007000,
+                            "status": "passed"
+                        },
+                        "name": "the account balance is 100",
+                        "keyword": "Given ",
+                        "line": 23,
+                        "match": {
+                            "arguments": [
+                                {
+                                    "val": "100",
+                                    "offset": 23
+                                }
+                            ],
+                            "location": "ATMScenario.createAccount(int)"
+                        }
+                    },
+                    {
+                        "result": {
+                            "duration": 33444444,
+                            "status": "passed"
+                        },
+                        "name": "the card is valid",
+                        "keyword": "And ",
+                        "line": 24,
+                        "match": {
+                            "arguments": [
+                                {
+                                    "val": "",
+                                    "offset": 0
+                                }
+                            ],
+                            "location": "ATMScenario.createCreditCard()"
+                        }
+                    },
+                    {
+                        "result": {
+                            "duration": 44333333,
+                            "status": "passed"
+                        },
+                        "name": "100 is contained in the machine",
+                        "keyword": "And ",
+                        "line": 25,
+                        "match": {
+                            "arguments": [
+                                {
+                                    "val": "100",
+                                    "offset": 0
+                                }
+                            ],
+                            "location": "ATMScenario.createATM(int)"
+                        },
+                        "matchedColumns": [
+                            1
+                        ]
+                    },
+                    {
+                        "result": {
+                            "duration": 11000001,
+                            "status": "passed"
+                        },
+                        "name": "the Account Holder requests 10, entering PIN 1234",
+                        "keyword": "When ",
+                        "line": 26,
+                        "match": {
+                            "arguments": [
+                                {
+                                    "val": "10",
+                                    "offset": 28
+                                },
+                                {
+                                    "val": "1234",
+                                    "offset": 45
+                                }
+                            ],
+                            "location": "ATMScenario.requestMoney(int)"
+                        },
+                        "matchedColumns": [
+                            2
+                        ]
+                    },
+                    {
+                        "result": {
+                            "duration": 3220000,
+                            "status": "passed"
+                        },
+                        "name": "the ATM should dispense 10 monetary units",
+                        "keyword": "Then ",
+                        "line": 27,
+                        "match": {
+                            "arguments": [
+                                {
+                                    "val": "10",
+                                    "offset": 24
+                                },
+                                {
+                                    "val": "",
+                                    "offset": 0
+                                }
+                            ],
+                            "location": "ATMScenario.checkMoney(int)"
+                        },
+                        "matchedColumns": [
+                            3
+                        ]
+                    },
+                    {
+                        "result": {
+                            "duration": 30000000,
+                            "status": "passed"
+                        },
+                        "name": "the account balance should be 90",
+                        "keyword": "And ",
+                        "line": 28,
+                        "arguments": [
+                            {
+                                "rows": [
+                                    {
+                                        "cells": [
+                                            "max",
+                                            "min"
+                                        ]
+                                    },
+                                    {
+                                        "cells": [
+                                            "20",
+                                            "3"
+                                        ]
+                                    }
+                                ]
+                            }
+                        ],
+                        "match": {
+                            "location": "ATMScenario.checkBalance(int)"
+                        },
+                        "matchedColumns": [
+                            2
+                        ]
+                    }
+                ],
+                "type": "scenario",
+                "after": [
+                    {
+                        "result": {
+                            "duration": 60744700,
+                            "status": "passed",
+                            "error_message": "Completed"
+                        },
+                        "match": {
+                            "location": "MachineFactory.timeout()"
+                        }
+                    }
+                ]
+            }
+        ],
+        "uri": "net/masterthought/example(s)/ATM:東京.feature"
+    },
+    {
+        "id": "account-holder-withdraws-more-cash",
+        "description": "As an Account Holder\nI want to withdraw cash from an ATM,<br/>so that I can get money when the bank is closed",
+        "name": "Second feature",
+        "keyword": "Feature",
+        "line": 1,
+        "elements": [
+            {
+                "id": "account-holder-withdraws-more-cash;account-has-sufficient-funds;;2",
+                "tags": [
+                    {
+                        "name": "@checkout",
+                        "line": 101
+                    }
+                ],
+                "before": [
+                    {
+                        "output": [
+                            "System version: beta3"
+                        ],
+                        "result": {
+                            "duration": 10744700,
+                            "status": "passed"
+                        },
+                        "match": {
+                            "location": "MachineFactory.findCashMachine()"
+                        }
+                    },
+                    {
+                        "result": {
+                            "duration": 1000001,
+                            "status": "failed",
+                            "error_message": "   \n"
+                        },
+                        "match": {
+                            "location": "MachineFactory.wait()"
+                        }
+                    }
+                ],
+                "description": "Account holder withdraws more cash",
+                "name": "Account may not have sufficient funds",
+                "keyword": "Scenario Outline",
+                "line": 19,
+                "steps": [
+                    {
+                        "result": {
+                            "status": "undefined"
+                        },
+                        "name": "the account balance is 100",
+                        "keyword": "Given ",
+                        "line": 7,
+                        "match": {
+                            "arguments": [
+                                {
+                                    "val": "100",
+                                    "offset": 23
+                                },
+                                {}
+                            ]
+                        },
+                        "matchedColumns": [
+                            0
+                        ],
+                        "before": [
+                            {
+                                "embeddings": [
+                                    {
+                                        "mime_type": "text/plain",
+                                        "data": ""
+                                    }
+                                ],
+                                "result": {
+                                    "duration": 410802047,
+                                    "status": "failed"
+                                }
+                            }
+                        ]
+                    },
+                    {
+                        "result": {
+                            "duration": 13000,
+                            "status": "passed"
+                        },
+                        "name": "the card is valid",
+                        "keyword": "And ",
+                        "line": 8,
+                        "match": {
+                            "arguments": [
+                                {
+                                    "val": "",
+                                    "offset": 17
+                                }
+                            ],
+                            "location": "ATMScenario.createCreditCard()"
+                        },
+                        "after": [
+                            {
+                                "result": {
+                                    "duration": 410802048,
+                                    "status": "passed"
+                                },
+                                "match": {
+                                    "location": "StepHook.afterStep()"
+                                }
+                            }
+                        ]
+                    },
+                    {
+                        "result": {
+                            "duration": 36000,
+                            "status": "passed"
+                        },
+                        "name": "the machine contains 100",
+                        "keyword": "And ",
+                        "line": 9,
+                        "match": {
+                            "arguments": [
+                                {
+                                    "val": "100",
+                                    "offset": 21
+                                }
+                            ],
+                            "location": "ATMScenario.createATM(int)"
+                        },
+                        "matchedColumns": [
+                            1
+                        ]
+                    },
+                    {
+                        "result": {
+                            "duration": 32000,
+                            "status": "passed"
+                        },
+                        "name": "the Account Holder requests 20",
+                        "keyword": "When ",
+                        "line": 10,
+                        "match": {
+                            "arguments": [
+                                {
+                                    "val": "20",
+                                    "offset": 28
+                                }
+                            ],
+                            "location": "ATMScenario.requestMoney(int)"
+                        },
+                        "matchedColumns": [
+                            2
+                        ]
+                    },
+                    {
+                        "result": {
+                            "duration": 36000,
+                            "status": "passed"
+                        },
+                        "name": "the ATM should dispense 20",
+                        "keyword": "Then ",
+                        "line": 11,
+                        "match": {
+                            "arguments": [
+                                {
+                                    "val": "20",
+                                    "offset": 24
+                                }
+                            ],
+                            "location": "ATMScenario.checkMoney(int)"
+                        },
+                        "matchedColumns": [
+                            3
+                        ]
+                    },
+                    {
+                        "result": {
+                            "duration": 1933000,
+                            "status": "skipped",
+                            "error_message": "java.lang.AssertionError: \nExpected: is <80>\n     got: <90>\n\n\tat org.junit.Assert.assertThat(Assert.java:780)\n\tat org.junit.Assert.assertThat(Assert.java:738)\n\tat net.masterthought.example.ATMScenario.checkBalance(ATMScenario.java:69)\n\tat ✽.And the account balance should be 90(net/masterthought/example/ATMK.feature:12)\n"
+                        },
+                        "name": "the account balance should be 90",
+                        "keyword": "And ",
+                        "line": 12,
+                        "match": {
+                            "arguments": [
+                                {
+                                    "val": "90",
+                                    "offset": 30
+                                }
+                            ],
+                            "location": "ATMScenario.checkBalance(int)"
+                        },
+                        "matchedColumns": [
+                            4
+                        ],
+                        "embeddings": [
+                            {
+                                "mime_type": "image/png",
+                                "data": "",
+                                "name": "Some PNG image"
+                            },
+                            {
+                                "mime_type": "image/jpeg",
+                                "data": ""
+                            },
+                            {
+                                "mime_type": "text/plain",
+                                "data": ""
+                            },
+                            {
+                                "mime_type": "text/html",
+                                "data": "",
+                                "name": "Some HTML embedding"
+                            },
+                            {
+                                "mime_type": "text/xml",
+                                "data": ""
+                            },
+                            {
+                                "mime_type": "image/svg+xml",
+                                "data": ""
+                            },
+                            {
+                                "mime_type": "js",
+                                "data": ""
+                            },
+                            {
+                                "mime_type": "text/plain",
+                                "data": ""
+                            },
+                            {
+                                "mime_type": "text/csv",
+                                "data": ""
+                            },
+                            {
+                                "mime_type": "video/mp4",
+                                "data": ""
+                            }
+                        ]
+                    },
+                    {
+                        "result": {
+                            "status": "pending"
+                        },
+                        "name": "the card should be returned",
+                        "keyword": "And ",
+                        "line": 13,
+                        "match": {
+                            "location": "ATMScenario.cardShouldBeReturned()"
+                        },
+                        "embeddings": [
+                            {
+                                "mime_type": "application/json",
+                                "data": ""
+                            }
+                        ]
+                    },
+                    {
+                        "result": {
+                            "status": "skipped"
+                        },
+                        "name": "its not implemented",
+                        "keyword": "And ",
+                        "line": 14,
+                        "match": {
+                            "location": "ATMScenario.its_not_implemented()"
+                        },
+                        "output": [
+                            [
+                                "Could not connect to the server @Rocky@"
+                            ],
+                            [
+                                "Could not connect to the server @Mike@"
+                            ]
+                        ]
+                    },
+                    {
+                        "result": {
+                            "status": "failed"
+                        },
+                        "name": "the card is valid",
+                        "keyword": "And ",
+                        "line": 15,
+                        "match": {
+                            "location": "ATMScenario.createCreditCard()"
+                        },
+                        "output": [
+                            "Checkpoints",
+                            232
+                        ]
+                    },
+                    {
+                        "result": {
+                            "duration": 90000000,
+                            "status": "ambiguous"
+                        },
+                        "name": "the card should be returned",
+                        "keyword": "And ",
+                        "line": 29,
+                        "match": {
+                            "location": "ATMScenario.cardShouldBeReturned()"
+                        }
+                    }
+                ],
+                "type": "scenario",
+                "after": [
+                    {
+                        "result": {
+                            "duration": 64700000,
+                            "status": "undefined",
+                            "error_message": "Undefined step"
+                        },
+                        "match": {
+                            "location": "any.error()"
+                        },
+                        "embeddings": [
+                            {
+                                "mime_type": "image/png",
+                                "data": ""
+                            }
+                        ]
+                    }
+                ]
+            },
+            {
+                "id": "account-holder-withdraws-more-cash;clean-up",
+                "name": "Clean-up",
+                "keyword": "Scenario",
+                "line": 31,
+                "steps": [
+                    {
+                        "result": {
+                            "duration": 560000,
+                            "status": "passed"
+                        },
+                        "name": "Stream closing",
+                        "keyword": "Given ",
+                        "line": 32
+                    }
+                ],
+                "type": "scenario"
+            },
+            {
+                "id": "undefined-result",
+                "name": "This step has no result...",
+                "keyword": "Scenario",
+                "line": 35,
+                "steps": [
+                    {
+                        "name": " - even it should",
+                        "keyword": "Given ",
+                        "line": 36
+                    }
+                ],
+                "type": "scenario"
+            }
+        ],
+        "uri": "net/masterthought/example/ATMK.feature"
+    }
+]
diff --git a/testlib/src/main/resources/json/cucumberJsonSampleGsonBefore.json b/testlib/src/main/resources/json/cucumberJsonSampleGsonBefore.json
new file mode 100644
index 0000000000..8250630cf7
--- /dev/null
+++ b/testlib/src/main/resources/json/cucumberJsonSampleGsonBefore.json
@@ -0,0 +1,660 @@
+[
+    {
+        "id": "account-holder-withdraws-cash",
+        "tags": [
+            {
+                "name": "@featureTag",
+                "line": 1
+            }
+        ],
+        "description": "This is description of the feature",
+        "name": "1st feature",
+        "keyword": "Feature",
+        "line": 2,
+        "elements": [
+            {
+                "description": "Perfect background",
+                "name": "Activate Credit Card",
+                "keyword": "Background",
+                "line": 7,
+                "steps": [
+                    {
+                        "result": {
+                            "duration": 99107447000,
+                            "status": "passed"
+                        },
+                        "name": "I have a new credit card",
+                        "keyword": "Given ",
+                        "line": 8,
+                        "match": {
+                            "location": "ATMScenario.I_have_a_new_credit_card()"
+                        },
+                        "embeddings": [
+                            {
+                                "mime_type": "image/url",
+                                "data": ""
+                            },
+                            {
+                                "data": "",
+                                "media": {
+                                    "type": "text/plain"
+                                }
+                            }
+                        ]
+                    },
+                    {
+                        "result": {
+                            "duration": 9520000,
+                            "status": "passed"
+                        },
+                        "name": "My credit card is described as follow:",
+                        "keyword": "And ",
+                        "line": 9,
+                        "match": {
+                            "location": "ATMScenario.My_credit_card_is_described_as_follow"
+                        },
+                        "doc_string": {
+                            "content_type": "",
+                            "line": 10,
+                            "value": "{\n\"issuer\": {\n\"name\": \"Real Bank Inc.\",\n\"isn:\": \"RB55800093842N\"\n},\n\"card_number\": \"4896 0215 8478 6325\",\n\"holder\": \"A guy\"\n}"
+                        }
+                    },
+                    {
+                        "result": {
+                            "duration": 7040000,
+                            "status": "passed"
+                        },
+                        "name": "I confirm my pin number",
+                        "keyword": "When ",
+                        "line": 18,
+                        "match": {
+                            "location": "ATMScenario.I_confirm_my_pin_number()"
+                        },
+                        "rows": [
+                            {
+                                "cells": [
+                                    "Müller",
+                                    "Deutschland"
+                                ],
+                                "line": 2
+                            },
+                            {
+                                "cells": [
+                                    "Nováková",
+                                    "Česko"
+                                ],
+                                "line": 3
+                            },
+                            {
+                                "cells": [
+                                    "Kovačević",
+                                    "Hrvatska"
+                                ],
+                                "line": 4
+                            },
+                            {
+                                "cells": [
+                                    "Παπαδόπουλος",
+                                    "Παπαδόπουλος"
+                                ],
+                                "line": 5
+                            },
+                            {
+                                "cells": [
+                                    "罗/羅",
+                                    "中國"
+                                ],
+                                "line": 6
+                            }
+                        ]
+                    },
+                    {
+                        "result": {
+                            "duration": 111111,
+                            "status": "passed"
+                        },
+                        "name": "the card should be activated",
+                        "keyword": "Then ",
+                        "line": 19,
+                        "match": {
+                            "location": "ATMScenario.the_card_should_be_activated()"
+                        }
+                    }
+                ],
+                "type": "background"
+            },
+            {
+                "id": "account-holder-withdraws-cash;account-has-\u0027sufficient-funds\u0027;;2",
+                "tags": [
+                    {
+                        "name": "@fast",
+                        "line": 21
+                    },
+                    {
+                        "name": "@featureTag",
+                        "line": 1
+                    },
+                    {
+                        "name": "@checkout",
+                        "line": 21
+                    }
+                ],
+                "description": "Account holder withdraws cash",
+                "name": "Account has <sufficient funds>",
+                "keyword": "Scenario Outline",
+                "line": 33,
+                "steps": [
+                    {
+                        "result": {
+                            "duration": 17007000,
+                            "status": "passed"
+                        },
+                        "name": "the account balance is 100",
+                        "keyword": "Given ",
+                        "line": 23,
+                        "match": {
+                            "arguments": [
+                                {
+                                    "val": "100",
+                                    "offset": 23
+                                }
+                            ],
+                            "location": "ATMScenario.createAccount(int)"
+                        }
+                    },
+                    {
+                        "result": {
+                            "duration": 33444444,
+                            "status": "passed"
+                        },
+                        "name": "the card is valid",
+                        "keyword": "And ",
+                        "line": 24,
+                        "match": {
+                            "arguments": [
+                                {
+                                    "val": "",
+                                    "offset": 0
+                                }
+                            ],
+                            "location": "ATMScenario.createCreditCard()"
+                        }
+                    },
+                    {
+                        "result": {
+                            "duration": 44333333,
+                            "status": "passed"
+                        },
+                        "name": "100 is contained in the machine",
+                        "keyword": "And ",
+                        "line": 25,
+                        "match": {
+                            "arguments": [
+                                {
+                                    "val": "100",
+                                    "offset": 0
+                                }
+                            ],
+                            "location": "ATMScenario.createATM(int)"
+                        },
+                        "matchedColumns": [
+                            1
+                        ]
+                    },
+                    {
+                        "result": {
+                            "duration": 11000001,
+                            "status": "passed"
+                        },
+                        "name": "the Account Holder requests 10, entering PIN 1234",
+                        "keyword": "When ",
+                        "line": 26,
+                        "match": {
+                            "arguments": [
+                                {
+                                    "val": "10",
+                                    "offset": 28
+                                },
+                                {
+                                    "val": "1234",
+                                    "offset": 45
+                                }
+                            ],
+                            "location": "ATMScenario.requestMoney(int)"
+                        },
+                        "matchedColumns": [
+                            2
+                        ]
+                    },
+                    {
+                        "result": {
+                            "duration": 3220000,
+                            "status": "passed"
+                        },
+                        "name": "the ATM should dispense 10 monetary units",
+                        "keyword": "Then ",
+                        "line": 27,
+                        "match": {
+                            "arguments": [
+                                {
+                                    "val": "10",
+                                    "offset": 24
+                                },
+                                {
+                                    "val": "",
+                                    "offset": 0
+                                }
+                            ],
+                            "location": "ATMScenario.checkMoney(int)"
+                        },
+                        "matchedColumns": [
+                            3
+                        ]
+                    },
+                    {
+                        "result": {
+                            "duration": 30000000,
+                            "status": "passed"
+                        },
+                        "name": "the account balance should be 90",
+                        "keyword": "And ",
+                        "line": 28,
+                        "arguments": [
+                            {
+                                "rows": [
+                                    {
+                                        "cells": [
+                                            "max",
+                                            "min"
+                                        ]
+                                    },
+                                    {
+                                        "cells": [
+                                            "20",
+                                            "3"
+                                        ]
+                                    }
+                                ]
+                            }
+                        ],
+                        "match": {
+                            "location": "ATMScenario.checkBalance(int)"
+                        },
+                        "matchedColumns": [
+                            2
+                        ]
+                    }
+                ],
+                "type": "scenario",
+                "after": [
+                    {
+                        "result": {
+                            "duration": 60744700,
+                            "status": "passed",
+                            "error_message": "Completed"
+                        },
+                        "match": {
+                            "location": "MachineFactory.timeout()"
+                        }
+                    }
+                ]
+            }
+        ],
+        "uri": "net/masterthought/example(s)/ATM:東京.feature"
+    },
+    {
+        "id": "account-holder-withdraws-more-cash",
+        "description": "As an Account Holder\nI want to withdraw cash from an ATM,<br/>so that I can get money when the bank is closed",
+        "name": "Second feature",
+        "keyword": "Feature",
+        "line": 1,
+        "elements": [
+            {
+                "id": "account-holder-withdraws-more-cash;account-has-sufficient-funds;;2",
+                "tags": [
+                    {
+                        "name": "@checkout",
+                        "line": 101
+                    }
+                ],
+                "before": [
+                    {
+                        "output": [
+                            "System version: beta3"
+                        ],
+                        "result": {
+                            "duration": 10744700,
+                            "status": "passed"
+                        },
+                        "match": {
+                            "location": "MachineFactory.findCashMachine()"
+                        }
+                    },
+                    {
+                        "result": {
+                            "duration": 1000001,
+                            "status": "failed",
+                            "error_message": "   \n"
+                        },
+                        "match": {
+                            "location": "MachineFactory.wait()"
+                        }
+                    }
+                ],
+                "description": "Account holder withdraws more cash",
+                "name": "Account may not have sufficient funds",
+                "keyword": "Scenario Outline",
+                "line": 19,
+                "steps": [
+                    {
+                        "result": {
+                            "status": "undefined"
+                        },
+                        "name": "the account balance is 100",
+                        "keyword": "Given ",
+                        "line": 7,
+                        "match": {
+                            "arguments": [
+                                {
+                                    "val": "100",
+                                    "offset": 23
+                                },
+                                {}
+                            ]
+                        },
+                        "matchedColumns": [
+                            0
+                        ],
+                        "before": [
+                            {
+                                "embeddings": [
+                                    {
+                                        "mime_type": "text/plain",
+                                        "data": ""
+                                    }
+                                ],
+                                "result": {
+                                    "duration": 410802047,
+                                    "status": "failed"
+                                }
+                            }
+                        ]
+                    },
+                    {
+                        "result": {
+                            "duration": 13000,
+                            "status": "passed"
+                        },
+                        "name": "the card is valid",
+                        "keyword": "And ",
+                        "line": 8,
+                        "match": {
+                            "arguments": [
+                                {
+                                    "val": "",
+                                    "offset": 17
+                                }
+                            ],
+                            "location": "ATMScenario.createCreditCard()"
+                        },
+                        "after": [
+                            {
+                                "result": {
+                                    "duration": 410802048,
+                                    "status": "passed"
+                                },
+                                "match": {
+                                    "location": "StepHook.afterStep()"
+                                }
+                            }
+                        ]
+                    },
+                    {
+                        "result": {
+                            "duration": 36000,
+                            "status": "passed"
+                        },
+                        "name": "the machine contains 100",
+                        "keyword": "And ",
+                        "line": 9,
+                        "match": {
+                            "arguments": [
+                                {
+                                    "val": "100",
+                                    "offset": 21
+                                }
+                            ],
+                            "location": "ATMScenario.createATM(int)"
+                        },
+                        "matchedColumns": [
+                            1
+                        ]
+                    },
+                    {
+                        "result": {
+                            "duration": 32000,
+                            "status": "passed"
+                        },
+                        "name": "the Account Holder requests 20",
+                        "keyword": "When ",
+                        "line": 10,
+                        "match": {
+                            "arguments": [
+                                {
+                                    "val": "20",
+                                    "offset": 28
+                                }
+                            ],
+                            "location": "ATMScenario.requestMoney(int)"
+                        },
+                        "matchedColumns": [
+                            2
+                        ]
+                    },
+                    {
+                        "result": {
+                            "duration": 36000,
+                            "status": "passed"
+                        },
+                        "name": "the ATM should dispense 20",
+                        "keyword": "Then ",
+                        "line": 11,
+                        "match": {
+                            "arguments": [
+                                {
+                                    "val": "20",
+                                    "offset": 24
+                                }
+                            ],
+                            "location": "ATMScenario.checkMoney(int)"
+                        },
+                        "matchedColumns": [
+                            3
+                        ]
+                    },
+                    {
+                        "result": {
+                            "duration": 1933000,
+                            "status": "skipped",
+                            "error_message": "java.lang.AssertionError: \nExpected: is \u003c80\u003e\n     got: \u003c90\u003e\n\n\tat org.junit.Assert.assertThat(Assert.java:780)\n\tat org.junit.Assert.assertThat(Assert.java:738)\n\tat net.masterthought.example.ATMScenario.checkBalance(ATMScenario.java:69)\n\tat ✽.And the account balance should be 90(net/masterthought/example/ATMK.feature:12)\n"
+                        },
+                        "name": "the account balance should be 90",
+                        "keyword": "And ",
+                        "line": 12,
+                        "match": {
+                            "arguments": [
+                                {
+                                    "val": "90",
+                                    "offset": 30
+                                }
+                            ],
+                            "location": "ATMScenario.checkBalance(int)"
+                        },
+                        "matchedColumns": [
+                            4
+                        ],
+                        "embeddings": [
+                            {
+                                "mime_type": "image/png",
+                                "data": "",
+                                "name": "Some PNG image"
+                            },
+                            {
+                                "mime_type": "image/jpeg",
+                                "data": ""
+                            },
+                            {
+                                "mime_type": "text/plain",
+                                "data": ""
+                            },
+                            {
+                                "mime_type": "text/html",
+                                "data": "",
+                                "name": "Some HTML embedding"
+                            },
+                            {
+                                "mime_type": "text/xml",
+                                "data": ""
+                            },
+                            {
+                                "mime_type": "image/svg+xml",
+                                "data": ""
+                            },
+                            {
+                                "mime_type": "js",
+                                "data": ""
+                            },
+                            {
+                              "mime_type": "text/plain",
+                              "data": ""
+                            },
+                            {
+                                "mime_type": "text/csv",
+                                "data": ""
+                            },
+                            {
+                                "mime_type": "video/mp4",
+                                "data": ""
+                            }
+                        ]
+                    },
+                    {
+                        "result": {
+                            "status": "pending"
+                        },
+                        "name": "the card should be returned",
+                        "keyword": "And ",
+                        "line": 13,
+                        "match": {
+                            "location": "ATMScenario.cardShouldBeReturned()"
+                        },
+                        "embeddings": [
+                            {
+                                "mime_type": "application/json",
+                                "data": ""
+                            }
+                        ]
+                    },
+                    {
+                        "result": {
+                            "status": "skipped"
+                        },
+                        "name": "its not implemented",
+                        "keyword": "And ",
+                        "line": 14,
+                        "match": {
+                            "location": "ATMScenario.its_not_implemented()"
+                        },
+                        "output": [
+                            [
+                                "Could not connect to the server @Rocky@"
+                            ],
+                            [
+                                "Could not connect to the server @Mike@"
+                            ]
+                        ]
+                    },
+                    {
+                        "result": {
+                            "status": "failed"
+                        },
+                        "name": "the card is valid",
+                        "keyword": "And ",
+                        "line": 15,
+                        "match": {
+                            "location": "ATMScenario.createCreditCard()"
+                        },
+                        "output": [
+                            "Checkpoints",
+                            232
+                        ]
+                    },
+                    {
+                        "result": {
+                            "duration": 90000000,
+                            "status": "ambiguous"
+                        },
+                        "name": "the card should be returned",
+                        "keyword": "And ",
+                        "line": 29,
+                        "match": {
+                            "location": "ATMScenario.cardShouldBeReturned()"
+                        }
+                    }
+                ],
+                "type": "scenario",
+                "after": [
+                    {
+                        "result": {
+                            "duration": 64700000,
+                            "status": "undefined",
+                            "error_message": "Undefined step"
+                        },
+                        "match": {
+                            "location": "any.error()"
+                        },
+                        "embeddings": [
+                            {
+                                "mime_type": "image/png",
+                                "data": ""
+                            }
+                        ]
+                    }
+                ]
+            },
+            {
+                "id": "account-holder-withdraws-more-cash;clean-up",
+                "name": "Clean-up",
+                "keyword": "Scenario",
+                "line": 31,
+                "steps": [
+                    {
+                        "result": {
+                            "duration": 560000,
+                            "status": "passed"
+                        },
+                        "name": "Stream closing",
+                        "keyword": "Given ",
+                        "line": 32
+                    }
+                ],
+                "type": "scenario"
+            },
+            {
+                "id": "undefined-result",
+                "name": "This step has no result...",
+                "keyword": "Scenario",
+                "line": 35,
+                "steps": [
+                    {
+                        "name": " - even it should",
+                        "keyword": "Given ",
+                        "line": 36
+                    }
+                ],
+                "type": "scenario"
+            }
+        ],
+        "uri": "net/masterthought/example/ATMK.feature"
+    }
+]
diff --git a/testlib/src/main/resources/json/escapeHtmlGsonAfter.json b/testlib/src/main/resources/json/escapeHtmlGsonAfter.json
new file mode 100644
index 0000000000..f83692da2a
--- /dev/null
+++ b/testlib/src/main/resources/json/escapeHtmlGsonAfter.json
@@ -0,0 +1,4 @@
+{
+    "escapedHtml": "\u003ca href\u003d\u0027https://www.google.com/search?q\u003ddiffplug-spotless\u0026tbm\u003disch\u0027\u003eSee some pictures!\u003c\\a\u003e",
+    "rawHtml": "\u003ca href\u003d\u0027https://www.google.com/search?q\u003ddiffplug-spotless\u0026tbm\u003disch\u0027\u003eSee some pictures!\u003c\\a\u003e"
+}
diff --git a/testlib/src/main/resources/json/escapeHtmlGsonAfterDisabled.json b/testlib/src/main/resources/json/escapeHtmlGsonAfterDisabled.json
new file mode 100644
index 0000000000..fe033341f8
--- /dev/null
+++ b/testlib/src/main/resources/json/escapeHtmlGsonAfterDisabled.json
@@ -0,0 +1,4 @@
+{
+    "escapedHtml": "<a href='https://www.google.com/search?q=diffplug-spotless&tbm=isch'>See some pictures!<\\a>",
+    "rawHtml": "<a href='https://www.google.com/search?q=diffplug-spotless&tbm=isch'>See some pictures!<\\a>"
+}
diff --git a/testlib/src/main/resources/json/escapeHtmlGsonBefore.json b/testlib/src/main/resources/json/escapeHtmlGsonBefore.json
new file mode 100644
index 0000000000..400e862d99
--- /dev/null
+++ b/testlib/src/main/resources/json/escapeHtmlGsonBefore.json
@@ -0,0 +1,4 @@
+{
+    "escapedHtml": "\u003ca href\u003d\u0027https://www.google.com/search?q\u003ddiffplug-spotless\u0026tbm\u003disch\u0027\u003eSee some pictures!\u003c\\a\u003e",
+    "rawHtml": "<a href='https://www.google.com/search?q=diffplug-spotless&tbm=isch'>See some pictures!<\\a>"
+}
diff --git a/testlib/src/main/resources/json/objectWithNullGsonAfter.json b/testlib/src/main/resources/json/objectWithNullGsonAfter.json
new file mode 100644
index 0000000000..368632dd8a
--- /dev/null
+++ b/testlib/src/main/resources/json/objectWithNullGsonAfter.json
@@ -0,0 +1,4 @@
+{
+    "value": null,
+    "another": 1
+}
diff --git a/testlib/src/main/resources/json/objectWithNullGsonBefore.json b/testlib/src/main/resources/json/objectWithNullGsonBefore.json
new file mode 100644
index 0000000000..f68567c97c
--- /dev/null
+++ b/testlib/src/main/resources/json/objectWithNullGsonBefore.json
@@ -0,0 +1,4 @@
+{
+"value": null,
+"another": 1
+}
diff --git a/testlib/src/main/resources/json/sortByKeysAfter.json b/testlib/src/main/resources/json/sortByKeysAfter.json
new file mode 100644
index 0000000000..c4a48de2f2
--- /dev/null
+++ b/testlib/src/main/resources/json/sortByKeysAfter.json
@@ -0,0 +1,19 @@
+{
+    "A": 1,
+    "X": 2,
+    "_arraysNotSorted": [
+        3,
+        2,
+        1
+    ],
+    "a": 3,
+    "c": 4,
+    "x": 5,
+    "z": {
+        "A": 1,
+        "X": 2,
+        "a": 3,
+        "c": 4,
+        "x": 5
+    }
+}
diff --git a/testlib/src/main/resources/json/sortByKeysAfterDisabled.json b/testlib/src/main/resources/json/sortByKeysAfterDisabled.json
new file mode 100644
index 0000000000..de7462bb98
--- /dev/null
+++ b/testlib/src/main/resources/json/sortByKeysAfterDisabled.json
@@ -0,0 +1,19 @@
+{
+    "z": {
+        "c": 4,
+        "x": 5,
+        "X": 2,
+        "A": 1,
+        "a": 3
+    },
+    "c": 4,
+    "x": 5,
+    "X": 2,
+    "A": 1,
+    "a": 3,
+    "_arraysNotSorted": [
+        3,
+        2,
+        1
+    ]
+}
diff --git a/testlib/src/main/resources/json/sortByKeysBefore.json b/testlib/src/main/resources/json/sortByKeysBefore.json
new file mode 100644
index 0000000000..de7462bb98
--- /dev/null
+++ b/testlib/src/main/resources/json/sortByKeysBefore.json
@@ -0,0 +1,19 @@
+{
+    "z": {
+        "c": 4,
+        "x": 5,
+        "X": 2,
+        "A": 1,
+        "a": 3
+    },
+    "c": 4,
+    "x": 5,
+    "X": 2,
+    "A": 1,
+    "a": 3,
+    "_arraysNotSorted": [
+        3,
+        2,
+        1
+    ]
+}
diff --git a/testlib/src/test/java/com/diffplug/spotless/json/GsonStepTest.java b/testlib/src/test/java/com/diffplug/spotless/json/GsonStepTest.java
new file mode 100644
index 0000000000..80fde970c3
--- /dev/null
+++ b/testlib/src/test/java/com/diffplug/spotless/json/GsonStepTest.java
@@ -0,0 +1,85 @@
+package com.diffplug.spotless.json;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.Provisioner;
+
+import com.diffplug.spotless.StepHarness;
+import com.diffplug.spotless.TestProvisioner;
+import com.diffplug.spotless.json.gson.GsonStep;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class GsonStepTest extends JsonFormatterStepCommonTests {
+
+	private static final String DEFAULT_VERSION = "2.8.9";
+
+	@Test
+	void handlesComplexNestedObject() throws Exception {
+		doWithResource("cucumberJsonSampleGson");
+	}
+
+	@Test
+	void handlesObjectWithNull() throws Exception {
+		doWithResource("objectWithNullGson");
+	}
+
+	@Test
+	void handlesInvalidJson() {
+		assertThatThrownBy(() -> doWithResource("invalidJson"))
+			.isInstanceOf(AssertionError.class)
+			.hasMessage("Unable to format JSON")
+			.hasRootCauseMessage("End of input at line 3 column 1 path $.a");
+	}
+
+	@Test
+	void handlesNotJson() {
+		assertThatThrownBy(() -> doWithResource("notJson"))
+			.isInstanceOf(AssertionError.class)
+			.hasMessage("Unable to format JSON")
+			.hasNoCause();
+	}
+
+	@Test
+	void handlesSortingWhenSortByKeyEnabled() throws Exception {
+		FormatterStep step = GsonStep.create(INDENT, true, false, DEFAULT_VERSION, TestProvisioner.mavenCentral());
+		StepHarness stepHarness = StepHarness.forStep(step);
+		stepHarness.testResource("json/sortByKeysBefore.json", "json/sortByKeysAfter.json");
+	}
+
+	@Test
+	void doesNoSortingWhenSortByKeyDisabled() throws Exception {
+		FormatterStep step = GsonStep.create(INDENT, false, false, DEFAULT_VERSION, TestProvisioner.mavenCentral());
+		StepHarness.forStep(step)
+			.testResource("json/sortByKeysBefore.json", "json/sortByKeysAfterDisabled.json");
+	}
+
+	@Test
+	void handlesHtmlEscapeWhenEnabled() throws Exception {
+		FormatterStep step = GsonStep.create(INDENT, false, true, DEFAULT_VERSION, TestProvisioner.mavenCentral());
+		StepHarness.forStep(step)
+			.testResource("json/escapeHtmlGsonBefore.json", "json/escapeHtmlGsonAfter.json");
+	}
+
+	@Test
+	void writesRawHtmlWhenHtmlEscapeDisabled() throws Exception {
+		FormatterStep step = GsonStep.create(INDENT, false, false, DEFAULT_VERSION, TestProvisioner.mavenCentral());
+		StepHarness.forStep(step)
+			.testResource("json/escapeHtmlGsonBefore.json", "json/escapeHtmlGsonAfterDisabled.json");
+	}
+
+	@Test
+	void handlesVersionIncompatibility() {
+		FormatterStep step = GsonStep.create(INDENT, false, false, "1.7", TestProvisioner.mavenCentral());
+		StepHarness stepHarness = StepHarness.forStep(step);
+		assertThatThrownBy(() -> stepHarness.testResource("json/cucumberJsonSampleGsonBefore.json", "json/cucumberJsonSampleGsonAfter.json"))
+			.isInstanceOf(IllegalStateException.class)
+			.hasMessage("There was a problem interacting with Gson; maybe you set an incompatible version?");
+	}
+
+	@Override
+	protected FormatterStep createFormatterStep(int indent, Provisioner provisioner) {
+		return GsonStep.create(indent, false, false, DEFAULT_VERSION, provisioner);
+	}
+}
diff --git a/testlib/src/test/java/com/diffplug/spotless/json/JsonFormatterStepCommonTests.java b/testlib/src/test/java/com/diffplug/spotless/json/JsonFormatterStepCommonTests.java
new file mode 100644
index 0000000000..dd8d9ba69a
--- /dev/null
+++ b/testlib/src/test/java/com/diffplug/spotless/json/JsonFormatterStepCommonTests.java
@@ -0,0 +1,89 @@
+package com.diffplug.spotless.json;
+
+import com.diffplug.spotless.*;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public abstract class JsonFormatterStepCommonTests {
+
+	protected static final int INDENT = 4;
+
+	@Test
+	void cannotProvideNullProvisioner() {
+		assertThatThrownBy(() -> createFormatterStep(INDENT, null))
+			.isInstanceOf(NullPointerException.class)
+			.hasMessage("provisioner cannot be null");
+	}
+
+	@Test
+	void handlesNestedObject() throws Exception {
+		doWithResource("nestedObject");
+	}
+
+	@Test
+	void handlesSingletonArray() throws Exception {
+		doWithResource("singletonArray");
+	}
+
+	@Test
+	void handlesEmptyFile() throws Exception {
+		doWithResource("empty");
+	}
+
+	@Test
+	void canSetCustomIndentationLevel() throws Exception {
+		FormatterStep step = createFormatterStep(6, TestProvisioner.mavenCentral());
+		StepHarness stepHarness = StepHarness.forStep(step);
+
+		String before = "json/singletonArrayBefore.json";
+		String after = "json/singletonArrayAfter6Spaces.json";
+		stepHarness.testResource(before, after);
+	}
+
+	@Test
+	void canSetIndentationLevelTo0() throws Exception {
+		FormatterStep step = createFormatterStep(0, TestProvisioner.mavenCentral());
+		StepHarness stepHarness = StepHarness.forStep(step);
+
+		String before = "json/singletonArrayBefore.json";
+		String after = "json/singletonArrayAfter0Spaces.json";
+		stepHarness.testResource(before, after);
+	}
+
+	@Test
+	void equality() {
+		new SerializableEqualityTester() {
+			int spaces = 0;
+
+			@Override
+			protected void setupTest(API api) {
+				// no changes, are the same
+				api.areDifferentThan();
+
+				// with different spacing
+				spaces = 1;
+				api.areDifferentThan();
+			}
+
+			@Override
+			protected FormatterStep create() {
+				return createFormatterStep(spaces, TestProvisioner.mavenCentral());
+			}
+		}.testEquals();
+	}
+
+	protected abstract FormatterStep createFormatterStep(int indent, Provisioner provisioner);
+
+	protected StepHarness getStepHarness() {
+		return StepHarness.forStep(createFormatterStep(INDENT, TestProvisioner.mavenCentral()));
+	}
+
+	protected void doWithResource(String name) throws Exception {
+		String before = String.format("json/%sBefore.json", name);
+		String after = String.format("json/%sAfter.json", name);
+		getStepHarness().testResource(before, after);
+	}
+
+}
diff --git a/testlib/src/test/java/com/diffplug/spotless/json/JsonSimpleStepTest.java b/testlib/src/test/java/com/diffplug/spotless/json/JsonSimpleStepTest.java
index 4085744593..a8b166fa21 100644
--- a/testlib/src/test/java/com/diffplug/spotless/json/JsonSimpleStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/json/JsonSimpleStepTest.java
@@ -17,121 +17,50 @@
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import org.junit.jupiter.api.Test;
-
-import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.SerializableEqualityTester;
-import com.diffplug.spotless.StepHarness;
-import com.diffplug.spotless.TestProvisioner;
-
-class JsonSimpleStepTest {
-
-	private static final int INDENT = 4;
+import com.diffplug.spotless.*;
 
-	private final FormatterStep step = JsonSimpleStep.create(INDENT, TestProvisioner.mavenCentral());
-	private final StepHarness stepHarness = StepHarness.forStep(step);
+import org.junit.jupiter.api.Test;
 
-	@Test
-	void cannotProvidedNullProvisioner() {
-		assertThatThrownBy(() -> JsonSimpleStep.create(INDENT, null)).isInstanceOf(NullPointerException.class).hasMessage("provisioner cannot be null");
-	}
+class JsonSimpleStepTest extends JsonFormatterStepCommonTests {
 
 	@Test
 	void handlesSingletonObject() throws Exception {
-		doWithResource(stepHarness, "singletonObject");
+		doWithResource("singletonObject");
 	}
 
 	@Test
 	void handlesSingletonObjectWithArray() throws Exception {
-		doWithResource(stepHarness, "singletonObjectWithArray");
-	}
-
-	@Test
-	void handlesNestedObject() throws Exception {
-		doWithResource(stepHarness, "nestedObject");
-	}
-
-	@Test
-	void handlesSingletonArray() throws Exception {
-		doWithResource(stepHarness, "singletonArray");
-	}
-
-	@Test
-	void handlesEmptyFile() throws Exception {
-		doWithResource(stepHarness, "empty");
+		doWithResource("singletonObjectWithArray");
 	}
 
 	@Test
 	void handlesComplexNestedObject() throws Exception {
-		doWithResource(stepHarness, "cucumberJsonSample");
+		doWithResource("cucumberJsonSample");
 	}
 
 	@Test
 	void handlesObjectWithNull() throws Exception {
-		doWithResource(stepHarness, "objectWithNull");
+		doWithResource("objectWithNull");
 	}
 
 	@Test
 	void handlesInvalidJson() {
-		assertThatThrownBy(() -> doWithResource(stepHarness, "invalidJson"))
-				.isInstanceOf(AssertionError.class)
-				.hasMessage("Unable to format JSON")
-				.hasRootCauseMessage("Expected a ',' or '}' at 9 [character 0 line 3]");
+		assertThatThrownBy(() -> doWithResource("invalidJson"))
+			.isInstanceOf(AssertionError.class)
+			.hasMessage("Unable to format JSON")
+			.hasRootCauseMessage("Expected a ',' or '}' at 9 [character 0 line 3]");
 	}
 
 	@Test
 	void handlesNotJson() {
-		assertThatThrownBy(() -> doWithResource(stepHarness, "notJson"))
-				.isInstanceOf(AssertionError.class)
-				.hasMessage("Unable to determine JSON type, expected a '{' or '[' but found '#'")
-				.hasNoCause();
-	}
-
-	@Test
-	void canSetCustomIndentationLevel() throws Exception {
-		FormatterStep step = JsonSimpleStep.create(6, TestProvisioner.mavenCentral());
-		StepHarness stepHarness = StepHarness.forStep(step);
-
-		String before = "json/singletonArrayBefore.json";
-		String after = "json/singletonArrayAfter6Spaces.json";
-		stepHarness.testResource(before, after);
-	}
-
-	@Test
-	void canSetIndentationLevelTo0() throws Exception {
-		FormatterStep step = JsonSimpleStep.create(0, TestProvisioner.mavenCentral());
-		StepHarness stepHarness = StepHarness.forStep(step);
-
-		String before = "json/singletonArrayBefore.json";
-		String after = "json/singletonArrayAfter0Spaces.json";
-		stepHarness.testResource(before, after);
-	}
-
-	@Test
-	void equality() {
-		new SerializableEqualityTester() {
-			int spaces = 0;
-
-			@Override
-			protected void setupTest(API api) {
-				// no changes, are the same
-				api.areDifferentThan();
-
-				// with different spacing
-				spaces = 1;
-				api.areDifferentThan();
-			}
-
-			@Override
-			protected FormatterStep create() {
-				return JsonSimpleStep.create(spaces, TestProvisioner.mavenCentral());
-			}
-		}.testEquals();
+		assertThatThrownBy(() -> doWithResource("notJson"))
+			.isInstanceOf(AssertionError.class)
+			.hasMessage("Unable to determine JSON type, expected a '{' or '[' but found '#'")
+			.hasNoCause();
 	}
 
-	private static void doWithResource(StepHarness stepHarness, String name) throws Exception {
-		String before = String.format("json/%sBefore.json", name);
-		String after = String.format("json/%sAfter.json", name);
-		stepHarness.testResource(before, after);
+	@Override
+	protected FormatterStep createFormatterStep(int indent, Provisioner provisioner) {
+		return JsonSimpleStep.create(indent, provisioner);
 	}
 }

From 7f15f16f4c00fdd3eabd4f1e79a9cd99a0f6fb32 Mon Sep 17 00:00:00 2001
From: Abel Keszei <keszeiabel@gmail.com>
Date: Sat, 12 Feb 2022 18:24:11 +0100
Subject: [PATCH 0029/2068] add escapeHtml to README

---
 plugin-gradle/README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index b3821d5277..7a6089850c 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -626,11 +626,19 @@ spotless {
     gson()
       .indentWithSpaces(6) // optional: specify the number of spaces to use
       .sortByKeys()        // optional: sort JSON by its keys
+      .escapeHtml()        // optional: escape HTML in values
       .version('2.8.1')    // optional: specify version
   }
 }
 ```
 
+Notes:
+* There's no option in Gson to leave HTML as-is (i.e. escaped HTML would remain escaped, raw would remain raw). Either
+all HTML characters are written escaped or none. Set `escapeHtml` if you prefer the former.
+* `sortByKeys` will apply lexicographic order on the keys of the input JSON. See the
+[javadoc of String](https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/String.html#compareTo(java.lang.String))
+for details.
+
 <a name="applying-prettier-to-javascript--flow--typescript--css--scss--less--jsx--graphql--yaml--etc"></a>
 
 ## Prettier

From 3835b5d8904c0e88144c1ec8800902df49e8b494 Mon Sep 17 00:00:00 2001
From: Abel Keszei <keszeiabel@gmail.com>
Date: Sat, 12 Feb 2022 18:59:03 +0100
Subject: [PATCH 0030/2068] update JsonExtension tests

---
 .../gradle/spotless/JsonExtensionTest.java    | 83 ++++++++++++++++++-
 1 file changed, 81 insertions(+), 2 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JsonExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JsonExtensionTest.java
index edcd4b428f..09ff70673f 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JsonExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JsonExtensionTest.java
@@ -21,7 +21,7 @@
 
 class JsonExtensionTest extends GradleIntegrationHarness {
 	@Test
-	void defaultFormatting() throws IOException {
+	void simpleDefaultFormatting() throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
 				"    id 'java'",
@@ -42,7 +42,7 @@ void defaultFormatting() throws IOException {
 	}
 
 	@Test
-	void formattingWithCustomNumberOfSpaces() throws IOException {
+	void simpleFormattingWithCustomNumberOfSpaces() throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
 				"    id 'java'",
@@ -59,4 +59,83 @@ void formattingWithCustomNumberOfSpaces() throws IOException {
 		gradleRunner().withArguments("spotlessApply").build();
 		assertFile("src/main/resources/example.json").sameAsResource("json/singletonArrayAfter6Spaces.json");
 	}
+
+	@Test
+	void gsonDefaultFormatting() throws IOException {
+		setFile("build.gradle").toLines(
+			"plugins {",
+			"    id 'java'",
+			"    id 'com.diffplug.spotless'",
+			"}",
+			"repositories { mavenCentral() }",
+			"spotless {",
+			"    json {",
+			"    target 'examples/**/*.json'",
+			"    gson()",
+			"}",
+			"}");
+		setFile("src/main/resources/example.json").toResource("json/nestedObjectBefore.json");
+		setFile("examples/main/resources/example.json").toResource("json/nestedObjectBefore.json");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("src/main/resources/example.json").sameAsResource("json/nestedObjectBefore.json");
+		assertFile("examples/main/resources/example.json").sameAsResource("json/nestedObjectAfter.json");
+	}
+
+	@Test
+	void gsonFormattingWithCustomNumberOfSpaces() throws IOException {
+		setFile("build.gradle").toLines(
+			"plugins {",
+			"    id 'java'",
+			"    id 'com.diffplug.spotless'",
+			"}",
+			"repositories { mavenCentral() }",
+			"spotless {",
+			"    json {",
+			"    target 'src/**/*.json'",
+			"    gson().indentWithSpaces(6)",
+			"}",
+			"}");
+		setFile("src/main/resources/example.json").toResource("json/singletonArrayBefore.json");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("src/main/resources/example.json").sameAsResource("json/singletonArrayAfter6Spaces.json");
+	}
+
+	@Test
+	void gsonFormattingWithSortingByKeys() throws IOException {
+		setFile("build.gradle").toLines(
+			"plugins {",
+			"    id 'java'",
+			"    id 'com.diffplug.spotless'",
+			"}",
+			"repositories { mavenCentral() }",
+			"spotless {",
+			"    json {",
+			"    target 'src/**/*.json'",
+			"    gson().sortByKeys()",
+			"}",
+			"}");
+		setFile("src/main/resources/example.json").toResource("json/sortByKeysBefore.json");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("src/main/resources/example.json").sameAsResource("json/sortByKeysAfter.json");
+	}
+
+	@Test
+	void gsonFormattingWithHtmlEscape() throws IOException {
+		setFile("build.gradle").toLines(
+			"plugins {",
+			"    id 'java'",
+			"    id 'com.diffplug.spotless'",
+			"}",
+			"repositories { mavenCentral() }",
+			"spotless {",
+			"    json {",
+			"    target 'src/**/*.json'",
+			"    gson().escapeHtml()",
+			"}",
+			"}");
+		setFile("src/main/resources/example.json").toResource("json/escapeHtmlGsonBefore.json");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("src/main/resources/example.json").sameAsResource("json/escapeHtmlGsonAfter.json");
+	}
+
 }

From b42a8cd392d48b823523a6d02acfc30717c5efb7 Mon Sep 17 00:00:00 2001
From: Abel Keszei <keszeiabel@gmail.com>
Date: Sat, 12 Feb 2022 19:00:30 +0100
Subject: [PATCH 0031/2068] apply format

---
 .../json/gson/GsonBuilderWrapper.java         | 15 ++++
 .../diffplug/spotless/json/gson/GsonStep.java | 39 +++++---
 .../spotless/json/gson/GsonWrapper.java       | 19 +++-
 .../spotless/json/gson/GsonWrapperBase.java   | 15 ++++
 .../json/gson/JsonElementWrapper.java         | 21 ++++-
 .../spotless/json/gson/JsonObjectWrapper.java | 19 +++-
 .../spotless/json/gson/JsonWriterWrapper.java | 19 +++-
 .../gradle/spotless/JsonExtension.java        |  2 +-
 .../gradle/spotless/JsonExtensionTest.java    | 90 +++++++++----------
 .../diffplug/spotless/json/GsonStepTest.java  | 46 ++++++----
 .../json/JsonFormatterStepCommonTests.java    | 23 ++++-
 .../spotless/json/JsonSimpleStepTest.java     | 18 ++--
 12 files changed, 229 insertions(+), 97 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonBuilderWrapper.java b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonBuilderWrapper.java
index 1693a5f9da..365e27fb4c 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonBuilderWrapper.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonBuilderWrapper.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.json.gson;
 
 import java.lang.reflect.Constructor;
diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
index 40ca84eeb7..06519ae39d 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
@@ -1,16 +1,31 @@
+/*
+ * Copyright 2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.json.gson;
 
-import com.diffplug.spotless.FormatterFunc;
-import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.JarState;
-import com.diffplug.spotless.Provisioner;
-
 import java.io.IOException;
 import java.io.Serializable;
 import java.io.StringWriter;
 import java.util.Collections;
 import java.util.Objects;
 
+import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.JarState;
+import com.diffplug.spotless.Provisioner;
+
 public class GsonStep {
 	private static final String MAVEN_COORDINATES = "com.google.code.gson:gson";
 
@@ -73,13 +88,13 @@ FormatterFunc toFormatter() {
 		private Object sortByKeys(JsonObjectWrapper jsonObjectWrapper, JsonElementWrapper jsonElementWrapper, Object jsonObject) {
 			Object result = jsonObjectWrapper.createJsonObject();
 			jsonObjectWrapper.keySet(jsonObject).stream().sorted()
-				.forEach(key -> {
-					Object element = jsonObjectWrapper.get(jsonObject, key);
-					if (jsonElementWrapper.isJsonObject(element)) {
-						element = sortByKeys(jsonObjectWrapper, jsonElementWrapper, element);
-					}
-					jsonObjectWrapper.add(result, key, element);
-				});
+					.forEach(key -> {
+						Object element = jsonObjectWrapper.get(jsonObject, key);
+						if (jsonElementWrapper.isJsonObject(element)) {
+							element = sortByKeys(jsonObjectWrapper, jsonElementWrapper, element);
+						}
+						jsonObjectWrapper.add(result, key, element);
+					});
 			return result;
 		}
 
diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonWrapper.java b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonWrapper.java
index 53e765fa04..fabb257964 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonWrapper.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonWrapper.java
@@ -1,10 +1,25 @@
+/*
+ * Copyright 2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.json.gson;
 
-import com.diffplug.spotless.JarState;
-
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 
+import com.diffplug.spotless.JarState;
+
 public class GsonWrapper extends GsonWrapperBase {
 
 	private final Constructor<?> constructor;
diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonWrapperBase.java b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonWrapperBase.java
index 31e22d53d0..3438c6062f 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonWrapperBase.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonWrapperBase.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.json.gson;
 
 import java.lang.reflect.Constructor;
diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/JsonElementWrapper.java b/lib/src/main/java/com/diffplug/spotless/json/gson/JsonElementWrapper.java
index a45225b411..cbb04a411a 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/gson/JsonElementWrapper.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/gson/JsonElementWrapper.java
@@ -1,10 +1,23 @@
+/*
+ * Copyright 2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.json.gson;
 
-import com.diffplug.spotless.JarState;
-
-import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
-import java.util.Set;
+
+import com.diffplug.spotless.JarState;
 
 public class JsonElementWrapper extends GsonWrapperBase {
 
diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/JsonObjectWrapper.java b/lib/src/main/java/com/diffplug/spotless/json/gson/JsonObjectWrapper.java
index 5485ce2ffc..0e2d48cf71 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/gson/JsonObjectWrapper.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/gson/JsonObjectWrapper.java
@@ -1,11 +1,26 @@
+/*
+ * Copyright 2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.json.gson;
 
-import com.diffplug.spotless.JarState;
-
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.util.Set;
 
+import com.diffplug.spotless.JarState;
+
 public class JsonObjectWrapper extends GsonWrapperBase {
 
 	private final Constructor<?> constructor;
diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/JsonWriterWrapper.java b/lib/src/main/java/com/diffplug/spotless/json/gson/JsonWriterWrapper.java
index 580e075e77..55ce4c0955 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/gson/JsonWriterWrapper.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/gson/JsonWriterWrapper.java
@@ -1,11 +1,26 @@
+/*
+ * Copyright 2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.json.gson;
 
-import com.diffplug.spotless.JarState;
-
 import java.io.Writer;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 
+import com.diffplug.spotless.JarState;
+
 public class JsonWriterWrapper extends GsonWrapperBase {
 
 	private final Class<?> clazz;
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
index bce3a68060..25182fa4bc 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JsonExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JsonExtensionTest.java
index 09ff70673f..e2fb9f70aa 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JsonExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JsonExtensionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2021-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -63,17 +63,17 @@ void simpleFormattingWithCustomNumberOfSpaces() throws IOException {
 	@Test
 	void gsonDefaultFormatting() throws IOException {
 		setFile("build.gradle").toLines(
-			"plugins {",
-			"    id 'java'",
-			"    id 'com.diffplug.spotless'",
-			"}",
-			"repositories { mavenCentral() }",
-			"spotless {",
-			"    json {",
-			"    target 'examples/**/*.json'",
-			"    gson()",
-			"}",
-			"}");
+				"plugins {",
+				"    id 'java'",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    json {",
+				"    target 'examples/**/*.json'",
+				"    gson()",
+				"}",
+				"}");
 		setFile("src/main/resources/example.json").toResource("json/nestedObjectBefore.json");
 		setFile("examples/main/resources/example.json").toResource("json/nestedObjectBefore.json");
 		gradleRunner().withArguments("spotlessApply").build();
@@ -84,17 +84,17 @@ void gsonDefaultFormatting() throws IOException {
 	@Test
 	void gsonFormattingWithCustomNumberOfSpaces() throws IOException {
 		setFile("build.gradle").toLines(
-			"plugins {",
-			"    id 'java'",
-			"    id 'com.diffplug.spotless'",
-			"}",
-			"repositories { mavenCentral() }",
-			"spotless {",
-			"    json {",
-			"    target 'src/**/*.json'",
-			"    gson().indentWithSpaces(6)",
-			"}",
-			"}");
+				"plugins {",
+				"    id 'java'",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    json {",
+				"    target 'src/**/*.json'",
+				"    gson().indentWithSpaces(6)",
+				"}",
+				"}");
 		setFile("src/main/resources/example.json").toResource("json/singletonArrayBefore.json");
 		gradleRunner().withArguments("spotlessApply").build();
 		assertFile("src/main/resources/example.json").sameAsResource("json/singletonArrayAfter6Spaces.json");
@@ -103,17 +103,17 @@ void gsonFormattingWithCustomNumberOfSpaces() throws IOException {
 	@Test
 	void gsonFormattingWithSortingByKeys() throws IOException {
 		setFile("build.gradle").toLines(
-			"plugins {",
-			"    id 'java'",
-			"    id 'com.diffplug.spotless'",
-			"}",
-			"repositories { mavenCentral() }",
-			"spotless {",
-			"    json {",
-			"    target 'src/**/*.json'",
-			"    gson().sortByKeys()",
-			"}",
-			"}");
+				"plugins {",
+				"    id 'java'",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    json {",
+				"    target 'src/**/*.json'",
+				"    gson().sortByKeys()",
+				"}",
+				"}");
 		setFile("src/main/resources/example.json").toResource("json/sortByKeysBefore.json");
 		gradleRunner().withArguments("spotlessApply").build();
 		assertFile("src/main/resources/example.json").sameAsResource("json/sortByKeysAfter.json");
@@ -122,17 +122,17 @@ void gsonFormattingWithSortingByKeys() throws IOException {
 	@Test
 	void gsonFormattingWithHtmlEscape() throws IOException {
 		setFile("build.gradle").toLines(
-			"plugins {",
-			"    id 'java'",
-			"    id 'com.diffplug.spotless'",
-			"}",
-			"repositories { mavenCentral() }",
-			"spotless {",
-			"    json {",
-			"    target 'src/**/*.json'",
-			"    gson().escapeHtml()",
-			"}",
-			"}");
+				"plugins {",
+				"    id 'java'",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    json {",
+				"    target 'src/**/*.json'",
+				"    gson().escapeHtml()",
+				"}",
+				"}");
 		setFile("src/main/resources/example.json").toResource("json/escapeHtmlGsonBefore.json");
 		gradleRunner().withArguments("spotlessApply").build();
 		assertFile("src/main/resources/example.json").sameAsResource("json/escapeHtmlGsonAfter.json");
diff --git a/testlib/src/test/java/com/diffplug/spotless/json/GsonStepTest.java b/testlib/src/test/java/com/diffplug/spotless/json/GsonStepTest.java
index 80fde970c3..a9fdc5383c 100644
--- a/testlib/src/test/java/com/diffplug/spotless/json/GsonStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/json/GsonStepTest.java
@@ -1,16 +1,30 @@
+/*
+ * Copyright 2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.json;
 
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import org.junit.jupiter.api.Test;
+
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.Provisioner;
-
 import com.diffplug.spotless.StepHarness;
 import com.diffplug.spotless.TestProvisioner;
 import com.diffplug.spotless.json.gson.GsonStep;
 
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
 public class GsonStepTest extends JsonFormatterStepCommonTests {
 
 	private static final String DEFAULT_VERSION = "2.8.9";
@@ -28,17 +42,17 @@ void handlesObjectWithNull() throws Exception {
 	@Test
 	void handlesInvalidJson() {
 		assertThatThrownBy(() -> doWithResource("invalidJson"))
-			.isInstanceOf(AssertionError.class)
-			.hasMessage("Unable to format JSON")
-			.hasRootCauseMessage("End of input at line 3 column 1 path $.a");
+				.isInstanceOf(AssertionError.class)
+				.hasMessage("Unable to format JSON")
+				.hasRootCauseMessage("End of input at line 3 column 1 path $.a");
 	}
 
 	@Test
 	void handlesNotJson() {
 		assertThatThrownBy(() -> doWithResource("notJson"))
-			.isInstanceOf(AssertionError.class)
-			.hasMessage("Unable to format JSON")
-			.hasNoCause();
+				.isInstanceOf(AssertionError.class)
+				.hasMessage("Unable to format JSON")
+				.hasNoCause();
 	}
 
 	@Test
@@ -52,21 +66,21 @@ void handlesSortingWhenSortByKeyEnabled() throws Exception {
 	void doesNoSortingWhenSortByKeyDisabled() throws Exception {
 		FormatterStep step = GsonStep.create(INDENT, false, false, DEFAULT_VERSION, TestProvisioner.mavenCentral());
 		StepHarness.forStep(step)
-			.testResource("json/sortByKeysBefore.json", "json/sortByKeysAfterDisabled.json");
+				.testResource("json/sortByKeysBefore.json", "json/sortByKeysAfterDisabled.json");
 	}
 
 	@Test
 	void handlesHtmlEscapeWhenEnabled() throws Exception {
 		FormatterStep step = GsonStep.create(INDENT, false, true, DEFAULT_VERSION, TestProvisioner.mavenCentral());
 		StepHarness.forStep(step)
-			.testResource("json/escapeHtmlGsonBefore.json", "json/escapeHtmlGsonAfter.json");
+				.testResource("json/escapeHtmlGsonBefore.json", "json/escapeHtmlGsonAfter.json");
 	}
 
 	@Test
 	void writesRawHtmlWhenHtmlEscapeDisabled() throws Exception {
 		FormatterStep step = GsonStep.create(INDENT, false, false, DEFAULT_VERSION, TestProvisioner.mavenCentral());
 		StepHarness.forStep(step)
-			.testResource("json/escapeHtmlGsonBefore.json", "json/escapeHtmlGsonAfterDisabled.json");
+				.testResource("json/escapeHtmlGsonBefore.json", "json/escapeHtmlGsonAfterDisabled.json");
 	}
 
 	@Test
@@ -74,8 +88,8 @@ void handlesVersionIncompatibility() {
 		FormatterStep step = GsonStep.create(INDENT, false, false, "1.7", TestProvisioner.mavenCentral());
 		StepHarness stepHarness = StepHarness.forStep(step);
 		assertThatThrownBy(() -> stepHarness.testResource("json/cucumberJsonSampleGsonBefore.json", "json/cucumberJsonSampleGsonAfter.json"))
-			.isInstanceOf(IllegalStateException.class)
-			.hasMessage("There was a problem interacting with Gson; maybe you set an incompatible version?");
+				.isInstanceOf(IllegalStateException.class)
+				.hasMessage("There was a problem interacting with Gson; maybe you set an incompatible version?");
 	}
 
 	@Override
diff --git a/testlib/src/test/java/com/diffplug/spotless/json/JsonFormatterStepCommonTests.java b/testlib/src/test/java/com/diffplug/spotless/json/JsonFormatterStepCommonTests.java
index dd8d9ba69a..9ee76f994c 100644
--- a/testlib/src/test/java/com/diffplug/spotless/json/JsonFormatterStepCommonTests.java
+++ b/testlib/src/test/java/com/diffplug/spotless/json/JsonFormatterStepCommonTests.java
@@ -1,10 +1,25 @@
+/*
+ * Copyright 2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.json;
 
-import com.diffplug.spotless.*;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import org.junit.jupiter.api.Test;
 
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import com.diffplug.spotless.*;
 
 public abstract class JsonFormatterStepCommonTests {
 
@@ -13,8 +28,8 @@ public abstract class JsonFormatterStepCommonTests {
 	@Test
 	void cannotProvideNullProvisioner() {
 		assertThatThrownBy(() -> createFormatterStep(INDENT, null))
-			.isInstanceOf(NullPointerException.class)
-			.hasMessage("provisioner cannot be null");
+				.isInstanceOf(NullPointerException.class)
+				.hasMessage("provisioner cannot be null");
 	}
 
 	@Test
diff --git a/testlib/src/test/java/com/diffplug/spotless/json/JsonSimpleStepTest.java b/testlib/src/test/java/com/diffplug/spotless/json/JsonSimpleStepTest.java
index a8b166fa21..b4f98e69ba 100644
--- a/testlib/src/test/java/com/diffplug/spotless/json/JsonSimpleStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/json/JsonSimpleStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2021-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,10 +17,10 @@
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import com.diffplug.spotless.*;
-
 import org.junit.jupiter.api.Test;
 
+import com.diffplug.spotless.*;
+
 class JsonSimpleStepTest extends JsonFormatterStepCommonTests {
 
 	@Test
@@ -46,17 +46,17 @@ void handlesObjectWithNull() throws Exception {
 	@Test
 	void handlesInvalidJson() {
 		assertThatThrownBy(() -> doWithResource("invalidJson"))
-			.isInstanceOf(AssertionError.class)
-			.hasMessage("Unable to format JSON")
-			.hasRootCauseMessage("Expected a ',' or '}' at 9 [character 0 line 3]");
+				.isInstanceOf(AssertionError.class)
+				.hasMessage("Unable to format JSON")
+				.hasRootCauseMessage("Expected a ',' or '}' at 9 [character 0 line 3]");
 	}
 
 	@Test
 	void handlesNotJson() {
 		assertThatThrownBy(() -> doWithResource("notJson"))
-			.isInstanceOf(AssertionError.class)
-			.hasMessage("Unable to determine JSON type, expected a '{' or '[' but found '#'")
-			.hasNoCause();
+				.isInstanceOf(AssertionError.class)
+				.hasMessage("Unable to determine JSON type, expected a '{' or '[' but found '#'")
+				.hasNoCause();
 	}
 
 	@Override

From baeed60bb788fa30c8ba4a7fd868fa963345fd61 Mon Sep 17 00:00:00 2001
From: Abel Keszei <keszeiabel@gmail.com>
Date: Sat, 12 Feb 2022 19:40:45 +0100
Subject: [PATCH 0032/2068] add json steps to feature matrix

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 6ace09631d..733979b1a1 100644
--- a/README.md
+++ b/README.md
@@ -102,6 +102,8 @@ extra('wtp.EclipseWtpFormatterStep')             +'{{yes}}       | {{yes}}
 | [`java.PalantirJavaFormatStep`](lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`java.RemoveUnusedImportsStep`](lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`java.EclipseJdtFormatterStep`](lib-extra/src/main/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
+| [`json.JsonSimpleStep`](lib/src/main/java/com/diffplug/spotless/json/JsonSimpleStep.java) | :+1:       | :white_large_square:     | :white_large_square:      | :white_large_square:  |
+| [`json.GsonStep`](lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java) | :+1:       | :white_large_square:     | :white_large_square:      | :white_large_square:  |
 | [`kotlin.KtLintStep`](lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`kotlin.KtfmtStep`](lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`kotlin.DiktatStep`](lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |

From 14f4e46992898567b8c94d44406acd016721feb0 Mon Sep 17 00:00:00 2001
From: Abel Keszei <keszeiabel@gmail.com>
Date: Sat, 12 Feb 2022 20:16:11 +0100
Subject: [PATCH 0033/2068] correctly add json steps to readme

---
 README.md                                                   | 6 ++++--
 .../com/diffplug/spotless/json/{gson => }/GsonStep.java     | 3 ++-
 .../java/com/diffplug/gradle/spotless/JsonExtension.java    | 2 +-
 .../test/java/com/diffplug/spotless/json/GsonStepTest.java  | 1 -
 4 files changed, 7 insertions(+), 5 deletions(-)
 rename lib/src/main/java/com/diffplug/spotless/json/{gson => }/GsonStep.java (98%)

diff --git a/README.md b/README.md
index 733979b1a1..bf4e7cf0d1 100644
--- a/README.md
+++ b/README.md
@@ -61,6 +61,8 @@ lib('java.ImportOrderStep')                      +'{{yes}}       | {{yes}}
 lib('java.PalantirJavaFormatStep')               +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('java.RemoveUnusedImportsStep')              +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
 extra('java.EclipseJdtFormatterStep')            +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
+lib('json.GsonStep')                             +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
+lib('json.JsonSimpleStep')                       +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
 lib('kotlin.KtLintStep')                         +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
 lib('kotlin.KtfmtStep')                          +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('kotlin.DiktatStep')                         +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
@@ -102,8 +104,8 @@ extra('wtp.EclipseWtpFormatterStep')             +'{{yes}}       | {{yes}}
 | [`java.PalantirJavaFormatStep`](lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`java.RemoveUnusedImportsStep`](lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`java.EclipseJdtFormatterStep`](lib-extra/src/main/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
-| [`json.JsonSimpleStep`](lib/src/main/java/com/diffplug/spotless/json/JsonSimpleStep.java) | :+1:       | :white_large_square:     | :white_large_square:      | :white_large_square:  |
-| [`json.GsonStep`](lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java) | :+1:       | :white_large_square:     | :white_large_square:      | :white_large_square:  |
+| [`json.GsonStep`](lib/src/main/java/com/diffplug/spotless/json/GsonStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
+| [`json.JsonSimpleStep`](lib/src/main/java/com/diffplug/spotless/json/JsonSimpleStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
 | [`kotlin.KtLintStep`](lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`kotlin.KtfmtStep`](lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`kotlin.DiktatStep`](lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java b/lib/src/main/java/com/diffplug/spotless/json/GsonStep.java
similarity index 98%
rename from lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
rename to lib/src/main/java/com/diffplug/spotless/json/GsonStep.java
index 06519ae39d..81d6ee2f34 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/GsonStep.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.diffplug.spotless.json.gson;
+package com.diffplug.spotless.json;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -25,6 +25,7 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
+import com.diffplug.spotless.json.gson.*;
 
 public class GsonStep {
 	private static final String MAVEN_COORDINATES = "com.google.code.gson:gson";
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
index 25182fa4bc..0c4ea3442a 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
@@ -18,8 +18,8 @@
 import javax.inject.Inject;
 
 import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.json.GsonStep;
 import com.diffplug.spotless.json.JsonSimpleStep;
-import com.diffplug.spotless.json.gson.GsonStep;
 
 public class JsonExtension extends FormatExtension {
 	private static final int DEFAULT_INDENTATION = 4;
diff --git a/testlib/src/test/java/com/diffplug/spotless/json/GsonStepTest.java b/testlib/src/test/java/com/diffplug/spotless/json/GsonStepTest.java
index a9fdc5383c..822d041aae 100644
--- a/testlib/src/test/java/com/diffplug/spotless/json/GsonStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/json/GsonStepTest.java
@@ -23,7 +23,6 @@
 import com.diffplug.spotless.Provisioner;
 import com.diffplug.spotless.StepHarness;
 import com.diffplug.spotless.TestProvisioner;
-import com.diffplug.spotless.json.gson.GsonStep;
 
 public class GsonStepTest extends JsonFormatterStepCommonTests {
 

From bd73171360e592628a706a93188d5921f7a4db4d Mon Sep 17 00:00:00 2001
From: Abel Keszei <keszeiabel@gmail.com>
Date: Sun, 13 Feb 2022 13:36:31 +0100
Subject: [PATCH 0034/2068] updates CHANGES.md

---
 CHANGES.md               | 2 ++
 plugin-gradle/CHANGES.md | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 29fd6d9375..e6420824d9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* Added support for JSON formatting based on [Gson](https://github.com/google/gson)
 
 ## [2.22.2] - 2022-02-09
 ### Changed
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 6c2a6cd4da..52b2b057e3 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Added
+* Added support for JSON formatting based on [Gson](https://github.com/google/gson)
 
 ## [6.2.2] - 2022-02-09
 ### Changed

From c8aa57883efd6bfbd177f5ecb7ea39bf5a1f6096 Mon Sep 17 00:00:00 2001
From: Abel Keszei <keszeiabel@gmail.com>
Date: Sun, 13 Feb 2022 13:37:55 +0100
Subject: [PATCH 0035/2068] add PR links to CHANGES.md changes

---
 CHANGES.md               | 2 +-
 plugin-gradle/CHANGES.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index e6420824d9..364fb31beb 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,7 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* Added support for JSON formatting based on [Gson](https://github.com/google/gson)
+* Added support for JSON formatting based on [Gson](https://github.com/google/gson) ([#1125](https://github.com/diffplug/spotless/pull/1125)).
 
 ## [2.22.2] - 2022-02-09
 ### Changed
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 52b2b057e3..096a40e09a 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -4,7 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* Added support for JSON formatting based on [Gson](https://github.com/google/gson)
+* Added support for JSON formatting based on [Gson](https://github.com/google/gson) ([#1125](https://github.com/diffplug/spotless/pull/1125)).
 
 ## [6.2.2] - 2022-02-09
 ### Changed

From 83091071dd55d5f887679e09170e5489425690e7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Feb 2022 12:05:37 +0000
Subject: [PATCH 0036/2068] Bump com.diffplug.spotless from 6.2.0 to 6.2.2

Bumps com.diffplug.spotless from 6.2.0 to 6.2.2.

---
updated-dependencies:
- dependency-name: com.diffplug.spotless
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index ca29a527e2..570d9c3d1e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,6 @@
 pluginManagement {
 	plugins {
-		id 'com.diffplug.spotless'                 version '6.2.0'
+		id 'com.diffplug.spotless'                 version '6.2.2'
 		// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
 		id 'com.gradle.plugin-publish'             version '0.20.0'
 		// https://github.com/gradle-nexus/publish-plugin/releases

From 4834e22e9ae05ad3da2973675811346be9976a8e Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 14 Feb 2022 12:20:42 -0800
Subject: [PATCH 0037/2068] Advertise the compile-only sourceset feature.

---
 CONTRIBUTING.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 94bef92f01..f03c500f83 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -99,6 +99,10 @@ Here's a checklist for creating a new step for Spotless:
 - [ ] Test class has test methods to verify behavior.
 - [ ] Test class has a test method `equality()` which tests equality using `StepEqualityTester` (see existing methods for examples).
 
+### Third-party dependencies via reflection or compile-only source sets
+
+Most formatters are going to use some kind of third-party jar. Spotless integrates with many formatters, some of which have incompatible transitive dependencies. To address this, we resolve third-party dependencies using [`JarState`](https://github.com/diffplug/spotless/blob/b26f0972b185995d7c6a7aefa726c146d24d9a82/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java#L118). To call methods on the classes in that `JarState`, you can either use reflection or a compile-only source set. See [#524](https://github.com/diffplug/spotless/issues/524) for examples of both approaches.
+
 ### Accessing the underlying File
 
 In order for Spotless' model to work, each step needs to look only at the `String` input, otherwise they cannot compose.  However, there are some cases where the source `File` is useful, such as to look at the file extension.  In this case, you can pass a `FormatterFunc.NeedsFile` instead of a `FormatterFunc`.  This should only be used in [rare circumstances](https://github.com/diffplug/spotless/pull/637), be careful that you don't accidentally depend on the bytes inside of the `File`!

From 9b1955b555cbdc63a3fc9306a26f62c2e4da997c Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 14 Feb 2022 12:28:59 -0800
Subject: [PATCH 0038/2068] Add missing bullet points.

---
 CONTRIBUTING.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f03c500f83..c1ce74bd8f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -103,6 +103,9 @@ Here's a checklist for creating a new step for Spotless:
 
 Most formatters are going to use some kind of third-party jar. Spotless integrates with many formatters, some of which have incompatible transitive dependencies. To address this, we resolve third-party dependencies using [`JarState`](https://github.com/diffplug/spotless/blob/b26f0972b185995d7c6a7aefa726c146d24d9a82/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java#L118). To call methods on the classes in that `JarState`, you can either use reflection or a compile-only source set. See [#524](https://github.com/diffplug/spotless/issues/524) for examples of both approaches.
 
+- Adding a compile-only sourceset is easier to read and probably a better approach for most cases.
+- Reflection is more flexible, and might be a better approach for a very simple API.
+
 ### Accessing the underlying File
 
 In order for Spotless' model to work, each step needs to look only at the `String` input, otherwise they cannot compose.  However, there are some cases where the source `File` is useful, such as to look at the file extension.  In this case, you can pass a `FormatterFunc.NeedsFile` instead of a `FormatterFunc`.  This should only be used in [rare circumstances](https://github.com/diffplug/spotless/pull/637), be careful that you don't accidentally depend on the bytes inside of the `File`!

From e6a31deadf0997c80e7a73a1b44ed562f2dcfdb7 Mon Sep 17 00:00:00 2001
From: Abel Keszei <keszeiabel@gmail.com>
Date: Mon, 14 Feb 2022 23:04:36 +0100
Subject: [PATCH 0039/2068] make classes of com.diffplug.spotless.json.gson
 package-private

---
 README.md                                         |  8 ++++----
 .../spotless/json/gson/GsonBuilderWrapper.java    | 12 ++++++------
 .../spotless/json/{ => gson}/GsonStep.java        |  3 +--
 .../diffplug/spotless/json/gson/GsonWrapper.java  | 15 ++++-----------
 .../spotless/json/gson/GsonWrapperBase.java       |  6 +++---
 .../spotless/json/gson/JsonElementWrapper.java    |  8 ++++----
 .../spotless/json/gson/JsonObjectWrapper.java     | 12 ++++++------
 .../spotless/json/gson/JsonWriterWrapper.java     | 10 +++++-----
 .../diffplug/gradle/spotless/JsonExtension.java   |  2 +-
 .../spotless/json/{ => gson}/GsonStepTest.java    |  4 +++-
 10 files changed, 37 insertions(+), 43 deletions(-)
 rename lib/src/main/java/com/diffplug/spotless/json/{ => gson}/GsonStep.java (98%)
 rename testlib/src/test/java/com/diffplug/spotless/json/{ => gson}/GsonStepTest.java (97%)

diff --git a/README.md b/README.md
index bf4e7cf0d1..f95ea7a7ca 100644
--- a/README.md
+++ b/README.md
@@ -30,8 +30,8 @@ It's easy to build such a function, but there are some gotchas and lots of integ
 ## Current feature matrix
 
 <!---freshmark matrix
-function lib(className)   { return '| [`' + className + '`](lib/src/main/java/com/diffplug/spotless/' + className.replace('.', '/') + '.java) | ' }
-function extra(className) { return '| [`' + className + '`](lib-extra/src/main/java/com/diffplug/spotless/extra/' + className.replace('.', '/') + '.java) | ' }
+function lib(className)   { return '| [`' + className + '`](lib/src/main/java/com/diffplug/spotless/' + className.replaceAll('\\.', '/') + '.java) | ' }
+function extra(className) { return '| [`' + className + '`](lib-extra/src/main/java/com/diffplug/spotless/extra/' + className.replaceAll('\\.', '/') + '.java) | ' }
 
 //                                               | GRADLE        | MAVEN        | SBT          | (new)   |
 output = [
@@ -61,7 +61,7 @@ lib('java.ImportOrderStep')                      +'{{yes}}       | {{yes}}
 lib('java.PalantirJavaFormatStep')               +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('java.RemoveUnusedImportsStep')              +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
 extra('java.EclipseJdtFormatterStep')            +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
-lib('json.GsonStep')                             +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
+lib('json.gson.GsonStep')                        +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
 lib('json.JsonSimpleStep')                       +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
 lib('kotlin.KtLintStep')                         +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
 lib('kotlin.KtfmtStep')                          +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
@@ -104,7 +104,7 @@ extra('wtp.EclipseWtpFormatterStep')             +'{{yes}}       | {{yes}}
 | [`java.PalantirJavaFormatStep`](lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`java.RemoveUnusedImportsStep`](lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`java.EclipseJdtFormatterStep`](lib-extra/src/main/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
-| [`json.GsonStep`](lib/src/main/java/com/diffplug/spotless/json/GsonStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
+| [`json.gson.GsonStep`](lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
 | [`json.JsonSimpleStep`](lib/src/main/java/com/diffplug/spotless/json/JsonSimpleStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
 | [`kotlin.KtLintStep`](lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`kotlin.KtfmtStep`](lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonBuilderWrapper.java b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonBuilderWrapper.java
index 365e27fb4c..c2e56f39b8 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonBuilderWrapper.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonBuilderWrapper.java
@@ -20,14 +20,14 @@
 
 import com.diffplug.spotless.JarState;
 
-public class GsonBuilderWrapper extends GsonWrapperBase {
+class GsonBuilderWrapper extends GsonWrapperBase {
 
 	private final Constructor<?> constructor;
 	private final Method serializeNullsMethod;
 	private final Method disableHtmlEscapingMethod;
 	private final Method createMethod;
 
-	public GsonBuilderWrapper(JarState jarState) {
+	GsonBuilderWrapper(JarState jarState) {
 		Class<?> clazz = loadClass(jarState.getClassLoader(), "com.google.gson.GsonBuilder");
 		this.constructor = getConstructor(clazz);
 		this.serializeNullsMethod = getMethod(clazz, "serializeNulls");
@@ -35,19 +35,19 @@ public GsonBuilderWrapper(JarState jarState) {
 		this.createMethod = getMethod(clazz, "create");
 	}
 
-	public Object createGsonBuilder() {
+	Object createGsonBuilder() {
 		return newInstance(constructor);
 	}
 
-	public Object serializeNulls(Object gsonBuilder) {
+	Object serializeNulls(Object gsonBuilder) {
 		return invoke(serializeNullsMethod, gsonBuilder);
 	}
 
-	public Object disableHtmlEscaping(Object gsonBuilder) {
+	Object disableHtmlEscaping(Object gsonBuilder) {
 		return invoke(disableHtmlEscapingMethod, gsonBuilder);
 	}
 
-	public Object create(Object gsonBuilder) {
+	Object create(Object gsonBuilder) {
 		return invoke(createMethod, gsonBuilder);
 	}
 
diff --git a/lib/src/main/java/com/diffplug/spotless/json/GsonStep.java b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
similarity index 98%
rename from lib/src/main/java/com/diffplug/spotless/json/GsonStep.java
rename to lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
index 81d6ee2f34..06519ae39d 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/GsonStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.diffplug.spotless.json;
+package com.diffplug.spotless.json.gson;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -25,7 +25,6 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
-import com.diffplug.spotless.json.gson.*;
 
 public class GsonStep {
 	private static final String MAVEN_COORDINATES = "com.google.code.gson:gson";
diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonWrapper.java b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonWrapper.java
index fabb257964..eaca499eed 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonWrapper.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonWrapper.java
@@ -15,33 +15,26 @@
  */
 package com.diffplug.spotless.json.gson;
 
-import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 
 import com.diffplug.spotless.JarState;
 
-public class GsonWrapper extends GsonWrapperBase {
+class GsonWrapper extends GsonWrapperBase {
 
-	private final Constructor<?> constructor;
 	private final Method fromJsonMethod;
 	private final Method toJsonMethod;
 
-	public GsonWrapper(JarState jarState, JsonElementWrapper jsonElementWrapper, JsonWriterWrapper jsonWriterWrapper) {
+	GsonWrapper(JarState jarState, JsonElementWrapper jsonElementWrapper, JsonWriterWrapper jsonWriterWrapper) {
 		Class<?> clazz = loadClass(jarState.getClassLoader(), "com.google.gson.Gson");
-		this.constructor = getConstructor(clazz);
 		this.fromJsonMethod = getMethod(clazz, "fromJson", String.class, Class.class);
 		this.toJsonMethod = getMethod(clazz, "toJson", jsonElementWrapper.getWrappedClass(), jsonWriterWrapper.getWrappedClass());
 	}
 
-	public Object createGson() {
-		return newInstance(constructor);
-	}
-
-	public Object fromJson(Object gson, String json, Class<?> type) {
+	Object fromJson(Object gson, String json, Class<?> type) {
 		return invoke(fromJsonMethod, gson, json, type);
 	}
 
-	public void toJson(Object gson, Object jsonElement, Object jsonWriter) {
+	void toJson(Object gson, Object jsonElement, Object jsonWriter) {
 		invoke(toJsonMethod, gson, jsonElement, jsonWriter);
 	}
 
diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonWrapperBase.java b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonWrapperBase.java
index 3438c6062f..24d12a5722 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonWrapperBase.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonWrapperBase.java
@@ -19,10 +19,10 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-public abstract class GsonWrapperBase {
+abstract class GsonWrapperBase {
 
-	public static final String INCOMPATIBLE_ERROR_MESSAGE = "There was a problem interacting with Gson; maybe you set an incompatible version?";
-	public static final String FAILED_TO_PARSE_ERROR_MESSAGE = "Unable to format JSON";
+	static final String INCOMPATIBLE_ERROR_MESSAGE = "There was a problem interacting with Gson; maybe you set an incompatible version?";
+	static final String FAILED_TO_PARSE_ERROR_MESSAGE = "Unable to format JSON";
 
 	protected final Class<?> loadClass(ClassLoader classLoader, String className) {
 		try {
diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/JsonElementWrapper.java b/lib/src/main/java/com/diffplug/spotless/json/gson/JsonElementWrapper.java
index cbb04a411a..ffdfa649ce 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/gson/JsonElementWrapper.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/gson/JsonElementWrapper.java
@@ -19,21 +19,21 @@
 
 import com.diffplug.spotless.JarState;
 
-public class JsonElementWrapper extends GsonWrapperBase {
+class JsonElementWrapper extends GsonWrapperBase {
 
 	private final Class<?> clazz;
 	private final Method isJsonObjectMethod;
 
-	public JsonElementWrapper(JarState jarState) {
+	JsonElementWrapper(JarState jarState) {
 		this.clazz = loadClass(jarState.getClassLoader(), "com.google.gson.JsonElement");
 		this.isJsonObjectMethod = getMethod(clazz, "isJsonObject");
 	}
 
-	public boolean isJsonObject(Object jsonElement) {
+	boolean isJsonObject(Object jsonElement) {
 		return (boolean) invoke(isJsonObjectMethod, jsonElement);
 	}
 
-	public Class<?> getWrappedClass() {
+	Class<?> getWrappedClass() {
 		return clazz;
 	}
 
diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/JsonObjectWrapper.java b/lib/src/main/java/com/diffplug/spotless/json/gson/JsonObjectWrapper.java
index 0e2d48cf71..35ec0d876b 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/gson/JsonObjectWrapper.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/gson/JsonObjectWrapper.java
@@ -21,14 +21,14 @@
 
 import com.diffplug.spotless.JarState;
 
-public class JsonObjectWrapper extends GsonWrapperBase {
+class JsonObjectWrapper extends GsonWrapperBase {
 
 	private final Constructor<?> constructor;
 	private final Method keySetMethod;
 	private final Method getMethod;
 	private final Method addMethod;
 
-	public JsonObjectWrapper(JarState jarState, JsonElementWrapper jsonElementWrapper) {
+	JsonObjectWrapper(JarState jarState, JsonElementWrapper jsonElementWrapper) {
 		Class<?> clazz = loadClass(jarState.getClassLoader(), "com.google.gson.JsonObject");
 		this.constructor = getConstructor(clazz);
 		this.keySetMethod = getMethod(clazz, "keySet");
@@ -36,20 +36,20 @@ public JsonObjectWrapper(JarState jarState, JsonElementWrapper jsonElementWrappe
 		this.addMethod = getMethod(clazz, "add", String.class, jsonElementWrapper.getWrappedClass());
 	}
 
-	public Object createJsonObject() {
+	Object createJsonObject() {
 		return newInstance(constructor);
 	}
 
 	@SuppressWarnings("unchecked")
-	public Set<String> keySet(Object jsonObject) {
+	Set<String> keySet(Object jsonObject) {
 		return (Set<String>) invoke(keySetMethod, jsonObject);
 	}
 
-	public Object get(Object jsonObject, String key) {
+	Object get(Object jsonObject, String key) {
 		return invoke(getMethod, jsonObject, key);
 	}
 
-	public void add(Object jsonObject, String key, Object element) {
+	void add(Object jsonObject, String key, Object element) {
 		invoke(addMethod, jsonObject, key, element);
 	}
 
diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/JsonWriterWrapper.java b/lib/src/main/java/com/diffplug/spotless/json/gson/JsonWriterWrapper.java
index 55ce4c0955..c9d682e2c2 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/gson/JsonWriterWrapper.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/gson/JsonWriterWrapper.java
@@ -21,27 +21,27 @@
 
 import com.diffplug.spotless.JarState;
 
-public class JsonWriterWrapper extends GsonWrapperBase {
+class JsonWriterWrapper extends GsonWrapperBase {
 
 	private final Class<?> clazz;
 	private final Constructor<?> constructor;
 	private final Method setIndentMethod;
 
-	public JsonWriterWrapper(JarState jarState) {
+	JsonWriterWrapper(JarState jarState) {
 		this.clazz = loadClass(jarState.getClassLoader(), "com.google.gson.stream.JsonWriter");
 		this.constructor = getConstructor(clazz, Writer.class);
 		this.setIndentMethod = getMethod(clazz, "setIndent", String.class);
 	}
 
-	public Object createJsonWriter(Writer writer) {
+	Object createJsonWriter(Writer writer) {
 		return newInstance(constructor, writer);
 	}
 
-	public void setIndent(Object jsonWriter, String indent) {
+	void setIndent(Object jsonWriter, String indent) {
 		invoke(setIndentMethod, jsonWriter, indent);
 	}
 
-	public Class<?> getWrappedClass() {
+	Class<?> getWrappedClass() {
 		return clazz;
 	}
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
index 0c4ea3442a..25182fa4bc 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
@@ -18,8 +18,8 @@
 import javax.inject.Inject;
 
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.json.GsonStep;
 import com.diffplug.spotless.json.JsonSimpleStep;
+import com.diffplug.spotless.json.gson.GsonStep;
 
 public class JsonExtension extends FormatExtension {
 	private static final int DEFAULT_INDENTATION = 4;
diff --git a/testlib/src/test/java/com/diffplug/spotless/json/GsonStepTest.java b/testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java
similarity index 97%
rename from testlib/src/test/java/com/diffplug/spotless/json/GsonStepTest.java
rename to testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java
index 822d041aae..7fd21e3996 100644
--- a/testlib/src/test/java/com/diffplug/spotless/json/GsonStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java
@@ -13,10 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.diffplug.spotless.json;
+package com.diffplug.spotless.json.gson;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import com.diffplug.spotless.json.JsonFormatterStepCommonTests;
+
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.FormatterStep;

From 0da1a1ab8c87e7063cd0440649e48e0f58005b11 Mon Sep 17 00:00:00 2001
From: Abel Keszei <keszeiabel@gmail.com>
Date: Tue, 15 Feb 2022 08:18:53 +0100
Subject: [PATCH 0040/2068] fix formatting of GsonStepTest

---
 .../java/com/diffplug/spotless/json/gson/GsonStepTest.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java b/testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java
index 7fd21e3996..cf1fd10752 100644
--- a/testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java
@@ -17,14 +17,13 @@
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import com.diffplug.spotless.json.JsonFormatterStepCommonTests;
-
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.Provisioner;
 import com.diffplug.spotless.StepHarness;
 import com.diffplug.spotless.TestProvisioner;
+import com.diffplug.spotless.json.JsonFormatterStepCommonTests;
 
 public class GsonStepTest extends JsonFormatterStepCommonTests {
 

From 46c0d75baf3e852175e2acf5e960af42149e2631 Mon Sep 17 00:00:00 2001
From: Jamie Tanna <jamie@jamietanna.co.uk>
Date: Fri, 4 Feb 2022 11:36:03 +0000
Subject: [PATCH 0041/2068] Remove unused logger

---
 .../com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
index 2147c22e90..8aa7510dc3 100644
--- a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
+++ b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
@@ -19,7 +19,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.logging.Logger;
 
 import com.pinterest.ktlint.core.KtLint;
 import com.pinterest.ktlint.core.KtLint.Params;
@@ -33,7 +32,6 @@
 import kotlin.jvm.functions.Function2;
 
 public class KtlintFormatterFunc implements FormatterFunc.NeedsFile {
-	private static final Logger logger = Logger.getLogger(KtlintFormatterFunc.class.getName());
 
 	private final List<RuleSet> rulesets;
 	private final Map<String, String> userData;

From e9ead1f17ac9ccfbd2b2d7f9f3213b6bb1e89a5a Mon Sep 17 00:00:00 2001
From: Jamie Tanna <jamie@jamietanna.co.uk>
Date: Fri, 4 Feb 2022 11:40:53 +0000
Subject: [PATCH 0042/2068] Migrate to SLF4J for logging

As noted in #1116, it'd be ideal if we moved to SLF4J as our logging
interface.

We can do this pretty easily, making sure we remove our `package-list`
reference, as well as making sure the SLF4J API is only used for
compilation.

We also need to map the error logging levels that most closely mirror
what `java.util.logging` uses.

Closes #1116.
---
 gradle/javadoc/java8/package-list                    |  1 -
 lib/build.gradle                                     |  2 ++
 .../spotless/glue/ktlint/KtlintFormatterFunc.java    |  2 +-
 .../spotless/FormatExceptionPolicyLegacy.java        | 12 ++++++------
 .../diffplug/spotless/markdown/FreshMarkStep.java    | 10 ++++++----
 .../spotless/npm/NpmFormatterStepStateBase.java      | 12 +++++++-----
 .../diffplug/spotless/npm/PrettierFormatterStep.java | 11 ++++++-----
 .../diffplug/spotless/npm/TsFmtFormatterStep.java    | 11 ++++++-----
 .../spotless/glue/pom/SortPomFormatterFunc.java      | 11 ++++++-----
 .../diffplug/gradle/spotless/GradleProvisioner.java  | 11 +++++------
 10 files changed, 45 insertions(+), 38 deletions(-)

diff --git a/gradle/javadoc/java8/package-list b/gradle/javadoc/java8/package-list
index 351c186855..496d90dbfa 100644
--- a/gradle/javadoc/java8/package-list
+++ b/gradle/javadoc/java8/package-list
@@ -55,7 +55,6 @@ java.util.concurrent.atomic
 java.util.concurrent.locks
 java.util.function
 java.util.jar
-java.util.logging
 java.util.prefs
 java.util.regex
 java.util.spi
diff --git a/lib/build.gradle b/lib/build.gradle
index 90d985ad69..b122cb42ee 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -21,6 +21,7 @@ for (glue in NEEDS_GLUE) {
 }
 
 dependencies {
+	compileOnly 'org.slf4j:slf4j-api:1.7.35'
 	// zero runtime reqs is a hard requirements for spotless-lib
 	// if you need a dep, put it in lib-extra
 	testImplementation "org.junit.jupiter:junit-jupiter:$VER_JUNIT"
@@ -29,6 +30,7 @@ dependencies {
 
 	// used for pom sorting
 	sortPomCompileOnly 'com.github.ekryd.sortpom:sortpom-sorter:3.0.0'
+	sortPomCompileOnly 'org.slf4j:slf4j-api:1.7.35'
 
 	palantirJavaFormatCompileOnly 'com.palantir.javaformat:palantir-java-format:1.1.0'
 
diff --git a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
index 8aa7510dc3..061224a819 100644
--- a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
+++ b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2021-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatExceptionPolicyLegacy.java b/lib/src/main/java/com/diffplug/spotless/FormatExceptionPolicyLegacy.java
index df95542a44..14f36da94e 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatExceptionPolicyLegacy.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatExceptionPolicyLegacy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,13 +15,13 @@
  */
 package com.diffplug.spotless;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class FormatExceptionPolicyLegacy extends NoLambda.EqualityBasedOnSerialization implements FormatExceptionPolicy {
 	private static final long serialVersionUID = 1L;
 
-	private static final Logger logger = Logger.getLogger(Formatter.class.getName());
+	private static final Logger logger = LoggerFactory.getLogger(Formatter.class.getName());
 
 	@Override
 	public void handleError(Throwable e, FormatterStep step, String relativePath) {
@@ -34,10 +34,10 @@ public void handleError(Throwable e, FormatterStep step, String relativePath) {
 	}
 
 	static void error(Throwable e, FormatterStep step, String relativePath) {
-		logger.log(Level.SEVERE, "Step '" + step.getName() + "' found problem in '" + relativePath + "':\n" + e.getMessage(), e);
+		logger.error("Step '" + step.getName() + "' found problem in '" + relativePath + "':\n" + e.getMessage(), e);
 	}
 
 	static void warning(Throwable e, FormatterStep step, String relativePath) {
-		logger.log(Level.WARNING, "Unable to apply step '" + step.getName() + "' to '" + relativePath + "'", e);
+		logger.warn("Unable to apply step '" + step.getName() + "' to '" + relativePath + "'", e);
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/markdown/FreshMarkStep.java b/lib/src/main/java/com/diffplug/spotless/markdown/FreshMarkStep.java
index 2190af88e7..d972dd9480 100644
--- a/lib/src/main/java/com/diffplug/spotless/markdown/FreshMarkStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/markdown/FreshMarkStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,9 @@
 import java.util.Objects;
 import java.util.TreeMap;
 import java.util.function.Consumer;
-import java.util.logging.Logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
@@ -78,8 +80,8 @@ private static class State implements Serializable {
 		}
 
 		FormatterFunc createFormat() throws Exception {
-			Logger logger = Logger.getLogger(FreshMarkStep.class.getName());
-			Consumer<String> loggingStream = logger::warning;
+			Logger logger = LoggerFactory.getLogger(FreshMarkStep.class.getName());
+			Consumer<String> loggingStream = logger::warn;
 
 			ClassLoader classLoader = jarState.getClassLoader();
 
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
index 48bec00c8f..d8127d10d2 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,9 @@
 import java.util.Map.Entry;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import java.util.logging.Logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.diffplug.spotless.FileSignature;
 import com.diffplug.spotless.FormatterFunc;
@@ -36,7 +38,7 @@
 
 abstract class NpmFormatterStepStateBase implements Serializable {
 
-	private static final Logger logger = Logger.getLogger(NpmFormatterStepStateBase.class.getName());
+	private static final Logger logger = LoggerFactory.getLogger(NpmFormatterStepStateBase.class.getName());
 
 	private static final long serialVersionUID = 1460749955865959948L;
 
@@ -166,13 +168,13 @@ public String getBaseUrl() {
 		@Override
 		public void close() throws Exception {
 			try {
-				logger.fine("Closing npm server in directory <" + serverPortFile.getParent() + "> and port <" + serverPort + ">");
+				logger.trace("Closing npm server in directory <" + serverPortFile.getParent() + "> and port <" + serverPort + ">");
 				if (server.isAlive()) {
 					boolean ended = server.waitFor(5, TimeUnit.SECONDS);
 					if (!ended) {
 						logger.info("Force-Closing npm server in directory <" + serverPortFile.getParent() + "> and port <" + serverPort + ">");
 						server.destroyForcibly().waitFor();
-						logger.fine("Force-Closing npm server in directory <" + serverPortFile.getParent() + "> and port <" + serverPort + "> -- Finished");
+						logger.trace("Force-Closing npm server in directory <" + serverPortFile.getParent() + "> and port <" + serverPort + "> -- Finished");
 					}
 				}
 			} finally {
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
index 0cd0f5f558..a5183d2e9c 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,11 +23,12 @@
 import java.util.Collections;
 import java.util.Map;
 import java.util.TreeMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import javax.annotation.Nonnull;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterFunc.Closeable;
 import com.diffplug.spotless.FormatterStep;
@@ -36,7 +37,7 @@
 
 public class PrettierFormatterStep {
 
-	private static final Logger logger = Logger.getLogger(PrettierFormatterStep.class.getName());
+	private static final Logger logger = LoggerFactory.getLogger(PrettierFormatterStep.class.getName());
 
 	public static final String NAME = "prettier-format";
 
@@ -95,7 +96,7 @@ private void endServer(PrettierRestService restService, ServerProcessInfo restSe
 			try {
 				restService.shutdown();
 			} catch (Throwable t) {
-				logger.log(Level.INFO, "Failed to request shutdown of rest service via api. Trying via process.", t);
+				logger.info("Failed to request shutdown of rest service via api. Trying via process.", t);
 			}
 			restServer.close();
 		}
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java
index a87bc0ebae..045c8a0df3 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,12 +21,13 @@
 import java.io.IOException;
 import java.io.Serializable;
 import java.util.*;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterFunc.Closeable;
 import com.diffplug.spotless.FormatterStep;
@@ -35,7 +36,7 @@
 
 public class TsFmtFormatterStep {
 
-	private static final Logger logger = Logger.getLogger(TsFmtFormatterStep.class.getName());
+	private static final Logger logger = LoggerFactory.getLogger(TsFmtFormatterStep.class.getName());
 
 	public static final String NAME = "tsfmt-format";
 
@@ -115,7 +116,7 @@ private void endServer(TsFmtRestService restService, ServerProcessInfo restServe
 			try {
 				restService.shutdown();
 			} catch (Throwable t) {
-				logger.log(Level.INFO, "Failed to request shutdown of rest service via api. Trying via process.", t);
+				logger.info("Failed to request shutdown of rest service via api. Trying via process.", t);
 			}
 			restServer.close();
 		}
diff --git a/lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java b/lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java
index 4a72c48fa9..909e04e589 100644
--- a/lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java
+++ b/lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2021-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,10 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.util.logging.Logger;
 
 import org.apache.commons.io.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.pom.SortPomCfg;
@@ -30,7 +31,7 @@
 import sortpom.parameter.PluginParameters;
 
 public class SortPomFormatterFunc implements FormatterFunc {
-	private static final Logger logger = Logger.getLogger(SortPomFormatterFunc.class.getName());
+	private static final Logger logger = LoggerFactory.getLogger(SortPomFormatterFunc.class.getName());
 	private final SortPomCfg cfg;
 
 	public SortPomFormatterFunc(SortPomCfg cfg) {
@@ -61,7 +62,7 @@ public String apply(String input) throws Exception {
 	private static class MySortPomLogger implements SortPomLogger {
 		@Override
 		public void warn(String content) {
-			logger.warning(content);
+			logger.warn(content);
 		}
 
 		@Override
@@ -71,7 +72,7 @@ public void info(String content) {
 
 		@Override
 		public void error(String content) {
-			logger.severe(content);
+			logger.error(content);
 		}
 	}
 }
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
index 240ffcdcdf..7c005cd471 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import org.gradle.api.GradleException;
 import org.gradle.api.Project;
@@ -30,6 +28,8 @@
 import org.gradle.api.artifacts.dsl.DependencyHandler;
 import org.gradle.api.attributes.Bundling;
 import org.gradle.api.initialization.dsl.ScriptHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.diffplug.common.base.Unhandled;
 import com.diffplug.common.collect.ImmutableList;
@@ -127,8 +127,7 @@ private static Provisioner forConfigurationContainer(Project project, Configurat
 				if (!projName.isEmpty()) {
 					projName = projName + "/";
 				}
-				logger.log(
-						Level.SEVERE,
+				logger.error(
 						"You need to add a repository containing the '" + mavenCoords + "' artifact in '" + projName + "build.gradle'.\n" +
 								"E.g.: 'repositories { mavenCentral() }'",
 						e);
@@ -137,7 +136,7 @@ private static Provisioner forConfigurationContainer(Project project, Configurat
 		};
 	}
 
-	private static final Logger logger = Logger.getLogger(GradleProvisioner.class.getName());
+	private static final Logger logger = LoggerFactory.getLogger(GradleProvisioner.class.getName());
 
 	/** Models a request to the provisioner. */
 	private static class Request {

From 166ab53bbe4d8cd0c510e954744c638304aa6d0a Mon Sep 17 00:00:00 2001
From: Jamie Tanna <jamie@jamietanna.co.uk>
Date: Fri, 4 Feb 2022 11:50:25 +0000
Subject: [PATCH 0043/2068] Remove string concatenation from log messages

As it removes unnecessary String concatenation at runtime, if the log
levels aren't enabled.
---
 .../diffplug/spotless/FormatExceptionPolicyLegacy.java    | 4 ++--
 .../diffplug/spotless/npm/NpmFormatterStepStateBase.java  | 8 +++++---
 .../com/diffplug/gradle/spotless/GradleProvisioner.java   | 3 ++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/FormatExceptionPolicyLegacy.java b/lib/src/main/java/com/diffplug/spotless/FormatExceptionPolicyLegacy.java
index 14f36da94e..0b43ad961b 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatExceptionPolicyLegacy.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatExceptionPolicyLegacy.java
@@ -34,10 +34,10 @@ public void handleError(Throwable e, FormatterStep step, String relativePath) {
 	}
 
 	static void error(Throwable e, FormatterStep step, String relativePath) {
-		logger.error("Step '" + step.getName() + "' found problem in '" + relativePath + "':\n" + e.getMessage(), e);
+		logger.error("Step '{}' found problem in '{}':\n{}", step.getName(), relativePath, e.getMessage(), e);
 	}
 
 	static void warning(Throwable e, FormatterStep step, String relativePath) {
-		logger.warn("Unable to apply step '" + step.getName() + "' to '" + relativePath + "'", e);
+		logger.warn("Unable to apply step '{}' to '{}'", step.getName(), relativePath, e);
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
index d8127d10d2..395a186ce1 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
@@ -168,13 +168,15 @@ public String getBaseUrl() {
 		@Override
 		public void close() throws Exception {
 			try {
-				logger.trace("Closing npm server in directory <" + serverPortFile.getParent() + "> and port <" + serverPort + ">");
+				logger.trace("Closing npm server in directory <{}> and port <{}>",
+						serverPortFile.getParent(), serverPort);
+
 				if (server.isAlive()) {
 					boolean ended = server.waitFor(5, TimeUnit.SECONDS);
 					if (!ended) {
-						logger.info("Force-Closing npm server in directory <" + serverPortFile.getParent() + "> and port <" + serverPort + ">");
+						logger.info("Force-Closing npm server in directory <{}> and port <{}>", serverPortFile.getParent(), serverPort);
 						server.destroyForcibly().waitFor();
-						logger.trace("Force-Closing npm server in directory <" + serverPortFile.getParent() + "> and port <" + serverPort + "> -- Finished");
+						logger.trace("Force-Closing npm server in directory <{}> and port <{}> -- Finished", serverPortFile.getParent(), serverPort);
 					}
 				}
 			} finally {
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
index 7c005cd471..bce04380c5 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
@@ -128,8 +128,9 @@ private static Provisioner forConfigurationContainer(Project project, Configurat
 					projName = projName + "/";
 				}
 				logger.error(
-						"You need to add a repository containing the '" + mavenCoords + "' artifact in '" + projName + "build.gradle'.\n" +
+						"You need to add a repository containing the '{}' artifact in '{}build.gradle'.\n" +
 								"E.g.: 'repositories { mavenCentral() }'",
+						mavenCoords, projName,
 						e);
 				throw e;
 			}

From a8b01b808a3f57dda08d2b92cc7500f1cc0ea006 Mon Sep 17 00:00:00 2001
From: Jamie Tanna <jamie@jamietanna.co.uk>
Date: Sun, 6 Feb 2022 13:12:53 +0000
Subject: [PATCH 0044/2068] Update CHANGES with SLF4J logging changes

---
 CHANGES.md               | 4 ++++
 plugin-gradle/CHANGES.md | 4 ++++
 plugin-maven/CHANGES.md  | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 29fd6d9375..508fee230a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,6 +11,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 
+### Changed
+
+* Use SLF4J for logging ([#1116](https://github.com/diffplug/spotless/issues/1116))
+
 ## [2.22.2] - 2022-02-09
 ### Changed
 * Bump default ktfmt `0.30` -> `0.31` ([#1118](https://github.com/diffplug/spotless/pull/1118)).
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 6c2a6cd4da..3c01b42312 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -4,6 +4,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 
+### Changed
+
+* Use SLF4J for logging ([#1116](https://github.com/diffplug/spotless/issues/1116))
+
 ## [6.2.2] - 2022-02-09
 ### Changed
 * Bump default ktfmt `0.30` -> `0.31` ([#1118](https://github.com/diffplug/spotless/pull/1118)).
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 8d277d1703..4bf305b5e3 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -4,6 +4,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 
+### Changed
+
+* Use SLF4J for logging ([#1116](https://github.com/diffplug/spotless/issues/1116))
+
 ## [2.20.2] - 2022-02-09
 ### Changed
 * Bump default ktfmt `0.30` -> `0.31` ([#1118](https://github.com/diffplug/spotless/pull/1118)).

From 85d15b59113944fb133e8445ec8bb8a7d591f6c6 Mon Sep 17 00:00:00 2001
From: Jamie Tanna <jamie@jamietanna.co.uk>
Date: Tue, 15 Feb 2022 09:21:53 +0000
Subject: [PATCH 0045/2068] Remove unnecessary `.getName()`s on logger creation

As SLF4J allows passing in a `Class<?>`, instead of a `String` for the
class name, we can simplify interactions with the logger creations.
---
 .../java/com/diffplug/spotless/FormatExceptionPolicyLegacy.java | 2 +-
 .../main/java/com/diffplug/spotless/markdown/FreshMarkStep.java | 2 +-
 .../com/diffplug/spotless/npm/NpmFormatterStepStateBase.java    | 2 +-
 .../java/com/diffplug/spotless/npm/PrettierFormatterStep.java   | 2 +-
 .../main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java | 2 +-
 .../com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java    | 2 +-
 .../java/com/diffplug/gradle/spotless/GradleProvisioner.java    | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/FormatExceptionPolicyLegacy.java b/lib/src/main/java/com/diffplug/spotless/FormatExceptionPolicyLegacy.java
index 0b43ad961b..93ca5d05b6 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatExceptionPolicyLegacy.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatExceptionPolicyLegacy.java
@@ -21,7 +21,7 @@
 class FormatExceptionPolicyLegacy extends NoLambda.EqualityBasedOnSerialization implements FormatExceptionPolicy {
 	private static final long serialVersionUID = 1L;
 
-	private static final Logger logger = LoggerFactory.getLogger(Formatter.class.getName());
+	private static final Logger logger = LoggerFactory.getLogger(Formatter.class);
 
 	@Override
 	public void handleError(Throwable e, FormatterStep step, String relativePath) {
diff --git a/lib/src/main/java/com/diffplug/spotless/markdown/FreshMarkStep.java b/lib/src/main/java/com/diffplug/spotless/markdown/FreshMarkStep.java
index d972dd9480..2591cac7a5 100644
--- a/lib/src/main/java/com/diffplug/spotless/markdown/FreshMarkStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/markdown/FreshMarkStep.java
@@ -80,7 +80,7 @@ private static class State implements Serializable {
 		}
 
 		FormatterFunc createFormat() throws Exception {
-			Logger logger = LoggerFactory.getLogger(FreshMarkStep.class.getName());
+			Logger logger = LoggerFactory.getLogger(FreshMarkStep.class);
 			Consumer<String> loggingStream = logger::warn;
 
 			ClassLoader classLoader = jarState.getClassLoader();
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
index 395a186ce1..2e8d80e471 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
@@ -38,7 +38,7 @@
 
 abstract class NpmFormatterStepStateBase implements Serializable {
 
-	private static final Logger logger = LoggerFactory.getLogger(NpmFormatterStepStateBase.class.getName());
+	private static final Logger logger = LoggerFactory.getLogger(NpmFormatterStepStateBase.class);
 
 	private static final long serialVersionUID = 1460749955865959948L;
 
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
index a5183d2e9c..49d692d62c 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
@@ -37,7 +37,7 @@
 
 public class PrettierFormatterStep {
 
-	private static final Logger logger = LoggerFactory.getLogger(PrettierFormatterStep.class.getName());
+	private static final Logger logger = LoggerFactory.getLogger(PrettierFormatterStep.class);
 
 	public static final String NAME = "prettier-format";
 
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java
index 045c8a0df3..14080ecf56 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java
@@ -36,7 +36,7 @@
 
 public class TsFmtFormatterStep {
 
-	private static final Logger logger = LoggerFactory.getLogger(TsFmtFormatterStep.class.getName());
+	private static final Logger logger = LoggerFactory.getLogger(TsFmtFormatterStep.class);
 
 	public static final String NAME = "tsfmt-format";
 
diff --git a/lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java b/lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java
index 909e04e589..22a0249634 100644
--- a/lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java
+++ b/lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java
@@ -31,7 +31,7 @@
 import sortpom.parameter.PluginParameters;
 
 public class SortPomFormatterFunc implements FormatterFunc {
-	private static final Logger logger = LoggerFactory.getLogger(SortPomFormatterFunc.class.getName());
+	private static final Logger logger = LoggerFactory.getLogger(SortPomFormatterFunc.class);
 	private final SortPomCfg cfg;
 
 	public SortPomFormatterFunc(SortPomCfg cfg) {
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
index bce04380c5..4ef8521412 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
@@ -137,7 +137,7 @@ private static Provisioner forConfigurationContainer(Project project, Configurat
 		};
 	}
 
-	private static final Logger logger = LoggerFactory.getLogger(GradleProvisioner.class.getName());
+	private static final Logger logger = LoggerFactory.getLogger(GradleProvisioner.class);
 
 	/** Models a request to the provisioner. */
 	private static class Request {

From e0e91be8139fb74666f83728014557867c680edd Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 15 Feb 2022 12:34:12 -0800
Subject: [PATCH 0046/2068] Tweak changelogs.

---
 CHANGES.md               | 2 --
 plugin-gradle/CHANGES.md | 2 --
 plugin-maven/CHANGES.md  | 2 --
 3 files changed, 6 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 8e6f79339f..56de7ed104 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,9 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Added support for JSON formatting based on [Gson](https://github.com/google/gson) ([#1125](https://github.com/diffplug/spotless/pull/1125)).
-
 ### Changed
-
 * Use SLF4J for logging ([#1116](https://github.com/diffplug/spotless/issues/1116))
 
 ## [2.22.2] - 2022-02-09
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 58030e0527..3c7de63ddf 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,9 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Added support for JSON formatting based on [Gson](https://github.com/google/gson) ([#1125](https://github.com/diffplug/spotless/pull/1125)).
-
 ### Changed
-
 * Use SLF4J for logging ([#1116](https://github.com/diffplug/spotless/issues/1116))
 
 ## [6.2.2] - 2022-02-09
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 4bf305b5e3..99bf40a44a 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,9 +3,7 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
-
 ### Changed
-
 * Use SLF4J for logging ([#1116](https://github.com/diffplug/spotless/issues/1116))
 
 ## [2.20.2] - 2022-02-09

From b10ea0e22a60e902ff70e97841eb01cfd8236a04 Mon Sep 17 00:00:00 2001
From: circleci <circleci@291b9c53445e>
Date: Tue, 15 Feb 2022 21:54:57 +0000
Subject: [PATCH 0047/2068] Published lib/2.23.0

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 56de7ed104..36be0237d7 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.23.0] - 2022-02-15
 ### Added
 * Added support for JSON formatting based on [Gson](https://github.com/google/gson) ([#1125](https://github.com/diffplug/spotless/pull/1125)).
 ### Changed

From d559a6b131c6bd41e264e3e67c55674e34e1aaeb Mon Sep 17 00:00:00 2001
From: circleci <circleci@3305c3c3996c>
Date: Tue, 15 Feb 2022 21:59:50 +0000
Subject: [PATCH 0048/2068] Published gradle/6.3.0

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 46 ++++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 3c7de63ddf..02f58ce41a 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [6.3.0] - 2022-02-15
 ### Added
 * Added support for JSON formatting based on [Gson](https://github.com/google/gson) ([#1125](https://github.com/diffplug/spotless/pull/1125)).
 ### Changed
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 7a6089850c..2039ed92d3 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -18,9 +18,9 @@ output = [
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
 [![Maven central](https://img.shields.io/badge/mavencentral-yes-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/index.html)
 [![License Apache](https://img.shields.io/badge/license-apache-blue.svg)](https://tldrlegal.com/license/apache-license-2.0-(apache-2.0))
-[![Changelog](https://img.shields.io/badge/changelog-6.2.2-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-6.3.0-blue.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)
@@ -126,10 +126,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -141,7 +141,7 @@ If you're stuck on an older version of Gradle, `id 'com.diffplug.gradle.spotless
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -248,8 +248,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -300,8 +300,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -359,7 +359,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -391,7 +391,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -423,7 +423,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -457,7 +457,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -478,7 +478,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -503,7 +503,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -543,7 +543,7 @@ sql.formatter.indent.size=4
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -586,7 +586,7 @@ For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#n
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -811,7 +811,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -878,9 +878,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -913,11 +913,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.2.2/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From 62e2b782a14676ec43647b0726f821da061e10dd Mon Sep 17 00:00:00 2001
From: Jan DHollander <jan.dhollander@bricsys247.com>
Date: Thu, 17 Feb 2022 13:02:11 +0100
Subject: [PATCH 0049/2068] #1132 - Add magic value to disable ratchetFrom

---
 .../spotless/maven/AbstractSpotlessMojo.java  | 12 +++++++++---
 .../spotless/maven/FormatterFactory.java      | 19 ++++++++++++++++---
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
index 1b5abe9f0c..274b225114 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
@@ -15,8 +15,6 @@
  */
 package com.diffplug.spotless.maven;
 
-import static java.util.stream.Collectors.toList;
-
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
@@ -71,10 +69,16 @@
 import com.diffplug.spotless.maven.sql.Sql;
 import com.diffplug.spotless.maven.typescript.Typescript;
 
+import static java.util.stream.Collectors.toList;
+
 public abstract class AbstractSpotlessMojo extends AbstractMojo {
 	private static final String DEFAULT_INDEX_FILE_NAME = "spotless-index";
 	private static final String DEFAULT_ENCODING = "UTF-8";
 	private static final String DEFAULT_LINE_ENDINGS = "GIT_ATTRIBUTES";
+
+	/** Value to allow unsetting the ratchet inherited from parent pom configuration. */
+	static final String RATCHETFROM_NONE = "NONE";
+
 	static final String GOAL_CHECK = "check";
 	static final String GOAL_APPLY = "apply";
 
@@ -302,7 +306,9 @@ private FormatterConfig getFormatterConfig() {
 		Provisioner provisioner = MavenProvisioner.create(resolver);
 		List<FormatterStepFactory> formatterStepFactories = getFormatterStepFactories();
 		FileLocator fileLocator = getFileLocator();
-		return new FormatterConfig(baseDir, encoding, lineEndings, Optional.ofNullable(ratchetFrom), provisioner, fileLocator, formatterStepFactories, Optional.ofNullable(setLicenseHeaderYearsFromGitHistory));
+		final Optional<String> optionalRatchetFrom = Optional.ofNullable(this.ratchetFrom)
+			.filter(ratchet -> !RATCHETFROM_NONE.equals(ratchet));
+		return new FormatterConfig(baseDir, encoding, lineEndings, optionalRatchetFrom, provisioner, fileLocator, formatterStepFactories, Optional.ofNullable(setLicenseHeaderYearsFromGitHistory));
 	}
 
 	private FileLocator getFileLocator() {
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java
index c06822486c..8e08c3903b 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java
@@ -15,8 +15,6 @@
  */
 package com.diffplug.spotless.maven;
 
-import static java.util.Collections.emptySet;
-
 import java.io.File;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
@@ -35,7 +33,20 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.LineEnding;
 import com.diffplug.spotless.generic.PipeStepPair;
-import com.diffplug.spotless.maven.generic.*;
+import com.diffplug.spotless.maven.generic.EclipseWtp;
+import com.diffplug.spotless.maven.generic.EndWithNewline;
+import com.diffplug.spotless.maven.generic.Indent;
+import com.diffplug.spotless.maven.generic.Jsr223;
+import com.diffplug.spotless.maven.generic.LicenseHeader;
+import com.diffplug.spotless.maven.generic.NativeCmd;
+import com.diffplug.spotless.maven.generic.Prettier;
+import com.diffplug.spotless.maven.generic.Replace;
+import com.diffplug.spotless.maven.generic.ReplaceRegex;
+import com.diffplug.spotless.maven.generic.ToggleOffOn;
+import com.diffplug.spotless.maven.generic.TrimTrailingWhitespace;
+
+import static com.diffplug.spotless.maven.AbstractSpotlessMojo.RATCHETFROM_NONE;
+import static java.util.Collections.emptySet;
 
 public abstract class FormatterFactory {
 	@Parameter
@@ -159,6 +170,8 @@ private LineEnding lineEndings(FormatterConfig config) {
 	Optional<String> ratchetFrom(FormatterConfig config) {
 		if (RATCHETFROM_NOT_SET_AT_FORMAT_LEVEL.equals(ratchetFrom)) {
 			return config.getRatchetFrom();
+		} else if (RATCHETFROM_NONE.equals(ratchetFrom)) {
+			return Optional.empty();
 		} else {
 			return Optional.ofNullable(ratchetFrom);
 		}

From edbad155dd4e0d8da6cd1bc5a21969c020a3462e Mon Sep 17 00:00:00 2001
From: Jan DHollander <jan.dhollander@bricsys247.com>
Date: Fri, 18 Feb 2022 09:07:57 +0100
Subject: [PATCH 0050/2068] Add info to readme and execute spotlessApply

---
 plugin-maven/README.md                                    | 8 ++++++++
 .../com/diffplug/spotless/maven/AbstractSpotlessMojo.java | 6 +++---
 .../com/diffplug/spotless/maven/FormatterFactory.java     | 8 ++++----
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 01688eb9b7..024b1107fe 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -999,6 +999,14 @@ However, we strongly recommend that you use a non-local branch, such as a tag or
 
 This is especially helpful for injecting accurate copyright dates using the [license step](#license-header).
 
+You can explicitly disable ratchet functionality by providing the value 'NONE':
+```xml
+<configuration>
+  <ratchetFrom>NONE</ratchetFrom>
+</configuration>
+```
+This is useful for disabling the ratchet functionality in child projects where the parent defines a ratchetFrom value.
+
 ## `spotless:off` and `spotless:on`
 
 Sometimes there is a chunk of code  which you have carefully handcrafted, and you would like to exclude just this one little part from getting clobbered by the autoformat. Some formatters have a way to do this, many don't, but who cares. If you setup your spotless like this:
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
index 274b225114..c68733f387 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
@@ -15,6 +15,8 @@
  */
 package com.diffplug.spotless.maven;
 
+import static java.util.stream.Collectors.toList;
+
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
@@ -69,8 +71,6 @@
 import com.diffplug.spotless.maven.sql.Sql;
 import com.diffplug.spotless.maven.typescript.Typescript;
 
-import static java.util.stream.Collectors.toList;
-
 public abstract class AbstractSpotlessMojo extends AbstractMojo {
 	private static final String DEFAULT_INDEX_FILE_NAME = "spotless-index";
 	private static final String DEFAULT_ENCODING = "UTF-8";
@@ -307,7 +307,7 @@ private FormatterConfig getFormatterConfig() {
 		List<FormatterStepFactory> formatterStepFactories = getFormatterStepFactories();
 		FileLocator fileLocator = getFileLocator();
 		final Optional<String> optionalRatchetFrom = Optional.ofNullable(this.ratchetFrom)
-			.filter(ratchet -> !RATCHETFROM_NONE.equals(ratchet));
+				.filter(ratchet -> !RATCHETFROM_NONE.equals(ratchet));
 		return new FormatterConfig(baseDir, encoding, lineEndings, optionalRatchetFrom, provisioner, fileLocator, formatterStepFactories, Optional.ofNullable(setLicenseHeaderYearsFromGitHistory));
 	}
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java
index 8e08c3903b..d5fbe60370 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,9 @@
  */
 package com.diffplug.spotless.maven;
 
+import static com.diffplug.spotless.maven.AbstractSpotlessMojo.RATCHETFROM_NONE;
+import static java.util.Collections.emptySet;
+
 import java.io.File;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
@@ -45,9 +48,6 @@
 import com.diffplug.spotless.maven.generic.ToggleOffOn;
 import com.diffplug.spotless.maven.generic.TrimTrailingWhitespace;
 
-import static com.diffplug.spotless.maven.AbstractSpotlessMojo.RATCHETFROM_NONE;
-import static java.util.Collections.emptySet;
-
 public abstract class FormatterFactory {
 	@Parameter
 	private String encoding;

From bd5548d40a6961c864951fb310b414bfb9f07724 Mon Sep 17 00:00:00 2001
From: Jan DHollander <jan.dhollander@bricsys247.com>
Date: Fri, 18 Feb 2022 09:10:13 +0100
Subject: [PATCH 0051/2068] Add to changelog

---
 plugin-maven/CHANGES.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 99bf40a44a..ff27aacf48 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,9 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* Magic value 'NONE' for disabling ratchet functionality ([#1134](https://github.com/diffplug/spotless/issues/1134))
+
 ### Changed
 * Use SLF4J for logging ([#1116](https://github.com/diffplug/spotless/issues/1116))
 

From 57dabaa48d3626d750218c7726d0c35d706beabe Mon Sep 17 00:00:00 2001
From: circleci <circleci@bc606a6db147>
Date: Sat, 19 Feb 2022 05:18:00 +0000
Subject: [PATCH 0052/2068] Published maven/2.21.0

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index ff27aacf48..a41995ef1f 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.21.0] - 2022-02-19
 ### Added
 * Magic value 'NONE' for disabling ratchet functionality ([#1134](https://github.com/diffplug/spotless/issues/1134))
 
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 024b1107fe..0a77666e45 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -12,8 +12,8 @@ output = [
   ].join('\n');
 -->
 [![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.20.2/index.html)
-[![Changelog](https://img.shields.io/badge/changelog-2.20.2-brightgreen.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.21.0/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.21.0-brightgreen.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)

From 80c4344eda32723a6f2194d7622e41b6633efc79 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Feb 2022 12:04:16 +0000
Subject: [PATCH 0053/2068] Bump com.github.spotbugs from 5.0.5 to 5.0.6

Bumps com.github.spotbugs from 5.0.5 to 5.0.6.

---
updated-dependencies:
- dependency-name: com.github.spotbugs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 570d9c3d1e..0d09df4325 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
 		// https://github.com/gradle-nexus/publish-plugin/releases
 		id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
 		// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
-		id 'com.github.spotbugs'                   version '5.0.5'
+		id 'com.github.spotbugs'                   version '5.0.6'
 		// https://github.com/diffplug/spotless-changelog
 		id 'com.diffplug.spotless-changelog'       version '2.3.2'
 		// https://github.com/diffplug/goomph/blob/main/CHANGES.md

From aba11e2ba19f4410c4020d053e97370f80511dd8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Feb 2022 12:04:17 +0000
Subject: [PATCH 0054/2068] Bump com.diffplug.spotless from 6.2.2 to 6.3.0

Bumps com.diffplug.spotless from 6.2.2 to 6.3.0.

---
updated-dependencies:
- dependency-name: com.diffplug.spotless
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 570d9c3d1e..72e5cc595e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,6 @@
 pluginManagement {
 	plugins {
-		id 'com.diffplug.spotless'                 version '6.2.2'
+		id 'com.diffplug.spotless'                 version '6.3.0'
 		// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
 		id 'com.gradle.plugin-publish'             version '0.20.0'
 		// https://github.com/gradle-nexus/publish-plugin/releases

From c0759b21f964d3e6ec85390b5f4744e7a61a68b2 Mon Sep 17 00:00:00 2001
From: x80486 <glad.text9491@fastmail.com>
Date: Tue, 22 Feb 2022 07:40:46 -0500
Subject: [PATCH 0055/2068] Method encoding should accept
 java.nio.charset.Charset type

---
 .../com/diffplug/gradle/spotless/SpotlessExtension.java  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
index 2fd3033f5f..e85c26f25e 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
@@ -73,6 +73,11 @@ public Charset getEncoding() {
 		return encoding;
 	}
 
+	/** Sets encoding to use (defaults to UTF_8). */
+	public void setEncoding(Charset charset) {
+		encoding = requireNonNull(charset);
+	}
+
 	/** Sets encoding to use (defaults to UTF_8). */
 	public void setEncoding(String name) {
 		requireNonNull(name);
@@ -80,8 +85,8 @@ public void setEncoding(String name) {
 	}
 
 	/** Sets encoding to use (defaults to UTF_8). */
-	public void setEncoding(Charset charset) {
-		encoding = requireNonNull(charset);
+	public void encoding(Charset charset) {
+		setEncoding(charset);
 	}
 
 	/** Sets encoding to use (defaults to UTF_8). */

From 13ef3fbd4e3e9e4b88e18d0c4688c26c1c36ff78 Mon Sep 17 00:00:00 2001
From: x80486 <glad.text9491@fastmail.com>
Date: Tue, 22 Feb 2022 07:56:03 -0500
Subject: [PATCH 0056/2068] Update "Unreleased" section in relevant projects
 for enhancement described in GitHub's Issue #1128

---
 plugin-gradle/CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 02f58ce41a..9f22285976 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Added
+* Accept `java.nio.charset.Charset` type when setting the character encoding via `encoding` ([#1128](https://github.com/diffplug/spotless/issues/1128))
 
 ## [6.3.0] - 2022-02-15
 ### Added

From 9eb082e84ca99984b4eb490b08b7f4ded0776456 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Feb 2022 12:03:42 +0000
Subject: [PATCH 0057/2068] Bump com.adarshr.test-logger from 3.1.0 to 3.2.0

Bumps com.adarshr.test-logger from 3.1.0 to 3.2.0.

---
updated-dependencies:
- dependency-name: com.adarshr.test-logger
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 4c23fbfcad..cb626e1b3d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -14,7 +14,7 @@ pluginManagement {
 		// https://github.com/gradle/test-retry-gradle-plugin/releases
 		id 'org.gradle.test-retry'                 version '1.3.1'
 		// https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md
-		id 'com.adarshr.test-logger'               version '3.1.0'
+		id 'com.adarshr.test-logger'               version '3.2.0'
 	}
 }
 plugins {

From fa0d153b2a2c0af7388e16b589232d396c41076a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Mar 2022 12:02:57 +0000
Subject: [PATCH 0058/2068] Bump actions/checkout from 2 to 3

Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml           | 2 +-
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 8af7ad4b44..59bac96914 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -30,7 +30,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 405a2b3065..8bfd0dcf51 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -6,5 +6,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: gradle/wrapper-validation-action@v1

From af4cd2232dd38c51ec50a3969eb1e1cd53b4843d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Mar 2022 19:07:35 +0000
Subject: [PATCH 0059/2068] Bump slf4j-api from 1.7.35 to 1.7.36

Bumps [slf4j-api](https://github.com/qos-ch/slf4j) from 1.7.35 to 1.7.36.
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.35...v_1.7.36)

---
updated-dependencies:
- dependency-name: org.slf4j:slf4j-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 lib/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index b122cb42ee..567e1f786c 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -21,7 +21,7 @@ for (glue in NEEDS_GLUE) {
 }
 
 dependencies {
-	compileOnly 'org.slf4j:slf4j-api:1.7.35'
+	compileOnly 'org.slf4j:slf4j-api:1.7.36'
 	// zero runtime reqs is a hard requirements for spotless-lib
 	// if you need a dep, put it in lib-extra
 	testImplementation "org.junit.jupiter:junit-jupiter:$VER_JUNIT"

From db9a14f09f3ba708f51e70224aca52a1317045f4 Mon Sep 17 00:00:00 2001
From: DDeg <dimoness7@narod.ru>
Date: Fri, 11 Mar 2022 10:37:07 +0300
Subject: [PATCH 0060/2068] Implemented configuration options for Kotlin ktfmt
 formatter.

---
 lib/build.gradle                              |  10 ++
 .../glue/ktfmt/KtfmtFormatterFunc.java        |  88 +++++++++++++
 .../glue/ktfmt/KtfmtFormattingOptions.java    |  92 +++++++++++++
 .../spotless/glue/ktfmt/KtfmtStyle.java       |  20 +++
 .../diffplug/spotless/kotlin/KtfmtStep.java   | 124 +++++++++++++++---
 .../gradle/spotless/KotlinExtension.java      |  43 ++++--
 .../spotless/KotlinGradleExtension.java       |  38 ++++--
 .../gradle/spotless/KotlinExtensionTest.java  |  46 ++++++-
 .../diffplug/spotless/maven/kotlin/Ktfmt.java |  20 ++-
 .../spotless/maven/kotlin/KtfmtTest.java      |  20 ++-
 .../kotlin/ktfmt/max-width-dropbox.clean      |  12 ++
 .../resources/kotlin/ktfmt/max-width.clean    |  12 ++
 .../resources/kotlin/ktfmt/max-width.dirty    |  12 ++
 .../spotless/kotlin/KtfmtStepTest.java        |   6 +-
 14 files changed, 499 insertions(+), 44 deletions(-)
 create mode 100644 lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtFormatterFunc.java
 create mode 100644 lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtFormattingOptions.java
 create mode 100644 lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtStyle.java
 create mode 100644 testlib/src/main/resources/kotlin/ktfmt/max-width-dropbox.clean
 create mode 100644 testlib/src/main/resources/kotlin/ktfmt/max-width.clean
 create mode 100644 testlib/src/main/resources/kotlin/ktfmt/max-width.dirty

diff --git a/lib/build.gradle b/lib/build.gradle
index 567e1f786c..a585d8328e 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -9,6 +9,7 @@ apply from: rootProject.file('gradle/java-publish.gradle')
 def NEEDS_GLUE = [
 	'sortPom',
 	'palantirJavaFormat',
+	'ktfmt',
 	'ktlint',
 	'flexmark'
 ]
@@ -34,6 +35,15 @@ dependencies {
 
 	palantirJavaFormatCompileOnly 'com.palantir.javaformat:palantir-java-format:1.1.0'
 
+	String VER_KTFMT = '0.34'
+	ktfmtCompileOnly "com.facebook:ktfmt:$VER_KTFMT"
+	String VER_KTLINT_GOOGLE_JAVA_FORMAT = '1.7' // for JDK 8 compatibility
+	ktfmtCompileOnly("com.google.googlejavaformat:google-java-format") {
+		version {
+			strictly VER_KTLINT_GOOGLE_JAVA_FORMAT
+		}
+	}
+
 	String VER_KTLINT='0.43.2'
 	ktlintCompileOnly "com.pinterest:ktlint:$VER_KTLINT"
 	ktlintCompileOnly "com.pinterest.ktlint:ktlint-core:$VER_KTLINT"
diff --git a/lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtFormatterFunc.java b/lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtFormatterFunc.java
new file mode 100644
index 0000000000..72e0e50e3c
--- /dev/null
+++ b/lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtFormatterFunc.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.glue.ktfmt;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import com.facebook.ktfmt.format.Formatter;
+import com.facebook.ktfmt.format.FormattingOptions;
+
+import com.diffplug.spotless.FormatterFunc;
+
+public final class KtfmtFormatterFunc implements FormatterFunc {
+
+	@Nonnull
+	private final KtfmtStyle style;
+
+	@Nullable
+	private final KtfmtFormattingOptions ktfmtFormattingOptions;
+
+	public KtfmtFormatterFunc() {
+		this(KtfmtStyle.DEFAULT, null);
+	}
+
+	public KtfmtFormatterFunc(@Nonnull KtfmtStyle style) {
+		this(style, null);
+	}
+
+	public KtfmtFormatterFunc(@Nullable KtfmtFormattingOptions ktfmtFormattingOptions) {
+		this(KtfmtStyle.DEFAULT, ktfmtFormattingOptions);
+	}
+
+	public KtfmtFormatterFunc(@Nonnull KtfmtStyle style, @Nullable KtfmtFormattingOptions ktfmtFormattingOptions) {
+		this.style = style;
+		this.ktfmtFormattingOptions = ktfmtFormattingOptions;
+	}
+
+	@Nonnull
+	@Override
+	public String apply(@Nonnull String input) throws Exception {
+		return Formatter.format(createFormattingOptions(), input);
+	}
+
+	private FormattingOptions createFormattingOptions() {
+		FormattingOptions formattingOptions;
+		switch (style) {
+		case DEFAULT:
+			formattingOptions = new FormattingOptions();
+			break;
+		case DROPBOX:
+			formattingOptions = Formatter.DROPBOX_FORMAT;
+			break;
+		case GOOGLE:
+			formattingOptions = Formatter.GOOGLE_FORMAT;
+			break;
+		case KOTLIN_LANG:
+			formattingOptions = Formatter.KOTLINLANG_FORMAT;
+			break;
+		default:
+			throw new IllegalStateException("Unknown formatting option");
+		}
+
+		if (ktfmtFormattingOptions != null) {
+			formattingOptions = formattingOptions.copy(
+					formattingOptions.getStyle(),
+					ktfmtFormattingOptions.getMaxWidth().orElse(formattingOptions.getMaxWidth()),
+					ktfmtFormattingOptions.getBlockIndent().orElse(formattingOptions.getBlockIndent()),
+					ktfmtFormattingOptions.getContinuationIndent().orElse(formattingOptions.getBlockIndent()),
+					ktfmtFormattingOptions.getRemoveUnusedImport().orElse(formattingOptions.getRemoveUnusedImports()),
+					formattingOptions.getDebuggingPrintOpsAfterFormatting());
+		}
+
+		return formattingOptions;
+	}
+}
diff --git a/lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtFormattingOptions.java b/lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtFormattingOptions.java
new file mode 100644
index 0000000000..ff8e522aae
--- /dev/null
+++ b/lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtFormattingOptions.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.glue.ktfmt;
+
+import java.util.Optional;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+public final class KtfmtFormattingOptions {
+
+	@Nullable
+	private Integer maxWidth;
+
+	@Nullable
+	private Integer blockIndent;
+
+	@Nullable
+	private Integer continuationIndent;
+
+	@Nullable
+	private Boolean removeUnusedImport;
+
+	public KtfmtFormattingOptions(
+			@Nullable Integer maxWidth,
+			@Nullable Integer blockIndent,
+			@Nullable Integer continuationIndent,
+			@Nullable Boolean removeUnusedImport) {
+		this.maxWidth = maxWidth;
+		this.blockIndent = blockIndent;
+		this.continuationIndent = continuationIndent;
+		this.removeUnusedImport = removeUnusedImport;
+	}
+
+	@Nonnull
+	public Optional<Integer> getMaxWidth() {
+		return Optional.ofNullable(maxWidth);
+	}
+
+	@Nonnull
+	public Optional<Integer> getBlockIndent() {
+		return Optional.ofNullable(blockIndent);
+	}
+
+	@Nonnull
+	public Optional<Integer> getContinuationIndent() {
+		return Optional.ofNullable(continuationIndent);
+	}
+
+	@Nonnull
+	public Optional<Boolean> getRemoveUnusedImport() {
+		return Optional.ofNullable(removeUnusedImport);
+	}
+
+	public void setMaxWidth(int maxWidth) {
+		if (maxWidth <= 0) {
+			throw new IllegalArgumentException("Max width cannot be negative value or 0");
+		}
+		this.maxWidth = maxWidth;
+	}
+
+	public void setBlockIndent(int blockIndent) {
+		if (blockIndent < 0) {
+			throw new IllegalArgumentException("Block indent cannot be negative value");
+		}
+		this.blockIndent = blockIndent;
+	}
+
+	public void setContinuationIndent(int continuationIndent) {
+		if (continuationIndent < 0) {
+			throw new IllegalArgumentException("Continuation indent cannot be negative value");
+		}
+		this.continuationIndent = continuationIndent;
+	}
+
+	public void setRemoveUnusedImport(boolean removeUnusedImport) {
+		this.removeUnusedImport = removeUnusedImport;
+	}
+}
diff --git a/lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtStyle.java b/lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtStyle.java
new file mode 100644
index 0000000000..34b81175ec
--- /dev/null
+++ b/lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtStyle.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.glue.ktfmt;
+
+public enum KtfmtStyle {
+	DEFAULT, DROPBOX, GOOGLE, KOTLIN_LANG
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
index 9f3b62dadb..e5e2e57f01 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
@@ -19,11 +19,18 @@
 
 import java.io.IOException;
 import java.io.Serializable;
+import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Objects;
 
-import com.diffplug.spotless.*;
+import javax.annotation.Nullable;
+
+import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.JarState;
+import com.diffplug.spotless.Provisioner;
+import com.diffplug.spotless.ThrowingEx;
 
 /**
  * Wraps up <a href="https://github.com/facebookincubator/ktfmt">ktfmt</a> as a FormatterStep.
@@ -32,7 +39,7 @@ public class KtfmtStep {
 	// prevent direct instantiation
 	private KtfmtStep() {}
 
-	private static final String DEFAULT_VERSION = "0.31";
+	private static final String DEFAULT_VERSION = "0.34";
 	static final String NAME = "ktfmt";
 	static final String PACKAGE = "com.facebook";
 	static final String MAVEN_COORDINATE = PACKAGE + ":ktfmt:";
@@ -62,7 +69,35 @@ String getSince() {
 		}
 	}
 
-	private static final String DROPBOX_STYLE_METHOD = "dropboxStyle";
+	public static class KtfmtFormattingOptions implements Serializable {
+
+		private static final long serialVersionUID = 1L;
+
+		@Nullable
+		private Integer maxWidth = null;
+
+		@Nullable
+		private Integer blockIndent = null;
+
+		@Nullable
+		private Integer continuationIndent = null;
+
+		@Nullable
+		private Boolean removeUnusedImport = null;
+
+		public KtfmtFormattingOptions() {}
+
+		public KtfmtFormattingOptions(
+				@Nullable Integer maxWidth,
+				@Nullable Integer blockIndent,
+				@Nullable Integer continuationIndent,
+				@Nullable Boolean removeUnusedImport) {
+			this.maxWidth = maxWidth;
+			this.blockIndent = blockIndent;
+			this.continuationIndent = continuationIndent;
+			this.removeUnusedImport = removeUnusedImport;
+		}
+	}
 
 	/**
 	 * The <code>format</code> method is available in the link below.
@@ -78,26 +113,21 @@ public static FormatterStep create(Provisioner provisioner) {
 
 	/** Creates a step which formats everything - code, import order, and unused imports. */
 	public static FormatterStep create(String version, Provisioner provisioner) {
-		return create(version, provisioner, DEFAULT);
+		return create(version, provisioner, null, null);
 	}
 
 	/** Creates a step which formats everything - code, import order, and unused imports. */
-	public static FormatterStep create(String version, Provisioner provisioner, Style style) {
+	public static FormatterStep create(String version, Provisioner provisioner, @Nullable Style style, @Nullable KtfmtFormattingOptions options) {
 		Objects.requireNonNull(version, "version");
 		Objects.requireNonNull(provisioner, "provisioner");
-		Objects.requireNonNull(style, "style");
 		return FormatterStep.createLazy(
-				NAME, () -> new State(version, provisioner, style), State::createFormat);
+				NAME, () -> new State(version, provisioner, style, options), State::createFormat);
 	}
 
 	public static String defaultVersion() {
 		return DEFAULT_VERSION;
 	}
 
-	public static String defaultStyle() {
-		return Style.DEFAULT.name();
-	}
-
 	static final class State implements Serializable {
 		private static final long serialVersionUID = 1L;
 
@@ -107,26 +137,90 @@ static final class State implements Serializable {
 		/**
 		 * Option that allows to apply formatting options to perform a 4 spaces block and continuation indent.
 		 */
+		@Nullable
 		private final Style style;
+		/**
+		 *
+		 */
+		@Nullable
+		private final KtfmtFormattingOptions options;
 		/** The jar that contains the formatter. */
 		final JarState jarState;
 
-		State(String version, Provisioner provisioner, Style style) throws IOException {
+		State(String version, Provisioner provisioner, @Nullable Style style, @Nullable KtfmtFormattingOptions options) throws IOException {
 			this.version = version;
+			this.options = options;
 			this.pkg = PACKAGE;
 			this.style = style;
 			this.jarState = JarState.from(MAVEN_COORDINATE + version, provisioner);
 		}
 
 		FormatterFunc createFormat() throws Exception {
-			ClassLoader classLoader = jarState.getClassLoader();
+			final ClassLoader classLoader = jarState.getClassLoader();
+
+			if (BadSemver.version(version) < BadSemver.version(0, 32)) {
+				if (options != null) {
+					throw new IllegalStateException("Ktfmt formatting options supported for version 0.32 and later");
+				}
+				return getFormatterFuncFallback(style != null ? style : DEFAULT, classLoader);
+			}
+
+			final Class<?> formatterFuncClass = classLoader.loadClass("com.diffplug.spotless.glue.ktfmt.KtfmtFormatterFunc");
+			final Class<?> ktfmtStyleClass = classLoader.loadClass("com.diffplug.spotless.glue.ktfmt.KtfmtStyle");
+			final Class<?> ktfmtFormattingOptionsClass = classLoader.loadClass("com.diffplug.spotless.glue.ktfmt.KtfmtFormattingOptions");
+
+			if (style == null && options == null) {
+				final Constructor<?> constructor = formatterFuncClass.getConstructor();
+				return (FormatterFunc) constructor.newInstance();
+			}
+
+			final Object ktfmtStyle = style == null ? null : Enum.valueOf((Class<? extends Enum>) ktfmtStyleClass, getKtfmtStyleOption(style));
+			if (options == null) {
+				final Constructor<?> constructor = formatterFuncClass.getConstructor(ktfmtStyleClass);
+				return (FormatterFunc) constructor.newInstance(ktfmtStyle);
+			}
+
+			final Constructor<?> optionsConstructor = ktfmtFormattingOptionsClass.getConstructor(
+					Integer.class, Integer.class, Integer.class, Boolean.class);
+			final Object ktfmtFormattingOptions = optionsConstructor.newInstance(
+					options.maxWidth, options.blockIndent, options.continuationIndent, options.removeUnusedImport);
+			if (style == null) {
+				final Constructor<?> constructor = formatterFuncClass.getConstructor(ktfmtFormattingOptionsClass);
+				return (FormatterFunc) constructor.newInstance(ktfmtFormattingOptions);
+			}
+
+			final Constructor<?> constructor = formatterFuncClass.getConstructor(ktfmtStyleClass, ktfmtFormattingOptionsClass);
+			return (FormatterFunc) constructor.newInstance(ktfmtStyle, ktfmtFormattingOptions);
+		}
+
+		/**
+		 * @param style
+		 * @return com.diffplug.spotless.glue.ktfmt.KtfmtStyle enum value name
+		 */
+		private String getKtfmtStyleOption(Style style) {
+			switch (style) {
+			case DEFAULT:
+				return "DEFAULT";
+			case DROPBOX:
+				return "DROPBOX";
+			case GOOGLE:
+				return "GOOGLE";
+			case KOTLINLANG:
+				return "KOTLIN_LANG";
+			default:
+				throw new IllegalStateException("Unsupported style: " + style);
+			}
+		}
+
+		private FormatterFunc getFormatterFuncFallback(Style style, ClassLoader classLoader) {
 			return input -> {
 				try {
 					if (style == DEFAULT) {
 						Method formatterMethod = getFormatterClazz(classLoader).getMethod(FORMATTER_METHOD, String.class);
 						return (String) formatterMethod.invoke(getFormatterClazz(classLoader), input);
 					} else {
-						Method formatterMethod = getFormatterClazz(classLoader).getMethod(FORMATTER_METHOD, getFormattingOptionsClazz(classLoader),
+						Method formatterMethod = getFormatterClazz(classLoader).getMethod(FORMATTER_METHOD,
+								getFormattingOptionsClazz(classLoader),
 								String.class);
 						Object formattingOptions = getCustomFormattingOptions(classLoader, style);
 						return (String) formatterMethod.invoke(getFormatterClazz(classLoader), formattingOptions, input);
@@ -151,7 +245,7 @@ private Object getCustomFormattingOptions(ClassLoader classLoader, Style style)
 			if (style == Style.DEFAULT || style == Style.DROPBOX) {
 				Class<?> formattingOptionsCompanionClazz = classLoader.loadClass(pkg + ".ktfmt.FormattingOptions$Companion");
 				Object companion = formattingOptionsCompanionClazz.getConstructors()[0].newInstance((Object) null);
-				Method formattingOptionsMethod = formattingOptionsCompanionClazz.getDeclaredMethod(DROPBOX_STYLE_METHOD);
+				Method formattingOptionsMethod = formattingOptionsCompanionClazz.getDeclaredMethod("dropboxStyle");
 				return formattingOptionsMethod.invoke(companion);
 			} else {
 				throw new IllegalStateException("Versions pre-0.19 can only use Default and Dropbox styles");
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
index d88b4aac7f..56d925caa3 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 import java.util.Collections;
 import java.util.Map;
 import java.util.Objects;
+import java.util.function.Consumer;
 
 import javax.inject.Inject;
 
@@ -34,6 +35,7 @@
 import com.diffplug.spotless.kotlin.DiktatStep;
 import com.diffplug.spotless.kotlin.KtLintStep;
 import com.diffplug.spotless.kotlin.KtfmtStep;
+import com.diffplug.spotless.kotlin.KtfmtStep.KtfmtFormattingOptions;
 import com.diffplug.spotless.kotlin.KtfmtStep.Style;
 
 public class KotlinExtension extends FormatExtension implements HasBuiltinDelimiterForLicense {
@@ -104,32 +106,49 @@ public KtfmtConfig ktfmt(String version) {
 	public class KtfmtConfig {
 		final String version;
 		Style style;
+		KtfmtFormattingOptions options;
+
+		private final ConfigurableStyle configurableStyle = new ConfigurableStyle();
 
 		KtfmtConfig(String version) {
 			this.version = Objects.requireNonNull(version);
-			this.style = Style.DEFAULT;
 			addStep(createStep());
 		}
 
-		public void dropboxStyle() {
-			style(Style.DROPBOX);
+		private ConfigurableStyle style(Style style) {
+			this.style = style;
+			replaceStep(createStep());
+			return configurableStyle;
 		}
 
-		public void googleStyle() {
-			style(Style.GOOGLE);
+		public ConfigurableStyle dropboxStyle() {
+			return style(Style.DROPBOX);
 		}
 
-		public void kotlinlangStyle() {
-			style(Style.KOTLINLANG);
+		public ConfigurableStyle googleStyle() {
+			return style(Style.GOOGLE);
 		}
 
-		public void style(Style style) {
-			this.style = style;
-			replaceStep(createStep());
+		public ConfigurableStyle kotlinlangStyle() {
+			return style(Style.KOTLINLANG);
+		}
+
+		public void configure(Consumer<KtfmtFormattingOptions> optionsConfiguration) {
+			this.configurableStyle.configure(optionsConfiguration);
 		}
 
 		private FormatterStep createStep() {
-			return KtfmtStep.create(version, provisioner(), style);
+			return KtfmtStep.create(version, provisioner(), style, options);
+		}
+
+		class ConfigurableStyle {
+
+			void configure(Consumer<KtfmtFormattingOptions> optionsConfiguration) {
+				KtfmtFormattingOptions ktfmtFormattingOptions = new KtfmtFormattingOptions();
+				optionsConfiguration.accept(ktfmtFormattingOptions);
+				options = ktfmtFormattingOptions;
+				replaceStep(createStep());
+			}
 		}
 	}
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
index 5ea3c29594..1ff2b0c332 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 import java.util.Collections;
 import java.util.Map;
 import java.util.Objects;
+import java.util.function.Consumer;
 
 import javax.inject.Inject;
 
@@ -28,6 +29,7 @@
 import com.diffplug.spotless.kotlin.DiktatStep;
 import com.diffplug.spotless.kotlin.KtLintStep;
 import com.diffplug.spotless.kotlin.KtfmtStep;
+import com.diffplug.spotless.kotlin.KtfmtStep.KtfmtFormattingOptions;
 import com.diffplug.spotless.kotlin.KtfmtStep.Style;
 
 public class KotlinGradleExtension extends FormatExtension {
@@ -90,6 +92,9 @@ public KtfmtConfig ktfmt(String version) {
 	public class KtfmtConfig {
 		final String version;
 		Style style;
+		KtfmtFormattingOptions options;
+
+		private final ConfigurableStyle configurableStyle = new ConfigurableStyle();
 
 		KtfmtConfig(String version) {
 			this.version = Objects.requireNonNull(version);
@@ -97,25 +102,40 @@ public class KtfmtConfig {
 			addStep(createStep());
 		}
 
-		public void style(Style style) {
+		private ConfigurableStyle style(Style style) {
 			this.style = style;
 			replaceStep(createStep());
+			return configurableStyle;
+		}
+
+		public ConfigurableStyle dropboxStyle() {
+			return style(Style.DROPBOX);
 		}
 
-		public void dropboxStyle() {
-			style(Style.DROPBOX);
+		public ConfigurableStyle googleStyle() {
+			return style(Style.GOOGLE);
 		}
 
-		public void googleStyle() {
-			style(Style.GOOGLE);
+		public ConfigurableStyle kotlinlangStyle() {
+			return style(Style.KOTLINLANG);
 		}
 
-		public void kotlinlangStyle() {
-			style(Style.KOTLINLANG);
+		public void configure(Consumer<KtfmtFormattingOptions> optionsConfiguration) {
+			this.configurableStyle.configure(optionsConfiguration);
 		}
 
 		private FormatterStep createStep() {
-			return KtfmtStep.create(version, provisioner(), style);
+			return KtfmtStep.create(version, provisioner(), style, options);
+		}
+
+		class ConfigurableStyle {
+
+			void configure(Consumer<KtfmtFormattingOptions> optionsConfiguration) {
+				KtfmtFormattingOptions ktfmtFormattingOptions = new KtfmtFormattingOptions();
+				optionsConfiguration.accept(ktfmtFormattingOptions);
+				options = ktfmtFormattingOptions;
+				replaceStep(createStep());
+			}
 		}
 	}
 
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
index f3d8ad442d..3bbd44d63d 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -269,4 +269,48 @@ void testWithNonStandardYearSeparatorKtfmt() throws IOException {
 			matcher.startsWith("// License Header 2012, 2014");
 		});
 	}
+
+	@Test
+	@EnabledForJreRange(min = JAVA_11) // ktfmt's dependency, google-java-format 1.8 requires a minimum of JRE 11+.
+	void testWithCustomMaxWidthDefaultStyleKtfmt() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    kotlin {",
+				"        ktfmt().configure { options ->",
+				"            options.maxWidth = 120",
+				"		 }",
+				"    }",
+				"}");
+
+		setFile("src/main/kotlin/max-width.kt").toResource("kotlin/ktfmt/max-width.dirty");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("src/main/kotlin/max-width.kt").sameAsResource("kotlin/ktfmt/max-width.clean");
+	}
+
+	@Test
+	@EnabledForJreRange(min = JAVA_11) // ktfmt's dependency, google-java-format 1.8 requires a minimum of JRE 11+.
+	void testWithCustomMaxWidthDropboxStyleKtfmt() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    kotlin {",
+				"        ktfmt().dropboxStyle().configure { options ->",
+				"            options.maxWidth = 120",
+				"		 }",
+				"    }",
+				"}");
+
+		setFile("src/main/kotlin/max-width.kt").toResource("kotlin/ktfmt/max-width.dirty");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("src/main/kotlin/max-width.kt").sameAsResource("kotlin/ktfmt/max-width-dropbox.clean");
+	}
 }
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktfmt.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktfmt.java
index c1258a15fe..b917d33a44 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktfmt.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktfmt.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.kotlin.KtfmtStep;
+import com.diffplug.spotless.kotlin.KtfmtStep.KtfmtFormattingOptions;
 import com.diffplug.spotless.kotlin.KtfmtStep.Style;
 import com.diffplug.spotless.maven.FormatterStepConfig;
 import com.diffplug.spotless.maven.FormatterStepFactory;
@@ -31,10 +32,23 @@ public class Ktfmt implements FormatterStepFactory {
 	@Parameter
 	private String style;
 
+	@Parameter
+	private Integer maxWidth;
+
+	@Parameter
+	private Integer blockIndent;
+
+	@Parameter
+	private Integer continuationIndent;
+
+	@Parameter
+	private Boolean removeUnusedImport;
+
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig config) {
 		String version = this.version != null ? this.version : KtfmtStep.defaultVersion();
-		String style = this.style != null ? this.style : KtfmtStep.defaultStyle();
-		return KtfmtStep.create(version, config.getProvisioner(), Style.valueOf(style));
+		Style style = this.style != null ? Style.valueOf(this.style) : null;
+		KtfmtFormattingOptions options = new KtfmtFormattingOptions(maxWidth, blockIndent, continuationIndent, removeUnusedImport);
+		return KtfmtStep.create(version, config.getProvisioner(), style, options);
 	}
 }
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtfmtTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtfmtTest.java
index 7b0ca069fc..88dcd172e0 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtfmtTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtfmtTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,4 +48,22 @@ void testKtfmtStyle() throws Exception {
 		mavenRunner().withArguments("spotless:apply").runNoError();
 		assertFile("src/main/kotlin/main.kt").sameAsResource("kotlin/ktfmt/basic-dropboxstyle.clean");
 	}
+
+	@Test
+	void testKtfmtWithMaxWidthOption() throws Exception {
+		writePomWithKotlinSteps("<ktfmt><maxWidth>120</maxWidth></ktfmt>");
+
+		setFile("src/main/kotlin/main.kt").toResource("kotlin/ktfmt/max-width.dirty");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("src/main/kotlin/main.kt").sameAsResource("kotlin/ktfmt/max-width.clean");
+	}
+
+	@Test
+	void testKtfmtStyleWithMaxWidthOption() throws Exception {
+		writePomWithKotlinSteps("<ktfmt><style>DROPBOX</style><maxWidth>120</maxWidth></ktfmt>");
+
+		setFile("src/main/kotlin/main.kt").toResource("kotlin/ktfmt/max-width.dirty");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("src/main/kotlin/main.kt").sameAsResource("kotlin/ktfmt/max-width-dropbox.clean");
+	}
 }
diff --git a/testlib/src/main/resources/kotlin/ktfmt/max-width-dropbox.clean b/testlib/src/main/resources/kotlin/ktfmt/max-width-dropbox.clean
new file mode 100644
index 0000000000..0fce31c7ec
--- /dev/null
+++ b/testlib/src/main/resources/kotlin/ktfmt/max-width-dropbox.clean
@@ -0,0 +1,12 @@
+import a.*
+import a.b
+import a.b.c.*
+import kotlinx.android.synthetic.main.layout_name.*
+
+fun main() {}
+
+fun foo(param1: Any, param2: Any, param3: Any, param4: Any, param5: Any, param6: Any, param7: Any, param8: Any) {
+    a()
+    functionNameWithAlmost120SymbolsToValidateThatKtfmtNotBreakLineAtDefault100(param1, param2, param3, param4, param5)
+    return b
+}
diff --git a/testlib/src/main/resources/kotlin/ktfmt/max-width.clean b/testlib/src/main/resources/kotlin/ktfmt/max-width.clean
new file mode 100644
index 0000000000..4592181044
--- /dev/null
+++ b/testlib/src/main/resources/kotlin/ktfmt/max-width.clean
@@ -0,0 +1,12 @@
+import a.*
+import a.b
+import a.b.c.*
+import kotlinx.android.synthetic.main.layout_name.*
+
+fun main() {}
+
+fun foo(param1: Any, param2: Any, param3: Any, param4: Any, param5: Any, param6: Any, param7: Any, param8: Any) {
+  a()
+  functionNameWithAlmost120SymbolsToValidateThatKtfmtNotBreakLineAtDefault100(param1, param2, param3, param4, param5)
+  return b
+}
diff --git a/testlib/src/main/resources/kotlin/ktfmt/max-width.dirty b/testlib/src/main/resources/kotlin/ktfmt/max-width.dirty
new file mode 100644
index 0000000000..ef9504e1c3
--- /dev/null
+++ b/testlib/src/main/resources/kotlin/ktfmt/max-width.dirty
@@ -0,0 +1,12 @@
+import a.*
+
+import kotlinx.android.synthetic.main.layout_name.*
+
+import a.b.c.*
+import a.b
+
+fun main() {}
+fun foo(param1: Any, param2: Any, param3: Any, param4: Any, param5: Any, param6: Any, param7: Any, param8: Any) {
+  a(); functionNameWithAlmost120SymbolsToValidateThatKtfmtNotBreakLineAtDefault100(param1, param2, param3, param4, param5)
+  return b
+}
diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java
index 3416e6d297..ddaf1b324b 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,14 +35,14 @@ void behavior() throws Exception {
 	@Test
 	@EnabledForJreRange(min = JAVA_11) // ktfmt's dependency, google-java-format 1.8 requires a minimum of JRE 11+.
 	void dropboxStyle_0_18() throws Exception {
-		FormatterStep step = KtfmtStep.create("0.18", TestProvisioner.mavenCentral(), KtfmtStep.Style.DROPBOX);
+		FormatterStep step = KtfmtStep.create("0.18", TestProvisioner.mavenCentral(), KtfmtStep.Style.DROPBOX, null);
 		StepHarness.forStep(step).testResource("kotlin/ktfmt/basic.dirty", "kotlin/ktfmt/basic-dropboxstyle.clean");
 	}
 
 	@Test
 	@EnabledForJreRange(min = JAVA_11) // ktfmt's dependency, google-java-format 1.8 requires a minimum of JRE 11+.
 	void dropboxStyle_0_19() throws Exception {
-		FormatterStep step = KtfmtStep.create("0.19", TestProvisioner.mavenCentral(), KtfmtStep.Style.DROPBOX);
+		FormatterStep step = KtfmtStep.create("0.19", TestProvisioner.mavenCentral(), KtfmtStep.Style.DROPBOX, null);
 		StepHarness.forStep(step).testResource("kotlin/ktfmt/basic.dirty", "kotlin/ktfmt/basic-dropboxstyle.clean");
 	}
 

From fb62f361f1478cef675ceb7df029e26b078bbea8 Mon Sep 17 00:00:00 2001
From: DDeg <dimoness7@narod.ru>
Date: Fri, 11 Mar 2022 10:47:52 +0300
Subject: [PATCH 0061/2068] Updated unreleased block in changelog with ktfmt
 custom parameters.

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 1 +
 plugin-maven/CHANGES.md  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 36be0237d7..79c97cb411 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,7 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+* Added support for setting custom parameters for Kotlin ktfmt in Gradle and Maven plugins. ([#1145](https://github.com/diffplug/spotless/pull/1145))
 
 ## [2.23.0] - 2022-02-15
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 9f22285976..4eb101c7a0 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Accept `java.nio.charset.Charset` type when setting the character encoding via `encoding` ([#1128](https://github.com/diffplug/spotless/issues/1128))
+* Added support for setting custom parameters for Kotlin ktfmt in Gradle plugin. ([#1145](https://github.com/diffplug/spotless/pull/1145))
 
 ## [6.3.0] - 2022-02-15
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index a41995ef1f..c320da7d31 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,7 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+* Added support for setting custom parameters for Kotlin ktfmt in Maven plugin. ([#1145](https://github.com/diffplug/spotless/pull/1145))
 
 ## [2.21.0] - 2022-02-19
 ### Added

From de790fcbb942835e0ec5911414a6af0695a2a1ab Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 28 Mar 2022 10:58:53 -0700
Subject: [PATCH 0062/2068] Minor changelog tweaks.

---
 CHANGES.md              | 1 +
 plugin-maven/CHANGES.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 79c97cb411..3010a0f826 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,7 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
 * Added support for setting custom parameters for Kotlin ktfmt in Gradle and Maven plugins. ([#1145](https://github.com/diffplug/spotless/pull/1145))
 
 ## [2.23.0] - 2022-02-15
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index c320da7d31..1976b6b46a 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,7 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
 * Added support for setting custom parameters for Kotlin ktfmt in Maven plugin. ([#1145](https://github.com/diffplug/spotless/pull/1145))
 
 ## [2.21.0] - 2022-02-19

From cf04c82e5f983d0774d73a7c67751037d826c757 Mon Sep 17 00:00:00 2001
From: circleci <circleci@bf35ac8f76c9>
Date: Mon, 28 Mar 2022 18:23:37 +0000
Subject: [PATCH 0063/2068] Published lib/2.24.0

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 3010a0f826..c4f39a815c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.24.0] - 2022-03-28
 ### Added
 * Added support for setting custom parameters for Kotlin ktfmt in Gradle and Maven plugins. ([#1145](https://github.com/diffplug/spotless/pull/1145))
 

From 795186b3443f1683335e1d91d68b20dbf2978606 Mon Sep 17 00:00:00 2001
From: circleci <circleci@bf35ac8f76c9>
Date: Mon, 28 Mar 2022 18:24:23 +0000
Subject: [PATCH 0064/2068] Published gradle/6.4.0

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 46 ++++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 4eb101c7a0..d991b050a4 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [6.4.0] - 2022-03-28
 ### Added
 * Accept `java.nio.charset.Charset` type when setting the character encoding via `encoding` ([#1128](https://github.com/diffplug/spotless/issues/1128))
 * Added support for setting custom parameters for Kotlin ktfmt in Gradle plugin. ([#1145](https://github.com/diffplug/spotless/pull/1145))
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 2039ed92d3..9b64f6f38a 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -18,9 +18,9 @@ output = [
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
 [![Maven central](https://img.shields.io/badge/mavencentral-yes-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/index.html)
 [![License Apache](https://img.shields.io/badge/license-apache-blue.svg)](https://tldrlegal.com/license/apache-license-2.0-(apache-2.0))
-[![Changelog](https://img.shields.io/badge/changelog-6.3.0-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-6.4.0-blue.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)
@@ -126,10 +126,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -141,7 +141,7 @@ If you're stuck on an older version of Gradle, `id 'com.diffplug.gradle.spotless
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -248,8 +248,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -300,8 +300,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -359,7 +359,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -391,7 +391,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -423,7 +423,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -457,7 +457,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -478,7 +478,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -503,7 +503,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -543,7 +543,7 @@ sql.formatter.indent.size=4
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -586,7 +586,7 @@ For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#n
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -811,7 +811,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -878,9 +878,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -913,11 +913,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.3.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From f1281c9127a6bfe6a4558bf8a201ddf9345df4d8 Mon Sep 17 00:00:00 2001
From: circleci <circleci@bf35ac8f76c9>
Date: Mon, 28 Mar 2022 18:25:41 +0000
Subject: [PATCH 0065/2068] Published maven/2.22.0

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 1976b6b46a..508e7f4997 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.22.0] - 2022-03-28
 ### Added
 * Added support for setting custom parameters for Kotlin ktfmt in Maven plugin. ([#1145](https://github.com/diffplug/spotless/pull/1145))
 
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 0a77666e45..d6b4d4d605 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -12,8 +12,8 @@ output = [
   ].join('\n');
 -->
 [![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.21.0/index.html)
-[![Changelog](https://img.shields.io/badge/changelog-2.21.0-brightgreen.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.22.0/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.22.0-brightgreen.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)

From 66e1a17c01b9e20b03d858648a927e237201ad30 Mon Sep 17 00:00:00 2001
From: DDeg <dimoness7@narod.ru>
Date: Tue, 29 Mar 2022 11:08:17 +0300
Subject: [PATCH 0066/2068] Fixed Ktfmt options usage in Gradle Kotlin (kts)
 scripts.

---
 .../diffplug/spotless/kotlin/KtfmtStep.java   | 16 +++++++
 .../gradle/spotless/KotlinExtension.java      |  4 +-
 .../spotless/KotlinGradleExtension.java       |  4 +-
 .../gradle/spotless/KotlinExtensionTest.java  | 44 +++++++++++++++++++
 4 files changed, 64 insertions(+), 4 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
index e5e2e57f01..d9feef4c91 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
@@ -97,6 +97,22 @@ public KtfmtFormattingOptions(
 			this.continuationIndent = continuationIndent;
 			this.removeUnusedImport = removeUnusedImport;
 		}
+
+		public void setMaxWidth(int maxWidth) {
+			this.maxWidth = maxWidth;
+		}
+
+		public void setBlockIndent(int blockIndent) {
+			this.blockIndent = blockIndent;
+		}
+
+		public void setContinuationIndent(int continuationIndent) {
+			this.continuationIndent = continuationIndent;
+		}
+
+		public void setRemoveUnusedImport(boolean removeUnusedImport) {
+			this.removeUnusedImport = removeUnusedImport;
+		}
 	}
 
 	/**
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
index 56d925caa3..c68fd9aeea 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
@@ -141,9 +141,9 @@ private FormatterStep createStep() {
 			return KtfmtStep.create(version, provisioner(), style, options);
 		}
 
-		class ConfigurableStyle {
+		public class ConfigurableStyle {
 
-			void configure(Consumer<KtfmtFormattingOptions> optionsConfiguration) {
+			public void configure(Consumer<KtfmtFormattingOptions> optionsConfiguration) {
 				KtfmtFormattingOptions ktfmtFormattingOptions = new KtfmtFormattingOptions();
 				optionsConfiguration.accept(ktfmtFormattingOptions);
 				options = ktfmtFormattingOptions;
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
index 1ff2b0c332..4275cd6efe 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
@@ -128,9 +128,9 @@ private FormatterStep createStep() {
 			return KtfmtStep.create(version, provisioner(), style, options);
 		}
 
-		class ConfigurableStyle {
+		public class ConfigurableStyle {
 
-			void configure(Consumer<KtfmtFormattingOptions> optionsConfiguration) {
+			public void configure(Consumer<KtfmtFormattingOptions> optionsConfiguration) {
 				KtfmtFormattingOptions ktfmtFormattingOptions = new KtfmtFormattingOptions();
 				optionsConfiguration.accept(ktfmtFormattingOptions);
 				options = ktfmtFormattingOptions;
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
index 3bbd44d63d..4c48c340d2 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
@@ -292,6 +292,28 @@ void testWithCustomMaxWidthDefaultStyleKtfmt() throws IOException {
 		assertFile("src/main/kotlin/max-width.kt").sameAsResource("kotlin/ktfmt/max-width.clean");
 	}
 
+	@Test
+	@EnabledForJreRange(min = JAVA_11) // ktfmt's dependency, google-java-format 1.8 requires a minimum of JRE 11+.
+	void testWithCustomMaxWidthDefaultStyleKtfmtGradleKts() throws IOException {
+		setFile("build.gradle.kts").toLines(
+				"plugins {",
+				"    id(\"org.jetbrains.kotlin.jvm\") version \"1.5.31\"",
+				"    id(\"com.diffplug.spotless\")",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    kotlin {",
+				"        ktfmt().configure { options ->",
+				"            options.setMaxWidth(120)",
+				"		 }",
+				"    }",
+				"}");
+
+		setFile("src/main/kotlin/max-width.kt").toResource("kotlin/ktfmt/max-width.dirty");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("src/main/kotlin/max-width.kt").sameAsResource("kotlin/ktfmt/max-width.clean");
+	}
+
 	@Test
 	@EnabledForJreRange(min = JAVA_11) // ktfmt's dependency, google-java-format 1.8 requires a minimum of JRE 11+.
 	void testWithCustomMaxWidthDropboxStyleKtfmt() throws IOException {
@@ -313,4 +335,26 @@ void testWithCustomMaxWidthDropboxStyleKtfmt() throws IOException {
 		gradleRunner().withArguments("spotlessApply").build();
 		assertFile("src/main/kotlin/max-width.kt").sameAsResource("kotlin/ktfmt/max-width-dropbox.clean");
 	}
+
+	@Test
+	@EnabledForJreRange(min = JAVA_11) // ktfmt's dependency, google-java-format 1.8 requires a minimum of JRE 11+.
+	void testWithCustomMaxWidthDropboxStyleKtfmtGradleKts() throws IOException {
+		setFile("build.gradle.kts").toLines(
+				"plugins {",
+				"    id(\"org.jetbrains.kotlin.jvm\") version \"1.5.31\"",
+				"    id(\"com.diffplug.spotless\")",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    kotlin {",
+				"        ktfmt().dropboxStyle().configure { options ->",
+				"            options.setMaxWidth(120)",
+				"		 }",
+				"    }",
+				"}");
+
+		setFile("src/main/kotlin/max-width.kt").toResource("kotlin/ktfmt/max-width.dirty");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("src/main/kotlin/max-width.kt").sameAsResource("kotlin/ktfmt/max-width-dropbox.clean");
+	}
 }

From cacdf56787e4e897bc5555508c0d0f81ddd3c35d Mon Sep 17 00:00:00 2001
From: DDeg <dimoness7@narod.ru>
Date: Tue, 29 Mar 2022 11:12:31 +0300
Subject: [PATCH 0067/2068] Updated unreleased block in changelog with Ktfmt
 configuration in kts scripts.

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index c4f39a815c..8de69d7d77 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,7 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+* Fixed access modifiers for setters in KtfmtStep configuration
 
 ## [2.24.0] - 2022-03-28
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index d991b050a4..520d2a667e 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,7 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+* Fixed ktfmt options configuration in Gradle plugin for Gradle Kotlin scripts (kts).
 
 ## [6.4.0] - 2022-03-28
 ### Added

From c0fbe4bbbdaef0af610eb306748b92c592b4e921 Mon Sep 17 00:00:00 2001
From: David Morris <dave@code-fish.co.uk>
Date: Tue, 29 Mar 2022 19:35:28 +0100
Subject: [PATCH 0068/2068] Fix copy and paste error still referring to maven

---
 plugin-gradle/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 9b64f6f38a..88273a6474 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -195,7 +195,7 @@ spotless {
 Using Java 16+ with Google Java Format 1.10.0 [requires additional flags](https://github.com/google/google-java-format/releases/tag/v1.10.0) to the running JDK.
 These Flags can be provided using the `gradle.properties` file (See [documentation](https://docs.gradle.org/current/userguide/build_environment.html)).
 
-For example the following file under `gradle.properties` will run maven with the required flags:
+For example the following file under `gradle.properties` will run gradle with the required flags:
 ```
 org.gradle.jvmargs=--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
   --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
@@ -221,7 +221,7 @@ spotless {
 Using Java 16+ with Palantir Java Format [requires additional flags](https://github.com/google/google-java-format/releases/tag/v1.10.0) on the running JDK.
 These Flags can be provided using the `gradle.properties` file (See [documentation](https://docs.gradle.org/current/userguide/build_environment.html)).
 
-For example the following file under `gradle.properties` will run maven with the required flags:
+For example the following file under `gradle.properties` will run gradle with the required flags:
 ```
 org.gradle.jvmargs=--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
   --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \

From 07c9ac8280e81f54699f97ca313721bb7295688e Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 29 Mar 2022 14:18:54 -0700
Subject: [PATCH 0069/2068] Add `### Fixed` category to the `CHANGES.md`

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 8de69d7d77..b749f7113a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,7 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
 * Fixed access modifiers for setters in KtfmtStep configuration
 
 ## [2.24.0] - 2022-03-28
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 520d2a667e..63470e6f8c 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,7 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Fixed
 * Fixed ktfmt options configuration in Gradle plugin for Gradle Kotlin scripts (kts).
 
 ## [6.4.0] - 2022-03-28

From d2e48e9ec5c469195d2cc596f05b38aebf521ef8 Mon Sep 17 00:00:00 2001
From: circleci <circleci@9ddbbcdde68f>
Date: Wed, 30 Mar 2022 00:44:59 +0000
Subject: [PATCH 0070/2068] Published lib/2.24.1

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index b749f7113a..0b2af47551 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.24.1] - 2022-03-30
 ### Fixed
 * Fixed access modifiers for setters in KtfmtStep configuration
 

From 75e925f8ee5636e62b50f1c48c013cd8d11be791 Mon Sep 17 00:00:00 2001
From: circleci <circleci@ecf62128d2fa>
Date: Wed, 30 Mar 2022 05:02:02 +0000
Subject: [PATCH 0071/2068] Published gradle/6.4.1

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 46 ++++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 63470e6f8c..67413e9014 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [6.4.1] - 2022-03-30
 ### Fixed
 * Fixed ktfmt options configuration in Gradle plugin for Gradle Kotlin scripts (kts).
 
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 88273a6474..eba973a514 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -18,9 +18,9 @@ output = [
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
 [![Maven central](https://img.shields.io/badge/mavencentral-yes-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/index.html)
 [![License Apache](https://img.shields.io/badge/license-apache-blue.svg)](https://tldrlegal.com/license/apache-license-2.0-(apache-2.0))
-[![Changelog](https://img.shields.io/badge/changelog-6.4.0-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-6.4.1-blue.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)
@@ -126,10 +126,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -141,7 +141,7 @@ If you're stuck on an older version of Gradle, `id 'com.diffplug.gradle.spotless
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -248,8 +248,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -300,8 +300,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -359,7 +359,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -391,7 +391,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -423,7 +423,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -457,7 +457,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -478,7 +478,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -503,7 +503,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -543,7 +543,7 @@ sql.formatter.indent.size=4
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -586,7 +586,7 @@ For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#n
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -811,7 +811,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -878,9 +878,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -913,11 +913,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From 6dfbc93f67d7554c472a1c0fc0cc13355383d774 Mon Sep 17 00:00:00 2001
From: Arul <me@arulraj.net>
Date: Sat, 2 Apr 2022 21:31:05 +0530
Subject: [PATCH 0072/2068] Fix #540

- Take care of system and user config
---
 .../extra/GitAttributesLineEndings.java       |  2 +-
 .../spotless/extra/GitWorkarounds.java        | 23 +++++++++++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
index 4aab23e142..ae9f0ceec1 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
@@ -172,7 +172,7 @@ static class RuntimeInit {
 			//////////////////////////
 			// REPO-SPECIFIC VALUES //
 			//////////////////////////
-			RepositorySpecificResolver repositoryResolver = GitWorkarounds.fileRepositoryResolverForProject(projectDir);
+			RepositorySpecificResolver repositoryResolver = GitWorkarounds.fileRepositoryResolverForProject(projectDir, userConfig);
 			if (repositoryResolver.getGitDir() != null) {
 				workTree = repositoryResolver.getWorkTree();
 				repoConfig = repositoryResolver.getRepositoryConfig();
diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitWorkarounds.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitWorkarounds.java
index a66650b38f..15e8cdb5b8 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitWorkarounds.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitWorkarounds.java
@@ -50,7 +50,7 @@ private GitWorkarounds() {}
 	 * @return the path to the .git directory.
 	 */
 	static @Nullable File getDotGitDir(File projectDir) {
-		return fileRepositoryResolverForProject(projectDir).getGitDir();
+		return fileRepositoryResolverForProject(projectDir, null).getGitDir();
 	}
 
 	/**
@@ -61,8 +61,8 @@ private GitWorkarounds() {}
 	 * @param projectDir the project directory.
 	 * @return the builder.
 	 */
-	static RepositorySpecificResolver fileRepositoryResolverForProject(File projectDir) {
-		RepositorySpecificResolver repositoryResolver = new RepositorySpecificResolver();
+	static RepositorySpecificResolver fileRepositoryResolverForProject(File projectDir, Config baseConfig) {
+		RepositorySpecificResolver repositoryResolver = new RepositorySpecificResolver(baseConfig);
 		repositoryResolver.findGitDir(projectDir);
 		repositoryResolver.readEnvironment();
 		if (repositoryResolver.getGitDir() != null || repositoryResolver.getWorkTree() != null) {
@@ -94,6 +94,16 @@ static class RepositorySpecificResolver extends FileRepositoryBuilder {
 
 		private File commonDirectory;
 
+		private Config baseConfig;
+
+		public RepositorySpecificResolver() {
+			this(null);
+		}
+
+		public RepositorySpecificResolver(Config baseConfig) {
+			this.baseConfig = baseConfig;
+		}
+
 		/** @return the repository specific configuration. */
 		Config getRepositoryConfig() {
 			return Errors.rethrow().get(this::getConfig);
@@ -108,7 +118,12 @@ Config getRepositoryConfig() {
 		protected Config loadConfig() throws IOException {
 			if (getGitDir() != null) {
 				File path = resolveWithCommonDir(Constants.CONFIG);
-				FileBasedConfig cfg = new FileBasedConfig(path, safeFS());
+				FileBasedConfig cfg = null;
+				if (this.baseConfig == null) {
+					cfg = new FileBasedConfig(path, safeFS());
+				} else {
+					cfg = new FileBasedConfig(baseConfig, path, safeFS());
+				}
 				try {
 					cfg.load();
 

From af6a3b388bcc11ad0984fafd9b4bea81b1dd577c Mon Sep 17 00:00:00 2001
From: Arul <me@arulraj.net>
Date: Mon, 4 Apr 2022 04:23:40 +0530
Subject: [PATCH 0073/2068] - fixed test cases

- updated changelogs
---
 CHANGES.md                                        |  3 +++
 .../diffplug/spotless/extra/GitWorkarounds.java   | 15 ++++++++++++++-
 plugin-gradle/CHANGES.md                          |  3 +++
 plugin-maven/CHANGES.md                           |  3 +++
 4 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 0b2af47551..ea34ee65b3 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]
 
+### Fixed
+* Git user config and system config also included for defaultEndings configuration. ([#540](https://github.com/diffplug/spotless/issues/540))
+
 ## [2.24.1] - 2022-03-30
 ### Fixed
 * Fixed access modifiers for setters in KtfmtStep configuration
diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitWorkarounds.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitWorkarounds.java
index 15e8cdb5b8..993c207218 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitWorkarounds.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitWorkarounds.java
@@ -50,7 +50,7 @@ private GitWorkarounds() {}
 	 * @return the path to the .git directory.
 	 */
 	static @Nullable File getDotGitDir(File projectDir) {
-		return fileRepositoryResolverForProject(projectDir, null).getGitDir();
+		return fileRepositoryResolverForProject(projectDir).getGitDir();
 	}
 
 	/**
@@ -61,6 +61,19 @@ private GitWorkarounds() {}
 	 * @param projectDir the project directory.
 	 * @return the builder.
 	 */
+	static RepositorySpecificResolver fileRepositoryResolverForProject(File projectDir) {
+		return fileRepositoryResolverForProject(projectDir, null);
+	}
+
+	/**
+	 * Creates a {@link RepositorySpecificResolver} for the given project directory.
+	 *
+	 * This applies a workaround for JGit not supporting worktrees properly.
+	 *
+	 * @param projectDir the project directory.
+	 * @param baseConfig the user and system level git config.
+	 * @return the builder.
+	 */
 	static RepositorySpecificResolver fileRepositoryResolverForProject(File projectDir, Config baseConfig) {
 		RepositorySpecificResolver repositoryResolver = new RepositorySpecificResolver(baseConfig);
 		repositoryResolver.findGitDir(projectDir);
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 67413e9014..f420e83323 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]
 
+### Fixed
+* Git user config and system config also included for defaultEndings configuration. ([#540](https://github.com/diffplug/spotless/issues/540))
+
 ## [6.4.1] - 2022-03-30
 ### Fixed
 * Fixed ktfmt options configuration in Gradle plugin for Gradle Kotlin scripts (kts).
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 508e7f4997..8863af1825 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]
 
+### Fixed
+* Git user config and system config also included for defaultEndings configuration. ([#540](https://github.com/diffplug/spotless/issues/540))
+
 ## [2.22.0] - 2022-03-28
 ### Added
 * Added support for setting custom parameters for Kotlin ktfmt in Maven plugin. ([#1145](https://github.com/diffplug/spotless/pull/1145))

From 43dadf5bf025d84b240656cc056d239f79ba4cbe Mon Sep 17 00:00:00 2001
From: Arul <me@arulraj.net>
Date: Mon, 4 Apr 2022 06:46:46 +0530
Subject: [PATCH 0074/2068] spotbugs fixes

---
 .../main/java/com/diffplug/spotless/extra/GitWorkarounds.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitWorkarounds.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitWorkarounds.java
index 993c207218..70f0b9cb99 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitWorkarounds.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitWorkarounds.java
@@ -74,7 +74,7 @@ static RepositorySpecificResolver fileRepositoryResolverForProject(File projectD
 	 * @param baseConfig the user and system level git config.
 	 * @return the builder.
 	 */
-	static RepositorySpecificResolver fileRepositoryResolverForProject(File projectDir, Config baseConfig) {
+	static RepositorySpecificResolver fileRepositoryResolverForProject(File projectDir, @Nullable Config baseConfig) {
 		RepositorySpecificResolver repositoryResolver = new RepositorySpecificResolver(baseConfig);
 		repositoryResolver.findGitDir(projectDir);
 		repositoryResolver.readEnvironment();
@@ -113,7 +113,7 @@ public RepositorySpecificResolver() {
 			this(null);
 		}
 
-		public RepositorySpecificResolver(Config baseConfig) {
+		public RepositorySpecificResolver(@Nullable Config baseConfig) {
 			this.baseConfig = baseConfig;
 		}
 

From b588a52435836fe57eb8bff2fc212f0be3f42b38 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Apr 2022 12:02:36 +0000
Subject: [PATCH 0075/2068] Bump com.diffplug.spotless from 6.3.0 to 6.4.1

Bumps com.diffplug.spotless from 6.3.0 to 6.4.1.

---
updated-dependencies:
- dependency-name: com.diffplug.spotless
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index cb626e1b3d..46368b1a38 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,6 @@
 pluginManagement {
 	plugins {
-		id 'com.diffplug.spotless'                 version '6.3.0'
+		id 'com.diffplug.spotless'                 version '6.4.1'
 		// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
 		id 'com.gradle.plugin-publish'             version '0.20.0'
 		// https://github.com/gradle-nexus/publish-plugin/releases

From 51df54ecdd325faead75d7f8167ba0e39ec303e5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Apr 2022 12:02:37 +0000
Subject: [PATCH 0076/2068] Bump com.gradle.plugin-publish from 0.20.0 to
 0.21.0

Bumps com.gradle.plugin-publish from 0.20.0 to 0.21.0.

---
updated-dependencies:
- dependency-name: com.gradle.plugin-publish
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index cb626e1b3d..f31878f8dd 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,7 +2,7 @@ pluginManagement {
 	plugins {
 		id 'com.diffplug.spotless'                 version '6.3.0'
 		// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
-		id 'com.gradle.plugin-publish'             version '0.20.0'
+		id 'com.gradle.plugin-publish'             version '0.21.0'
 		// https://github.com/gradle-nexus/publish-plugin/releases
 		id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
 		// https://github.com/spotbugs/spotbugs-gradle-plugin/releases

From f638d272ffe943e8497af7e51171cf272e20d624 Mon Sep 17 00:00:00 2001
From: circleci <circleci@139b32c4197a>
Date: Wed, 6 Apr 2022 16:49:47 +0000
Subject: [PATCH 0077/2068] Published lib/2.24.2

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index ea34ee65b3..93c6ac5d34 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,6 +11,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 
+## [2.24.2] - 2022-04-06
+
 ### Fixed
 * Git user config and system config also included for defaultEndings configuration. ([#540](https://github.com/diffplug/spotless/issues/540))
 

From 7fd553c371f5c607e158216b63ddce5ae88f5d18 Mon Sep 17 00:00:00 2001
From: circleci <circleci@139b32c4197a>
Date: Wed, 6 Apr 2022 16:50:52 +0000
Subject: [PATCH 0078/2068] Published gradle/6.4.2

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 46 ++++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index f420e83323..192741c0d3 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -4,6 +4,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 
+## [6.4.2] - 2022-04-06
+
 ### Fixed
 * Git user config and system config also included for defaultEndings configuration. ([#540](https://github.com/diffplug/spotless/issues/540))
 
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index eba973a514..429b09d5c2 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -18,9 +18,9 @@ output = [
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
 [![Maven central](https://img.shields.io/badge/mavencentral-yes-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/index.html)
 [![License Apache](https://img.shields.io/badge/license-apache-blue.svg)](https://tldrlegal.com/license/apache-license-2.0-(apache-2.0))
-[![Changelog](https://img.shields.io/badge/changelog-6.4.1-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-6.4.2-blue.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)
@@ -126,10 +126,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -141,7 +141,7 @@ If you're stuck on an older version of Gradle, `id 'com.diffplug.gradle.spotless
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -248,8 +248,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -300,8 +300,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -359,7 +359,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -391,7 +391,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -423,7 +423,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -457,7 +457,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -478,7 +478,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -503,7 +503,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -543,7 +543,7 @@ sql.formatter.indent.size=4
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -586,7 +586,7 @@ For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#n
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -811,7 +811,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -878,9 +878,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -913,11 +913,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.1/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From bd0db272bd7a0eba4507e4ab49d297995cb2f2ee Mon Sep 17 00:00:00 2001
From: circleci <circleci@139b32c4197a>
Date: Wed, 6 Apr 2022 16:52:41 +0000
Subject: [PATCH 0079/2068] Published maven/2.22.1

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 8863af1825..7ffcf0cc81 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -4,6 +4,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 
+## [2.22.1] - 2022-04-06
+
 ### Fixed
 * Git user config and system config also included for defaultEndings configuration. ([#540](https://github.com/diffplug/spotless/issues/540))
 
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index d6b4d4d605..e0daabecd9 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -12,8 +12,8 @@ output = [
   ].join('\n');
 -->
 [![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.22.0/index.html)
-[![Changelog](https://img.shields.io/badge/changelog-2.22.0-brightgreen.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.22.1/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.22.1-brightgreen.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)

From d5a97920f61f11f02ad058b978402500e9cad17e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Apr 2022 12:06:37 +0000
Subject: [PATCH 0080/2068] Bump com.diffplug.spotless from 6.4.1 to 6.4.2

Bumps com.diffplug.spotless from 6.4.1 to 6.4.2.

---
updated-dependencies:
- dependency-name: com.diffplug.spotless
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index bb8e7f77fe..f34dfc742c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,6 @@
 pluginManagement {
 	plugins {
-		id 'com.diffplug.spotless'                 version '6.4.1'
+		id 'com.diffplug.spotless'                 version '6.4.2'
 		// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
 		id 'com.gradle.plugin-publish'             version '0.21.0'
 		// https://github.com/gradle-nexus/publish-plugin/releases

From aefad7a939f231956c0743303ca38ff77223f9ab Mon Sep 17 00:00:00 2001
From: Alex Vanyo <vanyo@google.com>
Date: Sun, 17 Apr 2022 19:23:29 -0700
Subject: [PATCH 0081/2068] Add option to use ktlint experimental ruleset

---
 lib/build.gradle                              |  1 +
 .../glue/ktlint/KtlintFormatterFunc.java      | 12 ++++--
 .../diffplug/spotless/kotlin/KtLintStep.java  | 38 ++++++++++++-------
 plugin-gradle/README.md                       |  6 ++-
 .../gradle/spotless/KotlinExtension.java      | 17 +++++++--
 .../spotless/KotlinGradleExtension.java       | 17 +++++++--
 .../gradle/spotless/KotlinExtensionTest.java  | 36 ++++++++++++++++++
 .../spotless/KotlinGradleExtensionTest.java   | 36 ++++++++++++++++++
 .../kotlin/ktlint/experimental.clean          |  7 ++++
 .../kotlin/ktlint/experimental.dirty          |  6 +++
 10 files changed, 150 insertions(+), 26 deletions(-)
 create mode 100644 testlib/src/main/resources/kotlin/ktlint/experimental.clean
 create mode 100644 testlib/src/main/resources/kotlin/ktlint/experimental.dirty

diff --git a/lib/build.gradle b/lib/build.gradle
index a585d8328e..db9473d65e 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -47,6 +47,7 @@ dependencies {
 	String VER_KTLINT='0.43.2'
 	ktlintCompileOnly "com.pinterest:ktlint:$VER_KTLINT"
 	ktlintCompileOnly "com.pinterest.ktlint:ktlint-core:$VER_KTLINT"
+	ktlintCompileOnly "com.pinterest.ktlint:ktlint-ruleset-experimental:$VER_KTLINT"
 	ktlintCompileOnly "com.pinterest.ktlint:ktlint-ruleset-standard:$VER_KTLINT"
 
 	// used for markdown formatting
diff --git a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
index 061224a819..b3ef570180 100644
--- a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
+++ b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
@@ -16,7 +16,7 @@
 package com.diffplug.spotless.glue.ktlint;
 
 import java.io.File;
-import java.util.Collections;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -24,6 +24,7 @@
 import com.pinterest.ktlint.core.KtLint.Params;
 import com.pinterest.ktlint.core.LintError;
 import com.pinterest.ktlint.core.RuleSet;
+import com.pinterest.ktlint.ruleset.experimental.ExperimentalRuleSetProvider;
 import com.pinterest.ktlint.ruleset.standard.StandardRuleSetProvider;
 
 import com.diffplug.spotless.FormatterFunc;
@@ -38,8 +39,13 @@ public class KtlintFormatterFunc implements FormatterFunc.NeedsFile {
 	private final Function2<? super LintError, ? super Boolean, Unit> formatterCallback;
 	private final boolean isScript;
 
-	public KtlintFormatterFunc(boolean isScript, Map<String, String> userData) {
-		rulesets = Collections.singletonList(new StandardRuleSetProvider().get());
+	public KtlintFormatterFunc(boolean isScript, boolean useExperimental, Map<String, String> userData) {
+		rulesets = new ArrayList<>();
+		rulesets.add(new StandardRuleSetProvider().get());
+
+		if (useExperimental) {
+			rulesets.add(new ExperimentalRuleSetProvider().get());
+		}
 		this.userData = userData;
 		formatterCallback = new FormatterCallback();
 		this.isScript = isScript;
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index 1db75a4e1f..711495c409 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Objects;
@@ -49,26 +50,26 @@ public static FormatterStep create(Provisioner provisioner) {
 	}
 
 	public static FormatterStep create(String version, Provisioner provisioner) {
-		return create(version, provisioner, Collections.emptyMap());
+		return create(version, provisioner, false, Collections.emptyMap());
 	}
 
-	public static FormatterStep create(String version, Provisioner provisioner, Map<String, String> userData) {
-		return create(version, provisioner, false, userData);
+	public static FormatterStep create(String version, Provisioner provisioner, boolean useExperimental, Map<String, String> userData) {
+		return create(version, provisioner, false, useExperimental, userData);
 	}
 
 	public static FormatterStep createForScript(String version, Provisioner provisioner) {
-		return create(version, provisioner, true, Collections.emptyMap());
+		return create(version, provisioner, true, false, Collections.emptyMap());
 	}
 
-	public static FormatterStep createForScript(String version, Provisioner provisioner, Map<String, String> userData) {
-		return create(version, provisioner, true, userData);
+	public static FormatterStep createForScript(String version, Provisioner provisioner, boolean useExperimental, Map<String, String> userData) {
+		return create(version, provisioner, true, useExperimental, userData);
 	}
 
-	private static FormatterStep create(String version, Provisioner provisioner, boolean isScript, Map<String, String> userData) {
+	private static FormatterStep create(String version, Provisioner provisioner, boolean isScript, boolean useExperimental, Map<String, String> userData) {
 		Objects.requireNonNull(version, "version");
 		Objects.requireNonNull(provisioner, "provisioner");
 		return FormatterStep.createLazy(NAME,
-				() -> new State(version, provisioner, isScript, userData),
+				() -> new State(version, provisioner, isScript, useExperimental, userData),
 				State::createFormat);
 	}
 
@@ -84,10 +85,12 @@ static final class State implements Serializable {
 		private final String pkg;
 		/** The jar that contains the formatter. */
 		final JarState jarState;
+		private final boolean useExperimental;
 		private final TreeMap<String, String> userData;
 		private final boolean useParams;
 
-		State(String version, Provisioner provisioner, boolean isScript, Map<String, String> userData) throws IOException {
+		State(String version, Provisioner provisioner, boolean isScript, boolean useExperimental, Map<String, String> userData) throws IOException {
+			this.useExperimental = useExperimental;
 			this.userData = new TreeMap<>(userData);
 			String coordinate;
 			if (BadSemver.version(version) < BadSemver.version(0, 32)) {
@@ -105,17 +108,26 @@ static final class State implements Serializable {
 		FormatterFunc createFormat() throws Exception {
 			if (useParams) {
 				Class<?> formatterFunc = jarState.getClassLoader().loadClass("com.diffplug.spotless.glue.ktlint.KtlintFormatterFunc");
-				Constructor<?> constructor = formatterFunc.getConstructor(boolean.class, Map.class);
-				return (FormatterFunc.NeedsFile) constructor.newInstance(isScript, userData);
+				Constructor<?> constructor = formatterFunc.getConstructor(boolean.class, boolean.class, Map.class);
+				return (FormatterFunc.NeedsFile) constructor.newInstance(isScript, useExperimental, userData);
 			}
 
 			ClassLoader classLoader = jarState.getClassLoader();
 			// String KtLint::format(String input, Iterable<RuleSet> rules, Function2 errorCallback)
 
+			ArrayList<Object> ruleSets = new ArrayList<>();
+
 			// first, we get the standard rules
 			Class<?> standardRuleSetProviderClass = classLoader.loadClass(pkg + ".ktlint.ruleset.standard.StandardRuleSetProvider");
 			Object standardRuleSet = standardRuleSetProviderClass.getMethod("get").invoke(standardRuleSetProviderClass.newInstance());
-			Iterable<?> ruleSets = Collections.singletonList(standardRuleSet);
+			ruleSets.add(standardRuleSet);
+
+			// second, we get the experimental rules if desired
+			if (useExperimental) {
+				Class<?> experimentalRuleSetProviderClass = classLoader.loadClass(pkg + ".ktlint.ruleset.experimental.ExperimentalRuleSetProvider");
+				Object experimentalRuleSet = experimentalRuleSetProviderClass.getMethod("get").invoke(experimentalRuleSetProviderClass.newInstance());
+				ruleSets.add(experimentalRuleSet);
+			}
 
 			// next, we create an error callback which throws an assertion error when the format is bad
 			Class<?> function2Interface = classLoader.loadClass("kotlin.jvm.functions.Function2");
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 429b09d5c2..c8de7946bc 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -340,8 +340,10 @@ spotless {
 ```kotlin
 spotless {
   kotlin {
-    // version and userData are both optional
-    ktlint('0.43.2').userData(mapOf('indent_size' to '2', 'continuation_indent_size' to '2'))
+    // version, setUseExperimental and userData are all optional
+    ktlint('0.43.2')
+      .setUseExperimental(true)
+      .userData(mapOf('indent_size' to '2', 'continuation_indent_size' to '2'))
 ```
 
 ### diktat
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
index c68fd9aeea..f7cb7a20f0 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
@@ -59,7 +59,7 @@ public LicenseHeaderConfig licenseHeaderFile(Object licenseHeaderFile) {
 	/** Adds the specified version of <a href="https://github.com/pinterest/ktlint">ktlint</a>. */
 	public KotlinFormatExtension ktlint(String version) {
 		Objects.requireNonNull(version);
-		return new KotlinFormatExtension(version, Collections.emptyMap());
+		return new KotlinFormatExtension(version, false, Collections.emptyMap());
 	}
 
 	public KotlinFormatExtension ktlint() {
@@ -69,23 +69,32 @@ public KotlinFormatExtension ktlint() {
 	public class KotlinFormatExtension {
 
 		private final String version;
+		private boolean useExperimental;
 		private Map<String, String> userData;
 
-		KotlinFormatExtension(String version, Map<String, String> config) {
+		KotlinFormatExtension(String version, boolean useExperimental, Map<String, String> config) {
 			this.version = version;
+			this.useExperimental = useExperimental;
 			this.userData = config;
 			addStep(createStep());
 		}
 
-		public void userData(Map<String, String> userData) {
+		public KotlinFormatExtension setUseExperimental(boolean useExperimental) {
+			this.useExperimental = useExperimental;
+			replaceStep(createStep());
+			return this;
+		}
+
+		public KotlinFormatExtension userData(Map<String, String> userData) {
 			// Copy the map to a sorted map because up-to-date checking is based on binary-equals of the serialized
 			// representation.
 			this.userData = userData;
 			replaceStep(createStep());
+			return this;
 		}
 
 		private FormatterStep createStep() {
-			return KtLintStep.create(version, provisioner(), userData);
+			return KtLintStep.create(version, provisioner(), useExperimental, userData);
 		}
 	}
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
index 4275cd6efe..7a98c211bc 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
@@ -45,7 +45,7 @@ public KotlinGradleExtension(SpotlessExtension spotless) {
 	/** Adds the specified version of <a href="https://github.com/pinterest/ktlint">ktlint</a>. */
 	public KotlinFormatExtension ktlint(String version) {
 		Objects.requireNonNull(version, "version");
-		return new KotlinFormatExtension(version, Collections.emptyMap());
+		return new KotlinFormatExtension(version, false, Collections.emptyMap());
 	}
 
 	public KotlinFormatExtension ktlint() {
@@ -55,23 +55,32 @@ public KotlinFormatExtension ktlint() {
 	public class KotlinFormatExtension {
 
 		private final String version;
+		private boolean useExperimental;
 		private Map<String, String> userData;
 
-		KotlinFormatExtension(String version, Map<String, String> config) {
+		KotlinFormatExtension(String version, boolean useExperimental, Map<String, String> config) {
 			this.version = version;
+			this.useExperimental = useExperimental;
 			this.userData = config;
 			addStep(createStep());
 		}
 
-		public void userData(Map<String, String> userData) {
+		public KotlinFormatExtension setUseExperimental(boolean useExperimental) {
+			this.useExperimental = useExperimental;
+			replaceStep(createStep());
+			return this;
+		}
+
+		public KotlinFormatExtension userData(Map<String, String> userData) {
 			// Copy the map to a sorted map because up-to-date checking is based on binary-equals of the serialized
 			// representation.
 			this.userData = ImmutableSortedMap.copyOf(userData);
 			replaceStep(createStep());
+			return this;
 		}
 
 		private FormatterStep createStep() {
-			return KtLintStep.createForScript(version, provisioner(), userData);
+			return KtLintStep.createForScript(version, provisioner(), useExperimental, userData);
 		}
 	}
 
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
index 4c48c340d2..ff34ff1dc2 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
@@ -139,6 +139,42 @@ void testWithIndentation() throws IOException {
 		assertThat(result.getOutput()).contains("Unexpected indentation (4) (it should be 6)");
 	}
 
+	@Test
+	void withExperimental() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    kotlin {",
+				"        ktlint().setUseExperimental(true)",
+				"    }",
+				"}");
+		setFile("src/main/kotlin/experimental.kt").toResource("kotlin/ktlint/experimental.dirty");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("src/main/kotlin/experimental.kt").sameAsResource("kotlin/ktlint/experimental.clean");
+	}
+
+	@Test
+	void withExperimental_0_32() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    kotlin {",
+				"        ktlint('0.32.0').setUseExperimental(true)",
+				"    }",
+				"}");
+		setFile("src/main/kotlin/basic.kt").toResource("kotlin/ktlint/basic.dirty");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("src/main/kotlin/basic.kt").sameAsResource("kotlin/ktlint/basic.clean");
+	}
+
 	@Test
 	void testWithHeader() throws IOException {
 		setFile("build.gradle").toLines(
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
index c68de0d7e7..4d39a31d1a 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
@@ -128,6 +128,42 @@ void indentStep() throws IOException {
 		gradleRunner().withArguments("spotlessCheck").buildAndFail();
 	}
 
+	@Test
+	void withExperimental() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    kotlin {",
+				"        ktlint().setUseExperimental(true)",
+				"    }",
+				"}");
+		setFile("src/main/kotlin/experimental.kt").toResource("kotlin/ktlint/experimental.dirty");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("src/main/kotlin/experimental.kt").sameAsResource("kotlin/ktlint/experimental.clean");
+	}
+
+	@Test
+	void withExperimental_0_32() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    kotlin {",
+				"        ktlint('0.32.0').setUseExperimental(true)",
+				"    }",
+				"}");
+		setFile("src/main/kotlin/basic.kt").toResource("kotlin/ktlint/basic.dirty");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("src/main/kotlin/basic.kt").sameAsResource("kotlin/ktlint/basic.clean");
+	}
+
 	@Test
 	@EnabledForJreRange(min = JAVA_11) // ktfmt's dependency, google-java-format 1.8 requires a minimum of JRE 11+.
 	void integration_ktfmt() throws IOException {
diff --git a/testlib/src/main/resources/kotlin/ktlint/experimental.clean b/testlib/src/main/resources/kotlin/ktlint/experimental.clean
new file mode 100644
index 0000000000..50c41243a8
--- /dev/null
+++ b/testlib/src/main/resources/kotlin/ktlint/experimental.clean
@@ -0,0 +1,7 @@
+fun main() {
+    if (false) {
+        println("false")
+    } else {
+        println("true")
+    }
+}
diff --git a/testlib/src/main/resources/kotlin/ktlint/experimental.dirty b/testlib/src/main/resources/kotlin/ktlint/experimental.dirty
new file mode 100644
index 0000000000..cdb6e6bdf5
--- /dev/null
+++ b/testlib/src/main/resources/kotlin/ktlint/experimental.dirty
@@ -0,0 +1,6 @@
+fun main() {
+    if (false)
+        println("false")
+    else
+        println("true")
+}

From a209bc1cadbe08b72fcbc3b3059ee9cbd3d6c75a Mon Sep 17 00:00:00 2001
From: Alex Vanyo <vanyo@google.com>
Date: Sun, 17 Apr 2022 19:35:32 -0700
Subject: [PATCH 0082/2068] Update changelogs

---
 CHANGES.md               | 2 ++
 plugin-gradle/CHANGES.md | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 93c6ac5d34..c86189bad4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* Added support for enabling ktlint experimental ruleset. ([#1145](https://github.com/diffplug/spotless/pull/1168))
 
 ## [2.24.2] - 2022-04-06
 
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 192741c0d3..1862e3ddee 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Added
+* Added support for enabling ktlint experimental ruleset. ([#1145](https://github.com/diffplug/spotless/pull/1168))
 
 ## [6.4.2] - 2022-04-06
 

From ad44fc51d5c0b4c7a7369f64e07669263df116b9 Mon Sep 17 00:00:00 2001
From: Alex Vanyo <vanyo@google.com>
Date: Sun, 17 Apr 2022 20:11:33 -0700
Subject: [PATCH 0083/2068] Add test for verifying rule under test is still
 experimental

---
 .../gradle/spotless/KotlinExtensionTest.java  | 25 +++++++++++++++++++
 .../spotless/KotlinGradleExtensionTest.java   | 25 +++++++++++++++++++
 2 files changed, 50 insertions(+)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
index ff34ff1dc2..f10be630ef 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
@@ -175,6 +175,31 @@ void withExperimental_0_32() throws IOException {
 		assertFile("src/main/kotlin/basic.kt").sameAsResource("kotlin/ktlint/basic.clean");
 	}
 
+	/**
+	 * Check that the sample used to verify the experimental ruleset is untouched by the default ruleset, to verify
+	 * that enabling the experimental ruleset is actually doing something.
+	 *
+	 * If this test fails, it's likely that the experimental rule being used as a test graduated into the standard
+	 * ruleset, and therefore a new experimental rule should be used to verify functionality.
+	 */
+	@Test
+	void experimentalSampleUnchangedWithDefaultRuleset() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    kotlin {",
+				"        ktlint()",
+				"    }",
+				"}");
+		setFile("src/main/kotlin/experimental.kt").toResource("kotlin/ktlint/experimental.dirty");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("src/main/kotlin/experimental.kt").sameAsResource("kotlin/ktlint/experimental.dirty");
+	}
+
 	@Test
 	void testWithHeader() throws IOException {
 		setFile("build.gradle").toLines(
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
index 4d39a31d1a..d1ffff0718 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
@@ -164,6 +164,31 @@ void withExperimental_0_32() throws IOException {
 		assertFile("src/main/kotlin/basic.kt").sameAsResource("kotlin/ktlint/basic.clean");
 	}
 
+	/**
+	 * Check that the sample used to verify the experimental ruleset is untouched by the default ruleset, to verify
+	 * that enabling the experimental ruleset is actually doing something.
+	 *
+	 * If this test fails, it's likely that the experimental rule being used as a test graduated into the standard
+	 * ruleset, and therefore a new experimental rule should be used to verify functionality.
+	 */
+	@Test
+	void experimentalSampleUnchangedWithDefaultRuleset() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    kotlin {",
+				"        ktlint()",
+				"    }",
+				"}");
+		setFile("src/main/kotlin/experimental.kt").toResource("kotlin/ktlint/experimental.dirty");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("src/main/kotlin/experimental.kt").sameAsResource("kotlin/ktlint/experimental.dirty");
+	}
+
 	@Test
 	@EnabledForJreRange(min = JAVA_11) // ktfmt's dependency, google-java-format 1.8 requires a minimum of JRE 11+.
 	void integration_ktfmt() throws IOException {

From 0d8816c9fd137ebc8f08aaa0c9bf6a4c814fe6cf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Apr 2022 12:06:33 +0000
Subject: [PATCH 0084/2068] Bump org.gradle.test-retry from 1.3.1 to 1.3.2

Bumps org.gradle.test-retry from 1.3.1 to 1.3.2.

---
updated-dependencies:
- dependency-name: org.gradle.test-retry
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index bb8e7f77fe..6af1681cd2 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,7 +12,7 @@ pluginManagement {
 		// https://github.com/diffplug/goomph/blob/main/CHANGES.md
 		id 'com.diffplug.p2.asmaven'               version '3.27.0' // DO NOT UPDATE, see https://github.com/diffplug/spotless/pull/874
 		// https://github.com/gradle/test-retry-gradle-plugin/releases
-		id 'org.gradle.test-retry'                 version '1.3.1'
+		id 'org.gradle.test-retry'                 version '1.3.2'
 		// https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md
 		id 'com.adarshr.test-logger'               version '3.2.0'
 	}

From 1e85ee425454258c1af22ecab3d156fbc8f30808 Mon Sep 17 00:00:00 2001
From: Dawid Weiss <dawid.weiss@carrotsearch.com>
Date: Thu, 21 Apr 2022 09:04:46 +0200
Subject: [PATCH 0085/2068] #1175 Added a runToFixMessage property to customize
 the run-to-fix message in spotlessCheck task

---
 plugin-gradle/CHANGES.md                          |  2 ++
 .../diffplug/gradle/spotless/SpotlessCheck.java   | 10 ++++++++--
 .../gradle/spotless/DiffMessageFormatterTest.java | 15 ++++++++++++++-
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 192741c0d3..3a66016979 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Added
+* Added a runToFixMessage property to customize the run-to-fix message in spotlessCheck task ([#1175](https://github.com/diffplug/spotless/issues/1175)).
 
 ## [6.4.2] - 2022-04-06
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessCheck.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessCheck.java
index 55336a00ad..d0e27d60bf 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessCheck.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessCheck.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,6 +29,7 @@
 import org.gradle.api.file.FileVisitDetails;
 import org.gradle.api.file.FileVisitor;
 import org.gradle.api.provider.Property;
+import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.Internal;
 import org.gradle.api.tasks.TaskAction;
 
@@ -40,6 +41,9 @@ public abstract class SpotlessCheck extends SpotlessTaskService.ClientTask {
 	@Internal
 	public abstract Property<String> getEncoding();
 
+	@Input
+	public abstract Property<String> getRunToFixMessage();
+
 	public void performActionTest() throws IOException {
 		performAction(true);
 	}
@@ -98,7 +102,7 @@ public void visitFile(FileVisitDetails fileVisitDetails) {
 			if (!problemFiles.isEmpty()) {
 				Collections.sort(problemFiles);
 				throw new GradleException(DiffMessageFormatter.builder()
-						.runToFix("Run '" + calculateGradleCommand() + " " + getTaskPathPrefix() + "spotlessApply' to fix these violations.")
+						.runToFix(getRunToFixMessage().get())
 						.formatterFolder(
 								getProjectDir().get().getAsFile().toPath(),
 								getSpotlessOutDirectory().get().toPath(),
@@ -117,6 +121,8 @@ void init(SpotlessTaskImpl impl) {
 		super.init(impl);
 		getProjectPath().set(getProject().getPath());
 		getEncoding().set(impl.getEncoding());
+		getRunToFixMessage().convention(
+				"Run '" + calculateGradleCommand() + " " + getTaskPathPrefix() + "spotlessApply' to fix these violations.");
 	}
 
 	private String getTaskPathPrefix() {
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/DiffMessageFormatterTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/DiffMessageFormatterTest.java
index c46d398bf8..ef72043a47 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/DiffMessageFormatterTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/DiffMessageFormatterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -135,6 +135,19 @@ void lineEndingProblem() throws Exception {
 				"        +C\\n");
 	}
 
+	@Test
+	void customRunToFixMessage() throws Exception {
+		Bundle task = create(setFile("testFile").toContent("A\r\nB\r\nC\r\n"));
+		String customMessage = "Formatting issues detected, please read automatic-code-formatting.txt and correct.";
+		task.check.getRunToFixMessage().set(customMessage);
+
+		String msg = task.checkFailureMsg();
+
+		String firstLine = "The following files had format violations:\n";
+		String lastLine = "\n" + customMessage;
+		Assertions.assertThat(msg).startsWith(firstLine).endsWith(lastLine);
+	}
+
 	@Test
 	void whitespaceProblem() throws Exception {
 		Bundle spotless = create(setFile("testFile").toContent("A \nB\t\nC  \n"));

From 247939d28c3576f8cf202833d8321272d75c8ff8 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 21 Apr 2022 17:01:01 -0700
Subject: [PATCH 0086/2068] Remove unused piece from build.gradle (to trigger
 CI).

---
 build.gradle | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7c3a3dede9..16136e07ec 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,3 @@ spotless {
 		endWithNewline()
 	}
 }
-
-static Class<?> spotBugsTaskType() {
-	return com.github.spotbugs.snom.SpotBugsTask
-}

From 78dc7a6490469ea0d80d748cda2283db69795217 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 22 Apr 2022 00:58:21 +0000
Subject: [PATCH 0087/2068] Bump ktfmt from 0.34 to 0.35

Bumps [ktfmt](https://github.com/facebookincubator/ktfmt) from 0.34 to 0.35.
- [Release notes](https://github.com/facebookincubator/ktfmt/releases)
- [Commits](https://github.com/facebookincubator/ktfmt/compare/v0.34...v0.35)

---
updated-dependencies:
- dependency-name: com.facebook:ktfmt
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 lib/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index db9473d65e..28cd8e7221 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -35,7 +35,7 @@ dependencies {
 
 	palantirJavaFormatCompileOnly 'com.palantir.javaformat:palantir-java-format:1.1.0'
 
-	String VER_KTFMT = '0.34'
+	String VER_KTFMT = '0.35'
 	ktfmtCompileOnly "com.facebook:ktfmt:$VER_KTFMT"
 	String VER_KTLINT_GOOGLE_JAVA_FORMAT = '1.7' // for JDK 8 compatibility
 	ktfmtCompileOnly("com.google.googlejavaformat:google-java-format") {

From 533f1888ebdf289afd51fd53af92a04dfcccd7d8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 22 Apr 2022 00:58:48 +0000
Subject: [PATCH 0088/2068] Bump VER_KTLINT from 0.43.2 to 0.45.2

Bumps `VER_KTLINT` from 0.43.2 to 0.45.2.

Updates `ktlint` from 0.43.2 to 0.45.2
- [Release notes](https://github.com/pinterest/ktlint/releases)
- [Changelog](https://github.com/pinterest/ktlint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pinterest/ktlint/compare/0.43.2...0.45.2)

Updates `ktlint-core` from 0.43.2 to 0.45.2
- [Release notes](https://github.com/pinterest/ktlint/releases)
- [Changelog](https://github.com/pinterest/ktlint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pinterest/ktlint/compare/0.43.2...0.45.2)

Updates `ktlint-ruleset-experimental` from 0.43.2 to 0.45.2
- [Release notes](https://github.com/pinterest/ktlint/releases)
- [Changelog](https://github.com/pinterest/ktlint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pinterest/ktlint/compare/0.43.2...0.45.2)

Updates `ktlint-ruleset-standard` from 0.43.2 to 0.45.2
- [Release notes](https://github.com/pinterest/ktlint/releases)
- [Changelog](https://github.com/pinterest/ktlint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pinterest/ktlint/compare/0.43.2...0.45.2)

---
updated-dependencies:
- dependency-name: com.pinterest:ktlint
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.pinterest.ktlint:ktlint-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.pinterest.ktlint:ktlint-ruleset-experimental
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.pinterest.ktlint:ktlint-ruleset-standard
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 lib/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index db9473d65e..d620a3dd8d 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -44,7 +44,7 @@ dependencies {
 		}
 	}
 
-	String VER_KTLINT='0.43.2'
+	String VER_KTLINT='0.45.2'
 	ktlintCompileOnly "com.pinterest:ktlint:$VER_KTLINT"
 	ktlintCompileOnly "com.pinterest.ktlint:ktlint-core:$VER_KTLINT"
 	ktlintCompileOnly "com.pinterest.ktlint:ktlint-ruleset-experimental:$VER_KTLINT"

From 3d0a1032397423c46fb46efe1916f2cbb987cfa5 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 21 Apr 2022 22:20:50 -0700
Subject: [PATCH 0089/2068] Fix the regex for Python black to work for old and
 new versions.

---
 lib/src/main/java/com/diffplug/spotless/python/BlackStep.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/python/BlackStep.java b/lib/src/main/java/com/diffplug/spotless/python/BlackStep.java
index c19d023ffc..bd8095c495 100644
--- a/lib/src/main/java/com/diffplug/spotless/python/BlackStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/python/BlackStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 DiffPlug
+ * Copyright 2020-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.List;
+import java.util.regex.Pattern;
 
 import javax.annotation.Nullable;
 
@@ -63,6 +64,7 @@ private State createState() throws IOException, InterruptedException {
 		String trackingIssue = "\n  github issue to handle this better: https://github.com/diffplug/spotless/issues/674";
 		String exeAbsPath = ForeignExe.nameAndVersion("black", version)
 				.pathToExe(pathToExe)
+				.versionRegex(Pattern.compile("(?:black,|version) (\\S*)"))
 				.fixCantFind("Try running {@code pip install black=={version}}, or else tell Spotless where it is with {@code black().pathToExe('path/to/executable')}" + trackingIssue)
 				.fixWrongVersion("Try running {@code pip install --force-reinstall black=={version}}, or else specify {@code black('{versionFound}')} to Spotless" + trackingIssue)
 				.confirmVersionAndGetAbsolutePath();

From 800967a6fbecc2888983e64a66f9e3462714e154 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 21 Apr 2022 22:22:49 -0700
Subject: [PATCH 0090/2068] Bump default black version to latest: `19.10b0` ->
 `22.3.0`

---
 lib/src/main/java/com/diffplug/spotless/python/BlackStep.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/python/BlackStep.java b/lib/src/main/java/com/diffplug/spotless/python/BlackStep.java
index bd8095c495..3f4a8837b6 100644
--- a/lib/src/main/java/com/diffplug/spotless/python/BlackStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/python/BlackStep.java
@@ -37,7 +37,7 @@ public static String name() {
 	}
 
 	public static String defaultVersion() {
-		return "19.10b0";
+		return "22.3.0";
 	}
 
 	private final String version;

From f1c7f3968a78174bd04021ed34af3d225c6c3b71 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 21 Apr 2022 22:29:57 -0700
Subject: [PATCH 0091/2068] Update changelogs.

---
 CHANGES.md               | 3 ++-
 plugin-gradle/CHANGES.md | 2 ++
 plugin-maven/CHANGES.md  | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index c86189bad4..24ee694274 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,9 +12,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Added support for enabling ktlint experimental ruleset. ([#1145](https://github.com/diffplug/spotless/pull/1168))
+### Fixed
+* Fixed support for Python Black's new version reporting, and bumped default version to latest (`19.10b0` -> `22.3.0`) ([#1170](https://github.com/diffplug/spotless/issues/1170))
 
 ## [2.24.2] - 2022-04-06
-
 ### Fixed
 * Git user config and system config also included for defaultEndings configuration. ([#540](https://github.com/diffplug/spotless/issues/540))
 
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index b986f4b839..04d1ccf10f 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -6,6 +6,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * Added a runToFixMessage property to customize the run-to-fix message in spotlessCheck task ([#1175](https://github.com/diffplug/spotless/issues/1175)).
 * Added support for enabling ktlint experimental ruleset. ([#1145](https://github.com/diffplug/spotless/pull/1168))
+### Fixed
+* Fixed support for Python Black's new version reporting, and bumped default version to latest (`19.10b0` -> `22.3.0`) ([#1170](https://github.com/diffplug/spotless/issues/1170))
 
 ## [6.4.2] - 2022-04-06
 ### Fixed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 7ffcf0cc81..fb5dea1c6d 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,9 +3,10 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Fixed support for Python Black's new version reporting, and bumped default version to latest (`19.10b0` -> `22.3.0`) ([#1170](https://github.com/diffplug/spotless/issues/1170))
 
 ## [2.22.1] - 2022-04-06
-
 ### Fixed
 * Git user config and system config also included for defaultEndings configuration. ([#540](https://github.com/diffplug/spotless/issues/540))
 

From 297c8f7e2d3e512ce70eb0a44b5acbf1bfe401a3 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 21 Apr 2022 22:57:43 -0700
Subject: [PATCH 0092/2068] Apply `base` eagerly.

---
 .../gradle/spotless/FormatExtension.java      |  5 ++--
 .../spotless/SpotlessExtensionImpl.java       | 16 +++++------
 .../gradle/spotless/SpotlessPlugin.java       | 27 +++----------------
 3 files changed, 12 insertions(+), 36 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index 9da66b7929..d8c5525db6 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,6 +37,7 @@
 import org.gradle.api.Project;
 import org.gradle.api.file.ConfigurableFileTree;
 import org.gradle.api.file.FileCollection;
+import org.gradle.api.plugins.BasePlugin;
 
 import com.diffplug.common.base.Preconditions;
 import com.diffplug.spotless.FormatExceptionPolicyStrict;
@@ -788,7 +789,7 @@ public SpotlessApply createIndependentApplyTask(String taskName) {
 		spotlessTask.init(spotless.getRegisterDependenciesTask().getTaskService());
 		setupTask(spotlessTask);
 		// clean removes the SpotlessCache, so we have to run after clean
-		SpotlessPlugin.configureCleanTask(spotless.project, spotlessTask::mustRunAfter);
+		spotlessTask.mustRunAfter(BasePlugin.CLEAN_TASK_NAME);
 		// create the apply task
 		SpotlessApply applyTask = spotless.project.getTasks().create(taskName, SpotlessApply.class);
 		applyTask.init(spotlessTask);
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtensionImpl.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtensionImpl.java
index 24fa7b54b0..8a03d5b2ef 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtensionImpl.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtensionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 
 import org.gradle.api.Action;
 import org.gradle.api.Project;
-import org.gradle.api.UnknownTaskException;
+import org.gradle.api.plugins.BasePlugin;
 import org.gradle.api.plugins.JavaBasePlugin;
 import org.gradle.api.tasks.TaskContainer;
 import org.gradle.api.tasks.TaskProvider;
@@ -41,12 +41,7 @@ public SpotlessExtensionImpl(Project project) {
 
 		project.afterEvaluate(unused -> {
 			if (enforceCheck) {
-				try {
-					project.getTasks().named(JavaBasePlugin.CHECK_TASK_NAME)
-							.configure(task -> task.dependsOn(rootCheckTask));
-				} catch (UnknownTaskException e) {
-					// no action needed, it's okay if there's no `check` task
-				}
+				project.getTasks().named(JavaBasePlugin.CHECK_TASK_NAME).configure(task -> task.dependsOn(rootCheckTask));
 			}
 		});
 	}
@@ -61,8 +56,9 @@ protected void createFormatTasks(String name, FormatExtension formatExtension) {
 		TaskProvider<SpotlessTaskImpl> spotlessTask = tasks.register(taskName, SpotlessTaskImpl.class, task -> {
 			task.init(getRegisterDependenciesTask().getTaskService());
 			task.setEnabled(!isIdeHook);
+			// clean removes the SpotlessCache, so we have to run after clean
+			task.mustRunAfter(BasePlugin.CLEAN_TASK_NAME);
 		});
-		SpotlessPlugin.taskMustRunAfterClean(project, spotlessTask);
 		project.afterEvaluate(unused -> {
 			spotlessTask.configure(task -> {
 				// now that the task is being configured, we execute our actions
@@ -103,8 +99,8 @@ protected void createFormatTasks(String name, FormatExtension formatExtension) {
 		// create the diagnose task
 		TaskProvider<SpotlessDiagnoseTask> diagnoseTask = tasks.register(taskName + DIAGNOSE, SpotlessDiagnoseTask.class, task -> {
 			task.source = spotlessTask.get();
+			task.mustRunAfter(BasePlugin.CLEAN_TASK_NAME);
 		});
-		SpotlessPlugin.taskMustRunAfterClean(project, diagnoseTask);
 		rootDiagnoseTask.configure(task -> task.dependsOn(diagnoseTask));
 	}
 }
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPlugin.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPlugin.java
index 7b9e61eb03..868502d216 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPlugin.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPlugin.java
@@ -15,14 +15,10 @@
  */
 package com.diffplug.gradle.spotless;
 
-import java.util.function.Consumer;
-
 import org.gradle.api.GradleException;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.plugins.BasePlugin;
-import org.gradle.api.tasks.Delete;
-import org.gradle.api.tasks.TaskProvider;
 
 import com.diffplug.spotless.SpotlessCache;
 
@@ -39,6 +35,8 @@ public void apply(Project project) {
 		if (project.hasProperty(SPOTLESS_MODERN)) {
 			project.getLogger().warn("'spotlessModern' has no effect as of Spotless 5.0, recommend removing it.");
 		}
+		// make sure there's a `clean` and a `check`
+		project.getPlugins().apply(BasePlugin.class);
 
 		// setup the extension
 		project.getExtensions().create(SpotlessExtension.class, SpotlessExtension.EXTENSION, SpotlessExtensionImpl.class, project);
@@ -50,26 +48,7 @@ public void apply(Project project) {
 		//
 		// we use System.identityHashCode() to avoid a memory leak by hanging on to the reference directly
 		int cacheKey = System.identityHashCode(project.getRootProject());
-		configureCleanTask(project, clean -> clean.doLast(unused -> SpotlessCache.clearOnce(cacheKey)));
-	}
-
-	static void configureCleanTask(Project project, Consumer<Delete> onClean) {
-		project.getTasks().withType(Delete.class).configureEach(clean -> {
-			if (clean.getName().equals(BasePlugin.CLEAN_TASK_NAME)) {
-				onClean.accept(clean);
-			}
-		});
-	}
-
-	/** clean removes the SpotlessCache, so we have to run after clean. */
-	static void taskMustRunAfterClean(Project project, TaskProvider<?> task) {
-		if (project.getPlugins().hasPlugin(BasePlugin.class)) {
-			// if we know that the clean task is around, then we can configure lazily
-			task.configure(t -> t.mustRunAfter(BasePlugin.CLEAN_TASK_NAME));
-		} else {
-			// otherwise, we trigger configuration when the clean task gets configured
-			configureCleanTask(project, clean -> task.get().mustRunAfter(clean));
-		}
+		project.getTasks().named(BasePlugin.CLEAN_TASK_NAME).configure(clean -> clean.doLast(unused -> SpotlessCache.clearOnce(cacheKey)));
 	}
 
 	static String capitalize(String input) {

From 5856e8a0459001a98c743edcb9bff68ebf6213ab Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 21 Apr 2022 23:00:11 -0700
Subject: [PATCH 0093/2068] Update changelog.

---
 plugin-gradle/CHANGES.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 04d1ccf10f..97bd49309d 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -4,10 +4,14 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* Added a runToFixMessage property to customize the run-to-fix message in spotlessCheck task ([#1175](https://github.com/diffplug/spotless/issues/1175)).
+* Added a `runToFixMessage` property to customize the run-to-fix message in `spotlessCheck` task ([#1175](https://github.com/diffplug/spotless/issues/1175)).
 * Added support for enabling ktlint experimental ruleset. ([#1145](https://github.com/diffplug/spotless/pull/1168))
 ### Fixed
 * Fixed support for Python Black's new version reporting, and bumped default version to latest (`19.10b0` -> `22.3.0`) ([#1170](https://github.com/diffplug/spotless/issues/1170))
+### Changed
+- Spotless now applies the `base` plugin to make sure that Spotless always has a `check` task to hook into ([#1179](https://github.com/diffplug/spotless/pull/1179), fixes [#1164](https://github.com/diffplug/spotless/pull/1164), reverts [#1014](https://github.com/diffplug/spotless/pull/1014))
+  - Spotless used to work this way, we stopped applying base starting with version [`6.0.3` (released Dec 2021)](https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md#603---2021-12-06) in order to play nicely with a now-outdated Android template, but not applying `base` causes more problems than it fixes (see [#1164](https://github.com/diffplug/spotless/pull/1164) for a good example).
+  - If you have anything like `tasks.register<Delete>("clean"` or `tasks.register("clean", Delete)`, just change the `register` to `named` so that you are configuring the existing `clean` created by `base`, rather than creating a new task.
 
 ## [6.4.2] - 2022-04-06
 ### Fixed

From b6d71e75434f3b5d6199295adc4373cf9168b865 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 21 Apr 2022 23:15:18 -0700
Subject: [PATCH 0094/2068] All tasks are now part of the `verification` group.

---
 .../java/com/diffplug/gradle/spotless/SpotlessExtension.java  | 3 ++-
 .../com/diffplug/gradle/spotless/SpotlessExtensionImpl.java   | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
index e85c26f25e..57aa3b2d83 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
@@ -29,6 +29,7 @@
 import org.gradle.api.Project;
 import org.gradle.api.tasks.TaskContainer;
 import org.gradle.api.tasks.TaskProvider;
+import org.gradle.language.base.plugins.LifecycleBasePlugin;
 
 import com.diffplug.spotless.LineEnding;
 
@@ -36,7 +37,7 @@ public abstract class SpotlessExtension {
 	final Project project;
 	private final RegisterDependenciesTask registerDependenciesTask;
 
-	protected static final String TASK_GROUP = "Verification";
+	protected static final String TASK_GROUP = LifecycleBasePlugin.VERIFICATION_GROUP;
 	protected static final String CHECK_DESCRIPTION = "Checks that sourcecode satisfies formatting steps.";
 	protected static final String APPLY_DESCRIPTION = "Applies code formatting steps to sourcecode in-place.";
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtensionImpl.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtensionImpl.java
index 8a03d5b2ef..96474ffc4b 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtensionImpl.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtensionImpl.java
@@ -55,6 +55,7 @@ protected void createFormatTasks(String name, FormatExtension formatExtension) {
 		String taskName = EXTENSION + SpotlessPlugin.capitalize(name);
 		TaskProvider<SpotlessTaskImpl> spotlessTask = tasks.register(taskName, SpotlessTaskImpl.class, task -> {
 			task.init(getRegisterDependenciesTask().getTaskService());
+			task.setGroup(TASK_GROUP);
 			task.setEnabled(!isIdeHook);
 			// clean removes the SpotlessCache, so we have to run after clean
 			task.mustRunAfter(BasePlugin.CLEAN_TASK_NAME);
@@ -73,6 +74,7 @@ protected void createFormatTasks(String name, FormatExtension formatExtension) {
 		// create the check and apply control tasks
 		TaskProvider<SpotlessApply> applyTask = tasks.register(taskName + APPLY, SpotlessApply.class, task -> {
 			task.init(spotlessTask.get());
+			task.setGroup(TASK_GROUP);
 			task.setEnabled(!isIdeHook);
 			task.dependsOn(spotlessTask);
 		});
@@ -87,6 +89,7 @@ protected void createFormatTasks(String name, FormatExtension formatExtension) {
 
 		TaskProvider<SpotlessCheck> checkTask = tasks.register(taskName + CHECK, SpotlessCheck.class, task -> {
 			SpotlessTaskImpl source = spotlessTask.get();
+			task.setGroup(TASK_GROUP);
 			task.init(source);
 			task.setEnabled(!isIdeHook);
 			task.dependsOn(source);
@@ -99,6 +102,7 @@ protected void createFormatTasks(String name, FormatExtension formatExtension) {
 		// create the diagnose task
 		TaskProvider<SpotlessDiagnoseTask> diagnoseTask = tasks.register(taskName + DIAGNOSE, SpotlessDiagnoseTask.class, task -> {
 			task.source = spotlessTask.get();
+			task.setGroup(TASK_GROUP);
 			task.mustRunAfter(BasePlugin.CLEAN_TASK_NAME);
 		});
 		rootDiagnoseTask.configure(task -> task.dependsOn(diagnoseTask));

From c4748d8d1ce86d3e0e3d9d2dbe8c600fe846d10e Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 21 Apr 2022 23:17:50 -0700
Subject: [PATCH 0095/2068] Update changelog.

---
 plugin-gradle/CHANGES.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 97bd49309d..32e20c8732 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -4,12 +4,13 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* Added a `runToFixMessage` property to customize the run-to-fix message in `spotlessCheck` task ([#1175](https://github.com/diffplug/spotless/issues/1175)).
+* Added a `runToFixMessage` property to customize the run-to-fix message in `spotlessCheck` task. ([#1175](https://github.com/diffplug/spotless/issues/1175))
 * Added support for enabling ktlint experimental ruleset. ([#1145](https://github.com/diffplug/spotless/pull/1168))
 ### Fixed
-* Fixed support for Python Black's new version reporting, and bumped default version to latest (`19.10b0` -> `22.3.0`) ([#1170](https://github.com/diffplug/spotless/issues/1170))
+* Fixed support for Python Black's new version reporting, and bumped default version to latest (`19.10b0` -> `22.3.0`). ([#1170](https://github.com/diffplug/spotless/issues/1170))
+* All tasks (including helper tasks) are now part of the `verification` group. (fixes [#1050](https://github.com/diffplug/spotless/issues/1050))
 ### Changed
-- Spotless now applies the `base` plugin to make sure that Spotless always has a `check` task to hook into ([#1179](https://github.com/diffplug/spotless/pull/1179), fixes [#1164](https://github.com/diffplug/spotless/pull/1164), reverts [#1014](https://github.com/diffplug/spotless/pull/1014))
+- Spotless now applies the `base` plugin to make sure that Spotless always has a `check` task to hook into. ([#1179](https://github.com/diffplug/spotless/pull/1179), fixes [#1164](https://github.com/diffplug/spotless/pull/1164), reverts [#1014](https://github.com/diffplug/spotless/pull/1014))
   - Spotless used to work this way, we stopped applying base starting with version [`6.0.3` (released Dec 2021)](https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md#603---2021-12-06) in order to play nicely with a now-outdated Android template, but not applying `base` causes more problems than it fixes (see [#1164](https://github.com/diffplug/spotless/pull/1164) for a good example).
   - If you have anything like `tasks.register<Delete>("clean"` or `tasks.register("clean", Delete)`, just change the `register` to `named` so that you are configuring the existing `clean` created by `base`, rather than creating a new task.
 

From 2bd6d403690b669cc6e7a134c6ba3235eab98c94 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 21 Apr 2022 23:37:15 -0700
Subject: [PATCH 0096/2068] Fix encoding error messages when generated on Java
 8.

---
 .../com/diffplug/spotless/EncodingErrorMsg.java    | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/EncodingErrorMsg.java b/lib/src/main/java/com/diffplug/spotless/EncodingErrorMsg.java
index b89400b7c2..168bf9acff 100644
--- a/lib/src/main/java/com/diffplug/spotless/EncodingErrorMsg.java
+++ b/lib/src/main/java/com/diffplug/spotless/EncodingErrorMsg.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 package com.diffplug.spotless;
 
+import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
 import java.nio.charset.Charset;
@@ -115,8 +116,8 @@ private static void addIfAvailable(Collection<Charset> charsets, String name) {
 	}
 
 	private void appendExample(Charset charset, boolean must) {
-		byteBuf.clear();
-		charBuf.clear();
+		java8fix(byteBuf).clear();
+		java8fix(charBuf).clear();
 
 		CharsetDecoder decoder = charset.newDecoder();
 		if (!must) {
@@ -134,7 +135,7 @@ private void appendExample(Charset charset, boolean must) {
 					.onUnmappableCharacter(CodingErrorAction.REPLACE)
 					.decode(byteBuf, charBuf, true);
 		}
-		charBuf.flip();
+		java8fix(charBuf).flip();
 
 		int start = Math.max(unrepresentable - CONTEXT, 0);
 		int end = Math.min(charBuf.limit(), unrepresentable + CONTEXT + 1);
@@ -146,4 +147,9 @@ private void appendExample(Charset charset, boolean must) {
 		message.append(" <- ");
 		message.append(charset.name());
 	}
+
+	/** Fixes https://jira.mongodb.org/browse/JAVA-2559, as reported in https://github.com/diffplug/spotless/issues/1081 */
+	private static Buffer java8fix(Buffer b) {
+		return b;
+	}
 }

From 40df41df55564ff19ba2a5c49c72cbf3fb130994 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 21 Apr 2022 23:39:44 -0700
Subject: [PATCH 0097/2068] Update changelog.

---
 CHANGES.md               | 3 ++-
 plugin-gradle/CHANGES.md | 1 +
 plugin-maven/CHANGES.md  | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 24ee694274..554f1688e4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,7 +13,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * Added support for enabling ktlint experimental ruleset. ([#1145](https://github.com/diffplug/spotless/pull/1168))
 ### Fixed
-* Fixed support for Python Black's new version reporting, and bumped default version to latest (`19.10b0` -> `22.3.0`) ([#1170](https://github.com/diffplug/spotless/issues/1170))
+* Fixed support for Python Black's new version reporting, and bumped default version to latest (`19.10b0` -> `22.3.0`). ([#1170](https://github.com/diffplug/spotless/issues/1170))
+* Error messages for unexpected file encoding now works on Java 8. (fixes [#1081](https://github.com/diffplug/spotless/issues/1081))
 
 ## [2.24.2] - 2022-04-06
 ### Fixed
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 32e20c8732..3e54fe34e1 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -9,6 +9,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Fixed support for Python Black's new version reporting, and bumped default version to latest (`19.10b0` -> `22.3.0`). ([#1170](https://github.com/diffplug/spotless/issues/1170))
 * All tasks (including helper tasks) are now part of the `verification` group. (fixes [#1050](https://github.com/diffplug/spotless/issues/1050))
+* Error messages for unexpected file encoding now works on Java 8. (fixes [#1081](https://github.com/diffplug/spotless/issues/1081))
 ### Changed
 - Spotless now applies the `base` plugin to make sure that Spotless always has a `check` task to hook into. ([#1179](https://github.com/diffplug/spotless/pull/1179), fixes [#1164](https://github.com/diffplug/spotless/pull/1164), reverts [#1014](https://github.com/diffplug/spotless/pull/1014))
   - Spotless used to work this way, we stopped applying base starting with version [`6.0.3` (released Dec 2021)](https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md#603---2021-12-06) in order to play nicely with a now-outdated Android template, but not applying `base` causes more problems than it fixes (see [#1164](https://github.com/diffplug/spotless/pull/1164) for a good example).
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index fb5dea1c6d..8097b5a368 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -4,7 +4,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Fixed
-* Fixed support for Python Black's new version reporting, and bumped default version to latest (`19.10b0` -> `22.3.0`) ([#1170](https://github.com/diffplug/spotless/issues/1170))
+* Fixed support for Python Black's new version reporting, and bumped default version to latest (`19.10b0` -> `22.3.0`). ([#1170](https://github.com/diffplug/spotless/issues/1170))
+* Error messages for unexpected file encoding now works on Java 8. (fixes [#1081](https://github.com/diffplug/spotless/issues/1081))
 
 ## [2.22.1] - 2022-04-06
 ### Fixed

From b0b19360e8e357a4ce84dbe922ad6145e5bd8196 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 21 Apr 2022 23:55:10 -0700
Subject: [PATCH 0098/2068] Bump our default KtfmtStep version too.

---
 lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
index d9feef4c91..3cefe7baca 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
@@ -39,7 +39,7 @@ public class KtfmtStep {
 	// prevent direct instantiation
 	private KtfmtStep() {}
 
-	private static final String DEFAULT_VERSION = "0.34";
+	private static final String DEFAULT_VERSION = "0.35";
 	static final String NAME = "ktfmt";
 	static final String PACKAGE = "com.facebook";
 	static final String MAVEN_COORDINATE = PACKAGE + ":ktfmt:";

From 6f520e68266499d206bbe27dbc228e45504faecd Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 22 Apr 2022 00:11:37 -0700
Subject: [PATCH 0099/2068] Bump KtLintStep default version `0.43.2` ->
 `0.45.2`.

---
 lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index 711495c409..de099b04d1 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -38,7 +38,7 @@ public class KtLintStep {
 	// prevent direct instantiation
 	private KtLintStep() {}
 
-	private static final String DEFAULT_VERSION = "0.43.2";
+	private static final String DEFAULT_VERSION = "0.45.2";
 	static final String NAME = "ktlint";
 	static final String PACKAGE_PRE_0_32 = "com.github.shyiko";
 	static final String PACKAGE = "com.pinterest";

From cb1a37786e1797f6cc719d1343f4c480f7ca155d Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 22 Apr 2022 00:17:07 -0700
Subject: [PATCH 0100/2068] Bump changelogs.

---
 CHANGES.md               |  5 ++++-
 plugin-gradle/CHANGES.md | 10 ++++++----
 plugin-maven/CHANGES.md  |  5 ++++-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 554f1688e4..cfd8526468 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,8 +13,11 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * Added support for enabling ktlint experimental ruleset. ([#1145](https://github.com/diffplug/spotless/pull/1168))
 ### Fixed
-* Fixed support for Python Black's new version reporting, and bumped default version to latest (`19.10b0` -> `22.3.0`). ([#1170](https://github.com/diffplug/spotless/issues/1170))
+* Fixed support for Python Black's new version reporting. ([#1170](https://github.com/diffplug/spotless/issues/1170))
 * Error messages for unexpected file encoding now works on Java 8. (fixes [#1081](https://github.com/diffplug/spotless/issues/1081))
+### Changes
+* Bump default `black` version to latest (`19.10b0` -> `22.3.0`). ([#1170](https://github.com/diffplug/spotless/issues/1170))
+* Bump default `ktfmt` version `0.34` -> `0.36`. ([#1159](https://github.com/diffplug/spotless/pull/1159))
 
 ## [2.24.2] - 2022-04-06
 ### Fixed
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 3e54fe34e1..b412a58a59 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -7,13 +7,15 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Added a `runToFixMessage` property to customize the run-to-fix message in `spotlessCheck` task. ([#1175](https://github.com/diffplug/spotless/issues/1175))
 * Added support for enabling ktlint experimental ruleset. ([#1145](https://github.com/diffplug/spotless/pull/1168))
 ### Fixed
-* Fixed support for Python Black's new version reporting, and bumped default version to latest (`19.10b0` -> `22.3.0`). ([#1170](https://github.com/diffplug/spotless/issues/1170))
+* Fixed support for Python Black's new version reporting. ([#1170](https://github.com/diffplug/spotless/issues/1170))
 * All tasks (including helper tasks) are now part of the `verification` group. (fixes [#1050](https://github.com/diffplug/spotless/issues/1050))
 * Error messages for unexpected file encoding now works on Java 8. (fixes [#1081](https://github.com/diffplug/spotless/issues/1081))
 ### Changed
-- Spotless now applies the `base` plugin to make sure that Spotless always has a `check` task to hook into. ([#1179](https://github.com/diffplug/spotless/pull/1179), fixes [#1164](https://github.com/diffplug/spotless/pull/1164), reverts [#1014](https://github.com/diffplug/spotless/pull/1014))
-  - Spotless used to work this way, we stopped applying base starting with version [`6.0.3` (released Dec 2021)](https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md#603---2021-12-06) in order to play nicely with a now-outdated Android template, but not applying `base` causes more problems than it fixes (see [#1164](https://github.com/diffplug/spotless/pull/1164) for a good example).
-  - If you have anything like `tasks.register<Delete>("clean"` or `tasks.register("clean", Delete)`, just change the `register` to `named` so that you are configuring the existing `clean` created by `base`, rather than creating a new task.
+* Bump default `black` version to latest (`19.10b0` -> `22.3.0`). ([#1170](https://github.com/diffplug/spotless/issues/1170))
+* Bump default `ktfmt` version to latest (`0.34` -> `0.35`). ([#1159](https://github.com/diffplug/spotless/pull/1159))
+* Spotless now applies the `base` plugin to make sure that Spotless always has a `check` task to hook into. ([#1179](https://github.com/diffplug/spotless/pull/1179), fixes [#1164](https://github.com/diffplug/spotless/pull/1164), reverts [#1014](https://github.com/diffplug/spotless/pull/1014))
+  * Spotless used to work this way, we stopped applying base starting with version [`6.0.3` (released Dec 2021)](https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md#603---2021-12-06) in order to play nicely with a now-outdated Android template, but not applying `base` causes more problems than it fixes (see [#1164](https://github.com/diffplug/spotless/pull/1164) for a good example).
+  * If you have anything like `tasks.register<Delete>("clean"` or `tasks.register("clean", Delete)`, just change the `register` to `named` so that you are configuring the existing `clean` created by `base`, rather than creating a new task.
 
 ## [6.4.2] - 2022-04-06
 ### Fixed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 8097b5a368..e4831da6c1 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -4,8 +4,11 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Fixed
-* Fixed support for Python Black's new version reporting, and bumped default version to latest (`19.10b0` -> `22.3.0`). ([#1170](https://github.com/diffplug/spotless/issues/1170))
+* Fixed support for Python Black's new version reporting. ([#1170](https://github.com/diffplug/spotless/issues/1170))
 * Error messages for unexpected file encoding now works on Java 8. (fixes [#1081](https://github.com/diffplug/spotless/issues/1081))
+### Changes
+* Bump default `black` version to latest (`19.10b0` -> `22.3.0`). ([#1170](https://github.com/diffplug/spotless/issues/1170))
+* Bump default `ktfmt` version `0.34` -> `0.35`. ([#1159](https://github.com/diffplug/spotless/pull/1159))
 
 ## [2.22.1] - 2022-04-06
 ### Fixed

From b708850eb0114a91fdb153a96602bcea566373c1 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 22 Apr 2022 00:23:13 -0700
Subject: [PATCH 0101/2068] Bump changelogs.

---
 CHANGES.md               | 5 +++--
 plugin-gradle/CHANGES.md | 5 +++--
 plugin-maven/CHANGES.md  | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index cfd8526468..b36380d4fb 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -16,8 +16,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Fixed support for Python Black's new version reporting. ([#1170](https://github.com/diffplug/spotless/issues/1170))
 * Error messages for unexpected file encoding now works on Java 8. (fixes [#1081](https://github.com/diffplug/spotless/issues/1081))
 ### Changes
-* Bump default `black` version to latest (`19.10b0` -> `22.3.0`). ([#1170](https://github.com/diffplug/spotless/issues/1170))
-* Bump default `ktfmt` version `0.34` -> `0.36`. ([#1159](https://github.com/diffplug/spotless/pull/1159))
+* Bump default `black` version to latest `19.10b0` -> `22.3.0`. ([#1170](https://github.com/diffplug/spotless/issues/1170))
+* Bump default `ktfmt` version to latest `0.34` -> `0.35`. ([#1159](https://github.com/diffplug/spotless/pull/1159))
+* Bump default `ktlint` version to latest `0.43.2` -> `0.45.2`. ([#1177](https://github.com/diffplug/spotless/pull/1177))
 
 ## [2.24.2] - 2022-04-06
 ### Fixed
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index b412a58a59..1685156c8a 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -11,11 +11,12 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * All tasks (including helper tasks) are now part of the `verification` group. (fixes [#1050](https://github.com/diffplug/spotless/issues/1050))
 * Error messages for unexpected file encoding now works on Java 8. (fixes [#1081](https://github.com/diffplug/spotless/issues/1081))
 ### Changed
-* Bump default `black` version to latest (`19.10b0` -> `22.3.0`). ([#1170](https://github.com/diffplug/spotless/issues/1170))
-* Bump default `ktfmt` version to latest (`0.34` -> `0.35`). ([#1159](https://github.com/diffplug/spotless/pull/1159))
 * Spotless now applies the `base` plugin to make sure that Spotless always has a `check` task to hook into. ([#1179](https://github.com/diffplug/spotless/pull/1179), fixes [#1164](https://github.com/diffplug/spotless/pull/1164), reverts [#1014](https://github.com/diffplug/spotless/pull/1014))
   * Spotless used to work this way, we stopped applying base starting with version [`6.0.3` (released Dec 2021)](https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md#603---2021-12-06) in order to play nicely with a now-outdated Android template, but not applying `base` causes more problems than it fixes (see [#1164](https://github.com/diffplug/spotless/pull/1164) for a good example).
   * If you have anything like `tasks.register<Delete>("clean"` or `tasks.register("clean", Delete)`, just change the `register` to `named` so that you are configuring the existing `clean` created by `base`, rather than creating a new task.
+* Bump default `black` version to latest `19.10b0` -> `22.3.0`. ([#1170](https://github.com/diffplug/spotless/issues/1170))
+* Bump default `ktfmt` version to latest `0.34` -> `0.35`. ([#1159](https://github.com/diffplug/spotless/pull/1159))
+* Bump default `ktlint` version to latest `0.43.2` -> `0.45.2`. ([#1177](https://github.com/diffplug/spotless/pull/1177))
 
 ## [6.4.2] - 2022-04-06
 ### Fixed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index e4831da6c1..7c7a8b214b 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -7,8 +7,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Fixed support for Python Black's new version reporting. ([#1170](https://github.com/diffplug/spotless/issues/1170))
 * Error messages for unexpected file encoding now works on Java 8. (fixes [#1081](https://github.com/diffplug/spotless/issues/1081))
 ### Changes
-* Bump default `black` version to latest (`19.10b0` -> `22.3.0`). ([#1170](https://github.com/diffplug/spotless/issues/1170))
-* Bump default `ktfmt` version `0.34` -> `0.35`. ([#1159](https://github.com/diffplug/spotless/pull/1159))
+* Bump default `black` version to latest `19.10b0` -> `22.3.0`. ([#1170](https://github.com/diffplug/spotless/issues/1170))
+* Bump default `ktfmt` version to latest `0.34` -> `0.35`. ([#1159](https://github.com/diffplug/spotless/pull/1159))
+* Bump default `ktlint` version to latest `0.43.2` -> `0.45.2`. ([#1177](https://github.com/diffplug/spotless/pull/1177))
 
 ## [2.22.1] - 2022-04-06
 ### Fixed

From 9e1bfc8be55f54bb3411ea2aa9bee887a0b96898 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 22 Apr 2022 07:17:34 -0700
Subject: [PATCH 0102/2068] Fix test assertion.

---
 .../java/com/diffplug/spotless/kotlin/KtLintStepTest.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
index a3548c58b6..ecca9e6cc6 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@ void behavior() throws Exception {
 				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean")
 				.testResourceException("kotlin/ktlint/unsolvable.dirty", assertion -> {
 					assertion.isInstanceOf(AssertionError.class);
-					assertion.hasMessage("Error on line: 1, column: 2\n" +
+					assertion.hasMessage("Error on line: 1, column: 1\n" +
 							"Wildcard import");
 				});
 	}

From 1a26b6b55cb49705d5d1c1d7cad045807bfb9394 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 22 Apr 2022 07:38:05 -0700
Subject: [PATCH 0103/2068] Small change to trigger CI.

---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 8b95e1b44f..1a95765d37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,7 +23,6 @@ gradle-app.setting
 _ext/*/gradle/dependency-locks/*.lockfile
 
 ### Eclipse ###
-*.pydevproject
 .metadata
 .gradle
 bin/

From 42a6361f78c92beee4ddc9b1871036520ea47747 Mon Sep 17 00:00:00 2001
From: circleci <circleci@ca074f429a32>
Date: Fri, 22 Apr 2022 23:27:11 +0000
Subject: [PATCH 0104/2068] Published lib/2.25.0

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index b36380d4fb..90eccfbd45 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.25.0] - 2022-04-22
 ### Added
 * Added support for enabling ktlint experimental ruleset. ([#1145](https://github.com/diffplug/spotless/pull/1168))
 ### Fixed

From 7df18d26801f7e3fc22c133def6f53e9ac308285 Mon Sep 17 00:00:00 2001
From: circleci <circleci@ca074f429a32>
Date: Fri, 22 Apr 2022 23:27:56 +0000
Subject: [PATCH 0105/2068] Published gradle/6.5.0

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 46 ++++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 1685156c8a..a85e28ed75 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [6.5.0] - 2022-04-22
 ### Added
 * Added a `runToFixMessage` property to customize the run-to-fix message in `spotlessCheck` task. ([#1175](https://github.com/diffplug/spotless/issues/1175))
 * Added support for enabling ktlint experimental ruleset. ([#1145](https://github.com/diffplug/spotless/pull/1168))
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index c8de7946bc..02baa6e654 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -18,9 +18,9 @@ output = [
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
 [![Maven central](https://img.shields.io/badge/mavencentral-yes-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/index.html)
 [![License Apache](https://img.shields.io/badge/license-apache-blue.svg)](https://tldrlegal.com/license/apache-license-2.0-(apache-2.0))
-[![Changelog](https://img.shields.io/badge/changelog-6.4.2-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-6.5.0-blue.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)
@@ -126,10 +126,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -141,7 +141,7 @@ If you're stuck on an older version of Gradle, `id 'com.diffplug.gradle.spotless
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -248,8 +248,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -300,8 +300,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -361,7 +361,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -393,7 +393,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -425,7 +425,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -459,7 +459,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -480,7 +480,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -505,7 +505,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -545,7 +545,7 @@ sql.formatter.indent.size=4
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -588,7 +588,7 @@ For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#n
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -813,7 +813,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -880,9 +880,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -915,11 +915,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.4.2/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From 90f3f997b708bd8526aac2bc4d79db57070ff090 Mon Sep 17 00:00:00 2001
From: circleci <circleci@ca074f429a32>
Date: Fri, 22 Apr 2022 23:29:07 +0000
Subject: [PATCH 0106/2068] Published maven/2.22.2

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 7c7a8b214b..d798cdd3b1 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.22.2] - 2022-04-22
 ### Fixed
 * Fixed support for Python Black's new version reporting. ([#1170](https://github.com/diffplug/spotless/issues/1170))
 * Error messages for unexpected file encoding now works on Java 8. (fixes [#1081](https://github.com/diffplug/spotless/issues/1081))
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index e0daabecd9..ef2945c330 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -12,8 +12,8 @@ output = [
   ].join('\n');
 -->
 [![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.22.1/index.html)
-[![Changelog](https://img.shields.io/badge/changelog-2.22.1-brightgreen.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.22.2/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.22.2-brightgreen.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)

From 7ba7cb5f1ee29ceb19abd70232d269d2b622acf5 Mon Sep 17 00:00:00 2001
From: naveensrinivasan <172697+naveensrinivasan@users.noreply.github.com>
Date: Sat, 23 Apr 2022 21:23:35 -0500
Subject: [PATCH 0107/2068] chore: Set permissions for GitHub actions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 Restrict the GitHub token permissions only to the required ones; this way, even if the attackers will succeed in compromising your workflow, they won’t be able to do much.

- Included permissions for the action. https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions

https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions

https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs

[Keeping your GitHub Actions and workflows secure Part 1: Preventing pwn requests](https://securitylab.github.com/research/github-actions-preventing-pwn-requests/)

Signed-off-by: naveensrinivasan <172697+naveensrinivasan@users.noreply.github.com>
---
 .github/workflows/codeql-analysis.yml           | 7 +++++++
 .github/workflows/gradle-wrapper-validation.yml | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 59bac96914..5d8365459c 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -14,8 +14,15 @@ on:
   schedule:
     - cron: '0 16 * * 3'
 
+permissions:
+  contents: read
+
 jobs:
   analyze:
+    permissions:
+      actions: read  # for github/codeql-action/init to get workflow details
+      contents: read  # for actions/checkout to fetch code
+      security-events: write  # for github/codeql-action/autobuild to send a status report
     name: Analyze
     runs-on: ubuntu-latest
 
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 8bfd0dcf51..c80a7e5278 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -1,6 +1,9 @@
 name: "Validate Gradle Wrapper"
 on: [push, pull_request]
 
+permissions:
+  contents: read
+
 jobs:
   validation:
     name: "Validation"

From 82e5db3910cea585c9d25eaea0ee1b7777ecc26d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Apr 2022 12:04:26 +0000
Subject: [PATCH 0108/2068] Bump ktfmt from 0.35 to 0.36

Bumps [ktfmt](https://github.com/facebookincubator/ktfmt) from 0.35 to 0.36.
- [Release notes](https://github.com/facebookincubator/ktfmt/releases)
- [Commits](https://github.com/facebookincubator/ktfmt/compare/v0.35...v0.36)

---
updated-dependencies:
- dependency-name: com.facebook:ktfmt
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 lib/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 415817b09d..2df4243110 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -35,7 +35,7 @@ dependencies {
 
 	palantirJavaFormatCompileOnly 'com.palantir.javaformat:palantir-java-format:1.1.0'
 
-	String VER_KTFMT = '0.35'
+	String VER_KTFMT = '0.36'
 	ktfmtCompileOnly "com.facebook:ktfmt:$VER_KTFMT"
 	String VER_KTLINT_GOOGLE_JAVA_FORMAT = '1.7' // for JDK 8 compatibility
 	ktfmtCompileOnly("com.google.googlejavaformat:google-java-format") {

From 99f81bc9863497a1ca04e31e0a3a8cb351406cd3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Apr 2022 12:04:29 +0000
Subject: [PATCH 0109/2068] Bump com.diffplug.spotless from 6.4.2 to 6.5.0

Bumps com.diffplug.spotless from 6.4.2 to 6.5.0.

---
updated-dependencies:
- dependency-name: com.diffplug.spotless
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 8be69fc46d..4bdbdfc1a8 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,6 @@
 pluginManagement {
 	plugins {
-		id 'com.diffplug.spotless'                 version '6.4.2'
+		id 'com.diffplug.spotless'                 version '6.5.0'
 		// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
 		id 'com.gradle.plugin-publish'             version '0.21.0'
 		// https://github.com/gradle-nexus/publish-plugin/releases

From c4670ce14afa41aa7074618c23e562326601d9ce Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 27 Apr 2022 12:48:55 -0700
Subject: [PATCH 0110/2068] Bump ktfmt default version to 0.36.

---
 lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
index 3cefe7baca..86b036db3b 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
@@ -39,7 +39,7 @@ public class KtfmtStep {
 	// prevent direct instantiation
 	private KtfmtStep() {}
 
-	private static final String DEFAULT_VERSION = "0.35";
+	private static final String DEFAULT_VERSION = "0.36";
 	static final String NAME = "ktfmt";
 	static final String PACKAGE = "com.facebook";
 	static final String MAVEN_COORDINATE = PACKAGE + ":ktfmt:";

From 4a7c091082fde94ffd854213957ee27a09643d08 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 27 Apr 2022 12:50:03 -0700
Subject: [PATCH 0111/2068] Update changelogs.

---
 CHANGES.md               | 2 ++
 plugin-gradle/CHANGES.md | 2 ++
 plugin-maven/CHANGES.md  | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 90eccfbd45..763ecfa763 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Changes
+* Bump default `ktfmt` version to latest `0.35` -> `0.36`. ([#1183](https://github.com/diffplug/spotless/issues/1183))
 
 ## [2.25.0] - 2022-04-22
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index a85e28ed75..c9c72348d3 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Changes
+* Bump default `ktfmt` version to latest `0.35` -> `0.36`. ([#1183](https://github.com/diffplug/spotless/issues/1183))
 
 ## [6.5.0] - 2022-04-22
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index d798cdd3b1..9b85f48e8c 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Changes
+* Bump default `ktfmt` version to latest `0.35` -> `0.36`. ([#1183](https://github.com/diffplug/spotless/issues/1183))
 
 ## [2.22.2] - 2022-04-22
 ### Fixed

From 6e7d35b6fdfec7c7161343ce85280a0c538f49cf Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 27 Apr 2022 13:05:40 -0700
Subject: [PATCH 0112/2068] Bump default GJF to 1.15.0.

---
 .../java/com/diffplug/spotless/java/GoogleJavaFormatStep.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
index c5ef2e576a..6aec20c891 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
@@ -93,7 +93,7 @@ public static FormatterStep create(String groupArtifact, String version, String
 				State::createFormat);
 	}
 
-	static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(8, "1.7").add(11, "1.13.0");
+	static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(8, "1.7").add(11, "1.15.0");
 
 	public static String defaultGroupArtifact() {
 		return MAVEN_COORDINATE;

From b6735ed78f05420666d58ccb77d98b1f0ef3acf2 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 27 Apr 2022 13:09:54 -0700
Subject: [PATCH 0113/2068] Bump changelogs.

---
 CHANGES.md               | 2 ++
 plugin-gradle/CHANGES.md | 2 ++
 plugin-maven/CHANGES.md  | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 763ecfa763..cb69dd746c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changes
 * Bump default `ktfmt` version to latest `0.35` -> `0.36`. ([#1183](https://github.com/diffplug/spotless/issues/1183))
+* Bump default `google-java-format` version to latest `1.13.0` -> `1.15.0`.
+  * This means it is no longer necessary to use the `--add-exports` workaround (fixes [#834](https://github.com/diffplug/spotless/issues/834)).
 
 ## [2.25.0] - 2022-04-22
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index c9c72348d3..eeca3cba82 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,6 +5,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changes
 * Bump default `ktfmt` version to latest `0.35` -> `0.36`. ([#1183](https://github.com/diffplug/spotless/issues/1183))
+* Bump default `google-java-format` version to latest `1.13.0` -> `1.15.0`.
+  * This means it is no longer necessary to use the `--add-exports` workaround (fixes [#834](https://github.com/diffplug/spotless/issues/834)).
 
 ## [6.5.0] - 2022-04-22
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 9b85f48e8c..bc42d526b6 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,6 +5,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changes
 * Bump default `ktfmt` version to latest `0.35` -> `0.36`. ([#1183](https://github.com/diffplug/spotless/issues/1183))
+* Bump default `google-java-format` version to latest `1.13.0` -> `1.15.0`.
+  * This means it is no longer necessary to use the `--add-exports` workaround (fixes [#834](https://github.com/diffplug/spotless/issues/834)).
 
 ## [2.22.2] - 2022-04-22
 ### Fixed

From f497ad2b6379b5d9c658dc269a06bebf4f829435 Mon Sep 17 00:00:00 2001
From: circleci <circleci@628cab703aba>
Date: Wed, 27 Apr 2022 20:58:19 +0000
Subject: [PATCH 0114/2068] Published lib/2.25.1

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index cb69dd746c..c055c88f34 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.25.1] - 2022-04-27
 ### Changes
 * Bump default `ktfmt` version to latest `0.35` -> `0.36`. ([#1183](https://github.com/diffplug/spotless/issues/1183))
 * Bump default `google-java-format` version to latest `1.13.0` -> `1.15.0`.

From e2d9237cb3a4fa469c3b8828c56b5b6283498842 Mon Sep 17 00:00:00 2001
From: circleci <circleci@628cab703aba>
Date: Wed, 27 Apr 2022 20:59:11 +0000
Subject: [PATCH 0115/2068] Published gradle/6.5.1

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 46 ++++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index eeca3cba82..0c528b30a7 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [6.5.1] - 2022-04-27
 ### Changes
 * Bump default `ktfmt` version to latest `0.35` -> `0.36`. ([#1183](https://github.com/diffplug/spotless/issues/1183))
 * Bump default `google-java-format` version to latest `1.13.0` -> `1.15.0`.
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 02baa6e654..ba59a7339b 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -18,9 +18,9 @@ output = [
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
 [![Maven central](https://img.shields.io/badge/mavencentral-yes-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/index.html)
 [![License Apache](https://img.shields.io/badge/license-apache-blue.svg)](https://tldrlegal.com/license/apache-license-2.0-(apache-2.0))
-[![Changelog](https://img.shields.io/badge/changelog-6.5.0-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-6.5.1-blue.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)
@@ -126,10 +126,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -141,7 +141,7 @@ If you're stuck on an older version of Gradle, `id 'com.diffplug.gradle.spotless
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -248,8 +248,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -300,8 +300,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -361,7 +361,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -393,7 +393,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -425,7 +425,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -459,7 +459,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -480,7 +480,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -505,7 +505,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -545,7 +545,7 @@ sql.formatter.indent.size=4
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -588,7 +588,7 @@ For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#n
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -813,7 +813,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -880,9 +880,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -915,11 +915,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From a8f208a99d571502fa960c25530c83d2a8349bbd Mon Sep 17 00:00:00 2001
From: circleci <circleci@628cab703aba>
Date: Wed, 27 Apr 2022 21:00:41 +0000
Subject: [PATCH 0116/2068] Published maven/2.22.3

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index bc42d526b6..db71399c37 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.22.3] - 2022-04-27
 ### Changes
 * Bump default `ktfmt` version to latest `0.35` -> `0.36`. ([#1183](https://github.com/diffplug/spotless/issues/1183))
 * Bump default `google-java-format` version to latest `1.13.0` -> `1.15.0`.
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index ef2945c330..6958e5d0e2 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -12,8 +12,8 @@ output = [
   ].join('\n');
 -->
 [![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.22.2/index.html)
-[![Changelog](https://img.shields.io/badge/changelog-2.22.2-brightgreen.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.22.3/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.22.3-brightgreen.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)

From 4d454723d3ca0eb11d20916793989b188e470e94 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 28 Apr 2022 16:11:34 -0700
Subject: [PATCH 0117/2068] Update changelog to make it clear that #834 is
 still broken.

---
 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 c055c88f34..b2acc6f0b3 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,7 +15,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changes
 * Bump default `ktfmt` version to latest `0.35` -> `0.36`. ([#1183](https://github.com/diffplug/spotless/issues/1183))
 * Bump default `google-java-format` version to latest `1.13.0` -> `1.15.0`.
-  * This means it is no longer necessary to use the `--add-exports` workaround (fixes [#834](https://github.com/diffplug/spotless/issues/834)).
+  * ~~This means it is no longer necessary to use the `--add-exports` workaround (fixes [#834](https://github.com/diffplug/spotless/issues/834)).~~ `--add-exports` workaround is still needed.
 
 ## [2.25.0] - 2022-04-22
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 0c528b30a7..7025767e6d 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -8,7 +8,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changes
 * Bump default `ktfmt` version to latest `0.35` -> `0.36`. ([#1183](https://github.com/diffplug/spotless/issues/1183))
 * Bump default `google-java-format` version to latest `1.13.0` -> `1.15.0`.
-  * This means it is no longer necessary to use the `--add-exports` workaround (fixes [#834](https://github.com/diffplug/spotless/issues/834)).
+  * ~~This means it is no longer necessary to use the `--add-exports` workaround (fixes [#834](https://github.com/diffplug/spotless/issues/834)).~~ `--add-exports` workaround is still needed.
 
 ## [6.5.0] - 2022-04-22
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index db71399c37..b050ecfed0 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -8,7 +8,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changes
 * Bump default `ktfmt` version to latest `0.35` -> `0.36`. ([#1183](https://github.com/diffplug/spotless/issues/1183))
 * Bump default `google-java-format` version to latest `1.13.0` -> `1.15.0`.
-  * This means it is no longer necessary to use the `--add-exports` workaround (fixes [#834](https://github.com/diffplug/spotless/issues/834)).
+  * ~~This means it is no longer necessary to use the `--add-exports` workaround (fixes [#834](https://github.com/diffplug/spotless/issues/834)).~~ `--add-exports` workaround is still needed.
 
 ## [2.22.2] - 2022-04-22
 ### Fixed

From 1d945a77b8a4395c244f8b800712bb6592c9e28e Mon Sep 17 00:00:00 2001
From: Peter Trifanov <peter.trifanov@mail.ru>
Date: Sat, 30 Apr 2022 12:19:41 +0300
Subject: [PATCH 0118/2068] Convert diktat integration to use a compile-only
 sourceset

* Convert diktat integration
* Pass absolute path into `Params` object to resolve the problem with package name checking
---
 CHANGES.md                                    |  1 +
 lib/build.gradle                              |  6 +-
 .../glue/diktat/DiktatFormatterFunc.java      | 95 +++++++++++++++++++
 .../diffplug/spotless/kotlin/DiktatStep.java  | 91 +-----------------
 4 files changed, 105 insertions(+), 88 deletions(-)
 create mode 100644 lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java

diff --git a/CHANGES.md b/CHANGES.md
index b2acc6f0b3..f1379048d1 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,7 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+* Converted `diktat` integration to use a compile-only source set. ([#524](https://github.com/diffplug/spotless/issues/524))
 
 ## [2.25.1] - 2022-04-27
 ### Changes
diff --git a/lib/build.gradle b/lib/build.gradle
index 2df4243110..ccfb9b1b79 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -11,7 +11,8 @@ def NEEDS_GLUE = [
 	'palantirJavaFormat',
 	'ktfmt',
 	'ktlint',
-	'flexmark'
+	'flexmark',
+	'diktat'
 ]
 for (glue in NEEDS_GLUE) {
 	sourceSets.register(glue) {
@@ -50,6 +51,9 @@ dependencies {
 	ktlintCompileOnly "com.pinterest.ktlint:ktlint-ruleset-experimental:$VER_KTLINT"
 	ktlintCompileOnly "com.pinterest.ktlint:ktlint-ruleset-standard:$VER_KTLINT"
 
+	String VER_DIKTAT = "1.1.0"
+	diktatCompileOnly "org.cqfn.diktat:diktat-rules:$VER_DIKTAT"
+
 	// used for markdown formatting
 	flexmarkCompileOnly 'com.vladsch.flexmark:flexmark-all:0.62.2'
 }
diff --git a/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java b/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java
new file mode 100644
index 0000000000..5960ce2095
--- /dev/null
+++ b/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2021-2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.glue.diktat;
+
+import java.io.File;
+import java.util.*;
+
+import org.cqfn.diktat.ruleset.rules.DiktatRuleSetProvider;
+
+import com.pinterest.ktlint.core.KtLint;
+import com.pinterest.ktlint.core.KtLint.Params;
+import com.pinterest.ktlint.core.LintError;
+import com.pinterest.ktlint.core.RuleSet;
+
+import com.diffplug.spotless.FormatterFunc;
+
+import kotlin.Unit;
+import kotlin.jvm.functions.Function2;
+
+public class DiktatFormatterFunc implements FormatterFunc.NeedsFile {
+
+	private final List<RuleSet> rulesets;
+	private final Map<String, String> userData;
+	private final Function2<? super LintError, ? super Boolean, Unit> formatterCallback;
+	private final boolean isScript;
+
+	private final ArrayList<LintError> errors = new ArrayList<>();
+
+	public DiktatFormatterFunc(boolean isScript, Map<String, String> userData) {
+		rulesets = Collections.singletonList(new DiktatRuleSetProvider().get());
+		this.userData = userData;
+		this.formatterCallback = new FormatterCallback(errors);
+		this.isScript = isScript;
+	}
+
+	static class FormatterCallback implements Function2<LintError, Boolean, Unit> {
+		private final ArrayList<LintError> errors;
+
+		FormatterCallback(ArrayList<LintError> errors) {
+			this.errors = errors;
+		}
+
+		@Override
+		public Unit invoke(LintError lintError, Boolean corrected) {
+			if (!corrected) {
+				errors.add(lintError);
+			}
+			return null;
+		}
+	}
+
+	@Override
+	public String applyWithFile(String unix, File file) throws Exception {
+		errors.clear();
+		userData.put("file_path", file.getAbsolutePath());
+		String result = KtLint.INSTANCE.format(new Params(
+				file.getName(),
+				unix,
+				rulesets,
+				userData,
+				formatterCallback,
+				isScript,
+				null,
+				false));
+
+		if (!errors.isEmpty()) {
+			StringBuilder error = new StringBuilder();
+			error.append("There are ").append(errors.size()).append(" unfixed errors:");
+			for (LintError er : errors) {
+				error.append(System.lineSeparator())
+						.append("Error on line: ").append(er.getLine())
+						.append(", column: ").append(er.getCol())
+						.append(" cannot be fixed automatically")
+						.append(System.lineSeparator())
+						.append(er.getDetail());
+			}
+			throw new AssertionError(error);
+		}
+
+		return result;
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
index 7f5779cce6..e01748d4b5 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
@@ -18,9 +18,6 @@
 import java.io.IOException;
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
 import java.util.*;
 
 import javax.annotation.Nullable;
@@ -33,10 +30,9 @@ public class DiktatStep {
 	// prevent direct instantiation
 	private DiktatStep() {}
 
-	private static final String DEFAULT_VERSION = "1.0.1";
+	private static final String DEFAULT_VERSION = "1.1.0";
 	static final String NAME = "diktat";
 	static final String PACKAGE_DIKTAT = "org.cqfn.diktat";
-	static final String PACKAGE_KTLINT = "com.pinterest.ktlint";
 	static final String MAVEN_COORDINATE = PACKAGE_DIKTAT + ":diktat-rules:";
 
 	public static String defaultVersionDiktat() {
@@ -82,8 +78,6 @@ static final class State implements Serializable {
 		/** Are the files being linted Kotlin script files. */
 		private final boolean isScript;
 		private final @Nullable FileSignature config;
-		private final String pkg;
-		private final String pkgKtlint;
 		final JarState jar;
 		private final TreeMap<String, String> userData;
 
@@ -93,96 +87,19 @@ static final class State implements Serializable {
 			pkgSet.add(MAVEN_COORDINATE + versionDiktat);
 
 			this.userData = new TreeMap<>(userData);
-			this.pkg = PACKAGE_DIKTAT;
-			this.pkgKtlint = PACKAGE_KTLINT;
 			this.jar = JarState.from(pkgSet, provisioner);
 			this.isScript = isScript;
 			this.config = config;
 		}
 
 		FormatterFunc createFormat() throws Exception {
-
-			ClassLoader classLoader = jar.getClassLoader();
-
-			// first, we get the diktat rules
 			if (config != null) {
 				System.setProperty("diktat.config.path", config.getOnlyFile().getAbsolutePath());
 			}
 
-			Class<?> ruleSetProviderClass = classLoader.loadClass(pkg + ".ruleset.rules.DiktatRuleSetProvider");
-			Object diktatRuleSet = ruleSetProviderClass.getMethod("get").invoke(ruleSetProviderClass.newInstance());
-			Iterable<?> ruleSets = Collections.singletonList(diktatRuleSet);
-
-			// next, we create an error callback which throws an assertion error when the format is bad
-			Class<?> function2Interface = classLoader.loadClass("kotlin.jvm.functions.Function2");
-			Class<?> lintErrorClass = classLoader.loadClass(pkgKtlint + ".core.LintError");
-			Method detailGetter = lintErrorClass.getMethod("getDetail");
-			Method lineGetter = lintErrorClass.getMethod("getLine");
-			Method colGetter = lintErrorClass.getMethod("getCol");
-
-			// grab the KtLint singleton
-			Class<?> ktlintClass = classLoader.loadClass(pkgKtlint + ".core.KtLint");
-			Object ktlint = ktlintClass.getDeclaredField("INSTANCE").get(null);
-
-			Class<?> paramsClass = classLoader.loadClass(pkgKtlint + ".core.KtLint$Params");
-			// and its constructor
-			Constructor<?> constructor = paramsClass.getConstructor(
-					/* fileName, nullable */ String.class,
-					/* text */ String.class,
-					/* ruleSets */ Iterable.class,
-					/* userData */ Map.class,
-					/* callback */ function2Interface,
-					/* script */ boolean.class,
-					/* editorConfigPath, nullable */ String.class,
-					/* debug */ boolean.class);
-			Method formatterMethod = ktlintClass.getMethod("format", paramsClass);
-			FormatterFunc.NeedsFile formatterFunc = (input, file) -> {
-				ArrayList<Object> errors = new ArrayList<>();
-
-				Object formatterCallback = Proxy.newProxyInstance(classLoader, new Class[]{function2Interface},
-						(proxy, method, args) -> {
-							Object lintError = args[0]; //ktlint.core.LintError
-							boolean corrected = (Boolean) args[1];
-							if (!corrected) {
-								errors.add(lintError);
-							}
-							return null;
-						});
-
-				userData.put("file_path", file.getAbsolutePath());
-				try {
-					Object params = constructor.newInstance(
-							/* fileName, nullable */ file.getName(),
-							/* text */ input,
-							/* ruleSets */ ruleSets,
-							/* userData */ userData,
-							/* callback */ formatterCallback,
-							/* script */ isScript,
-							/* editorConfigPath, nullable */ null,
-							/* debug */ false);
-					String result = (String) formatterMethod.invoke(ktlint, params);
-					if (!errors.isEmpty()) {
-						StringBuilder error = new StringBuilder("");
-						error.append("There are ").append(errors.size()).append(" unfixed errors:");
-						for (Object er : errors) {
-							String detail = (String) detailGetter.invoke(er);
-							int line = (Integer) lineGetter.invoke(er);
-							int col = (Integer) colGetter.invoke(er);
-
-							error.append(System.lineSeparator()).append("Error on line: ").append(line).append(", column: ").append(col).append(" cannot be fixed automatically")
-									.append(System.lineSeparator()).append(detail);
-						}
-						throw new AssertionError(error);
-					}
-					return result;
-				} catch (InvocationTargetException e) {
-					throw ThrowingEx.unwrapCause(e);
-				}
-			};
-
-			return formatterFunc;
+			Class<?> formatterFunc = jar.getClassLoader().loadClass("com.diffplug.spotless.glue.diktat.DiktatFormatterFunc");
+			Constructor<?> constructor = formatterFunc.getConstructor(boolean.class, Map.class);
+			return (FormatterFunc.NeedsFile) constructor.newInstance(isScript, userData);
 		}
-
 	}
-
 }

From ef85dc4a25a3494e633c192d90c68ac6f0277339 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 2 May 2022 13:32:20 -0700
Subject: [PATCH 0119/2068] Update changelogs.

---
 CHANGES.md               | 4 +++-
 plugin-gradle/CHANGES.md | 3 +++
 plugin-maven/CHANGES.md  | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index f1379048d1..3f34593b1e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,7 +10,9 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
-* Converted `diktat` integration to use a compile-only source set. ([#524](https://github.com/diffplug/spotless/issues/524))
+### Changes
+* Bump default `diktat` version to latest `1.0.1` -> `1.0.1`.
+  * Converted `diktat` integration to use a compile-only source set. ([#524](https://github.com/diffplug/spotless/issues/524))
 
 ## [2.25.1] - 2022-04-27
 ### Changes
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 7025767e6d..1b7e892414 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,9 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Changes
+* Bump default `diktat` version to latest `1.0.1` -> `1.0.1`.
+  * Converted `diktat` integration to use a compile-only source set. ([#524](https://github.com/diffplug/spotless/issues/524))
 
 ## [6.5.1] - 2022-04-27
 ### Changes
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index b050ecfed0..db2891049b 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,9 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Changes
+* Bump default `diktat` version to latest `1.0.1` -> `1.0.1`.
+  * Converted `diktat` integration to use a compile-only source set. ([#524](https://github.com/diffplug/spotless/issues/524))
 
 ## [2.22.3] - 2022-04-27
 ### Changes

From a49c2b1b7b72d947077fc41c8221dcddd44bf29d Mon Sep 17 00:00:00 2001
From: Peter Trifanov <peter.trifanov@mail.ru>
Date: Tue, 3 May 2022 10:42:21 +0300
Subject: [PATCH 0120/2068] Convert diktat integration to use a compile-only
 sourceset

* Pass absolute path into `Params` object to resolve the problem with package name checking
* Update changelogs
---
 CHANGES.md                                                    | 3 ++-
 .../diffplug/spotless/glue/diktat/DiktatFormatterFunc.java    | 4 +++-
 plugin-gradle/CHANGES.md                                      | 3 ++-
 plugin-maven/CHANGES.md                                       | 3 ++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 3f34593b1e..56a0040dd4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,8 +11,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Changes
-* Bump default `diktat` version to latest `1.0.1` -> `1.0.1`.
+* Bump default `diktat` version to latest `1.0.1` -> `1.1.0`.
   * Converted `diktat` integration to use a compile-only source set. ([#524](https://github.com/diffplug/spotless/issues/524))
+  * Use the full path to a file in `diktat` integration ([#1189](https://github.com/diffplug/spotless/issues/1189))
 
 ## [2.25.1] - 2022-04-27
 ### Changes
diff --git a/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java b/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java
index 5960ce2095..1374bebb10 100644
--- a/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java
+++ b/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java
@@ -67,7 +67,9 @@ public String applyWithFile(String unix, File file) throws Exception {
 		errors.clear();
 		userData.put("file_path", file.getAbsolutePath());
 		String result = KtLint.INSTANCE.format(new Params(
-				file.getName(),
+				// Unlike Ktlint, Diktat requires full path to the file.
+				// See https://github.com/diffplug/spotless/issues/1189, https://github.com/analysis-dev/diktat/issues/1202
+				file.getAbsolutePath(),
 				unix,
 				rulesets,
 				userData,
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 1b7e892414..3ef22ce327 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -4,8 +4,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Changes
-* Bump default `diktat` version to latest `1.0.1` -> `1.0.1`.
+* Bump default `diktat` version to latest `1.0.1` -> `1.1.0`.
   * Converted `diktat` integration to use a compile-only source set. ([#524](https://github.com/diffplug/spotless/issues/524))
+  * Use the full path to a file in `diktat` integration ([#1189](https://github.com/diffplug/spotless/issues/1189))
 
 ## [6.5.1] - 2022-04-27
 ### Changes
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index db2891049b..8598ac482e 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -4,8 +4,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Changes
-* Bump default `diktat` version to latest `1.0.1` -> `1.0.1`.
+* Bump default `diktat` version to latest `1.0.1` -> `1.1.0`.
   * Converted `diktat` integration to use a compile-only source set. ([#524](https://github.com/diffplug/spotless/issues/524))
+  * Use the full path to a file in `diktat` integration ([#1189](https://github.com/diffplug/spotless/issues/1189))
 
 ## [2.22.3] - 2022-04-27
 ### Changes

From 417b1b85d68423726ae914fe926c4938deb11d6b Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 3 May 2022 14:12:24 -0700
Subject: [PATCH 0121/2068] Bump changelogs (mostly to trigger CI).

---
 CHANGES.md               | 6 +++---
 plugin-gradle/CHANGES.md | 6 +++---
 plugin-maven/CHANGES.md  | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 56a0040dd4..083b6b31f5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,9 +11,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Changes
-* Bump default `diktat` version to latest `1.0.1` -> `1.1.0`.
-  * Converted `diktat` integration to use a compile-only source set. ([#524](https://github.com/diffplug/spotless/issues/524))
-  * Use the full path to a file in `diktat` integration ([#1189](https://github.com/diffplug/spotless/issues/1189))
+* Bump default `diktat` version to latest `1.0.1` -> `1.1.0`. ([#1190](https://github.com/diffplug/spotless/pull/1190))
+  * Converted `diktat` integration to use a compile-only source set. (fixes [#524](https://github.com/diffplug/spotless/issues/524))
+  * Use the full path to a file in `diktat` integration. (fixes [#1189](https://github.com/diffplug/spotless/issues/1189))
 
 ## [2.25.1] - 2022-04-27
 ### Changes
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 3ef22ce327..81590a3d86 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -4,9 +4,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Changes
-* Bump default `diktat` version to latest `1.0.1` -> `1.1.0`.
-  * Converted `diktat` integration to use a compile-only source set. ([#524](https://github.com/diffplug/spotless/issues/524))
-  * Use the full path to a file in `diktat` integration ([#1189](https://github.com/diffplug/spotless/issues/1189))
+* Bump default `diktat` version to latest `1.0.1` -> `1.1.0`. ([#1190](https://github.com/diffplug/spotless/pull/1190))
+  * Converted `diktat` integration to use a compile-only source set. (fixes [#524](https://github.com/diffplug/spotless/issues/524))
+  * Use the full path to a file in `diktat` integration. (fixes [#1189](https://github.com/diffplug/spotless/issues/1189))
 
 ## [6.5.1] - 2022-04-27
 ### Changes
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 8598ac482e..4b7610ebb3 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -4,9 +4,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Changes
-* Bump default `diktat` version to latest `1.0.1` -> `1.1.0`.
-  * Converted `diktat` integration to use a compile-only source set. ([#524](https://github.com/diffplug/spotless/issues/524))
-  * Use the full path to a file in `diktat` integration ([#1189](https://github.com/diffplug/spotless/issues/1189))
+* Bump default `diktat` version to latest `1.0.1` -> `1.1.0`. ([#1190](https://github.com/diffplug/spotless/pull/1190))
+  * Converted `diktat` integration to use a compile-only source set. (fixes [#524](https://github.com/diffplug/spotless/issues/524))
+  * Use the full path to a file in `diktat` integration. (fixes [#1189](https://github.com/diffplug/spotless/issues/1189))
 
 ## [2.22.3] - 2022-04-27
 ### Changes

From 335d49524f3d9944d88da2cdadc69ff4f05a4cee Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 3 May 2022 15:44:52 -0700
Subject: [PATCH 0122/2068] Fixup the tests.

---
 .../java/com/diffplug/spotless/kotlin/DiktatStepTest.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
index 040a23d0a8..24a79ed61b 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
@@ -38,9 +38,9 @@ void behavior() throws Exception {
 					assertion.isInstanceOf(AssertionError.class);
 					assertion.hasMessage("There are 2 unfixed errors:" +
 							System.lineSeparator() + "Error on line: 1, column: 1 cannot be fixed automatically" +
-							System.lineSeparator() + "[FILE_NAME_INCORRECT] file name is incorrect - it should end with .kt extension and be in PascalCase: " +
+							System.lineSeparator() + "[FILE_NAME_INCORRECT] file name is incorrect - it should end with .kt extension and be in PascalCase: testlib" +
 							System.lineSeparator() + "Error on line: 1, column: 1 cannot be fixed automatically" +
-							System.lineSeparator() + "[FILE_NAME_MATCH_CLASS] file name is incorrect - it should match with the class described in it if there is the only one class declared:  vs Unsolvable");
+							System.lineSeparator() + "[FILE_NAME_MATCH_CLASS] file name is incorrect - it should match with the class described in it if there is the only one class declared: testlib vs Unsolvable");
 				});
 	}
 
@@ -57,9 +57,9 @@ void behaviorConf() throws Exception {
 					assertion.isInstanceOf(AssertionError.class);
 					assertion.hasMessage("There are 2 unfixed errors:" +
 							System.lineSeparator() + "Error on line: 1, column: 1 cannot be fixed automatically" +
-							System.lineSeparator() + "[FILE_NAME_INCORRECT] file name is incorrect - it should end with .kt extension and be in PascalCase: " +
+							System.lineSeparator() + "[FILE_NAME_INCORRECT] file name is incorrect - it should end with .kt extension and be in PascalCase: testlib" +
 							System.lineSeparator() + "Error on line: 1, column: 1 cannot be fixed automatically" +
-							System.lineSeparator() + "[FILE_NAME_MATCH_CLASS] file name is incorrect - it should match with the class described in it if there is the only one class declared:  vs Unsolvable");
+							System.lineSeparator() + "[FILE_NAME_MATCH_CLASS] file name is incorrect - it should match with the class described in it if there is the only one class declared: testlib vs Unsolvable");
 				});
 	}
 

From acf8a6faca4464d4e9b9662c49bf99b3ede44346 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 3 May 2022 23:07:36 +0000
Subject: [PATCH 0123/2068] Bump github/codeql-action from 1 to 2

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 1 to 2.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/v1...v2)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 5d8365459c..b2f2a259c3 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -50,7 +50,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -61,7 +61,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -75,4 +75,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

From 1346d0868d43a9366c30dac62d3b8c2efedc30e9 Mon Sep 17 00:00:00 2001
From: circleci <circleci@5d1d3c58ca2b>
Date: Tue, 3 May 2022 23:12:35 +0000
Subject: [PATCH 0124/2068] Published lib/2.25.2

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 083b6b31f5..a30549e380 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.25.2] - 2022-05-03
 ### Changes
 * Bump default `diktat` version to latest `1.0.1` -> `1.1.0`. ([#1190](https://github.com/diffplug/spotless/pull/1190))
   * Converted `diktat` integration to use a compile-only source set. (fixes [#524](https://github.com/diffplug/spotless/issues/524))

From daac96f3eb357c698d4c44dc9ab74fbdc6331e24 Mon Sep 17 00:00:00 2001
From: circleci <circleci@5d1d3c58ca2b>
Date: Tue, 3 May 2022 23:13:31 +0000
Subject: [PATCH 0125/2068] Published gradle/6.5.2

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 46 ++++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 81590a3d86..9397d1fa5a 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [6.5.2] - 2022-05-03
 ### Changes
 * Bump default `diktat` version to latest `1.0.1` -> `1.1.0`. ([#1190](https://github.com/diffplug/spotless/pull/1190))
   * Converted `diktat` integration to use a compile-only source set. (fixes [#524](https://github.com/diffplug/spotless/issues/524))
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index ba59a7339b..bc6d28b72c 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -18,9 +18,9 @@ output = [
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
 [![Maven central](https://img.shields.io/badge/mavencentral-yes-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/index.html)
 [![License Apache](https://img.shields.io/badge/license-apache-blue.svg)](https://tldrlegal.com/license/apache-license-2.0-(apache-2.0))
-[![Changelog](https://img.shields.io/badge/changelog-6.5.1-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-6.5.2-blue.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)
@@ -126,10 +126,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -141,7 +141,7 @@ If you're stuck on an older version of Gradle, `id 'com.diffplug.gradle.spotless
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -248,8 +248,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -300,8 +300,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -361,7 +361,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -393,7 +393,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -425,7 +425,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -459,7 +459,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -480,7 +480,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -505,7 +505,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -545,7 +545,7 @@ sql.formatter.indent.size=4
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -588,7 +588,7 @@ For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#n
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -813,7 +813,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -880,9 +880,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -915,11 +915,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.1/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From acd8e40d9f983d30ec361bfbea9231db92114148 Mon Sep 17 00:00:00 2001
From: circleci <circleci@5d1d3c58ca2b>
Date: Tue, 3 May 2022 23:15:30 +0000
Subject: [PATCH 0126/2068] Published maven/2.22.4

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 4b7610ebb3..fbacbc6c96 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.22.4] - 2022-05-03
 ### Changes
 * Bump default `diktat` version to latest `1.0.1` -> `1.1.0`. ([#1190](https://github.com/diffplug/spotless/pull/1190))
   * Converted `diktat` integration to use a compile-only source set. (fixes [#524](https://github.com/diffplug/spotless/issues/524))
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 6958e5d0e2..b3bab5af71 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -12,8 +12,8 @@ output = [
   ].join('\n');
 -->
 [![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.22.3/index.html)
-[![Changelog](https://img.shields.io/badge/changelog-2.22.3-brightgreen.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.22.4/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.22.4-brightgreen.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)

From 408dc68d10609fd8db194001279a34b2fc3876ac Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 6 May 2022 10:27:08 -0700
Subject: [PATCH 0127/2068] Fix the Black regex.

---
 CHANGES.md                                                    | 2 ++
 lib/src/main/java/com/diffplug/spotless/python/BlackStep.java | 2 +-
 plugin-gradle/CHANGES.md                                      | 2 ++
 plugin-maven/CHANGES.md                                       | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index a30549e380..e7427e178d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Update the `black` version regex to fix `19.10b0` and earlier. (fixes [#1195](https://github.com/diffplug/spotless/issues/1195), regression introduced in `2.25.0`)
 
 ## [2.25.2] - 2022-05-03
 ### Changes
diff --git a/lib/src/main/java/com/diffplug/spotless/python/BlackStep.java b/lib/src/main/java/com/diffplug/spotless/python/BlackStep.java
index 3f4a8837b6..6a03d0d808 100644
--- a/lib/src/main/java/com/diffplug/spotless/python/BlackStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/python/BlackStep.java
@@ -64,7 +64,7 @@ private State createState() throws IOException, InterruptedException {
 		String trackingIssue = "\n  github issue to handle this better: https://github.com/diffplug/spotless/issues/674";
 		String exeAbsPath = ForeignExe.nameAndVersion("black", version)
 				.pathToExe(pathToExe)
-				.versionRegex(Pattern.compile("(?:black,|version) (\\S*)"))
+				.versionRegex(Pattern.compile("(?:black, version|black,|version) (\\S*)"))
 				.fixCantFind("Try running {@code pip install black=={version}}, or else tell Spotless where it is with {@code black().pathToExe('path/to/executable')}" + trackingIssue)
 				.fixWrongVersion("Try running {@code pip install --force-reinstall black=={version}}, or else specify {@code black('{versionFound}')} to Spotless" + trackingIssue)
 				.confirmVersionAndGetAbsolutePath();
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 9397d1fa5a..963d6d06d7 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Update the `black` version regex to fix `19.10b0` and earlier. (fixes [#1195](https://github.com/diffplug/spotless/issues/1195), regression introduced in `6.5.0`)
 
 ## [6.5.2] - 2022-05-03
 ### Changes
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index fbacbc6c96..08cad5cfa9 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Update the `black` version regex to fix `19.10b0` and earlier. (fixes [#1195](https://github.com/diffplug/spotless/issues/1195), regression introduced in `2.22.2`)
 
 ## [2.22.4] - 2022-05-03
 ### Changes

From 90778f72b1993aa5a24ede003fdb064044936d59 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 6 May 2022 13:04:23 -0700
Subject: [PATCH 0128/2068] GradleProvisioner throws `GradleException` instead
 of just `logger.error`, this way Gradle reports the root cause.

---
 .../com/diffplug/gradle/spotless/GradleProvisioner.java   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
index 4ef8521412..63697afca2 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
@@ -127,12 +127,10 @@ private static Provisioner forConfigurationContainer(Project project, Configurat
 				if (!projName.isEmpty()) {
 					projName = projName + "/";
 				}
-				logger.error(
-						"You need to add a repository containing the '{}' artifact in '{}build.gradle'.\n" +
+				throw new GradleException(String.format(
+						"You need to add a repository containing the '%s' artifact in '%sbuild.gradle'.\n" +
 								"E.g.: 'repositories { mavenCentral() }'",
-						mavenCoords, projName,
-						e);
-				throw e;
+						mavenCoords, projName), e);
 			}
 		};
 	}

From f32ebe876259e7b823dc1da7b3f9886391dfc827 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 6 May 2022 10:36:52 -0700
Subject: [PATCH 0129/2068] Fix caching memory leak in
 GitAttributesLineEndings.

---
 .../extra/GitAttributesLineEndings.java        | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
index ae9f0ceec1..c4ca8edacb 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
@@ -15,8 +15,6 @@
  */
 package com.diffplug.spotless.extra;
 
-import static com.diffplug.spotless.extra.LibExtraPreconditions.requireElementsNonNull;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -78,8 +76,8 @@ public static LineEnding.Policy create(File projectDir, Supplier<Iterable<File>>
 	static class RelocatablePolicy extends LazyForwardingEquality<CachedEndings> implements LineEnding.Policy {
 		private static final long serialVersionUID = 5868522122123693015L;
 
-		final transient File projectDir;
-		final transient Supplier<Iterable<File>> toFormat;
+		transient File projectDir;
+		transient Supplier<Iterable<File>> toFormat;
 
 		RelocatablePolicy(File projectDir, Supplier<Iterable<File>> toFormat) {
 			this.projectDir = Objects.requireNonNull(projectDir, "projectDir");
@@ -88,8 +86,13 @@ static class RelocatablePolicy extends LazyForwardingEquality<CachedEndings> imp
 
 		@Override
 		protected CachedEndings calculateState() throws Exception {
-			Runtime runtime = new RuntimeInit(projectDir, toFormat.get()).atRuntime();
-			return new CachedEndings(projectDir, runtime, toFormat.get());
+			Runtime runtime = new RuntimeInit(projectDir).atRuntime();
+			// LazyForwardingEquality guarantees that this will only be called once, and keeping toFormat
+			// causes a memory leak, see https://github.com/diffplug/spotless/issues/1194
+			CachedEndings state = new CachedEndings(projectDir, runtime, toFormat.get());
+			projectDir = null;
+			toFormat = null;
+			return state;
 		}
 
 		@Override
@@ -146,8 +149,7 @@ static class RuntimeInit {
 		final @Nullable File workTree;
 
 		@SuppressFBWarnings("SIC_INNER_SHOULD_BE_STATIC_ANON")
-		RuntimeInit(File projectDir, Iterable<File> toFormat) {
-			requireElementsNonNull(toFormat);
+		RuntimeInit(File projectDir) {
 			/////////////////////////////////
 			// USER AND SYSTEM-WIDE VALUES //
 			/////////////////////////////////

From 986cda366250925537005fe6072561043afa1f4b Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 6 May 2022 13:20:00 -0700
Subject: [PATCH 0130/2068] Added a lazy version of
 `createIndependentApplyTask`.

---
 .../gradle/spotless/FormatExtension.java      | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index d8c5525db6..94ae136429 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -38,6 +38,7 @@
 import org.gradle.api.file.ConfigurableFileTree;
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.plugins.BasePlugin;
+import org.gradle.api.tasks.TaskProvider;
 
 import com.diffplug.common.base.Preconditions;
 import com.diffplug.spotless.FormatExceptionPolicyStrict;
@@ -769,6 +770,11 @@ protected Project getProject() {
 		return spotless.project;
 	}
 
+	/** Eager version of {@link #createIndependentApplyTaskLazy(String)} */
+	public SpotlessApply createIndependentApplyTask(String taskName) {
+		return createIndependentApplyTaskLazy(taskName).get();
+	}
+
 	/**
 	 * Creates an independent {@link SpotlessApply} for (very) unusual circumstances.
 	 *
@@ -782,19 +788,19 @@ protected Project getProject() {
 	 *
 	 * NOTE: does not respect the rarely-used <a href="https://github.com/diffplug/spotless/blob/b7f8c551a97dcb92cc4b0ee665448da5013b30a3/plugin-gradle/README.md#can-i-apply-spotless-to-specific-files">{@code spotlessFiles} property</a>.
 	 */
-	public SpotlessApply createIndependentApplyTask(String taskName) {
+	public TaskProvider<SpotlessApply> createIndependentApplyTaskLazy(String taskName) {
 		Preconditions.checkArgument(!taskName.endsWith(SpotlessExtension.APPLY), "Task name must not end with " + SpotlessExtension.APPLY);
-		// create and setup the task
-		SpotlessTaskImpl spotlessTask = spotless.project.getTasks().create(taskName + SpotlessTaskService.INDEPENDENT_HELPER, SpotlessTaskImpl.class);
-		spotlessTask.init(spotless.getRegisterDependenciesTask().getTaskService());
-		setupTask(spotlessTask);
-		// clean removes the SpotlessCache, so we have to run after clean
-		spotlessTask.mustRunAfter(BasePlugin.CLEAN_TASK_NAME);
+		TaskProvider<SpotlessTaskImpl> spotlessTask = spotless.project.getTasks().register(taskName + SpotlessTaskService.INDEPENDENT_HELPER, SpotlessTaskImpl.class, task -> {
+			task.init(spotless.getRegisterDependenciesTask().getTaskService());
+			setupTask(task);
+			// clean removes the SpotlessCache, so we have to run after clean
+			task.mustRunAfter(BasePlugin.CLEAN_TASK_NAME);
+		});
 		// create the apply task
-		SpotlessApply applyTask = spotless.project.getTasks().create(taskName, SpotlessApply.class);
-		applyTask.init(spotlessTask);
-		applyTask.dependsOn(spotlessTask);
-
+		TaskProvider<SpotlessApply> applyTask = spotless.project.getTasks().register(taskName, SpotlessApply.class, task -> {
+			task.dependsOn(spotlessTask);
+			task.init(spotlessTask.get());
+		});
 		return applyTask;
 	}
 

From 9b5510af72cf560948d0886c0694cfee2f9a9764 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 6 May 2022 13:49:24 -0700
Subject: [PATCH 0131/2068] Fix caching memory leak in lazy FormatterSteps.

---
 .../java/com/diffplug/spotless/FormatterStepImpl.java  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStepImpl.java b/lib/src/main/java/com/diffplug/spotless/FormatterStepImpl.java
index 061aff6af9..7663145f51 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStepImpl.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStepImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@ abstract class FormatterStepImpl<State extends Serializable> extends Strict<Stat
 	final transient String name;
 
 	/** Transient because only the state matters. */
-	final transient ThrowingEx.Supplier<State> stateSupplier;
+	transient ThrowingEx.Supplier<State> stateSupplier;
 
 	FormatterStepImpl(String name, ThrowingEx.Supplier<State> stateSupplier) {
 		this.name = Objects.requireNonNull(name);
@@ -53,7 +53,11 @@ public String getName() {
 
 	@Override
 	protected State calculateState() throws Exception {
-		return stateSupplier.get();
+		// LazyForwardingEquality guarantees that this will only be called once, and keeping toFormat
+		// causes a memory leak, see https://github.com/diffplug/spotless/issues/1194
+		State state = stateSupplier.get();
+		stateSupplier = null;
+		return state;
 	}
 
 	static final class Standard<State extends Serializable> extends FormatterStepImpl<State> {

From a0a96e379c31b092085bc9f4cf7591ce4df8b458 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 8 May 2022 18:11:52 -0700
Subject: [PATCH 0132/2068] Update changelogs.

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index e7427e178d..7eb1c33afe 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Fixed
 * Update the `black` version regex to fix `19.10b0` and earlier. (fixes [#1195](https://github.com/diffplug/spotless/issues/1195), regression introduced in `2.25.0`)
+* `GitAttributesLineEndings$RelocatablePolicy` and `FormatterStepImpl` now null-out their initialization lambdas after their state has been calculated, which allows GC to collect variables which were incidentally captured but not needed in the calculated state. ([#1198](https://github.com/diffplug/spotless/pull/1198))
 
 ## [2.25.2] - 2022-05-03
 ### Changes
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 963d6d06d7..b8531d3812 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,8 +3,11 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Added
+* `FormatExtension.createIndependentApplyTaskLazy`, with same functionality as `createIndependentApplyTaskLazy` but returning `TaskProvider` ([#1198](https://github.com/diffplug/spotless/pull/1198))
 ### Fixed
 * Update the `black` version regex to fix `19.10b0` and earlier. (fixes [#1195](https://github.com/diffplug/spotless/issues/1195), regression introduced in `6.5.0`)
+* Improved daemon memory consumption ([#1198](https://github.com/diffplug/spotless/pull/1198) fixes [#1194](https://github.com/diffplug/spotless/issues/1194))
 
 ## [6.5.2] - 2022-05-03
 ### Changes

From d42c78d52177fe55876bef556548da4e39d2d9cc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 May 2022 12:03:38 +0000
Subject: [PATCH 0133/2068] Bump ktfmt from 0.36 to 0.37

Bumps [ktfmt](https://github.com/facebookincubator/ktfmt) from 0.36 to 0.37.
- [Release notes](https://github.com/facebookincubator/ktfmt/releases)
- [Commits](https://github.com/facebookincubator/ktfmt/compare/v0.36...v0.37)

---
updated-dependencies:
- dependency-name: com.facebook:ktfmt
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 lib/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index ccfb9b1b79..2eb0f3e0e5 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -36,7 +36,7 @@ dependencies {
 
 	palantirJavaFormatCompileOnly 'com.palantir.javaformat:palantir-java-format:1.1.0'
 
-	String VER_KTFMT = '0.36'
+	String VER_KTFMT = '0.37'
 	ktfmtCompileOnly "com.facebook:ktfmt:$VER_KTFMT"
 	String VER_KTLINT_GOOGLE_JAVA_FORMAT = '1.7' // for JDK 8 compatibility
 	ktfmtCompileOnly("com.google.googlejavaformat:google-java-format") {

From 2be12910f62f2883330e064f44a6cc2f74ac52bf Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 9 May 2022 16:51:07 -0700
Subject: [PATCH 0134/2068] JvmLocalCache should force state evaluation of any
 LazyForwardingEquality to give it a chance to null-out its initializing
 lambda.

Addresses https://github.com/diffplug/spotless/issues/1194#issuecomment-1120744842
---
 .../com/diffplug/spotless/LazyForwardingEquality.java     | 7 ++++++-
 .../java/com/diffplug/gradle/spotless/JvmLocalCache.java  | 8 +++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/LazyForwardingEquality.java b/lib/src/main/java/com/diffplug/spotless/LazyForwardingEquality.java
index 05e758d586..e29464bd91 100644
--- a/lib/src/main/java/com/diffplug/spotless/LazyForwardingEquality.java
+++ b/lib/src/main/java/com/diffplug/spotless/LazyForwardingEquality.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -111,4 +111,9 @@ static byte[] toBytes(Serializable obj) {
 		}
 		return byteOutput.toByteArray();
 	}
+
+	/** Ensures that the lazy state has been evaluated. */
+	public static void unlazy(LazyForwardingEquality<?> in) {
+		in.state();
+	}
 }
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JvmLocalCache.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JvmLocalCache.java
index 9478e9e66f..3f03a5852b 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JvmLocalCache.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JvmLocalCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2021-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@
 import org.gradle.api.Task;
 
 import com.diffplug.spotless.FileSignature;
+import com.diffplug.spotless.LazyForwardingEquality;
 
 class JvmLocalCache {
 	private static GradleException cacheIsStale() {
@@ -53,6 +54,11 @@ static class LiveCacheKeyImpl<T> implements LiveCache<T>, Serializable {
 
 		@Override
 		public void set(T value) {
+			if (value instanceof LazyForwardingEquality) {
+				// whenever we cache an instance of LazyForwardingEquality, we want to make sure that we give it
+				// a chance to null-out its initialization lambda (see https://github.com/diffplug/spotless/issues/1194#issuecomment-1120744842)
+				LazyForwardingEquality.unlazy((LazyForwardingEquality<?>) value);
+			}
 			daemonState.put(internalKey, value);
 		}
 

From 27271d1552c19e9d8775368306ab433c7a9dff65 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 9 May 2022 17:07:20 -0700
Subject: [PATCH 0135/2068] Bump default ktfmt to latest 0.36 -> 0.37

---
 lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
index 86b036db3b..b7ade56b5f 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
@@ -39,7 +39,7 @@ public class KtfmtStep {
 	// prevent direct instantiation
 	private KtfmtStep() {}
 
-	private static final String DEFAULT_VERSION = "0.36";
+	private static final String DEFAULT_VERSION = "0.37";
 	static final String NAME = "ktfmt";
 	static final String PACKAGE = "com.facebook";
 	static final String MAVEN_COORDINATE = PACKAGE + ":ktfmt:";

From 2a1c3216f75068e77b17bc9851328f75ffdd046a Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 9 May 2022 17:07:30 -0700
Subject: [PATCH 0136/2068] Bump changes to latest.

---
 CHANGES.md               | 2 ++
 plugin-gradle/CHANGES.md | 2 ++
 plugin-maven/CHANGES.md  | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 7eb1c33afe..11562e8047 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,6 +13,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Update the `black` version regex to fix `19.10b0` and earlier. (fixes [#1195](https://github.com/diffplug/spotless/issues/1195), regression introduced in `2.25.0`)
 * `GitAttributesLineEndings$RelocatablePolicy` and `FormatterStepImpl` now null-out their initialization lambdas after their state has been calculated, which allows GC to collect variables which were incidentally captured but not needed in the calculated state. ([#1198](https://github.com/diffplug/spotless/pull/1198))
+### Changes
+* Bump default `ktfmt` version to latest `0.36` -> `0.37`. ([#1200](https://github.com/diffplug/spotless/pull/1200))
 
 ## [2.25.2] - 2022-05-03
 ### Changes
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index b8531d3812..74f75fff75 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -8,6 +8,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Update the `black` version regex to fix `19.10b0` and earlier. (fixes [#1195](https://github.com/diffplug/spotless/issues/1195), regression introduced in `6.5.0`)
 * Improved daemon memory consumption ([#1198](https://github.com/diffplug/spotless/pull/1198) fixes [#1194](https://github.com/diffplug/spotless/issues/1194))
+### Changes
+* Bump default `ktfmt` version to latest `0.36` -> `0.37`. ([#1200](https://github.com/diffplug/spotless/pull/1200))
 
 ## [6.5.2] - 2022-05-03
 ### Changes
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 08cad5cfa9..de8f0c2be0 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,6 +5,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Fixed
 * Update the `black` version regex to fix `19.10b0` and earlier. (fixes [#1195](https://github.com/diffplug/spotless/issues/1195), regression introduced in `2.22.2`)
+### Changes
+* Bump default `ktfmt` version to latest `0.36` -> `0.37`. ([#1200](https://github.com/diffplug/spotless/pull/1200))
 
 ## [2.22.4] - 2022-05-03
 ### Changes

From 424e42aa93c21f0d02efad28882453857abb1dde Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 10 May 2022 09:45:41 -0700
Subject: [PATCH 0137/2068] LazyForwardingEquality can now unlazy a
 `FormatterStep` which has a delegate field, a well as a
 `List<FormatterStep>`.

Fixes https://github.com/diffplug/spotless/issues/1194#issuecomment-1122034178
---
 .../spotless/DelegateFormatterStep.java       | 32 +++++++++++++++++++
 .../FilterByContentPatternFormatterStep.java  | 14 ++------
 .../spotless/FilterByFileFormatterStep.java   | 12 ++-----
 .../spotless/LazyForwardingEquality.java      | 13 ++++++--
 4 files changed, 49 insertions(+), 22 deletions(-)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/DelegateFormatterStep.java

diff --git a/lib/src/main/java/com/diffplug/spotless/DelegateFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/DelegateFormatterStep.java
new file mode 100644
index 0000000000..829652a5dc
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/DelegateFormatterStep.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless;
+
+import java.util.Objects;
+
+/** Superclass of all compound FormatterSteps necessary for {@link com.diffplug.spotless.LazyForwardingEquality#unlazy(java.lang.Object)}. */
+abstract class DelegateFormatterStep implements FormatterStep {
+	protected final FormatterStep delegateStep;
+
+	DelegateFormatterStep(FormatterStep delegateStep) {
+		this.delegateStep = Objects.requireNonNull(delegateStep);
+	}
+
+	@Override
+	public final String getName() {
+		return delegateStep.getName();
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/FilterByContentPatternFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/FilterByContentPatternFormatterStep.java
index 9b39361719..d9a6fe4093 100644
--- a/lib/src/main/java/com/diffplug/spotless/FilterByContentPatternFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/FilterByContentPatternFormatterStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,27 +22,19 @@
 
 import javax.annotation.Nullable;
 
-final class FilterByContentPatternFormatterStep implements FormatterStep {
-	private final FormatterStep delegateStep;
+final class FilterByContentPatternFormatterStep extends DelegateFormatterStep {
 	final Pattern contentPattern;
 
 	FilterByContentPatternFormatterStep(FormatterStep delegateStep, String contentPattern) {
-		this.delegateStep = Objects.requireNonNull(delegateStep);
+		super(delegateStep);
 		this.contentPattern = Pattern.compile(Objects.requireNonNull(contentPattern));
 	}
 
-	@Override
-	public String getName() {
-		return delegateStep.getName();
-	}
-
 	@Override
 	public @Nullable String format(String raw, File file) throws Exception {
 		Objects.requireNonNull(raw, "raw");
 		Objects.requireNonNull(file, "file");
-
 		Matcher matcher = contentPattern.matcher(raw);
-
 		if (matcher.find()) {
 			return delegateStep.format(raw, file);
 		} else {
diff --git a/lib/src/main/java/com/diffplug/spotless/FilterByFileFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/FilterByFileFormatterStep.java
index 2fd221220c..04a06a4673 100644
--- a/lib/src/main/java/com/diffplug/spotless/FilterByFileFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/FilterByFileFormatterStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,20 +20,14 @@
 
 import javax.annotation.Nullable;
 
-final class FilterByFileFormatterStep implements FormatterStep {
-	private final FormatterStep delegateStep;
+final class FilterByFileFormatterStep extends DelegateFormatterStep {
 	private final SerializableFileFilter filter;
 
 	FilterByFileFormatterStep(FormatterStep delegateStep, SerializableFileFilter filter) {
-		this.delegateStep = Objects.requireNonNull(delegateStep);
+		super(delegateStep);
 		this.filter = Objects.requireNonNull(filter);
 	}
 
-	@Override
-	public String getName() {
-		return delegateStep.getName();
-	}
-
 	@Override
 	public @Nullable String format(String raw, File file) throws Exception {
 		Objects.requireNonNull(raw, "raw");
diff --git a/lib/src/main/java/com/diffplug/spotless/LazyForwardingEquality.java b/lib/src/main/java/com/diffplug/spotless/LazyForwardingEquality.java
index e29464bd91..e2d6ba8988 100644
--- a/lib/src/main/java/com/diffplug/spotless/LazyForwardingEquality.java
+++ b/lib/src/main/java/com/diffplug/spotless/LazyForwardingEquality.java
@@ -113,7 +113,16 @@ static byte[] toBytes(Serializable obj) {
 	}
 
 	/** Ensures that the lazy state has been evaluated. */
-	public static void unlazy(LazyForwardingEquality<?> in) {
-		in.state();
+	public static void unlazy(Object in) {
+		if (in instanceof LazyForwardingEquality) {
+			((LazyForwardingEquality<?>) in).state();
+		} else if (in instanceof DelegateFormatterStep) {
+			unlazy(((DelegateFormatterStep) in).delegateStep);
+		} else if (in instanceof Iterable) {
+			Iterable<Object> cast = (Iterable<Object>) in;
+			for (Object c : cast) {
+				unlazy(c);
+			}
+		}
 	}
 }

From 628c5fcbe3e1ed85c895c0d2fe5bf9ebadf47bd6 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 10 May 2022 13:32:28 -0700
Subject: [PATCH 0138/2068] Fix spotbugs warning about `\n` vs `%n`.

---
 .../java/com/diffplug/gradle/spotless/GradleProvisioner.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
index 63697afca2..97f051cd86 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
@@ -128,7 +128,7 @@ private static Provisioner forConfigurationContainer(Project project, Configurat
 					projName = projName + "/";
 				}
 				throw new GradleException(String.format(
-						"You need to add a repository containing the '%s' artifact in '%sbuild.gradle'.\n" +
+						"You need to add a repository containing the '%s' artifact in '%sbuild.gradle'.%n" +
 								"E.g.: 'repositories { mavenCentral() }'",
 						mavenCoords, projName), e);
 			}

From 619fdcbf626f6ed929182834317eb5a3d646da09 Mon Sep 17 00:00:00 2001
From: circleci <circleci@391ba4318e4f>
Date: Tue, 10 May 2022 22:50:59 +0000
Subject: [PATCH 0139/2068] Published lib/2.25.3

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 11562e8047..8d2011de17 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.25.3] - 2022-05-10
 ### Fixed
 * Update the `black` version regex to fix `19.10b0` and earlier. (fixes [#1195](https://github.com/diffplug/spotless/issues/1195), regression introduced in `2.25.0`)
 * `GitAttributesLineEndings$RelocatablePolicy` and `FormatterStepImpl` now null-out their initialization lambdas after their state has been calculated, which allows GC to collect variables which were incidentally captured but not needed in the calculated state. ([#1198](https://github.com/diffplug/spotless/pull/1198))

From be2897247ffd28814b83fcdf9b440e5d541052c0 Mon Sep 17 00:00:00 2001
From: circleci <circleci@391ba4318e4f>
Date: Tue, 10 May 2022 22:51:46 +0000
Subject: [PATCH 0140/2068] Published gradle/6.6.0

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 46 ++++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 74f75fff75..fe7b0f879f 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [6.6.0] - 2022-05-10
 ### Added
 * `FormatExtension.createIndependentApplyTaskLazy`, with same functionality as `createIndependentApplyTaskLazy` but returning `TaskProvider` ([#1198](https://github.com/diffplug/spotless/pull/1198))
 ### Fixed
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index bc6d28b72c..06ba04d45e 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -18,9 +18,9 @@ output = [
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
 [![Maven central](https://img.shields.io/badge/mavencentral-yes-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/index.html)
 [![License Apache](https://img.shields.io/badge/license-apache-blue.svg)](https://tldrlegal.com/license/apache-license-2.0-(apache-2.0))
-[![Changelog](https://img.shields.io/badge/changelog-6.5.2-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-6.6.0-blue.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)
@@ -126,10 +126,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -141,7 +141,7 @@ If you're stuck on an older version of Gradle, `id 'com.diffplug.gradle.spotless
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -248,8 +248,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -300,8 +300,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -361,7 +361,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -393,7 +393,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -425,7 +425,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -459,7 +459,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -480,7 +480,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -505,7 +505,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -545,7 +545,7 @@ sql.formatter.indent.size=4
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -588,7 +588,7 @@ For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#n
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -813,7 +813,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -880,9 +880,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -915,11 +915,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.5.2/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From 8b3e85dbb5a1cb8f0f8be4978f296dd3abf8852d Mon Sep 17 00:00:00 2001
From: circleci <circleci@391ba4318e4f>
Date: Tue, 10 May 2022 22:53:18 +0000
Subject: [PATCH 0141/2068] Published maven/2.22.5

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index de8f0c2be0..a0dbcc1d97 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.22.5] - 2022-05-10
 ### Fixed
 * Update the `black` version regex to fix `19.10b0` and earlier. (fixes [#1195](https://github.com/diffplug/spotless/issues/1195), regression introduced in `2.22.2`)
 ### Changes
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index b3bab5af71..3486a37255 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -12,8 +12,8 @@ output = [
   ].join('\n');
 -->
 [![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.22.4/index.html)
-[![Changelog](https://img.shields.io/badge/changelog-2.22.4-brightgreen.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.22.5/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.22.5-brightgreen.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)

From e8cc5401d450350659f9592a7a5942ad9cea937a Mon Sep 17 00:00:00 2001
From: Per Lundberg <perlun@gmail.com>
Date: Thu, 12 May 2022 10:44:36 +0300
Subject: [PATCH 0142/2068] Update README.md

Remove superfluous backtick
---
 plugin-gradle/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 06ba04d45e..48572377b8 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -135,7 +135,7 @@ All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.dif
 
 Spotless requires JRE 8+, and Gradle 6.1.1+.  Some steps require JRE 11+, `Unsupported major.minor version` means you're using a step that needs a newer JRE.
 
-If you're stuck on an older version of Gradle, `id 'com.diffplug.gradle.spotless' version '4.5.1'` supports all the way back to Gradle 2.x`.
+If you're stuck on an older version of Gradle, `id 'com.diffplug.gradle.spotless' version '4.5.1'` supports all the way back to Gradle 2.x.
 
 <a name="applying-to-java-source"></a>
 

From ce19481aa71310a8125f6472230232e43958f260 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20K=C3=B6dderitzsch?= <lars.koedderitzsch@fv.nrw.de>
Date: Thu, 12 May 2022 11:29:03 +0200
Subject: [PATCH 0143/2068] unlazy collections/delegates

#1194 unlazy collections/delegates
---
 .../java/com/diffplug/gradle/spotless/JvmLocalCache.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JvmLocalCache.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JvmLocalCache.java
index 3f03a5852b..bcc480b7c6 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JvmLocalCache.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JvmLocalCache.java
@@ -54,11 +54,10 @@ static class LiveCacheKeyImpl<T> implements LiveCache<T>, Serializable {
 
 		@Override
 		public void set(T value) {
-			if (value instanceof LazyForwardingEquality) {
-				// whenever we cache an instance of LazyForwardingEquality, we want to make sure that we give it
-				// a chance to null-out its initialization lambda (see https://github.com/diffplug/spotless/issues/1194#issuecomment-1120744842)
-				LazyForwardingEquality.unlazy((LazyForwardingEquality<?>) value);
-			}
+
+			// whenever we cache an instance of LazyForwardingEquality, we want to make sure that we give it
+			// a chance to null-out its initialization lambda (see https://github.com/diffplug/spotless/issues/1194#issuecomment-1120744842)
+			LazyForwardingEquality.unlazy(value);
 			daemonState.put(internalKey, value);
 		}
 

From 73264a8dff04a2388eb509f90664ac197e62ccf2 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 12 May 2022 16:29:32 -0700
Subject: [PATCH 0144/2068] Fix the predeclare case.

---
 .../gradle/spotless/SpotlessExtensionPredeclare.java        | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtensionPredeclare.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtensionPredeclare.java
index a086f1ca52..ae6243f53a 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtensionPredeclare.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtensionPredeclare.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2021-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,8 @@
 import org.gradle.api.Action;
 import org.gradle.api.Project;
 
+import com.diffplug.spotless.LazyForwardingEquality;
+
 public class SpotlessExtensionPredeclare extends SpotlessExtension {
 	private final SortedMap<String, FormatExtension> toSetup = new TreeMap<>();
 
@@ -33,6 +35,8 @@ public SpotlessExtensionPredeclare(Project project, GradleProvisioner.Policy pol
 					lazyAction.execute(formatExtension);
 				}
 				getRegisterDependenciesTask().steps.addAll(formatExtension.steps);
+				// needed to fix Deemon memory leaks (#1194), but this line came from https://github.com/diffplug/spotless/pull/1206
+				LazyForwardingEquality.unlazy(getRegisterDependenciesTask().steps);
 			});
 		});
 	}

From b9e8325033ec7756b1d3f5e2a05551954b679dd1 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 12 May 2022 16:31:01 -0700
Subject: [PATCH 0145/2068] Update changelog.

---
 plugin-gradle/CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index fe7b0f879f..c535402d9e 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Fixed
+* More daemon memory consumption fixes ([#1206](https://github.com/diffplug/spotless/pull/1198) fixes [#1194](https://github.com/diffplug/spotless/issues/1194))
 
 ## [6.6.0] - 2022-05-10
 ### Added

From 7da4090540a0b7d1639e7eda47c9b003367dfe34 Mon Sep 17 00:00:00 2001
From: Andrew Parmet <andrew@parmet.com>
Date: Thu, 12 May 2022 19:38:48 -0400
Subject: [PATCH 0146/2068] implement buf format gradle step

---
 README.md                                     |  1 +
 .../diffplug/spotless/protobuf/BufStep.java   | 99 +++++++++++++++++++
 .../spotless/protobuf/ProtobufConstants.java  | 20 ++++
 plugin-gradle/README.md                       | 18 ++++
 .../gradle/spotless/ProtobufExtension.java    | 76 ++++++++++++++
 .../gradle/spotless/SpotlessExtension.java    |  6 ++
 .../gradle/spotless/BufIntegrationTest.java   | 55 +++++++++++
 .../src/main/resources/protobuf/buf/buf.proto |  5 +
 .../resources/protobuf/buf/buf.proto.clean    |  5 +
 .../main/resources/protobuf/buf/license.proto |  7 ++
 .../protobuf/buf/license.proto.clean          |  8 ++
 .../spotless/protobuf/BufStepTest.java        | 31 ++++++
 12 files changed, 331 insertions(+)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java
 create mode 100644 lib/src/main/java/com/diffplug/spotless/protobuf/ProtobufConstants.java
 create mode 100644 plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java
 create mode 100644 plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BufIntegrationTest.java
 create mode 100644 testlib/src/main/resources/protobuf/buf/buf.proto
 create mode 100644 testlib/src/main/resources/protobuf/buf/buf.proto.clean
 create mode 100644 testlib/src/main/resources/protobuf/buf/license.proto
 create mode 100644 testlib/src/main/resources/protobuf/buf/license.proto.clean
 create mode 100644 testlib/src/test/java/com/diffplug/spotless/protobuf/BufStepTest.java

diff --git a/README.md b/README.md
index f95ea7a7ca..fbdf738104 100644
--- a/README.md
+++ b/README.md
@@ -114,6 +114,7 @@ extra('wtp.EclipseWtpFormatterStep')             +'{{yes}}       | {{yes}}
 | [`npm.PrettierFormatterStep`](lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`npm.TsFmtFormatterStep`](lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`pom.SortPomStepStep`](lib/src/main/java/com/diffplug/spotless/pom/SortPomStepStep.java) | :white_large_square:        | :+1:      | :white_large_square:       | :white_large_square:  |
+| [`protobuf.BufStep`](lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
 | [`python.BlackStep`](lib/src/main/java/com/diffplug/spotless/python/BlackStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
 | [`scala.ScalaFmtStep`](lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`sql.DBeaverSQLFormatterStep`](lib/src/main/java/com/diffplug/spotless/sql/DBeaverSQLFormatterStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
diff --git a/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java b/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java
new file mode 100644
index 0000000000..601a47f193
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.protobuf;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.List;
+import java.util.regex.Pattern;
+
+import javax.annotation.Nullable;
+
+import com.diffplug.spotless.ForeignExe;
+import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.ProcessRunner;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+public class BufStep {
+	public static String name() {
+		return "buf";
+	}
+
+	public static String defaultVersion() {
+		return "1.4.0";
+	}
+
+	private final String version;
+	private final @Nullable String pathToExe;
+
+	private BufStep(String version, @Nullable String pathToExe) {
+		this.version = version;
+		this.pathToExe = pathToExe;
+	}
+
+	public static BufStep withVersion(String version) {
+		return new BufStep(version, null);
+	}
+
+	public BufStep withPathToExe(String pathToExe) {
+		return new BufStep(version, pathToExe);
+	}
+
+	public FormatterStep create() {
+		return FormatterStep.createLazy(name(), this::createState, State::toFunc);
+	}
+
+	private State createState() throws IOException, InterruptedException {
+		String instructions = "https://docs.buf.build/installation";
+		String exeAbsPath = ForeignExe.nameAndVersion("buf", version)
+				.pathToExe(pathToExe)
+				.versionRegex(Pattern.compile("(\\S*)"))
+				.fixCantFind("Try following the instructions at " + instructions + ", or else tell Spotless where it is with {@code buf().pathToExe('path/to/executable')}")
+				.confirmVersionAndGetAbsolutePath();
+		return new State(this, exeAbsPath);
+	}
+
+	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
+	static class State implements Serializable {
+		private static final long serialVersionUID = -1825662356883926318L;
+		// used for up-to-date checks and caching
+		final String version;
+		// used for executing
+		final transient List<String> args;
+
+		State(BufStep step, String exeAbsPath) {
+			this.version = step.version;
+			this.args = Arrays.asList(exeAbsPath, "format");
+		}
+
+		String format(ProcessRunner runner, String input, File file) throws IOException, InterruptedException {
+			String[] processArgs = args.toArray(new String[args.size() + 1]);
+			// add an argument to the end
+			processArgs[args.size()] = file.getAbsolutePath();
+			return runner.exec(input.getBytes(StandardCharsets.UTF_8), processArgs).assertExitZero(StandardCharsets.UTF_8);
+		}
+
+		FormatterFunc.Closeable toFunc() {
+			ProcessRunner runner = new ProcessRunner();
+			return FormatterFunc.Closeable.of(runner, this::format);
+		}
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/protobuf/ProtobufConstants.java b/lib/src/main/java/com/diffplug/spotless/protobuf/ProtobufConstants.java
new file mode 100644
index 0000000000..b24df7cc38
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/protobuf/ProtobufConstants.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.protobuf;
+
+public class ProtobufConstants {
+	public static final String LICENSE_HEADER_DELIMITER = "syntax";
+}
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 48572377b8..7bf684923c 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -65,6 +65,7 @@ Spotless supports all of Gradle's built-in performance features (incremental bui
   - [Kotlin](#kotlin) ([ktfmt](#ktfmt), [ktlint](#ktlint), [diktat](#diktat), [prettier](#prettier))
   - [Scala](#scala) ([scalafmt](#scalafmt))
   - [C/C++](#cc) ([clang-format](#clang-format), [eclipse cdt](#eclipse-cdt))
+  - [Protobuf](#protobuf) ([buf](#buf), [clang-format](#clang-format))
   - [Python](#python) ([black](#black))
   - [FreshMark](#freshmark) aka markdown
   - [Antlr4](#antlr4) ([antlr4formatter](#antlr4formatter))
@@ -457,6 +458,23 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 <a name="applying-freshmark-to-markdown-files"></a>
 
+## Protobuf
+
+### buf
+
+`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
+
+```gradle
+spotless {
+  protobuf {
+    // by default the target is every '.proto' file in the project
+    buf()
+
+    licenseHeader '/* (C) $YEAR */' // or licenseHeaderFile
+  }
+}
+```
+
 ## FreshMark
 
 `com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java
new file mode 100644
index 0000000000..44565e8073
--- /dev/null
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.gradle.spotless;
+
+import static com.diffplug.spotless.protobuf.ProtobufConstants.LICENSE_HEADER_DELIMITER;
+
+import java.util.Objects;
+
+import javax.inject.Inject;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.protobuf.BufStep;
+
+public class ProtobufExtension extends FormatExtension implements HasBuiltinDelimiterForLicense {
+	static final String NAME = "protobuf";
+
+	@Inject
+	public ProtobufExtension(SpotlessExtension spotless) {
+		super(spotless);
+	}
+
+	@Override
+	public LicenseHeaderConfig licenseHeader(String licenseHeader) {
+		return licenseHeader(licenseHeader, LICENSE_HEADER_DELIMITER);
+	}
+
+	@Override
+	public LicenseHeaderConfig licenseHeaderFile(Object licenseHeaderFile) {
+		return licenseHeaderFile(licenseHeaderFile, LICENSE_HEADER_DELIMITER);
+	}
+
+	/** Adds the specified version of <a href="https://github.com/pinterest/ktlint">ktlint</a>. */
+	public BufFormatExtension buf(String version) {
+		Objects.requireNonNull(version);
+		return new BufFormatExtension(version);
+	}
+
+	public BufFormatExtension buf() {
+		return buf(BufStep.defaultVersion());
+	}
+
+	public class BufFormatExtension {
+		private final String version;
+
+		BufFormatExtension(String version) {
+			this.version = version;
+			addStep(createStep());
+		}
+
+		private FormatterStep createStep() {
+			return BufStep.withVersion(version).create();
+		}
+	}
+
+	/** If the user hasn't specified files, assume all protobuf files should be checked. */
+	@Override
+	protected void setupTask(SpotlessTask task) {
+		if (target == null) {
+			target = parseTarget("**/*.proto");
+		}
+		super.setupTask(task);
+	}
+}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
index 57aa3b2d83..8aa9d2e619 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
@@ -188,6 +188,12 @@ public void json(Action<JsonExtension> closure) {
 		format(JsonExtension.NAME, JsonExtension.class, closure);
 	}
 
+	/** Configures the special protobuf-specific extension. */
+	public void protobuf(Action<ProtobufExtension> closure) {
+		requireNonNull(closure);
+		format(ProtobufExtension.NAME, ProtobufExtension.class, closure);
+	}
+
 	/** Configures a custom extension. */
 	public void format(String name, Action<FormatExtension> closure) {
 		requireNonNull(name, "name");
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BufIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BufIntegrationTest.java
new file mode 100644
index 0000000000..03f45a46c8
--- /dev/null
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BufIntegrationTest.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.gradle.spotless;
+
+import java.io.IOException;
+
+import org.junit.jupiter.api.Test;
+
+class BufIntegrationTest extends GradleIntegrationHarness {
+	@Test
+	void buf() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"  id 'com.diffplug.spotless'",
+				"}",
+				"spotless {",
+				"  protobuf {",
+				"    buf()",
+				"  }",
+				"}");
+		setFile("buf.proto").toResource("protobuf/buf/buf.proto");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("buf.proto").sameAsResource("protobuf/buf/buf.proto.clean");
+	}
+
+	@Test
+	void bufWithLicense() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"  id 'com.diffplug.spotless'",
+				"}",
+				"spotless {",
+				"  protobuf {",
+				"    buf()",
+				"    licenseHeader '/* (C) 2022 */'",
+				"  }",
+				"}");
+		setFile("license.proto").toResource("protobuf/buf/license.proto");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("license.proto").sameAsResource("protobuf/buf/license.proto.clean");
+	}
+}
diff --git a/testlib/src/main/resources/protobuf/buf/buf.proto b/testlib/src/main/resources/protobuf/buf/buf.proto
new file mode 100644
index 0000000000..a90d58bbd0
--- /dev/null
+++ b/testlib/src/main/resources/protobuf/buf/buf.proto
@@ -0,0 +1,5 @@
+message Testing {
+  required string field1 = 1;
+	required int32 field2 = 2;
+ optional string field3 = 3;
+}
\ No newline at end of file
diff --git a/testlib/src/main/resources/protobuf/buf/buf.proto.clean b/testlib/src/main/resources/protobuf/buf/buf.proto.clean
new file mode 100644
index 0000000000..faa8d91f24
--- /dev/null
+++ b/testlib/src/main/resources/protobuf/buf/buf.proto.clean
@@ -0,0 +1,5 @@
+message Testing {
+  required string field1 = 1;
+  required int32 field2 = 2;
+  optional string field3 = 3;
+}
diff --git a/testlib/src/main/resources/protobuf/buf/license.proto b/testlib/src/main/resources/protobuf/buf/license.proto
new file mode 100644
index 0000000000..aabedc5093
--- /dev/null
+++ b/testlib/src/main/resources/protobuf/buf/license.proto
@@ -0,0 +1,7 @@
+syntax = "proto3";
+
+message Testing {
+  required string field1 = 1;
+  required int32 field2 = 2;
+  optional string field3 = 3;
+}
diff --git a/testlib/src/main/resources/protobuf/buf/license.proto.clean b/testlib/src/main/resources/protobuf/buf/license.proto.clean
new file mode 100644
index 0000000000..11761efc28
--- /dev/null
+++ b/testlib/src/main/resources/protobuf/buf/license.proto.clean
@@ -0,0 +1,8 @@
+/* (C) 2022 */
+syntax = "proto3";
+
+message Testing {
+  required string field1 = 1;
+  required int32 field2 = 2;
+  optional string field3 = 3;
+}
diff --git a/testlib/src/test/java/com/diffplug/spotless/protobuf/BufStepTest.java b/testlib/src/test/java/com/diffplug/spotless/protobuf/BufStepTest.java
new file mode 100644
index 0000000000..c2079f462f
--- /dev/null
+++ b/testlib/src/test/java/com/diffplug/spotless/protobuf/BufStepTest.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.protobuf;
+
+import java.io.File;
+
+import org.junit.jupiter.api.Test;
+
+import com.diffplug.spotless.StepHarnessWithFile;
+
+class BufStepTest {
+	@Test
+	void test() throws Exception {
+		try (StepHarnessWithFile harness = StepHarnessWithFile.forStep(BufStep.withVersion(BufStep.defaultVersion()).create())) {
+			harness.testResource(new File("src/main/resources/protobuf/buf/buf.proto"), "protobuf/buf/buf.proto", "protobuf/buf/buf.proto.clean");
+		}
+	}
+}

From ef357fccb31837434a00680de5b56fc43bb91025 Mon Sep 17 00:00:00 2001
From: Andrew Parmet <andrew@parmet.com>
Date: Thu, 12 May 2022 19:58:04 -0400
Subject: [PATCH 0147/2068] update changelogs

---
 CHANGES.md               | 2 ++
 plugin-gradle/CHANGES.md | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 8d2011de17..bd3b15a4cf 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* Added support for Protobuf formatting based on [Buf](https://buf.build/) (#1208).
 
 ## [2.25.3] - 2022-05-10
 ### Fixed
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index fe7b0f879f..9d172a4cfd 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Added
+* Added support for Protobuf formatting based on [Buf](https://buf.build/) (#1208).
 
 ## [6.6.0] - 2022-05-10
 ### Added

From 4e56621aa8858ea528ea5eb0689f55dbd502503a Mon Sep 17 00:00:00 2001
From: Andrew Parmet <andrew@parmet.com>
Date: Thu, 12 May 2022 20:02:52 -0400
Subject: [PATCH 0148/2068] fix bad comment

---
 .../java/com/diffplug/gradle/spotless/ProtobufExtension.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java
index 44565e8073..660f0b3efb 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java
@@ -42,7 +42,7 @@ public LicenseHeaderConfig licenseHeaderFile(Object licenseHeaderFile) {
 		return licenseHeaderFile(licenseHeaderFile, LICENSE_HEADER_DELIMITER);
 	}
 
-	/** Adds the specified version of <a href="https://github.com/pinterest/ktlint">ktlint</a>. */
+	/** Adds the specified version of <a href="https://buf.build/">buf</a>. */
 	public BufFormatExtension buf(String version) {
 		Objects.requireNonNull(version);
 		return new BufFormatExtension(version);

From 5b16ed1324116bd46f3364d8c5ccca4fce5b6703 Mon Sep 17 00:00:00 2001
From: Andrew Parmet <andrew@parmet.com>
Date: Thu, 12 May 2022 20:45:28 -0400
Subject: [PATCH 0149/2068] allow specification of path to exe

---
 .../gradle/spotless/ProtobufExtension.java    | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java
index 660f0b3efb..59a63b97fd 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java
@@ -42,6 +42,15 @@ public LicenseHeaderConfig licenseHeaderFile(Object licenseHeaderFile) {
 		return licenseHeaderFile(licenseHeaderFile, LICENSE_HEADER_DELIMITER);
 	}
 
+	/** If the user hasn't specified files, assume all protobuf files should be checked. */
+	@Override
+	protected void setupTask(SpotlessTask task) {
+		if (target == null) {
+			target = parseTarget("**/*.proto");
+		}
+		super.setupTask(task);
+	}
+
 	/** Adds the specified version of <a href="https://buf.build/">buf</a>. */
 	public BufFormatExtension buf(String version) {
 		Objects.requireNonNull(version);
@@ -53,24 +62,21 @@ public BufFormatExtension buf() {
 	}
 
 	public class BufFormatExtension {
-		private final String version;
+		BufStep step;
 
 		BufFormatExtension(String version) {
-			this.version = version;
+			this.step = BufStep.withVersion(version);
 			addStep(createStep());
 		}
 
-		private FormatterStep createStep() {
-			return BufStep.withVersion(version).create();
+		public BufFormatExtension pathToExe(String pathToExe) {
+			step = step.withPathToExe(pathToExe);
+			replaceStep(createStep());
+			return this;
 		}
-	}
 
-	/** If the user hasn't specified files, assume all protobuf files should be checked. */
-	@Override
-	protected void setupTask(SpotlessTask task) {
-		if (target == null) {
-			target = parseTarget("**/*.proto");
+		private FormatterStep createStep() {
+			return step.create();
 		}
-		super.setupTask(task);
 	}
 }

From 85759c82067a2f1104b9b0ddfdaef51c50acf500 Mon Sep 17 00:00:00 2001
From: Andrew Parmet <andrew@parmet.com>
Date: Thu, 12 May 2022 23:03:04 -0400
Subject: [PATCH 0150/2068] fix table

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index fbdf738104..b55c4c4518 100644
--- a/README.md
+++ b/README.md
@@ -71,6 +71,7 @@ lib('markdown.FlexmarkStep')                     +'{{no}}        | {{yes}}
 lib('npm.PrettierFormatterStep')                 +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('npm.TsFmtFormatterStep')                    +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('pom.SortPomStepStep')                       +'{{no}}        | {{yes}}      | {{no}}       | {{no}}  |',
+lib('protobuf.BufSetp')                          +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
 lib('python.BlackStep')                          +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
 lib('scala.ScalaFmtStep')                        +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
 lib('sql.DBeaverSQLFormatterStep')               +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',

From 2ec3dcef2c4c24b52e9e315317cd522b2273c8d4 Mon Sep 17 00:00:00 2001
From: Andrew Parmet <andrew@parmet.com>
Date: Thu, 12 May 2022 23:03:16 -0400
Subject: [PATCH 0151/2068] typo

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b55c4c4518..e6455348a0 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ lib('markdown.FlexmarkStep')                     +'{{no}}        | {{yes}}
 lib('npm.PrettierFormatterStep')                 +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('npm.TsFmtFormatterStep')                    +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('pom.SortPomStepStep')                       +'{{no}}        | {{yes}}      | {{no}}       | {{no}}  |',
-lib('protobuf.BufSetp')                          +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
+lib('protobuf.BufStep')                          +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
 lib('python.BlackStep')                          +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
 lib('scala.ScalaFmtStep')                        +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
 lib('sql.DBeaverSQLFormatterStep')               +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',

From 8d25fd8a65b5c80232b58f94373b29efa6f97cb7 Mon Sep 17 00:00:00 2001
From: Andrew Parmet <andrew@parmet.com>
Date: Thu, 12 May 2022 23:21:19 -0400
Subject: [PATCH 0152/2068] add tag to disable buf tests in CI

---
 gradle/special-tests.gradle                   |  3 +-
 .../gradle/spotless/BufIntegrationTest.java   |  3 ++
 .../com/diffplug/spotless/tag/BufTest.java    | 30 +++++++++++++++++++
 .../spotless/protobuf/BufStepTest.java        |  3 ++
 4 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 testlib/src/main/java/com/diffplug/spotless/tag/BufTest.java

diff --git a/gradle/special-tests.gradle b/gradle/special-tests.gradle
index c435bc7e81..c3fa9cec0b 100644
--- a/gradle/special-tests.gradle
+++ b/gradle/special-tests.gradle
@@ -3,7 +3,8 @@ apply plugin: 'com.adarshr.test-logger'
 def special = [
 	'Npm',
 	'Black',
-	'Clang'
+	'Clang',
+	'Buf'
 ]
 
 boolean isCiServer = System.getenv().containsKey("CI")
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BufIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BufIntegrationTest.java
index 03f45a46c8..5625f927ce 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BufIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BufIntegrationTest.java
@@ -17,8 +17,11 @@
 
 import java.io.IOException;
 
+import com.diffplug.spotless.tag.BufTest;
+
 import org.junit.jupiter.api.Test;
 
+@BufTest
 class BufIntegrationTest extends GradleIntegrationHarness {
 	@Test
 	void buf() throws IOException {
diff --git a/testlib/src/main/java/com/diffplug/spotless/tag/BufTest.java b/testlib/src/main/java/com/diffplug/spotless/tag/BufTest.java
new file mode 100644
index 0000000000..cf358c3816
--- /dev/null
+++ b/testlib/src/main/java/com/diffplug/spotless/tag/BufTest.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.tag;
+
+import org.junit.jupiter.api.Tag;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Target({TYPE, METHOD})
+@Retention(RUNTIME)
+@Tag("Buf")
+public @interface BufTest {}
diff --git a/testlib/src/test/java/com/diffplug/spotless/protobuf/BufStepTest.java b/testlib/src/test/java/com/diffplug/spotless/protobuf/BufStepTest.java
index c2079f462f..f54cd2cae3 100644
--- a/testlib/src/test/java/com/diffplug/spotless/protobuf/BufStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/protobuf/BufStepTest.java
@@ -17,10 +17,13 @@
 
 import java.io.File;
 
+import com.diffplug.spotless.tag.BufTest;
+
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.StepHarnessWithFile;
 
+@BufTest
 class BufStepTest {
 	@Test
 	void test() throws Exception {

From 78712ba6c3e67acc310287da30bd3f284f7edff5 Mon Sep 17 00:00:00 2001
From: Andrew Parmet <andrew@parmet.com>
Date: Thu, 12 May 2022 23:36:27 -0400
Subject: [PATCH 0153/2068] lint

---
 .../com/diffplug/gradle/spotless/BufIntegrationTest.java  | 4 ++--
 .../src/main/java/com/diffplug/spotless/tag/BufTest.java  | 8 ++++----
 .../java/com/diffplug/spotless/protobuf/BufStepTest.java  | 3 +--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BufIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BufIntegrationTest.java
index 5625f927ce..ba08c51838 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BufIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BufIntegrationTest.java
@@ -17,10 +17,10 @@
 
 import java.io.IOException;
 
-import com.diffplug.spotless.tag.BufTest;
-
 import org.junit.jupiter.api.Test;
 
+import com.diffplug.spotless.tag.BufTest;
+
 @BufTest
 class BufIntegrationTest extends GradleIntegrationHarness {
 	@Test
diff --git a/testlib/src/main/java/com/diffplug/spotless/tag/BufTest.java b/testlib/src/main/java/com/diffplug/spotless/tag/BufTest.java
index cf358c3816..490218ef7b 100644
--- a/testlib/src/main/java/com/diffplug/spotless/tag/BufTest.java
+++ b/testlib/src/main/java/com/diffplug/spotless/tag/BufTest.java
@@ -15,14 +15,14 @@
  */
 package com.diffplug.spotless.tag;
 
-import org.junit.jupiter.api.Tag;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import org.junit.jupiter.api.Tag;
 
 @Target({TYPE, METHOD})
 @Retention(RUNTIME)
diff --git a/testlib/src/test/java/com/diffplug/spotless/protobuf/BufStepTest.java b/testlib/src/test/java/com/diffplug/spotless/protobuf/BufStepTest.java
index f54cd2cae3..0cd72129c6 100644
--- a/testlib/src/test/java/com/diffplug/spotless/protobuf/BufStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/protobuf/BufStepTest.java
@@ -17,11 +17,10 @@
 
 import java.io.File;
 
-import com.diffplug.spotless.tag.BufTest;
-
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.StepHarnessWithFile;
+import com.diffplug.spotless.tag.BufTest;
 
 @BufTest
 class BufStepTest {

From 5c44a8e906dbf3d404d7d38758d4980f66cb1996 Mon Sep 17 00:00:00 2001
From: Andrew Parmet <andrew@parmet.com>
Date: Fri, 13 May 2022 00:50:09 -0400
Subject: [PATCH 0154/2068] add doc to pathToExe noting executable path trick

---
 .../gradle/spotless/ProtobufExtension.java    | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java
index 59a63b97fd..ac9f37ec8c 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java
@@ -69,6 +69,30 @@ public class BufFormatExtension {
 			addStep(createStep());
 		}
 
+		/**
+		 * When used in conjunction with the <a href=https://github.com/andrewparmet/buf-gradle-plugin>{@code buf-gradle-plugin}</a>,
+		 * the {@code buf} executable can be resolved from its {@code bufTool} configuration:
+		 *
+		 * <pre>
+		 * {@code
+		 * spotless {
+         *     protobuf {
+         *         buf().pathToExe(configurations.getByName(BUF_BINARY_CONFIGURATION_NAME).singleFile.absolutePath)
+         *     }
+		 * }
+		 * }
+		 * </pre>
+		 *
+		 * Be sure to disable the {@code buf-gradle-plugin}'s native support of {@code buf format}:
+		 *
+		 * <pre>
+		 * {@code
+		 * buf {
+         *     enforceFormat = false
+		 * }
+		 * }
+		 * </pre>
+		 */
 		public BufFormatExtension pathToExe(String pathToExe) {
 			step = step.withPathToExe(pathToExe);
 			replaceStep(createStep());

From 580037dc7b6bf58aa7b7072327b0c12649c29968 Mon Sep 17 00:00:00 2001
From: Andrew Parmet <andrew@parmet.com>
Date: Fri, 13 May 2022 00:55:45 -0400
Subject: [PATCH 0155/2068] add to readme as well

---
 plugin-gradle/README.md                           | 15 +++++++++++++++
 .../gradle/spotless/ProtobufExtension.java        |  8 ++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 7bf684923c..273afb54d1 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -475,6 +475,21 @@ spotless {
 }
 ```
 
+When used in conjunction with the [buf-gradle-plugin](https://github.com/andrewparmet/buf-gradle-plugin), the `buf` executable can be resolved from its `bufTool` configuration:
+
+```gradle
+spotless {
+  protobuf {
+    buf().pathToExe(configurations.getByName(BUF_BINARY_CONFIGURATION_NAME).getSingleFile().getAbsolutePath())
+  }
+}
+
+// Be sure to disable the buf-gradle-plugin's native support of `buf format`:
+buf {
+  enforceFormat = false
+}
+```
+
 ## FreshMark
 
 `com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java
index ac9f37ec8c..8754880f69 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java
@@ -76,9 +76,9 @@ public class BufFormatExtension {
 		 * <pre>
 		 * {@code
 		 * spotless {
-         *     protobuf {
-         *         buf().pathToExe(configurations.getByName(BUF_BINARY_CONFIGURATION_NAME).singleFile.absolutePath)
-         *     }
+         *   protobuf {
+         *     buf().pathToExe(configurations.getByName(BUF_BINARY_CONFIGURATION_NAME).getSingleFile().getAbsolutePath())
+         *   }
 		 * }
 		 * }
 		 * </pre>
@@ -88,7 +88,7 @@ public class BufFormatExtension {
 		 * <pre>
 		 * {@code
 		 * buf {
-         *     enforceFormat = false
+         *   enforceFormat = false
 		 * }
 		 * }
 		 * </pre>

From 3f7b1e87995210c852f87035e2eb396d993d66fd Mon Sep 17 00:00:00 2001
From: Andrew Parmet <andrew@parmet.com>
Date: Fri, 13 May 2022 00:58:23 -0400
Subject: [PATCH 0156/2068] tidy up diction

---
 plugin-gradle/README.md                                         | 2 +-
 .../java/com/diffplug/gradle/spotless/ProtobufExtension.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 273afb54d1..ec97352749 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -484,7 +484,7 @@ spotless {
   }
 }
 
-// Be sure to disable the buf-gradle-plugin's native support of `buf format`:
+// Be sure to disable the buf-gradle-plugin's execution of `buf format`:
 buf {
   enforceFormat = false
 }
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java
index 8754880f69..5f24b97a02 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java
@@ -83,7 +83,7 @@ public class BufFormatExtension {
 		 * }
 		 * </pre>
 		 *
-		 * Be sure to disable the {@code buf-gradle-plugin}'s native support of {@code buf format}:
+		 * Be sure to disable the {@code buf-gradle-plugin}'s execution of {@code buf format}:
 		 *
 		 * <pre>
 		 * {@code

From 24a913c20c4eff623c08dd2d9e97d5866c735f2b Mon Sep 17 00:00:00 2001
From: Andrew Parmet <andrew@parmet.com>
Date: Fri, 13 May 2022 00:59:21 -0400
Subject: [PATCH 0157/2068] tabs

---
 .../com/diffplug/gradle/spotless/ProtobufExtension.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java
index 5f24b97a02..283fe21c58 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java
@@ -76,9 +76,9 @@ public class BufFormatExtension {
 		 * <pre>
 		 * {@code
 		 * spotless {
-         *   protobuf {
-         *     buf().pathToExe(configurations.getByName(BUF_BINARY_CONFIGURATION_NAME).getSingleFile().getAbsolutePath())
-         *   }
+		 *   protobuf {
+		 *     buf().pathToExe(configurations.getByName(BUF_BINARY_CONFIGURATION_NAME).getSingleFile().getAbsolutePath())
+		 *   }
 		 * }
 		 * }
 		 * </pre>
@@ -88,7 +88,7 @@ public class BufFormatExtension {
 		 * <pre>
 		 * {@code
 		 * buf {
-         *   enforceFormat = false
+		 *   enforceFormat = false
 		 * }
 		 * }
 		 * </pre>

From 63b97621a7be320313be8ee64b4e552400a18e79 Mon Sep 17 00:00:00 2001
From: circleci <circleci@e982fac00852>
Date: Fri, 13 May 2022 19:37:15 +0000
Subject: [PATCH 0158/2068] Published gradle/6.6.1

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 46 ++++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index c535402d9e..e67e6546bb 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [6.6.1] - 2022-05-13
 ### Fixed
 * More daemon memory consumption fixes ([#1206](https://github.com/diffplug/spotless/pull/1198) fixes [#1194](https://github.com/diffplug/spotless/issues/1194))
 
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 48572377b8..72eb58cb2b 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -18,9 +18,9 @@ output = [
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
 [![Maven central](https://img.shields.io/badge/mavencentral-yes-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/index.html)
 [![License Apache](https://img.shields.io/badge/license-apache-blue.svg)](https://tldrlegal.com/license/apache-license-2.0-(apache-2.0))
-[![Changelog](https://img.shields.io/badge/changelog-6.6.0-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-6.6.1-blue.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)
@@ -126,10 +126,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -141,7 +141,7 @@ If you're stuck on an older version of Gradle, `id 'com.diffplug.gradle.spotless
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -248,8 +248,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -300,8 +300,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -361,7 +361,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -393,7 +393,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -425,7 +425,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -459,7 +459,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -480,7 +480,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -505,7 +505,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -545,7 +545,7 @@ sql.formatter.indent.size=4
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -588,7 +588,7 @@ For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#n
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -813,7 +813,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -880,9 +880,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -915,11 +915,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From 3e185d9e7a7996084257a7df0a8a1790cf46e2d5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 May 2022 12:04:01 +0000
Subject: [PATCH 0159/2068] Bump com.github.spotbugs from 5.0.6 to 5.0.7

Bumps com.github.spotbugs from 5.0.6 to 5.0.7.

---
updated-dependencies:
- dependency-name: com.github.spotbugs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 4bdbdfc1a8..07f7e5ec34 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
 		// https://github.com/gradle-nexus/publish-plugin/releases
 		id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
 		// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
-		id 'com.github.spotbugs'                   version '5.0.6'
+		id 'com.github.spotbugs'                   version '5.0.7'
 		// https://github.com/diffplug/spotless-changelog
 		id 'com.diffplug.spotless-changelog'       version '2.3.2'
 		// https://github.com/diffplug/goomph/blob/main/CHANGES.md

From 8241fe511a029c9c02eb9550c832e827497b921f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 May 2022 12:04:03 +0000
Subject: [PATCH 0160/2068] Bump org.gradle.test-retry from 1.3.2 to 1.4.0

Bumps org.gradle.test-retry from 1.3.2 to 1.4.0.

---
updated-dependencies:
- dependency-name: org.gradle.test-retry
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 4bdbdfc1a8..32c136d631 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,7 +12,7 @@ pluginManagement {
 		// https://github.com/diffplug/goomph/blob/main/CHANGES.md
 		id 'com.diffplug.p2.asmaven'               version '3.27.0' // DO NOT UPDATE, see https://github.com/diffplug/spotless/pull/874
 		// https://github.com/gradle/test-retry-gradle-plugin/releases
-		id 'org.gradle.test-retry'                 version '1.3.2'
+		id 'org.gradle.test-retry'                 version '1.4.0'
 		// https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md
 		id 'com.adarshr.test-logger'               version '3.2.0'
 	}

From 9b26e02542733813276aa959fd22afba4c162e12 Mon Sep 17 00:00:00 2001
From: Marek Hlava <mh@cardlay.com>
Date: Sat, 21 May 2022 20:33:56 +0200
Subject: [PATCH 0161/2068] Add support for KtLint editorConfigOverride

---
 .editorconfig                                 |  2 +
 .../glue/ktlint/KtlintFormatterFunc.java      | 92 ++++++++++++++++---
 .../diffplug/spotless/kotlin/BadSemver.java   | 13 ++-
 .../diffplug/spotless/kotlin/KtLintStep.java  | 34 ++++---
 plugin-gradle/README.md                       | 11 ++-
 .../gradle/spotless/KotlinExtension.java      | 20 +++-
 .../spotless/KotlinGradleExtension.java       | 17 +++-
 .../gradle/spotless/KotlinExtensionTest.java  | 45 +++++++++
 .../spotless/KotlinGradleExtensionTest.java   | 63 +++++++++++--
 .../experimentalEditorConfigOverride.clean    |  5 +
 .../experimentalEditorConfigOverride.dirty    |  5 +
 .../spotless/kotlin/KtLintStepTest.java       |  7 ++
 12 files changed, 268 insertions(+), 46 deletions(-)
 create mode 100644 testlib/src/main/resources/kotlin/ktlint/experimentalEditorConfigOverride.clean
 create mode 100644 testlib/src/main/resources/kotlin/ktlint/experimentalEditorConfigOverride.dirty

diff --git a/.editorconfig b/.editorconfig
index a8061a0816..6712fd66cc 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -16,6 +16,8 @@ indent_size = 2
 # Doc: https://youtrack.jetbrains.com/issue/IDEA-170643#focus=streamItem-27-3708697.0-0
 ij_java_imports_layout = java.**,|,javax.**,|,org.**,|,com.**,|,com.diffplug.**,|,*
 ij_java_use_single_class_imports = true
+ij_java_class_count_to_use_import_on_demand = 999
+ij_java_names_count_to_use_import_on_demand = 999
 
 [*.xml.mustache]
 indent_style = space
diff --git a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
index b3ef570180..1cd79a6ba9 100644
--- a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
+++ b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
@@ -17,18 +17,26 @@
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import com.pinterest.ktlint.core.KtLint;
-import com.pinterest.ktlint.core.KtLint.Params;
+import com.pinterest.ktlint.core.KtLint.ExperimentalParams;
 import com.pinterest.ktlint.core.LintError;
 import com.pinterest.ktlint.core.RuleSet;
+import com.pinterest.ktlint.core.api.DefaultEditorConfigProperties;
+import com.pinterest.ktlint.core.api.EditorConfigOverride;
+import com.pinterest.ktlint.core.api.UsesEditorConfigProperties;
 import com.pinterest.ktlint.ruleset.experimental.ExperimentalRuleSetProvider;
 import com.pinterest.ktlint.ruleset.standard.StandardRuleSetProvider;
 
 import com.diffplug.spotless.FormatterFunc;
 
+import kotlin.Pair;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function2;
 
@@ -38,8 +46,13 @@ public class KtlintFormatterFunc implements FormatterFunc.NeedsFile {
 	private final Map<String, String> userData;
 	private final Function2<? super LintError, ? super Boolean, Unit> formatterCallback;
 	private final boolean isScript;
+	private final EditorConfigOverride editorConfigOverride;
 
-	public KtlintFormatterFunc(boolean isScript, boolean useExperimental, Map<String, String> userData) {
+	/**
+	 * Non-empty editorConfigOverrideMap requires KtLint 0.45.2.
+	 */
+	public KtlintFormatterFunc(boolean isScript, boolean useExperimental, Map<String, String> userData,
+			Map<String, Object> editorConfigOverrideMap) {
 		rulesets = new ArrayList<>();
 		rulesets.add(new StandardRuleSetProvider().get());
 
@@ -49,6 +62,46 @@ public KtlintFormatterFunc(boolean isScript, boolean useExperimental, Map<String
 		this.userData = userData;
 		formatterCallback = new FormatterCallback();
 		this.isScript = isScript;
+
+		if (editorConfigOverrideMap.isEmpty()) {
+			this.editorConfigOverride = null;
+		} else {
+			this.editorConfigOverride = createEditorConfigOverride(editorConfigOverrideMap);
+		}
+	}
+
+	/**
+	 * Create EditorConfigOverride from user provided parameters.
+	 * Calling this method requires KtLint 0.45.2.
+	 */
+	private EditorConfigOverride createEditorConfigOverride(Map<String, Object> editorConfigOverrideMap) {
+		// Get properties from rules in the rule sets
+		Stream<UsesEditorConfigProperties.EditorConfigProperty<?>> ruleProperties = rulesets.stream()
+				.flatMap(ruleSet -> Arrays.stream(ruleSet.getRules()))
+				.filter(rule -> rule instanceof UsesEditorConfigProperties)
+				.flatMap(rule -> ((UsesEditorConfigProperties) rule).getEditorConfigProperties().stream());
+
+		// Create a mapping of properties to their names based on rule properties and default properties
+		Map<String, UsesEditorConfigProperties.EditorConfigProperty<?>> supportedProperties = Stream
+				.concat(ruleProperties, DefaultEditorConfigProperties.INSTANCE.getDefaultEditorConfigProperties().stream())
+				.distinct()
+				.collect(Collectors.toMap(property -> property.getType().getName(), property -> property));
+
+		// Create config properties based on provided property names and values
+		@SuppressWarnings("unchecked")
+		Pair<UsesEditorConfigProperties.EditorConfigProperty<?>, ?>[] properties = editorConfigOverrideMap.entrySet().stream()
+				.map(entry -> {
+					UsesEditorConfigProperties.EditorConfigProperty<?> property = supportedProperties.get(entry.getKey());
+					if (property != null) {
+						return new Pair<>(property, entry.getValue());
+					} else {
+						return null;
+					}
+				})
+				.filter(Objects::nonNull)
+				.toArray(Pair[]::new);
+
+		return EditorConfigOverride.Companion.from(properties);
 	}
 
 	static class FormatterCallback implements Function2<LintError, Boolean, Unit> {
@@ -63,14 +116,31 @@ public Unit invoke(LintError lint, Boolean corrected) {
 
 	@Override
 	public String applyWithFile(String unix, File file) throws Exception {
-		return KtLint.INSTANCE.format(new Params(
-				file.getName(),
-				unix,
-				rulesets,
-				userData,
-				formatterCallback,
-				isScript,
-				null,
-				false));
+
+		if (editorConfigOverride != null) {
+			// Use ExperimentalParams with EditorConfigOverride which requires KtLint 0.45.2
+			return KtLint.INSTANCE.format(new ExperimentalParams(
+					file.getName(),
+					unix,
+					rulesets,
+					userData,
+					formatterCallback,
+					isScript,
+					null,
+					false,
+					editorConfigOverride,
+					false));
+		} else {
+			// Use Params for backward compatibility
+			return KtLint.INSTANCE.format(new KtLint.Params(
+					file.getName(),
+					unix,
+					rulesets,
+					userData,
+					formatterCallback,
+					isScript,
+					null,
+					false));
+		}
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/BadSemver.java b/lib/src/main/java/com/diffplug/spotless/kotlin/BadSemver.java
index ae500e55b4..771c27eb3e 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/BadSemver.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/BadSemver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2021-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,13 +26,18 @@ protected static int version(String input) {
 		}
 		String major = matcher.group(1);
 		String minor = matcher.group(2);
-		return version(Integer.parseInt(major), Integer.parseInt(minor));
+		String patch = matcher.group(3);
+		return version(Integer.parseInt(major), Integer.parseInt(minor), patch != null ? Integer.parseInt(patch) : 0);
 	}
 
 	/** Ambiguous after 2147.483647.blah-blah */
+	protected static int version(int major, int minor, int patch) {
+		return major * 1_000_000 + minor * 1_000 + patch;
+	}
+
 	protected static int version(int major, int minor) {
-		return major * 1_000_000 + minor;
+		return version(major, minor, 0);
 	}
 
-	private static final Pattern BAD_SEMVER = Pattern.compile("(\\d+)\\.(\\d+)");
+	private static final Pattern BAD_SEMVER = Pattern.compile("(\\d+)\\.(\\d+)\\.*(\\d+)*");
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index de099b04d1..d58331ec1b 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -50,26 +50,29 @@ public static FormatterStep create(Provisioner provisioner) {
 	}
 
 	public static FormatterStep create(String version, Provisioner provisioner) {
-		return create(version, provisioner, false, Collections.emptyMap());
+		return create(version, provisioner, false, Collections.emptyMap(), Collections.emptyMap());
 	}
 
-	public static FormatterStep create(String version, Provisioner provisioner, boolean useExperimental, Map<String, String> userData) {
-		return create(version, provisioner, false, useExperimental, userData);
+	public static FormatterStep create(String version, Provisioner provisioner, boolean useExperimental,
+			Map<String, String> userData, Map<String, Object> editorConfigOverride) {
+		return create(version, provisioner, false, useExperimental, userData, editorConfigOverride);
 	}
 
 	public static FormatterStep createForScript(String version, Provisioner provisioner) {
-		return create(version, provisioner, true, false, Collections.emptyMap());
+		return create(version, provisioner, true, false, Collections.emptyMap(), Collections.emptyMap());
 	}
 
-	public static FormatterStep createForScript(String version, Provisioner provisioner, boolean useExperimental, Map<String, String> userData) {
-		return create(version, provisioner, true, useExperimental, userData);
+	public static FormatterStep createForScript(String version, Provisioner provisioner, boolean useExperimental,
+			Map<String, String> userData, Map<String, Object> editorConfigOverride) {
+		return create(version, provisioner, true, useExperimental, userData, editorConfigOverride);
 	}
 
-	private static FormatterStep create(String version, Provisioner provisioner, boolean isScript, boolean useExperimental, Map<String, String> userData) {
+	private static FormatterStep create(String version, Provisioner provisioner, boolean isScript, boolean useExperimental,
+			Map<String, String> userData, Map<String, Object> editorConfigOverride) {
 		Objects.requireNonNull(version, "version");
 		Objects.requireNonNull(provisioner, "provisioner");
 		return FormatterStep.createLazy(NAME,
-				() -> new State(version, provisioner, isScript, useExperimental, userData),
+				() -> new State(version, provisioner, isScript, useExperimental, userData, editorConfigOverride),
 				State::createFormat);
 	}
 
@@ -87,11 +90,20 @@ static final class State implements Serializable {
 		final JarState jarState;
 		private final boolean useExperimental;
 		private final TreeMap<String, String> userData;
+		private final TreeMap<String, Object> editorConfigOverride;
 		private final boolean useParams;
 
-		State(String version, Provisioner provisioner, boolean isScript, boolean useExperimental, Map<String, String> userData) throws IOException {
+		State(String version, Provisioner provisioner, boolean isScript, boolean useExperimental,
+				Map<String, String> userData, Map<String, Object> editorConfigOverride) throws IOException {
+
+			if (!editorConfigOverride.isEmpty() &&
+					BadSemver.version(version) < BadSemver.version(0, 45, 2)) {
+				throw new IllegalStateException("KtLint editorConfigOverride supported for version 0.45.2 and later");
+			}
+
 			this.useExperimental = useExperimental;
 			this.userData = new TreeMap<>(userData);
+			this.editorConfigOverride = new TreeMap<>(editorConfigOverride);
 			String coordinate;
 			if (BadSemver.version(version) < BadSemver.version(0, 32)) {
 				coordinate = MAVEN_COORDINATE_PRE_0_32;
@@ -108,8 +120,8 @@ static final class State implements Serializable {
 		FormatterFunc createFormat() throws Exception {
 			if (useParams) {
 				Class<?> formatterFunc = jarState.getClassLoader().loadClass("com.diffplug.spotless.glue.ktlint.KtlintFormatterFunc");
-				Constructor<?> constructor = formatterFunc.getConstructor(boolean.class, boolean.class, Map.class);
-				return (FormatterFunc.NeedsFile) constructor.newInstance(isScript, useExperimental, userData);
+				Constructor<?> constructor = formatterFunc.getConstructor(boolean.class, boolean.class, Map.class, Map.class);
+				return (FormatterFunc.NeedsFile) constructor.newInstance(isScript, useExperimental, userData, editorConfigOverride);
 			}
 
 			ClassLoader classLoader = jarState.getClassLoader();
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 72eb58cb2b..e7f1f92107 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -335,15 +335,18 @@ spotless {
 
 ### ktlint
 
-[homepage](https://github.com/pinterest/ktlint). [changelog](https://github.com/pinterest/ktlint/releases).  Spotless does not ([yet](https://github.com/diffplug/spotless/issues/142)) respect the `.editorconfig` settings ([ktlint docs](https://github.com/pinterest/ktlint#editorconfig)), but you can provide them manually as `userData`.
+[homepage](https://github.com/pinterest/ktlint). [changelog](https://github.com/pinterest/ktlint/releases).  Spotless does not ([yet](https://github.com/diffplug/spotless/issues/142)) respect the `.editorconfig` settings ([ktlint docs](https://github.com/pinterest/ktlint#editorconfig)), but you can provide them manually as `editorConfigOverride`.
 
 ```kotlin
 spotless {
   kotlin {
-    // version, setUseExperimental and userData are all optional
-    ktlint('0.43.2')
+    // version, setUseExperimental, userData and editorConfigOverride are all optional
+    ktlint("0.45.2")
       .setUseExperimental(true)
-      .userData(mapOf('indent_size' to '2', 'continuation_indent_size' to '2'))
+      .userData(mapOf("android" to "true"))
+      .editorConfigOverride(mapOf("indent_size" to 2))
+  }
+}
 ```
 
 ### diktat
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
index f7cb7a20f0..546efab46d 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
@@ -30,6 +30,7 @@
 import org.gradle.api.plugins.JavaPluginConvention;
 import org.gradle.api.tasks.SourceSet;
 
+import com.diffplug.common.collect.ImmutableSortedMap;
 import com.diffplug.spotless.FileSignature;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.kotlin.DiktatStep;
@@ -59,7 +60,7 @@ public LicenseHeaderConfig licenseHeaderFile(Object licenseHeaderFile) {
 	/** Adds the specified version of <a href="https://github.com/pinterest/ktlint">ktlint</a>. */
 	public KotlinFormatExtension ktlint(String version) {
 		Objects.requireNonNull(version);
-		return new KotlinFormatExtension(version, false, Collections.emptyMap());
+		return new KotlinFormatExtension(version, false, Collections.emptyMap(), Collections.emptyMap());
 	}
 
 	public KotlinFormatExtension ktlint() {
@@ -71,11 +72,14 @@ public class KotlinFormatExtension {
 		private final String version;
 		private boolean useExperimental;
 		private Map<String, String> userData;
+		private Map<String, Object> editorConfigOverride;
 
-		KotlinFormatExtension(String version, boolean useExperimental, Map<String, String> config) {
+		KotlinFormatExtension(String version, boolean useExperimental, Map<String, String> config,
+				Map<String, Object> editorConfigOverride) {
 			this.version = version;
 			this.useExperimental = useExperimental;
 			this.userData = config;
+			this.editorConfigOverride = editorConfigOverride;
 			addStep(createStep());
 		}
 
@@ -88,13 +92,21 @@ public KotlinFormatExtension setUseExperimental(boolean useExperimental) {
 		public KotlinFormatExtension userData(Map<String, String> userData) {
 			// Copy the map to a sorted map because up-to-date checking is based on binary-equals of the serialized
 			// representation.
-			this.userData = userData;
+			this.userData = ImmutableSortedMap.copyOf(userData);
+			replaceStep(createStep());
+			return this;
+		}
+
+		public KotlinFormatExtension editorConfigOverride(Map<String, Object> editorConfigOverride) {
+			// Copy the map to a sorted map because up-to-date checking is based on binary-equals of the serialized
+			// representation.
+			this.editorConfigOverride = ImmutableSortedMap.copyOf(editorConfigOverride);
 			replaceStep(createStep());
 			return this;
 		}
 
 		private FormatterStep createStep() {
-			return KtLintStep.create(version, provisioner(), useExperimental, userData);
+			return KtLintStep.create(version, provisioner(), useExperimental, userData, editorConfigOverride);
 		}
 	}
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
index 7a98c211bc..c1abe62bd1 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
@@ -45,7 +45,7 @@ public KotlinGradleExtension(SpotlessExtension spotless) {
 	/** Adds the specified version of <a href="https://github.com/pinterest/ktlint">ktlint</a>. */
 	public KotlinFormatExtension ktlint(String version) {
 		Objects.requireNonNull(version, "version");
-		return new KotlinFormatExtension(version, false, Collections.emptyMap());
+		return new KotlinFormatExtension(version, false, Collections.emptyMap(), Collections.emptyMap());
 	}
 
 	public KotlinFormatExtension ktlint() {
@@ -57,11 +57,14 @@ public class KotlinFormatExtension {
 		private final String version;
 		private boolean useExperimental;
 		private Map<String, String> userData;
+		private Map<String, Object> editorConfigOverride;
 
-		KotlinFormatExtension(String version, boolean useExperimental, Map<String, String> config) {
+		KotlinFormatExtension(String version, boolean useExperimental, Map<String, String> config,
+				Map<String, Object> editorConfigOverride) {
 			this.version = version;
 			this.useExperimental = useExperimental;
 			this.userData = config;
+			this.editorConfigOverride = editorConfigOverride;
 			addStep(createStep());
 		}
 
@@ -79,8 +82,16 @@ public KotlinFormatExtension userData(Map<String, String> userData) {
 			return this;
 		}
 
+		public KotlinFormatExtension editorConfigOverride(Map<String, Object> editorConfigOverride) {
+			// Copy the map to a sorted map because up-to-date checking is based on binary-equals of the serialized
+			// representation.
+			this.editorConfigOverride = ImmutableSortedMap.copyOf(editorConfigOverride);
+			replaceStep(createStep());
+			return this;
+		}
+
 		private FormatterStep createStep() {
-			return KtLintStep.createForScript(version, provisioner(), useExperimental, userData);
+			return KtLintStep.createForScript(version, provisioner(), useExperimental, userData, editorConfigOverride);
 		}
 	}
 
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
index f10be630ef..da2a604681 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
@@ -16,6 +16,7 @@
 package com.diffplug.gradle.spotless;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.condition.JRE.JAVA_11;
 
 import java.io.IOException;
@@ -175,6 +176,50 @@ void withExperimental_0_32() throws IOException {
 		assertFile("src/main/kotlin/basic.kt").sameAsResource("kotlin/ktlint/basic.clean");
 	}
 
+	@Test
+	void withExperimentalEditorConfigOverride() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    kotlin {",
+				"        ktlint().setUseExperimental(true)",
+				"            .editorConfigOverride([",
+				"        	    ij_kotlin_allow_trailing_comma: true,",
+				"        	    ij_kotlin_allow_trailing_comma_on_call_site: true",
+				"            ])",
+				"    }",
+				"}");
+		setFile("src/main/kotlin/experimental.kt").toResource("kotlin/ktlint/experimentalEditorConfigOverride.dirty");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("src/main/kotlin/experimental.kt").sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.clean");
+	}
+
+	@Test
+	void withEditorConfigOverride_0_45_1() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    kotlin {",
+				"        ktlint('0.45.1')",
+				"            .editorConfigOverride([",
+				"        	    indent_size: 5",
+				"            ])",
+				"    }",
+				"}");
+		setFile("src/main/kotlin/basic.kt").toResource("kotlin/ktlint/basic.dirty");
+		Throwable error = assertThrows(Throwable.class,
+				() -> gradleRunner().withArguments("spotlessApply").build());
+		assertThat(error).hasMessageContaining("KtLint editorConfigOverride supported for version 0.45.2 and later");
+	}
+
 	/**
 	 * Check that the sample used to verify the experimental ruleset is untouched by the default ruleset, to verify
 	 * that enabling the experimental ruleset is actually doing something.
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
index d1ffff0718..034174cf73 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
@@ -16,6 +16,7 @@
 package com.diffplug.gradle.spotless;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.condition.JRE.JAVA_11;
 
 import java.io.IOException;
@@ -137,13 +138,13 @@ void withExperimental() throws IOException {
 				"}",
 				"repositories { mavenCentral() }",
 				"spotless {",
-				"    kotlin {",
+				"    kotlinGradle {",
 				"        ktlint().setUseExperimental(true)",
 				"    }",
 				"}");
-		setFile("src/main/kotlin/experimental.kt").toResource("kotlin/ktlint/experimental.dirty");
+		setFile("configuration.gradle.kts").toResource("kotlin/ktlint/experimental.dirty");
 		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("src/main/kotlin/experimental.kt").sameAsResource("kotlin/ktlint/experimental.clean");
+		assertFile("configuration.gradle.kts").sameAsResource("kotlin/ktlint/experimental.clean");
 	}
 
 	@Test
@@ -155,13 +156,57 @@ void withExperimental_0_32() throws IOException {
 				"}",
 				"repositories { mavenCentral() }",
 				"spotless {",
-				"    kotlin {",
+				"    kotlinGradle {",
 				"        ktlint('0.32.0').setUseExperimental(true)",
 				"    }",
 				"}");
-		setFile("src/main/kotlin/basic.kt").toResource("kotlin/ktlint/basic.dirty");
+		setFile("configuration.gradle.kts").toResource("kotlin/ktlint/basic.dirty");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("configuration.gradle.kts").sameAsResource("kotlin/ktlint/basic.clean");
+	}
+
+	@Test
+	void withExperimentalEditorConfigOverride() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    kotlinGradle {",
+				"        ktlint().setUseExperimental(true)",
+				"            .editorConfigOverride([",
+				"        	    ij_kotlin_allow_trailing_comma: true,",
+				"        	    ij_kotlin_allow_trailing_comma_on_call_site: true",
+				"            ])",
+				"    }",
+				"}");
+		setFile("configuration.gradle.kts").toResource("kotlin/ktlint/experimentalEditorConfigOverride.dirty");
 		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("src/main/kotlin/basic.kt").sameAsResource("kotlin/ktlint/basic.clean");
+		assertFile("configuration.gradle.kts").sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.clean");
+	}
+
+	@Test
+	void withEditorConfigOverride_0_45_1() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    kotlinGradle {",
+				"        ktlint('0.45.1')",
+				"            .editorConfigOverride([",
+				"        	    indent_size: 5",
+				"            ])",
+				"    }",
+				"}");
+		setFile("configuration.gradle.kts").toResource("kotlin/ktlint/basic.dirty");
+		Throwable error = assertThrows(Throwable.class,
+				() -> gradleRunner().withArguments("spotlessApply").build());
+		assertThat(error).hasMessageContaining("KtLint editorConfigOverride supported for version 0.45.2 and later");
 	}
 
 	/**
@@ -180,13 +225,13 @@ void experimentalSampleUnchangedWithDefaultRuleset() throws IOException {
 				"}",
 				"repositories { mavenCentral() }",
 				"spotless {",
-				"    kotlin {",
+				"    kotlinGradle {",
 				"        ktlint()",
 				"    }",
 				"}");
-		setFile("src/main/kotlin/experimental.kt").toResource("kotlin/ktlint/experimental.dirty");
+		setFile("configuration.gradle.kts").toResource("kotlin/ktlint/experimental.dirty");
 		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("src/main/kotlin/experimental.kt").sameAsResource("kotlin/ktlint/experimental.dirty");
+		assertFile("configuration.gradle.kts").sameAsResource("kotlin/ktlint/experimental.dirty");
 	}
 
 	@Test
diff --git a/testlib/src/main/resources/kotlin/ktlint/experimentalEditorConfigOverride.clean b/testlib/src/main/resources/kotlin/ktlint/experimentalEditorConfigOverride.clean
new file mode 100644
index 0000000000..532177d038
--- /dev/null
+++ b/testlib/src/main/resources/kotlin/ktlint/experimentalEditorConfigOverride.clean
@@ -0,0 +1,5 @@
+fun main() {
+    val list = listOf(
+        "hello",
+    )
+}
diff --git a/testlib/src/main/resources/kotlin/ktlint/experimentalEditorConfigOverride.dirty b/testlib/src/main/resources/kotlin/ktlint/experimentalEditorConfigOverride.dirty
new file mode 100644
index 0000000000..1610d6ba6d
--- /dev/null
+++ b/testlib/src/main/resources/kotlin/ktlint/experimentalEditorConfigOverride.dirty
@@ -0,0 +1,5 @@
+fun main() {
+    val list = listOf(
+        "hello"
+    )
+}
diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
index ecca9e6cc6..af61ac4cd0 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
@@ -77,6 +77,13 @@ void worksAlpha1() throws Exception {
 				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean");
 	}
 
+	@Test
+	void worksPre0_45_2() throws Exception {
+		FormatterStep step = KtLintStep.create("0.45.1", TestProvisioner.mavenCentral());
+		StepHarness.forStep(step)
+				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean");
+	}
+
 	@Test
 	void equality() throws Exception {
 		new SerializableEqualityTester() {

From 1978504080cf3362a4544709d86e4b7674388846 Mon Sep 17 00:00:00 2001
From: Marek Hlava <mh@cardlay.com>
Date: Sat, 21 May 2022 20:54:19 +0200
Subject: [PATCH 0162/2068] Update changelog

---
 CHANGES.md               | 2 ++
 plugin-gradle/CHANGES.md | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 8d2011de17..9b0f9ae0ea 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,6 +11,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 
+* Add support for `editorConfigOverride` in `ktlint`. ([#1218](https://github.com/diffplug/spotless/pull/1218) fixes [#1193](https://github.com/diffplug/spotless/issues/1193))
+
 ## [2.25.3] - 2022-05-10
 ### Fixed
 * Update the `black` version regex to fix `19.10b0` and earlier. (fixes [#1195](https://github.com/diffplug/spotless/issues/1195), regression introduced in `2.25.0`)
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index e67e6546bb..06c8988425 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -4,6 +4,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 
+* Add support for `editorConfigOverride` in `ktlint`. ([#1218](https://github.com/diffplug/spotless/pull/1218) fixes [#1193](https://github.com/diffplug/spotless/issues/1193))
+
 ## [6.6.1] - 2022-05-13
 ### Fixed
 * More daemon memory consumption fixes ([#1206](https://github.com/diffplug/spotless/pull/1198) fixes [#1194](https://github.com/diffplug/spotless/issues/1194))

From aa9e37a4a35e96348ae079e923e837adcfa27a8b Mon Sep 17 00:00:00 2001
From: tison <wander4096@gmail.com>
Date: Wed, 1 Jun 2022 23:45:16 +0800
Subject: [PATCH 0163/2068] Open com.sun.tools.javac modules on JDK 16+

Signed-off-by: tison <wander4096@gmail.com>
---
 .../main/java/com/diffplug/spotless/Jvm.java  |   3 +
 .../com/diffplug/spotless/ModuleHelper.java   | 136 ++++++++++++++++++
 2 files changed, 139 insertions(+)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/ModuleHelper.java

diff --git a/lib/src/main/java/com/diffplug/spotless/Jvm.java b/lib/src/main/java/com/diffplug/spotless/Jvm.java
index e22e0c6339..8d7482cb61 100644
--- a/lib/src/main/java/com/diffplug/spotless/Jvm.java
+++ b/lib/src/main/java/com/diffplug/spotless/Jvm.java
@@ -48,6 +48,9 @@ public final class Jvm {
 			if (VERSION <= 8) {
 				throw new IllegalArgumentException("Expected " + jre + " to start with an integer greater than 8");
 			}
+			if (VERSION >= 16) {
+				ModuleHelper.doOpenInternalPackagesIfRequired();
+			}
 		}
 	}
 
diff --git a/lib/src/main/java/com/diffplug/spotless/ModuleHelper.java b/lib/src/main/java/com/diffplug/spotless/ModuleHelper.java
new file mode 100644
index 0000000000..d4895afd20
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/ModuleHelper.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2016-2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.diffplug.spotless;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Nullable;
+
+import sun.misc.Unsafe;
+
+public final class ModuleHelper {
+	private static final Map<String, String> REQUIRED_PACKAGES_TO_TEST_CLASSES = new HashMap<>();
+
+	static {
+		REQUIRED_PACKAGES_TO_TEST_CLASSES.putIfAbsent("com.sun.tools.javac.util", "Context");
+		REQUIRED_PACKAGES_TO_TEST_CLASSES.putIfAbsent("com.sun.tools.javac.file", "CacheFSInfo");
+		REQUIRED_PACKAGES_TO_TEST_CLASSES.putIfAbsent("com.sun.tools.javac.tree", "TreeTranslator");
+		REQUIRED_PACKAGES_TO_TEST_CLASSES.putIfAbsent("com.sun.tools.javac.main", "CommandLine");
+		REQUIRED_PACKAGES_TO_TEST_CLASSES.putIfAbsent("com.sun.tools.javac.jvm", "ClassFile");
+		REQUIRED_PACKAGES_TO_TEST_CLASSES.putIfAbsent("com.sun.tools.javac.parser", "Tokens$TokenKind");
+		REQUIRED_PACKAGES_TO_TEST_CLASSES.putIfAbsent("com.sun.tools.javac.code", "Source");
+		REQUIRED_PACKAGES_TO_TEST_CLASSES.putIfAbsent("com.sun.tools.javac.processing", "PrintingProcessor");
+		REQUIRED_PACKAGES_TO_TEST_CLASSES.putIfAbsent("com.sun.tools.javac.comp", "AttrContext");
+		REQUIRED_PACKAGES_TO_TEST_CLASSES.putIfAbsent("com.sun.tools.javac.api", "DiagnosticFormatter$PositionKind");
+	}
+
+	private static boolean checkDone = false;
+
+	public static synchronized void doOpenInternalPackagesIfRequired() {
+		if (checkDone) {
+			return;
+		}
+		try {
+			checkDone = true;
+			final List<String> unavailableRequiredPackages = unavailableRequiredPackages();
+			if (!unavailableRequiredPackages.isEmpty()) {
+				openPackages(unavailableRequiredPackages);
+				final List<String> failedToOpen = unavailableRequiredPackages();
+				if (!failedToOpen.isEmpty()) {
+					final StringBuilder message = new StringBuilder();
+					message.append("WARNING: Some required internal classes are unavailable. Please consider adding the following JVM arguments\n");
+					message.append("WARNING: ");
+					for (String name: failedToOpen) {
+						message.append(String.format("--add-opens jdk.compiler/%s=ALL-UNNAMED", name));
+					}
+					System.err.println(message);
+				}
+			}
+		} catch (Throwable e) {
+			System.err.println("WARNING: Failed to check for unavailable JDK packages. Reason: " + e.getMessage());
+		}
+	}
+
+	private static List<String> unavailableRequiredPackages() {
+		final List<String> packages = new ArrayList<>();
+		for (Map.Entry<String, String> e : REQUIRED_PACKAGES_TO_TEST_CLASSES.entrySet()) {
+			final String key = e.getKey();
+			final String value = e.getValue();
+			try {
+				final Class<?> clazz = Class.forName(key + "." + value);
+				if (clazz.isEnum()) {
+					clazz.getMethod("values").invoke(null);
+				} else {
+					clazz.getDeclaredConstructor().newInstance();
+				}
+			} catch (IllegalAccessException ex) {
+				packages.add(key);
+			} catch (Exception ignore) {
+				// in old versions of JDK some classes could be unavailable
+			}
+		}
+		return packages;
+	}
+
+	@SuppressWarnings("unchecked")
+	private static void openPackages(Collection<String> packagesToOpen) throws Throwable {
+		final Collection<?> modules = allModules();
+		if (modules == null) {
+			return;
+		}
+		final Unsafe unsafe = Unsafe.getUnsafe();
+		final Field implLookupField = MethodHandles.Lookup.class.getDeclaredField("IMPL_LOOKUP");
+		final MethodHandles.Lookup lookup = (MethodHandles.Lookup) unsafe.getObject(
+			unsafe.staticFieldBase(implLookupField),
+			unsafe.staticFieldOffset(implLookupField));
+		final MethodHandle modifiers = lookup.findSetter(Method.class, "modifiers", Integer.TYPE);
+		final Method exportMethod = Class.forName("java.lang.Module").getDeclaredMethod("implAddOpens", String.class);
+		modifiers.invokeExact(exportMethod, Modifier.PUBLIC);
+		for (Object module : modules) {
+			final Collection<String> packages = (Collection<String>) module.getClass().getMethod("getPackages").invoke(module);
+			for (String name : packages) {
+				if (packagesToOpen.contains(name)) {
+					exportMethod.invoke(module, name);
+				}
+			}
+		}
+	}
+
+	@Nullable
+	// calling ModuleLayer.boot().modules() by reflection
+	private static Collection<?> allModules() {
+		try {
+			final Object boot = Class.forName("java.lang.ModuleLayer").getMethod("boot").invoke(null);
+			if (boot == null) {
+				return null;
+			}
+			final Object modules = boot.getClass().getMethod("modules").invoke(boot);
+			return (Collection<?>) modules;
+		} catch (Exception ignore) {
+			return null;
+		}
+	}
+}

From 81ce19b2841f74f9c31ce4b68e2aef42eba4a27f Mon Sep 17 00:00:00 2001
From: tison <wander4096@gmail.com>
Date: Wed, 1 Jun 2022 23:46:27 +0800
Subject: [PATCH 0164/2068] remove unrelated modules

Signed-off-by: tison <wander4096@gmail.com>
---
 lib/src/main/java/com/diffplug/spotless/ModuleHelper.java | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/ModuleHelper.java b/lib/src/main/java/com/diffplug/spotless/ModuleHelper.java
index d4895afd20..a81be46442 100644
--- a/lib/src/main/java/com/diffplug/spotless/ModuleHelper.java
+++ b/lib/src/main/java/com/diffplug/spotless/ModuleHelper.java
@@ -38,12 +38,7 @@ public final class ModuleHelper {
 		REQUIRED_PACKAGES_TO_TEST_CLASSES.putIfAbsent("com.sun.tools.javac.util", "Context");
 		REQUIRED_PACKAGES_TO_TEST_CLASSES.putIfAbsent("com.sun.tools.javac.file", "CacheFSInfo");
 		REQUIRED_PACKAGES_TO_TEST_CLASSES.putIfAbsent("com.sun.tools.javac.tree", "TreeTranslator");
-		REQUIRED_PACKAGES_TO_TEST_CLASSES.putIfAbsent("com.sun.tools.javac.main", "CommandLine");
-		REQUIRED_PACKAGES_TO_TEST_CLASSES.putIfAbsent("com.sun.tools.javac.jvm", "ClassFile");
 		REQUIRED_PACKAGES_TO_TEST_CLASSES.putIfAbsent("com.sun.tools.javac.parser", "Tokens$TokenKind");
-		REQUIRED_PACKAGES_TO_TEST_CLASSES.putIfAbsent("com.sun.tools.javac.code", "Source");
-		REQUIRED_PACKAGES_TO_TEST_CLASSES.putIfAbsent("com.sun.tools.javac.processing", "PrintingProcessor");
-		REQUIRED_PACKAGES_TO_TEST_CLASSES.putIfAbsent("com.sun.tools.javac.comp", "AttrContext");
 		REQUIRED_PACKAGES_TO_TEST_CLASSES.putIfAbsent("com.sun.tools.javac.api", "DiagnosticFormatter$PositionKind");
 	}
 

From 31d5791aac07f282064776b064666e1355de0a61 Mon Sep 17 00:00:00 2001
From: tison <wander4096@gmail.com>
Date: Thu, 2 Jun 2022 00:39:47 +0800
Subject: [PATCH 0165/2068] run spotlessApply

Signed-off-by: tison <wander4096@gmail.com>
---
 lib/src/main/java/com/diffplug/spotless/Jvm.java          | 2 +-
 lib/src/main/java/com/diffplug/spotless/ModuleHelper.java | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/Jvm.java b/lib/src/main/java/com/diffplug/spotless/Jvm.java
index 8d7482cb61..7756ffa917 100644
--- a/lib/src/main/java/com/diffplug/spotless/Jvm.java
+++ b/lib/src/main/java/com/diffplug/spotless/Jvm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/main/java/com/diffplug/spotless/ModuleHelper.java b/lib/src/main/java/com/diffplug/spotless/ModuleHelper.java
index a81be46442..0ccd3c8c15 100644
--- a/lib/src/main/java/com/diffplug/spotless/ModuleHelper.java
+++ b/lib/src/main/java/com/diffplug/spotless/ModuleHelper.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.diffplug.spotless;
 
 import java.lang.invoke.MethodHandle;
@@ -58,7 +57,7 @@ public static synchronized void doOpenInternalPackagesIfRequired() {
 					final StringBuilder message = new StringBuilder();
 					message.append("WARNING: Some required internal classes are unavailable. Please consider adding the following JVM arguments\n");
 					message.append("WARNING: ");
-					for (String name: failedToOpen) {
+					for (String name : failedToOpen) {
 						message.append(String.format("--add-opens jdk.compiler/%s=ALL-UNNAMED", name));
 					}
 					System.err.println(message);
@@ -99,8 +98,8 @@ private static void openPackages(Collection<String> packagesToOpen) throws Throw
 		final Unsafe unsafe = Unsafe.getUnsafe();
 		final Field implLookupField = MethodHandles.Lookup.class.getDeclaredField("IMPL_LOOKUP");
 		final MethodHandles.Lookup lookup = (MethodHandles.Lookup) unsafe.getObject(
-			unsafe.staticFieldBase(implLookupField),
-			unsafe.staticFieldOffset(implLookupField));
+				unsafe.staticFieldBase(implLookupField),
+				unsafe.staticFieldOffset(implLookupField));
 		final MethodHandle modifiers = lookup.findSetter(Method.class, "modifiers", Integer.TYPE);
 		final Method exportMethod = Class.forName("java.lang.Module").getDeclaredMethod("implAddOpens", String.class);
 		modifiers.invokeExact(exportMethod, Modifier.PUBLIC);

From 2033c6ab7cc570f7fedcb83af4647eac31dfee60 Mon Sep 17 00:00:00 2001
From: tison <wander4096@gmail.com>
Date: Thu, 2 Jun 2022 07:31:39 +0800
Subject: [PATCH 0166/2068] SuppressFBWarnings REC_CATCH_EXCEPTION

Signed-off-by: tison <wander4096@gmail.com>
---
 lib/src/main/java/com/diffplug/spotless/ModuleHelper.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/ModuleHelper.java b/lib/src/main/java/com/diffplug/spotless/ModuleHelper.java
index 0ccd3c8c15..0ab4f95540 100644
--- a/lib/src/main/java/com/diffplug/spotless/ModuleHelper.java
+++ b/lib/src/main/java/com/diffplug/spotless/ModuleHelper.java
@@ -28,6 +28,7 @@
 
 import javax.annotation.Nullable;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import sun.misc.Unsafe;
 
 public final class ModuleHelper {
@@ -68,6 +69,7 @@ public static synchronized void doOpenInternalPackagesIfRequired() {
 		}
 	}
 
+	@SuppressFBWarnings("REC_CATCH_EXCEPTION") // workaround JDK11
 	private static List<String> unavailableRequiredPackages() {
 		final List<String> packages = new ArrayList<>();
 		for (Map.Entry<String, String> e : REQUIRED_PACKAGES_TO_TEST_CLASSES.entrySet()) {
@@ -114,8 +116,9 @@ private static void openPackages(Collection<String> packagesToOpen) throws Throw
 	}
 
 	@Nullable
-	// calling ModuleLayer.boot().modules() by reflection
+	@SuppressFBWarnings("REC_CATCH_EXCEPTION") // workaround JDK11
 	private static Collection<?> allModules() {
+		// calling ModuleLayer.boot().modules() by reflection
 		try {
 			final Object boot = Class.forName("java.lang.ModuleLayer").getMethod("boot").invoke(null);
 			if (boot == null) {

From 7474c2544849ebc3c1a15a49548122de0da776ca Mon Sep 17 00:00:00 2001
From: tison <wander4096@gmail.com>
Date: Thu, 2 Jun 2022 23:20:18 +0800
Subject: [PATCH 0167/2068] Update CHANGES files

Signed-off-by: tison <wander4096@gmail.com>
---
 CHANGES.md               | 2 ++
 plugin-gradle/CHANGES.md | 2 ++
 plugin-maven/CHANGES.md  | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 8d2011de17..a5b391e794 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* google-java-format works on JDK16+ without jvm args workaround. ([#1224](https://github.com/diffplug/spotless/pull/1224))
 
 ## [2.25.3] - 2022-05-10
 ### Fixed
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index e67e6546bb..ad048e0a52 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Fixed
+* google-java-format works on JDK16+ without jvm args workaround. ([#1224](https://github.com/diffplug/spotless/pull/1224))
 
 ## [6.6.1] - 2022-05-13
 ### Fixed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index a0dbcc1d97..85094381e2 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* google-java-format works on JDK16+ without jvm args workaround. ([#1224](https://github.com/diffplug/spotless/pull/1224))
 
 ## [2.22.5] - 2022-05-10
 ### Fixed

From 2631a3f276b0350c360ea92eec553e1a8780f5ea Mon Sep 17 00:00:00 2001
From: tison <wander4096@gmail.com>
Date: Thu, 2 Jun 2022 23:34:18 +0800
Subject: [PATCH 0168/2068] only doOpenInternalPackagesIfRequired when
 GoogleJavaFormatStep is relevant

Signed-off-by: tison <wander4096@gmail.com>
---
 lib/src/main/java/com/diffplug/spotless/Jvm.java           | 3 ---
 .../com/diffplug/spotless/java/GoogleJavaFormatStep.java   | 1 +
 .../com/diffplug/spotless/{ => java}/ModuleHelper.java     | 7 +++++--
 3 files changed, 6 insertions(+), 5 deletions(-)
 rename lib/src/main/java/com/diffplug/spotless/{ => java}/ModuleHelper.java (97%)

diff --git a/lib/src/main/java/com/diffplug/spotless/Jvm.java b/lib/src/main/java/com/diffplug/spotless/Jvm.java
index 7756ffa917..14686c1e4c 100644
--- a/lib/src/main/java/com/diffplug/spotless/Jvm.java
+++ b/lib/src/main/java/com/diffplug/spotless/Jvm.java
@@ -48,9 +48,6 @@ public final class Jvm {
 			if (VERSION <= 8) {
 				throw new IllegalArgumentException("Expected " + jre + " to start with an integer greater than 8");
 			}
-			if (VERSION >= 16) {
-				ModuleHelper.doOpenInternalPackagesIfRequired();
-			}
 		}
 	}
 
diff --git a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
index 6aec20c891..6390c619a9 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
@@ -136,6 +136,7 @@ static final class State implements Serializable {
 
 		State(String stepName, String groupArtifact, String version, String style, Provisioner provisioner, boolean reflowLongStrings) throws Exception {
 			JVM_SUPPORT.assertFormatterSupported(version);
+			ModuleHelper.doOpenInternalPackagesIfRequired();
 			this.jarState = JarState.from(groupArtifact + ":" + version, provisioner);
 			this.stepName = stepName;
 			this.version = version;
diff --git a/lib/src/main/java/com/diffplug/spotless/ModuleHelper.java b/lib/src/main/java/com/diffplug/spotless/java/ModuleHelper.java
similarity index 97%
rename from lib/src/main/java/com/diffplug/spotless/ModuleHelper.java
rename to lib/src/main/java/com/diffplug/spotless/java/ModuleHelper.java
index 0ab4f95540..274b33d09f 100644
--- a/lib/src/main/java/com/diffplug/spotless/ModuleHelper.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/ModuleHelper.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.diffplug.spotless;
+package com.diffplug.spotless.java;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -31,7 +31,10 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import sun.misc.Unsafe;
 
-public final class ModuleHelper {
+final class ModuleHelper {
+	// prevent direct instantiation
+	private ModuleHelper() {}
+
 	private static final Map<String, String> REQUIRED_PACKAGES_TO_TEST_CLASSES = new HashMap<>();
 
 	static {

From 75616a06dc75c1bce8683d299cb0bce181ef08d8 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sat, 4 Jun 2022 17:05:28 -0700
Subject: [PATCH 0169/2068] Update changelog.

---
 CHANGES.md               | 4 ++--
 plugin-gradle/CHANGES.md | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 9b0f9ae0ea..0a3351fe91 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,8 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
-
-* Add support for `editorConfigOverride` in `ktlint`. ([#1218](https://github.com/diffplug/spotless/pull/1218) fixes [#1193](https://github.com/diffplug/spotless/issues/1193))
+### Added
+* Support for `editorConfigOverride` in `ktlint`. ([#1218](https://github.com/diffplug/spotless/pull/1218) fixes [#1193](https://github.com/diffplug/spotless/issues/1193))
 
 ## [2.25.3] - 2022-05-10
 ### Fixed
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 06c8988425..0732a18cee 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,8 +3,9 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
-
-* Add support for `editorConfigOverride` in `ktlint`. ([#1218](https://github.com/diffplug/spotless/pull/1218) fixes [#1193](https://github.com/diffplug/spotless/issues/1193))
+### Added
+* Support for `editorConfigOverride` in `ktlint`. ([#1218](https://github.com/diffplug/spotless/pull/1218) fixes [#1193](https://github.com/diffplug/spotless/issues/1193))
+  * If you are using properties like `indent_size`, you should pass now pass them as `editorConfigOverride` and not as `userData`.
 
 ## [6.6.1] - 2022-05-13
 ### Fixed

From b3fc6bc069f39cda48ff4d2144981acdb5358e8c Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sat, 4 Jun 2022 18:56:54 -0700
Subject: [PATCH 0170/2068] Only run ModuleHelper for JVM >= 16.

---
 .../main/java/com/diffplug/spotless/java/ModuleHelper.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/ModuleHelper.java b/lib/src/main/java/com/diffplug/spotless/java/ModuleHelper.java
index 274b33d09f..68a2a181d0 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/ModuleHelper.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/ModuleHelper.java
@@ -28,6 +28,8 @@
 
 import javax.annotation.Nullable;
 
+import com.diffplug.spotless.Jvm;
+
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import sun.misc.Unsafe;
 
@@ -48,7 +50,7 @@ private ModuleHelper() {}
 	private static boolean checkDone = false;
 
 	public static synchronized void doOpenInternalPackagesIfRequired() {
-		if (checkDone) {
+		if (Jvm.version() < 16 || checkDone) {
 			return;
 		}
 		try {

From bd8341772ad31305538de09458d51517a278c310 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sat, 4 Jun 2022 18:57:45 -0700
Subject: [PATCH 0171/2068] Improve the maven changelog entry.

---
 plugin-maven/CHANGES.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 85094381e2..01cf26bcbd 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -4,7 +4,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Fixed
-* google-java-format works on JDK16+ without jvm args workaround. ([#1224](https://github.com/diffplug/spotless/pull/1224))
+* `googleJavaFormat` and `removeUnusedImports` works on JDK16+ without jvm args workaround. ([#1224](https://github.com/diffplug/spotless/pull/1224))
+  * If you have a bunch of `--add-exports` calls in `MAVEN_OPTS` or `.mvn/jvm.config`, you should be able to remove them. (fixes [#834](https://github.com/diffplug/spotless/issues/834#issuecomment-817524058))
 
 ## [2.22.5] - 2022-05-10
 ### Fixed

From be40828864870b75aca974dd890e188a04dc2f8b Mon Sep 17 00:00:00 2001
From: circleci <circleci@fff0d73da0f1>
Date: Sun, 5 Jun 2022 16:03:45 +0000
Subject: [PATCH 0172/2068] Published lib/2.26.0

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index df4135c4bd..1837866009 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.26.0] - 2022-06-05
 ### Added
 * Support for `editorConfigOverride` in `ktlint`. ([#1218](https://github.com/diffplug/spotless/pull/1218) fixes [#1193](https://github.com/diffplug/spotless/issues/1193))
 ### Fixed

From 9ca9917405961933a934a175c39501dba6652f63 Mon Sep 17 00:00:00 2001
From: circleci <circleci@fff0d73da0f1>
Date: Sun, 5 Jun 2022 16:04:33 +0000
Subject: [PATCH 0173/2068] Published gradle/6.7.0

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 46 ++++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index edbbf11915..0e7d6d6267 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [6.7.0] - 2022-06-05
 ### Added
 * Support for `editorConfigOverride` in `ktlint`. ([#1218](https://github.com/diffplug/spotless/pull/1218) fixes [#1193](https://github.com/diffplug/spotless/issues/1193))
   * If you are using properties like `indent_size`, you should pass now pass them as `editorConfigOverride` and not as `userData`.
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index e7f1f92107..ab5204d99f 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -18,9 +18,9 @@ output = [
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
 [![Maven central](https://img.shields.io/badge/mavencentral-yes-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/index.html)
 [![License Apache](https://img.shields.io/badge/license-apache-blue.svg)](https://tldrlegal.com/license/apache-license-2.0-(apache-2.0))
-[![Changelog](https://img.shields.io/badge/changelog-6.6.1-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-6.7.0-blue.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)
@@ -126,10 +126,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -141,7 +141,7 @@ If you're stuck on an older version of Gradle, `id 'com.diffplug.gradle.spotless
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -248,8 +248,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -300,8 +300,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -364,7 +364,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -396,7 +396,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -428,7 +428,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -462,7 +462,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -483,7 +483,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -508,7 +508,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -548,7 +548,7 @@ sql.formatter.indent.size=4
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -591,7 +591,7 @@ For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#n
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -816,7 +816,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -883,9 +883,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -918,11 +918,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.1/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From 2a0f65add24c25239bc526a6ccf1496a4c3f8ba1 Mon Sep 17 00:00:00 2001
From: circleci <circleci@fff0d73da0f1>
Date: Sun, 5 Jun 2022 16:06:20 +0000
Subject: [PATCH 0174/2068] Published maven/2.22.6

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 01cf26bcbd..e5fcb0e6d2 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.22.6] - 2022-06-05
 ### Fixed
 * `googleJavaFormat` and `removeUnusedImports` works on JDK16+ without jvm args workaround. ([#1224](https://github.com/diffplug/spotless/pull/1224))
   * If you have a bunch of `--add-exports` calls in `MAVEN_OPTS` or `.mvn/jvm.config`, you should be able to remove them. (fixes [#834](https://github.com/diffplug/spotless/issues/834#issuecomment-817524058))
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 3486a37255..50e0a5ed99 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -12,8 +12,8 @@ output = [
   ].join('\n');
 -->
 [![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.22.5/index.html)
-[![Changelog](https://img.shields.io/badge/changelog-2.22.5-brightgreen.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.22.6/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.22.6-brightgreen.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)

From 3cc562682d7ab810672fce6d222cf5cf2bbabd5f Mon Sep 17 00:00:00 2001
From: tison <wander4096@gmail.com>
Date: Fri, 3 Jun 2022 00:14:13 +0800
Subject: [PATCH 0175/2068] get theUnsafe by reflection

Signed-off-by: tison <wander4096@gmail.com>
---
 .../main/java/com/diffplug/spotless/java/ModuleHelper.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/ModuleHelper.java b/lib/src/main/java/com/diffplug/spotless/java/ModuleHelper.java
index 68a2a181d0..415c58d69b 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/ModuleHelper.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/ModuleHelper.java
@@ -102,7 +102,9 @@ private static void openPackages(Collection<String> packagesToOpen) throws Throw
 		if (modules == null) {
 			return;
 		}
-		final Unsafe unsafe = Unsafe.getUnsafe();
+		final Field unsafeField = Unsafe.class.getDeclaredField("theUnsafe");
+		unsafeField.setAccessible(true);
+		final Unsafe unsafe = (Unsafe) unsafeField.get(null);
 		final Field implLookupField = MethodHandles.Lookup.class.getDeclaredField("IMPL_LOOKUP");
 		final MethodHandles.Lookup lookup = (MethodHandles.Lookup) unsafe.getObject(
 				unsafe.staticFieldBase(implLookupField),

From 6f98128680b715e7210e58faa11ba4b95bbc6f88 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 9 Jun 2022 17:01:19 -0700
Subject: [PATCH 0176/2068] Update changelogs.

---
 CHANGES.md               | 2 ++
 plugin-gradle/CHANGES.md | 3 +++
 plugin-maven/CHANGES.md  | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 1837866009..d8090f8079 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* (Second try) `googleJavaFormat` and `removeUnusedImports` works on JDK16+ without jvm args workaround. ([#1228](https://github.com/diffplug/spotless/pull/1228))
 
 ## [2.26.0] - 2022-06-05
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 0e7d6d6267..392633e7c8 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,9 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Fixed
+* (Second try) `googleJavaFormat` and `removeUnusedImports` works on JDK16+ without jvm args workaround. ([#1228](https://github.com/diffplug/spotless/pull/1228))
+  * If you have a bunch of `--add-exports` calls in your `org.gradle.jvmargs` property in `gradle.properties`, you should be able to remove them. (fixes [#834](https://github.com/diffplug/spotless/issues/834#issuecomment-819118761))
 
 ## [6.7.0] - 2022-06-05
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index e5fcb0e6d2..2fa38baba8 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,9 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* (Second try) `googleJavaFormat` and `removeUnusedImports` works on JDK16+ without jvm args workaround. ([#1228](https://github.com/diffplug/spotless/pull/1228))
+  * If you have a bunch of `--add-exports` calls in `MAVEN_OPTS` or `.mvn/jvm.config`, you should be able to remove them. (fixes [#834](https://github.com/diffplug/spotless/issues/834#issuecomment-817524058))
 
 ## [2.22.6] - 2022-06-05
 ### Fixed

From 78281ed89a7d1c3c596f9e06eea3b301ccb86530 Mon Sep 17 00:00:00 2001
From: circleci <circleci@b6e21e31939c>
Date: Fri, 10 Jun 2022 17:50:07 +0000
Subject: [PATCH 0177/2068] Published lib/2.26.1

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index d8090f8079..ea675ade27 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.26.1] - 2022-06-10
 ### Fixed
 * (Second try) `googleJavaFormat` and `removeUnusedImports` works on JDK16+ without jvm args workaround. ([#1228](https://github.com/diffplug/spotless/pull/1228))
 

From b6a18ffa8c5089ba5eabc5e0898f1cdd103de49a Mon Sep 17 00:00:00 2001
From: circleci <circleci@b6e21e31939c>
Date: Fri, 10 Jun 2022 17:51:06 +0000
Subject: [PATCH 0178/2068] Published gradle/6.7.1

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 46 ++++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 392633e7c8..a13fedf837 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [6.7.1] - 2022-06-10
 ### Fixed
 * (Second try) `googleJavaFormat` and `removeUnusedImports` works on JDK16+ without jvm args workaround. ([#1228](https://github.com/diffplug/spotless/pull/1228))
   * If you have a bunch of `--add-exports` calls in your `org.gradle.jvmargs` property in `gradle.properties`, you should be able to remove them. (fixes [#834](https://github.com/diffplug/spotless/issues/834#issuecomment-819118761))
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index ab5204d99f..291d0cf027 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -18,9 +18,9 @@ output = [
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
 [![Maven central](https://img.shields.io/badge/mavencentral-yes-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/index.html)
 [![License Apache](https://img.shields.io/badge/license-apache-blue.svg)](https://tldrlegal.com/license/apache-license-2.0-(apache-2.0))
-[![Changelog](https://img.shields.io/badge/changelog-6.7.0-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-6.7.1-blue.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)
@@ -126,10 +126,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -141,7 +141,7 @@ If you're stuck on an older version of Gradle, `id 'com.diffplug.gradle.spotless
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -248,8 +248,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -300,8 +300,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -364,7 +364,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -396,7 +396,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -428,7 +428,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -462,7 +462,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -483,7 +483,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -508,7 +508,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -548,7 +548,7 @@ sql.formatter.indent.size=4
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -591,7 +591,7 @@ For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#n
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -816,7 +816,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -883,9 +883,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -918,11 +918,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From 000aab1ec90bbfc6363e15ba45b6beb702d8c18a Mon Sep 17 00:00:00 2001
From: circleci <circleci@b6e21e31939c>
Date: Fri, 10 Jun 2022 17:52:36 +0000
Subject: [PATCH 0179/2068] Published maven/2.22.7

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 2fa38baba8..0f32859cab 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.22.7] - 2022-06-10
 ### Fixed
 * (Second try) `googleJavaFormat` and `removeUnusedImports` works on JDK16+ without jvm args workaround. ([#1228](https://github.com/diffplug/spotless/pull/1228))
   * If you have a bunch of `--add-exports` calls in `MAVEN_OPTS` or `.mvn/jvm.config`, you should be able to remove them. (fixes [#834](https://github.com/diffplug/spotless/issues/834#issuecomment-817524058))
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 50e0a5ed99..2795cc1629 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -12,8 +12,8 @@ output = [
   ].join('\n');
 -->
 [![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.22.6/index.html)
-[![Changelog](https://img.shields.io/badge/changelog-2.22.6-brightgreen.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.22.7/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.22.7-brightgreen.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)

From be18ed0274766d4ca45de42eaec30384ceed8272 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sat, 11 Jun 2022 15:57:45 -0700
Subject: [PATCH 0180/2068] Apply the fix from #1224 to PalantirJavaFormatStep.

---
 .../java/com/diffplug/spotless/java/PalantirJavaFormatStep.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
index a5474d549b..89673787d6 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
@@ -60,6 +60,7 @@ private static final class State implements Serializable {
 		private final String formatterVersion;
 
 		State(JarState jarState, String formatterVersion) {
+			ModuleHelper.doOpenInternalPackagesIfRequired();
 			this.jarState = jarState;
 			this.formatterVersion = formatterVersion;
 		}

From ba2c979bad568b4fc7e924472a9caf4cdd138ba5 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sat, 11 Jun 2022 16:01:28 -0700
Subject: [PATCH 0181/2068] Update changelogs.

---
 CHANGES.md               | 2 ++
 plugin-gradle/CHANGES.md | 2 ++
 plugin-maven/CHANGES.md  | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index ea675ade27..03d5ceec2e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* `PalantirJavaFormatStep` no longer needs the `--add-exports` calls in the `org.gradle.jvmargs` property in `gradle.properties`. ([#1233](https://github.com/diffplug/spotless/pull/1233))
 
 ## [2.26.1] - 2022-06-10
 ### Fixed
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index a13fedf837..890eb66e64 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Fixed
+* `PalantirJavaFormatStep` no longer needs the `--add-exports` calls in the `org.gradle.jvmargs` property in `gradle.properties`. ([#1233](https://github.com/diffplug/spotless/pull/1233))
 
 ## [6.7.1] - 2022-06-10
 ### Fixed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 0f32859cab..7583181456 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* `PalantirJavaFormatStep` no longer needs the `--add-exports` calls in `MAVEN_OPTS` or `.mvn/jvm.config`. ([#1233](https://github.com/diffplug/spotless/pull/1233))
 
 ## [2.22.7] - 2022-06-10
 ### Fixed

From b737f4c9b044a898ebeb93556c6c649019c7ccd4 Mon Sep 17 00:00:00 2001
From: circleci <circleci@d8765346358a>
Date: Sat, 11 Jun 2022 23:50:10 +0000
Subject: [PATCH 0182/2068] Published lib/2.26.2

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 03d5ceec2e..3803d08fd9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.26.2] - 2022-06-11
 ### Fixed
 * `PalantirJavaFormatStep` no longer needs the `--add-exports` calls in the `org.gradle.jvmargs` property in `gradle.properties`. ([#1233](https://github.com/diffplug/spotless/pull/1233))
 

From 56912f5983c33d1803d56162d211a699fc2d5f00 Mon Sep 17 00:00:00 2001
From: circleci <circleci@d8765346358a>
Date: Sat, 11 Jun 2022 23:51:09 +0000
Subject: [PATCH 0183/2068] Published gradle/6.7.2

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 46 ++++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 890eb66e64..6eac3102e0 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [6.7.2] - 2022-06-11
 ### Fixed
 * `PalantirJavaFormatStep` no longer needs the `--add-exports` calls in the `org.gradle.jvmargs` property in `gradle.properties`. ([#1233](https://github.com/diffplug/spotless/pull/1233))
 
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 291d0cf027..99d86026d6 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -18,9 +18,9 @@ output = [
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
 [![Maven central](https://img.shields.io/badge/mavencentral-yes-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/index.html)
 [![License Apache](https://img.shields.io/badge/license-apache-blue.svg)](https://tldrlegal.com/license/apache-license-2.0-(apache-2.0))
-[![Changelog](https://img.shields.io/badge/changelog-6.7.1-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-6.7.2-blue.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)
@@ -126,10 +126,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -141,7 +141,7 @@ If you're stuck on an older version of Gradle, `id 'com.diffplug.gradle.spotless
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -248,8 +248,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -300,8 +300,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -364,7 +364,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -396,7 +396,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -428,7 +428,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -462,7 +462,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -483,7 +483,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -508,7 +508,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -548,7 +548,7 @@ sql.formatter.indent.size=4
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -591,7 +591,7 @@ For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#n
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -816,7 +816,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -883,9 +883,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -918,11 +918,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.1/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From 97784730e21574b859f013ba00825502ce040929 Mon Sep 17 00:00:00 2001
From: circleci <circleci@d8765346358a>
Date: Sat, 11 Jun 2022 23:52:42 +0000
Subject: [PATCH 0184/2068] Published maven/2.22.8

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 7583181456..672dfb1150 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.22.8] - 2022-06-11
 ### Fixed
 * `PalantirJavaFormatStep` no longer needs the `--add-exports` calls in `MAVEN_OPTS` or `.mvn/jvm.config`. ([#1233](https://github.com/diffplug/spotless/pull/1233))
 
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 2795cc1629..e6b9ee8e29 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -12,8 +12,8 @@ output = [
   ].join('\n');
 -->
 [![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.22.7/index.html)
-[![Changelog](https://img.shields.io/badge/changelog-2.22.7-brightgreen.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.22.8/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.22.8-brightgreen.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)

From e19c3ad4a79d458c5520005bb785524de3356722 Mon Sep 17 00:00:00 2001
From: Iurii Ignatko <iignatko@gradle.com>
Date: Mon, 13 Jun 2022 15:44:15 +0300
Subject: [PATCH 0185/2068] Specify additional task outputs

---
 gradle/java-setup.gradle  | 10 +++++++++-
 plugin-maven/build.gradle | 15 ++++++++-------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/gradle/java-setup.gradle b/gradle/java-setup.gradle
index 5d9d756414..707584bccf 100644
--- a/gradle/java-setup.gradle
+++ b/gradle/java-setup.gradle
@@ -17,7 +17,6 @@ apply plugin: 'com.github.spotbugs'
 spotbugs {
 	toolVersion = VER_SPOTBUGS
 	ignoreFailures = false 	// bug free or it doesn't ship!
-	reportsDir = file('build/spotbugs')
 	reportLevel = 'medium'	// low|medium|high (low = sensitive to even minor mistakes)
 	omitVisitors = [
 		'FindReturnRef'] // https://spotbugs.readthedocs.io/en/latest/detectors.html#findreturnref
@@ -25,6 +24,15 @@ spotbugs {
 tasks.named('spotbugsTest') {
 	enabled = false
 }
+
+tasks.withType(com.github.spotbugs.snom.SpotBugsTask).configureEach {
+	outputs.file("$buildDir/reports/spotbugs/${it.name}.html")
+	outputs.file("$buildDir/spotbugs/auxclasspath/${it.name}")
+	reports {
+		html.enabled = true
+	}
+}
+
 tasks.named('spotbugsMain') {
 	// only run on Java 8 (no benefit to running twice)
 	enabled = org.gradle.api.JavaVersion.current() == org.gradle.api.JavaVersion.VERSION_11
diff --git a/plugin-maven/build.gradle b/plugin-maven/build.gradle
index 0905f58c24..d3da756bcc 100644
--- a/plugin-maven/build.gradle
+++ b/plugin-maven/build.gradle
@@ -27,7 +27,7 @@ import java.nio.file.Files
 import java.nio.file.Paths
 
 import static java.nio.charset.StandardCharsets.UTF_8
-import static java.nio.file.StandardOpenOption.CREATE_NEW
+import static java.nio.file.StandardOpenOption.CREATE
 import static java.nio.file.StandardOpenOption.TRUNCATE_EXISTING
 
 ext.artifactId = project.artifactIdMaven
@@ -91,9 +91,7 @@ dependencies {
 	testImplementation "org.apache.maven:maven-core:${VER_MAVEN_API}"
 }
 
-task cleanMavenProjectDir(type: Delete) { delete MAVEN_PROJECT_DIR }
-
-task copySourceFiles(type: Sync, dependsOn: cleanMavenProjectDir) {
+task copySourceFiles(type: Sync) {
 	from "src/main/java"
 	into "${MAVEN_PROJECT_DIR}/src/main/java"
 }
@@ -137,6 +135,9 @@ libs.each {
 }
 
 task createPomXml(dependsOn: installLocalDependencies) {
+	def newPomXml = Paths.get(MAVEN_PROJECT_DIR, "pom.xml")
+
+	outputs.file(newPomXml)
 	doLast {
 		def additionalDependencies = project.configurations.runtimeClasspath.resolvedConfiguration.resolvedArtifacts.findAll {
 			return !libs.contains(it.moduleVersion.id.name)
@@ -158,10 +159,9 @@ task createPomXml(dependsOn: installLocalDependencies) {
 		]
 
 		def pomXmlTemplate = Paths.get(PROJECT_DIR, "src/test/resources/pom-build.xml.mustache")
-		def newPomXml = Paths.get(MAVEN_PROJECT_DIR, "pom.xml")
 
 		Files.newBufferedReader(pomXmlTemplate).withCloseable { reader ->
-			Files.newBufferedWriter(newPomXml, UTF_8, CREATE_NEW, TRUNCATE_EXISTING).withCloseable { writer ->
+			Files.newBufferedWriter(newPomXml, UTF_8, CREATE, TRUNCATE_EXISTING).withCloseable { writer ->
 				def mustache = new DefaultMustacheFactory().compile(reader, "pom")
 				mustache.execute(writer, versions)
 			}
@@ -170,11 +170,12 @@ task createPomXml(dependsOn: installLocalDependencies) {
 }
 
 task runMavenBuild(type: Exec, dependsOn: [
-	cleanMavenProjectDir,
 	copySourceFiles,
 	copyMvnw,
 	createPomXml
 ]) {
+	outputs.dir(LOCAL_MAVEN_REPO_DIR)
+
 	workingDir MAVEN_PROJECT_DIR
 	// -B batch mode to make dependency download logging less verbose
 	commandLine mvnw("clean install -B -Dmaven.repo.local=${LOCAL_MAVEN_REPO_DIR}")

From 9940d740802f62554e1b4032b404210bd41a1356 Mon Sep 17 00:00:00 2001
From: Iurii Ignatko <iignatko@gradle.com>
Date: Tue, 14 Jun 2022 16:31:21 +0300
Subject: [PATCH 0186/2068] Use project.layout instead of buildDir and static
 strings

---
 gradle/java-setup.gradle  |  4 ++--
 plugin-maven/build.gradle | 19 ++++++++-----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/gradle/java-setup.gradle b/gradle/java-setup.gradle
index 707584bccf..9c9f394405 100644
--- a/gradle/java-setup.gradle
+++ b/gradle/java-setup.gradle
@@ -26,8 +26,8 @@ tasks.named('spotbugsTest') {
 }
 
 tasks.withType(com.github.spotbugs.snom.SpotBugsTask).configureEach {
-	outputs.file("$buildDir/reports/spotbugs/${it.name}.html")
-	outputs.file("$buildDir/spotbugs/auxclasspath/${it.name}")
+	outputs.file(project.layout.buildDirectory.file("reports/spotbugs/${it.name}.html"))
+	outputs.file(project.layout.buildDirectory.file("spotbugs/auxclasspath/${it.name}"))
 	reports {
 		html.enabled = true
 	}
diff --git a/plugin-maven/build.gradle b/plugin-maven/build.gradle
index d3da756bcc..174f10ef6a 100644
--- a/plugin-maven/build.gradle
+++ b/plugin-maven/build.gradle
@@ -24,7 +24,6 @@ visteg {
 import com.github.mustachejava.DefaultMustacheFactory
 
 import java.nio.file.Files
-import java.nio.file.Paths
 
 import static java.nio.charset.StandardCharsets.UTF_8
 import static java.nio.file.StandardOpenOption.CREATE
@@ -35,10 +34,8 @@ version = spotlessChangelog.versionNext
 apply from: rootProject.file("gradle/java-setup.gradle")
 apply from: rootProject.file("gradle/java-publish.gradle")
 
-final PROJECT_DIR = project.projectDir.toString()
-final BUILD_DIR = project.buildDir.toString()
-final MAVEN_PROJECT_DIR = "${BUILD_DIR}/mavenProject"
-final LOCAL_MAVEN_REPO_DIR = "${BUILD_DIR}/localMavenRepository"
+final MAVEN_PROJECT_DIR = project.layout.buildDirectory.dir("mavenProject").get()
+final LOCAL_MAVEN_REPO_DIR = project.layout.buildDirectory.dir("localMavenRepository").get()
 
 def mvnw(String args) {
 	boolean isWin = System.getProperty('os.name').toLowerCase().contains('win')
@@ -93,7 +90,7 @@ dependencies {
 
 task copySourceFiles(type: Sync) {
 	from "src/main/java"
-	into "${MAVEN_PROJECT_DIR}/src/main/java"
+	into MAVEN_PROJECT_DIR.dir("src/main/java")
 }
 
 task copyMvnw(type: Copy, dependsOn: copySourceFiles) {
@@ -120,7 +117,7 @@ libs.each {
 		workingDir MAVEN_PROJECT_DIR
 
 		inputs.file(file)
-		outputs.dir(project.file("${LOCAL_MAVEN_REPO_DIR}/${groupId.replace('.', '/')}/${artifactId}/${version}"))
+		outputs.dir(LOCAL_MAVEN_REPO_DIR.file(groupId.replace('.', '/') + "/" + artifactId + "/" + version))
 		commandLine mvnw("org.apache.maven.plugins:maven-install-plugin:2.3.1:install-file " +
 				"-Dfile=${file} " +
 				"-DgroupId=${groupId} " +
@@ -135,7 +132,7 @@ libs.each {
 }
 
 task createPomXml(dependsOn: installLocalDependencies) {
-	def newPomXml = Paths.get(MAVEN_PROJECT_DIR, "pom.xml")
+	def newPomXml = MAVEN_PROJECT_DIR.file("pom.xml").asFile.toPath()
 
 	outputs.file(newPomXml)
 	doLast {
@@ -158,7 +155,7 @@ task createPomXml(dependsOn: installLocalDependencies) {
 			additionalDependencies    : additionalDependencies
 		]
 
-		def pomXmlTemplate = Paths.get(PROJECT_DIR, "src/test/resources/pom-build.xml.mustache")
+		def pomXmlTemplate = project.layout.projectDirectory.file("src/test/resources/pom-build.xml.mustache").asFile.toPath()
 
 		Files.newBufferedReader(pomXmlTemplate).withCloseable { reader ->
 			Files.newBufferedWriter(newPomXml, UTF_8, CREATE, TRUNCATE_EXISTING).withCloseable { writer ->
@@ -183,7 +180,7 @@ task runMavenBuild(type: Exec, dependsOn: [
 
 jar.setActions Arrays.asList()
 jar.dependsOn(runMavenBuild)
-File jarIn = file("${MAVEN_PROJECT_DIR}/target/spotless-maven-plugin-${version}.jar")
+File jarIn = MAVEN_PROJECT_DIR.file("target/spotless-maven-plugin-${version}.jar").asFile
 File jarOut = jar.archivePath
 jar.inputs.file(jarIn)
 jar.outputs.file(jarOut)
@@ -196,7 +193,7 @@ test { useJUnitPlatform() }
 apply from: rootProject.file('gradle/special-tests.gradle')
 
 tasks.withType(Test) {
-	systemProperty "localMavenRepositoryDir", LOCAL_MAVEN_REPO_DIR
+	systemProperty "localMavenRepositoryDir", LOCAL_MAVEN_REPO_DIR.asFile
 	systemProperty "spotlessMavenPluginVersion", project.version
 	dependsOn(jar)
 }

From 57dad351859909dba226c51eb06292b308360468 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Jun 2022 23:38:46 +0000
Subject: [PATCH 0187/2068] Bump com.github.spotbugs from 5.0.7 to 5.0.8

Bumps com.github.spotbugs from 5.0.7 to 5.0.8.

---
updated-dependencies:
- dependency-name: com.github.spotbugs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 83a40d3061..13792d7260 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
 		// https://github.com/gradle-nexus/publish-plugin/releases
 		id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
 		// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
-		id 'com.github.spotbugs'                   version '5.0.7'
+		id 'com.github.spotbugs'                   version '5.0.8'
 		// https://github.com/diffplug/spotless-changelog
 		id 'com.diffplug.spotless-changelog'       version '2.3.2'
 		// https://github.com/diffplug/goomph/blob/main/CHANGES.md

From 34c5fe7192b34da4b24718235e296d6807728054 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E4=BF=8A=E7=BF=94?=
 <demon.jun@dbappsecurity.com.cn>
Date: Mon, 20 Jun 2022 10:13:16 +0800
Subject: [PATCH 0188/2068] add support for MAC_CLASSIC (\r only)

---
 .../com/diffplug/spotless/LineEnding.java     | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/LineEnding.java b/lib/src/main/java/com/diffplug/spotless/LineEnding.java
index 6ea5372807..4dd4344835 100644
--- a/lib/src/main/java/com/diffplug/spotless/LineEnding.java
+++ b/lib/src/main/java/com/diffplug/spotless/LineEnding.java
@@ -41,8 +41,10 @@ public Policy createPolicy() {
 	PLATFORM_NATIVE,
 	/** {@code \r\n} */
 	WINDOWS,
-	/** {@code \n} */
-	UNIX;
+    /** {@code \n} */
+    UNIX,
+    /** {@code \r} */
+    MAC_CLASSIC;
 	// @formatter:on
 
 	/** Returns a {@link Policy} appropriate for files which are contained within the given rootFolder. */
@@ -75,6 +77,7 @@ public Policy createPolicy() {
 		case PLATFORM_NATIVE:	return _platformNativePolicy;
 		case WINDOWS:			return WINDOWS_POLICY;
 		case UNIX:				return UNIX_POLICY;
+        case MAC_CLASSIC:       return MAC_CLASSIC_POLICY;
 		default:	throw new UnsupportedOperationException(this + " is a path-specific line ending.");
 		}
 	}
@@ -96,6 +99,7 @@ public String getEndingFor(File file) {
 
 	private static final Policy WINDOWS_POLICY = new ConstantLineEndingPolicy(WINDOWS.str());
 	private static final Policy UNIX_POLICY = new ConstantLineEndingPolicy(UNIX.str());
+    private static final Policy MAC_CLASSIC_POLICY = new ConstantLineEndingPolicy(MAC_CLASSIC.str());
 	private static final String _platformNative = System.getProperty("line.separator");
 	private static final Policy _platformNativePolicy = new ConstantLineEndingPolicy(_platformNative);
 	private static final boolean nativeIsWin = _platformNative.equals(WINDOWS.str());
@@ -117,6 +121,7 @@ public String str() {
 		case PLATFORM_NATIVE:	return _platformNative;
 		case WINDOWS:			return "\r\n";
 		case UNIX:				return "\n";
+		case MAC_CLASSIC:       return "\r";
 		default:	throw new UnsupportedOperationException(this + " is a path-specific line ending.");
 		}
 	}
@@ -137,12 +142,14 @@ public default boolean isUnix(File file) {
 
 	/** Returns a string with exclusively unix line endings. */
 	public static String toUnix(String input) {
-		int firstNewline = input.lastIndexOf('\n');
-		if (firstNewline == -1) {
+		if (input.lastIndexOf(WINDOWS.str()) > -1) {
+			return input.replace("\r", "");
+		} else if (input.lastIndexOf(MAC_CLASSIC.str()) > -1) {
+			// replace mac classic '\r' with unix line endings '\n'
+			return input.replace(MAC_CLASSIC.str(), UNIX.str());
+		} else {
 			// fastest way to detect if a string is already unix-only
 			return input;
-		} else {
-			return input.replace("\r", "");
 		}
 	}
 }

From 1cd8553e37f3d9fad546683ca71a04f0826d5b8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E4=BF=8A=E7=BF=94?=
 <demon.jun@dbappsecurity.com.cn>
Date: Tue, 21 Jun 2022 14:51:30 +0800
Subject: [PATCH 0189/2068] apply code style

---
 lib/src/main/java/com/diffplug/spotless/LineEnding.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/LineEnding.java b/lib/src/main/java/com/diffplug/spotless/LineEnding.java
index 4dd4344835..c5c5c45125 100644
--- a/lib/src/main/java/com/diffplug/spotless/LineEnding.java
+++ b/lib/src/main/java/com/diffplug/spotless/LineEnding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 585d0a524acd6580dd04961255838a856e40329f Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 24 Jun 2022 21:53:47 -0700
Subject: [PATCH 0190/2068] Speedup LineEnding.toUnix, and add a test.

---
 .../java/com/diffplug/spotless/LineEnding.java  | 17 ++++++++++-------
 .../com/diffplug/spotless/FormatterTest.java    | 10 +++++++++-
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/LineEnding.java b/lib/src/main/java/com/diffplug/spotless/LineEnding.java
index c5c5c45125..72b2532f2a 100644
--- a/lib/src/main/java/com/diffplug/spotless/LineEnding.java
+++ b/lib/src/main/java/com/diffplug/spotless/LineEnding.java
@@ -142,14 +142,17 @@ public default boolean isUnix(File file) {
 
 	/** Returns a string with exclusively unix line endings. */
 	public static String toUnix(String input) {
-		if (input.lastIndexOf(WINDOWS.str()) > -1) {
-			return input.replace("\r", "");
-		} else if (input.lastIndexOf(MAC_CLASSIC.str()) > -1) {
-			// replace mac classic '\r' with unix line endings '\n'
-			return input.replace(MAC_CLASSIC.str(), UNIX.str());
-		} else {
-			// fastest way to detect if a string is already unix-only
+		int lastCarriageReturn = input.lastIndexOf('\r');
+		if (lastCarriageReturn == -1) {
 			return input;
+		} else {
+			if (input.lastIndexOf("\r\n") == -1) {
+				// it is MAC_CLASSIC \r
+				return input.replace('\r', '\n');
+			} else {
+				// it is WINDOWS \r\n
+				return input.replace("\r", "");
+			}
 		}
 	}
 }
diff --git a/testlib/src/test/java/com/diffplug/spotless/FormatterTest.java b/testlib/src/test/java/com/diffplug/spotless/FormatterTest.java
index fc56332b2b..06b8e64d31 100644
--- a/testlib/src/test/java/com/diffplug/spotless/FormatterTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/FormatterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,12 +22,20 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.common.base.StandardSystemProperty;
 import com.diffplug.spotless.generic.EndWithNewlineStep;
 
 class FormatterTest {
+	@Test
+	void toUnix() {
+		Assertions.assertEquals("1\n2\n3", LineEnding.toUnix("1\n2\n3"));
+		Assertions.assertEquals("1\n2\n3", LineEnding.toUnix("1\r2\r3"));
+		Assertions.assertEquals("1\n2\n3", LineEnding.toUnix("1\r\n2\r\n3"));
+	}
+
 	// Formatter normally needs to be closed, but no resources will be leaked in this special case
 	@Test
 	void equality() {

From e4b0e0b402f0d25055c49ba27aa6fffabdc7d2e1 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 24 Jun 2022 21:53:53 -0700
Subject: [PATCH 0191/2068] Update docs.

---
 plugin-gradle/README.md | 2 +-
 plugin-maven/README.md  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 99d86026d6..52c1d4edac 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -866,7 +866,7 @@ spotless {
     encoding 'Cp1252' // except java, which will be Cp1252
 ```
 
-Line endings can also be set globally or per-format using the `lineEndings` property.  Spotless supports four line ending modes: `UNIX`, `WINDOWS`, `PLATFORM_NATIVE`, and `GIT_ATTRIBUTES`.  The default value is `GIT_ATTRIBUTES`, and *we highly recommend that you* ***do not change*** *this value*.  Git has opinions about line endings, and if Spotless and git disagree, then you're going to have a bad time.
+Line endings can also be set globally or per-format using the `lineEndings` property.  Spotless supports four line ending modes: `UNIX`, `WINDOWS`, `MAC_CLASSIC`, `PLATFORM_NATIVE`, and `GIT_ATTRIBUTES`.  The default value is `GIT_ATTRIBUTES`, and *we highly recommend that you* ***do not change*** *this value*.  Git has opinions about line endings, and if Spotless and git disagree, then you're going to have a bad time.
 
 You can easily set the line endings of different files using [a `.gitattributes` file](https://help.github.com/articles/dealing-with-line-endings/).  Here's an example `.gitattributes` which sets all files to unix newlines: `* text eol=lf`.
 
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index e6b9ee8e29..c4aefd4289 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -1034,7 +1034,7 @@ Spotless uses UTF-8 by default, but you can use [any encoding which Java support
 </configuration>
 ```
 
-Line endings can also be set globally or per-format using the `lineEndings` property.  Spotless supports four line ending modes: `UNIX`, `WINDOWS`, `PLATFORM_NATIVE`, and `GIT_ATTRIBUTES`.  The default value is `GIT_ATTRIBUTES`, and *we highly recommend that you* ***do not change*** *this value*.  Git has opinions about line endings, and if Spotless and git disagree, then you're going to have a bad time.
+Line endings can also be set globally or per-format using the `lineEndings` property.  Spotless supports four line ending modes: `UNIX`, `WINDOWS`, `MAC_CLASSIC`, `PLATFORM_NATIVE`, and `GIT_ATTRIBUTES`.  The default value is `GIT_ATTRIBUTES`, and *we highly recommend that you* ***do not change*** *this value*.  Git has opinions about line endings, and if Spotless and git disagree, then you're going to have a bad time.
 
 You can easily set the line endings of different files using [a `.gitattributes` file](https://help.github.com/articles/dealing-with-line-endings/).  Here's an example `.gitattributes` which sets all files to unix newlines: `* text eol=lf`.
 

From ab0321734d6fb8eae897c69b14efe5b22ebd6ca8 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 24 Jun 2022 21:58:16 -0700
Subject: [PATCH 0192/2068] Update changelogs.

---
 CHANGES.md               | 2 ++
 plugin-gradle/CHANGES.md | 2 ++
 plugin-maven/CHANGES.md  | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 3803d08fd9..8e0d2c74d5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* Support for `MAC_CLASSIC` (`\r`) line ending ([#1243](https://github.com/diffplug/spotless/pull/1243) fixes [#1196](https://github.com/diffplug/spotless/issues/1196))
 
 ## [2.26.2] - 2022-06-11
 ### Fixed
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 6eac3102e0..178b8ec39b 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Added
+* Support for `MAC_CLASSIC` (`\r`) line ending ([#1243](https://github.com/diffplug/spotless/pull/1243) fixes [#1196](https://github.com/diffplug/spotless/issues/1196))
 
 ## [6.7.2] - 2022-06-11
 ### Fixed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 672dfb1150..f6c5bcc84e 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* Support for `MAC_CLASSIC` (`\r`) line ending ([#1243](https://github.com/diffplug/spotless/pull/1243) fixes [#1196](https://github.com/diffplug/spotless/issues/1196))
 
 ## [2.22.8] - 2022-06-11
 ### Fixed

From 83ad9774a18f20621e09307f6fca30d1e20aed78 Mon Sep 17 00:00:00 2001
From: Nariman Abdullin <nulls.narik@gmail.com>
Date: Fri, 24 Jun 2022 17:24:04 +0300
Subject: [PATCH 0193/2068] Upgrade diktat to 1.2.0

---
 lib/build.gradle                              |  2 +-
 .../glue/diktat/DiktatFormatterFunc.java      | 13 ++++-----
 .../diffplug/spotless/kotlin/DiktatStep.java  | 28 ++++++-------------
 3 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 2eb0f3e0e5..97897b68bb 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -51,7 +51,7 @@ dependencies {
 	ktlintCompileOnly "com.pinterest.ktlint:ktlint-ruleset-experimental:$VER_KTLINT"
 	ktlintCompileOnly "com.pinterest.ktlint:ktlint-ruleset-standard:$VER_KTLINT"
 
-	String VER_DIKTAT = "1.1.0"
+	String VER_DIKTAT = "1.2.0"
 	diktatCompileOnly "org.cqfn.diktat:diktat-rules:$VER_DIKTAT"
 
 	// used for markdown formatting
diff --git a/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java b/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java
index 1374bebb10..5a5762f4b6 100644
--- a/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java
+++ b/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java
@@ -20,8 +20,8 @@
 
 import org.cqfn.diktat.ruleset.rules.DiktatRuleSetProvider;
 
+import com.pinterest.ktlint.core.api.EditorConfigOverride;
 import com.pinterest.ktlint.core.KtLint;
-import com.pinterest.ktlint.core.KtLint.Params;
 import com.pinterest.ktlint.core.LintError;
 import com.pinterest.ktlint.core.RuleSet;
 
@@ -33,15 +33,13 @@
 public class DiktatFormatterFunc implements FormatterFunc.NeedsFile {
 
 	private final List<RuleSet> rulesets;
-	private final Map<String, String> userData;
 	private final Function2<? super LintError, ? super Boolean, Unit> formatterCallback;
 	private final boolean isScript;
 
 	private final ArrayList<LintError> errors = new ArrayList<>();
 
-	public DiktatFormatterFunc(boolean isScript, Map<String, String> userData) {
+	public DiktatFormatterFunc(boolean isScript) {
 		rulesets = Collections.singletonList(new DiktatRuleSetProvider().get());
-		this.userData = userData;
 		this.formatterCallback = new FormatterCallback(errors);
 		this.isScript = isScript;
 	}
@@ -65,17 +63,18 @@ public Unit invoke(LintError lintError, Boolean corrected) {
 	@Override
 	public String applyWithFile(String unix, File file) throws Exception {
 		errors.clear();
-		userData.put("file_path", file.getAbsolutePath());
-		String result = KtLint.INSTANCE.format(new Params(
+		String result = KtLint.INSTANCE.format(new KtLint.ExperimentalParams(
 				// Unlike Ktlint, Diktat requires full path to the file.
 				// See https://github.com/diffplug/spotless/issues/1189, https://github.com/analysis-dev/diktat/issues/1202
 				file.getAbsolutePath(),
 				unix,
 				rulesets,
-				userData,
+				Collections.emptyMap(),
 				formatterCallback,
 				isScript,
 				null,
+				false,
+				new EditorConfigOverride(),
 				false));
 
 		if (!errors.isEmpty()) {
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
index e01748d4b5..7533652243 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
@@ -30,7 +30,7 @@ public class DiktatStep {
 	// prevent direct instantiation
 	private DiktatStep() {}
 
-	private static final String DEFAULT_VERSION = "1.1.0";
+	private static final String DEFAULT_VERSION = "1.2.0";
 	static final String NAME = "diktat";
 	static final String PACKAGE_DIKTAT = "org.cqfn.diktat";
 	static final String MAVEN_COORDINATE = PACKAGE_DIKTAT + ":diktat-rules:";
@@ -44,30 +44,22 @@ public static FormatterStep create(Provisioner provisioner) {
 	}
 
 	public static FormatterStep create(String versionDiktat, Provisioner provisioner) {
-		return create(versionDiktat, provisioner, Collections.emptyMap(), null);
+		return create(versionDiktat, provisioner, null);
 	}
 
 	public static FormatterStep create(String versionDiktat, Provisioner provisioner, @Nullable FileSignature config) {
-		return create(versionDiktat, provisioner, Collections.emptyMap(), config);
-	}
-
-	public static FormatterStep create(String versionDiktat, Provisioner provisioner, Map<String, String> userData, @Nullable FileSignature config) {
-		return create(versionDiktat, provisioner, false, userData, config);
+		return create(versionDiktat, provisioner, false, config);
 	}
 
 	public static FormatterStep createForScript(String versionDiktat, Provisioner provisioner, @Nullable FileSignature config) {
-		return createForScript(versionDiktat, provisioner, Collections.emptyMap(), config);
-	}
-
-	public static FormatterStep createForScript(String versionDiktat, Provisioner provisioner, Map<String, String> userData, @Nullable FileSignature config) {
-		return create(versionDiktat, provisioner, true, userData, config);
+		return create(versionDiktat, provisioner, true, config);
 	}
 
-	public static FormatterStep create(String versionDiktat, Provisioner provisioner, boolean isScript, Map<String, String> userData, @Nullable FileSignature config) {
+	public static FormatterStep create(String versionDiktat, Provisioner provisioner, boolean isScript, @Nullable FileSignature config) {
 		Objects.requireNonNull(versionDiktat, "versionDiktat");
 		Objects.requireNonNull(provisioner, "provisioner");
 		return FormatterStep.createLazy(NAME,
-				() -> new DiktatStep.State(versionDiktat, provisioner, isScript, userData, config),
+				() -> new DiktatStep.State(versionDiktat, provisioner, isScript, config),
 				DiktatStep.State::createFormat);
 	}
 
@@ -79,14 +71,12 @@ static final class State implements Serializable {
 		private final boolean isScript;
 		private final @Nullable FileSignature config;
 		final JarState jar;
-		private final TreeMap<String, String> userData;
 
-		State(String versionDiktat, Provisioner provisioner, boolean isScript, Map<String, String> userData, @Nullable FileSignature config) throws IOException {
+		State(String versionDiktat, Provisioner provisioner, boolean isScript, @Nullable FileSignature config) throws IOException {
 
 			HashSet<String> pkgSet = new HashSet<>();
 			pkgSet.add(MAVEN_COORDINATE + versionDiktat);
 
-			this.userData = new TreeMap<>(userData);
 			this.jar = JarState.from(pkgSet, provisioner);
 			this.isScript = isScript;
 			this.config = config;
@@ -98,8 +88,8 @@ FormatterFunc createFormat() throws Exception {
 			}
 
 			Class<?> formatterFunc = jar.getClassLoader().loadClass("com.diffplug.spotless.glue.diktat.DiktatFormatterFunc");
-			Constructor<?> constructor = formatterFunc.getConstructor(boolean.class, Map.class);
-			return (FormatterFunc.NeedsFile) constructor.newInstance(isScript, userData);
+			Constructor<?> constructor = formatterFunc.getConstructor(boolean.class);
+			return (FormatterFunc.NeedsFile) constructor.newInstance(isScript);
 		}
 	}
 }

From e9a9b9e31c1ec26cb6dbefde579826ec21c2272c Mon Sep 17 00:00:00 2001
From: Nariman Abdullin <nulls.narik@gmail.com>
Date: Fri, 24 Jun 2022 17:32:18 +0300
Subject: [PATCH 0194/2068] Update CHANGES.md

---
 CHANGES.md               | 2 ++
 plugin-gradle/CHANGES.md | 2 ++
 plugin-maven/CHANGES.md  | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 8e0d2c74d5..c9b2a9fa70 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Support for `MAC_CLASSIC` (`\r`) line ending ([#1243](https://github.com/diffplug/spotless/pull/1243) fixes [#1196](https://github.com/diffplug/spotless/issues/1196))
+### Fixed
+* Bump default `diktat` version to latest `1.1.0` -> `1.2.0`. ([saveourtool/diktat#1399](https://github.com/saveourtool/diktat/issues/1399))
 
 ## [2.26.2] - 2022-06-11
 ### Fixed
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 178b8ec39b..2244b0dfad 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,6 +5,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Support for `MAC_CLASSIC` (`\r`) line ending ([#1243](https://github.com/diffplug/spotless/pull/1243) fixes [#1196](https://github.com/diffplug/spotless/issues/1196))
+### Fixed
+* Bump default `diktat` version to latest `1.1.0` -> `1.2.0`. ([saveourtool/diktat#1399](https://github.com/saveourtool/diktat/issues/1399))
 
 ## [6.7.2] - 2022-06-11
 ### Fixed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index f6c5bcc84e..4d75eae40b 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,6 +5,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Support for `MAC_CLASSIC` (`\r`) line ending ([#1243](https://github.com/diffplug/spotless/pull/1243) fixes [#1196](https://github.com/diffplug/spotless/issues/1196))
+### Fixed
+* Bump default `diktat` version to latest `1.1.0` -> `1.2.0`. ([saveourtool/diktat#1399](https://github.com/saveourtool/diktat/issues/1399))
 
 ## [2.22.8] - 2022-06-11
 ### Fixed

From f65b13691c9142f151f8ff4a96fa09a160e8b673 Mon Sep 17 00:00:00 2001
From: Nariman Abdullin <nulls.narik@gmail.com>
Date: Fri, 24 Jun 2022 18:01:41 +0300
Subject: [PATCH 0195/2068] fixed compile and static issue

---
 .../com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java  | 2 +-
 .../main/java/com/diffplug/spotless/maven/kotlin/Diktat.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java b/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java
index 5a5762f4b6..0b9d115c2b 100644
--- a/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java
+++ b/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java
@@ -20,10 +20,10 @@
 
 import org.cqfn.diktat.ruleset.rules.DiktatRuleSetProvider;
 
-import com.pinterest.ktlint.core.api.EditorConfigOverride;
 import com.pinterest.ktlint.core.KtLint;
 import com.pinterest.ktlint.core.LintError;
 import com.pinterest.ktlint.core.RuleSet;
+import com.pinterest.ktlint.core.api.EditorConfigOverride;
 
 import com.diffplug.spotless.FormatterFunc;
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Diktat.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Diktat.java
index 97cbec07b2..13d600e11f 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Diktat.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Diktat.java
@@ -41,6 +41,6 @@ public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 			config = ThrowingEx.get(() -> FileSignature.signAsList(stepConfig.getFileLocator().locateFile(configFile)));
 		}
 		String diktatVersion = version != null ? version : DiktatStep.defaultVersionDiktat();
-		return DiktatStep.create(diktatVersion, stepConfig.getProvisioner(), Collections.emptyMap(), config);
+		return DiktatStep.create(diktatVersion, stepConfig.getProvisioner(), config);
 	}
 }

From 5c42c00f67f44057f04bf90afbe62fc8a9bf9e43 Mon Sep 17 00:00:00 2001
From: Nariman Abdullin <nulls.narik@gmail.com>
Date: Fri, 24 Jun 2022 18:45:35 +0300
Subject: [PATCH 0196/2068] fixed integration tests

---
 .../main/resources/kotlin/diktat/main.clean    |  6 +++---
 .../main/resources/kotlin/diktat/main.dirty    |  6 +++---
 .../spotless/kotlin/DiktatStepTest.java        | 18 +++++++++++++-----
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/testlib/src/main/resources/kotlin/diktat/main.clean b/testlib/src/main/resources/kotlin/diktat/main.clean
index 4405165ed5..c46b4542b0 100644
--- a/testlib/src/main/resources/kotlin/diktat/main.clean
+++ b/testlib/src/main/resources/kotlin/diktat/main.clean
@@ -1,7 +1,7 @@
 package org.cqfn.diktat.example.gradle.multiproject
 
 /**
- * @return print.
+ * @return something
  */
 class Main {
     /**
@@ -9,7 +9,7 @@ class Main {
      *
      */
     fun foo() {
-        println(";")
-        println()
+        bar(";")
+        bar()
     }
 }
diff --git a/testlib/src/main/resources/kotlin/diktat/main.dirty b/testlib/src/main/resources/kotlin/diktat/main.dirty
index 5f7be993aa..a5c225cc4f 100644
--- a/testlib/src/main/resources/kotlin/diktat/main.dirty
+++ b/testlib/src/main/resources/kotlin/diktat/main.dirty
@@ -1,6 +1,6 @@
 package org.cqfn.diktat.example.gradle.multiproject
 /**
- * @return print.
+ * @return something
  */
 class Main {
 	/**
@@ -8,7 +8,7 @@ class Main {
 	 *
 	 */
 	fun foo() {
-		println(";")
-		println();
+		bar(";")
+		bar();
 	}
 }
diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
index 24a79ed61b..c19f1dc45a 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
@@ -36,11 +36,15 @@ void behavior() throws Exception {
 		StepHarness.forStep(step)
 				.testResourceException("kotlin/diktat/Unsolvable.kt", assertion -> {
 					assertion.isInstanceOf(AssertionError.class);
-					assertion.hasMessage("There are 2 unfixed errors:" +
+					assertion.hasMessage("There are 4 unfixed errors:" +
 							System.lineSeparator() + "Error on line: 1, column: 1 cannot be fixed automatically" +
 							System.lineSeparator() + "[FILE_NAME_INCORRECT] file name is incorrect - it should end with .kt extension and be in PascalCase: testlib" +
 							System.lineSeparator() + "Error on line: 1, column: 1 cannot be fixed automatically" +
-							System.lineSeparator() + "[FILE_NAME_MATCH_CLASS] file name is incorrect - it should match with the class described in it if there is the only one class declared: testlib vs Unsolvable");
+							System.lineSeparator() + "[FILE_NAME_MATCH_CLASS] file name is incorrect - it should match with the class described in it if there is the only one class declared: testlib vs Unsolvable" +
+							System.lineSeparator() + "Error on line: 1, column: 1 cannot be fixed automatically" +
+							System.lineSeparator() + "[DEBUG_PRINT] use a dedicated logging library: found println()" +
+							System.lineSeparator() + "Error on line: 13, column: 9 cannot be fixed automatically" +
+							System.lineSeparator() + "[DEBUG_PRINT] use a dedicated logging library: found println()");
 				});
 	}
 
@@ -51,15 +55,19 @@ void behaviorConf() throws Exception {
 		File conf = setFile(configPath).toResource("kotlin/diktat/diktat-analysis.yml");
 		FileSignature config = signAsList(conf);
 
-		FormatterStep step = DiktatStep.create("1.0.1", TestProvisioner.mavenCentral(), Collections.emptyMap(), config);
+		FormatterStep step = DiktatStep.create("1.2.0", TestProvisioner.mavenCentral(), config);
 		StepHarness.forStep(step)
 				.testResourceException("kotlin/diktat/Unsolvable.kt", assertion -> {
 					assertion.isInstanceOf(AssertionError.class);
-					assertion.hasMessage("There are 2 unfixed errors:" +
+					assertion.hasMessage("There are 4 unfixed errors:" +
 							System.lineSeparator() + "Error on line: 1, column: 1 cannot be fixed automatically" +
 							System.lineSeparator() + "[FILE_NAME_INCORRECT] file name is incorrect - it should end with .kt extension and be in PascalCase: testlib" +
 							System.lineSeparator() + "Error on line: 1, column: 1 cannot be fixed automatically" +
-							System.lineSeparator() + "[FILE_NAME_MATCH_CLASS] file name is incorrect - it should match with the class described in it if there is the only one class declared: testlib vs Unsolvable");
+							System.lineSeparator() + "[FILE_NAME_MATCH_CLASS] file name is incorrect - it should match with the class described in it if there is the only one class declared: testlib vs Unsolvable" +
+							System.lineSeparator() + "Error on line: 1, column: 1 cannot be fixed automatically" +
+							System.lineSeparator() + "[DEBUG_PRINT] use a dedicated logging library: found println()" +
+							System.lineSeparator() + "Error on line: 13, column: 9 cannot be fixed automatically" +
+							System.lineSeparator() + "[DEBUG_PRINT] use a dedicated logging library: found println()");
 				});
 	}
 

From f6de4bb1ab49b4f948f37d186cd04032b16e2a00 Mon Sep 17 00:00:00 2001
From: Nariman Abdullin <nulls.narik@gmail.com>
Date: Fri, 24 Jun 2022 19:38:51 +0300
Subject: [PATCH 0197/2068] fixed year in javadoc

---
 .../main/java/com/diffplug/spotless/maven/kotlin/Diktat.java  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Diktat.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Diktat.java
index 13d600e11f..e47345d45d 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Diktat.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Diktat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2021-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,6 @@
  */
 package com.diffplug.spotless.maven.kotlin;
 
-import java.util.Collections;
-
 import org.apache.maven.plugins.annotations.Parameter;
 
 import com.diffplug.spotless.FileSignature;

From 6d1e35db09f50aebbedc4bcdf8d0dc9234d06e27 Mon Sep 17 00:00:00 2001
From: Nariman Abdullin <nulls.narik@gmail.com>
Date: Tue, 28 Jun 2022 20:51:08 +0300
Subject: [PATCH 0198/2068] bump diktat to 1.2.1 and add validation of min
 version

---
 CHANGES.md                                       |  4 +++-
 .../com/diffplug/spotless/kotlin/DiktatStep.java |  7 ++++++-
 plugin-gradle/CHANGES.md                         |  4 +++-
 plugin-maven/CHANGES.md                          |  4 +++-
 .../diffplug/spotless/kotlin/DiktatStepTest.java | 16 +++++++++++++---
 5 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index c9b2a9fa70..760595e88c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,7 +13,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * Support for `MAC_CLASSIC` (`\r`) line ending ([#1243](https://github.com/diffplug/spotless/pull/1243) fixes [#1196](https://github.com/diffplug/spotless/issues/1196))
 ### Fixed
-* Bump default `diktat` version to latest `1.1.0` -> `1.2.0`. ([saveourtool/diktat#1399](https://github.com/saveourtool/diktat/issues/1399))
+* Bump default `diktat` version to latest `1.1.0` -> `1.2.1`. ([saveourtool/diktat#1399](https://github.com/saveourtool/diktat/issues/1399))
+  * Note that support `diktat` version `1.2.1` is or higher
+  * The property `userData` is removed
 
 ## [2.26.2] - 2022-06-11
 ### Fixed
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
index 7533652243..94921a99bd 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
@@ -30,7 +30,9 @@ public class DiktatStep {
 	// prevent direct instantiation
 	private DiktatStep() {}
 
-	private static final String DEFAULT_VERSION = "1.2.0";
+	private static final String MIN_SUPPORTED_VERSION = "1.2.1";
+
+	private static final String DEFAULT_VERSION = "1.2.1";
 	static final String NAME = "diktat";
 	static final String PACKAGE_DIKTAT = "org.cqfn.diktat";
 	static final String MAVEN_COORDINATE = PACKAGE_DIKTAT + ":diktat-rules:";
@@ -56,6 +58,9 @@ public static FormatterStep createForScript(String versionDiktat, Provisioner pr
 	}
 
 	public static FormatterStep create(String versionDiktat, Provisioner provisioner, boolean isScript, @Nullable FileSignature config) {
+		if (BadSemver.version(versionDiktat) < BadSemver.version(MIN_SUPPORTED_VERSION)) {
+			throw new IllegalStateException("Diktat supported for version " + MIN_SUPPORTED_VERSION + " and later");
+		}
 		Objects.requireNonNull(versionDiktat, "versionDiktat");
 		Objects.requireNonNull(provisioner, "provisioner");
 		return FormatterStep.createLazy(NAME,
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 2244b0dfad..05bd5f7ce6 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -6,7 +6,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * Support for `MAC_CLASSIC` (`\r`) line ending ([#1243](https://github.com/diffplug/spotless/pull/1243) fixes [#1196](https://github.com/diffplug/spotless/issues/1196))
 ### Fixed
-* Bump default `diktat` version to latest `1.1.0` -> `1.2.0`. ([saveourtool/diktat#1399](https://github.com/saveourtool/diktat/issues/1399))
+* Bump default `diktat` version to latest `1.1.0` -> `1.2.1`. ([saveourtool/diktat#1399](https://github.com/saveourtool/diktat/issues/1399))
+  * Note that support `diktat` version `1.2.1` is or higher
+  * The property `userData` is removed
 
 ## [6.7.2] - 2022-06-11
 ### Fixed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 4d75eae40b..259cab1017 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -6,7 +6,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * Support for `MAC_CLASSIC` (`\r`) line ending ([#1243](https://github.com/diffplug/spotless/pull/1243) fixes [#1196](https://github.com/diffplug/spotless/issues/1196))
 ### Fixed
-* Bump default `diktat` version to latest `1.1.0` -> `1.2.0`. ([saveourtool/diktat#1399](https://github.com/saveourtool/diktat/issues/1399))
+* Bump default `diktat` version to latest `1.1.0` -> `1.2.1`. ([saveourtool/diktat#1399](https://github.com/saveourtool/diktat/issues/1399))
+  * Note that support `diktat` version `1.2.1` is or higher
+  * The property `userData` is removed
 
 ## [2.22.8] - 2022-06-11
 ### Fixed
diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
index c19f1dc45a..c37289c6e6 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
@@ -18,8 +18,8 @@
 import static com.diffplug.spotless.FileSignature.signAsList;
 
 import java.io.File;
-import java.util.Collections;
 
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.FileSignature;
@@ -50,12 +50,11 @@ void behavior() throws Exception {
 
 	@Test
 	void behaviorConf() throws Exception {
-
 		String configPath = "src/main/kotlin/diktat-analysis.yml";
 		File conf = setFile(configPath).toResource("kotlin/diktat/diktat-analysis.yml");
 		FileSignature config = signAsList(conf);
 
-		FormatterStep step = DiktatStep.create("1.2.0", TestProvisioner.mavenCentral(), config);
+		FormatterStep step = DiktatStep.create("1.2.1", TestProvisioner.mavenCentral(), config);
 		StepHarness.forStep(step)
 				.testResourceException("kotlin/diktat/Unsolvable.kt", assertion -> {
 					assertion.isInstanceOf(AssertionError.class);
@@ -71,4 +70,15 @@ void behaviorConf() throws Exception {
 				});
 	}
 
+	@Test
+	void notSupportedVersion() {
+		final IllegalStateException notSupportedException = Assertions.assertThrows(IllegalStateException.class,
+			() -> DiktatStep.create("1.2.0", TestProvisioner.mavenCentral()));
+		Assertions.assertTrue(
+			notSupportedException.getMessage().contains("Diktat supported for version 1.2.1 and later")
+		);
+
+		Assertions.assertDoesNotThrow(() -> DiktatStep.create("1.2.1", TestProvisioner.mavenCentral()));
+		Assertions.assertDoesNotThrow(() -> DiktatStep.create("2.0.0", TestProvisioner.mavenCentral()));
+	}
 }

From 67978ab1cbe345e71e4cea30ea3aa04c0f0330af Mon Sep 17 00:00:00 2001
From: Mitchell Skaggs <skaggsm333@gmail.com>
Date: Tue, 28 Jun 2022 21:44:32 -0500
Subject: [PATCH 0199/2068] Update KtLint min version to 0.46.0 and default
 version to 0.46.1

Closes #1239
---
 CHANGES.md                                    |  3 +
 lib/build.gradle                              |  2 +-
 .../glue/ktlint/KtlintFormatterFunc.java      | 44 ++++------
 .../diffplug/spotless/kotlin/KtLintStep.java  | 86 ++-----------------
 plugin-gradle/CHANGES.md                      |  3 +
 plugin-maven/CHANGES.md                       |  3 +
 .../spotless/kotlin/KtLintStepTest.java       | 39 +--------
 7 files changed, 37 insertions(+), 143 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 8e0d2c74d5..830d57d1a4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Support for `MAC_CLASSIC` (`\r`) line ending ([#1243](https://github.com/diffplug/spotless/pull/1243) fixes [#1196](https://github.com/diffplug/spotless/issues/1196))
+### Changes
+* Bump default `ktlint` version to latest `0.45.2` -> `0.46.1` [#1239](https://github.com/diffplug/spotless/issues/1239)
+  * Note that we now require `ktlint >= 0.46.0` due to frequent compatibility breakages
 
 ## [2.26.2] - 2022-06-11
 ### Fixed
diff --git a/lib/build.gradle b/lib/build.gradle
index 2eb0f3e0e5..34b25d94a7 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -45,7 +45,7 @@ dependencies {
 		}
 	}
 
-	String VER_KTLINT='0.45.2'
+	String VER_KTLINT='0.46.1'
 	ktlintCompileOnly "com.pinterest:ktlint:$VER_KTLINT"
 	ktlintCompileOnly "com.pinterest.ktlint:ktlint-core:$VER_KTLINT"
 	ktlintCompileOnly "com.pinterest.ktlint:ktlint-ruleset-experimental:$VER_KTLINT"
diff --git a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
index 1cd79a6ba9..da3e3ae475 100644
--- a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
+++ b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
@@ -24,6 +24,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.jetbrains.annotations.NotNull;
+
 import com.pinterest.ktlint.core.KtLint;
 import com.pinterest.ktlint.core.KtLint.ExperimentalParams;
 import com.pinterest.ktlint.core.LintError;
@@ -46,6 +48,7 @@ public class KtlintFormatterFunc implements FormatterFunc.NeedsFile {
 	private final Map<String, String> userData;
 	private final Function2<? super LintError, ? super Boolean, Unit> formatterCallback;
 	private final boolean isScript;
+	@NotNull
 	private final EditorConfigOverride editorConfigOverride;
 
 	/**
@@ -64,7 +67,7 @@ public KtlintFormatterFunc(boolean isScript, boolean useExperimental, Map<String
 		this.isScript = isScript;
 
 		if (editorConfigOverrideMap.isEmpty()) {
-			this.editorConfigOverride = null;
+			this.editorConfigOverride = EditorConfigOverride.Companion.getEmptyEditorConfigOverride();
 		} else {
 			this.editorConfigOverride = createEditorConfigOverride(editorConfigOverrideMap);
 		}
@@ -83,7 +86,7 @@ private EditorConfigOverride createEditorConfigOverride(Map<String, Object> edit
 
 		// Create a mapping of properties to their names based on rule properties and default properties
 		Map<String, UsesEditorConfigProperties.EditorConfigProperty<?>> supportedProperties = Stream
-				.concat(ruleProperties, DefaultEditorConfigProperties.INSTANCE.getDefaultEditorConfigProperties().stream())
+				.concat(ruleProperties, DefaultEditorConfigProperties.INSTANCE.getEditorConfigProperties().stream())
 				.distinct()
 				.collect(Collectors.toMap(property -> property.getType().getName(), property -> property));
 
@@ -116,31 +119,16 @@ public Unit invoke(LintError lint, Boolean corrected) {
 
 	@Override
 	public String applyWithFile(String unix, File file) throws Exception {
-
-		if (editorConfigOverride != null) {
-			// Use ExperimentalParams with EditorConfigOverride which requires KtLint 0.45.2
-			return KtLint.INSTANCE.format(new ExperimentalParams(
-					file.getName(),
-					unix,
-					rulesets,
-					userData,
-					formatterCallback,
-					isScript,
-					null,
-					false,
-					editorConfigOverride,
-					false));
-		} else {
-			// Use Params for backward compatibility
-			return KtLint.INSTANCE.format(new KtLint.Params(
-					file.getName(),
-					unix,
-					rulesets,
-					userData,
-					formatterCallback,
-					isScript,
-					null,
-					false));
-		}
+		return KtLint.INSTANCE.format(new ExperimentalParams(
+				file.getName(),
+				unix,
+				rulesets,
+				userData,
+				formatterCallback,
+				isScript,
+				null,
+				false,
+				editorConfigOverride,
+				false));
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index d58331ec1b..f57ef1e997 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -18,10 +18,6 @@
 import java.io.IOException;
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Objects;
@@ -31,18 +27,15 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
-import com.diffplug.spotless.ThrowingEx;
 
 /** Wraps up <a href="https://github.com/pinterest/ktlint">ktlint</a> as a FormatterStep. */
 public class KtLintStep {
 	// prevent direct instantiation
 	private KtLintStep() {}
 
-	private static final String DEFAULT_VERSION = "0.45.2";
+	private static final String DEFAULT_VERSION = "0.46.1";
 	static final String NAME = "ktlint";
-	static final String PACKAGE_PRE_0_32 = "com.github.shyiko";
 	static final String PACKAGE = "com.pinterest";
-	static final String MAVEN_COORDINATE_PRE_0_32 = PACKAGE_PRE_0_32 + ":ktlint:";
 	static final String MAVEN_COORDINATE = PACKAGE + ":ktlint:";
 
 	public static FormatterStep create(Provisioner provisioner) {
@@ -85,95 +78,30 @@ static final class State implements Serializable {
 
 		/** Are the files being linted Kotlin script files. */
 		private final boolean isScript;
-		private final String pkg;
 		/** The jar that contains the formatter. */
 		final JarState jarState;
 		private final boolean useExperimental;
 		private final TreeMap<String, String> userData;
 		private final TreeMap<String, Object> editorConfigOverride;
-		private final boolean useParams;
 
 		State(String version, Provisioner provisioner, boolean isScript, boolean useExperimental,
 				Map<String, String> userData, Map<String, Object> editorConfigOverride) throws IOException {
 
-			if (!editorConfigOverride.isEmpty() &&
-					BadSemver.version(version) < BadSemver.version(0, 45, 2)) {
-				throw new IllegalStateException("KtLint editorConfigOverride supported for version 0.45.2 and later");
+			if (BadSemver.version(version) < BadSemver.version(0, 46, 0)) {
+				throw new IllegalStateException("KtLint versions < 0.46.0 not supported!");
 			}
 
 			this.useExperimental = useExperimental;
 			this.userData = new TreeMap<>(userData);
 			this.editorConfigOverride = new TreeMap<>(editorConfigOverride);
-			String coordinate;
-			if (BadSemver.version(version) < BadSemver.version(0, 32)) {
-				coordinate = MAVEN_COORDINATE_PRE_0_32;
-				this.pkg = PACKAGE_PRE_0_32;
-			} else {
-				coordinate = MAVEN_COORDINATE;
-				this.pkg = PACKAGE;
-			}
-			this.useParams = BadSemver.version(version) >= BadSemver.version(0, 34);
-			this.jarState = JarState.from(coordinate + version, provisioner);
+			this.jarState = JarState.from(MAVEN_COORDINATE + version, provisioner);
 			this.isScript = isScript;
 		}
 
 		FormatterFunc createFormat() throws Exception {
-			if (useParams) {
-				Class<?> formatterFunc = jarState.getClassLoader().loadClass("com.diffplug.spotless.glue.ktlint.KtlintFormatterFunc");
-				Constructor<?> constructor = formatterFunc.getConstructor(boolean.class, boolean.class, Map.class, Map.class);
-				return (FormatterFunc.NeedsFile) constructor.newInstance(isScript, useExperimental, userData, editorConfigOverride);
-			}
-
-			ClassLoader classLoader = jarState.getClassLoader();
-			// String KtLint::format(String input, Iterable<RuleSet> rules, Function2 errorCallback)
-
-			ArrayList<Object> ruleSets = new ArrayList<>();
-
-			// first, we get the standard rules
-			Class<?> standardRuleSetProviderClass = classLoader.loadClass(pkg + ".ktlint.ruleset.standard.StandardRuleSetProvider");
-			Object standardRuleSet = standardRuleSetProviderClass.getMethod("get").invoke(standardRuleSetProviderClass.newInstance());
-			ruleSets.add(standardRuleSet);
-
-			// second, we get the experimental rules if desired
-			if (useExperimental) {
-				Class<?> experimentalRuleSetProviderClass = classLoader.loadClass(pkg + ".ktlint.ruleset.experimental.ExperimentalRuleSetProvider");
-				Object experimentalRuleSet = experimentalRuleSetProviderClass.getMethod("get").invoke(experimentalRuleSetProviderClass.newInstance());
-				ruleSets.add(experimentalRuleSet);
-			}
-
-			// next, we create an error callback which throws an assertion error when the format is bad
-			Class<?> function2Interface = classLoader.loadClass("kotlin.jvm.functions.Function2");
-			Class<?> lintErrorClass = classLoader.loadClass(pkg + ".ktlint.core.LintError");
-			Method detailGetter = lintErrorClass.getMethod("getDetail");
-			Method lineGetter = lintErrorClass.getMethod("getLine");
-			Method colGetter = lintErrorClass.getMethod("getCol");
-			Object formatterCallback = Proxy.newProxyInstance(classLoader, new Class[]{function2Interface},
-					(proxy, method, args) -> {
-						Object lintError = args[0]; //ktlint.core.LintError
-						boolean corrected = (Boolean) args[1];
-						if (!corrected) {
-							String detail = (String) detailGetter.invoke(lintError);
-							int line = (Integer) lineGetter.invoke(lintError);
-							int col = (Integer) colGetter.invoke(lintError);
-							throw new AssertionError("Error on line: " + line + ", column: " + col + "\n" + detail);
-						}
-						return null;
-					});
-
-			// grab the KtLint singleton
-			Class<?> ktlintClass = classLoader.loadClass(pkg + ".ktlint.core.KtLint");
-			Object ktlint = ktlintClass.getDeclaredField("INSTANCE").get(null);
-
-			// and its format method
-			String formatterMethodName = isScript ? "formatScript" : "format";
-			Method formatterMethod = ktlintClass.getMethod(formatterMethodName, String.class, Iterable.class, Map.class, function2Interface);
-			return input -> {
-				try {
-					return (String) formatterMethod.invoke(ktlint, input, ruleSets, userData, formatterCallback);
-				} catch (InvocationTargetException e) {
-					throw ThrowingEx.unwrapCause(e);
-				}
-			};
+			Class<?> formatterFunc = jarState.getClassLoader().loadClass("com.diffplug.spotless.glue.ktlint.KtlintFormatterFunc");
+			Constructor<?> constructor = formatterFunc.getConstructor(boolean.class, boolean.class, Map.class, Map.class);
+			return (FormatterFunc.NeedsFile) constructor.newInstance(isScript, useExperimental, userData, editorConfigOverride);
 		}
 	}
 }
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 178b8ec39b..77d94486bb 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,6 +5,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Support for `MAC_CLASSIC` (`\r`) line ending ([#1243](https://github.com/diffplug/spotless/pull/1243) fixes [#1196](https://github.com/diffplug/spotless/issues/1196))
+### Changes
+* Bump default `ktlint` version to latest `0.45.2` -> `0.46.1` [#1239](https://github.com/diffplug/spotless/issues/1239)
+  * Note that we now require `ktlint >= 0.46.0` due to frequent compatibility breakages
 
 ## [6.7.2] - 2022-06-11
 ### Fixed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index f6c5bcc84e..adefaacb5e 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,6 +5,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Support for `MAC_CLASSIC` (`\r`) line ending ([#1243](https://github.com/diffplug/spotless/pull/1243) fixes [#1196](https://github.com/diffplug/spotless/issues/1196))
+### Changes
+* Bump default `ktlint` version to latest `0.45.2` -> `0.46.1` [#1239](https://github.com/diffplug/spotless/issues/1239)
+  * Note that we now require `ktlint >= 0.46.0` due to frequent compatibility breakages
 
 ## [2.22.8] - 2022-06-11
 ### Fixed
diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
index af61ac4cd0..388fa57e74 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
@@ -42,8 +42,8 @@ void behavior() throws Exception {
 	}
 
 	@Test
-	void worksShyiko() throws Exception {
-		FormatterStep step = KtLintStep.create("0.31.0", TestProvisioner.mavenCentral());
+	void worksPre0_46_1() throws Exception {
+		FormatterStep step = KtLintStep.create("0.46.0", TestProvisioner.mavenCentral());
 		StepHarness.forStep(step)
 				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean")
 				.testResourceException("kotlin/ktlint/unsolvable.dirty", assertion -> {
@@ -53,48 +53,17 @@ void worksShyiko() throws Exception {
 				});
 	}
 
-	// Regression test to ensure it works on the version it switched to Pinterest (version 0.32.0)
-	// but before 0.34.
-	// https://github.com/diffplug/spotless/issues/419
-	@Test
-	void worksPinterestAndPre034() throws Exception {
-		FormatterStep step = KtLintStep.create("0.32.0", TestProvisioner.mavenCentral());
-		StepHarness.forStep(step)
-				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean")
-				.testResourceException("kotlin/ktlint/unsolvable.dirty", assertion -> {
-					assertion.isInstanceOf(AssertionError.class);
-					assertion.hasMessage("Error on line: 1, column: 1\n" +
-							"Wildcard import");
-				});
-	}
-
-	// Regression test to handle alpha and 1.x version numbers
-	// https://github.com/diffplug/spotless/issues/668
-	@Test
-	void worksAlpha1() throws Exception {
-		FormatterStep step = KtLintStep.create("0.38.0-alpha01", TestProvisioner.mavenCentral());
-		StepHarness.forStep(step)
-				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean");
-	}
-
-	@Test
-	void worksPre0_45_2() throws Exception {
-		FormatterStep step = KtLintStep.create("0.45.1", TestProvisioner.mavenCentral());
-		StepHarness.forStep(step)
-				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean");
-	}
-
 	@Test
 	void equality() throws Exception {
 		new SerializableEqualityTester() {
-			String version = "0.32.0";
+			String version = "0.46.0";
 
 			@Override
 			protected void setupTest(API api) {
 				// same version == same
 				api.areDifferentThan();
 				// change the version, and it's different
-				version = "0.38.0-alpha01";
+				version = "0.46.1";
 				api.areDifferentThan();
 			}
 

From 652e1f0786a1721b8b5c15f4063e422739a42789 Mon Sep 17 00:00:00 2001
From: Mitchell Skaggs <skaggsm333@gmail.com>
Date: Tue, 28 Jun 2022 21:45:47 -0500
Subject: [PATCH 0200/2068] Remove outdated test comment

---
 .../java/com/diffplug/spotless/kotlin/KtLintStepTest.java    | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
index 388fa57e74..a4a43ef44e 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
@@ -23,11 +23,6 @@
 import com.diffplug.spotless.StepHarness;
 import com.diffplug.spotless.TestProvisioner;
 
-/**
- * This class is the only one that uses jcenter, and it seems to be the only one that
- * causes these problems. The root is still a gradle bug, but in the meantime we don't
- * need to hold up *every* PR with this: https://github.com/gradle/gradle/issues/11752
- */
 class KtLintStepTest extends ResourceHarness {
 	@Test
 	void behavior() throws Exception {

From cfe2cf41af4062d4d374539e8aa68850fadf7619 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 29 Jun 2022 16:10:56 -0700
Subject: [PATCH 0201/2068] Change the verbiage around minimum required
 version.

---
 CHANGES.md                                                 | 7 +++----
 .../main/java/com/diffplug/spotless/kotlin/DiktatStep.java | 2 +-
 plugin-gradle/CHANGES.md                                   | 7 +++----
 plugin-maven/CHANGES.md                                    | 7 +++----
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 760595e88c..3a415d83ca 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,10 +12,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Support for `MAC_CLASSIC` (`\r`) line ending ([#1243](https://github.com/diffplug/spotless/pull/1243) fixes [#1196](https://github.com/diffplug/spotless/issues/1196))
-### Fixed
-* Bump default `diktat` version to latest `1.1.0` -> `1.2.1`. ([saveourtool/diktat#1399](https://github.com/saveourtool/diktat/issues/1399))
-  * Note that support `diktat` version `1.2.1` is or higher
-  * The property `userData` is removed
+### Changed
+* Minimum required `diktat` version bumped to `1.2.1` ([#1246](https://github.com/diffplug/spotless/pull/1246))
+  * Default bumped from `1.1.0` -> `1.2.1`
 
 ## [2.26.2] - 2022-06-11
 ### Fixed
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
index 94921a99bd..ff3e3240cf 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
@@ -59,7 +59,7 @@ public static FormatterStep createForScript(String versionDiktat, Provisioner pr
 
 	public static FormatterStep create(String versionDiktat, Provisioner provisioner, boolean isScript, @Nullable FileSignature config) {
 		if (BadSemver.version(versionDiktat) < BadSemver.version(MIN_SUPPORTED_VERSION)) {
-			throw new IllegalStateException("Diktat supported for version " + MIN_SUPPORTED_VERSION + " and later");
+			throw new IllegalStateException("Minimum required Diktat version is " + MIN_SUPPORTED_VERSION + ", you tried " + versionDiktat + " which is too old");
 		}
 		Objects.requireNonNull(versionDiktat, "versionDiktat");
 		Objects.requireNonNull(provisioner, "provisioner");
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 05bd5f7ce6..266c0ac151 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,10 +5,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Support for `MAC_CLASSIC` (`\r`) line ending ([#1243](https://github.com/diffplug/spotless/pull/1243) fixes [#1196](https://github.com/diffplug/spotless/issues/1196))
-### Fixed
-* Bump default `diktat` version to latest `1.1.0` -> `1.2.1`. ([saveourtool/diktat#1399](https://github.com/saveourtool/diktat/issues/1399))
-  * Note that support `diktat` version `1.2.1` is or higher
-  * The property `userData` is removed
+### Changed
+* Minimum required `diktat` version bumped to `1.2.1` ([#1246](https://github.com/diffplug/spotless/pull/1246))
+  * Default bumped from `1.1.0` -> `1.2.1`
 
 ## [6.7.2] - 2022-06-11
 ### Fixed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 259cab1017..25aec044fc 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,10 +5,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Support for `MAC_CLASSIC` (`\r`) line ending ([#1243](https://github.com/diffplug/spotless/pull/1243) fixes [#1196](https://github.com/diffplug/spotless/issues/1196))
-### Fixed
-* Bump default `diktat` version to latest `1.1.0` -> `1.2.1`. ([saveourtool/diktat#1399](https://github.com/saveourtool/diktat/issues/1399))
-  * Note that support `diktat` version `1.2.1` is or higher
-  * The property `userData` is removed
+### Changed
+* Minimum required `diktat` version bumped to `1.2.1` ([#1246](https://github.com/diffplug/spotless/pull/1246))
+  * Default bumped from `1.1.0` -> `1.2.1`
 
 ## [2.22.8] - 2022-06-11
 ### Fixed

From e3e0beb4661e491b6935e44ed1f19e97c29cad09 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 29 Jun 2022 16:11:08 -0700
Subject: [PATCH 0202/2068] spotlessApply

---
 .../java/com/diffplug/spotless/kotlin/DiktatStepTest.java    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
index c37289c6e6..0075aed162 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
@@ -73,10 +73,9 @@ void behaviorConf() throws Exception {
 	@Test
 	void notSupportedVersion() {
 		final IllegalStateException notSupportedException = Assertions.assertThrows(IllegalStateException.class,
-			() -> DiktatStep.create("1.2.0", TestProvisioner.mavenCentral()));
+				() -> DiktatStep.create("1.2.0", TestProvisioner.mavenCentral()));
 		Assertions.assertTrue(
-			notSupportedException.getMessage().contains("Diktat supported for version 1.2.1 and later")
-		);
+				notSupportedException.getMessage().contains("Diktat supported for version 1.2.1 and later"));
 
 		Assertions.assertDoesNotThrow(() -> DiktatStep.create("1.2.1", TestProvisioner.mavenCentral()));
 		Assertions.assertDoesNotThrow(() -> DiktatStep.create("2.0.0", TestProvisioner.mavenCentral()));

From 3022df74439315487e60149d72ee3f4e1ab9cc55 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 29 Jun 2022 16:35:11 -0700
Subject: [PATCH 0203/2068] Bump diktat down to latest published version, 1.2.0

---
 CHANGES.md                                                  | 4 ++--
 .../main/java/com/diffplug/spotless/kotlin/DiktatStep.java  | 4 ++--
 plugin-gradle/CHANGES.md                                    | 4 ++--
 plugin-maven/CHANGES.md                                     | 4 ++--
 .../java/com/diffplug/spotless/kotlin/DiktatStepTest.java   | 6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 3a415d83ca..0512418d94 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,8 +13,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * Support for `MAC_CLASSIC` (`\r`) line ending ([#1243](https://github.com/diffplug/spotless/pull/1243) fixes [#1196](https://github.com/diffplug/spotless/issues/1196))
 ### Changed
-* Minimum required `diktat` version bumped to `1.2.1` ([#1246](https://github.com/diffplug/spotless/pull/1246))
-  * Default bumped from `1.1.0` -> `1.2.1`
+* Minimum required `diktat` version bumped to `1.2.0` ([#1246](https://github.com/diffplug/spotless/pull/1246))
+  * Default bumped from `1.1.0` -> `1.2.0`
 
 ## [2.26.2] - 2022-06-11
 ### Fixed
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
index ff3e3240cf..92dcd8f51c 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
@@ -30,9 +30,9 @@ public class DiktatStep {
 	// prevent direct instantiation
 	private DiktatStep() {}
 
-	private static final String MIN_SUPPORTED_VERSION = "1.2.1";
+	private static final String MIN_SUPPORTED_VERSION = "1.2.0";
 
-	private static final String DEFAULT_VERSION = "1.2.1";
+	private static final String DEFAULT_VERSION = "1.2.0";
 	static final String NAME = "diktat";
 	static final String PACKAGE_DIKTAT = "org.cqfn.diktat";
 	static final String MAVEN_COORDINATE = PACKAGE_DIKTAT + ":diktat-rules:";
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 266c0ac151..69844c1daa 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -6,8 +6,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * Support for `MAC_CLASSIC` (`\r`) line ending ([#1243](https://github.com/diffplug/spotless/pull/1243) fixes [#1196](https://github.com/diffplug/spotless/issues/1196))
 ### Changed
-* Minimum required `diktat` version bumped to `1.2.1` ([#1246](https://github.com/diffplug/spotless/pull/1246))
-  * Default bumped from `1.1.0` -> `1.2.1`
+* Minimum required `diktat` version bumped to `1.2.0` ([#1246](https://github.com/diffplug/spotless/pull/1246))
+  * Default bumped from `1.1.0` -> `1.2.0`
 
 ## [6.7.2] - 2022-06-11
 ### Fixed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 25aec044fc..63c121a007 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -6,8 +6,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * Support for `MAC_CLASSIC` (`\r`) line ending ([#1243](https://github.com/diffplug/spotless/pull/1243) fixes [#1196](https://github.com/diffplug/spotless/issues/1196))
 ### Changed
-* Minimum required `diktat` version bumped to `1.2.1` ([#1246](https://github.com/diffplug/spotless/pull/1246))
-  * Default bumped from `1.1.0` -> `1.2.1`
+* Minimum required `diktat` version bumped to `1.2.0` ([#1246](https://github.com/diffplug/spotless/pull/1246))
+  * Default bumped from `1.1.0` -> `1.2.0`
 
 ## [2.22.8] - 2022-06-11
 ### Fixed
diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
index 0075aed162..2a955f16cb 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
@@ -54,7 +54,7 @@ void behaviorConf() throws Exception {
 		File conf = setFile(configPath).toResource("kotlin/diktat/diktat-analysis.yml");
 		FileSignature config = signAsList(conf);
 
-		FormatterStep step = DiktatStep.create("1.2.1", TestProvisioner.mavenCentral(), config);
+		FormatterStep step = DiktatStep.create("1.2.0", TestProvisioner.mavenCentral(), config);
 		StepHarness.forStep(step)
 				.testResourceException("kotlin/diktat/Unsolvable.kt", assertion -> {
 					assertion.isInstanceOf(AssertionError.class);
@@ -73,9 +73,9 @@ void behaviorConf() throws Exception {
 	@Test
 	void notSupportedVersion() {
 		final IllegalStateException notSupportedException = Assertions.assertThrows(IllegalStateException.class,
-				() -> DiktatStep.create("1.2.0", TestProvisioner.mavenCentral()));
+				() -> DiktatStep.create("1.1.0", TestProvisioner.mavenCentral()));
 		Assertions.assertTrue(
-				notSupportedException.getMessage().contains("Diktat supported for version 1.2.1 and later"));
+				notSupportedException.getMessage().contains("Minimum required Diktat version is 1.2.0, you tried 1.1.0 which is too old"));
 
 		Assertions.assertDoesNotThrow(() -> DiktatStep.create("1.2.1", TestProvisioner.mavenCentral()));
 		Assertions.assertDoesNotThrow(() -> DiktatStep.create("2.0.0", TestProvisioner.mavenCentral()));

From 9b0cf08d2ea69a1d32e4f5bcd0e910a623e2f779 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 29 Jun 2022 18:45:56 -0700
Subject: [PATCH 0204/2068] Update the maven tests for Diktat.

---
 .../java/com/diffplug/spotless/maven/kotlin/DiktatTest.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/DiktatTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/DiktatTest.java
index bd37c5c82e..eccaa7ac2e 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/DiktatTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/DiktatTest.java
@@ -40,7 +40,7 @@ void testDiktatWithVersion() throws Exception {
 
 		writePomWithKotlinSteps(
 				"<diktat>",
-				"  <version>1.0.1</version>",
+				"  <version>1.2.0</version>",
 				"</diktat>");
 
 		String path = "src/main/kotlin/Main.kt";
@@ -56,7 +56,7 @@ void testDiktatConfig() throws Exception {
 		File conf = setFile(configPath).toResource("kotlin/diktat/diktat-analysis.yml");
 		writePomWithKotlinSteps(
 				"<diktat>",
-				"  <version>1.0.1</version>",
+				"  <version>1.2.0</version>",
 				"  <configFile>" + conf.getAbsolutePath() + "</configFile>",
 				"</diktat>");
 

From 1d9d686d99332f70e3d8d2d42c7a57a0e89ac8f4 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 30 Jun 2022 09:10:22 -0700
Subject: [PATCH 0205/2068] Fixup a bunch of ktlint tests.

---
 .../gradle/spotless/KotlinExtensionTest.java  | 67 ++++---------------
 .../kotlin/ktlint/basic.clean-indent6         |  5 ++
 .../KotlinCodeWithMultiYearHeader.test        |  1 +
 .../KotlinCodeWithMultiYearHeader2.test       |  1 +
 .../KotlinCodeWithoutHeader.test              |  3 +-
 5 files changed, 21 insertions(+), 56 deletions(-)
 create mode 100644 testlib/src/main/resources/kotlin/ktlint/basic.clean-indent6

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
index da2a604681..b2952f18b3 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
@@ -15,13 +15,10 @@
  */
 package com.diffplug.gradle.spotless;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.condition.JRE.JAVA_11;
 
 import java.io.IOException;
 
-import org.gradle.testkit.runner.BuildResult;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledForJreRange;
 
@@ -42,9 +39,9 @@ void integration() throws IOException {
 				"        ktlint()",
 				"    }",
 				"}");
-		setFile("src/main/kotlin/basic.kt").toResource("kotlin/ktlint/basic.dirty");
+		setFile("src/main/kotlin/Main.kt").toResource("kotlin/ktlint/basic.dirty");
 		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("src/main/kotlin/basic.kt").sameAsResource("kotlin/ktlint/basic.clean");
+		assertFile("src/main/kotlin/Main.kt").sameAsResource("kotlin/ktlint/basic.clean");
 	}
 
 	@Test
@@ -132,12 +129,12 @@ void testWithIndentation() throws IOException {
 				"repositories { mavenCentral() }",
 				"spotless {",
 				"    kotlin {",
-				"        ktlint('0.32.0').userData(['indent_size': '6'])",
+				"        ktlint().editorConfigOverride(['indent_size': '6'])",
 				"    }",
 				"}");
-		setFile("src/main/kotlin/basic.kt").toResource("kotlin/ktlint/basic.dirty");
-		BuildResult result = gradleRunner().withArguments("spotlessApply").buildAndFail();
-		assertThat(result.getOutput()).contains("Unexpected indentation (4) (it should be 6)");
+		setFile("src/main/kotlin/Main.kt").toResource("kotlin/ktlint/basic.dirty");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("src/main/kotlin/Main.kt").sameAsResource("kotlin/ktlint/basic.clean-indent6");
 	}
 
 	@Test
@@ -153,27 +150,9 @@ void withExperimental() throws IOException {
 				"        ktlint().setUseExperimental(true)",
 				"    }",
 				"}");
-		setFile("src/main/kotlin/experimental.kt").toResource("kotlin/ktlint/experimental.dirty");
-		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("src/main/kotlin/experimental.kt").sameAsResource("kotlin/ktlint/experimental.clean");
-	}
-
-	@Test
-	void withExperimental_0_32() throws IOException {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    kotlin {",
-				"        ktlint('0.32.0').setUseExperimental(true)",
-				"    }",
-				"}");
-		setFile("src/main/kotlin/basic.kt").toResource("kotlin/ktlint/basic.dirty");
+		setFile("src/main/kotlin/Main.kt").toResource("kotlin/ktlint/experimental.dirty");
 		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("src/main/kotlin/basic.kt").sameAsResource("kotlin/ktlint/basic.clean");
+		assertFile("src/main/kotlin/Main.kt").sameAsResource("kotlin/ktlint/experimental.clean");
 	}
 
 	@Test
@@ -193,31 +172,9 @@ void withExperimentalEditorConfigOverride() throws IOException {
 				"            ])",
 				"    }",
 				"}");
-		setFile("src/main/kotlin/experimental.kt").toResource("kotlin/ktlint/experimentalEditorConfigOverride.dirty");
+		setFile("src/main/kotlin/Main.kt").toResource("kotlin/ktlint/experimentalEditorConfigOverride.dirty");
 		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("src/main/kotlin/experimental.kt").sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.clean");
-	}
-
-	@Test
-	void withEditorConfigOverride_0_45_1() throws IOException {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    kotlin {",
-				"        ktlint('0.45.1')",
-				"            .editorConfigOverride([",
-				"        	    indent_size: 5",
-				"            ])",
-				"    }",
-				"}");
-		setFile("src/main/kotlin/basic.kt").toResource("kotlin/ktlint/basic.dirty");
-		Throwable error = assertThrows(Throwable.class,
-				() -> gradleRunner().withArguments("spotlessApply").build());
-		assertThat(error).hasMessageContaining("KtLint editorConfigOverride supported for version 0.45.2 and later");
+		assertFile("src/main/kotlin/Main.kt").sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.clean");
 	}
 
 	/**
@@ -240,9 +197,9 @@ void experimentalSampleUnchangedWithDefaultRuleset() throws IOException {
 				"        ktlint()",
 				"    }",
 				"}");
-		setFile("src/main/kotlin/experimental.kt").toResource("kotlin/ktlint/experimental.dirty");
+		setFile("src/main/kotlin/Main.kt").toResource("kotlin/ktlint/experimental.dirty");
 		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("src/main/kotlin/experimental.kt").sameAsResource("kotlin/ktlint/experimental.dirty");
+		assertFile("src/main/kotlin/Main.kt").sameAsResource("kotlin/ktlint/experimental.dirty");
 	}
 
 	@Test
diff --git a/testlib/src/main/resources/kotlin/ktlint/basic.clean-indent6 b/testlib/src/main/resources/kotlin/ktlint/basic.clean-indent6
new file mode 100644
index 0000000000..cbfbfa8712
--- /dev/null
+++ b/testlib/src/main/resources/kotlin/ktlint/basic.clean-indent6
@@ -0,0 +1,5 @@
+fun main() {
+      fun name() { a(); return b }
+      println(";")
+      println()
+}
diff --git a/testlib/src/main/resources/kotlin/licenseheader/KotlinCodeWithMultiYearHeader.test b/testlib/src/main/resources/kotlin/licenseheader/KotlinCodeWithMultiYearHeader.test
index c8890b5f34..c78a2f8264 100644
--- a/testlib/src/main/resources/kotlin/licenseheader/KotlinCodeWithMultiYearHeader.test
+++ b/testlib/src/main/resources/kotlin/licenseheader/KotlinCodeWithMultiYearHeader.test
@@ -1,5 +1,6 @@
 // License Header 2012, 2014
 @file:JvmName("SomeFileName")
+
 package my.test
 
 object AnObject
diff --git a/testlib/src/main/resources/kotlin/licenseheader/KotlinCodeWithMultiYearHeader2.test b/testlib/src/main/resources/kotlin/licenseheader/KotlinCodeWithMultiYearHeader2.test
index 005124dec9..82c38dec74 100644
--- a/testlib/src/main/resources/kotlin/licenseheader/KotlinCodeWithMultiYearHeader2.test
+++ b/testlib/src/main/resources/kotlin/licenseheader/KotlinCodeWithMultiYearHeader2.test
@@ -1,5 +1,6 @@
 // License Header 2012-2014
 @file:JvmName("SomeFileName")
+
 package my.test
 
 object AnObject2
diff --git a/testlib/src/main/resources/kotlin/licenseheader/KotlinCodeWithoutHeader.test b/testlib/src/main/resources/kotlin/licenseheader/KotlinCodeWithoutHeader.test
index 666ba3a652..16ba57b2d4 100644
--- a/testlib/src/main/resources/kotlin/licenseheader/KotlinCodeWithoutHeader.test
+++ b/testlib/src/main/resources/kotlin/licenseheader/KotlinCodeWithoutHeader.test
@@ -1,4 +1,5 @@
 @file:JvmName("SomeFileName")
+
 package my.test
 
-object AnObject
\ No newline at end of file
+object AnObject

From 1474d990dd3482e4039ebbfd1061f2df4887703f Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 30 Jun 2022 10:57:54 -0700
Subject: [PATCH 0206/2068] Fix the rest of the ktlint tests.

---
 .../gradle/spotless/KotlinExtensionTest.java  | 25 ------
 .../spotless/KotlinGradleExtensionTest.java   | 83 -------------------
 .../spotless/maven/kotlin/KtlintTest.java     | 28 +------
 3 files changed, 3 insertions(+), 133 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
index b2952f18b3..5da722ea44 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
@@ -177,31 +177,6 @@ void withExperimentalEditorConfigOverride() throws IOException {
 		assertFile("src/main/kotlin/Main.kt").sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.clean");
 	}
 
-	/**
-	 * Check that the sample used to verify the experimental ruleset is untouched by the default ruleset, to verify
-	 * that enabling the experimental ruleset is actually doing something.
-	 *
-	 * If this test fails, it's likely that the experimental rule being used as a test graduated into the standard
-	 * ruleset, and therefore a new experimental rule should be used to verify functionality.
-	 */
-	@Test
-	void experimentalSampleUnchangedWithDefaultRuleset() throws IOException {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    kotlin {",
-				"        ktlint()",
-				"    }",
-				"}");
-		setFile("src/main/kotlin/Main.kt").toResource("kotlin/ktlint/experimental.dirty");
-		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("src/main/kotlin/Main.kt").sameAsResource("kotlin/ktlint/experimental.dirty");
-	}
-
 	@Test
 	void testWithHeader() throws IOException {
 		setFile("build.gradle").toLines(
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
index 034174cf73..ef42e89198 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
@@ -94,24 +94,6 @@ void integration_default_diktat() throws IOException {
 		assertThat(result.getOutput()).contains("[AVOID_NESTED_FUNCTIONS] try to avoid using nested functions");
 	}
 
-	@Test
-	void integration_pinterest() throws IOException {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    kotlinGradle {",
-				"        ktlint('0.32.0')",
-				"    }",
-				"}");
-		setFile("configuration.gradle.kts").toResource("kotlin/ktlint/basic.dirty");
-		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("configuration.gradle.kts").sameAsResource("kotlin/ktlint/basic.clean");
-	}
-
 	@Test
 	void indentStep() throws IOException {
 		setFile("build.gradle").toLines(
@@ -147,24 +129,6 @@ void withExperimental() throws IOException {
 		assertFile("configuration.gradle.kts").sameAsResource("kotlin/ktlint/experimental.clean");
 	}
 
-	@Test
-	void withExperimental_0_32() throws IOException {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    kotlinGradle {",
-				"        ktlint('0.32.0').setUseExperimental(true)",
-				"    }",
-				"}");
-		setFile("configuration.gradle.kts").toResource("kotlin/ktlint/basic.dirty");
-		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("configuration.gradle.kts").sameAsResource("kotlin/ktlint/basic.clean");
-	}
-
 	@Test
 	void withExperimentalEditorConfigOverride() throws IOException {
 		setFile("build.gradle").toLines(
@@ -187,53 +151,6 @@ void withExperimentalEditorConfigOverride() throws IOException {
 		assertFile("configuration.gradle.kts").sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.clean");
 	}
 
-	@Test
-	void withEditorConfigOverride_0_45_1() throws IOException {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    kotlinGradle {",
-				"        ktlint('0.45.1')",
-				"            .editorConfigOverride([",
-				"        	    indent_size: 5",
-				"            ])",
-				"    }",
-				"}");
-		setFile("configuration.gradle.kts").toResource("kotlin/ktlint/basic.dirty");
-		Throwable error = assertThrows(Throwable.class,
-				() -> gradleRunner().withArguments("spotlessApply").build());
-		assertThat(error).hasMessageContaining("KtLint editorConfigOverride supported for version 0.45.2 and later");
-	}
-
-	/**
-	 * Check that the sample used to verify the experimental ruleset is untouched by the default ruleset, to verify
-	 * that enabling the experimental ruleset is actually doing something.
-	 *
-	 * If this test fails, it's likely that the experimental rule being used as a test graduated into the standard
-	 * ruleset, and therefore a new experimental rule should be used to verify functionality.
-	 */
-	@Test
-	void experimentalSampleUnchangedWithDefaultRuleset() throws IOException {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    kotlinGradle {",
-				"        ktlint()",
-				"    }",
-				"}");
-		setFile("configuration.gradle.kts").toResource("kotlin/ktlint/experimental.dirty");
-		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("configuration.gradle.kts").sameAsResource("kotlin/ktlint/experimental.dirty");
-	}
-
 	@Test
 	@EnabledForJreRange(min = JAVA_11) // ktfmt's dependency, google-java-format 1.8 requires a minimum of JRE 11+.
 	void integration_ktfmt() throws IOException {
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
index 4e75008829..18e3002328 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
@@ -24,31 +24,9 @@ class KtlintTest extends MavenIntegrationHarness {
 	void testKtlint() throws Exception {
 		writePomWithKotlinSteps("<ktlint/>");
 
-		String path1 = "src/main/kotlin/main1.kt";
-		String path2 = "src/main/kotlin/main2.kt";
-
-		setFile(path1).toResource("kotlin/ktlint/basic.dirty");
-		setFile(path2).toResource("kotlin/ktlint/basic.dirty");
-
+		String path = "src/main/kotlin/Main.kt";
+		setFile(path).toResource("kotlin/ktlint/basic.dirty");
 		mavenRunner().withArguments("spotless:apply").runNoError();
-
-		assertFile(path1).sameAsResource("kotlin/ktlint/basic.clean");
-		assertFile(path2).sameAsResource("kotlin/ktlint/basic.clean");
-	}
-
-	@Test
-	void testKtlintShyiko() throws Exception {
-		writePomWithKotlinSteps("<ktlint><version>0.21.0</version></ktlint>");
-
-		String path1 = "src/main/kotlin/main1.kt";
-		String path2 = "src/main/kotlin/main2.kt";
-
-		setFile(path1).toResource("kotlin/ktlint/basic.dirty");
-		setFile(path2).toResource("kotlin/ktlint/basic.dirty");
-
-		mavenRunner().withArguments("spotless:apply").runNoError();
-
-		assertFile(path1).sameAsResource("kotlin/ktlint/basic.clean");
-		assertFile(path2).sameAsResource("kotlin/ktlint/basic.clean");
+		assertFile(path).sameAsResource("kotlin/ktlint/basic.clean");
 	}
 }

From 4befeaf5b4d2d25541108beb5a6512f5d9b67ac6 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 30 Jun 2022 12:30:57 -0700
Subject: [PATCH 0207/2068] spotlessApply

---
 .../com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java | 1 -
 .../java/com/diffplug/spotless/maven/kotlin/KtlintTest.java     | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
index ef42e89198..0f3438ffff 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
@@ -16,7 +16,6 @@
 package com.diffplug.gradle.spotless;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.condition.JRE.JAVA_11;
 
 import java.io.IOException;
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
index 18e3002328..887f7a3f50 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 502a8f0c1bc4a1e9f299f60584d80add7236ad9d Mon Sep 17 00:00:00 2001
From: Andrey Kuleshov <andrewkuleshov7@gmail.com>
Date: Thu, 30 Jun 2022 22:44:10 +0300
Subject: [PATCH 0208/2068] Updated diktat version to 1.2.1

---
 lib/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 97897b68bb..9491be4a03 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -51,7 +51,7 @@ dependencies {
 	ktlintCompileOnly "com.pinterest.ktlint:ktlint-ruleset-experimental:$VER_KTLINT"
 	ktlintCompileOnly "com.pinterest.ktlint:ktlint-ruleset-standard:$VER_KTLINT"
 
-	String VER_DIKTAT = "1.2.0"
+	String VER_DIKTAT = "1.2.1"
 	diktatCompileOnly "org.cqfn.diktat:diktat-rules:$VER_DIKTAT"
 
 	// used for markdown formatting

From e0286ee22dae7e47a76c94eb476b19b3bfd5dd3b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 30 Jun 2022 19:48:03 +0000
Subject: [PATCH 0209/2068] Bump ktfmt from 0.37 to 0.39

Bumps [ktfmt](https://github.com/facebookincubator/ktfmt) from 0.37 to 0.39.
- [Release notes](https://github.com/facebookincubator/ktfmt/releases)
- [Commits](https://github.com/facebookincubator/ktfmt/compare/v0.37...v0.39)

---
updated-dependencies:
- dependency-name: com.facebook:ktfmt
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 lib/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index f819a3c2fe..68f92c69f0 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -36,7 +36,7 @@ dependencies {
 
 	palantirJavaFormatCompileOnly 'com.palantir.javaformat:palantir-java-format:1.1.0'
 
-	String VER_KTFMT = '0.37'
+	String VER_KTFMT = '0.39'
 	ktfmtCompileOnly "com.facebook:ktfmt:$VER_KTFMT"
 	String VER_KTLINT_GOOGLE_JAVA_FORMAT = '1.7' // for JDK 8 compatibility
 	ktfmtCompileOnly("com.google.googlejavaformat:google-java-format") {

From 2b93b1b19c38c62288e0976c6d2d134ce0588ca2 Mon Sep 17 00:00:00 2001
From: Andrey Kuleshov <andrewkuleshov7@gmail.com>
Date: Thu, 30 Jun 2022 23:02:56 +0300
Subject: [PATCH 0210/2068] Updated all version of diktat (including tests)

---
 .../main/java/com/diffplug/spotless/kotlin/DiktatStep.java    | 4 ++--
 .../java/com/diffplug/spotless/maven/kotlin/DiktatTest.java   | 4 ++--
 .../java/com/diffplug/spotless/kotlin/DiktatStepTest.java     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
index 92dcd8f51c..ff3e3240cf 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
@@ -30,9 +30,9 @@ public class DiktatStep {
 	// prevent direct instantiation
 	private DiktatStep() {}
 
-	private static final String MIN_SUPPORTED_VERSION = "1.2.0";
+	private static final String MIN_SUPPORTED_VERSION = "1.2.1";
 
-	private static final String DEFAULT_VERSION = "1.2.0";
+	private static final String DEFAULT_VERSION = "1.2.1";
 	static final String NAME = "diktat";
 	static final String PACKAGE_DIKTAT = "org.cqfn.diktat";
 	static final String MAVEN_COORDINATE = PACKAGE_DIKTAT + ":diktat-rules:";
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/DiktatTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/DiktatTest.java
index eccaa7ac2e..dc6e59fef0 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/DiktatTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/DiktatTest.java
@@ -40,7 +40,7 @@ void testDiktatWithVersion() throws Exception {
 
 		writePomWithKotlinSteps(
 				"<diktat>",
-				"  <version>1.2.0</version>",
+				"  <version>1.2.1</version>",
 				"</diktat>");
 
 		String path = "src/main/kotlin/Main.kt";
@@ -56,7 +56,7 @@ void testDiktatConfig() throws Exception {
 		File conf = setFile(configPath).toResource("kotlin/diktat/diktat-analysis.yml");
 		writePomWithKotlinSteps(
 				"<diktat>",
-				"  <version>1.2.0</version>",
+				"  <version>1.2.1</version>",
 				"  <configFile>" + conf.getAbsolutePath() + "</configFile>",
 				"</diktat>");
 
diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
index 2a955f16cb..39f939ddf4 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
@@ -54,7 +54,7 @@ void behaviorConf() throws Exception {
 		File conf = setFile(configPath).toResource("kotlin/diktat/diktat-analysis.yml");
 		FileSignature config = signAsList(conf);
 
-		FormatterStep step = DiktatStep.create("1.2.0", TestProvisioner.mavenCentral(), config);
+		FormatterStep step = DiktatStep.create("1.2.1", TestProvisioner.mavenCentral(), config);
 		StepHarness.forStep(step)
 				.testResourceException("kotlin/diktat/Unsolvable.kt", assertion -> {
 					assertion.isInstanceOf(AssertionError.class);

From ad3c18bad8e01149e6df62d264d2af69cc5f416c Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 30 Jun 2022 13:11:43 -0700
Subject: [PATCH 0211/2068] Bump ktfmt programmatically to 0.39 also.

---
 CHANGES.md                                                    | 3 ++-
 lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java | 2 +-
 plugin-gradle/CHANGES.md                                      | 3 ++-
 plugin-maven/CHANGES.md                                       | 3 ++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 45511490d6..47f9542dc3 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,8 +15,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changes
 * Bump default `ktlint` version to latest `0.45.2` -> `0.46.1` ([#1239](https://github.com/diffplug/spotless/issues/1239))
   * Minimum supported version also bumped to `0.46.0` (we have abandoned strong backward compatibility for `ktlint`, from here on out Spotless will only support the most-recent breaking change).
-* Bump default `diktat` version to latest `1.1.0` -> `1.2.0` ([#1246](https://github.com/diffplug/spotless/pull/1246))
+* Bump default `diktat` version to latest `1.1.0` -> `1.2.1` ([#1246](https://github.com/diffplug/spotless/pull/1246))
   * Minimum supported version also bumped to `1.2.0` (diktat is based on ktlint and has the same backward compatibility issues).
+* Bump default `ktfmt` version to latest `0.37` -> `0.39` ([#1240](https://github.com/diffplug/spotless/pull/1240))
 
 ## [2.26.2] - 2022-06-11
 ### Fixed
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
index b7ade56b5f..37bbf786c6 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
@@ -39,7 +39,7 @@ public class KtfmtStep {
 	// prevent direct instantiation
 	private KtfmtStep() {}
 
-	private static final String DEFAULT_VERSION = "0.37";
+	private static final String DEFAULT_VERSION = "0.39";
 	static final String NAME = "ktfmt";
 	static final String PACKAGE = "com.facebook";
 	static final String MAVEN_COORDINATE = PACKAGE + ":ktfmt:";
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 71924d68c0..c3be5003da 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -8,8 +8,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changes
 * Bump default `ktlint` version to latest `0.45.2` -> `0.46.1` ([#1239](https://github.com/diffplug/spotless/issues/1239))
   * Minimum supported version also bumped to `0.46.0` (we have abandoned strong backward compatibility for `ktlint`, from here on out Spotless will only support the most-recent breaking change).
-* Bump default `diktat` version to latest `1.1.0` -> `1.2.0` ([#1246](https://github.com/diffplug/spotless/pull/1246))
+* Bump default `diktat` version to latest `1.1.0` -> `1.2.1` ([#1246](https://github.com/diffplug/spotless/pull/1246))
   * Minimum supported version also bumped to `1.2.0` (diktat is based on ktlint and has the same backward compatibility issues).
+* Bump default `ktfmt` version to latest `0.37` -> `0.39` ([#1240](https://github.com/diffplug/spotless/pull/1240))
 
 ## [6.7.2] - 2022-06-11
 ### Fixed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 5012b9f077..e7165b03d0 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -8,8 +8,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changes
 * Bump default `ktlint` version to latest `0.45.2` -> `0.46.1` ([#1239](https://github.com/diffplug/spotless/issues/1239))
   * Minimum supported version also bumped to `0.46.0` (we have abandoned strong backward compatibility for `ktlint`, from here on out Spotless will only support the most-recent breaking change).
-* Bump default `diktat` version to latest `1.1.0` -> `1.2.0` ([#1246](https://github.com/diffplug/spotless/pull/1246))
+* Bump default `diktat` version to latest `1.1.0` -> `1.2.1` ([#1246](https://github.com/diffplug/spotless/pull/1246))
   * Minimum supported version also bumped to `1.2.0` (diktat is based on ktlint and has the same backward compatibility issues).
+* Bump default `ktfmt` version to latest `0.37` -> `0.39` ([#1240](https://github.com/diffplug/spotless/pull/1240))
 
 ## [2.22.8] - 2022-06-11
 ### Fixed

From 9dde3da38949e385fa1bc035508c4511f058a0e9 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 30 Jun 2022 13:38:54 -0700
Subject: [PATCH 0212/2068] Update changes and a test.

---
 CHANGES.md                                                      | 2 +-
 plugin-gradle/CHANGES.md                                        | 2 +-
 plugin-maven/CHANGES.md                                         | 2 +-
 .../test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 47f9542dc3..5871c0d822 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -16,7 +16,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktlint` version to latest `0.45.2` -> `0.46.1` ([#1239](https://github.com/diffplug/spotless/issues/1239))
   * Minimum supported version also bumped to `0.46.0` (we have abandoned strong backward compatibility for `ktlint`, from here on out Spotless will only support the most-recent breaking change).
 * Bump default `diktat` version to latest `1.1.0` -> `1.2.1` ([#1246](https://github.com/diffplug/spotless/pull/1246))
-  * Minimum supported version also bumped to `1.2.0` (diktat is based on ktlint and has the same backward compatibility issues).
+  * Minimum supported version also bumped to `1.2.1` (diktat is based on ktlint and has the same backward compatibility issues).
 * Bump default `ktfmt` version to latest `0.37` -> `0.39` ([#1240](https://github.com/diffplug/spotless/pull/1240))
 
 ## [2.26.2] - 2022-06-11
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index c3be5003da..45c09688a6 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -9,7 +9,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktlint` version to latest `0.45.2` -> `0.46.1` ([#1239](https://github.com/diffplug/spotless/issues/1239))
   * Minimum supported version also bumped to `0.46.0` (we have abandoned strong backward compatibility for `ktlint`, from here on out Spotless will only support the most-recent breaking change).
 * Bump default `diktat` version to latest `1.1.0` -> `1.2.1` ([#1246](https://github.com/diffplug/spotless/pull/1246))
-  * Minimum supported version also bumped to `1.2.0` (diktat is based on ktlint and has the same backward compatibility issues).
+  * Minimum supported version also bumped to `1.2.1` (diktat is based on ktlint and has the same backward compatibility issues).
 * Bump default `ktfmt` version to latest `0.37` -> `0.39` ([#1240](https://github.com/diffplug/spotless/pull/1240))
 
 ## [6.7.2] - 2022-06-11
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index e7165b03d0..25ffe9f9e7 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -9,7 +9,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktlint` version to latest `0.45.2` -> `0.46.1` ([#1239](https://github.com/diffplug/spotless/issues/1239))
   * Minimum supported version also bumped to `0.46.0` (we have abandoned strong backward compatibility for `ktlint`, from here on out Spotless will only support the most-recent breaking change).
 * Bump default `diktat` version to latest `1.1.0` -> `1.2.1` ([#1246](https://github.com/diffplug/spotless/pull/1246))
-  * Minimum supported version also bumped to `1.2.0` (diktat is based on ktlint and has the same backward compatibility issues).
+  * Minimum supported version also bumped to `1.2.1` (diktat is based on ktlint and has the same backward compatibility issues).
 * Bump default `ktfmt` version to latest `0.37` -> `0.39` ([#1240](https://github.com/diffplug/spotless/pull/1240))
 
 ## [2.22.8] - 2022-06-11
diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
index 39f939ddf4..45bf6524f1 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
@@ -75,7 +75,7 @@ void notSupportedVersion() {
 		final IllegalStateException notSupportedException = Assertions.assertThrows(IllegalStateException.class,
 				() -> DiktatStep.create("1.1.0", TestProvisioner.mavenCentral()));
 		Assertions.assertTrue(
-				notSupportedException.getMessage().contains("Minimum required Diktat version is 1.2.0, you tried 1.1.0 which is too old"));
+				notSupportedException.getMessage().contains("Minimum required Diktat version is 1.2.1, you tried 1.1.0 which is too old"));
 
 		Assertions.assertDoesNotThrow(() -> DiktatStep.create("1.2.1", TestProvisioner.mavenCentral()));
 		Assertions.assertDoesNotThrow(() -> DiktatStep.create("2.0.0", TestProvisioner.mavenCentral()));

From 795f74f4651124d4d53be44ff6f48952852a2263 Mon Sep 17 00:00:00 2001
From: circleci <circleci@f6602ca9bd43>
Date: Thu, 30 Jun 2022 21:05:27 +0000
Subject: [PATCH 0213/2068] Published lib/2.27.0

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 5871c0d822..7f6160b600 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.27.0] - 2022-06-30
 ### Added
 * Support for `MAC_CLASSIC` (`\r`) line ending ([#1243](https://github.com/diffplug/spotless/pull/1243) fixes [#1196](https://github.com/diffplug/spotless/issues/1196))
 ### Changes

From d71bc1812f9fbcabb5cda3e82dac11d7da45e1d5 Mon Sep 17 00:00:00 2001
From: circleci <circleci@f6602ca9bd43>
Date: Thu, 30 Jun 2022 21:06:25 +0000
Subject: [PATCH 0214/2068] Published gradle/6.8.0

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 46 ++++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 45c09688a6..02d8da736d 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [6.8.0] - 2022-06-30
 ### Added
 * Support for `MAC_CLASSIC` (`\r`) line ending ([#1243](https://github.com/diffplug/spotless/pull/1243) fixes [#1196](https://github.com/diffplug/spotless/issues/1196))
 ### Changes
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 52c1d4edac..5301b4287c 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -18,9 +18,9 @@ output = [
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
 [![Maven central](https://img.shields.io/badge/mavencentral-yes-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/index.html)
 [![License Apache](https://img.shields.io/badge/license-apache-blue.svg)](https://tldrlegal.com/license/apache-license-2.0-(apache-2.0))
-[![Changelog](https://img.shields.io/badge/changelog-6.7.2-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-6.8.0-blue.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)
@@ -126,10 +126,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -141,7 +141,7 @@ If you're stuck on an older version of Gradle, `id 'com.diffplug.gradle.spotless
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -248,8 +248,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -300,8 +300,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -364,7 +364,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -396,7 +396,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -428,7 +428,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -462,7 +462,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -483,7 +483,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -508,7 +508,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -548,7 +548,7 @@ sql.formatter.indent.size=4
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -591,7 +591,7 @@ For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#n
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -816,7 +816,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -883,9 +883,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -918,11 +918,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.7.2/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From 8797048124a00aacd9359ff941cc4ddd7ba7b30f Mon Sep 17 00:00:00 2001
From: circleci <circleci@f6602ca9bd43>
Date: Thu, 30 Jun 2022 21:08:45 +0000
Subject: [PATCH 0215/2068] Published maven/2.23.0

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 25ffe9f9e7..2cc389b7d3 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.23.0] - 2022-06-30
 ### Added
 * Support for `MAC_CLASSIC` (`\r`) line ending ([#1243](https://github.com/diffplug/spotless/pull/1243) fixes [#1196](https://github.com/diffplug/spotless/issues/1196))
 ### Changes
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index c4aefd4289..e52d1ee540 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -12,8 +12,8 @@ output = [
   ].join('\n');
 -->
 [![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.22.8/index.html)
-[![Changelog](https://img.shields.io/badge/changelog-2.22.8-brightgreen.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.23.0/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.23.0-brightgreen.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)

From a8037c3c5bdf773e88646b627aaac28ec1f864c8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Jul 2022 12:06:17 +0000
Subject: [PATCH 0216/2068] Bump com.github.spotbugs from 5.0.8 to 5.0.9

Bumps com.github.spotbugs from 5.0.8 to 5.0.9.

---
updated-dependencies:
- dependency-name: com.github.spotbugs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 13792d7260..2733fccd84 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
 		// https://github.com/gradle-nexus/publish-plugin/releases
 		id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
 		// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
-		id 'com.github.spotbugs'                   version '5.0.8'
+		id 'com.github.spotbugs'                   version '5.0.9'
 		// https://github.com/diffplug/spotless-changelog
 		id 'com.diffplug.spotless-changelog'       version '2.3.2'
 		// https://github.com/diffplug/goomph/blob/main/CHANGES.md

From 8a42ae3028dcd6d5cb649bbaa0b04388f38d7f1f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Jul 2022 12:06:20 +0000
Subject: [PATCH 0217/2068] Bump com.gradle.plugin-publish from 0.21.0 to 1.0.0

Bumps com.gradle.plugin-publish from 0.21.0 to 1.0.0.

---
updated-dependencies:
- dependency-name: com.gradle.plugin-publish
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 13792d7260..d87a187b71 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,7 +2,7 @@ pluginManagement {
 	plugins {
 		id 'com.diffplug.spotless'                 version '6.5.0'
 		// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
-		id 'com.gradle.plugin-publish'             version '0.21.0'
+		id 'com.gradle.plugin-publish'             version '1.0.0'
 		// https://github.com/gradle-nexus/publish-plugin/releases
 		id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
 		// https://github.com/spotbugs/spotbugs-gradle-plugin/releases

From 1cbe523dba200baedf98f676ab3d9ead1950e276 Mon Sep 17 00:00:00 2001
From: bh-tt <bert@transtrend.com>
Date: Mon, 11 Jul 2022 16:44:24 +0200
Subject: [PATCH 0218/2068] Lazily check for foreign exes which may not be
 necessary for the current build

---
 .../spotless/cpp/ClangFormatStep.java         | 56 ++++++++++---------
 .../diffplug/spotless/python/BlackStep.java   | 18 +++---
 2 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/cpp/ClangFormatStep.java b/lib/src/main/java/com/diffplug/spotless/cpp/ClangFormatStep.java
index 5256739004..e038aaec90 100644
--- a/lib/src/main/java/com/diffplug/spotless/cpp/ClangFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/cpp/ClangFormatStep.java
@@ -21,6 +21,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 import javax.annotation.Nullable;
 
@@ -68,21 +69,20 @@ public FormatterStep create() {
 
 	private State createState() throws IOException, InterruptedException {
 		String howToInstall = "" +
-				"You can download clang-format from https://releases.llvm.org and " +
-				"then point Spotless to it with {@code pathToExe('/path/to/clang-format')} " +
-				"or you can use your platform's package manager:" +
-				"\n  win:   choco install llvm --version {version}  (try dropping version if it fails)" +
-				"\n  mac:   brew install clang-format (TODO: how to specify version?)" +
-				"\n  linux: apt install clang-format  (try clang-format-{version} with dropped minor versions)" +
-				"\n    github issue to handle this better: https://github.com/diffplug/spotless/issues/673";
-		String exeAbsPath = ForeignExe.nameAndVersion("clang-format", version)
-				.pathToExe(pathToExe)
-				.fixCantFind(howToInstall)
-				.fixWrongVersion(
-						"You can tell Spotless to use the version you already have with {@code clangFormat('{versionFound}')}" +
-								"or you can download the currently specified version, {version}.\n" + howToInstall)
-				.confirmVersionAndGetAbsolutePath();
-		return new State(this, exeAbsPath);
+			"You can download clang-format from https://releases.llvm.org and " +
+			"then point Spotless to it with {@code pathToExe('/path/to/clang-format')} " +
+			"or you can use your platform's package manager:" +
+			"\n  win:   choco install llvm --version {version}  (try dropping version if it fails)" +
+			"\n  mac:   brew install clang-format (TODO: how to specify version?)" +
+			"\n  linux: apt install clang-format  (try clang-format-{version} with dropped minor versions)" +
+			"\n    github issue to handle this better: https://github.com/diffplug/spotless/issues/673";
+		final ForeignExe exe =  ForeignExe.nameAndVersion("clang-format", version)
+			.pathToExe(pathToExe)
+			.fixCantFind(howToInstall)
+			.fixWrongVersion(
+					"You can tell Spotless to use the version you already have with {@code clangFormat('{versionFound}')}" +
+							"or you can download the currently specified version, {version}.\n" + howToInstall);
+		return new State(this, exe);
 	}
 
 	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
@@ -91,24 +91,28 @@ static class State implements Serializable {
 		// used for up-to-date checks and caching
 		final String version;
 		final @Nullable String style;
+		final ForeignExe exe;
 		// used for executing
-		final transient List<String> args;
+		private @Nullable List<String> args;
 
-		State(ClangFormatStep step, String exeAbsPath) {
+		State(ClangFormatStep step, ForeignExe pathToExe) {
 			this.version = step.version;
 			this.style = step.style;
-			args = new ArrayList<>(2);
-			args.add(exeAbsPath);
-			if (style != null) {
-				args.add("--style=" + style);
-			}
+			this.exe = Objects.requireNonNull(pathToExe);
 		}
 
 		String format(ProcessRunner runner, String input, File file) throws IOException, InterruptedException {
-			String[] processArgs = args.toArray(new String[args.size() + 1]);
-			// add an argument to the end
-			processArgs[args.size()] = "--assume-filename=" + file.getName();
-			return runner.exec(input.getBytes(StandardCharsets.UTF_8), processArgs).assertExitZero(StandardCharsets.UTF_8);
+			if (args == null) {
+				final List<String> tmpArgs = new ArrayList<>();
+				tmpArgs.add(exe.confirmVersionAndGetAbsolutePath());
+				if (style != null) {
+					tmpArgs.add("--style="+ style);	
+				}
+				args = tmpArgs;
+			}
+			final String[] processArgs = args.toArray(new String[args.size() + 1]);
+			processArgs[processArgs.length - 1] = "--assume-filename=" + file.getName();
+			return runner.exec(input.getBytes(StandardCharsets.UTF_8), args).assertExitZero(StandardCharsets.UTF_8);
 		}
 
 		FormatterFunc.Closeable toFunc() {
diff --git a/lib/src/main/java/com/diffplug/spotless/python/BlackStep.java b/lib/src/main/java/com/diffplug/spotless/python/BlackStep.java
index 6a03d0d808..b3f0c434f3 100644
--- a/lib/src/main/java/com/diffplug/spotless/python/BlackStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/python/BlackStep.java
@@ -18,8 +18,7 @@
 import java.io.IOException;
 import java.io.Serializable;
 import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.List;
+import java.util.Objects;
 import java.util.regex.Pattern;
 
 import javax.annotation.Nullable;
@@ -62,12 +61,11 @@ public FormatterStep create() {
 
 	private State createState() throws IOException, InterruptedException {
 		String trackingIssue = "\n  github issue to handle this better: https://github.com/diffplug/spotless/issues/674";
-		String exeAbsPath = ForeignExe.nameAndVersion("black", version)
+		ForeignExe exeAbsPath = ForeignExe.nameAndVersion("black", version)
 				.pathToExe(pathToExe)
 				.versionRegex(Pattern.compile("(?:black, version|black,|version) (\\S*)"))
 				.fixCantFind("Try running {@code pip install black=={version}}, or else tell Spotless where it is with {@code black().pathToExe('path/to/executable')}" + trackingIssue)
-				.fixWrongVersion("Try running {@code pip install --force-reinstall black=={version}}, or else specify {@code black('{versionFound}')} to Spotless" + trackingIssue)
-				.confirmVersionAndGetAbsolutePath();
+				.fixWrongVersion("Try running {@code pip install --force-reinstall black=={version}}, or else specify {@code black('{versionFound}')} to Spotless" + trackingIssue);
 		return new State(this, exeAbsPath);
 	}
 
@@ -76,15 +74,19 @@ static class State implements Serializable {
 		private static final long serialVersionUID = -1825662356883926318L;
 		// used for up-to-date checks and caching
 		final String version;
+		final ForeignExe exe;
 		// used for executing
-		final transient List<String> args;
+		private @Nullable String[] args;
 
-		State(BlackStep step, String exeAbsPath) {
+		State(BlackStep step, ForeignExe exeAbsPath) {
 			this.version = step.version;
-			this.args = Arrays.asList(exeAbsPath, "-");
+			this.exe = Objects.requireNonNull(exeAbsPath);
 		}
 
 		String format(ProcessRunner runner, String input) throws IOException, InterruptedException {
+			if (args == null) {
+				args = new String[] {exe.confirmVersionAndGetAbsolutePath(), "-"};
+			}
 			return runner.exec(input.getBytes(StandardCharsets.UTF_8), args).assertExitZero(StandardCharsets.UTF_8);
 		}
 

From 387b14db43054b4c2b2d2b01e1b0c9cccaff9394 Mon Sep 17 00:00:00 2001
From: bh-tt <bert@transtrend.com>
Date: Mon, 11 Jul 2022 16:50:14 +0200
Subject: [PATCH 0219/2068] Add to CHANGES.md

---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index 7f6160b600..90b9ed95b3 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -20,6 +20,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `diktat` version to latest `1.1.0` -> `1.2.1` ([#1246](https://github.com/diffplug/spotless/pull/1246))
   * Minimum supported version also bumped to `1.2.1` (diktat is based on ktlint and has the same backward compatibility issues).
 * Bump default `ktfmt` version to latest `0.37` -> `0.39` ([#1240](https://github.com/diffplug/spotless/pull/1240))
+* Clang and Black no longer break the build when the binary is unavailable, if they will not be run during that build ([#1257](https://github.com/diffplug/spotless/pull/1257))
 
 ## [2.26.2] - 2022-06-11
 ### Fixed

From 2338473edf8086c4d54b5053ffd89208c923d88c Mon Sep 17 00:00:00 2001
From: bh-tt <bert@transtrend.com>
Date: Wed, 13 Jul 2022 08:54:00 +0200
Subject: [PATCH 0220/2068] Transient State fields, fix CHANGES

---
 CHANGES.md                                                    | 4 ++--
 .../main/java/com/diffplug/spotless/cpp/ClangFormatStep.java  | 4 ++--
 lib/src/main/java/com/diffplug/spotless/python/BlackStep.java | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 90b9ed95b3..4b0b1b0e2f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,7 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
-
+### Added
+* Clang and Black no longer break the build when the binary is unavailable, if they will not be run during that build ([#1257](https://github.com/diffplug/spotless/pull/1257))
 ## [2.27.0] - 2022-06-30
 ### Added
 * Support for `MAC_CLASSIC` (`\r`) line ending ([#1243](https://github.com/diffplug/spotless/pull/1243) fixes [#1196](https://github.com/diffplug/spotless/issues/1196))
@@ -20,7 +21,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `diktat` version to latest `1.1.0` -> `1.2.1` ([#1246](https://github.com/diffplug/spotless/pull/1246))
   * Minimum supported version also bumped to `1.2.1` (diktat is based on ktlint and has the same backward compatibility issues).
 * Bump default `ktfmt` version to latest `0.37` -> `0.39` ([#1240](https://github.com/diffplug/spotless/pull/1240))
-* Clang and Black no longer break the build when the binary is unavailable, if they will not be run during that build ([#1257](https://github.com/diffplug/spotless/pull/1257))
 
 ## [2.26.2] - 2022-06-11
 ### Fixed
diff --git a/lib/src/main/java/com/diffplug/spotless/cpp/ClangFormatStep.java b/lib/src/main/java/com/diffplug/spotless/cpp/ClangFormatStep.java
index e038aaec90..aced507ee5 100644
--- a/lib/src/main/java/com/diffplug/spotless/cpp/ClangFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/cpp/ClangFormatStep.java
@@ -91,9 +91,9 @@ static class State implements Serializable {
 		// used for up-to-date checks and caching
 		final String version;
 		final @Nullable String style;
-		final ForeignExe exe;
+		final transient ForeignExe exe;
 		// used for executing
-		private @Nullable List<String> args;
+		private transient @Nullable List<String> args;
 
 		State(ClangFormatStep step, ForeignExe pathToExe) {
 			this.version = step.version;
diff --git a/lib/src/main/java/com/diffplug/spotless/python/BlackStep.java b/lib/src/main/java/com/diffplug/spotless/python/BlackStep.java
index b3f0c434f3..bf98a3a091 100644
--- a/lib/src/main/java/com/diffplug/spotless/python/BlackStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/python/BlackStep.java
@@ -74,9 +74,9 @@ static class State implements Serializable {
 		private static final long serialVersionUID = -1825662356883926318L;
 		// used for up-to-date checks and caching
 		final String version;
-		final ForeignExe exe;
+		final transient ForeignExe exe;
 		// used for executing
-		private @Nullable String[] args;
+		private transient @Nullable String[] args;
 
 		State(BlackStep step, ForeignExe exeAbsPath) {
 			this.version = step.version;

From 82353fd251ccce18c2eb5f2cf900775270513d16 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 26 Jul 2022 16:17:59 -0700
Subject: [PATCH 0221/2068] spotlessApply

---
 .../spotless/cpp/ClangFormatStep.java         | 30 +++++++++----------
 .../diffplug/spotless/python/BlackStep.java   |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/cpp/ClangFormatStep.java b/lib/src/main/java/com/diffplug/spotless/cpp/ClangFormatStep.java
index aced507ee5..2bff28e64e 100644
--- a/lib/src/main/java/com/diffplug/spotless/cpp/ClangFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/cpp/ClangFormatStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 DiffPlug
+ * Copyright 2020-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -69,19 +69,19 @@ public FormatterStep create() {
 
 	private State createState() throws IOException, InterruptedException {
 		String howToInstall = "" +
-			"You can download clang-format from https://releases.llvm.org and " +
-			"then point Spotless to it with {@code pathToExe('/path/to/clang-format')} " +
-			"or you can use your platform's package manager:" +
-			"\n  win:   choco install llvm --version {version}  (try dropping version if it fails)" +
-			"\n  mac:   brew install clang-format (TODO: how to specify version?)" +
-			"\n  linux: apt install clang-format  (try clang-format-{version} with dropped minor versions)" +
-			"\n    github issue to handle this better: https://github.com/diffplug/spotless/issues/673";
-		final ForeignExe exe =  ForeignExe.nameAndVersion("clang-format", version)
-			.pathToExe(pathToExe)
-			.fixCantFind(howToInstall)
-			.fixWrongVersion(
-					"You can tell Spotless to use the version you already have with {@code clangFormat('{versionFound}')}" +
-							"or you can download the currently specified version, {version}.\n" + howToInstall);
+				"You can download clang-format from https://releases.llvm.org and " +
+				"then point Spotless to it with {@code pathToExe('/path/to/clang-format')} " +
+				"or you can use your platform's package manager:" +
+				"\n  win:   choco install llvm --version {version}  (try dropping version if it fails)" +
+				"\n  mac:   brew install clang-format (TODO: how to specify version?)" +
+				"\n  linux: apt install clang-format  (try clang-format-{version} with dropped minor versions)" +
+				"\n    github issue to handle this better: https://github.com/diffplug/spotless/issues/673";
+		final ForeignExe exe = ForeignExe.nameAndVersion("clang-format", version)
+				.pathToExe(pathToExe)
+				.fixCantFind(howToInstall)
+				.fixWrongVersion(
+						"You can tell Spotless to use the version you already have with {@code clangFormat('{versionFound}')}" +
+								"or you can download the currently specified version, {version}.\n" + howToInstall);
 		return new State(this, exe);
 	}
 
@@ -106,7 +106,7 @@ String format(ProcessRunner runner, String input, File file) throws IOException,
 				final List<String> tmpArgs = new ArrayList<>();
 				tmpArgs.add(exe.confirmVersionAndGetAbsolutePath());
 				if (style != null) {
-					tmpArgs.add("--style="+ style);	
+					tmpArgs.add("--style=" + style);
 				}
 				args = tmpArgs;
 			}
diff --git a/lib/src/main/java/com/diffplug/spotless/python/BlackStep.java b/lib/src/main/java/com/diffplug/spotless/python/BlackStep.java
index bf98a3a091..9bce2241dd 100644
--- a/lib/src/main/java/com/diffplug/spotless/python/BlackStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/python/BlackStep.java
@@ -85,7 +85,7 @@ static class State implements Serializable {
 
 		String format(ProcessRunner runner, String input) throws IOException, InterruptedException {
 			if (args == null) {
-				args = new String[] {exe.confirmVersionAndGetAbsolutePath(), "-"};
+				args = new String[]{exe.confirmVersionAndGetAbsolutePath(), "-"};
 			}
 			return runner.exec(input.getBytes(StandardCharsets.UTF_8), args).assertExitZero(StandardCharsets.UTF_8);
 		}

From 1ab9b311c8a308dc79cff3fa72069708c21e92a4 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 26 Jul 2022 16:22:54 -0700
Subject: [PATCH 0222/2068] Update changelogs.

---
 CHANGES.md               | 3 ++-
 plugin-gradle/CHANGES.md | 2 ++
 plugin-maven/CHANGES.md  | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 4b0b1b0e2f..bed2af6281 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,7 +11,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* Clang and Black no longer break the build when the binary is unavailable, if they will not be run during that build ([#1257](https://github.com/diffplug/spotless/pull/1257))
+* Clang and Black no longer break the build when the binary is unavailable, if they will not be run during that build ([#1257](https://github.com/diffplug/spotless/pull/1257)).
+
 ## [2.27.0] - 2022-06-30
 ### Added
 * Support for `MAC_CLASSIC` (`\r`) line ending ([#1243](https://github.com/diffplug/spotless/pull/1243) fixes [#1196](https://github.com/diffplug/spotless/issues/1196))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 02d8da736d..43a1fb1d24 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Added
+* Clang and Black no longer break the build when the binary is unavailable, if they will not be run during that build ([#1257](https://github.com/diffplug/spotless/pull/1257)).
 
 ## [6.8.0] - 2022-06-30
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 2cc389b7d3..3499aeab36 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* Clang and Black no longer break the build when the binary is unavailable, if they will not be run during that build ([#1257](https://github.com/diffplug/spotless/pull/1257)).
 
 ## [2.23.0] - 2022-06-30
 ### Added

From aafd5fd1bb38ed88170394b5d21b3307fb1d0590 Mon Sep 17 00:00:00 2001
From: Stian Steinbakken <stiansteinbakken94@gmail.com>
Date: Wed, 27 Jul 2022 01:26:48 +0200
Subject: [PATCH 0223/2068] docs: update ktfmt comment with all available
 options (#1252)

---
 plugin-maven/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index e52d1ee540..1552c98537 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -329,8 +329,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ```xml
 <ktfmt>
-  <version>0.30</version> <!-- optional -->
-  <style>DEFAULT</style> <!-- optional, other option is DROPBOX -->
+  <version>0.39</version> <!-- optional -->
+  <style>DEFAULT</style> <!-- optional, other options are DROPBOX, GOOGLE and KOTLINLANG -->
 </ktfmt>
 ```
 

From 5ac80236c8d20b5ac68c00565a7261e53cb49294 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Necati=20S=C3=B6zer?=
 <32370872+necatisozer@users.noreply.github.com>
Date: Wed, 27 Jul 2022 02:27:48 +0300
Subject: [PATCH 0224/2068] Fix XML config typo in plugin-gradle README (#1259)

---
 plugin-gradle/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 5301b4287c..1e103a0a81 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -758,7 +758,7 @@ spotless {
 ```gradle
 spotless {
   format 'xml', {
-    target 'src/**/*/xml' // must specify target
+    target 'src/**/*.xml' // must specify target
     eclipseWtp('xml')     // must specify a type (table below)
     eclipseWtp('xml', '4.13.0') // optional version
     // you can also specify an arbitrary number of config files

From 018cb6619babf4af6d608f6683d228df804eeadb Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 26 Jul 2022 16:52:56 -0700
Subject: [PATCH 0225/2068] Bump from Gradle 7.3 -> 7.5

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 59203 -> 59536 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 gradlew                                  | 257 ++++++++++++++---------
 3 files changed, 154 insertions(+), 105 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..7454180f2ae8848c63b8b4dea2cb829da983f2fa 100755
GIT binary patch
delta 18435
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
B8dv}T

delta 17845
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
X49Luk)baa85H9$5YCsTPT`SVRWMtMW

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e750102e09..8049c684f0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 4f906e0c81..1b6c787337 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=`expr $i + 1`
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"

From 7867f96901d04048fa22a13306f2b606bf5aad17 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 27 Jul 2022 15:32:22 -0700
Subject: [PATCH 0226/2068] Add a test that triggers the
 StableConfigurationCache bug.

---
 .../com/diffplug/gradle/spotless/ConfigurationCacheTest.java | 5 +++--
 .../diffplug/gradle/spotless/GradleIntegrationHarness.java   | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ConfigurationCacheTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ConfigurationCacheTest.java
index 14b6de7702..4006752af2 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ConfigurationCacheTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ConfigurationCacheTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 DiffPlug
+ * Copyright 2020-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,8 @@ public class ConfigurationCacheTest extends GradleIntegrationHarness {
 	@Override
 	protected GradleRunner gradleRunner() throws IOException {
 		setFile("gradle.properties").toContent("org.gradle.unsafe.configuration-cache=true");
-		return super.gradleRunner().withGradleVersion(GradleVersionSupport.CONFIGURATION_CACHE.version);
+		setFile("settings.gradle").toContent("enableFeaturePreview(\"STABLE_CONFIGURATION_CACHE\")");
+		return super.gradleRunner().withGradleVersion(GradleVersionSupport.STABLE_CONFIGURATION_CACHE.version);
 	}
 
 	@Test
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
index 98b1e1cbf9..d9a81d2629 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
@@ -43,7 +43,9 @@ public class GradleIntegrationHarness extends ResourceHarness {
 	public enum GradleVersionSupport {
 		JRE_11("5.0"), MINIMUM(SpotlessPlugin.MINIMUM_GRADLE),
 		// technically, this API exists in 6.5, but the flags for it change in 6.6, so we build to that
-		CONFIGURATION_CACHE("6.6");
+		CONFIGURATION_CACHE("6.6"),
+		// https://docs.gradle.org/7.5/userguide/configuration_cache.html#config_cache:stable
+		STABLE_CONFIGURATION_CACHE("7.5");
 
 		final String version;
 

From 9ab5fe78f11d1763a6813df1787cdbc791e6b600 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 27 Jul 2022 15:33:51 -0700
Subject: [PATCH 0227/2068] Call Task.usesService wherever the service is used.

---
 .../com/diffplug/gradle/spotless/RegisterDependenciesTask.java | 3 ++-
 .../java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java    | 3 ++-
 .../java/com/diffplug/gradle/spotless/SpotlessTaskService.java | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RegisterDependenciesTask.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RegisterDependenciesTask.java
index a3fbdf4a81..69d3ee7525 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RegisterDependenciesTask.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RegisterDependenciesTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -64,6 +64,7 @@ void setup() {
 		String compositeBuildSuffix = getName().substring(TASK_NAME.length()); // see https://github.com/diffplug/spotless/pull/1001
 		BuildServiceRegistry buildServices = getProject().getGradle().getSharedServices();
 		getTaskService().set(buildServices.registerIfAbsent("SpotlessTaskService" + compositeBuildSuffix, SpotlessTaskService.class, spec -> {}));
+		usesService(getTaskService());
 		getBuildEventsListenerRegistry().onTaskCompletion(getTaskService());
 		unitOutput = new File(getProject().getBuildDir(), "tmp/spotless-register-dependencies");
 	}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
index 1b9cda204c..f776603fcc 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,6 +46,7 @@ public abstract class SpotlessTaskImpl extends SpotlessTask {
 	abstract DirectoryProperty getProjectDir();
 
 	void init(Provider<SpotlessTaskService> service) {
+		usesService(service);
 		getTaskService().set(service);
 		getProjectDir().set(getProject().getProjectDir());
 	}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskService.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskService.java
index 7fc0ea3775..c6b6c261bc 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskService.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2021-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -105,6 +105,7 @@ static abstract class ClientTask extends DefaultTask {
 		protected abstract ObjectFactory getConfigCacheWorkaround();
 
 		void init(SpotlessTaskImpl impl) {
+			usesService(impl.getTaskService());
 			getSpotlessOutDirectory().set(impl.getOutputDirectory());
 			getTaskService().set(impl.getTaskService());
 			getProjectDir().set(impl.getProjectDir());

From 3d12cb04068f586c16bfe61a88c72e14a1a68bb3 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 27 Jul 2022 15:52:41 -0700
Subject: [PATCH 0228/2068] Workaround to preserve `instanceof
 BuildServiceProvider` (blech, see #1260 for my complaint).

---
 .../gradle/spotless/RegisterDependenciesTask.java | 15 ++++++++++-----
 .../gradle/spotless/SpotlessTaskImpl.java         |  9 +++++++++
 .../gradle/spotless/SpotlessTaskService.java      |  2 +-
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RegisterDependenciesTask.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RegisterDependenciesTask.java
index 69d3ee7525..75bd06406b 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RegisterDependenciesTask.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RegisterDependenciesTask.java
@@ -24,7 +24,7 @@
 import javax.inject.Inject;
 
 import org.gradle.api.DefaultTask;
-import org.gradle.api.provider.Property;
+import org.gradle.api.provider.Provider;
 import org.gradle.api.services.BuildServiceRegistry;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.Internal;
@@ -63,9 +63,9 @@ void setup() {
 		Preconditions.checkArgument(getProject().getRootProject() == getProject(), "Can only be used on the root project");
 		String compositeBuildSuffix = getName().substring(TASK_NAME.length()); // see https://github.com/diffplug/spotless/pull/1001
 		BuildServiceRegistry buildServices = getProject().getGradle().getSharedServices();
-		getTaskService().set(buildServices.registerIfAbsent("SpotlessTaskService" + compositeBuildSuffix, SpotlessTaskService.class, spec -> {}));
-		usesService(getTaskService());
-		getBuildEventsListenerRegistry().onTaskCompletion(getTaskService());
+		taskService = buildServices.registerIfAbsent("SpotlessTaskService" + compositeBuildSuffix, SpotlessTaskService.class, spec -> {});
+		usesService(taskService);
+		getBuildEventsListenerRegistry().onTaskCompletion(taskService);
 		unitOutput = new File(getProject().getBuildDir(), "tmp/spotless-register-dependencies");
 	}
 
@@ -89,8 +89,13 @@ public void trivialFunction() throws IOException {
 		Files.write(Integer.toString(1), unitOutput, StandardCharsets.UTF_8);
 	}
 
+	// this field is stupid, but we need it, see https://github.com/diffplug/spotless/issues/1260
+	private Provider<SpotlessTaskService> taskService;
+
 	@Internal
-	abstract Property<SpotlessTaskService> getTaskService();
+	public Provider<SpotlessTaskService> getTaskService() {
+		return taskService;
+	}
 
 	@Inject
 	protected abstract BuildEventsListenerRegistry getBuildEventsListenerRegistry();
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
index f776603fcc..b37e9f283a 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
@@ -46,11 +46,20 @@ public abstract class SpotlessTaskImpl extends SpotlessTask {
 	abstract DirectoryProperty getProjectDir();
 
 	void init(Provider<SpotlessTaskService> service) {
+		taskServiceProvider = service;
 		usesService(service);
 		getTaskService().set(service);
 		getProjectDir().set(getProject().getProjectDir());
 	}
 
+	// this field is stupid, but we need it, see https://github.com/diffplug/spotless/issues/1260
+	private transient Provider<SpotlessTaskService> taskServiceProvider;
+
+	@Internal
+	Provider<SpotlessTaskService> getTaskServiceProvider() {
+		return taskServiceProvider;
+	}
+
 	@Inject
 	protected abstract FileSystemOperations getFs();
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskService.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskService.java
index c6b6c261bc..67de4b946c 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskService.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskService.java
@@ -105,7 +105,7 @@ static abstract class ClientTask extends DefaultTask {
 		protected abstract ObjectFactory getConfigCacheWorkaround();
 
 		void init(SpotlessTaskImpl impl) {
-			usesService(impl.getTaskService());
+			usesService(impl.getTaskServiceProvider());
 			getSpotlessOutDirectory().set(impl.getOutputDirectory());
 			getTaskService().set(impl.getTaskService());
 			getProjectDir().set(impl.getProjectDir());

From 06a09fce2b72e8c267d0d08f683ae53b2d546402 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 27 Jul 2022 16:05:15 -0700
Subject: [PATCH 0229/2068] Update changelog.

---
 plugin-gradle/CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 43a1fb1d24..d38d6ee70a 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,6 +5,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Clang and Black no longer break the build when the binary is unavailable, if they will not be run during that build ([#1257](https://github.com/diffplug/spotless/pull/1257)).
+### Fixed
+* Warnings about missing `Task#usesService` for Gradle 8.0 ([#1262](https://github.com/diffplug/spotless/pull/1262) fixes [#1260](https://github.com/diffplug/spotless/issues/1260))
 
 ## [6.8.0] - 2022-06-30
 ### Added

From 640f6a23cafa3dc06f17bba623ef7c9d435be36c Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 27 Jul 2022 16:13:04 -0700
Subject: [PATCH 0230/2068] Change groovy-xml to match Gradle 7.5 (very worried
 this is going to break older releases).

---
 lib-extra/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index 1f6fdd8962..4fe7f7c250 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -15,7 +15,7 @@ dependencies {
 	implementation "org.eclipse.jgit:org.eclipse.jgit:${VER_JGIT}"
 	implementation "com.googlecode.concurrent-trees:concurrent-trees:2.6.1"
 	// used for xml parsing in EclipseFormatter
-	implementation "org.codehaus.groovy:groovy-xml:3.0.9"
+	implementation "org.codehaus.groovy:groovy-xml:3.0.10"
 
 	// testing
 	testImplementation project(':testlib')

From e386e9313afd523f44113464a679d7999ff7e05e Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 27 Jul 2022 22:41:28 -0700
Subject: [PATCH 0231/2068] Fix test on Java 17 for new groovy.

---
 lib-extra/build.gradle | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index 4fe7f7c250..3757dbc91d 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -27,4 +27,10 @@ dependencies {
 // we'll hold the core lib to a high standard
 spotbugs { reportLevel = 'low' } // low|medium|high (low = sensitive to even minor mistakes)
 
-test { useJUnitPlatform() }
+test {
+	useJUnitPlatform()
+	if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
+		// needed for EclipseCdtFormatterStepTest
+		jvmArgs '--add-opens=java.base/java.lang=ALL-UNNAMED'
+	}
+}

From 6a786a2d46f562f84eb313919efe77494a453a6d Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 27 Jul 2022 23:11:03 -0700
Subject: [PATCH 0232/2068] Fix GradleVersion forced-upgrade for minimum
 required JRE.

---
 .../spotless/GradleIntegrationHarness.java    | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
index d9a81d2629..6cc35290db 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
@@ -29,6 +29,7 @@
 import org.gradle.testkit.runner.BuildTask;
 import org.gradle.testkit.runner.GradleRunner;
 import org.gradle.testkit.runner.TaskOutcome;
+import org.gradle.util.GradleVersion;
 import org.junit.jupiter.api.BeforeEach;
 
 import com.diffplug.common.base.Errors;
@@ -50,27 +51,35 @@ public enum GradleVersionSupport {
 		final String version;
 
 		GradleVersionSupport(String version) {
+			String minVersionForRunningJRE;
 			switch (Jvm.version()) {
 			case 20:
 			case 19:
-			case 18:
 				// TODO: https://docs.gradle.org/current/userguide/compatibility.html
+			case 18:
+				minVersionForRunningJRE = "7.5";
+				break;
 			case 17:
-				this.version = "7.3";
+				minVersionForRunningJRE = "7.3";
 				break;
 			case 16:
-				this.version = "7.0";
+				minVersionForRunningJRE = "7.0";
 				break;
 			case 15:
-				this.version = "6.7";
+				minVersionForRunningJRE = "6.7";
 				break;
 			case 14:
-				this.version = "6.3";
+				minVersionForRunningJRE = "6.3";
 				break;
 			default:
-				this.version = version;
+				minVersionForRunningJRE = null;
 				break;
 			}
+			if (minVersionForRunningJRE != null && GradleVersion.version(minVersionForRunningJRE).compareTo(GradleVersion.version(version)) > 0) {
+				this.version = minVersionForRunningJRE;
+			} else {
+				this.version = version;
+			}
 		}
 	}
 

From 9831c5962a91a7d9eae08a9fea305c632c06bb3f Mon Sep 17 00:00:00 2001
From: Omico <me@omico.icu>
Date: Wed, 27 Jul 2022 23:13:36 -0700
Subject: [PATCH 0233/2068] Support adding license header for classes without
 package name

---
 .../main/java/com/diffplug/spotless/kotlin/KotlinConstants.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KotlinConstants.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KotlinConstants.java
index 5df0231b8d..a7fc413f94 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KotlinConstants.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KotlinConstants.java
@@ -18,7 +18,7 @@
 public final class KotlinConstants {
 
 	// '^' is prepended to the regex in LICENSE_HEADER_DELIMITER later in FormatExtension.licenseHeader(String, String)
-	public static final String LICENSE_HEADER_DELIMITER = "(package |@file)";
+	public static final String LICENSE_HEADER_DELIMITER = "(package |@file|import )";
 
 	private KotlinConstants() {}
 }

From f6b85902308e46c0836c30df848526bf4ff0e57d Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 27 Jul 2022 23:30:25 -0700
Subject: [PATCH 0234/2068] The standard tests need the fix for the new Groovy
 too.

---
 lib-extra/build.gradle | 2 +-
 testlib/build.gradle   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index 3757dbc91d..38e7c37403 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -29,7 +29,7 @@ spotbugs { reportLevel = 'low' } // low|medium|high (low = sensitive to even min
 
 test {
 	useJUnitPlatform()
-	if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
+	if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_16)) {
 		// needed for EclipseCdtFormatterStepTest
 		jvmArgs '--add-opens=java.base/java.lang=ALL-UNNAMED'
 	}
diff --git a/testlib/build.gradle b/testlib/build.gradle
index 8e0a012882..30c44ece23 100644
--- a/testlib/build.gradle
+++ b/testlib/build.gradle
@@ -30,7 +30,8 @@ test {
 			'--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED',
 			'--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED',
 			'--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED',
-			'--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED'
+			'--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED',
+			'--add-opens=java.base/java.lang=ALL-UNNAMED'
 		]
 		jvmArgs args
 	}

From 8715f50537479e629df371679b2b1049ee66c9ea Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 28 Jul 2022 00:13:04 -0700
Subject: [PATCH 0235/2068] Update changelogs.

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 1 +
 plugin-maven/CHANGES.md  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index bed2af6281..8c079e0c4d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Clang and Black no longer break the build when the binary is unavailable, if they will not be run during that build ([#1257](https://github.com/diffplug/spotless/pull/1257)).
+* License header support for Kotlin files without `package` or `@file` but do at least have `import` ([#1263](https://github.com/diffplug/spotless/pull/1263)).
 
 ## [2.27.0] - 2022-06-30
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index d38d6ee70a..1653838a3a 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Clang and Black no longer break the build when the binary is unavailable, if they will not be run during that build ([#1257](https://github.com/diffplug/spotless/pull/1257)).
+* License header support for Kotlin files without `package` or `@file` but do at least have `import` ([#1263](https://github.com/diffplug/spotless/pull/1263)).
 ### Fixed
 * Warnings about missing `Task#usesService` for Gradle 8.0 ([#1262](https://github.com/diffplug/spotless/pull/1262) fixes [#1260](https://github.com/diffplug/spotless/issues/1260))
 
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 3499aeab36..732489f81f 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Clang and Black no longer break the build when the binary is unavailable, if they will not be run during that build ([#1257](https://github.com/diffplug/spotless/pull/1257)).
+* License header support for Kotlin files without `package` or `@file` but do at least have `import` ([#1263](https://github.com/diffplug/spotless/pull/1263)).
 
 ## [2.23.0] - 2022-06-30
 ### Added

From 6d6b09d2d3217e0d59aa5327035a4db5eb338e61 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 28 Jul 2022 00:13:14 -0700
Subject: [PATCH 0236/2068] spotlessApply

---
 .../main/java/com/diffplug/spotless/kotlin/KotlinConstants.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KotlinConstants.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KotlinConstants.java
index a7fc413f94..da2240f16c 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KotlinConstants.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KotlinConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From d6e767a2dfa91a0c24464a093d2827d7d1dd9ec0 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 28 Jul 2022 00:45:46 -0700
Subject: [PATCH 0237/2068] Adapt gradle plugin publishing for the new 1.0
 plugin-publish plugin.

---
 plugin-gradle/build.gradle | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/plugin-gradle/build.gradle b/plugin-gradle/build.gradle
index 3a5afd2ba8..8fec4beb92 100644
--- a/plugin-gradle/build.gradle
+++ b/plugin-gradle/build.gradle
@@ -77,19 +77,6 @@ if (version.endsWith('-SNAPSHOT')) {
 			'black',
 			'clang-format'
 		]
-		plugins {
-			spotlessPlugin {
-				id = 'com.diffplug.spotless'
-			}
-			spotlessPluginLegacy {
-				id = 'com.diffplug.gradle.spotless'
-			}
-		}
-		mavenCoordinates {
-			groupId = project.group
-			artifactId = project.artifactIdGradle
-			version = project.version
-		}
 	}
 }
 

From a474435ae70036140d446644d641a682ae20672d Mon Sep 17 00:00:00 2001
From: circleci <circleci@982ad2bc5ad1>
Date: Thu, 28 Jul 2022 07:50:49 +0000
Subject: [PATCH 0238/2068] Published lib/2.28.0

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 8c079e0c4d..d57135685f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.28.0] - 2022-07-28
 ### Added
 * Clang and Black no longer break the build when the binary is unavailable, if they will not be run during that build ([#1257](https://github.com/diffplug/spotless/pull/1257)).
 * License header support for Kotlin files without `package` or `@file` but do at least have `import` ([#1263](https://github.com/diffplug/spotless/pull/1263)).

From 4085c79c0fdced5bfa80d4347c096f6cecb16e36 Mon Sep 17 00:00:00 2001
From: circleci <circleci@982ad2bc5ad1>
Date: Thu, 28 Jul 2022 07:52:01 +0000
Subject: [PATCH 0239/2068] Published gradle/6.9.0

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 46 ++++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 1653838a3a..d7d434a90d 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [6.9.0] - 2022-07-28
 ### Added
 * Clang and Black no longer break the build when the binary is unavailable, if they will not be run during that build ([#1257](https://github.com/diffplug/spotless/pull/1257)).
 * License header support for Kotlin files without `package` or `@file` but do at least have `import` ([#1263](https://github.com/diffplug/spotless/pull/1263)).
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 1e103a0a81..8b8e5372e6 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -18,9 +18,9 @@ output = [
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
 [![Maven central](https://img.shields.io/badge/mavencentral-yes-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/index.html)
 [![License Apache](https://img.shields.io/badge/license-apache-blue.svg)](https://tldrlegal.com/license/apache-license-2.0-(apache-2.0))
-[![Changelog](https://img.shields.io/badge/changelog-6.8.0-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-6.9.0-blue.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)
@@ -126,10 +126,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -141,7 +141,7 @@ If you're stuck on an older version of Gradle, `id 'com.diffplug.gradle.spotless
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -248,8 +248,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -300,8 +300,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -364,7 +364,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -396,7 +396,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -428,7 +428,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -462,7 +462,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -483,7 +483,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -508,7 +508,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -548,7 +548,7 @@ sql.formatter.indent.size=4
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -591,7 +591,7 @@ For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#n
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -816,7 +816,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -883,9 +883,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -918,11 +918,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.8.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From 3878d363c9e28f121784362a659c72b1fbdcb6d8 Mon Sep 17 00:00:00 2001
From: circleci <circleci@982ad2bc5ad1>
Date: Thu, 28 Jul 2022 07:53:27 +0000
Subject: [PATCH 0240/2068] Published maven/2.24.0

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 732489f81f..c4ac990753 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.24.0] - 2022-07-28
 ### Added
 * Clang and Black no longer break the build when the binary is unavailable, if they will not be run during that build ([#1257](https://github.com/diffplug/spotless/pull/1257)).
 * License header support for Kotlin files without `package` or `@file` but do at least have `import` ([#1263](https://github.com/diffplug/spotless/pull/1263)).
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 1552c98537..d4798ba87e 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -12,8 +12,8 @@ output = [
   ].join('\n');
 -->
 [![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.23.0/index.html)
-[![Changelog](https://img.shields.io/badge/changelog-2.23.0-brightgreen.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.24.0/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.24.0-brightgreen.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)

From 74d0accc62f470699bbaab83aadbdd3b982e3df3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 12:04:24 +0000
Subject: [PATCH 0241/2068] Bump diktat-rules from 1.2.1 to 1.2.3

Bumps [diktat-rules](https://github.com/saveourtool/diktat) from 1.2.1 to 1.2.3.
- [Release notes](https://github.com/saveourtool/diktat/releases)
- [Commits](https://github.com/saveourtool/diktat/compare/v1.2.1...v1.2.3)

---
updated-dependencies:
- dependency-name: org.cqfn.diktat:diktat-rules
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 lib/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 4aba993334..e14e5c6438 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -51,7 +51,7 @@ dependencies {
 	ktlintCompileOnly "com.pinterest.ktlint:ktlint-ruleset-experimental:$VER_KTLINT"
 	ktlintCompileOnly "com.pinterest.ktlint:ktlint-ruleset-standard:$VER_KTLINT"
 
-	String VER_DIKTAT = "1.2.1"
+	String VER_DIKTAT = "1.2.3"
 	diktatCompileOnly "org.cqfn.diktat:diktat-rules:$VER_DIKTAT"
 
 	// used for markdown formatting

From 30bb58a693fe3a6be9737110209180ffad3538f2 Mon Sep 17 00:00:00 2001
From: bh-tt <bert@transtrend.com>
Date: Tue, 2 Aug 2022 11:41:37 +0200
Subject: [PATCH 0242/2068] Use the correct args

---
 .../main/java/com/diffplug/spotless/cpp/ClangFormatStep.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/cpp/ClangFormatStep.java b/lib/src/main/java/com/diffplug/spotless/cpp/ClangFormatStep.java
index aced507ee5..dba55b1931 100644
--- a/lib/src/main/java/com/diffplug/spotless/cpp/ClangFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/cpp/ClangFormatStep.java
@@ -20,6 +20,7 @@
 import java.io.Serializable;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 
@@ -112,7 +113,7 @@ String format(ProcessRunner runner, String input, File file) throws IOException,
 			}
 			final String[] processArgs = args.toArray(new String[args.size() + 1]);
 			processArgs[processArgs.length - 1] = "--assume-filename=" + file.getName();
-			return runner.exec(input.getBytes(StandardCharsets.UTF_8), args).assertExitZero(StandardCharsets.UTF_8);
+			return runner.exec(input.getBytes(StandardCharsets.UTF_8), processArgs).assertExitZero(StandardCharsets.UTF_8);
 		}
 
 		FormatterFunc.Closeable toFunc() {

From 4cc323f58e0b65e2cafae4738d0f1aa1d079e16c Mon Sep 17 00:00:00 2001
From: bh-tt <bert@transtrend.com>
Date: Tue, 2 Aug 2022 11:46:52 +0200
Subject: [PATCH 0243/2068] Add to changes

---
 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 d57135685f..75cf4d7cb0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,7 +10,7 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
-
+* Fix Clang not knowing the filename and changing the format ([#1267](https://github.com/diffplug/spotless/pull/1268))
 ## [2.28.0] - 2022-07-28
 ### Added
 * Clang and Black no longer break the build when the binary is unavailable, if they will not be run during that build ([#1257](https://github.com/diffplug/spotless/pull/1257)).
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index d7d434a90d..ff4559f19b 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,7 +3,7 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
-
+* Fix Clang not knowing the filename and changing the format ([#1267](https://github.com/diffplug/spotless/pull/1268))
 ## [6.9.0] - 2022-07-28
 ### Added
 * Clang and Black no longer break the build when the binary is unavailable, if they will not be run during that build ([#1257](https://github.com/diffplug/spotless/pull/1257)).
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index c4ac990753..4a63f89e15 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,7 +3,7 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
-
+* Fix Clang not knowing the filename and changing the format ([#1267](https://github.com/diffplug/spotless/pull/1268))
 ## [2.24.0] - 2022-07-28
 ### Added
 * Clang and Black no longer break the build when the binary is unavailable, if they will not be run during that build ([#1257](https://github.com/diffplug/spotless/pull/1257)).

From b71da45312aff3cd18d63d1bea1a6edd78fc5530 Mon Sep 17 00:00:00 2001
From: bh-tt <bert@transtrend.com>
Date: Tue, 2 Aug 2022 11:52:37 +0200
Subject: [PATCH 0244/2068] Remove unused import

---
 lib/src/main/java/com/diffplug/spotless/cpp/ClangFormatStep.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/cpp/ClangFormatStep.java b/lib/src/main/java/com/diffplug/spotless/cpp/ClangFormatStep.java
index 599863ccc1..5591045505 100644
--- a/lib/src/main/java/com/diffplug/spotless/cpp/ClangFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/cpp/ClangFormatStep.java
@@ -20,7 +20,6 @@
 import java.io.Serializable;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 

From 5d975ba19799992d514659533d661a70ec675940 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timur=20Sa=C4=9Flam?= <timur.saglam@kit.edu>
Date: Tue, 2 Aug 2022 15:05:39 +0200
Subject: [PATCH 0245/2068] Fix ANTLR 4 formatter maven configuration.

---
 plugin-maven/README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index d4798ba87e..ee08e91ae3 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -481,7 +481,7 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
       <include>src/*/antlr4/**/*.g4</include>
     </includes>
 
-    <antlr4formatter /> <!-- has its own section below -->
+    <antlr4Formatter /> <!-- has its own section below -->
 
     <licenseHeader>
       <content>/* (C)$YEAR */</content>  <!-- or <file>${project.basedir}/license-header</file> -->
@@ -490,14 +490,14 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 </configuration>
 ```
 
-### antlr4formatter
+### antlr4Formatter
 
 [homepage](https://github.com/antlr/Antlr4Formatter). [available versions](https://search.maven.org/artifact/com.khubla.antlr4formatter/antlr4-formatter). [code](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/antlr4/Antlr4Formatter.java).
 
 ```xml
-<antlr4formatter>
+<antlr4Formatter>
   <version>1.2.1</version> <!-- optional -->
-</antlr4formatter>
+</antlr4Formatter>
 ```
 
 ## SQL

From 05c43364a5ba6adb10f40de8bb88eca705092916 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 9 Aug 2022 10:21:46 -0700
Subject: [PATCH 0246/2068] Fix changelog categories.

---
 CHANGES.md               | 2 ++
 plugin-gradle/CHANGES.md | 2 ++
 plugin-maven/CHANGES.md  | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 75cf4d7cb0..349025fd65 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,7 +10,9 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
 * Fix Clang not knowing the filename and changing the format ([#1267](https://github.com/diffplug/spotless/pull/1268))
+
 ## [2.28.0] - 2022-07-28
 ### Added
 * Clang and Black no longer break the build when the binary is unavailable, if they will not be run during that build ([#1257](https://github.com/diffplug/spotless/pull/1257)).
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index ff4559f19b..a550a4f94e 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,7 +3,9 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Fixed
 * Fix Clang not knowing the filename and changing the format ([#1267](https://github.com/diffplug/spotless/pull/1268))
+
 ## [6.9.0] - 2022-07-28
 ### Added
 * Clang and Black no longer break the build when the binary is unavailable, if they will not be run during that build ([#1257](https://github.com/diffplug/spotless/pull/1257)).
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 4a63f89e15..8e26b79353 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,7 +3,9 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
 * Fix Clang not knowing the filename and changing the format ([#1267](https://github.com/diffplug/spotless/pull/1268))
+
 ## [2.24.0] - 2022-07-28
 ### Added
 * Clang and Black no longer break the build when the binary is unavailable, if they will not be run during that build ([#1257](https://github.com/diffplug/spotless/pull/1257)).

From 89b46921ebde4ce4a4e9651f0b448ce340e5e4b0 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 9 Aug 2022 10:25:00 -0700
Subject: [PATCH 0247/2068] Fix changelog 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 349025fd65..d884759825 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,7 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Fixed
-* Fix Clang not knowing the filename and changing the format ([#1267](https://github.com/diffplug/spotless/pull/1268))
+* Fix Clang not knowing the filename and changing the format ([#1268](https://github.com/diffplug/spotless/pull/1268) fixes [#1267](https://github.com/diffplug/spotless/issues/1267)).
 
 ## [2.28.0] - 2022-07-28
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index a550a4f94e..ebfa7d978e 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -4,7 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Fixed
-* Fix Clang not knowing the filename and changing the format ([#1267](https://github.com/diffplug/spotless/pull/1268))
+* Fix Clang not knowing the filename and changing the format ([#1268](https://github.com/diffplug/spotless/pull/1268) fixes [#1267](https://github.com/diffplug/spotless/issues/1267)).
 
 ## [6.9.0] - 2022-07-28
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 8e26b79353..073b77ca27 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -4,7 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Fixed
-* Fix Clang not knowing the filename and changing the format ([#1267](https://github.com/diffplug/spotless/pull/1268))
+* Fix Clang not knowing the filename and changing the format ([#1268](https://github.com/diffplug/spotless/pull/1268) fixes [#1267](https://github.com/diffplug/spotless/issues/1267)).
 
 ## [2.24.0] - 2022-07-28
 ### Added

From dbb207a2425cf5de37dc72ab737e1ba26e6a6a99 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 9 Aug 2022 16:21:20 -0700
Subject: [PATCH 0248/2068] Bump changelogs.

---
 CHANGES.md               | 2 ++
 plugin-gradle/CHANGES.md | 2 ++
 plugin-maven/CHANGES.md  | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index d884759825..53976671ba 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Fixed
 * Fix Clang not knowing the filename and changing the format ([#1268](https://github.com/diffplug/spotless/pull/1268) fixes [#1267](https://github.com/diffplug/spotless/issues/1267)).
+### Changes
+* Bump default `diktat` version to latest `1.2.1` -> `1.2.3` ([#1266](https://github.com/diffplug/spotless/pull/1266))
 
 ## [2.28.0] - 2022-07-28
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index ebfa7d978e..2c9e995b6f 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,6 +5,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Fixed
 * Fix Clang not knowing the filename and changing the format ([#1268](https://github.com/diffplug/spotless/pull/1268) fixes [#1267](https://github.com/diffplug/spotless/issues/1267)).
+### Changes
+* Bump default `diktat` version to latest `1.2.1` -> `1.2.3` ([#1266](https://github.com/diffplug/spotless/pull/1266))
 
 ## [6.9.0] - 2022-07-28
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 073b77ca27..4b5cc3e7b3 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,6 +5,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Fixed
 * Fix Clang not knowing the filename and changing the format ([#1268](https://github.com/diffplug/spotless/pull/1268) fixes [#1267](https://github.com/diffplug/spotless/issues/1267)).
+### Changes
+* Bump default `diktat` version to latest `1.2.1` -> `1.2.3` ([#1266](https://github.com/diffplug/spotless/pull/1266))
 
 ## [2.24.0] - 2022-07-28
 ### Added

From ba7d618407a845c03798facb19218408f4098a2e Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 9 Aug 2022 16:21:37 -0700
Subject: [PATCH 0249/2068] Bump default diktat version 1.2.1 -> 1.2.3

---
 lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
index ff3e3240cf..f1cd3103d9 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
@@ -32,7 +32,7 @@ private DiktatStep() {}
 
 	private static final String MIN_SUPPORTED_VERSION = "1.2.1";
 
-	private static final String DEFAULT_VERSION = "1.2.1";
+	private static final String DEFAULT_VERSION = "1.2.3";
 	static final String NAME = "diktat";
 	static final String PACKAGE_DIKTAT = "org.cqfn.diktat";
 	static final String MAVEN_COORDINATE = PACKAGE_DIKTAT + ":diktat-rules:";

From bde7eb3fff3784716fa706ab8b4fa4d3933a0b7d Mon Sep 17 00:00:00 2001
From: circleci <circleci@9dec03b38edc>
Date: Wed, 10 Aug 2022 01:25:50 +0000
Subject: [PATCH 0250/2068] Published lib/2.28.1

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 53976671ba..751749585f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.28.1] - 2022-08-10
 ### Fixed
 * Fix Clang not knowing the filename and changing the format ([#1268](https://github.com/diffplug/spotless/pull/1268) fixes [#1267](https://github.com/diffplug/spotless/issues/1267)).
 ### Changes

From ece76dde507aee383796e0ccad94a91e6bac5819 Mon Sep 17 00:00:00 2001
From: circleci <circleci@9dec03b38edc>
Date: Wed, 10 Aug 2022 01:27:19 +0000
Subject: [PATCH 0251/2068] Published gradle/6.9.1

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 46 ++++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 2c9e995b6f..3cf249b893 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [6.9.1] - 2022-08-10
 ### Fixed
 * Fix Clang not knowing the filename and changing the format ([#1268](https://github.com/diffplug/spotless/pull/1268) fixes [#1267](https://github.com/diffplug/spotless/issues/1267)).
 ### Changes
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 8b8e5372e6..bb71d8ab5b 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -18,9 +18,9 @@ output = [
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
 [![Maven central](https://img.shields.io/badge/mavencentral-yes-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/index.html)
 [![License Apache](https://img.shields.io/badge/license-apache-blue.svg)](https://tldrlegal.com/license/apache-license-2.0-(apache-2.0))
-[![Changelog](https://img.shields.io/badge/changelog-6.9.0-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-6.9.1-blue.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)
@@ -126,10 +126,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -141,7 +141,7 @@ If you're stuck on an older version of Gradle, `id 'com.diffplug.gradle.spotless
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -248,8 +248,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -300,8 +300,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -364,7 +364,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -396,7 +396,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -428,7 +428,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -462,7 +462,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -483,7 +483,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -508,7 +508,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -548,7 +548,7 @@ sql.formatter.indent.size=4
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -591,7 +591,7 @@ For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#n
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -816,7 +816,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -883,9 +883,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -918,11 +918,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From ce98b688cb4724a95e0abb05f4bbaf398097c1b8 Mon Sep 17 00:00:00 2001
From: circleci <circleci@9dec03b38edc>
Date: Wed, 10 Aug 2022 01:29:45 +0000
Subject: [PATCH 0252/2068] Published maven/2.24.1

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 4b5cc3e7b3..59bf722522 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.24.1] - 2022-08-10
 ### Fixed
 * Fix Clang not knowing the filename and changing the format ([#1268](https://github.com/diffplug/spotless/pull/1268) fixes [#1267](https://github.com/diffplug/spotless/issues/1267)).
 ### Changes
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index ee08e91ae3..f0c1874993 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -12,8 +12,8 @@ output = [
   ].join('\n');
 -->
 [![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.24.0/index.html)
-[![Changelog](https://img.shields.io/badge/changelog-2.24.0-brightgreen.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.24.1/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.24.1-brightgreen.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)

From 1c6082674943b72b0f4a46c1c4c4212924ab9884 Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Fri, 12 Aug 2022 06:44:24 -0700
Subject: [PATCH 0253/2068] `typeAnnotations()` removes line breaks between
 type annotations and types

---
 .../spotless/java/TypeAnnotationsStep.java    | 450 ++++++++++++++++++
 .../gradle/spotless/JavaExtension.java        |   6 +
 .../TypeAnnotationsInCommentsInput.test       |  31 ++
 .../TypeAnnotationsInCommentsOutput.test      |  25 +
 .../TypeAnnotationsTestInput.test             |  68 +++
 .../TypeAnnotationsTestOutput.test            |  43 ++
 .../java/TypeAnnotationsStepTest.java         |  57 +++
 7 files changed, 680 insertions(+)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/java/TypeAnnotationsStep.java
 create mode 100644 testlib/src/main/resources/java/typeannotations/TypeAnnotationsInCommentsInput.test
 create mode 100644 testlib/src/main/resources/java/typeannotations/TypeAnnotationsInCommentsOutput.test
 create mode 100644 testlib/src/main/resources/java/typeannotations/TypeAnnotationsTestInput.test
 create mode 100644 testlib/src/main/resources/java/typeannotations/TypeAnnotationsTestOutput.test
 create mode 100644 testlib/src/test/java/com/diffplug/spotless/java/TypeAnnotationsStepTest.java

diff --git a/lib/src/main/java/com/diffplug/spotless/java/TypeAnnotationsStep.java b/lib/src/main/java/com/diffplug/spotless/java/TypeAnnotationsStep.java
new file mode 100644
index 0000000000..d2fdc7cd1b
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/java/TypeAnnotationsStep.java
@@ -0,0 +1,450 @@
+/*
+ * Copyright 2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.java;
+
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.FormatterStep;
+
+/**
+ * Some formatters put every annotation on its own line
+ * -- even type annotations, which should be on the same line as the type they qualify.
+ * This class corrects the formatting.
+ * This is useful as a postprocessing step after a Java formatter that is not cognizant of type annotations.
+ */
+public final class TypeAnnotationsStep {
+	private TypeAnnotationsStep() {}
+
+	static final String NAME = "No line break between type annotation and type";
+
+	public static FormatterStep create() {
+		return FormatterStep.create(NAME, new State(), State::toFormatter);
+	}
+
+	// TODO: Enable users to specify more type annotations in `typeAnnotations` in build.gradle.
+	// TODO: Read from a local .type-annotations file.
+	private static final class State implements Serializable {
+		private static final long serialVersionUID = 1L;
+
+		/**
+		 * These are type annotations, which should NOT go on their own line.
+		 * A type annotation's {@code @Target} annotation contains {@code TYPE_USE}.
+		 */
+		private static final Set<String> typeAnnotations = new HashSet<>(
+				Arrays.asList(
+						// Type annotations from the Checker Framework.
+						"A",
+						"ACCBottom",
+						"Acceleration",
+						"ACCTop",
+						"AinferBottom",
+						"AlwaysSafe",
+						"Angle",
+						"AnnoWithStringArg",
+						"Area",
+						"ArrayLen",
+						"ArrayLenRange",
+						"ArrayWithoutPackage",
+						"AwtAlphaCompositingRule",
+						"AwtColorSpace",
+						"AwtCursorType",
+						"AwtFlowLayout",
+						"B",
+						"BinaryName",
+						"BinaryNameInUnnamedPackage",
+						"BinaryNameOrPrimitiveType",
+						"BinaryNameWithoutPackage",
+						"BoolVal",
+						"Bottom",
+						"BottomQualifier",
+						"BottomThis",
+						"BottomVal",
+						"C",
+						"CalledMethods",
+						"CalledMethodsBottom",
+						"CalledMethodsPredicate",
+						"CalledMethodsTop",
+						"CanonicalName",
+						"CanonicalNameAndBinaryName",
+						"CanonicalNameOrEmpty",
+						"CanonicalNameOrPrimitiveType",
+						"CCBottom",
+						"CCTop",
+						"cd",
+						"ClassBound",
+						"ClassGetName",
+						"ClassGetSimpleName",
+						"ClassVal",
+						"ClassValBottom",
+						"CompilerMessageKey",
+						"CompilerMessageKeyBottom",
+						"Constant",
+						"Critical",
+						"Current",
+						"D",
+						"DefaultType",
+						"degrees",
+						"Det",
+						"DotSeparatedIdentifiers",
+						"DotSeparatedIdentifiersOrPrimitiveType",
+						"DoubleVal",
+						"E",
+						"Encrypted",
+						"EnhancedRegex",
+						"EnumVal",
+						"Even",
+						"F",
+						"FBCBottom",
+						"FEBottom",
+						"FEBot",
+						"Fenum",
+						"FenumBottom",
+						"FenumTop",
+						"FETop",
+						"FieldDescriptor",
+						"FieldDescriptorForPrimitive",
+						"FieldDescriptorForPrimitiveOrArrayInUnnamedPackage",
+						"FieldDescriptorWithoutPackage",
+						"FlowExp",
+						"Force",
+						"Format",
+						"FormatBottom",
+						"FqBinaryName",
+						"Frequency",
+						"FullyQualifiedName",
+						"g",
+						"GTENegativeOne",
+						"GuardedBy",
+						"GuardedByBottom",
+						"GuardedByUnknown",
+						"GuardSatisfied",
+						"h",
+						"H1Bot",
+						"H1Invalid",
+						"H1Poly",
+						"H1S1",
+						"H1S2",
+						"H1Top",
+						"H2Bot",
+						"H2Poly",
+						"H2S1",
+						"H2S2",
+						"H2Top",
+						"Hz",
+						"I18nFormat",
+						"I18nFormatBottom",
+						"I18nFormatFor",
+						"I18nInvalidFormat",
+						"I18nUnknownFormat",
+						"Identifier",
+						"IdentifierOrArray",
+						"IdentifierOrPrimitiveType",
+						"ImplicitAnno",
+						"IndexFor",
+						"IndexOrHigh",
+						"IndexOrLow",
+						"Initialized",
+						"InitializedFields",
+						"InitializedFieldsBottom",
+						"InitializedFieldsPredicate",
+						"InternalForm",
+						"Interned",
+						"InternedDistinct",
+						"IntRange",
+						"IntVal",
+						"InvalidFormat",
+						"K",
+						"KeyFor",
+						"KeyForBottom",
+						"KeyForType",
+						"kg",
+						"kHz",
+						"km",
+						"km2",
+						"km3",
+						"kmPERh",
+						"kN",
+						"LbTop",
+						"LB_TOP",
+						"LeakedToResult",
+						"Length",
+						"LengthOf",
+						"LessThan",
+						"LessThanBottom",
+						"LessThanUnknown",
+						"LocalizableKey",
+						"LocalizableKeyBottom",
+						"Localized",
+						"LowerBoundBottom",
+						"LowerBoundUnknown",
+						"LTEqLengthOf",
+						"LTLengthOf",
+						"LTOMLengthOf",
+						"Luminance",
+						"m",
+						"m2",
+						"m3",
+						"Mass",
+						"MatchesRegex",
+						"MaybeAliased",
+						"MaybeDerivedFromConstant",
+						"MaybePresent",
+						"MaybeThis",
+						"MethodDescriptor",
+						"MethodVal",
+						"MethodValBottom",
+						"min",
+						"MinLen",
+						"mm",
+						"mm2",
+						"mm3",
+						"mol",
+						"MonotonicNonNull",
+						"MonotonicNonNullType",
+						"MonotonicOdd",
+						"mPERs",
+						"mPERs2",
+						"MustCall",
+						"MustCallAlias",
+						"MustCallUnknown",
+						"N",
+						"NegativeIndexFor",
+						"NewObject",
+						"NonConstant",
+						"NonDet",
+						"NonLeaked",
+						"NonNegative",
+						"NonNull",
+						"NonNullType",
+						"NonRaw",
+						"NotCalledMethods",
+						"NotNull",
+						"NotQualifier",
+						"NTDBottom",
+						"NTDMiddle",
+						"NTDSide",
+						"NTDTop",
+						"Nullable",
+						"NullableType",
+						"Odd",
+						"OptionalBottom",
+						"OrderNonDet",
+						"Parent",
+						"PatternA",
+						"PatternAB",
+						"PatternAC",
+						"PatternB",
+						"PatternBC",
+						"PatternBottomFull",
+						"PatternBottomPartial",
+						"PatternC",
+						"PatternUnknown",
+						"Poly",
+						"PolyAll",
+						"PolyConstant",
+						"PolyDet",
+						"PolyEncrypted",
+						"PolyFenum",
+						"PolyIndex",
+						"PolyInitializedFields",
+						"PolyInterned",
+						"PolyKeyFor",
+						"PolyLength",
+						"PolyLowerBound",
+						"PolyMustCall",
+						"PolyNull",
+						"PolyNullType",
+						"PolyPresent",
+						"PolyRaw",
+						"PolyReflection",
+						"PolyRegex",
+						"PolySameLen",
+						"PolySignature",
+						"PolySigned",
+						"PolyTainted",
+						"PolyTestAccumulation",
+						"PolyTypeDeclDefault",
+						"PolyUI",
+						"PolyUnit",
+						"PolyUpperBound",
+						"PolyValue",
+						"PolyVariableNameDefault",
+						"Positive",
+						"Present",
+						"PrimitiveType",
+						"PropertyKey",
+						"PropertyKeyBottom",
+						"PurityUnqualified",
+						"Qualifier",
+						"radians",
+						"Raw",
+						"ReflectBottom",
+						"Regex",
+						"RegexBottom",
+						"RegexNNGroups",
+						"ReportUnqualified",
+						"s",
+						"SameLen",
+						"SameLenBottom",
+						"SameLenUnknown",
+						"SearchIndexBottom",
+						"SearchIndexFor",
+						"SearchIndexUnknown",
+						"Sibling1",
+						"Sibling2",
+						"SiblingWithFields",
+						"SignatureBottom",
+						"Signed",
+						"SignednessBottom",
+						"SignednessGlb",
+						"SignedPositive",
+						"SignedPositiveFromUnsigned",
+						"Speed",
+						"StringVal",
+						"SubQual",
+						"Substance",
+						"SubstringIndexBottom",
+						"SubstringIndexFor",
+						"SubstringIndexUnknown",
+						"SuperQual",
+						"SwingBoxOrientation",
+						"SwingCompassDirection",
+						"SwingElementOrientation",
+						"SwingHorizontalOrientation",
+						"SwingSplitPaneOrientation",
+						"SwingTextOrientation",
+						"SwingTitleJustification",
+						"SwingTitlePosition",
+						"SwingVerticalOrientation",
+						"t",
+						"Tainted",
+						"Temperature",
+						"TestAccumulation",
+						"TestAccumulationBottom",
+						"TestAccumulationPredicate",
+						"This",
+						"Time",
+						"Top",
+						"TypeDeclDefaultBottom",
+						"TypeDeclDefaultMiddle",
+						"TypeDeclDefaultTop",
+						"UbTop",
+						"UB_TOP",
+						"UI",
+						"UnderInitialization",
+						"Unique",
+						"UnitsBottom",
+						"UnknownClass",
+						"UnknownCompilerMessageKey",
+						"UnknownFormat",
+						"UnknownInitialization",
+						"UnknownInterned",
+						"UnknownKeyFor",
+						"UnknownLocalizableKey",
+						"UnknownLocalized",
+						"UnknownMethod",
+						"UnknownPropertyKey",
+						"UnknownRegex",
+						"UnknownSignedness",
+						"UnknownThis",
+						"UnknownUnits",
+						"UnknownVal",
+						"Unsigned",
+						"Untainted",
+						"UpperBoundBottom",
+						"UpperBoundLiteral",
+						"UpperBoundUnknown",
+						"Value",
+						"VariableNameDefaultBottom",
+						"VariableNameDefaultMiddle",
+						"VariableNameDefaultTop",
+						"Volume",
+						"WholeProgramInferenceBottom"
+				// Add type annotations from other tools here.
+
+				));
+
+		// group 1 is the basename of the annotation.
+		private static final String annoNoArgRegex = "@(?:[A-Za-z_][A-Za-z0-9_.]*\\.)?([A-Za-z_][A-Za-z0-9_]*)";
+		private static final Pattern annoNoArgPattern = Pattern.compile(annoNoArgRegex);
+		// 3 non-empty cases:  ()  (".*")  (.*)
+		private static final String annoArgRegex = "(?:\\(\\)|\\(\"[^\"]*\"\\)|\\([^\")][^)]*\\))?";
+		// group 1 is the basename of the annotation.
+		private static final String annoRegex = annoNoArgRegex + annoArgRegex;
+		private static final String trailingAnnoRegex = annoRegex + "$";
+		private static final Pattern trailingAnnoPattern = Pattern.compile(trailingAnnoRegex);
+
+		// Heuristic: matches if the line might be within a //, /*, or Javadoc comment.
+		private static final Pattern withinCommentPattern = Pattern.compile("//|/\\*(?!.*/*/)|^[ \t]*\\*[ \t]");
+		// Don't move an annotation to the start of a comment line.
+		private static final Pattern startsWithCommentPattern = Pattern.compile("^[ \t]*(//|/\\*$|/\\*|void\\b)");
+
+		State() {}
+
+		FormatterFunc toFormatter() {
+			return unixStr -> fixupTypeAnnotations(unixStr);
+		}
+
+		/**
+		         * Removes line break between type annotations and the following type.
+		         *
+		         * @param the text of a Java file
+		         * @return corrected text of the Java file
+		 */
+		String fixupTypeAnnotations(String unixStr) {
+			// Each element of `lines` ends with a newline.
+			String[] lines = unixStr.split("((?<=\n))");
+			for (int i = 0; i < lines.length - 1; i++) {
+				String line = lines[i];
+				if (endsWithTypeAnnotation(line)) {
+					String nextLine = lines[i + 1];
+					if (startsWithCommentPattern.matcher(nextLine).find()) {
+						continue;
+					}
+					lines[i] = "";
+					lines[i + 1] = line.stripTrailing() + " " + nextLine.stripLeading();
+				}
+			}
+			return String.join("", lines);
+		}
+
+		/**
+		 * Returns true if the line ends with a type annotation. We need to fix such formatting.
+		 */
+		boolean endsWithTypeAnnotation(String unixLine) {
+			// Remove trailing newline.
+			String line = unixLine.stripTrailing();
+			Matcher m = trailingAnnoPattern.matcher(line);
+			if (!m.find()) {
+				return false;
+			}
+			String preceding = line.substring(0, m.start());
+			String basename = m.group(1);
+
+			if (withinCommentPattern.matcher(preceding).find()) {
+				return false;
+			}
+
+			return typeAnnotations.contains(basename);
+		}
+	}
+}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
index 479d2ffd12..d882ac472b 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
@@ -36,6 +36,7 @@
 import com.diffplug.spotless.java.ImportOrderStep;
 import com.diffplug.spotless.java.PalantirJavaFormatStep;
 import com.diffplug.spotless.java.RemoveUnusedImportsStep;
+import com.diffplug.spotless.java.TypeAnnotationsStep;
 
 public class JavaExtension extends FormatExtension implements HasBuiltinDelimiterForLicense {
 	static final String NAME = "java";
@@ -231,6 +232,11 @@ public void configFile(Object... configFiles) {
 
 	}
 
+	/** Removes newlines between type annotations and types. */
+	public void typeAnnotations() {
+		addStep(TypeAnnotationsStep.create());
+	}
+
 	/** If the user hasn't specified the files yet, we'll assume he/she means all of the java files. */
 	@Override
 	protected void setupTask(SpotlessTask task) {
diff --git a/testlib/src/main/resources/java/typeannotations/TypeAnnotationsInCommentsInput.test b/testlib/src/main/resources/java/typeannotations/TypeAnnotationsInCommentsInput.test
new file mode 100644
index 0000000000..d49799c0c3
--- /dev/null
+++ b/testlib/src/main/resources/java/typeannotations/TypeAnnotationsInCommentsInput.test
@@ -0,0 +1,31 @@
+class TypeAnnotationsInComments {
+
+  // Here is a comment relating to the annotation @Nullable
+  @Interned
+  String m1() {}
+
+  // Here is another comment relating to the annotation @Nullable
+  String m2() {}
+
+  /**
+   * Here is a misformatted type annotation within a Javadoc comment.
+   *
+   * @Nullable
+   * String s;
+   */
+
+  @Nullable
+  @Interned
+  String m3(/* Don't get confused by other comments on the line with the type */) {}
+
+  @Nullable
+  @Interned
+  String m3() {} // Still not confused
+
+  /*
+    code snippets in regular comments do get re-formatted
+
+    @Nullable
+    String s;
+   */
+}
diff --git a/testlib/src/main/resources/java/typeannotations/TypeAnnotationsInCommentsOutput.test b/testlib/src/main/resources/java/typeannotations/TypeAnnotationsInCommentsOutput.test
new file mode 100644
index 0000000000..491ce5b2aa
--- /dev/null
+++ b/testlib/src/main/resources/java/typeannotations/TypeAnnotationsInCommentsOutput.test
@@ -0,0 +1,25 @@
+class TypeAnnotationsInComments {
+
+  // Here is a comment relating to the annotation @Nullable
+  @Interned String m1() {}
+
+  // Here is another comment relating to the annotation @Nullable
+  String m2() {}
+
+  /**
+   * Here is a misformatted type annotation within a Javadoc comment.
+   *
+   * @Nullable
+   * String s;
+   */
+
+  @Nullable @Interned String m3(/* Don't get confused by other comments on the line with the type */) {}
+
+  @Nullable @Interned String m3() {} // Still not confused
+
+  /*
+    code snippets in regular comments do get re-formatted
+
+    @Nullable String s;
+   */
+}
diff --git a/testlib/src/main/resources/java/typeannotations/TypeAnnotationsTestInput.test b/testlib/src/main/resources/java/typeannotations/TypeAnnotationsTestInput.test
new file mode 100644
index 0000000000..8a870a34cc
--- /dev/null
+++ b/testlib/src/main/resources/java/typeannotations/TypeAnnotationsTestInput.test
@@ -0,0 +1,68 @@
+class TypeAnnotationsTest {
+
+  public @Nullable
+  String s0 = null;
+
+  @Deprecated
+  public @Nullable
+  String m0() {}
+
+  @Nullable
+  String s1 = null;
+
+  @Deprecated
+  @Nullable
+  String m1() {}
+
+  @Nullable
+  @Deprecated
+  String m2() {}
+
+  @Nullable
+  @Regex(2)
+  @Interned
+  String s2 = null;
+
+  @Deprecated
+  @Nullable
+  @Regex(2)
+  @Interned
+  String m3() {}
+
+  @Nullable
+  @Deprecated
+  @Regex(2)
+  @Interned
+  String m4() {}
+
+  @Nullable
+  // a comment
+  @Regex(2)
+  @Interned
+  String s3 = null;
+
+  @Nullable // a comment
+  @Regex(2)
+  @Interned
+  String s4 = null;
+
+  @Nullable
+  @Regex(2)
+  @Interned
+  // a comment
+  String s5 = null;
+
+  @Deprecated
+  // a comment
+  @Nullable
+  @Regex(2)
+  @Interned
+  String m5() {}
+
+  @Deprecated
+  @Nullable
+  // a comment
+  @Regex(2)
+  @Interned
+  String m6() {}
+}
diff --git a/testlib/src/main/resources/java/typeannotations/TypeAnnotationsTestOutput.test b/testlib/src/main/resources/java/typeannotations/TypeAnnotationsTestOutput.test
new file mode 100644
index 0000000000..81fd049609
--- /dev/null
+++ b/testlib/src/main/resources/java/typeannotations/TypeAnnotationsTestOutput.test
@@ -0,0 +1,43 @@
+class TypeAnnotationsTest {
+
+  public @Nullable String s0 = null;
+
+  @Deprecated
+  public @Nullable String m0() {}
+
+  @Nullable String s1 = null;
+
+  @Deprecated
+  @Nullable String m1() {}
+
+  @Nullable @Deprecated
+  String m2() {}
+
+  @Nullable @Regex(2) @Interned String s2 = null;
+
+  @Deprecated
+  @Nullable @Regex(2) @Interned String m3() {}
+
+  @Nullable @Deprecated
+  @Regex(2) @Interned String m4() {}
+
+  @Nullable
+  // a comment
+  @Regex(2) @Interned String s3 = null;
+
+  @Nullable // a comment
+  @Regex(2) @Interned String s4 = null;
+
+  @Nullable @Regex(2) @Interned
+  // a comment
+  String s5 = null;
+
+  @Deprecated
+  // a comment
+  @Nullable @Regex(2) @Interned String m5() {}
+
+  @Deprecated
+  @Nullable
+  // a comment
+  @Regex(2) @Interned String m6() {}
+}
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/TypeAnnotationsStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/TypeAnnotationsStepTest.java
new file mode 100644
index 0000000000..3724cac09f
--- /dev/null
+++ b/testlib/src/test/java/com/diffplug/spotless/java/TypeAnnotationsStepTest.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.java;
+
+import org.junit.jupiter.api.Test;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.ResourceHarness;
+import com.diffplug.spotless.SerializableEqualityTester;
+
+class TypeAnnotationsStepTest extends ResourceHarness {
+	@Test
+	void typeAnnotations() throws Throwable {
+		FormatterStep step = TypeAnnotationsStep.create();
+		assertOnResources(step, "java/typeannotations/TypeAnnotationsTestInput.test", "java/typeannotations/TypeAnnotationsTestOutput.test");
+	}
+
+	@Test
+	void typeAnnotationsInComments() throws Throwable {
+		FormatterStep step = TypeAnnotationsStep.create();
+		assertOnResources(step, "java/typeannotations/TypeAnnotationsInCommentsInput.test", "java/typeannotations/TypeAnnotationsInCommentsOutput.test");
+	}
+
+	@Test
+	void doesntThrowIfTypeAnnotationsIsntSerializable() {
+		TypeAnnotationsStep.create();
+	}
+
+	@Test
+	void equality() throws Exception {
+		new SerializableEqualityTester() {
+			@Override
+			protected void setupTest(API api) {
+				api.areDifferentThan();
+			}
+
+			@Override
+			protected FormatterStep create() {
+				return TypeAnnotationsStep.create();
+			}
+		}.testEquals();
+	}
+
+}

From 105eb878c91586fce323b2d6cb023b92bcd4cb94 Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Fri, 12 Aug 2022 06:50:36 -0700
Subject: [PATCH 0254/2068] Add changelog entry

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 751749585f..2b293772ee 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* `typeAnnotations()` step to correct formatting of type annotations.  It puts type annotations on the same line as the type that they qualify.  Run it after a Java formattng step, such as `googleJavaFormat()`. ([#1275](https://github.com/diffplug/spotless/pull/1275))
 
 ## [2.28.1] - 2022-08-10
 ### Fixed

From 6d76fc97f30320748a6e10cca7a052d6638b6529 Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Fri, 12 Aug 2022 06:52:13 -0700
Subject: [PATCH 0255/2068] Changelog in `plugin-gradle`, too

---
 plugin-gradle/CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 3cf249b893..ec0dd4e951 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Added
+* `typeAnnotations()` step to correct formatting of type annotations.  It puts type annotations on the same line as the type that they qualify.  Run it after a Java formattng step, such as `googleJavaFormat()`. ([#1275](https://github.com/diffplug/spotless/pull/1275))
 
 ## [6.9.1] - 2022-08-10
 ### Fixed

From 0c5d1b65b2ec344cd06f310a716a7ad03bd71fc7 Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Sat, 13 Aug 2022 08:55:20 -0700
Subject: [PATCH 0256/2068] Don't use Java 11 APIs

---
 .../java/com/diffplug/spotless/java/TypeAnnotationsStep.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/TypeAnnotationsStep.java b/lib/src/main/java/com/diffplug/spotless/java/TypeAnnotationsStep.java
index d2fdc7cd1b..dd0b86eeb4 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/TypeAnnotationsStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/TypeAnnotationsStep.java
@@ -421,7 +421,7 @@ String fixupTypeAnnotations(String unixStr) {
 						continue;
 					}
 					lines[i] = "";
-					lines[i + 1] = line.stripTrailing() + " " + nextLine.stripLeading();
+					lines[i + 1] = line.replaceAll("\\s+$", "") + " " + nextLine.replaceAll("^\\s+", "");
 				}
 			}
 			return String.join("", lines);
@@ -432,7 +432,7 @@ String fixupTypeAnnotations(String unixStr) {
 		 */
 		boolean endsWithTypeAnnotation(String unixLine) {
 			// Remove trailing newline.
-			String line = unixLine.stripTrailing();
+			String line = unixLine.replaceAll("\\s+$", "");
 			Matcher m = trailingAnnoPattern.matcher(line);
 			if (!m.find()) {
 				return false;

From 097ecfabdc0bd55ce5bca4f1ccee1a134773b578 Mon Sep 17 00:00:00 2001
From: EricGao888 <ericgao.apache@gmail.com>
Date: Tue, 16 Aug 2022 12:02:17 +0800
Subject: [PATCH 0257/2068] Fix minor bugs related of Spotless SQL config
 extension docs (#1256)

---
 plugin-gradle/README.md | 2 +-
 plugin-maven/README.md  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index bb71d8ab5b..53e77a9ced 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -528,7 +528,7 @@ spotless {
 ```gradle
 spotless {
   sql {
-    dbeaver().configFile('dbeaver.props') // configFile is optional
+    dbeaver().configFile('dbeaver.properties') // configFile is optional
 ```
 
 Default configuration file, other options [available here](https://github.com/diffplug/spotless/blob/main/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/DBeaverSQLFormatterConfiguration.java).
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index f0c1874993..fa4cf55c74 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -524,7 +524,7 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ```xml
 <dbeaver>
-    <configFile>dbeaver.props</configFile> <!-- configFile is optional -->
+    <configFile>dbeaver.properties</configFile> <!-- configFile is optional -->
 </dbeaver>
 ```
 

From a9607fc97eef82bd39d869ee3a296cdfda0d471b Mon Sep 17 00:00:00 2001
From: Stephen Panaro <stephen@digits.com>
Date: Thu, 18 Aug 2022 20:17:53 -0400
Subject: [PATCH 0258/2068] Add ktlint rule ID in formatter callback

---
 .../com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
index da3e3ae475..b9b225f35d 100644
--- a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
+++ b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
@@ -111,7 +111,7 @@ static class FormatterCallback implements Function2<LintError, Boolean, Unit> {
 		@Override
 		public Unit invoke(LintError lint, Boolean corrected) {
 			if (!corrected) {
-				throw new AssertionError("Error on line: " + lint.getLine() + ", column: " + lint.getCol() + "\n" + lint.getDetail());
+				throw new AssertionError("Error on line: " + lint.getLine() + ", column: " + lint.getCol() + "\n" + lint.getRuleId() + "\n" + lint.getDetail());
 			}
 			return null;
 		}

From 83411a88e88237d15efb0fd22186875fe57bac83 Mon Sep 17 00:00:00 2001
From: Stephen Panaro <stephen@digits.com>
Date: Thu, 18 Aug 2022 20:51:20 -0400
Subject: [PATCH 0259/2068] update changes

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 3 +++
 plugin-maven/CHANGES.md  | 1 +
 3 files changed, 5 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 751749585f..6e3ac85da7 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,7 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+* Add the `ktlint` rule in error messages when `ktlint` fails to apply a fix ([#1279](https://github.com/diffplug/spotless/pull/1279))
 
 ## [2.28.1] - 2022-08-10
 ### Fixed
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 3cf249b893..cdb11f83da 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
+* Add the `ktlint` rule in error messages when `ktlint` fails to apply a fix ([#1279](https://github.com/diffplug/spotless/pull/1279))
+
 ## [6.9.1] - 2022-08-10
 ### Fixed
 * Fix Clang not knowing the filename and changing the format ([#1268](https://github.com/diffplug/spotless/pull/1268) fixes [#1267](https://github.com/diffplug/spotless/issues/1267)).
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 59bf722522..b4cb262abd 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,7 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+* Add the `ktlint` rule in error messages when `ktlint` fails to apply a fix ([#1279](https://github.com/diffplug/spotless/pull/1279))
 
 ## [2.24.1] - 2022-08-10
 ### Fixed

From 0f296cba1479591dd75749fe234babe900a909b5 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 18 Aug 2022 22:01:26 -0700
Subject: [PATCH 0260/2068] Added missing `### Changes` where necessary.

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 1 -
 plugin-maven/CHANGES.md  | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 6e3ac85da7..9e00263a93 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,7 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Changes
 * Add the `ktlint` rule in error messages when `ktlint` fails to apply a fix ([#1279](https://github.com/diffplug/spotless/pull/1279))
 
 ## [2.28.1] - 2022-08-10
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index cdb11f83da..72d600688c 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,7 +3,6 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
-
 ### Changes
 * Add the `ktlint` rule in error messages when `ktlint` fails to apply a fix ([#1279](https://github.com/diffplug/spotless/pull/1279))
 
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index b4cb262abd..7366c3b731 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,7 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Changes
 * Add the `ktlint` rule in error messages when `ktlint` fails to apply a fix ([#1279](https://github.com/diffplug/spotless/pull/1279))
 
 ## [2.24.1] - 2022-08-10

From 640d8e7f77ec32f2c9fa8f2f7da6f5844ec2e658 Mon Sep 17 00:00:00 2001
From: Stephen Panaro <stephen@digits.com>
Date: Fri, 19 Aug 2022 10:22:44 -0400
Subject: [PATCH 0261/2068] Add rule prefix to message

---
 .../com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
index b9b225f35d..e7af558fb5 100644
--- a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
+++ b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
@@ -111,7 +111,7 @@ static class FormatterCallback implements Function2<LintError, Boolean, Unit> {
 		@Override
 		public Unit invoke(LintError lint, Boolean corrected) {
 			if (!corrected) {
-				throw new AssertionError("Error on line: " + lint.getLine() + ", column: " + lint.getCol() + "\n" + lint.getRuleId() + "\n" + lint.getDetail());
+				throw new AssertionError("Error on line: " + lint.getLine() + ", column: " + lint.getCol() + "\nrule: " + lint.getRuleId() + "\n" + lint.getDetail());
 			}
 			return null;
 		}

From fc1da8d3fbf8a9095419cf1a66bf473516e85c3f Mon Sep 17 00:00:00 2001
From: Stephen Panaro <stephen@digits.com>
Date: Fri, 19 Aug 2022 10:22:50 -0400
Subject: [PATCH 0262/2068] Fix tests

---
 .../test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
index a4a43ef44e..d9e6042c23 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
@@ -32,6 +32,7 @@ void behavior() throws Exception {
 				.testResourceException("kotlin/ktlint/unsolvable.dirty", assertion -> {
 					assertion.isInstanceOf(AssertionError.class);
 					assertion.hasMessage("Error on line: 1, column: 1\n" +
+							"rule: no-wildcard-imports\n" +
 							"Wildcard import");
 				});
 	}
@@ -44,6 +45,7 @@ void worksPre0_46_1() throws Exception {
 				.testResourceException("kotlin/ktlint/unsolvable.dirty", assertion -> {
 					assertion.isInstanceOf(AssertionError.class);
 					assertion.hasMessage("Error on line: 1, column: 1\n" +
+							"rule: no-wildcard-imports\n" +
 							"Wildcard import");
 				});
 	}

From 781eb684315319f278a74c84aa6f4cfab415bf84 Mon Sep 17 00:00:00 2001
From: Matthew de Detrich <matthew.dedetrich@aiven.io>
Date: Mon, 22 Aug 2022 13:18:50 +0200
Subject: [PATCH 0263/2068] Convert scalafmt integration to use a compile-only
 sourceset

---
 CHANGES.md                                    |  1 +
 lib/build.gradle                              |  6 +-
 .../diffplug/spotless/scala/ScalaFmtStep.java | 93 ++-----------------
 .../glue/scalafmt/ScalafmtFormatterFunc.java  | 56 +++++++++++
 .../scalafmt/basic.cleanWithCustomConf_1.1.0  | 24 -----
 .../scalafmt/basic.cleanWithCustomConf_2.0.1  | 25 -----
 .../scala/scalafmt/basic.clean_1.1.0          | 16 ----
 .../scala/scalafmt/basic.clean_2.0.1          | 18 ----
 .../scala/scalafmt/basicPost2.0.0.clean       | 18 ----
 .../basicPost2.0.0.cleanWithCustomConf        | 25 -----
 .../resources/scala/scalafmt/scalafmt.conf    |  2 +
 .../spotless/scala/ScalaFmtStepTest.java      | 44 ++-------
 12 files changed, 81 insertions(+), 247 deletions(-)
 create mode 100644 lib/src/scalafmt/java/com/diffplug/spotless/glue/scalafmt/ScalafmtFormatterFunc.java
 delete mode 100644 testlib/src/main/resources/scala/scalafmt/basic.cleanWithCustomConf_1.1.0
 delete mode 100644 testlib/src/main/resources/scala/scalafmt/basic.cleanWithCustomConf_2.0.1
 delete mode 100644 testlib/src/main/resources/scala/scalafmt/basic.clean_1.1.0
 delete mode 100644 testlib/src/main/resources/scala/scalafmt/basic.clean_2.0.1
 delete mode 100644 testlib/src/main/resources/scala/scalafmt/basicPost2.0.0.clean
 delete mode 100644 testlib/src/main/resources/scala/scalafmt/basicPost2.0.0.cleanWithCustomConf

diff --git a/CHANGES.md b/CHANGES.md
index 751749585f..446698d7ed 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,7 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+* Converted `scalafmt` integration to use a compile-only source set. (fixes [#524](https://github.com/diffplug/spotless/issues/524))
 
 ## [2.28.1] - 2022-08-10
 ### Fixed
diff --git a/lib/build.gradle b/lib/build.gradle
index e14e5c6438..0b3f4555b2 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -12,7 +12,8 @@ def NEEDS_GLUE = [
 	'ktfmt',
 	'ktlint',
 	'flexmark',
-	'diktat'
+	'diktat',
+	'scalafmt'
 ]
 for (glue in NEEDS_GLUE) {
 	sourceSets.register(glue) {
@@ -51,6 +52,9 @@ dependencies {
 	ktlintCompileOnly "com.pinterest.ktlint:ktlint-ruleset-experimental:$VER_KTLINT"
 	ktlintCompileOnly "com.pinterest.ktlint:ktlint-ruleset-standard:$VER_KTLINT"
 
+	String VER_SCALAFMT="3.5.9"
+	scalafmtCompileOnly "org.scalameta:scalafmt-core_2.13:$VER_SCALAFMT"
+
 	String VER_DIKTAT = "1.2.3"
 	diktatCompileOnly "org.cqfn.diktat:diktat-rules:$VER_DIKTAT"
 
diff --git a/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java b/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java
index 8c8e4ccb2d..34c951cf06 100644
--- a/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,13 +18,8 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
+import java.lang.reflect.Constructor;
 import java.util.Collections;
-import java.util.Objects;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import javax.annotation.Nullable;
 
@@ -39,12 +34,8 @@ public class ScalaFmtStep {
 	// prevent direct instantiation
 	private ScalaFmtStep() {}
 
-	private static final Pattern VERSION_PRE_2_0 = Pattern.compile("[10]\\.(\\d+)\\.\\d+");
-	private static final Pattern VERSION_PRE_3_0 = Pattern.compile("2\\.(\\d+)\\.\\d+");
-	private static final String DEFAULT_VERSION = "3.0.8";
+	private static final String DEFAULT_VERSION = "3.5.9";
 	static final String NAME = "scalafmt";
-	static final String MAVEN_COORDINATE_PRE_2_0 = "com.geirsson:scalafmt-core_2.11:";
-	static final String MAVEN_COORDINATE_PRE_3_0 = "org.scalameta:scalafmt-core_2.11:";
 	static final String MAVEN_COORDINATE = "org.scalameta:scalafmt-core_2.13:";
 
 	public static FormatterStep create(Provisioner provisioner) {
@@ -52,10 +43,8 @@ public static FormatterStep create(Provisioner provisioner) {
 	}
 
 	public static FormatterStep create(String version, Provisioner provisioner, @Nullable File configFile) {
-		Objects.requireNonNull(version, "version");
-		Objects.requireNonNull(provisioner, "provisioner");
 		return FormatterStep.createLazy(NAME,
-				() -> new State(version, provisioner, configFile),
+				() -> new State(JarState.from(MAVEN_COORDINATE + version, provisioner), configFile),
 				State::createFormat);
 	}
 
@@ -69,78 +58,16 @@ static final class State implements Serializable {
 		final JarState jarState;
 		final FileSignature configSignature;
 
-		State(String version, Provisioner provisioner, @Nullable File configFile) throws IOException {
-			String mavenCoordinate;
-			Matcher versionMatcher;
-			if ((versionMatcher = VERSION_PRE_2_0.matcher(version)).matches()) {
-				mavenCoordinate = MAVEN_COORDINATE_PRE_2_0;
-			} else if ((versionMatcher = VERSION_PRE_3_0.matcher(version)).matches()) {
-				mavenCoordinate = MAVEN_COORDINATE_PRE_3_0;
-			} else {
-				mavenCoordinate = MAVEN_COORDINATE;
-			}
-
-			this.jarState = JarState.from(mavenCoordinate + version, provisioner);
+		State(JarState jarState, @Nullable File configFile) throws IOException {
+			this.jarState = jarState;
 			this.configSignature = FileSignature.signAsList(configFile == null ? Collections.emptySet() : Collections.singleton(configFile));
 		}
 
 		FormatterFunc createFormat() throws Exception {
-			ClassLoader classLoader = jarState.getClassLoader();
-
-			// scalafmt returns instances of formatted, we get result by calling get()
-			Class<?> formatted = classLoader.loadClass("org.scalafmt.Formatted");
-			Method formattedGet = formatted.getMethod("get");
-
-			// this is how we actually do a format
-			Class<?> scalafmt = classLoader.loadClass("org.scalafmt.Scalafmt");
-			Class<?> scalaSet = classLoader.loadClass("scala.collection.immutable.Set");
-
-			Object defaultScalaFmtConfig = scalafmt.getMethod("format$default$2").invoke(null);
-			Object emptyRange = scalafmt.getMethod("format$default$3").invoke(null);
-			Method formatMethod = scalafmt.getMethod("format", String.class, defaultScalaFmtConfig.getClass(), scalaSet);
-
-			// now we just need to parse the config, if any
-			Object config;
-			if (configSignature.files().isEmpty()) {
-				config = defaultScalaFmtConfig;
-			} else {
-				File file = configSignature.getOnlyFile();
-
-				Class<?> optionCls = classLoader.loadClass("scala.Option");
-				Class<?> configCls = classLoader.loadClass("org.scalafmt.config.Config");
-				Class<?> scalafmtCls = classLoader.loadClass("org.scalafmt.Scalafmt");
-
-				Object configured;
-
-				try {
-					// scalafmt >= 1.6.0
-					Method parseHoconConfig = scalafmtCls.getMethod("parseHoconConfig", String.class);
-
-					String configStr = new String(Files.readAllBytes(file.toPath()), StandardCharsets.UTF_8);
-
-					configured = parseHoconConfig.invoke(null, configStr);
-				} catch (NoSuchMethodException e) {
-					// scalafmt >= v0.7.0-RC1 && scalafmt < 1.6.0
-					Method fromHocon = configCls.getMethod("fromHoconString", String.class, optionCls);
-					Object fromHoconEmptyPath = configCls.getMethod("fromHoconString$default$2").invoke(null);
-
-					String configStr = new String(Files.readAllBytes(file.toPath()), StandardCharsets.UTF_8);
-
-					configured = fromHocon.invoke(null, configStr, fromHoconEmptyPath);
-				}
-
-				config = invokeNoArg(configured, "get");
-			}
-			return input -> {
-				Object resultInsideFormatted = formatMethod.invoke(null, input, config, emptyRange);
-				return (String) formattedGet.invoke(resultInsideFormatted);
-			};
+			final ClassLoader classLoader = jarState.getClassLoader();
+			final Class<?> formatterFunc = classLoader.loadClass("com.diffplug.spotless.glue.scalafmt.ScalafmtFormatterFunc");
+			final Constructor<?> constructor = formatterFunc.getConstructor(FileSignature.class);
+			return (FormatterFunc) constructor.newInstance(this.configSignature);
 		}
 	}
-
-	private static Object invokeNoArg(Object obj, String toInvoke) throws Exception {
-		Class<?> clazz = obj.getClass();
-		Method method = clazz.getMethod(toInvoke);
-		return method.invoke(obj);
-	}
 }
diff --git a/lib/src/scalafmt/java/com/diffplug/spotless/glue/scalafmt/ScalafmtFormatterFunc.java b/lib/src/scalafmt/java/com/diffplug/spotless/glue/scalafmt/ScalafmtFormatterFunc.java
new file mode 100644
index 0000000000..b5924b2bac
--- /dev/null
+++ b/lib/src/scalafmt/java/com/diffplug/spotless/glue/scalafmt/ScalafmtFormatterFunc.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.glue.scalafmt;
+
+import java.io.File;
+import java.lang.reflect.Method;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+
+import org.scalafmt.Scalafmt;
+import org.scalafmt.config.ScalafmtConfig;
+import org.scalafmt.config.ScalafmtConfig$;
+
+import com.diffplug.spotless.FileSignature;
+import com.diffplug.spotless.FormatterFunc;
+
+import scala.collection.immutable.Set$;
+
+public class ScalafmtFormatterFunc implements FormatterFunc {
+	private final FileSignature configSignature;
+
+	public ScalafmtFormatterFunc(FileSignature configSignature) {
+		this.configSignature = configSignature;
+	}
+
+	@Override
+	public String apply(String input) throws Exception {
+		ScalafmtConfig config;
+		if (configSignature.files().isEmpty()) {
+			// Note that reflection is used here only because Scalafmt has a method called
+			// default which happens to be a reserved Java keyword. The only way to call
+			// such methods is by reflection, see
+			// https://vlkan.com/blog/post/2015/11/20/scala-method-with-java-reserved-keyword/
+			Method method = ScalafmtConfig$.MODULE$.getClass().getDeclaredMethod("default");
+			config = (ScalafmtConfig) method.invoke(ScalafmtConfig$.MODULE$);
+		} else {
+			File file = configSignature.getOnlyFile();
+			String configStr = new String(Files.readAllBytes(file.toPath()), StandardCharsets.UTF_8);
+			config = Scalafmt.parseHoconConfig(configStr).get();
+		}
+		return Scalafmt.format(input, config, Set$.MODULE$.empty()).get();
+	}
+}
diff --git a/testlib/src/main/resources/scala/scalafmt/basic.cleanWithCustomConf_1.1.0 b/testlib/src/main/resources/scala/scalafmt/basic.cleanWithCustomConf_1.1.0
deleted file mode 100644
index 98bf69b7af..0000000000
--- a/testlib/src/main/resources/scala/scalafmt/basic.cleanWithCustomConf_1.1.0
+++ /dev/null
@@ -1,24 +0,0 @@
-@foobar("annot", {
-  val x = 2
-  val y = 2 // y=2
-  x + y
-})
-object a
-    extends b
-    with c {
-  def foo[
-      T: Int#Double#Triple,
-      R <% String](
-      @annot1
-      x: Int @annot2 =
-        2,
-      y: Int = 3)
-    : Int = {
-    "match" match {
-      case 1 | 2 =>
-        3
-      case <A>2</A> =>
-        2
-    }
-  }
-}
diff --git a/testlib/src/main/resources/scala/scalafmt/basic.cleanWithCustomConf_2.0.1 b/testlib/src/main/resources/scala/scalafmt/basic.cleanWithCustomConf_2.0.1
deleted file mode 100644
index fc8267fb75..0000000000
--- a/testlib/src/main/resources/scala/scalafmt/basic.cleanWithCustomConf_2.0.1
+++ /dev/null
@@ -1,25 +0,0 @@
-@foobar("annot", {
-  val x = 2
-  val y = 2 // y=2
-  x + y
-})
-object a
-    extends b
-    with c {
-  def foo[
-      T: Int#Double#Triple,
-      R <% String
-  ](
-      @annot1
-      x: Int @annot2 =
-        2,
-      y: Int = 3
-  ): Int = {
-    "match" match {
-      case 1 | 2 =>
-        3
-      case <A>2</A> =>
-        2
-    }
-  }
-}
diff --git a/testlib/src/main/resources/scala/scalafmt/basic.clean_1.1.0 b/testlib/src/main/resources/scala/scalafmt/basic.clean_1.1.0
deleted file mode 100644
index 922a2ccbb9..0000000000
--- a/testlib/src/main/resources/scala/scalafmt/basic.clean_1.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-@foobar("annot", {
-  val x = 2
-  val y = 2 // y=2
-  x + y
-})
-object a extends b with c {
-  def foo[T: Int#Double#Triple, R <% String](@annot1
-                                             x: Int @annot2 = 2,
-                                             y: Int = 3): Int = {
-    "match" match {
-      case 1 | 2 =>
-        3
-      case <A>2</A> => 2
-    }
-  }
-}
diff --git a/testlib/src/main/resources/scala/scalafmt/basic.clean_2.0.1 b/testlib/src/main/resources/scala/scalafmt/basic.clean_2.0.1
deleted file mode 100644
index b838dfea65..0000000000
--- a/testlib/src/main/resources/scala/scalafmt/basic.clean_2.0.1
+++ /dev/null
@@ -1,18 +0,0 @@
-@foobar("annot", {
-  val x = 2
-  val y = 2 // y=2
-  x + y
-})
-object a extends b with c {
-  def foo[T: Int#Double#Triple, R <% String](
-      @annot1
-      x: Int @annot2 = 2,
-      y: Int = 3
-  ): Int = {
-    "match" match {
-      case 1 | 2 =>
-        3
-      case <A>2</A> => 2
-    }
-  }
-}
diff --git a/testlib/src/main/resources/scala/scalafmt/basicPost2.0.0.clean b/testlib/src/main/resources/scala/scalafmt/basicPost2.0.0.clean
deleted file mode 100644
index b838dfea65..0000000000
--- a/testlib/src/main/resources/scala/scalafmt/basicPost2.0.0.clean
+++ /dev/null
@@ -1,18 +0,0 @@
-@foobar("annot", {
-  val x = 2
-  val y = 2 // y=2
-  x + y
-})
-object a extends b with c {
-  def foo[T: Int#Double#Triple, R <% String](
-      @annot1
-      x: Int @annot2 = 2,
-      y: Int = 3
-  ): Int = {
-    "match" match {
-      case 1 | 2 =>
-        3
-      case <A>2</A> => 2
-    }
-  }
-}
diff --git a/testlib/src/main/resources/scala/scalafmt/basicPost2.0.0.cleanWithCustomConf b/testlib/src/main/resources/scala/scalafmt/basicPost2.0.0.cleanWithCustomConf
deleted file mode 100644
index fc8267fb75..0000000000
--- a/testlib/src/main/resources/scala/scalafmt/basicPost2.0.0.cleanWithCustomConf
+++ /dev/null
@@ -1,25 +0,0 @@
-@foobar("annot", {
-  val x = 2
-  val y = 2 // y=2
-  x + y
-})
-object a
-    extends b
-    with c {
-  def foo[
-      T: Int#Double#Triple,
-      R <% String
-  ](
-      @annot1
-      x: Int @annot2 =
-        2,
-      y: Int = 3
-  ): Int = {
-    "match" match {
-      case 1 | 2 =>
-        3
-      case <A>2</A> =>
-        2
-    }
-  }
-}
diff --git a/testlib/src/main/resources/scala/scalafmt/scalafmt.conf b/testlib/src/main/resources/scala/scalafmt/scalafmt.conf
index 5007f5e8ff..bcfec161f4 100644
--- a/testlib/src/main/resources/scala/scalafmt/scalafmt.conf
+++ b/testlib/src/main/resources/scala/scalafmt/scalafmt.conf
@@ -1,2 +1,4 @@
+version = 3.5.9
+runner.dialect = scala213
 style = defaultWithAlign # For pretty alignment.
 maxColumn = 20           # For my teensy narrow display
diff --git a/testlib/src/test/java/com/diffplug/spotless/scala/ScalaFmtStepTest.java b/testlib/src/test/java/com/diffplug/spotless/scala/ScalaFmtStepTest.java
index 0f42252d36..8003607962 100644
--- a/testlib/src/test/java/com/diffplug/spotless/scala/ScalaFmtStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/scala/ScalaFmtStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
+import java.util.NoSuchElementException;
 
 import org.junit.jupiter.api.Test;
 
@@ -34,38 +34,16 @@
 class ScalaFmtStepTest extends ResourceHarness {
 	@Test
 	void behaviorDefaultConfig() throws Exception {
-		StepHarness.forStep(ScalaFmtStep.create("1.1.0", TestProvisioner.mavenCentral(), null))
-				.testResource("scala/scalafmt/basic.dirty", "scala/scalafmt/basic.clean_1.1.0");
-		StepHarness.forStep(ScalaFmtStep.create("2.0.1", TestProvisioner.mavenCentral(), null))
-				.testResource("scala/scalafmt/basic.dirty", "scala/scalafmt/basic.clean_2.0.1");
 		StepHarness.forStep(ScalaFmtStep.create("3.0.0", TestProvisioner.mavenCentral(), null))
 				.testResource("scala/scalafmt/basic.dirty", "scala/scalafmt/basic.clean_3.0.0");
 	}
 
 	@Test
 	void behaviorCustomConfig() throws Exception {
-		StepHarness.forStep(ScalaFmtStep.create("1.1.0", TestProvisioner.mavenCentral(), createTestFile("scala/scalafmt/scalafmt.conf")))
-				.testResource("scala/scalafmt/basic.dirty", "scala/scalafmt/basic.cleanWithCustomConf_1.1.0");
-		StepHarness.forStep(ScalaFmtStep.create("2.0.1", TestProvisioner.mavenCentral(), createTestFile("scala/scalafmt/scalafmt.conf")))
-				.testResource("scala/scalafmt/basic.dirty", "scala/scalafmt/basic.cleanWithCustomConf_2.0.1");
 		StepHarness.forStep(ScalaFmtStep.create("3.0.0", TestProvisioner.mavenCentral(), createTestFile("scala/scalafmt/scalafmt.conf")))
 				.testResource("scala/scalafmt/basic.dirty", "scala/scalafmt/basic.cleanWithCustomConf_3.0.0");
 	}
 
-	@Test
-	void behaviorDefaultConfigVersion_2_0_0() throws Exception {
-		FormatterStep step = ScalaFmtStep.create("2.0.0", TestProvisioner.mavenCentral(), null);
-		StepHarness.forStep(step)
-				.testResource("scala/scalafmt/basic.dirty", "scala/scalafmt/basicPost2.0.0.clean");
-	}
-
-	@Test
-	void behaviorCustomConfigVersion_2_0_0() throws Exception {
-		FormatterStep step = ScalaFmtStep.create("2.0.0", TestProvisioner.mavenCentral(), createTestFile("scala/scalafmt/scalafmt.conf"));
-		StepHarness.forStep(step)
-				.testResource("scala/scalafmt/basic.dirty", "scala/scalafmt/basicPost2.0.0.cleanWithCustomConf");
-	}
-
 	@Test
 	void behaviorDefaultConfigVersion_3_0_0() throws Exception {
 		FormatterStep step = ScalaFmtStep.create("3.0.0", TestProvisioner.mavenCentral(), null);
@@ -83,7 +61,7 @@ void behaviorCustomConfigVersion_3_0_0() throws Exception {
 	@Test
 	void equality() throws Exception {
 		new SerializableEqualityTester() {
-			String version = "0.5.1";
+			String version = "3.5.9";
 			File configFile = null;
 
 			@Override
@@ -91,7 +69,7 @@ protected void setupTest(API api) throws IOException {
 				// same version == same
 				api.areDifferentThan();
 				// change the version, and it's different
-				version = "0.5.0";
+				version = "3.5.8";
 				api.areDifferentThan();
 				// add a config file, and its different
 				configFile = createTestFile("scala/scalafmt/scalafmt.conf");
@@ -113,18 +91,10 @@ void invalidConfiguration() throws Exception {
 		File invalidConfFile = createTestFile("scala/scalafmt/scalafmt.invalid.conf");
 		Provisioner provisioner = TestProvisioner.mavenCentral();
 
-		InvocationTargetException exception;
-
-		exception = assertThrows(InvocationTargetException.class,
-				() -> StepHarness.forStep(ScalaFmtStep.create("1.1.0", provisioner, invalidConfFile)).test("", ""));
-		assertThat(exception.getTargetException().getMessage()).contains("Invalid fields: invalidScalaFmtConfigField");
-
-		exception = assertThrows(InvocationTargetException.class,
-				() -> StepHarness.forStep(ScalaFmtStep.create("2.0.1", provisioner, invalidConfFile)).test("", ""));
-		assertThat(exception.getTargetException().getMessage()).contains("Invalid field: invalidScalaFmtConfigField");
+		NoSuchElementException exception;
 
-		exception = assertThrows(InvocationTargetException.class,
+		exception = assertThrows(NoSuchElementException.class,
 				() -> StepHarness.forStep(ScalaFmtStep.create("3.0.0", provisioner, invalidConfFile)).test("", ""));
-		assertThat(exception.getTargetException().getMessage()).contains("found option 'invalidScalaFmtConfigField' which wasn't expected");
+		assertThat(exception.getMessage()).contains("found option 'invalidScalaFmtConfigField' which wasn't expected");
 	}
 }

From fa9ad004babe8841bf51f6503fe223619186ac36 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Aug 2022 12:02:49 +0000
Subject: [PATCH 0264/2068] Bump com.github.spotbugs from 5.0.9 to 5.0.10

Bumps com.github.spotbugs from 5.0.9 to 5.0.10.

---
updated-dependencies:
- dependency-name: com.github.spotbugs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 77f17be106..83ed4aa59d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
 		// https://github.com/gradle-nexus/publish-plugin/releases
 		id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
 		// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
-		id 'com.github.spotbugs'                   version '5.0.9'
+		id 'com.github.spotbugs'                   version '5.0.10'
 		// https://github.com/diffplug/spotless-changelog
 		id 'com.diffplug.spotless-changelog'       version '2.3.2'
 		// https://github.com/diffplug/goomph/blob/main/CHANGES.md

From 137392f5fe38deaddebce6114d7e06ea8b517396 Mon Sep 17 00:00:00 2001
From: Matthew de Detrich <matthew.dedetrich@aiven.io>
Date: Tue, 23 Aug 2022 01:06:12 +0200
Subject: [PATCH 0265/2068] Allow configuration of scalaMajorVersion

---
 .../diffplug/spotless/scala/ScalaFmtStep.java  | 18 +++++++++++++++---
 .../gradle/spotless/ScalaExtension.java        | 14 +++++++++++---
 .../spotless/maven/scala/Scalafmt.java         |  6 +++++-
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java b/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java
index 34c951cf06..6ef9fcd5a7 100644
--- a/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java
@@ -35,16 +35,24 @@ public class ScalaFmtStep {
 	private ScalaFmtStep() {}
 
 	private static final String DEFAULT_VERSION = "3.5.9";
+
+	private static final String DEFAULT_SCALA_MAJOR_VERSION = "2.13";
 	static final String NAME = "scalafmt";
-	static final String MAVEN_COORDINATE = "org.scalameta:scalafmt-core_2.13:";
+	static final String MAVEN_COORDINATE = "org.scalameta:scalafmt-core_";
 
 	public static FormatterStep create(Provisioner provisioner) {
-		return create(defaultVersion(), provisioner, null);
+		return create(defaultVersion(), defaultScalaMajorVersion(), provisioner, null);
 	}
 
 	public static FormatterStep create(String version, Provisioner provisioner, @Nullable File configFile) {
+		return create(version, defaultScalaMajorVersion(), provisioner, configFile);
+	}
+
+	public static FormatterStep create(String version, @Nullable String scalaMajorVersion, Provisioner provisioner, @Nullable File configFile) {
+		String finalScalaMajorVersion = scalaMajorVersion == null ? DEFAULT_SCALA_MAJOR_VERSION : scalaMajorVersion;
+
 		return FormatterStep.createLazy(NAME,
-				() -> new State(JarState.from(MAVEN_COORDINATE + version, provisioner), configFile),
+				() -> new State(JarState.from(MAVEN_COORDINATE + finalScalaMajorVersion + ":" + version, provisioner), configFile),
 				State::createFormat);
 	}
 
@@ -52,6 +60,10 @@ public static String defaultVersion() {
 		return DEFAULT_VERSION;
 	}
 
+	public static String defaultScalaMajorVersion() {
+		return DEFAULT_SCALA_MAJOR_VERSION;
+	}
+
 	static final class State implements Serializable {
 		private static final long serialVersionUID = 1L;
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java
index f6db64348d..06fddc38e3 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java
@@ -48,21 +48,29 @@ public ScalaFmtConfig scalafmt(String version) {
 	public class ScalaFmtConfig {
 		final String version;
 		@Nullable
+		String scalaMajorVersion;
+		@Nullable
 		Object configFile;
 
 		ScalaFmtConfig(String version) {
 			this.version = Objects.requireNonNull(version);
-			addStep(createStep());
 		}
 
-		public void configFile(Object configFile) {
+		public ScalaFmtConfig configFile(Object configFile) {
 			this.configFile = Objects.requireNonNull(configFile);
 			replaceStep(createStep());
+			return this;
+		}
+
+		public ScalaFmtConfig scalaMajorVersion(String scalaMajorVersion) {
+			this.scalaMajorVersion = Objects.requireNonNull(scalaMajorVersion);
+			replaceStep(createStep());
+			return this;
 		}
 
 		private FormatterStep createStep() {
 			File resolvedConfigFile = configFile == null ? null : getProject().file(configFile);
-			return ScalaFmtStep.create(version, provisioner(), resolvedConfigFile);
+			return ScalaFmtStep.create(version, scalaMajorVersion, provisioner(), resolvedConfigFile);
 		}
 	}
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/scala/Scalafmt.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/scala/Scalafmt.java
index 470a5ddb72..0de90c4a7f 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/scala/Scalafmt.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/scala/Scalafmt.java
@@ -32,10 +32,14 @@ public class Scalafmt implements FormatterStepFactory {
 	@Parameter
 	private String version;
 
+	@Parameter
+	private String scalaMajorVersion;
+
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig config) {
 		String scalafmtVersion = version != null ? version : ScalaFmtStep.defaultVersion();
+		String scalafmtScalaMajorVersion = scalaMajorVersion != null ? scalaMajorVersion : ScalaFmtStep.defaultScalaMajorVersion();
 		File configFile = config.getFileLocator().locateFile(file);
-		return ScalaFmtStep.create(scalafmtVersion, config.getProvisioner(), configFile);
+		return ScalaFmtStep.create(scalafmtVersion, scalafmtScalaMajorVersion, config.getProvisioner(), configFile);
 	}
 }

From abe0be95ee0a819fa165464405d2da4038e48d10 Mon Sep 17 00:00:00 2001
From: Matthew de Detrich <matthew.dedetrich@aiven.io>
Date: Tue, 23 Aug 2022 01:16:40 +0200
Subject: [PATCH 0266/2068] Resolve formatting issues

---
 .../main/java/com/diffplug/gradle/spotless/ScalaExtension.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java
index 06fddc38e3..841c35e6d6 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From df59712817490eb87451770b8a32f461160622ea Mon Sep 17 00:00:00 2001
From: Matthew de Detrich <matthew.dedetrich@aiven.io>
Date: Tue, 23 Aug 2022 01:20:35 +0200
Subject: [PATCH 0267/2068] More formatting issues

---
 .../main/java/com/diffplug/spotless/maven/scala/Scalafmt.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/scala/Scalafmt.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/scala/Scalafmt.java
index 0de90c4a7f..e0dc44bef5 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/scala/Scalafmt.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/scala/Scalafmt.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 677415e9c197e81a46d1f1f7d8d7d00b13840007 Mon Sep 17 00:00:00 2001
From: Matthew de Detrich <matthew.dedetrich@aiven.io>
Date: Tue, 23 Aug 2022 01:38:57 +0200
Subject: [PATCH 0268/2068] Fix accidental removal of addStep

---
 .../main/java/com/diffplug/gradle/spotless/ScalaExtension.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java
index 841c35e6d6..8a8765b539 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java
@@ -54,6 +54,7 @@ public class ScalaFmtConfig {
 
 		ScalaFmtConfig(String version) {
 			this.version = Objects.requireNonNull(version);
+			addStep(createStep());
 		}
 
 		public ScalaFmtConfig configFile(Object configFile) {

From 30d72d82f9183274bfcffced5fc7f4525ed80946 Mon Sep 17 00:00:00 2001
From: Matthew de Detrich <matthew.dedetrich@aiven.io>
Date: Tue, 23 Aug 2022 11:40:06 +0200
Subject: [PATCH 0269/2068] Add documentation for majorScalaVersion

---
 CHANGES.md              | 1 +
 plugin-gradle/README.md | 4 ++--
 plugin-maven/README.md  | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 46524605ac..185ca636ee 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changes
 * Converted `scalafmt` integration to use a compile-only source set. (fixes [#524](https://github.com/diffplug/spotless/issues/524))
+* `scalafmt` integration now has a configuration option `majorScalaVersion` that allows you to configure the Scala version that gets resolved from the maven artifact. [#1283](https://github.com/diffplug/spotless/pull/1283)
 * Add the `ktlint` rule in error messages when `ktlint` fails to apply a fix ([#1279](https://github.com/diffplug/spotless/pull/1279))
 
 ## [2.28.1] - 2022-08-10
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 53e77a9ced..d107dc7f98 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -388,8 +388,8 @@ spotless {
 ```gradle
 spotless {
   scala {
-    // version and configFile are both optional
-    scalafmt('2.6.1').configFile('scalafmt.conf')
+    // version and configFile, majorScalaVersion are all optional
+    scalafmt('2.6.1').configFile('scalafmt.conf').majorScalaVersion('2.13')
 ```
 
 <a name="applying-to-cc-sources"></a>
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index fa4cf55c74..0b75c59434 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -395,6 +395,7 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 <scalafmt>
   <version>2.0.1</version>              <!-- optional -->
   <file>${project.basedir}/scalafmt.conf</file> <!-- optional -->
+  <majorScalaVersion>2.13</majorScalaVersion> <!-- optional -->
 </scalafmt>
 ```
 

From 872424a816b8f1068dfa3b7ae82c447ac342baba Mon Sep 17 00:00:00 2001
From: Matthew de Detrich <matthew.dedetrich@aiven.io>
Date: Tue, 23 Aug 2022 11:40:59 +0200
Subject: [PATCH 0270/2068] Update scalafmt versions in documentation

---
 plugin-gradle/README.md | 2 +-
 plugin-maven/README.md  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index d107dc7f98..7e0a39ab0e 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -389,7 +389,7 @@ spotless {
 spotless {
   scala {
     // version and configFile, majorScalaVersion are all optional
-    scalafmt('2.6.1').configFile('scalafmt.conf').majorScalaVersion('2.13')
+    scalafmt('3.5.9').configFile('scalafmt.conf').majorScalaVersion('2.13')
 ```
 
 <a name="applying-to-cc-sources"></a>
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 0b75c59434..f29d34f5bd 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -393,7 +393,7 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ```xml
 <scalafmt>
-  <version>2.0.1</version>              <!-- optional -->
+  <version>3.5.9</version>              <!-- optional -->
   <file>${project.basedir}/scalafmt.conf</file> <!-- optional -->
   <majorScalaVersion>2.13</majorScalaVersion> <!-- optional -->
 </scalafmt>

From 24ca9ec83ed01917bb13827c2f2a26a421610f82 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 23 Aug 2022 12:32:51 -0700
Subject: [PATCH 0271/2068] Add info about changes to scalafmt default version.

---
 CHANGES.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 185ca636ee..0fc7f14021 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,10 +10,12 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* `scalafmt` integration now has a configuration option `majorScalaVersion` that allows you to configure the Scala version that gets resolved from the maven artifact ([#1283](https://github.com/diffplug/spotless/pull/1283))
+  * Converted `scalafmt` integration to use a compile-only source set (fixes [#524](https://github.com/diffplug/spotless/issues/524))
 ### Changes
-* Converted `scalafmt` integration to use a compile-only source set. (fixes [#524](https://github.com/diffplug/spotless/issues/524))
-* `scalafmt` integration now has a configuration option `majorScalaVersion` that allows you to configure the Scala version that gets resolved from the maven artifact. [#1283](https://github.com/diffplug/spotless/pull/1283)
 * Add the `ktlint` rule in error messages when `ktlint` fails to apply a fix ([#1279](https://github.com/diffplug/spotless/pull/1279))
+* Bump default `scalafmt` to latest `3.0.8` -> `3.5.9` (removed support for pre-`3.0.0`) ([#1283](https://github.com/diffplug/spotless/pull/1283))
 
 ## [2.28.1] - 2022-08-10
 ### Fixed

From 735c7b5228a46a5d292b0aecfdc2d459932ac414 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 23 Aug 2022 12:33:02 -0700
Subject: [PATCH 0272/2068] Update the tool-specific changelogs.

---
 plugin-gradle/CHANGES.md | 3 +++
 plugin-maven/CHANGES.md  | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 72d600688c..30235660d5 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,8 +3,11 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Added
+* `scalafmt` integration now has a configuration option `majorScalaVersion` that allows you to configure the Scala version that gets resolved from the maven artifact ([#1283](https://github.com/diffplug/spotless/pull/1283))
 ### Changes
 * Add the `ktlint` rule in error messages when `ktlint` fails to apply a fix ([#1279](https://github.com/diffplug/spotless/pull/1279))
+* Bump default `scalafmt` to latest `3.0.8` -> `3.5.9` (removed support for pre-`3.0.0`) ([#1283](https://github.com/diffplug/spotless/pull/1283))
 
 ## [6.9.1] - 2022-08-10
 ### Fixed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 7366c3b731..ced0a0baba 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,8 +3,11 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* `scalafmt` integration now has a configuration option `majorScalaVersion` that allows you to configure the Scala version that gets resolved from the maven artifact ([#1283](https://github.com/diffplug/spotless/pull/1283))
 ### Changes
 * Add the `ktlint` rule in error messages when `ktlint` fails to apply a fix ([#1279](https://github.com/diffplug/spotless/pull/1279))
+* Bump default `scalafmt` to latest `3.0.8` -> `3.5.9` (removed support for pre-`3.0.0`) ([#1283](https://github.com/diffplug/spotless/pull/1283))
 
 ## [2.24.1] - 2022-08-10
 ### Fixed

From a75877c085b283a8eafb9397008cb7d6ce208217 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 23 Aug 2022 12:37:36 -0700
Subject: [PATCH 0273/2068] Massive speedup. FormatterFunc is instantiated
 lazily and is not involved in serialization/equality, so good to eagerly
 initialize in the constructor.

---
 .../glue/scalafmt/ScalafmtFormatterFunc.java       | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/lib/src/scalafmt/java/com/diffplug/spotless/glue/scalafmt/ScalafmtFormatterFunc.java b/lib/src/scalafmt/java/com/diffplug/spotless/glue/scalafmt/ScalafmtFormatterFunc.java
index b5924b2bac..49e1b6a1be 100644
--- a/lib/src/scalafmt/java/com/diffplug/spotless/glue/scalafmt/ScalafmtFormatterFunc.java
+++ b/lib/src/scalafmt/java/com/diffplug/spotless/glue/scalafmt/ScalafmtFormatterFunc.java
@@ -30,15 +30,9 @@
 import scala.collection.immutable.Set$;
 
 public class ScalafmtFormatterFunc implements FormatterFunc {
-	private final FileSignature configSignature;
+	private final ScalafmtConfig config;
 
-	public ScalafmtFormatterFunc(FileSignature configSignature) {
-		this.configSignature = configSignature;
-	}
-
-	@Override
-	public String apply(String input) throws Exception {
-		ScalafmtConfig config;
+	public ScalafmtFormatterFunc(FileSignature configSignature) throws Exception {
 		if (configSignature.files().isEmpty()) {
 			// Note that reflection is used here only because Scalafmt has a method called
 			// default which happens to be a reserved Java keyword. The only way to call
@@ -51,6 +45,10 @@ public String apply(String input) throws Exception {
 			String configStr = new String(Files.readAllBytes(file.toPath()), StandardCharsets.UTF_8);
 			config = Scalafmt.parseHoconConfig(configStr).get();
 		}
+	}
+
+	@Override
+	public String apply(String input) {
 		return Scalafmt.format(input, config, Set$.MODULE$.empty()).get();
 	}
 }

From e9d31502b710b56b57bbcc46be02f11313dfbfe0 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 23 Aug 2022 13:02:51 -0700
Subject: [PATCH 0274/2068] Fix test.

---
 .../com/diffplug/spotless/scala/ScalaFmtStepTest.java     | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/testlib/src/test/java/com/diffplug/spotless/scala/ScalaFmtStepTest.java b/testlib/src/test/java/com/diffplug/spotless/scala/ScalaFmtStepTest.java
index 8003607962..bad573e985 100644
--- a/testlib/src/test/java/com/diffplug/spotless/scala/ScalaFmtStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/scala/ScalaFmtStepTest.java
@@ -20,7 +20,7 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.NoSuchElementException;
+import java.lang.reflect.InvocationTargetException;
 
 import org.junit.jupiter.api.Test;
 
@@ -91,10 +91,8 @@ void invalidConfiguration() throws Exception {
 		File invalidConfFile = createTestFile("scala/scalafmt/scalafmt.invalid.conf");
 		Provisioner provisioner = TestProvisioner.mavenCentral();
 
-		NoSuchElementException exception;
-
-		exception = assertThrows(NoSuchElementException.class,
+		InvocationTargetException exception = assertThrows(InvocationTargetException.class,
 				() -> StepHarness.forStep(ScalaFmtStep.create("3.0.0", provisioner, invalidConfFile)).test("", ""));
-		assertThat(exception.getMessage()).contains("found option 'invalidScalaFmtConfigField' which wasn't expected");
+		assertThat(exception.getCause().getMessage()).contains("found option 'invalidScalaFmtConfigField' which wasn't expected");
 	}
 }

From a5332a6df3166cd1085092419b4f341a4dab3fa9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Aug 2022 20:21:26 +0000
Subject: [PATCH 0275/2068] Bump slf4j-api from 1.7.36 to 2.0.0

Bumps [slf4j-api](https://github.com/qos-ch/slf4j) from 1.7.36 to 2.0.0.
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.36...v_2.0.0)

---
updated-dependencies:
- dependency-name: org.slf4j:slf4j-api
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 lib/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 0b3f4555b2..fae8b5b875 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -24,7 +24,7 @@ for (glue in NEEDS_GLUE) {
 }
 
 dependencies {
-	compileOnly 'org.slf4j:slf4j-api:1.7.36'
+	compileOnly 'org.slf4j:slf4j-api:2.0.0'
 	// zero runtime reqs is a hard requirements for spotless-lib
 	// if you need a dep, put it in lib-extra
 	testImplementation "org.junit.jupiter:junit-jupiter:$VER_JUNIT"
@@ -33,7 +33,7 @@ dependencies {
 
 	// used for pom sorting
 	sortPomCompileOnly 'com.github.ekryd.sortpom:sortpom-sorter:3.0.0'
-	sortPomCompileOnly 'org.slf4j:slf4j-api:1.7.35'
+	sortPomCompileOnly 'org.slf4j:slf4j-api:2.0.0'
 
 	palantirJavaFormatCompileOnly 'com.palantir.javaformat:palantir-java-format:1.1.0'
 

From 1dfd0ee20868f9ca1b76817ae143712b3df8d729 Mon Sep 17 00:00:00 2001
From: circleci <circleci@bb4e8b46ec52>
Date: Tue, 23 Aug 2022 21:54:46 +0000
Subject: [PATCH 0276/2068] Published lib/2.29.0

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 0fc7f14021..580b23b9fb 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.29.0] - 2022-08-23
 ### Added
 * `scalafmt` integration now has a configuration option `majorScalaVersion` that allows you to configure the Scala version that gets resolved from the maven artifact ([#1283](https://github.com/diffplug/spotless/pull/1283))
   * Converted `scalafmt` integration to use a compile-only source set (fixes [#524](https://github.com/diffplug/spotless/issues/524))

From f0ad997adb617fb76afbfa09909294b8aff642b9 Mon Sep 17 00:00:00 2001
From: circleci <circleci@bb4e8b46ec52>
Date: Tue, 23 Aug 2022 21:55:49 +0000
Subject: [PATCH 0277/2068] Published gradle/6.10.0

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 46 ++++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 30235660d5..ee1ab8bee8 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [6.10.0] - 2022-08-23
 ### Added
 * `scalafmt` integration now has a configuration option `majorScalaVersion` that allows you to configure the Scala version that gets resolved from the maven artifact ([#1283](https://github.com/diffplug/spotless/pull/1283))
 ### Changes
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 7e0a39ab0e..a9fcfbfcf6 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -18,9 +18,9 @@ output = [
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
 [![Maven central](https://img.shields.io/badge/mavencentral-yes-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/index.html)
 [![License Apache](https://img.shields.io/badge/license-apache-blue.svg)](https://tldrlegal.com/license/apache-license-2.0-(apache-2.0))
-[![Changelog](https://img.shields.io/badge/changelog-6.9.1-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-6.10.0-blue.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)
@@ -126,10 +126,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -141,7 +141,7 @@ If you're stuck on an older version of Gradle, `id 'com.diffplug.gradle.spotless
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -248,8 +248,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -300,8 +300,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -364,7 +364,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -396,7 +396,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -428,7 +428,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -462,7 +462,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -483,7 +483,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -508,7 +508,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -548,7 +548,7 @@ sql.formatter.indent.size=4
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -591,7 +591,7 @@ For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#n
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -816,7 +816,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -883,9 +883,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -918,11 +918,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.9.1/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From 753f8f76078c81e841eeb9ae50aa108abf64b4f7 Mon Sep 17 00:00:00 2001
From: circleci <circleci@bb4e8b46ec52>
Date: Tue, 23 Aug 2022 21:57:47 +0000
Subject: [PATCH 0278/2068] Published maven/2.25.0

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index ced0a0baba..3b6986c5db 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.25.0] - 2022-08-23
 ### Added
 * `scalafmt` integration now has a configuration option `majorScalaVersion` that allows you to configure the Scala version that gets resolved from the maven artifact ([#1283](https://github.com/diffplug/spotless/pull/1283))
 ### Changes
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index f29d34f5bd..f59d00d47a 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -12,8 +12,8 @@ output = [
   ].join('\n');
 -->
 [![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.24.1/index.html)
-[![Changelog](https://img.shields.io/badge/changelog-2.24.1-brightgreen.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.25.0/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.25.0-brightgreen.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)

From 42edcb1c094732c6efb52bc57bb61cc10bb17f88 Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Thu, 25 Aug 2022 09:28:16 -0700
Subject: [PATCH 0279/2068] Add documentation in `README.md`

---
 plugin-gradle/README.md | 42 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index bb71d8ab5b..aee7d43eef 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -60,7 +60,7 @@ Spotless supports all of Gradle's built-in performance features (incremental bui
 - [**Quickstart**](#quickstart)
   - [Requirements](#requirements)
 - **Languages**
-  - [Java](#java) ([google-java-format](#google-java-format), [eclipse jdt](#eclipse-jdt), [clang-format](#clang-format), [prettier](#prettier), [palantir-java-format](#palantir-java-format))
+  - [Java](#java) ([google-java-format](#google-java-format), [eclipse jdt](#eclipse-jdt), [clang-format](#clang-format), [prettier](#prettier), [palantir-java-format](#palantir-java-format), [type annotations](#Type annotations))
   - [Groovy](#groovy) ([eclipse groovy](#eclipse-groovy))
   - [Kotlin](#kotlin) ([ktfmt](#ktfmt), [ktlint](#ktlint), [diktat](#diktat), [prettier](#prettier))
   - [Scala](#scala) ([scalafmt](#scalafmt))
@@ -117,6 +117,8 @@ spotless {
 
     // apply a specific flavor of google-java-format
     googleJavaFormat('1.8').aosp().reflowLongStrings()
+    // fix formatting of type annotations
+    typeAnnotations()
     // make sure every file has the following copyright header.
     // optionally, Spotless can set copyright years by digging
     // through git history (see "license" section below)
@@ -162,6 +164,8 @@ spotless {
     prettier()         // has its own section below
     clangFormat()      // has its own section below
 
+    typeAnnotations()  // has its own section below
+
     licenseHeader '/* (C) $YEAR */' // or licenseHeaderFile
   }
 }
@@ -188,6 +192,8 @@ spotless {
     //   and/or reflow long strings (requires at least 1.8)
     //   and/or use custom group artifact (you probably don't need this)
     googleJavaFormat('1.8').aosp().reflowLongStrings().groupArtifact('com.google.googlejavaformat:google-java-format')
+    // optional: fix formatting of type annotations
+    typeAnnotations()
 ```
 
 **⚠️ Note on using Google Java Format with Java 16+**
@@ -214,6 +220,8 @@ spotless {
     palantirJavaFormat()
     // optional: you can specify a specific version
     palantirJavaFormat('2.9.0')
+    // optional: fix formatting of type annotations
+    typeAnnotations()
 ```
 
 **⚠️ Note on using Palantir Java Format with Java 16+**
@@ -244,6 +252,38 @@ spotless {
 ```
 
 
+### Type annotations
+
+Type annotations should be on the same line as the type that they qualify.
+
+```java
+  @Override
+  @Deprecated
+  @Nullable @Interned String s;
+```
+
+However, some tools format them incorrectly, like this:
+
+```java
+  @Override
+  @Deprecated
+  @Nullable
+  @Interned
+  String s;
+```
+
+To fix the incorrect formatting, add the `typeAnnotations()` rule after a Java formatter.  For example:
+
+```gradle
+spotless {
+  java {
+    googleJavaFormat()
+    typeAnnotations()
+  }
+}
+```
+
+
 <a name="applying-to-groovy-source"></a>
 
 ## Groovy

From 4ad48a95a02261c34a5aa74c225d95289a3ecd56 Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Thu, 25 Aug 2022 09:31:52 -0700
Subject: [PATCH 0280/2068] Fix indentation

---
 .../diffplug/spotless/java/TypeAnnotationsStep.java   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/TypeAnnotationsStep.java b/lib/src/main/java/com/diffplug/spotless/java/TypeAnnotationsStep.java
index dd0b86eeb4..673807a08e 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/TypeAnnotationsStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/TypeAnnotationsStep.java
@@ -405,10 +405,10 @@ FormatterFunc toFormatter() {
 		}
 
 		/**
-		         * Removes line break between type annotations and the following type.
-		         *
-		         * @param the text of a Java file
-		         * @return corrected text of the Java file
+		 * Removes line break between type annotations and the following type.
+		 *
+		 * @param the text of a Java file
+		 * @return corrected text of the Java file
 		 */
 		String fixupTypeAnnotations(String unixStr) {
 			// Each element of `lines` ends with a newline.
@@ -428,7 +428,8 @@ String fixupTypeAnnotations(String unixStr) {
 		}
 
 		/**
-		 * Returns true if the line ends with a type annotation. We need to fix such formatting.
+		 * Returns true if the line ends with a type annotation.
+		 * TypeAnnotationStep fixes such formatting.
 		 */
 		boolean endsWithTypeAnnotation(String unixLine) {
 			// Remove trailing newline.

From e886d24500cf32fff6a417f1dc08bf93b6e15c0b Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Thu, 25 Aug 2022 10:17:40 -0700
Subject: [PATCH 0281/2068] The Checker Framework supports most known type
 annotations.

---
 .../java/com/diffplug/spotless/java/TypeAnnotationsStep.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/TypeAnnotationsStep.java b/lib/src/main/java/com/diffplug/spotless/java/TypeAnnotationsStep.java
index 673807a08e..2a46f0f40c 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/TypeAnnotationsStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/TypeAnnotationsStep.java
@@ -51,7 +51,9 @@ private static final class State implements Serializable {
 		 */
 		private static final Set<String> typeAnnotations = new HashSet<>(
 				Arrays.asList(
-						// Type annotations from the Checker Framework.
+						// Type annotations from the Checker Framework and all the tools it
+						// supports, including FindBugs, JetBrains (IntelliJ), Eclipse, NetBeans,
+						// Spring, JML, Android, etc.
 						"A",
 						"ACCBottom",
 						"Acceleration",

From 8666f98590976ccffb2e81fabbd3a348eed4066d Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Thu, 25 Aug 2022 11:23:38 -0700
Subject: [PATCH 0282/2068] Add line to table

---
 README.md               | 2 ++
 gradle/spotless.gradle  | 1 +
 plugin-gradle/README.md | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f95ea7a7ca..7680062a6c 100644
--- a/README.md
+++ b/README.md
@@ -61,6 +61,7 @@ lib('java.ImportOrderStep')                      +'{{yes}}       | {{yes}}
 lib('java.PalantirJavaFormatStep')               +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('java.RemoveUnusedImportsStep')              +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
 extra('java.EclipseJdtFormatterStep')            +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
+lib('java.TypeAnnotationsStep')                  +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
 lib('json.gson.GsonStep')                        +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
 lib('json.JsonSimpleStep')                       +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
 lib('kotlin.KtLintStep')                         +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
@@ -104,6 +105,7 @@ extra('wtp.EclipseWtpFormatterStep')             +'{{yes}}       | {{yes}}
 | [`java.PalantirJavaFormatStep`](lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`java.RemoveUnusedImportsStep`](lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`java.EclipseJdtFormatterStep`](lib-extra/src/main/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
+| [`java.TypeAnnotationsStep`](lib/src/main/java/com/diffplug/spotless/java/TypeAnnotationsStep.java) | :+1:       | :+1:       | :white_large_square:       | :white_large_square:  |
 | [`json.gson.GsonStep`](lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
 | [`json.JsonSimpleStep`](lib/src/main/java/com/diffplug/spotless/json/JsonSimpleStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
 | [`kotlin.KtLintStep`](lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
diff --git a/gradle/spotless.gradle b/gradle/spotless.gradle
index 96037b21a3..8ab9516bcc 100644
--- a/gradle/spotless.gradle
+++ b/gradle/spotless.gradle
@@ -22,6 +22,7 @@ spotless {
 			eclipse().configFile rootProject.file('gradle/spotless.eclipseformat.xml')
 			trimTrailingWhitespace()
 			removeUnusedImports()
+			// TODO: typeAnnotations()
 			custom 'noInternalDeps', noInternalDepsClosure
 		}
 	}
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index c96e8a1157..35133d4570 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -60,7 +60,7 @@ Spotless supports all of Gradle's built-in performance features (incremental bui
 - [**Quickstart**](#quickstart)
   - [Requirements](#requirements)
 - **Languages**
-  - [Java](#java) ([google-java-format](#google-java-format), [eclipse jdt](#eclipse-jdt), [clang-format](#clang-format), [prettier](#prettier), [palantir-java-format](#palantir-java-format), [type annotations](#Type annotations))
+  - [Java](#java) ([google-java-format](#google-java-format), [eclipse jdt](#eclipse-jdt), [clang-format](#clang-format), [prettier](#prettier), [palantir-java-format](#palantir-java-format), [type annotations](#type-annotations))
   - [Groovy](#groovy) ([eclipse groovy](#eclipse-groovy))
   - [Kotlin](#kotlin) ([ktfmt](#ktfmt), [ktlint](#ktlint), [diktat](#diktat), [prettier](#prettier))
   - [Scala](#scala) ([scalafmt](#scalafmt))

From 68e421770140f29b2c083ee478447bd1e7932358 Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Thu, 25 Aug 2022 11:44:54 -0700
Subject: [PATCH 0283/2068] Tweak comment

---
 plugin-gradle/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 35133d4570..894d8747bf 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -164,7 +164,7 @@ spotless {
     prettier()         // has its own section below
     clangFormat()      // has its own section below
 
-    typeAnnotations()  // has its own section below
+    typeAnnotations()  // fixes formatting of type annotations, see below
 
     licenseHeader '/* (C) $YEAR */' // or licenseHeaderFile
   }

From e69ab4b0266c39f89f61d0c19dd2e5afe98835b3 Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Thu, 25 Aug 2022 11:52:07 -0700
Subject: [PATCH 0284/2068] Add Maven support

---
 README.md                                     |  2 +-
 plugin-maven/CHANGES.md                       |  2 ++
 plugin-maven/README.md                        | 33 +++++++++++++++++--
 .../diffplug/spotless/maven/java/Java.java    |  4 +++
 .../spotless/maven/java/TypeAnnotations.java  | 29 ++++++++++++++++
 .../maven/java/TypeAnnotationsStepTest.java   | 33 +++++++++++++++++++
 6 files changed, 100 insertions(+), 3 deletions(-)
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/java/TypeAnnotations.java
 create mode 100644 plugin-maven/src/test/java/com/diffplug/spotless/maven/java/TypeAnnotationsStepTest.java

diff --git a/README.md b/README.md
index 7680062a6c..049e8728fa 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ lib('java.ImportOrderStep')                      +'{{yes}}       | {{yes}}
 lib('java.PalantirJavaFormatStep')               +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('java.RemoveUnusedImportsStep')              +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
 extra('java.EclipseJdtFormatterStep')            +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
-lib('java.TypeAnnotationsStep')                  +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
+lib('java.TypeAnnotationsStep')                  +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('json.gson.GsonStep')                        +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
 lib('json.JsonSimpleStep')                       +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
 lib('kotlin.KtLintStep')                         +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 3b6986c5db..c5c322ff55 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* `typeAnnotations` step to correct formatting of type annotations.  It puts type annotations on the same line as the type that they qualify.  Run it after a Java formattng step, such as `googleJavaFormat`. ([#1275](https://github.com/diffplug/spotless/pull/1275))
 
 ## [2.25.0] - 2022-08-23
 ### Added
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index f59d00d47a..eaee799db7 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -24,7 +24,7 @@ output = [
 output = prefixDelimiterReplace(input, 'https://{{org}}.github.io/{{name}}/javadoc/spotless-plugin-maven/', '/', versionLast)
 -->
 
-Spotless is a general-purpose formatting plugin.  It is completely à la carte, but also includes powerful "batteries-included" if you opt-in. Plugin requires a version of Maven higher or equal to 3.1.0.
+Spotless is a general-purpose formatting plugin used by [4,000 projects on GitHub (August 2020)](https://github.com/search?l=gradle&q=spotless&type=Code).  It is completely à la carte, but also includes powerful "batteries-included" if you opt-in. Plugin requires a version of Maven higher or equal to 3.1.0.
 
 To people who use your build, it looks like this:
 
@@ -47,7 +47,7 @@ user@machine repo % mvn spotless:check
   - [Requirements](#requirements)
   - [Binding to maven phase](#binding-to-maven-phase)
 - **Languages**
-  - [Java](#java) ([google-java-format](#google-java-format), [eclipse jdt](#eclipse-jdt), [prettier](#prettier), [palantir-java-format](#palantir-java-format))
+  - [Java](#java) ([google-java-format](#google-java-format), [eclipse jdt](#eclipse-jdt), [prettier](#prettier), [palantir-java-format](#palantir-java-format), [type annotations](#type-annotations))
   - [Groovy](#groovy) ([eclipse groovy](#eclipse-groovy))
   - [Kotlin](#kotlin) ([ktfmt](#ktfmt), [ktlint](#ktlint), [diktat](#diktat), [prettier](#prettier))
   - [Scala](#scala) ([scalafmt](#scalafmt))
@@ -191,6 +191,8 @@ any other maven phase (i.e. compile) then it can be configured as below;
     <eclipse />          <!-- has its own section below -->
     <prettier />         <!-- has its own section below -->
 
+    <typeAnnotations />  <!-- fixes formatting of type annotations, see below -->
+
     <licenseHeader>
       <content>/* (C)$YEAR */</content>  <!-- or <file>${project.basedir}/license-header</file> -->
     </licenseHeader>
@@ -255,6 +257,33 @@ This is a workaround to a [pending issue](https://github.com/diffplug/spotless/i
 </eclipse>
 ```
 
+### Type annotations
+
+Type annotations should be on the same line as the type that they qualify.
+
+```java
+  @Override
+  @Deprecated
+  @Nullable @Interned String s;
+```
+
+However, some tools format them incorrectly, like this:
+
+```java
+  @Override
+  @Deprecated
+  @Nullable
+  @Interned
+  String s;
+```
+
+To fix the incorrect formatting, add the `typeAnnotations()` rule after a Java formatter.  For example:
+
+```XML
+<googleJavaFormat />
+<typeAnnotations />
+```
+
 ## Groovy
 
 [code](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy/Groovy.java). [available steps](https://github.com/diffplug/spotless/tree/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy).
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Java.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Java.java
index 819179ebba..66b6b8b1c7 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Java.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Java.java
@@ -61,4 +61,8 @@ public void addPalantirJavaFormat(PalantirJavaFormat palantirJavaFormat) {
 	public void addRemoveUnusedImports(RemoveUnusedImports removeUnusedImports) {
 		addStepFactory(removeUnusedImports);
 	}
+
+	public void addTypeAnnotations(TypeAnnotations typeAnnotations) {
+		addStepFactory(typeAnnotations);
+	}
 }
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/TypeAnnotations.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/TypeAnnotations.java
new file mode 100644
index 0000000000..8a555c6c72
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/TypeAnnotations.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.java;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.java.TypeAnnotationsStep;
+import com.diffplug.spotless.maven.FormatterStepConfig;
+import com.diffplug.spotless.maven.FormatterStepFactory;
+
+public class TypeAnnotations implements FormatterStepFactory {
+
+	@Override
+	public FormatterStep newFormatterStep(FormatterStepConfig config) {
+		return TypeAnnotationsStep.create();
+	}
+}
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/TypeAnnotationsStepTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/TypeAnnotationsStepTest.java
new file mode 100644
index 0000000000..9ceebafb5e
--- /dev/null
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/TypeAnnotationsStepTest.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.java;
+
+import org.junit.jupiter.api.Test;
+
+import com.diffplug.spotless.maven.MavenIntegrationHarness;
+
+class TypeAnnotationsStepTest extends MavenIntegrationHarness {
+
+	@Test
+	void testRemoveUnusedInports() throws Exception {
+		writePomWithJavaSteps("<typeAnnotations/>");
+
+		String path = "src/main/java/test.java";
+		setFile(path).toResource("java/typeannotations/TypeAnnotationsTestInput.test");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile(path).sameAsResource("java/typeannotations/TypeAnnotationsTestOutput.test");
+	}
+}

From 61da1b2357656f31e23e04ccdf20803ff6ad649c Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Thu, 25 Aug 2022 12:02:38 -0700
Subject: [PATCH 0285/2068] Fix test name

---
 .../diffplug/spotless/maven/java/TypeAnnotationsStepTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/TypeAnnotationsStepTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/TypeAnnotationsStepTest.java
index 9ceebafb5e..c2281bf8fd 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/TypeAnnotationsStepTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/TypeAnnotationsStepTest.java
@@ -22,7 +22,7 @@
 class TypeAnnotationsStepTest extends MavenIntegrationHarness {
 
 	@Test
-	void testRemoveUnusedInports() throws Exception {
+	void testTypeAnnotations() throws Exception {
 		writePomWithJavaSteps("<typeAnnotations/>");
 
 		String path = "src/main/java/test.java";

From 9553e60bc2ed8dc32a5e96a58fbf25ca6d07e69c Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Thu, 25 Aug 2022 12:02:47 -0700
Subject: [PATCH 0286/2068] Define "type annotation"

---
 .../java/com/diffplug/spotless/java/TypeAnnotationsStep.java  | 4 ++++
 plugin-gradle/README.md                                       | 2 ++
 plugin-maven/README.md                                        | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/TypeAnnotationsStep.java b/lib/src/main/java/com/diffplug/spotless/java/TypeAnnotationsStep.java
index 2a46f0f40c..36a988aa23 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/TypeAnnotationsStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/TypeAnnotationsStep.java
@@ -30,6 +30,9 @@
  * -- even type annotations, which should be on the same line as the type they qualify.
  * This class corrects the formatting.
  * This is useful as a postprocessing step after a Java formatter that is not cognizant of type annotations.
+
+ * <p>
+ * Note: A type annotation is an annotation that is meta-annotated with {@code @Target({ElementType.TYPE_USE})}.
  */
 public final class TypeAnnotationsStep {
 	private TypeAnnotationsStep() {}
@@ -54,6 +57,7 @@ private static final class State implements Serializable {
 						// Type annotations from the Checker Framework and all the tools it
 						// supports, including FindBugs, JetBrains (IntelliJ), Eclipse, NetBeans,
 						// Spring, JML, Android, etc.
+						// A type annotation is an annotation that is meta-annotated with @Target({ElementType.TYPE_USE}).
 						"A",
 						"ACCBottom",
 						"Acceleration",
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 894d8747bf..71ccaf939c 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -262,6 +262,8 @@ Type annotations should be on the same line as the type that they qualify.
   @Nullable @Interned String s;
 ```
 
+(A type annotation is an annotation that is meta-annotated with `@Target({ElementType.TYPE_USE})`.)
+
 However, some tools format them incorrectly, like this:
 
 ```java
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index eaee799db7..9968bc3217 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -267,6 +267,8 @@ Type annotations should be on the same line as the type that they qualify.
   @Nullable @Interned String s;
 ```
 
+(A type annotation is an annotation that is meta-annotated with `@Target({ElementType.TYPE_USE})`.)
+
 However, some tools format them incorrectly, like this:
 
 ```java

From d7cd9fdaebc278b7605a65b174d1cffd19b1df0c Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Thu, 25 Aug 2022 12:17:15 -0700
Subject: [PATCH 0287/2068] No reordering

---
 plugin-gradle/README.md | 2 ++
 plugin-maven/README.md  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 71ccaf939c..3bb5ad4b9a 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -285,6 +285,8 @@ spotless {
 }
 ```
 
+This does not re-order annotations, it just removes incorrect newlines.
+
 
 <a name="applying-to-groovy-source"></a>
 
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 9968bc3217..449e6f617f 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -286,6 +286,8 @@ To fix the incorrect formatting, add the `typeAnnotations()` rule after a Java f
 <typeAnnotations />
 ```
 
+This does not re-order annotations, it just removes incorrect newlines.
+
 ## Groovy
 
 [code](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy/Groovy.java). [available steps](https://github.com/diffplug/spotless/tree/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy).

From d8f047ee2d20fb6394aff5bb2847a3917f819147 Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Thu, 25 Aug 2022 12:17:37 -0700
Subject: [PATCH 0288/2068] Whitespace

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 049e8728fa..94e093ce4f 100644
--- a/README.md
+++ b/README.md
@@ -105,7 +105,7 @@ extra('wtp.EclipseWtpFormatterStep')             +'{{yes}}       | {{yes}}
 | [`java.PalantirJavaFormatStep`](lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`java.RemoveUnusedImportsStep`](lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`java.EclipseJdtFormatterStep`](lib-extra/src/main/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
-| [`java.TypeAnnotationsStep`](lib/src/main/java/com/diffplug/spotless/java/TypeAnnotationsStep.java) | :+1:       | :+1:       | :white_large_square:       | :white_large_square:  |
+| [`java.TypeAnnotationsStep`](lib/src/main/java/com/diffplug/spotless/java/TypeAnnotationsStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`json.gson.GsonStep`](lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
 | [`json.JsonSimpleStep`](lib/src/main/java/com/diffplug/spotless/json/JsonSimpleStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
 | [`kotlin.KtLintStep`](lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |

From 437636b3c49430ad8cf692f029ca6e11197ffea2 Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Thu, 25 Aug 2022 14:10:36 -0700
Subject: [PATCH 0289/2068] List of type annotations is hard-coded

---
 CHANGES.md               | 2 +-
 plugin-gradle/CHANGES.md | 2 +-
 plugin-gradle/README.md  | 7 +++++--
 plugin-maven/CHANGES.md  | 2 +-
 plugin-maven/README.md   | 8 ++++++--
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index cc2296c166..613df41623 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,7 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* `typeAnnotations()` step to correct formatting of type annotations.  It puts type annotations on the same line as the type that they qualify.  Run it after a Java formattng step, such as `googleJavaFormat()`. ([#1275](https://github.com/diffplug/spotless/pull/1275))
+* `typeAnnotations()` step to correct formatting of type annotations.  It puts type annotations on the same line as the type that they qualify.  Run it after a Java formatting step, such as `googleJavaFormat()`. ([#1275](https://github.com/diffplug/spotless/pull/1275))
 
 ## [2.29.0] - 2022-08-23
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 2c3f483356..bd12048a49 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -4,7 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* `typeAnnotations()` step to correct formatting of type annotations.  It puts type annotations on the same line as the type that they qualify.  Run it after a Java formattng step, such as `googleJavaFormat()`. ([#1275](https://github.com/diffplug/spotless/pull/1275))
+* `typeAnnotations()` step to correct formatting of type annotations.  It puts type annotations on the same line as the type that they qualify.  Run it after a Java formatting step, such as `googleJavaFormat()`. ([#1275](https://github.com/diffplug/spotless/pull/1275))
 
 ## [6.10.0] - 2022-08-23
 ### Added
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 3bb5ad4b9a..121917b7c9 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -262,8 +262,6 @@ Type annotations should be on the same line as the type that they qualify.
   @Nullable @Interned String s;
 ```
 
-(A type annotation is an annotation that is meta-annotated with `@Target({ElementType.TYPE_USE})`.)
-
 However, some tools format them incorrectly, like this:
 
 ```java
@@ -287,6 +285,11 @@ spotless {
 
 This does not re-order annotations, it just removes incorrect newlines.
 
+A type annotation is an annotation that is meta-annotated with `@Target({ElementType.TYPE_USE})`.
+Because Spotless cannot necessarily examine the annotation definition, it uses a hard-coded
+list of well-known type annotations.  You can make a pull request to add new ones.
+In the future there will be mechanisms to add/remove annotations from the list.
+
 
 <a name="applying-to-groovy-source"></a>
 
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index c5c322ff55..33e3bc7774 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -4,7 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* `typeAnnotations` step to correct formatting of type annotations.  It puts type annotations on the same line as the type that they qualify.  Run it after a Java formattng step, such as `googleJavaFormat`. ([#1275](https://github.com/diffplug/spotless/pull/1275))
+* `typeAnnotations` step to correct formatting of type annotations.  It puts type annotations on the same line as the type that they qualify.  Run it after a Java formatting step, such as `googleJavaFormat`. ([#1275](https://github.com/diffplug/spotless/pull/1275))
 
 ## [2.25.0] - 2022-08-23
 ### Added
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 449e6f617f..42372387be 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -267,8 +267,6 @@ Type annotations should be on the same line as the type that they qualify.
   @Nullable @Interned String s;
 ```
 
-(A type annotation is an annotation that is meta-annotated with `@Target({ElementType.TYPE_USE})`.)
-
 However, some tools format them incorrectly, like this:
 
 ```java
@@ -288,6 +286,12 @@ To fix the incorrect formatting, add the `typeAnnotations()` rule after a Java f
 
 This does not re-order annotations, it just removes incorrect newlines.
 
+A type annotation is an annotation that is meta-annotated with `@Target({ElementType.TYPE_USE})`.
+Because Spotless cannot necessarily examine the annotation definition, it uses a hard-coded
+list of well-known type annotations.  You can make a pull request to add new ones.
+In the future there will be mechanisms to add/remove annotations from the list.
+
+
 ## Groovy
 
 [code](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy/Groovy.java). [available steps](https://github.com/diffplug/spotless/tree/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy).

From 2e8991134e8327a6c1fa519e75601418ab9adbda Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 25 Aug 2022 22:29:59 +0000
Subject: [PATCH 0290/2068] Add renovate.json

---
 renovate.json | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 renovate.json

diff --git a/renovate.json b/renovate.json
new file mode 100644
index 0000000000..7bd954555f
--- /dev/null
+++ b/renovate.json
@@ -0,0 +1,6 @@
+{
+	"$schema": "https://docs.renovatebot.com/renovate-schema.json",
+	"extends": [
+		"config:base"
+	]
+}

From 08aeffd9905c3fa4d095a366d834d009158fb999 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 25 Aug 2022 15:36:02 -0700
Subject: [PATCH 0291/2068] Remove dependabot, as per #1288

---
 .github/dependabot.yml | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
deleted file mode 100644
index 10ef831183..0000000000
--- a/.github/dependabot.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "gradle"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"

From 6f2c4f6f0d12e1e9b6722b881b3365afc3ad0aca Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 25 Aug 2022 22:37:50 +0000
Subject: [PATCH 0292/2068] Update dependency
 com.github.spullara.mustache.java:compiler to v0.9.10

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 032beae95c..918ff28ab3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -33,5 +33,5 @@ VER_MOCKITO=3.3.3
 # Used for Maven Plugin
 VER_MAVEN_API=3.0
 VER_ECLIPSE_AETHER=0.9.0.M2
-VER_MUSTACHE=0.9.6
+VER_MUSTACHE=0.9.10
 VER_PLEXUS_RESOURCES=1.2.0

From 8b1ea2d313608b219ff1f39af63f9002a4325778 Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Thu, 25 Aug 2022 17:19:03 -0700
Subject: [PATCH 0293/2068] Fix typos

---
 CONTRIBUTING.md                                                 | 2 +-
 .../spotless/extra/eclipse/base/SpotlessEclipseFramework.java   | 2 +-
 .../spotless/extra/eclipse/base/osgi/BundleController.java      | 2 +-
 _ext/eclipse-groovy/README.md                                   | 2 +-
 _ext/eclipse-jdt/README.md                                      | 2 +-
 _ext/eclipse-wtp/README.md                                      | 2 +-
 .../spotless/extra/eclipse/wtp/sse/PluginPreferences.java       | 2 +-
 gradle/spotless-freshmark.gradle                                | 2 +-
 lib/src/main/java/com/diffplug/spotless/FeatureClassLoader.java | 2 +-
 lib/src/main/java/com/diffplug/spotless/PaddedCell.java         | 2 +-
 plugin-gradle/CHANGES.md                                        | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c1ce74bd8f..bf1996778d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -129,7 +129,7 @@ The `_ext` projects are disabled per default, since:
 
 The `_ext` can be activated via the root project property `com.diffplug.spotless.include.ext`.
 
-Activate the the property via command line, like for example:
+Activate the property via command line, like for example:
 
 ```
 gradlew -Pcom.diffplug.spotless.include.ext=true build
diff --git a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/SpotlessEclipseFramework.java b/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/SpotlessEclipseFramework.java
index 44be5f6805..2eaf9e568e 100644
--- a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/SpotlessEclipseFramework.java
+++ b/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/SpotlessEclipseFramework.java
@@ -61,7 +61,7 @@ public enum DefaultBundles {
 		REGISTRY(org.eclipse.core.internal.registry.osgi.Activator.class),
 		/** Eclipse preferences always check whether this bundle has been activated before preference are set.*/
 		PREFERENCES(org.eclipse.core.internal.preferences.Activator.class),
-		/** The common runtime provides provides common services, like log and service adapters registry. */
+		/** The common runtime provides common services, like log and service adapters registry. */
 		COMMON(org.eclipse.core.internal.runtime.Activator.class);
 
 		private final Class<? extends BundleActivator> activatorClass;
diff --git a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/BundleController.java b/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/BundleController.java
index 7c5311126e..3589bd7082 100644
--- a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/BundleController.java
+++ b/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/BundleController.java
@@ -76,7 +76,7 @@ public BundleController() throws BundleException {
 		services.add(org.osgi.service.packageadmin.PackageAdmin.class, bundleLookup);
 		services.add(FrameworkWiring.class, bundleLookup);
 
-		//Redirect framework activator requests to the the org.eclipse.osgi bundle to this instance.
+		//Redirect framework activator requests to the org.eclipse.osgi bundle to this instance.
 		bundles.add(new SimpleBundle(systemBundle, ECLIPSE_LAUNCHER_SYMBOLIC_NAME, Bundle.ACTIVE));
 		FrameworkBundleRegistry.initialize(this);
 	}
diff --git a/_ext/eclipse-groovy/README.md b/_ext/eclipse-groovy/README.md
index c565d04cf2..687ed7a132 100644
--- a/_ext/eclipse-groovy/README.md
+++ b/_ext/eclipse-groovy/README.md
@@ -5,7 +5,7 @@ To fix this, we publish Groovy-Eclipse's formatter and all its dependencies, alo
 
 ## Build
 
-To publish a new version, update the `_ext/eclipse-groovy/gradle.properties` appropriately and and see [CONTRIBUTING.md](../../CONTRIBUTING.md) how to enable
+To publish a new version, update the `_ext/eclipse-groovy/gradle.properties` appropriately and see [CONTRIBUTING.md](../../CONTRIBUTING.md) how to enable
 `_ext` projects.
 
 ## License
diff --git a/_ext/eclipse-jdt/README.md b/_ext/eclipse-jdt/README.md
index 014b58e732..624e577e0d 100644
--- a/_ext/eclipse-jdt/README.md
+++ b/_ext/eclipse-jdt/README.md
@@ -4,7 +4,7 @@ Eclipse JDT and its dependencies require a large amount of byte code.
 Hence they should not be directly be required by the Spotless, but only be requested in case
 they are configured by the Spotless configuration. Hence we publish Eclipse's formatter and all its dependencies, along with a small amount of glue code, into the `com.diffplug.gradle.spotless:spotless-eclipse-jdt` artifact.
 
-To publish a new version, update the `_ext/eclipse-jdt/gradle.properties` appropriately and and see [CONTRIBUTING.md](../../CONTRIBUTING.md) how to enable
+To publish a new version, update the `_ext/eclipse-jdt/gradle.properties` appropriately and see [CONTRIBUTING.md](../../CONTRIBUTING.md) how to enable
 `_ext` projects.
 
 ## License
diff --git a/_ext/eclipse-wtp/README.md b/_ext/eclipse-wtp/README.md
index 879f299377..41dd58ff9b 100644
--- a/_ext/eclipse-wtp/README.md
+++ b/_ext/eclipse-wtp/README.md
@@ -2,7 +2,7 @@
 
 Eclipse WTP is not available in a form which can be easily consumed by maven or gradle. To fix this, we publish Eclipse's WTP formatters, along with a small amount of glue code, into the `com.diffplug.spotless.extra:spotless-eclipse-wtp` artifact.
 
-To publish a new version, update the `_ext/eclipse-wtp/gradle.properties` appropriately and and see [CONTRIBUTING.md](../../CONTRIBUTING.md) how to enable
+To publish a new version, update the `_ext/eclipse-wtp/gradle.properties` appropriately and see [CONTRIBUTING.md](../../CONTRIBUTING.md) how to enable
 `_ext` projects.
 
 ## License
diff --git a/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/sse/PluginPreferences.java b/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/sse/PluginPreferences.java
index 8e101ec87c..81aa772617 100644
--- a/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/sse/PluginPreferences.java
+++ b/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/sse/PluginPreferences.java
@@ -33,7 +33,7 @@
 import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
 
 /**
- * The plugin preference configuration of most WTP formatters is accomplished via the the
+ * The plugin preference configuration of most WTP formatters is accomplished via the
  * globabl Eclipse preference lookup.
  * Spotless allows different formatter configurations per sub-projects.
  * Fortunately most formatters only perform a lookup on instantiation and not afterwards.
diff --git a/gradle/spotless-freshmark.gradle b/gradle/spotless-freshmark.gradle
index 6df47581d4..30c5ab6306 100644
--- a/gradle/spotless-freshmark.gradle
+++ b/gradle/spotless-freshmark.gradle
@@ -75,7 +75,7 @@ if (tasks.names.contains('changelogCheck')) {
 	changelogBumpFreshmark.dependsOn tasks.named('changelogBump')
 
 	def changelogBumpFreshmarkGitAdd = tasks.register('changelogBumpFreshmarkGitAdd') {
-		// this git add add should run after the freshmark
+		// this git add should run after the freshmark
 		dependsOn(changelogBumpFreshmark)
 		// do the git add
 		doLast {
diff --git a/lib/src/main/java/com/diffplug/spotless/FeatureClassLoader.java b/lib/src/main/java/com/diffplug/spotless/FeatureClassLoader.java
index 506e29f49c..2672fa9475 100644
--- a/lib/src/main/java/com/diffplug/spotless/FeatureClassLoader.java
+++ b/lib/src/main/java/com/diffplug/spotless/FeatureClassLoader.java
@@ -30,7 +30,7 @@
  * This class loader is used to load classes of Spotless features from a search
  * path of URLs.<br/>
  * Features shall be independent from build tools. Hence the class loader of the
- * underlying build tool is e.g. skipped during the the search for classes.<br/>
+ * underlying build tool is e.g. skipped during the search for classes.<br/>
  *
  * For `com.diffplug.spotless.glue.`, classes are redefined from within the lib jar
  * but linked against the `Url[]`. This allows us to ship classfiles which function as glue
diff --git a/lib/src/main/java/com/diffplug/spotless/PaddedCell.java b/lib/src/main/java/com/diffplug/spotless/PaddedCell.java
index 59ef242f6c..ebc9538860 100644
--- a/lib/src/main/java/com/diffplug/spotless/PaddedCell.java
+++ b/lib/src/main/java/com/diffplug/spotless/PaddedCell.java
@@ -236,7 +236,7 @@ public static DirtyState calculateDirtyState(Formatter formatter, File file, byt
 
 	/**
 	 * The clean/dirty state of a single file.  Intended use:
-	 * - {@link #isClean()} means that the file is is clean, and there's nothing else to say
+	 * - {@link #isClean()} means that the file is clean, and there's nothing else to say
 	 * - {@link #didNotConverge()} means that we were unable to determine a clean state
 	 * - once you've tested the above conditions and you know that it's a dirty file with a converged state,
 	 *   then you can call {@link #writeCanonicalTo(OutputStream)} to get the canonical form of the given file.
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 3cf249b893..9f7ba3d0a6 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -786,7 +786,7 @@ spotless {
 ## [3.4.0] - 2017-05-21
 * `ImportOrderStep` can now handle multi-line comments and misplaced imports.
 * Groovy extension now checks for the `groovy` plugin to be applied.
-* Deprecated the old syntax for the the eclipse formatter:
+* Deprecated the old syntax for the eclipse formatter:
   + New syntax better separates the version from the other configuration options, and is more consistent with the other
   + `eclipseFormatFile('format.xml')` -> `eclipse().configFile('format.xml')`
   + `eclipseFormatFile('4.4.0', 'format.xml')` -> `eclipse('4.4.0').configFile('format.xml')`

From 01ce6c8ec8112b7ac24f9332701dc60741b55dd4 Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Thu, 25 Aug 2022 17:50:26 -0700
Subject: [PATCH 0294/2068] Update copyright dates

---
 lib/src/main/java/com/diffplug/spotless/FeatureClassLoader.java | 2 +-
 lib/src/main/java/com/diffplug/spotless/PaddedCell.java         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/FeatureClassLoader.java b/lib/src/main/java/com/diffplug/spotless/FeatureClassLoader.java
index 2672fa9475..b4a69bef11 100644
--- a/lib/src/main/java/com/diffplug/spotless/FeatureClassLoader.java
+++ b/lib/src/main/java/com/diffplug/spotless/FeatureClassLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/main/java/com/diffplug/spotless/PaddedCell.java b/lib/src/main/java/com/diffplug/spotless/PaddedCell.java
index ebc9538860..91914b7908 100644
--- a/lib/src/main/java/com/diffplug/spotless/PaddedCell.java
+++ b/lib/src/main/java/com/diffplug/spotless/PaddedCell.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 03c37feb05d1ecc3c6a3fe0ee32440e412fb4c1e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 26 Aug 2022 03:34:13 +0000
Subject: [PATCH 0295/2068] Update dependency org.eclipse.jgit:org.eclipse.jgit
 to v5.13.1.202206130422-r

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 918ff28ab3..e0d2bd2911 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,7 +25,7 @@ VER_SLF4J=[1.6,2.0[
 
 # Used in multiple places
 VER_DURIAN=1.2.0
-VER_JGIT=5.13.0.202109080827-r
+VER_JGIT=5.13.1.202206130422-r
 VER_JUNIT=5.8.0
 VER_ASSERTJ=3.15.0
 VER_MOCKITO=3.3.3

From 71b141311b2be41930bf1572e3a51494288c8e6b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 26 Aug 2022 03:34:18 +0000
Subject: [PATCH 0296/2068] Update win orb to v2.4.1

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8afdc61345..a5ca735442 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,6 +1,6 @@
 version: 2.1
 orbs:
-  win: circleci/windows@2.4.0
+  win: circleci/windows@2.4.1
 
 anchors:
   env_gradle: &env_gradle

From e0b6134a4edcf7bfbf9c27a90514b4dc8803018a Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Sun, 28 Aug 2022 10:02:28 -0700
Subject: [PATCH 0297/2068] Fix another typo

---
 .../main/java/com/diffplug/gradle/spotless/JavaExtension.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
index 479d2ffd12..ee7590da88 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
@@ -120,7 +120,7 @@ public GoogleJavaFormatConfig googleJavaFormat() {
 	 * Uses the given version of <a href="https://github.com/google/google-java-format">google-java-format</a> to format source code.
 	 *
 	 * Limited to published versions.  See <a href="https://github.com/diffplug/spotless/issues/33#issuecomment-252315095">issue #33</a>
-	 * for an workaround for using snapshot versions.
+	 * for a workaround for using snapshot versions.
 	 */
 	public GoogleJavaFormatConfig googleJavaFormat(String version) {
 		Objects.requireNonNull(version);
@@ -185,7 +185,7 @@ public PalantirJavaFormatConfig palantirJavaFormat() {
 	 * Uses the given version of <a href="https://github.com/palantir/palantir-java-format">palantir-java-format</a> to format source code.
 	 *
 	 * Limited to published versions.  See <a href="https://github.com/diffplug/spotless/issues/33#issuecomment-252315095">issue #33</a>
-	 * for an workaround for using snapshot versions.
+	 * for a workaround for using snapshot versions.
 	 */
 	public PalantirJavaFormatConfig palantirJavaFormat(String version) {
 		Objects.requireNonNull(version);

From d8b8a863872b7132dbae03b7d18a0cffcfbc5946 Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@alum.mit.edu>
Date: Sun, 28 Aug 2022 11:09:25 -1000
Subject: [PATCH 0298/2068] Support `addTypeAnnotation()` and
 `removeTypeAnnotation()`

---
 .github/dependabot.yml                        |  10 -
 CHANGES.md                                    |   2 +-
 README.md                                     |   4 +-
 gradle.properties                             |   2 +-
 gradle/spotless.gradle                        |   2 +-
 .../spotless/java/FormatAnnotationsStep.java  | 471 ++++++++++++++++++
 .../spotless/java/TypeAnnotationsStep.java    | 457 -----------------
 plugin-gradle/CHANGES.md                      |   2 +-
 plugin-gradle/README.md                       |  32 +-
 .../gradle/spotless/FormatExtension.java      |   1 +
 .../gradle/spotless/JavaExtension.java        |  37 +-
 plugin-maven/CHANGES.md                       |   2 +-
 plugin-maven/README.md                        |   6 +-
 ...nnotations.java => FormatAnnotations.java} |   9 +-
 .../diffplug/spotless/maven/java/Java.java    |   4 +-
 ...st.java => FormatAnnotationsStepTest.java} |  10 +-
 renovate.json                                 |   6 +
 .../FormatAnnotationsAddRemoveInput.test      |  11 +
 .../FormatAnnotationsAddRemoveOutput.test     |   9 +
 .../FormatAnnotationsInCommentsInput.test}    |   2 +-
 .../FormatAnnotationsInCommentsOutput.test}   |   2 +-
 .../FormatAnnotationsTestInput.test}          |  11 +-
 .../FormatAnnotationsTestOutput.test}         |  10 +-
 ...st.java => FormatAnnotationsStepTest.java} |  28 +-
 24 files changed, 613 insertions(+), 517 deletions(-)
 delete mode 100644 .github/dependabot.yml
 create mode 100644 lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java
 delete mode 100644 lib/src/main/java/com/diffplug/spotless/java/TypeAnnotationsStep.java
 rename plugin-maven/src/main/java/com/diffplug/spotless/maven/java/{TypeAnnotations.java => FormatAnnotations.java} (75%)
 rename plugin-maven/src/test/java/com/diffplug/spotless/maven/java/{TypeAnnotationsStepTest.java => FormatAnnotationsStepTest.java} (71%)
 create mode 100644 renovate.json
 create mode 100644 testlib/src/main/resources/java/formatannotations/FormatAnnotationsAddRemoveInput.test
 create mode 100644 testlib/src/main/resources/java/formatannotations/FormatAnnotationsAddRemoveOutput.test
 rename testlib/src/main/resources/java/{typeannotations/TypeAnnotationsInCommentsInput.test => formatannotations/FormatAnnotationsInCommentsInput.test} (94%)
 rename testlib/src/main/resources/java/{typeannotations/TypeAnnotationsInCommentsOutput.test => formatannotations/FormatAnnotationsInCommentsOutput.test} (93%)
 rename testlib/src/main/resources/java/{typeannotations/TypeAnnotationsTestInput.test => formatannotations/FormatAnnotationsTestInput.test} (87%)
 rename testlib/src/main/resources/java/{typeannotations/TypeAnnotationsTestOutput.test => formatannotations/FormatAnnotationsTestOutput.test} (87%)
 rename testlib/src/test/java/com/diffplug/spotless/java/{TypeAnnotationsStepTest.java => FormatAnnotationsStepTest.java} (50%)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
deleted file mode 100644
index 10ef831183..0000000000
--- a/.github/dependabot.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "gradle"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"
diff --git a/CHANGES.md b/CHANGES.md
index 613df41623..cec949f59d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,7 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* `typeAnnotations()` step to correct formatting of type annotations.  It puts type annotations on the same line as the type that they qualify.  Run it after a Java formatting step, such as `googleJavaFormat()`. ([#1275](https://github.com/diffplug/spotless/pull/1275))
+* `formatAnnotations()` step to correct formatting of type annotations.  It puts type annotations on the same line as the type that they qualify.  Run it after a Java formatting step, such as `googleJavaFormat()`. ([#1275](https://github.com/diffplug/spotless/pull/1275))
 
 ## [2.29.0] - 2022-08-23
 ### Added
diff --git a/README.md b/README.md
index 94e093ce4f..fb1a3670e6 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ lib('java.ImportOrderStep')                      +'{{yes}}       | {{yes}}
 lib('java.PalantirJavaFormatStep')               +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('java.RemoveUnusedImportsStep')              +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
 extra('java.EclipseJdtFormatterStep')            +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
-lib('java.TypeAnnotationsStep')                  +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
+lib('java.FormatAnnotationsStep')                +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('json.gson.GsonStep')                        +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
 lib('json.JsonSimpleStep')                       +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
 lib('kotlin.KtLintStep')                         +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
@@ -105,7 +105,7 @@ extra('wtp.EclipseWtpFormatterStep')             +'{{yes}}       | {{yes}}
 | [`java.PalantirJavaFormatStep`](lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`java.RemoveUnusedImportsStep`](lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`java.EclipseJdtFormatterStep`](lib-extra/src/main/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
-| [`java.TypeAnnotationsStep`](lib/src/main/java/com/diffplug/spotless/java/TypeAnnotationsStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
+| [`java.FormatAnnotationsStep`](lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`json.gson.GsonStep`](lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
 | [`json.JsonSimpleStep`](lib/src/main/java/com/diffplug/spotless/json/JsonSimpleStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
 | [`kotlin.KtLintStep`](lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
diff --git a/gradle.properties b/gradle.properties
index 032beae95c..918ff28ab3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -33,5 +33,5 @@ VER_MOCKITO=3.3.3
 # Used for Maven Plugin
 VER_MAVEN_API=3.0
 VER_ECLIPSE_AETHER=0.9.0.M2
-VER_MUSTACHE=0.9.6
+VER_MUSTACHE=0.9.10
 VER_PLEXUS_RESOURCES=1.2.0
diff --git a/gradle/spotless.gradle b/gradle/spotless.gradle
index 8ab9516bcc..677630ac69 100644
--- a/gradle/spotless.gradle
+++ b/gradle/spotless.gradle
@@ -22,7 +22,7 @@ spotless {
 			eclipse().configFile rootProject.file('gradle/spotless.eclipseformat.xml')
 			trimTrailingWhitespace()
 			removeUnusedImports()
-			// TODO: typeAnnotations()
+			// TODO: formatAnnotations()
 			custom 'noInternalDeps', noInternalDepsClosure
 		}
 	}
diff --git a/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java b/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java
new file mode 100644
index 0000000000..28691ccf91
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java
@@ -0,0 +1,471 @@
+/*
+ * Copyright 2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.java;
+
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.FormatterStep;
+
+/**
+ * Some formatters put every annotation on its own line
+ * -- even type annotations, which should be on the same line as the type they qualify.
+ * This class corrects the formatting.
+ * This is useful as a postprocessing step after a Java formatter that is not cognizant of type annotations.
+
+ * <p>
+ * Note: A type annotation is an annotation that is meta-annotated with {@code @Target({ElementType.TYPE_USE})}.
+ */
+public final class FormatAnnotationsStep {
+
+	/**
+	 * Simple names of type annotations.
+	 * A type annotation is an annotation that is meta-annotated with @Target({ElementType.TYPE_USE}).
+	 * A type annotation should be formatted on the same line as the type it qualifies.
+	 */
+	private static final List<String> defaultTypeAnnotations =
+			// Use simple names because Spotless has no access to the
+			// fully-qualified names or the definitions of the type qualifiers.
+			Arrays.asList(
+					// Type annotations from the Checker Framework and all
+					// the tools it supports: FindBugs, JetBrains (IntelliJ),
+					// Eclipse, NetBeans, Spring, JML, Android, etc.
+					"A",
+					"ACCBottom",
+					"Acceleration",
+					"ACCTop",
+					"AinferBottom",
+					"AlwaysSafe",
+					"Angle",
+					"AnnoWithStringArg",
+					"Area",
+					"ArrayLen",
+					"ArrayLenRange",
+					"ArrayWithoutPackage",
+					"AwtAlphaCompositingRule",
+					"AwtColorSpace",
+					"AwtCursorType",
+					"AwtFlowLayout",
+					"B",
+					"BinaryName",
+					"BinaryNameInUnnamedPackage",
+					"BinaryNameOrPrimitiveType",
+					"BinaryNameWithoutPackage",
+					"BoolVal",
+					"Bottom",
+					"BottomQualifier",
+					"BottomThis",
+					"BottomVal",
+					"C",
+					"CalledMethods",
+					"CalledMethodsBottom",
+					"CalledMethodsPredicate",
+					"CalledMethodsTop",
+					"CanonicalName",
+					"CanonicalNameAndBinaryName",
+					"CanonicalNameOrEmpty",
+					"CanonicalNameOrPrimitiveType",
+					"CCBottom",
+					"CCTop",
+					"cd",
+					"ClassBound",
+					"ClassGetName",
+					"ClassGetSimpleName",
+					"ClassVal",
+					"ClassValBottom",
+					"CompilerMessageKey",
+					"CompilerMessageKeyBottom",
+					"Constant",
+					"Critical",
+					"Current",
+					"D",
+					"DefaultType",
+					"degrees",
+					"Det",
+					"DotSeparatedIdentifiers",
+					"DotSeparatedIdentifiersOrPrimitiveType",
+					"DoubleVal",
+					"E",
+					"Encrypted",
+					"EnhancedRegex",
+					"EnumVal",
+					"Even",
+					"F",
+					"FBCBottom",
+					"FEBottom",
+					"FEBot",
+					"Fenum",
+					"FenumBottom",
+					"FenumTop",
+					"FETop",
+					"FieldDescriptor",
+					"FieldDescriptorForPrimitive",
+					"FieldDescriptorForPrimitiveOrArrayInUnnamedPackage",
+					"FieldDescriptorWithoutPackage",
+					"FlowExp",
+					"Force",
+					"Format",
+					"FormatBottom",
+					"FqBinaryName",
+					"Frequency",
+					"FullyQualifiedName",
+					"g",
+					"GTENegativeOne",
+					"GuardedBy",
+					"GuardedByBottom",
+					"GuardedByUnknown",
+					"GuardSatisfied",
+					"h",
+					"H1Bot",
+					"H1Invalid",
+					"H1Poly",
+					"H1S1",
+					"H1S2",
+					"H1Top",
+					"H2Bot",
+					"H2Poly",
+					"H2S1",
+					"H2S2",
+					"H2Top",
+					"Hz",
+					"I18nFormat",
+					"I18nFormatBottom",
+					"I18nFormatFor",
+					"I18nInvalidFormat",
+					"I18nUnknownFormat",
+					"Identifier",
+					"IdentifierOrArray",
+					"IdentifierOrPrimitiveType",
+					"ImplicitAnno",
+					"IndexFor",
+					"IndexOrHigh",
+					"IndexOrLow",
+					"Initialized",
+					"InitializedFields",
+					"InitializedFieldsBottom",
+					"InitializedFieldsPredicate",
+					"InternalForm",
+					"Interned",
+					"InternedDistinct",
+					"IntRange",
+					"IntVal",
+					"InvalidFormat",
+					"K",
+					"KeyFor",
+					"KeyForBottom",
+					"KeyForType",
+					"kg",
+					"kHz",
+					"km",
+					"km2",
+					"km3",
+					"kmPERh",
+					"kN",
+					"LbTop",
+					"LB_TOP",
+					"LeakedToResult",
+					"Length",
+					"LengthOf",
+					"LessThan",
+					"LessThanBottom",
+					"LessThanUnknown",
+					"LocalizableKey",
+					"LocalizableKeyBottom",
+					"Localized",
+					"LowerBoundBottom",
+					"LowerBoundUnknown",
+					"LTEqLengthOf",
+					"LTLengthOf",
+					"LTOMLengthOf",
+					"Luminance",
+					"m",
+					"m2",
+					"m3",
+					"Mass",
+					"MatchesRegex",
+					"MaybeAliased",
+					"MaybeDerivedFromConstant",
+					"MaybePresent",
+					"MaybeThis",
+					"MethodDescriptor",
+					"MethodVal",
+					"MethodValBottom",
+					"min",
+					"MinLen",
+					"mm",
+					"mm2",
+					"mm3",
+					"mol",
+					"MonotonicNonNull",
+					"MonotonicNonNullType",
+					"MonotonicOdd",
+					"mPERs",
+					"mPERs2",
+					"MustCall",
+					"MustCallAlias",
+					"MustCallUnknown",
+					"N",
+					"NegativeIndexFor",
+					"NewObject",
+					"NonConstant",
+					"NonDet",
+					"NonLeaked",
+					"NonNegative",
+					"NonNull",
+					"NonNullType",
+					"NonRaw",
+					"NotCalledMethods",
+					"NotNull",
+					"NotQualifier",
+					"NTDBottom",
+					"NTDMiddle",
+					"NTDSide",
+					"NTDTop",
+					"Nullable",
+					"NullableType",
+					"Odd",
+					"OptionalBottom",
+					"OrderNonDet",
+					"Parent",
+					"PatternA",
+					"PatternAB",
+					"PatternAC",
+					"PatternB",
+					"PatternBC",
+					"PatternBottomFull",
+					"PatternBottomPartial",
+					"PatternC",
+					"PatternUnknown",
+					"Poly",
+					"PolyAll",
+					"PolyConstant",
+					"PolyDet",
+					"PolyEncrypted",
+					"PolyFenum",
+					"PolyIndex",
+					"PolyInitializedFields",
+					"PolyInterned",
+					"PolyKeyFor",
+					"PolyLength",
+					"PolyLowerBound",
+					"PolyMustCall",
+					"PolyNull",
+					"PolyNullType",
+					"PolyPresent",
+					"PolyRaw",
+					"PolyReflection",
+					"PolyRegex",
+					"PolySameLen",
+					"PolySignature",
+					"PolySigned",
+					"PolyTainted",
+					"PolyTestAccumulation",
+					"PolyTypeDeclDefault",
+					"PolyUI",
+					"PolyUnit",
+					"PolyUpperBound",
+					"PolyValue",
+					"PolyVariableNameDefault",
+					"Positive",
+					"Present",
+					"PrimitiveType",
+					"PropertyKey",
+					"PropertyKeyBottom",
+					"PurityUnqualified",
+					"Qualifier",
+					"radians",
+					"Raw",
+					"ReflectBottom",
+					"Regex",
+					"RegexBottom",
+					"RegexNNGroups",
+					"ReportUnqualified",
+					"s",
+					"SameLen",
+					"SameLenBottom",
+					"SameLenUnknown",
+					"SearchIndexBottom",
+					"SearchIndexFor",
+					"SearchIndexUnknown",
+					"Sibling1",
+					"Sibling2",
+					"SiblingWithFields",
+					"SignatureBottom",
+					"Signed",
+					"SignednessBottom",
+					"SignednessGlb",
+					"SignedPositive",
+					"SignedPositiveFromUnsigned",
+					"Speed",
+					"StringVal",
+					"SubQual",
+					"Substance",
+					"SubstringIndexBottom",
+					"SubstringIndexFor",
+					"SubstringIndexUnknown",
+					"SuperQual",
+					"SwingBoxOrientation",
+					"SwingCompassDirection",
+					"SwingElementOrientation",
+					"SwingHorizontalOrientation",
+					"SwingSplitPaneOrientation",
+					"SwingTextOrientation",
+					"SwingTitleJustification",
+					"SwingTitlePosition",
+					"SwingVerticalOrientation",
+					"t",
+					"Tainted",
+					"Temperature",
+					"TestAccumulation",
+					"TestAccumulationBottom",
+					"TestAccumulationPredicate",
+					"This",
+					"Time",
+					"Top",
+					"TypeDeclDefaultBottom",
+					"TypeDeclDefaultMiddle",
+					"TypeDeclDefaultTop",
+					"UbTop",
+					"UB_TOP",
+					"UI",
+					"UnderInitialization",
+					"Unique",
+					"UnitsBottom",
+					"UnknownClass",
+					"UnknownCompilerMessageKey",
+					"UnknownFormat",
+					"UnknownInitialization",
+					"UnknownInterned",
+					"UnknownKeyFor",
+					"UnknownLocalizableKey",
+					"UnknownLocalized",
+					"UnknownMethod",
+					"UnknownPropertyKey",
+					"UnknownRegex",
+					"UnknownSignedness",
+					"UnknownThis",
+					"UnknownUnits",
+					"UnknownVal",
+					"Unsigned",
+					"Untainted",
+					"UpperBoundBottom",
+					"UpperBoundLiteral",
+					"UpperBoundUnknown",
+					"Value",
+					"VariableNameDefaultBottom",
+					"VariableNameDefaultMiddle",
+					"VariableNameDefaultTop",
+					"Volume",
+					"WholeProgramInferenceBottom"
+			// TODO: Add type annotations from other tools here.
+
+			);
+
+	static final String NAME = "No line break between type annotation and type";
+
+	public static FormatterStep create() {
+		return create(Collections.emptyList(), Collections.emptyList());
+	}
+
+	public static FormatterStep create(List<String> addedTypeAnnotations, List<String> removedTypeAnnotations) {
+		return FormatterStep.create(NAME, new State(addedTypeAnnotations, removedTypeAnnotations), State::toFormatter);
+	}
+
+	private FormatAnnotationsStep() {}
+
+	// TODO: Enable users to specify more type annotations in `formatAnnotations` in build.gradle.
+	// TODO: Read from a local .type-annotations file.
+	private static final class State implements Serializable {
+		private static final long serialVersionUID = 1L;
+
+		private final Set<String> typeAnnotations = new HashSet<>(defaultTypeAnnotations);
+
+		// group 1 is the basename of the annotation.
+		private static final String annoNoArgRegex = "@(?:[A-Za-z_][A-Za-z0-9_.]*\\.)?([A-Za-z_][A-Za-z0-9_]*)";
+		private static final Pattern annoNoArgPattern = Pattern.compile(annoNoArgRegex);
+		// 3 non-empty cases:  ()  (".*")  (.*)
+		private static final String annoArgRegex = "(?:\\(\\)|\\(\"[^\"]*\"\\)|\\([^\")][^)]*\\))?";
+		// group 1 is the basename of the annotation.
+		private static final String annoRegex = annoNoArgRegex + annoArgRegex;
+		private static final String trailingAnnoRegex = annoRegex + "$";
+		private static final Pattern trailingAnnoPattern = Pattern.compile(trailingAnnoRegex);
+
+		// Heuristic: matches if the line might be within a //, /*, or Javadoc comment.
+		private static final Pattern withinCommentPattern = Pattern.compile("//|/\\*(?!.*/*/)|^[ \t]*\\*[ \t]");
+		// Don't move an annotation to the start of a comment line.
+		private static final Pattern startsWithCommentPattern = Pattern.compile("^[ \t]*(//|/\\*$|/\\*|void\\b)");
+
+		State(List<String> addedTypeAnnotations, List<String> removedTypeAnnotations) {
+			typeAnnotations.addAll(addedTypeAnnotations);
+			typeAnnotations.removeAll(removedTypeAnnotations);
+		}
+
+		FormatterFunc toFormatter() {
+			return unixStr -> fixupFormatAnnotations(unixStr);
+		}
+
+		/**
+		 * Removes line break between type annotations and the following type.
+		 *
+		 * @param the text of a Java file
+		 * @return corrected text of the Java file
+		 */
+		String fixupFormatAnnotations(String unixStr) {
+			// Each element of `lines` ends with a newline.
+			String[] lines = unixStr.split("((?<=\n))");
+			for (int i = 0; i < lines.length - 1; i++) {
+				String line = lines[i];
+				if (endsWithTypeAnnotation(line)) {
+					String nextLine = lines[i + 1];
+					if (startsWithCommentPattern.matcher(nextLine).find()) {
+						continue;
+					}
+					lines[i] = "";
+					lines[i + 1] = line.replaceAll("\\s+$", "") + " " + nextLine.replaceAll("^\\s+", "");
+				}
+			}
+			return String.join("", lines);
+		}
+
+		/**
+		 * Returns true if the line ends with a type annotation.
+		 * FormatAnnotationsStep fixes such formatting.
+		 */
+		boolean endsWithTypeAnnotation(String unixLine) {
+			// Remove trailing newline.
+			String line = unixLine.replaceAll("\\s+$", "");
+			Matcher m = trailingAnnoPattern.matcher(line);
+			if (!m.find()) {
+				return false;
+			}
+			String preceding = line.substring(0, m.start());
+			String basename = m.group(1);
+
+			if (withinCommentPattern.matcher(preceding).find()) {
+				return false;
+			}
+
+			return typeAnnotations.contains(basename);
+		}
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/java/TypeAnnotationsStep.java b/lib/src/main/java/com/diffplug/spotless/java/TypeAnnotationsStep.java
deleted file mode 100644
index 36a988aa23..0000000000
--- a/lib/src/main/java/com/diffplug/spotless/java/TypeAnnotationsStep.java
+++ /dev/null
@@ -1,457 +0,0 @@
-/*
- * Copyright 2022 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.java;
-
-import java.io.Serializable;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import com.diffplug.spotless.FormatterFunc;
-import com.diffplug.spotless.FormatterStep;
-
-/**
- * Some formatters put every annotation on its own line
- * -- even type annotations, which should be on the same line as the type they qualify.
- * This class corrects the formatting.
- * This is useful as a postprocessing step after a Java formatter that is not cognizant of type annotations.
-
- * <p>
- * Note: A type annotation is an annotation that is meta-annotated with {@code @Target({ElementType.TYPE_USE})}.
- */
-public final class TypeAnnotationsStep {
-	private TypeAnnotationsStep() {}
-
-	static final String NAME = "No line break between type annotation and type";
-
-	public static FormatterStep create() {
-		return FormatterStep.create(NAME, new State(), State::toFormatter);
-	}
-
-	// TODO: Enable users to specify more type annotations in `typeAnnotations` in build.gradle.
-	// TODO: Read from a local .type-annotations file.
-	private static final class State implements Serializable {
-		private static final long serialVersionUID = 1L;
-
-		/**
-		 * These are type annotations, which should NOT go on their own line.
-		 * A type annotation's {@code @Target} annotation contains {@code TYPE_USE}.
-		 */
-		private static final Set<String> typeAnnotations = new HashSet<>(
-				Arrays.asList(
-						// Type annotations from the Checker Framework and all the tools it
-						// supports, including FindBugs, JetBrains (IntelliJ), Eclipse, NetBeans,
-						// Spring, JML, Android, etc.
-						// A type annotation is an annotation that is meta-annotated with @Target({ElementType.TYPE_USE}).
-						"A",
-						"ACCBottom",
-						"Acceleration",
-						"ACCTop",
-						"AinferBottom",
-						"AlwaysSafe",
-						"Angle",
-						"AnnoWithStringArg",
-						"Area",
-						"ArrayLen",
-						"ArrayLenRange",
-						"ArrayWithoutPackage",
-						"AwtAlphaCompositingRule",
-						"AwtColorSpace",
-						"AwtCursorType",
-						"AwtFlowLayout",
-						"B",
-						"BinaryName",
-						"BinaryNameInUnnamedPackage",
-						"BinaryNameOrPrimitiveType",
-						"BinaryNameWithoutPackage",
-						"BoolVal",
-						"Bottom",
-						"BottomQualifier",
-						"BottomThis",
-						"BottomVal",
-						"C",
-						"CalledMethods",
-						"CalledMethodsBottom",
-						"CalledMethodsPredicate",
-						"CalledMethodsTop",
-						"CanonicalName",
-						"CanonicalNameAndBinaryName",
-						"CanonicalNameOrEmpty",
-						"CanonicalNameOrPrimitiveType",
-						"CCBottom",
-						"CCTop",
-						"cd",
-						"ClassBound",
-						"ClassGetName",
-						"ClassGetSimpleName",
-						"ClassVal",
-						"ClassValBottom",
-						"CompilerMessageKey",
-						"CompilerMessageKeyBottom",
-						"Constant",
-						"Critical",
-						"Current",
-						"D",
-						"DefaultType",
-						"degrees",
-						"Det",
-						"DotSeparatedIdentifiers",
-						"DotSeparatedIdentifiersOrPrimitiveType",
-						"DoubleVal",
-						"E",
-						"Encrypted",
-						"EnhancedRegex",
-						"EnumVal",
-						"Even",
-						"F",
-						"FBCBottom",
-						"FEBottom",
-						"FEBot",
-						"Fenum",
-						"FenumBottom",
-						"FenumTop",
-						"FETop",
-						"FieldDescriptor",
-						"FieldDescriptorForPrimitive",
-						"FieldDescriptorForPrimitiveOrArrayInUnnamedPackage",
-						"FieldDescriptorWithoutPackage",
-						"FlowExp",
-						"Force",
-						"Format",
-						"FormatBottom",
-						"FqBinaryName",
-						"Frequency",
-						"FullyQualifiedName",
-						"g",
-						"GTENegativeOne",
-						"GuardedBy",
-						"GuardedByBottom",
-						"GuardedByUnknown",
-						"GuardSatisfied",
-						"h",
-						"H1Bot",
-						"H1Invalid",
-						"H1Poly",
-						"H1S1",
-						"H1S2",
-						"H1Top",
-						"H2Bot",
-						"H2Poly",
-						"H2S1",
-						"H2S2",
-						"H2Top",
-						"Hz",
-						"I18nFormat",
-						"I18nFormatBottom",
-						"I18nFormatFor",
-						"I18nInvalidFormat",
-						"I18nUnknownFormat",
-						"Identifier",
-						"IdentifierOrArray",
-						"IdentifierOrPrimitiveType",
-						"ImplicitAnno",
-						"IndexFor",
-						"IndexOrHigh",
-						"IndexOrLow",
-						"Initialized",
-						"InitializedFields",
-						"InitializedFieldsBottom",
-						"InitializedFieldsPredicate",
-						"InternalForm",
-						"Interned",
-						"InternedDistinct",
-						"IntRange",
-						"IntVal",
-						"InvalidFormat",
-						"K",
-						"KeyFor",
-						"KeyForBottom",
-						"KeyForType",
-						"kg",
-						"kHz",
-						"km",
-						"km2",
-						"km3",
-						"kmPERh",
-						"kN",
-						"LbTop",
-						"LB_TOP",
-						"LeakedToResult",
-						"Length",
-						"LengthOf",
-						"LessThan",
-						"LessThanBottom",
-						"LessThanUnknown",
-						"LocalizableKey",
-						"LocalizableKeyBottom",
-						"Localized",
-						"LowerBoundBottom",
-						"LowerBoundUnknown",
-						"LTEqLengthOf",
-						"LTLengthOf",
-						"LTOMLengthOf",
-						"Luminance",
-						"m",
-						"m2",
-						"m3",
-						"Mass",
-						"MatchesRegex",
-						"MaybeAliased",
-						"MaybeDerivedFromConstant",
-						"MaybePresent",
-						"MaybeThis",
-						"MethodDescriptor",
-						"MethodVal",
-						"MethodValBottom",
-						"min",
-						"MinLen",
-						"mm",
-						"mm2",
-						"mm3",
-						"mol",
-						"MonotonicNonNull",
-						"MonotonicNonNullType",
-						"MonotonicOdd",
-						"mPERs",
-						"mPERs2",
-						"MustCall",
-						"MustCallAlias",
-						"MustCallUnknown",
-						"N",
-						"NegativeIndexFor",
-						"NewObject",
-						"NonConstant",
-						"NonDet",
-						"NonLeaked",
-						"NonNegative",
-						"NonNull",
-						"NonNullType",
-						"NonRaw",
-						"NotCalledMethods",
-						"NotNull",
-						"NotQualifier",
-						"NTDBottom",
-						"NTDMiddle",
-						"NTDSide",
-						"NTDTop",
-						"Nullable",
-						"NullableType",
-						"Odd",
-						"OptionalBottom",
-						"OrderNonDet",
-						"Parent",
-						"PatternA",
-						"PatternAB",
-						"PatternAC",
-						"PatternB",
-						"PatternBC",
-						"PatternBottomFull",
-						"PatternBottomPartial",
-						"PatternC",
-						"PatternUnknown",
-						"Poly",
-						"PolyAll",
-						"PolyConstant",
-						"PolyDet",
-						"PolyEncrypted",
-						"PolyFenum",
-						"PolyIndex",
-						"PolyInitializedFields",
-						"PolyInterned",
-						"PolyKeyFor",
-						"PolyLength",
-						"PolyLowerBound",
-						"PolyMustCall",
-						"PolyNull",
-						"PolyNullType",
-						"PolyPresent",
-						"PolyRaw",
-						"PolyReflection",
-						"PolyRegex",
-						"PolySameLen",
-						"PolySignature",
-						"PolySigned",
-						"PolyTainted",
-						"PolyTestAccumulation",
-						"PolyTypeDeclDefault",
-						"PolyUI",
-						"PolyUnit",
-						"PolyUpperBound",
-						"PolyValue",
-						"PolyVariableNameDefault",
-						"Positive",
-						"Present",
-						"PrimitiveType",
-						"PropertyKey",
-						"PropertyKeyBottom",
-						"PurityUnqualified",
-						"Qualifier",
-						"radians",
-						"Raw",
-						"ReflectBottom",
-						"Regex",
-						"RegexBottom",
-						"RegexNNGroups",
-						"ReportUnqualified",
-						"s",
-						"SameLen",
-						"SameLenBottom",
-						"SameLenUnknown",
-						"SearchIndexBottom",
-						"SearchIndexFor",
-						"SearchIndexUnknown",
-						"Sibling1",
-						"Sibling2",
-						"SiblingWithFields",
-						"SignatureBottom",
-						"Signed",
-						"SignednessBottom",
-						"SignednessGlb",
-						"SignedPositive",
-						"SignedPositiveFromUnsigned",
-						"Speed",
-						"StringVal",
-						"SubQual",
-						"Substance",
-						"SubstringIndexBottom",
-						"SubstringIndexFor",
-						"SubstringIndexUnknown",
-						"SuperQual",
-						"SwingBoxOrientation",
-						"SwingCompassDirection",
-						"SwingElementOrientation",
-						"SwingHorizontalOrientation",
-						"SwingSplitPaneOrientation",
-						"SwingTextOrientation",
-						"SwingTitleJustification",
-						"SwingTitlePosition",
-						"SwingVerticalOrientation",
-						"t",
-						"Tainted",
-						"Temperature",
-						"TestAccumulation",
-						"TestAccumulationBottom",
-						"TestAccumulationPredicate",
-						"This",
-						"Time",
-						"Top",
-						"TypeDeclDefaultBottom",
-						"TypeDeclDefaultMiddle",
-						"TypeDeclDefaultTop",
-						"UbTop",
-						"UB_TOP",
-						"UI",
-						"UnderInitialization",
-						"Unique",
-						"UnitsBottom",
-						"UnknownClass",
-						"UnknownCompilerMessageKey",
-						"UnknownFormat",
-						"UnknownInitialization",
-						"UnknownInterned",
-						"UnknownKeyFor",
-						"UnknownLocalizableKey",
-						"UnknownLocalized",
-						"UnknownMethod",
-						"UnknownPropertyKey",
-						"UnknownRegex",
-						"UnknownSignedness",
-						"UnknownThis",
-						"UnknownUnits",
-						"UnknownVal",
-						"Unsigned",
-						"Untainted",
-						"UpperBoundBottom",
-						"UpperBoundLiteral",
-						"UpperBoundUnknown",
-						"Value",
-						"VariableNameDefaultBottom",
-						"VariableNameDefaultMiddle",
-						"VariableNameDefaultTop",
-						"Volume",
-						"WholeProgramInferenceBottom"
-				// Add type annotations from other tools here.
-
-				));
-
-		// group 1 is the basename of the annotation.
-		private static final String annoNoArgRegex = "@(?:[A-Za-z_][A-Za-z0-9_.]*\\.)?([A-Za-z_][A-Za-z0-9_]*)";
-		private static final Pattern annoNoArgPattern = Pattern.compile(annoNoArgRegex);
-		// 3 non-empty cases:  ()  (".*")  (.*)
-		private static final String annoArgRegex = "(?:\\(\\)|\\(\"[^\"]*\"\\)|\\([^\")][^)]*\\))?";
-		// group 1 is the basename of the annotation.
-		private static final String annoRegex = annoNoArgRegex + annoArgRegex;
-		private static final String trailingAnnoRegex = annoRegex + "$";
-		private static final Pattern trailingAnnoPattern = Pattern.compile(trailingAnnoRegex);
-
-		// Heuristic: matches if the line might be within a //, /*, or Javadoc comment.
-		private static final Pattern withinCommentPattern = Pattern.compile("//|/\\*(?!.*/*/)|^[ \t]*\\*[ \t]");
-		// Don't move an annotation to the start of a comment line.
-		private static final Pattern startsWithCommentPattern = Pattern.compile("^[ \t]*(//|/\\*$|/\\*|void\\b)");
-
-		State() {}
-
-		FormatterFunc toFormatter() {
-			return unixStr -> fixupTypeAnnotations(unixStr);
-		}
-
-		/**
-		 * Removes line break between type annotations and the following type.
-		 *
-		 * @param the text of a Java file
-		 * @return corrected text of the Java file
-		 */
-		String fixupTypeAnnotations(String unixStr) {
-			// Each element of `lines` ends with a newline.
-			String[] lines = unixStr.split("((?<=\n))");
-			for (int i = 0; i < lines.length - 1; i++) {
-				String line = lines[i];
-				if (endsWithTypeAnnotation(line)) {
-					String nextLine = lines[i + 1];
-					if (startsWithCommentPattern.matcher(nextLine).find()) {
-						continue;
-					}
-					lines[i] = "";
-					lines[i + 1] = line.replaceAll("\\s+$", "") + " " + nextLine.replaceAll("^\\s+", "");
-				}
-			}
-			return String.join("", lines);
-		}
-
-		/**
-		 * Returns true if the line ends with a type annotation.
-		 * TypeAnnotationStep fixes such formatting.
-		 */
-		boolean endsWithTypeAnnotation(String unixLine) {
-			// Remove trailing newline.
-			String line = unixLine.replaceAll("\\s+$", "");
-			Matcher m = trailingAnnoPattern.matcher(line);
-			if (!m.find()) {
-				return false;
-			}
-			String preceding = line.substring(0, m.start());
-			String basename = m.group(1);
-
-			if (withinCommentPattern.matcher(preceding).find()) {
-				return false;
-			}
-
-			return typeAnnotations.contains(basename);
-		}
-	}
-}
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index bd12048a49..513f36346d 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -4,7 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* `typeAnnotations()` step to correct formatting of type annotations.  It puts type annotations on the same line as the type that they qualify.  Run it after a Java formatting step, such as `googleJavaFormat()`. ([#1275](https://github.com/diffplug/spotless/pull/1275))
+* `formatAnnotations()` step to correct formatting of type annotations.  It puts type annotations on the same line as the type that they qualify.  Run it after a Java formatting step, such as `googleJavaFormat()`. ([#1275](https://github.com/diffplug/spotless/pull/1275))
 
 ## [6.10.0] - 2022-08-23
 ### Added
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 121917b7c9..c1a41c2ef0 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -118,7 +118,7 @@ spotless {
     // apply a specific flavor of google-java-format
     googleJavaFormat('1.8').aosp().reflowLongStrings()
     // fix formatting of type annotations
-    typeAnnotations()
+    formatAnnotations()
     // make sure every file has the following copyright header.
     // optionally, Spotless can set copyright years by digging
     // through git history (see "license" section below)
@@ -159,12 +159,13 @@ spotless {
 
     removeUnusedImports()
 
-    googleJavaFormat() // has its own section below
-    eclipse()          // has its own section below
-    prettier()         // has its own section below
-    clangFormat()      // has its own section below
+    // Choose one of these formatters.
+    googleJavaFormat()   // has its own section below
+    eclipse()            // has its own section below
+    prettier()           // has its own section below
+    clangFormat()        // has its own section below
 
-    typeAnnotations()  // fixes formatting of type annotations, see below
+    formatAnnotations()  // fixes formatting of type annotations, see below
 
     licenseHeader '/* (C) $YEAR */' // or licenseHeaderFile
   }
@@ -193,7 +194,7 @@ spotless {
     //   and/or use custom group artifact (you probably don't need this)
     googleJavaFormat('1.8').aosp().reflowLongStrings().groupArtifact('com.google.googlejavaformat:google-java-format')
     // optional: fix formatting of type annotations
-    typeAnnotations()
+    formatAnnotations()
 ```
 
 **⚠️ Note on using Google Java Format with Java 16+**
@@ -221,7 +222,7 @@ spotless {
     // optional: you can specify a specific version
     palantirJavaFormat('2.9.0')
     // optional: fix formatting of type annotations
-    typeAnnotations()
+    formatAnnotations()
 ```
 
 **⚠️ Note on using Palantir Java Format with Java 16+**
@@ -272,13 +273,13 @@ However, some tools format them incorrectly, like this:
   String s;
 ```
 
-To fix the incorrect formatting, add the `typeAnnotations()` rule after a Java formatter.  For example:
+To fix the incorrect formatting, add the `formatAnnotations()` rule after a Java formatter.  For example:
 
 ```gradle
 spotless {
   java {
     googleJavaFormat()
-    typeAnnotations()
+    formatAnnotations()
   }
 }
 ```
@@ -286,9 +287,14 @@ spotless {
 This does not re-order annotations, it just removes incorrect newlines.
 
 A type annotation is an annotation that is meta-annotated with `@Target({ElementType.TYPE_USE})`.
-Because Spotless cannot necessarily examine the annotation definition, it uses a hard-coded
-list of well-known type annotations.  You can make a pull request to add new ones.
-In the future there will be mechanisms to add/remove annotations from the list.
+Spotless has a default list of well-known type annotations.
+You can use `addTypeAnnotation()` and `removeTypeAnnotation()` to override its defaults:
+
+```gradle
+    formatAnnotations().addTypeAnnotation("Empty").addTypeAnnotation("NonEmpty").removeTypeAnnotation("Localized")
+```
+
+You can make a pull request to add new annotations to Spotless's default list.
 
 
 <a name="applying-to-groovy-source"></a>
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index 94ae136429..de0313eab4 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -691,6 +691,7 @@ public void withinBlocks(String name, String open, String close, Action<FormatEx
 	 *     target '*.md'
 	 *     withinBlocks 'java examples', '\n```java\n', '\n```\n', com.diffplug.gradle.spotless.JavaExtension, {
 	 *       googleJavaFormat()
+	 *       formatAnnotations()
 	 *     }
 	 *     ...
 	 * </pre>
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
index d882ac472b..1329ce1ad9 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
@@ -18,6 +18,8 @@
 import static com.diffplug.gradle.spotless.PluginGradlePreconditions.requireElementsNonNull;
 
 import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
 
 import javax.inject.Inject;
@@ -32,11 +34,11 @@
 import com.diffplug.spotless.extra.EclipseBasedStepBuilder;
 import com.diffplug.spotless.extra.java.EclipseJdtFormatterStep;
 import com.diffplug.spotless.generic.LicenseHeaderStep;
+import com.diffplug.spotless.java.FormatAnnotationsStep;
 import com.diffplug.spotless.java.GoogleJavaFormatStep;
 import com.diffplug.spotless.java.ImportOrderStep;
 import com.diffplug.spotless.java.PalantirJavaFormatStep;
 import com.diffplug.spotless.java.RemoveUnusedImportsStep;
-import com.diffplug.spotless.java.TypeAnnotationsStep;
 
 public class JavaExtension extends FormatExtension implements HasBuiltinDelimiterForLicense {
 	static final String NAME = "java";
@@ -233,8 +235,37 @@ public void configFile(Object... configFiles) {
 	}
 
 	/** Removes newlines between type annotations and types. */
-	public void typeAnnotations() {
-		addStep(TypeAnnotationsStep.create());
+	public FormatAnnotationsConfig formatAnnotations() {
+		return new FormatAnnotationsConfig();
+	}
+
+	public class FormatAnnotationsConfig {
+		final List<String> addedTypeAnnotations = new ArrayList<>();
+		final List<String> removedTypeAnnotations = new ArrayList<>();
+
+		FormatAnnotationsConfig() {
+			addStep(createStep());
+		}
+
+		public FormatAnnotationsConfig addTypeAnnotation(String simpleName) {
+			Objects.requireNonNull(simpleName);
+			addedTypeAnnotations.add(simpleName);
+			replaceStep(createStep());
+			return this;
+		}
+
+		public FormatAnnotationsConfig removeTypeAnnotation(String simpleName) {
+			Objects.requireNonNull(simpleName);
+			removedTypeAnnotations.add(simpleName);
+			replaceStep(createStep());
+			return this;
+		}
+
+		private FormatterStep createStep() {
+			return FormatAnnotationsStep.create(
+					addedTypeAnnotations,
+					removedTypeAnnotations);
+		}
 	}
 
 	/** If the user hasn't specified the files yet, we'll assume he/she means all of the java files. */
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 33e3bc7774..30842b1b06 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -4,7 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* `typeAnnotations` step to correct formatting of type annotations.  It puts type annotations on the same line as the type that they qualify.  Run it after a Java formatting step, such as `googleJavaFormat`. ([#1275](https://github.com/diffplug/spotless/pull/1275))
+* `formatAnnotations` step to correct formatting of type annotations.  It puts type annotations on the same line as the type that they qualify.  Run it after a Java formatting step, such as `googleJavaFormat`. ([#1275](https://github.com/diffplug/spotless/pull/1275))
 
 ## [2.25.0] - 2022-08-23
 ### Added
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 42372387be..b7e93f41ca 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -191,7 +191,7 @@ any other maven phase (i.e. compile) then it can be configured as below;
     <eclipse />          <!-- has its own section below -->
     <prettier />         <!-- has its own section below -->
 
-    <typeAnnotations />  <!-- fixes formatting of type annotations, see below -->
+    <formatAnnotations />  <!-- fixes formatting of type annotations, see below -->
 
     <licenseHeader>
       <content>/* (C)$YEAR */</content>  <!-- or <file>${project.basedir}/license-header</file> -->
@@ -277,11 +277,11 @@ However, some tools format them incorrectly, like this:
   String s;
 ```
 
-To fix the incorrect formatting, add the `typeAnnotations()` rule after a Java formatter.  For example:
+To fix the incorrect formatting, add the `formatAnnotations()` rule after a Java formatter.  For example:
 
 ```XML
 <googleJavaFormat />
-<typeAnnotations />
+<formatAnnotations />
 ```
 
 This does not re-order annotations, it just removes incorrect newlines.
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/TypeAnnotations.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/FormatAnnotations.java
similarity index 75%
rename from plugin-maven/src/main/java/com/diffplug/spotless/maven/java/TypeAnnotations.java
rename to plugin-maven/src/main/java/com/diffplug/spotless/maven/java/FormatAnnotations.java
index 8a555c6c72..5ce820921a 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/TypeAnnotations.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/FormatAnnotations.java
@@ -15,15 +15,18 @@
  */
 package com.diffplug.spotless.maven.java;
 
+import java.util.Collections;
+
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.java.TypeAnnotationsStep;
+import com.diffplug.spotless.java.FormatAnnotationsStep;
 import com.diffplug.spotless.maven.FormatterStepConfig;
 import com.diffplug.spotless.maven.FormatterStepFactory;
 
-public class TypeAnnotations implements FormatterStepFactory {
+public class FormatAnnotations implements FormatterStepFactory {
 
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig config) {
-		return TypeAnnotationsStep.create();
+		// TODO: Permit customization in Maven.
+		return FormatAnnotationsStep.create(Collections.emptyList(), Collections.emptyList());
 	}
 }
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Java.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Java.java
index 66b6b8b1c7..4bd018d53c 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Java.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Java.java
@@ -62,7 +62,7 @@ public void addRemoveUnusedImports(RemoveUnusedImports removeUnusedImports) {
 		addStepFactory(removeUnusedImports);
 	}
 
-	public void addTypeAnnotations(TypeAnnotations typeAnnotations) {
-		addStepFactory(typeAnnotations);
+	public void addFormatAnnotations(FormatAnnotations formatAnnotations) {
+		addStepFactory(formatAnnotations);
 	}
 }
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/TypeAnnotationsStepTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/FormatAnnotationsStepTest.java
similarity index 71%
rename from plugin-maven/src/test/java/com/diffplug/spotless/maven/java/TypeAnnotationsStepTest.java
rename to plugin-maven/src/test/java/com/diffplug/spotless/maven/java/FormatAnnotationsStepTest.java
index c2281bf8fd..8560b73fd4 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/TypeAnnotationsStepTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/FormatAnnotationsStepTest.java
@@ -19,15 +19,15 @@
 
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
 
-class TypeAnnotationsStepTest extends MavenIntegrationHarness {
+class FormatAnnotationsStepTest extends MavenIntegrationHarness {
 
 	@Test
-	void testTypeAnnotations() throws Exception {
-		writePomWithJavaSteps("<typeAnnotations/>");
+	void testFormatAnnotations() throws Exception {
+		writePomWithJavaSteps("<formatAnnotations/>");
 
 		String path = "src/main/java/test.java";
-		setFile(path).toResource("java/typeannotations/TypeAnnotationsTestInput.test");
+		setFile(path).toResource("java/formatannotations/FormatAnnotationsTestInput.test");
 		mavenRunner().withArguments("spotless:apply").runNoError();
-		assertFile(path).sameAsResource("java/typeannotations/TypeAnnotationsTestOutput.test");
+		assertFile(path).sameAsResource("java/formatannotations/FormatAnnotationsTestOutput.test");
 	}
 }
diff --git a/renovate.json b/renovate.json
new file mode 100644
index 0000000000..7bd954555f
--- /dev/null
+++ b/renovate.json
@@ -0,0 +1,6 @@
+{
+	"$schema": "https://docs.renovatebot.com/renovate-schema.json",
+	"extends": [
+		"config:base"
+	]
+}
diff --git a/testlib/src/main/resources/java/formatannotations/FormatAnnotationsAddRemoveInput.test b/testlib/src/main/resources/java/formatannotations/FormatAnnotationsAddRemoveInput.test
new file mode 100644
index 0000000000..e822a8cc41
--- /dev/null
+++ b/testlib/src/main/resources/java/formatannotations/FormatAnnotationsAddRemoveInput.test
@@ -0,0 +1,11 @@
+class FormatAnnotationsAddRemove {
+
+  @Empty
+  String e;
+
+  @NonEmpty
+  String ne;
+
+  @Localized
+  String localized;
+}
diff --git a/testlib/src/main/resources/java/formatannotations/FormatAnnotationsAddRemoveOutput.test b/testlib/src/main/resources/java/formatannotations/FormatAnnotationsAddRemoveOutput.test
new file mode 100644
index 0000000000..355528bd88
--- /dev/null
+++ b/testlib/src/main/resources/java/formatannotations/FormatAnnotationsAddRemoveOutput.test
@@ -0,0 +1,9 @@
+class FormatAnnotationsAddRemove {
+
+  @Empty String e;
+
+  @NonEmpty String ne;
+
+  @Localized
+  String localized;
+}
diff --git a/testlib/src/main/resources/java/typeannotations/TypeAnnotationsInCommentsInput.test b/testlib/src/main/resources/java/formatannotations/FormatAnnotationsInCommentsInput.test
similarity index 94%
rename from testlib/src/main/resources/java/typeannotations/TypeAnnotationsInCommentsInput.test
rename to testlib/src/main/resources/java/formatannotations/FormatAnnotationsInCommentsInput.test
index d49799c0c3..1095de0fd6 100644
--- a/testlib/src/main/resources/java/typeannotations/TypeAnnotationsInCommentsInput.test
+++ b/testlib/src/main/resources/java/formatannotations/FormatAnnotationsInCommentsInput.test
@@ -1,4 +1,4 @@
-class TypeAnnotationsInComments {
+class FormatAnnotationsInComments {
 
   // Here is a comment relating to the annotation @Nullable
   @Interned
diff --git a/testlib/src/main/resources/java/typeannotations/TypeAnnotationsInCommentsOutput.test b/testlib/src/main/resources/java/formatannotations/FormatAnnotationsInCommentsOutput.test
similarity index 93%
rename from testlib/src/main/resources/java/typeannotations/TypeAnnotationsInCommentsOutput.test
rename to testlib/src/main/resources/java/formatannotations/FormatAnnotationsInCommentsOutput.test
index 491ce5b2aa..91a352347b 100644
--- a/testlib/src/main/resources/java/typeannotations/TypeAnnotationsInCommentsOutput.test
+++ b/testlib/src/main/resources/java/formatannotations/FormatAnnotationsInCommentsOutput.test
@@ -1,4 +1,4 @@
-class TypeAnnotationsInComments {
+class FormatAnnotationsInComments {
 
   // Here is a comment relating to the annotation @Nullable
   @Interned String m1() {}
diff --git a/testlib/src/main/resources/java/typeannotations/TypeAnnotationsTestInput.test b/testlib/src/main/resources/java/formatannotations/FormatAnnotationsTestInput.test
similarity index 87%
rename from testlib/src/main/resources/java/typeannotations/TypeAnnotationsTestInput.test
rename to testlib/src/main/resources/java/formatannotations/FormatAnnotationsTestInput.test
index 8a870a34cc..fb711451d1 100644
--- a/testlib/src/main/resources/java/typeannotations/TypeAnnotationsTestInput.test
+++ b/testlib/src/main/resources/java/formatannotations/FormatAnnotationsTestInput.test
@@ -1,4 +1,4 @@
-class TypeAnnotationsTest {
+class FormatAnnotationsTest {
 
   public @Nullable
   String s0 = null;
@@ -65,4 +65,13 @@ class TypeAnnotationsTest {
   @Regex(2)
   @Interned
   String m6() {}
+
+  @Empty
+  String e;
+
+  @NonEmpty
+  String ne;
+
+  @Localized
+  String localized;
 }
diff --git a/testlib/src/main/resources/java/typeannotations/TypeAnnotationsTestOutput.test b/testlib/src/main/resources/java/formatannotations/FormatAnnotationsTestOutput.test
similarity index 87%
rename from testlib/src/main/resources/java/typeannotations/TypeAnnotationsTestOutput.test
rename to testlib/src/main/resources/java/formatannotations/FormatAnnotationsTestOutput.test
index 81fd049609..ca37e66d86 100644
--- a/testlib/src/main/resources/java/typeannotations/TypeAnnotationsTestOutput.test
+++ b/testlib/src/main/resources/java/formatannotations/FormatAnnotationsTestOutput.test
@@ -1,4 +1,4 @@
-class TypeAnnotationsTest {
+class FormatAnnotationsTest {
 
   public @Nullable String s0 = null;
 
@@ -40,4 +40,12 @@ class TypeAnnotationsTest {
   @Nullable
   // a comment
   @Regex(2) @Interned String m6() {}
+
+  @Empty
+  String e;
+
+  @NonEmpty
+  String ne;
+
+  @Localized String localized;
 }
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/TypeAnnotationsStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/FormatAnnotationsStepTest.java
similarity index 50%
rename from testlib/src/test/java/com/diffplug/spotless/java/TypeAnnotationsStepTest.java
rename to testlib/src/test/java/com/diffplug/spotless/java/FormatAnnotationsStepTest.java
index 3724cac09f..84d347e490 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/TypeAnnotationsStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/FormatAnnotationsStepTest.java
@@ -15,28 +15,36 @@
  */
 package com.diffplug.spotless.java;
 
+import java.util.Arrays;
+
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.ResourceHarness;
 import com.diffplug.spotless.SerializableEqualityTester;
 
-class TypeAnnotationsStepTest extends ResourceHarness {
+class FormatAnnotationsStepTest extends ResourceHarness {
+	@Test
+	void formatAnnotations() throws Throwable {
+		FormatterStep step = FormatAnnotationsStep.create();
+		assertOnResources(step, "java/formatannotations/FormatAnnotationsTestInput.test", "java/formatannotations/FormatAnnotationsTestOutput.test");
+	}
+
 	@Test
-	void typeAnnotations() throws Throwable {
-		FormatterStep step = TypeAnnotationsStep.create();
-		assertOnResources(step, "java/typeannotations/TypeAnnotationsTestInput.test", "java/typeannotations/TypeAnnotationsTestOutput.test");
+	void formatAnnotationsInComments() throws Throwable {
+		FormatterStep step = FormatAnnotationsStep.create();
+		assertOnResources(step, "java/formatannotations/FormatAnnotationsInCommentsInput.test", "java/formatannotations/FormatAnnotationsInCommentsOutput.test");
 	}
 
 	@Test
-	void typeAnnotationsInComments() throws Throwable {
-		FormatterStep step = TypeAnnotationsStep.create();
-		assertOnResources(step, "java/typeannotations/TypeAnnotationsInCommentsInput.test", "java/typeannotations/TypeAnnotationsInCommentsOutput.test");
+	void formatAnnotationsAddRemove() throws Throwable {
+		FormatterStep step = FormatAnnotationsStep.create(Arrays.asList("Empty", "NonEmpty"), Arrays.asList("Localized"));
+		assertOnResources(step, "java/formatannotations/FormatAnnotationsAddRemoveInput.test", "java/formatannotations/FormatAnnotationsAddRemoveOutput.test");
 	}
 
 	@Test
-	void doesntThrowIfTypeAnnotationsIsntSerializable() {
-		TypeAnnotationsStep.create();
+	void doesntThrowIfFormatAnnotationsIsntSerializable() {
+		FormatAnnotationsStep.create();
 	}
 
 	@Test
@@ -49,7 +57,7 @@ protected void setupTest(API api) {
 
 			@Override
 			protected FormatterStep create() {
-				return TypeAnnotationsStep.create();
+				return FormatAnnotationsStep.create();
 			}
 		}.testEquals();
 	}

From 263da38e4ef5ef33b2f5ea45b43d972ffdc78abd Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Sun, 28 Aug 2022 14:21:43 -0700
Subject: [PATCH 0299/2068] Tweaks

---
 .../diffplug/spotless/java/FormatAnnotationsStep.java    | 9 ++++++---
 .../java/com/diffplug/gradle/spotless/JavaExtension.java | 2 ++
 plugin-maven/README.md                                   | 1 +
 .../diffplug/spotless/maven/java/FormatAnnotations.java  | 2 +-
 .../FormatAnnotationsInCommentsInput.test                | 4 ++--
 .../FormatAnnotationsInCommentsOutput.test               | 4 ++--
 6 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java b/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java
index 28691ccf91..1345182acf 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java
@@ -393,7 +393,6 @@ public static FormatterStep create(List<String> addedTypeAnnotations, List<Strin
 
 	private FormatAnnotationsStep() {}
 
-	// TODO: Enable users to specify more type annotations in `formatAnnotations` in build.gradle.
 	// TODO: Read from a local .type-annotations file.
 	private static final class State implements Serializable {
 		private static final long serialVersionUID = 1L;
@@ -415,13 +414,17 @@ private static final class State implements Serializable {
 		// Don't move an annotation to the start of a comment line.
 		private static final Pattern startsWithCommentPattern = Pattern.compile("^[ \t]*(//|/\\*$|/\\*|void\\b)");
 
+                /**
+                 * @param addedTypeAnnotations simple names to add to Spotless's default list
+                 * @param removedTypeAnnotations simple names to remove from Spotless's default list
+                 */
 		State(List<String> addedTypeAnnotations, List<String> removedTypeAnnotations) {
 			typeAnnotations.addAll(addedTypeAnnotations);
 			typeAnnotations.removeAll(removedTypeAnnotations);
 		}
 
 		FormatterFunc toFormatter() {
-			return unixStr -> fixupFormatAnnotations(unixStr);
+			return unixStr -> fixupTypeAnnotations(unixStr);
 		}
 
 		/**
@@ -430,7 +433,7 @@ FormatterFunc toFormatter() {
 		 * @param the text of a Java file
 		 * @return corrected text of the Java file
 		 */
-		String fixupFormatAnnotations(String unixStr) {
+		String fixupTypeAnnotations(String unixStr) {
 			// Each element of `lines` ends with a newline.
 			String[] lines = unixStr.split("((?<=\n))");
 			for (int i = 0; i < lines.length - 1; i++) {
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
index 1329ce1ad9..25e464b0da 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
@@ -240,7 +240,9 @@ public FormatAnnotationsConfig formatAnnotations() {
 	}
 
 	public class FormatAnnotationsConfig {
+                /** Annotations in addition to those in the default list. */
 		final List<String> addedTypeAnnotations = new ArrayList<>();
+                /** Annotations that the user doesn't want treated as type annotations. */
 		final List<String> removedTypeAnnotations = new ArrayList<>();
 
 		FormatAnnotationsConfig() {
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index b7e93f41ca..3a112cd3b1 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -290,6 +290,7 @@ A type annotation is an annotation that is meta-annotated with `@Target({Element
 Because Spotless cannot necessarily examine the annotation definition, it uses a hard-coded
 list of well-known type annotations.  You can make a pull request to add new ones.
 In the future there will be mechanisms to add/remove annotations from the list.
+These mechanisms already exist for the Gradle plugin.
 
 
 ## Groovy
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/FormatAnnotations.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/FormatAnnotations.java
index 5ce820921a..ac60af0a62 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/FormatAnnotations.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/FormatAnnotations.java
@@ -26,7 +26,7 @@ public class FormatAnnotations implements FormatterStepFactory {
 
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig config) {
-		// TODO: Permit customization in Maven.
+		// TODO: Permit customization in Maven build files.
 		return FormatAnnotationsStep.create(Collections.emptyList(), Collections.emptyList());
 	}
 }
diff --git a/testlib/src/main/resources/java/formatannotations/FormatAnnotationsInCommentsInput.test b/testlib/src/main/resources/java/formatannotations/FormatAnnotationsInCommentsInput.test
index 1095de0fd6..a744b072a1 100644
--- a/testlib/src/main/resources/java/formatannotations/FormatAnnotationsInCommentsInput.test
+++ b/testlib/src/main/resources/java/formatannotations/FormatAnnotationsInCommentsInput.test
@@ -1,10 +1,10 @@
 class FormatAnnotationsInComments {
 
-  // Here is a comment relating to the annotation @Nullable
+  // Here is a comment
   @Interned
   String m1() {}
 
-  // Here is another comment relating to the annotation @Nullable
+  // Here is another comment
   String m2() {}
 
   /**
diff --git a/testlib/src/main/resources/java/formatannotations/FormatAnnotationsInCommentsOutput.test b/testlib/src/main/resources/java/formatannotations/FormatAnnotationsInCommentsOutput.test
index 91a352347b..be65af24be 100644
--- a/testlib/src/main/resources/java/formatannotations/FormatAnnotationsInCommentsOutput.test
+++ b/testlib/src/main/resources/java/formatannotations/FormatAnnotationsInCommentsOutput.test
@@ -1,9 +1,9 @@
 class FormatAnnotationsInComments {
 
-  // Here is a comment relating to the annotation @Nullable
+  // Here is a comment
   @Interned String m1() {}
 
-  // Here is another comment relating to the annotation @Nullable
+  // Here is another comment
   String m2() {}
 
   /**

From 04040622bed59ebcd87a32a2b1f56a9917587c00 Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Sun, 28 Aug 2022 14:23:32 -0700
Subject: [PATCH 0300/2068] Tabify

---
 .../com/diffplug/spotless/java/FormatAnnotationsStep.java | 8 ++++----
 .../java/com/diffplug/gradle/spotless/JavaExtension.java  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java b/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java
index 1345182acf..2d01e305a0 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java
@@ -414,10 +414,10 @@ private static final class State implements Serializable {
 		// Don't move an annotation to the start of a comment line.
 		private static final Pattern startsWithCommentPattern = Pattern.compile("^[ \t]*(//|/\\*$|/\\*|void\\b)");
 
-                /**
-                 * @param addedTypeAnnotations simple names to add to Spotless's default list
-                 * @param removedTypeAnnotations simple names to remove from Spotless's default list
-                 */
+		/**
+		 * @param addedTypeAnnotations simple names to add to Spotless's default list
+		 * @param removedTypeAnnotations simple names to remove from Spotless's default list
+		 */
 		State(List<String> addedTypeAnnotations, List<String> removedTypeAnnotations) {
 			typeAnnotations.addAll(addedTypeAnnotations);
 			typeAnnotations.removeAll(removedTypeAnnotations);
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
index 25e464b0da..3976c154aa 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
@@ -240,9 +240,9 @@ public FormatAnnotationsConfig formatAnnotations() {
 	}
 
 	public class FormatAnnotationsConfig {
-                /** Annotations in addition to those in the default list. */
+		/** Annotations in addition to those in the default list. */
 		final List<String> addedTypeAnnotations = new ArrayList<>();
-                /** Annotations that the user doesn't want treated as type annotations. */
+		/** Annotations that the user doesn't want treated as type annotations. */
 		final List<String> removedTypeAnnotations = new ArrayList<>();
 
 		FormatAnnotationsConfig() {

From 8c59a0637265f9357918caabcc2df459a3025cfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Burstr=C3=B6m?= <david.burstrom@gmail.com>
Date: Mon, 29 Aug 2022 13:41:05 +0200
Subject: [PATCH 0301/2068] Reinstate support for KtLint down to 0.31.0

The io.github.davidburstrom.version-compatibility plugin provides sourcesets that make it possible
to write adapters against specific versions of KtLint, and the correct adapter will be selected
during runtime.
---
 CHANGES.md                                    |   3 +
 lib/build.gradle                              |  35 +++++
 .../compat/KtLintCompat0Dot31Dot0Adapter.java |  63 +++++++++
 .../compat/KtLintCompat0Dot32Dot0Adapter.java |  63 +++++++++
 .../compat/KtLintCompat0Dot34Dot2Adapter.java |  67 ++++++++++
 .../compat/KtLintCompat0Dot45Dot2Adapter.java | 118 +++++++++++++++++
 .../compat/KtLintCompat0Dot46Dot0Adapter.java | 118 +++++++++++++++++
 .../ktlint/compat/KtLintCompatAdapter.java    |  24 ++++
 .../ktlint/compat/KtLintCompatReporting.java  |  25 ++++
 .../glue/ktlint/KtlintFormatterFunc.java      | 121 ++++--------------
 .../diffplug/spotless/kotlin/KtLintStep.java  |  25 +++-
 plugin-gradle/CHANGES.md                      |   3 +
 plugin-maven/CHANGES.md                       |   3 +
 settings.gradle                               |   3 +
 .../spotless/kotlin/KtLintStepTest.java       |  74 ++++++++++-
 15 files changed, 641 insertions(+), 104 deletions(-)
 create mode 100644 lib/src/compatKtLint0Dot31Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot31Dot0Adapter.java
 create mode 100644 lib/src/compatKtLint0Dot32Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot32Dot0Adapter.java
 create mode 100644 lib/src/compatKtLint0Dot34Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot34Dot2Adapter.java
 create mode 100644 lib/src/compatKtLint0Dot45Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot45Dot2Adapter.java
 create mode 100644 lib/src/compatKtLint0Dot46Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot46Dot0Adapter.java
 create mode 100644 lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
 create mode 100644 lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatReporting.java

diff --git a/CHANGES.md b/CHANGES.md
index 580b23b9fb..01e68f430c 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
+* Extend minimum supported version for `ktlint` to `0.31.0` ([#1303](https://github.com/diffplug/spotless/pull/1303)).
+
 ## [2.29.0] - 2022-08-23
 ### Added
 * `scalafmt` integration now has a configuration option `majorScalaVersion` that allows you to configure the Scala version that gets resolved from the maven artifact ([#1283](https://github.com/diffplug/spotless/pull/1283))
diff --git a/lib/build.gradle b/lib/build.gradle
index fae8b5b875..1a5fbf9c64 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -1,5 +1,6 @@
 plugins {
 	id 'java-library'
+	id 'io.github.davidburstrom.version-compatibility'
 }
 ext.artifactId = project.artifactIdLib
 version = rootProject.spotlessChangelog.versionNext
@@ -23,6 +24,21 @@ for (glue in NEEDS_GLUE) {
 	}
 }
 
+versionCompatibility {
+	adapters {
+		namespaces.register('KtLint') {
+			versions = [
+				'0.31.0',
+				'0.32.0',
+				'0.34.2',
+				'0.45.2',
+				'0.46.0',
+			]
+			targetSourceSetName = 'ktlint'
+		}
+	}
+}
+
 dependencies {
 	compileOnly 'org.slf4j:slf4j-api:2.0.0'
 	// zero runtime reqs is a hard requirements for spotless-lib
@@ -52,6 +68,25 @@ dependencies {
 	ktlintCompileOnly "com.pinterest.ktlint:ktlint-ruleset-experimental:$VER_KTLINT"
 	ktlintCompileOnly "com.pinterest.ktlint:ktlint-ruleset-standard:$VER_KTLINT"
 
+	compatKtLint0Dot31Dot0CompileOnly 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.20'
+	compatKtLint0Dot31Dot0CompileOnly 'com.github.shyiko.ktlint:ktlint-core:0.31.0'
+	compatKtLint0Dot31Dot0CompileOnly 'com.github.shyiko.ktlint:ktlint-ruleset-experimental:0.31.0'
+	compatKtLint0Dot31Dot0CompileOnly 'com.github.shyiko.ktlint:ktlint-ruleset-standard:0.31.0'
+	compatKtLint0Dot32Dot0CompileOnly 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.20'
+	compatKtLint0Dot32Dot0CompileOnly 'com.pinterest.ktlint:ktlint-core:0.32.0'
+	compatKtLint0Dot32Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-experimental:0.32.0'
+	compatKtLint0Dot32Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.32.0'
+	compatKtLint0Dot34Dot2CompileOnly 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.20'
+	compatKtLint0Dot34Dot2CompileOnly 'com.pinterest.ktlint:ktlint-core:0.34.2'
+	compatKtLint0Dot34Dot2CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-experimental:0.34.2'
+	compatKtLint0Dot34Dot2CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.34.2'
+	compatKtLint0Dot45Dot2CompileOnly 'com.pinterest.ktlint:ktlint-core:0.45.2'
+	compatKtLint0Dot45Dot2CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-experimental:0.45.2'
+	compatKtLint0Dot45Dot2CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.45.2'
+	compatKtLint0Dot46Dot0CompileOnly 'com.pinterest.ktlint:ktlint-core:0.46.0'
+	compatKtLint0Dot46Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-experimental:0.46.0'
+	compatKtLint0Dot46Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.46.0'
+
 	String VER_SCALAFMT="3.5.9"
 	scalafmtCompileOnly "org.scalameta:scalafmt-core_2.13:$VER_SCALAFMT"
 
diff --git a/lib/src/compatKtLint0Dot31Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot31Dot0Adapter.java b/lib/src/compatKtLint0Dot31Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot31Dot0Adapter.java
new file mode 100644
index 0000000000..56b8da2d20
--- /dev/null
+++ b/lib/src/compatKtLint0Dot31Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot31Dot0Adapter.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.glue.ktlint.compat;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import com.github.shyiko.ktlint.core.KtLint;
+import com.github.shyiko.ktlint.core.LintError;
+import com.github.shyiko.ktlint.core.RuleSet;
+import com.github.shyiko.ktlint.ruleset.experimental.ExperimentalRuleSetProvider;
+import com.github.shyiko.ktlint.ruleset.standard.StandardRuleSetProvider;
+
+import kotlin.Unit;
+import kotlin.jvm.functions.Function2;
+
+public class KtLintCompat0Dot31Dot0Adapter implements KtLintCompatAdapter {
+
+	static class FormatterCallback implements Function2<LintError, Boolean, Unit> {
+		@Override
+		public Unit invoke(LintError lint, Boolean corrected) {
+			if (!corrected) {
+				KtLintCompatReporting.report(lint.getLine(), lint.getCol(), lint.getRuleId(), lint.getDetail());
+			}
+			return null;
+		}
+	}
+
+	@Override
+	public String format(final String text, final String name, final boolean isScript,
+			final boolean useExperimental,
+			final Map<String, String> userData,
+			final Map<String, Object> editorConfigOverrideMap) {
+		final FormatterCallback formatterCallback = new FormatterCallback();
+
+		final List<RuleSet> rulesets = new ArrayList<>();
+		rulesets.add(new StandardRuleSetProvider().get());
+
+		if (useExperimental) {
+			rulesets.add(new ExperimentalRuleSetProvider().get());
+		}
+
+		return KtLint.INSTANCE.format(
+				text,
+				rulesets,
+				userData,
+				formatterCallback);
+	}
+}
diff --git a/lib/src/compatKtLint0Dot32Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot32Dot0Adapter.java b/lib/src/compatKtLint0Dot32Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot32Dot0Adapter.java
new file mode 100644
index 0000000000..6f69fcc7ce
--- /dev/null
+++ b/lib/src/compatKtLint0Dot32Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot32Dot0Adapter.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.glue.ktlint.compat;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import com.pinterest.ktlint.core.KtLint;
+import com.pinterest.ktlint.core.LintError;
+import com.pinterest.ktlint.core.RuleSet;
+import com.pinterest.ktlint.ruleset.experimental.ExperimentalRuleSetProvider;
+import com.pinterest.ktlint.ruleset.standard.StandardRuleSetProvider;
+
+import kotlin.Unit;
+import kotlin.jvm.functions.Function2;
+
+public class KtLintCompat0Dot32Dot0Adapter implements KtLintCompatAdapter {
+
+	static class FormatterCallback implements Function2<LintError, Boolean, Unit> {
+		@Override
+		public Unit invoke(LintError lint, Boolean corrected) {
+			if (!corrected) {
+				KtLintCompatReporting.report(lint.getLine(), lint.getCol(), lint.getRuleId(), lint.getDetail());
+			}
+			return null;
+		}
+	}
+
+	@Override
+	public String format(final String text, final String name, final boolean isScript,
+			final boolean useExperimental,
+			final Map<String, String> userData,
+			final Map<String, Object> editorConfigOverrideMap) {
+		final FormatterCallback formatterCallback = new FormatterCallback();
+
+		final List<RuleSet> rulesets = new ArrayList<>();
+		rulesets.add(new StandardRuleSetProvider().get());
+
+		if (useExperimental) {
+			rulesets.add(new ExperimentalRuleSetProvider().get());
+		}
+
+		return KtLint.INSTANCE.format(
+				text,
+				rulesets,
+				userData,
+				formatterCallback);
+	}
+}
diff --git a/lib/src/compatKtLint0Dot34Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot34Dot2Adapter.java b/lib/src/compatKtLint0Dot34Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot34Dot2Adapter.java
new file mode 100644
index 0000000000..a3c8c8df3b
--- /dev/null
+++ b/lib/src/compatKtLint0Dot34Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot34Dot2Adapter.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.glue.ktlint.compat;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import com.pinterest.ktlint.core.KtLint;
+import com.pinterest.ktlint.core.LintError;
+import com.pinterest.ktlint.core.RuleSet;
+import com.pinterest.ktlint.ruleset.experimental.ExperimentalRuleSetProvider;
+import com.pinterest.ktlint.ruleset.standard.StandardRuleSetProvider;
+
+import kotlin.Unit;
+import kotlin.jvm.functions.Function2;
+
+public class KtLintCompat0Dot34Dot2Adapter implements KtLintCompatAdapter {
+
+	static class FormatterCallback implements Function2<LintError, Boolean, Unit> {
+		@Override
+		public Unit invoke(LintError lint, Boolean corrected) {
+			if (!corrected) {
+				KtLintCompatReporting.report(lint.getLine(), lint.getCol(), lint.getRuleId(), lint.getDetail());
+			}
+			return null;
+		}
+	}
+
+	@Override
+	public String format(final String text, final String name, final boolean isScript,
+			final boolean useExperimental,
+			final Map<String, String> userData,
+			final Map<String, Object> editorConfigOverrideMap) {
+		final FormatterCallback formatterCallback = new FormatterCallback();
+
+		final List<RuleSet> rulesets = new ArrayList<>();
+		rulesets.add(new StandardRuleSetProvider().get());
+
+		if (useExperimental) {
+			rulesets.add(new ExperimentalRuleSetProvider().get());
+		}
+
+		return KtLint.INSTANCE.format(new KtLint.Params(
+				name,
+				text,
+				rulesets,
+				userData,
+				formatterCallback,
+				isScript,
+				null,
+				false));
+	}
+}
diff --git a/lib/src/compatKtLint0Dot45Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot45Dot2Adapter.java b/lib/src/compatKtLint0Dot45Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot45Dot2Adapter.java
new file mode 100644
index 0000000000..f7eadada3d
--- /dev/null
+++ b/lib/src/compatKtLint0Dot45Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot45Dot2Adapter.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.glue.ktlint.compat;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import com.pinterest.ktlint.core.KtLint;
+import com.pinterest.ktlint.core.LintError;
+import com.pinterest.ktlint.core.RuleSet;
+import com.pinterest.ktlint.core.api.DefaultEditorConfigProperties;
+import com.pinterest.ktlint.core.api.EditorConfigOverride;
+import com.pinterest.ktlint.core.api.UsesEditorConfigProperties;
+import com.pinterest.ktlint.ruleset.experimental.ExperimentalRuleSetProvider;
+import com.pinterest.ktlint.ruleset.standard.StandardRuleSetProvider;
+
+import kotlin.Pair;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function2;
+
+public class KtLintCompat0Dot45Dot2Adapter implements KtLintCompatAdapter {
+
+	static class FormatterCallback implements Function2<LintError, Boolean, Unit> {
+		@Override
+		public Unit invoke(LintError lint, Boolean corrected) {
+			if (!corrected) {
+				KtLintCompatReporting.report(lint.getLine(), lint.getCol(), lint.getRuleId(), lint.getDetail());
+			}
+			return null;
+		}
+	}
+
+	@Override
+	public String format(final String text, final String name, final boolean isScript,
+			final boolean useExperimental,
+			final Map<String, String> userData,
+			final Map<String, Object> editorConfigOverrideMap) {
+		final FormatterCallback formatterCallback = new FormatterCallback();
+
+		final List<RuleSet> rulesets = new ArrayList<>();
+		rulesets.add(new StandardRuleSetProvider().get());
+
+		if (useExperimental) {
+			rulesets.add(new ExperimentalRuleSetProvider().get());
+		}
+
+		EditorConfigOverride editorConfigOverride;
+		if (editorConfigOverrideMap.isEmpty()) {
+			editorConfigOverride = EditorConfigOverride.Companion.getEmptyEditorConfigOverride();
+		} else {
+			editorConfigOverride = createEditorConfigOverride(rulesets, editorConfigOverrideMap);
+		}
+
+		return KtLint.INSTANCE.format(new KtLint.ExperimentalParams(
+				name,
+				text,
+				rulesets,
+				userData,
+				formatterCallback,
+				isScript,
+				null,
+				false,
+				editorConfigOverride,
+				false));
+	}
+
+	/**
+	 * Create EditorConfigOverride from user provided parameters.
+	 * Calling this method requires KtLint 0.45.2.
+	 */
+	private static EditorConfigOverride createEditorConfigOverride(final List<RuleSet> rulesets, Map<String, Object> editorConfigOverrideMap) {
+		// Get properties from rules in the rule sets
+		Stream<UsesEditorConfigProperties.EditorConfigProperty<?>> ruleProperties = rulesets.stream()
+				.flatMap(ruleSet -> Arrays.stream(ruleSet.getRules()))
+				.filter(rule -> rule instanceof UsesEditorConfigProperties)
+				.flatMap(rule -> ((UsesEditorConfigProperties) rule).getEditorConfigProperties().stream());
+
+		// Create a mapping of properties to their names based on rule properties and default properties
+		Map<String, UsesEditorConfigProperties.EditorConfigProperty<?>> supportedProperties = Stream
+				.concat(ruleProperties, DefaultEditorConfigProperties.INSTANCE.getDefaultEditorConfigProperties().stream())
+				.distinct()
+				.collect(Collectors.toMap(property -> property.getType().getName(), property -> property));
+
+		// Create config properties based on provided property names and values
+		@SuppressWarnings("unchecked")
+		Pair<UsesEditorConfigProperties.EditorConfigProperty<?>, ?>[] properties = editorConfigOverrideMap.entrySet().stream()
+				.map(entry -> {
+					UsesEditorConfigProperties.EditorConfigProperty<?> property = supportedProperties.get(entry.getKey());
+					if (property != null) {
+						return new Pair<>(property, entry.getValue());
+					} else {
+						return null;
+					}
+				})
+				.filter(Objects::nonNull)
+				.toArray(Pair[]::new);
+
+		return EditorConfigOverride.Companion.from(properties);
+	}
+}
diff --git a/lib/src/compatKtLint0Dot46Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot46Dot0Adapter.java b/lib/src/compatKtLint0Dot46Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot46Dot0Adapter.java
new file mode 100644
index 0000000000..873b91af80
--- /dev/null
+++ b/lib/src/compatKtLint0Dot46Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot46Dot0Adapter.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.glue.ktlint.compat;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import com.pinterest.ktlint.core.KtLint;
+import com.pinterest.ktlint.core.LintError;
+import com.pinterest.ktlint.core.RuleSet;
+import com.pinterest.ktlint.core.api.DefaultEditorConfigProperties;
+import com.pinterest.ktlint.core.api.EditorConfigOverride;
+import com.pinterest.ktlint.core.api.UsesEditorConfigProperties;
+import com.pinterest.ktlint.ruleset.experimental.ExperimentalRuleSetProvider;
+import com.pinterest.ktlint.ruleset.standard.StandardRuleSetProvider;
+
+import kotlin.Pair;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function2;
+
+public class KtLintCompat0Dot46Dot0Adapter implements KtLintCompatAdapter {
+
+	static class FormatterCallback implements Function2<LintError, Boolean, Unit> {
+		@Override
+		public Unit invoke(LintError lint, Boolean corrected) {
+			if (!corrected) {
+				KtLintCompatReporting.report(lint.getLine(), lint.getCol(), lint.getRuleId(), lint.getDetail());
+			}
+			return null;
+		}
+	}
+
+	@Override
+	public String format(final String text, final String name, final boolean isScript,
+			final boolean useExperimental,
+			final Map<String, String> userData,
+			final Map<String, Object> editorConfigOverrideMap) {
+		final FormatterCallback formatterCallback = new FormatterCallback();
+
+		final List<RuleSet> rulesets = new ArrayList<>();
+		rulesets.add(new StandardRuleSetProvider().get());
+
+		if (useExperimental) {
+			rulesets.add(new ExperimentalRuleSetProvider().get());
+		}
+
+		EditorConfigOverride editorConfigOverride;
+		if (editorConfigOverrideMap.isEmpty()) {
+			editorConfigOverride = EditorConfigOverride.Companion.getEmptyEditorConfigOverride();
+		} else {
+			editorConfigOverride = createEditorConfigOverride(rulesets, editorConfigOverrideMap);
+		}
+
+		return KtLint.INSTANCE.format(new KtLint.ExperimentalParams(
+				name,
+				text,
+				rulesets,
+				userData,
+				formatterCallback,
+				isScript,
+				null,
+				false,
+				editorConfigOverride,
+				false));
+	}
+
+	/**
+	 * Create EditorConfigOverride from user provided parameters.
+	 * Calling this method requires KtLint 0.45.2.
+	 */
+	private static EditorConfigOverride createEditorConfigOverride(final List<RuleSet> rulesets, Map<String, Object> editorConfigOverrideMap) {
+		// Get properties from rules in the rule sets
+		Stream<UsesEditorConfigProperties.EditorConfigProperty<?>> ruleProperties = rulesets.stream()
+				.flatMap(ruleSet -> Arrays.stream(ruleSet.getRules()))
+				.filter(rule -> rule instanceof UsesEditorConfigProperties)
+				.flatMap(rule -> ((UsesEditorConfigProperties) rule).getEditorConfigProperties().stream());
+
+		// Create a mapping of properties to their names based on rule properties and default properties
+		Map<String, UsesEditorConfigProperties.EditorConfigProperty<?>> supportedProperties = Stream
+				.concat(ruleProperties, DefaultEditorConfigProperties.INSTANCE.getEditorConfigProperties().stream())
+				.distinct()
+				.collect(Collectors.toMap(property -> property.getType().getName(), property -> property));
+
+		// Create config properties based on provided property names and values
+		@SuppressWarnings("unchecked")
+		Pair<UsesEditorConfigProperties.EditorConfigProperty<?>, ?>[] properties = editorConfigOverrideMap.entrySet().stream()
+				.map(entry -> {
+					UsesEditorConfigProperties.EditorConfigProperty<?> property = supportedProperties.get(entry.getKey());
+					if (property != null) {
+						return new Pair<>(property, entry.getValue());
+					} else {
+						return null;
+					}
+				})
+				.filter(Objects::nonNull)
+				.toArray(Pair[]::new);
+
+		return EditorConfigOverride.Companion.from(properties);
+	}
+}
diff --git a/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java b/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
new file mode 100644
index 0000000000..5097cac135
--- /dev/null
+++ b/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.glue.ktlint.compat;
+
+import java.util.Map;
+
+public interface KtLintCompatAdapter {
+
+	String format(String text, String name, boolean isScript, boolean useExperimental, Map<String, String> userData,
+			Map<String, Object> editorConfigOverrideMap);
+}
diff --git a/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatReporting.java b/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatReporting.java
new file mode 100644
index 0000000000..7c1e0f6dd8
--- /dev/null
+++ b/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatReporting.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.glue.ktlint.compat;
+
+final class KtLintCompatReporting {
+
+	private KtLintCompatReporting() {}
+
+	static void report(int line, int column, String ruleId, String detail) {
+		throw new AssertionError("Error on line: " + line + ", column: " + column + "\nrule: " + ruleId + "\n" + detail);
+	}
+}
diff --git a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
index e7af558fb5..96ad244593 100644
--- a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
+++ b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
@@ -16,119 +16,52 @@
 package com.diffplug.spotless.glue.ktlint;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.jetbrains.annotations.NotNull;
 
-import com.pinterest.ktlint.core.KtLint;
-import com.pinterest.ktlint.core.KtLint.ExperimentalParams;
-import com.pinterest.ktlint.core.LintError;
-import com.pinterest.ktlint.core.RuleSet;
-import com.pinterest.ktlint.core.api.DefaultEditorConfigProperties;
-import com.pinterest.ktlint.core.api.EditorConfigOverride;
-import com.pinterest.ktlint.core.api.UsesEditorConfigProperties;
-import com.pinterest.ktlint.ruleset.experimental.ExperimentalRuleSetProvider;
-import com.pinterest.ktlint.ruleset.standard.StandardRuleSetProvider;
-
 import com.diffplug.spotless.FormatterFunc;
-
-import kotlin.Pair;
-import kotlin.Unit;
-import kotlin.jvm.functions.Function2;
+import com.diffplug.spotless.glue.ktlint.compat.KtLintCompat0Dot31Dot0Adapter;
+import com.diffplug.spotless.glue.ktlint.compat.KtLintCompat0Dot32Dot0Adapter;
+import com.diffplug.spotless.glue.ktlint.compat.KtLintCompat0Dot34Dot2Adapter;
+import com.diffplug.spotless.glue.ktlint.compat.KtLintCompat0Dot45Dot2Adapter;
+import com.diffplug.spotless.glue.ktlint.compat.KtLintCompat0Dot46Dot0Adapter;
+import com.diffplug.spotless.glue.ktlint.compat.KtLintCompat0Dot47Dot0Adapter;
+import com.diffplug.spotless.glue.ktlint.compat.KtLintCompatAdapter;
 
 public class KtlintFormatterFunc implements FormatterFunc.NeedsFile {
 
-	private final List<RuleSet> rulesets;
 	private final Map<String, String> userData;
-	private final Function2<? super LintError, ? super Boolean, Unit> formatterCallback;
 	private final boolean isScript;
 	@NotNull
-	private final EditorConfigOverride editorConfigOverride;
+	private final KtLintCompatAdapter adapter;
+	private final boolean useExperimental;
+	private final Map<String, Object> editorConfigOverrideMap;
 
-	/**
-	 * Non-empty editorConfigOverrideMap requires KtLint 0.45.2.
-	 */
-	public KtlintFormatterFunc(boolean isScript, boolean useExperimental, Map<String, String> userData,
+	public KtlintFormatterFunc(String version, boolean isScript, boolean useExperimental, Map<String, String> userData,
 			Map<String, Object> editorConfigOverrideMap) {
-		rulesets = new ArrayList<>();
-		rulesets.add(new StandardRuleSetProvider().get());
-
-		if (useExperimental) {
-			rulesets.add(new ExperimentalRuleSetProvider().get());
+		int minorVersion = Integer.parseInt(version.split("\\.")[1]);
+		if (version.equals("0.45.2")) {
+			this.adapter = new KtLintCompat0Dot45Dot2Adapter();
+		} else if (minorVersion >= 47) {
+			this.adapter = new KtLintCompat0Dot47Dot0Adapter();
+		} else if (minorVersion >= 46) {
+			this.adapter = new KtLintCompat0Dot46Dot0Adapter();
+		} else if (minorVersion >= 34) {
+			this.adapter = new KtLintCompat0Dot34Dot2Adapter();
+		} else if (minorVersion >= 32) {
+			this.adapter = new KtLintCompat0Dot32Dot0Adapter();
+		} else {
+			this.adapter = new KtLintCompat0Dot31Dot0Adapter();
 		}
+		this.useExperimental = useExperimental;
+		this.editorConfigOverrideMap = editorConfigOverrideMap;
 		this.userData = userData;
-		formatterCallback = new FormatterCallback();
 		this.isScript = isScript;
-
-		if (editorConfigOverrideMap.isEmpty()) {
-			this.editorConfigOverride = EditorConfigOverride.Companion.getEmptyEditorConfigOverride();
-		} else {
-			this.editorConfigOverride = createEditorConfigOverride(editorConfigOverrideMap);
-		}
-	}
-
-	/**
-	 * Create EditorConfigOverride from user provided parameters.
-	 * Calling this method requires KtLint 0.45.2.
-	 */
-	private EditorConfigOverride createEditorConfigOverride(Map<String, Object> editorConfigOverrideMap) {
-		// Get properties from rules in the rule sets
-		Stream<UsesEditorConfigProperties.EditorConfigProperty<?>> ruleProperties = rulesets.stream()
-				.flatMap(ruleSet -> Arrays.stream(ruleSet.getRules()))
-				.filter(rule -> rule instanceof UsesEditorConfigProperties)
-				.flatMap(rule -> ((UsesEditorConfigProperties) rule).getEditorConfigProperties().stream());
-
-		// Create a mapping of properties to their names based on rule properties and default properties
-		Map<String, UsesEditorConfigProperties.EditorConfigProperty<?>> supportedProperties = Stream
-				.concat(ruleProperties, DefaultEditorConfigProperties.INSTANCE.getEditorConfigProperties().stream())
-				.distinct()
-				.collect(Collectors.toMap(property -> property.getType().getName(), property -> property));
-
-		// Create config properties based on provided property names and values
-		@SuppressWarnings("unchecked")
-		Pair<UsesEditorConfigProperties.EditorConfigProperty<?>, ?>[] properties = editorConfigOverrideMap.entrySet().stream()
-				.map(entry -> {
-					UsesEditorConfigProperties.EditorConfigProperty<?> property = supportedProperties.get(entry.getKey());
-					if (property != null) {
-						return new Pair<>(property, entry.getValue());
-					} else {
-						return null;
-					}
-				})
-				.filter(Objects::nonNull)
-				.toArray(Pair[]::new);
-
-		return EditorConfigOverride.Companion.from(properties);
-	}
-
-	static class FormatterCallback implements Function2<LintError, Boolean, Unit> {
-		@Override
-		public Unit invoke(LintError lint, Boolean corrected) {
-			if (!corrected) {
-				throw new AssertionError("Error on line: " + lint.getLine() + ", column: " + lint.getCol() + "\nrule: " + lint.getRuleId() + "\n" + lint.getDetail());
-			}
-			return null;
-		}
 	}
 
 	@Override
 	public String applyWithFile(String unix, File file) throws Exception {
-		return KtLint.INSTANCE.format(new ExperimentalParams(
-				file.getName(),
-				unix,
-				rulesets,
-				userData,
-				formatterCallback,
-				isScript,
-				null,
-				false,
-				editorConfigOverride,
-				false));
+		return adapter.format(unix, file.getName(), isScript, useExperimental, userData, editorConfigOverrideMap);
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index f57ef1e997..6b886c2186 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -35,7 +35,9 @@ private KtLintStep() {}
 
 	private static final String DEFAULT_VERSION = "0.46.1";
 	static final String NAME = "ktlint";
+	static final String PACKAGE_PRE_0_32 = "com.github.shyiko";
 	static final String PACKAGE = "com.pinterest";
+	static final String MAVEN_COORDINATE_PRE_0_32 = PACKAGE_PRE_0_32 + ":ktlint:";
 	static final String MAVEN_COORDINATE = PACKAGE + ":ktlint:";
 
 	public static FormatterStep create(Provisioner provisioner) {
@@ -83,25 +85,34 @@ static final class State implements Serializable {
 		private final boolean useExperimental;
 		private final TreeMap<String, String> userData;
 		private final TreeMap<String, Object> editorConfigOverride;
+		private final String version;
 
 		State(String version, Provisioner provisioner, boolean isScript, boolean useExperimental,
 				Map<String, String> userData, Map<String, Object> editorConfigOverride) throws IOException {
+			this.version = version;
 
-			if (BadSemver.version(version) < BadSemver.version(0, 46, 0)) {
-				throw new IllegalStateException("KtLint versions < 0.46.0 not supported!");
+			String coordinate;
+			if (BadSemver.version(version) < BadSemver.version(0, 32)) {
+				coordinate = MAVEN_COORDINATE_PRE_0_32;
+			} else {
+				coordinate = MAVEN_COORDINATE;
+			}
+			if (BadSemver.version(version) < BadSemver.version(0, 31, 0)) {
+				throw new IllegalStateException("KtLint versions < 0.31.0 not supported!");
 			}
-
 			this.useExperimental = useExperimental;
 			this.userData = new TreeMap<>(userData);
 			this.editorConfigOverride = new TreeMap<>(editorConfigOverride);
-			this.jarState = JarState.from(MAVEN_COORDINATE + version, provisioner);
+			this.jarState = JarState.from(coordinate + version, provisioner);
 			this.isScript = isScript;
 		}
 
 		FormatterFunc createFormat() throws Exception {
-			Class<?> formatterFunc = jarState.getClassLoader().loadClass("com.diffplug.spotless.glue.ktlint.KtlintFormatterFunc");
-			Constructor<?> constructor = formatterFunc.getConstructor(boolean.class, boolean.class, Map.class, Map.class);
-			return (FormatterFunc.NeedsFile) constructor.newInstance(isScript, useExperimental, userData, editorConfigOverride);
+			final ClassLoader classLoader = jarState.getClassLoader();
+			Class<?> formatterFunc = classLoader.loadClass("com.diffplug.spotless.glue.ktlint.KtlintFormatterFunc");
+			Constructor<?> constructor = formatterFunc.getConstructor(
+					String.class, boolean.class, boolean.class, Map.class, Map.class);
+			return (FormatterFunc.NeedsFile) constructor.newInstance(version, isScript, useExperimental, userData, editorConfigOverride);
 		}
 	}
 }
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index ee1ab8bee8..f1f1fd69e1 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
+* Extend minimum supported version for `ktlint` to `0.31.0` ([#1303](https://github.com/diffplug/spotless/pull/1303)).
+
 ## [6.10.0] - 2022-08-23
 ### Added
 * `scalafmt` integration now has a configuration option `majorScalaVersion` that allows you to configure the Scala version that gets resolved from the maven artifact ([#1283](https://github.com/diffplug/spotless/pull/1283))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 3b6986c5db..f69b4a058e 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
+* Extend minimum supported version for `ktlint` to `0.31.0` ([#1303](https://github.com/diffplug/spotless/pull/1303)).
+
 ## [2.25.0] - 2022-08-23
 ### Added
 * `scalafmt` integration now has a configuration option `majorScalaVersion` that allows you to configure the Scala version that gets resolved from the maven artifact ([#1283](https://github.com/diffplug/spotless/pull/1283))
diff --git a/settings.gradle b/settings.gradle
index 83ed4aa59d..7909da6da8 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -15,6 +15,8 @@ pluginManagement {
 		id 'org.gradle.test-retry'                 version '1.4.0'
 		// https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md
 		id 'com.adarshr.test-logger'               version '3.2.0'
+		// https://github.com/davidburstrom/version-compatibility-gradle-plugin/tags
+		id 'io.github.davidburstrom.version-compatibility' version '0.1.0'
 	}
 }
 plugins {
@@ -26,6 +28,7 @@ plugins {
 	id 'com.diffplug.p2.asmaven'               apply false
 	id 'org.gradle.test-retry'                 apply false
 	id 'com.adarshr.test-logger'               apply false
+	id 'io.github.davidburstrom.version-compatibility' apply false
 }
 if (System.env['CI'] != null) {
 	// use the remote buildcache on all CI builds
diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
index d9e6042c23..96c2ab885a 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
@@ -15,6 +15,7 @@
  */
 package com.diffplug.spotless.kotlin;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.FormatterStep;
@@ -38,7 +39,74 @@ void behavior() throws Exception {
 	}
 
 	@Test
-	void worksPre0_46_1() throws Exception {
+	void worksShyiko() throws Exception {
+		FormatterStep step = KtLintStep.create("0.31.0", TestProvisioner.mavenCentral());
+		StepHarness.forStep(step)
+				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean")
+				.testResourceException("kotlin/ktlint/unsolvable.dirty", assertion -> {
+					assertion.isInstanceOf(AssertionError.class);
+					assertion.hasMessage("Error on line: 1, column: 1\n" +
+							"rule: no-wildcard-imports\n" +
+							"Wildcard import");
+				});
+	}
+
+	// Regression test to ensure it works on the version it switched to Pinterest (version 0.32.0)
+	// but before 0.34.
+	// https://github.com/diffplug/spotless/issues/419
+	@Test
+	void worksPinterestAndPre034() throws Exception {
+		FormatterStep step = KtLintStep.create("0.32.0", TestProvisioner.mavenCentral());
+		StepHarness.forStep(step)
+				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean")
+				.testResourceException("kotlin/ktlint/unsolvable.dirty", assertion -> {
+					assertion.isInstanceOf(AssertionError.class);
+					assertion.hasMessage("Error on line: 1, column: 1\n" +
+							"rule: no-wildcard-imports\n" +
+							"Wildcard import");
+				});
+	}
+
+	// Regression test to handle alpha and 1.x version numbers
+	// https://github.com/diffplug/spotless/issues/668
+	@Test
+	void worksAlpha1() throws Exception {
+		FormatterStep step = KtLintStep.create("0.38.0-alpha01", TestProvisioner.mavenCentral());
+		StepHarness.forStep(step)
+				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean");
+	}
+
+	@Test
+	void works0_44_0() throws Exception {
+		FormatterStep step = KtLintStep.create("0.44.0", TestProvisioner.mavenCentral());
+		StepHarness.forStep(step)
+				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean");
+	}
+
+	@Disabled("https://github.com/pinterest/ktlint/issues/1421")
+	@Test
+	void works0_45_0() throws Exception {
+		FormatterStep step = KtLintStep.create("0.45.0", TestProvisioner.mavenCentral());
+		StepHarness.forStep(step)
+				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean");
+	}
+
+	@Test
+	void works0_45_1() throws Exception {
+		FormatterStep step = KtLintStep.create("0.45.1", TestProvisioner.mavenCentral());
+		StepHarness.forStep(step)
+				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean");
+	}
+
+	@Test
+	void works0_45_2() throws Exception {
+		FormatterStep step = KtLintStep.create("0.45.2", TestProvisioner.mavenCentral());
+		StepHarness.forStep(step)
+				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean");
+	}
+
+	@Test
+	void works0_46_0() throws Exception {
 		FormatterStep step = KtLintStep.create("0.46.0", TestProvisioner.mavenCentral());
 		StepHarness.forStep(step)
 				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean")
@@ -53,14 +121,14 @@ void worksPre0_46_1() throws Exception {
 	@Test
 	void equality() throws Exception {
 		new SerializableEqualityTester() {
-			String version = "0.46.0";
+			String version = "0.32.0";
 
 			@Override
 			protected void setupTest(API api) {
 				// same version == same
 				api.areDifferentThan();
 				// change the version, and it's different
-				version = "0.46.1";
+				version = "0.38.0-alpha01";
 				api.areDifferentThan();
 			}
 

From 225d992fcf8fee26b7a3ca820f3fc82bc2bf064d Mon Sep 17 00:00:00 2001
From: "benjamin.gentner" <benjamin.gentner@fntsoftware.com>
Date: Fri, 2 Sep 2022 16:34:35 +0200
Subject: [PATCH 0302/2068] Fix Freshmark compatibility with JDK 15+ (fixes
 #803)

---
 .../spotless/markdown/FreshMarkStep.java         | 16 +++++++++++++++-
 .../spotless/markdown/FreshMarkStepTest.java     |  6 +-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/markdown/FreshMarkStep.java b/lib/src/main/java/com/diffplug/spotless/markdown/FreshMarkStep.java
index 2591cac7a5..fd03e95046 100644
--- a/lib/src/main/java/com/diffplug/spotless/markdown/FreshMarkStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/markdown/FreshMarkStep.java
@@ -19,6 +19,8 @@
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import java.util.NavigableMap;
 import java.util.Objects;
@@ -31,6 +33,7 @@
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
+import com.diffplug.spotless.Jvm;
 import com.diffplug.spotless.Provisioner;
 import com.diffplug.spotless.ThrowingEx.Supplier;
 
@@ -42,6 +45,10 @@ private FreshMarkStep() {}
 	private static final String DEFAULT_VERSION = "1.3.1";
 	private static final String NAME = "freshmark";
 	private static final String MAVEN_COORDINATE = "com.diffplug.freshmark:freshmark:";
+
+	private static final String NASHORN_MAVEN_COORDINATE = "org.openjdk.nashorn:nashorn-core:";
+
+	private static final String NASHORN_VERSION = "15.4";
 	private static final String FORMATTER_CLASS = "com.diffplug.freshmark.FreshMark";
 	private static final String FORMATTER_METHOD = "compile";
 
@@ -55,8 +62,15 @@ public static FormatterStep create(String version, Supplier<Map<String, ?>> prop
 		Objects.requireNonNull(version, "version");
 		Objects.requireNonNull(properties, "properties");
 		Objects.requireNonNull(provisioner, "provisioner");
+
+		List<String> mavenCoordinates = new ArrayList<>();
+		mavenCoordinates.add(MAVEN_COORDINATE + version);
+		if (Jvm.version() >= 15) {
+			mavenCoordinates.add(NASHORN_MAVEN_COORDINATE + NASHORN_VERSION);
+		}
+
 		return FormatterStep.createLazy(NAME,
-				() -> new State(JarState.from(MAVEN_COORDINATE + version, provisioner), properties.get()),
+				() -> new State(JarState.from(mavenCoordinates, provisioner), properties.get()),
 				State::createFormat);
 	}
 
diff --git a/testlib/src/test/java/com/diffplug/spotless/markdown/FreshMarkStepTest.java b/testlib/src/test/java/com/diffplug/spotless/markdown/FreshMarkStepTest.java
index 477642e247..a5fede28bc 100644
--- a/testlib/src/test/java/com/diffplug/spotless/markdown/FreshMarkStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/markdown/FreshMarkStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,20 +15,16 @@
  */
 package com.diffplug.spotless.markdown;
 
-import static org.junit.jupiter.api.condition.JRE.JAVA_14;
-
 import java.util.HashMap;
 import java.util.Map;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledForJreRange;
 
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.SerializableEqualityTester;
 import com.diffplug.spotless.StepHarness;
 import com.diffplug.spotless.TestProvisioner;
 
-@EnabledForJreRange(max = JAVA_14)
 class FreshMarkStepTest {
 	@Test
 	void behavior() throws Exception {

From 6abbc8adf4bd4644260fab7e9436619ab19e408b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 11 Sep 2022 01:37:09 +0000
Subject: [PATCH 0303/2068] Update dependency gradle to v7.5.1

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 59536 -> 60756 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 gradlew                                  |   6 ++++++
 gradlew.bat                              |  14 ++++++++------
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..249e5832f090a2944b7473328c07c9755baa3196 100755
GIT binary patch
delta 10158
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
Py&qIq5D-Lb|5*PA>zeod

delta 9041
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8049c684f0..ae04661ee7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 1b6c787337..a69d9cb6c2 100755
--- a/gradlew
+++ b/gradlew
@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/gradlew.bat b/gradlew.bat
index 107acd32c4..f127cfd49d 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

From 3dfb10e8cd78e823695dd298b7e6981d921c2b84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Burstr=C3=B6m?= <david.burstrom@gmail.com>
Date: Mon, 29 Aug 2022 13:48:05 +0200
Subject: [PATCH 0304/2068] Add support for KtLint 0.47.x

---
 CHANGES.md                                    |   1 +
 lib/build.gradle                              |   4 +
 .../compat/KtLintCompat0Dot47Dot0Adapter.java | 125 ++++++++++++++++++
 plugin-gradle/CHANGES.md                      |   1 +
 plugin-maven/CHANGES.md                       |   1 +
 .../spotless/kotlin/KtLintStepTest.java       |  26 ++++
 6 files changed, 158 insertions(+)
 create mode 100644 lib/src/compatKtLint0Dot47Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java

diff --git a/CHANGES.md b/CHANGES.md
index 01e68f430c..66679453dd 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,6 +13,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ### Changes
 * Extend minimum supported version for `ktlint` to `0.31.0` ([#1303](https://github.com/diffplug/spotless/pull/1303)).
+* Support `ktlint` version 0.47.x ([#1303](https://github.com/diffplug/spotless/pull/1303)) fixes [#1281](https://github.com/diffplug/spotless/issues/1281).
 
 ## [2.29.0] - 2022-08-23
 ### Added
diff --git a/lib/build.gradle b/lib/build.gradle
index 1a5fbf9c64..5983e4479a 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -33,6 +33,7 @@ versionCompatibility {
 				'0.34.2',
 				'0.45.2',
 				'0.46.0',
+				'0.47.0',
 			]
 			targetSourceSetName = 'ktlint'
 		}
@@ -86,6 +87,9 @@ dependencies {
 	compatKtLint0Dot46Dot0CompileOnly 'com.pinterest.ktlint:ktlint-core:0.46.0'
 	compatKtLint0Dot46Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-experimental:0.46.0'
 	compatKtLint0Dot46Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.46.0'
+	compatKtLint0Dot47Dot0CompileOnly 'com.pinterest.ktlint:ktlint-core:0.47.0'
+	compatKtLint0Dot47Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-experimental:0.47.0'
+	compatKtLint0Dot47Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.47.0'
 
 	String VER_SCALAFMT="3.5.9"
 	scalafmtCompileOnly "org.scalameta:scalafmt-core_2.13:$VER_SCALAFMT"
diff --git a/lib/src/compatKtLint0Dot47Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java b/lib/src/compatKtLint0Dot47Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java
new file mode 100644
index 0000000000..842294a5cc
--- /dev/null
+++ b/lib/src/compatKtLint0Dot47Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright 2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.glue.ktlint.compat;
+
+import static java.util.Collections.emptySet;
+
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import com.pinterest.ktlint.core.KtLint;
+import com.pinterest.ktlint.core.LintError;
+import com.pinterest.ktlint.core.Rule;
+import com.pinterest.ktlint.core.RuleProvider;
+import com.pinterest.ktlint.core.api.DefaultEditorConfigProperties;
+import com.pinterest.ktlint.core.api.EditorConfigDefaults;
+import com.pinterest.ktlint.core.api.EditorConfigOverride;
+import com.pinterest.ktlint.core.api.UsesEditorConfigProperties;
+import com.pinterest.ktlint.ruleset.experimental.ExperimentalRuleSetProvider;
+import com.pinterest.ktlint.ruleset.standard.StandardRuleSetProvider;
+
+import kotlin.Pair;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function2;
+
+public class KtLintCompat0Dot47Dot0Adapter implements KtLintCompatAdapter {
+
+	static class FormatterCallback implements Function2<LintError, Boolean, Unit> {
+		@Override
+		public Unit invoke(LintError lint, Boolean corrected) {
+			if (!corrected) {
+				KtLintCompatReporting.report(lint.getLine(), lint.getCol(), lint.getRuleId(), lint.getDetail());
+			}
+			return null;
+		}
+	}
+
+	@Override
+	public String format(final String text, final String name, final boolean isScript,
+			final boolean useExperimental,
+			final Map<String, String> userData,
+			final Map<String, Object> editorConfigOverrideMap) {
+		final FormatterCallback formatterCallback = new FormatterCallback();
+
+		Set<RuleProvider> allRuleProviders = new LinkedHashSet<>(
+				new StandardRuleSetProvider().getRuleProviders());
+		if (useExperimental) {
+			allRuleProviders.addAll(new ExperimentalRuleSetProvider().getRuleProviders());
+		}
+
+		EditorConfigOverride editorConfigOverride;
+		if (editorConfigOverrideMap.isEmpty()) {
+			editorConfigOverride = EditorConfigOverride.Companion.getEmptyEditorConfigOverride();
+		} else {
+			editorConfigOverride = createEditorConfigOverride(allRuleProviders.stream().map(
+					RuleProvider::createNewRuleInstance).collect(
+							Collectors.toList()),
+					editorConfigOverrideMap);
+		}
+
+		return KtLint.INSTANCE.format(new KtLint.ExperimentalParams(
+				name,
+				text,
+				emptySet(),
+				allRuleProviders,
+				userData,
+				formatterCallback,
+				isScript,
+				null,
+				false,
+				EditorConfigDefaults.Companion.getEmptyEditorConfigDefaults(),
+				editorConfigOverride,
+				false));
+	}
+
+	/**
+	 * Create EditorConfigOverride from user provided parameters.
+	 * Calling this method requires KtLint 0.45.2.
+	 */
+	private static EditorConfigOverride createEditorConfigOverride(final List<Rule> rules, Map<String, Object> editorConfigOverrideMap) {
+		// Get properties from rules in the rule sets
+		Stream<UsesEditorConfigProperties.EditorConfigProperty<?>> ruleProperties = rules.stream()
+				.filter(rule -> rule instanceof UsesEditorConfigProperties)
+				.flatMap(rule -> ((UsesEditorConfigProperties) rule).getEditorConfigProperties().stream());
+
+		// Create a mapping of properties to their names based on rule properties and default properties
+		Map<String, UsesEditorConfigProperties.EditorConfigProperty<?>> supportedProperties = Stream
+				.concat(ruleProperties, DefaultEditorConfigProperties.INSTANCE.getEditorConfigProperties().stream())
+				.distinct()
+				.collect(Collectors.toMap(property -> property.getType().getName(), property -> property));
+
+		// Create config properties based on provided property names and values
+		@SuppressWarnings("unchecked")
+		Pair<UsesEditorConfigProperties.EditorConfigProperty<?>, ?>[] properties = editorConfigOverrideMap.entrySet().stream()
+				.map(entry -> {
+					UsesEditorConfigProperties.EditorConfigProperty<?> property = supportedProperties.get(entry.getKey());
+					if (property != null) {
+						return new Pair<>(property, entry.getValue());
+					} else {
+						return null;
+					}
+				})
+				.filter(Objects::nonNull)
+				.toArray(Pair[]::new);
+
+		return EditorConfigOverride.Companion.from(properties);
+	}
+}
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index f1f1fd69e1..ef6a9c8988 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -6,6 +6,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ### Changes
 * Extend minimum supported version for `ktlint` to `0.31.0` ([#1303](https://github.com/diffplug/spotless/pull/1303)).
+* Support `ktlint` version 0.47.x ([#1303](https://github.com/diffplug/spotless/pull/1303)) fixes [#1281](https://github.com/diffplug/spotless/issues/1281).
 
 ## [6.10.0] - 2022-08-23
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index f69b4a058e..d6b6a51bcb 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -6,6 +6,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ### Changes
 * Extend minimum supported version for `ktlint` to `0.31.0` ([#1303](https://github.com/diffplug/spotless/pull/1303)).
+* Support `ktlint` version 0.47.x ([#1303](https://github.com/diffplug/spotless/pull/1303)) fixes [#1281](https://github.com/diffplug/spotless/issues/1281).
 
 ## [2.25.0] - 2022-08-23
 ### Added
diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
index 96c2ab885a..71a0979422 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
@@ -118,6 +118,32 @@ void works0_46_0() throws Exception {
 				});
 	}
 
+	@Test
+	void works0_47_0() throws Exception {
+		FormatterStep step = KtLintStep.create("0.47.0", TestProvisioner.mavenCentral());
+		StepHarness.forStep(step)
+				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean")
+				.testResourceException("kotlin/ktlint/unsolvable.dirty", assertion -> {
+					assertion.isInstanceOf(AssertionError.class);
+					assertion.hasMessage("Error on line: 1, column: 1\n" +
+							"rule: no-wildcard-imports\n" +
+							"Wildcard import");
+				});
+	}
+
+	@Test
+	void works0_47_1() throws Exception {
+		FormatterStep step = KtLintStep.create("0.47.1", TestProvisioner.mavenCentral());
+		StepHarness.forStep(step)
+				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean")
+				.testResourceException("kotlin/ktlint/unsolvable.dirty", assertion -> {
+					assertion.isInstanceOf(AssertionError.class);
+					assertion.hasMessage("Error on line: 1, column: 1\n" +
+							"rule: no-wildcard-imports\n" +
+							"Wildcard import");
+				});
+	}
+
 	@Test
 	void equality() throws Exception {
 		new SerializableEqualityTester() {

From e63edb9e1b46e488e78468d700b1b48a193a9d79 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 13 Sep 2022 18:34:26 +0000
Subject: [PATCH 0305/2068] Update plugin com.github.spotbugs to v5.0.12

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 83ed4aa59d..af76e2f368 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
 		// https://github.com/gradle-nexus/publish-plugin/releases
 		id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
 		// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
-		id 'com.github.spotbugs'                   version '5.0.10'
+		id 'com.github.spotbugs'                   version '5.0.12'
 		// https://github.com/diffplug/spotless-changelog
 		id 'com.diffplug.spotless-changelog'       version '2.3.2'
 		// https://github.com/diffplug/goomph/blob/main/CHANGES.md

From 164b95fda2b9158676ac5b243037ee8ea79f77b4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 13 Sep 2022 18:34:30 +0000
Subject: [PATCH 0306/2068] Update plugin org.gradle.test-retry to v1.4.1

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 83ed4aa59d..40769b1f4d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,7 +12,7 @@ pluginManagement {
 		// https://github.com/diffplug/goomph/blob/main/CHANGES.md
 		id 'com.diffplug.p2.asmaven'               version '3.27.0' // DO NOT UPDATE, see https://github.com/diffplug/spotless/pull/874
 		// https://github.com/gradle/test-retry-gradle-plugin/releases
-		id 'org.gradle.test-retry'                 version '1.4.0'
+		id 'org.gradle.test-retry'                 version '1.4.1'
 		// https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md
 		id 'com.adarshr.test-logger'               version '3.2.0'
 	}

From ef219c09a1d3a9119d393c9cd383892086aef83a Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 13 Sep 2022 17:10:27 -0700
Subject: [PATCH 0307/2068] Remove workarounds to #834 because they are no
 longer needed thanks to #1224 and #1228.

---
 plugin-gradle/README.md | 30 ------------------------------
 plugin-maven/README.md  | 22 ----------------------
 2 files changed, 52 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index c1a41c2ef0..dc49c21a88 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -197,21 +197,6 @@ spotless {
     formatAnnotations()
 ```
 
-**⚠️ Note on using Google Java Format with Java 16+**
-
-Using Java 16+ with Google Java Format 1.10.0 [requires additional flags](https://github.com/google/google-java-format/releases/tag/v1.10.0) to the running JDK.
-These Flags can be provided using the `gradle.properties` file (See [documentation](https://docs.gradle.org/current/userguide/build_environment.html)).
-
-For example the following file under `gradle.properties` will run gradle with the required flags:
-```
-org.gradle.jvmargs=--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
-  --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
-  --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
-  --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
-  --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
-```
-This is a workaround to a [pending issue](https://github.com/diffplug/spotless/issues/834).
-
 ### palantir-java-format
 
 [homepage](https://github.com/palantir/palantir-java-format). [changelog](https://github.com/palantir/palantir-java-format/releases).
@@ -225,21 +210,6 @@ spotless {
     formatAnnotations()
 ```
 
-**⚠️ Note on using Palantir Java Format with Java 16+**
-
-Using Java 16+ with Palantir Java Format [requires additional flags](https://github.com/google/google-java-format/releases/tag/v1.10.0) on the running JDK.
-These Flags can be provided using the `gradle.properties` file (See [documentation](https://docs.gradle.org/current/userguide/build_environment.html)).
-
-For example the following file under `gradle.properties` will run gradle with the required flags:
-```
-org.gradle.jvmargs=--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
-  --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
-  --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
-  --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
-  --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
-```
-This is a workaround to a [pending issue](https://github.com/diffplug/spotless/issues/834).
-
 ### eclipse jdt
 
 [homepage](https://www.eclipse.org/downloads/packages/). [compatible versions](https://github.com/diffplug/spotless/tree/main/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter). See [here](../ECLIPSE_SCREENSHOTS.md) for screenshots that demonstrate how to get and install the config file mentioned below.
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 3a112cd3b1..93175b9ed8 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -214,17 +214,6 @@ any other maven phase (i.e. compile) then it can be configured as below;
 </googleJavaFormat>
 ```
 
-**⚠️ Note on using Google Java Format with Java 16+**
-
-Using Java 16+ with Google Java Format 1.10.0 [requires additional flags](https://github.com/google/google-java-format/releases/tag/v1.10.0) to the running JDK.
-These Flags can be provided using `MAVEN_OPTS` environment variable or using the `./mvn/jvm.config` file (See [documentation](https://maven.apache.org/configure.html#mvn-jvm-config-file)).
-
-For example the following file under `.mvn/jvm.config` will run maven with the required flags:
-```
---add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
-```
-This is a workaround to a [pending issue](https://github.com/diffplug/spotless/issues/834).
-
 ### palantir-java-format
 
 [homepage](https://github.com/palantir/palantir-java-format). [changelog](https://github.com/palantir/palantir-java-format/releases). [code](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/PalantirJavaFormat.java).
@@ -235,17 +224,6 @@ This is a workaround to a [pending issue](https://github.com/diffplug/spotless/i
 </palantirJavaFormat>
 ```
 
-**⚠️ Note on using Palantir Java Format with Java 16+**
-
-Using Java 16+ with Palantir Java Format [requires additional flags](https://github.com/google/google-java-format/releases/tag/v1.10.0) on the running JDK.
-These Flags can be provided using `MAVEN_OPTS` environment variable or using the `./mvn/jvm.config` file (See [documentation](https://maven.apache.org/configure.html#mvn-jvm-config-file)).
-
-For example the following file under `.mvn/jvm.config` will run maven with the required flags:
-```
---add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
-```
-This is a workaround to a [pending issue](https://github.com/diffplug/spotless/issues/834).
-
 ### eclipse jdt
 
 [homepage](https://www.eclipse.org/downloads/packages/). [compatible versions](https://github.com/diffplug/spotless/tree/main/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter). [code](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Eclipse.java). See [here](../ECLIPSE_SCREENSHOTS.md) for screenshots that demonstrate how to get and install the config file mentioned below.

From 61d362bf03f7e8e47d5fccf8602ddef253c9a314 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 13 Sep 2022 17:14:06 -0700
Subject: [PATCH 0308/2068] Keep the step-specific sections specific to their
 section.

---
 plugin-gradle/README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index dc49c21a88..f5b7bbf1cc 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -193,8 +193,6 @@ spotless {
     //   and/or reflow long strings (requires at least 1.8)
     //   and/or use custom group artifact (you probably don't need this)
     googleJavaFormat('1.8').aosp().reflowLongStrings().groupArtifact('com.google.googlejavaformat:google-java-format')
-    // optional: fix formatting of type annotations
-    formatAnnotations()
 ```
 
 ### palantir-java-format
@@ -206,8 +204,6 @@ spotless {
     palantirJavaFormat()
     // optional: you can specify a specific version
     palantirJavaFormat('2.9.0')
-    // optional: fix formatting of type annotations
-    formatAnnotations()
 ```
 
 ### eclipse jdt

From 7a434ce732b50927a5690bb9b3e822407a462fa1 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 13 Sep 2022 17:15:51 -0700
Subject: [PATCH 0309/2068] Fix TOC entry to match the new formatAnnotations
 name.

---
 plugin-gradle/README.md | 4 ++--
 plugin-maven/README.md  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index f5b7bbf1cc..a6d05daa9d 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -60,7 +60,7 @@ Spotless supports all of Gradle's built-in performance features (incremental bui
 - [**Quickstart**](#quickstart)
   - [Requirements](#requirements)
 - **Languages**
-  - [Java](#java) ([google-java-format](#google-java-format), [eclipse jdt](#eclipse-jdt), [clang-format](#clang-format), [prettier](#prettier), [palantir-java-format](#palantir-java-format), [type annotations](#type-annotations))
+  - [Java](#java) ([google-java-format](#google-java-format), [eclipse jdt](#eclipse-jdt), [clang-format](#clang-format), [prettier](#prettier), [palantir-java-format](#palantir-java-format), [formatAnnotations](#formatAnnotations))
   - [Groovy](#groovy) ([eclipse groovy](#eclipse-groovy))
   - [Kotlin](#kotlin) ([ktfmt](#ktfmt), [ktlint](#ktlint), [diktat](#diktat), [prettier](#prettier))
   - [Scala](#scala) ([scalafmt](#scalafmt))
@@ -219,7 +219,7 @@ spotless {
 ```
 
 
-### Type annotations
+### formatAnnotations
 
 Type annotations should be on the same line as the type that they qualify.
 
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 93175b9ed8..d80773f3f1 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -47,7 +47,7 @@ user@machine repo % mvn spotless:check
   - [Requirements](#requirements)
   - [Binding to maven phase](#binding-to-maven-phase)
 - **Languages**
-  - [Java](#java) ([google-java-format](#google-java-format), [eclipse jdt](#eclipse-jdt), [prettier](#prettier), [palantir-java-format](#palantir-java-format), [type annotations](#type-annotations))
+  - [Java](#java) ([google-java-format](#google-java-format), [eclipse jdt](#eclipse-jdt), [prettier](#prettier), [palantir-java-format](#palantir-java-format), [formatAnnotations](#formatAnnotations))
   - [Groovy](#groovy) ([eclipse groovy](#eclipse-groovy))
   - [Kotlin](#kotlin) ([ktfmt](#ktfmt), [ktlint](#ktlint), [diktat](#diktat), [prettier](#prettier))
   - [Scala](#scala) ([scalafmt](#scalafmt))
@@ -235,7 +235,7 @@ any other maven phase (i.e. compile) then it can be configured as below;
 </eclipse>
 ```
 
-### Type annotations
+### formatAnnotations
 
 Type annotations should be on the same line as the type that they qualify.
 
@@ -255,7 +255,7 @@ However, some tools format them incorrectly, like this:
   String s;
 ```
 
-To fix the incorrect formatting, add the `formatAnnotations()` rule after a Java formatter.  For example:
+To fix the incorrect formatting, add the `formatAnnotations` rule after a Java formatter.  For example:
 
 ```XML
 <googleJavaFormat />

From 78cd2ef7448260c6640b8acc3ac158ed73b7f50c Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 13 Sep 2022 17:17:16 -0700
Subject: [PATCH 0310/2068] Minor tweak to changelog.

---
 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 cec949f59d..f61bebaa50 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,7 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* `formatAnnotations()` step to correct formatting of type annotations.  It puts type annotations on the same line as the type that they qualify.  Run it after a Java formatting step, such as `googleJavaFormat()`. ([#1275](https://github.com/diffplug/spotless/pull/1275))
+* `formatAnnotations()` step to correct formatting of Java type annotations.  It puts type annotations on the same line as the type that they qualify.  Run it after a Java formatting step, such as `googleJavaFormat()`. ([#1275](https://github.com/diffplug/spotless/pull/1275))
 
 ## [2.29.0] - 2022-08-23
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 0efb87334d..5003de1aba 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -4,7 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* `formatAnnotations()` step to correct formatting of type annotations.  It puts type annotations on the same line as the type that they qualify.  Run it after a Java formatting step, such as `googleJavaFormat()`. ([#1275](https://github.com/diffplug/spotless/pull/1275))
+* `formatAnnotations()` step to correct formatting of Java type annotations.  It puts type annotations on the same line as the type that they qualify.  Run it after a Java formatting step, such as `googleJavaFormat()`. ([#1275](https://github.com/diffplug/spotless/pull/1275))
 
 ## [6.10.0] - 2022-08-23
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 30842b1b06..fd371233f2 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -4,7 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* `formatAnnotations` step to correct formatting of type annotations.  It puts type annotations on the same line as the type that they qualify.  Run it after a Java formatting step, such as `googleJavaFormat`. ([#1275](https://github.com/diffplug/spotless/pull/1275))
+* `formatAnnotations` step to correct formatting of Java type annotations.  It puts type annotations on the same line as the type that they qualify.  Run it after a Java formatting step, such as `googleJavaFormat`. ([#1275](https://github.com/diffplug/spotless/pull/1275))
 
 ## [2.25.0] - 2022-08-23
 ### Added

From b3212da39b9a8ccb1c80aba9ebeab5164c8b7fdf Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 14 Sep 2022 02:19:01 +0000
Subject: [PATCH 0311/2068] Update dependency org.junit.jupiter:junit-jupiter
 to v5.9.0

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index e0d2bd2911..87f667956f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -26,7 +26,7 @@ VER_SLF4J=[1.6,2.0[
 # Used in multiple places
 VER_DURIAN=1.2.0
 VER_JGIT=5.13.1.202206130422-r
-VER_JUNIT=5.8.0
+VER_JUNIT=5.9.0
 VER_ASSERTJ=3.15.0
 VER_MOCKITO=3.3.3
 

From 90c802de6b306b563f3d61412e3ae59022c82b80 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 14 Sep 2022 04:43:01 +0000
Subject: [PATCH 0312/2068] Update dependency com.facebook:ktfmt to v0.40

---
 lib/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index fae8b5b875..3988a03bef 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -37,7 +37,7 @@ dependencies {
 
 	palantirJavaFormatCompileOnly 'com.palantir.javaformat:palantir-java-format:1.1.0'
 
-	String VER_KTFMT = '0.39'
+	String VER_KTFMT = '0.40'
 	ktfmtCompileOnly "com.facebook:ktfmt:$VER_KTFMT"
 	String VER_KTLINT_GOOGLE_JAVA_FORMAT = '1.7' // for JDK 8 compatibility
 	ktfmtCompileOnly("com.google.googlejavaformat:google-java-format") {

From b5c5cb11b76dd389b7dc0761dd7982517202ad7b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 14 Sep 2022 04:43:23 +0000
Subject: [PATCH 0313/2068] Update dependency org.assertj:assertj-core to
 v3.23.1

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 87f667956f..a9808ceb00 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -27,7 +27,7 @@ VER_SLF4J=[1.6,2.0[
 VER_DURIAN=1.2.0
 VER_JGIT=5.13.1.202206130422-r
 VER_JUNIT=5.9.0
-VER_ASSERTJ=3.15.0
+VER_ASSERTJ=3.23.1
 VER_MOCKITO=3.3.3
 
 # Used for Maven Plugin

From b722fc9a258863f003fd72b998c3f138f639e793 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 13 Sep 2022 21:48:28 -0700
Subject: [PATCH 0314/2068] Update changelogs.

---
 CHANGES.md               | 2 ++
 plugin-gradle/CHANGES.md | 2 ++
 plugin-maven/CHANGES.md  | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index f61bebaa50..df7f0380b5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * `formatAnnotations()` step to correct formatting of Java type annotations.  It puts type annotations on the same line as the type that they qualify.  Run it after a Java formatting step, such as `googleJavaFormat()`. ([#1275](https://github.com/diffplug/spotless/pull/1275))
+### Changes
+* Bump default `ktfmt` version to latest `0.39` -> `0.40` ([#1312](https://github.com/diffplug/spotless/pull/1312))
 
 ## [2.29.0] - 2022-08-23
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 5003de1aba..aed5f04ec5 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,6 +5,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * `formatAnnotations()` step to correct formatting of Java type annotations.  It puts type annotations on the same line as the type that they qualify.  Run it after a Java formatting step, such as `googleJavaFormat()`. ([#1275](https://github.com/diffplug/spotless/pull/1275))
+### Changes
+* Bump default `ktfmt` version to latest `0.39` -> `0.40` ([#1312](https://github.com/diffplug/spotless/pull/1312))
 
 ## [6.10.0] - 2022-08-23
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index fd371233f2..aa54842d27 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,6 +5,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * `formatAnnotations` step to correct formatting of Java type annotations.  It puts type annotations on the same line as the type that they qualify.  Run it after a Java formatting step, such as `googleJavaFormat`. ([#1275](https://github.com/diffplug/spotless/pull/1275))
+### Changes
+* Bump default `ktfmt` version to latest `0.39` -> `0.40` ([#1312](https://github.com/diffplug/spotless/pull/1312))
 
 ## [2.25.0] - 2022-08-23
 ### Added

From f2e2f71979efade036dbec53d27d66fcd00e3264 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 13 Sep 2022 21:48:39 -0700
Subject: [PATCH 0315/2068] Udpate KtFmtStep to the new latest version.

---
 lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
index 37bbf786c6..9e52bd0435 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
@@ -39,7 +39,7 @@ public class KtfmtStep {
 	// prevent direct instantiation
 	private KtfmtStep() {}
 
-	private static final String DEFAULT_VERSION = "0.39";
+	private static final String DEFAULT_VERSION = "0.40";
 	static final String NAME = "ktfmt";
 	static final String PACKAGE = "com.facebook";
 	static final String MAVEN_COORDINATE = PACKAGE + ":ktfmt:";

From 6e481449c4ed8f552846f1356f8422a5c1518fab Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 14 Sep 2022 05:02:53 +0000
Subject: [PATCH 0316/2068] Update dependency org.mockito:mockito-core to
 v3.12.4

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index a9808ceb00..8c0e3015b4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -28,7 +28,7 @@ VER_DURIAN=1.2.0
 VER_JGIT=5.13.1.202206130422-r
 VER_JUNIT=5.9.0
 VER_ASSERTJ=3.23.1
-VER_MOCKITO=3.3.3
+VER_MOCKITO=3.12.4
 
 # Used for Maven Plugin
 VER_MAVEN_API=3.0

From 9ec6f63323bb351483fffdea346a8504146cb071 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 13 Sep 2022 22:15:13 -0700
Subject: [PATCH 0317/2068] Add comments for what the differences are in each
 version of the adapter function.

---
 .../spotless/glue/ktlint/KtlintFormatterFunc.java    | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
index 96ad244593..cc64eb9d66 100644
--- a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
+++ b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
@@ -41,17 +41,23 @@ public class KtlintFormatterFunc implements FormatterFunc.NeedsFile {
 	public KtlintFormatterFunc(String version, boolean isScript, boolean useExperimental, Map<String, String> userData,
 			Map<String, Object> editorConfigOverrideMap) {
 		int minorVersion = Integer.parseInt(version.split("\\.")[1]);
-		if (version.equals("0.45.2")) {
-			this.adapter = new KtLintCompat0Dot45Dot2Adapter();
-		} else if (minorVersion >= 47) {
+		if (minorVersion >= 47) {
+			// rename RuleSet to RuleProvider
 			this.adapter = new KtLintCompat0Dot47Dot0Adapter();
 		} else if (minorVersion >= 46) {
+			// DefaultEditorConfigProperties.INSTANCE.getDefaultEditorConfigProperties() renamed to .getEditorConfigProperties()
 			this.adapter = new KtLintCompat0Dot46Dot0Adapter();
+		} else if (version.equals("0.45.2")) {
+			// add editorConfigOverride
+			this.adapter = new KtLintCompat0Dot45Dot2Adapter();
 		} else if (minorVersion >= 34) {
+			// KtLint.INSTANCE.format() now needs more parameters
 			this.adapter = new KtLintCompat0Dot34Dot2Adapter();
 		} else if (minorVersion >= 32) {
+			// rename packages from `com.github.shyiko` to `com.pinterest`
 			this.adapter = new KtLintCompat0Dot32Dot0Adapter();
 		} else {
+			// the OG
 			this.adapter = new KtLintCompat0Dot31Dot0Adapter();
 		}
 		this.useExperimental = useExperimental;

From 864eb7a8fa2ec80728d7f8c6a6cc8ce6575c137e Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 13 Sep 2022 22:19:18 -0700
Subject: [PATCH 0318/2068] Bump ktlint default version from `0.46.1` to
 `0.47.1`

---
 lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index 6b886c2186..5627913e4a 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -33,7 +33,7 @@ public class KtLintStep {
 	// prevent direct instantiation
 	private KtLintStep() {}
 
-	private static final String DEFAULT_VERSION = "0.46.1";
+	private static final String DEFAULT_VERSION = "0.47.1";
 	static final String NAME = "ktlint";
 	static final String PACKAGE_PRE_0_32 = "com.github.shyiko";
 	static final String PACKAGE = "com.pinterest";

From d80f076f1119153dc5865652eb6684fe101d5077 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 13 Sep 2022 22:22:04 -0700
Subject: [PATCH 0319/2068] Resolve changelog merge.

---
 CHANGES.md               | 6 ++----
 plugin-gradle/CHANGES.md | 6 ++----
 plugin-maven/CHANGES.md  | 6 ++----
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 4242daf40f..d845cc0b99 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -14,10 +14,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * `formatAnnotations()` step to correct formatting of Java type annotations.  It puts type annotations on the same line as the type that they qualify.  Run it after a Java formatting step, such as `googleJavaFormat()`. ([#1275](https://github.com/diffplug/spotless/pull/1275))
 ### Changes
 * Bump default `ktfmt` version to latest `0.39` -> `0.40` ([#1312](https://github.com/diffplug/spotless/pull/1312))
-
-### Changes
-* Extend minimum supported version for `ktlint` to `0.31.0` ([#1303](https://github.com/diffplug/spotless/pull/1303)).
-* Support `ktlint` version 0.47.x ([#1303](https://github.com/diffplug/spotless/pull/1303)) fixes [#1281](https://github.com/diffplug/spotless/issues/1281).
+* Bump default `ktlint` version to latest `0.46.1` -> `0.47.1` ([#1303](https://github.com/diffplug/spotless/pull/1303))
+  * Also restored support for older versions of ktlint back to `0.31.0`
 
 ## [2.29.0] - 2022-08-23
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 0a2f400635..78a9b46693 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -7,10 +7,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * `formatAnnotations()` step to correct formatting of Java type annotations.  It puts type annotations on the same line as the type that they qualify.  Run it after a Java formatting step, such as `googleJavaFormat()`. ([#1275](https://github.com/diffplug/spotless/pull/1275))
 ### Changes
 * Bump default `ktfmt` version to latest `0.39` -> `0.40` ([#1312](https://github.com/diffplug/spotless/pull/1312))
-
-### Changes
-* Extend minimum supported version for `ktlint` to `0.31.0` ([#1303](https://github.com/diffplug/spotless/pull/1303)).
-* Support `ktlint` version 0.47.x ([#1303](https://github.com/diffplug/spotless/pull/1303)) fixes [#1281](https://github.com/diffplug/spotless/issues/1281).
+* Bump default `ktlint` version to latest `0.46.1` -> `0.47.1` ([#1303](https://github.com/diffplug/spotless/pull/1303))
+  * Also restored support for older versions of ktlint back to `0.31.0`
 
 ## [6.10.0] - 2022-08-23
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 6536aa074a..5d47dc4f4f 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -7,10 +7,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * `formatAnnotations` step to correct formatting of Java type annotations.  It puts type annotations on the same line as the type that they qualify.  Run it after a Java formatting step, such as `googleJavaFormat`. ([#1275](https://github.com/diffplug/spotless/pull/1275))
 ### Changes
 * Bump default `ktfmt` version to latest `0.39` -> `0.40` ([#1312](https://github.com/diffplug/spotless/pull/1312))
-
-### Changes
-* Extend minimum supported version for `ktlint` to `0.31.0` ([#1303](https://github.com/diffplug/spotless/pull/1303)).
-* Support `ktlint` version 0.47.x ([#1303](https://github.com/diffplug/spotless/pull/1303)) fixes [#1281](https://github.com/diffplug/spotless/issues/1281).
+* Bump default `ktlint` version to latest `0.46.1` -> `0.47.1` ([#1303](https://github.com/diffplug/spotless/pull/1303))
+  * Also restored support for older versions of ktlint back to `0.31.0`
 
 ## [2.25.0] - 2022-08-23
 ### Added

From 670c0ab54b97c0208df43dc5093c8c11c3e68aba Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 14 Sep 2022 05:24:21 +0000
Subject: [PATCH 0320/2068] Update dependency org.eclipse.aether:aether-api to
 v0.9.1.v20140329

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 8c0e3015b4..09d152d886 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -32,6 +32,6 @@ VER_MOCKITO=3.12.4
 
 # Used for Maven Plugin
 VER_MAVEN_API=3.0
-VER_ECLIPSE_AETHER=0.9.0.M2
+VER_ECLIPSE_AETHER=0.9.1.v20140329
 VER_MUSTACHE=0.9.10
 VER_PLEXUS_RESOURCES=1.2.0

From f634a23b88a0271da4fab9de840c86c86592eea9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 14 Sep 2022 05:46:52 +0000
Subject: [PATCH 0321/2068] Update dependency
 com.github.spotbugs:spotbugs-annotations to v4.7.2

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 09d152d886..9b90d05ee8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,7 +17,7 @@ artifactIdGradle=spotless-plugin-gradle
 
 # Build requirements
 VER_JAVA=1.8
-VER_SPOTBUGS=4.5.0
+VER_SPOTBUGS=4.7.2
 VER_JSR_305=3.0.2
 
 # Dependencies provided by Spotless plugin

From 58a50f648168979fb2478db9b2781ac1764550b3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 14 Sep 2022 05:47:06 +0000
Subject: [PATCH 0322/2068] Update plugin com.diffplug.spotless-changelog to
 v2.4.0

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 1706b5fa7f..8e9c3a2d35 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -8,7 +8,7 @@ pluginManagement {
 		// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
 		id 'com.github.spotbugs'                   version '5.0.12'
 		// https://github.com/diffplug/spotless-changelog
-		id 'com.diffplug.spotless-changelog'       version '2.3.2'
+		id 'com.diffplug.spotless-changelog'       version '2.4.0'
 		// https://github.com/diffplug/goomph/blob/main/CHANGES.md
 		id 'com.diffplug.p2.asmaven'               version '3.27.0' // DO NOT UPDATE, see https://github.com/diffplug/spotless/pull/874
 		// https://github.com/gradle/test-retry-gradle-plugin/releases

From 6cee33d6f035b462be5800c154d86ecad63cdd57 Mon Sep 17 00:00:00 2001
From: circleci <circleci@f8ea76c207fb>
Date: Wed, 14 Sep 2022 05:54:42 +0000
Subject: [PATCH 0323/2068] Published lib/2.30.0

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index d845cc0b99..23c20dc957 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.30.0] - 2022-09-14
 ### Added
 * `formatAnnotations()` step to correct formatting of Java type annotations.  It puts type annotations on the same line as the type that they qualify.  Run it after a Java formatting step, such as `googleJavaFormat()`. ([#1275](https://github.com/diffplug/spotless/pull/1275))
 ### Changes

From 36e5cc6d61a8b728cf21e5b42b03fccdc66a872e Mon Sep 17 00:00:00 2001
From: circleci <circleci@f8ea76c207fb>
Date: Wed, 14 Sep 2022 05:56:03 +0000
Subject: [PATCH 0324/2068] Published gradle/6.11.0

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 46 ++++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 78a9b46693..f7c15244d5 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [6.11.0] - 2022-09-14
 ### Added
 * `formatAnnotations()` step to correct formatting of Java type annotations.  It puts type annotations on the same line as the type that they qualify.  Run it after a Java formatting step, such as `googleJavaFormat()`. ([#1275](https://github.com/diffplug/spotless/pull/1275))
 ### Changes
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index a6d05daa9d..29e748295e 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -18,9 +18,9 @@ output = [
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
 [![Maven central](https://img.shields.io/badge/mavencentral-yes-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/index.html)
 [![License Apache](https://img.shields.io/badge/license-apache-blue.svg)](https://tldrlegal.com/license/apache-license-2.0-(apache-2.0))
-[![Changelog](https://img.shields.io/badge/changelog-6.10.0-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-6.11.0-blue.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)
@@ -128,10 +128,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -143,7 +143,7 @@ If you're stuck on an older version of Gradle, `id 'com.diffplug.gradle.spotless
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -267,8 +267,8 @@ You can make a pull request to add new annotations to Spotless's default list.
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -319,8 +319,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -383,7 +383,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -415,7 +415,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -447,7 +447,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -481,7 +481,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -502,7 +502,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -527,7 +527,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -567,7 +567,7 @@ sql.formatter.indent.size=4
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -610,7 +610,7 @@ For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#n
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -835,7 +835,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -902,9 +902,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -937,11 +937,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.10.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From 0b186ab5217a53bf33f047dc00952cb0889e9121 Mon Sep 17 00:00:00 2001
From: circleci <circleci@f8ea76c207fb>
Date: Wed, 14 Sep 2022 05:57:45 +0000
Subject: [PATCH 0325/2068] Published maven/2.26.0

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 5d47dc4f4f..1ce37116a1 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.26.0] - 2022-09-14
 ### Added
 * `formatAnnotations` step to correct formatting of Java type annotations.  It puts type annotations on the same line as the type that they qualify.  Run it after a Java formatting step, such as `googleJavaFormat`. ([#1275](https://github.com/diffplug/spotless/pull/1275))
 ### Changes
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index d80773f3f1..19796770ef 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -12,8 +12,8 @@ output = [
   ].join('\n');
 -->
 [![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.25.0/index.html)
-[![Changelog](https://img.shields.io/badge/changelog-2.25.0-brightgreen.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.26.0/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.26.0-brightgreen.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)

From cdf7c015ad6f5ebb5b7efbc2b9d75f1e3dfbced4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 14 Sep 2022 11:09:59 +0000
Subject: [PATCH 0326/2068] Update plugin com.diffplug.spotless to v6.11.0

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 91de4f9e48..fb37734f5f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,6 @@
 pluginManagement {
 	plugins {
-		id 'com.diffplug.spotless'                 version '6.5.0'
+		id 'com.diffplug.spotless'                 version '6.11.0'
 		// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
 		id 'com.gradle.plugin-publish'             version '1.0.0'
 		// https://github.com/gradle-nexus/publish-plugin/releases

From 556bb22349d3328c1824431d27798b815a92dfa4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 15 Sep 2022 21:10:36 +0000
Subject: [PATCH 0327/2068] Update dependency org.eclipse.aether:aether-api to
 v1

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 9b90d05ee8..d37961f958 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -32,6 +32,6 @@ VER_MOCKITO=3.12.4
 
 # Used for Maven Plugin
 VER_MAVEN_API=3.0
-VER_ECLIPSE_AETHER=0.9.1.v20140329
+VER_ECLIPSE_AETHER=1.1.0
 VER_MUSTACHE=0.9.10
 VER_PLEXUS_RESOURCES=1.2.0

From 80111ddeb4e5f877dccf6ba9fcd2ca67d89ea600 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 16 Sep 2022 00:10:49 +0000
Subject: [PATCH 0328/2068] Update dependency org.mockito:mockito-core to v4

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 9b90d05ee8..4ac4b94fa5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -28,7 +28,7 @@ VER_DURIAN=1.2.0
 VER_JGIT=5.13.1.202206130422-r
 VER_JUNIT=5.9.0
 VER_ASSERTJ=3.23.1
-VER_MOCKITO=3.12.4
+VER_MOCKITO=4.8.0
 
 # Used for Maven Plugin
 VER_MAVEN_API=3.0

From f87bd70b6cd34392898da055f3d7507491b36368 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 16 Sep 2022 00:10:56 +0000
Subject: [PATCH 0329/2068] Update win orb to v5

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a5ca735442..83e434bcec 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,6 +1,6 @@
 version: 2.1
 orbs:
-  win: circleci/windows@2.4.1
+  win: circleci/windows@5.0.0
 
 anchors:
   env_gradle: &env_gradle

From 57788b87e745f9b1f01682aaa36565faada5e6c1 Mon Sep 17 00:00:00 2001
From: Tormod Alf Try Tufteland <moddad@gmail.com>
Date: Fri, 16 Sep 2022 15:33:48 +0200
Subject: [PATCH 0330/2068] feat: ktlint editorConfigOverrides for plugin-maven

---
 plugin-maven/README.md                             |  4 ++++
 .../com/diffplug/spotless/maven/kotlin/Ktlint.java | 14 +++++++++++++-
 .../diffplug/spotless/maven/kotlin/KtlintTest.java | 10 ++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 19796770ef..a6a8491784 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -359,6 +359,10 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 ```xml
 <ktlint>
   <version>0.43.2</version> <!-- optional -->
+  <editorConfigOverride> <!-- optional -->
+    <ij_kotlin_allow_trailing_comma>true</ij_kotlin_allow_trailing_comma>
+    <ij_kotlin_allow_trailing_comma_on_call_site>true</ij_kotlin_allow_trailing_comma_on_call_site>
+  </editorConfigOverride>
 </ktlint>
 ```
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
index 796523d315..5792ee0611 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
@@ -22,14 +22,26 @@
 import com.diffplug.spotless.maven.FormatterStepConfig;
 import com.diffplug.spotless.maven.FormatterStepFactory;
 
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
 public class Ktlint implements FormatterStepFactory {
 
 	@Parameter
 	private String version;
 
+	@Parameter
+	private Map<String, Object> editorConfigOverride;
+
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig config) {
 		String ktlintVersion = version != null ? version : KtLintStep.defaultVersion();
-		return KtLintStep.create(ktlintVersion, config.getProvisioner());
+
+		if (editorConfigOverride == null) {
+			editorConfigOverride = new HashMap<>();
+		}
+
+		return KtLintStep.create(ktlintVersion, config.getProvisioner(), false, Collections.emptyMap(), editorConfigOverride);
 	}
 }
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
index 887f7a3f50..ba6f1d8e2c 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
@@ -29,4 +29,14 @@ void testKtlint() throws Exception {
 		mavenRunner().withArguments("spotless:apply").runNoError();
 		assertFile(path).sameAsResource("kotlin/ktlint/basic.clean");
 	}
+
+	@Test
+	void testKtlintEditorConfigOverride() throws Exception {
+		writePomWithKotlinSteps("<ktlint><editorConfigOverride><ij_kotlin_allow_trailing_comma>true</ij_kotlin_allow_trailing_comma><ij_kotlin_allow_trailing_comma_on_call_site>true</ij_kotlin_allow_trailing_comma_on_call_site></editorConfigOverride></ktlint>");
+
+		String path = "src/main/kotlin/Main.kt";
+		setFile(path).toResource("kotlin/ktlint/experimentalEditorConfigOverride.dirty");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile(path).sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.clean");
+	}
 }

From e4f1fc92a1c280c6b370530e6f64a69b8daa8296 Mon Sep 17 00:00:00 2001
From: Tormod Alf Try Tufteland <moddad@gmail.com>
Date: Fri, 16 Sep 2022 16:43:53 +0200
Subject: [PATCH 0331/2068] doc: add changes

---
 CHANGES.md              | 2 ++
 plugin-maven/CHANGES.md | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 23c20dc957..b0117a4bd5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* Support for `editorConfigOverride` in `ktlint`, `plugin-maven`. ([#1335](https://github.com/diffplug/spotless/pull/1335) fixes [#1334](https://github.com/diffplug/spotless/issues/1334))
 
 ## [2.30.0] - 2022-09-14
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 1ce37116a1..6046e7aed1 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* Support for `editorConfigOverride` in `ktlint`, `plugin-maven`. ([#1335](https://github.com/diffplug/spotless/pull/1335) fixes [#1334](https://github.com/diffplug/spotless/issues/1334))
 
 ## [2.26.0] - 2022-09-14
 ### Added

From 96803ae88ff4d0d4de554dc4a5f00fb1d4b47cdf Mon Sep 17 00:00:00 2001
From: Tormod Alf Try Tufteland <moddad@gmail.com>
Date: Sat, 17 Sep 2022 10:57:17 +0200
Subject: [PATCH 0332/2068] fix: linting

---
 .../com/diffplug/spotless/maven/kotlin/Ktlint.java     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
index 5792ee0611..45bda05065 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,10 @@
  */
 package com.diffplug.spotless.maven.kotlin;
 
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.maven.plugins.annotations.Parameter;
 
 import com.diffplug.spotless.FormatterStep;
@@ -22,10 +26,6 @@
 import com.diffplug.spotless.maven.FormatterStepConfig;
 import com.diffplug.spotless.maven.FormatterStepFactory;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
 public class Ktlint implements FormatterStepFactory {
 
 	@Parameter

From 59c166a369e77867d28b453b94787111f36a96a7 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 19 Sep 2022 13:02:20 -0700
Subject: [PATCH 0333/2068] Only changes are in plugin-maven, so that's the
 only changelog that should change.

---
 CHANGES.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index b0117a4bd5..23c20dc957 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,8 +10,6 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
-### Added
-* Support for `editorConfigOverride` in `ktlint`, `plugin-maven`. ([#1335](https://github.com/diffplug/spotless/pull/1335) fixes [#1334](https://github.com/diffplug/spotless/issues/1334))
 
 ## [2.30.0] - 2022-09-14
 ### Added

From de9bb1f757bf2502551cd98dd8f371abf2d1a3fb Mon Sep 17 00:00:00 2001
From: circleci <circleci@571d3f0e6d07>
Date: Mon, 19 Sep 2022 20:09:52 +0000
Subject: [PATCH 0334/2068] Published maven/2.27.0

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 6046e7aed1..6c3ff896a9 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.27.0] - 2022-09-19
 ### Added
 * Support for `editorConfigOverride` in `ktlint`, `plugin-maven`. ([#1335](https://github.com/diffplug/spotless/pull/1335) fixes [#1334](https://github.com/diffplug/spotless/issues/1334))
 
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index a6a8491784..a7ab01cfa0 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -12,8 +12,8 @@ output = [
   ].join('\n');
 -->
 [![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.26.0/index.html)
-[![Changelog](https://img.shields.io/badge/changelog-2.26.0-brightgreen.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.27.0/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.27.0-brightgreen.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)

From 92e21d9a64f6aa753695b83114e5ed6db022f6d9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 20 Sep 2022 22:09:47 +0000
Subject: [PATCH 0335/2068] Update dependency org.junit.jupiter:junit-jupiter
 to v5.9.1

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 155ac981bc..b7bbe3ea6a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -26,7 +26,7 @@ VER_SLF4J=[1.6,2.0[
 # Used in multiple places
 VER_DURIAN=1.2.0
 VER_JGIT=5.13.1.202206130422-r
-VER_JUNIT=5.9.0
+VER_JUNIT=5.9.1
 VER_ASSERTJ=3.23.1
 VER_MOCKITO=4.8.0
 

From d99ee528b065046b153d208a718ee57734d84469 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 23 Sep 2022 22:03:23 +0000
Subject: [PATCH 0336/2068] Update dependency com.facebook:ktfmt to v0.41

---
 lib/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index dfb2a38d73..dfd67e59ed 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -54,7 +54,7 @@ dependencies {
 
 	palantirJavaFormatCompileOnly 'com.palantir.javaformat:palantir-java-format:1.1.0'
 
-	String VER_KTFMT = '0.40'
+	String VER_KTFMT = '0.41'
 	ktfmtCompileOnly "com.facebook:ktfmt:$VER_KTFMT"
 	String VER_KTLINT_GOOGLE_JAVA_FORMAT = '1.7' // for JDK 8 compatibility
 	ktfmtCompileOnly("com.google.googlejavaformat:google-java-format") {

From b0bb294147cd30966b88335391b6becb880526de Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 26 Sep 2022 13:37:54 +0000
Subject: [PATCH 0337/2068] Update dependency
 com.palantir.javaformat:palantir-java-format to v2

---
 lib/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index dfb2a38d73..ef10376f18 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -52,7 +52,7 @@ dependencies {
 	sortPomCompileOnly 'com.github.ekryd.sortpom:sortpom-sorter:3.0.0'
 	sortPomCompileOnly 'org.slf4j:slf4j-api:2.0.0'
 
-	palantirJavaFormatCompileOnly 'com.palantir.javaformat:palantir-java-format:1.1.0'
+	palantirJavaFormatCompileOnly 'com.palantir.javaformat:palantir-java-format:2.27.0'
 
 	String VER_KTFMT = '0.40'
 	ktfmtCompileOnly "com.facebook:ktfmt:$VER_KTFMT"

From dc9f4291f80bcb15dd63721abbba70f4ab0c371a Mon Sep 17 00:00:00 2001
From: tison <wander4096@gmail.com>
Date: Wed, 28 Sep 2022 21:18:52 +0800
Subject: [PATCH 0338/2068] fix: maven plugin should identify skip config key

Signed-off-by: tison <wander4096@gmail.com>
---
 .../com/diffplug/spotless/maven/AbstractSpotlessMojo.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
index c68733f387..f163fa2802 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
@@ -91,6 +91,9 @@ public abstract class AbstractSpotlessMojo extends AbstractMojo {
 	@Parameter(defaultValue = "${mojoExecution.goal}", required = true, readonly = true)
 	private String goal;
 
+	@Parameter(defaultValue = "false")
+	private boolean skip;
+
 	@Parameter(property = "spotless.apply.skip", defaultValue = "false")
 	private boolean applySkip;
 
@@ -200,6 +203,10 @@ public final void execute() throws MojoExecutionException {
 	}
 
 	private boolean shouldSkip() {
+		if (skip) {
+			return true;
+		}
+
 		switch (goal) {
 		case GOAL_CHECK:
 			return checkSkip;
@@ -208,6 +215,7 @@ private boolean shouldSkip() {
 		default:
 			break;
 		}
+
 		return false;
 	}
 

From 622f3a0c0bdb679a9f3a9123ba598dd2e6201be7 Mon Sep 17 00:00:00 2001
From: tison <wander4096@gmail.com>
Date: Wed, 28 Sep 2022 22:48:37 +0800
Subject: [PATCH 0339/2068] update CHANGES

Signed-off-by: tison <wander4096@gmail.com>
---
 plugin-maven/CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 6c3ff896a9..d46447ea38 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* `skip` config key should work again now. ([#1353](https://github.com/diffplug/spotless/pull/1353) fixes [#1227](https://github.com/diffplug/spotless/issues/1227) and [#491](https://github.com/diffplug/spotless/issues/491))
 
 ## [2.27.0] - 2022-09-19
 ### Added

From 7667a849d377b546d45350b77b65e0793e3d17dc Mon Sep 17 00:00:00 2001
From: circleci <circleci@6316f5805dd9>
Date: Wed, 28 Sep 2022 17:29:42 +0000
Subject: [PATCH 0340/2068] Published maven/2.27.1

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index d46447ea38..33b8f2b03a 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.27.1] - 2022-09-28
 ### Fixed
 * `skip` config key should work again now. ([#1353](https://github.com/diffplug/spotless/pull/1353) fixes [#1227](https://github.com/diffplug/spotless/issues/1227) and [#491](https://github.com/diffplug/spotless/issues/491))
 
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index a7ab01cfa0..b60cfa1a38 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -12,8 +12,8 @@ output = [
   ].join('\n');
 -->
 [![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.27.0/index.html)
-[![Changelog](https://img.shields.io/badge/changelog-2.27.0-brightgreen.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.27.1/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.27.1-brightgreen.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)

From aa48b8d9f1b4b0785d33dbecd4acb96e5c39b1e1 Mon Sep 17 00:00:00 2001
From: Duo Zhang <zhangduo@apache.org>
Date: Tue, 4 Oct 2022 00:58:47 +0800
Subject: [PATCH 0341/2068] Allow replacement to be null for ReplaceRegex of
 plugin maven

---
 .../com/diffplug/spotless/maven/generic/Replace.java | 12 +++++++-----
 .../spotless/maven/generic/ReplaceRegex.java         | 12 +++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Replace.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Replace.java
index 947ceee8e2..53967fd7d7 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Replace.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Replace.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,10 +35,12 @@ public class Replace implements FormatterStepFactory {
 
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig config) {
-		if (name == null || search == null || replacement == null) {
-			throw new IllegalArgumentException("Must specify 'name', 'search' and 'replacement'.");
+		if (name == null || search == null) {
+			throw new IllegalArgumentException("Must specify 'name' and 'search'.");
 		}
-
-		return ReplaceStep.create(name, search, replacement);
+		// Use empty string if replacement is not provided. In pom.xml there is no way to specify
+		// an empty string as a property value as maven will always trim the value and if it is
+		// empty, maven will consider the property as not provided.
+		return ReplaceStep.create(name, search, replacement != null ? replacement : "");
 	}
 }
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/ReplaceRegex.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/ReplaceRegex.java
index 243f14220e..9983aa8475 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/ReplaceRegex.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/ReplaceRegex.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,10 +35,12 @@ public class ReplaceRegex implements FormatterStepFactory {
 
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig config) {
-		if (name == null || searchRegex == null || replacement == null) {
-			throw new IllegalArgumentException("Must specify 'name', 'searchRegex' and 'replacement'.");
+		if (name == null || searchRegex == null) {
+			throw new IllegalArgumentException("Must specify 'name' and 'searchRegex'.");
 		}
-
-		return ReplaceRegexStep.create(name, searchRegex, replacement);
+		// Use empty string if replacement is not provided. In pom.xml there is no way to specify
+		// an empty string as a property value as maven will always trim the value and if it is
+		// empty, maven will consider the property as not provided.
+		return ReplaceRegexStep.create(name, searchRegex, replacement != null ? replacement : "");
 	}
 }

From 49892456496c283d23b47b6d4f0bc5f6a44c885e Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 10 Oct 2022 16:26:53 +0200
Subject: [PATCH 0342/2068] Update changelog.

---
 plugin-maven/CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 33b8f2b03a..e42fd89add 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* `replace` and `replaceRegex` steps now allow you to replace something with an empty string, previously this would generate a null pointer exception. (fixes [#1359](https://github.com/diffplug/spotless/issues/1359))
 
 ## [2.27.1] - 2022-09-28
 ### Fixed

From 23784ba9e1774c91218a77e2b60ba12343b33c8c Mon Sep 17 00:00:00 2001
From: circleci <circleci@b6e027c33d02>
Date: Mon, 10 Oct 2022 14:50:07 +0000
Subject: [PATCH 0343/2068] Published maven/2.27.2

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index e42fd89add..7da89e6712 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.27.2] - 2022-10-10
 ### Fixed
 * `replace` and `replaceRegex` steps now allow you to replace something with an empty string, previously this would generate a null pointer exception. (fixes [#1359](https://github.com/diffplug/spotless/issues/1359))
 
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index b60cfa1a38..2a249357a6 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -12,8 +12,8 @@ output = [
   ].join('\n');
 -->
 [![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.27.1/index.html)
-[![Changelog](https://img.shields.io/badge/changelog-2.27.1-brightgreen.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.27.2/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.27.2-brightgreen.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)

From 3d6da4b821e70c3b451e7234c5b6d053ab89cef4 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 10 Oct 2022 17:58:50 +0200
Subject: [PATCH 0344/2068] Move the repositories block higher.

---
 build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 16136e07ec..5766e6b85e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,3 +1,6 @@
+repositories {
+	mavenCentral()
+}
 apply from: rootProject.file('gradle/java-publish.gradle')
 apply from: rootProject.file('gradle/changelog.gradle')
 allprojects {
@@ -5,9 +8,6 @@ allprojects {
 }
 apply from: rootProject.file('gradle/spotless-freshmark.gradle')
 
-repositories {
-	mavenCentral()
-}
 spotless {
 	groovyGradle {
 		target '*.gradle', 'gradle/*.gradle'

From 744a2d9fdcaac0d8d3b45a03e30b32322c2e0ae2 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 10 Oct 2022 18:14:13 +0200
Subject: [PATCH 0345/2068] Fixes.

---
 plugin-gradle/build.gradle | 2 +-
 plugin-maven/build.gradle  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugin-gradle/build.gradle b/plugin-gradle/build.gradle
index 8fec4beb92..f1b3320b50 100644
--- a/plugin-gradle/build.gradle
+++ b/plugin-gradle/build.gradle
@@ -1,10 +1,10 @@
 apply from: rootProject.file('gradle/changelog.gradle')
 ext.artifactId = project.artifactIdGradle
 version = spotlessChangelog.versionNext
+apply plugin: 'java-library'
 apply from: rootProject.file('gradle/java-setup.gradle')
 apply from: rootProject.file('gradle/spotless-freshmark.gradle')
 
-apply plugin: 'java-library'
 apply plugin: 'com.gradle.plugin-publish'
 apply plugin: 'java-gradle-plugin'
 
diff --git a/plugin-maven/build.gradle b/plugin-maven/build.gradle
index 174f10ef6a..b7ac8a36c8 100644
--- a/plugin-maven/build.gradle
+++ b/plugin-maven/build.gradle
@@ -5,6 +5,7 @@ buildscript {
 plugins {
 	id 'cz.malohlava.visteg' version '1.0.5' // https://github.com/mmalohlava/gradle-visteg
 }
+repositories { mavenCentral() }
 apply from: rootProject.file('gradle/changelog.gradle')
 apply from: rootProject.file('gradle/spotless-freshmark.gradle')
 

From bd12e20cbb58ad4b51d63bb47b24911f364357ae Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Tue, 11 Oct 2022 10:36:42 -0700
Subject: [PATCH 0346/2068] Don't treat `@Value` as a type annotation

---
 .../java/com/diffplug/spotless/java/FormatAnnotationsStep.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java b/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java
index 2d01e305a0..d05a53ee1b 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java
@@ -371,7 +371,7 @@ public final class FormatAnnotationsStep {
 					"UpperBoundBottom",
 					"UpperBoundLiteral",
 					"UpperBoundUnknown",
-					"Value",
+					"ValueTypeAnno",
 					"VariableNameDefaultBottom",
 					"VariableNameDefaultMiddle",
 					"VariableNameDefaultTop",

From 26f8f59966c02ee2a1d238a5ffa34b6016018285 Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Tue, 11 Oct 2022 10:42:38 -0700
Subject: [PATCH 0347/2068] Add test cases for type annotations on classes

---
 ...FormatAnnotationsAccessModifiersInput.test | 57 +++++++++++++++++++
 ...ormatAnnotationsAccessModifiersOutput.test | 57 +++++++++++++++++++
 .../FormatAnnotationsTestInput.test           |  9 +++
 .../FormatAnnotationsTestOutput.test          |  7 +++
 4 files changed, 130 insertions(+)
 create mode 100644 testlib/src/main/resources/java/formatannotations/FormatAnnotationsAccessModifiersInput.test
 create mode 100644 testlib/src/main/resources/java/formatannotations/FormatAnnotationsAccessModifiersOutput.test

diff --git a/testlib/src/main/resources/java/formatannotations/FormatAnnotationsAccessModifiersInput.test b/testlib/src/main/resources/java/formatannotations/FormatAnnotationsAccessModifiersInput.test
new file mode 100644
index 0000000000..6ac5519cc9
--- /dev/null
+++ b/testlib/src/main/resources/java/formatannotations/FormatAnnotationsAccessModifiersInput.test
@@ -0,0 +1,57 @@
+// Annotations in the wrong order.  The preferred order is:
+//  * declaration annotations
+//  * access modifiers such as `public`
+//  * type annotations
+//  * type
+
+class FormatAnnotationsAccessModifiers {
+
+  @Nullable public Object myMethod1() {
+    return null;
+  }
+
+  @Nullable
+  public Object myMethod2() {
+    return null;
+  }
+
+  @Nullable
+  public
+  Object myMethod3() {
+    return null;
+  }
+
+  @Nullable
+  @Deprecated
+  public Object myMethod4() {
+    return null;
+  }
+
+  @Override
+  @Nullable
+  @Deprecated
+  public Object myMethod5() {
+    return null;
+  }
+
+  @Nullable @Deprecated public Object myMethod6() {
+    return null;
+  }
+}
+
+@Deprecated
+@Interned
+@MustCall("close")
+@SuppressWarnings
+public class MyClass3 {
+  // No body
+}
+
+public
+@Deprecated
+@SuppressWarnings
+@Interned
+@MustCall("close")
+class MyClass4 {
+  // No body
+}
diff --git a/testlib/src/main/resources/java/formatannotations/FormatAnnotationsAccessModifiersOutput.test b/testlib/src/main/resources/java/formatannotations/FormatAnnotationsAccessModifiersOutput.test
new file mode 100644
index 0000000000..6ac5519cc9
--- /dev/null
+++ b/testlib/src/main/resources/java/formatannotations/FormatAnnotationsAccessModifiersOutput.test
@@ -0,0 +1,57 @@
+// Annotations in the wrong order.  The preferred order is:
+//  * declaration annotations
+//  * access modifiers such as `public`
+//  * type annotations
+//  * type
+
+class FormatAnnotationsAccessModifiers {
+
+  @Nullable public Object myMethod1() {
+    return null;
+  }
+
+  @Nullable
+  public Object myMethod2() {
+    return null;
+  }
+
+  @Nullable
+  public
+  Object myMethod3() {
+    return null;
+  }
+
+  @Nullable
+  @Deprecated
+  public Object myMethod4() {
+    return null;
+  }
+
+  @Override
+  @Nullable
+  @Deprecated
+  public Object myMethod5() {
+    return null;
+  }
+
+  @Nullable @Deprecated public Object myMethod6() {
+    return null;
+  }
+}
+
+@Deprecated
+@Interned
+@MustCall("close")
+@SuppressWarnings
+public class MyClass3 {
+  // No body
+}
+
+public
+@Deprecated
+@SuppressWarnings
+@Interned
+@MustCall("close")
+class MyClass4 {
+  // No body
+}
diff --git a/testlib/src/main/resources/java/formatannotations/FormatAnnotationsTestInput.test b/testlib/src/main/resources/java/formatannotations/FormatAnnotationsTestInput.test
index fb711451d1..b93631db5a 100644
--- a/testlib/src/main/resources/java/formatannotations/FormatAnnotationsTestInput.test
+++ b/testlib/src/main/resources/java/formatannotations/FormatAnnotationsTestInput.test
@@ -75,3 +75,12 @@ class FormatAnnotationsTest {
   @Localized
   String localized;
 }
+
+@Deprecated
+@SuppressWarnings
+public
+@Interned
+@MustCall("close")
+class MyClass1 {
+  // No body
+}
diff --git a/testlib/src/main/resources/java/formatannotations/FormatAnnotationsTestOutput.test b/testlib/src/main/resources/java/formatannotations/FormatAnnotationsTestOutput.test
index ca37e66d86..6daabf198c 100644
--- a/testlib/src/main/resources/java/formatannotations/FormatAnnotationsTestOutput.test
+++ b/testlib/src/main/resources/java/formatannotations/FormatAnnotationsTestOutput.test
@@ -49,3 +49,10 @@ class FormatAnnotationsTest {
 
   @Localized String localized;
 }
+
+@Deprecated
+@SuppressWarnings
+public
+@Interned @MustCall("close") class MyClass1 {
+  // No body
+}

From 4b13e329e25a872c125d8f4c8eb8b05a0ca60d90 Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Thu, 13 Oct 2022 10:25:39 -0700
Subject: [PATCH 0348/2068] Add changelog

---
 CHANGES.md               | 2 ++
 plugin-gradle/CHANGES.md | 2 ++
 plugin-maven/CHANGES.md  | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 23c20dc957..dc0bd38c60 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Don't treat `@Value` as a type annotation [#1367](https://github.com/diffplug/spotless/pull/1367)
 
 ## [2.30.0] - 2022-09-14
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index f7c15244d5..a8adac938d 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Don't treat `@Value` as a type annotation [#1367](https://github.com/diffplug/spotless/pull/1367)
 
 ## [6.11.0] - 2022-09-14
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 1ce37116a1..268cf97322 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Don't treat `@Value` as a type annotation [#1367](https://github.com/diffplug/spotless/pull/1367)
 
 ## [2.26.0] - 2022-09-14
 ### Added

From e79625731bdef4bdb0a58557975231c52f1339ff Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Thu, 13 Oct 2022 10:47:02 -0700
Subject: [PATCH 0349/2068] Add invocation of test

---
 .../spotless/maven/java/FormatAnnotationsStepTest.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/FormatAnnotationsStepTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/FormatAnnotationsStepTest.java
index 8560b73fd4..972a4b4f7f 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/FormatAnnotationsStepTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/FormatAnnotationsStepTest.java
@@ -30,4 +30,14 @@ void testFormatAnnotations() throws Exception {
 		mavenRunner().withArguments("spotless:apply").runNoError();
 		assertFile(path).sameAsResource("java/formatannotations/FormatAnnotationsTestOutput.test");
 	}
+
+	@Test
+	void testFormatAnnotationsAccessModifiers() throws Exception {
+		writePomWithJavaSteps("<formatAnnotations/>");
+
+		String path = "src/main/java/test.java";
+		setFile(path).toResource("java/formatannotations/FormatAnnotationsAccessModifiersInput.test");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile(path).sameAsResource("java/formatannotations/FormatAnnotationsAccessModifiersOutput.test");
+	}
 }

From 276810c5109831dcd04bfc9932a1e84b2afb67d1 Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Thu, 13 Oct 2022 14:37:50 -0700
Subject: [PATCH 0350/2068] Add tests, fix expected output

---
 ...FormatAnnotationsAccessModifiersInput.test |  6 +++++
 ...ormatAnnotationsAccessModifiersOutput.test | 25 ++++++++-----------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/testlib/src/main/resources/java/formatannotations/FormatAnnotationsAccessModifiersInput.test b/testlib/src/main/resources/java/formatannotations/FormatAnnotationsAccessModifiersInput.test
index 6ac5519cc9..13546f9a84 100644
--- a/testlib/src/main/resources/java/formatannotations/FormatAnnotationsAccessModifiersInput.test
+++ b/testlib/src/main/resources/java/formatannotations/FormatAnnotationsAccessModifiersInput.test
@@ -27,6 +27,12 @@ class FormatAnnotationsAccessModifiers {
     return null;
   }
 
+  @Deprecated
+  @Nullable
+  public Object myMethod4a() {
+    return null;
+  }
+
   @Override
   @Nullable
   @Deprecated
diff --git a/testlib/src/main/resources/java/formatannotations/FormatAnnotationsAccessModifiersOutput.test b/testlib/src/main/resources/java/formatannotations/FormatAnnotationsAccessModifiersOutput.test
index 6ac5519cc9..ffc6169c4c 100644
--- a/testlib/src/main/resources/java/formatannotations/FormatAnnotationsAccessModifiersOutput.test
+++ b/testlib/src/main/resources/java/formatannotations/FormatAnnotationsAccessModifiersOutput.test
@@ -10,26 +10,27 @@ class FormatAnnotationsAccessModifiers {
     return null;
   }
 
-  @Nullable
-  public Object myMethod2() {
+  @Nullable public Object myMethod2() {
     return null;
   }
 
-  @Nullable
-  public
+  @Nullable public
   Object myMethod3() {
     return null;
   }
 
-  @Nullable
-  @Deprecated
+  @Nullable @Deprecated
   public Object myMethod4() {
     return null;
   }
 
-  @Override
-  @Nullable
   @Deprecated
+  @Nullable public Object myMethod4a() {
+    return null;
+  }
+
+  @Override
+  @Nullable @Deprecated
   public Object myMethod5() {
     return null;
   }
@@ -40,9 +41,7 @@ class FormatAnnotationsAccessModifiers {
 }
 
 @Deprecated
-@Interned
-@MustCall("close")
-@SuppressWarnings
+@Interned @MustCall("close") @SuppressWarnings
 public class MyClass3 {
   // No body
 }
@@ -50,8 +49,6 @@ public class MyClass3 {
 public
 @Deprecated
 @SuppressWarnings
-@Interned
-@MustCall("close")
-class MyClass4 {
+@Interned @MustCall("close") class MyClass4 {
   // No body
 }

From 650374d4be3aa9489f4f2580d3bc96957c40257f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 17 Oct 2022 07:07:09 +0000
Subject: [PATCH 0351/2068] fix(deps): update dependency
 com.github.spotbugs:spotbugs-annotations to v4.7.3

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index b7bbe3ea6a..31a94db7df 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,7 +17,7 @@ artifactIdGradle=spotless-plugin-gradle
 
 # Build requirements
 VER_JAVA=1.8
-VER_SPOTBUGS=4.7.2
+VER_SPOTBUGS=4.7.3
 VER_JSR_305=3.0.2
 
 # Dependencies provided by Spotless plugin

From 28ca68cc4552dc530132161934fa54260494fbc4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 19 Oct 2022 00:55:20 +0000
Subject: [PATCH 0352/2068] chore(deps): update plugin com.github.spotbugs to
 v5.0.13

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 47699727c4..0ce22a9a8c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
 		// https://github.com/gradle-nexus/publish-plugin/releases
 		id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
 		// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
-		id 'com.github.spotbugs'                   version '5.0.12'
+		id 'com.github.spotbugs'                   version '5.0.13'
 		// https://github.com/diffplug/spotless-changelog
 		id 'com.diffplug.spotless-changelog'       version '2.4.0'
 		// https://github.com/diffplug/goomph/blob/main/CHANGES.md

From 707e50edb0a5d54d9634d28acfa403b209d57740 Mon Sep 17 00:00:00 2001
From: Bruno Medeiros <brunojcm@gmail.com>
Date: Wed, 19 Oct 2022 23:12:34 +0800
Subject: [PATCH 0353/2068] fix(ktlint): support ktlint_disabled_rules in 0.47+

---
 .../glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/src/compatKtLint0Dot47Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java b/lib/src/compatKtLint0Dot47Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java
index 842294a5cc..66274fd0ef 100644
--- a/lib/src/compatKtLint0Dot47Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot47Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java
@@ -100,9 +100,13 @@ private static EditorConfigOverride createEditorConfigOverride(final List<Rule>
 				.filter(rule -> rule instanceof UsesEditorConfigProperties)
 				.flatMap(rule -> ((UsesEditorConfigProperties) rule).getEditorConfigProperties().stream());
 
+		// get complete list of supported properties in DefaultEditorConfigProperties.INSTANCE
+		List<UsesEditorConfigProperties.EditorConfigProperty<?>> editorConfigProperties = DefaultEditorConfigProperties.INSTANCE.getEditorConfigProperties();
+		editorConfigProperties.add(DefaultEditorConfigProperties.INSTANCE.getKtlintDisabledRulesProperty());
+
 		// Create a mapping of properties to their names based on rule properties and default properties
 		Map<String, UsesEditorConfigProperties.EditorConfigProperty<?>> supportedProperties = Stream
-				.concat(ruleProperties, DefaultEditorConfigProperties.INSTANCE.getEditorConfigProperties().stream())
+				.concat(ruleProperties, editorConfigProperties.stream())
 				.distinct()
 				.collect(Collectors.toMap(property -> property.getType().getName(), property -> property));
 

From 6824821bcd072a0a35370a2dc4604d8635fe35c9 Mon Sep 17 00:00:00 2001
From: Bruno Medeiros <brunojcm@gmail.com>
Date: Fri, 21 Oct 2022 10:14:38 +0800
Subject: [PATCH 0354/2068] user mutable list implementation before adding
 element

---
 .../glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/src/compatKtLint0Dot47Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java b/lib/src/compatKtLint0Dot47Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java
index 66274fd0ef..757ffc922b 100644
--- a/lib/src/compatKtLint0Dot47Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot47Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java
@@ -17,6 +17,7 @@
 
 import static java.util.Collections.emptySet;
 
+import java.util.ArrayList;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
@@ -101,7 +102,7 @@ private static EditorConfigOverride createEditorConfigOverride(final List<Rule>
 				.flatMap(rule -> ((UsesEditorConfigProperties) rule).getEditorConfigProperties().stream());
 
 		// get complete list of supported properties in DefaultEditorConfigProperties.INSTANCE
-		List<UsesEditorConfigProperties.EditorConfigProperty<?>> editorConfigProperties = DefaultEditorConfigProperties.INSTANCE.getEditorConfigProperties();
+		List<UsesEditorConfigProperties.EditorConfigProperty<?>> editorConfigProperties = new ArrayList<>(DefaultEditorConfigProperties.INSTANCE.getEditorConfigProperties());
 		editorConfigProperties.add(DefaultEditorConfigProperties.INSTANCE.getKtlintDisabledRulesProperty());
 
 		// Create a mapping of properties to their names based on rule properties and default properties

From fb3f658631df27bd98cf5bb0a54dae13be4b9818 Mon Sep 17 00:00:00 2001
From: Bruno Medeiros <brunojcm@gmail.com>
Date: Fri, 21 Oct 2022 10:15:04 +0800
Subject: [PATCH 0355/2068] add change log entries

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 1 +
 plugin-maven/CHANGES.md  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index dc0bd38c60..f6671d2191 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Fixed
 * Don't treat `@Value` as a type annotation [#1367](https://github.com/diffplug/spotless/pull/1367)
+* Support `ktlint_disabled_rules` in `ktlint` 0.47.x [#1378](https://github.com/diffplug/spotless/pull/1378)
 
 ## [2.30.0] - 2022-09-14
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index a8adac938d..5acd85ddc8 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Fixed
 * Don't treat `@Value` as a type annotation [#1367](https://github.com/diffplug/spotless/pull/1367)
+* Support `ktlint_disabled_rules` in `ktlint` 0.47.x [#1378](https://github.com/diffplug/spotless/pull/1378)
 
 ## [6.11.0] - 2022-09-14
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 75659026d4..b08a2366fd 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Fixed
 * Don't treat `@Value` as a type annotation [#1367](https://github.com/diffplug/spotless/pull/1367)
+* Support `ktlint_disabled_rules` in `ktlint` 0.47.x [#1378](https://github.com/diffplug/spotless/pull/1378)
 
 ## [2.27.2] - 2022-10-10
 ### Fixed

From ec2e1b2aa274476a1c7a52741b98c7905fd7ebbc Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 21 Oct 2022 19:58:11 +0000
Subject: [PATCH 0356/2068] fix(deps): update dependency
 org.mockito:mockito-core to v4.8.1

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 31a94db7df..5df7719934 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -28,7 +28,7 @@ VER_DURIAN=1.2.0
 VER_JGIT=5.13.1.202206130422-r
 VER_JUNIT=5.9.1
 VER_ASSERTJ=3.23.1
-VER_MOCKITO=4.8.0
+VER_MOCKITO=4.8.1
 
 # Used for Maven Plugin
 VER_MAVEN_API=3.0

From bff7c23af18d9a65f0f1baedcd190edd2e832807 Mon Sep 17 00:00:00 2001
From: Jasper Vandemalle <jasper.vandemalle@gmail.com>
Date: Wed, 26 Oct 2022 11:55:07 +0200
Subject: [PATCH 0357/2068] Fix SortPomStepStep typo

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index fb1a3670e6..605305bd29 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ lib('markdown.FreshMarkStep')                    +'{{yes}}       | {{no}}
 lib('markdown.FlexmarkStep')                     +'{{no}}        | {{yes}}      | {{no}}       | {{no}}  |',
 lib('npm.PrettierFormatterStep')                 +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('npm.TsFmtFormatterStep')                    +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
-lib('pom.SortPomStepStep')                       +'{{no}}        | {{yes}}      | {{no}}       | {{no}}  |',
+lib('pom.SortPomStep')                           +'{{no}}        | {{yes}}      | {{no}}       | {{no}}  |',
 lib('python.BlackStep')                          +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
 lib('scala.ScalaFmtStep')                        +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
 lib('sql.DBeaverSQLFormatterStep')               +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
@@ -115,7 +115,7 @@ extra('wtp.EclipseWtpFormatterStep')             +'{{yes}}       | {{yes}}
 | [`markdown.FlexmarkStep`](lib/src/main/java/com/diffplug/spotless/markdown/FlexmarkStep.java) | :white_large_square:        | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`npm.PrettierFormatterStep`](lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`npm.TsFmtFormatterStep`](lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
-| [`pom.SortPomStepStep`](lib/src/main/java/com/diffplug/spotless/pom/SortPomStepStep.java) | :white_large_square:        | :+1:      | :white_large_square:       | :white_large_square:  |
+| [`pom.SortPomStep`](lib/src/main/java/com/diffplug/spotless/pom/SortPomStep.java) | :white_large_square:        | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`python.BlackStep`](lib/src/main/java/com/diffplug/spotless/python/BlackStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
 | [`scala.ScalaFmtStep`](lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`sql.DBeaverSQLFormatterStep`](lib/src/main/java/com/diffplug/spotless/sql/DBeaverSQLFormatterStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |

From be4892f9d300d507225e65169c6f2a0e84afcb53 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 1 Nov 2022 01:32:49 +0000
Subject: [PATCH 0358/2068] fix(deps): update dependency
 org.scalameta:scalafmt-core_2.13 to v3.6.1

---
 lib/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index dfb2a38d73..34f04371d6 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -91,7 +91,7 @@ dependencies {
 	compatKtLint0Dot47Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-experimental:0.47.0'
 	compatKtLint0Dot47Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.47.0'
 
-	String VER_SCALAFMT="3.5.9"
+	String VER_SCALAFMT="3.6.1"
 	scalafmtCompileOnly "org.scalameta:scalafmt-core_2.13:$VER_SCALAFMT"
 
 	String VER_DIKTAT = "1.2.3"

From 3785b1be4ab93a906fa933a317a6877968239201 Mon Sep 17 00:00:00 2001
From: jochenberger <fooberger@gmail.com>
Date: Thu, 3 Nov 2022 14:56:07 +0100
Subject: [PATCH 0359/2068] Fix link

---
 plugin-gradle/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 29e748295e..7f5590da21 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -303,7 +303,7 @@ spotless {
 
 ### eclipse groovy
 
-[homepage](https://github.com/groovy/groovy-eclipse/wiki). [changelog](https://github.com/groovy/groovy-eclipse/releases). [compatible versions](https://github.com/diffplug/spotless/tree/main/lib-extra/src/main/resources/com/diffplug/spotless/extra/groovy_eclipse_formatter). The Groovy formatter uses some of the [eclipse jdt](#eclipse-jdt) configuration parameters in addition to groovy-specific ones. All parameters can be configured within a single file, like the Java properties file [greclipse.properties](../testlib/src/main/resources/groovy/greclipse/format/greclipse.properties) in the previous example. The formatter step can also load the [exported Eclipse properties](../ECLIPSE_SCREENSHOTS.md) and augment it with the `.metadata/.plugins/org.eclipse.core.runtime/.settings/org.codehaus.groovy.eclipse.ui.prefs` from your Eclipse workspace as shown below.
+[homepage](https://github.com/groovy/groovy-eclipse/wiki). [changelog](https://github.com/groovy/groovy-eclipse/releases). [compatible versions](https://github.com/diffplug/spotless/tree/main/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter). The Groovy formatter uses some of the [eclipse jdt](#eclipse-jdt) configuration parameters in addition to groovy-specific ones. All parameters can be configured within a single file, like the Java properties file [greclipse.properties](../testlib/src/main/resources/groovy/greclipse/format/greclipse.properties) in the previous example. The formatter step can also load the [exported Eclipse properties](../ECLIPSE_SCREENSHOTS.md) and augment it with the `.metadata/.plugins/org.eclipse.core.runtime/.settings/org.codehaus.groovy.eclipse.ui.prefs` from your Eclipse workspace as shown below.
 
 ```gradle
 spotless {

From 8d4d944eaff35a7e372e79517b0b67f91dde9400 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 11 Nov 2022 12:04:59 +0000
Subject: [PATCH 0360/2068] chore(deps): update plugin
 com.gradle.plugin-publish to v1.1.0

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 0ce22a9a8c..6184ab802f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,7 +2,7 @@ pluginManagement {
 	plugins {
 		id 'com.diffplug.spotless'                 version '6.11.0'
 		// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
-		id 'com.gradle.plugin-publish'             version '1.0.0'
+		id 'com.gradle.plugin-publish'             version '1.1.0'
 		// https://github.com/gradle-nexus/publish-plugin/releases
 		id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
 		// https://github.com/spotbugs/spotbugs-gradle-plugin/releases

From e8133131e12e3ba1a95257770376f59b64903ebf Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 14 Nov 2022 20:13:44 +0000
Subject: [PATCH 0361/2068] fix(deps): update dependency
 org.mockito:mockito-core to v4.9.0

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 5df7719934..fc2b2b43da 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -28,7 +28,7 @@ VER_DURIAN=1.2.0
 VER_JGIT=5.13.1.202206130422-r
 VER_JUNIT=5.9.1
 VER_ASSERTJ=3.23.1
-VER_MOCKITO=4.8.1
+VER_MOCKITO=4.9.0
 
 # Used for Maven Plugin
 VER_MAVEN_API=3.0

From 9773159231029cb23212d7a2b4656d508dc8525c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 15 Nov 2022 17:15:34 +0000
Subject: [PATCH 0362/2068] fix(deps): update dependency
 org.cqfn.diktat:diktat-rules to v1.2.4.2

---
 lib/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index dfb2a38d73..cf3216ade6 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -94,7 +94,7 @@ dependencies {
 	String VER_SCALAFMT="3.5.9"
 	scalafmtCompileOnly "org.scalameta:scalafmt-core_2.13:$VER_SCALAFMT"
 
-	String VER_DIKTAT = "1.2.3"
+	String VER_DIKTAT = "1.2.4.2"
 	diktatCompileOnly "org.cqfn.diktat:diktat-rules:$VER_DIKTAT"
 
 	// used for markdown formatting

From 35a56eaed731ea5d43786fd7c5a2ab4fc8d3dff4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Mino?= <aurelien.mino@gmail.com>
Date: Sun, 20 Nov 2022 00:37:49 +0100
Subject: [PATCH 0363/2068] Support for group of imports without blank lines
 between groups

To keep compatibility with existing configuration, a special delimiter `|` is introduced to separate subgroup of imports inside a group.
For example "java|javax" will not generate a blank line between the java group and the javax group.

The notion of ImportsGroup has been introduced for clarification, allowing code has been simplification.

Fixes #1375
---
 CHANGES.md                                    |   1 +
 .../spotless/java/ImportSorterImpl.java       | 174 ++++++++----------
 plugin-gradle/README.md                       |   4 +-
 plugin-maven/README.md                        |   8 +-
 .../JavaCodeSortedImportsSubgroups.test       |  16 ++
 .../JavaCodeUnsortedImportsSubgroups.test     |  15 ++
 .../spotless/java/ImportOrderStepTest.java    |   6 +
 7 files changed, 119 insertions(+), 105 deletions(-)
 create mode 100644 testlib/src/main/resources/java/importsorter/JavaCodeSortedImportsSubgroups.test
 create mode 100644 testlib/src/main/resources/java/importsorter/JavaCodeUnsortedImportsSubgroups.test

diff --git a/CHANGES.md b/CHANGES.md
index f6671d2191..4bd52e1aa0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,6 +13,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Don't treat `@Value` as a type annotation [#1367](https://github.com/diffplug/spotless/pull/1367)
 * Support `ktlint_disabled_rules` in `ktlint` 0.47.x [#1378](https://github.com/diffplug/spotless/pull/1378)
+* ImportOrder: support groups of imports without blank lines [#1401](https://github.com/diffplug/spotless/pull/1401)
 
 ## [2.30.0] - 2022-09-14
 ### Added
diff --git a/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java b/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java
index ec075ffedd..6dd8d58ba4 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java
@@ -17,6 +17,8 @@
 
 import java.io.Serializable;
 import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import javax.annotation.Nullable;
 
@@ -25,12 +27,41 @@
 // which itself is licensed under the Apache 2.0 license.
 final class ImportSorterImpl {
 
-	private final List<String> template = new ArrayList<>();
+	private static final String CATCH_ALL_SUBGROUP = "";
+	private static final String STATIC_KEYWORD = "static ";
+	private static final String STATIC_SYMBOL = "\\#";
+	private static final String SUBGROUP_SEPARATOR = "|";
+
+	private final List<ImportsGroup> importsGroups;
 	private final Map<String, List<String>> matchingImports = new HashMap<>();
 	private final List<String> notMatching = new ArrayList<>();
 	private final Set<String> allImportOrderItems = new HashSet<>();
 	private final Comparator<String> ordering;
 
+	// An ImportsGroup is a group of imports ; each group is separated by blank lines.
+	// A group is composed of subgroups : imports are sorted by subgroup.
+	private static class ImportsGroup {
+
+		private final List<String> subGroups;
+
+		public ImportsGroup(String importOrder) {
+			this.subGroups = Stream.of(importOrder.split("\\" + SUBGROUP_SEPARATOR))
+				.map(this::normalizeStatic)
+				.collect(Collectors.toList());
+		}
+
+		private String normalizeStatic(String subgroup) {
+			if (subgroup.startsWith(STATIC_SYMBOL)) {
+				return subgroup.replace(STATIC_SYMBOL, STATIC_KEYWORD);
+			}
+			return subgroup;
+		}
+
+		public List<String> getSubGroups() {
+			return subGroups;
+		}
+	}
+
 	static List<String> sort(List<String> imports, List<String> importsOrder, boolean wildcardsLast, String lineFormat) {
 		ImportSorterImpl importsSorter = new ImportSorterImpl(importsOrder, wildcardsLast);
 		return importsSorter.sort(imports, lineFormat);
@@ -40,43 +71,42 @@ private List<String> sort(List<String> imports, String lineFormat) {
 		filterMatchingImports(imports);
 		mergeNotMatchingItems(false);
 		mergeNotMatchingItems(true);
-		mergeMatchingItems();
+		List<String> sortedImported = mergeMatchingItems();
 
-		return getResult(lineFormat);
+		return getResult(sortedImported, lineFormat);
 	}
 
 	private ImportSorterImpl(List<String> importOrder, boolean wildcardsLast) {
-		List<String> importOrderCopy = new ArrayList<>(importOrder);
-		normalizeStaticOrderItems(importOrderCopy);
-		putStaticItemIfNotExists(importOrderCopy);
-		template.addAll(importOrderCopy);
+		importsGroups = importOrder.stream().filter(Objects::nonNull).map(ImportsGroup::new).collect(Collectors.toList());
+		putStaticItemIfNotExists(importsGroups);
+		putCatchAllGroupIfNotExists(importsGroups);
+
 		ordering = new OrderingComparator(wildcardsLast);
-		this.allImportOrderItems.addAll(importOrderCopy);
+
+		List<String> subgroups = importsGroups.stream().map(ImportsGroup::getSubGroups).flatMap(Collection::stream).collect(Collectors.toList());
+		this.allImportOrderItems.addAll(subgroups);
 	}
 
-	private static void putStaticItemIfNotExists(List<String> allImportOrderItems) {
-		boolean contains = false;
+	private void putStaticItemIfNotExists(List<ImportsGroup> importsGroups) {
+		boolean catchAllSubGroupExist = importsGroups.stream().anyMatch(group -> group.getSubGroups().contains(STATIC_KEYWORD));
+		if (catchAllSubGroupExist) {
+			return;
+		}
+
 		int indexOfFirstStatic = 0;
-		for (int i = 0; i < allImportOrderItems.size(); i++) {
-			String allImportOrderItem = allImportOrderItems.get(i);
-			if (allImportOrderItem.equals("static ")) {
-				contains = true;
-			}
-			if (allImportOrderItem.startsWith("static ")) {
+		for (int i = 0; i < importsGroups.size(); i++) {
+			boolean subgroupMatch = importsGroups.get(i).getSubGroups().stream().anyMatch(subgroup -> subgroup.startsWith(STATIC_KEYWORD));
+			if (subgroupMatch) {
 				indexOfFirstStatic = i;
 			}
 		}
-		if (!contains) {
-			allImportOrderItems.add(indexOfFirstStatic, "static ");
-		}
+		importsGroups.add(indexOfFirstStatic, new ImportsGroup(STATIC_KEYWORD));
 	}
 
-	private static void normalizeStaticOrderItems(List<String> allImportOrderItems) {
-		for (int i = 0; i < allImportOrderItems.size(); i++) {
-			String s = allImportOrderItems.get(i);
-			if (s.startsWith("\\#")) {
-				allImportOrderItems.set(i, s.replace("\\#", "static "));
-			}
+	private void putCatchAllGroupIfNotExists(List<ImportsGroup> importsGroups) {
+		boolean catchAllSubGroupExist = importsGroups.stream().anyMatch(group -> group.getSubGroups().contains(CATCH_ALL_SUBGROUP));
+		if (!catchAllSubGroupExist) {
+			importsGroups.add(new ImportsGroup(CATCH_ALL_SUBGROUP));
 		}
 	}
 
@@ -87,9 +117,7 @@ private void filterMatchingImports(List<String> imports) {
 		for (String anImport : imports) {
 			String orderItem = getBestMatchingImportOrderItem(anImport);
 			if (orderItem != null) {
-				if (!matchingImports.containsKey(orderItem)) {
-					matchingImports.put(orderItem, new ArrayList<>());
-				}
+				matchingImports.computeIfAbsent(orderItem, key -> new ArrayList<>());
 				matchingImports.get(orderItem).add(anImport);
 			} else {
 				notMatching.add(anImport);
@@ -116,34 +144,14 @@ private void filterMatchingImports(List<String> imports) {
 	 * not matching means it does not match any order item, so it will be appended before or after order items
 	 */
 	private void mergeNotMatchingItems(boolean staticItems) {
-		sort(notMatching);
-
-		int firstIndexOfOrderItem = getFirstIndexOfOrderItem(notMatching, staticItems);
-		int indexOfOrderItem = 0;
 		for (String notMatchingItem : notMatching) {
 			if (!matchesStatic(staticItems, notMatchingItem)) {
 				continue;
 			}
 			boolean isOrderItem = isOrderItem(notMatchingItem, staticItems);
-			if (isOrderItem) {
-				indexOfOrderItem = template.indexOf(notMatchingItem);
-			} else {
-				if (indexOfOrderItem == 0 && firstIndexOfOrderItem != 0) {
-					// insert before alphabetically first order item
-					template.add(firstIndexOfOrderItem, notMatchingItem);
-					firstIndexOfOrderItem++;
-				} else if (firstIndexOfOrderItem == 0) {
-					// no order is specified
-					if (template.size() > 0 && (template.get(template.size() - 1).startsWith("static"))) {
-						// insert N after last static import
-						template.add(ImportSorter.N);
-					}
-					template.add(notMatchingItem);
-				} else {
-					// insert after the previous order item
-					template.add(indexOfOrderItem + 1, notMatchingItem);
-					indexOfOrderItem++;
-				}
+			if (!isOrderItem) {
+				matchingImports.computeIfAbsent(CATCH_ALL_SUBGROUP, key -> new ArrayList<>());
+				matchingImports.get(CATCH_ALL_SUBGROUP).add(notMatchingItem);
 			}
 		}
 	}
@@ -153,76 +161,44 @@ private boolean isOrderItem(String notMatchingItem, boolean staticItems) {
 		return contains && matchesStatic(staticItems, notMatchingItem);
 	}
 
-	/**
-	 * gets first order item from sorted input list, and finds out it's index in template.
-	 */
-	private int getFirstIndexOfOrderItem(List<String> notMatching, boolean staticItems) {
-		int firstIndexOfOrderItem = 0;
-		for (String notMatchingItem : notMatching) {
-			if (!matchesStatic(staticItems, notMatchingItem)) {
-				continue;
-			}
-			boolean isOrderItem = isOrderItem(notMatchingItem, staticItems);
-			if (isOrderItem) {
-				firstIndexOfOrderItem = template.indexOf(notMatchingItem);
-				break;
-			}
-		}
-		return firstIndexOfOrderItem;
-	}
-
 	private static boolean matchesStatic(boolean staticItems, String notMatchingItem) {
-		boolean isStatic = notMatchingItem.startsWith("static ");
+		boolean isStatic = notMatchingItem.startsWith(STATIC_KEYWORD);
 		return (isStatic && staticItems) || (!isStatic && !staticItems);
 	}
 
-	private void mergeMatchingItems() {
-		for (int i = 0; i < template.size(); i++) {
-			String item = template.get(i);
-			if (allImportOrderItems.contains(item)) {
-				// find matching items for order item
-				List<String> strings = matchingImports.get(item);
+	private List<String> mergeMatchingItems() {
+		List<String> template = new ArrayList<>();
+		for (ImportsGroup group : importsGroups) {
+			boolean groupIsNotEmpty = false;
+			for (String subgroup : group.getSubGroups()) {
+				List<String> strings = matchingImports.get(subgroup);
 				if (strings == null || strings.isEmpty()) {
-					// if there is none, just remove order item
-					template.remove(i);
-					i--;
 					continue;
 				}
+				groupIsNotEmpty = true;
 				List<String> matchingItems = new ArrayList<>(strings);
 				sort(matchingItems);
-
-				// replace order item by matching import statements
-				// this is a mess and it is only a luck that it works :-]
-				template.remove(i);
-				if (i != 0 && !template.get(i - 1).equals(ImportSorter.N)) {
-					template.add(i, ImportSorter.N);
-					i++;
-				}
-				if (i + 1 < template.size() && !template.get(i + 1).equals(ImportSorter.N)
-						&& !template.get(i).equals(ImportSorter.N)) {
-					template.add(i, ImportSorter.N);
-				}
-				template.addAll(i, matchingItems);
-				if (i != 0 && !template.get(i - 1).equals(ImportSorter.N)) {
-					template.add(i, ImportSorter.N);
-				}
-
+				template.addAll(matchingItems);
+			}
+			if (groupIsNotEmpty) {
+				template.add(ImportSorter.N);
 			}
 		}
 		// if there is \n on the end, remove it
-		if (template.size() > 0 && template.get(template.size() - 1).equals(ImportSorter.N)) {
+		if (!template.isEmpty() && template.get(template.size() - 1).equals(ImportSorter.N)) {
 			template.remove(template.size() - 1);
 		}
+		return template;
 	}
 
 	private void sort(List<String> items) {
 		items.sort(ordering);
 	}
 
-	private List<String> getResult(String lineFormat) {
+	private List<String> getResult(List<String> sortedImported, String lineFormat) {
 		List<String> strings = new ArrayList<>();
 
-		for (String s : template) {
+		for (String s : sortedImported) {
 			if (s.equals(ImportSorter.N)) {
 				strings.add(s);
 			} else {
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 7f5590da21..03d933aea2 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -151,8 +151,8 @@ spotless {
     // Use the default importOrder configuration
     importOrder()
     // optional: you can specify import groups directly
-    // note: you can use an empty string for all the imports you didn't specify explicitly, and '\\#` prefix for static imports
-    importOrder('java', 'javax', 'com.acme', '', '\\#com.acme', '\\#')
+    // note: you can use an empty string for all the imports you didn't specify explicitly, '|' to join group without blank line, and '\\#` prefix for static imports
+    importOrder('java|javax', 'com.acme', '', '\\#com.acme', '\\#')
     // optional: instead of specifying import groups directly you can specify a config file
     // export config file: https://github.com/diffplug/spotless/blob/main/ECLIPSE_SCREENSHOTS.md#creating-spotlessimportorder
     importOrderFile('eclipse-import-order.txt') // import order file as exported from eclipse
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 2a249357a6..d596af229b 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -181,8 +181,8 @@ any other maven phase (i.e. compile) then it can be configured as below;
     <importOrder /> <!-- standard import order -->
     <importOrder>  <!-- or a custom ordering -->
       <wildcardsLast>false</wildcardsLast> <!-- Optional, default false. Sort wildcard import after specific imports -->
-      <order>java,javax,org,com,com.diffplug,,\\#com.diffplug,\\#</order>  <!-- or use <file>${project.basedir}/eclipse.importorder</file> -->
-      <!-- you can use an empty string for all the imports you didn't specify explicitly, and '\\#` prefix for static imports. -->
+      <order>java|javax,org,com,com.diffplug,,\\#com.diffplug,\\#</order>  <!-- or use <file>${project.basedir}/eclipse.importorder</file> -->
+      <!-- you can use an empty string for all the imports you didn't specify explicitly, '|' to join group without blank line, and '\\#` prefix for static imports. -->
     </importOrder>
 
     <removeUnusedImports /> <!-- self-explanatory -->
@@ -286,8 +286,8 @@ These mechanisms already exist for the Gradle plugin.
 
     <importOrder /> <!-- standard import order -->
     <importOrder>  <!-- or a custom ordering -->
-      <order>java,javax,org,com,com.diffplug,,\\#com.diffplug,\\#</order>  <!-- or use <file>${project.basedir}/eclipse.importorder</file> -->
-      <!-- you can use an empty string for all the imports you didn't specify explicitly, and '\\#` prefix for static imports -->
+      <order>java|javax,org,com,com.diffplug,,\\#com.diffplug,\\#</order>  <!-- or use <file>${project.basedir}/eclipse.importorder</file> -->
+      <!-- you can use an empty string for all the imports you didn't specify explicitly, '|' to join group without blank line, and '\\#` prefix for static imports. -->
     </importOrder>
 
     <greclipse />          <!-- has its own section below -->
diff --git a/testlib/src/main/resources/java/importsorter/JavaCodeSortedImportsSubgroups.test b/testlib/src/main/resources/java/importsorter/JavaCodeSortedImportsSubgroups.test
new file mode 100644
index 0000000000..b2346bb19c
--- /dev/null
+++ b/testlib/src/main/resources/java/importsorter/JavaCodeSortedImportsSubgroups.test
@@ -0,0 +1,16 @@
+import java.awt.*;
+import java.lang.Runnable;
+import java.lang.Thread;
+import java.util.*;
+import java.util.List;
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+
+import org.dooda.Didoo;
+import static com.foo.Bar;
+import static com.github.tomakehurst.wiremock.client.WireMock.*;
+import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
+
+import static java.lang.Exception.*;
+import static java.lang.Runnable.*;
+import static org.hamcrest.Matchers.*;
diff --git a/testlib/src/main/resources/java/importsorter/JavaCodeUnsortedImportsSubgroups.test b/testlib/src/main/resources/java/importsorter/JavaCodeUnsortedImportsSubgroups.test
new file mode 100644
index 0000000000..35d8c465e4
--- /dev/null
+++ b/testlib/src/main/resources/java/importsorter/JavaCodeUnsortedImportsSubgroups.test
@@ -0,0 +1,15 @@
+import static java.lang.Exception.*;
+import static com.github.tomakehurst.wiremock.client.WireMock.*;
+import org.dooda.Didoo;
+import java.util.List;
+import javax.inject.Inject;
+import java.lang.Thread;
+import java.util.*;
+import java.lang.Runnable;
+import static org.hamcrest.Matchers.*;
+import javax.annotation.Nullable;
+
+import static java.lang.Runnable.*;
+import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
+import static com.foo.Bar
+import java.awt.*;
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/ImportOrderStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/ImportOrderStepTest.java
index 332b5bc979..2db3651e02 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/ImportOrderStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/ImportOrderStepTest.java
@@ -34,6 +34,12 @@ void sortImportsFromArray() throws Throwable {
 		assertOnResources(step, "java/importsorter/JavaCodeUnsortedImports.test", "java/importsorter/JavaCodeSortedImports.test");
 	}
 
+	@Test
+	void sortImportsFromArrayWithSubgroups() throws Throwable {
+		FormatterStep step = ImportOrderStep.forJava().createFrom("java|javax", "org|\\#com", "\\#");
+		assertOnResources(step, "java/importsorter/JavaCodeUnsortedImportsSubgroups.test", "java/importsorter/JavaCodeSortedImportsSubgroups.test");
+	}
+
 	@Test
 	void sortImportsFromFile() throws Throwable {
 		FormatterStep step = ImportOrderStep.forJava().createFrom(createTestFile("java/importsorter/import.properties"));

From a1314e93e2274da1a29bfdec6c8056fcfd0d5293 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 23 Nov 2022 16:52:08 -0800
Subject: [PATCH 0364/2068] Update changelogs.

---
 CHANGES.md               | 3 ++-
 plugin-gradle/CHANGES.md | 2 ++
 plugin-maven/CHANGES.md  | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 4bd52e1aa0..634542e6af 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,10 +10,11 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* `importOrder` now support groups of imports without blank lines ([#1401](https://github.com/diffplug/spotless/pull/1401))
 ### Fixed
 * Don't treat `@Value` as a type annotation [#1367](https://github.com/diffplug/spotless/pull/1367)
 * Support `ktlint_disabled_rules` in `ktlint` 0.47.x [#1378](https://github.com/diffplug/spotless/pull/1378)
-* ImportOrder: support groups of imports without blank lines [#1401](https://github.com/diffplug/spotless/pull/1401)
 
 ## [2.30.0] - 2022-09-14
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 5acd85ddc8..b002c5bd74 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Added
+* `importOrder` now support groups of imports without blank lines ([#1401](https://github.com/diffplug/spotless/pull/1401))
 ### Fixed
 * Don't treat `@Value` as a type annotation [#1367](https://github.com/diffplug/spotless/pull/1367)
 * Support `ktlint_disabled_rules` in `ktlint` 0.47.x [#1378](https://github.com/diffplug/spotless/pull/1378)
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index b08a2366fd..cd42f0e8d8 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* `importOrder` now support groups of imports without blank lines ([#1401](https://github.com/diffplug/spotless/pull/1401))
 ### Fixed
 * Don't treat `@Value` as a type annotation [#1367](https://github.com/diffplug/spotless/pull/1367)
 * Support `ktlint_disabled_rules` in `ktlint` 0.47.x [#1378](https://github.com/diffplug/spotless/pull/1378)

From 997a4b5f9699cfbd5309bd81d6ef8a5d77f5403b Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 23 Nov 2022 22:14:59 -0800
Subject: [PATCH 0365/2068] spotlessApply

---
 .../java/com/diffplug/spotless/java/ImportSorterImpl.java   | 6 +++---
 .../com/diffplug/spotless/java/ImportOrderStepTest.java     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java b/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java
index 6dd8d58ba4..0390d99c1b 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,8 +46,8 @@ private static class ImportsGroup {
 
 		public ImportsGroup(String importOrder) {
 			this.subGroups = Stream.of(importOrder.split("\\" + SUBGROUP_SEPARATOR))
-				.map(this::normalizeStatic)
-				.collect(Collectors.toList());
+					.map(this::normalizeStatic)
+					.collect(Collectors.toList());
 		}
 
 		private String normalizeStatic(String subgroup) {
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/ImportOrderStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/ImportOrderStepTest.java
index 2db3651e02..32cf0a97c0 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/ImportOrderStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/ImportOrderStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From c280c4081a96d0ed3fea74ba4c0780d1431b389e Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 23 Nov 2022 23:12:29 -0800
Subject: [PATCH 0366/2068] Bump ktfmt to latest.

---
 lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
index 9e52bd0435..4f84d991bc 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
@@ -39,7 +39,7 @@ public class KtfmtStep {
 	// prevent direct instantiation
 	private KtfmtStep() {}
 
-	private static final String DEFAULT_VERSION = "0.40";
+	private static final String DEFAULT_VERSION = "0.41";
 	static final String NAME = "ktfmt";
 	static final String PACKAGE = "com.facebook";
 	static final String MAVEN_COORDINATE = PACKAGE + ":ktfmt:";

From 2ac1c46a6e161a44c0960fd1bb3ef042810799f2 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 23 Nov 2022 23:13:58 -0800
Subject: [PATCH 0367/2068] Update changelogs.

---
 CHANGES.md               | 2 ++
 plugin-gradle/CHANGES.md | 2 ++
 plugin-maven/CHANGES.md  | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 634542e6af..2b8dbcbb97 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,6 +15,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Don't treat `@Value` as a type annotation [#1367](https://github.com/diffplug/spotless/pull/1367)
 * Support `ktlint_disabled_rules` in `ktlint` 0.47.x [#1378](https://github.com/diffplug/spotless/pull/1378)
+### Changes
+* Bump default `ktfmt` version to latest `0.40` -> `0.41` ([#1340](https://github.com/diffplug/spotless/pull/1340))
 
 ## [2.30.0] - 2022-09-14
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index b002c5bd74..faf63fc28f 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -8,6 +8,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Don't treat `@Value` as a type annotation [#1367](https://github.com/diffplug/spotless/pull/1367)
 * Support `ktlint_disabled_rules` in `ktlint` 0.47.x [#1378](https://github.com/diffplug/spotless/pull/1378)
+### Changes
+* Bump default `ktfmt` version to latest `0.40` -> `0.41` ([#1340](https://github.com/diffplug/spotless/pull/1340))
 
 ## [6.11.0] - 2022-09-14
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index cd42f0e8d8..a12b42b761 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -8,6 +8,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Don't treat `@Value` as a type annotation [#1367](https://github.com/diffplug/spotless/pull/1367)
 * Support `ktlint_disabled_rules` in `ktlint` 0.47.x [#1378](https://github.com/diffplug/spotless/pull/1378)
+### Changes
+* Bump default `ktfmt` version to latest `0.40` -> `0.41` ([#1340](https://github.com/diffplug/spotless/pull/1340))
 
 ## [2.27.2] - 2022-10-10
 ### Fixed

From 91534af62b65b0c66ef14d87000e67a9f7e044b9 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 23 Nov 2022 23:17:19 -0800
Subject: [PATCH 0368/2068] Bump the default ScalaFmtStep version.

---
 lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java b/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java
index 6ef9fcd5a7..bff0d9b215 100644
--- a/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java
@@ -34,7 +34,7 @@ public class ScalaFmtStep {
 	// prevent direct instantiation
 	private ScalaFmtStep() {}
 
-	private static final String DEFAULT_VERSION = "3.5.9";
+	private static final String DEFAULT_VERSION = "3.6.1";
 
 	private static final String DEFAULT_SCALA_MAJOR_VERSION = "2.13";
 	static final String NAME = "scalafmt";

From 4f20754c0930d26646110e86c71f03d5d0a0bbe0 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 23 Nov 2022 23:19:05 -0800
Subject: [PATCH 0369/2068] Update changelogs.

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 1 +
 plugin-maven/CHANGES.md  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 2b8dbcbb97..04dedc886f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,6 +17,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Support `ktlint_disabled_rules` in `ktlint` 0.47.x [#1378](https://github.com/diffplug/spotless/pull/1378)
 ### Changes
 * Bump default `ktfmt` version to latest `0.40` -> `0.41` ([#1340](https://github.com/diffplug/spotless/pull/1340))
+* Bump default `scalafmt` version to latest `3.5.9` -> `3.6.1` ([#1373](https://github.com/diffplug/spotless/pull/1373))
 
 ## [2.30.0] - 2022-09-14
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index faf63fc28f..fdc40ef58b 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -10,6 +10,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Support `ktlint_disabled_rules` in `ktlint` 0.47.x [#1378](https://github.com/diffplug/spotless/pull/1378)
 ### Changes
 * Bump default `ktfmt` version to latest `0.40` -> `0.41` ([#1340](https://github.com/diffplug/spotless/pull/1340))
+* Bump default `scalafmt` version to latest `3.5.9` -> `3.6.1` ([#1373](https://github.com/diffplug/spotless/pull/1373))
 
 ## [6.11.0] - 2022-09-14
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index a12b42b761..9d728c41e8 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -10,6 +10,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Support `ktlint_disabled_rules` in `ktlint` 0.47.x [#1378](https://github.com/diffplug/spotless/pull/1378)
 ### Changes
 * Bump default `ktfmt` version to latest `0.40` -> `0.41` ([#1340](https://github.com/diffplug/spotless/pull/1340))
+* Bump default `scalafmt` version to latest `3.5.9` -> `3.6.1` ([#1373](https://github.com/diffplug/spotless/pull/1373))
 
 ## [2.27.2] - 2022-10-10
 ### Fixed

From aa8cd409b298ba801815ac759aa22deb1712c532 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 23 Nov 2022 23:22:31 -0800
Subject: [PATCH 0370/2068] Bump diktat 1.2.3 -> 1.2.4.2

---
 CHANGES.md                                                     | 1 +
 lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java | 2 +-
 plugin-gradle/CHANGES.md                                       | 1 +
 plugin-maven/CHANGES.md                                        | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 04dedc886f..0522c24fcd 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -18,6 +18,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changes
 * Bump default `ktfmt` version to latest `0.40` -> `0.41` ([#1340](https://github.com/diffplug/spotless/pull/1340))
 * Bump default `scalafmt` version to latest `3.5.9` -> `3.6.1` ([#1373](https://github.com/diffplug/spotless/pull/1373))
+* Bump default `diktat` version to latest `1.2.3` -> `1.2.4.2` ([#1393](https://github.com/diffplug/spotless/pull/1393))
 
 ## [2.30.0] - 2022-09-14
 ### Added
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
index f1cd3103d9..9fb5bd634f 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
@@ -32,7 +32,7 @@ private DiktatStep() {}
 
 	private static final String MIN_SUPPORTED_VERSION = "1.2.1";
 
-	private static final String DEFAULT_VERSION = "1.2.3";
+	private static final String DEFAULT_VERSION = "1.2.4.2";
 	static final String NAME = "diktat";
 	static final String PACKAGE_DIKTAT = "org.cqfn.diktat";
 	static final String MAVEN_COORDINATE = PACKAGE_DIKTAT + ":diktat-rules:";
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index fdc40ef58b..7a297ba536 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -11,6 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changes
 * Bump default `ktfmt` version to latest `0.40` -> `0.41` ([#1340](https://github.com/diffplug/spotless/pull/1340))
 * Bump default `scalafmt` version to latest `3.5.9` -> `3.6.1` ([#1373](https://github.com/diffplug/spotless/pull/1373))
+* Bump default `diktat` version to latest `1.2.3` -> `1.2.4.2` ([#1393](https://github.com/diffplug/spotless/pull/1393))
 
 ## [6.11.0] - 2022-09-14
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 9d728c41e8..3348adbb77 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -11,6 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changes
 * Bump default `ktfmt` version to latest `0.40` -> `0.41` ([#1340](https://github.com/diffplug/spotless/pull/1340))
 * Bump default `scalafmt` version to latest `3.5.9` -> `3.6.1` ([#1373](https://github.com/diffplug/spotless/pull/1373))
+* Bump default `diktat` version to latest `1.2.3` -> `1.2.4.2` ([#1393](https://github.com/diffplug/spotless/pull/1393))
 
 ## [2.27.2] - 2022-10-10
 ### Fixed

From 284dfaf0fc1b92a583f74bc3298f15295aa6a7f8 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 24 Nov 2022 00:05:06 -0800
Subject: [PATCH 0371/2068] Fix the scalafmt tests.

---
 testlib/src/main/resources/scala/scalafmt/scalafmt.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testlib/src/main/resources/scala/scalafmt/scalafmt.conf b/testlib/src/main/resources/scala/scalafmt/scalafmt.conf
index bcfec161f4..e15d7318fa 100644
--- a/testlib/src/main/resources/scala/scalafmt/scalafmt.conf
+++ b/testlib/src/main/resources/scala/scalafmt/scalafmt.conf
@@ -1,4 +1,4 @@
-version = 3.5.9
+version = 3.6.1
 runner.dialect = scala213
 style = defaultWithAlign # For pretty alignment.
 maxColumn = 20           # For my teensy narrow display

From 933ad2a8b56f78cb47fcb43738b8bb2ed668c2f7 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 24 Nov 2022 00:20:17 -0800
Subject: [PATCH 0372/2068] Bump default `palantir-java-format` version to
 latest `2.10` -> `2.28`

---
 .../java/com/diffplug/spotless/java/PalantirJavaFormatStep.java | 2 +-
 .../com/diffplug/spotless/java/PalantirJavaFormatStepTest.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
index 89673787d6..67c55c2e86 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
@@ -29,7 +29,7 @@ private PalantirJavaFormatStep() {}
 
 	private static final String NAME = "palantir-java-format";
 	private static final String MAVEN_COORDINATE = "com.palantir.javaformat:palantir-java-format:";
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(8, "1.1.0").add(11, "2.10.0");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(8, "1.1.0").add(11, "2.28.0");
 
 	/** Creates a step which formats everything - code, import order, and unused imports. */
 	public static FormatterStep create(Provisioner provisioner) {
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/PalantirJavaFormatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/PalantirJavaFormatStepTest.java
index a589992567..ad358cafc6 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/PalantirJavaFormatStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/PalantirJavaFormatStepTest.java
@@ -40,7 +40,7 @@ void jvm13Features() throws Exception {
 	@Test
 	@EnabledForJreRange(min = JAVA_11)
 	void behavior2() throws Exception {
-		FormatterStep step = PalantirJavaFormatStep.create("2.10.0", TestProvisioner.mavenCentral());
+		FormatterStep step = PalantirJavaFormatStep.create("2.28.0", TestProvisioner.mavenCentral());
 		StepHarness.forStep(step)
 				.testResource("java/palantirjavaformat/JavaCodeUnformatted.test", "java/palantirjavaformat/JavaCodeFormatted.test")
 				.testResource("java/palantirjavaformat/JavaCodeWithLicenseUnformatted.test", "java/palantirjavaformat/JavaCodeWithLicenseFormatted.test")

From d30fc64f1cf1a51289c9d34c61c6ec134aa6274f Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 24 Nov 2022 00:20:23 -0800
Subject: [PATCH 0373/2068] Bump changelogs.

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 1 +
 plugin-maven/CHANGES.md  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 0522c24fcd..fdd4925141 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -19,6 +19,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktfmt` version to latest `0.40` -> `0.41` ([#1340](https://github.com/diffplug/spotless/pull/1340))
 * Bump default `scalafmt` version to latest `3.5.9` -> `3.6.1` ([#1373](https://github.com/diffplug/spotless/pull/1373))
 * Bump default `diktat` version to latest `1.2.3` -> `1.2.4.2` ([#1393](https://github.com/diffplug/spotless/pull/1393))
+* Bump default `palantir-java-format` version to latest `2.10` -> `2.28` ([#1393](https://github.com/diffplug/spotless/pull/1393))
 
 ## [2.30.0] - 2022-09-14
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 7a297ba536..cdc2be9766 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktfmt` version to latest `0.40` -> `0.41` ([#1340](https://github.com/diffplug/spotless/pull/1340))
 * Bump default `scalafmt` version to latest `3.5.9` -> `3.6.1` ([#1373](https://github.com/diffplug/spotless/pull/1373))
 * Bump default `diktat` version to latest `1.2.3` -> `1.2.4.2` ([#1393](https://github.com/diffplug/spotless/pull/1393))
+* Bump default `palantir-java-format` version to latest `2.10` -> `2.28` ([#1393](https://github.com/diffplug/spotless/pull/1393))
 
 ## [6.11.0] - 2022-09-14
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 3348adbb77..dccbe089d5 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktfmt` version to latest `0.40` -> `0.41` ([#1340](https://github.com/diffplug/spotless/pull/1340))
 * Bump default `scalafmt` version to latest `3.5.9` -> `3.6.1` ([#1373](https://github.com/diffplug/spotless/pull/1373))
 * Bump default `diktat` version to latest `1.2.3` -> `1.2.4.2` ([#1393](https://github.com/diffplug/spotless/pull/1393))
+* Bump default `palantir-java-format` version to latest `2.10` -> `2.28` ([#1393](https://github.com/diffplug/spotless/pull/1393))
 
 ## [2.27.2] - 2022-10-10
 ### Fixed

From 075d6375bb35ad8bb66e21beefdd2ce90a6339f3 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 24 Nov 2022 00:21:33 -0800
Subject: [PATCH 0374/2068] Bump lib to latest.

---
 lib/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 472da94a61..9fd9981370 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -52,7 +52,7 @@ dependencies {
 	sortPomCompileOnly 'com.github.ekryd.sortpom:sortpom-sorter:3.0.0'
 	sortPomCompileOnly 'org.slf4j:slf4j-api:2.0.0'
 
-	palantirJavaFormatCompileOnly 'com.palantir.javaformat:palantir-java-format:2.27.0'
+	palantirJavaFormatCompileOnly 'com.palantir.javaformat:palantir-java-format:2.28.0'
 
 	String VER_KTFMT = '0.41'
 	ktfmtCompileOnly "com.facebook:ktfmt:$VER_KTFMT"

From 050009fb378caadca16c062b741f81366ea5e4ac Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 24 Nov 2022 00:29:24 -0800
Subject: [PATCH 0375/2068] Stop testing node on windows because it's too slow
 and we test it anyway with test_npm_8.

---
 .circleci/config.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 83e434bcec..dd9adf4c00 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -140,13 +140,6 @@ jobs:
           path: lib-extra/build/test-results/test
       - store_test_results:
           path: plugin-gradle/build/test-results/test
-      - run:
-          name: gradlew testNpm
-          command: gradlew testNpm --build-cache -PSPOTLESS_EXCLUDE_MAVEN=true
-      - store_test_results:
-          path: testlib/build/test-results/testNpm
-      - store_test_results:
-          path: plugin-gradle/build/test-results/testNpm
   changelog_print:
     << : *env_gradle
     steps:

From fd70d743f4832303e468f549b4f8b8d17398b73d Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 24 Nov 2022 01:05:29 -0800
Subject: [PATCH 0376/2068] Fix CI

---
 lib/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 9fd9981370..e398e80d23 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -52,7 +52,7 @@ dependencies {
 	sortPomCompileOnly 'com.github.ekryd.sortpom:sortpom-sorter:3.0.0'
 	sortPomCompileOnly 'org.slf4j:slf4j-api:2.0.0'
 
-	palantirJavaFormatCompileOnly 'com.palantir.javaformat:palantir-java-format:2.28.0'
+	palantirJavaFormatCompileOnly 'com.palantir.javaformat:palantir-java-format:1.1.0' 	// this version needs to stay compilable against Java 8 for CI Job testNpm
 
 	String VER_KTFMT = '0.41'
 	ktfmtCompileOnly "com.facebook:ktfmt:$VER_KTFMT"

From d7d7ecce6d10b45739e49abed74162538cec62f6 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 24 Nov 2022 13:33:20 -0800
Subject: [PATCH 0377/2068] Fix publishing by bumping spotless-changelog to
 latest.

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 6184ab802f..591901cab5 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -8,7 +8,7 @@ pluginManagement {
 		// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
 		id 'com.github.spotbugs'                   version '5.0.13'
 		// https://github.com/diffplug/spotless-changelog
-		id 'com.diffplug.spotless-changelog'       version '2.4.0'
+		id 'com.diffplug.spotless-changelog'       version '2.4.1'
 		// https://github.com/diffplug/goomph/blob/main/CHANGES.md
 		id 'com.diffplug.p2.asmaven'               version '3.27.0' // DO NOT UPDATE, see https://github.com/diffplug/spotless/pull/874
 		// https://github.com/gradle/test-retry-gradle-plugin/releases

From f2f8b08dd855d79973fa29048d654b1e12cb35cb Mon Sep 17 00:00:00 2001
From: circleci <circleci@7c0119aa505e>
Date: Thu, 24 Nov 2022 22:19:00 +0000
Subject: [PATCH 0378/2068] Published lib/2.31.0

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index fdd4925141..b4bdc4479e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.31.0] - 2022-11-24
 ### Added
 * `importOrder` now support groups of imports without blank lines ([#1401](https://github.com/diffplug/spotless/pull/1401))
 ### Fixed

From a31bba3e5a623f2dbb4eb98d1946961b8dbd23e3 Mon Sep 17 00:00:00 2001
From: circleci <circleci@7c0119aa505e>
Date: Thu, 24 Nov 2022 22:20:03 +0000
Subject: [PATCH 0379/2068] Published gradle/6.12.0

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 46 ++++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index cdc2be9766..2060e5e90c 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [6.12.0] - 2022-11-24
 ### Added
 * `importOrder` now support groups of imports without blank lines ([#1401](https://github.com/diffplug/spotless/pull/1401))
 ### Fixed
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 03d933aea2..fcc0336cbb 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -18,9 +18,9 @@ output = [
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
 [![Maven central](https://img.shields.io/badge/mavencentral-yes-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/index.html)
 [![License Apache](https://img.shields.io/badge/license-apache-blue.svg)](https://tldrlegal.com/license/apache-license-2.0-(apache-2.0))
-[![Changelog](https://img.shields.io/badge/changelog-6.11.0-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-6.12.0-blue.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)
@@ -128,10 +128,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -143,7 +143,7 @@ If you're stuck on an older version of Gradle, `id 'com.diffplug.gradle.spotless
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -267,8 +267,8 @@ You can make a pull request to add new annotations to Spotless's default list.
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -319,8 +319,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -383,7 +383,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -415,7 +415,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -447,7 +447,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -481,7 +481,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -502,7 +502,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -527,7 +527,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -567,7 +567,7 @@ sql.formatter.indent.size=4
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -610,7 +610,7 @@ For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#n
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -835,7 +835,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -902,9 +902,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -937,11 +937,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.11.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From 4d34ad4dda4161df018863b22c9eb1162651da1d Mon Sep 17 00:00:00 2001
From: circleci <circleci@7c0119aa505e>
Date: Thu, 24 Nov 2022 22:21:45 +0000
Subject: [PATCH 0380/2068] Published maven/2.28.0

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index dccbe089d5..9baefc2ec8 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.28.0] - 2022-11-24
 ### Added
 * `importOrder` now support groups of imports without blank lines ([#1401](https://github.com/diffplug/spotless/pull/1401))
 ### Fixed
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index d596af229b..e6a2c47aae 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -12,8 +12,8 @@ output = [
   ].join('\n');
 -->
 [![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.27.2/index.html)
-[![Changelog](https://img.shields.io/badge/changelog-2.27.2-brightgreen.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.28.0/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.28.0-brightgreen.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)

From aac6de4e80171e5a8dc6aaf5682bbc1069d956ad Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 24 Nov 2022 23:26:23 +0000
Subject: [PATCH 0381/2068] chore(deps): update plugin com.diffplug.spotless to
 v6.12.0

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 591901cab5..e0f3291da5 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,6 @@
 pluginManagement {
 	plugins {
-		id 'com.diffplug.spotless'                 version '6.11.0'
+		id 'com.diffplug.spotless'                 version '6.12.0'
 		// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
 		id 'com.gradle.plugin-publish'             version '1.1.0'
 		// https://github.com/gradle-nexus/publish-plugin/releases

From ad9159e266647a422ec3d6b3f89e794f36515733 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 25 Nov 2022 15:18:54 +0000
Subject: [PATCH 0382/2068] chore(deps): update dependency gradle to v7.6

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 60756 -> 61574 bytes
 gradle/wrapper/gradle-wrapper.properties |   3 ++-
 gradlew                                  |  12 ++++++++----
 gradlew.bat                              |   1 +
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 249e5832f090a2944b7473328c07c9755baa3196..943f0cbfa754578e88a3dae77fce6e3dea56edbf 100755
GIT binary patch
delta 36524
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

delta 35766
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%0DG<S^qW!A-@`soL|Nd&|btslc<LhQ&mX>K?7GHTj
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
VwlMN}`%er%aGR6olj~j${vQ;P=LY})

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ae04661ee7..f398c33c4b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index a69d9cb6c2..65dcd68d65 100755
--- a/gradlew
+++ b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
diff --git a/gradlew.bat b/gradlew.bat
index f127cfd49d..93e3f59f13 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

From 4816da628f08453210e0cbf503988f321cae6686 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 30 Nov 2022 16:14:47 +0000
Subject: [PATCH 0383/2068] chore(deps): update plugin org.gradle.test-retry to
 v1.5.0

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index e0f3291da5..eb818a2c0e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,7 +12,7 @@ pluginManagement {
 		// https://github.com/diffplug/goomph/blob/main/CHANGES.md
 		id 'com.diffplug.p2.asmaven'               version '3.27.0' // DO NOT UPDATE, see https://github.com/diffplug/spotless/pull/874
 		// https://github.com/gradle/test-retry-gradle-plugin/releases
-		id 'org.gradle.test-retry'                 version '1.4.1'
+		id 'org.gradle.test-retry'                 version '1.5.0'
 		// https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md
 		id 'com.adarshr.test-logger'               version '3.2.0'
 		// https://github.com/davidburstrom/version-compatibility-gradle-plugin/tags

From 1f0397c6976d02ffa034441900145ac526e651d8 Mon Sep 17 00:00:00 2001
From: Konrad Windszus <kwin@apache.org>
Date: Thu, 1 Dec 2022 12:30:05 +0100
Subject: [PATCH 0384/2068] Add m2e support

This closes #1413
---
 plugin-maven/build.gradle                     |  1 +
 .../spotless/maven/AbstractSpotlessMojo.java  | 10 ++++--
 .../spotless/maven/SpotlessApplyMojo.java     |  1 +
 .../maven/incremental/UpToDateChecker.java    | 22 +++++++++++++
 .../m2e/lifecycle-mapping-metadata.xml        | 32 +++++++++++++++++++
 5 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 plugin-maven/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml

diff --git a/plugin-maven/build.gradle b/plugin-maven/build.gradle
index b7ac8a36c8..3ea73e6101 100644
--- a/plugin-maven/build.gradle
+++ b/plugin-maven/build.gradle
@@ -76,6 +76,7 @@ dependencies {
 	implementation "com.diffplug.durian:durian-collect:${VER_DURIAN}"
 	implementation("org.codehaus.plexus:plexus-resources:${VER_PLEXUS_RESOURCES}")
 	implementation "org.eclipse.jgit:org.eclipse.jgit:${VER_JGIT}"
+	implementation 'org.sonatype.plexus:plexus-build-api:0.0.7'
 
 	testImplementation project(":testlib")
 	testImplementation "org.junit.jupiter:junit-jupiter:${VER_JUNIT}"
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
index f163fa2802..a0180e6d75 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
@@ -88,6 +88,9 @@ public abstract class AbstractSpotlessMojo extends AbstractMojo {
 	@Component
 	private ResourceManager resourceManager;
 
+	@Component
+	protected BuildContext buildContext;
+
 	@Parameter(defaultValue = "${mojoExecution.goal}", required = true, readonly = true)
 	private String goal;
 
@@ -344,10 +347,13 @@ private UpToDateChecker createUpToDateChecker(Iterable<Formatter> formatters) {
 			Path targetDir = project.getBasedir().toPath().resolve(project.getBuild().getDirectory());
 			indexFile = targetDir.resolve(DEFAULT_INDEX_FILE_NAME);
 		}
+		final UpToDateChecker checker;
 		if (upToDateChecking != null && upToDateChecking.isEnabled()) {
 			getLog().info("Up-to-date checking enabled");
-			return UpToDateChecker.forProject(project, indexFile, formatters, getLog());
+			checker = UpToDateChecker.forProject(project, indexFile, formatters, getLog());
+		} else {
+			checker = UpToDateChecker.noop(project, indexFile, getLog());
 		}
-		return UpToDateChecker.noop(project, indexFile, getLog());
+		return UpToDateChecker.wrapWithBuildContext(checker, buildContext);
 	}
 }
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
index 6ea67240ee..4f3fb64f5a 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
@@ -45,6 +45,7 @@ protected void process(Iterable<File> files, Formatter formatter, UpToDateChecke
 				PaddedCell.DirtyState dirtyState = PaddedCell.calculateDirtyState(formatter, file);
 				if (!dirtyState.isClean() && !dirtyState.didNotConverge()) {
 					dirtyState.writeCanonicalTo(file);
+					buildContext.refresh(file);
 				}
 			} catch (IOException e) {
 				throw new MojoExecutionException("Unable to format file " + file, e);
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/UpToDateChecker.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/UpToDateChecker.java
index 2fd2f3a1ea..6dd21728e3 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/UpToDateChecker.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/UpToDateChecker.java
@@ -19,6 +19,7 @@
 
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.project.MavenProject;
+import org.sonatype.plexus.build.incremental.BuildContext;
 
 import com.diffplug.spotless.Formatter;
 
@@ -37,4 +38,25 @@ static UpToDateChecker noop(MavenProject project, Path indexFile, Log log) {
 	static UpToDateChecker forProject(MavenProject project, Path indexFile, Iterable<Formatter> formatters, Log log) {
 		return IndexBasedChecker.create(project, indexFile, formatters, log);
 	}
+	
+	static UpToDateChecker wrapWithBuildContext(UpToDateChecker delegate, BuildContext buildContext) {
+		return new UpToDateChecker() {
+		
+			@Override
+			public void setUpToDate(Path file) {
+				delegate.setUpToDate(file);
+			}
+
+			@Override
+			public boolean isUpToDate(Path file) {
+				return !buildContext.hasDelta(file.toFile()) || delegate.isUpToDate(file);
+			}
+
+			@Override
+			public void close() {
+				delegate.close();
+			}
+		};
+	}
+	
 }
diff --git a/plugin-maven/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml b/plugin-maven/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
new file mode 100644
index 0000000000..9000b83704
--- /dev/null
+++ b/plugin-maven/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
@@ -0,0 +1,32 @@
+<!--
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<!-- metadata for m2e: https://www.eclipse.org/m2e/documentation/m2e-making-maven-plugins-compat.html -->
+<lifecycleMappingMetadata>
+    <pluginExecutions>
+        <pluginExecution>
+            <pluginExecutionFilter>
+                <goals>
+                    <goal>apply</goal>
+                    <goal>check</goal>
+                </goals>
+            </pluginExecutionFilter>
+            <action>
+                <execute>
+                    <runOnIncremental>true</runOnIncremental>
+                    <runOnConfiguration>false</runOnConfiguration>
+                </execute>
+            </action>
+        </pluginExecution>
+    </pluginExecutions>
+</lifecycleMappingMetadata>
\ No newline at end of file

From a7c0f67a76da52d80f575fdf43ac481906210999 Mon Sep 17 00:00:00 2001
From: Konrad Windszus <kwin@apache.org>
Date: Thu, 1 Dec 2022 12:41:37 +0100
Subject: [PATCH 0385/2068] fix formatting

---
 .../java/com/diffplug/spotless/maven/SpotlessApplyMojo.java | 2 +-
 .../spotless/maven/incremental/UpToDateChecker.java         | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
index 4f3fb64f5a..7a15d01b17 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/UpToDateChecker.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/UpToDateChecker.java
index 6dd21728e3..f63b8b4dfc 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/UpToDateChecker.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/UpToDateChecker.java
@@ -38,10 +38,10 @@ static UpToDateChecker noop(MavenProject project, Path indexFile, Log log) {
 	static UpToDateChecker forProject(MavenProject project, Path indexFile, Iterable<Formatter> formatters, Log log) {
 		return IndexBasedChecker.create(project, indexFile, formatters, log);
 	}
-	
+
 	static UpToDateChecker wrapWithBuildContext(UpToDateChecker delegate, BuildContext buildContext) {
 		return new UpToDateChecker() {
-		
+
 			@Override
 			public void setUpToDate(Path file) {
 				delegate.setUpToDate(file);
@@ -58,5 +58,5 @@ public void close() {
 			}
 		};
 	}
-	
+
 }

From fa232426a5ea26cee7a8e483b3a81c3677a1c1d1 Mon Sep 17 00:00:00 2001
From: Konrad Windszus <kwin@apache.org>
Date: Thu, 1 Dec 2022 12:45:57 +0100
Subject: [PATCH 0386/2068] add missing import

---
 .../java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
index a0180e6d75..e4fdc7dcd0 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
@@ -50,6 +50,7 @@
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.repository.RemoteRepository;
+import org.sonatype.plexus.build.incremental.BuildContext;
 
 import com.diffplug.spotless.Formatter;
 import com.diffplug.spotless.LineEnding;

From b7b17a9831095685622934f34133585c55517c4e Mon Sep 17 00:00:00 2001
From: Konrad Windszus <kwin@apache.org>
Date: Sat, 3 Dec 2022 09:37:48 +0100
Subject: [PATCH 0387/2068] replace OR by AND

---
 .../diffplug/spotless/maven/incremental/UpToDateChecker.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/UpToDateChecker.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/UpToDateChecker.java
index f63b8b4dfc..be971cb374 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/UpToDateChecker.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/UpToDateChecker.java
@@ -49,7 +49,7 @@ public void setUpToDate(Path file) {
 
 			@Override
 			public boolean isUpToDate(Path file) {
-				return !buildContext.hasDelta(file.toFile()) || delegate.isUpToDate(file);
+				return !buildContext.hasDelta(file.toFile()) && delegate.isUpToDate(file);
 			}
 
 			@Override

From b22f54fe8367051e3a3bd969e1c7155713beb1e3 Mon Sep 17 00:00:00 2001
From: Konrad Windszus <kwin@apache.org>
Date: Sat, 3 Dec 2022 09:48:00 +0100
Subject: [PATCH 0388/2068] fix condition to only evaluate IndexBasedChecker
 when necessary

---
 .../diffplug/spotless/maven/incremental/UpToDateChecker.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/UpToDateChecker.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/UpToDateChecker.java
index be971cb374..bda325d992 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/UpToDateChecker.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/UpToDateChecker.java
@@ -49,7 +49,10 @@ public void setUpToDate(Path file) {
 
 			@Override
 			public boolean isUpToDate(Path file) {
-				return !buildContext.hasDelta(file.toFile()) && delegate.isUpToDate(file);
+				if (buildContext.hasDelta(file)) {
+					return delegate.isUpToDate(file);
+				}
+				return true;
 			}
 
 			@Override

From fc02156bdc8c265a20eb475e48438e93af783412 Mon Sep 17 00:00:00 2001
From: Konrad Windszus <kwin@apache.org>
Date: Mon, 5 Dec 2022 09:53:10 +0100
Subject: [PATCH 0389/2068] fix compilation error and make field private

---
 .../java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java  | 2 +-
 .../diffplug/spotless/maven/incremental/UpToDateChecker.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
index e4fdc7dcd0..2f3f0e4ab2 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
@@ -90,7 +90,7 @@ public abstract class AbstractSpotlessMojo extends AbstractMojo {
 	private ResourceManager resourceManager;
 
 	@Component
-	protected BuildContext buildContext;
+	private BuildContext buildContext;
 
 	@Parameter(defaultValue = "${mojoExecution.goal}", required = true, readonly = true)
 	private String goal;
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/UpToDateChecker.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/UpToDateChecker.java
index bda325d992..40dc84c8c6 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/UpToDateChecker.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/UpToDateChecker.java
@@ -49,7 +49,7 @@ public void setUpToDate(Path file) {
 
 			@Override
 			public boolean isUpToDate(Path file) {
-				if (buildContext.hasDelta(file)) {
+				if (buildContext.hasDelta(file.toFile())) {
 					return delegate.isUpToDate(file);
 				}
 				return true;

From 52ea9fb8e1694245ce74f1c03b3e3ffbdcddbdb1 Mon Sep 17 00:00:00 2001
From: Konrad Windszus <kwin@apache.org>
Date: Mon, 5 Dec 2022 09:56:08 +0100
Subject: [PATCH 0390/2068] revert making field private, as accessed in
 subclasses

---
 .../java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
index 2f3f0e4ab2..e4fdc7dcd0 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
@@ -90,7 +90,7 @@ public abstract class AbstractSpotlessMojo extends AbstractMojo {
 	private ResourceManager resourceManager;
 
 	@Component
-	private BuildContext buildContext;
+	protected BuildContext buildContext;
 
 	@Parameter(defaultValue = "${mojoExecution.goal}", required = true, readonly = true)
 	private String goal;

From 99272b229158ef0116c53ed9e8a7f69008638f93 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 9 Dec 2022 13:59:44 +0000
Subject: [PATCH 0391/2068] fix(deps): update dependency com.facebook:ktfmt to
 v0.42

---
 lib/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index e398e80d23..18935800fa 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -54,7 +54,7 @@ dependencies {
 
 	palantirJavaFormatCompileOnly 'com.palantir.javaformat:palantir-java-format:1.1.0' 	// this version needs to stay compilable against Java 8 for CI Job testNpm
 
-	String VER_KTFMT = '0.41'
+	String VER_KTFMT = '0.42'
 	ktfmtCompileOnly "com.facebook:ktfmt:$VER_KTFMT"
 	String VER_KTLINT_GOOGLE_JAVA_FORMAT = '1.7' // for JDK 8 compatibility
 	ktfmtCompileOnly("com.google.googlejavaformat:google-java-format") {

From 2e4197ec7a99482a090d3f5a7da70f040e497e98 Mon Sep 17 00:00:00 2001
From: Laurent Goujon <laurent@dremio.com>
Date: Thu, 15 Dec 2022 14:55:19 -0800
Subject: [PATCH 0392/2068] Fix typo in gradle properties

Fix typo in constant used by gradle scripts: ECLISPE -> ECLIPSE
---
 _ext/eclipse-cdt/build.gradle         |  4 ++--
 _ext/eclipse-cdt/gradle.properties    |  4 ++--
 _ext/eclipse-groovy/build.gradle      |  2 +-
 _ext/eclipse-groovy/gradle.properties |  2 +-
 _ext/eclipse-wtp/build.gradle         | 10 +++++-----
 _ext/eclipse-wtp/gradle.properties    |  8 ++++----
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/_ext/eclipse-cdt/build.gradle b/_ext/eclipse-cdt/build.gradle
index 17819f4a2e..93ccac3b24 100644
--- a/_ext/eclipse-cdt/build.gradle
+++ b/_ext/eclipse-cdt/build.gradle
@@ -19,13 +19,13 @@ apply from: rootProject.file('gradle/java-publish.gradle')
 dependencies {
 	implementation "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLISPE_BASE}"
 	// Provides text partitioners for formatters
-	implementation ("org.eclipse.platform:org.eclipse.jface.text:${VER_ECLISPE_JFACE}") {
+	implementation ("org.eclipse.platform:org.eclipse.jface.text:${VER_ECLIPSE_JFACE}") {
 		exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt'
 	}
 	// Required to by CCorePlugin calling CDTLogWriter
 	implementation "com.ibm.icu:icu4j:${VER_IBM_ICU}"
 	// Required to by CCorePlugin calling PositionTrackerManager
-	implementation "org.eclipse.platform:org.eclipse.core.filebuffers:${VER_ECLISPE_EFS}"
+	implementation "org.eclipse.platform:org.eclipse.core.filebuffers:${VER_ECLIPSE_EFS}"
 
 	testImplementation("org.slf4j:slf4j-simple:${VER_SLF4J}")
 }
diff --git a/_ext/eclipse-cdt/gradle.properties b/_ext/eclipse-cdt/gradle.properties
index 9c1c8a7ee6..10166b51d0 100644
--- a/_ext/eclipse-cdt/gradle.properties
+++ b/_ext/eclipse-cdt/gradle.properties
@@ -7,6 +7,6 @@ VER_JAVA=11
 # Compile dependencies
 VER_ECLIPSE_CDT=10.5
 VER_SPOTLESS_ECLISPE_BASE=[3.5.0,4.0.0[
-VER_ECLISPE_JFACE=[3.18.0,4.0.0[
-VER_ECLISPE_EFS=[3.7.0,4.0.0[
+VER_ECLIPSE_JFACE=[3.18.0,4.0.0[
+VER_ECLIPSE_EFS=[3.7.0,4.0.0[
 VER_IBM_ICU=[67.1,68[
diff --git a/_ext/eclipse-groovy/build.gradle b/_ext/eclipse-groovy/build.gradle
index e1382acd76..00a7fed489 100644
--- a/_ext/eclipse-groovy/build.gradle
+++ b/_ext/eclipse-groovy/build.gradle
@@ -41,7 +41,7 @@ apply from: rootProject.file('gradle/java-publish.gradle')
 dependencies {
 	implementation "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLISPE_BASE}"
 	// Provides text partitioners for formatters
-	implementation ("org.eclipse.platform:org.eclipse.jface.text:${VER_ECLISPE_JFACE}") {
+	implementation ("org.eclipse.platform:org.eclipse.jface.text:${VER_ECLIPSE_JFACE}") {
 		exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt'
 	}
 	testImplementation("org.slf4j:slf4j-simple:${VER_SLF4J}")
diff --git a/_ext/eclipse-groovy/gradle.properties b/_ext/eclipse-groovy/gradle.properties
index b8a21001fd..9569e765bc 100644
--- a/_ext/eclipse-groovy/gradle.properties
+++ b/_ext/eclipse-groovy/gradle.properties
@@ -7,7 +7,7 @@ VER_JAVA=11
 # Compile
 VER_ECLIPSE=4.21
 VER_SPOTLESS_ECLISPE_BASE=[3.4.2,4.0.0[
-VER_ECLISPE_JFACE=[3.15.300,4.0.0[
+VER_ECLIPSE_JFACE=[3.15.300,4.0.0[
 VER_GRECLIPSE=4.3.0
 VER_GROOVY=4.0.0
 # Use org.eclipse.jdt.core patched for Groovy-Eclipse
diff --git a/_ext/eclipse-wtp/build.gradle b/_ext/eclipse-wtp/build.gradle
index 4001e100c2..ba32385a1b 100644
--- a/_ext/eclipse-wtp/build.gradle
+++ b/_ext/eclipse-wtp/build.gradle
@@ -64,20 +64,20 @@ dependencies {
 	// Required by most WPT formatters
 	implementation "com.ibm.icu:icu4j:${VER_IBM_ICU}"
 	// The XSD/DTD and other models are defined with EMF.
-	implementation "org.eclipse.emf:org.eclipse.emf.common:${VER_ECLISPE_EMF}"
-	implementation "org.eclipse.emf:org.eclipse.emf.ecore:${VER_ECLISPE_EMF}"
+	implementation "org.eclipse.emf:org.eclipse.emf.common:${VER_ECLIPSE_EMF}"
+	implementation "org.eclipse.emf:org.eclipse.emf.ecore:${VER_ECLIPSE_EMF}"
 	// Some WPT plugins requires OSGI bundle interfaces (but not effectively used)
 	implementation "org.eclipse.platform:org.eclipse.osgi.services:${VER_ECLIPSE_OSGI_SERVICES}"
 	// Provides document data structure and file buffers for formatters
 	implementation "org.eclipse.platform:org.eclipse.core.filebuffers:${VER_ECLIPSE_FILE_BUFFERS}"
 	// Provides text partitioners for formatters
-	implementation ("org.eclipse.platform:org.eclipse.jface.text:${VER_ECLISPE_JFACE}") {
+	implementation ("org.eclipse.platform:org.eclipse.jface.text:${VER_ECLIPSE_JFACE}") {
 		exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt'
 	}
 	// Some WPT plugins use the EFS for storing temporary worspace data
-	implementation "org.eclipse.platform:org.eclipse.core.filesystem:${VER_ECLISPE_EFS}"
+	implementation "org.eclipse.platform:org.eclipse.core.filesystem:${VER_ECLIPSE_EFS}"
 	// Required by org.eclipse.wst.xsd.core
-	implementation "org.eclipse.emf:org.eclipse.xsd:${VER_ECLISPE_XSD}"
+	implementation "org.eclipse.emf:org.eclipse.xsd:${VER_ECLIPSE_XSD}"
 
 	testImplementation("org.slf4j:slf4j-simple:${VER_SLF4J}")
 }
diff --git a/_ext/eclipse-wtp/gradle.properties b/_ext/eclipse-wtp/gradle.properties
index 743748d1ba..f6cedd63e3 100644
--- a/_ext/eclipse-wtp/gradle.properties
+++ b/_ext/eclipse-wtp/gradle.properties
@@ -8,9 +8,9 @@ VER_JAVA=11
 VER_ECLIPSE_WTP=2021-09
 VER_SPOTLESS_ECLISPE_BASE=[3.5.0,4.0.0[
 VER_IBM_ICU=[67.1,68[
-VER_ECLISPE_EMF=[2.22.0,3.0.0[
+VER_ECLIPSE_EMF=[2.22.0,3.0.0[
 VER_ECLIPSE_OSGI_SERVICES=[3.10.0,4.0.0[
 VER_ECLIPSE_FILE_BUFFERS=[3.7.0,4.0.0[
-VER_ECLISPE_JFACE=[3.18.0,4.0.0[
-VER_ECLISPE_EFS=[1.9.0,2.0.0[
-VER_ECLISPE_XSD=[2.18.0,3.0.0[
+VER_ECLIPSE_JFACE=[3.18.0,4.0.0[
+VER_ECLIPSE_EFS=[1.9.0,2.0.0[
+VER_ECLIPSE_XSD=[2.18.0,3.0.0[

From 697236562f7ce20025c619d30fe5756b1404bd0c Mon Sep 17 00:00:00 2001
From: Laurent Goujon <laurent@dremio.com>
Date: Thu, 15 Dec 2022 14:56:28 -0800
Subject: [PATCH 0393/2068] Reduce ratchet memory usage for multi-module
 projects

Ratchet creates a cache of Git repository per project but each Git
repository is a new FileRepository instance even if two projects share
the same repository on disk.

Since FileRepository is thread-safe, change GitRatchet to cache
FileRepository instances per git repository
---
 .../com/diffplug/spotless/extra/GitRatchet.java     | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitRatchet.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitRatchet.java
index 6b8d5a9f41..3b0e3c06ed 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitRatchet.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitRatchet.java
@@ -138,6 +138,7 @@ private static boolean worktreeIsCleanCheckout(TreeWalk treeWalk) {
 	private final static int WORKDIR = 2;
 
 	Map<Project, Repository> gitRoots = new HashMap<>();
+    Map<File, Repository> gitRepositories = new HashMap<>();
 	Table<Repository, String, ObjectId> rootTreeShaCache = HashBasedTable.create();
 	Map<Project, ObjectId> subtreeShaCache = new HashMap<>();
 
@@ -174,7 +175,7 @@ protected Repository repositoryFor(Project project) throws IOException {
 
 	protected abstract @Nullable Project getParent(Project project);
 
-	private static @Nullable Repository traverseParentsUntil(File startWith, @Nullable File file) throws IOException {
+	private @Nullable Repository traverseParentsUntil(File startWith, @Nullable File file) throws IOException {
 		while (startWith != null && !Objects.equals(startWith, file)) {
 			if (isGitRoot(startWith)) {
 				return createRepo(startWith);
@@ -190,8 +191,14 @@ private static boolean isGitRoot(File dir) {
 		return dotGit != null && RepositoryCache.FileKey.isGitRepository(dotGit, FS.DETECTED);
 	}
 
-	static Repository createRepo(File dir) throws IOException {
-		return FileRepositoryBuilder.create(GitWorkarounds.getDotGitDir(dir));
+	Repository createRepo(File dir) throws IOException {
+        File dotGitDir = GitWorkarounds.getDotGitDir(dir);
+        Repository repo = gitRepositories.get(dotGitDir);
+        if (repo == null) {
+		    repo = FileRepositoryBuilder.create(dotGitDir);
+            gitRepositories.put(dotGitDir, repo);
+        }
+        return repo;
 	}
 
 	/**

From f6f37f4d9e4cad9e1732afbfee4615a7fbbd1345 Mon Sep 17 00:00:00 2001
From: Laurent Goujon <laurent@dremio.com>
Date: Thu, 15 Dec 2022 15:07:57 -0800
Subject: [PATCH 0394/2068] Update CHANGES.md

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 1 +
 plugin-maven/CHANGES.md  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index b4bdc4479e..b781dacb6d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,6 +17,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Don't treat `@Value` as a type annotation [#1367](https://github.com/diffplug/spotless/pull/1367)
 * Support `ktlint_disabled_rules` in `ktlint` 0.47.x [#1378](https://github.com/diffplug/spotless/pull/1378)
+* Share git repositories across projects when using ratchet ([#1426](https://github.com/diffplug/spotless/pull/1426))
 ### Changes
 * Bump default `ktfmt` version to latest `0.40` -> `0.41` ([#1340](https://github.com/diffplug/spotless/pull/1340))
 * Bump default `scalafmt` version to latest `3.5.9` -> `3.6.1` ([#1373](https://github.com/diffplug/spotless/pull/1373))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 2060e5e90c..a4aa656c3f 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -10,6 +10,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Don't treat `@Value` as a type annotation [#1367](https://github.com/diffplug/spotless/pull/1367)
 * Support `ktlint_disabled_rules` in `ktlint` 0.47.x [#1378](https://github.com/diffplug/spotless/pull/1378)
+* Share git repositories across projects when using ratchet ([#1426](https://github.com/diffplug/spotless/pull/1426))
 ### Changes
 * Bump default `ktfmt` version to latest `0.40` -> `0.41` ([#1340](https://github.com/diffplug/spotless/pull/1340))
 * Bump default `scalafmt` version to latest `3.5.9` -> `3.6.1` ([#1373](https://github.com/diffplug/spotless/pull/1373))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 9baefc2ec8..6b7d3e40d2 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -10,6 +10,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Don't treat `@Value` as a type annotation [#1367](https://github.com/diffplug/spotless/pull/1367)
 * Support `ktlint_disabled_rules` in `ktlint` 0.47.x [#1378](https://github.com/diffplug/spotless/pull/1378)
+* Share git repositories across projects when using ratchet ([#1426](https://github.com/diffplug/spotless/pull/1426))
 ### Changes
 * Bump default `ktfmt` version to latest `0.40` -> `0.41` ([#1340](https://github.com/diffplug/spotless/pull/1340))
 * Bump default `scalafmt` version to latest `3.5.9` -> `3.6.1` ([#1373](https://github.com/diffplug/spotless/pull/1373))

From fd6cd9a36ef70f68a128169e93d3430604101b94 Mon Sep 17 00:00:00 2001
From: Laurent Goujon <laurent@dremio.com>
Date: Thu, 15 Dec 2022 15:14:31 -0800
Subject: [PATCH 0395/2068] Add missing typo

---
 _ext/eclipse-cdt/build.gradle         | 2 +-
 _ext/eclipse-cdt/gradle.properties    | 2 +-
 _ext/eclipse-groovy/build.gradle      | 2 +-
 _ext/eclipse-groovy/gradle.properties | 2 +-
 _ext/eclipse-jdt/build.gradle         | 2 +-
 _ext/eclipse-jdt/gradle.properties    | 2 +-
 _ext/eclipse-wtp/build.gradle         | 2 +-
 _ext/eclipse-wtp/gradle.properties    | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/_ext/eclipse-cdt/build.gradle b/_ext/eclipse-cdt/build.gradle
index 93ccac3b24..0982b7d555 100644
--- a/_ext/eclipse-cdt/build.gradle
+++ b/_ext/eclipse-cdt/build.gradle
@@ -17,7 +17,7 @@ apply from: rootProject.file('gradle/java-publish.gradle')
 
 
 dependencies {
-	implementation "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLISPE_BASE}"
+	implementation "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLIPSE_BASE}"
 	// Provides text partitioners for formatters
 	implementation ("org.eclipse.platform:org.eclipse.jface.text:${VER_ECLIPSE_JFACE}") {
 		exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt'
diff --git a/_ext/eclipse-cdt/gradle.properties b/_ext/eclipse-cdt/gradle.properties
index 10166b51d0..821ceea4d1 100644
--- a/_ext/eclipse-cdt/gradle.properties
+++ b/_ext/eclipse-cdt/gradle.properties
@@ -6,7 +6,7 @@ VER_JAVA=11
 
 # Compile dependencies
 VER_ECLIPSE_CDT=10.5
-VER_SPOTLESS_ECLISPE_BASE=[3.5.0,4.0.0[
+VER_SPOTLESS_ECLIPSE_BASE=[3.5.0,4.0.0[
 VER_ECLIPSE_JFACE=[3.18.0,4.0.0[
 VER_ECLIPSE_EFS=[3.7.0,4.0.0[
 VER_IBM_ICU=[67.1,68[
diff --git a/_ext/eclipse-groovy/build.gradle b/_ext/eclipse-groovy/build.gradle
index 00a7fed489..a45590fada 100644
--- a/_ext/eclipse-groovy/build.gradle
+++ b/_ext/eclipse-groovy/build.gradle
@@ -39,7 +39,7 @@ apply from: rootProject.file('_ext/gradle/p2-fat-jar-setup.gradle')
 apply from: rootProject.file('gradle/java-publish.gradle')
 
 dependencies {
-	implementation "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLISPE_BASE}"
+	implementation "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLIPSE_BASE}"
 	// Provides text partitioners for formatters
 	implementation ("org.eclipse.platform:org.eclipse.jface.text:${VER_ECLIPSE_JFACE}") {
 		exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt'
diff --git a/_ext/eclipse-groovy/gradle.properties b/_ext/eclipse-groovy/gradle.properties
index 9569e765bc..c1c6101caa 100644
--- a/_ext/eclipse-groovy/gradle.properties
+++ b/_ext/eclipse-groovy/gradle.properties
@@ -6,7 +6,7 @@ VER_JAVA=11
 
 # Compile
 VER_ECLIPSE=4.21
-VER_SPOTLESS_ECLISPE_BASE=[3.4.2,4.0.0[
+VER_SPOTLESS_ECLIPSE_BASE=[3.4.2,4.0.0[
 VER_ECLIPSE_JFACE=[3.15.300,4.0.0[
 VER_GRECLIPSE=4.3.0
 VER_GROOVY=4.0.0
diff --git a/_ext/eclipse-jdt/build.gradle b/_ext/eclipse-jdt/build.gradle
index b0967822a9..283e52f86d 100644
--- a/_ext/eclipse-jdt/build.gradle
+++ b/_ext/eclipse-jdt/build.gradle
@@ -10,7 +10,7 @@ ext {
 }
 
 dependencies {
-	implementation "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLISPE_BASE}"
+	implementation "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLIPSE_BASE}"
 	implementation("org.eclipse.jdt:org.eclipse.jdt.core:${VER_ECLIPSE_JDT_CORE}") {
 		exclude group: 'org.eclipse.platform', module: 'org.eclipse.ant.core'
 		exclude group: 'org.eclipse.platform', module: 'org.eclipse.core.expressions'
diff --git a/_ext/eclipse-jdt/gradle.properties b/_ext/eclipse-jdt/gradle.properties
index 82a4423140..51d5f41014 100644
--- a/_ext/eclipse-jdt/gradle.properties
+++ b/_ext/eclipse-jdt/gradle.properties
@@ -6,4 +6,4 @@ VER_JAVA=11
 
 # Compile
 VER_ECLIPSE_JDT_CORE=[3.13.0,4.0.0[
-VER_SPOTLESS_ECLISPE_BASE=[3.5.0,4.0.0[
+VER_SPOTLESS_ECLIPSE_BASE=[3.5.0,4.0.0[
diff --git a/_ext/eclipse-wtp/build.gradle b/_ext/eclipse-wtp/build.gradle
index ba32385a1b..92a78578f6 100644
--- a/_ext/eclipse-wtp/build.gradle
+++ b/_ext/eclipse-wtp/build.gradle
@@ -60,7 +60,7 @@ apply from: rootProject.file('_ext/gradle/p2-fat-jar-setup.gradle')
 apply from: rootProject.file('gradle/java-publish.gradle')
 
 dependencies {
-	implementation "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLISPE_BASE}"
+	implementation "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLIPSE_BASE}"
 	// Required by most WPT formatters
 	implementation "com.ibm.icu:icu4j:${VER_IBM_ICU}"
 	// The XSD/DTD and other models are defined with EMF.
diff --git a/_ext/eclipse-wtp/gradle.properties b/_ext/eclipse-wtp/gradle.properties
index f6cedd63e3..a341c0fb49 100644
--- a/_ext/eclipse-wtp/gradle.properties
+++ b/_ext/eclipse-wtp/gradle.properties
@@ -6,7 +6,7 @@ VER_JAVA=11
 
 # Compile
 VER_ECLIPSE_WTP=2021-09
-VER_SPOTLESS_ECLISPE_BASE=[3.5.0,4.0.0[
+VER_SPOTLESS_ECLIPSE_BASE=[3.5.0,4.0.0[
 VER_IBM_ICU=[67.1,68[
 VER_ECLIPSE_EMF=[2.22.0,3.0.0[
 VER_ECLIPSE_OSGI_SERVICES=[3.10.0,4.0.0[

From 7949f87aced31c56b6fbc86d9370dd7163816c90 Mon Sep 17 00:00:00 2001
From: Laurent Goujon <laurent@dremio.com>
Date: Thu, 15 Dec 2022 15:11:01 -0800
Subject: [PATCH 0396/2068] Update CHANGES.md

---
 _ext/eclipse-cdt/CHANGES.md    | 2 ++
 _ext/eclipse-groovy/CHANGES.md | 2 ++
 _ext/eclipse-wtp/CHANGES.md    | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/_ext/eclipse-cdt/CHANGES.md b/_ext/eclipse-cdt/CHANGES.md
index bdc7d99ea9..cda212bd3d 100644
--- a/_ext/eclipse-cdt/CHANGES.md
+++ b/_ext/eclipse-cdt/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `9.9.0`).
 
 ## [Unreleased]
+### Fixed
+* Fix typo in gradle variable names ([#1425](https://github.com/diffplug/spotless/pull/1425))
 
 ## [10.5.0] - 2021-12-13
 ### Added
diff --git a/_ext/eclipse-groovy/CHANGES.md b/_ext/eclipse-groovy/CHANGES.md
index c80ce061d5..b0f909ccb2 100644
--- a/_ext/eclipse-groovy/CHANGES.md
+++ b/_ext/eclipse-groovy/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.5.0`).
 
 ## [Unreleased]
+### Fixed
+* Fix typo in gradle variable names ([#1425](https://github.com/diffplug/spotless/pull/1425))
 
 ## [4.3.0] - 2021-10-13
 ### Added
diff --git a/_ext/eclipse-wtp/CHANGES.md b/_ext/eclipse-wtp/CHANGES.md
index 6fc919aa0e..0001618b1f 100644
--- a/_ext/eclipse-wtp/CHANGES.md
+++ b/_ext/eclipse-wtp/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.15.1`).
 
 ## [Unreleased]
+### Fixed
+* Fix typo in gradle variable names ([#1425](https://github.com/diffplug/spotless/pull/1425))
 
 ## [3.23.0] - 2021-09-22
 ### Added

From 38ca03bd1613bbfb368f45dabbe21b109aba0162 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 18 Dec 2022 10:20:11 -0800
Subject: [PATCH 0397/2068] spotlessApply

---
 build.gradle                                   |  2 +-
 .../diffplug/spotless/extra/GitRatchet.java    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index 5766e6b85e..f9e3d0de21 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,4 +18,4 @@ spotless {
 		trimTrailingWhitespace()
 		endWithNewline()
 	}
-}
+}
\ No newline at end of file
diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitRatchet.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitRatchet.java
index 3b0e3c06ed..4ba59e6aa5 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitRatchet.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitRatchet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 DiffPlug
+ * Copyright 2020-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -138,7 +138,7 @@ private static boolean worktreeIsCleanCheckout(TreeWalk treeWalk) {
 	private final static int WORKDIR = 2;
 
 	Map<Project, Repository> gitRoots = new HashMap<>();
-    Map<File, Repository> gitRepositories = new HashMap<>();
+	Map<File, Repository> gitRepositories = new HashMap<>();
 	Table<Repository, String, ObjectId> rootTreeShaCache = HashBasedTable.create();
 	Map<Project, ObjectId> subtreeShaCache = new HashMap<>();
 
@@ -192,13 +192,13 @@ private static boolean isGitRoot(File dir) {
 	}
 
 	Repository createRepo(File dir) throws IOException {
-        File dotGitDir = GitWorkarounds.getDotGitDir(dir);
-        Repository repo = gitRepositories.get(dotGitDir);
-        if (repo == null) {
-		    repo = FileRepositoryBuilder.create(dotGitDir);
-            gitRepositories.put(dotGitDir, repo);
-        }
-        return repo;
+		File dotGitDir = GitWorkarounds.getDotGitDir(dir);
+		Repository repo = gitRepositories.get(dotGitDir);
+		if (repo == null) {
+			repo = FileRepositoryBuilder.create(dotGitDir);
+			gitRepositories.put(dotGitDir, repo);
+		}
+		return repo;
 	}
 
 	/**

From a4d552625952b62dd28e2e59fa6f76d179426091 Mon Sep 17 00:00:00 2001
From: Laurent Goujon <laurent@dremio.com>
Date: Mon, 19 Dec 2022 10:47:37 -0800
Subject: [PATCH 0398/2068] Simplify GitRatchet cache logic

Change GitRatchet cache logic to use git root instead of projects as a
caching key for FileRepository.
---
 .../diffplug/spotless/extra/GitRatchet.java   | 55 +++----------------
 1 file changed, 8 insertions(+), 47 deletions(-)

diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitRatchet.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitRatchet.java
index 4ba59e6aa5..31f2f597f9 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitRatchet.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitRatchet.java
@@ -19,7 +19,6 @@
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
 
 import javax.annotation.Nullable;
@@ -137,8 +136,7 @@ private static boolean worktreeIsCleanCheckout(TreeWalk treeWalk) {
 	private final static int INDEX = 1;
 	private final static int WORKDIR = 2;
 
-	Map<Project, Repository> gitRoots = new HashMap<>();
-	Map<File, Repository> gitRepositories = new HashMap<>();
+	Map<File, Repository> gitRoots = new HashMap<>();
 	Table<Repository, String, ObjectId> rootTreeShaCache = HashBasedTable.create();
 	Map<Project, ObjectId> subtreeShaCache = new HashMap<>();
 
@@ -148,25 +146,14 @@ private static boolean worktreeIsCleanCheckout(TreeWalk treeWalk) {
 	 * We cache the Repository for every Project in {@code gitRoots}, and use dynamic programming to populate it.
 	 */
 	protected Repository repositoryFor(Project project) throws IOException {
-		Repository repo = gitRoots.get(project);
+		File projectGitDir = GitWorkarounds.getDotGitDir(getDir(project));
+		if (projectGitDir == null || !RepositoryCache.FileKey.isGitRepository(projectGitDir, FS.DETECTED)) {
+			throw new IllegalArgumentException("Cannot find git repository in any parent directory");
+		}
+		Repository repo = gitRoots.get(projectGitDir);
 		if (repo == null) {
-			if (isGitRoot(getDir(project))) {
-				repo = createRepo(getDir(project));
-			} else {
-				Project parentProj = getParent(project);
-				if (parentProj == null) {
-					repo = traverseParentsUntil(getDir(project).getParentFile(), null);
-					if (repo == null) {
-						throw new IllegalArgumentException("Cannot find git repository in any parent directory");
-					}
-				} else {
-					repo = traverseParentsUntil(getDir(project).getParentFile(), getDir(parentProj));
-					if (repo == null) {
-						repo = repositoryFor(parentProj);
-					}
-				}
-			}
-			gitRoots.put(project, repo);
+			repo = FileRepositoryBuilder.create(projectGitDir);
+			gitRoots.put(projectGitDir, repo);
 		}
 		return repo;
 	}
@@ -175,32 +162,6 @@ protected Repository repositoryFor(Project project) throws IOException {
 
 	protected abstract @Nullable Project getParent(Project project);
 
-	private @Nullable Repository traverseParentsUntil(File startWith, @Nullable File file) throws IOException {
-		while (startWith != null && !Objects.equals(startWith, file)) {
-			if (isGitRoot(startWith)) {
-				return createRepo(startWith);
-			} else {
-				startWith = startWith.getParentFile();
-			}
-		}
-		return null;
-	}
-
-	private static boolean isGitRoot(File dir) {
-		File dotGit = GitWorkarounds.getDotGitDir(dir);
-		return dotGit != null && RepositoryCache.FileKey.isGitRepository(dotGit, FS.DETECTED);
-	}
-
-	Repository createRepo(File dir) throws IOException {
-		File dotGitDir = GitWorkarounds.getDotGitDir(dir);
-		Repository repo = gitRepositories.get(dotGitDir);
-		if (repo == null) {
-			repo = FileRepositoryBuilder.create(dotGitDir);
-			gitRepositories.put(dotGitDir, repo);
-		}
-		return repo;
-	}
-
 	/**
 	 * Fast way to return treeSha of the given ref against the git repository which stores the given project.
 	 * Because of parallel project evaluation, there may be races here, so we synchronize on ourselves.  However, this method

From 079257aa340e5ace264eb63cddda6260ddc7ee79 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 28 Dec 2022 16:25:37 +0000
Subject: [PATCH 0399/2068] fix(deps): update dependency
 org.mockito:mockito-core to v4.11.0

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index fc2b2b43da..577ed87535 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -28,7 +28,7 @@ VER_DURIAN=1.2.0
 VER_JGIT=5.13.1.202206130422-r
 VER_JUNIT=5.9.1
 VER_ASSERTJ=3.23.1
-VER_MOCKITO=4.9.0
+VER_MOCKITO=4.11.0
 
 # Used for Maven Plugin
 VER_MAVEN_API=3.0

From e19bc6739c12c440e1b850bfba8e8b0876f6148d Mon Sep 17 00:00:00 2001
From: Abel Keszei <keszeiabel@gmail.com>
Date: Fri, 30 Dec 2022 11:44:58 +0100
Subject: [PATCH 0400/2068] add support for skipping first few lines matching a
 pattern

---
 .../spotless/generic/LicenseHeaderStep.java   | 69 ++++++++++++++-----
 .../gradle/spotless/FormatExtension.java      |  6 ++
 2 files changed, 57 insertions(+), 18 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java b/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
index 6a34c08828..5345adc150 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
@@ -51,7 +51,7 @@ public static LicenseHeaderStep headerDelimiter(String header, String delimiter)
 	}
 
 	public static LicenseHeaderStep headerDelimiter(ThrowingEx.Supplier<String> headerLazy, String delimiter) {
-		return new LicenseHeaderStep(null, null, headerLazy, delimiter, DEFAULT_YEAR_DELIMITER, () -> YearMode.PRESERVE);
+		return new LicenseHeaderStep(null, null, headerLazy, delimiter, DEFAULT_YEAR_DELIMITER, () -> YearMode.PRESERVE, null);
 	}
 
 	final String name;
@@ -60,14 +60,16 @@ public static LicenseHeaderStep headerDelimiter(ThrowingEx.Supplier<String> head
 	final String delimiter;
 	final String yearSeparator;
 	final Supplier<YearMode> yearMode;
+	final @Nullable String skipLinesPattern;
 
-	private LicenseHeaderStep(@Nullable String name, @Nullable String contentPattern, ThrowingEx.Supplier<String> headerLazy, String delimiter, String yearSeparator, Supplier<YearMode> yearMode) {
+	private LicenseHeaderStep(@Nullable String name, @Nullable String contentPattern, ThrowingEx.Supplier<String> headerLazy, String delimiter, String yearSeparator, Supplier<YearMode> yearMode, @Nullable String skipLinesPattern) {
 		this.name = sanitizeName(name);
-		this.contentPattern = sanitizeContentPattern(contentPattern);
+		this.contentPattern = sanitizePattern(contentPattern);
 		this.headerLazy = Objects.requireNonNull(headerLazy);
 		this.delimiter = Objects.requireNonNull(delimiter);
 		this.yearSeparator = Objects.requireNonNull(yearSeparator);
 		this.yearMode = Objects.requireNonNull(yearMode);
+		this.skipLinesPattern = sanitizePattern(skipLinesPattern);
 	}
 
 	public String getName() {
@@ -75,11 +77,11 @@ public String getName() {
 	}
 
 	public LicenseHeaderStep withName(String name) {
-		return new LicenseHeaderStep(name, contentPattern, headerLazy, delimiter, yearSeparator, yearMode);
+		return new LicenseHeaderStep(name, contentPattern, headerLazy, delimiter, yearSeparator, yearMode, skipLinesPattern);
 	}
 
 	public LicenseHeaderStep withContentPattern(String contentPattern) {
-		return new LicenseHeaderStep(name, contentPattern, headerLazy, delimiter, yearSeparator, yearMode);
+		return new LicenseHeaderStep(name, contentPattern, headerLazy, delimiter, yearSeparator, yearMode, skipLinesPattern);
 	}
 
 	public LicenseHeaderStep withHeaderString(String header) {
@@ -87,15 +89,15 @@ public LicenseHeaderStep withHeaderString(String header) {
 	}
 
 	public LicenseHeaderStep withHeaderLazy(ThrowingEx.Supplier<String> headerLazy) {
-		return new LicenseHeaderStep(name, contentPattern, headerLazy, delimiter, yearSeparator, yearMode);
+		return new LicenseHeaderStep(name, contentPattern, headerLazy, delimiter, yearSeparator, yearMode, skipLinesPattern);
 	}
 
 	public LicenseHeaderStep withDelimiter(String delimiter) {
-		return new LicenseHeaderStep(name, contentPattern, headerLazy, delimiter, yearSeparator, yearMode);
+		return new LicenseHeaderStep(name, contentPattern, headerLazy, delimiter, yearSeparator, yearMode, skipLinesPattern);
 	}
 
 	public LicenseHeaderStep withYearSeparator(String yearSeparator) {
-		return new LicenseHeaderStep(name, contentPattern, headerLazy, delimiter, yearSeparator, yearMode);
+		return new LicenseHeaderStep(name, contentPattern, headerLazy, delimiter, yearSeparator, yearMode, skipLinesPattern);
 	}
 
 	public LicenseHeaderStep withYearMode(YearMode yearMode) {
@@ -103,7 +105,11 @@ public LicenseHeaderStep withYearMode(YearMode yearMode) {
 	}
 
 	public LicenseHeaderStep withYearModeLazy(Supplier<YearMode> yearMode) {
-		return new LicenseHeaderStep(name, contentPattern, headerLazy, delimiter, yearSeparator, yearMode);
+		return new LicenseHeaderStep(name, contentPattern, headerLazy, delimiter, yearSeparator, yearMode, skipLinesPattern);
+	}
+
+	public LicenseHeaderStep withSkipLinesPattern(String skipLinesPattern) {
+		return new LicenseHeaderStep(name, contentPattern, headerLazy, delimiter, yearSeparator, yearMode, skipLinesPattern);
 	}
 
 	public FormatterStep build() {
@@ -112,7 +118,7 @@ public FormatterStep build() {
 		if (yearMode.get() == YearMode.SET_FROM_GIT) {
 			formatterStep = FormatterStep.createNeverUpToDateLazy(name, () -> {
 				boolean updateYear = false; // doesn't matter
-				Runtime runtime = new Runtime(headerLazy.get(), delimiter, yearSeparator, updateYear);
+				Runtime runtime = new Runtime(headerLazy.get(), delimiter, yearSeparator, updateYear, skipLinesPattern);
 				return FormatterFunc.needsFile(runtime::setLicenseHeaderYearsFromGitHistory);
 			});
 		} else {
@@ -130,7 +136,7 @@ public FormatterStep build() {
 				default:
 					throw new IllegalStateException(yearMode.toString());
 				}
-				return new Runtime(headerLazy.get(), delimiter, yearSeparator, updateYear);
+				return new Runtime(headerLazy.get(), delimiter, yearSeparator, updateYear, skipLinesPattern);
 			}, step -> step::format);
 		}
 
@@ -156,18 +162,18 @@ private String sanitizeName(@Nullable String name) {
 	}
 
 	@Nullable
-	private String sanitizeContentPattern(@Nullable String contentPattern) {
-		if (contentPattern == null) {
-			return contentPattern;
+	private String sanitizePattern(@Nullable String pattern) {
+		if (pattern == null) {
+			return pattern;
 		}
 
-		contentPattern = contentPattern.trim();
+		pattern = pattern.trim();
 
-		if (contentPattern.isEmpty()) {
+		if (pattern.isEmpty()) {
 			return null;
 		}
 
-		return contentPattern;
+		return pattern;
 	}
 
 	private static final String DEFAULT_NAME_PREFIX = LicenseHeaderStep.class.getName();
@@ -195,6 +201,7 @@ private static class Runtime implements Serializable {
 		private static final long serialVersionUID = 1475199492829130965L;
 
 		private final Pattern delimiterPattern;
+		private final @Nullable Pattern skipLinesPattern;
 		private final String yearSepOrFull;
 		private final @Nullable String yearToday;
 		private final @Nullable String beforeYear;
@@ -203,7 +210,7 @@ private static class Runtime implements Serializable {
 		private final boolean licenseHeaderWithRange;
 
 		/** The license that we'd like enforced. */
-		private Runtime(String licenseHeader, String delimiter, String yearSeparator, boolean updateYearWithLatest) {
+		private Runtime(String licenseHeader, String delimiter, String yearSeparator, boolean updateYearWithLatest, @Nullable String skipLinesPattern) {
 			if (delimiter.contains("\n")) {
 				throw new IllegalArgumentException("The delimiter must not contain any newlines.");
 			}
@@ -213,6 +220,7 @@ private Runtime(String licenseHeader, String delimiter, String yearSeparator, bo
 				licenseHeader = licenseHeader + "\n";
 			}
 			this.delimiterPattern = Pattern.compile('^' + delimiter, Pattern.UNIX_LINES | Pattern.MULTILINE);
+			this.skipLinesPattern = skipLinesPattern == null ? null : Pattern.compile(skipLinesPattern);
 
 			Optional<String> yearToken = getYearToken(licenseHeader);
 			if (yearToken.isPresent()) {
@@ -254,6 +262,31 @@ private static Optional<String> getYearToken(String licenseHeader) {
 
 		/** Formats the given string. */
 		private String format(String raw) {
+			if (skipLinesPattern == null) {
+				return addOrUpdateLicenseHeader(raw);
+			} else {
+				String[] lines = raw.split("\n");
+				StringBuilder skippedLinesBuilder = new StringBuilder();
+				StringBuilder remainingLinesBuilder = new StringBuilder();
+				boolean lastMatched = true;
+				for (String line : lines) {
+					if (lastMatched) {
+						Matcher matcher = skipLinesPattern.matcher(line);
+						if (matcher.find()) {
+							skippedLinesBuilder.append(line).append('\n');
+						} else {
+							remainingLinesBuilder.append(line).append('\n');
+							lastMatched = false;
+						}
+					} else {
+						remainingLinesBuilder.append(line).append('\n');
+					}
+				}
+				return skippedLinesBuilder + addOrUpdateLicenseHeader(remainingLinesBuilder.toString());
+			}
+		}
+
+		private String addOrUpdateLicenseHeader(String raw) {
 			Matcher contentMatcher = delimiterPattern.matcher(raw);
 			if (!contentMatcher.find()) {
 				throw new IllegalArgumentException("Unable to find delimiter regex " + delimiterPattern);
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index de0313eab4..84690bf063 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -462,6 +462,12 @@ public LicenseHeaderConfig yearSeparator(String yearSeparator) {
 			return this;
 		}
 
+		public LicenseHeaderConfig skipLinesPattern(String skipLinesPattern) {
+			builder = builder.withSkipLinesPattern(skipLinesPattern);
+			replaceStep(createStep());
+			return this;
+		}
+
 		/**
 		 * @param updateYearWithLatest
 		 *           Will turn {@code 2004} into {@code 2004-2020}, and {@code 2004-2019} into {@code 2004-2020}

From e46b9a1a3b4581085d50d6002a2a78e3790b96e2 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sat, 31 Dec 2022 01:09:30 -0800
Subject: [PATCH 0401/2068] Fix changelogs.

---
 CHANGES.md               | 2 ++
 plugin-gradle/CHANGES.md | 3 ++-
 plugin-maven/CHANGES.md  | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index b781dacb6d..a59f0c8570 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Improve memory usage when using git ratchet ([#1426](https://github.com/diffplug/spotless/pull/1426))
 
 ## [2.31.0] - 2022-11-24
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index a4aa656c3f..ebe7d0ceea 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Improve memory usage when using git ratchet ([#1426](https://github.com/diffplug/spotless/pull/1426))
 
 ## [6.12.0] - 2022-11-24
 ### Added
@@ -10,7 +12,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Don't treat `@Value` as a type annotation [#1367](https://github.com/diffplug/spotless/pull/1367)
 * Support `ktlint_disabled_rules` in `ktlint` 0.47.x [#1378](https://github.com/diffplug/spotless/pull/1378)
-* Share git repositories across projects when using ratchet ([#1426](https://github.com/diffplug/spotless/pull/1426))
 ### Changes
 * Bump default `ktfmt` version to latest `0.40` -> `0.41` ([#1340](https://github.com/diffplug/spotless/pull/1340))
 * Bump default `scalafmt` version to latest `3.5.9` -> `3.6.1` ([#1373](https://github.com/diffplug/spotless/pull/1373))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 6b7d3e40d2..07903bfae1 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Improve memory usage when using git ratchet ([#1426](https://github.com/diffplug/spotless/pull/1426))
 
 ## [2.28.0] - 2022-11-24
 ### Added

From 9580038f011220a9a1047ac77f33649709d04c12 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 31 Dec 2022 09:27:29 +0000
Subject: [PATCH 0402/2068] chore(deps): update plugin
 io.github.davidburstrom.version-compatibility to v0.3.0

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index eb818a2c0e..828a3629c7 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -16,7 +16,7 @@ pluginManagement {
 		// https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md
 		id 'com.adarshr.test-logger'               version '3.2.0'
 		// https://github.com/davidburstrom/version-compatibility-gradle-plugin/tags
-		id 'io.github.davidburstrom.version-compatibility' version '0.1.0'
+		id 'io.github.davidburstrom.version-compatibility' version '0.3.0'
 	}
 }
 plugins {

From 46e8db412f261542f696db895430ef7edcd16039 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sat, 31 Dec 2022 01:52:24 -0800
Subject: [PATCH 0403/2068] Add missing changelog entry for #1414 and #1413

---
 plugin-maven/CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 07903bfae1..e1c6b8ce48 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* Added support for M2E's incremental compilation ([#1414](https://github.com/diffplug/spotless/pull/1414) fixes [#1413](https://github.com/diffplug/spotless/issues/1413))
 ### Fixed
 * Improve memory usage when using git ratchet ([#1426](https://github.com/diffplug/spotless/pull/1426))
 

From 18fd936aac915cbcb6bb7aa1e110ce6504d9a306 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Burstr=C3=B6m?= <david.burstrom@gmail.com>
Date: Sun, 1 Jan 2023 13:01:31 +0100
Subject: [PATCH 0404/2068] Fix the documentation so that it looks sane in Vim
 too

---
 CONTRIBUTING.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index bf1996778d..782e377d58 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -36,7 +36,7 @@ For the folders below in monospace text, they are published on maven central at
 | `lib-extra` | Contains the optional parts of Spotless which require external dependencies.  `LineEnding.GIT_ATTRIBUTES` won't work unless `lib-extra` is available. |
 | `plugin-gradle` | Integrates spotless and all of its formatters into Gradle. |
 | `plugin-maven` | Integrates spotless and all of its formatters into Maven. |
-| _ext | Folder for generating glue jars (specifically packaging Eclipse jars from p2 for consumption using maven).
+| `_ext` | Folder for generating glue jars (specifically packaging Eclipse jars from p2 for consumption using maven).
 
 ## How to add a new FormatterStep
 
@@ -119,7 +119,7 @@ There are many great formatters (prettier, clang-format, black, etc.) which live
 
 Because of Spotless' up-to-date checking and [git ratcheting](https://github.com/diffplug/spotless/tree/main/plugin-gradle#ratchet), Spotless actually doesn't have to call formatters very often, so even an expensive shell call for every single invocation isn't that bad.  Anything that works is better than nothing, and we can always speed things up later if it feels too slow (but it probably won't).
 
-## How to enable the _ext projects
+## How to enable the `_ext` projects
 
 The `_ext` projects are disabled per default, since:
 

From 918547f92cc6f1140f5f1bd889b6062440861199 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Burstr=C3=B6m?= <david.burstrom@gmail.com>
Date: Tue, 20 Dec 2022 22:27:14 +0100
Subject: [PATCH 0405/2068] Add support for KtLint 0.48.0 (fixes #1430)

---
 CHANGES.md                                    |   3 +
 lib/build.gradle                              |   4 +
 .../compat/KtLintCompat0Dot48Dot0Adapter.java | 121 ++++++++++++++++++
 .../glue/ktlint/KtlintFormatterFunc.java      |   6 +-
 .../diffplug/spotless/kotlin/KtLintStep.java  |   2 +-
 plugin-gradle/CHANGES.md                      |   2 +
 plugin-maven/CHANGES.md                       |   3 +
 .../spotless/kotlin/KtLintStepTest.java       |  13 ++
 8 files changed, 152 insertions(+), 2 deletions(-)
 create mode 100644 lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java

diff --git a/CHANGES.md b/CHANGES.md
index a59f0c8570..171924a35f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Fixed
 * Improve memory usage when using git ratchet ([#1426](https://github.com/diffplug/spotless/pull/1426))
+* Support `ktlint` 0.48+ ([#1432](https://github.com/diffplug/spotless/pull/1432)) fixes ([#1430](https://github.com/diffplug/spotless/issues/1430))
+### Changes
+* Bump default `ktlint` version to latest `0.47.1` -> `0.48.0` ([#1432](https://github.com/diffplug/spotless/pull/1432))
 
 ## [2.31.0] - 2022-11-24
 ### Added
diff --git a/lib/build.gradle b/lib/build.gradle
index e398e80d23..8a816c61aa 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -34,6 +34,7 @@ versionCompatibility {
 				'0.45.2',
 				'0.46.0',
 				'0.47.0',
+				'0.48.0',
 			]
 			targetSourceSetName = 'ktlint'
 		}
@@ -90,6 +91,9 @@ dependencies {
 	compatKtLint0Dot47Dot0CompileOnly 'com.pinterest.ktlint:ktlint-core:0.47.0'
 	compatKtLint0Dot47Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-experimental:0.47.0'
 	compatKtLint0Dot47Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.47.0'
+	compatKtLint0Dot48Dot0CompileOnly 'com.pinterest.ktlint:ktlint-core:0.48.0'
+	compatKtLint0Dot48Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-experimental:0.48.0'
+	compatKtLint0Dot48Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.48.0'
 
 	String VER_SCALAFMT="3.6.1"
 	scalafmtCompileOnly "org.scalameta:scalafmt-core_2.13:$VER_SCALAFMT"
diff --git a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
new file mode 100644
index 0000000000..8235c535a5
--- /dev/null
+++ b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.glue.ktlint.compat;
+
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import com.pinterest.ktlint.core.KtLint;
+import com.pinterest.ktlint.core.LintError;
+import com.pinterest.ktlint.core.Rule;
+import com.pinterest.ktlint.core.RuleProvider;
+import com.pinterest.ktlint.core.api.DefaultEditorConfigProperties;
+import com.pinterest.ktlint.core.api.EditorConfigDefaults;
+import com.pinterest.ktlint.core.api.EditorConfigOverride;
+import com.pinterest.ktlint.core.api.UsesEditorConfigProperties;
+import com.pinterest.ktlint.core.api.editorconfig.EditorConfigProperty;
+import com.pinterest.ktlint.ruleset.experimental.ExperimentalRuleSetProvider;
+import com.pinterest.ktlint.ruleset.standard.StandardRuleSetProvider;
+
+import kotlin.Pair;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function2;
+
+public class KtLintCompat0Dot48Dot0Adapter implements KtLintCompatAdapter {
+
+	static class FormatterCallback implements Function2<LintError, Boolean, Unit> {
+		@Override
+		public Unit invoke(LintError lint, Boolean corrected) {
+			if (!corrected) {
+				KtLintCompatReporting.report(lint.getLine(), lint.getCol(), lint.getRuleId(), lint.getDetail());
+			}
+			return null;
+		}
+	}
+
+	@Override
+	public String format(final String text, final String name, final boolean isScript,
+			final boolean useExperimental,
+			final Map<String, String> userData,
+			final Map<String, Object> editorConfigOverrideMap) {
+		final FormatterCallback formatterCallback = new FormatterCallback();
+
+		Set<RuleProvider> allRuleProviders = new LinkedHashSet<>(
+				new StandardRuleSetProvider().getRuleProviders());
+		if (useExperimental) {
+			allRuleProviders.addAll(new ExperimentalRuleSetProvider().getRuleProviders());
+		}
+
+		EditorConfigOverride editorConfigOverride;
+		if (editorConfigOverrideMap.isEmpty()) {
+			editorConfigOverride = EditorConfigOverride.Companion.getEmptyEditorConfigOverride();
+		} else {
+			editorConfigOverride = createEditorConfigOverride(allRuleProviders.stream().map(
+					RuleProvider::createNewRuleInstance).collect(
+							Collectors.toList()),
+					editorConfigOverrideMap);
+		}
+
+		return KtLint.INSTANCE.format(new KtLint.ExperimentalParams(
+				name,
+				text,
+				allRuleProviders,
+				userData,
+				formatterCallback,
+				isScript,
+				false,
+				EditorConfigDefaults.Companion.getEmptyEditorConfigDefaults(),
+				editorConfigOverride,
+				false));
+	}
+
+	/**
+	 * Create EditorConfigOverride from user provided parameters.
+	 */
+	private static EditorConfigOverride createEditorConfigOverride(final List<Rule> rules, Map<String, Object> editorConfigOverrideMap) {
+		// Get properties from rules in the rule sets
+		Stream<EditorConfigProperty<?>> ruleProperties = rules.stream()
+				.filter(rule -> rule instanceof UsesEditorConfigProperties)
+				.flatMap(rule -> ((UsesEditorConfigProperties) rule).getEditorConfigProperties().stream());
+
+		// Create a mapping of properties to their names based on rule properties and default properties
+		Map<String, EditorConfigProperty<?>> supportedProperties = Stream
+				.concat(ruleProperties, DefaultEditorConfigProperties.INSTANCE.getEditorConfigProperties().stream())
+				.distinct()
+				.collect(Collectors.toMap(EditorConfigProperty::getName, property -> property));
+
+		// Create config properties based on provided property names and values
+		@SuppressWarnings("unchecked")
+		Pair<EditorConfigProperty<?>, ?>[] properties = editorConfigOverrideMap.entrySet().stream()
+				.map(entry -> {
+					EditorConfigProperty<?> property = supportedProperties.get(entry.getKey());
+					if (property != null) {
+						return new Pair<>(property, entry.getValue());
+					} else {
+						return null;
+					}
+				})
+				.filter(Objects::nonNull)
+				.toArray(Pair[]::new);
+
+		return EditorConfigOverride.Companion.from(properties);
+	}
+}
diff --git a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
index cc64eb9d66..45c5c5e4cf 100644
--- a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
+++ b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
@@ -27,6 +27,7 @@
 import com.diffplug.spotless.glue.ktlint.compat.KtLintCompat0Dot45Dot2Adapter;
 import com.diffplug.spotless.glue.ktlint.compat.KtLintCompat0Dot46Dot0Adapter;
 import com.diffplug.spotless.glue.ktlint.compat.KtLintCompat0Dot47Dot0Adapter;
+import com.diffplug.spotless.glue.ktlint.compat.KtLintCompat0Dot48Dot0Adapter;
 import com.diffplug.spotless.glue.ktlint.compat.KtLintCompatAdapter;
 
 public class KtlintFormatterFunc implements FormatterFunc.NeedsFile {
@@ -41,7 +42,10 @@ public class KtlintFormatterFunc implements FormatterFunc.NeedsFile {
 	public KtlintFormatterFunc(String version, boolean isScript, boolean useExperimental, Map<String, String> userData,
 			Map<String, Object> editorConfigOverrideMap) {
 		int minorVersion = Integer.parseInt(version.split("\\.")[1]);
-		if (minorVersion >= 47) {
+		if (minorVersion >= 48) {
+			// ExperimentalParams lost two constructor arguments, EditorConfigProperty moved to its own class
+			this.adapter = new KtLintCompat0Dot48Dot0Adapter();
+		} else if (minorVersion == 47) {
 			// rename RuleSet to RuleProvider
 			this.adapter = new KtLintCompat0Dot47Dot0Adapter();
 		} else if (minorVersion >= 46) {
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index 5627913e4a..f62c62b05b 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -33,7 +33,7 @@ public class KtLintStep {
 	// prevent direct instantiation
 	private KtLintStep() {}
 
-	private static final String DEFAULT_VERSION = "0.47.1";
+	private static final String DEFAULT_VERSION = "0.48.0";
 	static final String NAME = "ktlint";
 	static final String PACKAGE_PRE_0_32 = "com.github.shyiko";
 	static final String PACKAGE = "com.pinterest";
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index ebe7d0ceea..ec06599d20 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -12,11 +12,13 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Don't treat `@Value` as a type annotation [#1367](https://github.com/diffplug/spotless/pull/1367)
 * Support `ktlint_disabled_rules` in `ktlint` 0.47.x [#1378](https://github.com/diffplug/spotless/pull/1378)
+* Support `ktlint` 0.48+ ([#1432](https://github.com/diffplug/spotless/pull/1432)) fixes ([#1430](https://github.com/diffplug/spotless/issues/1430))
 ### Changes
 * Bump default `ktfmt` version to latest `0.40` -> `0.41` ([#1340](https://github.com/diffplug/spotless/pull/1340))
 * Bump default `scalafmt` version to latest `3.5.9` -> `3.6.1` ([#1373](https://github.com/diffplug/spotless/pull/1373))
 * Bump default `diktat` version to latest `1.2.3` -> `1.2.4.2` ([#1393](https://github.com/diffplug/spotless/pull/1393))
 * Bump default `palantir-java-format` version to latest `2.10` -> `2.28` ([#1393](https://github.com/diffplug/spotless/pull/1393))
+* Bump default `ktlint` version to latest `0.47.1` -> `0.48.0` ([#1432](https://github.com/diffplug/spotless/pull/1432))
 
 ## [6.11.0] - 2022-09-14
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index e1c6b8ce48..f401908166 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -7,6 +7,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Added support for M2E's incremental compilation ([#1414](https://github.com/diffplug/spotless/pull/1414) fixes [#1413](https://github.com/diffplug/spotless/issues/1413))
 ### Fixed
 * Improve memory usage when using git ratchet ([#1426](https://github.com/diffplug/spotless/pull/1426))
+* Support `ktlint` 0.48+ ([#1432](https://github.com/diffplug/spotless/pull/1432)) fixes ([#1430](https://github.com/diffplug/spotless/issues/1430))
+### Changes
+* Bump default `ktlint` version to latest `0.47.1` -> `0.48.0` ([#1432](https://github.com/diffplug/spotless/pull/1432))
 
 ## [2.28.0] - 2022-11-24
 ### Added
diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
index 71a0979422..3a55a19e92 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
@@ -144,6 +144,19 @@ void works0_47_1() throws Exception {
 				});
 	}
 
+	@Test
+	void works0_48_0() throws Exception {
+		FormatterStep step = KtLintStep.create("0.48.0", TestProvisioner.mavenCentral());
+		StepHarness.forStep(step)
+				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean")
+				.testResourceException("kotlin/ktlint/unsolvable.dirty", assertion -> {
+					assertion.isInstanceOf(AssertionError.class);
+					assertion.hasMessage("Error on line: 1, column: 1\n" +
+							"rule: no-wildcard-imports\n" +
+							"Wildcard import");
+				});
+	}
+
 	@Test
 	void equality() throws Exception {
 		new SerializableEqualityTester() {

From b3d8e89002c21324f03e896c0d786df3be09839d Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 1 Jan 2023 20:13:05 -0800
Subject: [PATCH 0406/2068] spotlessApply for 2023

---
 .../com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java  | 2 +-
 lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java  | 2 +-
 .../test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
index 45c5c5e4cf..fc64cdb23e 100644
--- a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
+++ b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 DiffPlug
+ * Copyright 2021-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index f62c62b05b..b444f0f1a7 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
index 3a55a19e92..42e377fde5 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From b44d70d00add006427f3cb8ef2387da543addfa3 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 1 Jan 2023 20:14:22 -0800
Subject: [PATCH 0407/2068] Move changelog entries to the correct release.

---
 plugin-gradle/CHANGES.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index ec06599d20..3e78920abe 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,6 +5,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Fixed
 * Improve memory usage when using git ratchet ([#1426](https://github.com/diffplug/spotless/pull/1426))
+* Support `ktlint` 0.48+ ([#1432](https://github.com/diffplug/spotless/pull/1432)) fixes ([#1430](https://github.com/diffplug/spotless/issues/1430))
+### Changes
+* Bump default `ktlint` version to latest `0.47.1` -> `0.48.0` ([#1432](https://github.com/diffplug/spotless/pull/1432))
 
 ## [6.12.0] - 2022-11-24
 ### Added
@@ -12,13 +15,11 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Don't treat `@Value` as a type annotation [#1367](https://github.com/diffplug/spotless/pull/1367)
 * Support `ktlint_disabled_rules` in `ktlint` 0.47.x [#1378](https://github.com/diffplug/spotless/pull/1378)
-* Support `ktlint` 0.48+ ([#1432](https://github.com/diffplug/spotless/pull/1432)) fixes ([#1430](https://github.com/diffplug/spotless/issues/1430))
 ### Changes
 * Bump default `ktfmt` version to latest `0.40` -> `0.41` ([#1340](https://github.com/diffplug/spotless/pull/1340))
 * Bump default `scalafmt` version to latest `3.5.9` -> `3.6.1` ([#1373](https://github.com/diffplug/spotless/pull/1373))
 * Bump default `diktat` version to latest `1.2.3` -> `1.2.4.2` ([#1393](https://github.com/diffplug/spotless/pull/1393))
 * Bump default `palantir-java-format` version to latest `2.10` -> `2.28` ([#1393](https://github.com/diffplug/spotless/pull/1393))
-* Bump default `ktlint` version to latest `0.47.1` -> `0.48.0` ([#1432](https://github.com/diffplug/spotless/pull/1432))
 
 ## [6.11.0] - 2022-09-14
 ### Added

From 9a8ccae9ec04ff5e6f37da07cc445242ef69c516 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 1 Jan 2023 20:19:21 -0800
Subject: [PATCH 0408/2068] Bump default ktfmt 0.41 -> 0.42

---
 lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
index 4f84d991bc..242c9c9173 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
@@ -39,7 +39,7 @@ public class KtfmtStep {
 	// prevent direct instantiation
 	private KtfmtStep() {}
 
-	private static final String DEFAULT_VERSION = "0.41";
+	private static final String DEFAULT_VERSION = "0.42";
 	static final String NAME = "ktfmt";
 	static final String PACKAGE = "com.facebook";
 	static final String MAVEN_COORDINATE = PACKAGE + ":ktfmt:";

From 8f7e00594de49856e2c14edf09d89352e0eddd60 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 1 Jan 2023 20:21:01 -0800
Subject: [PATCH 0409/2068] spotlessApply

---
 lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
index 242c9c9173..b6f7a533eb 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 062e83584650be1dd47f5c8485426e8438b05600 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 1 Jan 2023 20:21:13 -0800
Subject: [PATCH 0410/2068] Bump changelogs.

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 1 +
 plugin-maven/CHANGES.md  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 171924a35f..fe37d3e845 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,6 +15,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Support `ktlint` 0.48+ ([#1432](https://github.com/diffplug/spotless/pull/1432)) fixes ([#1430](https://github.com/diffplug/spotless/issues/1430))
 ### Changes
 * Bump default `ktlint` version to latest `0.47.1` -> `0.48.0` ([#1432](https://github.com/diffplug/spotless/pull/1432))
+* Bump default `ktfmt` version to latest `0.41` -> `0.42` ([#1421](https://github.com/diffplug/spotless/pull/1421))
 
 ## [2.31.0] - 2022-11-24
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 3e78920abe..6b98d25dc2 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -8,6 +8,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Support `ktlint` 0.48+ ([#1432](https://github.com/diffplug/spotless/pull/1432)) fixes ([#1430](https://github.com/diffplug/spotless/issues/1430))
 ### Changes
 * Bump default `ktlint` version to latest `0.47.1` -> `0.48.0` ([#1432](https://github.com/diffplug/spotless/pull/1432))
+* Bump default `ktfmt` version to latest `0.41` -> `0.42` ([#1421](https://github.com/diffplug/spotless/pull/1421))
 
 ## [6.12.0] - 2022-11-24
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index f401908166..e8fc8d3d49 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -10,6 +10,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Support `ktlint` 0.48+ ([#1432](https://github.com/diffplug/spotless/pull/1432)) fixes ([#1430](https://github.com/diffplug/spotless/issues/1430))
 ### Changes
 * Bump default `ktlint` version to latest `0.47.1` -> `0.48.0` ([#1432](https://github.com/diffplug/spotless/pull/1432))
+* Bump default `ktfmt` version to latest `0.41` -> `0.42` ([#1421](https://github.com/diffplug/spotless/pull/1421))
 
 ## [2.28.0] - 2022-11-24
 ### Added

From 45a3c8a2b13cd223f4ca9cfd0831b7639f12fffd Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 1 Jan 2023 20:37:08 -0800
Subject: [PATCH 0411/2068] Reorder plugin application to keep Gradle 7.6
 happy.

---
 plugin-gradle/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin-gradle/build.gradle b/plugin-gradle/build.gradle
index f1b3320b50..ba60eb450f 100644
--- a/plugin-gradle/build.gradle
+++ b/plugin-gradle/build.gradle
@@ -2,11 +2,11 @@ apply from: rootProject.file('gradle/changelog.gradle')
 ext.artifactId = project.artifactIdGradle
 version = spotlessChangelog.versionNext
 apply plugin: 'java-library'
+apply plugin: 'com.gradle.plugin-publish'
+apply plugin: 'java-gradle-plugin'
 apply from: rootProject.file('gradle/java-setup.gradle')
 apply from: rootProject.file('gradle/spotless-freshmark.gradle')
 
-apply plugin: 'com.gradle.plugin-publish'
-apply plugin: 'java-gradle-plugin'
 
 dependencies {
 	if (version.endsWith('-SNAPSHOT') || (rootProject.spotlessChangelog.versionNext == rootProject.spotlessChangelog.versionLast)) {

From c13acee2130be0b730a14fbadade6e7f597001b7 Mon Sep 17 00:00:00 2001
From: circleci <circleci@9de72a80fa9b>
Date: Mon, 2 Jan 2023 04:44:42 +0000
Subject: [PATCH 0412/2068] Published lib/2.31.1

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index fe37d3e845..e3493f7c09 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.31.1] - 2023-01-02
 ### Fixed
 * Improve memory usage when using git ratchet ([#1426](https://github.com/diffplug/spotless/pull/1426))
 * Support `ktlint` 0.48+ ([#1432](https://github.com/diffplug/spotless/pull/1432)) fixes ([#1430](https://github.com/diffplug/spotless/issues/1430))

From 718a504c123de899e75300e7f2f6c55d7a40da42 Mon Sep 17 00:00:00 2001
From: circleci <circleci@9de72a80fa9b>
Date: Mon, 2 Jan 2023 04:45:56 +0000
Subject: [PATCH 0413/2068] Published gradle/6.12.1

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 46 ++++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 6b98d25dc2..cac4f56567 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [6.12.1] - 2023-01-02
 ### Fixed
 * Improve memory usage when using git ratchet ([#1426](https://github.com/diffplug/spotless/pull/1426))
 * Support `ktlint` 0.48+ ([#1432](https://github.com/diffplug/spotless/pull/1432)) fixes ([#1430](https://github.com/diffplug/spotless/issues/1430))
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index fcc0336cbb..755d21d056 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -18,9 +18,9 @@ output = [
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
 [![Maven central](https://img.shields.io/badge/mavencentral-yes-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/index.html)
 [![License Apache](https://img.shields.io/badge/license-apache-blue.svg)](https://tldrlegal.com/license/apache-license-2.0-(apache-2.0))
-[![Changelog](https://img.shields.io/badge/changelog-6.12.0-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-6.12.1-blue.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)
@@ -128,10 +128,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -143,7 +143,7 @@ If you're stuck on an older version of Gradle, `id 'com.diffplug.gradle.spotless
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -267,8 +267,8 @@ You can make a pull request to add new annotations to Spotless's default list.
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -319,8 +319,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -383,7 +383,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -415,7 +415,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -447,7 +447,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -481,7 +481,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -502,7 +502,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -527,7 +527,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -567,7 +567,7 @@ sql.formatter.indent.size=4
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -610,7 +610,7 @@ For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#n
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -835,7 +835,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -902,9 +902,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -937,11 +937,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From 8146bf72d33c7ce443c21a748595eeea1087a5e1 Mon Sep 17 00:00:00 2001
From: circleci <circleci@9de72a80fa9b>
Date: Mon, 2 Jan 2023 04:47:36 +0000
Subject: [PATCH 0414/2068] Published maven/2.29.0

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index e8fc8d3d49..84e06aa847 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.29.0] - 2023-01-02
 ### Added
 * Added support for M2E's incremental compilation ([#1414](https://github.com/diffplug/spotless/pull/1414) fixes [#1413](https://github.com/diffplug/spotless/issues/1413))
 ### Fixed
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index e6a2c47aae..80be3dbc37 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -12,8 +12,8 @@ output = [
   ].join('\n');
 -->
 [![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.28.0/index.html)
-[![Changelog](https://img.shields.io/badge/changelog-2.28.0-brightgreen.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.29.0/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.29.0-brightgreen.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)

From 2c03111edf22f9506520a31aff476017258d24b9 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 1 Jan 2023 21:04:36 -0800
Subject: [PATCH 0415/2068] Update GradleIntegrationHarness' JVM compatibility
 matrix.

---
 .../diffplug/gradle/spotless/GradleIntegrationHarness.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
index 6cc35290db..9e2f490429 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,9 +53,12 @@ public enum GradleVersionSupport {
 		GradleVersionSupport(String version) {
 			String minVersionForRunningJRE;
 			switch (Jvm.version()) {
+			case 21:
 			case 20:
-			case 19:
 				// TODO: https://docs.gradle.org/current/userguide/compatibility.html
+			case 19:
+				minVersionForRunningJRE = "7.6";
+				break;
 			case 18:
 				minVersionForRunningJRE = "7.5";
 				break;

From 923d87561af4f914d0221d9145d50adcd003a36e Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 1 Jan 2023 21:05:02 -0800
Subject: [PATCH 0416/2068] Update groovy-xml to a version that Gradle 7.6 can
 tolerate.

---
 lib-extra/build.gradle | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index 38e7c37403..6dd195cde9 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -15,7 +15,9 @@ dependencies {
 	implementation "org.eclipse.jgit:org.eclipse.jgit:${VER_JGIT}"
 	implementation "com.googlecode.concurrent-trees:concurrent-trees:2.6.1"
 	// used for xml parsing in EclipseFormatter
-	implementation "org.codehaus.groovy:groovy-xml:3.0.10"
+	// TODO: Gradle barfs if this doesn't match its built-in version,
+	// would be great to drop this for something less sensitive if possible
+	implementation "org.codehaus.groovy:groovy-xml:3.0.13"
 
 	// testing
 	testImplementation project(':testlib')

From 1f7bab70bff03a047e081c2d019be508810d3371 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 1 Jan 2023 21:12:33 -0800
Subject: [PATCH 0417/2068] Turns out we don't need groovy-xml at all anymore.
 Lol.

---
 lib-extra/build.gradle | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index 6dd195cde9..d94992f8d3 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -14,10 +14,6 @@ dependencies {
 	// needed by GitAttributesLineEndings
 	implementation "org.eclipse.jgit:org.eclipse.jgit:${VER_JGIT}"
 	implementation "com.googlecode.concurrent-trees:concurrent-trees:2.6.1"
-	// used for xml parsing in EclipseFormatter
-	// TODO: Gradle barfs if this doesn't match its built-in version,
-	// would be great to drop this for something less sensitive if possible
-	implementation "org.codehaus.groovy:groovy-xml:3.0.13"
 
 	// testing
 	testImplementation project(':testlib')

From d7ac1fe76f1fffe611af89b3535d1e44352e0433 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 1 Jan 2023 21:14:48 -0800
Subject: [PATCH 0418/2068] Update changelog.

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index e3493f7c09..40a2ae3e07 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Changes
+* Bump the dev version of Gradle from `7.5.1` to `7.6` ([#1409](https://github.com/diffplug/spotless/pull/1409))
 
 ## [2.31.1] - 2023-01-02
 ### Fixed

From 6e19b7edc7e5e6b4bf62214c18ff1b2b84e72c8c Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 1 Jan 2023 21:23:38 -0800
Subject: [PATCH 0419/2068] Another needed update for the changelog.

---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index 40a2ae3e07..cf43b4eb22 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changes
 * Bump the dev version of Gradle from `7.5.1` to `7.6` ([#1409](https://github.com/diffplug/spotless/pull/1409))
+  * We also removed the no-longer-required dependency `org.codehaus.groovy:groovy-xml`
 
 ## [2.31.1] - 2023-01-02
 ### Fixed

From ade6c0d48138af938aaa7039a22ef784e92036b0 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 2 Jan 2023 06:21:18 +0000
Subject: [PATCH 0420/2068] chore(deps): update plugin com.diffplug.spotless to
 v6.12.1

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 828a3629c7..786baa1eba 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,6 @@
 pluginManagement {
 	plugins {
-		id 'com.diffplug.spotless'                 version '6.12.0'
+		id 'com.diffplug.spotless'                 version '6.12.1'
 		// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
 		id 'com.gradle.plugin-publish'             version '1.1.0'
 		// https://github.com/gradle-nexus/publish-plugin/releases

From 50e7cb01e05019c671e1411fb7c56f8bd7314f52 Mon Sep 17 00:00:00 2001
From: Abel Keszei <keszeiabel@gmail.com>
Date: Mon, 2 Jan 2023 19:34:54 +0100
Subject: [PATCH 0421/2068] apply license header updates

---
 .../java/com/diffplug/spotless/generic/LicenseHeaderStep.java   | 2 +-
 .../main/java/com/diffplug/gradle/spotless/FormatExtension.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java b/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
index 5345adc150..d1fdf86e3e 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index 84690bf063..9c1e239d39 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 9df255ed3c1a56aeec24e6e92190e6382cf45dcd Mon Sep 17 00:00:00 2001
From: Eir Nym <485399+eirnym@users.noreply.github.com>
Date: Tue, 3 Jan 2023 00:06:41 +0100
Subject: [PATCH 0422/2068] Add editor config file option to maven and gradle

---
 .../compat/KtLintCompat0Dot31Dot0Adapter.java   |  4 ++--
 .../compat/KtLintCompat0Dot32Dot0Adapter.java   |  4 ++--
 .../compat/KtLintCompat0Dot34Dot2Adapter.java   |  6 +++---
 .../compat/KtLintCompat0Dot45Dot2Adapter.java   |  6 +++---
 .../compat/KtLintCompat0Dot46Dot0Adapter.java   |  6 +++---
 .../compat/KtLintCompat0Dot47Dot0Adapter.java   | 17 ++++++++++++-----
 .../compat/KtLintCompat0Dot48Dot0Adapter.java   | 15 +++++++++++----
 .../glue/ktlint/compat/KtLintCompatAdapter.java |  4 ++--
 .../glue/ktlint/KtlintFormatterFunc.java        |  6 ++++--
 .../diffplug/spotless/kotlin/KtLintStep.java    | 15 +++++++++++----
 .../gradle/spotless/KotlinExtension.java        | 10 ++++++----
 .../gradle/spotless/KotlinGradleExtension.java  | 14 +++++++++++---
 .../diffplug/spotless/maven/kotlin/Ktlint.java  |  7 ++++---
 13 files changed, 74 insertions(+), 40 deletions(-)

diff --git a/lib/src/compatKtLint0Dot31Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot31Dot0Adapter.java b/lib/src/compatKtLint0Dot31Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot31Dot0Adapter.java
index 56b8da2d20..a10bf9be0e 100644
--- a/lib/src/compatKtLint0Dot31Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot31Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot31Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot31Dot0Adapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 DiffPlug
+ * Copyright 2022-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	@Override
 	public String format(final String text, final String name, final boolean isScript,
 			final boolean useExperimental,
-			final Map<String, String> userData,
+			String editorConfigPath, final Map<String, String> userData,
 			final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
diff --git a/lib/src/compatKtLint0Dot32Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot32Dot0Adapter.java b/lib/src/compatKtLint0Dot32Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot32Dot0Adapter.java
index 6f69fcc7ce..3f98abe3b3 100644
--- a/lib/src/compatKtLint0Dot32Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot32Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot32Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot32Dot0Adapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 DiffPlug
+ * Copyright 2022-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	@Override
 	public String format(final String text, final String name, final boolean isScript,
 			final boolean useExperimental,
-			final Map<String, String> userData,
+			String editorConfigPath, final Map<String, String> userData,
 			final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
diff --git a/lib/src/compatKtLint0Dot34Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot34Dot2Adapter.java b/lib/src/compatKtLint0Dot34Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot34Dot2Adapter.java
index a3c8c8df3b..0352a8e1f0 100644
--- a/lib/src/compatKtLint0Dot34Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot34Dot2Adapter.java
+++ b/lib/src/compatKtLint0Dot34Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot34Dot2Adapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 DiffPlug
+ * Copyright 2022-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	@Override
 	public String format(final String text, final String name, final boolean isScript,
 			final boolean useExperimental,
-			final Map<String, String> userData,
+			String editorConfigPath, final Map<String, String> userData,
 			final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
@@ -61,7 +61,7 @@ public String format(final String text, final String name, final boolean isScrip
 				userData,
 				formatterCallback,
 				isScript,
-				null,
+				editorConfigPath,
 				false));
 	}
 }
diff --git a/lib/src/compatKtLint0Dot45Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot45Dot2Adapter.java b/lib/src/compatKtLint0Dot45Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot45Dot2Adapter.java
index f7eadada3d..15c2238d5d 100644
--- a/lib/src/compatKtLint0Dot45Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot45Dot2Adapter.java
+++ b/lib/src/compatKtLint0Dot45Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot45Dot2Adapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 DiffPlug
+ * Copyright 2022-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,7 +51,7 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	@Override
 	public String format(final String text, final String name, final boolean isScript,
 			final boolean useExperimental,
-			final Map<String, String> userData,
+			String editorConfigPath, final Map<String, String> userData,
 			final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
@@ -76,7 +76,7 @@ public String format(final String text, final String name, final boolean isScrip
 				userData,
 				formatterCallback,
 				isScript,
-				null,
+				editorConfigPath,
 				false,
 				editorConfigOverride,
 				false));
diff --git a/lib/src/compatKtLint0Dot46Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot46Dot0Adapter.java b/lib/src/compatKtLint0Dot46Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot46Dot0Adapter.java
index 873b91af80..28eba672a0 100644
--- a/lib/src/compatKtLint0Dot46Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot46Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot46Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot46Dot0Adapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 DiffPlug
+ * Copyright 2022-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,7 +51,7 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	@Override
 	public String format(final String text, final String name, final boolean isScript,
 			final boolean useExperimental,
-			final Map<String, String> userData,
+			String editorConfigPath, final Map<String, String> userData,
 			final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
@@ -76,7 +76,7 @@ public String format(final String text, final String name, final boolean isScrip
 				userData,
 				formatterCallback,
 				isScript,
-				null,
+				editorConfigPath,
 				false,
 				editorConfigOverride,
 				false));
diff --git a/lib/src/compatKtLint0Dot47Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java b/lib/src/compatKtLint0Dot47Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java
index 757ffc922b..3445a688b1 100644
--- a/lib/src/compatKtLint0Dot47Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot47Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 DiffPlug
+ * Copyright 2022-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,8 @@
 
 import static java.util.Collections.emptySet;
 
+import java.io.File;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -56,7 +58,7 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	@Override
 	public String format(final String text, final String name, final boolean isScript,
 			final boolean useExperimental,
-			final Map<String, String> userData,
+			String editorConfigPath, final Map<String, String> userData,
 			final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
@@ -68,14 +70,19 @@ public String format(final String text, final String name, final boolean isScrip
 
 		EditorConfigOverride editorConfigOverride;
 		if (editorConfigOverrideMap.isEmpty()) {
-			editorConfigOverride = EditorConfigOverride.Companion.getEmptyEditorConfigOverride();
+			editorConfigOverride = new EditorConfigOverride();
 		} else {
 			editorConfigOverride = createEditorConfigOverride(allRuleProviders.stream().map(
 					RuleProvider::createNewRuleInstance).collect(
 							Collectors.toList()),
 					editorConfigOverrideMap);
 		}
-
+		Path editorConfigFilePath;
+		if (editorConfigPath == null) {
+			editorConfigFilePath = null;
+		} else {
+			editorConfigFilePath = new File(editorConfigPath).toPath();
+		}
 		return KtLint.INSTANCE.format(new KtLint.ExperimentalParams(
 				name,
 				text,
@@ -86,7 +93,7 @@ public String format(final String text, final String name, final boolean isScrip
 				isScript,
 				null,
 				false,
-				EditorConfigDefaults.Companion.getEmptyEditorConfigDefaults(),
+				EditorConfigDefaults.Companion.load(editorConfigFilePath),
 				editorConfigOverride,
 				false));
 	}
diff --git a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
index 8235c535a5..3efc8c085d 100644
--- a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
@@ -15,6 +15,8 @@
  */
 package com.diffplug.spotless.glue.ktlint.compat;
 
+import java.io.File;
+import java.nio.file.Path;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
@@ -54,7 +56,7 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	@Override
 	public String format(final String text, final String name, final boolean isScript,
 			final boolean useExperimental,
-			final Map<String, String> userData,
+			String editorConfigPath, final Map<String, String> userData,
 			final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
@@ -66,14 +68,19 @@ public String format(final String text, final String name, final boolean isScrip
 
 		EditorConfigOverride editorConfigOverride;
 		if (editorConfigOverrideMap.isEmpty()) {
-			editorConfigOverride = EditorConfigOverride.Companion.getEmptyEditorConfigOverride();
+			editorConfigOverride = new EditorConfigOverride();
 		} else {
 			editorConfigOverride = createEditorConfigOverride(allRuleProviders.stream().map(
 					RuleProvider::createNewRuleInstance).collect(
 							Collectors.toList()),
 					editorConfigOverrideMap);
 		}
-
+		Path editorConfigFilePath;
+		if (editorConfigPath == null) {
+			editorConfigFilePath = null;
+		} else {
+			editorConfigFilePath = new File(editorConfigPath).toPath();
+		}
 		return KtLint.INSTANCE.format(new KtLint.ExperimentalParams(
 				name,
 				text,
@@ -82,7 +89,7 @@ public String format(final String text, final String name, final boolean isScrip
 				formatterCallback,
 				isScript,
 				false,
-				EditorConfigDefaults.Companion.getEmptyEditorConfigDefaults(),
+				EditorConfigDefaults.Companion.load(editorConfigFilePath),
 				editorConfigOverride,
 				false));
 	}
diff --git a/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java b/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
index 5097cac135..b3e5d1817a 100644
--- a/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
+++ b/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 DiffPlug
+ * Copyright 2022-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,6 @@
 
 public interface KtLintCompatAdapter {
 
-	String format(String text, String name, boolean isScript, boolean useExperimental, Map<String, String> userData,
+	String format(String text, String name, boolean isScript, boolean useExperimental, String editorConfigPath, Map<String, String> userData,
 			Map<String, Object> editorConfigOverrideMap);
 }
diff --git a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
index fc64cdb23e..5b43bf5e14 100644
--- a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
+++ b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
@@ -37,9 +37,10 @@ public class KtlintFormatterFunc implements FormatterFunc.NeedsFile {
 	@NotNull
 	private final KtLintCompatAdapter adapter;
 	private final boolean useExperimental;
+	private final String editorConfigPath;
 	private final Map<String, Object> editorConfigOverrideMap;
 
-	public KtlintFormatterFunc(String version, boolean isScript, boolean useExperimental, Map<String, String> userData,
+	public KtlintFormatterFunc(String version, boolean isScript, boolean useExperimental, String editorConfigPath, Map<String, String> userData,
 			Map<String, Object> editorConfigOverrideMap) {
 		int minorVersion = Integer.parseInt(version.split("\\.")[1]);
 		if (minorVersion >= 48) {
@@ -64,6 +65,7 @@ public KtlintFormatterFunc(String version, boolean isScript, boolean useExperime
 			// the OG
 			this.adapter = new KtLintCompat0Dot31Dot0Adapter();
 		}
+		this.editorConfigPath = editorConfigPath;
 		this.useExperimental = useExperimental;
 		this.editorConfigOverrideMap = editorConfigOverrideMap;
 		this.userData = userData;
@@ -72,6 +74,6 @@ public KtlintFormatterFunc(String version, boolean isScript, boolean useExperime
 
 	@Override
 	public String applyWithFile(String unix, File file) throws Exception {
-		return adapter.format(unix, file.getName(), isScript, useExperimental, userData, editorConfigOverrideMap);
+		return adapter.format(unix, file.getName(), isScript, useExperimental, editorConfigPath, userData, editorConfigOverrideMap);
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index b444f0f1a7..9291e69fde 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -64,10 +64,15 @@ public static FormatterStep createForScript(String version, Provisioner provisio
 
 	private static FormatterStep create(String version, Provisioner provisioner, boolean isScript, boolean useExperimental,
 			Map<String, String> userData, Map<String, Object> editorConfigOverride) {
+		return create(version, provisioner, useExperimental, userData, editorConfigOverride);
+	}
+
+	public static FormatterStep create(String version, Provisioner provisioner, boolean isScript, boolean useExperimental,
+			String editorConfig, Map<String, String> userData, Map<String, Object> editorConfigOverride) {
 		Objects.requireNonNull(version, "version");
 		Objects.requireNonNull(provisioner, "provisioner");
 		return FormatterStep.createLazy(NAME,
-				() -> new State(version, provisioner, isScript, useExperimental, userData, editorConfigOverride),
+				() -> new State(version, provisioner, isScript, useExperimental, editorConfig, userData, editorConfigOverride),
 				State::createFormat);
 	}
 
@@ -86,9 +91,10 @@ static final class State implements Serializable {
 		private final TreeMap<String, String> userData;
 		private final TreeMap<String, Object> editorConfigOverride;
 		private final String version;
+		private final String editorConfigPath;
 
 		State(String version, Provisioner provisioner, boolean isScript, boolean useExperimental,
-				Map<String, String> userData, Map<String, Object> editorConfigOverride) throws IOException {
+				String editorConfigPath, Map<String, String> userData, Map<String, Object> editorConfigOverride) throws IOException {
 			this.version = version;
 
 			String coordinate;
@@ -104,6 +110,7 @@ static final class State implements Serializable {
 			this.userData = new TreeMap<>(userData);
 			this.editorConfigOverride = new TreeMap<>(editorConfigOverride);
 			this.jarState = JarState.from(coordinate + version, provisioner);
+			this.editorConfigPath = editorConfigPath;
 			this.isScript = isScript;
 		}
 
@@ -111,8 +118,8 @@ FormatterFunc createFormat() throws Exception {
 			final ClassLoader classLoader = jarState.getClassLoader();
 			Class<?> formatterFunc = classLoader.loadClass("com.diffplug.spotless.glue.ktlint.KtlintFormatterFunc");
 			Constructor<?> constructor = formatterFunc.getConstructor(
-					String.class, boolean.class, boolean.class, Map.class, Map.class);
-			return (FormatterFunc.NeedsFile) constructor.newInstance(version, isScript, useExperimental, userData, editorConfigOverride);
+					String.class, boolean.class, boolean.class, String.class, Map.class, Map.class);
+			return (FormatterFunc.NeedsFile) constructor.newInstance(version, isScript, useExperimental, editorConfigPath, userData, editorConfigOverride);
 		}
 	}
 }
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
index 546efab46d..eddeef36d6 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,7 +60,7 @@ public LicenseHeaderConfig licenseHeaderFile(Object licenseHeaderFile) {
 	/** Adds the specified version of <a href="https://github.com/pinterest/ktlint">ktlint</a>. */
 	public KotlinFormatExtension ktlint(String version) {
 		Objects.requireNonNull(version);
-		return new KotlinFormatExtension(version, false, Collections.emptyMap(), Collections.emptyMap());
+		return new KotlinFormatExtension(version, false, null, Collections.emptyMap(), Collections.emptyMap());
 	}
 
 	public KotlinFormatExtension ktlint() {
@@ -71,13 +71,15 @@ public class KotlinFormatExtension {
 
 		private final String version;
 		private boolean useExperimental;
+		private String editorConfigPath;
 		private Map<String, String> userData;
 		private Map<String, Object> editorConfigOverride;
 
-		KotlinFormatExtension(String version, boolean useExperimental, Map<String, String> config,
+		KotlinFormatExtension(String version, boolean useExperimental, String editorConfigPath, Map<String, String> config,
 				Map<String, Object> editorConfigOverride) {
 			this.version = version;
 			this.useExperimental = useExperimental;
+			this.editorConfigPath = editorConfigPath;
 			this.userData = config;
 			this.editorConfigOverride = editorConfigOverride;
 			addStep(createStep());
@@ -106,7 +108,7 @@ public KotlinFormatExtension editorConfigOverride(Map<String, Object> editorConf
 		}
 
 		private FormatterStep createStep() {
-			return KtLintStep.create(version, provisioner(), useExperimental, userData, editorConfigOverride);
+			return KtLintStep.create(version, provisioner(), useExperimental, false, editorConfigPath, userData, editorConfigOverride);
 		}
 	}
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
index c1abe62bd1..5120d88754 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,7 +45,7 @@ public KotlinGradleExtension(SpotlessExtension spotless) {
 	/** Adds the specified version of <a href="https://github.com/pinterest/ktlint">ktlint</a>. */
 	public KotlinFormatExtension ktlint(String version) {
 		Objects.requireNonNull(version, "version");
-		return new KotlinFormatExtension(version, false, Collections.emptyMap(), Collections.emptyMap());
+		return new KotlinFormatExtension(version, false, null, Collections.emptyMap(), Collections.emptyMap());
 	}
 
 	public KotlinFormatExtension ktlint() {
@@ -56,18 +56,26 @@ public class KotlinFormatExtension {
 
 		private final String version;
 		private boolean useExperimental;
+		private String editorConfigPath;
 		private Map<String, String> userData;
 		private Map<String, Object> editorConfigOverride;
 
-		KotlinFormatExtension(String version, boolean useExperimental, Map<String, String> config,
+		KotlinFormatExtension(String version, boolean useExperimental, String editorConfigPath, Map<String, String> config,
 				Map<String, Object> editorConfigOverride) {
 			this.version = version;
 			this.useExperimental = useExperimental;
+			this.editorConfigPath = editorConfigPath;
 			this.userData = config;
 			this.editorConfigOverride = editorConfigOverride;
 			addStep(createStep());
 		}
 
+		public KotlinFormatExtension setEditorConfigPath(String editorConfigPath) {
+			this.editorConfigPath = editorConfigPath;
+			replaceStep(createStep());
+			return this;
+		}
+
 		public KotlinFormatExtension setUseExperimental(boolean useExperimental) {
 			this.useExperimental = useExperimental;
 			replaceStep(createStep());
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
index 45bda05065..ad57c47976 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,8 @@ public class Ktlint implements FormatterStepFactory {
 
 	@Parameter
 	private String version;
-
+	@Parameter
+	private String editorConfigPath;
 	@Parameter
 	private Map<String, Object> editorConfigOverride;
 
@@ -42,6 +43,6 @@ public FormatterStep newFormatterStep(FormatterStepConfig config) {
 			editorConfigOverride = new HashMap<>();
 		}
 
-		return KtLintStep.create(ktlintVersion, config.getProvisioner(), false, Collections.emptyMap(), editorConfigOverride);
+		return KtLintStep.create(ktlintVersion, config.getProvisioner(), false, false, editorConfigPath, Collections.emptyMap(), editorConfigOverride);
 	}
 }

From 132ecc94a2380da4afcea336bdad5fcbf652fe93 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 2 Jan 2023 14:39:02 -0800
Subject: [PATCH 0423/2068] Breaking changes to Spotless' internal testing
 infrastructure `testlib`   * `StepHarness` now operates on `Formatter` rather
 than a `FormatterStep`.   * `StepHarnessWithFile` now takes a
 `ResourceHarness` in its constructor.   * Standardized that we test exception
 *messages*, not types, which will ease the transition to linting later on.

---
 .../spotless/extra/GitAttributesTest.java     |  25 ++--
 .../diffplug/spotless/ResourceHarness.java    |  55 ++++-----
 .../com/diffplug/spotless/StepHarness.java    |  69 ++++++-----
 .../spotless/StepHarnessWithFile.java         | 105 ++++++++++-------
 .../antlr4/Antlr4FormatterStepTest.java       |  10 +-
 .../spotless/cpp/ClangFormatStepTest.java     |  14 +--
 .../spotless/generic/IndentStepTest.java      |  28 ++---
 .../spotless/generic/PipeStepPairTest.java    |  16 ++-
 .../java/FormatAnnotationsStepTest.java       |  18 +--
 .../spotless/java/ImportOrderStepTest.java    |  47 ++++----
 .../json/JsonFormatterStepCommonTests.java    |   5 +-
 .../spotless/json/JsonSimpleStepTest.java     | 111 ++++++++++++++----
 .../spotless/json/gson/GsonStepTest.java      |  33 ++----
 .../spotless/kotlin/DiktatStepTest.java       |  42 ++-----
 .../spotless/kotlin/KtLintStepTest.java       | 106 +++++++----------
 .../npm/PrettierFormatterStepTest.java        |  17 ++-
 .../spotless/scala/ScalaFmtStepTest.java      |  33 +++---
 17 files changed, 373 insertions(+), 361 deletions(-)

diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/GitAttributesTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/GitAttributesTest.java
index ed657c365a..a7cde9e58f 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/GitAttributesTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/GitAttributesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,24 +26,19 @@
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.junit.jupiter.api.Test;
 
-import com.diffplug.common.base.Errors;
 import com.diffplug.common.base.StringPrinter;
 import com.diffplug.spotless.LineEnding;
 import com.diffplug.spotless.ResourceHarness;
 
 class GitAttributesTest extends ResourceHarness {
 	private List<File> testFiles(String prefix) {
-		try {
-			List<File> result = new ArrayList<>();
-			for (String path : TEST_PATHS) {
-				String prefixedPath = prefix + path;
-				setFile(prefixedPath).toContent("");
-				result.add(newFile(prefixedPath));
-			}
-			return result;
-		} catch (IOException e) {
-			throw Errors.asRuntime(e);
+		List<File> result = new ArrayList<>();
+		for (String path : TEST_PATHS) {
+			String prefixedPath = prefix + path;
+			setFile(prefixedPath).toContent("");
+			result.add(newFile(prefixedPath));
 		}
+		return result;
 	}
 
 	private List<File> testFiles() {
@@ -53,7 +48,7 @@ private List<File> testFiles() {
 	private static final List<String> TEST_PATHS = Arrays.asList("someFile", "subfolder/someFile", "MANIFEST.MF", "subfolder/MANIFEST.MF");
 
 	@Test
-	void cacheTest() throws IOException {
+	void cacheTest() {
 		setFile(".gitattributes").toContent(StringPrinter.buildStringFromLines(
 				"* eol=lf",
 				"*.MF eol=crlf"));
@@ -84,7 +79,7 @@ void cacheTest() throws IOException {
 	}
 
 	@Test
-	void policyTest() throws IOException {
+	void policyTest() {
 		setFile(".gitattributes").toContent(StringPrinter.buildStringFromLines(
 				"* eol=lf",
 				"*.MF eol=crlf"));
@@ -96,7 +91,7 @@ void policyTest() throws IOException {
 	}
 
 	@Test
-	void policyDefaultLineEndingTest() throws GitAPIException, IOException {
+	void policyDefaultLineEndingTest() throws GitAPIException {
 		Git git = Git.init().setDirectory(rootFolder()).call();
 		git.close();
 		setFile(".git/config").toContent(StringPrinter.buildStringFromLines(
diff --git a/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java b/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java
index b4a8bbae24..d4a79fe417 100644
--- a/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java
+++ b/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,7 +54,7 @@ protected File rootFolder() {
 	}
 
 	/** Returns a new child of the root folder. */
-	protected File newFile(String subpath) throws IOException {
+	protected File newFile(String subpath) {
 		return new File(rootFolder(), subpath);
 	}
 
@@ -85,16 +85,16 @@ protected void replace(String path, String toReplace, String replaceWith) throws
 	}
 
 	/** Returns the contents of the given file from the src/test/resources directory. */
-	protected static String getTestResource(String filename) throws IOException {
+	protected static String getTestResource(String filename) {
 		URL url = ResourceHarness.class.getResource("/" + filename);
 		if (url == null) {
 			throw new IllegalArgumentException("No such resource " + filename);
 		}
-		return Resources.toString(url, StandardCharsets.UTF_8);
+		return ThrowingEx.get(() -> LineEnding.toUnix(Resources.toString(url, StandardCharsets.UTF_8)));
 	}
 
 	/** Returns Files (in a temporary folder) which has the contents of the given file from the src/test/resources directory. */
-	protected List<File> createTestFiles(String... filenames) throws IOException {
+	protected List<File> createTestFiles(String... filenames) {
 		List<File> files = new ArrayList<>(filenames.length);
 		for (String filename : filenames) {
 			files.add(createTestFile(filename));
@@ -103,7 +103,7 @@ protected List<File> createTestFiles(String... filenames) throws IOException {
 	}
 
 	/** Returns a File (in a temporary folder) which has the contents of the given file from the src/test/resources directory. */
-	protected File createTestFile(String filename) throws IOException {
+	protected File createTestFile(String filename) {
 		return createTestFile(filename, UnaryOperator.identity());
 	}
 
@@ -111,39 +111,22 @@ protected File createTestFile(String filename) throws IOException {
 	 * Returns a File (in a temporary folder) which has the contents, possibly processed, of the given file from the
 	 * src/test/resources directory.
 	 */
-	protected File createTestFile(String filename, UnaryOperator<String> fileContentsProcessor) throws IOException {
+	protected File createTestFile(String filename, UnaryOperator<String> fileContentsProcessor) {
 		int lastSlash = filename.lastIndexOf('/');
 		String name = lastSlash >= 0 ? filename.substring(lastSlash) : filename;
 		File file = newFile(name);
 		file.getParentFile().mkdirs();
-		Files.write(file.toPath(), fileContentsProcessor.apply(getTestResource(filename)).getBytes(StandardCharsets.UTF_8));
+		ThrowingEx.run(() -> Files.write(file.toPath(), fileContentsProcessor.apply(getTestResource(filename)).getBytes(StandardCharsets.UTF_8)));
 		return file;
 	}
 
-	/** Reads the given resource from "before", applies the step, and makes sure the result is "after". */
-	protected void assertOnResources(FormatterStep step, String unformattedPath, String expectedPath) throws Throwable {
-		assertOnResources(rawUnix -> step.format(rawUnix, new File("")), unformattedPath, expectedPath);
-	}
-
-	/** Reads the given resource from "before", applies the step, and makes sure the result is "after". */
-	protected void assertOnResources(FormatterFunc step, String unformattedPath, String expectedPath) throws Throwable {
-		String unformatted = LineEnding.toUnix(getTestResource(unformattedPath)); // unix-ified input
-		String formatted = step.apply(unformatted);
-		// no windows newlines
-		assertThat(formatted).doesNotContain("\r");
-
-		// unix-ify the test resource output in case git screwed it up
-		String expected = LineEnding.toUnix(getTestResource(expectedPath)); // unix-ified output
-		assertThat(formatted).isEqualTo(expected);
-	}
-
 	@CheckReturnValue
-	protected ReadAsserter assertFile(String path) throws IOException {
+	protected ReadAsserter assertFile(String path) {
 		return new ReadAsserter(newFile(path));
 	}
 
 	@CheckReturnValue
-	protected ReadAsserter assertFile(File file) throws IOException {
+	protected ReadAsserter assertFile(File file) {
 		return new ReadAsserter(file);
 	}
 
@@ -176,7 +159,7 @@ public void matches(Consumer<AbstractCharSequenceAssert<?, String>> conditions)
 		}
 	}
 
-	protected WriteAsserter setFile(String path) throws IOException {
+	protected WriteAsserter setFile(String path) {
 		return new WriteAsserter(newFile(path));
 	}
 
@@ -188,21 +171,25 @@ private WriteAsserter(File file) {
 			this.file = file;
 		}
 
-		public File toLines(String... lines) throws IOException {
+		public File toLines(String... lines) {
 			return toContent(String.join("\n", Arrays.asList(lines)));
 		}
 
-		public File toContent(String content) throws IOException {
+		public File toContent(String content) {
 			return toContent(content, StandardCharsets.UTF_8);
 		}
 
-		public File toContent(String content, Charset charset) throws IOException {
-			Files.write(file.toPath(), content.getBytes(charset));
+		public File toContent(String content, Charset charset) {
+			ThrowingEx.run(() -> {
+				Files.write(file.toPath(), content.getBytes(charset));
+			});
 			return file;
 		}
 
-		public File toResource(String path) throws IOException {
-			Files.write(file.toPath(), getTestResource(path).getBytes(StandardCharsets.UTF_8));
+		public File toResource(String path) {
+			ThrowingEx.run(() -> {
+				Files.write(file.toPath(), getTestResource(path).getBytes(StandardCharsets.UTF_8));
+			});
 			return file;
 		}
 
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarness.java b/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
index 8755f852d6..976a80df29 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,31 +22,21 @@
 import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.Objects;
-import java.util.function.Consumer;
 
-import org.assertj.core.api.AbstractThrowableAssert;
+import org.assertj.core.api.AbstractStringAssert;
 import org.assertj.core.api.Assertions;
 
 /** An api for testing a {@code FormatterStep} that doesn't depend on the File path. DO NOT ADD FILE SUPPORT TO THIS, use {@link StepHarnessWithFile} if you need that. */
 public class StepHarness implements AutoCloseable {
-	private final FormatterFunc formatter;
+	private final Formatter formatter;
 
-	private StepHarness(FormatterFunc formatter) {
+	private StepHarness(Formatter formatter) {
 		this.formatter = Objects.requireNonNull(formatter);
 	}
 
 	/** Creates a harness for testing steps which don't depend on the file. */
 	public static StepHarness forStep(FormatterStep step) {
-		// We don't care if an individual FormatterStep is misbehaving on line-endings, because
-		// Formatter fixes that.  No reason to care in tests either.  It's likely to pop up when
-		// running tests on Windows from time-to-time
-		return new StepHarness(FormatterFunc.Closeable.ofDangerous(
-				() -> {
-					if (step instanceof FormatterStepImpl.Standard) {
-						((FormatterStepImpl.Standard<?>) step).cleanupFormatterFunc();
-					}
-				},
-				input -> LineEnding.toUnix(step.format(input, new File("")))));
+		return forSteps(step);
 	}
 
 	/** Creates a harness for testing steps which don't depend on the file. */
@@ -61,55 +51,62 @@ public static StepHarness forSteps(FormatterStep... steps) {
 
 	/** Creates a harness for testing a formatter whose steps don't depend on the file. */
 	public static StepHarness forFormatter(Formatter formatter) {
-		return new StepHarness(FormatterFunc.Closeable.ofDangerous(
-				formatter::close,
-				input -> formatter.compute(input, new File(""))));
+		return new StepHarness(formatter);
 	}
 
 	/** Asserts that the given element is transformed as expected, and that the result is idempotent. */
-	public StepHarness test(String before, String after) throws Exception {
-		String actual = formatter.apply(before);
+	public StepHarness test(String before, String after) {
+		String actual = formatter.compute(LineEnding.toUnix(before), new File(""));
 		assertEquals(after, actual, "Step application failed");
 		return testUnaffected(after);
 	}
 
 	/** Asserts that the given element is idempotent w.r.t the step under test. */
-	public StepHarness testUnaffected(String idempotentElement) throws Exception {
-		String actual = formatter.apply(idempotentElement);
+	public StepHarness testUnaffected(String idempotentElement) {
+		String actual = formatter.compute(LineEnding.toUnix(idempotentElement), new File(""));
 		assertEquals(idempotentElement, actual, "Step is not idempotent");
 		return this;
 	}
 
 	/** Asserts that the given elements in  the resources directory are transformed as expected. */
-	public StepHarness testResource(String resourceBefore, String resourceAfter) throws Exception {
+	public StepHarness testResource(String resourceBefore, String resourceAfter) {
 		String before = ResourceHarness.getTestResource(resourceBefore);
 		String after = ResourceHarness.getTestResource(resourceAfter);
 		return test(before, after);
 	}
 
 	/** Asserts that the given elements in the resources directory are transformed as expected. */
-	public StepHarness testResourceUnaffected(String resourceIdempotent) throws Exception {
+	public StepHarness testResourceUnaffected(String resourceIdempotent) {
 		String idempotentElement = ResourceHarness.getTestResource(resourceIdempotent);
 		return testUnaffected(idempotentElement);
 	}
 
-	/** Asserts that the given elements in the resources directory are transformed as expected. */
-	public StepHarness testResourceException(String resourceBefore, Consumer<AbstractThrowableAssert<?, ? extends Throwable>> exceptionAssertion) throws Exception {
-		return testException(ResourceHarness.getTestResource(resourceBefore), exceptionAssertion);
+	public AbstractStringAssert<?> testResourceExceptionMsg(String resourceBefore) {
+		return testExceptionMsg(ResourceHarness.getTestResource(resourceBefore));
 	}
 
-	/** Asserts that the given elements in the resources directory are transformed as expected. */
-	public StepHarness testException(String before, Consumer<AbstractThrowableAssert<?, ? extends Throwable>> exceptionAssertion) throws Exception {
-		Throwable t = assertThrows(Throwable.class, () -> formatter.apply(before));
-		AbstractThrowableAssert<?, ? extends Throwable> abstractAssert = Assertions.assertThat(t);
-		exceptionAssertion.accept(abstractAssert);
-		return this;
+	public AbstractStringAssert<?> testExceptionMsg(String before) {
+		try {
+			formatter.compute(LineEnding.toUnix(before), FormatterStepImpl.SENTINEL);
+			throw new SecurityException("Expected exception");
+		} catch (Throwable e) {
+			if (e instanceof SecurityException) {
+				throw new AssertionError(e.getMessage());
+			} else {
+				Throwable rootCause = e;
+				while (rootCause.getCause() != null) {
+					if (rootCause instanceof IllegalStateException) {
+						break;
+					}
+					rootCause = rootCause.getCause();
+				}
+				return Assertions.assertThat(rootCause.getMessage());
+			}
+		}
 	}
 
 	@Override
 	public void close() {
-		if (formatter instanceof FormatterFunc.Closeable) {
-			((FormatterFunc.Closeable) formatter).close();
-		}
+		formatter.close();
 	}
 }
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java b/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java
index 89be961d04..3d01a6bd44 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,78 +18,99 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
 import java.util.Objects;
 
+import org.assertj.core.api.AbstractStringAssert;
+import org.assertj.core.api.Assertions;
+
 /** An api for testing a {@code FormatterStep} that depends on the File path. */
 public class StepHarnessWithFile implements AutoCloseable {
-	private final FormatterFunc formatter;
+	private final Formatter formatter;
+	private final ResourceHarness harness;
 
-	private StepHarnessWithFile(FormatterFunc formatter) {
+	private StepHarnessWithFile(ResourceHarness harness, Formatter formatter) {
+		this.harness = Objects.requireNonNull(harness);
 		this.formatter = Objects.requireNonNull(formatter);
 	}
 
 	/** Creates a harness for testing steps which do depend on the file. */
-	public static StepHarnessWithFile forStep(FormatterStep step) {
-		// We don't care if an individual FormatterStep is misbehaving on line-endings, because
-		// Formatter fixes that.  No reason to care in tests either.  It's likely to pop up when
-		// running tests on Windows from time-to-time
-		return new StepHarnessWithFile(FormatterFunc.Closeable.ofDangerous(
-				() -> {
-					if (step instanceof FormatterStepImpl.Standard) {
-						((FormatterStepImpl.Standard<?>) step).cleanupFormatterFunc();
-					}
-				},
-				new FormatterFunc() {
-					@Override
-					public String apply(String unix) throws Exception {
-						return apply(unix, new File(""));
-					}
-
-					@Override
-					public String apply(String unix, File file) throws Exception {
-						return LineEnding.toUnix(step.format(unix, file));
-					}
-				}));
+	public static StepHarnessWithFile forStep(ResourceHarness harness, FormatterStep step) {
+		return new StepHarnessWithFile(harness, Formatter.builder()
+				.encoding(StandardCharsets.UTF_8)
+				.lineEndingsPolicy(LineEnding.UNIX.createPolicy())
+				.steps(Collections.singletonList(step))
+				.rootDir(harness.rootFolder().toPath())
+				.build());
 	}
 
 	/** Creates a harness for testing a formatter whose steps do depend on the file. */
-	public static StepHarnessWithFile forFormatter(Formatter formatter) {
-		return new StepHarnessWithFile(FormatterFunc.Closeable.ofDangerous(
-				formatter::close,
-				input -> formatter.compute(input, new File(""))));
+	public static StepHarnessWithFile forFormatter(ResourceHarness harness, Formatter formatter) {
+		return new StepHarnessWithFile(harness, formatter);
 	}
 
 	/** Asserts that the given element is transformed as expected, and that the result is idempotent. */
-	public StepHarnessWithFile test(File file, String before, String after) throws Exception {
-		String actual = formatter.apply(before, file);
+	public StepHarnessWithFile test(File file, String before, String after) {
+		String actual = formatter.compute(LineEnding.toUnix(before), file);
 		assertEquals(after, actual, "Step application failed");
 		return testUnaffected(file, after);
 	}
 
 	/** Asserts that the given element is idempotent w.r.t the step under test. */
-	public StepHarnessWithFile testUnaffected(File file, String idempotentElement) throws Exception {
-		String actual = formatter.apply(idempotentElement, file);
+	public StepHarnessWithFile testUnaffected(File file, String idempotentElement) {
+		String actual = formatter.compute(LineEnding.toUnix(idempotentElement), file);
 		assertEquals(idempotentElement, actual, "Step is not idempotent");
 		return this;
 	}
 
 	/** Asserts that the given elements in  the resources directory are transformed as expected. */
-	public StepHarnessWithFile testResource(File file, String resourceBefore, String resourceAfter) throws Exception {
-		String before = ResourceHarness.getTestResource(resourceBefore);
-		String after = ResourceHarness.getTestResource(resourceAfter);
-		return test(file, before, after);
+	public StepHarnessWithFile testResource(String resourceBefore, String resourceAfter) {
+		return testResource(resourceBefore, resourceBefore, resourceAfter);
+	}
+
+	public StepHarnessWithFile testResource(String filename, String resourceBefore, String resourceAfter) {
+		String contentBefore = ResourceHarness.getTestResource(resourceBefore);
+		File file = harness.setFile(filename).toContent(contentBefore);
+		return test(file, contentBefore, ResourceHarness.getTestResource(resourceAfter));
 	}
 
 	/** Asserts that the given elements in the resources directory are transformed as expected. */
-	public StepHarnessWithFile testResourceUnaffected(File file, String resourceIdempotent) throws Exception {
-		String idempotentElement = ResourceHarness.getTestResource(resourceIdempotent);
-		return testUnaffected(file, idempotentElement);
+	public StepHarnessWithFile testResourceUnaffected(String resourceIdempotent) {
+		String contentBefore = ResourceHarness.getTestResource(resourceIdempotent);
+		File file = harness.setFile(resourceIdempotent).toContent(contentBefore);
+		return testUnaffected(file, contentBefore);
+	}
+
+	public AbstractStringAssert<?> testResourceExceptionMsg(String resourceBefore) {
+		return testResourceExceptionMsg(resourceBefore, resourceBefore);
+	}
+
+	public AbstractStringAssert<?> testResourceExceptionMsg(String filename, String resourceBefore) {
+		String contentBefore = ResourceHarness.getTestResource(resourceBefore);
+		File file = harness.setFile(filename).toContent(contentBefore);
+		return testExceptionMsg(file, contentBefore);
+	}
+
+	public AbstractStringAssert<?> testExceptionMsg(File file, String before) {
+		try {
+			formatter.compute(LineEnding.toUnix(before), file);
+			throw new SecurityException("Expected exception");
+		} catch (Throwable e) {
+			if (e instanceof SecurityException) {
+				throw new AssertionError(e.getMessage());
+			} else {
+				Throwable rootCause = e;
+				while (rootCause.getCause() != null) {
+					rootCause = rootCause.getCause();
+				}
+				return Assertions.assertThat(rootCause.getMessage());
+			}
+		}
 	}
 
 	@Override
 	public void close() {
-		if (formatter instanceof FormatterFunc.Closeable) {
-			((FormatterFunc.Closeable) formatter).close();
-		}
+		formatter.close();
 	}
 }
diff --git a/testlib/src/test/java/com/diffplug/spotless/antlr4/Antlr4FormatterStepTest.java b/testlib/src/test/java/com/diffplug/spotless/antlr4/Antlr4FormatterStepTest.java
index a26cbd4425..0f5b1b0bb7 100644
--- a/testlib/src/test/java/com/diffplug/spotless/antlr4/Antlr4FormatterStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/antlr4/Antlr4FormatterStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,15 +18,13 @@
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.ResourceHarness;
+import com.diffplug.spotless.StepHarness;
 import com.diffplug.spotless.TestProvisioner;
 
-class Antlr4FormatterStepTest extends ResourceHarness {
-
+class Antlr4FormatterStepTest {
 	@Test
 	void formatGrammar() throws Throwable {
 		FormatterStep step = Antlr4FormatterStep.create(TestProvisioner.mavenCentral());
-		assertOnResources(step, "antlr4/Hello.unformatted.g4", "antlr4/Hello.formatted.g4");
+		StepHarness.forStep(step).testResource("antlr4/Hello.unformatted.g4", "antlr4/Hello.formatted.g4");
 	}
-
 }
diff --git a/testlib/src/test/java/com/diffplug/spotless/cpp/ClangFormatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/cpp/ClangFormatStepTest.java
index cf0f551485..7e76b4eea1 100644
--- a/testlib/src/test/java/com/diffplug/spotless/cpp/ClangFormatStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/cpp/ClangFormatStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 DiffPlug
+ * Copyright 2020-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,26 +15,26 @@
  */
 package com.diffplug.spotless.cpp;
 
-import java.io.File;
 import java.util.Arrays;
 
 import org.junit.jupiter.api.Test;
 
+import com.diffplug.spotless.ResourceHarness;
 import com.diffplug.spotless.StepHarnessWithFile;
 import com.diffplug.spotless.tag.ClangTest;
 
 @ClangTest
-class ClangFormatStepTest {
+class ClangFormatStepTest extends ResourceHarness {
 	@Test
-	void test() throws Exception {
-		try (StepHarnessWithFile harness = StepHarnessWithFile.forStep(ClangFormatStep.withVersion(ClangFormatStep.defaultVersion()).create())) {
+	void test() {
+		try (StepHarnessWithFile harness = StepHarnessWithFile.forStep(this, ClangFormatStep.withVersion(ClangFormatStep.defaultVersion()).create())) {
 			// can't be named java or it gets compiled into .class file
-			harness.testResource(new File("example.java"), "clang/example.java.dirty", "clang/example.java.clean");
+			harness.testResource("example.java", "clang/example.java.dirty", "clang/example.java.clean");
 			// test every other language clang supports
 			for (String ext : Arrays.asList("c", "cs", "js", "m", "proto")) {
 				String filename = "example." + ext;
 				String root = "clang/" + filename;
-				harness.testResource(new File(filename), root, root + ".clean");
+				harness.testResource(filename, root, root + ".clean");
 			}
 		}
 	}
diff --git a/testlib/src/test/java/com/diffplug/spotless/generic/IndentStepTest.java b/testlib/src/test/java/com/diffplug/spotless/generic/IndentStepTest.java
index c7df4639e3..38503d7182 100644
--- a/testlib/src/test/java/com/diffplug/spotless/generic/IndentStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/generic/IndentStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,46 +15,42 @@
  */
 package com.diffplug.spotless.generic;
 
-import java.io.File;
-
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.ResourceHarness;
 import com.diffplug.spotless.SerializableEqualityTester;
 import com.diffplug.spotless.StepHarness;
 
-class IndentStepTest extends ResourceHarness {
+class IndentStepTest {
 	@Test
-	void tabToTab() throws Throwable {
+	void tabToTab() {
 		FormatterStep indent = IndentStep.Type.TAB.create(4);
-		assertOnResources(indent, "indent/IndentedWithTab.test", "indent/IndentedWithTab.test");
+		StepHarness.forStep(indent).testResource("indent/IndentedWithTab.test", "indent/IndentedWithTab.test");
 	}
 
 	@Test
-	void spaceToSpace() throws Throwable {
+	void spaceToSpace() {
 		FormatterStep indent = IndentStep.Type.SPACE.create(4);
-		assertOnResources(indent, "indent/IndentedWithSpace.test", "indent/IndentedWithSpace.test");
+		StepHarness.forStep(indent).testResource("indent/IndentedWithSpace.test", "indent/IndentedWithSpace.test");
 	}
 
 	@Test
-	void spaceToTab() throws Throwable {
+	void spaceToTab() {
 		FormatterStep indent = IndentStep.Type.TAB.create(4);
-		assertOnResources(indent, "indent/IndentedWithSpace.test", "indent/IndentedWithTab.test");
+		StepHarness.forStep(indent).testResource("indent/IndentedWithSpace.test", "indent/IndentedWithTab.test");
 	}
 
 	@Test
-	void tabToSpace() throws Throwable {
+	void tabToSpace() {
 		FormatterStep indent = IndentStep.Type.SPACE.create(4);
-		assertOnResources(indent, "indent/IndentedWithTab.test", "indent/IndentedWithSpace.test");
+		StepHarness.forStep(indent).testResource("indent/IndentedWithTab.test", "indent/IndentedWithSpace.test");
 	}
 
 	@Test
-	void doesntClipNewlines() throws Throwable {
+	void doesntClipNewlines() {
 		FormatterStep indent = IndentStep.Type.SPACE.create(4);
 		String blankNewlines = "\n\n\n\n";
-		Assertions.assertEquals(blankNewlines, indent.format(blankNewlines, new File("")));
+		StepHarness.forStep(indent).testUnaffected(blankNewlines);
 	}
 
 	@Test
diff --git a/testlib/src/test/java/com/diffplug/spotless/generic/PipeStepPairTest.java b/testlib/src/test/java/com/diffplug/spotless/generic/PipeStepPairTest.java
index 6bb144e6b4..b648432b92 100644
--- a/testlib/src/test/java/com/diffplug/spotless/generic/PipeStepPairTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/generic/PipeStepPairTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 DiffPlug
+ * Copyright 2020-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@
 
 class PipeStepPairTest {
 	@Test
-	void single() throws Exception {
+	void single() {
 		PipeStepPair pair = PipeStepPair.named("underTest").openClose("spotless:off", "spotless:on").buildPair();
 		FormatterStep lowercase = FormatterStep.createNeverUpToDate("lowercase", str -> str.toLowerCase(Locale.ROOT));
 		StepHarness harness = StepHarness.forSteps(pair.in(), lowercase, pair.out());
@@ -47,7 +47,7 @@ void single() throws Exception {
 	}
 
 	@Test
-	void multiple() throws Exception {
+	void multiple() {
 		PipeStepPair pair = PipeStepPair.named("underTest").openClose("spotless:off", "spotless:on").buildPair();
 		FormatterStep lowercase = FormatterStep.createNeverUpToDate("lowercase", str -> str.toLowerCase(Locale.ROOT));
 		StepHarness harness = StepHarness.forSteps(pair.in(), lowercase, pair.out());
@@ -81,23 +81,21 @@ void multiple() throws Exception {
 	}
 
 	@Test
-	void broken() throws Exception {
+	void broken() {
 		PipeStepPair pair = PipeStepPair.named("underTest").openClose("spotless:off", "spotless:on").buildPair();
 		FormatterStep uppercase = FormatterStep.createNeverUpToDate("uppercase", str -> str.toUpperCase(Locale.ROOT));
 		StepHarness harness = StepHarness.forSteps(pair.in(), uppercase, pair.out());
 		// this fails because uppercase turns spotless:off into SPOTLESS:OFF, etc
-		harness.testException(StringPrinter.buildStringFromLines(
+		harness.testExceptionMsg(StringPrinter.buildStringFromLines(
 				"A B C",
 				"spotless:off",
 				"D E F",
 				"spotless:on",
-				"G H I"), exception -> {
-					exception.hasMessage("An intermediate step removed a match of spotless:off spotless:on");
-				});
+				"G H I")).isEqualTo("An intermediate step removed a match of spotless:off spotless:on");
 	}
 
 	@Test
-	void andApply() throws Exception {
+	void andApply() {
 		FormatterStep lowercase = FormatterStep.createNeverUpToDate("lowercase", str -> str.toLowerCase(Locale.ROOT));
 		FormatterStep lowercaseSometimes = PipeStepPair.named("lowercaseSometimes").openClose("<lower>", "</lower>")
 				.buildStepWhichAppliesSubSteps(Paths.get(""), Arrays.asList(lowercase));
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/FormatAnnotationsStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/FormatAnnotationsStepTest.java
index 84d347e490..7aa0b64c00 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/FormatAnnotationsStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/FormatAnnotationsStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 DiffPlug
+ * Copyright 2022-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,26 +20,26 @@
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.ResourceHarness;
 import com.diffplug.spotless.SerializableEqualityTester;
+import com.diffplug.spotless.StepHarness;
 
-class FormatAnnotationsStepTest extends ResourceHarness {
+class FormatAnnotationsStepTest {
 	@Test
-	void formatAnnotations() throws Throwable {
+	void formatAnnotations() {
 		FormatterStep step = FormatAnnotationsStep.create();
-		assertOnResources(step, "java/formatannotations/FormatAnnotationsTestInput.test", "java/formatannotations/FormatAnnotationsTestOutput.test");
+		StepHarness.forStep(step).testResource("java/formatannotations/FormatAnnotationsTestInput.test", "java/formatannotations/FormatAnnotationsTestOutput.test");
 	}
 
 	@Test
-	void formatAnnotationsInComments() throws Throwable {
+	void formatAnnotationsInComments() {
 		FormatterStep step = FormatAnnotationsStep.create();
-		assertOnResources(step, "java/formatannotations/FormatAnnotationsInCommentsInput.test", "java/formatannotations/FormatAnnotationsInCommentsOutput.test");
+		StepHarness.forStep(step).testResource("java/formatannotations/FormatAnnotationsInCommentsInput.test", "java/formatannotations/FormatAnnotationsInCommentsOutput.test");
 	}
 
 	@Test
-	void formatAnnotationsAddRemove() throws Throwable {
+	void formatAnnotationsAddRemove() {
 		FormatterStep step = FormatAnnotationsStep.create(Arrays.asList("Empty", "NonEmpty"), Arrays.asList("Localized"));
-		assertOnResources(step, "java/formatannotations/FormatAnnotationsAddRemoveInput.test", "java/formatannotations/FormatAnnotationsAddRemoveOutput.test");
+		StepHarness.forStep(step).testResource("java/formatannotations/FormatAnnotationsAddRemoveInput.test", "java/formatannotations/FormatAnnotationsAddRemoveOutput.test");
 	}
 
 	@Test
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/ImportOrderStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/ImportOrderStepTest.java
index 32cf0a97c0..8f3bd799bc 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/ImportOrderStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/ImportOrderStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,72 +20,73 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.ResourceHarness;
 import com.diffplug.spotless.SerializableEqualityTester;
+import com.diffplug.spotless.StepHarness;
 
 class ImportOrderStepTest extends ResourceHarness {
 	@Test
-	void sortImportsDefault() throws Throwable {
+	void sortImportsDefault() {
 		FormatterStep step = ImportOrderStep.forJava().createFrom();
-		assertOnResources(step, "java/importsorter/JavaCodeUnsortedImports.test", "java/importsorter/JavaCodeSortedImportsDefault.test");
+		StepHarness.forStep(step).testResource("java/importsorter/JavaCodeUnsortedImports.test", "java/importsorter/JavaCodeSortedImportsDefault.test");
 	}
 
 	@Test
-	void sortImportsFromArray() throws Throwable {
+	void sortImportsFromArray() {
 		FormatterStep step = ImportOrderStep.forJava().createFrom("java", "javax", "org", "\\#com");
-		assertOnResources(step, "java/importsorter/JavaCodeUnsortedImports.test", "java/importsorter/JavaCodeSortedImports.test");
+		StepHarness.forStep(step).testResource("java/importsorter/JavaCodeUnsortedImports.test", "java/importsorter/JavaCodeSortedImports.test");
 	}
 
 	@Test
-	void sortImportsFromArrayWithSubgroups() throws Throwable {
+	void sortImportsFromArrayWithSubgroups() {
 		FormatterStep step = ImportOrderStep.forJava().createFrom("java|javax", "org|\\#com", "\\#");
-		assertOnResources(step, "java/importsorter/JavaCodeUnsortedImportsSubgroups.test", "java/importsorter/JavaCodeSortedImportsSubgroups.test");
+		StepHarness.forStep(step).testResource("java/importsorter/JavaCodeUnsortedImportsSubgroups.test", "java/importsorter/JavaCodeSortedImportsSubgroups.test");
 	}
 
 	@Test
-	void sortImportsFromFile() throws Throwable {
+	void sortImportsFromFile() {
 		FormatterStep step = ImportOrderStep.forJava().createFrom(createTestFile("java/importsorter/import.properties"));
-		assertOnResources(step, "java/importsorter/JavaCodeUnsortedImports.test", "java/importsorter/JavaCodeSortedImports.test");
+		StepHarness.forStep(step).testResource("java/importsorter/JavaCodeUnsortedImports.test", "java/importsorter/JavaCodeSortedImports.test");
 	}
 
 	@Test
-	void sortImportsUnmatched() throws Throwable {
+	void sortImportsUnmatched() {
 		FormatterStep step = ImportOrderStep.forJava().createFrom(createTestFile("java/importsorter/import_unmatched.properties"));
-		assertOnResources(step, "java/importsorter/JavaCodeUnsortedImportsUnmatched.test", "java/importsorter/JavaCodeSortedImportsUnmatched.test");
+		StepHarness.forStep(step).testResource("java/importsorter/JavaCodeUnsortedImportsUnmatched.test", "java/importsorter/JavaCodeSortedImportsUnmatched.test");
 	}
 
 	@Test
-	void sortImportsWildcardsLast() throws Throwable {
+	void sortImportsWildcardsLast() {
 		FormatterStep step = ImportOrderStep.forJava().createFrom(true);
-		assertOnResources(step, "java/importsorter/JavaCodeUnsortedImports.test", "java/importsorter/JavaCodeSortedImportsWildcardsLast.test");
+		StepHarness.forStep(step).testResource("java/importsorter/JavaCodeUnsortedImports.test", "java/importsorter/JavaCodeSortedImportsWildcardsLast.test");
 	}
 
 	@Test
-	void removeDuplicates() throws Throwable {
+	void removeDuplicates() {
 		FormatterStep step = ImportOrderStep.forJava().createFrom(createTestFile("java/importsorter/import_unmatched.properties"));
-		assertOnResources(step, "java/importsorter/JavaCodeSortedDuplicateImportsUnmatched.test", "java/importsorter/JavaCodeSortedImportsUnmatched.test");
+		StepHarness.forStep(step).testResource("java/importsorter/JavaCodeSortedDuplicateImportsUnmatched.test", "java/importsorter/JavaCodeSortedImportsUnmatched.test");
 	}
 
 	@Test
-	void removeComments() throws Throwable {
+	void removeComments() {
 		FormatterStep step = ImportOrderStep.forJava().createFrom(createTestFile("java/importsorter/import.properties"));
-		assertOnResources(step, "java/importsorter/JavaCodeImportComments.test", "java/importsorter/JavaCodeSortedImports.test");
+		StepHarness.forStep(step).testResource("java/importsorter/JavaCodeImportComments.test", "java/importsorter/JavaCodeSortedImports.test");
 	}
 
 	@Test
-	void misplacedImports() throws Throwable {
+	void misplacedImports() {
 		FormatterStep step = ImportOrderStep.forJava().createFrom(createTestFile("java/importsorter/import.properties"));
-		assertOnResources(step, "java/importsorter/JavaCodeUnsortedMisplacedImports.test", "java/importsorter/JavaCodeSortedMisplacedImports.test");
+		StepHarness.forStep(step).testResource("java/importsorter/JavaCodeUnsortedMisplacedImports.test", "java/importsorter/JavaCodeSortedMisplacedImports.test");
 	}
 
 	@Test
-	void empty() throws Throwable {
+	void empty() {
 		FormatterStep step = ImportOrderStep.forJava().createFrom(createTestFile("java/importsorter/import.properties"));
-		assertOnResources(step, "java/importsorter/JavaCodeEmptyFile.test", "java/importsorter/JavaCodeEmptyFile.test");
+		StepHarness.forStep(step).testResource("java/importsorter/JavaCodeEmptyFile.test", "java/importsorter/JavaCodeEmptyFile.test");
 	}
 
 	@Test
-	void groovyImports() throws Throwable {
+	void groovyImports() {
 		FormatterStep step = ImportOrderStep.forGroovy().createFrom(createTestFile("java/importsorter/import.properties"));
-		assertOnResources(step, "java/importsorter/GroovyCodeUnsortedMisplacedImports.test", "java/importsorter/GroovyCodeSortedMisplacedImports.test");
+		StepHarness.forStep(step).testResource("java/importsorter/GroovyCodeUnsortedMisplacedImports.test", "java/importsorter/GroovyCodeSortedMisplacedImports.test");
 	}
 
 	@Test
diff --git a/testlib/src/test/java/com/diffplug/spotless/json/JsonFormatterStepCommonTests.java b/testlib/src/test/java/com/diffplug/spotless/json/JsonFormatterStepCommonTests.java
index 9ee76f994c..fbdb6e9a4e 100644
--- a/testlib/src/test/java/com/diffplug/spotless/json/JsonFormatterStepCommonTests.java
+++ b/testlib/src/test/java/com/diffplug/spotless/json/JsonFormatterStepCommonTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 DiffPlug
+ * Copyright 2022-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -95,10 +95,9 @@ protected StepHarness getStepHarness() {
 		return StepHarness.forStep(createFormatterStep(INDENT, TestProvisioner.mavenCentral()));
 	}
 
-	protected void doWithResource(String name) throws Exception {
+	protected void doWithResource(String name) {
 		String before = String.format("json/%sBefore.json", name);
 		String after = String.format("json/%sAfter.json", name);
 		getStepHarness().testResource(before, after);
 	}
-
 }
diff --git a/testlib/src/test/java/com/diffplug/spotless/json/JsonSimpleStepTest.java b/testlib/src/test/java/com/diffplug/spotless/json/JsonSimpleStepTest.java
index b4f98e69ba..19edc1a8e8 100644
--- a/testlib/src/test/java/com/diffplug/spotless/json/JsonSimpleStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/json/JsonSimpleStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 DiffPlug
+ * Copyright 2021-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,48 +19,115 @@
 
 import org.junit.jupiter.api.Test;
 
-import com.diffplug.spotless.*;
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.SerializableEqualityTester;
+import com.diffplug.spotless.StepHarness;
+import com.diffplug.spotless.TestProvisioner;
 
-class JsonSimpleStepTest extends JsonFormatterStepCommonTests {
+class JsonSimpleStepTest {
+
+	private static final int INDENT = 4;
+
+	private final FormatterStep step = JsonSimpleStep.create(INDENT, TestProvisioner.mavenCentral());
+	private final StepHarness stepHarness = StepHarness.forStep(step);
+
+	@Test
+	void cannotProvidedNullProvisioner() {
+		assertThatThrownBy(() -> JsonSimpleStep.create(INDENT, null)).isInstanceOf(NullPointerException.class).hasMessage("provisioner cannot be null");
+	}
+
+	@Test
+	void handlesSingletonObject() {
+		doWithResource(stepHarness, "singletonObject");
+	}
+
+	@Test
+	void handlesSingletonObjectWithArray() {
+		doWithResource(stepHarness, "singletonObjectWithArray");
+	}
+
+	@Test
+	void handlesNestedObject() {
+		doWithResource(stepHarness, "nestedObject");
+	}
 
 	@Test
-	void handlesSingletonObject() throws Exception {
-		doWithResource("singletonObject");
+	void handlesSingletonArray() {
+		doWithResource(stepHarness, "singletonArray");
 	}
 
 	@Test
-	void handlesSingletonObjectWithArray() throws Exception {
-		doWithResource("singletonObjectWithArray");
+	void handlesEmptyFile() {
+		doWithResource(stepHarness, "empty");
 	}
 
 	@Test
-	void handlesComplexNestedObject() throws Exception {
-		doWithResource("cucumberJsonSample");
+	void handlesComplexNestedObject() {
+		doWithResource(stepHarness, "cucumberJsonSample");
 	}
 
 	@Test
-	void handlesObjectWithNull() throws Exception {
-		doWithResource("objectWithNull");
+	void handlesObjectWithNull() {
+		doWithResource(stepHarness, "objectWithNull");
 	}
 
 	@Test
 	void handlesInvalidJson() {
-		assertThatThrownBy(() -> doWithResource("invalidJson"))
-				.isInstanceOf(AssertionError.class)
-				.hasMessage("Unable to format JSON")
-				.hasRootCauseMessage("Expected a ',' or '}' at 9 [character 0 line 3]");
+		stepHarness.testResourceExceptionMsg("json/invalidJsonBefore.json")
+				.contains("Expected a ',' or '}' at 9 [character 0 line 3]");
 	}
 
 	@Test
 	void handlesNotJson() {
-		assertThatThrownBy(() -> doWithResource("notJson"))
-				.isInstanceOf(AssertionError.class)
-				.hasMessage("Unable to determine JSON type, expected a '{' or '[' but found '#'")
-				.hasNoCause();
+		stepHarness.testResourceExceptionMsg("json/notJsonBefore.json")
+				.contains("Unable to determine JSON type, expected a '{' or '[' but found '#'");
+	}
+
+	@Test
+	void canSetCustomIndentationLevel() {
+		FormatterStep step = JsonSimpleStep.create(6, TestProvisioner.mavenCentral());
+		StepHarness stepHarness = StepHarness.forStep(step);
+
+		String before = "json/singletonArrayBefore.json";
+		String after = "json/singletonArrayAfter6Spaces.json";
+		stepHarness.testResource(before, after);
+	}
+
+	@Test
+	void canSetIndentationLevelTo0() {
+		FormatterStep step = JsonSimpleStep.create(0, TestProvisioner.mavenCentral());
+		StepHarness stepHarness = StepHarness.forStep(step);
+
+		String before = "json/singletonArrayBefore.json";
+		String after = "json/singletonArrayAfter0Spaces.json";
+		stepHarness.testResource(before, after);
+	}
+
+	@Test
+	void equality() {
+		new SerializableEqualityTester() {
+			int spaces = 0;
+
+			@Override
+			protected void setupTest(API api) {
+				// no changes, are the same
+				api.areDifferentThan();
+
+				// with different spacing
+				spaces = 1;
+				api.areDifferentThan();
+			}
+
+			@Override
+			protected FormatterStep create() {
+				return JsonSimpleStep.create(spaces, TestProvisioner.mavenCentral());
+			}
+		}.testEquals();
 	}
 
-	@Override
-	protected FormatterStep createFormatterStep(int indent, Provisioner provisioner) {
-		return JsonSimpleStep.create(indent, provisioner);
+	private static void doWithResource(StepHarness stepHarness, String name) {
+		String before = String.format("json/%sBefore.json", name);
+		String after = String.format("json/%sAfter.json", name);
+		stepHarness.testResource(before, after);
 	}
 }
diff --git a/testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java b/testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java
index cf1fd10752..8f1d758836 100644
--- a/testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 DiffPlug
+ * Copyright 2022-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,9 @@
  */
 package com.diffplug.spotless.json.gson;
 
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import java.io.File;
 
+import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.FormatterStep;
@@ -30,54 +31,47 @@ public class GsonStepTest extends JsonFormatterStepCommonTests {
 	private static final String DEFAULT_VERSION = "2.8.9";
 
 	@Test
-	void handlesComplexNestedObject() throws Exception {
+	void handlesComplexNestedObject() {
 		doWithResource("cucumberJsonSampleGson");
 	}
 
 	@Test
-	void handlesObjectWithNull() throws Exception {
+	void handlesObjectWithNull() {
 		doWithResource("objectWithNullGson");
 	}
 
 	@Test
 	void handlesInvalidJson() {
-		assertThatThrownBy(() -> doWithResource("invalidJson"))
-				.isInstanceOf(AssertionError.class)
-				.hasMessage("Unable to format JSON")
-				.hasRootCauseMessage("End of input at line 3 column 1 path $.a");
+		getStepHarness().testResourceExceptionMsg("json/invalidJsonBefore.json").isEqualTo("End of input at line 3 column 1 path $.a");
 	}
 
 	@Test
 	void handlesNotJson() {
-		assertThatThrownBy(() -> doWithResource("notJson"))
-				.isInstanceOf(AssertionError.class)
-				.hasMessage("Unable to format JSON")
-				.hasNoCause();
+		getStepHarness().testResourceExceptionMsg("json/notJsonBefore.json").isEqualTo("Unable to format JSON");
 	}
 
 	@Test
-	void handlesSortingWhenSortByKeyEnabled() throws Exception {
+	void handlesSortingWhenSortByKeyEnabled() {
 		FormatterStep step = GsonStep.create(INDENT, true, false, DEFAULT_VERSION, TestProvisioner.mavenCentral());
-		StepHarness stepHarness = StepHarness.forStep(step);
-		stepHarness.testResource("json/sortByKeysBefore.json", "json/sortByKeysAfter.json");
+		StepHarness.forStep(step).testResource("json/sortByKeysBefore.json", "json/sortByKeysAfter.json");
 	}
 
 	@Test
-	void doesNoSortingWhenSortByKeyDisabled() throws Exception {
+	void doesNoSortingWhenSortByKeyDisabled() {
 		FormatterStep step = GsonStep.create(INDENT, false, false, DEFAULT_VERSION, TestProvisioner.mavenCentral());
 		StepHarness.forStep(step)
 				.testResource("json/sortByKeysBefore.json", "json/sortByKeysAfterDisabled.json");
 	}
 
 	@Test
-	void handlesHtmlEscapeWhenEnabled() throws Exception {
+	void handlesHtmlEscapeWhenEnabled() {
 		FormatterStep step = GsonStep.create(INDENT, false, true, DEFAULT_VERSION, TestProvisioner.mavenCentral());
 		StepHarness.forStep(step)
 				.testResource("json/escapeHtmlGsonBefore.json", "json/escapeHtmlGsonAfter.json");
 	}
 
 	@Test
-	void writesRawHtmlWhenHtmlEscapeDisabled() throws Exception {
+	void writesRawHtmlWhenHtmlEscapeDisabled() {
 		FormatterStep step = GsonStep.create(INDENT, false, false, DEFAULT_VERSION, TestProvisioner.mavenCentral());
 		StepHarness.forStep(step)
 				.testResource("json/escapeHtmlGsonBefore.json", "json/escapeHtmlGsonAfterDisabled.json");
@@ -86,8 +80,7 @@ void writesRawHtmlWhenHtmlEscapeDisabled() throws Exception {
 	@Test
 	void handlesVersionIncompatibility() {
 		FormatterStep step = GsonStep.create(INDENT, false, false, "1.7", TestProvisioner.mavenCentral());
-		StepHarness stepHarness = StepHarness.forStep(step);
-		assertThatThrownBy(() -> stepHarness.testResource("json/cucumberJsonSampleGsonBefore.json", "json/cucumberJsonSampleGsonAfter.json"))
+		Assertions.assertThatThrownBy(() -> step.format("", new File("")))
 				.isInstanceOf(IllegalStateException.class)
 				.hasMessage("There was a problem interacting with Gson; maybe you set an incompatible version?");
 	}
diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
index 45bf6524f1..5055f47e8d 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 DiffPlug
+ * Copyright 2021-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,27 +25,19 @@
 import com.diffplug.spotless.FileSignature;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.ResourceHarness;
-import com.diffplug.spotless.StepHarness;
+import com.diffplug.spotless.StepHarnessWithFile;
 import com.diffplug.spotless.TestProvisioner;
 
 class DiktatStepTest extends ResourceHarness {
 
 	@Test
-	void behavior() throws Exception {
+	void behavior() {
 		FormatterStep step = DiktatStep.create(TestProvisioner.mavenCentral());
-		StepHarness.forStep(step)
-				.testResourceException("kotlin/diktat/Unsolvable.kt", assertion -> {
-					assertion.isInstanceOf(AssertionError.class);
-					assertion.hasMessage("There are 4 unfixed errors:" +
-							System.lineSeparator() + "Error on line: 1, column: 1 cannot be fixed automatically" +
-							System.lineSeparator() + "[FILE_NAME_INCORRECT] file name is incorrect - it should end with .kt extension and be in PascalCase: testlib" +
-							System.lineSeparator() + "Error on line: 1, column: 1 cannot be fixed automatically" +
-							System.lineSeparator() + "[FILE_NAME_MATCH_CLASS] file name is incorrect - it should match with the class described in it if there is the only one class declared: testlib vs Unsolvable" +
-							System.lineSeparator() + "Error on line: 1, column: 1 cannot be fixed automatically" +
-							System.lineSeparator() + "[DEBUG_PRINT] use a dedicated logging library: found println()" +
-							System.lineSeparator() + "Error on line: 13, column: 9 cannot be fixed automatically" +
-							System.lineSeparator() + "[DEBUG_PRINT] use a dedicated logging library: found println()");
-				});
+		StepHarnessWithFile.forStep(this, step).testResourceExceptionMsg("kotlin/diktat/Unsolvable.kt").isEqualTo("There are 2 unfixed errors:" +
+				System.lineSeparator() + "Error on line: 1, column: 1 cannot be fixed automatically" +
+				System.lineSeparator() + "[DEBUG_PRINT] use a dedicated logging library: found println()" +
+				System.lineSeparator() + "Error on line: 13, column: 9 cannot be fixed automatically" +
+				System.lineSeparator() + "[DEBUG_PRINT] use a dedicated logging library: found println()");
 	}
 
 	@Test
@@ -55,19 +47,11 @@ void behaviorConf() throws Exception {
 		FileSignature config = signAsList(conf);
 
 		FormatterStep step = DiktatStep.create("1.2.1", TestProvisioner.mavenCentral(), config);
-		StepHarness.forStep(step)
-				.testResourceException("kotlin/diktat/Unsolvable.kt", assertion -> {
-					assertion.isInstanceOf(AssertionError.class);
-					assertion.hasMessage("There are 4 unfixed errors:" +
-							System.lineSeparator() + "Error on line: 1, column: 1 cannot be fixed automatically" +
-							System.lineSeparator() + "[FILE_NAME_INCORRECT] file name is incorrect - it should end with .kt extension and be in PascalCase: testlib" +
-							System.lineSeparator() + "Error on line: 1, column: 1 cannot be fixed automatically" +
-							System.lineSeparator() + "[FILE_NAME_MATCH_CLASS] file name is incorrect - it should match with the class described in it if there is the only one class declared: testlib vs Unsolvable" +
-							System.lineSeparator() + "Error on line: 1, column: 1 cannot be fixed automatically" +
-							System.lineSeparator() + "[DEBUG_PRINT] use a dedicated logging library: found println()" +
-							System.lineSeparator() + "Error on line: 13, column: 9 cannot be fixed automatically" +
-							System.lineSeparator() + "[DEBUG_PRINT] use a dedicated logging library: found println()");
-				});
+		StepHarnessWithFile.forStep(this, step).testResourceExceptionMsg("kotlin/diktat/Unsolvable.kt").isEqualTo("There are 2 unfixed errors:" +
+				System.lineSeparator() + "Error on line: 1, column: 1 cannot be fixed automatically" +
+				System.lineSeparator() + "[DEBUG_PRINT] use a dedicated logging library: found println()" +
+				System.lineSeparator() + "Error on line: 13, column: 9 cannot be fixed automatically" +
+				System.lineSeparator() + "[DEBUG_PRINT] use a dedicated logging library: found println()");
 	}
 
 	@Test
diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
index 42e377fde5..94de314e0b 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
@@ -22,62 +22,56 @@
 import com.diffplug.spotless.ResourceHarness;
 import com.diffplug.spotless.SerializableEqualityTester;
 import com.diffplug.spotless.StepHarness;
+import com.diffplug.spotless.StepHarnessWithFile;
 import com.diffplug.spotless.TestProvisioner;
 
 class KtLintStepTest extends ResourceHarness {
 	@Test
-	void behavior() throws Exception {
+	void behavior() {
 		FormatterStep step = KtLintStep.create(TestProvisioner.mavenCentral());
-		StepHarness.forStep(step)
+		StepHarnessWithFile.forStep(this, step)
 				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean")
-				.testResourceException("kotlin/ktlint/unsolvable.dirty", assertion -> {
-					assertion.isInstanceOf(AssertionError.class);
-					assertion.hasMessage("Error on line: 1, column: 1\n" +
-							"rule: no-wildcard-imports\n" +
-							"Wildcard import");
-				});
+				.testResourceExceptionMsg("kotlin/ktlint/unsolvable.dirty").isEqualTo(
+						"Error on line: 1, column: 1\n" +
+								"rule: no-wildcard-imports\n" +
+								"Wildcard import");
 	}
 
 	@Test
-	void worksShyiko() throws Exception {
+	void worksShyiko() {
 		FormatterStep step = KtLintStep.create("0.31.0", TestProvisioner.mavenCentral());
-		StepHarness.forStep(step)
+		StepHarnessWithFile.forStep(this, step)
 				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean")
-				.testResourceException("kotlin/ktlint/unsolvable.dirty", assertion -> {
-					assertion.isInstanceOf(AssertionError.class);
-					assertion.hasMessage("Error on line: 1, column: 1\n" +
-							"rule: no-wildcard-imports\n" +
-							"Wildcard import");
-				});
+				.testResourceExceptionMsg("kotlin/ktlint/unsolvable.dirty").isEqualTo(
+						"Error on line: 1, column: 1\n" +
+								"rule: no-wildcard-imports\n" +
+								"Wildcard import");
 	}
 
 	// Regression test to ensure it works on the version it switched to Pinterest (version 0.32.0)
 	// but before 0.34.
 	// https://github.com/diffplug/spotless/issues/419
 	@Test
-	void worksPinterestAndPre034() throws Exception {
+	void worksPinterestAndPre034() {
 		FormatterStep step = KtLintStep.create("0.32.0", TestProvisioner.mavenCentral());
-		StepHarness.forStep(step)
+		StepHarnessWithFile.forStep(this, step)
 				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean")
-				.testResourceException("kotlin/ktlint/unsolvable.dirty", assertion -> {
-					assertion.isInstanceOf(AssertionError.class);
-					assertion.hasMessage("Error on line: 1, column: 1\n" +
-							"rule: no-wildcard-imports\n" +
-							"Wildcard import");
-				});
+				.testResourceExceptionMsg("kotlin/ktlint/unsolvable.dirty").isEqualTo("Error on line: 1, column: 1\n" +
+						"rule: no-wildcard-imports\n" +
+						"Wildcard import");
 	}
 
 	// Regression test to handle alpha and 1.x version numbers
 	// https://github.com/diffplug/spotless/issues/668
 	@Test
-	void worksAlpha1() throws Exception {
+	void worksAlpha1() {
 		FormatterStep step = KtLintStep.create("0.38.0-alpha01", TestProvisioner.mavenCentral());
 		StepHarness.forStep(step)
 				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean");
 	}
 
 	@Test
-	void works0_44_0() throws Exception {
+	void works0_44_0() {
 		FormatterStep step = KtLintStep.create("0.44.0", TestProvisioner.mavenCentral());
 		StepHarness.forStep(step)
 				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean");
@@ -85,80 +79,68 @@ void works0_44_0() throws Exception {
 
 	@Disabled("https://github.com/pinterest/ktlint/issues/1421")
 	@Test
-	void works0_45_0() throws Exception {
+	void works0_45_0() {
 		FormatterStep step = KtLintStep.create("0.45.0", TestProvisioner.mavenCentral());
 		StepHarness.forStep(step)
 				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean");
 	}
 
 	@Test
-	void works0_45_1() throws Exception {
+	void works0_45_1() {
 		FormatterStep step = KtLintStep.create("0.45.1", TestProvisioner.mavenCentral());
 		StepHarness.forStep(step)
 				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean");
 	}
 
 	@Test
-	void works0_45_2() throws Exception {
+	void works0_45_2() {
 		FormatterStep step = KtLintStep.create("0.45.2", TestProvisioner.mavenCentral());
 		StepHarness.forStep(step)
 				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean");
 	}
 
 	@Test
-	void works0_46_0() throws Exception {
+	void works0_46_0() {
 		FormatterStep step = KtLintStep.create("0.46.0", TestProvisioner.mavenCentral());
-		StepHarness.forStep(step)
+		StepHarnessWithFile.forStep(this, step)
 				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean")
-				.testResourceException("kotlin/ktlint/unsolvable.dirty", assertion -> {
-					assertion.isInstanceOf(AssertionError.class);
-					assertion.hasMessage("Error on line: 1, column: 1\n" +
-							"rule: no-wildcard-imports\n" +
-							"Wildcard import");
-				});
+				.testResourceExceptionMsg("kotlin/ktlint/unsolvable.dirty").isEqualTo("Error on line: 1, column: 1\n" +
+						"rule: no-wildcard-imports\n" +
+						"Wildcard import");
 	}
 
 	@Test
-	void works0_47_0() throws Exception {
+	void works0_47_0() {
 		FormatterStep step = KtLintStep.create("0.47.0", TestProvisioner.mavenCentral());
-		StepHarness.forStep(step)
+		StepHarnessWithFile.forStep(this, step)
 				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean")
-				.testResourceException("kotlin/ktlint/unsolvable.dirty", assertion -> {
-					assertion.isInstanceOf(AssertionError.class);
-					assertion.hasMessage("Error on line: 1, column: 1\n" +
-							"rule: no-wildcard-imports\n" +
-							"Wildcard import");
-				});
+				.testResourceExceptionMsg("kotlin/ktlint/unsolvable.dirty").isEqualTo("Error on line: 1, column: 1\n" +
+						"rule: no-wildcard-imports\n" +
+						"Wildcard import");
 	}
 
 	@Test
-	void works0_47_1() throws Exception {
+	void works0_47_1() {
 		FormatterStep step = KtLintStep.create("0.47.1", TestProvisioner.mavenCentral());
-		StepHarness.forStep(step)
+		StepHarnessWithFile.forStep(this, step)
 				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean")
-				.testResourceException("kotlin/ktlint/unsolvable.dirty", assertion -> {
-					assertion.isInstanceOf(AssertionError.class);
-					assertion.hasMessage("Error on line: 1, column: 1\n" +
-							"rule: no-wildcard-imports\n" +
-							"Wildcard import");
-				});
+				.testResourceExceptionMsg("kotlin/ktlint/unsolvable.dirty").isEqualTo("Error on line: 1, column: 1\n" +
+						"rule: no-wildcard-imports\n" +
+						"Wildcard import");
 	}
 
 	@Test
-	void works0_48_0() throws Exception {
+	void works0_48_0() {
 		FormatterStep step = KtLintStep.create("0.48.0", TestProvisioner.mavenCentral());
-		StepHarness.forStep(step)
+		StepHarnessWithFile.forStep(this, step)
 				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean")
-				.testResourceException("kotlin/ktlint/unsolvable.dirty", assertion -> {
-					assertion.isInstanceOf(AssertionError.class);
-					assertion.hasMessage("Error on line: 1, column: 1\n" +
-							"rule: no-wildcard-imports\n" +
-							"Wildcard import");
-				});
+				.testResourceExceptionMsg("kotlin/ktlint/unsolvable.dirty").isEqualTo("Error on line: 1, column: 1\n" +
+						"rule: no-wildcard-imports\n" +
+						"Wildcard import");
 	}
 
 	@Test
-	void equality() throws Exception {
+	void equality() {
 		new SerializableEqualityTester() {
 			String version = "0.32.0";
 
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
index d2d866e97d..9de75fda32 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,13 +25,14 @@
 
 import com.diffplug.common.collect.ImmutableMap;
 import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.ResourceHarness;
 import com.diffplug.spotless.StepHarness;
 import com.diffplug.spotless.StepHarnessWithFile;
 import com.diffplug.spotless.TestProvisioner;
 import com.diffplug.spotless.tag.NpmTest;
 
 @NpmTest
-class PrettierFormatterStepTest {
+class PrettierFormatterStepTest extends ResourceHarness {
 
 	@NpmTest
 	@Nested
@@ -96,8 +97,8 @@ void parserInferenceBasedOnFilenameIsWorking() throws Exception {
 					npmPathResolver(),
 					new PrettierConfig(null, Collections.emptyMap()));
 
-			try (StepHarnessWithFile stepHarness = StepHarnessWithFile.forStep(formatterStep)) {
-				stepHarness.testResource(new File("test.json"), dirtyFile, cleanFile);
+			try (StepHarnessWithFile stepHarness = StepHarnessWithFile.forStep(this, formatterStep)) {
+				stepHarness.testResource("test.json", dirtyFile, cleanFile);
 			}
 		}
 
@@ -109,11 +110,9 @@ void verifyPrettierErrorMessageIsRelayed() throws Exception {
 					buildDir(),
 					npmPathResolver(),
 					new PrettierConfig(null, ImmutableMap.of("parser", "postcss")));
-			try (StepHarness stepHarness = StepHarness.forStep(formatterStep)) {
-				stepHarness.testResourceException("npm/prettier/filetypes/scss/scss.dirty", exception -> {
-					exception.hasMessageContaining("HTTP 501");
-					exception.hasMessageContaining("Couldn't resolve parser \"postcss\"");
-				});
+			try (StepHarnessWithFile stepHarness = StepHarnessWithFile.forStep(this, formatterStep)) {
+				stepHarness.testResourceExceptionMsg("npm/prettier/filetypes/scss/scss.dirty").startsWith(
+						"com.diffplug.spotless.npm.SimpleRestClient$SimpleRestResponseException: Unexpected response status code at /prettier/format [HTTP 501] -- (Error while formatting: Error: Couldn't resolve parser \"postcss\")");
 			}
 		}
 	}
diff --git a/testlib/src/test/java/com/diffplug/spotless/scala/ScalaFmtStepTest.java b/testlib/src/test/java/com/diffplug/spotless/scala/ScalaFmtStepTest.java
index bad573e985..1714dd9e29 100644
--- a/testlib/src/test/java/com/diffplug/spotless/scala/ScalaFmtStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/scala/ScalaFmtStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,13 +15,9 @@
  */
 package com.diffplug.spotless.scala;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
 import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 
+import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.FormatterStep;
@@ -33,43 +29,43 @@
 
 class ScalaFmtStepTest extends ResourceHarness {
 	@Test
-	void behaviorDefaultConfig() throws Exception {
+	void behaviorDefaultConfig() {
 		StepHarness.forStep(ScalaFmtStep.create("3.0.0", TestProvisioner.mavenCentral(), null))
 				.testResource("scala/scalafmt/basic.dirty", "scala/scalafmt/basic.clean_3.0.0");
 	}
 
 	@Test
-	void behaviorCustomConfig() throws Exception {
+	void behaviorCustomConfig() {
 		StepHarness.forStep(ScalaFmtStep.create("3.0.0", TestProvisioner.mavenCentral(), createTestFile("scala/scalafmt/scalafmt.conf")))
 				.testResource("scala/scalafmt/basic.dirty", "scala/scalafmt/basic.cleanWithCustomConf_3.0.0");
 	}
 
 	@Test
-	void behaviorDefaultConfigVersion_3_0_0() throws Exception {
+	void behaviorDefaultConfigVersion_3_0_0() {
 		FormatterStep step = ScalaFmtStep.create("3.0.0", TestProvisioner.mavenCentral(), null);
 		StepHarness.forStep(step)
 				.testResource("scala/scalafmt/basic.dirty", "scala/scalafmt/basicPost3.0.0.clean");
 	}
 
 	@Test
-	void behaviorCustomConfigVersion_3_0_0() throws Exception {
+	void behaviorCustomConfigVersion_3_0_0() {
 		FormatterStep step = ScalaFmtStep.create("3.0.0", TestProvisioner.mavenCentral(), createTestFile("scala/scalafmt/scalafmt.conf"));
 		StepHarness.forStep(step)
 				.testResource("scala/scalafmt/basic.dirty", "scala/scalafmt/basicPost3.0.0.cleanWithCustomConf");
 	}
 
 	@Test
-	void equality() throws Exception {
+	void equality() {
 		new SerializableEqualityTester() {
-			String version = "3.5.9";
+			String version = "3.6.1";
 			File configFile = null;
 
 			@Override
-			protected void setupTest(API api) throws IOException {
+			protected void setupTest(API api) {
 				// same version == same
 				api.areDifferentThan();
 				// change the version, and it's different
-				version = "3.5.8";
+				version = "3.0.0";
 				api.areDifferentThan();
 				// add a config file, and its different
 				configFile = createTestFile("scala/scalafmt/scalafmt.conf");
@@ -87,12 +83,11 @@ protected FormatterStep create() {
 	}
 
 	@Test
-	void invalidConfiguration() throws Exception {
+	void invalidConfiguration() {
 		File invalidConfFile = createTestFile("scala/scalafmt/scalafmt.invalid.conf");
 		Provisioner provisioner = TestProvisioner.mavenCentral();
-
-		InvocationTargetException exception = assertThrows(InvocationTargetException.class,
-				() -> StepHarness.forStep(ScalaFmtStep.create("3.0.0", provisioner, invalidConfFile)).test("", ""));
-		assertThat(exception.getCause().getMessage()).contains("found option 'invalidScalaFmtConfigField' which wasn't expected");
+		Assertions.assertThatThrownBy(() -> {
+			ScalaFmtStep.create("3.0.0", provisioner, invalidConfFile).format("", new File(""));
+		}).cause().message().contains("found option 'invalidScalaFmtConfigField' which wasn't expected");
 	}
 }

From 748fd3040b286edf521c65cb67ad8cadc0e7c96f Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 2 Jan 2023 18:17:11 -0800
Subject: [PATCH 0424/2068] Update changelog.

---
 CHANGES.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index cf43b4eb22..a7e3516607 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,6 +13,11 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changes
 * Bump the dev version of Gradle from `7.5.1` to `7.6` ([#1409](https://github.com/diffplug/spotless/pull/1409))
   * We also removed the no-longer-required dependency `org.codehaus.groovy:groovy-xml`
+* Breaking changes to Spotless' internal testing infrastructure `testlib` ([#1443](https://github.com/diffplug/spotless/pull/1443))
+  * `ResourceHarness` no longer has any duplicated functionality which was also present in `StepHarness`
+  * `StepHarness` now operates on `Formatter` rather than a `FormatterStep`
+  * `StepHarnessWithFile` now takes a `ResourceHarness` in its constructor to handle the file manipulation parts
+  * Standardized that we test exception *messages*, not types, which will ease the transition to linting later on
 
 ## [2.31.1] - 2023-01-02
 ### Fixed

From 6cd1eb49e54fd4a58e78f8fc1db2e0a1998043a5 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 2 Jan 2023 18:45:08 -0800
Subject: [PATCH 0425/2068] Try to fix the failing Prettier test.

---
 .../com/diffplug/spotless/npm/PrettierFormatterStepTest.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
index 9de75fda32..5f14022ad8 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
@@ -111,8 +111,8 @@ void verifyPrettierErrorMessageIsRelayed() throws Exception {
 					npmPathResolver(),
 					new PrettierConfig(null, ImmutableMap.of("parser", "postcss")));
 			try (StepHarnessWithFile stepHarness = StepHarnessWithFile.forStep(this, formatterStep)) {
-				stepHarness.testResourceExceptionMsg("npm/prettier/filetypes/scss/scss.dirty").startsWith(
-						"com.diffplug.spotless.npm.SimpleRestClient$SimpleRestResponseException: Unexpected response status code at /prettier/format [HTTP 501] -- (Error while formatting: Error: Couldn't resolve parser \"postcss\")");
+				stepHarness.testResourceExceptionMsg("npm/prettier/filetypes/scss/scss.dirty").isEqualTo(
+						"Unexpected response status code at /prettier/format [HTTP 501] -- (Error while formatting: Error: Couldn't resolve parser \"postcss\")");
 			}
 		}
 	}

From f0b74d8a8494a4dd188ae773882fe2faa49e425c Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 2 Jan 2023 20:20:41 -0800
Subject: [PATCH 0426/2068] StepHarness needs a strict error policy for it to
 exercise what we want in the tests.

---
 testlib/src/main/java/com/diffplug/spotless/StepHarness.java     | 1 +
 .../src/main/java/com/diffplug/spotless/StepHarnessWithFile.java | 1 +
 2 files changed, 2 insertions(+)

diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarness.java b/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
index 976a80df29..71e2a663b5 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
@@ -46,6 +46,7 @@ public static StepHarness forSteps(FormatterStep... steps) {
 				.lineEndingsPolicy(LineEnding.UNIX.createPolicy())
 				.encoding(StandardCharsets.UTF_8)
 				.rootDir(Paths.get(""))
+				.exceptionPolicy(new FormatExceptionPolicyStrict())
 				.build());
 	}
 
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java b/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java
index 3d01a6bd44..98a709c59f 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java
@@ -42,6 +42,7 @@ public static StepHarnessWithFile forStep(ResourceHarness harness, FormatterStep
 				.lineEndingsPolicy(LineEnding.UNIX.createPolicy())
 				.steps(Collections.singletonList(step))
 				.rootDir(harness.rootFolder().toPath())
+				.exceptionPolicy(new FormatExceptionPolicyStrict())
 				.build());
 	}
 

From 5e728be5dbad1a66f04b19f62b4483c186bb727a Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Tue, 3 Jan 2023 22:33:12 +0400
Subject: [PATCH 0427/2068] Initial iteration

---
 plugin-maven/README.md                        | 50 ++++++++++++++++++-
 .../diffplug/spotless/maven/json/Gson.java    | 45 +++++++++++++++++
 .../diffplug/spotless/maven/json/Json.java    | 47 +++++++++++++++++
 .../diffplug/spotless/maven/json/Simple.java  | 35 +++++++++++++
 4 files changed, 176 insertions(+), 1 deletion(-)
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Gson.java
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Simple.java

diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 80be3dbc37..8be4149705 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -58,6 +58,7 @@ user@machine repo % mvn spotless:check
   - [Maven Pom](#maven-pom) ([sortPom](#sortpom))
   - [Markdown](#markdown) ([flexmark](#flexmark))
   - [Typescript](#typescript) ([tsfmt](#tsfmt), [prettier](#prettier))
+  - [JSON](#json)
   - Multiple languages
     - [Prettier](#prettier) ([plugins](#prettier-plugins), [npm detection](#npm-detection), [`.npmrc` detection](#npmrc-detection))
     - [eclipse web tools platform](#eclipse-web-tools-platform)
@@ -431,7 +432,7 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 <configuration>
   <cpp>
     <includes> <!-- You have to set the target manually -->
-      <include>src/native/**</inclue>
+      <include>src/native/**</include>
     </includes>
 
     <eclipseCdt /> <!-- has its own section below -->
@@ -700,6 +701,53 @@ The auto-discovery of config files (up the file tree) will not work when using t
 
 For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#npmrc-detection) sections of prettier, which apply also to tsfmt.
 
+## JSON
+
+- `com.diffplug.spotless.maven.json.Json` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java)
+
+```xml
+<configuration>
+  <json>
+    <includes>    <!-- You have to set the target manually -->
+      <include>src/**/*.json</include>
+    </includes>
+
+    <simple />    <!-- has its own section below -->
+    <gson />      <!-- has its own section below -->
+  </json>
+</configuration>
+```
+
+### simple
+
+Uses a JSON pretty-printer that optionally allows configuring the number of spaces that are used to pretty print objects:
+
+```xml
+<simple>
+	<indentSpaces>4</indentSpaces>    <!-- optional: specify the number of spaces to use -->
+</simple> 
+```
+
+### Gson
+
+Uses Google Gson to also allow sorting by keys besides custom indentation - useful for i18n files.
+
+```xml
+<gson>
+	<indentSpaces>4</indentSpaces>        <!-- optional: specify the number of spaces to use -->
+	<sortByKeys>false</sortByKeys>        <!-- optional: sort JSON by its keys -->
+	<escapeHtml>false</indentSpaces>      <!-- optional: escape HTML in values -->
+	<version>2.8.1</version>              <!-- optional: specify version -->
+</gson>
+```
+
+Notes:
+* There's no option in Gson to leave HTML as-is (i.e. escaped HTML would remain escaped, raw would remain raw). Either
+all HTML characters are written escaped or none. Set `escapeHtml` if you prefer the former.
+* `sortByKeys` will apply lexicographic order on the keys of the input JSON. See the
+[javadoc of String](https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/String.html#compareTo(java.lang.String))
+for details.
+
 <a name="applying-prettier-to-javascript--flow--typescript--css--scss--less--jsx--graphql--yaml--etc"></a>
 
 ## Prettier
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Gson.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Gson.java
new file mode 100644
index 0000000000..9091157637
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Gson.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2021 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.json;
+
+import org.apache.maven.plugins.annotations.Parameter;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.json.gson.GsonStep;
+import com.diffplug.spotless.maven.FormatterStepConfig;
+import com.diffplug.spotless.maven.FormatterStepFactory;
+
+public class Gson implements FormatterStepFactory {
+	private static final String DEFAULT_GSON_VERSION = "2.8.9";
+
+	@Parameter
+	int indentSpaces = Json.DEFAULT_INDENTATION;
+
+	@Parameter
+	boolean sortByKeys = false;
+
+	@Parameter
+	boolean escapeHtml = false;
+
+	@Parameter
+	String version = DEFAULT_GSON_VERSION;
+
+	@Override
+	public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
+		int indentSpaces = this.indentSpaces;
+		return GsonStep.create(indentSpaces, sortByKeys, escapeHtml, version, stepConfig.getProvisioner());
+	}
+}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java
new file mode 100644
index 0000000000..4cd4e88a7d
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2021 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.json;
+
+import java.util.Collections;
+import java.util.Set;
+
+import com.diffplug.spotless.maven.FormatterFactory;
+
+/**
+ * A {@link FormatterFactory} implementation that corresponds to {@code <json>...</json>} configuration element.
+ */
+public class Json extends FormatterFactory {
+	public static final int DEFAULT_INDENTATION = 4;
+	
+	@Override
+	public Set<String> defaultIncludes() {
+		return Collections.emptySet();
+	}
+
+	@Override
+	public String licenseHeaderDelimiter() {
+		return null;
+	}
+
+	public void addSimple(Simple simple) {
+		addStepFactory(simple);
+	}
+
+	public void addGson(Gson gson) {
+		addStepFactory(gson);
+	}
+
+}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Simple.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Simple.java
new file mode 100644
index 0000000000..5926d22282
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Simple.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2021 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.json;
+
+import org.apache.maven.plugins.annotations.Parameter;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.json.JsonSimpleStep;
+import com.diffplug.spotless.maven.FormatterStepConfig;
+import com.diffplug.spotless.maven.FormatterStepFactory;
+
+public class Simple implements FormatterStepFactory {
+
+	@Parameter
+	int indentSpaces = Json.DEFAULT_INDENTATION;
+
+	@Override
+	public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
+		int indentSpaces = this.indentSpaces;
+		return JsonSimpleStep.create(indentSpaces, stepConfig.getProvisioner());
+	}
+}

From a7f969c8a950b33fd609b93a77b9032fb191cf30 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Tue, 3 Jan 2023 22:34:34 +0400
Subject: [PATCH 0428/2068] Fix copyright

---
 .../src/main/java/com/diffplug/spotless/maven/json/Gson.java    | 2 +-
 .../src/main/java/com/diffplug/spotless/maven/json/Json.java    | 2 +-
 .../src/main/java/com/diffplug/spotless/maven/json/Simple.java  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Gson.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Gson.java
index 9091157637..7962ecb1f7 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Gson.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Gson.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java
index 4cd4e88a7d..27f9a0b82a 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Simple.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Simple.java
index 5926d22282..f1cc114da2 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Simple.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Simple.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 338dd161ed45c853f4b63772ee2da1d867c06521 Mon Sep 17 00:00:00 2001
From: Jake Wharton <github@jakewharton.com>
Date: Tue, 3 Jan 2023 14:00:09 -0500
Subject: [PATCH 0429/2068] Prevent tool configurations from being resolved
 outside project

When exposed they can create ambiguities when downstream projects try to automatically choose a configuration based on its attributes.
---
 .../java/com/diffplug/gradle/spotless/GradleProvisioner.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
index 97f051cd86..65e41da42c 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
@@ -118,6 +118,7 @@ private static Provisioner forConfigurationContainer(Project project, Configurat
 						.forEach(config.getDependencies()::add);
 				config.setDescription(mavenCoords.toString());
 				config.setTransitive(withTransitives);
+				config.setCanBeConsumed(false);
 				config.attributes(attr -> {
 					attr.attribute(Bundling.BUNDLING_ATTRIBUTE, project.getObjects().named(Bundling.class, Bundling.EXTERNAL));
 				});

From f9a70adede09876fb0b770209d89f1f11dd7108e Mon Sep 17 00:00:00 2001
From: Jake Wharton <github@jakewharton.com>
Date: Tue, 3 Jan 2023 14:05:48 -0500
Subject: [PATCH 0430/2068] Update CHANGES.md

---
 plugin-gradle/CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index cac4f56567..b9e3096980 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Prevent tool configurations from being resolved outside project ([#1447](https://github.com/diffplug/spotless/pull/1447))
 
 ## [6.12.1] - 2023-01-02
 ### Fixed

From 163fb6e347a2a45fceb5189fd8d8b47882eadd1d Mon Sep 17 00:00:00 2001
From: Jake Wharton <github@jakewharton.com>
Date: Tue, 3 Jan 2023 14:16:47 -0500
Subject: [PATCH 0431/2068] Update GradleProvisioner.java

---
 .../java/com/diffplug/gradle/spotless/GradleProvisioner.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
index 65e41da42c..bd5d8db8ca 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 773d59c45412a349437334a2429d675236e35396 Mon Sep 17 00:00:00 2001
From: Eir Nym <485399+eirnym@users.noreply.github.com>
Date: Tue, 3 Jan 2023 00:12:32 +0100
Subject: [PATCH 0432/2068] Add changes

---
 CHANGES.md               | 2 ++
 plugin-gradle/CHANGES.md | 2 ++
 plugin-maven/CHANGES.md  | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index cf43b4eb22..440ea59f80 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* Add option `editorConfigFile` for `ktLint` [#142](https://github.com/diffplug/spotless/issues/142)
 ### Changes
 * Bump the dev version of Gradle from `7.5.1` to `7.6` ([#1409](https://github.com/diffplug/spotless/pull/1409))
   * We also removed the no-longer-required dependency `org.codehaus.groovy:groovy-xml`
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index cac4f56567..3c9b51bd5a 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Added
+* Add option `editorConfigFile` for `ktLint` [#142](https://github.com/diffplug/spotless/issues/142)
 
 ## [6.12.1] - 2023-01-02
 ### Fixed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 84e06aa847..ae8ac7e4dd 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* Add option `editorConfigFile` for `ktLint` [#142](https://github.com/diffplug/spotless/issues/142)
 
 ## [2.29.0] - 2023-01-02
 ### Added

From 57be84fb8283e62ae971f25c5b3467ee5906db8a Mon Sep 17 00:00:00 2001
From: Eir Nym <485399+eirnym@users.noreply.github.com>
Date: Tue, 3 Jan 2023 21:19:47 +0100
Subject: [PATCH 0433/2068] Use FileSignature to cache changes

---
 .../glue/ktlint/KtlintFormatterFunc.java      | 26 +++++++------------
 .../diffplug/spotless/kotlin/KtLintStep.java  |  7 ++---
 .../gradle/spotless/KotlinExtension.java      | 14 ++++++++--
 .../spotless/KotlinGradleExtension.java       | 13 +++++++---
 .../spotless/maven/kotlin/Ktlint.java         | 11 +++++---
 5 files changed, 43 insertions(+), 28 deletions(-)

diff --git a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
index 5b43bf5e14..df98b6d691 100644
--- a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
+++ b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
@@ -15,20 +15,14 @@
  */
 package com.diffplug.spotless.glue.ktlint;
 
-import java.io.File;
-import java.util.Map;
+import com.diffplug.spotless.FileSignature;
+import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.glue.ktlint.compat.*;
 
 import org.jetbrains.annotations.NotNull;
 
-import com.diffplug.spotless.FormatterFunc;
-import com.diffplug.spotless.glue.ktlint.compat.KtLintCompat0Dot31Dot0Adapter;
-import com.diffplug.spotless.glue.ktlint.compat.KtLintCompat0Dot32Dot0Adapter;
-import com.diffplug.spotless.glue.ktlint.compat.KtLintCompat0Dot34Dot2Adapter;
-import com.diffplug.spotless.glue.ktlint.compat.KtLintCompat0Dot45Dot2Adapter;
-import com.diffplug.spotless.glue.ktlint.compat.KtLintCompat0Dot46Dot0Adapter;
-import com.diffplug.spotless.glue.ktlint.compat.KtLintCompat0Dot47Dot0Adapter;
-import com.diffplug.spotless.glue.ktlint.compat.KtLintCompat0Dot48Dot0Adapter;
-import com.diffplug.spotless.glue.ktlint.compat.KtLintCompatAdapter;
+import java.io.File;
+import java.util.Map;
 
 public class KtlintFormatterFunc implements FormatterFunc.NeedsFile {
 
@@ -37,11 +31,11 @@ public class KtlintFormatterFunc implements FormatterFunc.NeedsFile {
 	@NotNull
 	private final KtLintCompatAdapter adapter;
 	private final boolean useExperimental;
-	private final String editorConfigPath;
+	private final FileSignature editorConfigPath;
 	private final Map<String, Object> editorConfigOverrideMap;
 
-	public KtlintFormatterFunc(String version, boolean isScript, boolean useExperimental, String editorConfigPath, Map<String, String> userData,
-			Map<String, Object> editorConfigOverrideMap) {
+	public KtlintFormatterFunc(String version, boolean isScript, boolean useExperimental, FileSignature editorConfigPath, Map<String, String> userData,
+							   Map<String, Object> editorConfigOverrideMap) {
 		int minorVersion = Integer.parseInt(version.split("\\.")[1]);
 		if (minorVersion >= 48) {
 			// ExperimentalParams lost two constructor arguments, EditorConfigProperty moved to its own class
@@ -73,7 +67,7 @@ public KtlintFormatterFunc(String version, boolean isScript, boolean useExperime
 	}
 
 	@Override
-	public String applyWithFile(String unix, File file) throws Exception {
-		return adapter.format(unix, file.getName(), isScript, useExperimental, editorConfigPath, userData, editorConfigOverrideMap);
+	public String applyWithFile(String unix, File file) {
+		return adapter.format(unix, file.getName(), isScript, useExperimental, editorConfigPath.getOnlyFile().getAbsolutePath(), userData, editorConfigOverrideMap);
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index 9291e69fde..6d4d8b07ed 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -23,6 +23,7 @@
 import java.util.Objects;
 import java.util.TreeMap;
 
+import com.diffplug.spotless.FileSignature;
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
@@ -68,7 +69,7 @@ private static FormatterStep create(String version, Provisioner provisioner, boo
 	}
 
 	public static FormatterStep create(String version, Provisioner provisioner, boolean isScript, boolean useExperimental,
-			String editorConfig, Map<String, String> userData, Map<String, Object> editorConfigOverride) {
+			FileSignature editorConfig, Map<String, String> userData, Map<String, Object> editorConfigOverride) {
 		Objects.requireNonNull(version, "version");
 		Objects.requireNonNull(provisioner, "provisioner");
 		return FormatterStep.createLazy(NAME,
@@ -91,10 +92,10 @@ static final class State implements Serializable {
 		private final TreeMap<String, String> userData;
 		private final TreeMap<String, Object> editorConfigOverride;
 		private final String version;
-		private final String editorConfigPath;
+		private final FileSignature editorConfigPath;
 
 		State(String version, Provisioner provisioner, boolean isScript, boolean useExperimental,
-				String editorConfigPath, Map<String, String> userData, Map<String, Object> editorConfigOverride) throws IOException {
+				FileSignature editorConfigPath, Map<String, String> userData, Map<String, Object> editorConfigOverride) throws IOException {
 			this.version = version;
 
 			String coordinate;
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
index eddeef36d6..8af03aaefd 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
@@ -71,11 +71,11 @@ public class KotlinFormatExtension {
 
 		private final String version;
 		private boolean useExperimental;
-		private String editorConfigPath;
+		private FileSignature editorConfigPath;
 		private Map<String, String> userData;
 		private Map<String, Object> editorConfigOverride;
 
-		KotlinFormatExtension(String version, boolean useExperimental, String editorConfigPath, Map<String, String> config,
+		KotlinFormatExtension(String version, boolean useExperimental, FileSignature editorConfigPath, Map<String, String> config,
 				Map<String, Object> editorConfigOverride) {
 			this.version = version;
 			this.useExperimental = useExperimental;
@@ -91,6 +91,16 @@ public KotlinFormatExtension setUseExperimental(boolean useExperimental) {
 			return this;
 		}
 
+		public KotlinFormatExtension setEditorConfigPath(Object editorConfigFile) throws IOException {
+			if (editorConfigFile == null) {
+				this.editorConfigPath = null;
+			} else {
+				this.editorConfigPath = FileSignature.signAsList(getProject().file(editorConfigFile));
+			}
+			replaceStep(createStep());
+			return this;
+		}
+
 		public KotlinFormatExtension userData(Map<String, String> userData) {
 			// Copy the map to a sorted map because up-to-date checking is based on binary-equals of the serialized
 			// representation.
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
index 5120d88754..ca4ecc9bde 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
@@ -56,11 +56,11 @@ public class KotlinFormatExtension {
 
 		private final String version;
 		private boolean useExperimental;
-		private String editorConfigPath;
+		private FileSignature editorConfigPath;
 		private Map<String, String> userData;
 		private Map<String, Object> editorConfigOverride;
 
-		KotlinFormatExtension(String version, boolean useExperimental, String editorConfigPath, Map<String, String> config,
+		KotlinFormatExtension(String version, boolean useExperimental, FileSignature editorConfigPath, Map<String, String> config,
 				Map<String, Object> editorConfigOverride) {
 			this.version = version;
 			this.useExperimental = useExperimental;
@@ -70,8 +70,13 @@ public class KotlinFormatExtension {
 			addStep(createStep());
 		}
 
-		public KotlinFormatExtension setEditorConfigPath(String editorConfigPath) {
-			this.editorConfigPath = editorConfigPath;
+		public KotlinFormatExtension setEditorConfigPath(Object editorConfigPath) throws IOException {
+
+			if (editorConfigPath == null) {
+				this.editorConfigPath = null;
+			} else {
+				this.editorConfigPath = FileSignature.signAsList(getProject().file(editorConfigPath));
+			}
 			replaceStep(createStep());
 			return this;
 		}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
index ad57c47976..2825980733 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
@@ -21,7 +21,9 @@
 
 import org.apache.maven.plugins.annotations.Parameter;
 
+import com.diffplug.spotless.FileSignature;
 import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.ThrowingEx;
 import com.diffplug.spotless.kotlin.KtLintStep;
 import com.diffplug.spotless.maven.FormatterStepConfig;
 import com.diffplug.spotless.maven.FormatterStepFactory;
@@ -36,13 +38,16 @@ public class Ktlint implements FormatterStepFactory {
 	private Map<String, Object> editorConfigOverride;
 
 	@Override
-	public FormatterStep newFormatterStep(FormatterStepConfig config) {
+	public FormatterStep newFormatterStep(final FormatterStepConfig stepConfig) {
 		String ktlintVersion = version != null ? version : KtLintStep.defaultVersion();
-
+		FileSignature configPath = null;
+		if (editorConfigPath != null) {
+			configPath = ThrowingEx.get(() -> FileSignature.signAsList(stepConfig.getFileLocator().locateFile(editorConfigPath)));
+		}
 		if (editorConfigOverride == null) {
 			editorConfigOverride = new HashMap<>();
 		}
 
-		return KtLintStep.create(ktlintVersion, config.getProvisioner(), false, false, editorConfigPath, Collections.emptyMap(), editorConfigOverride);
+		return KtLintStep.create(ktlintVersion, stepConfig.getProvisioner(), false, false, configPath, Collections.emptyMap(), editorConfigOverride);
 	}
 }

From bd93e17a69613f04d4eab32629862c7229a2176f Mon Sep 17 00:00:00 2001
From: Eir Nym <485399+eirnym@users.noreply.github.com>
Date: Tue, 3 Jan 2023 22:03:22 +0100
Subject: [PATCH 0434/2068] Fix NPE and contract to pass the variable

---
 .../glue/ktlint/KtlintFormatterFunc.java      | 19 ++++++++++++-------
 .../diffplug/spotless/kotlin/KtLintStep.java  |  4 ++--
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
index df98b6d691..cfd6ab859c 100644
--- a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
+++ b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
@@ -15,14 +15,14 @@
  */
 package com.diffplug.spotless.glue.ktlint;
 
-import com.diffplug.spotless.FileSignature;
-import com.diffplug.spotless.FormatterFunc;
-import com.diffplug.spotless.glue.ktlint.compat.*;
+import java.io.File;
+import java.util.Map;
 
 import org.jetbrains.annotations.NotNull;
 
-import java.io.File;
-import java.util.Map;
+import com.diffplug.spotless.FileSignature;
+import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.glue.ktlint.compat.*;
 
 public class KtlintFormatterFunc implements FormatterFunc.NeedsFile {
 
@@ -35,7 +35,7 @@ public class KtlintFormatterFunc implements FormatterFunc.NeedsFile {
 	private final Map<String, Object> editorConfigOverrideMap;
 
 	public KtlintFormatterFunc(String version, boolean isScript, boolean useExperimental, FileSignature editorConfigPath, Map<String, String> userData,
-							   Map<String, Object> editorConfigOverrideMap) {
+			Map<String, Object> editorConfigOverrideMap) {
 		int minorVersion = Integer.parseInt(version.split("\\.")[1]);
 		if (minorVersion >= 48) {
 			// ExperimentalParams lost two constructor arguments, EditorConfigProperty moved to its own class
@@ -68,6 +68,11 @@ public KtlintFormatterFunc(String version, boolean isScript, boolean useExperime
 
 	@Override
 	public String applyWithFile(String unix, File file) {
-		return adapter.format(unix, file.getName(), isScript, useExperimental, editorConfigPath.getOnlyFile().getAbsolutePath(), userData, editorConfigOverrideMap);
+
+		String absoluteEditorConfigPath = null;
+		if (editorConfigPath != null) {
+			absoluteEditorConfigPath = editorConfigPath.getOnlyFile().getAbsolutePath();
+		}
+		return adapter.format(unix, file.getName(), isScript, useExperimental, absoluteEditorConfigPath, userData, editorConfigOverrideMap);
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index 6d4d8b07ed..4d29a01394 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -59,7 +59,7 @@ public static FormatterStep createForScript(String version, Provisioner provisio
 	}
 
 	public static FormatterStep createForScript(String version, Provisioner provisioner, boolean useExperimental,
-			Map<String, String> userData, Map<String, Object> editorConfigOverride) {
+			FileSignature editorConfigPath, Map<String, String> userData, Map<String, Object> editorConfigOverride) {
 		return create(version, provisioner, true, useExperimental, userData, editorConfigOverride);
 	}
 
@@ -119,7 +119,7 @@ FormatterFunc createFormat() throws Exception {
 			final ClassLoader classLoader = jarState.getClassLoader();
 			Class<?> formatterFunc = classLoader.loadClass("com.diffplug.spotless.glue.ktlint.KtlintFormatterFunc");
 			Constructor<?> constructor = formatterFunc.getConstructor(
-					String.class, boolean.class, boolean.class, String.class, Map.class, Map.class);
+					String.class, boolean.class, boolean.class, FileSignature.class, Map.class, Map.class);
 			return (FormatterFunc.NeedsFile) constructor.newInstance(version, isScript, useExperimental, editorConfigPath, userData, editorConfigOverride);
 		}
 	}

From b18da45e4a88f5900c80bd6dd6f2422b194127f2 Mon Sep 17 00:00:00 2001
From: Eir Nym <485399+eirnym@users.noreply.github.com>
Date: Tue, 3 Jan 2023 22:04:00 +0100
Subject: [PATCH 0435/2068] EditorConfig: Set sane default for Gradle

---
 .../gradle/spotless/KotlinGradleExtension.java     | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
index ca4ecc9bde..a06c640060 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
@@ -15,6 +15,7 @@
  */
 package com.diffplug.gradle.spotless;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.Map;
@@ -43,12 +44,17 @@ public KotlinGradleExtension(SpotlessExtension spotless) {
 	}
 
 	/** Adds the specified version of <a href="https://github.com/pinterest/ktlint">ktlint</a>. */
-	public KotlinFormatExtension ktlint(String version) {
+	public KotlinFormatExtension ktlint(String version) throws IOException {
 		Objects.requireNonNull(version, "version");
-		return new KotlinFormatExtension(version, false, null, Collections.emptyMap(), Collections.emptyMap());
+		FileSignature editorConfigPath = null;
+		File defaultEditorConfig = getProject().getRootProject().file(".editorConfig");
+		if (defaultEditorConfig.exists() && defaultEditorConfig.isFile()) {
+			editorConfigPath = FileSignature.signAsList(defaultEditorConfig);
+		}
+		return new KotlinFormatExtension(version, false, editorConfigPath, Collections.emptyMap(), Collections.emptyMap());
 	}
 
-	public KotlinFormatExtension ktlint() {
+	public KotlinFormatExtension ktlint() throws IOException {
 		return ktlint(KtLintStep.defaultVersion());
 	}
 
@@ -104,7 +110,7 @@ public KotlinFormatExtension editorConfigOverride(Map<String, Object> editorConf
 		}
 
 		private FormatterStep createStep() {
-			return KtLintStep.createForScript(version, provisioner(), useExperimental, userData, editorConfigOverride);
+			return KtLintStep.createForScript(version, provisioner(), useExperimental, editorConfigPath, userData, editorConfigOverride);
 		}
 	}
 

From 79e35c1dfe3c18aca8e216749d825752cd539d3d Mon Sep 17 00:00:00 2001
From: Eir Nym <485399+eirnym@users.noreply.github.com>
Date: Tue, 3 Jan 2023 22:07:05 +0100
Subject: [PATCH 0436/2068] EditorConfig: add documentation

---
 plugin-gradle/README.md | 10 +++++++++-
 plugin-maven/README.md  |  8 +++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 755d21d056..84c4e626a0 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -354,7 +354,14 @@ spotless {
 
 ### ktlint
 
-[homepage](https://github.com/pinterest/ktlint). [changelog](https://github.com/pinterest/ktlint/releases).  Spotless does not ([yet](https://github.com/diffplug/spotless/issues/142)) respect the `.editorconfig` settings ([ktlint docs](https://github.com/pinterest/ktlint#editorconfig)), but you can provide them manually as `editorConfigOverride`.
+[homepage](https://github.com/pinterest/ktlint). [changelog](https://github.com/pinterest/ktlint/releases).
+
+Spotless respects the `.editorconfig` settings by providing `editorConfigPath` option.
+([ktlint docs](https://github.com/pinterest/ktlint#editorconfig)).
+Default value is the `.editorconfig` file located in the top project.
+Passing `null` will clear the option.
+
+Additionally, `editorConfigOverride` options will override what's supplied in `.editorconfig` file.
 
 ```kotlin
 spotless {
@@ -363,6 +370,7 @@ spotless {
     ktlint("0.45.2")
       .setUseExperimental(true)
       .userData(mapOf("android" to "true"))
+      .editorConfigPath("$projectDir/config/.editorconfig")  // sample unusual placement
       .editorConfigOverride(mapOf("indent_size" to 2))
   }
 }
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 80be3dbc37..1ae8e3a195 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -354,7 +354,13 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ### ktlint
 
-[homepage](https://github.com/pinterest/ktlint). [changelog](https://github.com/pinterest/ktlint/releases). [code](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java).  Spotless does not ([yet](https://github.com/diffplug/spotless/issues/142)) respect the `.editorconfig` settings.
+[homepage](https://github.com/pinterest/ktlint). [changelog](https://github.com/pinterest/ktlint/releases).
+[code](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java).
+
+Spotless respects the `.editorconfig` settings by providing `editorConfigPath` option.
+([ktlint docs](https://github.com/pinterest/ktlint#editorconfig)).
+
+Additionally, `editorConfigOverride` options will override what's supplied in `.editorconfig` file.
 
 ```xml
 <ktlint>

From 696d50c8b49db16a27ba9222683ece55dbfc91d5 Mon Sep 17 00:00:00 2001
From: Jake Wharton <github@jakewharton.com>
Date: Tue, 3 Jan 2023 16:58:31 -0500
Subject: [PATCH 0437/2068] Update GradleProvisioner.java

---
 .../java/com/diffplug/gradle/spotless/GradleProvisioner.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
index bd5d8db8ca..e1129b3b0b 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
@@ -119,6 +119,7 @@ private static Provisioner forConfigurationContainer(Project project, Configurat
 				config.setDescription(mavenCoords.toString());
 				config.setTransitive(withTransitives);
 				config.setCanBeConsumed(false);
+				config.setVisible(false);
 				config.attributes(attr -> {
 					attr.attribute(Bundling.BUNDLING_ATTRIBUTE, project.getObjects().named(Bundling.class, Bundling.EXTERNAL));
 				});

From 5e442db1cd30bbc299cf904939af1174e6d44361 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 3 Jan 2023 14:30:02 -0800
Subject: [PATCH 0438/2068] Tweak changelog.

---
 plugin-gradle/CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index b9e3096980..c5f464069f 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -4,7 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Fixed
-* Prevent tool configurations from being resolved outside project ([#1447](https://github.com/diffplug/spotless/pull/1447))
+* Prevent tool configurations from being resolved outside project ([#1447](https://github.com/diffplug/spotless/pull/1447) fixes [#1215](https://github.com/diffplug/spotless/issues/1215))
 
 ## [6.12.1] - 2023-01-02
 ### Fixed

From fc938dfdd8d800ea37ac79d456e66f6a51250189 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Wed, 4 Jan 2023 11:27:01 +0400
Subject: [PATCH 0439/2068] Add changes note, Fix style

---
 plugin-maven/CHANGES.md                       |  1 +
 plugin-maven/README.md                        | 12 +++---
 .../diffplug/spotless/maven/json/Json.java    |  2 +-
 .../spotless/maven/json/JsonTest.java         | 40 +++++++++++++++++++
 4 files changed, 48 insertions(+), 7 deletions(-)
 create mode 100644 plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 84e06aa847..b15e005a9b 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 (
 ## [2.29.0] - 2023-01-02
 ### Added
 * Added support for M2E's incremental compilation ([#1414](https://github.com/diffplug/spotless/pull/1414) fixes [#1413](https://github.com/diffplug/spotless/issues/1413))
+* Add JSON support ([#1446](https://github.com/diffplug/spotless/pull/1446))
 ### Fixed
 * Improve memory usage when using git ratchet ([#1426](https://github.com/diffplug/spotless/pull/1426))
 * Support `ktlint` 0.48+ ([#1432](https://github.com/diffplug/spotless/pull/1432)) fixes ([#1430](https://github.com/diffplug/spotless/issues/1430))
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 8be4149705..70f3dfe1dc 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -724,8 +724,8 @@ Uses a JSON pretty-printer that optionally allows configuring the number of spac
 
 ```xml
 <simple>
-	<indentSpaces>4</indentSpaces>    <!-- optional: specify the number of spaces to use -->
-</simple> 
+  <indentSpaces>4</indentSpaces>    <!-- optional: specify the number of spaces to use -->
+</simple>
 ```
 
 ### Gson
@@ -734,10 +734,10 @@ Uses Google Gson to also allow sorting by keys besides custom indentation - usef
 
 ```xml
 <gson>
-	<indentSpaces>4</indentSpaces>        <!-- optional: specify the number of spaces to use -->
-	<sortByKeys>false</sortByKeys>        <!-- optional: sort JSON by its keys -->
-	<escapeHtml>false</indentSpaces>      <!-- optional: escape HTML in values -->
-	<version>2.8.1</version>              <!-- optional: specify version -->
+  <indentSpaces>4</indentSpaces>        <!-- optional: specify the number of spaces to use -->
+  <sortByKeys>false</sortByKeys>        <!-- optional: sort JSON by its keys -->
+  <escapeHtml>false</indentSpaces>      <!-- optional: escape HTML in values -->
+  <version>2.8.1</version>              <!-- optional: specify version -->
 </gson>
 ```
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java
index 27f9a0b82a..c326525d0c 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java
@@ -25,7 +25,7 @@
  */
 public class Json extends FormatterFactory {
 	public static final int DEFAULT_INDENTATION = 4;
-	
+
 	@Override
 	public Set<String> defaultIncludes() {
 		return Collections.emptySet();
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java
new file mode 100644
index 0000000000..b7e666190a
--- /dev/null
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.json;
+
+import org.junit.jupiter.api.Test;
+
+import com.diffplug.spotless.maven.MavenIntegrationHarness;
+
+public class JsonTest extends MavenIntegrationHarness {
+	@Test
+	public void testFormatJson_WithSimple_defaultConfig() throws Exception {
+		writePomWithPomSteps("<json><simple/></json>");
+
+		setFile("json_test.json").toResource("json/json_dirty.json");
+		mavenRunner().withArguments("spotless:apply").runNoError().error();
+		assertFile("json_test.json").sameAsResource("json/json_clean_default.json");
+	}
+
+	@Test
+	public void testFormatJson_WithGson_defaultConfig() throws Exception {
+		writePomWithPomSteps("<json><gson/></json>");
+
+		setFile("json_test.json").toResource("json/json_dirty.json");
+		mavenRunner().withArguments("spotless:apply").runNoError().error();
+		assertFile("json_test.json").sameAsResource("json/json_clean_default.json");
+	}
+}

From 49592279ad462949fb68c3643ee85be0a062d839 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Mon, 28 Nov 2022 19:55:57 +0100
Subject: [PATCH 0440/2068] extract base serve code

---
 .../spotless/npm/NpmResourceHelper.java       | 10 +++++-
 .../spotless/npm/PrettierFormatterStep.java   |  4 ++-
 .../spotless/npm/TsFmtFormatterStep.java      |  4 ++-
 .../com/diffplug/spotless/npm/common-serve.js | 32 +++++++++++++++++++
 .../diffplug/spotless/npm/prettier-serve.js   | 30 -----------------
 .../com/diffplug/spotless/npm/tsfmt-serve.js  | 31 ------------------
 6 files changed, 47 insertions(+), 64 deletions(-)
 create mode 100644 lib/src/main/resources/com/diffplug/spotless/npm/common-serve.js

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmResourceHelper.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmResourceHelper.java
index ad1211d717..cb6fff3290 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmResourceHelper.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmResourceHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,9 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.time.Duration;
+import java.util.Arrays;
 import java.util.concurrent.TimeoutException;
+import java.util.stream.Collectors;
 
 import com.diffplug.spotless.ThrowingEx;
 
@@ -45,6 +47,12 @@ static void deleteFileIfExists(File file) throws IOException {
 		}
 	}
 
+	static String readUtf8StringFromClasspath(Class<?> clazz, String... resourceNames) {
+		return Arrays.stream(resourceNames)
+				.map(resourceName -> readUtf8StringFromClasspath(clazz, resourceName))
+				.collect(Collectors.joining("\n"));
+	}
+
 	static String readUtf8StringFromClasspath(Class<?> clazz, String resourceName) {
 		try (InputStream input = clazz.getResourceAsStream(resourceName)) {
 			return readUtf8StringFromInputStream(input);
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
index 49d692d62c..5a5662eee4 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
@@ -70,7 +70,9 @@ private static class State extends NpmFormatterStepStateBase implements Serializ
 									NpmResourceHelper.readUtf8StringFromClasspath(PrettierFormatterStep.class, "/com/diffplug/spotless/npm/prettier-package.json"),
 									new TreeMap<>(devDependencies)),
 							"prettier",
-							NpmResourceHelper.readUtf8StringFromClasspath(PrettierFormatterStep.class, "/com/diffplug/spotless/npm/prettier-serve.js"),
+							NpmResourceHelper.readUtf8StringFromClasspath(PrettierFormatterStep.class,
+									"/com/diffplug/spotless/npm/common-serve.js",
+									"/com/diffplug/spotless/npm/prettier-serve.js"),
 							npmPathResolver.resolveNpmrcContent()),
 					buildDir,
 					npmPathResolver.resolveNpmExecutable());
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java
index 14080ecf56..e9c098d709 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java
@@ -76,7 +76,9 @@ public State(String stepName, Map<String, String> versions, File buildDir, NpmPa
 					new NpmConfig(
 							replaceDevDependencies(NpmResourceHelper.readUtf8StringFromClasspath(TsFmtFormatterStep.class, "/com/diffplug/spotless/npm/tsfmt-package.json"), new TreeMap<>(versions)),
 							"typescript-formatter",
-							NpmResourceHelper.readUtf8StringFromClasspath(PrettierFormatterStep.class, "/com/diffplug/spotless/npm/tsfmt-serve.js"),
+							NpmResourceHelper.readUtf8StringFromClasspath(PrettierFormatterStep.class,
+									"/com/diffplug/spotless/npm/common-serve.js",
+									"/com/diffplug/spotless/npm/tsfmt-serve.js"),
 							npmPathResolver.resolveNpmrcContent()),
 					buildDir,
 					npmPathResolver.resolveNpmExecutable());
diff --git a/lib/src/main/resources/com/diffplug/spotless/npm/common-serve.js b/lib/src/main/resources/com/diffplug/spotless/npm/common-serve.js
new file mode 100644
index 0000000000..3e031cedea
--- /dev/null
+++ b/lib/src/main/resources/com/diffplug/spotless/npm/common-serve.js
@@ -0,0 +1,32 @@
+// this file will be glued to the top of the specific xy-server.js file
+const GracefulShutdownManager = require("@moebius/http-graceful-shutdown").GracefulShutdownManager;
+const express = require("express");
+const app = express();
+
+app.use(express.json({ limit: "50mb" }));
+
+const fs = require("fs");
+
+var listener = app.listen(0, "127.0.0.1", () => {
+	console.log("Server running on port " + listener.address().port);
+	fs.writeFile("server.port.tmp", "" + listener.address().port, function(err) {
+		if (err) {
+			return console.log(err);
+		} else {
+			fs.rename("server.port.tmp", "server.port", function(err) {
+				if (err) {
+					return console.log(err);
+				}
+			}); // try to be as atomic as possible
+		}
+	});
+});
+const shutdownManager = new GracefulShutdownManager(listener);
+
+app.post("/shutdown", (req, res) => {
+	res.status(200).send("Shutting down");
+	setTimeout(function() {
+		shutdownManager.terminate(() => console.log("graceful shutdown finished."));
+	}, 200);
+});
+
diff --git a/lib/src/main/resources/com/diffplug/spotless/npm/prettier-serve.js b/lib/src/main/resources/com/diffplug/spotless/npm/prettier-serve.js
index 351ef73f9a..d4ce13bbbc 100644
--- a/lib/src/main/resources/com/diffplug/spotless/npm/prettier-serve.js
+++ b/lib/src/main/resources/com/diffplug/spotless/npm/prettier-serve.js
@@ -1,35 +1,5 @@
-const GracefulShutdownManager = require("@moebius/http-graceful-shutdown").GracefulShutdownManager;
-const express = require("express");
-const app = express();
-
-app.use(express.json({ limit: "50mb" }));
 const prettier = require("prettier");
 
-const fs = require("fs");
-
-var listener = app.listen(0, "127.0.0.1", () => {
-	console.log("Server running on port " + listener.address().port);
-	fs.writeFile("server.port.tmp", "" + listener.address().port, function(err) {
-		if (err) {
-			return console.log(err);
-		} else {
-			fs.rename("server.port.tmp", "server.port", function(err) {
-				if (err) {
-					return console.log(err);
-				}
-			}); // try to be as atomic as possible
-		}
-	});
-});
-const shutdownManager = new GracefulShutdownManager(listener);
-
-app.post("/shutdown", (req, res) => {
-	res.status(200).send("Shutting down");
-	setTimeout(function() {
-		shutdownManager.terminate(() => console.log("graceful shutdown finished."));
-	}, 200);
-});
-
 app.post("/prettier/config-options", (req, res) => {
 	var config_data = req.body;
 	var prettier_config_path = config_data.prettier_config_path;
diff --git a/lib/src/main/resources/com/diffplug/spotless/npm/tsfmt-serve.js b/lib/src/main/resources/com/diffplug/spotless/npm/tsfmt-serve.js
index b25048d410..8ec25565ff 100644
--- a/lib/src/main/resources/com/diffplug/spotless/npm/tsfmt-serve.js
+++ b/lib/src/main/resources/com/diffplug/spotless/npm/tsfmt-serve.js
@@ -1,36 +1,5 @@
-const GracefulShutdownManager = require("@moebius/http-graceful-shutdown").GracefulShutdownManager;
-const express = require("express");
-const app = express();
-app.use(express.json({ limit: "50mb" }));
-
 const tsfmt = require("typescript-formatter");
 
-const fs = require("fs");
-
-var listener = app.listen(0, "127.0.0.1", () => {
-	console.log("Server running on port " + listener.address().port);
-	fs.writeFile("server.port.tmp", "" + listener.address().port, function(err) {
-		if (err) {
-			return console.log(err);
-		} else {
-			fs.rename("server.port.tmp", "server.port", function(err) {
-				if (err) {
-					return console.log(err);
-				}
-			}); // try to be as atomic as possible
-		}
-	});
-});
-
-const shutdownManager = new GracefulShutdownManager(listener);
-
-app.post("/shutdown", (req, res) => {
-	res.status(200).send("Shutting down");
-	setTimeout(function() {
-		shutdownManager.terminate(() => console.log("graceful shutdown finished."));
-	}, 200);
-});
-
 app.post("/tsfmt/format", (req, res) => {
 	var format_data = req.body;
 	tsfmt.processString("spotless-format-string.ts", format_data.file_content, format_data.config_options).then(resultMap => {

From c70bd347f4b855035ddc466b0d7d5361ee77f415 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Mon, 28 Nov 2022 19:56:11 +0100
Subject: [PATCH 0441/2068] upgrade express to latest

---
 .../resources/com/diffplug/spotless/npm/prettier-package.json   | 2 +-
 .../main/resources/com/diffplug/spotless/npm/tsfmt-package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/resources/com/diffplug/spotless/npm/prettier-package.json b/lib/src/main/resources/com/diffplug/spotless/npm/prettier-package.json
index 113f20bc3f..7bda08db8a 100644
--- a/lib/src/main/resources/com/diffplug/spotless/npm/prettier-package.json
+++ b/lib/src/main/resources/com/diffplug/spotless/npm/prettier-package.json
@@ -9,7 +9,7 @@
 	},
 	"devDependencies": {
 ${devDependencies},
-		"express": "4.17.1",
+		"express": "4.18.2",
 		"@moebius/http-graceful-shutdown": "1.1.0"
 	},
 	"dependencies": {},
diff --git a/lib/src/main/resources/com/diffplug/spotless/npm/tsfmt-package.json b/lib/src/main/resources/com/diffplug/spotless/npm/tsfmt-package.json
index d6e5eff3b2..7037bd2ec1 100644
--- a/lib/src/main/resources/com/diffplug/spotless/npm/tsfmt-package.json
+++ b/lib/src/main/resources/com/diffplug/spotless/npm/tsfmt-package.json
@@ -9,7 +9,7 @@
 	},
 	"devDependencies": {
 ${devDependencies},
-		"express": "4.17.1",
+		"express": "4.18.2",
 		"@moebius/http-graceful-shutdown": "1.1.0"
 	},
 	"dependencies": {},

From 3884e14d7ffd9a3c4fbfbe9bdeeb1172810d0b17 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Sat, 3 Dec 2022 19:50:03 +0100
Subject: [PATCH 0442/2068] extract common rest code on client side

---
 .../spotless/npm/BaseNpmRestService.java      | 30 +++++++++++++++++++
 .../spotless/npm/PrettierRestService.java     | 13 ++------
 .../spotless/npm/TsFmtRestService.java        | 13 ++------
 3 files changed, 36 insertions(+), 20 deletions(-)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/npm/BaseNpmRestService.java

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/BaseNpmRestService.java b/lib/src/main/java/com/diffplug/spotless/npm/BaseNpmRestService.java
new file mode 100644
index 0000000000..e8582c15ec
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/npm/BaseNpmRestService.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2016-2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.npm;
+
+abstract class BaseNpmRestService {
+
+	protected final SimpleRestClient restClient;
+
+	BaseNpmRestService(String baseUrl) {
+		this.restClient = SimpleRestClient.forBaseUrl(baseUrl);
+	}
+
+	public String shutdown() {
+		return restClient.post("/shutdown");
+	}
+
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/PrettierRestService.java b/lib/src/main/java/com/diffplug/spotless/npm/PrettierRestService.java
index ced08b013f..2a62823aa0 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/PrettierRestService.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/PrettierRestService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,12 +19,10 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-public class PrettierRestService {
-
-	private final SimpleRestClient restClient;
+public class PrettierRestService extends BaseNpmRestService {
 
 	PrettierRestService(String baseUrl) {
-		this.restClient = SimpleRestClient.forBaseUrl(baseUrl);
+		super(baseUrl);
 	}
 
 	public String resolveConfig(File prettierConfigPath, Map<String, Object> prettierConfigOptions) {
@@ -48,9 +46,4 @@ public String format(String fileContent, String configOptionsJsonString) {
 
 		return restClient.postJson("/prettier/format", jsonProperties);
 	}
-
-	public String shutdown() {
-		return restClient.post("/shutdown");
-	}
-
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/TsFmtRestService.java b/lib/src/main/java/com/diffplug/spotless/npm/TsFmtRestService.java
index a47b608c36..f77510c3b6 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/TsFmtRestService.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/TsFmtRestService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,12 +18,10 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-public class TsFmtRestService {
-
-	private final SimpleRestClient restClient;
+public class TsFmtRestService extends BaseNpmRestService {
 
 	TsFmtRestService(String baseUrl) {
-		this.restClient = SimpleRestClient.forBaseUrl(baseUrl);
+		super(baseUrl);
 	}
 
 	public String format(String fileContent, Map<String, Object> configOptions) {
@@ -35,9 +33,4 @@ public String format(String fileContent, Map<String, Object> configOptions) {
 
 		return restClient.postJson("/tsfmt/format", jsonProperties);
 	}
-
-	public String shutdown() {
-		return restClient.post("/shutdown");
-	}
-
 }

From c20d3bb14adae3b90654b0531ac12a06d468185a Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Sat, 3 Dec 2022 19:53:24 +0100
Subject: [PATCH 0443/2068] add "eslint --fix" as formatter

---
 .../diffplug/spotless/npm/EslintConfig.java   |  61 +++++
 .../spotless/npm/EslintFormatterStep.java     | 219 ++++++++++++++++++
 .../spotless/npm/EslintRestService.java       |  46 ++++
 .../spotless/npm/NpmResourceHelper.java       |  11 +
 .../diffplug/spotless/npm/eslint-package.json |  19 ++
 .../com/diffplug/spotless/npm/eslint-serve.js |  66 ++++++
 .../gradle/spotless/FormatExtension.java      |  87 ++++++-
 .../gradle/spotless/TypescriptExtension.java  |  56 ++++-
 .../spotless/TypescriptExtensionTest.java     |  21 +-
 .../resources/npm/eslint/config/.eslintrc.js  |  38 +++
 .../eslint/config/typescript.configfile.clean |  15 ++
 .../eslint/config/typescript.defaults.clean   |  11 +
 .../npm/eslint/config/typescript.dirty        |  10 +
 .../eslint/config/typescript.override.clean   |   9 +
 .../eslint/filetypes/typescript/.eslintrc.js  |  59 +++++
 .../filetypes/typescript/typescript.clean     |  11 +
 .../filetypes/typescript/typescript.dirty     |  11 +
 17 files changed, 737 insertions(+), 13 deletions(-)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/npm/EslintConfig.java
 create mode 100644 lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
 create mode 100644 lib/src/main/java/com/diffplug/spotless/npm/EslintRestService.java
 create mode 100644 lib/src/main/resources/com/diffplug/spotless/npm/eslint-package.json
 create mode 100644 lib/src/main/resources/com/diffplug/spotless/npm/eslint-serve.js
 create mode 100644 testlib/src/main/resources/npm/eslint/config/.eslintrc.js
 create mode 100644 testlib/src/main/resources/npm/eslint/config/typescript.configfile.clean
 create mode 100644 testlib/src/main/resources/npm/eslint/config/typescript.defaults.clean
 create mode 100644 testlib/src/main/resources/npm/eslint/config/typescript.dirty
 create mode 100644 testlib/src/main/resources/npm/eslint/config/typescript.override.clean
 create mode 100644 testlib/src/main/resources/npm/eslint/filetypes/typescript/.eslintrc.js
 create mode 100644 testlib/src/main/resources/npm/eslint/filetypes/typescript/typescript.clean
 create mode 100644 testlib/src/main/resources/npm/eslint/filetypes/typescript/typescript.dirty

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintConfig.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintConfig.java
new file mode 100644
index 0000000000..a6d41f9bc0
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintConfig.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2016-2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.npm;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
+
+import javax.annotation.Nullable;
+
+import com.diffplug.spotless.FileSignature;
+import com.diffplug.spotless.ThrowingEx;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+public class EslintConfig implements Serializable {
+
+	private static final long serialVersionUID = -6196834313082791248L;
+
+	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
+	@Nullable
+	private final transient File eslintConfigPath;
+
+	@SuppressWarnings("unused")
+	private final FileSignature eslintConfigPathSignature;
+
+	private final String eslintConfigJs;
+
+	public EslintConfig(@Nullable File eslintConfigPath, @Nullable String eslintConfigJs) {
+		try {
+			this.eslintConfigPath = eslintConfigPath;
+			this.eslintConfigPathSignature = eslintConfigPath != null ? FileSignature.signAsList(this.eslintConfigPath) : FileSignature.signAsList();
+			this.eslintConfigJs = eslintConfigJs;
+		} catch (IOException e) {
+			throw ThrowingEx.asRuntime(e);
+		}
+	}
+
+	@Nullable
+	public File getEslintConfigPath() {
+		return eslintConfigPath;
+	}
+
+	@Nullable
+	public String getEslintConfigJs() {
+		return eslintConfigJs;
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
new file mode 100644
index 0000000000..83d60a72c1
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
@@ -0,0 +1,219 @@
+/*
+ * Copyright 2016-2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.npm;
+
+import static java.util.Objects.requireNonNull;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.TreeMap;
+
+import javax.annotation.Nonnull;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.FormatterFunc.Closeable;
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.Provisioner;
+import com.diffplug.spotless.ThrowingEx;
+import com.diffplug.spotless.npm.EslintRestService.FormatOption;
+
+public class EslintFormatterStep {
+
+	private static final Logger logger = LoggerFactory.getLogger(EslintFormatterStep.class);
+
+	public static final String NAME = "eslint-format";
+
+	public static final String DEFAULT_ESLINT_VERSION = "8.28.0";
+
+	public enum PopularStyleGuide {
+		STANDARD_WITH_TYPESCRIPT("standard-with-typescript") {
+			@Override
+			public Map<String, String> devDependencies() {
+				Map<String, String> dependencies = new LinkedHashMap<>();
+				dependencies.put("eslint-config-standard-with-typescript", "23.0.0");
+				dependencies.put("eslint-plugin-import", "2.26.0");
+				dependencies.put("eslint-plugin-n", "15.5.1");
+				dependencies.put("eslint-plugin-promise", "6.1.1");
+				dependencies.put("typescript", "4.9.3");
+				return dependencies;
+			}
+		},
+		XO_TYPESCRIPT("xo-typescript") {
+			@Override
+			public Map<String, String> devDependencies() {
+				Map<String, String> dependencies = new LinkedHashMap<>();
+				dependencies.put("eslint-config-xo", "0.43.1");
+				dependencies.put("eslint-config-xo-typescript", "0.55.1");
+				dependencies.put("typescript", "4.9.3");
+				return dependencies;
+			}
+		};
+
+		private final String popularStyleGuideName;
+
+		PopularStyleGuide(String popularStyleGuideName) {
+			this.popularStyleGuideName = popularStyleGuideName;
+		}
+
+		public String getPopularStyleGuideName() {
+			return popularStyleGuideName;
+		}
+
+		public abstract Map<String, String> devDependencies();
+
+		public static PopularStyleGuide fromNameOrNull(String popularStyleGuideName) {
+			for (PopularStyleGuide popularStyleGuide : PopularStyleGuide.values()) {
+				if (popularStyleGuide.popularStyleGuideName.equals(popularStyleGuideName)) {
+					return popularStyleGuide;
+				}
+			}
+			return null;
+		}
+	}
+
+	public static Map<String, String> defaultDevDependenciesForTypescript() {
+		return defaultDevDependenciesTypescriptWithEslint(DEFAULT_ESLINT_VERSION);
+	}
+
+	public static Map<String, String> defaultDevDependenciesTypescriptWithEslint(String eslintVersion) {
+		Map<String, String> dependencies = new LinkedHashMap<>();
+		dependencies.put("@typescript-eslint/eslint-plugin", "5.45.0");
+		dependencies.put("@typescript-eslint/parser", "5.45.0");
+		dependencies.put("eslint", Objects.requireNonNull(eslintVersion));
+		return dependencies;
+	}
+
+	public static Map<String, String> defaultDevDependencies() {
+		return defaultDevDependenciesWithEslint(DEFAULT_ESLINT_VERSION);
+	}
+
+	public static Map<String, String> defaultDevDependenciesWithEslint(String version) {
+		return Collections.singletonMap("eslint", version);
+	}
+
+	public static FormatterStep create(Map<String, String> devDependencies, Provisioner provisioner, File buildDir, NpmPathResolver npmPathResolver, EslintConfig eslintConfig) {
+		requireNonNull(devDependencies);
+		requireNonNull(provisioner);
+		requireNonNull(buildDir);
+		return FormatterStep.createLazy(NAME,
+				() -> new State(NAME, devDependencies, buildDir, npmPathResolver, eslintConfig),
+				State::createFormatterFunc);
+	}
+
+	private static class State extends NpmFormatterStepStateBase implements Serializable {
+
+		private static final long serialVersionUID = -539537027004745812L;
+		private final EslintConfig eslintConfig;
+
+		State(String stepName, Map<String, String> devDependencies, File buildDir, NpmPathResolver npmPathResolver, EslintConfig eslintConfig) throws IOException {
+			super(stepName,
+					new NpmConfig(
+							replaceDevDependencies(
+									NpmResourceHelper.readUtf8StringFromClasspath(EslintFormatterStep.class, "/com/diffplug/spotless/npm/eslint-package.json"),
+									new TreeMap<>(devDependencies)),
+							"eslint",
+							NpmResourceHelper.readUtf8StringFromClasspath(EslintFormatterStep.class,
+									"/com/diffplug/spotless/npm/common-serve.js",
+									"/com/diffplug/spotless/npm/eslint-serve.js"),
+							npmPathResolver.resolveNpmrcContent()),
+					buildDir,
+					npmPathResolver.resolveNpmExecutable());
+			this.eslintConfig = localCopyFiles(requireNonNull(eslintConfig));
+		}
+
+		private EslintConfig localCopyFiles(EslintConfig orig) {
+			if (orig.getEslintConfigPath() == null) {
+				return orig;
+			}
+			// If a config file is provided, we need to make sure it is at the same location as the node modules
+			// as eslint will try to resolve plugin/config names relatively to the config file location
+			FormattedPrinter.SYSOUT.print("Copying config file <%s> to <%s> and using the copy", orig.getEslintConfigPath(), nodeModulesDir);
+			File configFileCopy = NpmResourceHelper.copyFileToDir(orig.getEslintConfigPath(), nodeModulesDir);
+			return new EslintConfig(configFileCopy, orig.getEslintConfigJs());
+		}
+
+		@Override
+		@Nonnull
+		public FormatterFunc createFormatterFunc() {
+			try {
+				FormattedPrinter.SYSOUT.print("creating formatter function (starting server)");
+				ServerProcessInfo eslintRestServer = npmRunServer();
+				EslintRestService restService = new EslintRestService(eslintRestServer.getBaseUrl());
+
+				//				String prettierConfigOptions = restService.resolveConfig(this.prettierConfig.getPrettierConfigPath(), this.prettierConfig.getOptions());
+				return Closeable.ofDangerous(() -> endServer(restService, eslintRestServer), new EslintFilePathPassingFormatterFunc(nodeModulesDir, eslintConfig, restService));
+			} catch (IOException e) {
+				throw ThrowingEx.asRuntime(e);
+			}
+		}
+
+		private void endServer(BaseNpmRestService restService, ServerProcessInfo restServer) throws Exception {
+			FormattedPrinter.SYSOUT.print("Closing formatting function (ending server).");
+			try {
+				restService.shutdown();
+			} catch (Throwable t) {
+				logger.info("Failed to request shutdown of rest service via api. Trying via process.", t);
+			}
+			restServer.close();
+		}
+
+	}
+
+	private static class EslintFilePathPassingFormatterFunc implements FormatterFunc.NeedsFile {
+		private final File nodeModulesDir;
+		private final EslintConfig eslintConfig;
+		private final EslintRestService restService;
+
+		public EslintFilePathPassingFormatterFunc(File nodeModulesDir, EslintConfig eslintConfig, EslintRestService restService) {
+			this.nodeModulesDir = nodeModulesDir;
+			this.eslintConfig = requireNonNull(eslintConfig);
+			this.restService = requireNonNull(restService);
+		}
+
+		@Override
+		public String applyWithFile(String unix, File file) throws Exception {
+			FormattedPrinter.SYSOUT.print("formatting String '" + unix.substring(0, Math.min(50, unix.length())) + "[...]' in file '" + file + "'");
+
+			Map<FormatOption, Object> eslintCallOptions = new HashMap<>();
+			setConfigToCallOptions(eslintCallOptions);
+			setFilePathToCallOptions(eslintCallOptions, file);
+			return restService.format(unix, eslintCallOptions);
+		}
+
+		private void setFilePathToCallOptions(Map<FormatOption, Object> eslintCallOptions, File fileToBeFormatted) {
+			eslintCallOptions.put(FormatOption.FILE_PATH, fileToBeFormatted.getAbsolutePath());
+		}
+
+		private void setConfigToCallOptions(Map<FormatOption, Object> eslintCallOptions) {
+			if (eslintConfig.getEslintConfigPath() != null) {
+				eslintCallOptions.put(FormatOption.ESLINT_OVERRIDE_CONFIG_FILE, eslintConfig.getEslintConfigPath().getAbsolutePath());
+			}
+			if (eslintConfig.getEslintConfigJs() != null) {
+				eslintCallOptions.put(FormatOption.ESLINT_OVERRIDE_CONFIG, eslintConfig.getEslintConfigJs());
+			}
+			eslintCallOptions.put(FormatOption.NODE_MODULES_DIR, nodeModulesDir.getAbsolutePath());
+		}
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintRestService.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintRestService.java
new file mode 100644
index 0000000000..541b77bab8
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintRestService.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2016-2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.npm;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+public class EslintRestService extends BaseNpmRestService {
+
+	EslintRestService(String baseUrl) {
+		super(baseUrl);
+	}
+
+	public String format(String fileContent, Map<FormatOption, Object> formatOptions) {
+		Map<String, Object> jsonProperties = new LinkedHashMap<>();
+		jsonProperties.put("file_content", fileContent);
+		for (Entry<FormatOption, Object> option : formatOptions.entrySet()) {
+			jsonProperties.put(option.getKey().backendName, option.getValue());
+		}
+		return restClient.postJson("/eslint/format", jsonProperties);
+	}
+
+	enum FormatOption {
+		ESLINT_OVERRIDE_CONFIG("eslint_override_config"), ESLINT_OVERRIDE_CONFIG_FILE("eslint_override_config_file"), FILE_PATH("file_path"), NODE_MODULES_DIR("node_modules_dir");
+
+		private final String backendName;
+
+		FormatOption(String backendName) {
+			this.backendName = backendName;
+		}
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmResourceHelper.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmResourceHelper.java
index cb6fff3290..4f97e7e732 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmResourceHelper.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmResourceHelper.java
@@ -18,6 +18,7 @@
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.concurrent.TimeoutException;
@@ -100,4 +101,14 @@ static void awaitReadableFile(File file, Duration maxWaitTime) throws TimeoutExc
 			}
 		}
 	}
+
+	static File copyFileToDir(File file, File targetDir) {
+		try {
+			File copiedFile = new File(targetDir, file.getName());
+			Files.copy(file.toPath(), copiedFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
+			return copiedFile;
+		} catch (IOException e) {
+			throw ThrowingEx.asRuntime(e);
+		}
+	}
 }
diff --git a/lib/src/main/resources/com/diffplug/spotless/npm/eslint-package.json b/lib/src/main/resources/com/diffplug/spotless/npm/eslint-package.json
new file mode 100644
index 0000000000..dcd91e729d
--- /dev/null
+++ b/lib/src/main/resources/com/diffplug/spotless/npm/eslint-package.json
@@ -0,0 +1,19 @@
+{
+	"name": "spotless-eslint-formatter-step",
+	"version": "2.0.0",
+	"description": "Spotless formatter step for running eslint as a rest service.",
+	"repository": "https://github.com/diffplug/spotless",
+	"license": "Apache-2.0",
+	"scripts": {
+		"start": "node serve.js"
+	},
+	"devDependencies": {
+${devDependencies},
+		"express": "4.18.2",
+		"@moebius/http-graceful-shutdown": "1.1.0"
+	},
+	"dependencies": {},
+	"engines": {
+		"node": ">=6"
+	}
+}
diff --git a/lib/src/main/resources/com/diffplug/spotless/npm/eslint-serve.js b/lib/src/main/resources/com/diffplug/spotless/npm/eslint-serve.js
new file mode 100644
index 0000000000..8c56b8ef08
--- /dev/null
+++ b/lib/src/main/resources/com/diffplug/spotless/npm/eslint-serve.js
@@ -0,0 +1,66 @@
+const {ESLint} = require("eslint");
+
+app.post("/eslint/format", async (req, res) => {
+
+	const format_data = req.body;
+
+	const ESLintOverrideConfig = format_data.eslint_override_config;
+
+	const ESLintOverrideConfigFile = format_data.eslint_override_config_file;
+
+	if (!ESLintOverrideConfig && !ESLintOverrideConfigFile) {
+		res.status(501).send("Error while formatting: No config provided");
+		return;
+	}
+
+	const filePath = format_data.file_path;
+
+	if (!filePath) {
+		res.status(501).send("Error while formatting: No file path provided");
+		return;
+	}
+
+	const ESLintOptions = {
+		fix: true,
+		useEslintrc: false, // would result in (gradle) cache issues
+		resolvePluginsRelativeTo: format_data.node_modules_dir
+	};
+
+
+	if (ESLintOverrideConfigFile) {
+		ESLintOptions.overrideConfigFile = ESLintOverrideConfigFile;
+	}
+	if (ESLintOverrideConfig) {
+		ESLintOptions.overrideConfig = ESLintOverrideConfig;
+	}
+
+	const eslint = new ESLint(ESLintOptions);
+
+
+	try {
+		console.log("using options: " + JSON.stringify(ESLintOptions));
+		console.log("format input", format_data.file_content);
+		const lintTextOptions = {
+			filePath: filePath,
+		}
+		console.log("lintTextOptions", lintTextOptions);
+		// LintResult[] // https://eslint.org/docs/latest/developer-guide/nodejs-api#-lintresult-type
+		const results = await eslint.lintText(format_data.file_content, lintTextOptions);
+		if (results.length !== 1) {
+			res.status(501).send("Error while formatting: Unexpected number of results");
+			return;
+		}
+		const result = results[0];
+		console.log("result: " + JSON.stringify(result));
+		if (result.fatalErrorCount && result.fatalErrorCount > 0) {
+			res.status(501).send("Fatal error while formatting: " + JSON.stringify(result.messages));
+			return;
+		}
+		const formatted = result.output || result.source || format_data.file_content;
+		res.set("Content-Type", "text/plain");
+		res.send(formatted);
+	} catch (err) {
+		console.log("error", err);
+		res.status(501).send("Error while formatting: " + err);
+	}
+});
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index de0313eab4..99e21bd8c8 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -16,6 +16,7 @@
 package com.diffplug.gradle.spotless;
 
 import static com.diffplug.gradle.spotless.PluginGradlePreconditions.requireElementsNonNull;
+import static java.util.Objects.requireNonNull;
 
 import java.io.File;
 import java.io.Serializable;
@@ -23,9 +24,9 @@
 import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Random;
 import java.util.TreeMap;
 
@@ -59,6 +60,8 @@
 import com.diffplug.spotless.generic.ReplaceRegexStep;
 import com.diffplug.spotless.generic.ReplaceStep;
 import com.diffplug.spotless.generic.TrimTrailingWhitespaceStep;
+import com.diffplug.spotless.npm.EslintConfig;
+import com.diffplug.spotless.npm.EslintFormatterStep;
 import com.diffplug.spotless.npm.NpmPathResolver;
 import com.diffplug.spotless.npm.PrettierFormatterStep;
 
@@ -71,7 +74,7 @@ public class FormatExtension {
 
 	@Inject
 	public FormatExtension(SpotlessExtension spotless) {
-		this.spotless = Objects.requireNonNull(spotless);
+		this.spotless = requireNonNull(spotless);
 	}
 
 	protected final Provisioner provisioner() {
@@ -96,7 +99,7 @@ public LineEnding getLineEndings() {
 
 	/** Sets the line endings to use (defaults to {@link SpotlessExtensionImpl#getLineEndings()}. */
 	public void setLineEndings(LineEnding lineEndings) {
-		this.lineEndings = Objects.requireNonNull(lineEndings);
+		this.lineEndings = requireNonNull(lineEndings);
 	}
 
 	Charset encoding;
@@ -108,7 +111,7 @@ public Charset getEncoding() {
 
 	/** Sets the encoding to use (defaults to {@link SpotlessExtensionImpl#getEncoding()}. */
 	public void setEncoding(String name) {
-		setEncoding(Charset.forName(Objects.requireNonNull(name)));
+		setEncoding(Charset.forName(requireNonNull(name)));
 	}
 
 	/** Sentinel to distinguish between "don't ratchet this format" and "use spotless parent format". */
@@ -136,19 +139,19 @@ public void ratchetFrom(String ratchetFrom) {
 
 	/** Sets the encoding to use (defaults to {@link SpotlessExtensionImpl#getEncoding()}. */
 	public void setEncoding(Charset charset) {
-		encoding = Objects.requireNonNull(charset);
+		encoding = requireNonNull(charset);
 	}
 
 	final FormatExceptionPolicyStrict exceptionPolicy = new FormatExceptionPolicyStrict();
 
 	/** Ignores errors in the given step. */
 	public void ignoreErrorForStep(String stepName) {
-		exceptionPolicy.excludeStep(Objects.requireNonNull(stepName));
+		exceptionPolicy.excludeStep(requireNonNull(stepName));
 	}
 
 	/** Ignores errors for the given relative path. */
 	public void ignoreErrorForPath(String relativePath) {
-		exceptionPolicy.excludePath(Objects.requireNonNull(relativePath));
+		exceptionPolicy.excludePath(requireNonNull(relativePath));
 	}
 
 	/** Sets encoding to use (defaults to {@link SpotlessExtensionImpl#getEncoding()}). */
@@ -290,7 +293,7 @@ private static void relativizeIfSubdir(List<String> relativePaths, File root, Fi
 
 	/** Adds a new step. */
 	public void addStep(FormatterStep newStep) {
-		Objects.requireNonNull(newStep);
+		requireNonNull(newStep);
 		int existingIdx = getExistingStepIdx(newStep.getName());
 		if (existingIdx != -1) {
 			throw new GradleException("Multiple steps with name '" + newStep.getName() + "' for spotless format '" + formatName() + "'");
@@ -356,13 +359,13 @@ protected Integer calculateState() throws Exception {
 
 	/** Adds a custom step. Receives a string with unix-newlines, must return a string with unix newlines. */
 	public void custom(String name, Closure<String> formatter) {
-		Objects.requireNonNull(formatter, "formatter");
+		requireNonNull(formatter, "formatter");
 		custom(name, formatter::call);
 	}
 
 	/** Adds a custom step. Receives a string with unix-newlines, must return a string with unix newlines. */
 	public void custom(String name, FormatterFunc formatter) {
-		Objects.requireNonNull(formatter, "formatter");
+		requireNonNull(formatter, "formatter");
 		addStep(FormatterStep.createLazy(name, () -> globalState, unusedState -> formatter));
 	}
 
@@ -560,7 +563,7 @@ public class PrettierConfig extends NpmStepConfig<PrettierConfig> {
 		final Map<String, String> devDependencies;
 
 		PrettierConfig(Map<String, String> devDependencies) {
-			this.devDependencies = Objects.requireNonNull(devDependencies);
+			this.devDependencies = requireNonNull(devDependencies);
 		}
 
 		public PrettierConfig configFile(final Object prettierConfigFile) {
@@ -605,6 +608,68 @@ public PrettierConfig prettier(Map<String, String> devDependencies) {
 		return prettierConfig;
 	}
 
+	public class EslintFormatExtension extends NpmStepConfig<EslintFormatExtension> {
+
+		Map<String, String> devDependencies = new LinkedHashMap<>();
+
+		@Nullable
+		Object configFilePath = null;
+
+		@Nullable
+		String configJs = null;
+
+		public EslintFormatExtension(Map<String, String> devDependencies) {
+			this.devDependencies.putAll(requireNonNull(devDependencies));
+		}
+
+		public EslintFormatExtension devDependencies(Map<String, String> devDependencies) {
+			this.devDependencies.putAll(devDependencies);
+			replaceStep(createStep());
+			return this;
+		}
+
+		public EslintFormatExtension configJs(String configJs) {
+			this.configJs = requireNonNull(configJs);
+			replaceStep(createStep());
+			return this;
+		}
+
+		public EslintFormatExtension configFile(Object configFilePath) {
+			this.configFilePath = requireNonNull(configFilePath);
+			replaceStep(createStep());
+			return this;
+		}
+
+		public FormatterStep createStep() {
+			final Project project = getProject();
+
+			return EslintFormatterStep.create(
+					devDependencies,
+					provisioner(),
+					project.getBuildDir(),
+					new NpmPathResolver(npmFileOrNull(), npmrcFileOrNull(), project.getProjectDir(), project.getRootDir()),
+					eslintConfig());
+		}
+
+		private EslintConfig eslintConfig() {
+			return new EslintConfig(configFilePath != null ? getProject().file(configFilePath) : null, configJs);
+		}
+	}
+
+	public EslintFormatExtension eslint() {
+		return eslint(EslintFormatterStep.defaultDevDependencies());
+	}
+
+	public EslintFormatExtension eslint(String version) {
+		return eslint(EslintFormatterStep.defaultDevDependenciesWithEslint(version));
+	}
+
+	public EslintFormatExtension eslint(Map<String, String> devDependencies) {
+		EslintFormatExtension eslint = new EslintFormatExtension(devDependencies);
+		addStep(eslint.createStep());
+		return eslint;
+	}
+
 	/** Uses the default version of clang-format. */
 	public ClangFormatConfig clangFormat() {
 		return clangFormat(ClangFormatStep.defaultVersion());
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
index 58b9d4acbb..e80730d5ed 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,10 +17,12 @@
 
 import static java.util.Objects.requireNonNull;
 
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Objects;
 import java.util.TreeMap;
+import java.util.stream.Collectors;
 
 import javax.annotation.Nullable;
 import javax.inject.Inject;
@@ -28,6 +30,8 @@
 import org.gradle.api.Project;
 
 import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.npm.EslintFormatterStep;
+import com.diffplug.spotless.npm.EslintFormatterStep.PopularStyleGuide;
 import com.diffplug.spotless.npm.NpmPathResolver;
 import com.diffplug.spotless.npm.PrettierFormatterStep;
 import com.diffplug.spotless.npm.TsConfigFileType;
@@ -169,6 +173,56 @@ private void fixParserToTypescript() {
 		}
 	}
 
+	@Override
+	public TypescriptEslintFormatExtension eslint() {
+		return eslint(EslintFormatterStep.defaultDevDependenciesForTypescript());
+	}
+
+	@Override
+	public TypescriptEslintFormatExtension eslint(String version) {
+		return eslint(EslintFormatterStep.defaultDevDependenciesTypescriptWithEslint(version));
+	}
+
+	@Override
+	public TypescriptEslintFormatExtension eslint(Map<String, String> devDependencies) {
+		TypescriptEslintFormatExtension eslint = new TypescriptEslintFormatExtension(devDependencies);
+		addStep(eslint.createStep());
+		return eslint;
+	}
+
+	public class TypescriptEslintFormatExtension extends EslintFormatExtension {
+
+		public TypescriptEslintFormatExtension(Map<String, String> devDependencies) {
+			super(devDependencies);
+		}
+
+		@Override
+		public TypescriptEslintFormatExtension devDependencies(Map<String, String> devDependencies) {
+			return (TypescriptEslintFormatExtension) super.devDependencies(devDependencies);
+		}
+
+		@Override
+		public TypescriptEslintFormatExtension configJs(String configJs) {
+			return (TypescriptEslintFormatExtension) super.configJs(configJs);
+		}
+
+		@Override
+		public TypescriptEslintFormatExtension configFile(Object configFilePath) {
+			return (TypescriptEslintFormatExtension) super.configFile(configFilePath);
+		}
+
+		public TypescriptEslintFormatExtension styleGuide(String styleGuide) {
+			PopularStyleGuide popularStyleGuide = PopularStyleGuide.fromNameOrNull(styleGuide);
+			if (popularStyleGuide == null) {
+				throw new IllegalArgumentException("Unknown style guide: " + styleGuide + ". Known style guides: "
+						+ Arrays.stream(PopularStyleGuide.values()).map(PopularStyleGuide::getPopularStyleGuideName).collect(Collectors.joining(", ")));
+			}
+			devDependencies(popularStyleGuide.devDependencies());
+			replaceStep(createStep());
+			return this;
+		}
+	}
+
 	@Override
 	protected void setupTask(SpotlessTask task) {
 		// defaults to all typescript files
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TypescriptExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TypescriptExtensionTest.java
index 100c4eb3b0..40da7e3536 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TypescriptExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TypescriptExtensionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -141,4 +141,23 @@ void usePrettier() throws IOException {
 		gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
 		assertFile("test.ts").sameAsResource("npm/prettier/filetypes/typescript/typescript.clean");
 	}
+
+	@Test
+	void useEslint() throws IOException {
+		setFile(".eslintrc.js").toResource("npm/eslint/filetypes/typescript/.eslintrc.js");
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    typescript {",
+				"        target 'test.ts'",
+				"        eslint().configFile('.eslintrc.js')",
+				"    }",
+				"}");
+		setFile("test.ts").toResource("npm/eslint/filetypes/typescript/typescript.dirty");
+		gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+		assertFile("test.ts").sameAsResource("npm/eslint/filetypes/typescript/typescript.clean");
+	}
 }
diff --git a/testlib/src/main/resources/npm/eslint/config/.eslintrc.js b/testlib/src/main/resources/npm/eslint/config/.eslintrc.js
new file mode 100644
index 0000000000..6cb3070512
--- /dev/null
+++ b/testlib/src/main/resources/npm/eslint/config/.eslintrc.js
@@ -0,0 +1,38 @@
+module.exports = {
+	"env": {
+		"browser": true,
+		"es2021": true
+	},
+	"extends": [
+		"eslint:recommended",
+		"plugin:@typescript-eslint/recommended"
+	],
+	"overrides": [
+	],
+	"parser": "@typescript-eslint/parser",
+	"parserOptions": {
+		"ecmaVersion": "latest",
+		"sourceType": "module"
+	},
+	"plugins": [
+		"@typescript-eslint"
+	],
+	"rules": {
+		"indent": [
+			"error",
+			4
+		],
+		"linebreak-style": [
+			"error",
+			"unix"
+		],
+		"quotes": [
+			"error",
+			"double"
+		],
+		"semi": [
+			"error",
+			"always"
+		]
+	}
+};
diff --git a/testlib/src/main/resources/npm/eslint/config/typescript.configfile.clean b/testlib/src/main/resources/npm/eslint/config/typescript.configfile.clean
new file mode 100644
index 0000000000..0ec76369be
--- /dev/null
+++ b/testlib/src/main/resources/npm/eslint/config/typescript.configfile.clean
@@ -0,0 +1,15 @@
+export class MyVeryOwnControllerWithARatherLongNameThatIsNotReallyNecessary
+  extends AbstractController
+  implements DisposeAware, CallbackAware {
+  public myValue: string[];
+
+  constructor(
+    private myService: Service,
+    name: string,
+    private field: any
+  ) {
+    super(name);
+  }
+
+  //...
+}
diff --git a/testlib/src/main/resources/npm/eslint/config/typescript.defaults.clean b/testlib/src/main/resources/npm/eslint/config/typescript.defaults.clean
new file mode 100644
index 0000000000..0155b905bd
--- /dev/null
+++ b/testlib/src/main/resources/npm/eslint/config/typescript.defaults.clean
@@ -0,0 +1,11 @@
+export class MyVeryOwnControllerWithARatherLongNameThatIsNotReallyNecessary
+  extends AbstractController
+  implements DisposeAware, CallbackAware {
+  public myValue: string[];
+
+  constructor(private myService: Service, name: string, private field: any) {
+    super(name);
+  }
+
+  //...
+}
diff --git a/testlib/src/main/resources/npm/eslint/config/typescript.dirty b/testlib/src/main/resources/npm/eslint/config/typescript.dirty
new file mode 100644
index 0000000000..a3a30bf49a
--- /dev/null
+++ b/testlib/src/main/resources/npm/eslint/config/typescript.dirty
@@ -0,0 +1,10 @@
+export class MyVeryOwnControllerWithARatherLongNameThatIsNotReallyNecessary extends AbstractController implements DisposeAware, CallbackAware {
+
+
+public myValue:string[];
+
+constructor(private myService:Service,name:string,private field:any){ super(name)   ;}
+
+
+//...
+}
diff --git a/testlib/src/main/resources/npm/eslint/config/typescript.override.clean b/testlib/src/main/resources/npm/eslint/config/typescript.override.clean
new file mode 100644
index 0000000000..3f3a8c30af
--- /dev/null
+++ b/testlib/src/main/resources/npm/eslint/config/typescript.override.clean
@@ -0,0 +1,9 @@
+export class MyVeryOwnControllerWithARatherLongNameThatIsNotReallyNecessary extends AbstractController implements DisposeAware, CallbackAware {
+  public myValue: string[];
+
+  constructor(private myService: Service, name: string, private field: any) {
+    super(name);
+  }
+
+  //...
+}
diff --git a/testlib/src/main/resources/npm/eslint/filetypes/typescript/.eslintrc.js b/testlib/src/main/resources/npm/eslint/filetypes/typescript/.eslintrc.js
new file mode 100644
index 0000000000..e6ddff7d4c
--- /dev/null
+++ b/testlib/src/main/resources/npm/eslint/filetypes/typescript/.eslintrc.js
@@ -0,0 +1,59 @@
+module.exports = {
+	"env": {
+		"browser": true,
+		"es2021": true
+	},
+	"extends": [
+		"eslint:recommended",
+		"plugin:@typescript-eslint/recommended"
+	],
+	"overrides": [
+	],
+	"parser": "@typescript-eslint/parser",
+	"parserOptions": {
+		"ecmaVersion": "latest",
+		"sourceType": "module"
+	},
+	"plugins": [
+		"@typescript-eslint"
+	],
+	"rules": {
+		"indent": [
+			"error",
+			4
+		],
+		"linebreak-style": [
+			"error",
+			"unix"
+		],
+		"quotes": [
+			"error",
+			"double"
+		],
+		"semi": [
+			"error",
+			"always"
+		],
+		"curly": [
+			"error"
+		],
+		"max-statements-per-line": [
+			"error",
+			{ "max": 1 }
+		],
+		"object-curly-newline": [
+			"error",
+			"always"
+		],
+		"comma-spacing": [
+			"error",
+			{ "before": false, "after": true }
+		],
+		"object-property-newline": [
+			"error",
+		],
+		"no-trailing-spaces": [
+			"error"
+		],
+	}
+};
diff --git a/testlib/src/main/resources/npm/eslint/filetypes/typescript/typescript.clean b/testlib/src/main/resources/npm/eslint/filetypes/typescript/typescript.clean
new file mode 100644
index 0000000000..526519cae9
--- /dev/null
+++ b/testlib/src/main/resources/npm/eslint/filetypes/typescript/typescript.clean
@@ -0,0 +1,11 @@
+export class MyController extends AbstractController implements DisposeAware, CallbackAware {
+
+
+    public myValue:string[];
+
+    constructor(private myService:Service, name:string, private field:any){ super(name)   ;}
+
+
+    //...
+
+}
diff --git a/testlib/src/main/resources/npm/eslint/filetypes/typescript/typescript.dirty b/testlib/src/main/resources/npm/eslint/filetypes/typescript/typescript.dirty
new file mode 100644
index 0000000000..0a9201c2e7
--- /dev/null
+++ b/testlib/src/main/resources/npm/eslint/filetypes/typescript/typescript.dirty
@@ -0,0 +1,11 @@
+export class MyController extends AbstractController implements DisposeAware, CallbackAware {
+
+
+public myValue:string[];
+
+constructor(private myService:Service,name:string,private field:any){ super(name)   ;}
+
+
+//...
+
+}

From 4f5e4d343d08831104abd7faec86d8ff820b3125 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Wed, 7 Dec 2022 20:01:32 +0100
Subject: [PATCH 0444/2068] eslint: add support for xo standard typescript
 ruleset

---
 .../diffplug/spotless/npm/EslintConfig.java   | 19 ++++++++-
 .../spotless/npm/EslintFormatterStep.java     | 42 ++++++++++++-------
 .../spotless/npm/EslintRestService.java       |  2 +-
 .../npm/NpmFormatterStepStateBase.java        |  6 ++-
 .../spotless/npm/NpmResourceHelper.java       | 17 ++++++--
 .../spotless/npm/PrettierFormatterStep.java   |  7 ++--
 .../spotless/npm/TsFmtFormatterStep.java      |  7 ++--
 .../com/diffplug/spotless/npm/eslint-serve.js | 14 +++++++
 .../gradle/spotless/FormatExtension.java      | 32 +++++++++++++-
 .../gradle/spotless/TypescriptExtension.java  | 11 +++++
 .../spotless/TypescriptExtensionTest.java     | 26 ++++++++++--
 .../custom_rules}/.eslintrc.js                |  0
 .../custom_rules}/typescript.clean            |  0
 .../custom_rules}/typescript.dirty            |  0
 .../typescript/standard_rules_xo/.eslintrc.js | 26 ++++++++++++
 .../standard_rules_xo/tsconfig.json           | 18 ++++++++
 .../standard_rules_xo/typescript.clean        |  9 ++++
 .../standard_rules_xo/typescript.dirty        | 10 +++++
 18 files changed, 216 insertions(+), 30 deletions(-)
 rename testlib/src/main/resources/npm/eslint/{filetypes/typescript => typescript/custom_rules}/.eslintrc.js (100%)
 rename testlib/src/main/resources/npm/eslint/{filetypes/typescript => typescript/custom_rules}/typescript.clean (100%)
 rename testlib/src/main/resources/npm/eslint/{filetypes/typescript => typescript/custom_rules}/typescript.dirty (100%)
 create mode 100644 testlib/src/main/resources/npm/eslint/typescript/standard_rules_xo/.eslintrc.js
 create mode 100644 testlib/src/main/resources/npm/eslint/typescript/standard_rules_xo/tsconfig.json
 create mode 100644 testlib/src/main/resources/npm/eslint/typescript/standard_rules_xo/typescript.clean
 create mode 100644 testlib/src/main/resources/npm/eslint/typescript/standard_rules_xo/typescript.dirty

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintConfig.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintConfig.java
index a6d41f9bc0..83f5ab1a73 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/EslintConfig.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintConfig.java
@@ -18,7 +18,12 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Optional;
+import java.util.TreeMap;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import com.diffplug.spotless.FileSignature;
@@ -39,11 +44,18 @@ public class EslintConfig implements Serializable {
 
 	private final String eslintConfigJs;
 
-	public EslintConfig(@Nullable File eslintConfigPath, @Nullable String eslintConfigJs) {
+	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
+	private final transient Map<File, Optional<String>> additionalConfigFiles; // key: source-file, value: target-remapping path relative to package.json (if needed)
+
+	private final FileSignature additionalConfigFilesSignature;
+
+	public EslintConfig(@Nullable File eslintConfigPath, @Nullable String eslintConfigJs, Map<File, Optional<String>> additionalConfigFiles) {
 		try {
 			this.eslintConfigPath = eslintConfigPath;
 			this.eslintConfigPathSignature = eslintConfigPath != null ? FileSignature.signAsList(this.eslintConfigPath) : FileSignature.signAsList();
 			this.eslintConfigJs = eslintConfigJs;
+			this.additionalConfigFiles = additionalConfigFiles != null ? new TreeMap<>(additionalConfigFiles) : Collections.emptyMap();
+			this.additionalConfigFilesSignature = FileSignature.signAsList(this.additionalConfigFiles.keySet().toArray(new File[0]));
 		} catch (IOException e) {
 			throw ThrowingEx.asRuntime(e);
 		}
@@ -58,4 +70,9 @@ public File getEslintConfigPath() {
 	public String getEslintConfigJs() {
 		return eslintConfigJs;
 	}
+
+	@Nonnull
+	public Map<File, Optional<String>> getAdditionalConfigFiles() {
+		return additionalConfigFiles;
+	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
index 83d60a72c1..492cf0da90 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
@@ -25,6 +25,7 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.TreeMap;
 
 import javax.annotation.Nonnull;
@@ -113,12 +114,13 @@ public static Map<String, String> defaultDevDependenciesWithEslint(String versio
 		return Collections.singletonMap("eslint", version);
 	}
 
-	public static FormatterStep create(Map<String, String> devDependencies, Provisioner provisioner, File buildDir, NpmPathResolver npmPathResolver, EslintConfig eslintConfig) {
+	public static FormatterStep create(Map<String, String> devDependencies, Provisioner provisioner, File projectDir, File buildDir, NpmPathResolver npmPathResolver, EslintConfig eslintConfig) {
 		requireNonNull(devDependencies);
 		requireNonNull(provisioner);
+		requireNonNull(projectDir);
 		requireNonNull(buildDir);
 		return FormatterStep.createLazy(NAME,
-				() -> new State(NAME, devDependencies, buildDir, npmPathResolver, eslintConfig),
+				() -> new State(NAME, devDependencies, projectDir, buildDir, npmPathResolver, eslintConfig),
 				State::createFormatterFunc);
 	}
 
@@ -127,7 +129,7 @@ private static class State extends NpmFormatterStepStateBase implements Serializ
 		private static final long serialVersionUID = -539537027004745812L;
 		private final EslintConfig eslintConfig;
 
-		State(String stepName, Map<String, String> devDependencies, File buildDir, NpmPathResolver npmPathResolver, EslintConfig eslintConfig) throws IOException {
+		State(String stepName, Map<String, String> devDependencies, File projectDir, File buildDir, NpmPathResolver npmPathResolver, EslintConfig eslintConfig) throws IOException {
 			super(stepName,
 					new NpmConfig(
 							replaceDevDependencies(
@@ -138,20 +140,29 @@ private static class State extends NpmFormatterStepStateBase implements Serializ
 									"/com/diffplug/spotless/npm/common-serve.js",
 									"/com/diffplug/spotless/npm/eslint-serve.js"),
 							npmPathResolver.resolveNpmrcContent()),
+					projectDir,
 					buildDir,
 					npmPathResolver.resolveNpmExecutable());
 			this.eslintConfig = localCopyFiles(requireNonNull(eslintConfig));
 		}
 
 		private EslintConfig localCopyFiles(EslintConfig orig) {
-			if (orig.getEslintConfigPath() == null) {
-				return orig;
-			}
-			// If a config file is provided, we need to make sure it is at the same location as the node modules
-			// as eslint will try to resolve plugin/config names relatively to the config file location
+			// If any config files are provided, we need to make sure they are at the same location as the node modules
+			// as eslint will try to resolve plugin/config names relatively to the config file location and some
+			// eslint configs contain relative paths to additional config files (such as tsconfig.json e.g.)
 			FormattedPrinter.SYSOUT.print("Copying config file <%s> to <%s> and using the copy", orig.getEslintConfigPath(), nodeModulesDir);
 			File configFileCopy = NpmResourceHelper.copyFileToDir(orig.getEslintConfigPath(), nodeModulesDir);
-			return new EslintConfig(configFileCopy, orig.getEslintConfigJs());
+
+			for (Map.Entry<File, Optional<String>> additionalConfigFile : orig.getAdditionalConfigFiles().entrySet()) {
+				FormattedPrinter.SYSOUT.print("Copying additional config file <%s> to <%s> at subpath <%s> and using the copy", additionalConfigFile.getKey(), nodeModulesDir, additionalConfigFile.getValue());
+
+				if (additionalConfigFile.getValue().isPresent()) {
+					NpmResourceHelper.copyFileToDirAtSubpath(additionalConfigFile.getKey(), nodeModulesDir, additionalConfigFile.getValue().get());
+				} else {
+					NpmResourceHelper.copyFileToDir(additionalConfigFile.getKey(), nodeModulesDir);
+				}
+			}
+			return new EslintConfig(configFileCopy, orig.getEslintConfigJs(), orig.getAdditionalConfigFiles());
 		}
 
 		@Override
@@ -161,9 +172,7 @@ public FormatterFunc createFormatterFunc() {
 				FormattedPrinter.SYSOUT.print("creating formatter function (starting server)");
 				ServerProcessInfo eslintRestServer = npmRunServer();
 				EslintRestService restService = new EslintRestService(eslintRestServer.getBaseUrl());
-
-				//				String prettierConfigOptions = restService.resolveConfig(this.prettierConfig.getPrettierConfigPath(), this.prettierConfig.getOptions());
-				return Closeable.ofDangerous(() -> endServer(restService, eslintRestServer), new EslintFilePathPassingFormatterFunc(nodeModulesDir, eslintConfig, restService));
+				return Closeable.ofDangerous(() -> endServer(restService, eslintRestServer), new EslintFilePathPassingFormatterFunc(projectDir, nodeModulesDir, eslintConfig, restService));
 			} catch (IOException e) {
 				throw ThrowingEx.asRuntime(e);
 			}
@@ -182,12 +191,14 @@ private void endServer(BaseNpmRestService restService, ServerProcessInfo restSer
 	}
 
 	private static class EslintFilePathPassingFormatterFunc implements FormatterFunc.NeedsFile {
+		private final File projectDir;
 		private final File nodeModulesDir;
 		private final EslintConfig eslintConfig;
 		private final EslintRestService restService;
 
-		public EslintFilePathPassingFormatterFunc(File nodeModulesDir, EslintConfig eslintConfig, EslintRestService restService) {
-			this.nodeModulesDir = nodeModulesDir;
+		public EslintFilePathPassingFormatterFunc(File projectDir, File nodeModulesDir, EslintConfig eslintConfig, EslintRestService restService) {
+			this.projectDir = requireNonNull(projectDir);
+			this.nodeModulesDir = requireNonNull(nodeModulesDir);
 			this.eslintConfig = requireNonNull(eslintConfig);
 			this.restService = requireNonNull(restService);
 		}
@@ -214,6 +225,9 @@ private void setConfigToCallOptions(Map<FormatOption, Object> eslintCallOptions)
 				eslintCallOptions.put(FormatOption.ESLINT_OVERRIDE_CONFIG, eslintConfig.getEslintConfigJs());
 			}
 			eslintCallOptions.put(FormatOption.NODE_MODULES_DIR, nodeModulesDir.getAbsolutePath());
+
+			// TODO (simschla, 09.12.22): maybe only add this if there is a typescript config active? (TBD: how to detect)
+			eslintCallOptions.put(FormatOption.TS_CONFIG_ROOT_DIR, nodeModulesDir.toPath().relativize(projectDir.toPath()).toString());
 		}
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintRestService.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintRestService.java
index 541b77bab8..d3a01621f1 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/EslintRestService.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintRestService.java
@@ -35,7 +35,7 @@ public String format(String fileContent, Map<FormatOption, Object> formatOptions
 	}
 
 	enum FormatOption {
-		ESLINT_OVERRIDE_CONFIG("eslint_override_config"), ESLINT_OVERRIDE_CONFIG_FILE("eslint_override_config_file"), FILE_PATH("file_path"), NODE_MODULES_DIR("node_modules_dir");
+		ESLINT_OVERRIDE_CONFIG("eslint_override_config"), ESLINT_OVERRIDE_CONFIG_FILE("eslint_override_config_file"), FILE_PATH("file_path"), NODE_MODULES_DIR("node_modules_dir"), TS_CONFIG_ROOT_DIR("ts_config_root_dir");
 
 		private final String backendName;
 
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
index 2e8d80e471..fc1543fd61 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
@@ -51,13 +51,17 @@ abstract class NpmFormatterStepStateBase implements Serializable {
 	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
 	private final transient File npmExecutable;
 
+	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
+	public final transient File projectDir;
+
 	private final NpmConfig npmConfig;
 
 	private final String stepName;
 
-	protected NpmFormatterStepStateBase(String stepName, NpmConfig npmConfig, File buildDir, File npm) throws IOException {
+	protected NpmFormatterStepStateBase(String stepName, NpmConfig npmConfig, File projectDir, File buildDir, File npm) throws IOException {
 		this.stepName = requireNonNull(stepName);
 		this.npmConfig = requireNonNull(npmConfig);
+		this.projectDir = requireNonNull(projectDir);
 		this.npmExecutable = npm;
 
 		NodeServerLayout layout = prepareNodeServer(buildDir);
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmResourceHelper.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmResourceHelper.java
index 4f97e7e732..48e974eec6 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmResourceHelper.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmResourceHelper.java
@@ -18,9 +18,12 @@
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import java.time.Duration;
 import java.util.Arrays;
+import java.util.Objects;
 import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
 
@@ -103,10 +106,18 @@ static void awaitReadableFile(File file, Duration maxWaitTime) throws TimeoutExc
 	}
 
 	static File copyFileToDir(File file, File targetDir) {
+		return copyFileToDirAtSubpath(file, targetDir, file.getName());
+	}
+
+	static File copyFileToDirAtSubpath(File file, File targetDir, String relativePath) {
+		Objects.requireNonNull(relativePath);
 		try {
-			File copiedFile = new File(targetDir, file.getName());
-			Files.copy(file.toPath(), copiedFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
-			return copiedFile;
+			// create file pointing to relativePath in targetDir
+			final Path relativeTargetFile = Paths.get(targetDir.getAbsolutePath(), relativePath);
+			assertDirectoryExists(relativeTargetFile.getParent().toFile());
+
+			Files.copy(file.toPath(), relativeTargetFile, StandardCopyOption.REPLACE_EXISTING);
+			return relativeTargetFile.toFile();
 		} catch (IOException e) {
 			throw ThrowingEx.asRuntime(e);
 		}
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
index 5a5662eee4..8489644c36 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
@@ -49,12 +49,12 @@ public static final Map<String, String> defaultDevDependenciesWithPrettier(Strin
 		return Collections.singletonMap("prettier", version);
 	}
 
-	public static FormatterStep create(Map<String, String> devDependencies, Provisioner provisioner, File buildDir, NpmPathResolver npmPathResolver, PrettierConfig prettierConfig) {
+	public static FormatterStep create(Map<String, String> devDependencies, Provisioner provisioner, File projectDir, File buildDir, NpmPathResolver npmPathResolver, PrettierConfig prettierConfig) {
 		requireNonNull(devDependencies);
 		requireNonNull(provisioner);
 		requireNonNull(buildDir);
 		return FormatterStep.createLazy(NAME,
-				() -> new State(NAME, devDependencies, buildDir, npmPathResolver, prettierConfig),
+				() -> new State(NAME, devDependencies, projectDir, buildDir, npmPathResolver, prettierConfig),
 				State::createFormatterFunc);
 	}
 
@@ -63,7 +63,7 @@ private static class State extends NpmFormatterStepStateBase implements Serializ
 		private static final long serialVersionUID = -539537027004745812L;
 		private final PrettierConfig prettierConfig;
 
-		State(String stepName, Map<String, String> devDependencies, File buildDir, NpmPathResolver npmPathResolver, PrettierConfig prettierConfig) throws IOException {
+		State(String stepName, Map<String, String> devDependencies, File projectDir, File buildDir, NpmPathResolver npmPathResolver, PrettierConfig prettierConfig) throws IOException {
 			super(stepName,
 					new NpmConfig(
 							replaceDevDependencies(
@@ -74,6 +74,7 @@ private static class State extends NpmFormatterStepStateBase implements Serializ
 									"/com/diffplug/spotless/npm/common-serve.js",
 									"/com/diffplug/spotless/npm/prettier-serve.js"),
 							npmPathResolver.resolveNpmrcContent()),
+					projectDir,
 					buildDir,
 					npmPathResolver.resolveNpmExecutable());
 			this.prettierConfig = requireNonNull(prettierConfig);
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java
index e9c098d709..027af89e23 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java
@@ -40,11 +40,11 @@ public class TsFmtFormatterStep {
 
 	public static final String NAME = "tsfmt-format";
 
-	public static FormatterStep create(Map<String, String> versions, Provisioner provisioner, File buildDir, NpmPathResolver npmPathResolver, @Nullable TypedTsFmtConfigFile configFile, @Nullable Map<String, Object> inlineTsFmtSettings) {
+	public static FormatterStep create(Map<String, String> versions, Provisioner provisioner, File projectDir, File buildDir, NpmPathResolver npmPathResolver, @Nullable TypedTsFmtConfigFile configFile, @Nullable Map<String, Object> inlineTsFmtSettings) {
 		requireNonNull(provisioner);
 		requireNonNull(buildDir);
 		return FormatterStep.createLazy(NAME,
-				() -> new State(NAME, versions, buildDir, npmPathResolver, configFile, inlineTsFmtSettings),
+				() -> new State(NAME, versions, projectDir, buildDir, npmPathResolver, configFile, inlineTsFmtSettings),
 				State::createFormatterFunc);
 	}
 
@@ -71,7 +71,7 @@ public static class State extends NpmFormatterStepStateBase implements Serializa
 		@Nullable
 		private final TypedTsFmtConfigFile configFile;
 
-		public State(String stepName, Map<String, String> versions, File buildDir, NpmPathResolver npmPathResolver, @Nullable TypedTsFmtConfigFile configFile, @Nullable Map<String, Object> inlineTsFmtSettings) throws IOException {
+		public State(String stepName, Map<String, String> versions, File projectDir, File buildDir, NpmPathResolver npmPathResolver, @Nullable TypedTsFmtConfigFile configFile, @Nullable Map<String, Object> inlineTsFmtSettings) throws IOException {
 			super(stepName,
 					new NpmConfig(
 							replaceDevDependencies(NpmResourceHelper.readUtf8StringFromClasspath(TsFmtFormatterStep.class, "/com/diffplug/spotless/npm/tsfmt-package.json"), new TreeMap<>(versions)),
@@ -80,6 +80,7 @@ public State(String stepName, Map<String, String> versions, File buildDir, NpmPa
 									"/com/diffplug/spotless/npm/common-serve.js",
 									"/com/diffplug/spotless/npm/tsfmt-serve.js"),
 							npmPathResolver.resolveNpmrcContent()),
+					projectDir,
 					buildDir,
 					npmPathResolver.resolveNpmExecutable());
 			this.buildDir = requireNonNull(buildDir);
diff --git a/lib/src/main/resources/com/diffplug/spotless/npm/eslint-serve.js b/lib/src/main/resources/com/diffplug/spotless/npm/eslint-serve.js
index 8c56b8ef08..15018e6cb0 100644
--- a/lib/src/main/resources/com/diffplug/spotless/npm/eslint-serve.js
+++ b/lib/src/main/resources/com/diffplug/spotless/npm/eslint-serve.js
@@ -24,8 +24,22 @@ app.post("/eslint/format", async (req, res) => {
 		fix: true,
 		useEslintrc: false, // would result in (gradle) cache issues
 		resolvePluginsRelativeTo: format_data.node_modules_dir
+		// baseConfig: {
+		// 	parserOptions: {
+		// 		tsconfigRootDir: '../../',
+		// 	}
+		// }
 	};
 
+	if (format_data.ts_config_root_dir) {
+		ESLintOptions.baseConfig = {
+			parserOptions: {
+				tsconfigRootDir: format_data.ts_config_root_dir
+			}
+		};
+		// res.status(501).send("Resolved ts config root dir: " + format_data.ts_config_root_dir);
+	}
+
 
 	if (ESLintOverrideConfigFile) {
 		ESLintOptions.overrideConfigFile = ESLintOverrideConfigFile;
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index 99e21bd8c8..3f433afa92 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -27,8 +27,10 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Random;
 import java.util.TreeMap;
+import java.util.stream.Collectors;
 
 import javax.annotation.Nullable;
 import javax.inject.Inject;
@@ -583,6 +585,7 @@ FormatterStep createStep() {
 			return PrettierFormatterStep.create(
 					devDependencies,
 					provisioner(),
+					project.getProjectDir(),
 					project.getBuildDir(),
 					new NpmPathResolver(npmFileOrNull(), npmrcFileOrNull(), project.getProjectDir(), project.getRootDir()),
 					new com.diffplug.spotless.npm.PrettierConfig(
@@ -618,6 +621,8 @@ public class EslintFormatExtension extends NpmStepConfig<EslintFormatExtension>
 		@Nullable
 		String configJs = null;
 
+		List<AdditionalEslintConfig> additionalConfigs = new ArrayList<>();
+
 		public EslintFormatExtension(Map<String, String> devDependencies) {
 			this.devDependencies.putAll(requireNonNull(devDependencies));
 		}
@@ -640,19 +645,44 @@ public EslintFormatExtension configFile(Object configFilePath) {
 			return this;
 		}
 
+		protected void additionalConfigFilePath(Object sourceFile, String relativeTargetPath) {
+			this.additionalConfigs.add(new AdditionalEslintConfig(sourceFile, relativeTargetPath));
+		}
+
 		public FormatterStep createStep() {
 			final Project project = getProject();
 
 			return EslintFormatterStep.create(
 					devDependencies,
 					provisioner(),
+					project.getProjectDir(),
 					project.getBuildDir(),
 					new NpmPathResolver(npmFileOrNull(), npmrcFileOrNull(), project.getProjectDir(), project.getRootDir()),
 					eslintConfig());
 		}
 
 		private EslintConfig eslintConfig() {
-			return new EslintConfig(configFilePath != null ? getProject().file(configFilePath) : null, configJs);
+			return new EslintConfig(configFilePath != null ? getProject().file(configFilePath) : null, configJs, additionalConfigs());
+		}
+
+		private Map<File, Optional<String>> additionalConfigs() {
+			// convert additionalConfigs to a map explicitly allowing null values
+
+			return additionalConfigs.stream()
+					.collect(Collectors.toMap(
+							config -> getProject().file(config.configFilePath),
+							config -> Optional.ofNullable(config.relativeTargetPath)));
+		}
+	}
+
+	private static class AdditionalEslintConfig {
+		final Object configFilePath;
+
+		final String relativeTargetPath;
+
+		AdditionalEslintConfig(Object configFilePath, String relativeTargetPath) {
+			this.configFilePath = configFilePath;
+			this.relativeTargetPath = relativeTargetPath;
 		}
 	}
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
index e80730d5ed..b126cc76c6 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
@@ -113,6 +113,7 @@ public FormatterStep createStep() {
 			return TsFmtFormatterStep.create(
 					devDependencies,
 					provisioner(),
+					project.getProjectDir(),
 					project.getBuildDir(),
 					new NpmPathResolver(npmFileOrNull(), npmrcFileOrNull(), project.getProjectDir(), project.getRootDir()),
 					typedConfigFile(),
@@ -221,6 +222,16 @@ public TypescriptEslintFormatExtension styleGuide(String styleGuide) {
 			replaceStep(createStep());
 			return this;
 		}
+
+		public TypescriptEslintFormatExtension tsconfigFile(Object path) {
+			return tsconfigFile(path, null);
+		}
+
+		public TypescriptEslintFormatExtension tsconfigFile(Object path, String remapping) {
+			additionalConfigFilePath(path, remapping);
+			replaceStep(createStep());
+			return this;
+		}
 	}
 
 	@Override
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TypescriptExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TypescriptExtensionTest.java
index 40da7e3536..e7086e0c91 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TypescriptExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TypescriptExtensionTest.java
@@ -144,7 +144,7 @@ void usePrettier() throws IOException {
 
 	@Test
 	void useEslint() throws IOException {
-		setFile(".eslintrc.js").toResource("npm/eslint/filetypes/typescript/.eslintrc.js");
+		setFile(".eslintrc.js").toResource("npm/eslint/typescript/custom_rules/.eslintrc.js");
 		setFile("build.gradle").toLines(
 				"plugins {",
 				"    id 'com.diffplug.spotless'",
@@ -156,8 +156,28 @@ void useEslint() throws IOException {
 				"        eslint().configFile('.eslintrc.js')",
 				"    }",
 				"}");
-		setFile("test.ts").toResource("npm/eslint/filetypes/typescript/typescript.dirty");
+		setFile("test.ts").toResource("npm/eslint/typescript/custom_rules/typescript.dirty");
 		gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
-		assertFile("test.ts").sameAsResource("npm/eslint/filetypes/typescript/typescript.clean");
+		assertFile("test.ts").sameAsResource("npm/eslint/typescript/custom_rules/typescript.clean");
+	}
+
+	@Test
+	void useXoStandardRules() throws IOException {
+		setFile(".eslintrc.js").toResource("npm/eslint/typescript/standard_rules_xo/.eslintrc.js");
+		setFile("tsconfig.json").toResource("npm/eslint/typescript/standard_rules_xo/tsconfig.json"); // needs to be copied to!
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    typescript {",
+				"        target 'test.ts'",
+				"        eslint().styleGuide('xo-typescript').configFile('.eslintrc.js')//.tsconfigFile('tsconfig.json')", // TODO TODO maybe can skip the additional config files alltogether, instead provide tsConfigRootDir to eslint-serve.js via call
+				"    }",
+				"}");
+		setFile("test.ts").toResource("npm/eslint/typescript/standard_rules_xo/typescript.dirty");
+		gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+		assertFile("test.ts").sameAsResource("npm/eslint/typescript/standard_rules_xo/typescript.clean");
 	}
 }
diff --git a/testlib/src/main/resources/npm/eslint/filetypes/typescript/.eslintrc.js b/testlib/src/main/resources/npm/eslint/typescript/custom_rules/.eslintrc.js
similarity index 100%
rename from testlib/src/main/resources/npm/eslint/filetypes/typescript/.eslintrc.js
rename to testlib/src/main/resources/npm/eslint/typescript/custom_rules/.eslintrc.js
diff --git a/testlib/src/main/resources/npm/eslint/filetypes/typescript/typescript.clean b/testlib/src/main/resources/npm/eslint/typescript/custom_rules/typescript.clean
similarity index 100%
rename from testlib/src/main/resources/npm/eslint/filetypes/typescript/typescript.clean
rename to testlib/src/main/resources/npm/eslint/typescript/custom_rules/typescript.clean
diff --git a/testlib/src/main/resources/npm/eslint/filetypes/typescript/typescript.dirty b/testlib/src/main/resources/npm/eslint/typescript/custom_rules/typescript.dirty
similarity index 100%
rename from testlib/src/main/resources/npm/eslint/filetypes/typescript/typescript.dirty
rename to testlib/src/main/resources/npm/eslint/typescript/custom_rules/typescript.dirty
diff --git a/testlib/src/main/resources/npm/eslint/typescript/standard_rules_xo/.eslintrc.js b/testlib/src/main/resources/npm/eslint/typescript/standard_rules_xo/.eslintrc.js
new file mode 100644
index 0000000000..e1ca03f732
--- /dev/null
+++ b/testlib/src/main/resources/npm/eslint/typescript/standard_rules_xo/.eslintrc.js
@@ -0,0 +1,26 @@
+module.exports = {
+	env: {
+		browser: true,
+		es2021: true,
+	},
+	extends: 'xo/browser',
+	overrides: [
+		{
+			extends: [
+				'xo-typescript',
+			],
+			files: [
+				'*.ts',
+				'*.tsx',
+			],
+		},
+	],
+	parser: "@typescript-eslint/parser",
+	parserOptions: {
+		ecmaVersion: 'latest',
+		sourceType: 'module',
+		project: './tsconfig.json',
+	},
+	rules: {
+	},
+};
diff --git a/testlib/src/main/resources/npm/eslint/typescript/standard_rules_xo/tsconfig.json b/testlib/src/main/resources/npm/eslint/typescript/standard_rules_xo/tsconfig.json
new file mode 100644
index 0000000000..629f834eb5
--- /dev/null
+++ b/testlib/src/main/resources/npm/eslint/typescript/standard_rules_xo/tsconfig.json
@@ -0,0 +1,18 @@
+{
+	"compileOnSave": true,
+	"compilerOptions": {
+		"module": "ES6",
+		"noImplicitAny": true,
+		"outDir": "build/ide/",
+		"sourceMap": true,
+		"skipLibCheck": true,
+		"target": "ES6",
+		"baseUrl": "./",
+		"paths": {
+		},
+		"lib": ["es7", "dom", "es2017"]
+	},
+	"include": [
+		"**/*"
+	]
+}
diff --git a/testlib/src/main/resources/npm/eslint/typescript/standard_rules_xo/typescript.clean b/testlib/src/main/resources/npm/eslint/typescript/standard_rules_xo/typescript.clean
new file mode 100644
index 0000000000..5c43d7a746
--- /dev/null
+++ b/testlib/src/main/resources/npm/eslint/typescript/standard_rules_xo/typescript.clean
@@ -0,0 +1,9 @@
+export class MyController extends AbstractController implements DisposeAware, CallbackAware {
+	public myValue: string[];
+
+	constructor(private readonly myService: Service, name: string, private readonly field: any) {
+		super(name);
+	}
+
+	// ...
+}
diff --git a/testlib/src/main/resources/npm/eslint/typescript/standard_rules_xo/typescript.dirty b/testlib/src/main/resources/npm/eslint/typescript/standard_rules_xo/typescript.dirty
new file mode 100644
index 0000000000..a8f7447af1
--- /dev/null
+++ b/testlib/src/main/resources/npm/eslint/typescript/standard_rules_xo/typescript.dirty
@@ -0,0 +1,10 @@
+export class MyController extends AbstractController implements DisposeAware, CallbackAware {
+
+public myValue:string[];
+
+constructor(private myService:Service,name:string,private field:any){ super(name)   ;}
+
+
+//...
+
+}

From 96339675402e79f0737f70733b2224cba4345c2e Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Fri, 9 Dec 2022 21:10:40 +0100
Subject: [PATCH 0445/2068] eslint: add support for standard-with-typescript
 ruleset

---
 .../com/diffplug/spotless/npm/eslint-serve.js | 71 +++++++++----------
 .../spotless/TypescriptExtensionTest.java     | 24 ++++++-
 .../.eslintrc.js                              | 16 +++++
 .../tsconfig.json                             | 18 +++++
 .../typescript.clean                          |  7 ++
 .../typescript.dirty                          | 10 +++
 6 files changed, 105 insertions(+), 41 deletions(-)
 create mode 100644 testlib/src/main/resources/npm/eslint/typescript/standard_rules_standard_with_typescript/.eslintrc.js
 create mode 100644 testlib/src/main/resources/npm/eslint/typescript/standard_rules_standard_with_typescript/tsconfig.json
 create mode 100644 testlib/src/main/resources/npm/eslint/typescript/standard_rules_standard_with_typescript/typescript.clean
 create mode 100644 testlib/src/main/resources/npm/eslint/typescript/standard_rules_standard_with_typescript/typescript.dirty

diff --git a/lib/src/main/resources/com/diffplug/spotless/npm/eslint-serve.js b/lib/src/main/resources/com/diffplug/spotless/npm/eslint-serve.js
index 15018e6cb0..2804eb86dd 100644
--- a/lib/src/main/resources/com/diffplug/spotless/npm/eslint-serve.js
+++ b/lib/src/main/resources/com/diffplug/spotless/npm/eslint-serve.js
@@ -1,57 +1,50 @@
 const {ESLint} = require("eslint");
 
 app.post("/eslint/format", async (req, res) => {
+	try {
+		const format_data = req.body;
 
-	const format_data = req.body;
-
-	const ESLintOverrideConfig = format_data.eslint_override_config;
+		const ESLintOverrideConfig = format_data.eslint_override_config;
 
-	const ESLintOverrideConfigFile = format_data.eslint_override_config_file;
+		const ESLintOverrideConfigFile = format_data.eslint_override_config_file;
 
-	if (!ESLintOverrideConfig && !ESLintOverrideConfigFile) {
-		res.status(501).send("Error while formatting: No config provided");
-		return;
-	}
-
-	const filePath = format_data.file_path;
+		if (!ESLintOverrideConfig && !ESLintOverrideConfigFile) {
+			res.status(501).send("Error while formatting: No config provided");
+			return;
+		}
 
-	if (!filePath) {
-		res.status(501).send("Error while formatting: No file path provided");
-		return;
-	}
+		const filePath = format_data.file_path;
 
-	const ESLintOptions = {
-		fix: true,
-		useEslintrc: false, // would result in (gradle) cache issues
-		resolvePluginsRelativeTo: format_data.node_modules_dir
-		// baseConfig: {
-		// 	parserOptions: {
-		// 		tsconfigRootDir: '../../',
-		// 	}
-		// }
-	};
+		if (!filePath) {
+			res.status(501).send("Error while formatting: No file path provided");
+			return;
+		}
 
-	if (format_data.ts_config_root_dir) {
-		ESLintOptions.baseConfig = {
-			parserOptions: {
-				tsconfigRootDir: format_data.ts_config_root_dir
-			}
+		const ESLintOptions = {
+			fix: true,
+			useEslintrc: false, // would result in (gradle) cache issues
+			resolvePluginsRelativeTo: format_data.node_modules_dir
 		};
-		// res.status(501).send("Resolved ts config root dir: " + format_data.ts_config_root_dir);
-	}
 
+		if (format_data.ts_config_root_dir) {
+			ESLintOptions.baseConfig = {
+				parserOptions: {
+					tsconfigRootDir: format_data.ts_config_root_dir
+				}
+			};
+		}
 
-	if (ESLintOverrideConfigFile) {
-		ESLintOptions.overrideConfigFile = ESLintOverrideConfigFile;
-	}
-	if (ESLintOverrideConfig) {
-		ESLintOptions.overrideConfig = ESLintOverrideConfig;
-	}
 
-	const eslint = new ESLint(ESLintOptions);
+		if (ESLintOverrideConfigFile) {
+			ESLintOptions.overrideConfigFile = ESLintOverrideConfigFile;
+		}
+		if (ESLintOverrideConfig) {
+			ESLintOptions.overrideConfig = ESLintOverrideConfig;
+		}
+
+		const eslint = new ESLint(ESLintOptions);
 
 
-	try {
 		console.log("using options: " + JSON.stringify(ESLintOptions));
 		console.log("format input", format_data.file_content);
 		const lintTextOptions = {
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TypescriptExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TypescriptExtensionTest.java
index e7086e0c91..0c3d10c89f 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TypescriptExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TypescriptExtensionTest.java
@@ -164,7 +164,7 @@ void useEslint() throws IOException {
 	@Test
 	void useXoStandardRules() throws IOException {
 		setFile(".eslintrc.js").toResource("npm/eslint/typescript/standard_rules_xo/.eslintrc.js");
-		setFile("tsconfig.json").toResource("npm/eslint/typescript/standard_rules_xo/tsconfig.json"); // needs to be copied to!
+		setFile("tsconfig.json").toResource("npm/eslint/typescript/standard_rules_xo/tsconfig.json");
 		setFile("build.gradle").toLines(
 				"plugins {",
 				"    id 'com.diffplug.spotless'",
@@ -173,11 +173,31 @@ void useXoStandardRules() throws IOException {
 				"spotless {",
 				"    typescript {",
 				"        target 'test.ts'",
-				"        eslint().styleGuide('xo-typescript').configFile('.eslintrc.js')//.tsconfigFile('tsconfig.json')", // TODO TODO maybe can skip the additional config files alltogether, instead provide tsConfigRootDir to eslint-serve.js via call
+				"        eslint().styleGuide('xo-typescript').configFile('.eslintrc.js')",
 				"    }",
 				"}");
 		setFile("test.ts").toResource("npm/eslint/typescript/standard_rules_xo/typescript.dirty");
 		gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
 		assertFile("test.ts").sameAsResource("npm/eslint/typescript/standard_rules_xo/typescript.clean");
 	}
+
+	@Test
+	void useStandardWithTypescriptRules() throws IOException {
+		setFile(".eslintrc.js").toResource("npm/eslint/typescript/standard_rules_standard_with_typescript/.eslintrc.js");
+		setFile("tsconfig.json").toResource("npm/eslint/typescript/standard_rules_standard_with_typescript/tsconfig.json");
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    typescript {",
+				"        target 'test.ts'",
+				"        eslint().styleGuide('standard-with-typescript').configFile('.eslintrc.js')",
+				"    }",
+				"}");
+		setFile("test.ts").toResource("npm/eslint/typescript/standard_rules_standard_with_typescript/typescript.dirty");
+		gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+		assertFile("test.ts").sameAsResource("npm/eslint/typescript/standard_rules_standard_with_typescript/typescript.clean");
+	}
 }
diff --git a/testlib/src/main/resources/npm/eslint/typescript/standard_rules_standard_with_typescript/.eslintrc.js b/testlib/src/main/resources/npm/eslint/typescript/standard_rules_standard_with_typescript/.eslintrc.js
new file mode 100644
index 0000000000..0a86d5db86
--- /dev/null
+++ b/testlib/src/main/resources/npm/eslint/typescript/standard_rules_standard_with_typescript/.eslintrc.js
@@ -0,0 +1,16 @@
+module.exports = {
+	env: {
+		browser: true,
+		es2021: true
+	},
+	extends: 'standard-with-typescript',
+	overrides: [
+	],
+	parserOptions: {
+		ecmaVersion: 'latest',
+		sourceType: 'module',
+		project: './tsconfig.json',
+	},
+	rules: {
+	}
+}
diff --git a/testlib/src/main/resources/npm/eslint/typescript/standard_rules_standard_with_typescript/tsconfig.json b/testlib/src/main/resources/npm/eslint/typescript/standard_rules_standard_with_typescript/tsconfig.json
new file mode 100644
index 0000000000..629f834eb5
--- /dev/null
+++ b/testlib/src/main/resources/npm/eslint/typescript/standard_rules_standard_with_typescript/tsconfig.json
@@ -0,0 +1,18 @@
+{
+	"compileOnSave": true,
+	"compilerOptions": {
+		"module": "ES6",
+		"noImplicitAny": true,
+		"outDir": "build/ide/",
+		"sourceMap": true,
+		"skipLibCheck": true,
+		"target": "ES6",
+		"baseUrl": "./",
+		"paths": {
+		},
+		"lib": ["es7", "dom", "es2017"]
+	},
+	"include": [
+		"**/*"
+	]
+}
diff --git a/testlib/src/main/resources/npm/eslint/typescript/standard_rules_standard_with_typescript/typescript.clean b/testlib/src/main/resources/npm/eslint/typescript/standard_rules_standard_with_typescript/typescript.clean
new file mode 100644
index 0000000000..cbe609b1bb
--- /dev/null
+++ b/testlib/src/main/resources/npm/eslint/typescript/standard_rules_standard_with_typescript/typescript.clean
@@ -0,0 +1,7 @@
+export class MyController extends AbstractController implements DisposeAware, CallbackAware {
+  public myValue: string[]
+
+  constructor (private readonly myService: Service, name: string, private readonly field: any) { super(name) }
+
+  // ...
+}
diff --git a/testlib/src/main/resources/npm/eslint/typescript/standard_rules_standard_with_typescript/typescript.dirty b/testlib/src/main/resources/npm/eslint/typescript/standard_rules_standard_with_typescript/typescript.dirty
new file mode 100644
index 0000000000..a8f7447af1
--- /dev/null
+++ b/testlib/src/main/resources/npm/eslint/typescript/standard_rules_standard_with_typescript/typescript.dirty
@@ -0,0 +1,10 @@
+export class MyController extends AbstractController implements DisposeAware, CallbackAware {
+
+public myValue:string[];
+
+constructor(private myService:Service,name:string,private field:any){ super(name)   ;}
+
+
+//...
+
+}

From 7022b7fa3b9337474951defff106746c280f4a58 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Thu, 15 Dec 2022 19:53:59 +0100
Subject: [PATCH 0446/2068] eslint: add unit tests, cleanup code

---
 .../diffplug/spotless/npm/EslintConfig.java   |  23 +-
 .../spotless/npm/EslintFormatterStep.java     |  21 +-
 .../spotless/npm/EslintTypescriptConfig.java  |  41 ++++
 .../gradle/spotless/FormatExtension.java      |  30 +--
 .../gradle/spotless/TypescriptExtension.java  |  19 +-
 .../diffplug/spotless/ResourceHarness.java    |  18 +-
 .../spotless/npm/EslintFormatterStepTest.java | 210 ++++++++++++++++++
 .../npm/NpmFormatterStepCommonTests.java      |   9 +
 .../npm/PrettierFormatterStepTest.java        |   5 +
 .../spotless/npm/TsFmtFormatterStepTest.java  |   2 +
 10 files changed, 309 insertions(+), 69 deletions(-)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/npm/EslintTypescriptConfig.java
 create mode 100644 testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintConfig.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintConfig.java
index 83f5ab1a73..732111cc71 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/EslintConfig.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintConfig.java
@@ -18,12 +18,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
-import java.util.Collections;
-import java.util.Map;
-import java.util.Optional;
-import java.util.TreeMap;
 
-import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import com.diffplug.spotless.FileSignature;
@@ -44,23 +39,20 @@ public class EslintConfig implements Serializable {
 
 	private final String eslintConfigJs;
 
-	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
-	private final transient Map<File, Optional<String>> additionalConfigFiles; // key: source-file, value: target-remapping path relative to package.json (if needed)
-
-	private final FileSignature additionalConfigFilesSignature;
-
-	public EslintConfig(@Nullable File eslintConfigPath, @Nullable String eslintConfigJs, Map<File, Optional<String>> additionalConfigFiles) {
+	public EslintConfig(@Nullable File eslintConfigPath, @Nullable String eslintConfigJs) {
 		try {
 			this.eslintConfigPath = eslintConfigPath;
 			this.eslintConfigPathSignature = eslintConfigPath != null ? FileSignature.signAsList(this.eslintConfigPath) : FileSignature.signAsList();
 			this.eslintConfigJs = eslintConfigJs;
-			this.additionalConfigFiles = additionalConfigFiles != null ? new TreeMap<>(additionalConfigFiles) : Collections.emptyMap();
-			this.additionalConfigFilesSignature = FileSignature.signAsList(this.additionalConfigFiles.keySet().toArray(new File[0]));
 		} catch (IOException e) {
 			throw ThrowingEx.asRuntime(e);
 		}
 	}
 
+	public EslintConfig withEslintConfigPath(@Nullable File eslintConfigPath) {
+		return new EslintConfig(eslintConfigPath, this.eslintConfigJs);
+	}
+
 	@Nullable
 	public File getEslintConfigPath() {
 		return eslintConfigPath;
@@ -70,9 +62,4 @@ public File getEslintConfigPath() {
 	public String getEslintConfigJs() {
 		return eslintConfigJs;
 	}
-
-	@Nonnull
-	public Map<File, Optional<String>> getAdditionalConfigFiles() {
-		return additionalConfigFiles;
-	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
index 492cf0da90..49bde50945 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
@@ -25,7 +25,6 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.TreeMap;
 
 import javax.annotation.Nonnull;
@@ -152,17 +151,7 @@ private EslintConfig localCopyFiles(EslintConfig orig) {
 			// eslint configs contain relative paths to additional config files (such as tsconfig.json e.g.)
 			FormattedPrinter.SYSOUT.print("Copying config file <%s> to <%s> and using the copy", orig.getEslintConfigPath(), nodeModulesDir);
 			File configFileCopy = NpmResourceHelper.copyFileToDir(orig.getEslintConfigPath(), nodeModulesDir);
-
-			for (Map.Entry<File, Optional<String>> additionalConfigFile : orig.getAdditionalConfigFiles().entrySet()) {
-				FormattedPrinter.SYSOUT.print("Copying additional config file <%s> to <%s> at subpath <%s> and using the copy", additionalConfigFile.getKey(), nodeModulesDir, additionalConfigFile.getValue());
-
-				if (additionalConfigFile.getValue().isPresent()) {
-					NpmResourceHelper.copyFileToDirAtSubpath(additionalConfigFile.getKey(), nodeModulesDir, additionalConfigFile.getValue().get());
-				} else {
-					NpmResourceHelper.copyFileToDir(additionalConfigFile.getKey(), nodeModulesDir);
-				}
-			}
-			return new EslintConfig(configFileCopy, orig.getEslintConfigJs(), orig.getAdditionalConfigFiles());
+			return orig.withEslintConfigPath(configFileCopy);
 		}
 
 		@Override
@@ -226,8 +215,12 @@ private void setConfigToCallOptions(Map<FormatOption, Object> eslintCallOptions)
 			}
 			eslintCallOptions.put(FormatOption.NODE_MODULES_DIR, nodeModulesDir.getAbsolutePath());
 
-			// TODO (simschla, 09.12.22): maybe only add this if there is a typescript config active? (TBD: how to detect)
-			eslintCallOptions.put(FormatOption.TS_CONFIG_ROOT_DIR, nodeModulesDir.toPath().relativize(projectDir.toPath()).toString());
+			if (eslintConfig instanceof EslintTypescriptConfig) {
+				// if we are a ts config, see if we need to use specific paths or use default projectDir
+				File tsConfigFilePath = ((EslintTypescriptConfig) eslintConfig).getTypescriptConfigPath();
+				File tsConfigRootDir = tsConfigFilePath != null ? tsConfigFilePath.getParentFile() : projectDir;
+				eslintCallOptions.put(FormatOption.TS_CONFIG_ROOT_DIR, nodeModulesDir.getAbsoluteFile().toPath().relativize(tsConfigRootDir.getAbsoluteFile().toPath()).toString());
+			}
 		}
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintTypescriptConfig.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintTypescriptConfig.java
new file mode 100644
index 0000000000..05c8209837
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintTypescriptConfig.java
@@ -0,0 +1,41 @@
+package com.diffplug.spotless.npm;
+
+import com.diffplug.spotless.FileSignature;
+import com.diffplug.spotless.ThrowingEx;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+import javax.annotation.Nullable;
+
+import java.io.File;
+import java.io.IOException;
+
+public class EslintTypescriptConfig extends EslintConfig {
+
+	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
+	@Nullable
+	private final transient File typescriptConfigPath;
+
+	@SuppressWarnings("unused")
+	private final FileSignature typescriptConfigPathSignature;
+
+	public EslintTypescriptConfig(@Nullable File eslintConfigPath, @Nullable String eslintConfigJs, @Nullable File typescriptConfigPath) {
+		super(eslintConfigPath, eslintConfigJs);
+		try {
+			this.typescriptConfigPath = typescriptConfigPath;
+			this.typescriptConfigPathSignature = typescriptConfigPath != null ? FileSignature.signAsList(this.typescriptConfigPath) : FileSignature.signAsList();
+		} catch (IOException e) {
+			throw ThrowingEx.asRuntime(e);
+		}
+	}
+
+	@Override
+	public EslintConfig withEslintConfigPath(@Nullable File eslintConfigPath) {
+		return new EslintTypescriptConfig(eslintConfigPath, this.getEslintConfigJs(), this.typescriptConfigPath);
+	}
+
+	@Nullable
+	public File getTypescriptConfigPath() {
+		return typescriptConfigPath;
+	}
+}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index 3f433afa92..6152f9009d 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -621,8 +621,6 @@ public class EslintFormatExtension extends NpmStepConfig<EslintFormatExtension>
 		@Nullable
 		String configJs = null;
 
-		List<AdditionalEslintConfig> additionalConfigs = new ArrayList<>();
-
 		public EslintFormatExtension(Map<String, String> devDependencies) {
 			this.devDependencies.putAll(requireNonNull(devDependencies));
 		}
@@ -645,10 +643,6 @@ public EslintFormatExtension configFile(Object configFilePath) {
 			return this;
 		}
 
-		protected void additionalConfigFilePath(Object sourceFile, String relativeTargetPath) {
-			this.additionalConfigs.add(new AdditionalEslintConfig(sourceFile, relativeTargetPath));
-		}
-
 		public FormatterStep createStep() {
 			final Project project = getProject();
 
@@ -661,28 +655,8 @@ public FormatterStep createStep() {
 					eslintConfig());
 		}
 
-		private EslintConfig eslintConfig() {
-			return new EslintConfig(configFilePath != null ? getProject().file(configFilePath) : null, configJs, additionalConfigs());
-		}
-
-		private Map<File, Optional<String>> additionalConfigs() {
-			// convert additionalConfigs to a map explicitly allowing null values
-
-			return additionalConfigs.stream()
-					.collect(Collectors.toMap(
-							config -> getProject().file(config.configFilePath),
-							config -> Optional.ofNullable(config.relativeTargetPath)));
-		}
-	}
-
-	private static class AdditionalEslintConfig {
-		final Object configFilePath;
-
-		final String relativeTargetPath;
-
-		AdditionalEslintConfig(Object configFilePath, String relativeTargetPath) {
-			this.configFilePath = configFilePath;
-			this.relativeTargetPath = relativeTargetPath;
+		protected EslintConfig eslintConfig() {
+			return new EslintConfig(configFilePath != null ? getProject().file(configFilePath) : null, configJs);
 		}
 	}
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
index b126cc76c6..d4dedc32eb 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
@@ -27,6 +27,10 @@
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 
+import com.diffplug.spotless.npm.EslintConfig;
+
+import com.diffplug.spotless.npm.EslintTypescriptConfig;
+
 import org.gradle.api.Project;
 
 import com.diffplug.spotless.FormatterStep;
@@ -193,6 +197,9 @@ public TypescriptEslintFormatExtension eslint(Map<String, String> devDependencie
 
 	public class TypescriptEslintFormatExtension extends EslintFormatExtension {
 
+		@Nullable
+		Object typescriptConfigFilePath = null;
+
 		public TypescriptEslintFormatExtension(Map<String, String> devDependencies) {
 			super(devDependencies);
 		}
@@ -224,14 +231,16 @@ public TypescriptEslintFormatExtension styleGuide(String styleGuide) {
 		}
 
 		public TypescriptEslintFormatExtension tsconfigFile(Object path) {
-			return tsconfigFile(path, null);
-		}
-
-		public TypescriptEslintFormatExtension tsconfigFile(Object path, String remapping) {
-			additionalConfigFilePath(path, remapping);
+			this.typescriptConfigFilePath = requireNonNull(path);
 			replaceStep(createStep());
 			return this;
 		}
+
+		@Override
+		protected EslintConfig eslintConfig() {
+			EslintConfig config = super.eslintConfig();
+			return new EslintTypescriptConfig(config.getEslintConfigPath(), config.getEslintConfigJs(), typescriptConfigFilePath != null ? getProject().file(typescriptConfigFilePath) : null);
+		}
 	}
 
 	@Override
diff --git a/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java b/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java
index d4a79fe417..0304889e1f 100644
--- a/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java
+++ b/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java
@@ -27,6 +27,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.function.UnaryOperator;
 
@@ -86,11 +87,20 @@ protected void replace(String path, String toReplace, String replaceWith) throws
 
 	/** Returns the contents of the given file from the src/test/resources directory. */
 	protected static String getTestResource(String filename) {
-		URL url = ResourceHarness.class.getResource("/" + filename);
-		if (url == null) {
-			throw new IllegalArgumentException("No such resource " + filename);
+		Optional<URL> resourceUrl = getTestResourceUrl(filename);
+		if (resourceUrl.isPresent()) {
+			return ThrowingEx.get(() -> LineEnding.toUnix(Resources.toString(resourceUrl.get(), StandardCharsets.UTF_8)));
 		}
-		return ThrowingEx.get(() -> LineEnding.toUnix(Resources.toString(url, StandardCharsets.UTF_8)));
+		throw new IllegalArgumentException("No such resource " + filename);
+	}
+
+	protected static boolean existsTestResource(String filename) {
+		return getTestResourceUrl(filename).isPresent();
+	}
+
+	private static Optional<URL> getTestResourceUrl(String filename) {
+		URL url = ResourceHarness.class.getResource("/" + filename);
+		return Optional.ofNullable(url);
 	}
 
 	/** Returns Files (in a temporary folder) which has the contents of the given file from the src/test/resources directory. */
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
new file mode 100644
index 0000000000..afe463c1aa
--- /dev/null
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
@@ -0,0 +1,210 @@
+/*
+ * Copyright 2016-2021 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.npm;
+
+import com.diffplug.common.collect.ImmutableMap;
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.StepHarness;
+import com.diffplug.spotless.StepHarnessWithFile;
+import com.diffplug.spotless.TestProvisioner;
+import com.diffplug.spotless.tag.NpmTest;
+
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import java.io.File;
+import java.util.Map;
+import java.util.TreeMap;
+
+@NpmTest
+class EslintFormatterStepTest {
+
+	@NpmTest
+	@Nested
+	class EslintTypescriptFormattingStepTest extends NpmFormatterStepCommonTests {
+
+		private final Map<String, Map<String, String>> devDependenciesForRuleset = ImmutableMap.of(
+			"custom_rules", EslintFormatterStep.defaultDevDependenciesForTypescript(),
+			"standard_rules_standard_with_typescript", combine(EslintFormatterStep.defaultDevDependenciesForTypescript(), EslintFormatterStep.PopularStyleGuide.STANDARD_WITH_TYPESCRIPT.devDependencies()),
+				"standard_rules_xo", combine(EslintFormatterStep.defaultDevDependenciesForTypescript(), EslintFormatterStep.PopularStyleGuide.XO_TYPESCRIPT.devDependencies())
+				);
+
+		private final Map<String, String> combine(Map<String, String> m1, Map<String, String> m2) {
+			Map<String, String> combined = new TreeMap<>(m1);
+			combined.putAll(m2);
+			return combined;
+		}
+
+		@ParameterizedTest(name = "{index}: eslint can be applied using ruleset {0}")
+		@ValueSource(strings = {"custom_rules", "standard_rules_standard_with_typescript", "standard_rules_xo"})
+		void formattingUsingRulesetsFile(String ruleSetName) throws Exception {
+			String filedir = "npm/eslint/typescript/" + ruleSetName + "/";
+
+			String testDir = "formatting_ruleset_" + ruleSetName + "/";
+//			File testDirFile = newFolder(testDir);
+
+			final File eslintRc = createTestFile(filedir + ".eslintrc.js");
+//			final File eslintRc = setFile(buildDir().getPath() + "/.eslintrc.js").toResource(filedir + ".eslintrc.js");
+
+			//setFile(testDir + "/test.ts").toResource(filedir + "typescript.dirty");
+			File tsconfigFile = null;
+			if (existsTestResource(filedir + "tsconfig.json")) {
+				tsconfigFile = setFile(testDir + "tsconfig.json").toResource(filedir + "tsconfig.json");
+			}
+			final String dirtyFile = filedir + "typescript.dirty";
+			File dirtyFileFile = setFile(testDir + "test.ts").toResource(dirtyFile);
+			final String cleanFile = filedir + "typescript.clean";
+
+			final FormatterStep formatterStep = EslintFormatterStep.create(
+				devDependenciesForRuleset.get(ruleSetName),
+				TestProvisioner.mavenCentral(),
+				projectDir(),
+				buildDir(),
+				npmPathResolver(),
+				new EslintTypescriptConfig(eslintRc, null, tsconfigFile));
+
+			try (StepHarnessWithFile stepHarness = StepHarnessWithFile.forStep(formatterStep)) {
+				stepHarness.testResource(dirtyFileFile, dirtyFile, cleanFile);
+			}
+		}
+	}
+/*
+	@NpmTest
+	@Nested
+	class PrettierFormattingOfFileTypesIsWorking extends NpmFormatterStepCommonTests {
+
+		@ParameterizedTest(name = "{index}: prettier can be applied to {0}")
+		@ValueSource(strings = {"html", "typescript", "json", "javascript-es5", "javascript-es6", "css", "scss", "markdown", "yaml"})
+		void formattingUsingConfigFile(String fileType) throws Exception {
+			String filedir = "npm/prettier/filetypes/" + fileType + "/";
+
+			final File prettierRc = createTestFile(filedir + ".prettierrc.yml");
+			final String dirtyFile = filedir + fileType + ".dirty";
+			final String cleanFile = filedir + fileType + ".clean";
+
+			final FormatterStep formatterStep = PrettierFormatterStep.create(
+					PrettierFormatterStep.defaultDevDependencies(),
+					TestProvisioner.mavenCentral(),
+					buildDir(),
+					npmPathResolver(),
+					new PrettierConfig(prettierRc, null));
+
+			try (StepHarness stepHarness = StepHarness.forStep(formatterStep)) {
+				stepHarness.testResource(dirtyFile, cleanFile);
+			}
+		}
+	}
+
+	@NpmTest
+	@Nested
+	class SpecificPrettierFormatterStepTests extends NpmFormatterStepCommonTests {
+
+		@Test
+		void parserInferenceBasedOnExplicitFilepathIsWorking() throws Exception {
+			String filedir = "npm/prettier/filetypes/json/";
+
+			final String dirtyFile = filedir + "json.dirty";
+			final String cleanFile = filedir + "json.clean";
+
+			final FormatterStep formatterStep = PrettierFormatterStep.create(
+					PrettierFormatterStep.defaultDevDependencies(),
+					TestProvisioner.mavenCentral(),
+					buildDir(),
+					npmPathResolver(),
+					new PrettierConfig(null, ImmutableMap.of("filepath", "anyname.json"))); // should select parser based on this name
+
+			try (StepHarness stepHarness = StepHarness.forStep(formatterStep)) {
+				stepHarness.testResource(dirtyFile, cleanFile);
+			}
+		}
+
+		@Test
+		void parserInferenceBasedOnFilenameIsWorking() throws Exception {
+			String filedir = "npm/prettier/filename/";
+
+			final String dirtyFile = filedir + "dirty.json";
+			final String cleanFile = filedir + "clean.json";
+
+			final FormatterStep formatterStep = PrettierFormatterStep.create(
+					PrettierFormatterStep.defaultDevDependencies(),
+					TestProvisioner.mavenCentral(),
+					buildDir(),
+					npmPathResolver(),
+					new PrettierConfig(null, Collections.emptyMap()));
+
+			try (StepHarnessWithFile stepHarness = StepHarnessWithFile.forStep(formatterStep)) {
+				stepHarness.testResource(new File("test.json"), dirtyFile, cleanFile);
+			}
+		}
+
+		@Test
+		void verifyPrettierErrorMessageIsRelayed() throws Exception {
+			FormatterStep formatterStep = PrettierFormatterStep.create(
+					PrettierFormatterStep.defaultDevDependenciesWithPrettier("2.0.5"),
+					TestProvisioner.mavenCentral(),
+					buildDir(),
+					npmPathResolver(),
+					new PrettierConfig(null, ImmutableMap.of("parser", "postcss")));
+			try (StepHarness stepHarness = StepHarness.forStep(formatterStep)) {
+				stepHarness.testResourceException("npm/prettier/filetypes/scss/scss.dirty", exception -> {
+					exception.hasMessageContaining("HTTP 501");
+					exception.hasMessageContaining("Couldn't resolve parser \"postcss\"");
+				});
+			}
+		}
+	}
+
+	@NpmTest
+	@Nested
+	class PrettierFormattingOptionsAreWorking extends NpmFormatterStepCommonTests {
+
+		private static final String FILEDIR = "npm/prettier/config/";
+
+		void runFormatTest(PrettierConfig config, String cleanFileNameSuffix) throws Exception {
+
+			final String dirtyFile = FILEDIR + "typescript.dirty";
+			final String cleanFile = FILEDIR + "typescript." + cleanFileNameSuffix + ".clean";
+
+			final FormatterStep formatterStep = PrettierFormatterStep.create(
+					PrettierFormatterStep.defaultDevDependencies(),
+					TestProvisioner.mavenCentral(),
+					buildDir(),
+					npmPathResolver(),
+					config); // should select parser based on this name
+
+			try (StepHarness stepHarness = StepHarness.forStep(formatterStep)) {
+				stepHarness.testResource(dirtyFile, cleanFile);
+			}
+		}
+
+		@Test
+		void defaultsAreApplied() throws Exception {
+			runFormatTest(new PrettierConfig(null, ImmutableMap.of("parser", "typescript")), "defaults");
+		}
+
+		@Test
+		void configFileOptionsAreApplied() throws Exception {
+			runFormatTest(new PrettierConfig(createTestFile(FILEDIR + ".prettierrc.yml"), null), "configfile");
+		}
+
+		@Test
+		void configFileOptionsCanBeOverriden() throws Exception {
+			runFormatTest(new PrettierConfig(createTestFile(FILEDIR + ".prettierrc.yml"), ImmutableMap.of("printWidth", 300)), "override");
+		}
+
+	}*/
+}
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/NpmFormatterStepCommonTests.java b/testlib/src/test/java/com/diffplug/spotless/npm/NpmFormatterStepCommonTests.java
index 4da65cadc6..f1b5da59ff 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/NpmFormatterStepCommonTests.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/NpmFormatterStepCommonTests.java
@@ -42,4 +42,13 @@ protected File buildDir() throws IOException {
 		}
 		return this.buildDir;
 	}
+
+	private File projectDir = null;
+
+	protected File projectDir() throws IOException {
+		if (this.projectDir == null) {
+			this.projectDir = newFolder("project-dir");
+		}
+		return this.projectDir;
+	}
 }
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
index 5f14022ad8..9db218efb5 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
@@ -50,6 +50,7 @@ void formattingUsingConfigFile(String fileType) throws Exception {
 			final FormatterStep formatterStep = PrettierFormatterStep.create(
 					PrettierFormatterStep.defaultDevDependencies(),
 					TestProvisioner.mavenCentral(),
+					projectDir(),
 					buildDir(),
 					npmPathResolver(),
 					new PrettierConfig(prettierRc, null));
@@ -74,6 +75,7 @@ void parserInferenceBasedOnExplicitFilepathIsWorking() throws Exception {
 			final FormatterStep formatterStep = PrettierFormatterStep.create(
 					PrettierFormatterStep.defaultDevDependencies(),
 					TestProvisioner.mavenCentral(),
+					projectDir(),
 					buildDir(),
 					npmPathResolver(),
 					new PrettierConfig(null, ImmutableMap.of("filepath", "anyname.json"))); // should select parser based on this name
@@ -93,6 +95,7 @@ void parserInferenceBasedOnFilenameIsWorking() throws Exception {
 			final FormatterStep formatterStep = PrettierFormatterStep.create(
 					PrettierFormatterStep.defaultDevDependencies(),
 					TestProvisioner.mavenCentral(),
+					projectDir(),
 					buildDir(),
 					npmPathResolver(),
 					new PrettierConfig(null, Collections.emptyMap()));
@@ -107,6 +110,7 @@ void verifyPrettierErrorMessageIsRelayed() throws Exception {
 			FormatterStep formatterStep = PrettierFormatterStep.create(
 					PrettierFormatterStep.defaultDevDependenciesWithPrettier("2.0.5"),
 					TestProvisioner.mavenCentral(),
+					projectDir(),
 					buildDir(),
 					npmPathResolver(),
 					new PrettierConfig(null, ImmutableMap.of("parser", "postcss")));
@@ -131,6 +135,7 @@ void runFormatTest(PrettierConfig config, String cleanFileNameSuffix) throws Exc
 			final FormatterStep formatterStep = PrettierFormatterStep.create(
 					PrettierFormatterStep.defaultDevDependencies(),
 					TestProvisioner.mavenCentral(),
+					projectDir(),
 					buildDir(),
 					npmPathResolver(),
 					config); // should select parser based on this name
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/TsFmtFormatterStepTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/TsFmtFormatterStepTest.java
index 2812601726..d06b902b83 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/TsFmtFormatterStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/TsFmtFormatterStepTest.java
@@ -57,6 +57,7 @@ void formattingUsingConfigFile(String formattingConfigFile) throws Exception {
 			final FormatterStep formatterStep = TsFmtFormatterStep.create(
 					TsFmtFormatterStep.defaultDevDependencies(),
 					TestProvisioner.mavenCentral(),
+					projectDir(),
 					buildDir(),
 					npmPathResolver(),
 					TypedTsFmtConfigFile.named(configFileNameWithoutExtension, configFile),
@@ -79,6 +80,7 @@ void formattingUsingInlineConfigWorks() throws Exception {
 			final FormatterStep formatterStep = TsFmtFormatterStep.create(
 					TsFmtFormatterStep.defaultDevDependencies(),
 					TestProvisioner.mavenCentral(),
+					projectDir(),
 					buildDir(),
 					npmPathResolver(),
 					null,

From a2a5502b2ea696968c036dc89e21dedc95dd8633 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Thu, 15 Dec 2022 20:11:33 +0100
Subject: [PATCH 0447/2068] eslint: reduce required options

---
 .../resources/com/diffplug/spotless/npm/eslint-serve.js    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/src/main/resources/com/diffplug/spotless/npm/eslint-serve.js b/lib/src/main/resources/com/diffplug/spotless/npm/eslint-serve.js
index 2804eb86dd..3c10b048c1 100644
--- a/lib/src/main/resources/com/diffplug/spotless/npm/eslint-serve.js
+++ b/lib/src/main/resources/com/diffplug/spotless/npm/eslint-serve.js
@@ -23,7 +23,6 @@ app.post("/eslint/format", async (req, res) => {
 		const ESLintOptions = {
 			fix: true,
 			useEslintrc: false, // would result in (gradle) cache issues
-			resolvePluginsRelativeTo: format_data.node_modules_dir
 		};
 
 		if (format_data.ts_config_root_dir) {
@@ -42,15 +41,17 @@ app.post("/eslint/format", async (req, res) => {
 			ESLintOptions.overrideConfig = ESLintOverrideConfig;
 		}
 
+		console.log("using options: " + JSON.stringify(ESLintOptions));
+		console.log("format input: ", format_data.file_content);
+
 		const eslint = new ESLint(ESLintOptions);
 
 
-		console.log("using options: " + JSON.stringify(ESLintOptions));
-		console.log("format input", format_data.file_content);
 		const lintTextOptions = {
 			filePath: filePath,
 		}
 		console.log("lintTextOptions", lintTextOptions);
+
 		// LintResult[] // https://eslint.org/docs/latest/developer-guide/nodejs-api#-lintresult-type
 		const results = await eslint.lintText(format_data.file_content, lintTextOptions);
 		if (results.length !== 1) {

From 35b2b7ced394c1bb5c512b47edd34604e451726d Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Fri, 16 Dec 2022 06:06:07 +0100
Subject: [PATCH 0448/2068] eslint: remove unneeded configuration

---
 .../diffplug/spotless/npm/EslintFormatterStep.java  |  2 --
 .../diffplug/spotless/npm/EslintRestService.java    |  2 +-
 .../spotless/npm/EslintFormatterStepTest.java       | 13 ++++++++-----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
index 49bde50945..55261350b3 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
@@ -213,8 +213,6 @@ private void setConfigToCallOptions(Map<FormatOption, Object> eslintCallOptions)
 			if (eslintConfig.getEslintConfigJs() != null) {
 				eslintCallOptions.put(FormatOption.ESLINT_OVERRIDE_CONFIG, eslintConfig.getEslintConfigJs());
 			}
-			eslintCallOptions.put(FormatOption.NODE_MODULES_DIR, nodeModulesDir.getAbsolutePath());
-
 			if (eslintConfig instanceof EslintTypescriptConfig) {
 				// if we are a ts config, see if we need to use specific paths or use default projectDir
 				File tsConfigFilePath = ((EslintTypescriptConfig) eslintConfig).getTypescriptConfigPath();
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintRestService.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintRestService.java
index d3a01621f1..198ee5389c 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/EslintRestService.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintRestService.java
@@ -35,7 +35,7 @@ public String format(String fileContent, Map<FormatOption, Object> formatOptions
 	}
 
 	enum FormatOption {
-		ESLINT_OVERRIDE_CONFIG("eslint_override_config"), ESLINT_OVERRIDE_CONFIG_FILE("eslint_override_config_file"), FILE_PATH("file_path"), NODE_MODULES_DIR("node_modules_dir"), TS_CONFIG_ROOT_DIR("ts_config_root_dir");
+		ESLINT_OVERRIDE_CONFIG("eslint_override_config"), ESLINT_OVERRIDE_CONFIG_FILE("eslint_override_config_file"), FILE_PATH("file_path"), TS_CONFIG_ROOT_DIR("ts_config_root_dir");
 
 		private final String backendName;
 
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
index afe463c1aa..45787e4217 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
@@ -23,6 +23,7 @@
 import com.diffplug.spotless.tag.NpmTest;
 
 import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
@@ -33,6 +34,12 @@
 @NpmTest
 class EslintFormatterStepTest {
 
+	private final Map<String, String> combine(Map<String, String> m1, Map<String, String> m2) {
+		Map<String, String> combined = new TreeMap<>(m1);
+		combined.putAll(m2);
+		return combined;
+	}
+
 	@NpmTest
 	@Nested
 	class EslintTypescriptFormattingStepTest extends NpmFormatterStepCommonTests {
@@ -43,11 +50,7 @@ class EslintTypescriptFormattingStepTest extends NpmFormatterStepCommonTests {
 				"standard_rules_xo", combine(EslintFormatterStep.defaultDevDependenciesForTypescript(), EslintFormatterStep.PopularStyleGuide.XO_TYPESCRIPT.devDependencies())
 				);
 
-		private final Map<String, String> combine(Map<String, String> m1, Map<String, String> m2) {
-			Map<String, String> combined = new TreeMap<>(m1);
-			combined.putAll(m2);
-			return combined;
-		}
+
 
 		@ParameterizedTest(name = "{index}: eslint can be applied using ruleset {0}")
 		@ValueSource(strings = {"custom_rules", "standard_rules_standard_with_typescript", "standard_rules_xo"})

From 016dd3adc08cfb92ef37bccf2ea59d7c48c4edcd Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Fri, 16 Dec 2022 06:06:51 +0100
Subject: [PATCH 0449/2068] eslint: test supplying inline config

---
 .../spotless/npm/EslintFormatterStep.java     |   3 +
 .../com/diffplug/spotless/npm/eslint-serve.js |   2 +-
 .../spotless/npm/EslintFormatterStepTest.java | 161 ++++++------------
 3 files changed, 52 insertions(+), 114 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
index 55261350b3..91d8ef62a5 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
@@ -146,6 +146,9 @@ private static class State extends NpmFormatterStepStateBase implements Serializ
 		}
 
 		private EslintConfig localCopyFiles(EslintConfig orig) {
+			if (orig.getEslintConfigPath() == null) {
+				return orig;
+			}
 			// If any config files are provided, we need to make sure they are at the same location as the node modules
 			// as eslint will try to resolve plugin/config names relatively to the config file location and some
 			// eslint configs contain relative paths to additional config files (such as tsconfig.json e.g.)
diff --git a/lib/src/main/resources/com/diffplug/spotless/npm/eslint-serve.js b/lib/src/main/resources/com/diffplug/spotless/npm/eslint-serve.js
index 3c10b048c1..b9f3207d5f 100644
--- a/lib/src/main/resources/com/diffplug/spotless/npm/eslint-serve.js
+++ b/lib/src/main/resources/com/diffplug/spotless/npm/eslint-serve.js
@@ -38,7 +38,7 @@ app.post("/eslint/format", async (req, res) => {
 			ESLintOptions.overrideConfigFile = ESLintOverrideConfigFile;
 		}
 		if (ESLintOverrideConfig) {
-			ESLintOptions.overrideConfig = ESLintOverrideConfig;
+			eval("ESLintOptions.overrideConfig = " + ESLintOverrideConfig);
 		}
 
 		console.log("using options: " + JSON.stringify(ESLintOptions));
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
index 45787e4217..fdf17caae7 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
@@ -85,129 +85,64 @@ void formattingUsingRulesetsFile(String ruleSetName) throws Exception {
 			}
 		}
 	}
-/*
-	@NpmTest
-	@Nested
-	class PrettierFormattingOfFileTypesIsWorking extends NpmFormatterStepCommonTests {
-
-		@ParameterizedTest(name = "{index}: prettier can be applied to {0}")
-		@ValueSource(strings = {"html", "typescript", "json", "javascript-es5", "javascript-es6", "css", "scss", "markdown", "yaml"})
-		void formattingUsingConfigFile(String fileType) throws Exception {
-			String filedir = "npm/prettier/filetypes/" + fileType + "/";
-
-			final File prettierRc = createTestFile(filedir + ".prettierrc.yml");
-			final String dirtyFile = filedir + fileType + ".dirty";
-			final String cleanFile = filedir + fileType + ".clean";
-
-			final FormatterStep formatterStep = PrettierFormatterStep.create(
-					PrettierFormatterStep.defaultDevDependencies(),
-					TestProvisioner.mavenCentral(),
-					buildDir(),
-					npmPathResolver(),
-					new PrettierConfig(prettierRc, null));
-
-			try (StepHarness stepHarness = StepHarness.forStep(formatterStep)) {
-				stepHarness.testResource(dirtyFile, cleanFile);
-			}
-		}
-	}
 
 	@NpmTest
 	@Nested
-	class SpecificPrettierFormatterStepTests extends NpmFormatterStepCommonTests {
+	class EslintInlineConfigFormattingStepTest extends NpmFormatterStepCommonTests {
 
-		@Test
-		void parserInferenceBasedOnExplicitFilepathIsWorking() throws Exception {
-			String filedir = "npm/prettier/filetypes/json/";
-
-			final String dirtyFile = filedir + "json.dirty";
-			final String cleanFile = filedir + "json.clean";
-
-			final FormatterStep formatterStep = PrettierFormatterStep.create(
-					PrettierFormatterStep.defaultDevDependencies(),
-					TestProvisioner.mavenCentral(),
-					buildDir(),
-					npmPathResolver(),
-					new PrettierConfig(null, ImmutableMap.of("filepath", "anyname.json"))); // should select parser based on this name
-
-			try (StepHarness stepHarness = StepHarness.forStep(formatterStep)) {
-				stepHarness.testResource(dirtyFile, cleanFile);
-			}
-		}
 
 		@Test
-		void parserInferenceBasedOnFilenameIsWorking() throws Exception {
-			String filedir = "npm/prettier/filename/";
-
-			final String dirtyFile = filedir + "dirty.json";
-			final String cleanFile = filedir + "clean.json";
+		void formattingUsingInlineXoConfig() throws Exception {
+			String filedir = "npm/eslint/typescript/standard_rules_xo/";
+
+			String testDir = "formatting_ruleset_xo_inline_config/";
+
+
+			final String esLintConfig = String.join("\n",
+				"{",
+				"	env: {",
+				"		browser: true,",
+				"		es2021: true,",
+				"	},",
+				"	extends: 'xo/browser',",
+				"	overrides: [",
+				"		{",
+				"			extends: [",
+				"				'xo-typescript',",
+				"			],",
+				"			files: [",
+				"				'*.ts',",
+				"				'*.tsx',",
+				"			],",
+				"		},",
+				"	],",
+				"	parser: '@typescript-eslint/parser',",
+				"	parserOptions: {",
+				"		ecmaVersion: 'latest',",
+				"		sourceType: 'module',",
+				"		project: './tsconfig.json',",
+				"	},",
+				"	rules: {",
+				"	},",
+				"}"
+			);
+
+			File tsconfigFile = setFile(testDir + "tsconfig.json").toResource(filedir + "tsconfig.json");
+			final String dirtyFile = filedir + "typescript.dirty";
+			File dirtyFileFile = setFile(testDir + "test.ts").toResource(dirtyFile);
+			final String cleanFile = filedir + "typescript.clean";
 
-			final FormatterStep formatterStep = PrettierFormatterStep.create(
-					PrettierFormatterStep.defaultDevDependencies(),
-					TestProvisioner.mavenCentral(),
-					buildDir(),
-					npmPathResolver(),
-					new PrettierConfig(null, Collections.emptyMap()));
+			final FormatterStep formatterStep = EslintFormatterStep.create(
+				combine(EslintFormatterStep.PopularStyleGuide.XO_TYPESCRIPT.devDependencies(), EslintFormatterStep.defaultDevDependenciesForTypescript()),
+				TestProvisioner.mavenCentral(),
+				projectDir(),
+				buildDir(),
+				npmPathResolver(),
+				new EslintTypescriptConfig(null, esLintConfig, tsconfigFile));
 
 			try (StepHarnessWithFile stepHarness = StepHarnessWithFile.forStep(formatterStep)) {
-				stepHarness.testResource(new File("test.json"), dirtyFile, cleanFile);
-			}
-		}
-
-		@Test
-		void verifyPrettierErrorMessageIsRelayed() throws Exception {
-			FormatterStep formatterStep = PrettierFormatterStep.create(
-					PrettierFormatterStep.defaultDevDependenciesWithPrettier("2.0.5"),
-					TestProvisioner.mavenCentral(),
-					buildDir(),
-					npmPathResolver(),
-					new PrettierConfig(null, ImmutableMap.of("parser", "postcss")));
-			try (StepHarness stepHarness = StepHarness.forStep(formatterStep)) {
-				stepHarness.testResourceException("npm/prettier/filetypes/scss/scss.dirty", exception -> {
-					exception.hasMessageContaining("HTTP 501");
-					exception.hasMessageContaining("Couldn't resolve parser \"postcss\"");
-				});
+				stepHarness.testResource(dirtyFileFile, dirtyFile, cleanFile);
 			}
 		}
 	}
-
-	@NpmTest
-	@Nested
-	class PrettierFormattingOptionsAreWorking extends NpmFormatterStepCommonTests {
-
-		private static final String FILEDIR = "npm/prettier/config/";
-
-		void runFormatTest(PrettierConfig config, String cleanFileNameSuffix) throws Exception {
-
-			final String dirtyFile = FILEDIR + "typescript.dirty";
-			final String cleanFile = FILEDIR + "typescript." + cleanFileNameSuffix + ".clean";
-
-			final FormatterStep formatterStep = PrettierFormatterStep.create(
-					PrettierFormatterStep.defaultDevDependencies(),
-					TestProvisioner.mavenCentral(),
-					buildDir(),
-					npmPathResolver(),
-					config); // should select parser based on this name
-
-			try (StepHarness stepHarness = StepHarness.forStep(formatterStep)) {
-				stepHarness.testResource(dirtyFile, cleanFile);
-			}
-		}
-
-		@Test
-		void defaultsAreApplied() throws Exception {
-			runFormatTest(new PrettierConfig(null, ImmutableMap.of("parser", "typescript")), "defaults");
-		}
-
-		@Test
-		void configFileOptionsAreApplied() throws Exception {
-			runFormatTest(new PrettierConfig(createTestFile(FILEDIR + ".prettierrc.yml"), null), "configfile");
-		}
-
-		@Test
-		void configFileOptionsCanBeOverriden() throws Exception {
-			runFormatTest(new PrettierConfig(createTestFile(FILEDIR + ".prettierrc.yml"), ImmutableMap.of("printWidth", 300)), "override");
-		}
-
-	}*/
 }

From a9f89d8e51e8c969a40f1bf78b668852ffa69ddc Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Fri, 16 Dec 2022 19:57:48 +0100
Subject: [PATCH 0450/2068] eslint: adding javascript formatting (part 1)

---
 .../spotless/npm/EslintFormatterStep.java     | 40 ++++++++++++-
 .../spotless/TypescriptExtensionTest.java     | 16 +++---
 .../javascript/custom_rules/.eslintrc.js      | 31 ++++++++++
 .../custom_rules/javascript-es6.clean         | 21 +++++++
 .../custom_rules/javascript-es6.dirty         | 21 +++++++
 .../javascript/styleguide/airbnb/.eslintrc.js | 15 +++++
 .../styleguide/airbnb/javascript-es6.clean    | 17 ++++++
 .../styleguide/airbnb/javascript-es6.dirty    | 21 +++++++
 .../javascript/styleguide/google/.eslintrc.js | 15 +++++
 .../styleguide/google/javascript-es6.clean    | 25 +++++++++
 .../styleguide/google/javascript-es6.dirty    | 21 +++++++
 .../styleguide/standard/.eslintrc.js          | 15 +++++
 .../styleguide/standard/javascript-es6.clean  | 19 +++++++
 .../styleguide/standard/javascript-es6.dirty  | 21 +++++++
 .../javascript/styleguide/xo/.eslintrc.js     | 15 +++++
 .../styleguide/xo/javascript-es6.clean        | 20 +++++++
 .../styleguide/xo/javascript-es6.dirty        | 21 +++++++
 .../standard_with_typescript}/.eslintrc.js    |  0
 .../standard_with_typescript}/tsconfig.json   |  0
 .../typescript.clean                          |  0
 .../typescript.dirty                          |  0
 .../xo}/.eslintrc.js                          |  0
 .../xo}/tsconfig.json                         |  0
 .../xo}/typescript.clean                      |  0
 .../xo}/typescript.dirty                      |  0
 .../spotless/npm/EslintFormatterStepTest.java | 56 ++++++++++++++++---
 26 files changed, 393 insertions(+), 17 deletions(-)
 create mode 100644 testlib/src/main/resources/npm/eslint/javascript/custom_rules/.eslintrc.js
 create mode 100644 testlib/src/main/resources/npm/eslint/javascript/custom_rules/javascript-es6.clean
 create mode 100644 testlib/src/main/resources/npm/eslint/javascript/custom_rules/javascript-es6.dirty
 create mode 100644 testlib/src/main/resources/npm/eslint/javascript/styleguide/airbnb/.eslintrc.js
 create mode 100644 testlib/src/main/resources/npm/eslint/javascript/styleguide/airbnb/javascript-es6.clean
 create mode 100644 testlib/src/main/resources/npm/eslint/javascript/styleguide/airbnb/javascript-es6.dirty
 create mode 100644 testlib/src/main/resources/npm/eslint/javascript/styleguide/google/.eslintrc.js
 create mode 100644 testlib/src/main/resources/npm/eslint/javascript/styleguide/google/javascript-es6.clean
 create mode 100644 testlib/src/main/resources/npm/eslint/javascript/styleguide/google/javascript-es6.dirty
 create mode 100644 testlib/src/main/resources/npm/eslint/javascript/styleguide/standard/.eslintrc.js
 create mode 100644 testlib/src/main/resources/npm/eslint/javascript/styleguide/standard/javascript-es6.clean
 create mode 100644 testlib/src/main/resources/npm/eslint/javascript/styleguide/standard/javascript-es6.dirty
 create mode 100644 testlib/src/main/resources/npm/eslint/javascript/styleguide/xo/.eslintrc.js
 create mode 100644 testlib/src/main/resources/npm/eslint/javascript/styleguide/xo/javascript-es6.clean
 create mode 100644 testlib/src/main/resources/npm/eslint/javascript/styleguide/xo/javascript-es6.dirty
 rename testlib/src/main/resources/npm/eslint/typescript/{standard_rules_standard_with_typescript => styleguide/standard_with_typescript}/.eslintrc.js (100%)
 rename testlib/src/main/resources/npm/eslint/typescript/{standard_rules_standard_with_typescript => styleguide/standard_with_typescript}/tsconfig.json (100%)
 rename testlib/src/main/resources/npm/eslint/typescript/{standard_rules_standard_with_typescript => styleguide/standard_with_typescript}/typescript.clean (100%)
 rename testlib/src/main/resources/npm/eslint/typescript/{standard_rules_standard_with_typescript => styleguide/standard_with_typescript}/typescript.dirty (100%)
 rename testlib/src/main/resources/npm/eslint/typescript/{standard_rules_xo => styleguide/xo}/.eslintrc.js (100%)
 rename testlib/src/main/resources/npm/eslint/typescript/{standard_rules_xo => styleguide/xo}/tsconfig.json (100%)
 rename testlib/src/main/resources/npm/eslint/typescript/{standard_rules_xo => styleguide/xo}/typescript.clean (100%)
 rename testlib/src/main/resources/npm/eslint/typescript/{standard_rules_xo => styleguide/xo}/typescript.dirty (100%)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
index 91d8ef62a5..14bc99a243 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
@@ -48,7 +48,7 @@ public class EslintFormatterStep {
 	public static final String DEFAULT_ESLINT_VERSION = "8.28.0";
 
 	public enum PopularStyleGuide {
-		STANDARD_WITH_TYPESCRIPT("standard-with-typescript") {
+		TS_STANDARD_WITH_TYPESCRIPT("standard-with-typescript") {
 			@Override
 			public Map<String, String> devDependencies() {
 				Map<String, String> dependencies = new LinkedHashMap<>();
@@ -60,7 +60,7 @@ public Map<String, String> devDependencies() {
 				return dependencies;
 			}
 		},
-		XO_TYPESCRIPT("xo-typescript") {
+		TS_XO_TYPESCRIPT("xo-typescript") {
 			@Override
 			public Map<String, String> devDependencies() {
 				Map<String, String> dependencies = new LinkedHashMap<>();
@@ -69,6 +69,42 @@ public Map<String, String> devDependencies() {
 				dependencies.put("typescript", "4.9.3");
 				return dependencies;
 			}
+		},
+		JS_AIRBNB("airbnb") {
+			@Override
+			public Map<String, String> devDependencies() {
+				Map<String, String> dependencies = new LinkedHashMap<>();
+				dependencies.put("eslint-config-airbnb-base", "15.0.0");
+				dependencies.put("eslint-plugin-import", "2.26.0");
+				return dependencies;
+			}
+		},
+		JS_GOOGLE("google") {
+			@Override
+			public Map<String, String> devDependencies() {
+				Map<String, String> dependencies = new LinkedHashMap<>();
+				dependencies.put("eslint-config-google", "0.14.0");
+				return dependencies;
+			}
+		},
+		JS_STANDARD("standard") {
+			@Override
+			public Map<String, String> devDependencies() {
+				Map<String, String> dependencies = new LinkedHashMap<>();
+				dependencies.put("eslint-config-standard", "17.0.0");
+				dependencies.put("eslint-plugin-import", "2.26.0");
+				dependencies.put("eslint-plugin-n", "15.6.0");
+				dependencies.put("eslint-plugin-promise", "6.1.1");
+				return dependencies;
+			}
+		},
+		JS_XO("xo") {
+			@Override
+			public Map<String, String> devDependencies() {
+				Map<String, String> dependencies = new LinkedHashMap<>();
+				dependencies.put("eslint-config-xo", "0.43.1");
+				return dependencies;
+			}
 		};
 
 		private final String popularStyleGuideName;
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TypescriptExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TypescriptExtensionTest.java
index 0c3d10c89f..7d715998f6 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TypescriptExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TypescriptExtensionTest.java
@@ -163,8 +163,8 @@ void useEslint() throws IOException {
 
 	@Test
 	void useXoStandardRules() throws IOException {
-		setFile(".eslintrc.js").toResource("npm/eslint/typescript/standard_rules_xo/.eslintrc.js");
-		setFile("tsconfig.json").toResource("npm/eslint/typescript/standard_rules_xo/tsconfig.json");
+		setFile(".eslintrc.js").toResource("npm/eslint/typescript/styleguide/xo/.eslintrc.js");
+		setFile("tsconfig.json").toResource("npm/eslint/typescript/styleguide/xo/tsconfig.json");
 		setFile("build.gradle").toLines(
 				"plugins {",
 				"    id 'com.diffplug.spotless'",
@@ -176,15 +176,15 @@ void useXoStandardRules() throws IOException {
 				"        eslint().styleGuide('xo-typescript').configFile('.eslintrc.js')",
 				"    }",
 				"}");
-		setFile("test.ts").toResource("npm/eslint/typescript/standard_rules_xo/typescript.dirty");
+		setFile("test.ts").toResource("npm/eslint/typescript/styleguide/xo/typescript.dirty");
 		gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
-		assertFile("test.ts").sameAsResource("npm/eslint/typescript/standard_rules_xo/typescript.clean");
+		assertFile("test.ts").sameAsResource("npm/eslint/typescript/styleguide/xo/typescript.clean");
 	}
 
 	@Test
 	void useStandardWithTypescriptRules() throws IOException {
-		setFile(".eslintrc.js").toResource("npm/eslint/typescript/standard_rules_standard_with_typescript/.eslintrc.js");
-		setFile("tsconfig.json").toResource("npm/eslint/typescript/standard_rules_standard_with_typescript/tsconfig.json");
+		setFile(".eslintrc.js").toResource("npm/eslint/typescript/styleguide/standard_with_typescript/.eslintrc.js");
+		setFile("tsconfig.json").toResource("npm/eslint/typescript/styleguide/standard_with_typescript/tsconfig.json");
 		setFile("build.gradle").toLines(
 				"plugins {",
 				"    id 'com.diffplug.spotless'",
@@ -196,8 +196,8 @@ void useStandardWithTypescriptRules() throws IOException {
 				"        eslint().styleGuide('standard-with-typescript').configFile('.eslintrc.js')",
 				"    }",
 				"}");
-		setFile("test.ts").toResource("npm/eslint/typescript/standard_rules_standard_with_typescript/typescript.dirty");
+		setFile("test.ts").toResource("npm/eslint/typescript/styleguide/standard_with_typescript/typescript.dirty");
 		gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
-		assertFile("test.ts").sameAsResource("npm/eslint/typescript/standard_rules_standard_with_typescript/typescript.clean");
+		assertFile("test.ts").sameAsResource("npm/eslint/typescript/styleguide/standard_with_typescript/typescript.clean");
 	}
 }
diff --git a/testlib/src/main/resources/npm/eslint/javascript/custom_rules/.eslintrc.js b/testlib/src/main/resources/npm/eslint/javascript/custom_rules/.eslintrc.js
new file mode 100644
index 0000000000..60c5c19f5b
--- /dev/null
+++ b/testlib/src/main/resources/npm/eslint/javascript/custom_rules/.eslintrc.js
@@ -0,0 +1,31 @@
+module.exports = {
+	"env": {
+		"browser": true,
+		"es2021": true
+	},
+	"extends": "eslint:recommended",
+	"overrides": [
+	],
+	"parserOptions": {
+		"ecmaVersion": "latest",
+		"sourceType": "module"
+	},
+	"rules": {
+		"indent": [
+			"error",
+			2
+		],
+		"linebreak-style": [
+			"error",
+			"unix"
+		],
+		"quotes": [
+			"error",
+			"double"
+		],
+		"semi": [
+			"error",
+			"always"
+		]
+	}
+};
diff --git a/testlib/src/main/resources/npm/eslint/javascript/custom_rules/javascript-es6.clean b/testlib/src/main/resources/npm/eslint/javascript/custom_rules/javascript-es6.clean
new file mode 100644
index 0000000000..8bbeb50cf3
--- /dev/null
+++ b/testlib/src/main/resources/npm/eslint/javascript/custom_rules/javascript-es6.clean
@@ -0,0 +1,21 @@
+var numbers=[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,
+];
+
+const p = {
+  first: "Peter",
+  last : "Pan",
+  get fullName() { return this.first + " " + this.last;  }
+};
+
+const str = "Hello, world!"
+;
+
+var str2=str.charAt(3)+str[0];
+
+var multilinestr = "Hello \
+World"
+;
+
+function test (a,     b = "world") { let combined =a+   b; return combined;}
+
+test  ("Hello");
diff --git a/testlib/src/main/resources/npm/eslint/javascript/custom_rules/javascript-es6.dirty b/testlib/src/main/resources/npm/eslint/javascript/custom_rules/javascript-es6.dirty
new file mode 100644
index 0000000000..36a514cc30
--- /dev/null
+++ b/testlib/src/main/resources/npm/eslint/javascript/custom_rules/javascript-es6.dirty
@@ -0,0 +1,21 @@
+var numbers=[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,
+];
+
+const p = {
+    first: 'Peter',
+    last : 'Pan',
+    get fullName() { return this.first + ' ' + this.last;  }
+};
+
+const str = 'Hello, world!'
+;
+
+var str2=str.charAt(3)+str[0];
+
+var multilinestr = 'Hello \
+World'
+;
+
+function test (a,     b = 'world') { let combined =a+   b; return combined};
+
+test  ('Hello');
diff --git a/testlib/src/main/resources/npm/eslint/javascript/styleguide/airbnb/.eslintrc.js b/testlib/src/main/resources/npm/eslint/javascript/styleguide/airbnb/.eslintrc.js
new file mode 100644
index 0000000000..d93248ee88
--- /dev/null
+++ b/testlib/src/main/resources/npm/eslint/javascript/styleguide/airbnb/.eslintrc.js
@@ -0,0 +1,15 @@
+module.exports = {
+	env: {
+		browser: true,
+		es2021: true,
+	},
+	extends: 'airbnb-base',
+	overrides: [
+	],
+	parserOptions: {
+		ecmaVersion: 'latest',
+		sourceType: 'module',
+	},
+	rules: {
+	},
+};
diff --git a/testlib/src/main/resources/npm/eslint/javascript/styleguide/airbnb/javascript-es6.clean b/testlib/src/main/resources/npm/eslint/javascript/styleguide/airbnb/javascript-es6.clean
new file mode 100644
index 0000000000..c8dda3d33f
--- /dev/null
+++ b/testlib/src/main/resources/npm/eslint/javascript/styleguide/airbnb/javascript-es6.clean
@@ -0,0 +1,17 @@
+const numbers = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+];
+
+const p = {
+  first: 'Peter',
+  last: 'Pan',
+  get fullName() { return `${this.first} ${this.last}`; },
+};
+
+const str = 'Hello, world!';
+const str2 = str.charAt(3) + str[0];
+
+const multilinestr = 'Hello \
+World';
+function test(a, b = 'world') { const combined = a + b; return combined; }
+
+test('Hello');
diff --git a/testlib/src/main/resources/npm/eslint/javascript/styleguide/airbnb/javascript-es6.dirty b/testlib/src/main/resources/npm/eslint/javascript/styleguide/airbnb/javascript-es6.dirty
new file mode 100644
index 0000000000..08ebafc1a2
--- /dev/null
+++ b/testlib/src/main/resources/npm/eslint/javascript/styleguide/airbnb/javascript-es6.dirty
@@ -0,0 +1,21 @@
+var numbers=[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,
+];
+
+const p = {
+    first: "Peter",
+    last : "Pan",
+    get fullName() { return this.first + " " + this.last;  }
+};
+
+const str = "Hello, world!"
+;
+
+var str2=str.charAt(3)+str[0];
+
+var multilinestr = "Hello \
+World"
+;
+
+function test (a,     b = "world") { let combined =a+   b; return combined};
+
+test  ("Hello");
diff --git a/testlib/src/main/resources/npm/eslint/javascript/styleguide/google/.eslintrc.js b/testlib/src/main/resources/npm/eslint/javascript/styleguide/google/.eslintrc.js
new file mode 100644
index 0000000000..71b0c47016
--- /dev/null
+++ b/testlib/src/main/resources/npm/eslint/javascript/styleguide/google/.eslintrc.js
@@ -0,0 +1,15 @@
+module.exports = {
+	'env': {
+		'browser': true,
+		'es2021': true,
+	},
+	'extends': 'google',
+	'overrides': [
+	],
+	'parserOptions': {
+		'ecmaVersion': 'latest',
+		'sourceType': 'module',
+	},
+	'rules': {
+	},
+};
diff --git a/testlib/src/main/resources/npm/eslint/javascript/styleguide/google/javascript-es6.clean b/testlib/src/main/resources/npm/eslint/javascript/styleguide/google/javascript-es6.clean
new file mode 100644
index 0000000000..f960a984c2
--- /dev/null
+++ b/testlib/src/main/resources/npm/eslint/javascript/styleguide/google/javascript-es6.clean
@@ -0,0 +1,25 @@
+const numbers=[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+];
+
+const p = {
+  first: 'Peter',
+  last: 'Pan',
+  get fullName() {
+    return this.first + ' ' + this.last;
+  },
+};
+
+const str = 'Hello, world!'
+;
+
+const str2=str.charAt(3)+str[0];
+
+const multilinestr = 'Hello \
+World'
+;
+
+function test(a, b = 'world') {
+  const combined =a+ b; return combined;
+};
+
+test('Hello');
diff --git a/testlib/src/main/resources/npm/eslint/javascript/styleguide/google/javascript-es6.dirty b/testlib/src/main/resources/npm/eslint/javascript/styleguide/google/javascript-es6.dirty
new file mode 100644
index 0000000000..08ebafc1a2
--- /dev/null
+++ b/testlib/src/main/resources/npm/eslint/javascript/styleguide/google/javascript-es6.dirty
@@ -0,0 +1,21 @@
+var numbers=[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,
+];
+
+const p = {
+    first: "Peter",
+    last : "Pan",
+    get fullName() { return this.first + " " + this.last;  }
+};
+
+const str = "Hello, world!"
+;
+
+var str2=str.charAt(3)+str[0];
+
+var multilinestr = "Hello \
+World"
+;
+
+function test (a,     b = "world") { let combined =a+   b; return combined};
+
+test  ("Hello");
diff --git a/testlib/src/main/resources/npm/eslint/javascript/styleguide/standard/.eslintrc.js b/testlib/src/main/resources/npm/eslint/javascript/styleguide/standard/.eslintrc.js
new file mode 100644
index 0000000000..cbed25aab9
--- /dev/null
+++ b/testlib/src/main/resources/npm/eslint/javascript/styleguide/standard/.eslintrc.js
@@ -0,0 +1,15 @@
+module.exports = {
+	env: {
+		browser: true,
+		es2021: true
+	},
+	extends: 'standard',
+	overrides: [
+	],
+	parserOptions: {
+		ecmaVersion: 'latest',
+		sourceType: 'module'
+	},
+	rules: {
+	}
+}
diff --git a/testlib/src/main/resources/npm/eslint/javascript/styleguide/standard/javascript-es6.clean b/testlib/src/main/resources/npm/eslint/javascript/styleguide/standard/javascript-es6.clean
new file mode 100644
index 0000000000..757d330a7f
--- /dev/null
+++ b/testlib/src/main/resources/npm/eslint/javascript/styleguide/standard/javascript-es6.clean
@@ -0,0 +1,19 @@
+const numbers = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20
+]
+
+const p = {
+  first: 'Peter',
+  last: 'Pan',
+  get fullName () { return this.first + ' ' + this.last }
+}
+
+const str = 'Hello, world!'
+
+const str2 = str.charAt(3) + str[0]
+
+const multilinestr = 'Hello \
+World'
+
+function test (a, b = 'world') { const combined = a + b; return combined };
+
+test('Hello')
diff --git a/testlib/src/main/resources/npm/eslint/javascript/styleguide/standard/javascript-es6.dirty b/testlib/src/main/resources/npm/eslint/javascript/styleguide/standard/javascript-es6.dirty
new file mode 100644
index 0000000000..08ebafc1a2
--- /dev/null
+++ b/testlib/src/main/resources/npm/eslint/javascript/styleguide/standard/javascript-es6.dirty
@@ -0,0 +1,21 @@
+var numbers=[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,
+];
+
+const p = {
+    first: "Peter",
+    last : "Pan",
+    get fullName() { return this.first + " " + this.last;  }
+};
+
+const str = "Hello, world!"
+;
+
+var str2=str.charAt(3)+str[0];
+
+var multilinestr = "Hello \
+World"
+;
+
+function test (a,     b = "world") { let combined =a+   b; return combined};
+
+test  ("Hello");
diff --git a/testlib/src/main/resources/npm/eslint/javascript/styleguide/xo/.eslintrc.js b/testlib/src/main/resources/npm/eslint/javascript/styleguide/xo/.eslintrc.js
new file mode 100644
index 0000000000..844e843c41
--- /dev/null
+++ b/testlib/src/main/resources/npm/eslint/javascript/styleguide/xo/.eslintrc.js
@@ -0,0 +1,15 @@
+module.exports = {
+	env: {
+		browser: true,
+		es2021: true,
+	},
+	extends: 'xo',
+	overrides: [
+	],
+	parserOptions: {
+		ecmaVersion: 'latest',
+		sourceType: 'module',
+	},
+	rules: {
+	},
+};
diff --git a/testlib/src/main/resources/npm/eslint/javascript/styleguide/xo/javascript-es6.clean b/testlib/src/main/resources/npm/eslint/javascript/styleguide/xo/javascript-es6.clean
new file mode 100644
index 0000000000..3cd1bd0865
--- /dev/null
+++ b/testlib/src/main/resources/npm/eslint/javascript/styleguide/xo/javascript-es6.clean
@@ -0,0 +1,20 @@
+const numbers = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20];
+
+const p = {
+	first: 'Peter',
+	last: 'Pan',
+	get fullName() {
+		return this.first + ' ' + this.last;
+	},
+};
+
+const str = 'Hello, world!';
+const str2 = str.charAt(3) + str[0];
+
+const multilinestr = 'Hello \
+World';
+function test(a, b = 'world') {
+	const combined = a + b; return combined;
+}
+
+test('Hello');
diff --git a/testlib/src/main/resources/npm/eslint/javascript/styleguide/xo/javascript-es6.dirty b/testlib/src/main/resources/npm/eslint/javascript/styleguide/xo/javascript-es6.dirty
new file mode 100644
index 0000000000..08ebafc1a2
--- /dev/null
+++ b/testlib/src/main/resources/npm/eslint/javascript/styleguide/xo/javascript-es6.dirty
@@ -0,0 +1,21 @@
+var numbers=[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,
+];
+
+const p = {
+    first: "Peter",
+    last : "Pan",
+    get fullName() { return this.first + " " + this.last;  }
+};
+
+const str = "Hello, world!"
+;
+
+var str2=str.charAt(3)+str[0];
+
+var multilinestr = "Hello \
+World"
+;
+
+function test (a,     b = "world") { let combined =a+   b; return combined};
+
+test  ("Hello");
diff --git a/testlib/src/main/resources/npm/eslint/typescript/standard_rules_standard_with_typescript/.eslintrc.js b/testlib/src/main/resources/npm/eslint/typescript/styleguide/standard_with_typescript/.eslintrc.js
similarity index 100%
rename from testlib/src/main/resources/npm/eslint/typescript/standard_rules_standard_with_typescript/.eslintrc.js
rename to testlib/src/main/resources/npm/eslint/typescript/styleguide/standard_with_typescript/.eslintrc.js
diff --git a/testlib/src/main/resources/npm/eslint/typescript/standard_rules_standard_with_typescript/tsconfig.json b/testlib/src/main/resources/npm/eslint/typescript/styleguide/standard_with_typescript/tsconfig.json
similarity index 100%
rename from testlib/src/main/resources/npm/eslint/typescript/standard_rules_standard_with_typescript/tsconfig.json
rename to testlib/src/main/resources/npm/eslint/typescript/styleguide/standard_with_typescript/tsconfig.json
diff --git a/testlib/src/main/resources/npm/eslint/typescript/standard_rules_standard_with_typescript/typescript.clean b/testlib/src/main/resources/npm/eslint/typescript/styleguide/standard_with_typescript/typescript.clean
similarity index 100%
rename from testlib/src/main/resources/npm/eslint/typescript/standard_rules_standard_with_typescript/typescript.clean
rename to testlib/src/main/resources/npm/eslint/typescript/styleguide/standard_with_typescript/typescript.clean
diff --git a/testlib/src/main/resources/npm/eslint/typescript/standard_rules_standard_with_typescript/typescript.dirty b/testlib/src/main/resources/npm/eslint/typescript/styleguide/standard_with_typescript/typescript.dirty
similarity index 100%
rename from testlib/src/main/resources/npm/eslint/typescript/standard_rules_standard_with_typescript/typescript.dirty
rename to testlib/src/main/resources/npm/eslint/typescript/styleguide/standard_with_typescript/typescript.dirty
diff --git a/testlib/src/main/resources/npm/eslint/typescript/standard_rules_xo/.eslintrc.js b/testlib/src/main/resources/npm/eslint/typescript/styleguide/xo/.eslintrc.js
similarity index 100%
rename from testlib/src/main/resources/npm/eslint/typescript/standard_rules_xo/.eslintrc.js
rename to testlib/src/main/resources/npm/eslint/typescript/styleguide/xo/.eslintrc.js
diff --git a/testlib/src/main/resources/npm/eslint/typescript/standard_rules_xo/tsconfig.json b/testlib/src/main/resources/npm/eslint/typescript/styleguide/xo/tsconfig.json
similarity index 100%
rename from testlib/src/main/resources/npm/eslint/typescript/standard_rules_xo/tsconfig.json
rename to testlib/src/main/resources/npm/eslint/typescript/styleguide/xo/tsconfig.json
diff --git a/testlib/src/main/resources/npm/eslint/typescript/standard_rules_xo/typescript.clean b/testlib/src/main/resources/npm/eslint/typescript/styleguide/xo/typescript.clean
similarity index 100%
rename from testlib/src/main/resources/npm/eslint/typescript/standard_rules_xo/typescript.clean
rename to testlib/src/main/resources/npm/eslint/typescript/styleguide/xo/typescript.clean
diff --git a/testlib/src/main/resources/npm/eslint/typescript/standard_rules_xo/typescript.dirty b/testlib/src/main/resources/npm/eslint/typescript/styleguide/xo/typescript.dirty
similarity index 100%
rename from testlib/src/main/resources/npm/eslint/typescript/standard_rules_xo/typescript.dirty
rename to testlib/src/main/resources/npm/eslint/typescript/styleguide/xo/typescript.dirty
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
index fdf17caae7..3a8bfc7fd6 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
@@ -17,7 +17,6 @@
 
 import com.diffplug.common.collect.ImmutableMap;
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.StepHarness;
 import com.diffplug.spotless.StepHarnessWithFile;
 import com.diffplug.spotless.TestProvisioner;
 import com.diffplug.spotless.tag.NpmTest;
@@ -40,24 +39,67 @@ private final Map<String, String> combine(Map<String, String> m1, Map<String, St
 		return combined;
 	}
 
+	@NpmTest
+	@Nested
+	class EslintJavascriptFormattingStepTest extends NpmFormatterStepCommonTests {
+
+		private final Map<String, Map<String, String>> devDependenciesForRuleset = ImmutableMap.of(
+			"custom_rules", EslintFormatterStep.defaultDevDependenciesForTypescript(),
+			"styleguide/airbnb", combine(EslintFormatterStep.defaultDevDependencies(), EslintFormatterStep.PopularStyleGuide.JS_AIRBNB.devDependencies()),
+			"styleguide/google", combine(EslintFormatterStep.defaultDevDependencies(), EslintFormatterStep.PopularStyleGuide.JS_GOOGLE.devDependencies()),
+			"styleguide/standard", combine(EslintFormatterStep.defaultDevDependencies(), EslintFormatterStep.PopularStyleGuide.JS_STANDARD.devDependencies()),
+			"styleguide/xo", combine(EslintFormatterStep.defaultDevDependencies(), EslintFormatterStep.PopularStyleGuide.JS_XO.devDependencies())
+		);
+
+		@ParameterizedTest(name = "{index}: eslint can be applied using ruleset {0}")
+		@ValueSource(strings = {"custom_rules", "styleguide/airbnb", "styleguide/google", "styleguide/standard", "styleguide/xo"})
+		void formattingUsingRulesetsFile(String ruleSetName) throws Exception {
+			String filedir = "npm/eslint/javascript/" + ruleSetName + "/";
+
+			String testDir = "formatting_ruleset_" + ruleSetName.replace('/', '_') + "/";
+//			File testDirFile = newFolder(testDir);
+
+			final File eslintRc = createTestFile(filedir + ".eslintrc.js");
+//			final File eslintRc = setFile(buildDir().getPath() + "/.eslintrc.js").toResource(filedir + ".eslintrc.js");
+
+			final String dirtyFile = filedir + "javascript-es6.dirty";
+			File dirtyFileFile = setFile(testDir + "test.js").toResource(dirtyFile);
+			final String cleanFile = filedir + "javascript-es6.clean";
+
+			final FormatterStep formatterStep = EslintFormatterStep.create(
+				devDependenciesForRuleset.get(ruleSetName),
+				TestProvisioner.mavenCentral(),
+				projectDir(),
+				buildDir(),
+				npmPathResolver(),
+				new EslintConfig(eslintRc, null));
+
+			try (StepHarnessWithFile stepHarness = StepHarnessWithFile.forStep(formatterStep)) {
+				stepHarness.testResource(dirtyFileFile, dirtyFile, cleanFile);
+			}
+		}
+	}
+
+
+
 	@NpmTest
 	@Nested
 	class EslintTypescriptFormattingStepTest extends NpmFormatterStepCommonTests {
 
 		private final Map<String, Map<String, String>> devDependenciesForRuleset = ImmutableMap.of(
 			"custom_rules", EslintFormatterStep.defaultDevDependenciesForTypescript(),
-			"standard_rules_standard_with_typescript", combine(EslintFormatterStep.defaultDevDependenciesForTypescript(), EslintFormatterStep.PopularStyleGuide.STANDARD_WITH_TYPESCRIPT.devDependencies()),
-				"standard_rules_xo", combine(EslintFormatterStep.defaultDevDependenciesForTypescript(), EslintFormatterStep.PopularStyleGuide.XO_TYPESCRIPT.devDependencies())
+			"styleguide/standard_with_typescript", combine(EslintFormatterStep.defaultDevDependenciesForTypescript(), EslintFormatterStep.PopularStyleGuide.TS_STANDARD_WITH_TYPESCRIPT.devDependencies()),
+				"styleguide/xo", combine(EslintFormatterStep.defaultDevDependenciesForTypescript(), EslintFormatterStep.PopularStyleGuide.TS_XO_TYPESCRIPT.devDependencies())
 				);
 
 
 
 		@ParameterizedTest(name = "{index}: eslint can be applied using ruleset {0}")
-		@ValueSource(strings = {"custom_rules", "standard_rules_standard_with_typescript", "standard_rules_xo"})
+		@ValueSource(strings = {"custom_rules", "styleguide/standard_with_typescript", "styleguide/xo"})
 		void formattingUsingRulesetsFile(String ruleSetName) throws Exception {
 			String filedir = "npm/eslint/typescript/" + ruleSetName + "/";
 
-			String testDir = "formatting_ruleset_" + ruleSetName + "/";
+			String testDir = "formatting_ruleset_" + ruleSetName.replace('/', '_') + "/";
 //			File testDirFile = newFolder(testDir);
 
 			final File eslintRc = createTestFile(filedir + ".eslintrc.js");
@@ -88,7 +130,7 @@ void formattingUsingRulesetsFile(String ruleSetName) throws Exception {
 
 	@NpmTest
 	@Nested
-	class EslintInlineConfigFormattingStepTest extends NpmFormatterStepCommonTests {
+	class EslintInlineConfigTypescriptFormattingStepTest extends NpmFormatterStepCommonTests {
 
 
 		@Test
@@ -133,7 +175,7 @@ void formattingUsingInlineXoConfig() throws Exception {
 			final String cleanFile = filedir + "typescript.clean";
 
 			final FormatterStep formatterStep = EslintFormatterStep.create(
-				combine(EslintFormatterStep.PopularStyleGuide.XO_TYPESCRIPT.devDependencies(), EslintFormatterStep.defaultDevDependenciesForTypescript()),
+				combine(EslintFormatterStep.PopularStyleGuide.TS_XO_TYPESCRIPT.devDependencies(), EslintFormatterStep.defaultDevDependenciesForTypescript()),
 				TestProvisioner.mavenCentral(),
 				projectDir(),
 				buildDir(),

From 4efc19b200face1697512e18ed906524df444177 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Sun, 18 Dec 2022 20:43:16 +0100
Subject: [PATCH 0451/2068] eslint: introduce separate javascript extension

---
 .../spotless/npm/EslintTypescriptConfig.java  |  25 ++-
 .../gradle/spotless/FormatExtension.java      | 100 +++--------
 .../gradle/spotless/JavascriptExtension.java  | 156 ++++++++++++++++++
 .../gradle/spotless/SpotlessExtension.java    |   5 +
 .../gradle/spotless/TypescriptExtension.java  |  84 +++++-----
 .../spotless/npm/EslintFormatterStepTest.java | 139 ++++++++--------
 .../npm/NpmFormatterStepCommonTests.java      |   2 +-
 .../spotless/npm/TsFmtFormatterStepTest.java  |   2 +-
 8 files changed, 313 insertions(+), 200 deletions(-)
 create mode 100644 plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintTypescriptConfig.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintTypescriptConfig.java
index 05c8209837..f8c213a0a9 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/EslintTypescriptConfig.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintTypescriptConfig.java
@@ -1,15 +1,30 @@
+/*
+ * Copyright 2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.npm;
 
+import java.io.File;
+import java.io.IOException;
+
+import javax.annotation.Nullable;
+
 import com.diffplug.spotless.FileSignature;
 import com.diffplug.spotless.ThrowingEx;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
-import javax.annotation.Nullable;
-
-import java.io.File;
-import java.io.IOException;
-
 public class EslintTypescriptConfig extends EslintConfig {
 
 	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index 6152f9009d..08e713a921 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -24,13 +24,11 @@
 import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Random;
 import java.util.TreeMap;
-import java.util.stream.Collectors;
+import java.util.function.Consumer;
 
 import javax.annotation.Nullable;
 import javax.inject.Inject;
@@ -62,8 +60,6 @@
 import com.diffplug.spotless.generic.ReplaceRegexStep;
 import com.diffplug.spotless.generic.ReplaceStep;
 import com.diffplug.spotless.generic.TrimTrailingWhitespaceStep;
-import com.diffplug.spotless.npm.EslintConfig;
-import com.diffplug.spotless.npm.EslintFormatterStep;
 import com.diffplug.spotless.npm.NpmPathResolver;
 import com.diffplug.spotless.npm.PrettierFormatterStep;
 
@@ -518,23 +514,32 @@ public LicenseHeaderConfig licenseHeaderFile(Object licenseHeaderFile, String de
 		return config;
 	}
 
-	public abstract class NpmStepConfig<T extends NpmStepConfig<?>> {
+	public abstract static class NpmStepConfig<T extends NpmStepConfig<?>> {
 		@Nullable
 		protected Object npmFile;
 
 		@Nullable
 		protected Object npmrcFile;
 
+		protected Project project;
+
+		private Consumer<FormatterStep> replaceStep;
+
+		public NpmStepConfig(Project project, Consumer<FormatterStep> replaceStep) {
+			this.project = requireNonNull(project);
+			this.replaceStep = requireNonNull(replaceStep);
+		}
+
 		@SuppressWarnings("unchecked")
 		public T npmExecutable(final Object npmFile) {
 			this.npmFile = npmFile;
-			replaceStep(createStep());
+			replaceStep();
 			return (T) this;
 		}
 
 		public T npmrc(final Object npmrcFile) {
 			this.npmrcFile = npmrcFile;
-			replaceStep(createStep());
+			replaceStep();
 			return (T) this;
 		}
 
@@ -547,10 +552,14 @@ File npmrcFileOrNull() {
 		}
 
 		private File fileOrNull(Object npmFile) {
-			return npmFile != null ? getProject().file(npmFile) : null;
+			return npmFile != null ? project.file(npmFile) : null;
 		}
 
-		abstract FormatterStep createStep();
+		protected void replaceStep() {
+			replaceStep.accept(createStep());
+		}
+
+		abstract protected FormatterStep createStep();
 
 	}
 
@@ -565,22 +574,24 @@ public class PrettierConfig extends NpmStepConfig<PrettierConfig> {
 		final Map<String, String> devDependencies;
 
 		PrettierConfig(Map<String, String> devDependencies) {
+			super(getProject(), FormatExtension.this::replaceStep);
 			this.devDependencies = requireNonNull(devDependencies);
 		}
 
 		public PrettierConfig configFile(final Object prettierConfigFile) {
 			this.prettierConfigFile = prettierConfigFile;
-			replaceStep(createStep());
+			replaceStep();
 			return this;
 		}
 
 		public PrettierConfig config(final Map<String, Object> prettierConfig) {
 			this.prettierConfig = new TreeMap<>(prettierConfig);
-			replaceStep(createStep());
+			replaceStep();
 			return this;
 		}
 
-		FormatterStep createStep() {
+		@Override
+		protected FormatterStep createStep() {
 			final Project project = getProject();
 			return PrettierFormatterStep.create(
 					devDependencies,
@@ -611,69 +622,6 @@ public PrettierConfig prettier(Map<String, String> devDependencies) {
 		return prettierConfig;
 	}
 
-	public class EslintFormatExtension extends NpmStepConfig<EslintFormatExtension> {
-
-		Map<String, String> devDependencies = new LinkedHashMap<>();
-
-		@Nullable
-		Object configFilePath = null;
-
-		@Nullable
-		String configJs = null;
-
-		public EslintFormatExtension(Map<String, String> devDependencies) {
-			this.devDependencies.putAll(requireNonNull(devDependencies));
-		}
-
-		public EslintFormatExtension devDependencies(Map<String, String> devDependencies) {
-			this.devDependencies.putAll(devDependencies);
-			replaceStep(createStep());
-			return this;
-		}
-
-		public EslintFormatExtension configJs(String configJs) {
-			this.configJs = requireNonNull(configJs);
-			replaceStep(createStep());
-			return this;
-		}
-
-		public EslintFormatExtension configFile(Object configFilePath) {
-			this.configFilePath = requireNonNull(configFilePath);
-			replaceStep(createStep());
-			return this;
-		}
-
-		public FormatterStep createStep() {
-			final Project project = getProject();
-
-			return EslintFormatterStep.create(
-					devDependencies,
-					provisioner(),
-					project.getProjectDir(),
-					project.getBuildDir(),
-					new NpmPathResolver(npmFileOrNull(), npmrcFileOrNull(), project.getProjectDir(), project.getRootDir()),
-					eslintConfig());
-		}
-
-		protected EslintConfig eslintConfig() {
-			return new EslintConfig(configFilePath != null ? getProject().file(configFilePath) : null, configJs);
-		}
-	}
-
-	public EslintFormatExtension eslint() {
-		return eslint(EslintFormatterStep.defaultDevDependencies());
-	}
-
-	public EslintFormatExtension eslint(String version) {
-		return eslint(EslintFormatterStep.defaultDevDependenciesWithEslint(version));
-	}
-
-	public EslintFormatExtension eslint(Map<String, String> devDependencies) {
-		EslintFormatExtension eslint = new EslintFormatExtension(devDependencies);
-		addStep(eslint.createStep());
-		return eslint;
-	}
-
 	/** Uses the default version of clang-format. */
 	public ClangFormatConfig clangFormat() {
 		return clangFormat(ClangFormatStep.defaultVersion());
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
new file mode 100644
index 0000000000..348ed5f37e
--- /dev/null
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright 2016-2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.gradle.spotless;
+
+import static java.util.Objects.requireNonNull;
+
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+
+import org.gradle.api.Project;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.npm.EslintConfig;
+import com.diffplug.spotless.npm.EslintFormatterStep;
+import com.diffplug.spotless.npm.EslintFormatterStep.PopularStyleGuide;
+import com.diffplug.spotless.npm.NpmPathResolver;
+
+public class JavascriptExtension extends FormatExtension {
+
+	static final String NAME = "javascript";
+
+	@Inject
+	public JavascriptExtension(SpotlessExtension spotless) {
+		super(spotless);
+	}
+
+	public JavascriptEslintConfig eslint() {
+		return eslint(EslintFormatterStep.defaultDevDependenciesForTypescript());
+	}
+
+	public JavascriptEslintConfig eslint(String version) {
+		return eslint(EslintFormatterStep.defaultDevDependenciesTypescriptWithEslint(version));
+	}
+
+	public JavascriptEslintConfig eslint(Map<String, String> devDependencies) {
+		JavascriptEslintConfig eslint = new JavascriptEslintConfig(devDependencies);
+		addStep(eslint.createStep());
+		return eslint;
+	}
+
+	// TODO: make the configs static so that they do not need to have a hierarchy symmetric to the extensions
+
+	public static abstract class EslintBaseConfig<T extends EslintBaseConfig<?>> extends NpmStepConfig<EslintBaseConfig<T>> {
+		Map<String, String> devDependencies = new LinkedHashMap<>();
+
+		@Nullable
+		Object configFilePath = null;
+
+		@Nullable
+		String configJs = null;
+
+		public EslintBaseConfig(Project project, Consumer<FormatterStep> replaceStep, Map<String, String> devDependencies) {
+			super(project, replaceStep);
+			this.devDependencies.putAll(requireNonNull(devDependencies));
+		}
+
+		@SuppressWarnings("unchecked")
+		public T devDependencies(Map<String, String> devDependencies) {
+			this.devDependencies.putAll(devDependencies);
+			replaceStep();
+			return (T) this;
+		}
+
+		@SuppressWarnings("unchecked")
+		public T configJs(String configJs) {
+			this.configJs = requireNonNull(configJs);
+			replaceStep();
+			return (T) this;
+		}
+
+		@SuppressWarnings("unchecked")
+		public T configFile(Object configFilePath) {
+			this.configFilePath = requireNonNull(configFilePath);
+			replaceStep();
+			return (T) this;
+		}
+
+		@SuppressWarnings("unchecked")
+		public T styleGuide(String styleGuide) {
+			PopularStyleGuide popularStyleGuide = PopularStyleGuide.fromNameOrNull(styleGuide);
+
+			verifyStyleGuideIsSupported(styleGuide, popularStyleGuide);
+			devDependencies(popularStyleGuide.devDependencies());
+			replaceStep();
+			return (T) this;
+		}
+
+		protected abstract void verifyStyleGuideIsSupported(String styleGuideName, PopularStyleGuide popularStyleGuide);
+	}
+
+	public class JavascriptEslintConfig extends EslintBaseConfig<JavascriptEslintConfig> {
+
+		public JavascriptEslintConfig(Map<String, String> devDependencies) {
+			super(getProject(), JavascriptExtension.this::replaceStep, devDependencies);
+		}
+
+		public FormatterStep createStep() {
+			final Project project = getProject();
+
+			return EslintFormatterStep.create(
+					devDependencies,
+					provisioner(),
+					project.getProjectDir(),
+					project.getBuildDir(),
+					new NpmPathResolver(npmFileOrNull(), npmrcFileOrNull(), project.getProjectDir(), project.getRootDir()),
+					eslintConfig());
+		}
+
+		@Override
+		protected void verifyStyleGuideIsSupported(String styleGuideName, PopularStyleGuide popularStyleGuide) {
+			if (!isJsStyleGuide(popularStyleGuide)) {
+				throw new IllegalArgumentException("Unknown style guide: " + styleGuideName + ". Known javascript style guides: "
+						+ Arrays.stream(PopularStyleGuide.values())
+								.filter(this::isJsStyleGuide)
+								.map(PopularStyleGuide::getPopularStyleGuideName)
+								.sorted()
+								.collect(Collectors.joining(", ")));
+			}
+		}
+
+		private boolean isJsStyleGuide(PopularStyleGuide popularStyleGuide) {
+			return popularStyleGuide != null && popularStyleGuide.name().startsWith("JS_");
+		}
+
+		protected EslintConfig eslintConfig() {
+			return new EslintConfig(configFilePath != null ? getProject().file(configFilePath) : null, configJs);
+		}
+	}
+
+	@Override
+	protected void setupTask(SpotlessTask task) {
+		if (target == null) {
+			throw noDefaultTargetException();
+		}
+		super.setupTask(task);
+	}
+}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
index 57aa3b2d83..3fe5721b5d 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
@@ -167,6 +167,11 @@ public void cpp(Action<CppExtension> closure) {
 		format(CppExtension.NAME, CppExtension.class, closure);
 	}
 
+	/** Configures the special javascript-specific extension for javascript files. */
+	public void javascript(Action<JavascriptExtension> closure) {
+		format(JavascriptExtension.NAME, JavascriptExtension.class, closure);
+	}
+
 	/** Configures the special typescript-specific extension for typescript files. */
 	public void typescript(Action<TypescriptExtension> closure) {
 		format(TypescriptExtension.NAME, TypescriptExtension.class, closure);
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
index d4dedc32eb..f318dd89c8 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
@@ -27,15 +27,13 @@
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 
-import com.diffplug.spotless.npm.EslintConfig;
-
-import com.diffplug.spotless.npm.EslintTypescriptConfig;
-
 import org.gradle.api.Project;
 
 import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.npm.EslintConfig;
 import com.diffplug.spotless.npm.EslintFormatterStep;
 import com.diffplug.spotless.npm.EslintFormatterStep.PopularStyleGuide;
+import com.diffplug.spotless.npm.EslintTypescriptConfig;
 import com.diffplug.spotless.npm.NpmPathResolver;
 import com.diffplug.spotless.npm.PrettierFormatterStep;
 import com.diffplug.spotless.npm.TsConfigFileType;
@@ -81,12 +79,13 @@ public class TypescriptFormatExtension extends NpmStepConfig<TypescriptFormatExt
 		private final Map<String, String> devDependencies;
 
 		TypescriptFormatExtension(Map<String, String> devDependencies) {
+			super(getProject(), TypescriptExtension.this::replaceStep);
 			this.devDependencies = Objects.requireNonNull(devDependencies);
 		}
 
 		public void config(final Map<String, Object> config) {
 			this.config = new TreeMap<>(requireNonNull(config));
-			replaceStep(createStep());
+			replaceStep();
 		}
 
 		public void tsconfigFile(final Object path) {
@@ -108,7 +107,7 @@ public void tsfmtFile(final Object path) {
 		private void configFile(TsConfigFileType filetype, Object path) {
 			this.configFileType = requireNonNull(filetype);
 			this.configFilePath = requireNonNull(path);
-			replaceStep(createStep());
+			replaceStep();
 		}
 
 		public FormatterStep createStep() {
@@ -161,7 +160,7 @@ public class TypescriptPrettierConfig extends PrettierConfig {
 		}
 
 		@Override
-		FormatterStep createStep() {
+		protected FormatterStep createStep() {
 			fixParserToTypescript();
 			return super.createStep();
 		}
@@ -178,74 +177,73 @@ private void fixParserToTypescript() {
 		}
 	}
 
-	@Override
-	public TypescriptEslintFormatExtension eslint() {
+	public TypescriptEslintConfig eslint() {
 		return eslint(EslintFormatterStep.defaultDevDependenciesForTypescript());
 	}
 
-	@Override
-	public TypescriptEslintFormatExtension eslint(String version) {
+	public TypescriptEslintConfig eslint(String version) {
 		return eslint(EslintFormatterStep.defaultDevDependenciesTypescriptWithEslint(version));
 	}
 
-	@Override
-	public TypescriptEslintFormatExtension eslint(Map<String, String> devDependencies) {
-		TypescriptEslintFormatExtension eslint = new TypescriptEslintFormatExtension(devDependencies);
+	public TypescriptEslintConfig eslint(Map<String, String> devDependencies) {
+		TypescriptEslintConfig eslint = new TypescriptEslintConfig(devDependencies);
 		addStep(eslint.createStep());
 		return eslint;
 	}
 
-	public class TypescriptEslintFormatExtension extends EslintFormatExtension {
+	public class TypescriptEslintConfig extends JavascriptExtension.EslintBaseConfig<TypescriptEslintConfig> {
 
 		@Nullable
 		Object typescriptConfigFilePath = null;
 
-		public TypescriptEslintFormatExtension(Map<String, String> devDependencies) {
-			super(devDependencies);
+		public TypescriptEslintConfig(Map<String, String> devDependencies) {
+			super(getProject(), TypescriptExtension.this::replaceStep, devDependencies);
 		}
 
-		@Override
-		public TypescriptEslintFormatExtension devDependencies(Map<String, String> devDependencies) {
-			return (TypescriptEslintFormatExtension) super.devDependencies(devDependencies);
+		public TypescriptEslintConfig tsconfigFile(Object path) {
+			this.typescriptConfigFilePath = requireNonNull(path);
+			replaceStep();
+			return this;
 		}
 
 		@Override
-		public TypescriptEslintFormatExtension configJs(String configJs) {
-			return (TypescriptEslintFormatExtension) super.configJs(configJs);
+		protected void verifyStyleGuideIsSupported(String styleGuideName, PopularStyleGuide popularStyleGuide) {
+			if (!isTsStyleGuide(popularStyleGuide)) {
+				throw new IllegalArgumentException("Unknown style guide: " + styleGuideName + ". Known typescript style guides: "
+						+ Arrays.stream(EslintFormatterStep.PopularStyleGuide.values())
+								.filter(this::isTsStyleGuide)
+								.map(PopularStyleGuide::getPopularStyleGuideName)
+								.sorted()
+								.collect(Collectors.joining(", ")));
+			}
 		}
 
-		@Override
-		public TypescriptEslintFormatExtension configFile(Object configFilePath) {
-			return (TypescriptEslintFormatExtension) super.configFile(configFilePath);
+		private boolean isTsStyleGuide(PopularStyleGuide popularStyleGuide) {
+			return popularStyleGuide != null && popularStyleGuide.name().startsWith("TS_");
 		}
 
-		public TypescriptEslintFormatExtension styleGuide(String styleGuide) {
-			PopularStyleGuide popularStyleGuide = PopularStyleGuide.fromNameOrNull(styleGuide);
-			if (popularStyleGuide == null) {
-				throw new IllegalArgumentException("Unknown style guide: " + styleGuide + ". Known style guides: "
-						+ Arrays.stream(PopularStyleGuide.values()).map(PopularStyleGuide::getPopularStyleGuideName).collect(Collectors.joining(", ")));
-			}
-			devDependencies(popularStyleGuide.devDependencies());
-			replaceStep(createStep());
-			return this;
-		}
+		public FormatterStep createStep() {
+			final Project project = getProject();
 
-		public TypescriptEslintFormatExtension tsconfigFile(Object path) {
-			this.typescriptConfigFilePath = requireNonNull(path);
-			replaceStep(createStep());
-			return this;
+			return EslintFormatterStep.create(
+					devDependencies,
+					provisioner(),
+					project.getProjectDir(),
+					project.getBuildDir(),
+					new NpmPathResolver(npmFileOrNull(), npmrcFileOrNull(), project.getProjectDir(), project.getRootDir()),
+					eslintConfig());
 		}
 
-		@Override
 		protected EslintConfig eslintConfig() {
-			EslintConfig config = super.eslintConfig();
-			return new EslintTypescriptConfig(config.getEslintConfigPath(), config.getEslintConfigJs(), typescriptConfigFilePath != null ? getProject().file(typescriptConfigFilePath) : null);
+			return new EslintTypescriptConfig(
+					configFilePath != null ? getProject().file(configFilePath) : null,
+					configJs,
+					typescriptConfigFilePath != null ? getProject().file(typescriptConfigFilePath) : null);
 		}
 	}
 
 	@Override
 	protected void setupTask(SpotlessTask task) {
-		// defaults to all typescript files
 		if (target == null) {
 			throw noDefaultTargetException();
 		}
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
index 3a8bfc7fd6..95298db0ea 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,20 +15,20 @@
  */
 package com.diffplug.spotless.npm;
 
-import com.diffplug.common.collect.ImmutableMap;
-import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.StepHarnessWithFile;
-import com.diffplug.spotless.TestProvisioner;
-import com.diffplug.spotless.tag.NpmTest;
+import java.io.File;
+import java.util.Map;
+import java.util.TreeMap;
 
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
-import java.io.File;
-import java.util.Map;
-import java.util.TreeMap;
+import com.diffplug.common.collect.ImmutableMap;
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.StepHarnessWithFile;
+import com.diffplug.spotless.TestProvisioner;
+import com.diffplug.spotless.tag.NpmTest;
 
 @NpmTest
 class EslintFormatterStepTest {
@@ -44,12 +44,11 @@ private final Map<String, String> combine(Map<String, String> m1, Map<String, St
 	class EslintJavascriptFormattingStepTest extends NpmFormatterStepCommonTests {
 
 		private final Map<String, Map<String, String>> devDependenciesForRuleset = ImmutableMap.of(
-			"custom_rules", EslintFormatterStep.defaultDevDependenciesForTypescript(),
-			"styleguide/airbnb", combine(EslintFormatterStep.defaultDevDependencies(), EslintFormatterStep.PopularStyleGuide.JS_AIRBNB.devDependencies()),
-			"styleguide/google", combine(EslintFormatterStep.defaultDevDependencies(), EslintFormatterStep.PopularStyleGuide.JS_GOOGLE.devDependencies()),
-			"styleguide/standard", combine(EslintFormatterStep.defaultDevDependencies(), EslintFormatterStep.PopularStyleGuide.JS_STANDARD.devDependencies()),
-			"styleguide/xo", combine(EslintFormatterStep.defaultDevDependencies(), EslintFormatterStep.PopularStyleGuide.JS_XO.devDependencies())
-		);
+				"custom_rules", EslintFormatterStep.defaultDevDependenciesForTypescript(),
+				"styleguide/airbnb", combine(EslintFormatterStep.defaultDevDependencies(), EslintFormatterStep.PopularStyleGuide.JS_AIRBNB.devDependencies()),
+				"styleguide/google", combine(EslintFormatterStep.defaultDevDependencies(), EslintFormatterStep.PopularStyleGuide.JS_GOOGLE.devDependencies()),
+				"styleguide/standard", combine(EslintFormatterStep.defaultDevDependencies(), EslintFormatterStep.PopularStyleGuide.JS_STANDARD.devDependencies()),
+				"styleguide/xo", combine(EslintFormatterStep.defaultDevDependencies(), EslintFormatterStep.PopularStyleGuide.JS_XO.devDependencies()));
 
 		@ParameterizedTest(name = "{index}: eslint can be applied using ruleset {0}")
 		@ValueSource(strings = {"custom_rules", "styleguide/airbnb", "styleguide/google", "styleguide/standard", "styleguide/xo"})
@@ -57,22 +56,22 @@ void formattingUsingRulesetsFile(String ruleSetName) throws Exception {
 			String filedir = "npm/eslint/javascript/" + ruleSetName + "/";
 
 			String testDir = "formatting_ruleset_" + ruleSetName.replace('/', '_') + "/";
-//			File testDirFile = newFolder(testDir);
+			//			File testDirFile = newFolder(testDir);
 
 			final File eslintRc = createTestFile(filedir + ".eslintrc.js");
-//			final File eslintRc = setFile(buildDir().getPath() + "/.eslintrc.js").toResource(filedir + ".eslintrc.js");
+			//			final File eslintRc = setFile(buildDir().getPath() + "/.eslintrc.js").toResource(filedir + ".eslintrc.js");
 
 			final String dirtyFile = filedir + "javascript-es6.dirty";
 			File dirtyFileFile = setFile(testDir + "test.js").toResource(dirtyFile);
 			final String cleanFile = filedir + "javascript-es6.clean";
 
 			final FormatterStep formatterStep = EslintFormatterStep.create(
-				devDependenciesForRuleset.get(ruleSetName),
-				TestProvisioner.mavenCentral(),
-				projectDir(),
-				buildDir(),
-				npmPathResolver(),
-				new EslintConfig(eslintRc, null));
+					devDependenciesForRuleset.get(ruleSetName),
+					TestProvisioner.mavenCentral(),
+					projectDir(),
+					buildDir(),
+					npmPathResolver(),
+					new EslintConfig(eslintRc, null));
 
 			try (StepHarnessWithFile stepHarness = StepHarnessWithFile.forStep(formatterStep)) {
 				stepHarness.testResource(dirtyFileFile, dirtyFile, cleanFile);
@@ -80,19 +79,14 @@ void formattingUsingRulesetsFile(String ruleSetName) throws Exception {
 		}
 	}
 
-
-
 	@NpmTest
 	@Nested
 	class EslintTypescriptFormattingStepTest extends NpmFormatterStepCommonTests {
 
 		private final Map<String, Map<String, String>> devDependenciesForRuleset = ImmutableMap.of(
-			"custom_rules", EslintFormatterStep.defaultDevDependenciesForTypescript(),
-			"styleguide/standard_with_typescript", combine(EslintFormatterStep.defaultDevDependenciesForTypescript(), EslintFormatterStep.PopularStyleGuide.TS_STANDARD_WITH_TYPESCRIPT.devDependencies()),
-				"styleguide/xo", combine(EslintFormatterStep.defaultDevDependenciesForTypescript(), EslintFormatterStep.PopularStyleGuide.TS_XO_TYPESCRIPT.devDependencies())
-				);
-
-
+				"custom_rules", EslintFormatterStep.defaultDevDependenciesForTypescript(),
+				"styleguide/standard_with_typescript", combine(EslintFormatterStep.defaultDevDependenciesForTypescript(), EslintFormatterStep.PopularStyleGuide.TS_STANDARD_WITH_TYPESCRIPT.devDependencies()),
+				"styleguide/xo", combine(EslintFormatterStep.defaultDevDependenciesForTypescript(), EslintFormatterStep.PopularStyleGuide.TS_XO_TYPESCRIPT.devDependencies()));
 
 		@ParameterizedTest(name = "{index}: eslint can be applied using ruleset {0}")
 		@ValueSource(strings = {"custom_rules", "styleguide/standard_with_typescript", "styleguide/xo"})
@@ -100,10 +94,10 @@ void formattingUsingRulesetsFile(String ruleSetName) throws Exception {
 			String filedir = "npm/eslint/typescript/" + ruleSetName + "/";
 
 			String testDir = "formatting_ruleset_" + ruleSetName.replace('/', '_') + "/";
-//			File testDirFile = newFolder(testDir);
+			//			File testDirFile = newFolder(testDir);
 
 			final File eslintRc = createTestFile(filedir + ".eslintrc.js");
-//			final File eslintRc = setFile(buildDir().getPath() + "/.eslintrc.js").toResource(filedir + ".eslintrc.js");
+			//			final File eslintRc = setFile(buildDir().getPath() + "/.eslintrc.js").toResource(filedir + ".eslintrc.js");
 
 			//setFile(testDir + "/test.ts").toResource(filedir + "typescript.dirty");
 			File tsconfigFile = null;
@@ -115,12 +109,12 @@ void formattingUsingRulesetsFile(String ruleSetName) throws Exception {
 			final String cleanFile = filedir + "typescript.clean";
 
 			final FormatterStep formatterStep = EslintFormatterStep.create(
-				devDependenciesForRuleset.get(ruleSetName),
-				TestProvisioner.mavenCentral(),
-				projectDir(),
-				buildDir(),
-				npmPathResolver(),
-				new EslintTypescriptConfig(eslintRc, null, tsconfigFile));
+					devDependenciesForRuleset.get(ruleSetName),
+					TestProvisioner.mavenCentral(),
+					projectDir(),
+					buildDir(),
+					npmPathResolver(),
+					new EslintTypescriptConfig(eslintRc, null, tsconfigFile));
 
 			try (StepHarnessWithFile stepHarness = StepHarnessWithFile.forStep(formatterStep)) {
 				stepHarness.testResource(dirtyFileFile, dirtyFile, cleanFile);
@@ -132,42 +126,39 @@ void formattingUsingRulesetsFile(String ruleSetName) throws Exception {
 	@Nested
 	class EslintInlineConfigTypescriptFormattingStepTest extends NpmFormatterStepCommonTests {
 
-
 		@Test
 		void formattingUsingInlineXoConfig() throws Exception {
 			String filedir = "npm/eslint/typescript/standard_rules_xo/";
 
 			String testDir = "formatting_ruleset_xo_inline_config/";
 
-
 			final String esLintConfig = String.join("\n",
-				"{",
-				"	env: {",
-				"		browser: true,",
-				"		es2021: true,",
-				"	},",
-				"	extends: 'xo/browser',",
-				"	overrides: [",
-				"		{",
-				"			extends: [",
-				"				'xo-typescript',",
-				"			],",
-				"			files: [",
-				"				'*.ts',",
-				"				'*.tsx',",
-				"			],",
-				"		},",
-				"	],",
-				"	parser: '@typescript-eslint/parser',",
-				"	parserOptions: {",
-				"		ecmaVersion: 'latest',",
-				"		sourceType: 'module',",
-				"		project: './tsconfig.json',",
-				"	},",
-				"	rules: {",
-				"	},",
-				"}"
-			);
+					"{",
+					"	env: {",
+					"		browser: true,",
+					"		es2021: true,",
+					"	},",
+					"	extends: 'xo/browser',",
+					"	overrides: [",
+					"		{",
+					"			extends: [",
+					"				'xo-typescript',",
+					"			],",
+					"			files: [",
+					"				'*.ts',",
+					"				'*.tsx',",
+					"			],",
+					"		},",
+					"	],",
+					"	parser: '@typescript-eslint/parser',",
+					"	parserOptions: {",
+					"		ecmaVersion: 'latest',",
+					"		sourceType: 'module',",
+					"		project: './tsconfig.json',",
+					"	},",
+					"	rules: {",
+					"	},",
+					"}");
 
 			File tsconfigFile = setFile(testDir + "tsconfig.json").toResource(filedir + "tsconfig.json");
 			final String dirtyFile = filedir + "typescript.dirty";
@@ -175,12 +166,12 @@ void formattingUsingInlineXoConfig() throws Exception {
 			final String cleanFile = filedir + "typescript.clean";
 
 			final FormatterStep formatterStep = EslintFormatterStep.create(
-				combine(EslintFormatterStep.PopularStyleGuide.TS_XO_TYPESCRIPT.devDependencies(), EslintFormatterStep.defaultDevDependenciesForTypescript()),
-				TestProvisioner.mavenCentral(),
-				projectDir(),
-				buildDir(),
-				npmPathResolver(),
-				new EslintTypescriptConfig(null, esLintConfig, tsconfigFile));
+					combine(EslintFormatterStep.PopularStyleGuide.TS_XO_TYPESCRIPT.devDependencies(), EslintFormatterStep.defaultDevDependenciesForTypescript()),
+					TestProvisioner.mavenCentral(),
+					projectDir(),
+					buildDir(),
+					npmPathResolver(),
+					new EslintTypescriptConfig(null, esLintConfig, tsconfigFile));
 
 			try (StepHarnessWithFile stepHarness = StepHarnessWithFile.forStep(formatterStep)) {
 				stepHarness.testResource(dirtyFileFile, dirtyFile, cleanFile);
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/NpmFormatterStepCommonTests.java b/testlib/src/test/java/com/diffplug/spotless/npm/NpmFormatterStepCommonTests.java
index f1b5da59ff..1ed6e9bbe8 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/NpmFormatterStepCommonTests.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/NpmFormatterStepCommonTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/TsFmtFormatterStepTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/TsFmtFormatterStepTest.java
index d06b902b83..474c664486 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/TsFmtFormatterStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/TsFmtFormatterStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 0206246cee0de58aac3b3477da69f98d8b1c2426 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 20 Dec 2022 19:38:34 +0100
Subject: [PATCH 0452/2068] eslint: adding tests for js

---
 .../diffplug/spotless/npm/EslintConfig.java   |   7 +
 .../spotless/npm/EslintFormatterStep.java     |   4 +-
 .../gradle/spotless/JavascriptExtension.java  |  61 ++++-
 .../spotless/JavascriptExtensionTest.java     | 221 ++++++++++++++++++
 .../spotless/TypescriptExtensionTest.java     |  25 +-
 5 files changed, 312 insertions(+), 6 deletions(-)
 create mode 100644 plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavascriptExtensionTest.java

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintConfig.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintConfig.java
index 732111cc71..4e1848856a 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/EslintConfig.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintConfig.java
@@ -62,4 +62,11 @@ public File getEslintConfigPath() {
 	public String getEslintConfigJs() {
 		return eslintConfigJs;
 	}
+
+	public EslintConfig verify() {
+		if (eslintConfigPath == null && eslintConfigJs == null) {
+			throw new IllegalArgumentException("ESLint must be configured using either a configFile or a configJs - but both are null.");
+		}
+		return this;
+	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
index 14bc99a243..0e5e618e1e 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
@@ -183,14 +183,14 @@ private static class State extends NpmFormatterStepStateBase implements Serializ
 
 		private EslintConfig localCopyFiles(EslintConfig orig) {
 			if (orig.getEslintConfigPath() == null) {
-				return orig;
+				return orig.verify();
 			}
 			// If any config files are provided, we need to make sure they are at the same location as the node modules
 			// as eslint will try to resolve plugin/config names relatively to the config file location and some
 			// eslint configs contain relative paths to additional config files (such as tsconfig.json e.g.)
 			FormattedPrinter.SYSOUT.print("Copying config file <%s> to <%s> and using the copy", orig.getEslintConfigPath(), nodeModulesDir);
 			File configFileCopy = NpmResourceHelper.copyFileToDir(orig.getEslintConfigPath(), nodeModulesDir);
-			return orig.withEslintConfigPath(configFileCopy);
+			return orig.withEslintConfigPath(configFileCopy).verify();
 		}
 
 		@Override
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
index 348ed5f37e..fb05387f49 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
@@ -18,6 +18,7 @@
 import static java.util.Objects.requireNonNull;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.function.Consumer;
@@ -28,11 +29,13 @@
 
 import org.gradle.api.Project;
 
+import com.diffplug.common.collect.ImmutableList;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.npm.EslintConfig;
 import com.diffplug.spotless.npm.EslintFormatterStep;
 import com.diffplug.spotless.npm.EslintFormatterStep.PopularStyleGuide;
 import com.diffplug.spotless.npm.NpmPathResolver;
+import com.diffplug.spotless.npm.PrettierFormatterStep;
 
 public class JavascriptExtension extends FormatExtension {
 
@@ -57,8 +60,6 @@ public JavascriptEslintConfig eslint(Map<String, String> devDependencies) {
 		return eslint;
 	}
 
-	// TODO: make the configs static so that they do not need to have a hierarchy symmetric to the extensions
-
 	public static abstract class EslintBaseConfig<T extends EslintBaseConfig<?>> extends NpmStepConfig<EslintBaseConfig<T>> {
 		Map<String, String> devDependencies = new LinkedHashMap<>();
 
@@ -146,6 +147,62 @@ protected EslintConfig eslintConfig() {
 		}
 	}
 
+	/** Uses the default version of prettier. */
+	@Override
+	public PrettierConfig prettier() {
+		return prettier(PrettierFormatterStep.defaultDevDependencies());
+	}
+
+	/** Uses the specified version of prettier. */
+	@Override
+	public PrettierConfig prettier(String version) {
+		return prettier(PrettierFormatterStep.defaultDevDependenciesWithPrettier(version));
+	}
+
+	/** Uses exactly the npm packages specified in the map. */
+	@Override
+	public PrettierConfig prettier(Map<String, String> devDependencies) {
+		PrettierConfig prettierConfig = new JavascriptPrettierConfig(devDependencies);
+		addStep(prettierConfig.createStep());
+		return prettierConfig;
+	}
+
+	private static final String DEFAULT_PRETTIER_JS_PARSER = "babel";
+	private static final ImmutableList<String> PRETTIER_JS_PARSERS = ImmutableList.of(DEFAULT_PRETTIER_JS_PARSER, "babel-flow", "flow");
+
+	/**
+	 * Overrides the parser to be set to a js parser.
+	 */
+	public class JavascriptPrettierConfig extends PrettierConfig {
+
+		JavascriptPrettierConfig(Map<String, String> devDependencies) {
+			super(devDependencies);
+		}
+
+		@Override
+		protected FormatterStep createStep() {
+			fixParserToJavascript();
+			return super.createStep();
+		}
+
+		private void fixParserToJavascript() {
+			if (this.prettierConfig == null) {
+				this.prettierConfig = Collections.singletonMap("parser", DEFAULT_PRETTIER_JS_PARSER);
+			} else {
+				final Object currentParser = this.prettierConfig.get("parser");
+				if (PRETTIER_JS_PARSERS.contains(String.valueOf(currentParser))) {
+					getProject().getLogger().debug("Already javascript parser set, not overriding.");
+				} else {
+					this.prettierConfig.put("parser", DEFAULT_PRETTIER_JS_PARSER);
+					if (currentParser != null) {
+						getProject().getLogger().warn("Overriding parser option to '{}'. (Was set to '{}'.) Set it to another js parser if you have problems with '{}'.", DEFAULT_PRETTIER_JS_PARSER, currentParser, DEFAULT_PRETTIER_JS_PARSER);
+					}
+				}
+
+			}
+		}
+	}
+
 	@Override
 	protected void setupTask(SpotlessTask task) {
 		if (target == null) {
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavascriptExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavascriptExtensionTest.java
new file mode 100644
index 0000000000..af203936f3
--- /dev/null
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavascriptExtensionTest.java
@@ -0,0 +1,221 @@
+/*
+ * Copyright 2016-2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.gradle.spotless;
+
+import java.io.IOException;
+
+import org.assertj.core.api.Assertions;
+import org.gradle.testkit.runner.BuildResult;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import com.diffplug.spotless.tag.NpmTest;
+
+@NpmTest
+class JavascriptExtensionTest extends GradleIntegrationHarness {
+
+	@NpmTest
+	@Nested
+	class EslintGeneralJavascriptTests extends GradleIntegrationHarness {
+		@Test
+		void supportsEslintFormattingForJavascript() throws IOException {
+			setFile(".eslintrc.js").toResource("npm/eslint/javascript/styleguide/standard/.eslintrc.js");
+			setFile("build.gradle").toLines(
+					"plugins {",
+					"    id 'com.diffplug.spotless'",
+					"}",
+					"repositories { mavenCentral() }",
+					"spotless {",
+					"    javascript {",
+					"        target 'test.js'",
+					"        eslint().configFile('.eslintrc.js').styleGuide('standard')",
+					"    }",
+					"}");
+			setFile("test.js").toResource("npm/eslint/javascript/styleguide/standard/javascript-es6.dirty");
+			gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+			assertFile("test.js").sameAsResource("npm/eslint/javascript/styleguide/standard/javascript-es6.clean");
+		}
+
+		@Test
+		void eslintDoesNotAllowToUseTsStyleGuideForJavascript() throws IOException {
+			setFile(".eslintrc.js").toResource("npm/eslint/javascript/styleguide/standard/.eslintrc.js");
+			setFile("build.gradle").toLines(
+					"plugins {",
+					"    id 'com.diffplug.spotless'",
+					"}",
+					"repositories { mavenCentral() }",
+					"spotless {",
+					"    javascript {",
+					"        target 'test.js'",
+					"        eslint().configFile('.eslintrc.js').styleGuide('xo-typescript')",
+					"    }",
+					"}");
+			setFile("test.js").toResource("npm/eslint/javascript/styleguide/standard/javascript-es6.dirty");
+			final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").buildAndFail();
+			Assertions.assertThat(spotlessApply.getOutput()).contains("Unknown style guide: xo-typescript");
+		}
+
+		@Test
+		void eslintAllowsToSpecifyEslintVersionForJavascript() throws IOException {
+			setFile(".eslintrc.js").toResource("npm/eslint/javascript/styleguide/standard/.eslintrc.js");
+			setFile("build.gradle").toLines(
+					"plugins {",
+					"    id 'com.diffplug.spotless'",
+					"}",
+					"repositories { mavenCentral() }",
+					"spotless {",
+					"    javascript {",
+					"        target 'test.js'",
+					"        eslint('8.28.0').configFile('.eslintrc.js').styleGuide('standard')",
+					"    }",
+					"}");
+			setFile("test.js").toResource("npm/eslint/javascript/styleguide/standard/javascript-es6.dirty");
+			gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+			assertFile("test.js").sameAsResource("npm/eslint/javascript/styleguide/standard/javascript-es6.clean");
+		}
+
+		@Test
+		void esllintAllowsToSpecifyInlineConfig() throws IOException {
+			final String eslintConfigJs = String.join("\n",
+					"{",
+					"	env: {",
+					"		browser: true,",
+					"		es2021: true",
+					"	},",
+					"	extends: 'standard',",
+					"	overrides: [",
+					"	],",
+					"	parserOptions: {",
+					"		ecmaVersion: 'latest',",
+					"		sourceType: 'module'",
+					"	},",
+					"	rules: {",
+					"	}",
+					"}");
+			setFile("build.gradle").toLines(
+					"plugins {",
+					"    id 'com.diffplug.spotless'",
+					"}",
+					"repositories { mavenCentral() }",
+					"spotless {",
+					"    javascript {",
+					"        target 'test.js'",
+					"        eslint().configJs('''" + eslintConfigJs + "''').styleGuide('standard')",
+					"    }",
+					"}");
+			setFile("test.js").toResource("npm/eslint/javascript/styleguide/standard/javascript-es6.dirty");
+			gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+			assertFile("test.js").sameAsResource("npm/eslint/javascript/styleguide/standard/javascript-es6.clean");
+		}
+
+		@Test
+		void eslintRequiresAnExplicitEslintConfig() throws IOException {
+			setFile(".eslintrc.js").toResource("npm/eslint/javascript/styleguide/standard/.eslintrc.js");
+			setFile("build.gradle").toLines(
+					"plugins {",
+					"    id 'com.diffplug.spotless'",
+					"}",
+					"repositories { mavenCentral() }",
+					"spotless {",
+					"    javascript {",
+					"        target 'test.js'",
+					"        eslint().styleGuide('standard')",
+					"    }",
+					"}");
+			setFile("test.js").toResource("npm/eslint/javascript/styleguide/standard/javascript-es6.dirty");
+			BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").buildAndFail();
+			Assertions.assertThat(spotlessApply.getOutput()).contains("ESLint must be configured");
+		}
+
+		@Test
+		void eslintAllowsSpecifyingCustomLibraryVersions() throws IOException {
+			setFile(".eslintrc.js").toResource("npm/eslint/javascript/styleguide/standard/.eslintrc.js");
+			setFile("build.gradle").toLines(
+					"plugins {",
+					"    id 'com.diffplug.spotless'",
+					"}",
+					"repositories { mavenCentral() }",
+					"spotless {",
+					"    javascript {",
+					"        target 'test.js'",
+					"        eslint([",
+					"            'eslint': '8.28.0',",
+					"            'eslint-config-standard': '17.0.0',",
+					"            'eslint-plugin-import': '2.26.0',",
+					"            'eslint-plugin-n': '15.6.0',",
+					"            'eslint-plugin-promise': '6.1.1'",
+					"        ]).configFile('.eslintrc.js')",
+					"    }",
+					"}");
+			setFile("test.js").toResource("npm/eslint/javascript/styleguide/standard/javascript-es6.dirty");
+			gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+			assertFile("test.js").sameAsResource("npm/eslint/javascript/styleguide/standard/javascript-es6.clean");
+		}
+
+	}
+
+	@NpmTest
+	@Nested
+	class EslintPopularJsStyleGuideTests extends GradleIntegrationHarness {
+		@ParameterizedTest(name = "{index}: eslint can be applied using styleguide {0}")
+		@ValueSource(strings = {"airbnb", "google", "standard", "xo"})
+		void formattingUsingStyleguide(String styleguide) throws Exception {
+
+			final String styleguidePath = "npm/eslint/javascript/styleguide/" + styleguide + "/";
+
+			setFile(".eslintrc.js").toResource(styleguidePath + ".eslintrc.js");
+			setFile("build.gradle").toLines(
+					"plugins {",
+					"    id 'com.diffplug.spotless'",
+					"}",
+					"repositories { mavenCentral() }",
+					"spotless {",
+					"    javascript {",
+					"        target 'test.js'",
+					"        eslint().configFile('.eslintrc.js').styleGuide('" + styleguide + "')",
+					"    }",
+					"}");
+			setFile("test.js").toResource(styleguidePath + "javascript-es6.dirty");
+			gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+			assertFile("test.js").sameAsResource(styleguidePath + "javascript-es6.clean");
+		}
+	}
+
+	@NpmTest
+	@Nested
+	class JavascriptPrettierTests extends GradleIntegrationHarness {
+		@Test
+		void supportsPrettierFormattingForJavascript() throws IOException {
+			setFile("build.gradle").toLines(
+					"plugins {",
+					"    id 'com.diffplug.spotless'",
+					"}",
+					"repositories { mavenCentral() }",
+					"spotless {",
+					"    javascript {",
+					"        target 'test.js'",
+					"        prettier()",
+					"    }",
+					"}");
+			setFile("test.js").toResource("npm/prettier/filetypes/javascript-es6/javascript-es6.dirty");
+			gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+			assertFile("test.js").sameAsResource("npm/prettier/filetypes/javascript-es6/javascript-es6.clean");
+		}
+	}
+
+}
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TypescriptExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TypescriptExtensionTest.java
index 7d715998f6..da9fa03905 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TypescriptExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TypescriptExtensionTest.java
@@ -17,6 +17,8 @@
 
 import java.io.IOException;
 
+import org.assertj.core.api.Assertions;
+import org.gradle.testkit.runner.BuildResult;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.tag.NpmTest;
@@ -162,7 +164,7 @@ void useEslint() throws IOException {
 	}
 
 	@Test
-	void useXoStandardRules() throws IOException {
+	void useEslintXoStandardRules() throws IOException {
 		setFile(".eslintrc.js").toResource("npm/eslint/typescript/styleguide/xo/.eslintrc.js");
 		setFile("tsconfig.json").toResource("npm/eslint/typescript/styleguide/xo/tsconfig.json");
 		setFile("build.gradle").toLines(
@@ -182,7 +184,7 @@ void useXoStandardRules() throws IOException {
 	}
 
 	@Test
-	void useStandardWithTypescriptRules() throws IOException {
+	void useEslintStandardWithTypescriptRules() throws IOException {
 		setFile(".eslintrc.js").toResource("npm/eslint/typescript/styleguide/standard_with_typescript/.eslintrc.js");
 		setFile("tsconfig.json").toResource("npm/eslint/typescript/styleguide/standard_with_typescript/tsconfig.json");
 		setFile("build.gradle").toLines(
@@ -200,4 +202,23 @@ void useStandardWithTypescriptRules() throws IOException {
 		gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
 		assertFile("test.ts").sameAsResource("npm/eslint/typescript/styleguide/standard_with_typescript/typescript.clean");
 	}
+
+	@Test
+	void useEslintForTypescriptDoesNotAllowUsingJsStyleguide() throws IOException {
+		setFile(".eslintrc.js").toResource("npm/eslint/javascript/styleguide/airbnb/.eslintrc.js");
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    typescript {",
+				"        target 'test.ts'",
+				"        eslint().styleGuide('airbnb').configFile('.eslintrc.js')",
+				"    }",
+				"}");
+		setFile("test.js").toResource("npm/eslint/javascript/styleguide/airbnb/javascript-es6.dirty");
+		BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").buildAndFail();
+		Assertions.assertThat(spotlessApply.getOutput()).contains("Unknown style guide: airbnb");
+	}
 }

From 393a4c4424e66466cf1a698ab8716c331ec7e493 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 20 Dec 2022 19:37:54 +0100
Subject: [PATCH 0453/2068] eslint: bumping version numbers

---
 .../spotless/npm/EslintFormatterStep.java     | 37 +++++++++----------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
index 0e5e618e1e..8589819540 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
@@ -45,18 +45,17 @@ public class EslintFormatterStep {
 
 	public static final String NAME = "eslint-format";
 
-	public static final String DEFAULT_ESLINT_VERSION = "8.28.0";
+	public static final String DEFAULT_ESLINT_VERSION = "^8.30.0";
 
 	public enum PopularStyleGuide {
 		TS_STANDARD_WITH_TYPESCRIPT("standard-with-typescript") {
 			@Override
 			public Map<String, String> devDependencies() {
 				Map<String, String> dependencies = new LinkedHashMap<>();
-				dependencies.put("eslint-config-standard-with-typescript", "23.0.0");
-				dependencies.put("eslint-plugin-import", "2.26.0");
-				dependencies.put("eslint-plugin-n", "15.5.1");
-				dependencies.put("eslint-plugin-promise", "6.1.1");
-				dependencies.put("typescript", "4.9.3");
+				dependencies.put("eslint-config-standard-with-typescript", "^24.0.0");
+				dependencies.put("eslint-plugin-import", "^2.26.0");
+				dependencies.put("eslint-plugin-n", "^15.6.0");
+				dependencies.put("eslint-plugin-promise", "^6.1.1");
 				return dependencies;
 			}
 		},
@@ -64,9 +63,8 @@ public Map<String, String> devDependencies() {
 			@Override
 			public Map<String, String> devDependencies() {
 				Map<String, String> dependencies = new LinkedHashMap<>();
-				dependencies.put("eslint-config-xo", "0.43.1");
-				dependencies.put("eslint-config-xo-typescript", "0.55.1");
-				dependencies.put("typescript", "4.9.3");
+				dependencies.put("eslint-config-xo", "^0.43.1");
+				dependencies.put("eslint-config-xo-typescript", "^0.55.1");
 				return dependencies;
 			}
 		},
@@ -74,8 +72,8 @@ public Map<String, String> devDependencies() {
 			@Override
 			public Map<String, String> devDependencies() {
 				Map<String, String> dependencies = new LinkedHashMap<>();
-				dependencies.put("eslint-config-airbnb-base", "15.0.0");
-				dependencies.put("eslint-plugin-import", "2.26.0");
+				dependencies.put("eslint-config-airbnb-base", "^15.0.0");
+				dependencies.put("eslint-plugin-import", "^2.26.0");
 				return dependencies;
 			}
 		},
@@ -83,7 +81,7 @@ public Map<String, String> devDependencies() {
 			@Override
 			public Map<String, String> devDependencies() {
 				Map<String, String> dependencies = new LinkedHashMap<>();
-				dependencies.put("eslint-config-google", "0.14.0");
+				dependencies.put("eslint-config-google", "^0.14.0");
 				return dependencies;
 			}
 		},
@@ -91,10 +89,10 @@ public Map<String, String> devDependencies() {
 			@Override
 			public Map<String, String> devDependencies() {
 				Map<String, String> dependencies = new LinkedHashMap<>();
-				dependencies.put("eslint-config-standard", "17.0.0");
-				dependencies.put("eslint-plugin-import", "2.26.0");
-				dependencies.put("eslint-plugin-n", "15.6.0");
-				dependencies.put("eslint-plugin-promise", "6.1.1");
+				dependencies.put("eslint-config-standard", "^17.0.0");
+				dependencies.put("eslint-plugin-import", "^2.26.0");
+				dependencies.put("eslint-plugin-n", "^15.6.0");
+				dependencies.put("eslint-plugin-promise", "^6.1.1");
 				return dependencies;
 			}
 		},
@@ -102,7 +100,7 @@ public Map<String, String> devDependencies() {
 			@Override
 			public Map<String, String> devDependencies() {
 				Map<String, String> dependencies = new LinkedHashMap<>();
-				dependencies.put("eslint-config-xo", "0.43.1");
+				dependencies.put("eslint-config-xo", "^0.43.1");
 				return dependencies;
 			}
 		};
@@ -135,8 +133,9 @@ public static Map<String, String> defaultDevDependenciesForTypescript() {
 
 	public static Map<String, String> defaultDevDependenciesTypescriptWithEslint(String eslintVersion) {
 		Map<String, String> dependencies = new LinkedHashMap<>();
-		dependencies.put("@typescript-eslint/eslint-plugin", "5.45.0");
-		dependencies.put("@typescript-eslint/parser", "5.45.0");
+		dependencies.put("@typescript-eslint/eslint-plugin", "^5.47.0");
+		dependencies.put("@typescript-eslint/parser", "^5.47.0");
+		dependencies.put("typescript", "^4.9.4");
 		dependencies.put("eslint", Objects.requireNonNull(eslintVersion));
 		return dependencies;
 	}

From 8dc740ef3723d38687222c2dfcd9b68bae3edce0 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 20 Dec 2022 19:53:57 +0100
Subject: [PATCH 0454/2068] eslint: adapt to extended api on maven side

---
 .../java/com/diffplug/spotless/maven/generic/Prettier.java | 7 ++++---
 .../java/com/diffplug/spotless/maven/typescript/Tsfmt.java | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Prettier.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Prettier.java
index 85684e85cd..5bdce32c47 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Prettier.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Prettier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -105,8 +105,9 @@ public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 		// create the format step
 		PrettierConfig prettierConfig = new PrettierConfig(configFileHandler, configInline);
 		File buildDir = stepConfig.getFileLocator().getBuildDir();
-		NpmPathResolver npmPathResolver = new NpmPathResolver(npm, npmrcFile, stepConfig.getFileLocator().getBaseDir());
-		return PrettierFormatterStep.create(devDependencies, stepConfig.getProvisioner(), buildDir, npmPathResolver, prettierConfig);
+		File baseDir = stepConfig.getFileLocator().getBaseDir();
+		NpmPathResolver npmPathResolver = new NpmPathResolver(npm, npmrcFile, baseDir);
+		return PrettierFormatterStep.create(devDependencies, stepConfig.getProvisioner(), baseDir, buildDir, npmPathResolver, prettierConfig);
 	}
 
 	private boolean moreThanOneNonNull(Object... objects) {
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Tsfmt.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Tsfmt.java
index 9ebb9ac503..e41231818c 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Tsfmt.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Tsfmt.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -120,8 +120,9 @@ public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 		}
 
 		File buildDir = stepConfig.getFileLocator().getBuildDir();
-		NpmPathResolver npmPathResolver = new NpmPathResolver(npm, npmrcFile, stepConfig.getFileLocator().getBaseDir());
-		return TsFmtFormatterStep.create(devDependencies, stepConfig.getProvisioner(), buildDir, npmPathResolver, configFile, configInline);
+		File baseDir = stepConfig.getFileLocator().getBaseDir();
+		NpmPathResolver npmPathResolver = new NpmPathResolver(npm, npmrcFile, baseDir);
+		return TsFmtFormatterStep.create(devDependencies, stepConfig.getProvisioner(), baseDir, buildDir, npmPathResolver, configFile, configInline);
 	}
 
 	private static IllegalArgumentException onlyOneConfig() {

From cb3dd5536febc8fccb0b71ee1103225d6fd9eafb Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Wed, 21 Dec 2022 16:28:32 +0100
Subject: [PATCH 0455/2068] eslint: speedup npm install

---
 lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java
index e1bf8c8673..28db79b726 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ class NpmProcess {
 	}
 
 	void install() {
-		npmAwait("install", "--no-audit", "--no-package-lock");
+		npmAwait("install", "--no-audit", "--no-package-lock", "--prefer-offline");
 	}
 
 	Process start() {

From e12c5efb5f64b4133228e7d102baebd67191da32 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Wed, 21 Dec 2022 16:31:18 +0100
Subject: [PATCH 0456/2068] eslint: speedup npmrc tests

we intend them to timeout, but please fail quicker.
---
 .../gradle/spotless/PrettierIntegrationTest.java   | 12 +++++++++---
 .../maven/prettier/PrettierFormatStepTest.java     | 14 +++++++++++---
 .../maven/typescript/TypescriptFormatStepTest.java | 14 +++++++++++---
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java
index 404ccf88c8..6f55312bd5 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -163,7 +163,10 @@ void usePhpCommunityPlugin() throws IOException {
 	@Test
 	void autodetectNpmrcFileConfig() throws IOException {
 		setFile(".npmrc").toLines(
-				"registry=https://i.do.no.exist.com");
+				"registry=https://i.do.not.exist.com",
+				"fetch-timeout=250",
+				"fetch-retry-mintimeout=250",
+				"fetch-retry-maxtimeout=250");
 		setFile("build.gradle").toLines(
 				"plugins {",
 				"    id 'com.diffplug.spotless'",
@@ -186,7 +189,10 @@ void autodetectNpmrcFileConfig() throws IOException {
 	@Test
 	void pickupNpmrcFileConfig() throws IOException {
 		setFile(".custom_npmrc").toLines(
-				"registry=https://i.do.no.exist.com");
+				"registry=https://i.do.not.exist.com",
+				"fetch-timeout=250",
+				"fetch-retry-mintimeout=250",
+				"fetch-retry-maxtimeout=250");
 		setFile("build.gradle").toLines(
 				"plugins {",
 				"    id 'com.diffplug.spotless'",
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/prettier/PrettierFormatStepTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/prettier/PrettierFormatStepTest.java
index 130bbde600..8fce61b5d8 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/prettier/PrettierFormatStepTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/prettier/PrettierFormatStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -145,7 +145,11 @@ void autodetect_parser_based_on_filename() throws Exception {
 
 	@Test
 	void autodetect_npmrc_file() throws Exception {
-		setFile(".npmrc").toLines("registry=https://i.do.no.exist.com");
+		setFile(".npmrc").toLines(
+				"registry=https://i.do.not.exist.com",
+				"fetch-timeout=250",
+				"fetch-retry-mintimeout=250",
+				"fetch-retry-maxtimeout=250");
 		String suffix = "ts";
 		writePomWithPrettierSteps("**/*." + suffix,
 				"<prettier>",
@@ -158,7 +162,11 @@ void autodetect_npmrc_file() throws Exception {
 
 	@Test
 	void select_configured_npmrc_file() throws Exception {
-		setFile(".custom_npmrc").toLines("registry=https://i.do.no.exist.com");
+		setFile(".custom_npmrc").toLines(
+				"registry=https://i.do.not.exist.com",
+				"fetch-timeout=250",
+				"fetch-retry-mintimeout=250",
+				"fetch-retry-maxtimeout=250");
 		String suffix = "ts";
 		writePomWithPrettierSteps("**/*." + suffix,
 				"<prettier>",
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/typescript/TypescriptFormatStepTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/typescript/TypescriptFormatStepTest.java
index 600f9818d1..3b21f972ed 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/typescript/TypescriptFormatStepTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/typescript/TypescriptFormatStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -114,7 +114,11 @@ void testTypescript_2_Configs() throws Exception {
 
 	@Test
 	void testNpmrcIsAutoPickedUp() throws Exception {
-		setFile(".npmrc").toLines("registry=https://i.do.no.exist.com");
+		setFile(".npmrc").toLines(
+				"registry=https://i.do.not.exist.com",
+				"fetch-timeout=250",
+				"fetch-retry-mintimeout=250",
+				"fetch-retry-maxtimeout=250");
 		writePomWithTypescriptSteps(
 				"<tsfmt>",
 				"  <tslintFile>${basedir}/tslint.json</tslintFile>",
@@ -126,7 +130,11 @@ void testNpmrcIsAutoPickedUp() throws Exception {
 
 	@Test
 	void testNpmrcIsConfigurativelyPickedUp() throws Exception {
-		setFile(".custom_npmrc").toLines("registry=https://i.do.no.exist.com");
+		setFile(".custom_npmrc").toLines(
+				"registry=https://i.do.not.exist.com",
+				"fetch-timeout=250",
+				"fetch-retry-mintimeout=250",
+				"fetch-retry-maxtimeout=250");
 		writePomWithTypescriptSteps(
 				"<tsfmt>",
 				"  <tslintFile>${basedir}/tslint.json</tslintFile>",

From 218db79b6ff8d0a1ea8c00a83cf38e21b8a19689 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Wed, 21 Dec 2022 16:31:51 +0100
Subject: [PATCH 0457/2068] eslint: extract base properties

to a common base class
---
 .../spotless/maven/generic/Prettier.java      | 20 ++-----
 .../npm/AbstractNpmFormatterStepFactory.java  | 55 +++++++++++++++++++
 .../spotless/maven/typescript/Tsfmt.java      | 20 ++-----
 3 files changed, 65 insertions(+), 30 deletions(-)
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/npm/AbstractNpmFormatterStepFactory.java

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Prettier.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Prettier.java
index 5bdce32c47..b45f802653 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Prettier.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Prettier.java
@@ -23,12 +23,12 @@
 
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.maven.FormatterStepConfig;
-import com.diffplug.spotless.maven.FormatterStepFactory;
+import com.diffplug.spotless.maven.npm.AbstractNpmFormatterStepFactory;
 import com.diffplug.spotless.npm.NpmPathResolver;
 import com.diffplug.spotless.npm.PrettierConfig;
 import com.diffplug.spotless.npm.PrettierFormatterStep;
 
-public class Prettier implements FormatterStepFactory {
+public class Prettier extends AbstractNpmFormatterStepFactory {
 
 	public static final String ERROR_MESSAGE_ONLY_ONE_CONFIG = "must specify exactly one prettierVersion, devDependencies or devDependencyProperties";
 
@@ -47,12 +47,6 @@ public class Prettier implements FormatterStepFactory {
 	@Parameter
 	private String configFile;
 
-	@Parameter
-	private String npmExecutable;
-
-	@Parameter
-	private String npmrc;
-
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 
@@ -70,10 +64,6 @@ public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 			this.devDependencies = dependencyPropertiesAsMap();
 		}
 
-		File npm = npmExecutable != null ? stepConfig.getFileLocator().locateFile(npmExecutable) : null;
-
-		File npmrcFile = npmrc != null ? stepConfig.getFileLocator().locateFile(npmrc) : null;
-
 		// process config file or inline config
 		File configFileHandler;
 		if (this.configFile != null) {
@@ -103,10 +93,10 @@ public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 		}
 
 		// create the format step
+		File baseDir = baseDir(stepConfig);
+		File buildDir = buildDir(stepConfig);
 		PrettierConfig prettierConfig = new PrettierConfig(configFileHandler, configInline);
-		File buildDir = stepConfig.getFileLocator().getBuildDir();
-		File baseDir = stepConfig.getFileLocator().getBaseDir();
-		NpmPathResolver npmPathResolver = new NpmPathResolver(npm, npmrcFile, baseDir);
+		NpmPathResolver npmPathResolver = npmPathResolver(stepConfig);
 		return PrettierFormatterStep.create(devDependencies, stepConfig.getProvisioner(), baseDir, buildDir, npmPathResolver, prettierConfig);
 	}
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/npm/AbstractNpmFormatterStepFactory.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/npm/AbstractNpmFormatterStepFactory.java
new file mode 100644
index 0000000000..8bc0f8f715
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/npm/AbstractNpmFormatterStepFactory.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2016-2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.npm;
+
+import java.io.File;
+
+import org.apache.maven.plugins.annotations.Parameter;
+
+import com.diffplug.spotless.maven.FormatterStepConfig;
+import com.diffplug.spotless.maven.FormatterStepFactory;
+import com.diffplug.spotless.npm.NpmPathResolver;
+
+public abstract class AbstractNpmFormatterStepFactory implements FormatterStepFactory {
+
+	@Parameter
+	private String npmExecutable;
+
+	@Parameter
+	private String npmrc;
+
+	protected File npm(FormatterStepConfig stepConfig) {
+		File npm = npmExecutable != null ? stepConfig.getFileLocator().locateFile(npmExecutable) : null;
+		return npm;
+	}
+
+	protected File npmrc(FormatterStepConfig stepConfig) {
+		File npmrc = this.npmrc != null ? stepConfig.getFileLocator().locateFile(this.npmrc) : null;
+		return npmrc;
+	}
+
+	protected File buildDir(FormatterStepConfig stepConfig) {
+		return stepConfig.getFileLocator().getBuildDir();
+	}
+
+	protected File baseDir(FormatterStepConfig stepConfig) {
+		return stepConfig.getFileLocator().getBaseDir();
+	}
+
+	protected NpmPathResolver npmPathResolver(FormatterStepConfig stepConfig) {
+		return new NpmPathResolver(npm(stepConfig), npmrc(stepConfig), baseDir(stepConfig));
+	}
+}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Tsfmt.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Tsfmt.java
index e41231818c..6c60c02cc6 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Tsfmt.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Tsfmt.java
@@ -23,13 +23,13 @@
 
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.maven.FormatterStepConfig;
-import com.diffplug.spotless.maven.FormatterStepFactory;
+import com.diffplug.spotless.maven.npm.AbstractNpmFormatterStepFactory;
 import com.diffplug.spotless.npm.NpmPathResolver;
 import com.diffplug.spotless.npm.TsConfigFileType;
 import com.diffplug.spotless.npm.TsFmtFormatterStep;
 import com.diffplug.spotless.npm.TypedTsFmtConfigFile;
 
-public class Tsfmt implements FormatterStepFactory {
+public class Tsfmt extends AbstractNpmFormatterStepFactory {
 
 	@Parameter
 	private String tslintFile;
@@ -52,12 +52,6 @@ public class Tsfmt implements FormatterStepFactory {
 	@Parameter
 	private String tslintVersion;
 
-	@Parameter
-	private String npmExecutable;
-
-	@Parameter
-	private String npmrc;
-
 	@Parameter
 	private Map<String, String> config;
 
@@ -74,10 +68,6 @@ public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 			devDependencies.put("tslint", tslintVersion);
 		}
 
-		File npm = npmExecutable != null ? stepConfig.getFileLocator().locateFile(npmExecutable) : null;
-
-		File npmrcFile = npmrc != null ? stepConfig.getFileLocator().locateFile(npmrc) : null;
-
 		TypedTsFmtConfigFile configFile;
 		Map<String, Object> configInline;
 		// check that there is only 1 config file or inline config
@@ -119,9 +109,9 @@ public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 			throw onlyOneConfig();
 		}
 
-		File buildDir = stepConfig.getFileLocator().getBuildDir();
-		File baseDir = stepConfig.getFileLocator().getBaseDir();
-		NpmPathResolver npmPathResolver = new NpmPathResolver(npm, npmrcFile, baseDir);
+		File buildDir = buildDir(stepConfig);
+		File baseDir = baseDir(stepConfig);
+		NpmPathResolver npmPathResolver = npmPathResolver(stepConfig);
 		return TsFmtFormatterStep.create(devDependencies, stepConfig.getProvisioner(), baseDir, buildDir, npmPathResolver, configFile, configInline);
 	}
 

From 31462a224d9b54c21ce75366e5d40ce5ea59f540 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Thu, 22 Dec 2022 07:52:03 +0100
Subject: [PATCH 0458/2068] eslint: initial maven support

---
 .../spotless/npm/EslintFormatterStep.java     | 25 +++--
 .../gradle/spotless/JavascriptExtension.java  | 14 +--
 .../gradle/spotless/TypescriptExtension.java  |  9 +-
 .../spotless/maven/AbstractSpotlessMojo.java  |  4 +
 .../spotless/maven/javascript/EslintJs.java   | 98 +++++++++++++++++++
 .../spotless/maven/javascript/Javascript.java | 42 ++++++++
 .../spotless/maven/typescript/EslintTs.java   | 48 +++++++++
 .../spotless/maven/typescript/Typescript.java |  8 +-
 .../spotless/npm/EslintFormatterStepTest.java |  2 +-
 9 files changed, 221 insertions(+), 29 deletions(-)
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/EslintJs.java
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/Javascript.java
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/EslintTs.java

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
index 8589819540..820283aae4 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
@@ -20,12 +20,14 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.TreeMap;
+import java.util.function.Predicate;
 
 import javax.annotation.Nonnull;
 
@@ -50,7 +52,7 @@ public class EslintFormatterStep {
 	public enum PopularStyleGuide {
 		TS_STANDARD_WITH_TYPESCRIPT("standard-with-typescript") {
 			@Override
-			public Map<String, String> devDependencies() {
+			public @Nonnull Map<String, String> devDependencies() {
 				Map<String, String> dependencies = new LinkedHashMap<>();
 				dependencies.put("eslint-config-standard-with-typescript", "^24.0.0");
 				dependencies.put("eslint-plugin-import", "^2.26.0");
@@ -61,7 +63,7 @@ public Map<String, String> devDependencies() {
 		},
 		TS_XO_TYPESCRIPT("xo-typescript") {
 			@Override
-			public Map<String, String> devDependencies() {
+			public @Nonnull Map<String, String> devDependencies() {
 				Map<String, String> dependencies = new LinkedHashMap<>();
 				dependencies.put("eslint-config-xo", "^0.43.1");
 				dependencies.put("eslint-config-xo-typescript", "^0.55.1");
@@ -70,7 +72,7 @@ public Map<String, String> devDependencies() {
 		},
 		JS_AIRBNB("airbnb") {
 			@Override
-			public Map<String, String> devDependencies() {
+			public @Nonnull Map<String, String> devDependencies() {
 				Map<String, String> dependencies = new LinkedHashMap<>();
 				dependencies.put("eslint-config-airbnb-base", "^15.0.0");
 				dependencies.put("eslint-plugin-import", "^2.26.0");
@@ -79,7 +81,7 @@ public Map<String, String> devDependencies() {
 		},
 		JS_GOOGLE("google") {
 			@Override
-			public Map<String, String> devDependencies() {
+			public @Nonnull Map<String, String> devDependencies() {
 				Map<String, String> dependencies = new LinkedHashMap<>();
 				dependencies.put("eslint-config-google", "^0.14.0");
 				return dependencies;
@@ -87,7 +89,7 @@ public Map<String, String> devDependencies() {
 		},
 		JS_STANDARD("standard") {
 			@Override
-			public Map<String, String> devDependencies() {
+			public @Nonnull Map<String, String> devDependencies() {
 				Map<String, String> dependencies = new LinkedHashMap<>();
 				dependencies.put("eslint-config-standard", "^17.0.0");
 				dependencies.put("eslint-plugin-import", "^2.26.0");
@@ -98,7 +100,7 @@ public Map<String, String> devDependencies() {
 		},
 		JS_XO("xo") {
 			@Override
-			public Map<String, String> devDependencies() {
+			public @Nonnull Map<String, String> devDependencies() {
 				Map<String, String> dependencies = new LinkedHashMap<>();
 				dependencies.put("eslint-config-xo", "^0.43.1");
 				return dependencies;
@@ -115,7 +117,7 @@ public String getPopularStyleGuideName() {
 			return popularStyleGuideName;
 		}
 
-		public abstract Map<String, String> devDependencies();
+		public abstract @Nonnull Map<String, String> devDependencies();
 
 		public static PopularStyleGuide fromNameOrNull(String popularStyleGuideName) {
 			for (PopularStyleGuide popularStyleGuide : PopularStyleGuide.values()) {
@@ -125,6 +127,15 @@ public static PopularStyleGuide fromNameOrNull(String popularStyleGuideName) {
 			}
 			return null;
 		}
+
+		public static String getPopularStyleGuideNames(Predicate<PopularStyleGuide> filter) {
+			// collect matching style guide names using stream
+			return Arrays.stream(PopularStyleGuide.values())
+					.filter(filter)
+					.map(PopularStyleGuide::getPopularStyleGuideName)
+					.sorted()
+					.collect(java.util.stream.Collectors.joining(", "));
+		}
 	}
 
 	public static Map<String, String> defaultDevDependenciesForTypescript() {
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
index fb05387f49..cbe0040a83 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
@@ -17,12 +17,10 @@
 
 import static java.util.Objects.requireNonNull;
 
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.function.Consumer;
-import java.util.stream.Collectors;
 
 import javax.annotation.Nullable;
 import javax.inject.Inject;
@@ -100,9 +98,8 @@ public T styleGuide(String styleGuide) {
 			PopularStyleGuide popularStyleGuide = PopularStyleGuide.fromNameOrNull(styleGuide);
 
 			verifyStyleGuideIsSupported(styleGuide, popularStyleGuide);
-			devDependencies(popularStyleGuide.devDependencies());
-			replaceStep();
-			return (T) this;
+			assert popularStyleGuide != null;
+			return devDependencies(popularStyleGuide.devDependencies());
 		}
 
 		protected abstract void verifyStyleGuideIsSupported(String styleGuideName, PopularStyleGuide popularStyleGuide);
@@ -129,12 +126,7 @@ public FormatterStep createStep() {
 		@Override
 		protected void verifyStyleGuideIsSupported(String styleGuideName, PopularStyleGuide popularStyleGuide) {
 			if (!isJsStyleGuide(popularStyleGuide)) {
-				throw new IllegalArgumentException("Unknown style guide: " + styleGuideName + ". Known javascript style guides: "
-						+ Arrays.stream(PopularStyleGuide.values())
-								.filter(this::isJsStyleGuide)
-								.map(PopularStyleGuide::getPopularStyleGuideName)
-								.sorted()
-								.collect(Collectors.joining(", ")));
+				throw new IllegalArgumentException("Unknown style guide: " + styleGuideName + ". Known javascript style guides: " + PopularStyleGuide.getPopularStyleGuideNames(this::isJsStyleGuide));
 			}
 		}
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
index f318dd89c8..79ae056bdc 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
@@ -17,12 +17,10 @@
 
 import static java.util.Objects.requireNonNull;
 
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Objects;
 import java.util.TreeMap;
-import java.util.stream.Collectors;
 
 import javax.annotation.Nullable;
 import javax.inject.Inject;
@@ -209,12 +207,7 @@ public TypescriptEslintConfig tsconfigFile(Object path) {
 		@Override
 		protected void verifyStyleGuideIsSupported(String styleGuideName, PopularStyleGuide popularStyleGuide) {
 			if (!isTsStyleGuide(popularStyleGuide)) {
-				throw new IllegalArgumentException("Unknown style guide: " + styleGuideName + ". Known typescript style guides: "
-						+ Arrays.stream(EslintFormatterStep.PopularStyleGuide.values())
-								.filter(this::isTsStyleGuide)
-								.map(PopularStyleGuide::getPopularStyleGuideName)
-								.sorted()
-								.collect(Collectors.joining(", ")));
+				throw new IllegalArgumentException("Unknown style guide: " + styleGuideName + ". Known typescript style guides: " + PopularStyleGuide.getPopularStyleGuideNames(this::isTsStyleGuide));
 			}
 		}
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
index e4fdc7dcd0..f13f9b200d 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
@@ -64,6 +64,7 @@
 import com.diffplug.spotless.maven.incremental.UpToDateChecker;
 import com.diffplug.spotless.maven.incremental.UpToDateChecking;
 import com.diffplug.spotless.maven.java.Java;
+import com.diffplug.spotless.maven.javascript.Javascript;
 import com.diffplug.spotless.maven.kotlin.Kotlin;
 import com.diffplug.spotless.maven.markdown.Markdown;
 import com.diffplug.spotless.maven.pom.Pom;
@@ -152,6 +153,9 @@ public abstract class AbstractSpotlessMojo extends AbstractMojo {
 	@Parameter
 	private Typescript typescript;
 
+	@Parameter
+	private Javascript javascript;
+
 	@Parameter
 	private Antlr4 antlr4;
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/EslintJs.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/EslintJs.java
new file mode 100644
index 0000000000..91de2136a1
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/EslintJs.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2016-2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.javascript;
+
+import java.io.File;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.apache.maven.plugins.annotations.Parameter;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.maven.FormatterStepConfig;
+import com.diffplug.spotless.maven.npm.AbstractNpmFormatterStepFactory;
+import com.diffplug.spotless.npm.EslintConfig;
+import com.diffplug.spotless.npm.EslintFormatterStep;
+import com.diffplug.spotless.npm.NpmPathResolver;
+
+public class EslintJs extends AbstractNpmFormatterStepFactory {
+
+	@Parameter
+	private String configFile;
+
+	@Parameter
+	private String configJs;
+
+	@Parameter
+	private String styleGuide;
+
+	@Parameter
+	protected String eslintVersion;
+
+	@Parameter
+	private Map<String, String> devDependencies;
+
+	@Override
+	public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
+		Map<String, String> devDependencies = new TreeMap<>();
+		if (this.devDependencies != null) {
+			devDependencies.putAll(this.devDependencies);
+		} else {
+			Map<String, String> defaultDependencies = createDefaultDependencies();
+			devDependencies.putAll(defaultDependencies);
+		}
+
+		addStyleGuideDevDependencies(devDependencies);
+
+		File buildDir = buildDir(stepConfig);
+		File baseDir = baseDir(stepConfig);
+		NpmPathResolver npmPathResolver = npmPathResolver(stepConfig);
+		return EslintFormatterStep.create(devDependencies, stepConfig.getProvisioner(), baseDir, buildDir, npmPathResolver, eslintConfig(stepConfig));
+	}
+
+	protected EslintConfig eslintConfig(FormatterStepConfig stepConfig) {
+		return new EslintConfig(this.configFile != null ? stepConfig.getFileLocator().locateFile(this.configFile) : null, this.configJs);
+	}
+
+	private void addStyleGuideDevDependencies(Map<String, String> devDependencies) {
+		if (this.styleGuide != null) {
+			EslintFormatterStep.PopularStyleGuide styleGuide = EslintFormatterStep.PopularStyleGuide.valueOf(this.styleGuide);
+			validateStyleGuide(styleGuide);
+			devDependencies.putAll(styleGuide.devDependencies());
+		}
+	}
+
+	private void validateStyleGuide(EslintFormatterStep.PopularStyleGuide styleGuide) {
+		if (styleGuide == null) {
+			throw new IllegalArgumentException("StyleGuide '" + this.styleGuide + "' is not supported. Supported style guides: " + supportedStyleGuides());
+		}
+		if (!isValidStyleGuide(styleGuide)) {
+			throw new IllegalArgumentException("StyleGuide must be of correct type but is: " + styleGuide + ". Use one of the following: " + supportedStyleGuides());
+		}
+	}
+
+	private String supportedStyleGuides() {
+		return EslintFormatterStep.PopularStyleGuide.getPopularStyleGuideNames(this::isValidStyleGuide);
+	}
+
+	protected boolean isValidStyleGuide(EslintFormatterStep.PopularStyleGuide styleGuide) {
+		return styleGuide.name().startsWith("JS_");
+	}
+
+	protected Map<String, String> createDefaultDependencies() {
+		return eslintVersion == null ? EslintFormatterStep.defaultDevDependencies() : EslintFormatterStep.defaultDevDependenciesWithEslint(eslintVersion);
+	}
+}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/Javascript.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/Javascript.java
new file mode 100644
index 0000000000..db7049ff0d
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/Javascript.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2016-2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.javascript;
+
+import java.util.Collections;
+import java.util.Set;
+
+import com.diffplug.spotless.maven.FormatterFactory;
+
+/**
+ * A {@link FormatterFactory} implementation that corresponds to {@code <javascript>...</javascript>} configuration element.
+ * <p>
+ * It defines a formatter for typescript source files.
+ */
+public class Javascript extends FormatterFactory {
+	@Override
+	public Set<String> defaultIncludes() {
+		return Collections.emptySet();
+	}
+
+	@Override
+	public String licenseHeaderDelimiter() {
+		return null;
+	}
+
+	public void addEslint(EslintJs eslint) {
+		addStepFactory(eslint);
+	}
+}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/EslintTs.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/EslintTs.java
new file mode 100644
index 0000000000..0fe834ffde
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/EslintTs.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.typescript;
+
+import java.util.Map;
+
+import org.apache.maven.plugins.annotations.Parameter;
+
+import com.diffplug.spotless.maven.FormatterStepConfig;
+import com.diffplug.spotless.maven.javascript.EslintJs;
+import com.diffplug.spotless.npm.EslintConfig;
+import com.diffplug.spotless.npm.EslintFormatterStep;
+import com.diffplug.spotless.npm.EslintTypescriptConfig;
+
+public class EslintTs extends EslintJs {
+
+	@Parameter
+	private String tsconfigFile;
+
+	@Override
+	protected EslintConfig eslintConfig(FormatterStepConfig stepConfig) {
+		EslintConfig jsConfig = super.eslintConfig(stepConfig);
+		return new EslintTypescriptConfig(jsConfig.getEslintConfigPath(), jsConfig.getEslintConfigJs(), tsconfigFile != null ? stepConfig.getFileLocator().locateFile(tsconfigFile) : null);
+	}
+
+	@Override
+	protected boolean isValidStyleGuide(EslintFormatterStep.PopularStyleGuide styleGuide) {
+		return styleGuide.name().startsWith("TS_");
+	}
+
+	@Override
+	protected Map<String, String> createDefaultDependencies() {
+		return this.eslintVersion == null ? EslintFormatterStep.defaultDevDependenciesForTypescript() : EslintFormatterStep.defaultDevDependenciesTypescriptWithEslint(this.eslintVersion);
+	}
+}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Typescript.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Typescript.java
index da6e6ddd91..1320cac2d8 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Typescript.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Typescript.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
 /**
  * A {@link FormatterFactory} implementation that corresponds to {@code <typescript>...</typescript>} configuration element.
  * <p>
- * It defines a formatter for typescript source files.
+ * It defines formatters for typescript source files.
  */
 public class Typescript extends FormatterFactory {
 	@Override
@@ -39,4 +39,8 @@ public String licenseHeaderDelimiter() {
 	public void addTsfmt(Tsfmt tsfmt) {
 		addStepFactory(tsfmt);
 	}
+
+	public void addEslint(EslintTs eslint) {
+		addStepFactory(eslint);
+	}
 }
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
index 95298db0ea..15ebb0cc0d 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
@@ -128,7 +128,7 @@ class EslintInlineConfigTypescriptFormattingStepTest extends NpmFormatterStepCom
 
 		@Test
 		void formattingUsingInlineXoConfig() throws Exception {
-			String filedir = "npm/eslint/typescript/standard_rules_xo/";
+			String filedir = "npm/eslint/typescript/styleguide/xo/";
 
 			String testDir = "formatting_ruleset_xo_inline_config/";
 

From dd5ae78fcd05300f64a6a85a1823402fe1891045 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Thu, 22 Dec 2022 20:04:16 +0100
Subject: [PATCH 0459/2068] eslint: tests for maven integration into typescript

---
 .../com/diffplug/spotless/npm/eslint-serve.js |   2 +-
 .../spotless/maven/javascript/EslintJs.java   |   4 +-
 .../maven/MavenIntegrationHarness.java        |   4 +-
 .../typescript/TypescriptFormatStepTest.java  | 107 +++++++++++++++---
 4 files changed, 96 insertions(+), 21 deletions(-)

diff --git a/lib/src/main/resources/com/diffplug/spotless/npm/eslint-serve.js b/lib/src/main/resources/com/diffplug/spotless/npm/eslint-serve.js
index b9f3207d5f..1f1b1fab5a 100644
--- a/lib/src/main/resources/com/diffplug/spotless/npm/eslint-serve.js
+++ b/lib/src/main/resources/com/diffplug/spotless/npm/eslint-serve.js
@@ -55,7 +55,7 @@ app.post("/eslint/format", async (req, res) => {
 		// LintResult[] // https://eslint.org/docs/latest/developer-guide/nodejs-api#-lintresult-type
 		const results = await eslint.lintText(format_data.file_content, lintTextOptions);
 		if (results.length !== 1) {
-			res.status(501).send("Error while formatting: Unexpected number of results");
+			res.status(501).send("Error while formatting: Unexpected number of results: " + JSON.stringify(results));
 			return;
 		}
 		const result = results[0];
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/EslintJs.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/EslintJs.java
index 91de2136a1..589e2f3f0c 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/EslintJs.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/EslintJs.java
@@ -69,7 +69,7 @@ protected EslintConfig eslintConfig(FormatterStepConfig stepConfig) {
 
 	private void addStyleGuideDevDependencies(Map<String, String> devDependencies) {
 		if (this.styleGuide != null) {
-			EslintFormatterStep.PopularStyleGuide styleGuide = EslintFormatterStep.PopularStyleGuide.valueOf(this.styleGuide);
+			EslintFormatterStep.PopularStyleGuide styleGuide = EslintFormatterStep.PopularStyleGuide.fromNameOrNull(this.styleGuide);
 			validateStyleGuide(styleGuide);
 			devDependencies.putAll(styleGuide.devDependencies());
 		}
@@ -80,7 +80,7 @@ private void validateStyleGuide(EslintFormatterStep.PopularStyleGuide styleGuide
 			throw new IllegalArgumentException("StyleGuide '" + this.styleGuide + "' is not supported. Supported style guides: " + supportedStyleGuides());
 		}
 		if (!isValidStyleGuide(styleGuide)) {
-			throw new IllegalArgumentException("StyleGuide must be of correct type but is: " + styleGuide + ". Use one of the following: " + supportedStyleGuides());
+			throw new IllegalArgumentException("StyleGuide must be of correct type but is: " + styleGuide.getPopularStyleGuideName() + ". Use one of the following: " + supportedStyleGuides());
 		}
 	}
 
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
index 939940a315..61d9c80a37 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
@@ -136,8 +136,8 @@ protected void writePomWithCppSteps(String... steps) throws IOException {
 		writePom(groupWithSteps("cpp", steps));
 	}
 
-	protected void writePomWithTypescriptSteps(String... steps) throws IOException {
-		writePom(groupWithSteps("typescript", including("**/*.ts"), steps));
+	protected void writePomWithTypescriptSteps(String includes, String... steps) throws IOException {
+		writePom(groupWithSteps("typescript", including(includes), steps));
 	}
 
 	protected void writePomWithSqlSteps(String... steps) throws IOException {
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/typescript/TypescriptFormatStepTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/typescript/TypescriptFormatStepTest.java
index 3b21f972ed..b57a2a97a6 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/typescript/TypescriptFormatStepTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/typescript/TypescriptFormatStepTest.java
@@ -21,84 +21,95 @@
 
 import org.junit.jupiter.api.Test;
 
+import com.diffplug.spotless.ResourceHarness;
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
 import com.diffplug.spotless.maven.MavenRunner.Result;
 import com.diffplug.spotless.tag.NpmTest;
 
 @NpmTest
 class TypescriptFormatStepTest extends MavenIntegrationHarness {
-	private void run(String kind) throws IOException, InterruptedException {
-		String path = prepareRun(kind);
+
+	private static final String TEST_FILE_PATH = "src/main/typescript/test.ts";
+
+	private void runTsfmt(String kind) throws IOException, InterruptedException {
+		String path = prepareRunTsfmt(kind);
 		mavenRunner().withArguments("spotless:apply").runNoError();
 		assertFile(path).sameAsResource("npm/tsfmt/" + kind + "/" + kind + ".clean");
 	}
 
-	private String prepareRun(String kind) throws IOException {
-		String path = "src/main/typescript/test.ts";
-		setFile(path).toResource("npm/tsfmt/" + kind + "/" + kind + ".dirty");
-		return path;
+	private String prepareRunTsfmt(String kind) throws IOException {
+		setFile(TEST_FILE_PATH).toResource("npm/tsfmt/" + kind + "/" + kind + ".dirty");
+		return TEST_FILE_PATH;
 	}
 
-	private Result runExpectingError(String kind) throws IOException, InterruptedException {
-		prepareRun(kind);
+	private Result runExpectingErrorTsfmt(String kind) throws IOException, InterruptedException {
+		prepareRunTsfmt(kind);
 		return mavenRunner().withArguments("spotless:apply").runHasError();
 	}
 
 	@Test
 	void tslint() throws Exception {
 		writePomWithTypescriptSteps(
+				TEST_FILE_PATH,
 				"<tsfmt>",
 				"  <tslintFile>${basedir}/tslint.json</tslintFile>",
 				"</tsfmt>");
 		setFile("tslint.json").toResource("npm/tsfmt/tslint/tslint.json");
-		run("tslint");
+		runTsfmt("tslint");
 	}
 
 	@Test
 	void vscode() throws Exception {
 		writePomWithTypescriptSteps(
+				TEST_FILE_PATH,
 				"<tsfmt>",
 				"  <vscodeFile>${basedir}/vscode.json</vscodeFile>",
 				"</tsfmt>");
 		setFile("vscode.json").toResource("npm/tsfmt/vscode/vscode.json");
-		run("vscode");
+		runTsfmt("vscode");
 	}
 
 	@Test
 	void tsfmt() throws Exception {
 		writePomWithTypescriptSteps(
+				TEST_FILE_PATH,
 				"<tsfmt>",
 				"  <tsfmtFile>${basedir}/tsfmt.json</tsfmtFile>",
 				"</tsfmt>");
 		setFile("tsfmt.json").toResource("npm/tsfmt/tsfmt/tsfmt.json");
-		run("tsfmt");
+		runTsfmt("tsfmt");
 	}
 
 	@Test
 	void tsfmtInline() throws Exception {
 		writePomWithTypescriptSteps(
+				TEST_FILE_PATH,
 				"<tsfmt>",
 				"  <config>",
 				"    <indentSize>1</indentSize>",
 				"    <convertTabsToSpaces>true</convertTabsToSpaces>",
 				"  </config>",
 				"</tsfmt>");
-		run("tsfmt");
+		runTsfmt("tsfmt");
 	}
 
 	@Test
 	void tsconfig() throws Exception {
 		writePomWithTypescriptSteps(
+				TEST_FILE_PATH,
 				"<tsfmt>",
 				"  <tsconfigFile>${project.basedir}/tsconfig.json</tsconfigFile>",
 				"</tsfmt>");
 		setFile("tsconfig.json").toResource("npm/tsfmt/tsconfig/tsconfig.json");
-		run("tsconfig");
+		runTsfmt("tsconfig");
 	}
 
 	@Test
 	void testTypescript_2_Configs() throws Exception {
+		String path = "src/main/typescript/test.ts";
+
 		writePomWithTypescriptSteps(
+				path,
 				"<tsfmt>",
 				"  <vscodeFile>${basedir}/tslint.json</vscodeFile>",
 				"  <tsfmtFile>${basedir}/tslint.json</tsfmtFile>",
@@ -106,7 +117,6 @@ void testTypescript_2_Configs() throws Exception {
 		setFile("vscode.json").toResource("npm/tsfmt/vscode/vscode.json");
 		setFile("tsfmt.json").toResource("npm/tsfmt/tsfmt/tsfmt.json");
 
-		String path = "src/main/typescript/test.ts";
 		setFile(path).toResource("npm/tsfmt/tsfmt/tsfmt.dirty");
 		Result result = mavenRunner().withArguments("spotless:apply").runHasError();
 		assertThat(result.output()).contains("must specify exactly one configFile or config");
@@ -120,11 +130,12 @@ void testNpmrcIsAutoPickedUp() throws Exception {
 				"fetch-retry-mintimeout=250",
 				"fetch-retry-maxtimeout=250");
 		writePomWithTypescriptSteps(
+				TEST_FILE_PATH,
 				"<tsfmt>",
 				"  <tslintFile>${basedir}/tslint.json</tslintFile>",
 				"</tsfmt>");
 		setFile("tslint.json").toResource("npm/tsfmt/tslint/tslint.json");
-		Result result = runExpectingError("tslint");
+		Result result = runExpectingErrorTsfmt("tslint");
 		assertThat(result.output()).containsPattern("Running npm command.*npm install.* failed with exit code: 1");
 	}
 
@@ -136,12 +147,76 @@ void testNpmrcIsConfigurativelyPickedUp() throws Exception {
 				"fetch-retry-mintimeout=250",
 				"fetch-retry-maxtimeout=250");
 		writePomWithTypescriptSteps(
+				TEST_FILE_PATH,
 				"<tsfmt>",
 				"  <tslintFile>${basedir}/tslint.json</tslintFile>",
 				"  <npmrc>${basedir}/.custom_npmrc</npmrc>",
 				"</tsfmt>");
 		setFile("tslint.json").toResource("npm/tsfmt/tslint/tslint.json");
-		Result result = runExpectingError("tslint");
+		Result result = runExpectingErrorTsfmt("tslint");
 		assertThat(result.output()).containsPattern("Running npm command.*npm install.* failed with exit code: 1");
 	}
+
+	@Test
+	void eslintConfigFile() throws Exception {
+		writePomWithTypescriptSteps(
+				TEST_FILE_PATH,
+				"<eslint>",
+				"  <configFile>.eslintrc.js</configFile>",
+				"</eslint>");
+		setFile(".eslintrc.js").toResource("npm/eslint/typescript/custom_rules/.eslintrc.js");
+		setFile(TEST_FILE_PATH).toResource("npm/eslint/typescript/custom_rules/typescript.dirty");
+
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile(TEST_FILE_PATH).sameAsResource("npm/eslint/typescript/custom_rules/typescript.clean");
+	}
+
+	@Test
+	void eslintConfigJs() throws Exception {
+		final String configJs = ResourceHarness.getTestResource("npm/eslint/typescript/custom_rules/.eslintrc.js")
+				.replace("module.exports = ", "");
+		writePomWithTypescriptSteps(
+				TEST_FILE_PATH,
+				"<eslint>",
+				"  <configJs>" + configJs + "</configJs>",
+				"</eslint>");
+		setFile(TEST_FILE_PATH).toResource("npm/eslint/typescript/custom_rules/typescript.dirty");
+
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile(TEST_FILE_PATH).sameAsResource("npm/eslint/typescript/custom_rules/typescript.clean");
+	}
+
+	@Test
+	void eslintStyleguideStandardWithTypescript() throws Exception {
+		writePomWithTypescriptSteps(
+				TEST_FILE_PATH,
+				"<eslint>",
+				"  <configFile>.eslintrc.js</configFile>",
+				"  <styleGuide>standard-with-typescript</styleGuide>",
+				"  <tsconfigFile>${basedir}/tsconfig.json</tsconfigFile>",
+				"</eslint>");
+		setFile(".eslintrc.js").toResource("npm/eslint/typescript/styleguide/standard_with_typescript/.eslintrc.js");
+		setFile("tsconfig.json").toResource("npm/eslint/typescript/styleguide/standard_with_typescript/tsconfig.json");
+		setFile(TEST_FILE_PATH).toResource("npm/eslint/typescript/styleguide/standard_with_typescript/typescript.dirty");
+
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile(TEST_FILE_PATH).sameAsResource("npm/eslint/typescript/styleguide/standard_with_typescript/typescript.clean");
+	}
+
+	@Test
+	void eslintStyleguideXo() throws Exception {
+		writePomWithTypescriptSteps(
+				TEST_FILE_PATH,
+				"<eslint>",
+				"  <configFile>.eslintrc.js</configFile>",
+				"  <styleGuide>xo-typescript</styleGuide>",
+				"  <tsconfigFile>${basedir}/tsconfig.json</tsconfigFile>",
+				"</eslint>");
+		setFile(".eslintrc.js").toResource("npm/eslint/typescript/styleguide/xo/.eslintrc.js");
+		setFile("tsconfig.json").toResource("npm/eslint/typescript/styleguide/xo/tsconfig.json");
+		setFile(TEST_FILE_PATH).toResource("npm/eslint/typescript/styleguide/xo/typescript.dirty");
+
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile(TEST_FILE_PATH).sameAsResource("npm/eslint/typescript/styleguide/xo/typescript.clean");
+	}
 }

From 7d2e5adc131e6458bb71e8e9cb694dffce1ae502 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Fri, 23 Dec 2022 07:53:57 +0100
Subject: [PATCH 0460/2068] eslint: adding maven javascript tests

---
 .../spotless/maven/AbstractSpotlessMojo.java  |   2 +-
 .../maven/javascript/AbstractEslint.java      |  92 +++++++++++++++
 .../spotless/maven/javascript/EslintJs.java   |  65 +---------
 .../spotless/maven/typescript/EslintTs.java   |  10 +-
 .../maven/MavenIntegrationHarness.java        |   4 +
 .../javascript/JavascriptFormatStepTest.java  | 111 ++++++++++++++++++
 6 files changed, 216 insertions(+), 68 deletions(-)
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/AbstractEslint.java
 create mode 100644 plugin-maven/src/test/java/com/diffplug/spotless/maven/javascript/JavascriptFormatStepTest.java

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
index f13f9b200d..647535a590 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
@@ -335,7 +335,7 @@ private FileLocator getFileLocator() {
 	}
 
 	private List<FormatterFactory> getFormatterFactories() {
-		return Stream.concat(formats.stream(), Stream.of(groovy, java, scala, kotlin, cpp, typescript, antlr4, pom, sql, python, markdown))
+		return Stream.concat(formats.stream(), Stream.of(groovy, java, scala, kotlin, cpp, typescript, javascript, antlr4, pom, sql, python, markdown))
 				.filter(Objects::nonNull)
 				.collect(toList());
 	}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/AbstractEslint.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/AbstractEslint.java
new file mode 100644
index 0000000000..735a25c0c5
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/AbstractEslint.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2016-2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.javascript;
+
+import java.io.File;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.apache.maven.plugins.annotations.Parameter;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.maven.FormatterStepConfig;
+import com.diffplug.spotless.maven.npm.AbstractNpmFormatterStepFactory;
+import com.diffplug.spotless.npm.EslintConfig;
+import com.diffplug.spotless.npm.EslintFormatterStep;
+import com.diffplug.spotless.npm.NpmPathResolver;
+
+public abstract class AbstractEslint extends AbstractNpmFormatterStepFactory {
+
+	@Parameter
+	protected String configFile;
+
+	@Parameter
+	protected String configJs;
+
+	@Parameter
+	protected String styleGuide;
+
+	@Parameter
+	protected String eslintVersion;
+
+	@Parameter
+	protected Map<String, String> devDependencies;
+
+	@Override
+	public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
+		Map<String, String> devDependencies = new TreeMap<>();
+		if (this.devDependencies != null) {
+			devDependencies.putAll(this.devDependencies);
+		} else {
+			Map<String, String> defaultDependencies = createDefaultDependencies();
+			devDependencies.putAll(defaultDependencies);
+		}
+
+		addStyleGuideDevDependencies(devDependencies);
+
+		File buildDir = buildDir(stepConfig);
+		File baseDir = baseDir(stepConfig);
+		NpmPathResolver npmPathResolver = npmPathResolver(stepConfig);
+		return EslintFormatterStep.create(devDependencies, stepConfig.getProvisioner(), baseDir, buildDir, npmPathResolver, eslintConfig(stepConfig));
+	}
+
+	protected abstract EslintConfig eslintConfig(FormatterStepConfig stepConfig);
+
+	private void addStyleGuideDevDependencies(Map<String, String> devDependencies) {
+		if (this.styleGuide != null) {
+			EslintFormatterStep.PopularStyleGuide styleGuide = EslintFormatterStep.PopularStyleGuide.fromNameOrNull(this.styleGuide);
+			validateStyleGuide(styleGuide);
+			devDependencies.putAll(styleGuide.devDependencies());
+		}
+	}
+
+	private void validateStyleGuide(EslintFormatterStep.PopularStyleGuide styleGuide) {
+		if (styleGuide == null) {
+			throw new IllegalArgumentException("StyleGuide '" + this.styleGuide + "' is not supported. Supported style guides: " + supportedStyleGuides());
+		}
+		if (!isValidStyleGuide(styleGuide)) {
+			throw new IllegalArgumentException("StyleGuide must be of correct type but is: " + styleGuide.getPopularStyleGuideName() + ". Use one of the following: " + supportedStyleGuides());
+		}
+	}
+
+	private String supportedStyleGuides() {
+		return EslintFormatterStep.PopularStyleGuide.getPopularStyleGuideNames(this::isValidStyleGuide);
+	}
+
+	protected abstract boolean isValidStyleGuide(EslintFormatterStep.PopularStyleGuide styleGuide);
+
+	protected abstract Map<String, String> createDefaultDependencies();
+}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/EslintJs.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/EslintJs.java
index 589e2f3f0c..f6c7beaff4 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/EslintJs.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/EslintJs.java
@@ -15,84 +15,23 @@
  */
 package com.diffplug.spotless.maven.javascript;
 
-import java.io.File;
 import java.util.Map;
-import java.util.TreeMap;
 
-import org.apache.maven.plugins.annotations.Parameter;
-
-import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.maven.FormatterStepConfig;
-import com.diffplug.spotless.maven.npm.AbstractNpmFormatterStepFactory;
 import com.diffplug.spotless.npm.EslintConfig;
 import com.diffplug.spotless.npm.EslintFormatterStep;
-import com.diffplug.spotless.npm.NpmPathResolver;
-
-public class EslintJs extends AbstractNpmFormatterStepFactory {
-
-	@Parameter
-	private String configFile;
-
-	@Parameter
-	private String configJs;
-
-	@Parameter
-	private String styleGuide;
-
-	@Parameter
-	protected String eslintVersion;
-
-	@Parameter
-	private Map<String, String> devDependencies;
-
-	@Override
-	public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
-		Map<String, String> devDependencies = new TreeMap<>();
-		if (this.devDependencies != null) {
-			devDependencies.putAll(this.devDependencies);
-		} else {
-			Map<String, String> defaultDependencies = createDefaultDependencies();
-			devDependencies.putAll(defaultDependencies);
-		}
 
-		addStyleGuideDevDependencies(devDependencies);
-
-		File buildDir = buildDir(stepConfig);
-		File baseDir = baseDir(stepConfig);
-		NpmPathResolver npmPathResolver = npmPathResolver(stepConfig);
-		return EslintFormatterStep.create(devDependencies, stepConfig.getProvisioner(), baseDir, buildDir, npmPathResolver, eslintConfig(stepConfig));
-	}
+public class EslintJs extends AbstractEslint {
 
 	protected EslintConfig eslintConfig(FormatterStepConfig stepConfig) {
 		return new EslintConfig(this.configFile != null ? stepConfig.getFileLocator().locateFile(this.configFile) : null, this.configJs);
 	}
 
-	private void addStyleGuideDevDependencies(Map<String, String> devDependencies) {
-		if (this.styleGuide != null) {
-			EslintFormatterStep.PopularStyleGuide styleGuide = EslintFormatterStep.PopularStyleGuide.fromNameOrNull(this.styleGuide);
-			validateStyleGuide(styleGuide);
-			devDependencies.putAll(styleGuide.devDependencies());
-		}
-	}
-
-	private void validateStyleGuide(EslintFormatterStep.PopularStyleGuide styleGuide) {
-		if (styleGuide == null) {
-			throw new IllegalArgumentException("StyleGuide '" + this.styleGuide + "' is not supported. Supported style guides: " + supportedStyleGuides());
-		}
-		if (!isValidStyleGuide(styleGuide)) {
-			throw new IllegalArgumentException("StyleGuide must be of correct type but is: " + styleGuide.getPopularStyleGuideName() + ". Use one of the following: " + supportedStyleGuides());
-		}
-	}
-
-	private String supportedStyleGuides() {
-		return EslintFormatterStep.PopularStyleGuide.getPopularStyleGuideNames(this::isValidStyleGuide);
-	}
-
 	protected boolean isValidStyleGuide(EslintFormatterStep.PopularStyleGuide styleGuide) {
 		return styleGuide.name().startsWith("JS_");
 	}
 
 	protected Map<String, String> createDefaultDependencies() {
-		return eslintVersion == null ? EslintFormatterStep.defaultDevDependencies() : EslintFormatterStep.defaultDevDependenciesWithEslint(eslintVersion);
+		return this.eslintVersion == null ? EslintFormatterStep.defaultDevDependencies() : EslintFormatterStep.defaultDevDependenciesWithEslint(this.eslintVersion);
 	}
 }
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/EslintTs.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/EslintTs.java
index 0fe834ffde..f69f17f41e 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/EslintTs.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/EslintTs.java
@@ -20,20 +20,22 @@
 import org.apache.maven.plugins.annotations.Parameter;
 
 import com.diffplug.spotless.maven.FormatterStepConfig;
-import com.diffplug.spotless.maven.javascript.EslintJs;
+import com.diffplug.spotless.maven.javascript.AbstractEslint;
 import com.diffplug.spotless.npm.EslintConfig;
 import com.diffplug.spotless.npm.EslintFormatterStep;
 import com.diffplug.spotless.npm.EslintTypescriptConfig;
 
-public class EslintTs extends EslintJs {
+public class EslintTs extends AbstractEslint {
 
 	@Parameter
 	private String tsconfigFile;
 
 	@Override
 	protected EslintConfig eslintConfig(FormatterStepConfig stepConfig) {
-		EslintConfig jsConfig = super.eslintConfig(stepConfig);
-		return new EslintTypescriptConfig(jsConfig.getEslintConfigPath(), jsConfig.getEslintConfigJs(), tsconfigFile != null ? stepConfig.getFileLocator().locateFile(tsconfigFile) : null);
+		return new EslintTypescriptConfig(
+				configFile != null ? stepConfig.getFileLocator().locateFile(configFile) : null,
+				configJs,
+				tsconfigFile != null ? stepConfig.getFileLocator().locateFile(tsconfigFile) : null);
 	}
 
 	@Override
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
index 61d9c80a37..7a8073925d 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
@@ -136,6 +136,10 @@ protected void writePomWithCppSteps(String... steps) throws IOException {
 		writePom(groupWithSteps("cpp", steps));
 	}
 
+	protected void writePomWithJavascriptSteps(String includes, String... steps) throws IOException {
+		writePom(groupWithSteps("javascript", including(includes), steps));
+	}
+
 	protected void writePomWithTypescriptSteps(String includes, String... steps) throws IOException {
 		writePom(groupWithSteps("typescript", including(includes), steps));
 	}
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/javascript/JavascriptFormatStepTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/javascript/JavascriptFormatStepTest.java
new file mode 100644
index 0000000000..0f6d0d275f
--- /dev/null
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/javascript/JavascriptFormatStepTest.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2016-2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.javascript;
+
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import com.diffplug.spotless.ResourceHarness;
+import com.diffplug.spotless.maven.MavenIntegrationHarness;
+import com.diffplug.spotless.maven.MavenRunner.Result;
+import com.diffplug.spotless.tag.NpmTest;
+
+@NpmTest
+class JavascriptFormatStepTest extends MavenIntegrationHarness {
+
+	private static final String TEST_FILE_PATH = "src/main/javascript/test.js";
+
+	@NpmTest
+	@Nested
+	class EslintCustomRulesTest extends MavenIntegrationHarness {
+
+		@Test
+		void eslintConfigFile() throws Exception {
+			writePomWithJavascriptSteps(
+					TEST_FILE_PATH,
+					"<eslint>",
+					"  <configFile>.eslintrc.js</configFile>",
+					"</eslint>");
+			setFile(".eslintrc.js").toResource("npm/eslint/javascript/custom_rules/.eslintrc.js");
+			setFile(TEST_FILE_PATH).toResource("npm/eslint/javascript/custom_rules/javascript-es6.dirty");
+
+			Result result = mavenRunner().withArguments("spotless:apply").runNoError();
+			System.out.println(result.output());
+			assertFile(TEST_FILE_PATH).sameAsResource("npm/eslint/javascript/custom_rules/javascript-es6.clean");
+		}
+
+		@Test
+		void eslintConfigJs() throws Exception {
+			final String configJs = ResourceHarness.getTestResource("npm/eslint/javascript/custom_rules/.eslintrc.js")
+					.replace("module.exports = ", "");
+			writePomWithJavascriptSteps(
+					TEST_FILE_PATH,
+					"<eslint>",
+					"  <configJs>" + configJs + "</configJs>",
+					"</eslint>");
+			setFile(TEST_FILE_PATH).toResource("npm/eslint/javascript/custom_rules/javascript-es6.dirty");
+
+			mavenRunner().withArguments("spotless:apply").runNoError();
+			assertFile(TEST_FILE_PATH).sameAsResource("npm/eslint/javascript/custom_rules/javascript-es6.clean");
+		}
+
+	}
+
+	@NpmTest
+	@Nested
+	class EslintStyleguidesTest extends MavenIntegrationHarness {
+
+		@ParameterizedTest(name = "{index}: eslint js formatting with configFile using styleguide {0}")
+		@ValueSource(strings = {"airbnb", "google", "standard", "xo"})
+		void eslintJsStyleguideUsingConfigFile(String styleGuide) throws Exception {
+			final String styleGuidePath = "npm/eslint/javascript/styleguide/" + styleGuide;
+
+			writePomWithJavascriptSteps(
+					TEST_FILE_PATH,
+					"<eslint>",
+					"  <configFile>.eslintrc.js</configFile>",
+					"  <styleGuide>" + styleGuide + "</styleGuide>",
+					"</eslint>");
+			setFile(".eslintrc.js").toResource(styleGuidePath + "/.eslintrc.js");
+			setFile(TEST_FILE_PATH).toResource(styleGuidePath + "/javascript-es6.dirty");
+
+			mavenRunner().withArguments("spotless:apply").runNoError();
+			assertFile(TEST_FILE_PATH).sameAsResource(styleGuidePath + "/javascript-es6.clean");
+		}
+
+		@ParameterizedTest(name = "{index}: eslint js formatting with inline config using styleguide {0}")
+		@ValueSource(strings = {"airbnb", "google", "standard", "xo"})
+		void eslintJsStyleguideUsingInlineConfig(String styleGuide) throws Exception {
+			final String styleGuidePath = "npm/eslint/javascript/styleguide/" + styleGuide;
+
+			final String escapedInlineConfig = ResourceHarness.getTestResource(styleGuidePath + "/.eslintrc.js")
+					.replace("<", "&lt;")
+					.replace(">", "&gt;");
+			writePomWithJavascriptSteps(
+					TEST_FILE_PATH,
+					"<eslint>",
+					"  <configJs>" + escapedInlineConfig + "</configJs>",
+					"  <styleGuide>" + styleGuide + "</styleGuide>",
+					"</eslint>");
+			setFile(TEST_FILE_PATH).toResource(styleGuidePath + "/javascript-es6.dirty");
+
+			mavenRunner().withArguments("spotless:apply").runNoError();
+			assertFile(TEST_FILE_PATH).sameAsResource(styleGuidePath + "/javascript-es6.clean");
+		}
+	}
+}

From 1d164d3528c8b9763217637665e9a84587a85002 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Fri, 23 Dec 2022 08:22:07 +0100
Subject: [PATCH 0461/2068] eslint: also test custom devDependencies case

---
 .../javascript/JavascriptFormatStepTest.java  | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/javascript/JavascriptFormatStepTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/javascript/JavascriptFormatStepTest.java
index 0f6d0d275f..379208b9e4 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/javascript/JavascriptFormatStepTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/javascript/JavascriptFormatStepTest.java
@@ -107,5 +107,29 @@ void eslintJsStyleguideUsingInlineConfig(String styleGuide) throws Exception {
 			mavenRunner().withArguments("spotless:apply").runNoError();
 			assertFile(TEST_FILE_PATH).sameAsResource(styleGuidePath + "/javascript-es6.clean");
 		}
+
+		@Test
+		void provideCustomDependenciesForStyleguideStandard() throws Exception {
+			final String styleGuidePath = "npm/eslint/javascript/styleguide/standard";
+
+			writePomWithJavascriptSteps(
+				TEST_FILE_PATH,
+				"<eslint>",
+				"  <configFile>.eslintrc.js</configFile>",
+				"  <devDependencies>",
+				"    <eslint>8.28.0</eslint>",
+				"    <eslint-config-standard>17.0.0</eslint-config-standard>",
+				"    <eslint-plugin-import>2.26.0</eslint-plugin-import>",
+				"    <eslint-plugin-n>15.6.0</eslint-plugin-n>",
+				"    <eslint-plugin-promise>6.1.1</eslint-plugin-promise>",
+				"  </devDependencies>",
+				"</eslint>");
+			setFile(".eslintrc.js").toResource(styleGuidePath + "/.eslintrc.js");
+
+			setFile(TEST_FILE_PATH).toResource(styleGuidePath + "/javascript-es6.dirty");
+
+			mavenRunner().withArguments("spotless:apply").runNoError();
+			assertFile(TEST_FILE_PATH).sameAsResource(styleGuidePath + "/javascript-es6.clean");
+		}
 	}
 }

From 3f3705395fac64a7f083facd13896e5d26243e38 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Wed, 4 Jan 2023 09:55:35 +0100
Subject: [PATCH 0462/2068] eslint: adding readme (common and plugin-gradle)

---
 CHANGES.md               |   3 +
 README.md                |   2 +
 plugin-gradle/CHANGES.md |   2 +
 plugin-gradle/README.md  | 120 ++++++++++++++++++++++++++++++++++++++-
 4 files changed, 126 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index a7e3516607..3efdec3b67 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,9 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* Added support for npm-based [ESLint](https://eslint.org/)-formatter for javascript and typescript ([#1433](https://github.com/diffplug/spotless/pull/1433))
+
 ### Changes
 * Bump the dev version of Gradle from `7.5.1` to `7.6` ([#1409](https://github.com/diffplug/spotless/pull/1409))
   * We also removed the no-longer-required dependency `org.codehaus.groovy:groovy-xml`
diff --git a/README.md b/README.md
index 605305bd29..ddc3c2391c 100644
--- a/README.md
+++ b/README.md
@@ -69,6 +69,7 @@ lib('kotlin.KtfmtStep')                          +'{{yes}}       | {{yes}}
 lib('kotlin.DiktatStep')                         +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('markdown.FreshMarkStep')                    +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
 lib('markdown.FlexmarkStep')                     +'{{no}}        | {{yes}}      | {{no}}       | {{no}}  |',
+lib('npm.EslintFormatterStep')                   +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('npm.PrettierFormatterStep')                 +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('npm.TsFmtFormatterStep')                    +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('pom.SortPomStep')                           +'{{no}}        | {{yes}}      | {{no}}       | {{no}}  |',
@@ -113,6 +114,7 @@ extra('wtp.EclipseWtpFormatterStep')             +'{{yes}}       | {{yes}}
 | [`kotlin.DiktatStep`](lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`markdown.FreshMarkStep`](lib/src/main/java/com/diffplug/spotless/markdown/FreshMarkStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
 | [`markdown.FlexmarkStep`](lib/src/main/java/com/diffplug/spotless/markdown/FlexmarkStep.java) | :white_large_square:        | :+1:      | :white_large_square:       | :white_large_square:  |
+| [`npm.EslintFormatterStep`](lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`npm.PrettierFormatterStep`](lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`npm.TsFmtFormatterStep`](lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`pom.SortPomStep`](lib/src/main/java/com/diffplug/spotless/pom/SortPomStep.java) | :white_large_square:        | :+1:      | :white_large_square:       | :white_large_square:  |
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index c5f464069f..d668f69483 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Added
+* Added support for npm-based [ESLint](https://eslint.org/) formatter for javascript and typescript ([#1433](https://github.com/diffplug/spotless/pull/1433))
 ### Fixed
 * Prevent tool configurations from being resolved outside project ([#1447](https://github.com/diffplug/spotless/pull/1447) fixes [#1215](https://github.com/diffplug/spotless/issues/1215))
 
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 755d21d056..6f498059b9 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -69,7 +69,8 @@ Spotless supports all of Gradle's built-in performance features (incremental bui
   - [FreshMark](#freshmark) aka markdown
   - [Antlr4](#antlr4) ([antlr4formatter](#antlr4formatter))
   - [SQL](#sql) ([dbeaver](#dbeaver), [prettier](#prettier))
-  - [Typescript](#typescript) ([tsfmt](#tsfmt), [prettier](#prettier))
+  - [Typescript](#typescript) ([tsfmt](#tsfmt), [prettier](#prettier), [eslint](#eslint--typescript-))
+  - [Javascript](#javascript) ([prettier](#prettier), [eslint](#eslint--javascript-))
   - [JSON](#json)
   - Multiple languages
     - [Prettier](#prettier) ([plugins](#prettier-plugins), [npm detection](#npm-detection), [`.npmrc` detection](#npmrc-detection))
@@ -576,6 +577,7 @@ spotless {
 
     tsfmt()    // has its own section below
     prettier() // has its own section below
+    eslint() // has its own section below
 
     licenseHeader '/* (C) $YEAR */', '(import|const|declare|export|var) ' // or licenseHeaderFile
     // note the '(import|const|...' argument - this is a regex which identifies the top
@@ -608,6 +610,122 @@ spotless {
 
 For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#npmrc-detection) sections of prettier, which apply also to tsfmt.
 
+### eslint (Typescript)
+
+[npm](https://www.npmjs.com/package/eslint). [changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md). *Please note:*
+The auto-discovery of config files (up the file tree) will not work when using eslint within spotless,
+hence you are required to provide resolvable file paths for config files, or alternatively provide the configuration inline.
+
+The configuration is very similar to the [eslint (Javascript)](#eslint--javascript-) configuration. It differs in supported
+styleguides and the requirement for a tsconfigFile.
+
+```gradle
+spotless {
+  typescript {
+    eslint('8.30.0') // version is optional
+    eslint(['my-eslint-fork': '1.2.3', 'my-eslint-plugin': '1.2.1']) // can specify exactly which npm packages to use
+
+    eslint()
+      // optional: use a popular eslint styleguide for typescript
+      .styleGuide('standard-with-typescript') // or 'xo-typescript'
+      // configuration is mandatory. Provide inline config or a config file.
+      // a) inline-configuration
+      .configJs('''
+        {
+          env: {
+            browser: true,
+            es2021: true
+          },
+          extends: 'standard-with-typescript',
+          overrides: [
+          ],
+          parserOptions: {
+            ecmaVersion: 'latest',
+            sourceType: 'module',
+            project: './tsconfig.json',
+          },
+          rules: {
+          }
+        }
+      ''')
+      // b) config file
+      .configFile('.eslintrc.js')
+      // recommended: provide a tsconfig.json - especially when using the styleguides
+      .tsconfigFile('tsconfig.json')
+  }
+}
+```
+
+**Prerequisite: eslint requires a working NodeJS version**
+
+For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#npmrc-detection) sections of prettier, which apply also to eslint.
+
+## Javascript
+
+- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
+
+```gradle
+spotless {
+  javascript {
+    target 'src/**/*.js' // you have to set the target manually
+
+    prettier() // has its own section below
+    eslint() // has its own section below
+
+    licenseHeader '/* (C) $YEAR */', 'REGEX_TO_DEFINE_TOP_OF_FILE' // or licenseHeaderFile
+  }
+}
+```
+
+### eslint (Javascript)
+
+[npm](https://www.npmjs.com/package/eslint). [changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md). *Please note:*
+The auto-discovery of config files (up the file tree) will not work when using eslint within spotless,
+hence you are required to provide resolvable file paths for config files, or alternatively provide the configuration inline.
+
+The configuration is very similar to the [eslint (Typescript)](#eslint--typescript-) configuration. It differs in supported
+styleguides and no requirement for a tsconfig (of course).
+
+```gradle
+
+```gradle
+spotless {
+  javascript {
+    eslint('8.30.0') // version is optional
+    eslint(['my-eslint-fork': '1.2.3', 'my-eslint-plugin': '1.2.1']) // can specify exactly which npm packages to use
+
+    eslint()
+      // optional: use a popular eslint styleguide for javascript
+      .styleGuide('standard') // or 'airbnb', 'google', 'xo'
+      // configuration is mandatory. Provide inline config or a config file.
+      // a) inline-configuration
+      .configJs('''
+        {
+          env: {
+            browser: true,
+            es2021: true
+          },
+          extends: 'standard',
+          overrides: [
+          ],
+          parserOptions: {
+            ecmaVersion: 'latest',
+            sourceType: 'module'
+          },
+          rules: {
+          }
+        }
+      ''')
+      // b) config file
+      .configFile('.eslintrc.js')
+  }
+}
+```
+
+**Prerequisite: eslint requires a working NodeJS version**
+
+For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#npmrc-detection) sections of prettier, which apply also to eslint.
+
 ## JSON
 
 - `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)

From bb843ce0cf741b809ea8cf022ae5556464789ac5 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Wed, 4 Jan 2023 09:56:22 +0100
Subject: [PATCH 0463/2068] eslint: apply spotless

---
 .../spotless/npm/BaseNpmRestService.java      |  2 +-
 .../diffplug/spotless/npm/EslintConfig.java   |  2 +-
 .../spotless/npm/EslintFormatterStep.java     |  2 +-
 .../spotless/npm/EslintRestService.java       |  2 +-
 .../spotless/npm/EslintTypescriptConfig.java  |  2 +-
 .../npm/NpmFormatterStepStateBase.java        |  2 +-
 .../com/diffplug/spotless/npm/NpmProcess.java |  2 +-
 .../spotless/npm/NpmResourceHelper.java       |  2 +-
 .../spotless/npm/PrettierFormatterStep.java   |  2 +-
 .../spotless/npm/PrettierRestService.java     |  2 +-
 .../spotless/npm/TsFmtFormatterStep.java      |  2 +-
 .../spotless/npm/TsFmtRestService.java        |  2 +-
 .../gradle/spotless/FormatExtension.java      |  2 +-
 .../gradle/spotless/JavascriptExtension.java  |  2 +-
 .../gradle/spotless/SpotlessExtension.java    |  2 +-
 .../gradle/spotless/TypescriptExtension.java  |  2 +-
 .../spotless/JavascriptExtensionTest.java     |  2 +-
 .../spotless/PrettierIntegrationTest.java     |  2 +-
 .../spotless/TypescriptExtensionTest.java     |  2 +-
 .../spotless/maven/AbstractSpotlessMojo.java  |  2 +-
 .../spotless/maven/generic/Prettier.java      |  2 +-
 .../maven/javascript/AbstractEslint.java      |  2 +-
 .../spotless/maven/javascript/EslintJs.java   |  2 +-
 .../spotless/maven/javascript/Javascript.java |  2 +-
 .../npm/AbstractNpmFormatterStepFactory.java  |  2 +-
 .../spotless/maven/typescript/EslintTs.java   |  2 +-
 .../spotless/maven/typescript/Tsfmt.java      |  2 +-
 .../spotless/maven/typescript/Typescript.java |  2 +-
 .../maven/MavenIntegrationHarness.java        |  2 +-
 .../javascript/JavascriptFormatStepTest.java  | 24 +++++++++----------
 .../prettier/PrettierFormatStepTest.java      |  2 +-
 .../typescript/TypescriptFormatStepTest.java  |  2 +-
 .../spotless/npm/EslintFormatterStepTest.java |  2 +-
 .../npm/NpmFormatterStepCommonTests.java      |  2 +-
 .../spotless/npm/TsFmtFormatterStepTest.java  |  2 +-
 35 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/BaseNpmRestService.java b/lib/src/main/java/com/diffplug/spotless/npm/BaseNpmRestService.java
index e8582c15ec..a6d93182a1 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/BaseNpmRestService.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/BaseNpmRestService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintConfig.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintConfig.java
index 4e1848856a..3499b3face 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/EslintConfig.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
index 820283aae4..ac3ee05345 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintRestService.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintRestService.java
index 198ee5389c..e17237ecbf 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/EslintRestService.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintRestService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintTypescriptConfig.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintTypescriptConfig.java
index f8c213a0a9..fc45f8bd7b 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/EslintTypescriptConfig.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintTypescriptConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 DiffPlug
+ * Copyright 2022-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
index fc1543fd61..49a166e45c 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java
index 28db79b726..e2fd07682c 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmResourceHelper.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmResourceHelper.java
index 48e974eec6..2acf3a180d 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmResourceHelper.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmResourceHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
index 8489644c36..a83fc07674 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/PrettierRestService.java b/lib/src/main/java/com/diffplug/spotless/npm/PrettierRestService.java
index 2a62823aa0..ccdc189d27 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/PrettierRestService.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/PrettierRestService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java
index 027af89e23..98d694ec33 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/TsFmtRestService.java b/lib/src/main/java/com/diffplug/spotless/npm/TsFmtRestService.java
index f77510c3b6..704d2b47af 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/TsFmtRestService.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/TsFmtRestService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index 08e713a921..c72c9339a0 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
index cbe0040a83..862c7566ee 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
index 3fe5721b5d..1c65fad310 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
index 79ae056bdc..5de1bb1ac3 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavascriptExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavascriptExtensionTest.java
index af203936f3..331e17f28e 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavascriptExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavascriptExtensionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java
index 6f55312bd5..bc8ad1148e 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TypescriptExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TypescriptExtensionTest.java
index da9fa03905..598ff7dc14 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TypescriptExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TypescriptExtensionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
index 647535a590..5ad96ece46 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Prettier.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Prettier.java
index b45f802653..ffe384b4d9 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Prettier.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Prettier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/AbstractEslint.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/AbstractEslint.java
index 735a25c0c5..b5fc156a57 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/AbstractEslint.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/AbstractEslint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/EslintJs.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/EslintJs.java
index f6c7beaff4..f9954ab0c8 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/EslintJs.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/EslintJs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/Javascript.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/Javascript.java
index db7049ff0d..7ca35dd258 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/Javascript.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/Javascript.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/npm/AbstractNpmFormatterStepFactory.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/npm/AbstractNpmFormatterStepFactory.java
index 8bc0f8f715..22ee5e0dba 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/npm/AbstractNpmFormatterStepFactory.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/npm/AbstractNpmFormatterStepFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/EslintTs.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/EslintTs.java
index f69f17f41e..72f3735d97 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/EslintTs.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/EslintTs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 DiffPlug
+ * Copyright 2022-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Tsfmt.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Tsfmt.java
index 6c60c02cc6..685d473072 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Tsfmt.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Tsfmt.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Typescript.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Typescript.java
index 1320cac2d8..6f0d7f91b2 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Typescript.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Typescript.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
index 7a8073925d..d9a23cdb74 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/javascript/JavascriptFormatStepTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/javascript/JavascriptFormatStepTest.java
index 379208b9e4..7ebc592add 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/javascript/JavascriptFormatStepTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/javascript/JavascriptFormatStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -113,17 +113,17 @@ void provideCustomDependenciesForStyleguideStandard() throws Exception {
 			final String styleGuidePath = "npm/eslint/javascript/styleguide/standard";
 
 			writePomWithJavascriptSteps(
-				TEST_FILE_PATH,
-				"<eslint>",
-				"  <configFile>.eslintrc.js</configFile>",
-				"  <devDependencies>",
-				"    <eslint>8.28.0</eslint>",
-				"    <eslint-config-standard>17.0.0</eslint-config-standard>",
-				"    <eslint-plugin-import>2.26.0</eslint-plugin-import>",
-				"    <eslint-plugin-n>15.6.0</eslint-plugin-n>",
-				"    <eslint-plugin-promise>6.1.1</eslint-plugin-promise>",
-				"  </devDependencies>",
-				"</eslint>");
+					TEST_FILE_PATH,
+					"<eslint>",
+					"  <configFile>.eslintrc.js</configFile>",
+					"  <devDependencies>",
+					"    <eslint>8.28.0</eslint>",
+					"    <eslint-config-standard>17.0.0</eslint-config-standard>",
+					"    <eslint-plugin-import>2.26.0</eslint-plugin-import>",
+					"    <eslint-plugin-n>15.6.0</eslint-plugin-n>",
+					"    <eslint-plugin-promise>6.1.1</eslint-plugin-promise>",
+					"  </devDependencies>",
+					"</eslint>");
 			setFile(".eslintrc.js").toResource(styleGuidePath + "/.eslintrc.js");
 
 			setFile(TEST_FILE_PATH).toResource(styleGuidePath + "/javascript-es6.dirty");
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/prettier/PrettierFormatStepTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/prettier/PrettierFormatStepTest.java
index 8fce61b5d8..c0a9267b93 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/prettier/PrettierFormatStepTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/prettier/PrettierFormatStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/typescript/TypescriptFormatStepTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/typescript/TypescriptFormatStepTest.java
index b57a2a97a6..ac925cc9b6 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/typescript/TypescriptFormatStepTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/typescript/TypescriptFormatStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
index 15ebb0cc0d..5f53c9effa 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/NpmFormatterStepCommonTests.java b/testlib/src/test/java/com/diffplug/spotless/npm/NpmFormatterStepCommonTests.java
index 1ed6e9bbe8..dff105108a 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/NpmFormatterStepCommonTests.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/NpmFormatterStepCommonTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/TsFmtFormatterStepTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/TsFmtFormatterStepTest.java
index 474c664486..a774c7c1ee 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/TsFmtFormatterStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/TsFmtFormatterStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 508dd69b8c328cf537809025ca0134e65c7587b0 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Wed, 4 Jan 2023 10:02:13 +0100
Subject: [PATCH 0464/2068] bumping default prettier version

---
 CHANGES.md                                    |  3 ++-
 .../spotless/npm/PrettierFormatterStep.java   |  2 +-
 .../config/typescript.configfile.clean        |  3 ++-
 .../prettier/config/typescript.defaults.clean |  3 ++-
 .../javascript-es5/javascript-es5.clean       | 24 +++----------------
 .../javascript-es6/javascript-es6.clean       | 24 +++----------------
 6 files changed, 13 insertions(+), 46 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 3efdec3b67..bf1798d7c2 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,8 +12,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Added support for npm-based [ESLint](https://eslint.org/)-formatter for javascript and typescript ([#1433](https://github.com/diffplug/spotless/pull/1433))
-
 ### Changes
+* Bump default Version for `prettier` from `2.0.5` to `2.8.1`
 * Bump the dev version of Gradle from `7.5.1` to `7.6` ([#1409](https://github.com/diffplug/spotless/pull/1409))
   * We also removed the no-longer-required dependency `org.codehaus.groovy:groovy-xml`
 * Breaking changes to Spotless' internal testing infrastructure `testlib` ([#1443](https://github.com/diffplug/spotless/pull/1443))
@@ -22,6 +22,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
   * `StepHarnessWithFile` now takes a `ResourceHarness` in its constructor to handle the file manipulation parts
   * Standardized that we test exception *messages*, not types, which will ease the transition to linting later on
 
+
 ## [2.31.1] - 2023-01-02
 ### Fixed
 * Improve memory usage when using git ratchet ([#1426](https://github.com/diffplug/spotless/pull/1426))
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
index a83fc07674..22a162eb0b 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
@@ -42,7 +42,7 @@ public class PrettierFormatterStep {
 	public static final String NAME = "prettier-format";
 
 	public static final Map<String, String> defaultDevDependencies() {
-		return defaultDevDependenciesWithPrettier("2.0.5");
+		return defaultDevDependenciesWithPrettier("2.8.1");
 	}
 
 	public static final Map<String, String> defaultDevDependenciesWithPrettier(String version) {
diff --git a/testlib/src/main/resources/npm/prettier/config/typescript.configfile.clean b/testlib/src/main/resources/npm/prettier/config/typescript.configfile.clean
index 0ec76369be..dfe71bf0a9 100644
--- a/testlib/src/main/resources/npm/prettier/config/typescript.configfile.clean
+++ b/testlib/src/main/resources/npm/prettier/config/typescript.configfile.clean
@@ -1,6 +1,7 @@
 export class MyVeryOwnControllerWithARatherLongNameThatIsNotReallyNecessary
   extends AbstractController
-  implements DisposeAware, CallbackAware {
+  implements DisposeAware, CallbackAware
+{
   public myValue: string[];
 
   constructor(
diff --git a/testlib/src/main/resources/npm/prettier/config/typescript.defaults.clean b/testlib/src/main/resources/npm/prettier/config/typescript.defaults.clean
index 0155b905bd..61d8e020d6 100644
--- a/testlib/src/main/resources/npm/prettier/config/typescript.defaults.clean
+++ b/testlib/src/main/resources/npm/prettier/config/typescript.defaults.clean
@@ -1,6 +1,7 @@
 export class MyVeryOwnControllerWithARatherLongNameThatIsNotReallyNecessary
   extends AbstractController
-  implements DisposeAware, CallbackAware {
+  implements DisposeAware, CallbackAware
+{
   public myValue: string[];
 
   constructor(private myService: Service, name: string, private field: any) {
diff --git a/testlib/src/main/resources/npm/prettier/filetypes/javascript-es5/javascript-es5.clean b/testlib/src/main/resources/npm/prettier/filetypes/javascript-es5/javascript-es5.clean
index 29002f6b05..0cfac613f1 100644
--- a/testlib/src/main/resources/npm/prettier/filetypes/javascript-es5/javascript-es5.clean
+++ b/testlib/src/main/resources/npm/prettier/filetypes/javascript-es5/javascript-es5.clean
@@ -1,24 +1,5 @@
 var numbers = [
-  1,
-  2,
-  3,
-  4,
-  5,
-  6,
-  7,
-  8,
-  9,
-  10,
-  11,
-  12,
-  13,
-  14,
-  15,
-  16,
-  17,
-  18,
-  19,
-  20,
+  1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
 ];
 
 var p = {
@@ -32,7 +13,8 @@ var p = {
 var str = "Hello, world!";
 var str2 = str.charAt(3) + str[0];
 
-var multilinestr = "Hello \
+var multilinestr =
+  "Hello \
 World";
 function test(a, b) {
   return a + b;
diff --git a/testlib/src/main/resources/npm/prettier/filetypes/javascript-es6/javascript-es6.clean b/testlib/src/main/resources/npm/prettier/filetypes/javascript-es6/javascript-es6.clean
index d4e982d69f..1935faa03c 100644
--- a/testlib/src/main/resources/npm/prettier/filetypes/javascript-es6/javascript-es6.clean
+++ b/testlib/src/main/resources/npm/prettier/filetypes/javascript-es6/javascript-es6.clean
@@ -1,24 +1,5 @@
 var numbers = [
-  1,
-  2,
-  3,
-  4,
-  5,
-  6,
-  7,
-  8,
-  9,
-  10,
-  11,
-  12,
-  13,
-  14,
-  15,
-  16,
-  17,
-  18,
-  19,
-  20,
+  1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
 ];
 
 const p = {
@@ -32,7 +13,8 @@ const p = {
 const str = "Hello, world!";
 var str2 = str.charAt(3) + str[0];
 
-var multilinestr = "Hello \
+var multilinestr =
+  "Hello \
 World";
 function test(a, b = "world") {
   let combined = a + b;

From 67a0a0510e9f55c911c4bc7f519756c49767d88d Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Wed, 4 Jan 2023 12:56:45 +0100
Subject: [PATCH 0465/2068] eslint: update readme for maven

---
 plugin-maven/CHANGES.md |   2 +
 plugin-maven/README.md  | 140 +++++++++++++++++++++++++++++++++++++++-
 2 files changed, 141 insertions(+), 1 deletion(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 84e06aa847..f57a8dbbd4 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* Added support for npm-based [ESLint](https://eslint.org/)-formatter for javascript and typescript ([#1433](https://github.com/diffplug/spotless/pull/1433))
 
 ## [2.29.0] - 2023-01-02
 ### Added
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 80be3dbc37..b246bcb035 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -57,7 +57,8 @@ user@machine repo % mvn spotless:check
   - [Sql](#sql) ([dbeaver](#dbeaver))
   - [Maven Pom](#maven-pom) ([sortPom](#sortpom))
   - [Markdown](#markdown) ([flexmark](#flexmark))
-  - [Typescript](#typescript) ([tsfmt](#tsfmt), [prettier](#prettier))
+  - [Typescript](#typescript) ([tsfmt](#tsfmt), [prettier](#prettier), [ESLint](#eslint--typescript-))
+  - [Javascript](#javascript) ([prettier](#prettier), [ESLint](#eslint--javascript-))
   - Multiple languages
     - [Prettier](#prettier) ([plugins](#prettier-plugins), [npm detection](#npm-detection), [`.npmrc` detection](#npmrc-detection))
     - [eclipse web tools platform](#eclipse-web-tools-platform)
@@ -660,6 +661,7 @@ Currently, none of the available options can be configured yet. It uses only the
 
     <tsfmt/>    <!-- has its own section below -->
     <prettier/> <!-- has its own section below -->
+    <eslint/>   <!-- has its own section below -->
 
     <licenseHeader>
       <content>/* (C)$YEAR */</content>  <!-- or <file>${project.basedir}/license-header</file> -->
@@ -700,8 +702,144 @@ The auto-discovery of config files (up the file tree) will not work when using t
 
 For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#npmrc-detection) sections of prettier, which apply also to tsfmt.
 
+### ESLint (typescript)
+
+[npm](https://www.npmjs.com/package/eslint). [changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md). *Please note:*
+The auto-discovery of config files (up the file tree) will not work when using ESLint within spotless,
+hence you are required to provide resolvable file paths for config files, or alternatively provide the configuration inline.
+
+The configuration is very similar to the [ESLint (Javascript)](#eslint--javascript-) configuration. It differs in supported
+styleguides and the requirement for a tsconfigFile.
+
+```xml
+<eslint>
+  <!-- Specify at most one of the following 3 configs: either 'eslintVersion', 'devDependencies' or 'devDependencyProperties'  -->
+  <eslintVersion>8.30.0</eslintVersion>
+  <devDependencies>
+    <myEslintFork>8.30.0</myEslintFork>
+    <myEslintPlugin>1.2.1</myEslintPlugin>
+  </devDependencies>
+  <devDependencyProperties>
+    <property>
+      <name>eslint</name>
+      <value>8.30.0</value>
+    </property>
+    <property>
+      <name>@eslint/my-plugin-typescript</name> <!-- this could not be written in the simpler to write 'devDependencies' element. -->
+      <value>0.14.2</value>
+    </property>
+  </devDependencyProperties>
+  <!-- optional: use one of the popular style guides: 'standard-with-typescript' or 'xo-typescript' -->
+  <styleGuide>standard-with-typescript</styleGuide>
+  <!-- mandatory: provide either a configFile or a configJs object -->
+  <configFile>${project.basedir}/.eslintrc.js</configFile>
+  <configJs>
+    {
+      env: {
+        browser: true,
+        es2021: true
+      },
+      extends: 'standard-with-typescript',
+      overrides: [
+      ],
+      parserOptions: {
+        ecmaVersion: 'latest',
+        sourceType: 'module',
+        project: './tsconfig.json',
+      },
+      rules: {
+      }
+    }
+  </configJs>
+  <!-- recommended: provide a tsconfigFile - especially when using the styleguides -->
+  <tsconfigFile>${project.basedir}/tsconfig.json</tsconfigFile>
+</eslint>
+```
+
+**Prerequisite: ESLint requires a working NodeJS version**
+
+For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#npmrc-detection) sections of prettier, which apply also to ESLint.
+
 <a name="applying-prettier-to-javascript--flow--typescript--css--scss--less--jsx--graphql--yaml--etc"></a>
 
+## Javascript
+
+[code](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/Javascript.java). [available steps](https://github.com/diffplug/spotless/tree/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript).
+
+```xml
+<configuration>
+  <typescript>
+    <includes> <!-- You have to set the target manually -->
+      <include>src/**/*.js</include>
+    </includes>
+
+    <prettier/> <!-- has its own section below -->
+    <eslint/>   <!-- has its own section below -->
+
+    <licenseHeader>
+      <content>/* (C)$YEAR */</content>  <!-- or <file>${project.basedir}/license-header</file> -->
+      <delimiter>REGEX_TO_DEFINE_TOP_OF_FILE</delimiter> <!-- set a regex to define the top of the file -->
+    </licenseHeader>
+  </typescript>
+</configuration>
+```
+
+
+### ESLint (Javascript)
+
+[npm](https://www.npmjs.com/package/eslint). [changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md). *Please note:*
+The auto-discovery of config files (up the file tree) will not work when using ESLint within spotless,
+hence you are required to provide resolvable file paths for config files, or alternatively provide the configuration inline.
+
+The configuration is very similar to the [ESLint (Typescript)](#eslint--typescript-) configuration. It differs in supported
+styleguides and no requirement for a tsconfig (of course).
+
+```xml
+<eslint>
+  <!-- Specify at most one of the following 3 configs: either 'eslintVersion', 'devDependencies' or 'devDependencyProperties'  -->
+  <eslintVersion>8.30.0</eslintVersion>
+  <devDependencies>
+    <myEslintFork>8.30.0</myEslintFork>
+    <myEslintPlugin>1.2.1</myEslintPlugin>
+  </devDependencies>
+  <devDependencyProperties>
+    <property>
+      <name>eslint</name>
+      <value>8.30.0</value>
+    </property>
+    <property>
+      <name>@eslint/my-plugin-javascript</name> <!-- this could not be written in the simpler to write 'devDependencies' element. -->
+      <value>0.14.2</value>
+    </property>
+  </devDependencyProperties>
+  <!-- optional: use one of the popular style guides: 'standard', 'airbnb', 'google' or 'xo' -->
+  <styleGuide>standard</styleGuide>
+  <!-- mandatory: provide either a configFile or a configJs object -->
+  <configFile>${project.basedir}/.eslintrc.js</configFile>
+  <configJs>
+    {
+      env: {
+        browser: true,
+        es2021: true
+      },
+      extends: 'standard',
+      overrides: [
+      ],
+      parserOptions: {
+        ecmaVersion: 'latest',
+        sourceType: 'module'
+      },
+      rules: {
+      }
+    }
+  </configJs>
+</eslint>
+```
+
+**Prerequisite: ESLint requires a working NodeJS version**
+
+For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#npmrc-detection) sections of prettier, which apply also to ESLint.
+
 ## Prettier
 
 [homepage](https://prettier.io/). [changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md). [official plugins](https://prettier.io/docs/en/plugins.html#official-plugins). [community plugins](https://prettier.io/docs/en/plugins.html#community-plugins). Prettier is a formatter that can format almost every anything - JavaScript, JSX, Angular, Vue, Flow, TypeScript, CSS, Less, SCSS, HTML, JSON, GraphQL, Markdown (including GFM and MDX), and YAML.  It can format even more [using plugins](https://prettier.io/docs/en/plugins.html) (PHP, Ruby, Swift, XML, Apex, Elm, Java (!!), Kotlin, pgSQL, .properties, solidity, svelte, toml, shellscript, ...).

From e07082a5526e370b5355606d90298d70b8d8d32f Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Wed, 4 Jan 2023 12:56:56 +0100
Subject: [PATCH 0466/2068] eslint: unify naming in documentation

---
 plugin-gradle/README.md | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 6f498059b9..edd6c43bb6 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -69,8 +69,8 @@ Spotless supports all of Gradle's built-in performance features (incremental bui
   - [FreshMark](#freshmark) aka markdown
   - [Antlr4](#antlr4) ([antlr4formatter](#antlr4formatter))
   - [SQL](#sql) ([dbeaver](#dbeaver), [prettier](#prettier))
-  - [Typescript](#typescript) ([tsfmt](#tsfmt), [prettier](#prettier), [eslint](#eslint--typescript-))
-  - [Javascript](#javascript) ([prettier](#prettier), [eslint](#eslint--javascript-))
+  - [Typescript](#typescript) ([tsfmt](#tsfmt), [prettier](#prettier), [ESLint](#eslint--typescript-))
+  - [Javascript](#javascript) ([prettier](#prettier), [ESLint](#eslint--javascript-))
   - [JSON](#json)
   - Multiple languages
     - [Prettier](#prettier) ([plugins](#prettier-plugins), [npm detection](#npm-detection), [`.npmrc` detection](#npmrc-detection))
@@ -610,13 +610,13 @@ spotless {
 
 For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#npmrc-detection) sections of prettier, which apply also to tsfmt.
 
-### eslint (Typescript)
+### ESLint (Typescript)
 
 [npm](https://www.npmjs.com/package/eslint). [changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md). *Please note:*
-The auto-discovery of config files (up the file tree) will not work when using eslint within spotless,
+The auto-discovery of config files (up the file tree) will not work when using ESLint within spotless,
 hence you are required to provide resolvable file paths for config files, or alternatively provide the configuration inline.
 
-The configuration is very similar to the [eslint (Javascript)](#eslint--javascript-) configuration. It differs in supported
+The configuration is very similar to the [ESLint (Javascript)](#eslint--javascript-) configuration. It differs in supported
 styleguides and the requirement for a tsconfigFile.
 
 ```gradle
@@ -656,9 +656,9 @@ spotless {
 }
 ```
 
-**Prerequisite: eslint requires a working NodeJS version**
+**Prerequisite: ESLint requires a working NodeJS version**
 
-For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#npmrc-detection) sections of prettier, which apply also to eslint.
+For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#npmrc-detection) sections of prettier, which apply also to ESLint.
 
 ## Javascript
 
@@ -677,13 +677,13 @@ spotless {
 }
 ```
 
-### eslint (Javascript)
+### ESLint (Javascript)
 
 [npm](https://www.npmjs.com/package/eslint). [changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md). *Please note:*
-The auto-discovery of config files (up the file tree) will not work when using eslint within spotless,
+The auto-discovery of config files (up the file tree) will not work when using ESLint within spotless,
 hence you are required to provide resolvable file paths for config files, or alternatively provide the configuration inline.
 
-The configuration is very similar to the [eslint (Typescript)](#eslint--typescript-) configuration. It differs in supported
+The configuration is very similar to the [ESLint (Typescript)](#eslint--typescript-) configuration. It differs in supported
 styleguides and no requirement for a tsconfig (of course).
 
 ```gradle
@@ -722,9 +722,9 @@ spotless {
 }
 ```
 
-**Prerequisite: eslint requires a working NodeJS version**
+**Prerequisite: ESLint requires a working NodeJS version**
 
-For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#npmrc-detection) sections of prettier, which apply also to eslint.
+For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#npmrc-detection) sections of prettier, which apply also to ESLint.
 
 ## JSON
 

From 2943c661623dddfd34c8a532fbdad8f1fdf32469 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Wed, 4 Jan 2023 13:41:44 +0100
Subject: [PATCH 0467/2068] eslint: adapt to api changes in TestResource

---
 .../spotless/npm/EslintFormatterStepTest.java      | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
index 5f53c9effa..a993f43090 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
@@ -19,6 +19,8 @@
 import java.util.Map;
 import java.util.TreeMap;
 
+import com.diffplug.spotless.ResourceHarness;
+
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -73,8 +75,8 @@ void formattingUsingRulesetsFile(String ruleSetName) throws Exception {
 					npmPathResolver(),
 					new EslintConfig(eslintRc, null));
 
-			try (StepHarnessWithFile stepHarness = StepHarnessWithFile.forStep(formatterStep)) {
-				stepHarness.testResource(dirtyFileFile, dirtyFile, cleanFile);
+			try (StepHarnessWithFile stepHarness = StepHarnessWithFile.forStep(this, formatterStep)) {
+				stepHarness.test(dirtyFileFile, ResourceHarness.getTestResource(dirtyFile), ResourceHarness.getTestResource(cleanFile));
 			}
 		}
 	}
@@ -116,8 +118,8 @@ void formattingUsingRulesetsFile(String ruleSetName) throws Exception {
 					npmPathResolver(),
 					new EslintTypescriptConfig(eslintRc, null, tsconfigFile));
 
-			try (StepHarnessWithFile stepHarness = StepHarnessWithFile.forStep(formatterStep)) {
-				stepHarness.testResource(dirtyFileFile, dirtyFile, cleanFile);
+			try (StepHarnessWithFile stepHarness = StepHarnessWithFile.forStep(this, formatterStep)) {
+				stepHarness.test(dirtyFileFile, ResourceHarness.getTestResource(dirtyFile), ResourceHarness.getTestResource(cleanFile));
 			}
 		}
 	}
@@ -173,8 +175,8 @@ void formattingUsingInlineXoConfig() throws Exception {
 					npmPathResolver(),
 					new EslintTypescriptConfig(null, esLintConfig, tsconfigFile));
 
-			try (StepHarnessWithFile stepHarness = StepHarnessWithFile.forStep(formatterStep)) {
-				stepHarness.testResource(dirtyFileFile, dirtyFile, cleanFile);
+			try (StepHarnessWithFile stepHarness = StepHarnessWithFile.forStep(this, formatterStep)) {
+				stepHarness.test(dirtyFileFile, ResourceHarness.getTestResource(dirtyFile), ResourceHarness.getTestResource(cleanFile));
 			}
 		}
 	}

From ce21de7bbe2108a04b8b9b1c02a43cf01d889faf Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Wed, 4 Jan 2023 13:44:21 +0100
Subject: [PATCH 0468/2068] eslint: adapt PR number

---
 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 bf1798d7c2..95a657e334 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,7 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* Added support for npm-based [ESLint](https://eslint.org/)-formatter for javascript and typescript ([#1433](https://github.com/diffplug/spotless/pull/1433))
+* Added support for npm-based [ESLint](https://eslint.org/)-formatter for javascript and typescript ([#1453](https://github.com/diffplug/spotless/pull/1453))
 ### Changes
 * Bump default Version for `prettier` from `2.0.5` to `2.8.1`
 * Bump the dev version of Gradle from `7.5.1` to `7.6` ([#1409](https://github.com/diffplug/spotless/pull/1409))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index d668f69483..7ed1bc7a20 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -4,7 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* Added support for npm-based [ESLint](https://eslint.org/) formatter for javascript and typescript ([#1433](https://github.com/diffplug/spotless/pull/1433))
+* Added support for npm-based [ESLint](https://eslint.org/) formatter for javascript and typescript ([#1453](https://github.com/diffplug/spotless/pull/1453))
 ### Fixed
 * Prevent tool configurations from being resolved outside project ([#1447](https://github.com/diffplug/spotless/pull/1447) fixes [#1215](https://github.com/diffplug/spotless/issues/1215))
 
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index f57a8dbbd4..a58bb2a30f 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -4,7 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* Added support for npm-based [ESLint](https://eslint.org/)-formatter for javascript and typescript ([#1433](https://github.com/diffplug/spotless/pull/1433))
+* Added support for npm-based [ESLint](https://eslint.org/)-formatter for javascript and typescript ([#1453](https://github.com/diffplug/spotless/pull/1453))
 
 ## [2.29.0] - 2023-01-02
 ### Added

From 3a1d43bca5274dd83fe5f7667d85afe14c8d4400 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Wed, 4 Jan 2023 13:53:53 +0100
Subject: [PATCH 0469/2068] eslint: add default version bump to CHANGES

---
 plugin-gradle/CHANGES.md | 2 ++
 plugin-maven/CHANGES.md  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 7ed1bc7a20..bb05d07554 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -7,6 +7,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Added support for npm-based [ESLint](https://eslint.org/) formatter for javascript and typescript ([#1453](https://github.com/diffplug/spotless/pull/1453))
 ### Fixed
 * Prevent tool configurations from being resolved outside project ([#1447](https://github.com/diffplug/spotless/pull/1447) fixes [#1215](https://github.com/diffplug/spotless/issues/1215))
+### Changes
+* Bump default Version for `prettier` from `2.0.5` to `2.8.1`
 
 ## [6.12.1] - 2023-01-02
 ### Fixed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index a58bb2a30f..4f5d30cb74 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,6 +5,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Added support for npm-based [ESLint](https://eslint.org/)-formatter for javascript and typescript ([#1453](https://github.com/diffplug/spotless/pull/1453))
+### Changes
+* Bump default Version for `prettier` from `2.0.5` to `2.8.1`
 
 ## [2.29.0] - 2023-01-02
 ### Added

From b4f76b4f8cca59803ef720b651c39d00e88e0617 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Wed, 4 Jan 2023 14:04:21 +0100
Subject: [PATCH 0470/2068] eslint: adapt maven code to match documentation

---
 .../spotless/maven/generic/Prettier.java      | 16 +--------------
 .../maven/javascript/AbstractEslint.java      | 17 ++++++++++++++++
 .../npm/AbstractNpmFormatterStepFactory.java  | 20 +++++++++++++++++++
 .../spotless/npm/EslintFormatterStepTest.java |  3 +--
 4 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Prettier.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Prettier.java
index ffe384b4d9..01ce2a5394 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Prettier.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Prettier.java
@@ -61,7 +61,7 @@ public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 		if (prettierVersion != null && !prettierVersion.isEmpty()) {
 			this.devDependencies = PrettierFormatterStep.defaultDevDependenciesWithPrettier(prettierVersion);
 		} else if (devDependencyProperties != null) {
-			this.devDependencies = dependencyPropertiesAsMap();
+			this.devDependencies = propertiesAsMap(this.devDependencyProperties);
 		}
 
 		// process config file or inline config
@@ -100,20 +100,6 @@ public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 		return PrettierFormatterStep.create(devDependencies, stepConfig.getProvisioner(), baseDir, buildDir, npmPathResolver, prettierConfig);
 	}
 
-	private boolean moreThanOneNonNull(Object... objects) {
-		return Arrays.stream(objects)
-				.filter(Objects::nonNull)
-				.filter(o -> !(o instanceof String) || !((String) o).isEmpty()) // if it is a string, it should not be empty
-				.count() > 1;
-	}
-
-	private Map<String, String> dependencyPropertiesAsMap() {
-		return this.devDependencyProperties.stringPropertyNames()
-				.stream()
-				.map(name -> new AbstractMap.SimpleEntry<>(name, this.devDependencyProperties.getProperty(name)))
-				.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
-	}
-
 	private static IllegalArgumentException onlyOneConfig() {
 		return new IllegalArgumentException(ERROR_MESSAGE_ONLY_ONE_CONFIG);
 	}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/AbstractEslint.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/AbstractEslint.java
index b5fc156a57..1829f91b4e 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/AbstractEslint.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/AbstractEslint.java
@@ -17,6 +17,7 @@
 
 import java.io.File;
 import java.util.Map;
+import java.util.Properties;
 import java.util.TreeMap;
 
 import org.apache.maven.plugins.annotations.Parameter;
@@ -30,6 +31,8 @@
 
 public abstract class AbstractEslint extends AbstractNpmFormatterStepFactory {
 
+	public static final String ERROR_MESSAGE_ONLY_ONE_CONFIG = "must specify exactly one eslintVersion, devDependencies or devDependencyProperties";
+
 	@Parameter
 	protected String configFile;
 
@@ -45,11 +48,21 @@ public abstract class AbstractEslint extends AbstractNpmFormatterStepFactory {
 	@Parameter
 	protected Map<String, String> devDependencies;
 
+	@Parameter
+	protected Properties devDependencyProperties;
+
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
+		// check if config is only setup in one way
+		if (moreThanOneNonNull(this.eslintVersion, this.devDependencies, this.devDependencyProperties)) {
+			throw onlyOneConfig();
+		}
+
 		Map<String, String> devDependencies = new TreeMap<>();
 		if (this.devDependencies != null) {
 			devDependencies.putAll(this.devDependencies);
+		} else if (this.devDependencyProperties != null) {
+			devDependencies.putAll(propertiesAsMap(this.devDependencyProperties));
 		} else {
 			Map<String, String> defaultDependencies = createDefaultDependencies();
 			devDependencies.putAll(defaultDependencies);
@@ -63,6 +76,10 @@ public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 		return EslintFormatterStep.create(devDependencies, stepConfig.getProvisioner(), baseDir, buildDir, npmPathResolver, eslintConfig(stepConfig));
 	}
 
+	private static IllegalArgumentException onlyOneConfig() {
+		return new IllegalArgumentException(ERROR_MESSAGE_ONLY_ONE_CONFIG);
+	}
+
 	protected abstract EslintConfig eslintConfig(FormatterStepConfig stepConfig);
 
 	private void addStyleGuideDevDependencies(Map<String, String> devDependencies) {
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/npm/AbstractNpmFormatterStepFactory.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/npm/AbstractNpmFormatterStepFactory.java
index 22ee5e0dba..5467f4c3bc 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/npm/AbstractNpmFormatterStepFactory.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/npm/AbstractNpmFormatterStepFactory.java
@@ -16,6 +16,12 @@
 package com.diffplug.spotless.maven.npm;
 
 import java.io.File;
+import java.util.AbstractMap;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Properties;
+import java.util.stream.Collectors;
 
 import org.apache.maven.plugins.annotations.Parameter;
 
@@ -52,4 +58,18 @@ protected File baseDir(FormatterStepConfig stepConfig) {
 	protected NpmPathResolver npmPathResolver(FormatterStepConfig stepConfig) {
 		return new NpmPathResolver(npm(stepConfig), npmrc(stepConfig), baseDir(stepConfig));
 	}
+
+	protected boolean moreThanOneNonNull(Object... objects) {
+		return Arrays.stream(objects)
+				.filter(Objects::nonNull)
+				.filter(o -> !(o instanceof String) || !((String) o).isEmpty()) // if it is a string, it should not be empty
+				.count() > 1;
+	}
+
+	protected Map<String, String> propertiesAsMap(Properties devDependencyProperties) {
+		return devDependencyProperties.stringPropertyNames()
+				.stream()
+				.map(name -> new AbstractMap.SimpleEntry<>(name, devDependencyProperties.getProperty(name)))
+				.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+	}
 }
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
index a993f43090..19f6e8c223 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
@@ -19,8 +19,6 @@
 import java.util.Map;
 import java.util.TreeMap;
 
-import com.diffplug.spotless.ResourceHarness;
-
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -28,6 +26,7 @@
 
 import com.diffplug.common.collect.ImmutableMap;
 import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.ResourceHarness;
 import com.diffplug.spotless.StepHarnessWithFile;
 import com.diffplug.spotless.TestProvisioner;
 import com.diffplug.spotless.tag.NpmTest;

From 45983197c3098f163dc6abf5c751684b21cbc6cc Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Wed, 4 Jan 2023 14:04:31 +0100
Subject: [PATCH 0471/2068] eslint: spotlessApply

---
 .../src/main/java/com/diffplug/spotless/extra/GitRatchet.java   | 2 +-
 plugin-gradle/README.md                                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitRatchet.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitRatchet.java
index 31f2f597f9..037d4d847b 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitRatchet.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitRatchet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 DiffPlug
+ * Copyright 2020-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index edd6c43bb6..1e34cdc88a 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -662,7 +662,7 @@ For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#n
 
 ## Javascript
 
-- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.0/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
+- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
 
 ```gradle
 spotless {

From f01b03891d980e06f215ae2706c39a5f2d20753e Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Wed, 4 Jan 2023 18:24:17 +0400
Subject: [PATCH 0472/2068] Fix tests

---
 .../spotless/maven/MavenIntegrationHarness.java      |  4 ++++
 .../com/diffplug/spotless/maven/json/JsonTest.java   | 12 ++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
index 939940a315..1976d577bb 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
@@ -156,6 +156,10 @@ protected void writePomWithMarkdownSteps(String... steps) throws IOException {
 		writePom(groupWithSteps("markdown", including("**/*.md"), steps));
 	}
 
+	protected void writePomWithJsonSteps(String... steps) throws IOException {
+		writePom(groupWithSteps("json", including("**/*.json"), steps));
+	}
+
 	protected void writePom(String... configuration) throws IOException {
 		writePom(null, configuration, null);
 	}
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java
index b7e666190a..fe6560cbec 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java
@@ -22,19 +22,19 @@
 public class JsonTest extends MavenIntegrationHarness {
 	@Test
 	public void testFormatJson_WithSimple_defaultConfig() throws Exception {
-		writePomWithPomSteps("<json><simple/></json>");
+		writePomWithJsonSteps("<json><simple/></json>");
 
-		setFile("json_test.json").toResource("json/json_dirty.json");
+		setFile("json_test.json").toResource("json/sortByKeysBefore.json");
 		mavenRunner().withArguments("spotless:apply").runNoError().error();
-		assertFile("json_test.json").sameAsResource("json/json_clean_default.json");
+		assertFile("json_test.json").sameAsResource("json/sortByKeysAfterDisabled.json");
 	}
 
 	@Test
 	public void testFormatJson_WithGson_defaultConfig() throws Exception {
-		writePomWithPomSteps("<json><gson/></json>");
+		writePomWithJsonSteps("<json><gson/></json>");
 
-		setFile("json_test.json").toResource("json/json_dirty.json");
+		setFile("json_test.json").toResource("json/sortByKeysBefore.json");
 		mavenRunner().withArguments("spotless:apply").runNoError().error();
-		assertFile("json_test.json").sameAsResource("json/json_clean_default.json");
+		assertFile("json_test.json").sameAsResource("json/sortByKeysAfterDisabled.json");
 	}
 }

From 1d2290d61e019edc01f86c2ee838a00107935ac4 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Wed, 4 Jan 2023 18:29:05 +0400
Subject: [PATCH 0473/2068] Fix README

---
 plugin-maven/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 70f3dfe1dc..dcc18a5dd6 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -703,7 +703,7 @@ For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#n
 
 ## JSON
 
-- `com.diffplug.spotless.maven.json.Json` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java)
+- `com.diffplug.spotless.maven.json.Json` [code](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/json.java)
 
 ```xml
 <configuration>

From a4899012b2cc08c176264567e829979de1d33095 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Wed, 4 Jan 2023 18:47:39 +0400
Subject: [PATCH 0474/2068] Fix style

---
 .../com/diffplug/spotless/maven/MavenIntegrationHarness.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
index 1976d577bb..9e9495da65 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From cf8bc0853f7cfa1364a12d076368bc099f9a9ef2 Mon Sep 17 00:00:00 2001
From: Abel Keszei <keszeiabel@gmail.com>
Date: Wed, 4 Jan 2023 21:15:57 +0100
Subject: [PATCH 0475/2068] =?UTF-8?q?rename=20skipLinesPattern=20to=20skip?=
 =?UTF-8?q?=C3=85LinesMatching?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../spotless/generic/LicenseHeaderStep.java   | 36 +++++++++----------
 .../gradle/spotless/FormatExtension.java      |  4 +--
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java b/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
index d1fdf86e3e..8a46e08bda 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
@@ -60,16 +60,16 @@ public static LicenseHeaderStep headerDelimiter(ThrowingEx.Supplier<String> head
 	final String delimiter;
 	final String yearSeparator;
 	final Supplier<YearMode> yearMode;
-	final @Nullable String skipLinesPattern;
+	final @Nullable String skipLinesMatching;
 
-	private LicenseHeaderStep(@Nullable String name, @Nullable String contentPattern, ThrowingEx.Supplier<String> headerLazy, String delimiter, String yearSeparator, Supplier<YearMode> yearMode, @Nullable String skipLinesPattern) {
+	private LicenseHeaderStep(@Nullable String name, @Nullable String contentPattern, ThrowingEx.Supplier<String> headerLazy, String delimiter, String yearSeparator, Supplier<YearMode> yearMode, @Nullable String skipLinesMatching) {
 		this.name = sanitizeName(name);
 		this.contentPattern = sanitizePattern(contentPattern);
 		this.headerLazy = Objects.requireNonNull(headerLazy);
 		this.delimiter = Objects.requireNonNull(delimiter);
 		this.yearSeparator = Objects.requireNonNull(yearSeparator);
 		this.yearMode = Objects.requireNonNull(yearMode);
-		this.skipLinesPattern = sanitizePattern(skipLinesPattern);
+		this.skipLinesMatching = sanitizePattern(skipLinesMatching);
 	}
 
 	public String getName() {
@@ -77,11 +77,11 @@ public String getName() {
 	}
 
 	public LicenseHeaderStep withName(String name) {
-		return new LicenseHeaderStep(name, contentPattern, headerLazy, delimiter, yearSeparator, yearMode, skipLinesPattern);
+		return new LicenseHeaderStep(name, contentPattern, headerLazy, delimiter, yearSeparator, yearMode, skipLinesMatching);
 	}
 
 	public LicenseHeaderStep withContentPattern(String contentPattern) {
-		return new LicenseHeaderStep(name, contentPattern, headerLazy, delimiter, yearSeparator, yearMode, skipLinesPattern);
+		return new LicenseHeaderStep(name, contentPattern, headerLazy, delimiter, yearSeparator, yearMode, skipLinesMatching);
 	}
 
 	public LicenseHeaderStep withHeaderString(String header) {
@@ -89,15 +89,15 @@ public LicenseHeaderStep withHeaderString(String header) {
 	}
 
 	public LicenseHeaderStep withHeaderLazy(ThrowingEx.Supplier<String> headerLazy) {
-		return new LicenseHeaderStep(name, contentPattern, headerLazy, delimiter, yearSeparator, yearMode, skipLinesPattern);
+		return new LicenseHeaderStep(name, contentPattern, headerLazy, delimiter, yearSeparator, yearMode, skipLinesMatching);
 	}
 
 	public LicenseHeaderStep withDelimiter(String delimiter) {
-		return new LicenseHeaderStep(name, contentPattern, headerLazy, delimiter, yearSeparator, yearMode, skipLinesPattern);
+		return new LicenseHeaderStep(name, contentPattern, headerLazy, delimiter, yearSeparator, yearMode, skipLinesMatching);
 	}
 
 	public LicenseHeaderStep withYearSeparator(String yearSeparator) {
-		return new LicenseHeaderStep(name, contentPattern, headerLazy, delimiter, yearSeparator, yearMode, skipLinesPattern);
+		return new LicenseHeaderStep(name, contentPattern, headerLazy, delimiter, yearSeparator, yearMode, skipLinesMatching);
 	}
 
 	public LicenseHeaderStep withYearMode(YearMode yearMode) {
@@ -105,11 +105,11 @@ public LicenseHeaderStep withYearMode(YearMode yearMode) {
 	}
 
 	public LicenseHeaderStep withYearModeLazy(Supplier<YearMode> yearMode) {
-		return new LicenseHeaderStep(name, contentPattern, headerLazy, delimiter, yearSeparator, yearMode, skipLinesPattern);
+		return new LicenseHeaderStep(name, contentPattern, headerLazy, delimiter, yearSeparator, yearMode, skipLinesMatching);
 	}
 
-	public LicenseHeaderStep withSkipLinesPattern(String skipLinesPattern) {
-		return new LicenseHeaderStep(name, contentPattern, headerLazy, delimiter, yearSeparator, yearMode, skipLinesPattern);
+	public LicenseHeaderStep withSkipLinesMatching(String skipLinesMatching) {
+		return new LicenseHeaderStep(name, contentPattern, headerLazy, delimiter, yearSeparator, yearMode, skipLinesMatching);
 	}
 
 	public FormatterStep build() {
@@ -118,7 +118,7 @@ public FormatterStep build() {
 		if (yearMode.get() == YearMode.SET_FROM_GIT) {
 			formatterStep = FormatterStep.createNeverUpToDateLazy(name, () -> {
 				boolean updateYear = false; // doesn't matter
-				Runtime runtime = new Runtime(headerLazy.get(), delimiter, yearSeparator, updateYear, skipLinesPattern);
+				Runtime runtime = new Runtime(headerLazy.get(), delimiter, yearSeparator, updateYear, skipLinesMatching);
 				return FormatterFunc.needsFile(runtime::setLicenseHeaderYearsFromGitHistory);
 			});
 		} else {
@@ -136,7 +136,7 @@ public FormatterStep build() {
 				default:
 					throw new IllegalStateException(yearMode.toString());
 				}
-				return new Runtime(headerLazy.get(), delimiter, yearSeparator, updateYear, skipLinesPattern);
+				return new Runtime(headerLazy.get(), delimiter, yearSeparator, updateYear, skipLinesMatching);
 			}, step -> step::format);
 		}
 
@@ -201,7 +201,7 @@ private static class Runtime implements Serializable {
 		private static final long serialVersionUID = 1475199492829130965L;
 
 		private final Pattern delimiterPattern;
-		private final @Nullable Pattern skipLinesPattern;
+		private final @Nullable Pattern skipLinesMatching;
 		private final String yearSepOrFull;
 		private final @Nullable String yearToday;
 		private final @Nullable String beforeYear;
@@ -210,7 +210,7 @@ private static class Runtime implements Serializable {
 		private final boolean licenseHeaderWithRange;
 
 		/** The license that we'd like enforced. */
-		private Runtime(String licenseHeader, String delimiter, String yearSeparator, boolean updateYearWithLatest, @Nullable String skipLinesPattern) {
+		private Runtime(String licenseHeader, String delimiter, String yearSeparator, boolean updateYearWithLatest, @Nullable String skipLinesMatching) {
 			if (delimiter.contains("\n")) {
 				throw new IllegalArgumentException("The delimiter must not contain any newlines.");
 			}
@@ -220,7 +220,7 @@ private Runtime(String licenseHeader, String delimiter, String yearSeparator, bo
 				licenseHeader = licenseHeader + "\n";
 			}
 			this.delimiterPattern = Pattern.compile('^' + delimiter, Pattern.UNIX_LINES | Pattern.MULTILINE);
-			this.skipLinesPattern = skipLinesPattern == null ? null : Pattern.compile(skipLinesPattern);
+			this.skipLinesMatching = skipLinesMatching == null ? null : Pattern.compile(skipLinesMatching);
 
 			Optional<String> yearToken = getYearToken(licenseHeader);
 			if (yearToken.isPresent()) {
@@ -262,7 +262,7 @@ private static Optional<String> getYearToken(String licenseHeader) {
 
 		/** Formats the given string. */
 		private String format(String raw) {
-			if (skipLinesPattern == null) {
+			if (skipLinesMatching == null) {
 				return addOrUpdateLicenseHeader(raw);
 			} else {
 				String[] lines = raw.split("\n");
@@ -271,7 +271,7 @@ private String format(String raw) {
 				boolean lastMatched = true;
 				for (String line : lines) {
 					if (lastMatched) {
-						Matcher matcher = skipLinesPattern.matcher(line);
+						Matcher matcher = skipLinesMatching.matcher(line);
 						if (matcher.find()) {
 							skippedLinesBuilder.append(line).append('\n');
 						} else {
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index 9c1e239d39..b8344c385f 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -462,8 +462,8 @@ public LicenseHeaderConfig yearSeparator(String yearSeparator) {
 			return this;
 		}
 
-		public LicenseHeaderConfig skipLinesPattern(String skipLinesPattern) {
-			builder = builder.withSkipLinesPattern(skipLinesPattern);
+		public LicenseHeaderConfig skipLinesMatching(String skipLinesMatching) {
+			builder = builder.withSkipLinesMatching(skipLinesMatching);
 			replaceStep(createStep());
 			return this;
 		}

From 6dc01fa90418ca7eb995bfa42f7ef2eb207643fc Mon Sep 17 00:00:00 2001
From: Clayton Walker <clayton.m.walker@gmail.com>
Date: Wed, 4 Jan 2023 14:06:51 -0700
Subject: [PATCH 0476/2068] Fix ktlint 0.48

---
 gradle.properties                             |  2 +
 lib/build.gradle                              | 16 +++--
 .../KtLintCompat0Dot48Dot1Adapter.java}       | 64 ++++++++++++++-----
 .../glue/ktlint/KtlintFormatterFunc.java      |  4 +-
 .../diffplug/spotless/kotlin/KtLintStep.java  |  2 +-
 .../KtLintCompat0Dot48Dot1AdapterTest.java    | 48 ++++++++++++++
 .../resources/empty_class_body.kt             |  3 +
 .../resources/fails_no_semicolons.kt          |  3 +
 .../spotless/kotlin/KtLintStepTest.java       |  4 +-
 9 files changed, 119 insertions(+), 27 deletions(-)
 rename lib/src/{compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java => compatKtLint0Dot48Dot1/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot1Adapter.java} (57%)
 create mode 100644 lib/src/testCompatKtLint0Dot48Dot1/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot1AdapterTest.java
 create mode 100644 lib/src/testCompatKtLint0Dot48Dot1/resources/empty_class_body.kt
 create mode 100644 lib/src/testCompatKtLint0Dot48Dot1/resources/fails_no_semicolons.kt

diff --git a/gradle.properties b/gradle.properties
index 577ed87535..001197ff4c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,7 @@
 # To fix metaspace errors
 org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=1024m -Dfile.encoding=UTF-8
+org.gradle.parallel=true
+org.gradle.caching=true
 name=spotless
 description=Spotless - keep your code spotless with Gradle
 org=diffplug
diff --git a/lib/build.gradle b/lib/build.gradle
index 0cc258afca..826abf70a7 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -34,7 +34,7 @@ versionCompatibility {
 				'0.45.2',
 				'0.46.0',
 				'0.47.0',
-				'0.48.0',
+				'0.48.1',
 			]
 			targetSourceSetName = 'ktlint'
 		}
@@ -91,9 +91,9 @@ dependencies {
 	compatKtLint0Dot47Dot0CompileOnly 'com.pinterest.ktlint:ktlint-core:0.47.0'
 	compatKtLint0Dot47Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-experimental:0.47.0'
 	compatKtLint0Dot47Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.47.0'
-	compatKtLint0Dot48Dot0CompileOnly 'com.pinterest.ktlint:ktlint-core:0.48.0'
-	compatKtLint0Dot48Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-experimental:0.48.0'
-	compatKtLint0Dot48Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.48.0'
+	compatKtLint0Dot48Dot1CompileOnly 'com.pinterest.ktlint:ktlint-core:0.48.1'
+	compatKtLint0Dot48Dot1CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-experimental:0.48.1'
+	compatKtLint0Dot48Dot1CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.48.1'
 
 	String VER_SCALAFMT="3.6.1"
 	scalafmtCompileOnly "org.scalameta:scalafmt-core_2.13:$VER_SCALAFMT"
@@ -105,10 +105,16 @@ dependencies {
 	flexmarkCompileOnly 'com.vladsch.flexmark:flexmark-all:0.62.2'
 }
 
+configurations.named('testCompatKtLint0Dot48Dot1Implementation').configure {
+	extendsFrom(configurations.testImplementation, configurations.compatKtLint0Dot48Dot1CompileOnly)
+}
+
 // we'll hold the core lib to a high standard
 spotbugs { reportLevel = 'low' } // low|medium|high (low = sensitive to even minor mistakes)
 
-test { useJUnitPlatform() }
+tasks.withType(Test).configureEach {
+	useJUnitPlatform()
+}
 
 jar {
 	for (glue in NEEDS_GLUE) {
diff --git a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java b/lib/src/compatKtLint0Dot48Dot1/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot1Adapter.java
similarity index 57%
rename from lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
rename to lib/src/compatKtLint0Dot48Dot1/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot1Adapter.java
index 8235c535a5..e47f950a1b 100644
--- a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot48Dot1/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot1Adapter.java
@@ -15,6 +15,9 @@
  */
 package com.diffplug.spotless.glue.ktlint.compat;
 
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
@@ -23,15 +26,21 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import com.pinterest.ktlint.core.KtLint;
+import com.pinterest.ktlint.core.KtLintRuleEngine;
 import com.pinterest.ktlint.core.LintError;
 import com.pinterest.ktlint.core.Rule;
 import com.pinterest.ktlint.core.RuleProvider;
-import com.pinterest.ktlint.core.api.DefaultEditorConfigProperties;
 import com.pinterest.ktlint.core.api.EditorConfigDefaults;
 import com.pinterest.ktlint.core.api.EditorConfigOverride;
 import com.pinterest.ktlint.core.api.UsesEditorConfigProperties;
+import com.pinterest.ktlint.core.api.editorconfig.CodeStyleEditorConfigPropertyKt;
+import com.pinterest.ktlint.core.api.editorconfig.DisabledRulesEditorConfigPropertyKt;
 import com.pinterest.ktlint.core.api.editorconfig.EditorConfigProperty;
+import com.pinterest.ktlint.core.api.editorconfig.IndentSizeEditorConfigPropertyKt;
+import com.pinterest.ktlint.core.api.editorconfig.IndentStyleEditorConfigPropertyKt;
+import com.pinterest.ktlint.core.api.editorconfig.InsertFinalNewLineEditorConfigPropertyKt;
+import com.pinterest.ktlint.core.api.editorconfig.MaxLineLengthEditorConfigPropertyKt;
+import com.pinterest.ktlint.core.api.editorconfig.RuleExecutionEditorConfigPropertyKt;
 import com.pinterest.ktlint.ruleset.experimental.ExperimentalRuleSetProvider;
 import com.pinterest.ktlint.ruleset.standard.StandardRuleSetProvider;
 
@@ -39,7 +48,23 @@
 import kotlin.Unit;
 import kotlin.jvm.functions.Function2;
 
-public class KtLintCompat0Dot48Dot0Adapter implements KtLintCompatAdapter {
+public class KtLintCompat0Dot48Dot1Adapter implements KtLintCompatAdapter {
+
+	private static final List<EditorConfigProperty<?>> DEFAULT_EDITOR_CONFIG_PROPERTIES;
+
+	static {
+		List<EditorConfigProperty<?>> list = new ArrayList<>();
+		list.add(CodeStyleEditorConfigPropertyKt.getCODE_STYLE_PROPERTY());
+		//noinspection deprecation
+		list.add(DisabledRulesEditorConfigPropertyKt.getDISABLED_RULES_PROPERTY());
+		//noinspection KotlinInternalInJava,deprecation
+		list.add(DisabledRulesEditorConfigPropertyKt.getKTLINT_DISABLED_RULES_PROPERTY());
+		list.add(IndentStyleEditorConfigPropertyKt.getINDENT_STYLE_PROPERTY());
+		list.add(IndentSizeEditorConfigPropertyKt.getINDENT_SIZE_PROPERTY());
+		list.add(InsertFinalNewLineEditorConfigPropertyKt.getINSERT_FINAL_NEWLINE_PROPERTY());
+		list.add(MaxLineLengthEditorConfigPropertyKt.getMAX_LINE_LENGTH_PROPERTY());
+		DEFAULT_EDITOR_CONFIG_PROPERTIES = Collections.unmodifiableList(list);
+	}
 
 	static class FormatterCallback implements Function2<LintError, Boolean, Unit> {
 		@Override
@@ -47,7 +72,7 @@ public Unit invoke(LintError lint, Boolean corrected) {
 			if (!corrected) {
 				KtLintCompatReporting.report(lint.getLine(), lint.getCol(), lint.getRuleId(), lint.getDetail());
 			}
-			return null;
+			return Unit.INSTANCE;
 		}
 	}
 
@@ -66,7 +91,7 @@ public String format(final String text, final String name, final boolean isScrip
 
 		EditorConfigOverride editorConfigOverride;
 		if (editorConfigOverrideMap.isEmpty()) {
-			editorConfigOverride = EditorConfigOverride.Companion.getEmptyEditorConfigOverride();
+			editorConfigOverride = EditorConfigOverride.Companion.getEMPTY_EDITOR_CONFIG_OVERRIDE();
 		} else {
 			editorConfigOverride = createEditorConfigOverride(allRuleProviders.stream().map(
 					RuleProvider::createNewRuleInstance).collect(
@@ -74,17 +99,10 @@ public String format(final String text, final String name, final boolean isScrip
 					editorConfigOverrideMap);
 		}
 
-		return KtLint.INSTANCE.format(new KtLint.ExperimentalParams(
-				name,
-				text,
-				allRuleProviders,
-				userData,
-				formatterCallback,
-				isScript,
-				false,
-				EditorConfigDefaults.Companion.getEmptyEditorConfigDefaults(),
-				editorConfigOverride,
-				false));
+		EditorConfigDefaults editorConfigDefaults = EditorConfigDefaults.Companion.getEMPTY_EDITOR_CONFIG_DEFAULTS();
+		boolean isInvokedFromCli = false;
+		KtLintRuleEngine ktLintRuleEngine = new KtLintRuleEngine(allRuleProviders, editorConfigDefaults, editorConfigOverride, isInvokedFromCli);
+		return ktLintRuleEngine.format(text, Paths.get(name), formatterCallback);
 	}
 
 	/**
@@ -98,7 +116,7 @@ private static EditorConfigOverride createEditorConfigOverride(final List<Rule>
 
 		// Create a mapping of properties to their names based on rule properties and default properties
 		Map<String, EditorConfigProperty<?>> supportedProperties = Stream
-				.concat(ruleProperties, DefaultEditorConfigProperties.INSTANCE.getEditorConfigProperties().stream())
+				.concat(ruleProperties, DEFAULT_EDITOR_CONFIG_PROPERTIES.stream())
 				.distinct()
 				.collect(Collectors.toMap(EditorConfigProperty::getName, property -> property));
 
@@ -109,6 +127,18 @@ private static EditorConfigOverride createEditorConfigOverride(final List<Rule>
 					EditorConfigProperty<?> property = supportedProperties.get(entry.getKey());
 					if (property != null) {
 						return new Pair<>(property, entry.getValue());
+					} else if (entry.getKey().startsWith("ktlint_")) {
+						String[] parts = entry.getKey().substring(7).split("_", 2);
+						if (parts.length == 1) {
+							// convert ktlint_{ruleset} to {ruleset}
+							String qualifiedRuleId = parts[0];
+							property = RuleExecutionEditorConfigPropertyKt.createRuleSetExecutionEditorConfigProperty(qualifiedRuleId);
+						} else {
+							// convert ktlint_{ruleset}_{rulename} to {ruleset}:{rulename}
+							String qualifiedRuleId = parts[0] + ":" + parts[1];
+							property = RuleExecutionEditorConfigPropertyKt.createRuleExecutionEditorConfigProperty(qualifiedRuleId);
+						}
+						return new Pair<>(property, entry.getValue());
 					} else {
 						return null;
 					}
diff --git a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
index fc64cdb23e..5be69e819c 100644
--- a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
+++ b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
@@ -27,7 +27,7 @@
 import com.diffplug.spotless.glue.ktlint.compat.KtLintCompat0Dot45Dot2Adapter;
 import com.diffplug.spotless.glue.ktlint.compat.KtLintCompat0Dot46Dot0Adapter;
 import com.diffplug.spotless.glue.ktlint.compat.KtLintCompat0Dot47Dot0Adapter;
-import com.diffplug.spotless.glue.ktlint.compat.KtLintCompat0Dot48Dot0Adapter;
+import com.diffplug.spotless.glue.ktlint.compat.KtLintCompat0Dot48Dot1Adapter;
 import com.diffplug.spotless.glue.ktlint.compat.KtLintCompatAdapter;
 
 public class KtlintFormatterFunc implements FormatterFunc.NeedsFile {
@@ -44,7 +44,7 @@ public KtlintFormatterFunc(String version, boolean isScript, boolean useExperime
 		int minorVersion = Integer.parseInt(version.split("\\.")[1]);
 		if (minorVersion >= 48) {
 			// ExperimentalParams lost two constructor arguments, EditorConfigProperty moved to its own class
-			this.adapter = new KtLintCompat0Dot48Dot0Adapter();
+			this.adapter = new KtLintCompat0Dot48Dot1Adapter();
 		} else if (minorVersion == 47) {
 			// rename RuleSet to RuleProvider
 			this.adapter = new KtLintCompat0Dot47Dot0Adapter();
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index b444f0f1a7..7efbb911e3 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -33,7 +33,7 @@ public class KtLintStep {
 	// prevent direct instantiation
 	private KtLintStep() {}
 
-	private static final String DEFAULT_VERSION = "0.48.0";
+	private static final String DEFAULT_VERSION = "0.48.1";
 	static final String NAME = "ktlint";
 	static final String PACKAGE_PRE_0_32 = "com.github.shyiko";
 	static final String PACKAGE = "com.pinterest";
diff --git a/lib/src/testCompatKtLint0Dot48Dot1/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot1AdapterTest.java b/lib/src/testCompatKtLint0Dot48Dot1/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot1AdapterTest.java
new file mode 100644
index 0000000000..d4416d83f3
--- /dev/null
+++ b/lib/src/testCompatKtLint0Dot48Dot1/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot1AdapterTest.java
@@ -0,0 +1,48 @@
+package com.diffplug.spotless.glue.ktlint.compat;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class KtLintCompat0Dot48Dot1AdapterTest {
+	@Test
+	public void testDefaults(@TempDir Path path) throws IOException {
+		KtLintCompat0Dot48Dot1Adapter KtLintCompat0Dot48Dot1Adapter = new KtLintCompat0Dot48Dot1Adapter();
+		try (InputStream is = KtLintCompat0Dot48Dot1AdapterTest.class.getResourceAsStream("/empty_class_body.kt")) {
+			Files.copy(is, path.resolve("empty_class_body.kt"));
+		}
+		String text = new String(Files.readAllBytes(path.resolve("empty_class_body.kt")));
+
+		Map<String, String> userData = new HashMap<>();
+
+		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
+
+		String formatted = KtLintCompat0Dot48Dot1Adapter.format(text, "empty_class_body.kt", false, false, userData, editorConfigOverrideMap);
+		assertEquals("class empty_class_body\n", formatted);
+	}
+
+	@Test
+	public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
+		KtLintCompat0Dot48Dot1Adapter KtLintCompat0Dot48Dot1Adapter = new KtLintCompat0Dot48Dot1Adapter();
+		try (InputStream is = KtLintCompat0Dot48Dot1AdapterTest.class.getResourceAsStream("/fails_no_semicolons.kt")) {
+			Files.copy(is, path.resolve("fails_no_semicolons.kt"));
+		}
+		String text = new String(Files.readAllBytes(path.resolve("fails_no_semicolons.kt")));
+
+		Map<String, String> userData = new HashMap<>();
+
+		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
+		editorConfigOverrideMap.put("ktlint_standard_no-semi", "disabled");
+
+		String formatted = KtLintCompat0Dot48Dot1Adapter.format(text, "fails_no_semicolons.kt", false, false, userData, editorConfigOverrideMap);
+		assertEquals("class fails_no_semicolons {\n\tval i = 0;\n}\n", formatted);
+	}
+}
diff --git a/lib/src/testCompatKtLint0Dot48Dot1/resources/empty_class_body.kt b/lib/src/testCompatKtLint0Dot48Dot1/resources/empty_class_body.kt
new file mode 100644
index 0000000000..b84774d572
--- /dev/null
+++ b/lib/src/testCompatKtLint0Dot48Dot1/resources/empty_class_body.kt
@@ -0,0 +1,3 @@
+class empty_class_body {
+
+}
diff --git a/lib/src/testCompatKtLint0Dot48Dot1/resources/fails_no_semicolons.kt b/lib/src/testCompatKtLint0Dot48Dot1/resources/fails_no_semicolons.kt
new file mode 100644
index 0000000000..20ab460913
--- /dev/null
+++ b/lib/src/testCompatKtLint0Dot48Dot1/resources/fails_no_semicolons.kt
@@ -0,0 +1,3 @@
+class fails_no_semicolons {
+	val i = 0;
+}
diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
index 94de314e0b..4ad9620d48 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
@@ -130,8 +130,8 @@ void works0_47_1() {
 	}
 
 	@Test
-	void works0_48_0() {
-		FormatterStep step = KtLintStep.create("0.48.0", TestProvisioner.mavenCentral());
+	void works0_48_1() {
+		FormatterStep step = KtLintStep.create("0.48.1", TestProvisioner.mavenCentral());
 		StepHarnessWithFile.forStep(this, step)
 				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean")
 				.testResourceExceptionMsg("kotlin/ktlint/unsolvable.dirty").isEqualTo("Error on line: 1, column: 1\n" +

From 4550b66e70910b4733500a6fa4534197fbaa0dd6 Mon Sep 17 00:00:00 2001
From: Clayton Walker <clayton.m.walker@gmail.com>
Date: Wed, 4 Jan 2023 14:13:36 -0700
Subject: [PATCH 0477/2068] Add change to changelog

---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index a7e3516607..d595ff8df6 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,6 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Changes
+* Fix ktlint 0.48.x and bump to ktlint 0.48.1
 * Bump the dev version of Gradle from `7.5.1` to `7.6` ([#1409](https://github.com/diffplug/spotless/pull/1409))
   * We also removed the no-longer-required dependency `org.codehaus.groovy:groovy-xml`
 * Breaking changes to Spotless' internal testing infrastructure `testlib` ([#1443](https://github.com/diffplug/spotless/pull/1443))

From 2936d3cbd6493cab8a2fd27d797b6f8fd2d920eb Mon Sep 17 00:00:00 2001
From: Clayton Walker <clayton.m.walker@gmail.com>
Date: Wed, 4 Jan 2023 14:14:54 -0700
Subject: [PATCH 0478/2068] Add link to issue in changelog

---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index d595ff8df6..ee73f019a5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,7 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Changes
-* Fix ktlint 0.48.x and bump to ktlint 0.48.1
+* Fix ktlint 0.48.x and bump to ktlint 0.48.1 ([#1444](https://github.com/diffplug/spotless/issues/1444))
 * Bump the dev version of Gradle from `7.5.1` to `7.6` ([#1409](https://github.com/diffplug/spotless/pull/1409))
   * We also removed the no-longer-required dependency `org.codehaus.groovy:groovy-xml`
 * Breaking changes to Spotless' internal testing infrastructure `testlib` ([#1443](https://github.com/diffplug/spotless/pull/1443))

From 3a3583b836815c6b431fdce0ddd9a9ea3af03a81 Mon Sep 17 00:00:00 2001
From: Abel Keszei <keszeiabel@gmail.com>
Date: Wed, 4 Jan 2023 22:16:49 +0100
Subject: [PATCH 0479/2068] add maven support

---
 .../java/com/diffplug/spotless/generic/LicenseHeaderStep.java | 2 +-
 .../com/diffplug/spotless/maven/generic/LicenseHeader.java    | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java b/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
index 8a46e08bda..46312ca07a 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
@@ -108,7 +108,7 @@ public LicenseHeaderStep withYearModeLazy(Supplier<YearMode> yearMode) {
 		return new LicenseHeaderStep(name, contentPattern, headerLazy, delimiter, yearSeparator, yearMode, skipLinesMatching);
 	}
 
-	public LicenseHeaderStep withSkipLinesMatching(String skipLinesMatching) {
+	public LicenseHeaderStep withSkipLinesMatching(@Nullable String skipLinesMatching) {
 		return new LicenseHeaderStep(name, contentPattern, headerLazy, delimiter, yearSeparator, yearMode, skipLinesMatching);
 	}
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/LicenseHeader.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/LicenseHeader.java
index ee2ae4fda0..22386c6892 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/LicenseHeader.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/LicenseHeader.java
@@ -37,6 +37,9 @@ public class LicenseHeader implements FormatterStepFactory {
 	@Parameter
 	private String delimiter;
 
+	@Parameter
+	private String skipLinesMatching;
+
 	@Override
 	public final FormatterStep newFormatterStep(FormatterStepConfig config) {
 		String delimiterString = delimiter != null ? delimiter : config.getLicenseHeaderDelimiter();
@@ -53,6 +56,7 @@ public final FormatterStep newFormatterStep(FormatterStepConfig config) {
 			}
 			return LicenseHeaderStep.headerDelimiter(() -> readFileOrContent(config), delimiterString)
 					.withYearMode(yearMode)
+					.withSkipLinesMatching(skipLinesMatching)
 					.build()
 					.filterByFile(LicenseHeaderStep.unsupportedJvmFilesFilter());
 		} else {

From 41c3fe9f07ddfa7145e1e582de923537393e0c67 Mon Sep 17 00:00:00 2001
From: Clayton Walker <clayton.m.walker@gmail.com>
Date: Wed, 4 Jan 2023 14:21:19 -0700
Subject: [PATCH 0480/2068] Update all change logs

---
 CHANGES.md               | 4 +++-
 plugin-gradle/CHANGES.md | 3 +++
 plugin-maven/CHANGES.md  | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index ee73f019a5..50e4d83141 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,8 +10,9 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Support `ktlint` 0.48+ new rule disabling syntax ([#1456](https://github.com/diffplug/spotless/pull/1456)) fixes ([#1444](https://github.com/diffplug/spotless/issues/1444))
 ### Changes
-* Fix ktlint 0.48.x and bump to ktlint 0.48.1 ([#1444](https://github.com/diffplug/spotless/issues/1444))
 * Bump the dev version of Gradle from `7.5.1` to `7.6` ([#1409](https://github.com/diffplug/spotless/pull/1409))
   * We also removed the no-longer-required dependency `org.codehaus.groovy:groovy-xml`
 * Breaking changes to Spotless' internal testing infrastructure `testlib` ([#1443](https://github.com/diffplug/spotless/pull/1443))
@@ -19,6 +20,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
   * `StepHarness` now operates on `Formatter` rather than a `FormatterStep`
   * `StepHarnessWithFile` now takes a `ResourceHarness` in its constructor to handle the file manipulation parts
   * Standardized that we test exception *messages*, not types, which will ease the transition to linting later on
+  * Bump default `ktlint` version to latest `0.47.1` -> `0.48.1` ([#1456](https://github.com/diffplug/spotless/pull/1456))
 
 ## [2.31.1] - 2023-01-02
 ### Fixed
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index c5f464069f..56ed8d6c1e 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,6 +5,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Fixed
 * Prevent tool configurations from being resolved outside project ([#1447](https://github.com/diffplug/spotless/pull/1447) fixes [#1215](https://github.com/diffplug/spotless/issues/1215))
+* Support `ktlint` 0.48+ new rule disabling syntax ([#1456](https://github.com/diffplug/spotless/pull/1456)) fixes ([#1444](https://github.com/diffplug/spotless/issues/1444))
+### Changes
+* Bump default `ktlint` version to latest `0.47.1` -> `0.48.1` ([#1456](https://github.com/diffplug/spotless/pull/1456))
 
 ## [6.12.1] - 2023-01-02
 ### Fixed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 84e06aa847..bc706437fd 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,10 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Support `ktlint` 0.48+ new rule disabling syntax ([#1456](https://github.com/diffplug/spotless/pull/1456)) fixes ([#1444](https://github.com/diffplug/spotless/issues/1444))
+### Changes
+* Bump default `ktlint` version to latest `0.47.1` -> `0.48.1` ([#1456](https://github.com/diffplug/spotless/pull/1456))
 
 ## [2.29.0] - 2023-01-02
 ### Added

From 954e6b58b5c02bbab86b0998cc1232717cba0c7f Mon Sep 17 00:00:00 2001
From: Clayton Walker <clayton.m.walker@gmail.com>
Date: Wed, 4 Jan 2023 14:33:30 -0700
Subject: [PATCH 0481/2068] Run spotless

---
 .../KtLintCompat0Dot48Dot1AdapterTest.java    | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/lib/src/testCompatKtLint0Dot48Dot1/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot1AdapterTest.java b/lib/src/testCompatKtLint0Dot48Dot1/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot1AdapterTest.java
index d4416d83f3..a49de57a97 100644
--- a/lib/src/testCompatKtLint0Dot48Dot1/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot1AdapterTest.java
+++ b/lib/src/testCompatKtLint0Dot48Dot1/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot1AdapterTest.java
@@ -1,5 +1,22 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.glue.ktlint.compat;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
@@ -10,8 +27,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 public class KtLintCompat0Dot48Dot1AdapterTest {
 	@Test
 	public void testDefaults(@TempDir Path path) throws IOException {

From 1a19da11f18dcdf60d821abda4ebd77a0a4e4648 Mon Sep 17 00:00:00 2001
From: Clayton Walker <clayton.m.walker@gmail.com>
Date: Wed, 4 Jan 2023 15:34:22 -0700
Subject: [PATCH 0482/2068] Use older format function that doesn't load
 .editorconfig

---
 .../compat/KtLintCompat0Dot48Dot1Adapter.java  | 18 ++++++++++++------
 .../KtLintCompat0Dot48Dot1AdapterTest.java     |  1 +
 .../spotless/kotlin/KtLintStepTest.java        | 10 ++++++++++
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/lib/src/compatKtLint0Dot48Dot1/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot1Adapter.java b/lib/src/compatKtLint0Dot48Dot1/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot1Adapter.java
index e47f950a1b..4329c18db9 100644
--- a/lib/src/compatKtLint0Dot48Dot1/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot1Adapter.java
+++ b/lib/src/compatKtLint0Dot48Dot1/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot1Adapter.java
@@ -15,7 +15,6 @@
  */
 package com.diffplug.spotless.glue.ktlint.compat;
 
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedHashSet;
@@ -26,7 +25,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import com.pinterest.ktlint.core.KtLintRuleEngine;
+import com.pinterest.ktlint.core.KtLint;
 import com.pinterest.ktlint.core.LintError;
 import com.pinterest.ktlint.core.Rule;
 import com.pinterest.ktlint.core.RuleProvider;
@@ -99,10 +98,17 @@ public String format(final String text, final String name, final boolean isScrip
 					editorConfigOverrideMap);
 		}
 
-		EditorConfigDefaults editorConfigDefaults = EditorConfigDefaults.Companion.getEMPTY_EDITOR_CONFIG_DEFAULTS();
-		boolean isInvokedFromCli = false;
-		KtLintRuleEngine ktLintRuleEngine = new KtLintRuleEngine(allRuleProviders, editorConfigDefaults, editorConfigOverride, isInvokedFromCli);
-		return ktLintRuleEngine.format(text, Paths.get(name), formatterCallback);
+		return KtLint.INSTANCE.format(new KtLint.ExperimentalParams(
+				name,
+				text,
+				allRuleProviders,
+				userData,
+				formatterCallback,
+				isScript,
+				false,
+				EditorConfigDefaults.Companion.getEMPTY_EDITOR_CONFIG_DEFAULTS(),
+				editorConfigOverride,
+				false));
 	}
 
 	/**
diff --git a/lib/src/testCompatKtLint0Dot48Dot1/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot1AdapterTest.java b/lib/src/testCompatKtLint0Dot48Dot1/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot1AdapterTest.java
index a49de57a97..31e6caf824 100644
--- a/lib/src/testCompatKtLint0Dot48Dot1/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot1AdapterTest.java
+++ b/lib/src/testCompatKtLint0Dot48Dot1/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot1AdapterTest.java
@@ -55,6 +55,7 @@ public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		Map<String, String> userData = new HashMap<>();
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
+		editorConfigOverrideMap.put("indent_style", "tab");
 		editorConfigOverrideMap.put("ktlint_standard_no-semi", "disabled");
 
 		String formatted = KtLintCompat0Dot48Dot1Adapter.format(text, "fails_no_semicolons.kt", false, false, userData, editorConfigOverrideMap);
diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
index 4ad9620d48..1be0c7b72f 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
@@ -129,6 +129,16 @@ void works0_47_1() {
 						"Wildcard import");
 	}
 
+	@Test
+	void works0_48_0() {
+		FormatterStep step = KtLintStep.create("0.48.0", TestProvisioner.mavenCentral());
+		StepHarnessWithFile.forStep(this, step)
+				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean")
+				.testResourceExceptionMsg("kotlin/ktlint/unsolvable.dirty").isEqualTo("Error on line: 1, column: 1\n" +
+						"rule: no-wildcard-imports\n" +
+						"Wildcard import");
+	}
+
 	@Test
 	void works0_48_1() {
 		FormatterStep step = KtLintStep.create("0.48.1", TestProvisioner.mavenCentral());

From 11971ab599ee730d3c1fc6b995198a31f7525f6a Mon Sep 17 00:00:00 2001
From: Clayton Walker <clayton.m.walker@gmail.com>
Date: Wed, 4 Jan 2023 15:43:03 -0700
Subject: [PATCH 0483/2068] Fix UTF-8 encoder errors

---
 .../ktlint/compat/KtLintCompat0Dot48Dot1AdapterTest.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/src/testCompatKtLint0Dot48Dot1/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot1AdapterTest.java b/lib/src/testCompatKtLint0Dot48Dot1/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot1AdapterTest.java
index 31e6caf824..ca9d603e5c 100644
--- a/lib/src/testCompatKtLint0Dot48Dot1/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot1AdapterTest.java
+++ b/lib/src/testCompatKtLint0Dot48Dot1/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot1AdapterTest.java
@@ -19,6 +19,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.HashMap;
@@ -34,7 +35,7 @@ public void testDefaults(@TempDir Path path) throws IOException {
 		try (InputStream is = KtLintCompat0Dot48Dot1AdapterTest.class.getResourceAsStream("/empty_class_body.kt")) {
 			Files.copy(is, path.resolve("empty_class_body.kt"));
 		}
-		String text = new String(Files.readAllBytes(path.resolve("empty_class_body.kt")));
+		String text = new String(Files.readAllBytes(path.resolve("empty_class_body.kt")), StandardCharsets.UTF_8);
 
 		Map<String, String> userData = new HashMap<>();
 
@@ -50,7 +51,7 @@ public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		try (InputStream is = KtLintCompat0Dot48Dot1AdapterTest.class.getResourceAsStream("/fails_no_semicolons.kt")) {
 			Files.copy(is, path.resolve("fails_no_semicolons.kt"));
 		}
-		String text = new String(Files.readAllBytes(path.resolve("fails_no_semicolons.kt")));
+		String text = new String(Files.readAllBytes(path.resolve("fails_no_semicolons.kt")), StandardCharsets.UTF_8);
 
 		Map<String, String> userData = new HashMap<>();
 

From b853169fb7650db131b6cc8efa9b538c4613cde2 Mon Sep 17 00:00:00 2001
From: Clayton Walker <clayton.m.walker@gmail.com>
Date: Wed, 4 Jan 2023 15:56:42 -0700
Subject: [PATCH 0484/2068] Remove org.gradle settings

---
 gradle.properties | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 001197ff4c..577ed87535 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,5 @@
 # To fix metaspace errors
 org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=1024m -Dfile.encoding=UTF-8
-org.gradle.parallel=true
-org.gradle.caching=true
 name=spotless
 description=Spotless - keep your code spotless with Gradle
 org=diffplug

From 3540242e98591391c2e766656d5e9ed53f6ca746 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Thu, 5 Jan 2023 07:00:51 +0100
Subject: [PATCH 0485/2068] eslint: reduce log-noise, cleanup error codes

---
 .../com/diffplug/spotless/npm/NpmProcess.java  |  6 +++++-
 .../com/diffplug/spotless/npm/common-serve.js  | 13 ++++++++++---
 .../com/diffplug/spotless/npm/eslint-serve.js  | 18 +++++++++---------
 .../diffplug/spotless/npm/prettier-serve.js    |  2 +-
 .../com/diffplug/spotless/npm/tsfmt-serve.js   |  2 +-
 .../npm/PrettierFormatterStepTest.java         |  2 +-
 6 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java
index e2fd07682c..8be94a9ea3 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java
@@ -34,7 +34,11 @@ class NpmProcess {
 	}
 
 	void install() {
-		npmAwait("install", "--no-audit", "--no-package-lock", "--prefer-offline");
+		npmAwait("install",
+				"--no-audit",
+				"--no-package-lock",
+				"--no-fund",
+				"--prefer-offline");
 	}
 
 	Process start() {
diff --git a/lib/src/main/resources/com/diffplug/spotless/npm/common-serve.js b/lib/src/main/resources/com/diffplug/spotless/npm/common-serve.js
index 3e031cedea..c1c9d62757 100644
--- a/lib/src/main/resources/com/diffplug/spotless/npm/common-serve.js
+++ b/lib/src/main/resources/com/diffplug/spotless/npm/common-serve.js
@@ -1,4 +1,5 @@
-// this file will be glued to the top of the specific xy-server.js file
+// this file will be glued to the top of the specific xy-serve.js file
+const debug_serve = false; // set to true for debug log output in node process
 const GracefulShutdownManager = require("@moebius/http-graceful-shutdown").GracefulShutdownManager;
 const express = require("express");
 const app = express();
@@ -7,8 +8,14 @@ app.use(express.json({ limit: "50mb" }));
 
 const fs = require("fs");
 
+function debugLog() {
+	if (debug_serve) {
+		console.log.apply(this, arguments)
+	}
+}
+
 var listener = app.listen(0, "127.0.0.1", () => {
-	console.log("Server running on port " + listener.address().port);
+	debugLog("Server running on port " + listener.address().port);
 	fs.writeFile("server.port.tmp", "" + listener.address().port, function(err) {
 		if (err) {
 			return console.log(err);
@@ -26,7 +33,7 @@ const shutdownManager = new GracefulShutdownManager(listener);
 app.post("/shutdown", (req, res) => {
 	res.status(200).send("Shutting down");
 	setTimeout(function() {
-		shutdownManager.terminate(() => console.log("graceful shutdown finished."));
+		shutdownManager.terminate(() => debugLog("graceful shutdown finished."));
 	}, 200);
 });
 
diff --git a/lib/src/main/resources/com/diffplug/spotless/npm/eslint-serve.js b/lib/src/main/resources/com/diffplug/spotless/npm/eslint-serve.js
index 1f1b1fab5a..8b60e56dc8 100644
--- a/lib/src/main/resources/com/diffplug/spotless/npm/eslint-serve.js
+++ b/lib/src/main/resources/com/diffplug/spotless/npm/eslint-serve.js
@@ -9,14 +9,14 @@ app.post("/eslint/format", async (req, res) => {
 		const ESLintOverrideConfigFile = format_data.eslint_override_config_file;
 
 		if (!ESLintOverrideConfig && !ESLintOverrideConfigFile) {
-			res.status(501).send("Error while formatting: No config provided");
+			res.status(400).send("Error while formatting: No config provided");
 			return;
 		}
 
 		const filePath = format_data.file_path;
 
 		if (!filePath) {
-			res.status(501).send("Error while formatting: No file path provided");
+			res.status(400).send("Error while formatting: No file path provided");
 			return;
 		}
 
@@ -41,8 +41,8 @@ app.post("/eslint/format", async (req, res) => {
 			eval("ESLintOptions.overrideConfig = " + ESLintOverrideConfig);
 		}
 
-		console.log("using options: " + JSON.stringify(ESLintOptions));
-		console.log("format input: ", format_data.file_content);
+		debugLog("using options: " + JSON.stringify(ESLintOptions));
+		debugLog("format input: ", format_data.file_content);
 
 		const eslint = new ESLint(ESLintOptions);
 
@@ -50,18 +50,18 @@ app.post("/eslint/format", async (req, res) => {
 		const lintTextOptions = {
 			filePath: filePath,
 		}
-		console.log("lintTextOptions", lintTextOptions);
+		debugLog("lintTextOptions", lintTextOptions);
 
 		// LintResult[] // https://eslint.org/docs/latest/developer-guide/nodejs-api#-lintresult-type
 		const results = await eslint.lintText(format_data.file_content, lintTextOptions);
 		if (results.length !== 1) {
-			res.status(501).send("Error while formatting: Unexpected number of results: " + JSON.stringify(results));
+			res.status(500).send("Error while formatting: Unexpected number of results: " + JSON.stringify(results));
 			return;
 		}
 		const result = results[0];
-		console.log("result: " + JSON.stringify(result));
+		debugLog("result: " + JSON.stringify(result));
 		if (result.fatalErrorCount && result.fatalErrorCount > 0) {
-			res.status(501).send("Fatal error while formatting: " + JSON.stringify(result.messages));
+			res.status(500).send("Fatal error while formatting: " + JSON.stringify(result.messages));
 			return;
 		}
 		const formatted = result.output || result.source || format_data.file_content;
@@ -69,6 +69,6 @@ app.post("/eslint/format", async (req, res) => {
 		res.send(formatted);
 	} catch (err) {
 		console.log("error", err);
-		res.status(501).send("Error while formatting: " + err);
+		res.status(500).send("Error while formatting: " + err);
 	}
 });
diff --git a/lib/src/main/resources/com/diffplug/spotless/npm/prettier-serve.js b/lib/src/main/resources/com/diffplug/spotless/npm/prettier-serve.js
index d4ce13bbbc..b60daaaa77 100644
--- a/lib/src/main/resources/com/diffplug/spotless/npm/prettier-serve.js
+++ b/lib/src/main/resources/com/diffplug/spotless/npm/prettier-serve.js
@@ -27,7 +27,7 @@ app.post("/prettier/format", (req, res) => {
 	try {
 		formatted_file_content = prettier.format(format_data.file_content, format_data.config_options);
 	} catch(err) {
-		res.status(501).send("Error while formatting: " + err);
+		res.status(500).send("Error while formatting: " + err);
 		return;
 	}
 	res.set("Content-Type", "text/plain");
diff --git a/lib/src/main/resources/com/diffplug/spotless/npm/tsfmt-serve.js b/lib/src/main/resources/com/diffplug/spotless/npm/tsfmt-serve.js
index 8ec25565ff..b9f20a1472 100644
--- a/lib/src/main/resources/com/diffplug/spotless/npm/tsfmt-serve.js
+++ b/lib/src/main/resources/com/diffplug/spotless/npm/tsfmt-serve.js
@@ -25,6 +25,6 @@ app.post("/tsfmt/format", (req, res) => {
 		res.set("Content-Type", "text/plain");
 		res.send(resultMap.dest);
 	}).catch(reason => {
-		res.status(501).send(reason);
+		res.status(500).send(reason);
 	});
 });
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
index 9db218efb5..acc756fa31 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
@@ -116,7 +116,7 @@ void verifyPrettierErrorMessageIsRelayed() throws Exception {
 					new PrettierConfig(null, ImmutableMap.of("parser", "postcss")));
 			try (StepHarnessWithFile stepHarness = StepHarnessWithFile.forStep(this, formatterStep)) {
 				stepHarness.testResourceExceptionMsg("npm/prettier/filetypes/scss/scss.dirty").isEqualTo(
-						"Unexpected response status code at /prettier/format [HTTP 501] -- (Error while formatting: Error: Couldn't resolve parser \"postcss\")");
+						"Unexpected response status code at /prettier/format [HTTP 500] -- (Error while formatting: Error: Couldn't resolve parser \"postcss\")");
 			}
 		}
 	}

From 98c023b8f972ac37574f0bdae5d407bc502b50f0 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Thu, 5 Jan 2023 09:35:10 +0100
Subject: [PATCH 0486/2068] eslint: spotbugs fix

---
 .../java/com/diffplug/spotless/npm/EslintTypescriptConfig.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintTypescriptConfig.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintTypescriptConfig.java
index fc45f8bd7b..ea3e2046b3 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/EslintTypescriptConfig.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintTypescriptConfig.java
@@ -27,6 +27,8 @@
 
 public class EslintTypescriptConfig extends EslintConfig {
 
+	private static final long serialVersionUID = -126864670181617006L;
+
 	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
 	@Nullable
 	private final transient File typescriptConfigPath;

From 667eef943c0f89ca2415e913cf6d8206ff8c5585 Mon Sep 17 00:00:00 2001
From: Eir Nym <485399+eirnym@users.noreply.github.com>
Date: Thu, 5 Jan 2023 13:14:32 +0100
Subject: [PATCH 0487/2068] Pass editor config and filenames correctly

---
 .../glue/ktlint/KtlintFormatterFunc.java      |  2 +-
 .../diffplug/spotless/kotlin/KtLintStep.java  | 57 +++++++++++++++----
 .../gradle/spotless/KotlinExtension.java      | 16 ++++--
 .../spotless/KotlinGradleExtension.java       | 12 +++-
 4 files changed, 68 insertions(+), 19 deletions(-)

diff --git a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
index cfd6ab859c..034a782be6 100644
--- a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
+++ b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
@@ -73,6 +73,6 @@ public String applyWithFile(String unix, File file) {
 		if (editorConfigPath != null) {
 			absoluteEditorConfigPath = editorConfigPath.getOnlyFile().getAbsolutePath();
 		}
-		return adapter.format(unix, file.getName(), isScript, useExperimental, absoluteEditorConfigPath, userData, editorConfigOverrideMap);
+		return adapter.format(unix, file.getAbsolutePath(), isScript, useExperimental, absoluteEditorConfigPath, userData, editorConfigOverrideMap);
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index 4d29a01394..20e7d885e1 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -23,6 +23,8 @@
 import java.util.Objects;
 import java.util.TreeMap;
 
+import javax.annotation.Nullable;
+
 import com.diffplug.spotless.FileSignature;
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
@@ -51,25 +53,50 @@ public static FormatterStep create(String version, Provisioner provisioner) {
 
 	public static FormatterStep create(String version, Provisioner provisioner, boolean useExperimental,
 			Map<String, String> userData, Map<String, Object> editorConfigOverride) {
-		return create(version, provisioner, false, useExperimental, userData, editorConfigOverride);
+		return create(version, provisioner, false, useExperimental, null, userData, editorConfigOverride);
 	}
 
 	public static FormatterStep createForScript(String version, Provisioner provisioner) {
-		return create(version, provisioner, true, false, Collections.emptyMap(), Collections.emptyMap());
+		return create(version, provisioner, true, false, null, Collections.emptyMap(), Collections.emptyMap());
 	}
 
-	public static FormatterStep createForScript(String version, Provisioner provisioner, boolean useExperimental,
-			FileSignature editorConfigPath, Map<String, String> userData, Map<String, Object> editorConfigOverride) {
-		return create(version, provisioner, true, useExperimental, userData, editorConfigOverride);
+	public static FormatterStep createForScript(String version,
+			Provisioner provisioner,
+			boolean useExperimental,
+			@Nullable FileSignature editorConfigPath,
+			Map<String, String> userData,
+			Map<String, Object> editorConfigOverride) {
+		return create(version,
+				provisioner,
+				true,
+				useExperimental,
+				editorConfigPath,
+				userData,
+				editorConfigOverride);
 	}
 
-	private static FormatterStep create(String version, Provisioner provisioner, boolean isScript, boolean useExperimental,
-			Map<String, String> userData, Map<String, Object> editorConfigOverride) {
-		return create(version, provisioner, useExperimental, userData, editorConfigOverride);
+	private static FormatterStep create(String version,
+			Provisioner provisioner,
+			boolean isScript,
+			boolean useExperimental,
+			Map<String, String> userData,
+			Map<String, Object> editorConfigOverride) {
+		return create(version,
+				provisioner,
+				useExperimental,
+				isScript,
+				null,
+				userData,
+				editorConfigOverride);
 	}
 
-	public static FormatterStep create(String version, Provisioner provisioner, boolean isScript, boolean useExperimental,
-			FileSignature editorConfig, Map<String, String> userData, Map<String, Object> editorConfigOverride) {
+	public static FormatterStep create(String version,
+			Provisioner provisioner,
+			boolean isScript,
+			boolean useExperimental,
+			@Nullable FileSignature editorConfig,
+			Map<String, String> userData,
+			Map<String, Object> editorConfigOverride) {
 		Objects.requireNonNull(version, "version");
 		Objects.requireNonNull(provisioner, "provisioner");
 		return FormatterStep.createLazy(NAME,
@@ -92,10 +119,16 @@ static final class State implements Serializable {
 		private final TreeMap<String, String> userData;
 		private final TreeMap<String, Object> editorConfigOverride;
 		private final String version;
+		@Nullable
 		private final FileSignature editorConfigPath;
 
-		State(String version, Provisioner provisioner, boolean isScript, boolean useExperimental,
-				FileSignature editorConfigPath, Map<String, String> userData, Map<String, Object> editorConfigOverride) throws IOException {
+		State(String version,
+				Provisioner provisioner,
+				boolean isScript,
+				boolean useExperimental,
+				@Nullable FileSignature editorConfigPath,
+				Map<String, String> userData,
+				Map<String, Object> editorConfigOverride) throws IOException {
 			this.version = version;
 
 			String coordinate;
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
index 8af03aaefd..9ebc290219 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
@@ -17,12 +17,14 @@
 
 import static com.diffplug.spotless.kotlin.KotlinConstants.LICENSE_HEADER_DELIMITER;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Objects;
 import java.util.function.Consumer;
 
+import javax.annotation.Nullable;
 import javax.inject.Inject;
 
 import org.gradle.api.GradleException;
@@ -58,12 +60,17 @@ public LicenseHeaderConfig licenseHeaderFile(Object licenseHeaderFile) {
 	}
 
 	/** Adds the specified version of <a href="https://github.com/pinterest/ktlint">ktlint</a>. */
-	public KotlinFormatExtension ktlint(String version) {
+	public KotlinFormatExtension ktlint(String version) throws IOException {
 		Objects.requireNonNull(version);
-		return new KotlinFormatExtension(version, false, null, Collections.emptyMap(), Collections.emptyMap());
+		FileSignature editorConfigPath = null;
+		File defaultEditorConfig = getProject().getRootProject().file(".editorconfig");
+		if (defaultEditorConfig.exists() && defaultEditorConfig.isFile()) {
+			editorConfigPath = FileSignature.signAsList(defaultEditorConfig);
+		}
+		return new KotlinFormatExtension(version, false, editorConfigPath, Collections.emptyMap(), Collections.emptyMap());
 	}
 
-	public KotlinFormatExtension ktlint() {
+	public KotlinFormatExtension ktlint() throws IOException {
 		return ktlint(KtLintStep.defaultVersion());
 	}
 
@@ -71,11 +78,12 @@ public class KotlinFormatExtension {
 
 		private final String version;
 		private boolean useExperimental;
+		@Nullable
 		private FileSignature editorConfigPath;
 		private Map<String, String> userData;
 		private Map<String, Object> editorConfigOverride;
 
-		KotlinFormatExtension(String version, boolean useExperimental, FileSignature editorConfigPath, Map<String, String> config,
+		KotlinFormatExtension(String version, boolean useExperimental, @Nullable FileSignature editorConfigPath, Map<String, String> config,
 				Map<String, Object> editorConfigOverride) {
 			this.version = version;
 			this.useExperimental = useExperimental;
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
index a06c640060..ec645a8972 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
@@ -22,6 +22,7 @@
 import java.util.Objects;
 import java.util.function.Consumer;
 
+import javax.annotation.Nullable;
 import javax.inject.Inject;
 
 import com.diffplug.common.collect.ImmutableSortedMap;
@@ -47,7 +48,7 @@ public KotlinGradleExtension(SpotlessExtension spotless) {
 	public KotlinFormatExtension ktlint(String version) throws IOException {
 		Objects.requireNonNull(version, "version");
 		FileSignature editorConfigPath = null;
-		File defaultEditorConfig = getProject().getRootProject().file(".editorConfig");
+		File defaultEditorConfig = getProject().getRootProject().file(".editorconfig");
 		if (defaultEditorConfig.exists() && defaultEditorConfig.isFile()) {
 			editorConfigPath = FileSignature.signAsList(defaultEditorConfig);
 		}
@@ -62,6 +63,7 @@ public class KotlinFormatExtension {
 
 		private final String version;
 		private boolean useExperimental;
+		@Nullable
 		private FileSignature editorConfigPath;
 		private Map<String, String> userData;
 		private Map<String, Object> editorConfigOverride;
@@ -110,7 +112,13 @@ public KotlinFormatExtension editorConfigOverride(Map<String, Object> editorConf
 		}
 
 		private FormatterStep createStep() {
-			return KtLintStep.createForScript(version, provisioner(), useExperimental, editorConfigPath, userData, editorConfigOverride);
+			return KtLintStep.createForScript(
+					version,
+					provisioner(),
+					useExperimental,
+					editorConfigPath,
+					userData,
+					editorConfigOverride);
 		}
 	}
 

From 03eae65e91b89d8ccc3ff71c6a5b2a4b4d243748 Mon Sep 17 00:00:00 2001
From: Eir Nym <485399+eirnym@users.noreply.github.com>
Date: Thu, 5 Jan 2023 13:17:23 +0100
Subject: [PATCH 0488/2068] EditorConfig: Use Path for files for KtLint

---
 .../ktlint/compat/KtLintCompat0Dot31Dot0Adapter.java  |  9 +++++----
 .../ktlint/compat/KtLintCompat0Dot32Dot0Adapter.java  |  9 +++++----
 .../ktlint/compat/KtLintCompat0Dot34Dot2Adapter.java  | 11 ++++++-----
 .../ktlint/compat/KtLintCompat0Dot45Dot2Adapter.java  | 11 ++++++-----
 .../ktlint/compat/KtLintCompat0Dot46Dot0Adapter.java  | 11 ++++++-----
 .../ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java  | 10 +++++-----
 .../ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java  | 10 +++++-----
 .../glue/ktlint/compat/KtLintCompatAdapter.java       |  5 +++--
 .../spotless/glue/ktlint/KtlintFormatterFunc.java     |  2 +-
 9 files changed, 42 insertions(+), 36 deletions(-)

diff --git a/lib/src/compatKtLint0Dot31Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot31Dot0Adapter.java b/lib/src/compatKtLint0Dot31Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot31Dot0Adapter.java
index a10bf9be0e..42d6e0c5bd 100644
--- a/lib/src/compatKtLint0Dot31Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot31Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot31Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot31Dot0Adapter.java
@@ -15,6 +15,7 @@
  */
 package com.diffplug.spotless.glue.ktlint.compat;
 
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -41,10 +42,10 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	}
 
 	@Override
-	public String format(final String text, final String name, final boolean isScript,
-			final boolean useExperimental,
-			String editorConfigPath, final Map<String, String> userData,
-			final Map<String, Object> editorConfigOverrideMap) {
+	public String format(final String text, Path path, final boolean isScript,
+						 final boolean useExperimental,
+						 String editorConfigPath, final Map<String, String> userData,
+						 final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		final List<RuleSet> rulesets = new ArrayList<>();
diff --git a/lib/src/compatKtLint0Dot32Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot32Dot0Adapter.java b/lib/src/compatKtLint0Dot32Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot32Dot0Adapter.java
index 3f98abe3b3..11d3c0d8e5 100644
--- a/lib/src/compatKtLint0Dot32Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot32Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot32Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot32Dot0Adapter.java
@@ -15,6 +15,7 @@
  */
 package com.diffplug.spotless.glue.ktlint.compat;
 
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -41,10 +42,10 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	}
 
 	@Override
-	public String format(final String text, final String name, final boolean isScript,
-			final boolean useExperimental,
-			String editorConfigPath, final Map<String, String> userData,
-			final Map<String, Object> editorConfigOverrideMap) {
+	public String format(final String text, Path path, final boolean isScript,
+						 final boolean useExperimental,
+						 String editorConfigPath, final Map<String, String> userData,
+						 final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		final List<RuleSet> rulesets = new ArrayList<>();
diff --git a/lib/src/compatKtLint0Dot34Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot34Dot2Adapter.java b/lib/src/compatKtLint0Dot34Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot34Dot2Adapter.java
index 0352a8e1f0..63d59ff74e 100644
--- a/lib/src/compatKtLint0Dot34Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot34Dot2Adapter.java
+++ b/lib/src/compatKtLint0Dot34Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot34Dot2Adapter.java
@@ -15,6 +15,7 @@
  */
 package com.diffplug.spotless.glue.ktlint.compat;
 
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -41,10 +42,10 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	}
 
 	@Override
-	public String format(final String text, final String name, final boolean isScript,
-			final boolean useExperimental,
-			String editorConfigPath, final Map<String, String> userData,
-			final Map<String, Object> editorConfigOverrideMap) {
+	public String format(final String text, Path path, final boolean isScript,
+						 final boolean useExperimental,
+						 String editorConfigPath, final Map<String, String> userData,
+						 final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		final List<RuleSet> rulesets = new ArrayList<>();
@@ -55,7 +56,7 @@ public String format(final String text, final String name, final boolean isScrip
 		}
 
 		return KtLint.INSTANCE.format(new KtLint.Params(
-				name,
+				path.toFile().getAbsolutePath(),
 				text,
 				rulesets,
 				userData,
diff --git a/lib/src/compatKtLint0Dot45Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot45Dot2Adapter.java b/lib/src/compatKtLint0Dot45Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot45Dot2Adapter.java
index 15c2238d5d..b7b2435d93 100644
--- a/lib/src/compatKtLint0Dot45Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot45Dot2Adapter.java
+++ b/lib/src/compatKtLint0Dot45Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot45Dot2Adapter.java
@@ -15,6 +15,7 @@
  */
 package com.diffplug.spotless.glue.ktlint.compat;
 
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -49,10 +50,10 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	}
 
 	@Override
-	public String format(final String text, final String name, final boolean isScript,
-			final boolean useExperimental,
-			String editorConfigPath, final Map<String, String> userData,
-			final Map<String, Object> editorConfigOverrideMap) {
+	public String format(final String text, Path path, final boolean isScript,
+						 final boolean useExperimental,
+						 String editorConfigPath, final Map<String, String> userData,
+						 final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		final List<RuleSet> rulesets = new ArrayList<>();
@@ -70,7 +71,7 @@ public String format(final String text, final String name, final boolean isScrip
 		}
 
 		return KtLint.INSTANCE.format(new KtLint.ExperimentalParams(
-				name,
+				path.toFile().getAbsolutePath(),
 				text,
 				rulesets,
 				userData,
diff --git a/lib/src/compatKtLint0Dot46Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot46Dot0Adapter.java b/lib/src/compatKtLint0Dot46Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot46Dot0Adapter.java
index 28eba672a0..198ce7ef9c 100644
--- a/lib/src/compatKtLint0Dot46Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot46Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot46Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot46Dot0Adapter.java
@@ -15,6 +15,7 @@
  */
 package com.diffplug.spotless.glue.ktlint.compat;
 
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -49,10 +50,10 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	}
 
 	@Override
-	public String format(final String text, final String name, final boolean isScript,
-			final boolean useExperimental,
-			String editorConfigPath, final Map<String, String> userData,
-			final Map<String, Object> editorConfigOverrideMap) {
+	public String format(final String text, Path path, final boolean isScript,
+						 final boolean useExperimental,
+						 String editorConfigPath, final Map<String, String> userData,
+						 final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		final List<RuleSet> rulesets = new ArrayList<>();
@@ -70,7 +71,7 @@ public String format(final String text, final String name, final boolean isScrip
 		}
 
 		return KtLint.INSTANCE.format(new KtLint.ExperimentalParams(
-				name,
+				path.toFile().getAbsolutePath(),
 				text,
 				rulesets,
 				userData,
diff --git a/lib/src/compatKtLint0Dot47Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java b/lib/src/compatKtLint0Dot47Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java
index 3445a688b1..0d4f65936a 100644
--- a/lib/src/compatKtLint0Dot47Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot47Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java
@@ -56,10 +56,10 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	}
 
 	@Override
-	public String format(final String text, final String name, final boolean isScript,
-			final boolean useExperimental,
-			String editorConfigPath, final Map<String, String> userData,
-			final Map<String, Object> editorConfigOverrideMap) {
+	public String format(final String text, Path path, final boolean isScript,
+						 final boolean useExperimental,
+						 String editorConfigPath, final Map<String, String> userData,
+						 final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		Set<RuleProvider> allRuleProviders = new LinkedHashSet<>(
@@ -84,7 +84,7 @@ public String format(final String text, final String name, final boolean isScrip
 			editorConfigFilePath = new File(editorConfigPath).toPath();
 		}
 		return KtLint.INSTANCE.format(new KtLint.ExperimentalParams(
-				name,
+				path.toFile().getAbsolutePath(),
 				text,
 				emptySet(),
 				allRuleProviders,
diff --git a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
index 3efc8c085d..2cc580ea6a 100644
--- a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
@@ -54,10 +54,10 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	}
 
 	@Override
-	public String format(final String text, final String name, final boolean isScript,
-			final boolean useExperimental,
-			String editorConfigPath, final Map<String, String> userData,
-			final Map<String, Object> editorConfigOverrideMap) {
+	public String format(final String text, Path path, final boolean isScript,
+						 final boolean useExperimental,
+						 String editorConfigPath, final Map<String, String> userData,
+						 final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		Set<RuleProvider> allRuleProviders = new LinkedHashSet<>(
@@ -82,7 +82,7 @@ public String format(final String text, final String name, final boolean isScrip
 			editorConfigFilePath = new File(editorConfigPath).toPath();
 		}
 		return KtLint.INSTANCE.format(new KtLint.ExperimentalParams(
-				name,
+				path.toFile().getAbsolutePath(),
 				text,
 				allRuleProviders,
 				userData,
diff --git a/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java b/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
index b3e5d1817a..1693025688 100644
--- a/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
+++ b/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
@@ -15,10 +15,11 @@
  */
 package com.diffplug.spotless.glue.ktlint.compat;
 
+import java.nio.file.Path;
 import java.util.Map;
 
 public interface KtLintCompatAdapter {
 
-	String format(String text, String name, boolean isScript, boolean useExperimental, String editorConfigPath, Map<String, String> userData,
-			Map<String, Object> editorConfigOverrideMap);
+	String format(String text, Path path, boolean isScript, boolean useExperimental, String editorConfigPath, Map<String, String> userData,
+				  Map<String, Object> editorConfigOverrideMap);
 }
diff --git a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
index 034a782be6..1fe296143c 100644
--- a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
+++ b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
@@ -73,6 +73,6 @@ public String applyWithFile(String unix, File file) {
 		if (editorConfigPath != null) {
 			absoluteEditorConfigPath = editorConfigPath.getOnlyFile().getAbsolutePath();
 		}
-		return adapter.format(unix, file.getAbsolutePath(), isScript, useExperimental, absoluteEditorConfigPath, userData, editorConfigOverrideMap);
+		return adapter.format(unix, file.toPath(), isScript, useExperimental, absoluteEditorConfigPath, userData, editorConfigOverrideMap);
 	}
 }

From 5f4417ede83573d9d91e48b2ad0a136617d65f1b Mon Sep 17 00:00:00 2001
From: Eir Nym <485399+eirnym@users.noreply.github.com>
Date: Thu, 5 Jan 2023 13:58:00 +0100
Subject: [PATCH 0489/2068] EditorConfig: Using KtLintRuleEngine for KtLint
 0.48.x

---
 .../compat/KtLintCompat0Dot31Dot0Adapter.java |  6 +++---
 .../compat/KtLintCompat0Dot32Dot0Adapter.java |  6 +++---
 .../compat/KtLintCompat0Dot34Dot2Adapter.java |  6 +++---
 .../compat/KtLintCompat0Dot45Dot2Adapter.java |  6 +++---
 .../compat/KtLintCompat0Dot46Dot0Adapter.java |  6 +++---
 .../compat/KtLintCompat0Dot47Dot0Adapter.java |  6 +++---
 .../compat/KtLintCompat0Dot48Dot0Adapter.java | 19 +++++++------------
 .../ktlint/compat/KtLintCompatAdapter.java    |  2 +-
 8 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/lib/src/compatKtLint0Dot31Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot31Dot0Adapter.java b/lib/src/compatKtLint0Dot31Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot31Dot0Adapter.java
index 42d6e0c5bd..b9147345e2 100644
--- a/lib/src/compatKtLint0Dot31Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot31Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot31Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot31Dot0Adapter.java
@@ -43,9 +43,9 @@ public Unit invoke(LintError lint, Boolean corrected) {
 
 	@Override
 	public String format(final String text, Path path, final boolean isScript,
-						 final boolean useExperimental,
-						 String editorConfigPath, final Map<String, String> userData,
-						 final Map<String, Object> editorConfigOverrideMap) {
+			final boolean useExperimental,
+			String editorConfigPath, final Map<String, String> userData,
+			final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		final List<RuleSet> rulesets = new ArrayList<>();
diff --git a/lib/src/compatKtLint0Dot32Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot32Dot0Adapter.java b/lib/src/compatKtLint0Dot32Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot32Dot0Adapter.java
index 11d3c0d8e5..de77d027f6 100644
--- a/lib/src/compatKtLint0Dot32Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot32Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot32Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot32Dot0Adapter.java
@@ -43,9 +43,9 @@ public Unit invoke(LintError lint, Boolean corrected) {
 
 	@Override
 	public String format(final String text, Path path, final boolean isScript,
-						 final boolean useExperimental,
-						 String editorConfigPath, final Map<String, String> userData,
-						 final Map<String, Object> editorConfigOverrideMap) {
+			final boolean useExperimental,
+			String editorConfigPath, final Map<String, String> userData,
+			final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		final List<RuleSet> rulesets = new ArrayList<>();
diff --git a/lib/src/compatKtLint0Dot34Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot34Dot2Adapter.java b/lib/src/compatKtLint0Dot34Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot34Dot2Adapter.java
index 63d59ff74e..ae86e55e40 100644
--- a/lib/src/compatKtLint0Dot34Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot34Dot2Adapter.java
+++ b/lib/src/compatKtLint0Dot34Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot34Dot2Adapter.java
@@ -43,9 +43,9 @@ public Unit invoke(LintError lint, Boolean corrected) {
 
 	@Override
 	public String format(final String text, Path path, final boolean isScript,
-						 final boolean useExperimental,
-						 String editorConfigPath, final Map<String, String> userData,
-						 final Map<String, Object> editorConfigOverrideMap) {
+			final boolean useExperimental,
+			String editorConfigPath, final Map<String, String> userData,
+			final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		final List<RuleSet> rulesets = new ArrayList<>();
diff --git a/lib/src/compatKtLint0Dot45Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot45Dot2Adapter.java b/lib/src/compatKtLint0Dot45Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot45Dot2Adapter.java
index b7b2435d93..06fbf8cdbd 100644
--- a/lib/src/compatKtLint0Dot45Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot45Dot2Adapter.java
+++ b/lib/src/compatKtLint0Dot45Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot45Dot2Adapter.java
@@ -51,9 +51,9 @@ public Unit invoke(LintError lint, Boolean corrected) {
 
 	@Override
 	public String format(final String text, Path path, final boolean isScript,
-						 final boolean useExperimental,
-						 String editorConfigPath, final Map<String, String> userData,
-						 final Map<String, Object> editorConfigOverrideMap) {
+			final boolean useExperimental,
+			String editorConfigPath, final Map<String, String> userData,
+			final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		final List<RuleSet> rulesets = new ArrayList<>();
diff --git a/lib/src/compatKtLint0Dot46Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot46Dot0Adapter.java b/lib/src/compatKtLint0Dot46Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot46Dot0Adapter.java
index 198ce7ef9c..8c41157946 100644
--- a/lib/src/compatKtLint0Dot46Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot46Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot46Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot46Dot0Adapter.java
@@ -51,9 +51,9 @@ public Unit invoke(LintError lint, Boolean corrected) {
 
 	@Override
 	public String format(final String text, Path path, final boolean isScript,
-						 final boolean useExperimental,
-						 String editorConfigPath, final Map<String, String> userData,
-						 final Map<String, Object> editorConfigOverrideMap) {
+			final boolean useExperimental,
+			String editorConfigPath, final Map<String, String> userData,
+			final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		final List<RuleSet> rulesets = new ArrayList<>();
diff --git a/lib/src/compatKtLint0Dot47Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java b/lib/src/compatKtLint0Dot47Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java
index 0d4f65936a..441f4636fa 100644
--- a/lib/src/compatKtLint0Dot47Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot47Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java
@@ -57,9 +57,9 @@ public Unit invoke(LintError lint, Boolean corrected) {
 
 	@Override
 	public String format(final String text, Path path, final boolean isScript,
-						 final boolean useExperimental,
-						 String editorConfigPath, final Map<String, String> userData,
-						 final Map<String, Object> editorConfigOverrideMap) {
+			final boolean useExperimental,
+			String editorConfigPath, final Map<String, String> userData,
+			final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		Set<RuleProvider> allRuleProviders = new LinkedHashSet<>(
diff --git a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
index 2cc580ea6a..51a1b283c6 100644
--- a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
@@ -25,7 +25,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import com.pinterest.ktlint.core.KtLint;
+import com.pinterest.ktlint.core.KtLintRuleEngine;
 import com.pinterest.ktlint.core.LintError;
 import com.pinterest.ktlint.core.Rule;
 import com.pinterest.ktlint.core.RuleProvider;
@@ -55,9 +55,9 @@ public Unit invoke(LintError lint, Boolean corrected) {
 
 	@Override
 	public String format(final String text, Path path, final boolean isScript,
-						 final boolean useExperimental,
-						 String editorConfigPath, final Map<String, String> userData,
-						 final Map<String, Object> editorConfigOverrideMap) {
+			final boolean useExperimental,
+			String editorConfigPath, final Map<String, String> userData,
+			final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		Set<RuleProvider> allRuleProviders = new LinkedHashSet<>(
@@ -81,17 +81,12 @@ public String format(final String text, Path path, final boolean isScript,
 		} else {
 			editorConfigFilePath = new File(editorConfigPath).toPath();
 		}
-		return KtLint.INSTANCE.format(new KtLint.ExperimentalParams(
-				path.toFile().getAbsolutePath(),
-				text,
+		return new KtLintRuleEngine(
 				allRuleProviders,
-				userData,
-				formatterCallback,
-				isScript,
-				false,
 				EditorConfigDefaults.Companion.load(editorConfigFilePath),
 				editorConfigOverride,
-				false));
+				false)
+						.format(path, formatterCallback);
 	}
 
 	/**
diff --git a/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java b/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
index 1693025688..9d5cc8b06e 100644
--- a/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
+++ b/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
@@ -21,5 +21,5 @@
 public interface KtLintCompatAdapter {
 
 	String format(String text, Path path, boolean isScript, boolean useExperimental, String editorConfigPath, Map<String, String> userData,
-				  Map<String, Object> editorConfigOverrideMap);
+			Map<String, Object> editorConfigOverrideMap);
 }

From 5cd53a9bb9fa709af695ef61272bb3f9977d5571 Mon Sep 17 00:00:00 2001
From: Eir Nym <485399+eirnym@users.noreply.github.com>
Date: Thu, 5 Jan 2023 14:02:05 +0100
Subject: [PATCH 0490/2068] EditorConfig: pass Path to an implementation

---
 .../ktlint/compat/KtLintCompat0Dot31Dot0Adapter.java |  2 +-
 .../ktlint/compat/KtLintCompat0Dot32Dot0Adapter.java |  2 +-
 .../ktlint/compat/KtLintCompat0Dot34Dot2Adapter.java |  4 ++--
 .../ktlint/compat/KtLintCompat0Dot45Dot2Adapter.java |  4 ++--
 .../ktlint/compat/KtLintCompat0Dot46Dot0Adapter.java |  4 ++--
 .../ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java | 12 +++---------
 .../ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java | 12 +++---------
 .../glue/ktlint/compat/KtLintCompatAdapter.java      |  2 +-
 .../spotless/glue/ktlint/KtlintFormatterFunc.java    |  5 +++--
 9 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/lib/src/compatKtLint0Dot31Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot31Dot0Adapter.java b/lib/src/compatKtLint0Dot31Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot31Dot0Adapter.java
index b9147345e2..7a956de86a 100644
--- a/lib/src/compatKtLint0Dot31Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot31Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot31Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot31Dot0Adapter.java
@@ -44,7 +44,7 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	@Override
 	public String format(final String text, Path path, final boolean isScript,
 			final boolean useExperimental,
-			String editorConfigPath, final Map<String, String> userData,
+			Path editorConfigPath, final Map<String, String> userData,
 			final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
diff --git a/lib/src/compatKtLint0Dot32Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot32Dot0Adapter.java b/lib/src/compatKtLint0Dot32Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot32Dot0Adapter.java
index de77d027f6..94c41c3716 100644
--- a/lib/src/compatKtLint0Dot32Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot32Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot32Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot32Dot0Adapter.java
@@ -44,7 +44,7 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	@Override
 	public String format(final String text, Path path, final boolean isScript,
 			final boolean useExperimental,
-			String editorConfigPath, final Map<String, String> userData,
+			Path editorConfigPath, final Map<String, String> userData,
 			final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
diff --git a/lib/src/compatKtLint0Dot34Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot34Dot2Adapter.java b/lib/src/compatKtLint0Dot34Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot34Dot2Adapter.java
index ae86e55e40..8926a8e21f 100644
--- a/lib/src/compatKtLint0Dot34Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot34Dot2Adapter.java
+++ b/lib/src/compatKtLint0Dot34Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot34Dot2Adapter.java
@@ -44,7 +44,7 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	@Override
 	public String format(final String text, Path path, final boolean isScript,
 			final boolean useExperimental,
-			String editorConfigPath, final Map<String, String> userData,
+			Path editorConfigPath, final Map<String, String> userData,
 			final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
@@ -62,7 +62,7 @@ public String format(final String text, Path path, final boolean isScript,
 				userData,
 				formatterCallback,
 				isScript,
-				editorConfigPath,
+				editorConfigPath.toFile().getAbsolutePath(),
 				false));
 	}
 }
diff --git a/lib/src/compatKtLint0Dot45Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot45Dot2Adapter.java b/lib/src/compatKtLint0Dot45Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot45Dot2Adapter.java
index 06fbf8cdbd..c90cf59d2b 100644
--- a/lib/src/compatKtLint0Dot45Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot45Dot2Adapter.java
+++ b/lib/src/compatKtLint0Dot45Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot45Dot2Adapter.java
@@ -52,7 +52,7 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	@Override
 	public String format(final String text, Path path, final boolean isScript,
 			final boolean useExperimental,
-			String editorConfigPath, final Map<String, String> userData,
+			Path editorConfigPath, final Map<String, String> userData,
 			final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
@@ -77,7 +77,7 @@ public String format(final String text, Path path, final boolean isScript,
 				userData,
 				formatterCallback,
 				isScript,
-				editorConfigPath,
+				editorConfigPath.toFile().getAbsolutePath(),
 				false,
 				editorConfigOverride,
 				false));
diff --git a/lib/src/compatKtLint0Dot46Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot46Dot0Adapter.java b/lib/src/compatKtLint0Dot46Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot46Dot0Adapter.java
index 8c41157946..54b34296a4 100644
--- a/lib/src/compatKtLint0Dot46Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot46Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot46Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot46Dot0Adapter.java
@@ -52,7 +52,7 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	@Override
 	public String format(final String text, Path path, final boolean isScript,
 			final boolean useExperimental,
-			String editorConfigPath, final Map<String, String> userData,
+			Path editorConfigPath, final Map<String, String> userData,
 			final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
@@ -77,7 +77,7 @@ public String format(final String text, Path path, final boolean isScript,
 				userData,
 				formatterCallback,
 				isScript,
-				editorConfigPath,
+				editorConfigPath.toFile().getAbsolutePath(),
 				false,
 				editorConfigOverride,
 				false));
diff --git a/lib/src/compatKtLint0Dot47Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java b/lib/src/compatKtLint0Dot47Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java
index 441f4636fa..20b87eeb17 100644
--- a/lib/src/compatKtLint0Dot47Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot47Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java
@@ -17,7 +17,6 @@
 
 import static java.util.Collections.emptySet;
 
-import java.io.File;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
@@ -58,7 +57,7 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	@Override
 	public String format(final String text, Path path, final boolean isScript,
 			final boolean useExperimental,
-			String editorConfigPath, final Map<String, String> userData,
+			Path editorConfigPath, final Map<String, String> userData,
 			final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
@@ -77,12 +76,7 @@ public String format(final String text, Path path, final boolean isScript,
 							Collectors.toList()),
 					editorConfigOverrideMap);
 		}
-		Path editorConfigFilePath;
-		if (editorConfigPath == null) {
-			editorConfigFilePath = null;
-		} else {
-			editorConfigFilePath = new File(editorConfigPath).toPath();
-		}
+
 		return KtLint.INSTANCE.format(new KtLint.ExperimentalParams(
 				path.toFile().getAbsolutePath(),
 				text,
@@ -93,7 +87,7 @@ public String format(final String text, Path path, final boolean isScript,
 				isScript,
 				null,
 				false,
-				EditorConfigDefaults.Companion.load(editorConfigFilePath),
+				EditorConfigDefaults.Companion.load(editorConfigPath),
 				editorConfigOverride,
 				false));
 	}
diff --git a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
index 51a1b283c6..be7f161251 100644
--- a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
@@ -15,7 +15,6 @@
  */
 package com.diffplug.spotless.glue.ktlint.compat;
 
-import java.io.File;
 import java.nio.file.Path;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -56,7 +55,7 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	@Override
 	public String format(final String text, Path path, final boolean isScript,
 			final boolean useExperimental,
-			String editorConfigPath, final Map<String, String> userData,
+			Path editorConfigPath, final Map<String, String> userData,
 			final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
@@ -75,15 +74,10 @@ public String format(final String text, Path path, final boolean isScript,
 							Collectors.toList()),
 					editorConfigOverrideMap);
 		}
-		Path editorConfigFilePath;
-		if (editorConfigPath == null) {
-			editorConfigFilePath = null;
-		} else {
-			editorConfigFilePath = new File(editorConfigPath).toPath();
-		}
+
 		return new KtLintRuleEngine(
 				allRuleProviders,
-				EditorConfigDefaults.Companion.load(editorConfigFilePath),
+				EditorConfigDefaults.Companion.load(editorConfigPath),
 				editorConfigOverride,
 				false)
 						.format(path, formatterCallback);
diff --git a/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java b/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
index 9d5cc8b06e..68a65eb6c8 100644
--- a/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
+++ b/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
@@ -20,6 +20,6 @@
 
 public interface KtLintCompatAdapter {
 
-	String format(String text, Path path, boolean isScript, boolean useExperimental, String editorConfigPath, Map<String, String> userData,
+	String format(String text, Path path, boolean isScript, boolean useExperimental, Path editorConfigPath, Map<String, String> userData,
 			Map<String, Object> editorConfigOverrideMap);
 }
diff --git a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
index 1fe296143c..e6f3715d25 100644
--- a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
+++ b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
@@ -16,6 +16,7 @@
 package com.diffplug.spotless.glue.ktlint;
 
 import java.io.File;
+import java.nio.file.Path;
 import java.util.Map;
 
 import org.jetbrains.annotations.NotNull;
@@ -69,9 +70,9 @@ public KtlintFormatterFunc(String version, boolean isScript, boolean useExperime
 	@Override
 	public String applyWithFile(String unix, File file) {
 
-		String absoluteEditorConfigPath = null;
+		Path absoluteEditorConfigPath = null;
 		if (editorConfigPath != null) {
-			absoluteEditorConfigPath = editorConfigPath.getOnlyFile().getAbsolutePath();
+			absoluteEditorConfigPath = editorConfigPath.getOnlyFile().toPath();
 		}
 		return adapter.format(unix, file.toPath(), isScript, useExperimental, absoluteEditorConfigPath, userData, editorConfigOverrideMap);
 	}

From f4c2a1d84e2cb82aa36415ae514a93cc60b59ace Mon Sep 17 00:00:00 2001
From: Eir Nym <485399+eirnym@users.noreply.github.com>
Date: Thu, 5 Jan 2023 16:28:35 +0100
Subject: [PATCH 0491/2068] EditorConfig: Use default path without checking
 (KtLint will check them anyway)

---
 .../java/com/diffplug/gradle/spotless/KotlinExtension.java   | 5 +----
 .../com/diffplug/gradle/spotless/KotlinGradleExtension.java  | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
index 9ebc290219..5d1c484521 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
@@ -62,11 +62,8 @@ public LicenseHeaderConfig licenseHeaderFile(Object licenseHeaderFile) {
 	/** Adds the specified version of <a href="https://github.com/pinterest/ktlint">ktlint</a>. */
 	public KotlinFormatExtension ktlint(String version) throws IOException {
 		Objects.requireNonNull(version);
-		FileSignature editorConfigPath = null;
 		File defaultEditorConfig = getProject().getRootProject().file(".editorconfig");
-		if (defaultEditorConfig.exists() && defaultEditorConfig.isFile()) {
-			editorConfigPath = FileSignature.signAsList(defaultEditorConfig);
-		}
+		FileSignature editorConfigPath = FileSignature.signAsList(defaultEditorConfig);
 		return new KotlinFormatExtension(version, false, editorConfigPath, Collections.emptyMap(), Collections.emptyMap());
 	}
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
index ec645a8972..82a8edd9a5 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
@@ -47,11 +47,8 @@ public KotlinGradleExtension(SpotlessExtension spotless) {
 	/** Adds the specified version of <a href="https://github.com/pinterest/ktlint">ktlint</a>. */
 	public KotlinFormatExtension ktlint(String version) throws IOException {
 		Objects.requireNonNull(version, "version");
-		FileSignature editorConfigPath = null;
 		File defaultEditorConfig = getProject().getRootProject().file(".editorconfig");
-		if (defaultEditorConfig.exists() && defaultEditorConfig.isFile()) {
-			editorConfigPath = FileSignature.signAsList(defaultEditorConfig);
-		}
+		FileSignature editorConfigPath = FileSignature.signAsList(defaultEditorConfig);
 		return new KotlinFormatExtension(version, false, editorConfigPath, Collections.emptyMap(), Collections.emptyMap());
 	}
 

From b6e90739d5deac7b356eaad74307b3c2dc061a0c Mon Sep 17 00:00:00 2001
From: Clayton Walker <clayton.m.walker@gmail.com>
Date: Fri, 6 Jan 2023 10:45:59 -0700
Subject: [PATCH 0492/2068] Change back to 0.48.0

---
 lib/build.gradle                                   | 12 ++++++------
 .../compat/KtLintCompat0Dot48Dot0Adapter.java}     |  2 +-
 .../spotless/glue/ktlint/KtlintFormatterFunc.java  |  4 ++--
 .../compat/KtLintCompat0Dot48Dot0AdapterTest.java} | 14 +++++++-------
 .../resources/empty_class_body.kt                  |  0
 .../resources/fails_no_semicolons.kt               |  0
 6 files changed, 16 insertions(+), 16 deletions(-)
 rename lib/src/{compatKtLint0Dot48Dot1/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot1Adapter.java => compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java} (99%)
 rename lib/src/{testCompatKtLint0Dot48Dot1/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot1AdapterTest.java => testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java} (81%)
 rename lib/src/{testCompatKtLint0Dot48Dot1 => testCompatKtLint0Dot48Dot0}/resources/empty_class_body.kt (100%)
 rename lib/src/{testCompatKtLint0Dot48Dot1 => testCompatKtLint0Dot48Dot0}/resources/fails_no_semicolons.kt (100%)

diff --git a/lib/build.gradle b/lib/build.gradle
index 826abf70a7..4cf4c66332 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -34,7 +34,7 @@ versionCompatibility {
 				'0.45.2',
 				'0.46.0',
 				'0.47.0',
-				'0.48.1',
+				'0.48.0',
 			]
 			targetSourceSetName = 'ktlint'
 		}
@@ -91,9 +91,9 @@ dependencies {
 	compatKtLint0Dot47Dot0CompileOnly 'com.pinterest.ktlint:ktlint-core:0.47.0'
 	compatKtLint0Dot47Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-experimental:0.47.0'
 	compatKtLint0Dot47Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.47.0'
-	compatKtLint0Dot48Dot1CompileOnly 'com.pinterest.ktlint:ktlint-core:0.48.1'
-	compatKtLint0Dot48Dot1CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-experimental:0.48.1'
-	compatKtLint0Dot48Dot1CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.48.1'
+	compatKtLint0Dot48Dot0CompileOnly 'com.pinterest.ktlint:ktlint-core:0.48.0'
+	compatKtLint0Dot48Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-experimental:0.48.0'
+	compatKtLint0Dot48Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.48.0'
 
 	String VER_SCALAFMT="3.6.1"
 	scalafmtCompileOnly "org.scalameta:scalafmt-core_2.13:$VER_SCALAFMT"
@@ -105,8 +105,8 @@ dependencies {
 	flexmarkCompileOnly 'com.vladsch.flexmark:flexmark-all:0.62.2'
 }
 
-configurations.named('testCompatKtLint0Dot48Dot1Implementation').configure {
-	extendsFrom(configurations.testImplementation, configurations.compatKtLint0Dot48Dot1CompileOnly)
+configurations.named('testCompatKtLint0Dot48Dot0Implementation').configure {
+	extendsFrom(configurations.testImplementation, configurations.compatKtLint0Dot48Dot0CompileOnly)
 }
 
 // we'll hold the core lib to a high standard
diff --git a/lib/src/compatKtLint0Dot48Dot1/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot1Adapter.java b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
similarity index 99%
rename from lib/src/compatKtLint0Dot48Dot1/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot1Adapter.java
rename to lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
index 4329c18db9..f910576971 100644
--- a/lib/src/compatKtLint0Dot48Dot1/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot1Adapter.java
+++ b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
@@ -47,7 +47,7 @@
 import kotlin.Unit;
 import kotlin.jvm.functions.Function2;
 
-public class KtLintCompat0Dot48Dot1Adapter implements KtLintCompatAdapter {
+public class KtLintCompat0Dot48Dot0Adapter implements KtLintCompatAdapter {
 
 	private static final List<EditorConfigProperty<?>> DEFAULT_EDITOR_CONFIG_PROPERTIES;
 
diff --git a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
index 5be69e819c..fc64cdb23e 100644
--- a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
+++ b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
@@ -27,7 +27,7 @@
 import com.diffplug.spotless.glue.ktlint.compat.KtLintCompat0Dot45Dot2Adapter;
 import com.diffplug.spotless.glue.ktlint.compat.KtLintCompat0Dot46Dot0Adapter;
 import com.diffplug.spotless.glue.ktlint.compat.KtLintCompat0Dot47Dot0Adapter;
-import com.diffplug.spotless.glue.ktlint.compat.KtLintCompat0Dot48Dot1Adapter;
+import com.diffplug.spotless.glue.ktlint.compat.KtLintCompat0Dot48Dot0Adapter;
 import com.diffplug.spotless.glue.ktlint.compat.KtLintCompatAdapter;
 
 public class KtlintFormatterFunc implements FormatterFunc.NeedsFile {
@@ -44,7 +44,7 @@ public KtlintFormatterFunc(String version, boolean isScript, boolean useExperime
 		int minorVersion = Integer.parseInt(version.split("\\.")[1]);
 		if (minorVersion >= 48) {
 			// ExperimentalParams lost two constructor arguments, EditorConfigProperty moved to its own class
-			this.adapter = new KtLintCompat0Dot48Dot1Adapter();
+			this.adapter = new KtLintCompat0Dot48Dot0Adapter();
 		} else if (minorVersion == 47) {
 			// rename RuleSet to RuleProvider
 			this.adapter = new KtLintCompat0Dot47Dot0Adapter();
diff --git a/lib/src/testCompatKtLint0Dot48Dot1/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot1AdapterTest.java b/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java
similarity index 81%
rename from lib/src/testCompatKtLint0Dot48Dot1/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot1AdapterTest.java
rename to lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java
index ca9d603e5c..cccf71da12 100644
--- a/lib/src/testCompatKtLint0Dot48Dot1/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot1AdapterTest.java
+++ b/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java
@@ -28,11 +28,11 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-public class KtLintCompat0Dot48Dot1AdapterTest {
+public class KtLintCompat0Dot48Dot0AdapterTest {
 	@Test
 	public void testDefaults(@TempDir Path path) throws IOException {
-		KtLintCompat0Dot48Dot1Adapter KtLintCompat0Dot48Dot1Adapter = new KtLintCompat0Dot48Dot1Adapter();
-		try (InputStream is = KtLintCompat0Dot48Dot1AdapterTest.class.getResourceAsStream("/empty_class_body.kt")) {
+		KtLintCompat0Dot48Dot0Adapter ktLintCompat0Dot48Dot0Adapter = new KtLintCompat0Dot48Dot0Adapter();
+		try (InputStream is = KtLintCompat0Dot48Dot0AdapterTest.class.getResourceAsStream("/empty_class_body.kt")) {
 			Files.copy(is, path.resolve("empty_class_body.kt"));
 		}
 		String text = new String(Files.readAllBytes(path.resolve("empty_class_body.kt")), StandardCharsets.UTF_8);
@@ -41,14 +41,14 @@ public void testDefaults(@TempDir Path path) throws IOException {
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 
-		String formatted = KtLintCompat0Dot48Dot1Adapter.format(text, "empty_class_body.kt", false, false, userData, editorConfigOverrideMap);
+		String formatted = ktLintCompat0Dot48Dot0Adapter.format(text, "empty_class_body.kt", false, false, userData, editorConfigOverrideMap);
 		assertEquals("class empty_class_body\n", formatted);
 	}
 
 	@Test
 	public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
-		KtLintCompat0Dot48Dot1Adapter KtLintCompat0Dot48Dot1Adapter = new KtLintCompat0Dot48Dot1Adapter();
-		try (InputStream is = KtLintCompat0Dot48Dot1AdapterTest.class.getResourceAsStream("/fails_no_semicolons.kt")) {
+		KtLintCompat0Dot48Dot0Adapter ktLintCompat0Dot48Dot0Adapter = new KtLintCompat0Dot48Dot0Adapter();
+		try (InputStream is = KtLintCompat0Dot48Dot0AdapterTest.class.getResourceAsStream("/fails_no_semicolons.kt")) {
 			Files.copy(is, path.resolve("fails_no_semicolons.kt"));
 		}
 		String text = new String(Files.readAllBytes(path.resolve("fails_no_semicolons.kt")), StandardCharsets.UTF_8);
@@ -59,7 +59,7 @@ public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		editorConfigOverrideMap.put("indent_style", "tab");
 		editorConfigOverrideMap.put("ktlint_standard_no-semi", "disabled");
 
-		String formatted = KtLintCompat0Dot48Dot1Adapter.format(text, "fails_no_semicolons.kt", false, false, userData, editorConfigOverrideMap);
+		String formatted = ktLintCompat0Dot48Dot0Adapter.format(text, "fails_no_semicolons.kt", false, false, userData, editorConfigOverrideMap);
 		assertEquals("class fails_no_semicolons {\n\tval i = 0;\n}\n", formatted);
 	}
 }
diff --git a/lib/src/testCompatKtLint0Dot48Dot1/resources/empty_class_body.kt b/lib/src/testCompatKtLint0Dot48Dot0/resources/empty_class_body.kt
similarity index 100%
rename from lib/src/testCompatKtLint0Dot48Dot1/resources/empty_class_body.kt
rename to lib/src/testCompatKtLint0Dot48Dot0/resources/empty_class_body.kt
diff --git a/lib/src/testCompatKtLint0Dot48Dot1/resources/fails_no_semicolons.kt b/lib/src/testCompatKtLint0Dot48Dot0/resources/fails_no_semicolons.kt
similarity index 100%
rename from lib/src/testCompatKtLint0Dot48Dot1/resources/fails_no_semicolons.kt
rename to lib/src/testCompatKtLint0Dot48Dot0/resources/fails_no_semicolons.kt

From 8d52fb28f73c7a772b9097a05e00e73df967c69d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 6 Jan 2023 17:56:29 +0000
Subject: [PATCH 0493/2068] fix(deps): update dependency
 org.assertj:assertj-core to v3.24.1

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 577ed87535..e966c09437 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -27,7 +27,7 @@ VER_SLF4J=[1.6,2.0[
 VER_DURIAN=1.2.0
 VER_JGIT=5.13.1.202206130422-r
 VER_JUNIT=5.9.1
-VER_ASSERTJ=3.23.1
+VER_ASSERTJ=3.24.1
 VER_MOCKITO=4.11.0
 
 # Used for Maven Plugin

From 6b2e2c397f4405ff9c1ed264dcd78138d2e8bb87 Mon Sep 17 00:00:00 2001
From: Clayton Walker <clayton.m.walker@gmail.com>
Date: Fri, 6 Jan 2023 11:10:29 -0700
Subject: [PATCH 0494/2068] Use testCommonImplementation configuration

---
 lib/build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 4cf4c66332..e8c22d28b6 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -45,9 +45,9 @@ dependencies {
 	compileOnly 'org.slf4j:slf4j-api:2.0.0'
 	// zero runtime reqs is a hard requirements for spotless-lib
 	// if you need a dep, put it in lib-extra
-	testImplementation "org.junit.jupiter:junit-jupiter:$VER_JUNIT"
-	testImplementation "org.assertj:assertj-core:$VER_ASSERTJ"
-	testImplementation "com.diffplug.durian:durian-testlib:$VER_DURIAN"
+	testCommonImplementation "org.junit.jupiter:junit-jupiter:$VER_JUNIT"
+	testCommonImplementation "org.assertj:assertj-core:$VER_ASSERTJ"
+	testCommonImplementation "com.diffplug.durian:durian-testlib:$VER_DURIAN"
 
 	// used for pom sorting
 	sortPomCompileOnly 'com.github.ekryd.sortpom:sortpom-sorter:3.0.0'
@@ -106,7 +106,7 @@ dependencies {
 }
 
 configurations.named('testCompatKtLint0Dot48Dot0Implementation').configure {
-	extendsFrom(configurations.testImplementation, configurations.compatKtLint0Dot48Dot0CompileOnly)
+	extendsFrom(configurations.compatKtLint0Dot48Dot0CompileOnly)
 }
 
 // we'll hold the core lib to a high standard

From 3125f972f1b9883a9452c0ef8abb65cdea43ebac Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sat, 7 Jan 2023 08:56:44 -0800
Subject: [PATCH 0495/2068] Our java example was ordered such that the import
 order would get wiped out by gjf, leading to confusion in #1417.

---
 plugin-maven/README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index dcc18a5dd6..da39543cc4 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -179,6 +179,10 @@ any other maven phase (i.e. compile) then it can be configured as below;
       <include>src/test/java/**/*.java</include>
     </includes>
 
+    <googleJavaFormat /> <!-- has its own section below -->
+    <eclipse />          <!-- has its own section below -->
+    <prettier />         <!-- has its own section below -->
+
     <importOrder /> <!-- standard import order -->
     <importOrder>  <!-- or a custom ordering -->
       <wildcardsLast>false</wildcardsLast> <!-- Optional, default false. Sort wildcard import after specific imports -->
@@ -188,10 +192,6 @@ any other maven phase (i.e. compile) then it can be configured as below;
 
     <removeUnusedImports /> <!-- self-explanatory -->
 
-    <googleJavaFormat /> <!-- has its own section below -->
-    <eclipse />          <!-- has its own section below -->
-    <prettier />         <!-- has its own section below -->
-
     <formatAnnotations />  <!-- fixes formatting of type annotations, see below -->
 
     <licenseHeader>

From bd562c1365e1b603d7202d66d1d34657ae9baebb Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sat, 7 Jan 2023 09:06:34 -0800
Subject: [PATCH 0496/2068] Emphasize that order matters to the Maven users.

---
 plugin-maven/README.md | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index da39543cc4..8440a4368e 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -129,7 +129,16 @@ To use it in your pom, just [add the Spotless dependency](https://search.maven.o
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
 - a `target` (the files to format), which you set with [`includes` and `excludes`](https://github.com/diffplug/spotless/blob/989abbecff4d8373c6111c1a98f359eadc532429/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java#L51-L55)
 - a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Replace.java), [`replaceRegex`](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/ReplaceRegex.java), [`trimTrailingWhitespace`](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/TrimTrailingWhitespace.java), [`indent`](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Indent.java), [`prettier`](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Prettier.java), [`eclipseWtp`](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/EclipseWtp.java), and [`licenseHeader`](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/LicenseHeader.java).
-
+- **order matters**, and this is good! (More info [here](https://github.com/diffplug/spotless/blob/main/PADDEDCELL.md) and [here](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-spotless-works))
+  - For example, `googleJavaFormat` always indents with spaces, but some wish it had a tab mode
+    - ```xml
+      <googleJavaFormat/> // this works
+      <indent><tabs>true</tabs><spacesPerTab>2</spacesPerTab></indent>
+       ```
+    - ```xml
+      <indent><tabs>true</tabs><spacesPerTab>2</spacesPerTab></indent>
+      <googleJavaFormat/> // the tab indentation gets overwritten
+       ```
 
 ### Requirements
 

From 8e1fb53059778d37e67d8814c3eb4e7f8fabbc2f Mon Sep 17 00:00:00 2001
From: Abel Keszei <keszeiabel@gmail.com>
Date: Sat, 7 Jan 2023 21:50:46 +0100
Subject: [PATCH 0497/2068] add test for skipLinesMatching setting of license
 header step

---
 testlib/src/main/resources/license/SkipLines.test   |  9 +++++++++
 .../main/resources/license/SkipLinesHasLicense.test | 13 +++++++++++++
 .../spotless/generic/LicenseHeaderStepTest.java     |  7 +++++++
 3 files changed, 29 insertions(+)
 create mode 100644 testlib/src/main/resources/license/SkipLines.test
 create mode 100644 testlib/src/main/resources/license/SkipLinesHasLicense.test

diff --git a/testlib/src/main/resources/license/SkipLines.test b/testlib/src/main/resources/license/SkipLines.test
new file mode 100644
index 0000000000..4048868ac6
--- /dev/null
+++ b/testlib/src/main/resources/license/SkipLines.test
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd">
+
+<module name="Checker">
+    <module name="ThisIsNotARealCheckstyleConfigFolks">
+        <property name="goodAdvice" value="dontTryItAnakin"/>
+        <property name="adviceGiver" value="generalKenobi"/>
+    </module>
+</module>
diff --git a/testlib/src/main/resources/license/SkipLinesHasLicense.test b/testlib/src/main/resources/license/SkipLinesHasLicense.test
new file mode 100644
index 0000000000..f645c5b2e2
--- /dev/null
+++ b/testlib/src/main/resources/license/SkipLinesHasLicense.test
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd">
+<!--
+  -- This is a fake license header.
+  -- All rights reserved.
+  -->
+
+<module name="Checker">
+    <module name="ThisIsNotARealCheckstyleConfigFolks">
+        <property name="goodAdvice" value="dontTryItAnakin"/>
+        <property name="adviceGiver" value="generalKenobi"/>
+    </module>
+</module>
diff --git a/testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java b/testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java
index 137937beb9..785c1c528a 100644
--- a/testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java
@@ -122,6 +122,13 @@ void should_remove_header_when_empty() throws Throwable {
 				.test(getTestResource("license/HasLicense.test"), getTestResource("license/MissingLicense.test"));
 	}
 
+	@Test
+	void should_skip_lines_matching_predefined_pattern() throws Throwable {
+		StepHarness.forStep(LicenseHeaderStep.headerDelimiter("<!--\n  -- This is a fake license header.\n  -- All rights reserved.\n  -->", "^(?!<!--|\\s+--).*$")
+			.withSkipLinesMatching("(?i)^(<\\?xml[^>]+>|<!doctype[^>]+>)$").build())
+			.testResource("license/SkipLines.test", "license/SkipLinesHasLicense.test");
+	}
+
 	private String licenceWithAddress() {
 		return "Copyright &#169; $YEAR FooBar Inc. All Rights Reserved.\n" +
 				" *\n" +

From 09d957f77af02dc6dea56ebb31259172b06d956f Mon Sep 17 00:00:00 2001
From: Abel Keszei <keszeiabel@gmail.com>
Date: Sat, 7 Jan 2023 22:01:35 +0100
Subject: [PATCH 0498/2068] update CHANGES.md files with skipLinesMatching

---
 CHANGES.md               | 3 +++
 plugin-gradle/CHANGES.md | 2 ++
 plugin-maven/CHANGES.md  | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index a7e3516607..0e9fc4a042 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,9 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* Added `skipLinesMatching` option to `licenseHeader` to support formats where license header cannot be immediately added to the top of the file (e.g. xml, sh). ([#1441](https://github.com/diffplug/spotless/pull/1441)).
+
 ### Changes
 * Bump the dev version of Gradle from `7.5.1` to `7.6` ([#1409](https://github.com/diffplug/spotless/pull/1409))
   * We also removed the no-longer-required dependency `org.codehaus.groovy:groovy-xml`
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index c5f464069f..25aaa5c552 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Added
+* Added `skipLinesMatching` option to `licenseHeader` to support formats where license header cannot be immediately added to the top of the file (e.g. xml, sh). ([#1441](https://github.com/diffplug/spotless/pull/1441))
 ### Fixed
 * Prevent tool configurations from being resolved outside project ([#1447](https://github.com/diffplug/spotless/pull/1447) fixes [#1215](https://github.com/diffplug/spotless/issues/1215))
 
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index b15e005a9b..95bbebfdc1 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* Added `skipLinesMatching` option to `licenseHeader` to support formats where license header cannot be immediately added to the top of the file (e.g. xml, sh). ([#1441](https://github.com/diffplug/spotless/pull/1441)).
 
 ## [2.29.0] - 2023-01-02
 ### Added

From d50c05f371d577412e0250c96c488ae57059c152 Mon Sep 17 00:00:00 2001
From: Abel Keszei <keszeiabel@gmail.com>
Date: Sat, 7 Jan 2023 22:02:42 +0100
Subject: [PATCH 0499/2068] apply format

---
 .../com/diffplug/spotless/maven/generic/LicenseHeader.java  | 2 +-
 .../diffplug/spotless/generic/LicenseHeaderStepTest.java    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/LicenseHeader.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/LicenseHeader.java
index 22386c6892..ff89f55ead 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/LicenseHeader.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/LicenseHeader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java b/testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java
index 785c1c528a..2b1d0aff07 100644
--- a/testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -125,8 +125,8 @@ void should_remove_header_when_empty() throws Throwable {
 	@Test
 	void should_skip_lines_matching_predefined_pattern() throws Throwable {
 		StepHarness.forStep(LicenseHeaderStep.headerDelimiter("<!--\n  -- This is a fake license header.\n  -- All rights reserved.\n  -->", "^(?!<!--|\\s+--).*$")
-			.withSkipLinesMatching("(?i)^(<\\?xml[^>]+>|<!doctype[^>]+>)$").build())
-			.testResource("license/SkipLines.test", "license/SkipLinesHasLicense.test");
+				.withSkipLinesMatching("(?i)^(<\\?xml[^>]+>|<!doctype[^>]+>)$").build())
+				.testResource("license/SkipLines.test", "license/SkipLinesHasLicense.test");
 	}
 
 	private String licenceWithAddress() {

From 778f4859d4c06ad86df1e4a1982cb34456b329ed Mon Sep 17 00:00:00 2001
From: Clayton Walker <clayton.m.walker@gmail.com>
Date: Sat, 7 Jan 2023 14:10:08 -0700
Subject: [PATCH 0500/2068] Use latest version-compatibility plugin

---
 lib/build.gradle | 10 +++-------
 settings.gradle  |  2 +-
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index e8c22d28b6..115d27195f 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -91,9 +91,9 @@ dependencies {
 	compatKtLint0Dot47Dot0CompileOnly 'com.pinterest.ktlint:ktlint-core:0.47.0'
 	compatKtLint0Dot47Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-experimental:0.47.0'
 	compatKtLint0Dot47Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.47.0'
-	compatKtLint0Dot48Dot0CompileOnly 'com.pinterest.ktlint:ktlint-core:0.48.0'
-	compatKtLint0Dot48Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-experimental:0.48.0'
-	compatKtLint0Dot48Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.48.0'
+	compatKtLint0Dot48Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-core:0.48.0'
+	compatKtLint0Dot48Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-ruleset-experimental:0.48.0'
+	compatKtLint0Dot48Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.48.0'
 
 	String VER_SCALAFMT="3.6.1"
 	scalafmtCompileOnly "org.scalameta:scalafmt-core_2.13:$VER_SCALAFMT"
@@ -105,10 +105,6 @@ dependencies {
 	flexmarkCompileOnly 'com.vladsch.flexmark:flexmark-all:0.62.2'
 }
 
-configurations.named('testCompatKtLint0Dot48Dot0Implementation').configure {
-	extendsFrom(configurations.compatKtLint0Dot48Dot0CompileOnly)
-}
-
 // we'll hold the core lib to a high standard
 spotbugs { reportLevel = 'low' } // low|medium|high (low = sensitive to even minor mistakes)
 
diff --git a/settings.gradle b/settings.gradle
index 786baa1eba..741e4b6ccc 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -16,7 +16,7 @@ pluginManagement {
 		// https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md
 		id 'com.adarshr.test-logger'               version '3.2.0'
 		// https://github.com/davidburstrom/version-compatibility-gradle-plugin/tags
-		id 'io.github.davidburstrom.version-compatibility' version '0.3.0'
+		id 'io.github.davidburstrom.version-compatibility' version '0.4.0'
 	}
 }
 plugins {

From 34097544d3ee6288fec976e30ac008b0d33b0ab4 Mon Sep 17 00:00:00 2001
From: Clayton Walker <clayton.m.walker@gmail.com>
Date: Sat, 7 Jan 2023 14:19:46 -0700
Subject: [PATCH 0501/2068] Factor out helper method

---
 .../KtLintCompat0Dot48Dot0AdapterTest.java     | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java b/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java
index cccf71da12..fe4463468a 100644
--- a/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java
+++ b/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java
@@ -32,10 +32,7 @@ public class KtLintCompat0Dot48Dot0AdapterTest {
 	@Test
 	public void testDefaults(@TempDir Path path) throws IOException {
 		KtLintCompat0Dot48Dot0Adapter ktLintCompat0Dot48Dot0Adapter = new KtLintCompat0Dot48Dot0Adapter();
-		try (InputStream is = KtLintCompat0Dot48Dot0AdapterTest.class.getResourceAsStream("/empty_class_body.kt")) {
-			Files.copy(is, path.resolve("empty_class_body.kt"));
-		}
-		String text = new String(Files.readAllBytes(path.resolve("empty_class_body.kt")), StandardCharsets.UTF_8);
+		String text = loadAndWriteText(path, "empty_class_body.kt");
 
 		Map<String, String> userData = new HashMap<>();
 
@@ -48,10 +45,7 @@ public void testDefaults(@TempDir Path path) throws IOException {
 	@Test
 	public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		KtLintCompat0Dot48Dot0Adapter ktLintCompat0Dot48Dot0Adapter = new KtLintCompat0Dot48Dot0Adapter();
-		try (InputStream is = KtLintCompat0Dot48Dot0AdapterTest.class.getResourceAsStream("/fails_no_semicolons.kt")) {
-			Files.copy(is, path.resolve("fails_no_semicolons.kt"));
-		}
-		String text = new String(Files.readAllBytes(path.resolve("fails_no_semicolons.kt")), StandardCharsets.UTF_8);
+		String text = loadAndWriteText(path, "fails_no_semicolons.kt");
 
 		Map<String, String> userData = new HashMap<>();
 
@@ -62,4 +56,12 @@ public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		String formatted = ktLintCompat0Dot48Dot0Adapter.format(text, "fails_no_semicolons.kt", false, false, userData, editorConfigOverrideMap);
 		assertEquals("class fails_no_semicolons {\n\tval i = 0;\n}\n", formatted);
 	}
+
+	private static String loadAndWriteText(Path path, String name) throws IOException {
+		try (InputStream is = KtLintCompat0Dot48Dot0AdapterTest.class.getResourceAsStream("/" + name)) {
+			Files.copy(is, path.resolve(name));
+		}
+		return new String(Files.readAllBytes(path.resolve(name)), StandardCharsets.UTF_8);
+	}
+
 }

From 110821ec29848f332f8e0f561e748acddd32dfb8 Mon Sep 17 00:00:00 2001
From: Kostiantyn Liutovych <lutovich@gmail.com>
Date: Sat, 7 Jan 2023 22:20:26 +0100
Subject: [PATCH 0502/2068] Improve selectivity in Maven plugin fingerprint

`PluginFingerprint` captures a particular configuration of the Spotless Maven
plugin. It is used to invalidate the up-to-date index when plugin's configuration
changes.

Invalidations of the index file seem to be too frequent because `PluginFingerprint`
includes the effective (as in Effective POM) configuration of the Spotless plugin.
For example, it includes dependencies declared outside of the `<plugin></plugin>`
XML element. So addition of an unrelated project dependency will invalidate the
index file.

Spotless Maven plugin manages its own dependencies using `ArtifactResolver`. There's
no need to include the effective `<plugin>` object into `PluginFingerprint`. This
commit simplifies the fingerprint to include only the plugin's version and serialized
configuration of all formatters. It should be backward-compatible because fingerprint
format change will simply trigger an invalidation of the index file.
---
 .../maven/incremental/PluginFingerprint.java  |  21 ++-
 .../incremental/PluginFingerprintTest.java    | 137 ++----------------
 2 files changed, 23 insertions(+), 135 deletions(-)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/PluginFingerprint.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/PluginFingerprint.java
index 3805cf4600..9efd6f2586 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/PluginFingerprint.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/PluginFingerprint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 DiffPlug
+ * Copyright 2021-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,17 +17,21 @@
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
-import java.util.ArrayList;
 import java.util.Base64;
-import java.util.List;
 import java.util.Objects;
 
-import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.project.MavenProject;
 
 import com.diffplug.spotless.Formatter;
 
+/**
+ * Represents a particular Spotless Maven plugin setup using a Base64-encoded serialized form of:
+ * <ol>
+ *    <li>Plugin version as configured in the POM</li>
+ *    <li>Formatter instances created according to the POM configuration</li>
+ * </ol>
+ */
 class PluginFingerprint {
 
 	private static final String SPOTLESS_PLUGIN_KEY = "com.diffplug.spotless:spotless-maven-plugin";
@@ -83,12 +87,8 @@ public String toString() {
 	}
 
 	private static byte[] digest(Plugin plugin, Iterable<Formatter> formatters) {
-		// dependencies can be an unserializable org.apache.maven.model.merge.ModelMerger$MergingList
-		// replace it with a serializable ArrayList
-		List<Dependency> dependencies = plugin.getDependencies();
-		plugin.setDependencies(new ArrayList<>(dependencies));
 		try (ObjectDigestOutputStream out = ObjectDigestOutputStream.create()) {
-			out.writeObject(plugin);
+			out.writeObject(plugin.getVersion());
 			for (Formatter formatter : formatters) {
 				out.writeObject(formatter);
 			}
@@ -96,9 +96,6 @@ private static byte[] digest(Plugin plugin, Iterable<Formatter> formatters) {
 			return out.digest();
 		} catch (IOException e) {
 			throw new UncheckedIOException("Unable to serialize plugin " + plugin, e);
-		} finally {
-			// reset the original list
-			plugin.setDependencies(dependencies);
 		}
 	}
 }
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/PluginFingerprintTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/PluginFingerprintTest.java
index 90e59d657e..c344580d37 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/PluginFingerprintTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/PluginFingerprintTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 DiffPlug
+ * Copyright 2021-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,126 +43,22 @@ class PluginFingerprintTest extends MavenIntegrationHarness {
 	private static final String VERSION_1 = "1.0.0";
 	private static final String VERSION_2 = "2.0.0";
 
-	private static final String[] EXECUTION_1 = {
-			"<execution>",
-			"  <id>check</id>",
-			"  <goals>",
-			"    <goal>check</goal>",
-			"  </goals>",
-			"</execution>"
-	};
-	private static final String[] EXECUTION_2 = {};
-
-	private static final String[] CONFIGURATION_1 = {
-			"<googleJavaFormat>",
-			"  <version>1.2</version>",
-			"</googleJavaFormat>"
-	};
-	private static final String[] CONFIGURATION_2 = {
-			"<googleJavaFormat>",
-			"  <version>1.8</version>",
-			"  <reflowLongStrings>true</reflowLongStrings>",
-			"</googleJavaFormat>"
-	};
-
-	private static final String[] DEPENDENCIES_1 = {
-			"<dependencies>",
-			"  <dependency>",
-			"    <groupId>unknown</groupId>",
-			"    <artifactId>unknown</artifactId>",
-			"    <version>1.0</version>",
-			"  </dependency>",
-			"</dependencies>"
-	};
-	private static final String[] DEPENDENCIES_2 = {
-			"<dependencies>",
-			"  <dependency>",
-			"    <groupId>unknown</groupId>",
-			"    <artifactId>unknown</artifactId>",
-			"    <version>2.0</version>",
-			"  </dependency>",
-			"</dependencies>"
-	};
-
 	private static final List<Formatter> FORMATTERS = singletonList(formatter(formatterStep("default")));
 
 	@Test
-	void sameFingerprint() throws Exception {
-		String xml1 = createPomXmlContent(VERSION_1, EXECUTION_1, CONFIGURATION_1);
-		String xml2 = createPomXmlContent(VERSION_1, EXECUTION_1, CONFIGURATION_1);
+	void sameFingerprintWhenVersionAndFormattersAreTheSame() throws Exception {
+		MavenProject project = mavenProject(VERSION_1);
 
-		MavenProject project1 = mavenProject(xml1);
-		MavenProject project2 = mavenProject(xml2);
-
-		PluginFingerprint fingerprint1 = PluginFingerprint.from(project1, FORMATTERS);
-		PluginFingerprint fingerprint2 = PluginFingerprint.from(project2, FORMATTERS);
+		PluginFingerprint fingerprint1 = PluginFingerprint.from(project, FORMATTERS);
+		PluginFingerprint fingerprint2 = PluginFingerprint.from(project, FORMATTERS);
 
 		assertThat(fingerprint1).isEqualTo(fingerprint2);
 	}
 
 	@Test
-	void sameFingerprintWithDependencies() throws Exception {
-		String xml1 = createPomXmlContent(VERSION_1, EXECUTION_1, CONFIGURATION_1, DEPENDENCIES_1);
-		String xml2 = createPomXmlContent(VERSION_1, EXECUTION_1, CONFIGURATION_1, DEPENDENCIES_1);
-
-		MavenProject project1 = mavenProject(xml1);
-		MavenProject project2 = mavenProject(xml2);
-
-		PluginFingerprint fingerprint1 = PluginFingerprint.from(project1, FORMATTERS);
-		PluginFingerprint fingerprint2 = PluginFingerprint.from(project2, FORMATTERS);
-
-		assertThat(fingerprint1).isEqualTo(fingerprint2);
-	}
-
-	@Test
-	void differentFingerprintForDifferentDependencies() throws Exception {
-		String xml1 = createPomXmlContent(VERSION_1, EXECUTION_1, CONFIGURATION_1, DEPENDENCIES_1);
-		String xml2 = createPomXmlContent(VERSION_1, EXECUTION_1, CONFIGURATION_1, DEPENDENCIES_2);
-
-		MavenProject project1 = mavenProject(xml1);
-		MavenProject project2 = mavenProject(xml2);
-
-		PluginFingerprint fingerprint1 = PluginFingerprint.from(project1, FORMATTERS);
-		PluginFingerprint fingerprint2 = PluginFingerprint.from(project2, FORMATTERS);
-
-		assertThat(fingerprint1).isNotEqualTo(fingerprint2);
-	}
-
-	@Test
-	void differentFingerprintForDifferentPluginVersion() throws Exception {
-		String xml1 = createPomXmlContent(VERSION_1, EXECUTION_1, CONFIGURATION_1);
-		String xml2 = createPomXmlContent(VERSION_2, EXECUTION_1, CONFIGURATION_1);
-
-		MavenProject project1 = mavenProject(xml1);
-		MavenProject project2 = mavenProject(xml2);
-
-		PluginFingerprint fingerprint1 = PluginFingerprint.from(project1, FORMATTERS);
-		PluginFingerprint fingerprint2 = PluginFingerprint.from(project2, FORMATTERS);
-
-		assertThat(fingerprint1).isNotEqualTo(fingerprint2);
-	}
-
-	@Test
-	void differentFingerprintForDifferentExecution() throws Exception {
-		String xml1 = createPomXmlContent(VERSION_2, EXECUTION_1, CONFIGURATION_1);
-		String xml2 = createPomXmlContent(VERSION_2, EXECUTION_2, CONFIGURATION_1);
-
-		MavenProject project1 = mavenProject(xml1);
-		MavenProject project2 = mavenProject(xml2);
-
-		PluginFingerprint fingerprint1 = PluginFingerprint.from(project1, FORMATTERS);
-		PluginFingerprint fingerprint2 = PluginFingerprint.from(project2, FORMATTERS);
-
-		assertThat(fingerprint1).isNotEqualTo(fingerprint2);
-	}
-
-	@Test
-	void differentFingerprintForDifferentConfiguration() throws Exception {
-		String xml1 = createPomXmlContent(VERSION_1, EXECUTION_2, CONFIGURATION_2);
-		String xml2 = createPomXmlContent(VERSION_1, EXECUTION_2, CONFIGURATION_1);
-
-		MavenProject project1 = mavenProject(xml1);
-		MavenProject project2 = mavenProject(xml2);
+	void differentFingerprintForDifferentPluginVersions() throws Exception {
+		MavenProject project1 = mavenProject(VERSION_1);
+		MavenProject project2 = mavenProject(VERSION_2);
 
 		PluginFingerprint fingerprint1 = PluginFingerprint.from(project1, FORMATTERS);
 		PluginFingerprint fingerprint2 = PluginFingerprint.from(project2, FORMATTERS);
@@ -172,11 +68,8 @@ void differentFingerprintForDifferentConfiguration() throws Exception {
 
 	@Test
 	void differentFingerprintForFormattersWithDifferentSteps() throws Exception {
-		String xml1 = createPomXmlContent(VERSION_1, EXECUTION_1, CONFIGURATION_1);
-		String xml2 = createPomXmlContent(VERSION_1, EXECUTION_1, CONFIGURATION_1);
-
-		MavenProject project1 = mavenProject(xml1);
-		MavenProject project2 = mavenProject(xml2);
+		MavenProject project1 = mavenProject(VERSION_1);
+		MavenProject project2 = mavenProject(VERSION_1);
 
 		FormatterStep step1 = formatterStep("step1");
 		FormatterStep step2 = formatterStep("step2");
@@ -192,11 +85,8 @@ void differentFingerprintForFormattersWithDifferentSteps() throws Exception {
 
 	@Test
 	void differentFingerprintForFormattersWithDifferentLineEndings() throws Exception {
-		String xml1 = createPomXmlContent(VERSION_1, EXECUTION_1, CONFIGURATION_1);
-		String xml2 = createPomXmlContent(VERSION_1, EXECUTION_1, CONFIGURATION_1);
-
-		MavenProject project1 = mavenProject(xml1);
-		MavenProject project2 = mavenProject(xml2);
+		MavenProject project1 = mavenProject(VERSION_1);
+		MavenProject project2 = mavenProject(VERSION_1);
 
 		FormatterStep step = formatterStep("step");
 		List<Formatter> formatters1 = singletonList(formatter(LineEnding.UNIX, step));
@@ -224,7 +114,8 @@ void failsWhenProjectDoesNotContainSpotlessPlugin() {
 				.hasMessageContaining("Spotless plugin absent from the project");
 	}
 
-	private static MavenProject mavenProject(String xml) throws Exception {
+	private MavenProject mavenProject(String spotlessVersion) throws Exception {
+		String xml = createPomXmlContent(spotlessVersion, new String[0], new String[0]);
 		return new MavenProject(readPom(xml));
 	}
 

From 3b3d985918fb3391aea1e9593a092f1cc0303401 Mon Sep 17 00:00:00 2001
From: Kostiantyn Liutovych <lutovich@gmail.com>
Date: Sat, 7 Jan 2023 22:21:16 +0100
Subject: [PATCH 0503/2068] Improve index file invalidation message in Maven
 plugin

Do not mention plugin fingerprint because it is an implementation detail and
can be confusing to users. Explain why index file invalidation could happen.
---
 .../com/diffplug/spotless/maven/incremental/FileIndex.java    | 4 ++--
 .../diffplug/spotless/maven/incremental/FileIndexTest.java    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/FileIndex.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/FileIndex.java
index 728f8a57bc..8330319cfb 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/FileIndex.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/FileIndex.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2021-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -76,7 +76,7 @@ static FileIndex read(FileIndexConfig config, Log log) {
 			PluginFingerprint computedFingerprint = config.getPluginFingerprint();
 			PluginFingerprint storedFingerprint = PluginFingerprint.from(firstLine);
 			if (!computedFingerprint.equals(storedFingerprint)) {
-				log.info("Fingerprint mismatch in the index file. Fallback to an empty index");
+				log.info("Index file corresponds to a different configuration of the plugin. Either the plugin version or its configuration has changed. Fallback to an empty index");
 				return emptyIndexFallback(config);
 			} else {
 				Content content = readIndexContent(reader, config.getProjectDir(), log);
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/FileIndexTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/FileIndexTest.java
index ce9c0077e8..8cd5e8a2f7 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/FileIndexTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/FileIndexTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2021-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,7 +60,7 @@ void readFallsBackToEmptyIndexOnFingerprintMismatch() throws Exception {
 		FileIndex index = FileIndex.read(config, log);
 
 		assertThat(index.size()).isZero();
-		verify(log).info("Fingerprint mismatch in the index file. Fallback to an empty index");
+		verify(log).info("Index file corresponds to a different configuration of the plugin. Either the plugin version or its configuration has changed. Fallback to an empty index");
 	}
 
 	@Test

From b858a7c67ac0c8f256280e799719e5cc791c18d0 Mon Sep 17 00:00:00 2001
From: Abel Keszei <keszeiabel@gmail.com>
Date: Sat, 7 Jan 2023 22:28:57 +0100
Subject: [PATCH 0504/2068] update READMEs with info on skipLinesMatching

---
 plugin-gradle/README.md | 6 ++++++
 plugin-maven/README.md  | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 755d21d056..7d465007b6 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -843,6 +843,12 @@ See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-g
 
 If your project has not been rigorous with copyright headers, and you'd like to use git history to repair this retroactively, you can do so with `-PspotlessSetLicenseHeaderYearsFromGitHistory=true`.  When run in this mode, Spotless will do an expensive search through git history for each file, and set the copyright header based on the oldest and youngest commits for that file.  This is intended to be a one-off sort of thing.
 
+### Files with fixed header lines
+
+Some files have fixed header lines (e.g. `<?xml version="1.0" ...` in XMLs, or `#!/bin/bash` in bash scripts). Comments cannot precede these, so the license header has to come after them, too.
+
+To define what lines to skip at the beginning of such files, fill the `skipLinesMatching` option with a regular expression that matches them (e.g. `.skipLinesMatching("^#!.+?\$")` to skip shebangs).
+
 <a name="ratchet"></a>
 
 ## How can I enforce formatting gradually? (aka "ratchet")
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 8440a4368e..11f6c35deb 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -1013,6 +1013,12 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 
 If your project has not been rigorous with copyright headers, and you'd like to use git history to repair this retroactively, you can do so with `-DspotlessSetLicenseHeaderYearsFromGitHistory=true`.  When run in this mode, Spotless will do an expensive search through git history for each file, and set the copyright header based on the oldest and youngest commits for that file.  This is intended to be a one-off sort of thing.
 
+### Files with fixed header lines
+
+Some files have fixed header lines (e.g. `<?xml version="1.0" ...` in XMLs, or `#!/bin/bash` in bash scripts). Comments cannot precede these, so the license header has to come after them, too.
+
+To define what lines to skip at the beginning of such files, fill the `skipLinesMatching` option with a regular expression that matches them (e.g. `<skipLinesMatching>^#!.+?$</skipLinesMatching>` to skip shebangs).
+
 <a name="invisible"></a>
 
 <a name="ratchet"></a>

From 878d0039843811a5fa9afe6d7f3558537f8d4ef0 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sat, 7 Jan 2023 15:22:41 -0800
Subject: [PATCH 0505/2068] Move changelog print out of .circleci

---
 .circleci/config.yml                  | 29 ---------------------------
 .github/workflows/changelog-print.yml | 20 ++++++++++++++++++
 2 files changed, 20 insertions(+), 29 deletions(-)
 create mode 100644 .github/workflows/changelog-print.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
index dd9adf4c00..829e1e60b9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -140,15 +140,6 @@ jobs:
           path: lib-extra/build/test-results/test
       - store_test_results:
           path: plugin-gradle/build/test-results/test
-  changelog_print:
-    << : *env_gradle
-    steps:
-      - checkout
-      - *restore_cache_wrapper
-      - *restore_cache_deps
-      - run:
-          name: gradlew changelogPrint
-          command: ./gradlew changelogPrint
   do_release_all:
     << : *env_gradle
     steps:
@@ -276,46 +267,26 @@ workflows:
             - assemble_testClasses
   deploy:
     jobs:
-      - changelog_print:
-          filters:
-            branches:
-              only: main
       - release_all:
           type: approval
-          requires:
-            - changelog_print
       - do_release_all:
           requires:
             - release_all
-          context:
-            - SonatypeDeploy
       - release_plugin_gradle:
           type: approval
-          requires:
-            - changelog_print
       - do_release_plugin_gradle:
           requires:
             - release_plugin_gradle
-          context:
-            - SonatypeDeploy
       - release_plugin_maven:
           type: approval
-          requires:
-            - changelog_print
       - do_release_plugin_maven:
           requires:
             - release_plugin_maven
-          context:
-            - SonatypeDeploy
       - release_lib:
           type: approval
-          requires:
-            - changelog_print
       - do_release_lib:
           requires:
             - release_lib
-          context:
-            - SonatypeDeploy
   ext_deploy:
     jobs:
       - ext_changelog_print:
diff --git a/.github/workflows/changelog-print.yml b/.github/workflows/changelog-print.yml
new file mode 100644
index 0000000000..0641124750
--- /dev/null
+++ b/.github/workflows/changelog-print.yml
@@ -0,0 +1,20 @@
+name: changelogPrint
+
+on:
+  push:
+    branches: [main]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    name: changelogPrint
+    steps:
+      - uses: actions/checkout@v3
+      - name: jdk 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: 11
+          distribution: 'temurin'
+      - name: gradle caching
+        uses: gradle/gradle-build-action@v2
+      - run: ./gradlew changelogPrint

From 69ac7f460195480dc3cd6ac0d7514dbb1640b499 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sat, 7 Jan 2023 15:23:34 -0800
Subject: [PATCH 0506/2068] Remove all the _ext publishing from config.yml

---
 .circleci/config.yml | 120 -------------------------------------------
 1 file changed, 120 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 829e1e60b9..7881f2d2d3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -186,66 +186,6 @@ jobs:
       - run:
           name: gradlew :plugin-maven:changelogPush
           command: ./gradlew :plugin-maven:changelogPush -Prelease=true --stacktrace
-  ext_changelog_print:
-    << : *env_gradle
-    steps:
-      - checkout
-      - *restore_cache_wrapper
-      - *restore_cache_deps
-      - *set_git_origin_to_https
-      - run:
-          name: gradlew -Pcom.diffplug.spotless.include.ext.nop2=true changelogPrint
-          command: ./gradlew -Pcom.diffplug.spotless.include.ext.nop2=true changelogPrint
-  ext_do_release_base:
-    << : *env_gradle
-    steps:
-      - checkout
-      - *restore_cache_wrapper
-      - *restore_cache_deps
-      - *set_git_origin_to_https
-      - run:
-          name: gradlew :eclipse-base:changelogPush
-          command: ./gradlew -Pcom.diffplug.spotless.include.ext.nop2=true :eclipse-base:changelogPush -Prelease=true --stacktrace
-  ext_do_release_jdt:
-    << : *env_gradle
-    steps:
-      - checkout
-      - *restore_cache_wrapper
-      - *restore_cache_deps
-      - *set_git_origin_to_https
-      - run:
-          name: gradlew :eclipse-jdt:changelogPush
-          command: ./gradlew -Pcom.diffplug.spotless.include.ext.nop2=true :eclipse-jdt:changelogPush -Prelease=true --stacktrace
-  ext_do_release_cdt:
-    << : *env_gradle
-    steps:
-      - checkout
-      - *restore_cache_wrapper
-      - *restore_cache_deps
-      - *set_git_origin_to_https
-      - run:
-          name: gradlew :eclipse-cdt:changelogPush
-          command: ./gradlew -Pcom.diffplug.spotless.include.ext.cdt=true :eclipse-cdt:changelogPush -Prelease=true --stacktrace
-  ext_do_release_groovy:
-    << : *env_gradle
-    steps:
-      - checkout
-      - *restore_cache_wrapper
-      - *restore_cache_deps
-      - *set_git_origin_to_https
-      - run:
-          name: gradlew :eclipse-groovy:changelogPush
-          command: ./gradlew -Pcom.diffplug.spotless.include.ext.groovy=true :eclipse-groovy:changelogPush -Prelease=true --stacktrace
-  ext_do_release_wtp:
-    << : *env_gradle
-    steps:
-      - checkout
-      - *restore_cache_wrapper
-      - *restore_cache_deps
-      - *set_git_origin_to_https
-      - run:
-          name: gradlew :eclipse-wtp:changelogPush
-          command: ./gradlew -Pcom.diffplug.spotless.include.ext.wtp=true :eclipse-wtp:changelogPush -Prelease=true --stacktrace
 
 workflows:
   version: 2
@@ -287,63 +227,3 @@ workflows:
       - do_release_lib:
           requires:
             - release_lib
-  ext_deploy:
-    jobs:
-      - ext_changelog_print:
-          filters:
-            branches:
-              only: main
-      - ext_release_base:
-          type: approval
-          requires:
-            - ext_changelog_print
-      - ext_do_release_base:
-          requires:
-            - ext_release_base
-          context:
-            - SonatypeDeploy
-      - ext_release_jdt:
-          type: approval
-          requires:
-            - ext_changelog_print
-      - ext_do_release_jdt:
-          requires:
-            - ext_release_jdt
-          context:
-            - SonatypeDeploy
-      - ext_release_cdt:
-          type: approval
-          requires:
-            - ext_changelog_print
-      - ext_do_release_cdt:
-          filters:
-            branches:
-              only: main
-          requires:
-            - ext_release_cdt
-          context:
-            - SonatypeDeploy
-      - ext_release_groovy:
-          type: approval
-          requires:
-            - ext_changelog_print
-      - ext_do_release_groovy:
-          filters:
-            branches:
-              only: main
-          requires:
-            - ext_release_groovy
-          context:
-            - SonatypeDeploy
-      - ext_release_wtp:
-          type: approval
-          requires:
-            - ext_changelog_print
-      - ext_do_release_wtp:
-          filters:
-            branches:
-              only: main
-          requires:
-            - ext_release_wtp
-          context:
-            - SonatypeDeploy

From 7b8ed503cbf6b1adc7456f6e27f80664cf9d7329 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sat, 7 Jan 2023 15:39:11 -0800
Subject: [PATCH 0507/2068] Move publishing out of CirclCI and into github
 actions.

---
 .circleci/config.yml         | 68 ------------------------------------
 .github/workflows/deploy.yml | 63 +++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 68 deletions(-)
 create mode 100644 .github/workflows/deploy.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7881f2d2d3..b9f91766c9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -140,52 +140,6 @@ jobs:
           path: lib-extra/build/test-results/test
       - store_test_results:
           path: plugin-gradle/build/test-results/test
-  do_release_all:
-    << : *env_gradle
-    steps:
-      - checkout
-      - *restore_cache_wrapper
-      - *restore_cache_deps
-      - *set_git_origin_to_https
-      - run:
-          name: gradlew :changelogPush
-          command: ./gradlew :changelogPush -Prelease=true --stacktrace --warning-mode all
-      - run:
-          name: gradlew :plugin-gradle:changelogPush
-          command: ./gradlew :plugin-gradle:changelogPush -Prelease=true -Pgradle.publish.key=${gradle_key} -Pgradle.publish.secret=${gradle_secret} --stacktrace --warning-mode all
-      - run:
-          name: gradlew :plugin-maven:changelogPush
-          command: ./gradlew :plugin-maven:changelogPush -Prelease=true --stacktrace --warning-mode all
-  do_release_lib:
-    << : *env_gradle
-    steps:
-      - checkout
-      - *restore_cache_wrapper
-      - *restore_cache_deps
-      - *set_git_origin_to_https
-      - run:
-          name: gradlew :changelogPush
-          command: ./gradlew :changelogPush -Prelease=true --stacktrace --warning-mode all
-  do_release_plugin_gradle:
-    << : *env_gradle
-    steps:
-      - checkout
-      - *restore_cache_wrapper
-      - *restore_cache_deps
-      - *set_git_origin_to_https
-      - run:
-          name: gradlew :plugin-gradle:changelogPush
-          command: ./gradlew :plugin-gradle:changelogPush -Prelease=true -Pgradle.publish.key=${gradle_key} -Pgradle.publish.secret=${gradle_secret} --stacktrace
-  do_release_plugin_maven:
-    << : *env_gradle
-    steps:
-      - checkout
-      - *restore_cache_wrapper
-      - *restore_cache_deps
-      - *set_git_origin_to_https
-      - run:
-          name: gradlew :plugin-maven:changelogPush
-          command: ./gradlew :plugin-maven:changelogPush -Prelease=true --stacktrace
 
 workflows:
   version: 2
@@ -205,25 +159,3 @@ workflows:
       - test_npm_8:
           requires:
             - assemble_testClasses
-  deploy:
-    jobs:
-      - release_all:
-          type: approval
-      - do_release_all:
-          requires:
-            - release_all
-      - release_plugin_gradle:
-          type: approval
-      - do_release_plugin_gradle:
-          requires:
-            - release_plugin_gradle
-      - release_plugin_maven:
-          type: approval
-      - do_release_plugin_maven:
-          requires:
-            - release_plugin_maven
-      - release_lib:
-          type: approval
-      - do_release_lib:
-          requires:
-            - release_lib
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
new file mode 100644
index 0000000000..6af73db448
--- /dev/null
+++ b/.github/workflows/deploy.yml
@@ -0,0 +1,63 @@
+# GH_TOKEN
+# NEXUS_USER
+# NEXUS_PASS
+# GPG_PASSPHRASE
+# GPG_KEY (base64)
+#   gpg --export-secret-keys --armor KEY_ID | openssl base64 | pbcopy
+# GRADLE_PORTAL_KEY
+# GRADLE_PORTAL_SECRET
+
+name: deploy
+on:
+  workflow_dispatch:
+    inputs:
+      to_publish:
+        description: 'What to publish'
+        required: true
+        default: 'all'
+        type: choice
+        options:
+          - plugin-gradle
+          - plugin-maven
+          - all
+          - lib
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    name: deploy
+    env:
+      gh_token: ${{ secrets.GH_TOKEN }}
+      ORG_GRADLE_PROJECT_nexus_user: ${{ secrets.NEXUS_USER }}
+      ORG_GRADLE_PROJECT_nexus_pass: ${{ secrets.NEXUS_PASS }}
+      ORG_GRADLE_PROJECT_gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
+      ORG_GRADLE_PROJECT_gpg_key64: ${{ secrets.GPG_KEY }}
+
+        gradle_key
+    steps:
+      - uses: actions/checkout@v3
+      - name: jdk 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: 11
+          distribution: 'temurin'
+      - name: gradle caching
+        uses: gradle/gradle-build-action@v2
+      - name: publish all
+        if: "${{ github.event.inputs.to_publish == 'all' }}"
+        run: |
+          ./gradlew :changelogPush -Prelease=true --stacktrace --warning-mode all
+          ./gradlew :plugin-gradle:changelogPush -Prelease=true -Pgradle.publish.key=${{ secrets.GRADLE_PORTAL_KEY }} -Pgradle.publish.secret=${{ secrets.GRADLE_PORTAL_SECRET }} --stacktrace --warning-mode all
+          ./gradlew :plugin-maven:changelogPush -Prelease=true --stacktrace --warning-mode all
+      - name: publish just plugin-gradle
+        if: "${{ github.event.inputs.to_publish == 'plugin-gradle' }}"
+        run: |
+          ./gradlew :plugin-gradle:changelogPush -Prelease=true -Pgradle.publish.key=${{ secrets.GRADLE_PORTAL_KEY }} -Pgradle.publish.secret=${{ secrets.GRADLE_PORTAL_SECRET }} --stacktrace --warning-mode all
+      - name: publish just plugin-maven
+        if: "${{ github.event.inputs.to_publish == 'plugin-maven' }}"
+        run: |
+          ./gradlew :plugin-maven:changelogPush -Prelease=true --stacktrace --warning-mode all
+      - name: publish just lib
+        if: "${{ github.event.inputs.to_publish == 'lib' }}"
+        run: |
+          ./gradlew :changelogPush -Prelease=true --stacktrace --warning-mode all

From 016eecf893f072fbef5592e80d52cc1e0eefc8de Mon Sep 17 00:00:00 2001
From: Kostiantyn Liutovych <lutovich@gmail.com>
Date: Sun, 8 Jan 2023 13:59:53 +0100
Subject: [PATCH 0508/2068] Update changelog

---
 plugin-maven/CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 84e06aa847..b92aa4095d 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Reduce spurious invalidations of the up-to-date index file ([#1461](https://github.com/diffplug/spotless/pull/1461))
 
 ## [2.29.0] - 2023-01-02
 ### Added

From 5db9d64a6810237ff83e271370893b28bfa55bb4 Mon Sep 17 00:00:00 2001
From: Eir Nym <485399+eirnym@users.noreply.github.com>
Date: Sun, 8 Jan 2023 20:27:13 +0100
Subject: [PATCH 0509/2068] Use Files.exists, make code more consistent

* Use java.nio.file.Files.exists to be consistent
* Use empty empty EditorConfigDefaults settings for KtLint 0.47 and 0.48
  when possible
---
 .../ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java   | 10 +++++++++-
 .../ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java   |  5 +++--
 .../compat/KtLintCompat0Dot48Dot0AdapterTest.java      |  1 -
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/lib/src/compatKtLint0Dot47Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java b/lib/src/compatKtLint0Dot47Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java
index 20b87eeb17..0a38730b6a 100644
--- a/lib/src/compatKtLint0Dot47Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot47Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java
@@ -17,6 +17,7 @@
 
 import static java.util.Collections.emptySet;
 
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
@@ -77,6 +78,13 @@ public String format(final String text, Path path, final boolean isScript,
 					editorConfigOverrideMap);
 		}
 
+		EditorConfigDefaults editorConfig;
+		if (editorConfigPath == null || !Files.exists(editorConfigPath)) {
+			editorConfig = EditorConfigDefaults.Companion.getEmptyEditorConfigDefaults();
+		} else {
+			editorConfig = EditorConfigDefaults.Companion.load(editorConfigPath);
+		}
+
 		return KtLint.INSTANCE.format(new KtLint.ExperimentalParams(
 				path.toFile().getAbsolutePath(),
 				text,
@@ -87,7 +95,7 @@ public String format(final String text, Path path, final boolean isScript,
 				isScript,
 				null,
 				false,
-				EditorConfigDefaults.Companion.load(editorConfigPath),
+				editorConfig,
 				editorConfigOverride,
 				false));
 	}
diff --git a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
index 8bb96faf08..ca5cb08b74 100644
--- a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
@@ -15,9 +15,10 @@
  */
 package com.diffplug.spotless.glue.ktlint.compat;
 
+import java.nio.file.Path;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.nio.file.Path;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
@@ -99,7 +100,7 @@ public String format(final String text, Path path, final boolean isScript,
 					editorConfigOverrideMap);
 		}
 		EditorConfigDefaults editorConfig;
-		if (editorConfigPath == null || !editorConfigPath.toFile().exists()) {
+		if (editorConfigPath == null || !Files.exists(editorConfigPath)) {
 			editorConfig = EditorConfigDefaults.Companion.getEMPTY_EDITOR_CONFIG_DEFAULTS();
 		} else {
 			editorConfig = EditorConfigDefaults.Companion.load(editorConfigPath);
diff --git a/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java b/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java
index cd91633215..6825b3d818 100644
--- a/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java
+++ b/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java
@@ -17,7 +17,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;

From e49fb26ee2fc4d2057f0b0d0a078323d570143b2 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 8 Jan 2023 20:32:29 -0800
Subject: [PATCH 0510/2068] Update changelog.

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index c7cde364c0..9ca16e4dc3 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -24,6 +24,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
   * `StepHarnessWithFile` now takes a `ResourceHarness` in its constructor to handle the file manipulation parts
   * Standardized that we test exception *messages*, not types, which will ease the transition to linting later on
   * Bump default `ktlint` version to latest `0.47.1` -> `0.48.1` ([#1456](https://github.com/diffplug/spotless/pull/1456))
+* Switch our publishing infrastructure from CircleCI to GitHub Actions ([#1462](https://github.com/diffplug/spotless/pull/1462)).
+  * Help wanted for moving our tests too ([#1472](https://github.com/diffplug/spotless/issues/1472))
 
 ## [2.31.1] - 2023-01-02
 ### Fixed

From 6cb3ec5008e738fad916bd546ad3ca3512cb2f0e Mon Sep 17 00:00:00 2001
From: Eir Nym <485399+eirnym@users.noreply.github.com>
Date: Mon, 9 Jan 2023 11:22:05 +0100
Subject: [PATCH 0511/2068] Apply spotless

---
 .../glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
index ca5cb08b74..5d24603f70 100644
--- a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
@@ -15,8 +15,8 @@
  */
 package com.diffplug.spotless.glue.ktlint.compat;
 
-import java.nio.file.Path;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedHashSet;

From 9296fc9e17cff26c8faee2f14434f658e27aeed2 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Mon, 9 Jan 2023 20:37:02 +0400
Subject: [PATCH 0512/2068] Fix JSON in Unreleased

---
 README.md               | 4 ++--
 plugin-maven/CHANGES.md | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 605305bd29..fdd038940b 100644
--- a/README.md
+++ b/README.md
@@ -62,8 +62,8 @@ lib('java.PalantirJavaFormatStep')               +'{{yes}}       | {{yes}}
 lib('java.RemoveUnusedImportsStep')              +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
 extra('java.EclipseJdtFormatterStep')            +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
 lib('java.FormatAnnotationsStep')                +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
-lib('json.gson.GsonStep')                        +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
-lib('json.JsonSimpleStep')                       +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
+lib('json.gson.GsonStep')                        +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
+lib('json.JsonSimpleStep')                       +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('kotlin.KtLintStep')                         +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
 lib('kotlin.KtfmtStep')                          +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('kotlin.DiktatStep')                         +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 984c86d502..e7f5d05619 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Added `skipLinesMatching` option to `licenseHeader` to support formats where license header cannot be immediately added to the top of the file (e.g. xml, sh). ([#1441](https://github.com/diffplug/spotless/pull/1441))
+* Add JSON support ([#1446](https://github.com/diffplug/spotless/pull/1446))
 ### Fixed
 * Support `ktlint` 0.48+ new rule disabling syntax ([#1456](https://github.com/diffplug/spotless/pull/1456)) fixes ([#1444](https://github.com/diffplug/spotless/issues/1444))
 ### Changes
@@ -14,7 +15,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [2.29.0] - 2023-01-02
 ### Added
 * Added support for M2E's incremental compilation ([#1414](https://github.com/diffplug/spotless/pull/1414) fixes [#1413](https://github.com/diffplug/spotless/issues/1413))
-* Add JSON support ([#1446](https://github.com/diffplug/spotless/pull/1446))
 ### Fixed
 * Improve memory usage when using git ratchet ([#1426](https://github.com/diffplug/spotless/pull/1426))
 * Support `ktlint` 0.48+ ([#1432](https://github.com/diffplug/spotless/pull/1432)) fixes ([#1430](https://github.com/diffplug/spotless/issues/1430))

From af3991836b87d8786f7736d695cd00d3dd4d7bdc Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 9 Jan 2023 09:17:42 -0800
Subject: [PATCH 0513/2068] `spotlessApply` (freshmark only works on Java < 15
 until #1304 gets merged)

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index fdd038940b..e41fb44e8e 100644
--- a/README.md
+++ b/README.md
@@ -106,8 +106,8 @@ extra('wtp.EclipseWtpFormatterStep')             +'{{yes}}       | {{yes}}
 | [`java.RemoveUnusedImportsStep`](lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`java.EclipseJdtFormatterStep`](lib-extra/src/main/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`java.FormatAnnotationsStep`](lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
-| [`json.gson.GsonStep`](lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
-| [`json.JsonSimpleStep`](lib/src/main/java/com/diffplug/spotless/json/JsonSimpleStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
+| [`json.gson.GsonStep`](lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
+| [`json.JsonSimpleStep`](lib/src/main/java/com/diffplug/spotless/json/JsonSimpleStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`kotlin.KtLintStep`](lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`kotlin.KtfmtStep`](lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`kotlin.DiktatStep`](lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |

From 10bf0f087efb187286464182056da54642a93207 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 9 Jan 2023 11:51:45 -0800
Subject: [PATCH 0514/2068] Missing from #1442 - spotbugs error, unused private
 static method

---
 .../com/diffplug/spotless/kotlin/KtLintStep.java  | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index 835e997f8e..7bcae36fb0 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -75,21 +75,6 @@ public static FormatterStep createForScript(String version,
 				editorConfigOverride);
 	}
 
-	private static FormatterStep create(String version,
-			Provisioner provisioner,
-			boolean isScript,
-			boolean useExperimental,
-			Map<String, String> userData,
-			Map<String, Object> editorConfigOverride) {
-		return create(version,
-				provisioner,
-				useExperimental,
-				isScript,
-				null,
-				userData,
-				editorConfigOverride);
-	}
-
 	public static FormatterStep create(String version,
 			Provisioner provisioner,
 			boolean isScript,

From 45b3ea4acbf5e64bd7ee2708b1956b94789c2664 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 9 Jan 2023 11:52:07 -0800
Subject: [PATCH 0515/2068] Missing from #1442 - FileSignature target must
 exist

---
 .../main/java/com/diffplug/gradle/spotless/KotlinExtension.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
index 5d1c484521..5a7419f68d 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
@@ -63,7 +63,7 @@ public LicenseHeaderConfig licenseHeaderFile(Object licenseHeaderFile) {
 	public KotlinFormatExtension ktlint(String version) throws IOException {
 		Objects.requireNonNull(version);
 		File defaultEditorConfig = getProject().getRootProject().file(".editorconfig");
-		FileSignature editorConfigPath = FileSignature.signAsList(defaultEditorConfig);
+		FileSignature editorConfigPath = defaultEditorConfig.exists() ? FileSignature.signAsList(defaultEditorConfig) : null;
 		return new KotlinFormatExtension(version, false, editorConfigPath, Collections.emptyMap(), Collections.emptyMap());
 	}
 

From d507c39af737708f4257e687e42f2e62ab6897b3 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 9 Jan 2023 11:55:08 -0800
Subject: [PATCH 0516/2068] Missing from #1442 - FileSignature target must
 exist

---
 .../com/diffplug/gradle/spotless/KotlinGradleExtension.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
index 82a8edd9a5..a0657e99d9 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
@@ -48,7 +48,7 @@ public KotlinGradleExtension(SpotlessExtension spotless) {
 	public KotlinFormatExtension ktlint(String version) throws IOException {
 		Objects.requireNonNull(version, "version");
 		File defaultEditorConfig = getProject().getRootProject().file(".editorconfig");
-		FileSignature editorConfigPath = FileSignature.signAsList(defaultEditorConfig);
+		FileSignature editorConfigPath = defaultEditorConfig.exists() ? FileSignature.signAsList(defaultEditorConfig) : null;
 		return new KotlinFormatExtension(version, false, editorConfigPath, Collections.emptyMap(), Collections.emptyMap());
 	}
 

From 774ba3783c3561334a009ba0f074f87f60c5079d Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 9 Jan 2023 12:04:10 -0800
Subject: [PATCH 0517/2068] Missing from #1442 - warning in changelog that
 `.editorconfig` will get picked up which will change formatting result

---
 plugin-gradle/CHANGES.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index e81ab43621..3c2e3b5e90 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -4,7 +4,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* Add option `editorConfigFile` for `ktLint` [#142](https://github.com/diffplug/spotless/issues/142)
+* **POTENTIALLY BREAKING** `ktlint` step now supports `.editorconfig` ([#1442](https://github.com/diffplug/spotless/pull/1442) implements [#142](https://github.com/diffplug/spotless/issues/142))
+  * If the root project has a file `.editorconfig` it will be picked up by default, if you don't want that, add `ktlint().setEditorConfigPath(null)` to override the default.
 * Added `skipLinesMatching` option to `licenseHeader` to support formats where license header cannot be immediately added to the top of the file (e.g. xml, sh). ([#1441](https://github.com/diffplug/spotless/pull/1441))
 ### Fixed
 * Prevent tool configurations from being resolved outside project ([#1447](https://github.com/diffplug/spotless/pull/1447) fixes [#1215](https://github.com/diffplug/spotless/issues/1215))

From 53605f0ccce52f5704e432d2cb37885ac0ab1318 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 9 Jan 2023 12:14:26 -0800
Subject: [PATCH 0518/2068] Missing from #1442 - warning in changelog that
 `ktlint` is now modifying license header, so step order matters.

---
 CHANGES.md                                                | 1 +
 plugin-gradle/CHANGES.md                                  | 2 +-
 .../com/diffplug/gradle/spotless/KotlinExtensionTest.java | 8 ++++----
 plugin-maven/CHANGES.md                                   | 1 +
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 774e125426..f0db002dc1 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Add option `editorConfigFile` for `ktLint` [#142](https://github.com/diffplug/spotless/issues/142)
+  * **POTENTIALLY BREAKING** `ktlint` step now modifies license headers. Make sure to put `licenseHeader` *after* `ktlint`.
 * Added `skipLinesMatching` option to `licenseHeader` to support formats where license header cannot be immediately added to the top of the file (e.g. xml, sh). ([#1441](https://github.com/diffplug/spotless/pull/1441)).
 ### Fixed
 * Support `ktlint` 0.48+ new rule disabling syntax ([#1456](https://github.com/diffplug/spotless/pull/1456)) fixes ([#1444](https://github.com/diffplug/spotless/issues/1444))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 3c2e3b5e90..e8758188b6 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,7 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * **POTENTIALLY BREAKING** `ktlint` step now supports `.editorconfig` ([#1442](https://github.com/diffplug/spotless/pull/1442) implements [#142](https://github.com/diffplug/spotless/issues/142))
-  * If the root project has a file `.editorconfig` it will be picked up by default, if you don't want that, add `ktlint().setEditorConfigPath(null)` to override the default.
+  * **POTENTIALLY BREAKING** `ktlint` step now modifies license headers. Make sure to put `licenseHeader` *after* `ktlint`.
 * Added `skipLinesMatching` option to `licenseHeader` to support formats where license header cannot be immediately added to the top of the file (e.g. xml, sh). ([#1441](https://github.com/diffplug/spotless/pull/1441))
 ### Fixed
 * Prevent tool configurations from being resolved outside project ([#1447](https://github.com/diffplug/spotless/pull/1447) fixes [#1215](https://github.com/diffplug/spotless/issues/1215))
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
index 5da722ea44..d77b22d0d3 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -187,8 +187,8 @@ void testWithHeader() throws IOException {
 				"repositories { mavenCentral() }",
 				"spotless {",
 				"    kotlin {",
-				"        licenseHeader('" + HEADER + "')",
 				"        ktlint()",
+				"        licenseHeader('" + HEADER + "')",
 				"    }",
 				"}");
 		setFile("src/main/kotlin/AnObject.kt").toResource("kotlin/licenseheader/KotlinCodeWithoutHeader.test");
@@ -226,8 +226,8 @@ void testWithCustomHeaderSeparator() throws IOException {
 				"repositories { mavenCentral() }",
 				"spotless {",
 				"    kotlin {",
-				"        licenseHeader ('" + HEADER + "', '@file')",
 				"        ktlint()",
+				"        licenseHeader ('" + HEADER + "', '@file')",
 				"    }",
 				"}");
 		setFile("src/main/kotlin/AnObject.kt").toResource("kotlin/licenseheader/KotlinCodeWithoutHeader.test");
@@ -265,8 +265,8 @@ void testWithNonStandardYearSeparator() throws IOException {
 				"repositories { mavenCentral() }",
 				"spotless {",
 				"    kotlin {",
-				"        licenseHeader('" + HEADER_WITH_YEAR + "').yearSeparator(', ')",
 				"        ktlint()",
+				"        licenseHeader('" + HEADER_WITH_YEAR + "').yearSeparator(', ')",
 				"    }",
 				"}");
 
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index f0daee6a35..cb38f95de1 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Add option `editorConfigFile` for `ktLint` [#142](https://github.com/diffplug/spotless/issues/142)
+  * **POTENTIALLY BREAKING** `ktlint` step now modifies license headers. Make sure to put `licenseHeader` *after* `ktlint`.
 * Added `skipLinesMatching` option to `licenseHeader` to support formats where license header cannot be immediately added to the top of the file (e.g. xml, sh). ([#1441](https://github.com/diffplug/spotless/pull/1441))
 * Add JSON support ([#1446](https://github.com/diffplug/spotless/pull/1446))
 ### Fixed

From 77b77f7b2e7b20acb8f381579a878dcece80ff61 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 9 Jan 2023 12:43:57 -0800
Subject: [PATCH 0519/2068] Missing from #1442 - NPE's in older adapters.

---
 .../glue/ktlint/compat/KtLintCompat0Dot34Dot2Adapter.java       | 2 +-
 .../glue/ktlint/compat/KtLintCompat0Dot45Dot2Adapter.java       | 2 +-
 .../glue/ktlint/compat/KtLintCompat0Dot46Dot0Adapter.java       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/src/compatKtLint0Dot34Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot34Dot2Adapter.java b/lib/src/compatKtLint0Dot34Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot34Dot2Adapter.java
index 8926a8e21f..1b8509902c 100644
--- a/lib/src/compatKtLint0Dot34Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot34Dot2Adapter.java
+++ b/lib/src/compatKtLint0Dot34Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot34Dot2Adapter.java
@@ -62,7 +62,7 @@ public String format(final String text, Path path, final boolean isScript,
 				userData,
 				formatterCallback,
 				isScript,
-				editorConfigPath.toFile().getAbsolutePath(),
+				editorConfigPath == null ? null : editorConfigPath.toFile().getAbsolutePath(),
 				false));
 	}
 }
diff --git a/lib/src/compatKtLint0Dot45Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot45Dot2Adapter.java b/lib/src/compatKtLint0Dot45Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot45Dot2Adapter.java
index c90cf59d2b..23fb2b4c5c 100644
--- a/lib/src/compatKtLint0Dot45Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot45Dot2Adapter.java
+++ b/lib/src/compatKtLint0Dot45Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot45Dot2Adapter.java
@@ -77,7 +77,7 @@ public String format(final String text, Path path, final boolean isScript,
 				userData,
 				formatterCallback,
 				isScript,
-				editorConfigPath.toFile().getAbsolutePath(),
+				editorConfigPath == null ? null : editorConfigPath.toFile().getAbsolutePath(),
 				false,
 				editorConfigOverride,
 				false));
diff --git a/lib/src/compatKtLint0Dot46Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot46Dot0Adapter.java b/lib/src/compatKtLint0Dot46Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot46Dot0Adapter.java
index 54b34296a4..afaf2ad19f 100644
--- a/lib/src/compatKtLint0Dot46Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot46Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot46Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot46Dot0Adapter.java
@@ -77,7 +77,7 @@ public String format(final String text, Path path, final boolean isScript,
 				userData,
 				formatterCallback,
 				isScript,
-				editorConfigPath.toFile().getAbsolutePath(),
+				editorConfigPath == null ? null : editorConfigPath.toFile().getAbsolutePath(),
 				false,
 				editorConfigOverride,
 				false));

From b2ee32b01ec655ba9e94810a9743fd85fe38d05b Mon Sep 17 00:00:00 2001
From: Eir Nym <485399+eirnym@users.noreply.github.com>
Date: Mon, 9 Jan 2023 22:27:56 +0100
Subject: [PATCH 0520/2068] Drop old KtLint support(0.3x and 0.45.2)

---
 lib/build.gradle                              |  19 ---
 .../compat/KtLintCompat0Dot31Dot0Adapter.java |  64 ----------
 .../compat/KtLintCompat0Dot32Dot0Adapter.java |  64 ----------
 .../compat/KtLintCompat0Dot34Dot2Adapter.java |  68 ----------
 .../compat/KtLintCompat0Dot45Dot2Adapter.java | 119 ------------------
 .../glue/ktlint/KtlintFormatterFunc.java      |  14 +--
 6 files changed, 1 insertion(+), 347 deletions(-)
 delete mode 100644 lib/src/compatKtLint0Dot31Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot31Dot0Adapter.java
 delete mode 100644 lib/src/compatKtLint0Dot32Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot32Dot0Adapter.java
 delete mode 100644 lib/src/compatKtLint0Dot34Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot34Dot2Adapter.java
 delete mode 100644 lib/src/compatKtLint0Dot45Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot45Dot2Adapter.java

diff --git a/lib/build.gradle b/lib/build.gradle
index 115d27195f..2259cfb12c 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -28,10 +28,6 @@ versionCompatibility {
 	adapters {
 		namespaces.register('KtLint') {
 			versions = [
-				'0.31.0',
-				'0.32.0',
-				'0.34.2',
-				'0.45.2',
 				'0.46.0',
 				'0.47.0',
 				'0.48.0',
@@ -70,21 +66,6 @@ dependencies {
 	ktlintCompileOnly "com.pinterest.ktlint:ktlint-ruleset-experimental:$VER_KTLINT"
 	ktlintCompileOnly "com.pinterest.ktlint:ktlint-ruleset-standard:$VER_KTLINT"
 
-	compatKtLint0Dot31Dot0CompileOnly 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.20'
-	compatKtLint0Dot31Dot0CompileOnly 'com.github.shyiko.ktlint:ktlint-core:0.31.0'
-	compatKtLint0Dot31Dot0CompileOnly 'com.github.shyiko.ktlint:ktlint-ruleset-experimental:0.31.0'
-	compatKtLint0Dot31Dot0CompileOnly 'com.github.shyiko.ktlint:ktlint-ruleset-standard:0.31.0'
-	compatKtLint0Dot32Dot0CompileOnly 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.20'
-	compatKtLint0Dot32Dot0CompileOnly 'com.pinterest.ktlint:ktlint-core:0.32.0'
-	compatKtLint0Dot32Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-experimental:0.32.0'
-	compatKtLint0Dot32Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.32.0'
-	compatKtLint0Dot34Dot2CompileOnly 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.20'
-	compatKtLint0Dot34Dot2CompileOnly 'com.pinterest.ktlint:ktlint-core:0.34.2'
-	compatKtLint0Dot34Dot2CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-experimental:0.34.2'
-	compatKtLint0Dot34Dot2CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.34.2'
-	compatKtLint0Dot45Dot2CompileOnly 'com.pinterest.ktlint:ktlint-core:0.45.2'
-	compatKtLint0Dot45Dot2CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-experimental:0.45.2'
-	compatKtLint0Dot45Dot2CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.45.2'
 	compatKtLint0Dot46Dot0CompileOnly 'com.pinterest.ktlint:ktlint-core:0.46.0'
 	compatKtLint0Dot46Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-experimental:0.46.0'
 	compatKtLint0Dot46Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.46.0'
diff --git a/lib/src/compatKtLint0Dot31Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot31Dot0Adapter.java b/lib/src/compatKtLint0Dot31Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot31Dot0Adapter.java
deleted file mode 100644
index 7a956de86a..0000000000
--- a/lib/src/compatKtLint0Dot31Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot31Dot0Adapter.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2022-2023 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.glue.ktlint.compat;
-
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import com.github.shyiko.ktlint.core.KtLint;
-import com.github.shyiko.ktlint.core.LintError;
-import com.github.shyiko.ktlint.core.RuleSet;
-import com.github.shyiko.ktlint.ruleset.experimental.ExperimentalRuleSetProvider;
-import com.github.shyiko.ktlint.ruleset.standard.StandardRuleSetProvider;
-
-import kotlin.Unit;
-import kotlin.jvm.functions.Function2;
-
-public class KtLintCompat0Dot31Dot0Adapter implements KtLintCompatAdapter {
-
-	static class FormatterCallback implements Function2<LintError, Boolean, Unit> {
-		@Override
-		public Unit invoke(LintError lint, Boolean corrected) {
-			if (!corrected) {
-				KtLintCompatReporting.report(lint.getLine(), lint.getCol(), lint.getRuleId(), lint.getDetail());
-			}
-			return null;
-		}
-	}
-
-	@Override
-	public String format(final String text, Path path, final boolean isScript,
-			final boolean useExperimental,
-			Path editorConfigPath, final Map<String, String> userData,
-			final Map<String, Object> editorConfigOverrideMap) {
-		final FormatterCallback formatterCallback = new FormatterCallback();
-
-		final List<RuleSet> rulesets = new ArrayList<>();
-		rulesets.add(new StandardRuleSetProvider().get());
-
-		if (useExperimental) {
-			rulesets.add(new ExperimentalRuleSetProvider().get());
-		}
-
-		return KtLint.INSTANCE.format(
-				text,
-				rulesets,
-				userData,
-				formatterCallback);
-	}
-}
diff --git a/lib/src/compatKtLint0Dot32Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot32Dot0Adapter.java b/lib/src/compatKtLint0Dot32Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot32Dot0Adapter.java
deleted file mode 100644
index 94c41c3716..0000000000
--- a/lib/src/compatKtLint0Dot32Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot32Dot0Adapter.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2022-2023 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.glue.ktlint.compat;
-
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import com.pinterest.ktlint.core.KtLint;
-import com.pinterest.ktlint.core.LintError;
-import com.pinterest.ktlint.core.RuleSet;
-import com.pinterest.ktlint.ruleset.experimental.ExperimentalRuleSetProvider;
-import com.pinterest.ktlint.ruleset.standard.StandardRuleSetProvider;
-
-import kotlin.Unit;
-import kotlin.jvm.functions.Function2;
-
-public class KtLintCompat0Dot32Dot0Adapter implements KtLintCompatAdapter {
-
-	static class FormatterCallback implements Function2<LintError, Boolean, Unit> {
-		@Override
-		public Unit invoke(LintError lint, Boolean corrected) {
-			if (!corrected) {
-				KtLintCompatReporting.report(lint.getLine(), lint.getCol(), lint.getRuleId(), lint.getDetail());
-			}
-			return null;
-		}
-	}
-
-	@Override
-	public String format(final String text, Path path, final boolean isScript,
-			final boolean useExperimental,
-			Path editorConfigPath, final Map<String, String> userData,
-			final Map<String, Object> editorConfigOverrideMap) {
-		final FormatterCallback formatterCallback = new FormatterCallback();
-
-		final List<RuleSet> rulesets = new ArrayList<>();
-		rulesets.add(new StandardRuleSetProvider().get());
-
-		if (useExperimental) {
-			rulesets.add(new ExperimentalRuleSetProvider().get());
-		}
-
-		return KtLint.INSTANCE.format(
-				text,
-				rulesets,
-				userData,
-				formatterCallback);
-	}
-}
diff --git a/lib/src/compatKtLint0Dot34Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot34Dot2Adapter.java b/lib/src/compatKtLint0Dot34Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot34Dot2Adapter.java
deleted file mode 100644
index 1b8509902c..0000000000
--- a/lib/src/compatKtLint0Dot34Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot34Dot2Adapter.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2022-2023 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.glue.ktlint.compat;
-
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import com.pinterest.ktlint.core.KtLint;
-import com.pinterest.ktlint.core.LintError;
-import com.pinterest.ktlint.core.RuleSet;
-import com.pinterest.ktlint.ruleset.experimental.ExperimentalRuleSetProvider;
-import com.pinterest.ktlint.ruleset.standard.StandardRuleSetProvider;
-
-import kotlin.Unit;
-import kotlin.jvm.functions.Function2;
-
-public class KtLintCompat0Dot34Dot2Adapter implements KtLintCompatAdapter {
-
-	static class FormatterCallback implements Function2<LintError, Boolean, Unit> {
-		@Override
-		public Unit invoke(LintError lint, Boolean corrected) {
-			if (!corrected) {
-				KtLintCompatReporting.report(lint.getLine(), lint.getCol(), lint.getRuleId(), lint.getDetail());
-			}
-			return null;
-		}
-	}
-
-	@Override
-	public String format(final String text, Path path, final boolean isScript,
-			final boolean useExperimental,
-			Path editorConfigPath, final Map<String, String> userData,
-			final Map<String, Object> editorConfigOverrideMap) {
-		final FormatterCallback formatterCallback = new FormatterCallback();
-
-		final List<RuleSet> rulesets = new ArrayList<>();
-		rulesets.add(new StandardRuleSetProvider().get());
-
-		if (useExperimental) {
-			rulesets.add(new ExperimentalRuleSetProvider().get());
-		}
-
-		return KtLint.INSTANCE.format(new KtLint.Params(
-				path.toFile().getAbsolutePath(),
-				text,
-				rulesets,
-				userData,
-				formatterCallback,
-				isScript,
-				editorConfigPath == null ? null : editorConfigPath.toFile().getAbsolutePath(),
-				false));
-	}
-}
diff --git a/lib/src/compatKtLint0Dot45Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot45Dot2Adapter.java b/lib/src/compatKtLint0Dot45Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot45Dot2Adapter.java
deleted file mode 100644
index 23fb2b4c5c..0000000000
--- a/lib/src/compatKtLint0Dot45Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot45Dot2Adapter.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright 2022-2023 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.glue.ktlint.compat;
-
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import com.pinterest.ktlint.core.KtLint;
-import com.pinterest.ktlint.core.LintError;
-import com.pinterest.ktlint.core.RuleSet;
-import com.pinterest.ktlint.core.api.DefaultEditorConfigProperties;
-import com.pinterest.ktlint.core.api.EditorConfigOverride;
-import com.pinterest.ktlint.core.api.UsesEditorConfigProperties;
-import com.pinterest.ktlint.ruleset.experimental.ExperimentalRuleSetProvider;
-import com.pinterest.ktlint.ruleset.standard.StandardRuleSetProvider;
-
-import kotlin.Pair;
-import kotlin.Unit;
-import kotlin.jvm.functions.Function2;
-
-public class KtLintCompat0Dot45Dot2Adapter implements KtLintCompatAdapter {
-
-	static class FormatterCallback implements Function2<LintError, Boolean, Unit> {
-		@Override
-		public Unit invoke(LintError lint, Boolean corrected) {
-			if (!corrected) {
-				KtLintCompatReporting.report(lint.getLine(), lint.getCol(), lint.getRuleId(), lint.getDetail());
-			}
-			return null;
-		}
-	}
-
-	@Override
-	public String format(final String text, Path path, final boolean isScript,
-			final boolean useExperimental,
-			Path editorConfigPath, final Map<String, String> userData,
-			final Map<String, Object> editorConfigOverrideMap) {
-		final FormatterCallback formatterCallback = new FormatterCallback();
-
-		final List<RuleSet> rulesets = new ArrayList<>();
-		rulesets.add(new StandardRuleSetProvider().get());
-
-		if (useExperimental) {
-			rulesets.add(new ExperimentalRuleSetProvider().get());
-		}
-
-		EditorConfigOverride editorConfigOverride;
-		if (editorConfigOverrideMap.isEmpty()) {
-			editorConfigOverride = EditorConfigOverride.Companion.getEmptyEditorConfigOverride();
-		} else {
-			editorConfigOverride = createEditorConfigOverride(rulesets, editorConfigOverrideMap);
-		}
-
-		return KtLint.INSTANCE.format(new KtLint.ExperimentalParams(
-				path.toFile().getAbsolutePath(),
-				text,
-				rulesets,
-				userData,
-				formatterCallback,
-				isScript,
-				editorConfigPath == null ? null : editorConfigPath.toFile().getAbsolutePath(),
-				false,
-				editorConfigOverride,
-				false));
-	}
-
-	/**
-	 * Create EditorConfigOverride from user provided parameters.
-	 * Calling this method requires KtLint 0.45.2.
-	 */
-	private static EditorConfigOverride createEditorConfigOverride(final List<RuleSet> rulesets, Map<String, Object> editorConfigOverrideMap) {
-		// Get properties from rules in the rule sets
-		Stream<UsesEditorConfigProperties.EditorConfigProperty<?>> ruleProperties = rulesets.stream()
-				.flatMap(ruleSet -> Arrays.stream(ruleSet.getRules()))
-				.filter(rule -> rule instanceof UsesEditorConfigProperties)
-				.flatMap(rule -> ((UsesEditorConfigProperties) rule).getEditorConfigProperties().stream());
-
-		// Create a mapping of properties to their names based on rule properties and default properties
-		Map<String, UsesEditorConfigProperties.EditorConfigProperty<?>> supportedProperties = Stream
-				.concat(ruleProperties, DefaultEditorConfigProperties.INSTANCE.getDefaultEditorConfigProperties().stream())
-				.distinct()
-				.collect(Collectors.toMap(property -> property.getType().getName(), property -> property));
-
-		// Create config properties based on provided property names and values
-		@SuppressWarnings("unchecked")
-		Pair<UsesEditorConfigProperties.EditorConfigProperty<?>, ?>[] properties = editorConfigOverrideMap.entrySet().stream()
-				.map(entry -> {
-					UsesEditorConfigProperties.EditorConfigProperty<?> property = supportedProperties.get(entry.getKey());
-					if (property != null) {
-						return new Pair<>(property, entry.getValue());
-					} else {
-						return null;
-					}
-				})
-				.filter(Objects::nonNull)
-				.toArray(Pair[]::new);
-
-		return EditorConfigOverride.Companion.from(properties);
-	}
-}
diff --git a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
index e6f3715d25..02ff5355e3 100644
--- a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
+++ b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
@@ -44,21 +44,9 @@ public KtlintFormatterFunc(String version, boolean isScript, boolean useExperime
 		} else if (minorVersion == 47) {
 			// rename RuleSet to RuleProvider
 			this.adapter = new KtLintCompat0Dot47Dot0Adapter();
-		} else if (minorVersion >= 46) {
+		} else {
 			// DefaultEditorConfigProperties.INSTANCE.getDefaultEditorConfigProperties() renamed to .getEditorConfigProperties()
 			this.adapter = new KtLintCompat0Dot46Dot0Adapter();
-		} else if (version.equals("0.45.2")) {
-			// add editorConfigOverride
-			this.adapter = new KtLintCompat0Dot45Dot2Adapter();
-		} else if (minorVersion >= 34) {
-			// KtLint.INSTANCE.format() now needs more parameters
-			this.adapter = new KtLintCompat0Dot34Dot2Adapter();
-		} else if (minorVersion >= 32) {
-			// rename packages from `com.github.shyiko` to `com.pinterest`
-			this.adapter = new KtLintCompat0Dot32Dot0Adapter();
-		} else {
-			// the OG
-			this.adapter = new KtLintCompat0Dot31Dot0Adapter();
 		}
 		this.editorConfigPath = editorConfigPath;
 		this.useExperimental = useExperimental;

From a80c0eb3a53c009118357fe20a8d2d61e31ed087 Mon Sep 17 00:00:00 2001
From: Eir Nym <485399+eirnym@users.noreply.github.com>
Date: Mon, 9 Jan 2023 22:35:31 +0100
Subject: [PATCH 0521/2068] Update changelog

---
 CHANGES.md               | 3 +++
 plugin-gradle/CHANGES.md | 2 ++
 plugin-maven/CHANGES.md  | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index f0db002dc1..2adb7a92a3 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -29,6 +29,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Switch our publishing infrastructure from CircleCI to GitHub Actions ([#1462](https://github.com/diffplug/spotless/pull/1462)).
   * Help wanted for moving our tests too ([#1472](https://github.com/diffplug/spotless/issues/1472))
 
+#### Removed
+* Removed support for KtLint 0.3x and 0.45.2 ([#1475](https://github.com/diffplug/spotless/pull/1475))
+
 ## [2.31.1] - 2023-01-02
 ### Fixed
 * Improve memory usage when using git ratchet ([#1426](https://github.com/diffplug/spotless/pull/1426))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index e8758188b6..771dfcb558 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -12,6 +12,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Support `ktlint` 0.48+ new rule disabling syntax ([#1456](https://github.com/diffplug/spotless/pull/1456)) fixes ([#1444](https://github.com/diffplug/spotless/issues/1444))
 ### Changes
 * Bump default `ktlint` version to latest `0.47.1` -> `0.48.1` ([#1456](https://github.com/diffplug/spotless/pull/1456))
+#### Removed
+* Removed support for KtLint 0.3x and 0.45.2 ([#1475](https://github.com/diffplug/spotless/pull/1475))
 
 ## [6.12.1] - 2023-01-02
 ### Fixed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index cb38f95de1..024c0ebf24 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -13,6 +13,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changes
 * Bump default `ktlint` version to latest `0.47.1` -> `0.48.1` ([#1456](https://github.com/diffplug/spotless/pull/1456))
 * Reduce spurious invalidations of the up-to-date index file ([#1461](https://github.com/diffplug/spotless/pull/1461))
+#### Removed
+* Removed support for KtLint 0.3x and 0.45.2 ([#1475](https://github.com/diffplug/spotless/pull/1475))
 
 ## [2.29.0] - 2023-01-02
 ### Added

From 57744396c21d91c226b28508c8244e7ec833d18a Mon Sep 17 00:00:00 2001
From: Eir Nym <485399+eirnym@users.noreply.github.com>
Date: Mon, 9 Jan 2023 22:40:34 +0100
Subject: [PATCH 0522/2068] Use caching with setup-java github action

---
 .github/workflows/changelog-print.yml | 1 +
 .github/workflows/deploy.yml          | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/changelog-print.yml b/.github/workflows/changelog-print.yml
index 0641124750..330f78cda0 100644
--- a/.github/workflows/changelog-print.yml
+++ b/.github/workflows/changelog-print.yml
@@ -15,6 +15,7 @@ jobs:
         with:
           java-version: 11
           distribution: 'temurin'
+          cache: 'gradle'
       - name: gradle caching
         uses: gradle/gradle-build-action@v2
       - run: ./gradlew changelogPrint
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 6af73db448..7f93bb01f6 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -41,6 +41,7 @@ jobs:
         with:
           java-version: 11
           distribution: 'temurin'
+          cache: 'gradle'
       - name: gradle caching
         uses: gradle/gradle-build-action@v2
       - name: publish all

From 657a5029d4650d12208dc48700058c72b2447aa9 Mon Sep 17 00:00:00 2001
From: Eir Nym <485399+eirnym@users.noreply.github.com>
Date: Mon, 9 Jan 2023 22:57:29 +0100
Subject: [PATCH 0523/2068] Add spotless check and build with tests

---
 .github/workflows/build-ci.yml | 46 ++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 .github/workflows/build-ci.yml

diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml
new file mode 100644
index 0000000000..35df2e8d23
--- /dev/null
+++ b/.github/workflows/build-ci.yml
@@ -0,0 +1,46 @@
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+      types: [assigned, opened, synchronize, reopened]
+
+jobs:
+  buildTest:
+    name: Build CI
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        java_version: [11, 17]
+        distribution: ["temurin"]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Install JDK ${{ matrix.distribution }} ${{ matrix.java_version }}
+        uses: actions/setup-java@v3.9.0
+        with:
+          distribution: ${{ matrix.distribution }}
+          java-version: ${{ matrix.java_version }}
+          cache: gradle
+      - name: Build project
+        run: ./gradlew build -x spotlessCheck
+  spotless:
+    name: Check Spotless
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        java_version: [11]
+        distribution: ["temurin"]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Install JDK ${{ matrix.distribution }} ${{ matrix.java_version }}
+        uses: actions/setup-java@v3.9.0
+        with:
+          distribution: ${{ matrix.distribution }}
+          java-version: ${{ matrix.java_version }}
+          cache: gradle
+      - name: Check spotless
+        run: ./gradlew spotlessCheck

From fe801f0f3266762e466bdff4f399279202e81096 Mon Sep 17 00:00:00 2001
From: Eir Nym <485399+eirnym@users.noreply.github.com>
Date: Mon, 9 Jan 2023 23:08:39 +0100
Subject: [PATCH 0524/2068] Full stacktrace on build jobs could be quite
 helpful

---
 .github/workflows/build-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml
index 35df2e8d23..12e1b01410 100644
--- a/.github/workflows/build-ci.yml
+++ b/.github/workflows/build-ci.yml
@@ -24,7 +24,7 @@ jobs:
           java-version: ${{ matrix.java_version }}
           cache: gradle
       - name: Build project
-        run: ./gradlew build -x spotlessCheck
+        run: ./gradlew build -x spotlessCheck -S
   spotless:
     name: Check Spotless
     runs-on: ubuntu-latest
@@ -43,4 +43,4 @@ jobs:
           java-version: ${{ matrix.java_version }}
           cache: gradle
       - name: Check spotless
-        run: ./gradlew spotlessCheck
+        run: ./gradlew spotlessCheck -S

From 6289be94b37a0279ed3c3a90f969c2391faf084c Mon Sep 17 00:00:00 2001
From: Eir Nym <485399+eirnym@users.noreply.github.com>
Date: Mon, 9 Jan 2023 23:12:53 +0100
Subject: [PATCH 0525/2068] Use fetch-depth:0 as workaround for spotlessCheck

---
 .github/workflows/build-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml
index 12e1b01410..97f52dee00 100644
--- a/.github/workflows/build-ci.yml
+++ b/.github/workflows/build-ci.yml
@@ -36,6 +36,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
       - name: Install JDK ${{ matrix.distribution }} ${{ matrix.java_version }}
         uses: actions/setup-java@v3.9.0
         with:

From 71661c18a35c2361ddfff12c77d0c3ac985b5b92 Mon Sep 17 00:00:00 2001
From: Eir Nym <485399+eirnym@users.noreply.github.com>
Date: Mon, 9 Jan 2023 23:52:59 +0100
Subject: [PATCH 0526/2068] Add Windows CI

---
 .github/workflows/build-ci.yml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml
index 97f52dee00..a8c13ecf64 100644
--- a/.github/workflows/build-ci.yml
+++ b/.github/workflows/build-ci.yml
@@ -46,3 +46,22 @@ jobs:
           cache: gradle
       - name: Check spotless
         run: ./gradlew spotlessCheck -S
+  buildTestOnWindows:
+      name: Build on Windows CI
+      runs-on: windows-latest
+      strategy:
+          fail-fast: false
+          matrix:
+              java_version: [11, 17]
+              distribution: ["temurin"]
+      steps:
+          - name: Checkout
+            uses: actions/checkout@v3
+          - name: Install JDK ${{ matrix.distribution }} ${{ matrix.java_version }}
+            uses: actions/setup-java@v3.9.0
+            with:
+                distribution: ${{ matrix.distribution }}
+                java-version: ${{ matrix.java_version }}
+                cache: gradle
+          - name: Build project
+            run: ./gradlew build -x spotlessCheck -S

From 5fc8689e0cbcf6b4fff6bf5fd6e5c5e06f780e88 Mon Sep 17 00:00:00 2001
From: Eir Nym <485399+eirnym@users.noreply.github.com>
Date: Mon, 9 Jan 2023 23:56:29 +0100
Subject: [PATCH 0527/2068] Fix editor config for yaml

---
 .editorconfig                  |  4 ++++
 .github/workflows/build-ci.yml | 38 +++++++++++++++++-----------------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 6712fd66cc..1c19210c40 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -21,3 +21,7 @@ ij_java_names_count_to_use_import_on_demand = 999
 
 [*.xml.mustache]
 indent_style = space
+
+[*.{yml,yaml}]
+indent_style = space
+indent_size = 2
diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml
index a8c13ecf64..ea12b03764 100644
--- a/.github/workflows/build-ci.yml
+++ b/.github/workflows/build-ci.yml
@@ -3,7 +3,7 @@ on:
     branches:
       - main
   pull_request:
-      types: [assigned, opened, synchronize, reopened]
+    types: [assigned, opened, synchronize, reopened]
 
 jobs:
   buildTest:
@@ -47,21 +47,21 @@ jobs:
       - name: Check spotless
         run: ./gradlew spotlessCheck -S
   buildTestOnWindows:
-      name: Build on Windows CI
-      runs-on: windows-latest
-      strategy:
-          fail-fast: false
-          matrix:
-              java_version: [11, 17]
-              distribution: ["temurin"]
-      steps:
-          - name: Checkout
-            uses: actions/checkout@v3
-          - name: Install JDK ${{ matrix.distribution }} ${{ matrix.java_version }}
-            uses: actions/setup-java@v3.9.0
-            with:
-                distribution: ${{ matrix.distribution }}
-                java-version: ${{ matrix.java_version }}
-                cache: gradle
-          - name: Build project
-            run: ./gradlew build -x spotlessCheck -S
+    name: Build on Windows CI
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        java_version: [11, 17]
+        distribution: ["temurin"]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Install JDK ${{ matrix.distribution }} ${{ matrix.java_version }}
+        uses: actions/setup-java@v3.9.0
+        with:
+          distribution: ${{ matrix.distribution }}
+          java-version: ${{ matrix.java_version }}
+          cache: gradle
+      - name: Build project
+        run: ./gradlew build -x spotlessCheck -S

From d3052d3e8193d0aa9421a7b1e25b35062725c862 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Tue, 10 Jan 2023 09:44:56 +0400
Subject: [PATCH 0528/2068] Base implementation

---
 .../spotless/yaml/YamlJacksonStep.java        | 147 ++++++++++++++++++
 .../spotless/maven/yaml/JacksonYaml.java      |  46 ++++++
 .../diffplug/spotless/maven/yaml/Yaml.java    |  41 +++++
 .../yaml/separator_comments.clean.yaml        |   8 +
 .../resources/yaml/separator_comments.yaml    |   8 +
 5 files changed, 250 insertions(+)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/yaml/YamlJacksonStep.java
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/JacksonYaml.java
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/Yaml.java
 create mode 100644 testlib/src/main/resources/yaml/separator_comments.clean.yaml
 create mode 100644 testlib/src/main/resources/yaml/separator_comments.yaml

diff --git a/lib/src/main/java/com/diffplug/spotless/yaml/YamlJacksonStep.java b/lib/src/main/java/com/diffplug/spotless/yaml/YamlJacksonStep.java
new file mode 100644
index 0000000000..6783b9a976
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/yaml/YamlJacksonStep.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright 2021 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.yaml;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
+import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.JarState;
+import com.diffplug.spotless.Provisioner;
+
+/**
+ * Simple YAML formatter which reformats the file according to Jackson YAMLFactory.
+ */
+public final class YamlJacksonStep {
+	private static final String MAVEN_COORDINATE = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:";
+	private static final String DEFAULT_VERSION = "2.13.4";
+
+	public static String defaultVersion() {
+		return DEFAULT_VERSION;
+	}
+
+	public static FormatterStep create(List<String> enabledFeatures,
+			List<String> disabledFeatures,
+			String jacksonVersion,
+			Provisioner provisioner) {
+		Objects.requireNonNull(provisioner, "provisioner cannot be null");
+		return FormatterStep.createLazy("yaml",
+				() -> new State(enabledFeatures, disabledFeatures, jacksonVersion, provisioner),
+				State::toFormatter);
+	}
+
+	public static FormatterStep create(Provisioner provisioner) {
+		return create(Arrays.asList("INDENT_OUTPUT"), Arrays.asList(), defaultVersion(), provisioner);
+	}
+
+	private static final class State implements Serializable {
+		private static final long serialVersionUID = 1L;
+
+		private final List<String> enabledFeatures;
+		private final List<String> disabledFeatures;
+
+		private final JarState jarState;
+
+		private State(List<String> enabledFeatures,
+				List<String> disabledFeatures,
+				String jacksonVersion,
+				Provisioner provisioner) throws IOException {
+			this.enabledFeatures = enabledFeatures;
+			this.disabledFeatures = disabledFeatures;
+
+			this.jarState = JarState.from(MAVEN_COORDINATE + jacksonVersion, provisioner);
+		}
+
+		FormatterFunc toFormatter() {
+			Class<?> jsonFactoryClass;
+			Class<?> yamlFactoryClass;
+			Class<?> objectMapperClass;
+
+			Class<?> serializationFeatureClass;
+			Method enableFeature;
+			Method disableFeature;
+
+			Method stringToObject;
+			Method objectToString;
+			try {
+				ClassLoader classLoader = jarState.getClassLoader();
+				jsonFactoryClass = classLoader.loadClass("com.fasterxml.jackson.core.JsonFactory");
+				yamlFactoryClass = classLoader.loadClass("com.fasterxml.jackson.dataformat.yaml.YAMLFactory");
+
+				objectMapperClass = classLoader.loadClass("com.fasterxml.jackson.databind.ObjectMapper");
+
+				// Configure the ObjectMapper
+				// https://github.com/FasterXML/jackson-databind#commonly-used-features
+				{
+					serializationFeatureClass =
+							classLoader.loadClass("com.fasterxml.jackson.databind.SerializationFeature");
+					enableFeature = objectMapperClass.getMethod("enable", serializationFeatureClass);
+					disableFeature = objectMapperClass.getMethod("disable", serializationFeatureClass);
+				}
+
+				stringToObject = objectMapperClass.getMethod("readValue", String.class, Class.class);
+				objectToString = objectMapperClass.getMethod("writeValueAsString", Object.class);
+			} catch (ClassNotFoundException | NoSuchMethodException e) {
+				throw new IllegalStateException("There was a problem preparing org.json dependencies", e);
+			}
+
+			return s -> {
+				if (s.isEmpty()) {
+					return s;
+				}
+
+				Object yamlFactory = yamlFactoryClass.getConstructor().newInstance();
+				Object objectMapper = objectMapperClass.getConstructor(jsonFactoryClass).newInstance(yamlFactory);
+
+				for (String feature : enabledFeatures) {
+					// https://stackoverflow.com/questions/3735927/java-instantiating-an-enum-using-reflection
+					Object indentOutput = Enum.valueOf(serializationFeatureClass.asSubclass(Enum.class), feature);
+
+					enableFeature.invoke(objectMapper, indentOutput);
+				}
+
+				for (String feature : disabledFeatures) {
+					// https://stackoverflow.com/questions/3735927/java-instantiating-an-enum-using-reflection
+					Object indentOutput = Enum.valueOf(serializationFeatureClass.asSubclass(Enum.class), feature);
+
+					disableFeature.invoke(objectMapper, indentOutput);
+				}
+
+				return format(objectMapper, stringToObject, objectToString, s);
+			};
+		}
+
+		private String format(Object objectMapper, Method stringToObject, Method objectToString, String s)
+				throws IllegalAccessException, IllegalArgumentException {
+			try {
+				Object parsed = stringToObject.invoke(s, Object.class);
+				return (String) objectToString.invoke(objectMapper, parsed);
+			} catch (InvocationTargetException ex) {
+				throw new AssertionError("Unable to format YAML", ex.getCause());
+			}
+		}
+	}
+
+	private YamlJacksonStep() {
+		// cannot be directly instantiated
+	}
+}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/JacksonYaml.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/JacksonYaml.java
new file mode 100644
index 0000000000..90892f969a
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/JacksonYaml.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.yaml;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.maven.plugins.annotations.Parameter;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.maven.FormatterStepConfig;
+import com.diffplug.spotless.maven.FormatterStepFactory;
+import com.diffplug.spotless.yaml.YamlJacksonStep;
+
+public class JacksonYaml implements FormatterStepFactory {
+
+	@Parameter
+	private String version = YamlJacksonStep.defaultVersion();
+
+	@Parameter
+	private String[] enabledFeatures = new String[] { "INDENT_OUTPUT" };
+
+	@Parameter
+	private String[] disabledFeatures = new String[0];
+
+	@Override
+	public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
+		List<String> enabledFeaturesAsList = Arrays.asList(enabledFeatures);
+		List<String> disabledFeaturesAsList = Arrays.asList(disabledFeatures);
+		return YamlJacksonStep
+				.create(enabledFeaturesAsList, disabledFeaturesAsList, version, stepConfig.getProvisioner());
+	}
+}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/Yaml.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/Yaml.java
new file mode 100644
index 0000000000..a6ceaaa592
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/Yaml.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.yaml;
+
+import java.util.Collections;
+import java.util.Set;
+
+import com.diffplug.spotless.maven.FormatterFactory;
+
+/**
+ * A {@link FormatterFactory} implementation that corresponds to {@code <yaml>...</yaml>} configuration element.
+ */
+public class Yaml extends FormatterFactory {
+	@Override
+	public Set<String> defaultIncludes() {
+		return Collections.emptySet();
+	}
+
+	@Override
+	public String licenseHeaderDelimiter() {
+		return null;
+	}
+
+	public void addJackson(JacksonYaml jackson) {
+		addStepFactory(jackson);
+	}
+
+}
diff --git a/testlib/src/main/resources/yaml/separator_comments.clean.yaml b/testlib/src/main/resources/yaml/separator_comments.clean.yaml
new file mode 100644
index 0000000000..bf46f753c0
--- /dev/null
+++ b/testlib/src/main/resources/yaml/separator_comments.clean.yaml
@@ -0,0 +1,8 @@
+---
+hr:
+  - Mark McGwire
+  # Following node labeled SS
+  - &SS Sammy Sosa
+rbi:
+  - *SS # Subsequent occurrence
+  - Ken Griffey
\ No newline at end of file
diff --git a/testlib/src/main/resources/yaml/separator_comments.yaml b/testlib/src/main/resources/yaml/separator_comments.yaml
new file mode 100644
index 0000000000..bf46f753c0
--- /dev/null
+++ b/testlib/src/main/resources/yaml/separator_comments.yaml
@@ -0,0 +1,8 @@
+---
+hr:
+  - Mark McGwire
+  # Following node labeled SS
+  - &SS Sammy Sosa
+rbi:
+  - *SS # Subsequent occurrence
+  - Ken Griffey
\ No newline at end of file

From a89ba3a94d1c05fe4e190d006a2fd4d678f9acb0 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Tue, 10 Jan 2023 10:01:58 +0400
Subject: [PATCH 0529/2068] Progress with doc and tests

---
 CHANGES.md                                    |  1 +
 .../spotless/yaml/YamlJacksonStep.java        |  5 +--
 plugin-maven/CHANGES.md                       |  1 +
 plugin-maven/README.md                        | 39 ++++++++++++++++++-
 .../spotless/maven/yaml/JacksonYaml.java      |  2 +-
 .../diffplug/spotless/maven/yaml/Yaml.java    |  4 +-
 .../maven/MavenIntegrationHarness.java        |  4 ++
 .../spotless/maven/yaml/YamlTest.java         | 31 +++++++++++++++
 8 files changed, 80 insertions(+), 7 deletions(-)
 create mode 100644 plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java

diff --git a/CHANGES.md b/CHANGES.md
index 9ca16e4dc3..32ef01ad67 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Added `skipLinesMatching` option to `licenseHeader` to support formats where license header cannot be immediately added to the top of the file (e.g. xml, sh). ([#1441](https://github.com/diffplug/spotless/pull/1441)).
+* Add YAML support through Jackson ([#1478](https://github.com/diffplug/spotless/pull/1478))
 ### Fixed
 * Support `ktlint` 0.48+ new rule disabling syntax ([#1456](https://github.com/diffplug/spotless/pull/1456)) fixes ([#1444](https://github.com/diffplug/spotless/issues/1444))
 
diff --git a/lib/src/main/java/com/diffplug/spotless/yaml/YamlJacksonStep.java b/lib/src/main/java/com/diffplug/spotless/yaml/YamlJacksonStep.java
index 6783b9a976..4e76bb2941 100644
--- a/lib/src/main/java/com/diffplug/spotless/yaml/YamlJacksonStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/yaml/YamlJacksonStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2021-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -92,8 +92,7 @@ FormatterFunc toFormatter() {
 				// Configure the ObjectMapper
 				// https://github.com/FasterXML/jackson-databind#commonly-used-features
 				{
-					serializationFeatureClass =
-							classLoader.loadClass("com.fasterxml.jackson.databind.SerializationFeature");
+					serializationFeatureClass = classLoader.loadClass("com.fasterxml.jackson.databind.SerializationFeature");
 					enableFeature = objectMapperClass.getMethod("enable", serializationFeatureClass);
 					disableFeature = objectMapperClass.getMethod("disable", serializationFeatureClass);
 				}
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 984c86d502..6212bf1872 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Added `skipLinesMatching` option to `licenseHeader` to support formats where license header cannot be immediately added to the top of the file (e.g. xml, sh). ([#1441](https://github.com/diffplug/spotless/pull/1441))
+* Add YAML support through Jackson ([#1478](https://github.com/diffplug/spotless/pull/1478))
 ### Fixed
 * Support `ktlint` 0.48+ new rule disabling syntax ([#1456](https://github.com/diffplug/spotless/pull/1456)) fixes ([#1444](https://github.com/diffplug/spotless/issues/1444))
 ### Changes
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 11f6c35deb..9255594375 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -59,6 +59,7 @@ user@machine repo % mvn spotless:check
   - [Markdown](#markdown) ([flexmark](#flexmark))
   - [Typescript](#typescript) ([tsfmt](#tsfmt), [prettier](#prettier))
   - [JSON](#json)
+  - [YAML](#yaml)
   - Multiple languages
     - [Prettier](#prettier) ([plugins](#prettier-plugins), [npm detection](#npm-detection), [`.npmrc` detection](#npmrc-detection))
     - [eclipse web tools platform](#eclipse-web-tools-platform)
@@ -712,7 +713,7 @@ For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#n
 
 ## JSON
 
-- `com.diffplug.spotless.maven.json.Json` [code](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/json.java)
+- `com.diffplug.spotless.maven.json.Json` [code](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java)
 
 ```xml
 <configuration>
@@ -759,6 +760,42 @@ for details.
 
 <a name="applying-prettier-to-javascript--flow--typescript--css--scss--less--jsx--graphql--yaml--etc"></a>
 
+
+## YAML
+
+- `com.diffplug.spotless.maven.FormatterFactory.addStepFactory(FormatterStepFactory)` [code](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/Yaml.java)
+
+```xml
+<configuration>
+  <yaml>
+    <includes>   <!-- These are the default includes -->
+      <include>**/*.yaml</include>
+      <include>**/*.yml</include>
+    </includes>
+
+    <jackson />    <!-- has its own section below -->
+  </yaml>
+</configuration>
+```
+
+### jackson
+
+Uses Jackson and YAMLFactory to pretty print objects:
+
+```xml
+<jackson>
+  <version>2.13.4</version>    <!-- optional: The version of 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml' to be used -->
+  <enabledFeatures>    <!-- optional: Customize the set of enabled features -->
+    <enabledFeature>INDENT_OUTPUT<enabledFeature/>
+  </enabledFeatures>
+  <disabledFeatures>    <!-- optional: Customize the set of disabled features -->
+    <disabledFeature>DEFAULT_HAS_TO_DISABLED_FEATURE<disabledFeature/>
+  </disabledFeatures>
+</jackson>
+```
+
+<a name="applying-prettier-to-javascript--flow--typescript--css--scss--less--jsx--graphql--yaml--etc"></a>
+
 ## Prettier
 
 [homepage](https://prettier.io/). [changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md). [official plugins](https://prettier.io/docs/en/plugins.html#official-plugins). [community plugins](https://prettier.io/docs/en/plugins.html#community-plugins). Prettier is a formatter that can format almost every anything - JavaScript, JSX, Angular, Vue, Flow, TypeScript, CSS, Less, SCSS, HTML, JSON, GraphQL, Markdown (including GFM and MDX), and YAML.  It can format even more [using plugins](https://prettier.io/docs/en/plugins.html) (PHP, Ruby, Swift, XML, Apex, Elm, Java (!!), Kotlin, pgSQL, .properties, solidity, svelte, toml, shellscript, ...).
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/JacksonYaml.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/JacksonYaml.java
index 90892f969a..86b52aac7d 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/JacksonYaml.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/JacksonYaml.java
@@ -31,7 +31,7 @@ public class JacksonYaml implements FormatterStepFactory {
 	private String version = YamlJacksonStep.defaultVersion();
 
 	@Parameter
-	private String[] enabledFeatures = new String[] { "INDENT_OUTPUT" };
+	private String[] enabledFeatures = new String[]{"INDENT_OUTPUT"};
 
 	@Parameter
 	private String[] disabledFeatures = new String[0];
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/Yaml.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/Yaml.java
index a6ceaaa592..20e609ceb4 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/Yaml.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/Yaml.java
@@ -15,9 +15,9 @@
  */
 package com.diffplug.spotless.maven.yaml;
 
-import java.util.Collections;
 import java.util.Set;
 
+import com.diffplug.common.collect.Sets;
 import com.diffplug.spotless.maven.FormatterFactory;
 
 /**
@@ -26,7 +26,7 @@
 public class Yaml extends FormatterFactory {
 	@Override
 	public Set<String> defaultIncludes() {
-		return Collections.emptySet();
+		return Sets.newHashSet("**/*.yaml", "**/*.yml");
 	}
 
 	@Override
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
index 9e9495da65..5dbd3e0075 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
@@ -160,6 +160,10 @@ protected void writePomWithJsonSteps(String... steps) throws IOException {
 		writePom(groupWithSteps("json", including("**/*.json"), steps));
 	}
 
+	protected void writePomWithYamlSteps(String... steps) throws IOException {
+		writePom(groupWithSteps("yaml", steps));
+	}
+
 	protected void writePom(String... configuration) throws IOException {
 		writePom(null, configuration, null);
 	}
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java
new file mode 100644
index 0000000000..8b9bab6cbb
--- /dev/null
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.yaml;
+
+import org.junit.jupiter.api.Test;
+
+import com.diffplug.spotless.maven.MavenIntegrationHarness;
+
+public class YamlTest extends MavenIntegrationHarness {
+	@Test
+	public void testFormatJson_WithSimple_defaultConfig() throws Exception {
+		writePomWithJsonSteps("<yaml><jackson/></yaml>");
+
+		setFile("yaml_test.json").toResource("yaml/separator_comments.yaml");
+		mavenRunner().withArguments("spotless:apply").runNoError().error();
+		assertFile("yaml_test.json").sameAsResource("yaml/separator_comments.clean.yaml");
+	}
+}

From 3244f2defe92773733c7d600c0c9f4440506de65 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Tue, 10 Jan 2023 10:05:31 +0400
Subject: [PATCH 0530/2068] Add unit-tests

---
 .../spotless/maven/yaml/YamlTest.java         | 20 ++++++++++++++++++-
 .../yaml/array_with_bracket.clean.yaml        |  8 ++++++++
 .../resources/yaml/array_with_bracket.yaml    |  5 +++++
 .../yaml/multiple_document.clean.yaml         |  8 ++++++++
 .../resources/yaml/multiple_document.yaml     | 10 ++++++++++
 .../resources/yaml/separator_comments.yaml    |  1 +
 6 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 testlib/src/main/resources/yaml/array_with_bracket.clean.yaml
 create mode 100644 testlib/src/main/resources/yaml/array_with_bracket.yaml
 create mode 100644 testlib/src/main/resources/yaml/multiple_document.clean.yaml
 create mode 100644 testlib/src/main/resources/yaml/multiple_document.yaml

diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java
index 8b9bab6cbb..b2168ff05f 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java
@@ -21,11 +21,29 @@
 
 public class YamlTest extends MavenIntegrationHarness {
 	@Test
-	public void testFormatJson_WithSimple_defaultConfig() throws Exception {
+	public void testFormatYaml_WithJackson_defaultConfig_separatorComments() throws Exception {
 		writePomWithJsonSteps("<yaml><jackson/></yaml>");
 
 		setFile("yaml_test.json").toResource("yaml/separator_comments.yaml");
 		mavenRunner().withArguments("spotless:apply").runNoError().error();
 		assertFile("yaml_test.json").sameAsResource("yaml/separator_comments.clean.yaml");
 	}
+
+	@Test
+	public void testFormatYaml_WithJackson_defaultConfig_arrayBrackets() throws Exception {
+		writePomWithJsonSteps("<yaml><jackson/></yaml>");
+
+		setFile("yaml_test.json").toResource("yaml/array_with_bracket.yaml");
+		mavenRunner().withArguments("spotless:apply").runNoError().error();
+		assertFile("yaml_test.json").sameAsResource("yaml/array_with_bracket.clean.yaml");
+	}
+
+	@Test
+	public void testFormatYaml_WithJackson_defaultConfig_multipleComments() throws Exception {
+		writePomWithJsonSteps("<yaml><jackson/></yaml>");
+
+		setFile("yaml_test.json").toResource("yaml/multiple_documents.yaml");
+		mavenRunner().withArguments("spotless:apply").runNoError().error();
+		assertFile("yaml_test.json").sameAsResource("yaml/multiple_documents.clean.yaml");
+	}
 }
diff --git a/testlib/src/main/resources/yaml/array_with_bracket.clean.yaml b/testlib/src/main/resources/yaml/array_with_bracket.clean.yaml
new file mode 100644
index 0000000000..bf46f753c0
--- /dev/null
+++ b/testlib/src/main/resources/yaml/array_with_bracket.clean.yaml
@@ -0,0 +1,8 @@
+---
+hr:
+  - Mark McGwire
+  # Following node labeled SS
+  - &SS Sammy Sosa
+rbi:
+  - *SS # Subsequent occurrence
+  - Ken Griffey
\ No newline at end of file
diff --git a/testlib/src/main/resources/yaml/array_with_bracket.yaml b/testlib/src/main/resources/yaml/array_with_bracket.yaml
new file mode 100644
index 0000000000..c83e381e6b
--- /dev/null
+++ b/testlib/src/main/resources/yaml/array_with_bracket.yaml
@@ -0,0 +1,5 @@
+hr: [Mark McGwire, Sammy Sosa]
+
+
+
+rbi: [Sammy Sosa, Ken Griffey]
\ No newline at end of file
diff --git a/testlib/src/main/resources/yaml/multiple_document.clean.yaml b/testlib/src/main/resources/yaml/multiple_document.clean.yaml
new file mode 100644
index 0000000000..bf46f753c0
--- /dev/null
+++ b/testlib/src/main/resources/yaml/multiple_document.clean.yaml
@@ -0,0 +1,8 @@
+---
+hr:
+  - Mark McGwire
+  # Following node labeled SS
+  - &SS Sammy Sosa
+rbi:
+  - *SS # Subsequent occurrence
+  - Ken Griffey
\ No newline at end of file
diff --git a/testlib/src/main/resources/yaml/multiple_document.yaml b/testlib/src/main/resources/yaml/multiple_document.yaml
new file mode 100644
index 0000000000..51f14a5862
--- /dev/null
+++ b/testlib/src/main/resources/yaml/multiple_document.yaml
@@ -0,0 +1,10 @@
+document: this is document 1
+---
+
+document: this is document 2
+
+
+---
+
+
+document: this is document 3
\ No newline at end of file
diff --git a/testlib/src/main/resources/yaml/separator_comments.yaml b/testlib/src/main/resources/yaml/separator_comments.yaml
index bf46f753c0..0213e66406 100644
--- a/testlib/src/main/resources/yaml/separator_comments.yaml
+++ b/testlib/src/main/resources/yaml/separator_comments.yaml
@@ -1,3 +1,4 @@
+
 ---
 hr:
   - Mark McGwire

From 43078663dbf2b7cf1fcdf55f1c25b41d272684ad Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Tue, 10 Jan 2023 10:06:36 +0400
Subject: [PATCH 0531/2068] Improve testcases

---
 .../main/resources/yaml/array_with_bracket.clean.yaml  | 10 ++--------
 .../src/main/resources/yaml/array_with_bracket.yaml    |  4 ++--
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/testlib/src/main/resources/yaml/array_with_bracket.clean.yaml b/testlib/src/main/resources/yaml/array_with_bracket.clean.yaml
index bf46f753c0..8e9d80065e 100644
--- a/testlib/src/main/resources/yaml/array_with_bracket.clean.yaml
+++ b/testlib/src/main/resources/yaml/array_with_bracket.clean.yaml
@@ -1,8 +1,2 @@
----
-hr:
-  - Mark McGwire
-  # Following node labeled SS
-  - &SS Sammy Sosa
-rbi:
-  - *SS # Subsequent occurrence
-  - Ken Griffey
\ No newline at end of file
+episodes: [1, 2, 3, 4, 5, 6, 7]
+best-jedi: {name: Obi-Wan, side: light} 
\ No newline at end of file
diff --git a/testlib/src/main/resources/yaml/array_with_bracket.yaml b/testlib/src/main/resources/yaml/array_with_bracket.yaml
index c83e381e6b..e28373163d 100644
--- a/testlib/src/main/resources/yaml/array_with_bracket.yaml
+++ b/testlib/src/main/resources/yaml/array_with_bracket.yaml
@@ -1,5 +1,5 @@
-hr: [Mark McGwire, Sammy Sosa]
+episodes: [1, 2, 3, 4, 5, 6, 7]
 
 
 
-rbi: [Sammy Sosa, Ken Griffey]
\ No newline at end of file
+best-jedi: {name: Obi-Wan, side: light} 
\ No newline at end of file

From d4d91cb97975a8a29e7a067a3c64af15460b7bef Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 10 Jan 2023 08:35:14 +0100
Subject: [PATCH 0532/2068] eslint: remove direct api support for styleguides

---
 .../spotless/npm/EslintFormatterStep.java     |  93 +-------------
 plugin-gradle/README.md                       |   4 -
 .../gradle/spotless/JavascriptExtension.java  |  25 +---
 .../gradle/spotless/TypescriptExtension.java  |  15 +--
 .../spotless/JavascriptExtensionTest.java     |  41 ++----
 .../spotless/TypescriptExtensionTest.java     |  32 ++---
 plugin-maven/README.md                        |   4 -
 .../maven/javascript/AbstractEslint.java      |  28 ----
 .../spotless/maven/javascript/EslintJs.java   |   4 -
 .../spotless/maven/typescript/EslintTs.java   |   5 -
 .../javascript/JavascriptFormatStepTest.java  |  10 +-
 .../typescript/TypescriptFormatStepTest.java  |  10 +-
 .../spotless/npm/EslintStyleGuide.java        | 120 ++++++++++++++++++
 .../spotless/npm/EslintFormatterStepTest.java |  21 +--
 14 files changed, 170 insertions(+), 242 deletions(-)
 create mode 100644 testlib/src/main/java/com/diffplug/spotless/npm/EslintStyleGuide.java

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
index ac3ee05345..81c5b6ce78 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
@@ -20,14 +20,12 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.TreeMap;
-import java.util.function.Predicate;
 
 import javax.annotation.Nonnull;
 
@@ -47,96 +45,7 @@ public class EslintFormatterStep {
 
 	public static final String NAME = "eslint-format";
 
-	public static final String DEFAULT_ESLINT_VERSION = "^8.30.0";
-
-	public enum PopularStyleGuide {
-		TS_STANDARD_WITH_TYPESCRIPT("standard-with-typescript") {
-			@Override
-			public @Nonnull Map<String, String> devDependencies() {
-				Map<String, String> dependencies = new LinkedHashMap<>();
-				dependencies.put("eslint-config-standard-with-typescript", "^24.0.0");
-				dependencies.put("eslint-plugin-import", "^2.26.0");
-				dependencies.put("eslint-plugin-n", "^15.6.0");
-				dependencies.put("eslint-plugin-promise", "^6.1.1");
-				return dependencies;
-			}
-		},
-		TS_XO_TYPESCRIPT("xo-typescript") {
-			@Override
-			public @Nonnull Map<String, String> devDependencies() {
-				Map<String, String> dependencies = new LinkedHashMap<>();
-				dependencies.put("eslint-config-xo", "^0.43.1");
-				dependencies.put("eslint-config-xo-typescript", "^0.55.1");
-				return dependencies;
-			}
-		},
-		JS_AIRBNB("airbnb") {
-			@Override
-			public @Nonnull Map<String, String> devDependencies() {
-				Map<String, String> dependencies = new LinkedHashMap<>();
-				dependencies.put("eslint-config-airbnb-base", "^15.0.0");
-				dependencies.put("eslint-plugin-import", "^2.26.0");
-				return dependencies;
-			}
-		},
-		JS_GOOGLE("google") {
-			@Override
-			public @Nonnull Map<String, String> devDependencies() {
-				Map<String, String> dependencies = new LinkedHashMap<>();
-				dependencies.put("eslint-config-google", "^0.14.0");
-				return dependencies;
-			}
-		},
-		JS_STANDARD("standard") {
-			@Override
-			public @Nonnull Map<String, String> devDependencies() {
-				Map<String, String> dependencies = new LinkedHashMap<>();
-				dependencies.put("eslint-config-standard", "^17.0.0");
-				dependencies.put("eslint-plugin-import", "^2.26.0");
-				dependencies.put("eslint-plugin-n", "^15.6.0");
-				dependencies.put("eslint-plugin-promise", "^6.1.1");
-				return dependencies;
-			}
-		},
-		JS_XO("xo") {
-			@Override
-			public @Nonnull Map<String, String> devDependencies() {
-				Map<String, String> dependencies = new LinkedHashMap<>();
-				dependencies.put("eslint-config-xo", "^0.43.1");
-				return dependencies;
-			}
-		};
-
-		private final String popularStyleGuideName;
-
-		PopularStyleGuide(String popularStyleGuideName) {
-			this.popularStyleGuideName = popularStyleGuideName;
-		}
-
-		public String getPopularStyleGuideName() {
-			return popularStyleGuideName;
-		}
-
-		public abstract @Nonnull Map<String, String> devDependencies();
-
-		public static PopularStyleGuide fromNameOrNull(String popularStyleGuideName) {
-			for (PopularStyleGuide popularStyleGuide : PopularStyleGuide.values()) {
-				if (popularStyleGuide.popularStyleGuideName.equals(popularStyleGuideName)) {
-					return popularStyleGuide;
-				}
-			}
-			return null;
-		}
-
-		public static String getPopularStyleGuideNames(Predicate<PopularStyleGuide> filter) {
-			// collect matching style guide names using stream
-			return Arrays.stream(PopularStyleGuide.values())
-					.filter(filter)
-					.map(PopularStyleGuide::getPopularStyleGuideName)
-					.sorted()
-					.collect(java.util.stream.Collectors.joining(", "));
-		}
-	}
+	public static final String DEFAULT_ESLINT_VERSION = "^8.31.0";
 
 	public static Map<String, String> defaultDevDependenciesForTypescript() {
 		return defaultDevDependenciesTypescriptWithEslint(DEFAULT_ESLINT_VERSION);
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 1ed2b942b5..8a06351bed 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -634,8 +634,6 @@ spotless {
     eslint(['my-eslint-fork': '1.2.3', 'my-eslint-plugin': '1.2.1']) // can specify exactly which npm packages to use
 
     eslint()
-      // optional: use a popular eslint styleguide for typescript
-      .styleGuide('standard-with-typescript') // or 'xo-typescript'
       // configuration is mandatory. Provide inline config or a config file.
       // a) inline-configuration
       .configJs('''
@@ -703,8 +701,6 @@ spotless {
     eslint(['my-eslint-fork': '1.2.3', 'my-eslint-plugin': '1.2.1']) // can specify exactly which npm packages to use
 
     eslint()
-      // optional: use a popular eslint styleguide for javascript
-      .styleGuide('standard') // or 'airbnb', 'google', 'xo'
       // configuration is mandatory. Provide inline config or a config file.
       // a) inline-configuration
       .configJs('''
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
index 862c7566ee..dd476b6a69 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
@@ -31,7 +31,6 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.npm.EslintConfig;
 import com.diffplug.spotless.npm.EslintFormatterStep;
-import com.diffplug.spotless.npm.EslintFormatterStep.PopularStyleGuide;
 import com.diffplug.spotless.npm.NpmPathResolver;
 import com.diffplug.spotless.npm.PrettierFormatterStep;
 
@@ -73,7 +72,7 @@ public EslintBaseConfig(Project project, Consumer<FormatterStep> replaceStep, Ma
 		}
 
 		@SuppressWarnings("unchecked")
-		public T devDependencies(Map<String, String> devDependencies) {
+		protected T devDependencies(Map<String, String> devDependencies) {
 			this.devDependencies.putAll(devDependencies);
 			replaceStep();
 			return (T) this;
@@ -92,17 +91,6 @@ public T configFile(Object configFilePath) {
 			replaceStep();
 			return (T) this;
 		}
-
-		@SuppressWarnings("unchecked")
-		public T styleGuide(String styleGuide) {
-			PopularStyleGuide popularStyleGuide = PopularStyleGuide.fromNameOrNull(styleGuide);
-
-			verifyStyleGuideIsSupported(styleGuide, popularStyleGuide);
-			assert popularStyleGuide != null;
-			return devDependencies(popularStyleGuide.devDependencies());
-		}
-
-		protected abstract void verifyStyleGuideIsSupported(String styleGuideName, PopularStyleGuide popularStyleGuide);
 	}
 
 	public class JavascriptEslintConfig extends EslintBaseConfig<JavascriptEslintConfig> {
@@ -123,17 +111,6 @@ public FormatterStep createStep() {
 					eslintConfig());
 		}
 
-		@Override
-		protected void verifyStyleGuideIsSupported(String styleGuideName, PopularStyleGuide popularStyleGuide) {
-			if (!isJsStyleGuide(popularStyleGuide)) {
-				throw new IllegalArgumentException("Unknown style guide: " + styleGuideName + ". Known javascript style guides: " + PopularStyleGuide.getPopularStyleGuideNames(this::isJsStyleGuide));
-			}
-		}
-
-		private boolean isJsStyleGuide(PopularStyleGuide popularStyleGuide) {
-			return popularStyleGuide != null && popularStyleGuide.name().startsWith("JS_");
-		}
-
 		protected EslintConfig eslintConfig() {
 			return new EslintConfig(configFilePath != null ? getProject().file(configFilePath) : null, configJs);
 		}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
index 5de1bb1ac3..0824caa769 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
@@ -27,10 +27,10 @@
 
 import org.gradle.api.Project;
 
+import com.diffplug.gradle.spotless.JavascriptExtension.EslintBaseConfig;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.npm.EslintConfig;
 import com.diffplug.spotless.npm.EslintFormatterStep;
-import com.diffplug.spotless.npm.EslintFormatterStep.PopularStyleGuide;
 import com.diffplug.spotless.npm.EslintTypescriptConfig;
 import com.diffplug.spotless.npm.NpmPathResolver;
 import com.diffplug.spotless.npm.PrettierFormatterStep;
@@ -189,7 +189,7 @@ public TypescriptEslintConfig eslint(Map<String, String> devDependencies) {
 		return eslint;
 	}
 
-	public class TypescriptEslintConfig extends JavascriptExtension.EslintBaseConfig<TypescriptEslintConfig> {
+	public class TypescriptEslintConfig extends EslintBaseConfig<TypescriptEslintConfig> {
 
 		@Nullable
 		Object typescriptConfigFilePath = null;
@@ -204,17 +204,6 @@ public TypescriptEslintConfig tsconfigFile(Object path) {
 			return this;
 		}
 
-		@Override
-		protected void verifyStyleGuideIsSupported(String styleGuideName, PopularStyleGuide popularStyleGuide) {
-			if (!isTsStyleGuide(popularStyleGuide)) {
-				throw new IllegalArgumentException("Unknown style guide: " + styleGuideName + ". Known typescript style guides: " + PopularStyleGuide.getPopularStyleGuideNames(this::isTsStyleGuide));
-			}
-		}
-
-		private boolean isTsStyleGuide(PopularStyleGuide popularStyleGuide) {
-			return popularStyleGuide != null && popularStyleGuide.name().startsWith("TS_");
-		}
-
 		public FormatterStep createStep() {
 			final Project project = getProject();
 
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavascriptExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavascriptExtensionTest.java
index 331e17f28e..26354b93be 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavascriptExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavascriptExtensionTest.java
@@ -24,11 +24,17 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
+import com.diffplug.spotless.npm.EslintFormatterStep;
+import com.diffplug.spotless.npm.EslintStyleGuide;
 import com.diffplug.spotless.tag.NpmTest;
 
 @NpmTest
 class JavascriptExtensionTest extends GradleIntegrationHarness {
 
+	private static String styleGuideMapString(String styleGuideName) {
+		return EslintStyleGuide.fromNameOrNull(styleGuideName).asGradleMapStringMergedWith(EslintFormatterStep.defaultDevDependencies());
+	}
+
 	@NpmTest
 	@Nested
 	class EslintGeneralJavascriptTests extends GradleIntegrationHarness {
@@ -43,7 +49,7 @@ void supportsEslintFormattingForJavascript() throws IOException {
 					"spotless {",
 					"    javascript {",
 					"        target 'test.js'",
-					"        eslint().configFile('.eslintrc.js').styleGuide('standard')",
+					"        eslint(" + styleGuideMapString("standard") + ").configFile('.eslintrc.js')",
 					"    }",
 					"}");
 			setFile("test.js").toResource("npm/eslint/javascript/styleguide/standard/javascript-es6.dirty");
@@ -51,28 +57,9 @@ void supportsEslintFormattingForJavascript() throws IOException {
 			assertFile("test.js").sameAsResource("npm/eslint/javascript/styleguide/standard/javascript-es6.clean");
 		}
 
-		@Test
-		void eslintDoesNotAllowToUseTsStyleGuideForJavascript() throws IOException {
-			setFile(".eslintrc.js").toResource("npm/eslint/javascript/styleguide/standard/.eslintrc.js");
-			setFile("build.gradle").toLines(
-					"plugins {",
-					"    id 'com.diffplug.spotless'",
-					"}",
-					"repositories { mavenCentral() }",
-					"spotless {",
-					"    javascript {",
-					"        target 'test.js'",
-					"        eslint().configFile('.eslintrc.js').styleGuide('xo-typescript')",
-					"    }",
-					"}");
-			setFile("test.js").toResource("npm/eslint/javascript/styleguide/standard/javascript-es6.dirty");
-			final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").buildAndFail();
-			Assertions.assertThat(spotlessApply.getOutput()).contains("Unknown style guide: xo-typescript");
-		}
-
 		@Test
 		void eslintAllowsToSpecifyEslintVersionForJavascript() throws IOException {
-			setFile(".eslintrc.js").toResource("npm/eslint/javascript/styleguide/standard/.eslintrc.js");
+			setFile(".eslintrc.js").toResource("npm/eslint/javascript/custom_rules/.eslintrc.js");
 			setFile("build.gradle").toLines(
 					"plugins {",
 					"    id 'com.diffplug.spotless'",
@@ -81,12 +68,12 @@ void eslintAllowsToSpecifyEslintVersionForJavascript() throws IOException {
 					"spotless {",
 					"    javascript {",
 					"        target 'test.js'",
-					"        eslint('8.28.0').configFile('.eslintrc.js').styleGuide('standard')",
+					"        eslint('8.28.0').configFile('.eslintrc.js')",
 					"    }",
 					"}");
-			setFile("test.js").toResource("npm/eslint/javascript/styleguide/standard/javascript-es6.dirty");
+			setFile("test.js").toResource("npm/eslint/javascript/custom_rules/javascript-es6.dirty");
 			gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
-			assertFile("test.js").sameAsResource("npm/eslint/javascript/styleguide/standard/javascript-es6.clean");
+			assertFile("test.js").sameAsResource("npm/eslint/javascript/custom_rules/javascript-es6.clean");
 		}
 
 		@Test
@@ -115,7 +102,7 @@ void esllintAllowsToSpecifyInlineConfig() throws IOException {
 					"spotless {",
 					"    javascript {",
 					"        target 'test.js'",
-					"        eslint().configJs('''" + eslintConfigJs + "''').styleGuide('standard')",
+					"        eslint(" + styleGuideMapString("standard") + ").configJs('''" + eslintConfigJs + "''')",
 					"    }",
 					"}");
 			setFile("test.js").toResource("npm/eslint/javascript/styleguide/standard/javascript-es6.dirty");
@@ -134,7 +121,7 @@ void eslintRequiresAnExplicitEslintConfig() throws IOException {
 					"spotless {",
 					"    javascript {",
 					"        target 'test.js'",
-					"        eslint().styleGuide('standard')",
+					"        eslint(" + styleGuideMapString("standard") + ")",
 					"    }",
 					"}");
 			setFile("test.js").toResource("npm/eslint/javascript/styleguide/standard/javascript-es6.dirty");
@@ -187,7 +174,7 @@ void formattingUsingStyleguide(String styleguide) throws Exception {
 					"spotless {",
 					"    javascript {",
 					"        target 'test.js'",
-					"        eslint().configFile('.eslintrc.js').styleGuide('" + styleguide + "')",
+					"        eslint(" + styleGuideMapString(styleguide) + ").configFile('.eslintrc.js')",
 					"    }",
 					"}");
 			setFile("test.js").toResource(styleguidePath + "javascript-es6.dirty");
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TypescriptExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TypescriptExtensionTest.java
index 598ff7dc14..9b4ec8372e 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TypescriptExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TypescriptExtensionTest.java
@@ -17,14 +17,19 @@
 
 import java.io.IOException;
 
-import org.assertj.core.api.Assertions;
-import org.gradle.testkit.runner.BuildResult;
 import org.junit.jupiter.api.Test;
 
+import com.diffplug.spotless.npm.EslintFormatterStep;
+import com.diffplug.spotless.npm.EslintStyleGuide;
 import com.diffplug.spotless.tag.NpmTest;
 
 @NpmTest
 class TypescriptExtensionTest extends GradleIntegrationHarness {
+
+	private static String styleGuideMapString(String styleGuideName) {
+		return EslintStyleGuide.fromNameOrNull(styleGuideName).asGradleMapStringMergedWith(EslintFormatterStep.defaultDevDependencies());
+	}
+
 	@Test
 	void allowToSpecifyFormatterVersion() throws IOException {
 		setFile("build.gradle").toLines(
@@ -175,7 +180,7 @@ void useEslintXoStandardRules() throws IOException {
 				"spotless {",
 				"    typescript {",
 				"        target 'test.ts'",
-				"        eslint().styleGuide('xo-typescript').configFile('.eslintrc.js')",
+				"        eslint(" + styleGuideMapString("xo-typescript") + ").configFile('.eslintrc.js')",
 				"    }",
 				"}");
 		setFile("test.ts").toResource("npm/eslint/typescript/styleguide/xo/typescript.dirty");
@@ -195,30 +200,11 @@ void useEslintStandardWithTypescriptRules() throws IOException {
 				"spotless {",
 				"    typescript {",
 				"        target 'test.ts'",
-				"        eslint().styleGuide('standard-with-typescript').configFile('.eslintrc.js')",
+				"        eslint(" + styleGuideMapString("standard-with-typescript") + ").configFile('.eslintrc.js')",
 				"    }",
 				"}");
 		setFile("test.ts").toResource("npm/eslint/typescript/styleguide/standard_with_typescript/typescript.dirty");
 		gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
 		assertFile("test.ts").sameAsResource("npm/eslint/typescript/styleguide/standard_with_typescript/typescript.clean");
 	}
-
-	@Test
-	void useEslintForTypescriptDoesNotAllowUsingJsStyleguide() throws IOException {
-		setFile(".eslintrc.js").toResource("npm/eslint/javascript/styleguide/airbnb/.eslintrc.js");
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    typescript {",
-				"        target 'test.ts'",
-				"        eslint().styleGuide('airbnb').configFile('.eslintrc.js')",
-				"    }",
-				"}");
-		setFile("test.js").toResource("npm/eslint/javascript/styleguide/airbnb/javascript-es6.dirty");
-		BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").buildAndFail();
-		Assertions.assertThat(spotlessApply.getOutput()).contains("Unknown style guide: airbnb");
-	}
 }
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index dcf9df45d9..2a2aa31010 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -745,8 +745,6 @@ styleguides and the requirement for a tsconfigFile.
       <value>0.14.2</value>
     </property>
   </devDependencyProperties>
-  <!-- optional: use one of the popular style guides: 'standard-with-typescript' or 'xo-typescript' -->
-  <styleGuide>standard-with-typescript</styleGuide>
   <!-- mandatory: provide either a configFile or a configJs object -->
   <configFile>${project.basedir}/.eslintrc.js</configFile>
   <configJs>
@@ -826,8 +824,6 @@ styleguides and no requirement for a tsconfig (of course).
       <value>0.14.2</value>
     </property>
   </devDependencyProperties>
-  <!-- optional: use one of the popular style guides: 'standard', 'airbnb', 'google' or 'xo' -->
-  <styleGuide>standard</styleGuide>
   <!-- mandatory: provide either a configFile or a configJs object -->
   <configFile>${project.basedir}/.eslintrc.js</configFile>
   <configJs>
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/AbstractEslint.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/AbstractEslint.java
index 1829f91b4e..b06d3079e7 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/AbstractEslint.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/AbstractEslint.java
@@ -39,9 +39,6 @@ public abstract class AbstractEslint extends AbstractNpmFormatterStepFactory {
 	@Parameter
 	protected String configJs;
 
-	@Parameter
-	protected String styleGuide;
-
 	@Parameter
 	protected String eslintVersion;
 
@@ -68,8 +65,6 @@ public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 			devDependencies.putAll(defaultDependencies);
 		}
 
-		addStyleGuideDevDependencies(devDependencies);
-
 		File buildDir = buildDir(stepConfig);
 		File baseDir = baseDir(stepConfig);
 		NpmPathResolver npmPathResolver = npmPathResolver(stepConfig);
@@ -82,28 +77,5 @@ private static IllegalArgumentException onlyOneConfig() {
 
 	protected abstract EslintConfig eslintConfig(FormatterStepConfig stepConfig);
 
-	private void addStyleGuideDevDependencies(Map<String, String> devDependencies) {
-		if (this.styleGuide != null) {
-			EslintFormatterStep.PopularStyleGuide styleGuide = EslintFormatterStep.PopularStyleGuide.fromNameOrNull(this.styleGuide);
-			validateStyleGuide(styleGuide);
-			devDependencies.putAll(styleGuide.devDependencies());
-		}
-	}
-
-	private void validateStyleGuide(EslintFormatterStep.PopularStyleGuide styleGuide) {
-		if (styleGuide == null) {
-			throw new IllegalArgumentException("StyleGuide '" + this.styleGuide + "' is not supported. Supported style guides: " + supportedStyleGuides());
-		}
-		if (!isValidStyleGuide(styleGuide)) {
-			throw new IllegalArgumentException("StyleGuide must be of correct type but is: " + styleGuide.getPopularStyleGuideName() + ". Use one of the following: " + supportedStyleGuides());
-		}
-	}
-
-	private String supportedStyleGuides() {
-		return EslintFormatterStep.PopularStyleGuide.getPopularStyleGuideNames(this::isValidStyleGuide);
-	}
-
-	protected abstract boolean isValidStyleGuide(EslintFormatterStep.PopularStyleGuide styleGuide);
-
 	protected abstract Map<String, String> createDefaultDependencies();
 }
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/EslintJs.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/EslintJs.java
index f9954ab0c8..483d38ae1e 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/EslintJs.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/EslintJs.java
@@ -27,10 +27,6 @@ protected EslintConfig eslintConfig(FormatterStepConfig stepConfig) {
 		return new EslintConfig(this.configFile != null ? stepConfig.getFileLocator().locateFile(this.configFile) : null, this.configJs);
 	}
 
-	protected boolean isValidStyleGuide(EslintFormatterStep.PopularStyleGuide styleGuide) {
-		return styleGuide.name().startsWith("JS_");
-	}
-
 	protected Map<String, String> createDefaultDependencies() {
 		return this.eslintVersion == null ? EslintFormatterStep.defaultDevDependencies() : EslintFormatterStep.defaultDevDependenciesWithEslint(this.eslintVersion);
 	}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/EslintTs.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/EslintTs.java
index 72f3735d97..dc43185dcd 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/EslintTs.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/EslintTs.java
@@ -38,11 +38,6 @@ protected EslintConfig eslintConfig(FormatterStepConfig stepConfig) {
 				tsconfigFile != null ? stepConfig.getFileLocator().locateFile(tsconfigFile) : null);
 	}
 
-	@Override
-	protected boolean isValidStyleGuide(EslintFormatterStep.PopularStyleGuide styleGuide) {
-		return styleGuide.name().startsWith("TS_");
-	}
-
 	@Override
 	protected Map<String, String> createDefaultDependencies() {
 		return this.eslintVersion == null ? EslintFormatterStep.defaultDevDependenciesForTypescript() : EslintFormatterStep.defaultDevDependenciesTypescriptWithEslint(this.eslintVersion);
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/javascript/JavascriptFormatStepTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/javascript/JavascriptFormatStepTest.java
index 7ebc592add..5c8a5f04b3 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/javascript/JavascriptFormatStepTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/javascript/JavascriptFormatStepTest.java
@@ -23,6 +23,8 @@
 import com.diffplug.spotless.ResourceHarness;
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
 import com.diffplug.spotless.maven.MavenRunner.Result;
+import com.diffplug.spotless.npm.EslintFormatterStep;
+import com.diffplug.spotless.npm.EslintStyleGuide;
 import com.diffplug.spotless.tag.NpmTest;
 
 @NpmTest
@@ -30,6 +32,10 @@ class JavascriptFormatStepTest extends MavenIntegrationHarness {
 
 	private static final String TEST_FILE_PATH = "src/main/javascript/test.js";
 
+	private static String styleGuideDevDependenciesString(String styleGuideName) {
+		return EslintStyleGuide.fromNameOrNull(styleGuideName).asMavenXmlStringMergedWith(EslintFormatterStep.defaultDevDependencies());
+	}
+
 	@NpmTest
 	@Nested
 	class EslintCustomRulesTest extends MavenIntegrationHarness {
@@ -79,7 +85,7 @@ void eslintJsStyleguideUsingConfigFile(String styleGuide) throws Exception {
 					TEST_FILE_PATH,
 					"<eslint>",
 					"  <configFile>.eslintrc.js</configFile>",
-					"  <styleGuide>" + styleGuide + "</styleGuide>",
+					"  " + styleGuideDevDependenciesString(styleGuide),
 					"</eslint>");
 			setFile(".eslintrc.js").toResource(styleGuidePath + "/.eslintrc.js");
 			setFile(TEST_FILE_PATH).toResource(styleGuidePath + "/javascript-es6.dirty");
@@ -100,7 +106,7 @@ void eslintJsStyleguideUsingInlineConfig(String styleGuide) throws Exception {
 					TEST_FILE_PATH,
 					"<eslint>",
 					"  <configJs>" + escapedInlineConfig + "</configJs>",
-					"  <styleGuide>" + styleGuide + "</styleGuide>",
+					"  " + styleGuideDevDependenciesString(styleGuide),
 					"</eslint>");
 			setFile(TEST_FILE_PATH).toResource(styleGuidePath + "/javascript-es6.dirty");
 
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/typescript/TypescriptFormatStepTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/typescript/TypescriptFormatStepTest.java
index ac925cc9b6..95097fe467 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/typescript/TypescriptFormatStepTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/typescript/TypescriptFormatStepTest.java
@@ -24,6 +24,8 @@
 import com.diffplug.spotless.ResourceHarness;
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
 import com.diffplug.spotless.maven.MavenRunner.Result;
+import com.diffplug.spotless.npm.EslintFormatterStep;
+import com.diffplug.spotless.npm.EslintStyleGuide;
 import com.diffplug.spotless.tag.NpmTest;
 
 @NpmTest
@@ -31,6 +33,10 @@ class TypescriptFormatStepTest extends MavenIntegrationHarness {
 
 	private static final String TEST_FILE_PATH = "src/main/typescript/test.ts";
 
+	private static String styleGuideDevDependenciesString(String styleGuideName) {
+		return EslintStyleGuide.fromNameOrNull(styleGuideName).asMavenXmlStringMergedWith(EslintFormatterStep.defaultDevDependencies());
+	}
+
 	private void runTsfmt(String kind) throws IOException, InterruptedException {
 		String path = prepareRunTsfmt(kind);
 		mavenRunner().withArguments("spotless:apply").runNoError();
@@ -192,7 +198,7 @@ void eslintStyleguideStandardWithTypescript() throws Exception {
 				TEST_FILE_PATH,
 				"<eslint>",
 				"  <configFile>.eslintrc.js</configFile>",
-				"  <styleGuide>standard-with-typescript</styleGuide>",
+				"  " + styleGuideDevDependenciesString("standard-with-typescript"),
 				"  <tsconfigFile>${basedir}/tsconfig.json</tsconfigFile>",
 				"</eslint>");
 		setFile(".eslintrc.js").toResource("npm/eslint/typescript/styleguide/standard_with_typescript/.eslintrc.js");
@@ -209,7 +215,7 @@ void eslintStyleguideXo() throws Exception {
 				TEST_FILE_PATH,
 				"<eslint>",
 				"  <configFile>.eslintrc.js</configFile>",
-				"  <styleGuide>xo-typescript</styleGuide>",
+				"  " + styleGuideDevDependenciesString("xo-typescript"),
 				"  <tsconfigFile>${basedir}/tsconfig.json</tsconfigFile>",
 				"</eslint>");
 		setFile(".eslintrc.js").toResource("npm/eslint/typescript/styleguide/xo/.eslintrc.js");
diff --git a/testlib/src/main/java/com/diffplug/spotless/npm/EslintStyleGuide.java b/testlib/src/main/java/com/diffplug/spotless/npm/EslintStyleGuide.java
new file mode 100644
index 0000000000..62d0b0aa00
--- /dev/null
+++ b/testlib/src/main/java/com/diffplug/spotless/npm/EslintStyleGuide.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.npm;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.annotation.Nonnull;
+
+/**
+ * A helper class to create dev dependencies for eslint when using one of the popular styleguides in testing.
+ */
+public enum EslintStyleGuide {
+	TS_STANDARD_WITH_TYPESCRIPT("standard-with-typescript") {
+		@Override
+		public @Nonnull Map<String, String> devDependencies() {
+			Map<String, String> dependencies = new LinkedHashMap<>();
+			dependencies.put("eslint-config-standard-with-typescript", "^24.0.0");
+			dependencies.put("eslint-plugin-import", "^2.26.0");
+			dependencies.put("eslint-plugin-n", "^15.6.0");
+			dependencies.put("eslint-plugin-promise", "^6.1.1");
+			return dependencies;
+		}
+	},
+	TS_XO_TYPESCRIPT("xo-typescript") {
+		@Override
+		public @Nonnull Map<String, String> devDependencies() {
+			Map<String, String> dependencies = new LinkedHashMap<>();
+			dependencies.put("eslint-config-xo", "^0.43.1");
+			dependencies.put("eslint-config-xo-typescript", "^0.55.1");
+			return dependencies;
+		}
+	},
+	JS_AIRBNB("airbnb") {
+		@Override
+		public @Nonnull Map<String, String> devDependencies() {
+			Map<String, String> dependencies = new LinkedHashMap<>();
+			dependencies.put("eslint-config-airbnb-base", "^15.0.0");
+			dependencies.put("eslint-plugin-import", "^2.26.0");
+			return dependencies;
+		}
+	},
+	JS_GOOGLE("google") {
+		@Override
+		public @Nonnull Map<String, String> devDependencies() {
+			Map<String, String> dependencies = new LinkedHashMap<>();
+			dependencies.put("eslint-config-google", "^0.14.0");
+			return dependencies;
+		}
+	},
+	JS_STANDARD("standard") {
+		@Override
+		public @Nonnull Map<String, String> devDependencies() {
+			Map<String, String> dependencies = new LinkedHashMap<>();
+			dependencies.put("eslint-config-standard", "^17.0.0");
+			dependencies.put("eslint-plugin-import", "^2.26.0");
+			dependencies.put("eslint-plugin-n", "^15.6.0");
+			dependencies.put("eslint-plugin-promise", "^6.1.1");
+			return dependencies;
+		}
+	},
+	JS_XO("xo") {
+		@Override
+		public @Nonnull Map<String, String> devDependencies() {
+			Map<String, String> dependencies = new LinkedHashMap<>();
+			dependencies.put("eslint-config-xo", "^0.43.1");
+			return dependencies;
+		}
+	};
+
+	private final String popularStyleGuideName;
+
+	EslintStyleGuide(String popularStyleGuideName) {
+		this.popularStyleGuideName = popularStyleGuideName;
+	}
+
+	public abstract @Nonnull Map<String, String> devDependencies();
+
+	public static EslintStyleGuide fromNameOrNull(String popularStyleGuideName) {
+		for (EslintStyleGuide popularStyleGuide : EslintStyleGuide.values()) {
+			if (popularStyleGuide.popularStyleGuideName.equals(popularStyleGuideName)) {
+				return popularStyleGuide;
+			}
+		}
+		return null;
+	}
+
+	public Map<String, String> mergedWith(Map<String, String> devDependencies) {
+		Map<String, String> merged = new LinkedHashMap<>(devDependencies);
+		merged.putAll(devDependencies());
+		return merged;
+	}
+
+	public String asGradleMapStringMergedWith(Map<String, String> devDependencies) {
+		return mergedWith(devDependencies).entrySet().stream()
+				.map(entry -> "'" + entry.getKey() + "': '" + entry.getValue() + "'")
+				.collect(Collectors.joining(", ", "[", "]"));
+	}
+
+	public String asMavenXmlStringMergedWith(Map<String, String> devDependencies) {
+		return mergedWith(devDependencies).entrySet().stream()
+				.map(entry -> "<" + entry.getKey() + ">" + entry.getValue() + "</" + entry.getKey() + ">")
+				.collect(Collectors.joining("", "<devDependencies>", "</devDependencies>"));
+	}
+
+}
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
index 19f6e8c223..1bc0915ed3 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
@@ -17,7 +17,6 @@
 
 import java.io.File;
 import java.util.Map;
-import java.util.TreeMap;
 
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
@@ -34,22 +33,16 @@
 @NpmTest
 class EslintFormatterStepTest {
 
-	private final Map<String, String> combine(Map<String, String> m1, Map<String, String> m2) {
-		Map<String, String> combined = new TreeMap<>(m1);
-		combined.putAll(m2);
-		return combined;
-	}
-
 	@NpmTest
 	@Nested
 	class EslintJavascriptFormattingStepTest extends NpmFormatterStepCommonTests {
 
 		private final Map<String, Map<String, String>> devDependenciesForRuleset = ImmutableMap.of(
 				"custom_rules", EslintFormatterStep.defaultDevDependenciesForTypescript(),
-				"styleguide/airbnb", combine(EslintFormatterStep.defaultDevDependencies(), EslintFormatterStep.PopularStyleGuide.JS_AIRBNB.devDependencies()),
-				"styleguide/google", combine(EslintFormatterStep.defaultDevDependencies(), EslintFormatterStep.PopularStyleGuide.JS_GOOGLE.devDependencies()),
-				"styleguide/standard", combine(EslintFormatterStep.defaultDevDependencies(), EslintFormatterStep.PopularStyleGuide.JS_STANDARD.devDependencies()),
-				"styleguide/xo", combine(EslintFormatterStep.defaultDevDependencies(), EslintFormatterStep.PopularStyleGuide.JS_XO.devDependencies()));
+				"styleguide/airbnb", EslintStyleGuide.JS_AIRBNB.mergedWith(EslintFormatterStep.defaultDevDependencies()),
+				"styleguide/google", EslintStyleGuide.JS_GOOGLE.mergedWith(EslintFormatterStep.defaultDevDependencies()),
+				"styleguide/standard", EslintStyleGuide.JS_STANDARD.mergedWith(EslintFormatterStep.defaultDevDependencies()),
+				"styleguide/xo", EslintStyleGuide.JS_XO.mergedWith(EslintFormatterStep.defaultDevDependencies()));
 
 		@ParameterizedTest(name = "{index}: eslint can be applied using ruleset {0}")
 		@ValueSource(strings = {"custom_rules", "styleguide/airbnb", "styleguide/google", "styleguide/standard", "styleguide/xo"})
@@ -86,8 +79,8 @@ class EslintTypescriptFormattingStepTest extends NpmFormatterStepCommonTests {
 
 		private final Map<String, Map<String, String>> devDependenciesForRuleset = ImmutableMap.of(
 				"custom_rules", EslintFormatterStep.defaultDevDependenciesForTypescript(),
-				"styleguide/standard_with_typescript", combine(EslintFormatterStep.defaultDevDependenciesForTypescript(), EslintFormatterStep.PopularStyleGuide.TS_STANDARD_WITH_TYPESCRIPT.devDependencies()),
-				"styleguide/xo", combine(EslintFormatterStep.defaultDevDependenciesForTypescript(), EslintFormatterStep.PopularStyleGuide.TS_XO_TYPESCRIPT.devDependencies()));
+				"styleguide/standard_with_typescript", EslintStyleGuide.TS_STANDARD_WITH_TYPESCRIPT.mergedWith(EslintFormatterStep.defaultDevDependenciesForTypescript()),
+				"styleguide/xo", EslintStyleGuide.TS_XO_TYPESCRIPT.mergedWith(EslintFormatterStep.defaultDevDependenciesForTypescript()));
 
 		@ParameterizedTest(name = "{index}: eslint can be applied using ruleset {0}")
 		@ValueSource(strings = {"custom_rules", "styleguide/standard_with_typescript", "styleguide/xo"})
@@ -167,7 +160,7 @@ void formattingUsingInlineXoConfig() throws Exception {
 			final String cleanFile = filedir + "typescript.clean";
 
 			final FormatterStep formatterStep = EslintFormatterStep.create(
-					combine(EslintFormatterStep.PopularStyleGuide.TS_XO_TYPESCRIPT.devDependencies(), EslintFormatterStep.defaultDevDependenciesForTypescript()),
+					EslintStyleGuide.TS_XO_TYPESCRIPT.mergedWith(EslintFormatterStep.defaultDevDependenciesForTypescript()),
 					TestProvisioner.mavenCentral(),
 					projectDir(),
 					buildDir(),

From 6577e29cdbd735b310143057372b1a0709c5219f Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 10 Jan 2023 09:43:04 +0100
Subject: [PATCH 0533/2068] eslint: fix anchor navigation

---
 plugin-gradle/README.md | 8 ++++----
 plugin-maven/README.md  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 8a06351bed..878885f645 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -69,8 +69,8 @@ Spotless supports all of Gradle's built-in performance features (incremental bui
   - [FreshMark](#freshmark) aka markdown
   - [Antlr4](#antlr4) ([antlr4formatter](#antlr4formatter))
   - [SQL](#sql) ([dbeaver](#dbeaver), [prettier](#prettier))
-  - [Typescript](#typescript) ([tsfmt](#tsfmt), [prettier](#prettier), [ESLint](#eslint--typescript-))
-  - [Javascript](#javascript) ([prettier](#prettier), [ESLint](#eslint--javascript-))
+  - [Typescript](#typescript) ([tsfmt](#tsfmt), [prettier](#prettier), [ESLint](#eslint-typescript))
+  - [Javascript](#javascript) ([prettier](#prettier), [ESLint](#eslint-javascript))
   - [JSON](#json)
   - Multiple languages
     - [Prettier](#prettier) ([plugins](#prettier-plugins), [npm detection](#npm-detection), [`.npmrc` detection](#npmrc-detection))
@@ -624,7 +624,7 @@ For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#n
 The auto-discovery of config files (up the file tree) will not work when using ESLint within spotless,
 hence you are required to provide resolvable file paths for config files, or alternatively provide the configuration inline.
 
-The configuration is very similar to the [ESLint (Javascript)](#eslint--javascript-) configuration. It differs in supported
+The configuration is very similar to the [ESLint (Javascript)](#eslint-javascript) configuration. It differs in supported
 styleguides and the requirement for a tsconfigFile.
 
 ```gradle
@@ -689,7 +689,7 @@ spotless {
 The auto-discovery of config files (up the file tree) will not work when using ESLint within spotless,
 hence you are required to provide resolvable file paths for config files, or alternatively provide the configuration inline.
 
-The configuration is very similar to the [ESLint (Typescript)](#eslint--typescript-) configuration. It differs in supported
+The configuration is very similar to the [ESLint (Typescript)](#eslint-typescript) configuration. It differs in supported
 styleguides and no requirement for a tsconfig (of course).
 
 ```gradle
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 2a2aa31010..e74e1b27cf 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -57,8 +57,8 @@ user@machine repo % mvn spotless:check
   - [Sql](#sql) ([dbeaver](#dbeaver))
   - [Maven Pom](#maven-pom) ([sortPom](#sortpom))
   - [Markdown](#markdown) ([flexmark](#flexmark))
-  - [Typescript](#typescript) ([tsfmt](#tsfmt), [prettier](#prettier), [ESLint](#eslint--typescript-))
-  - [Javascript](#javascript) ([prettier](#prettier), [ESLint](#eslint--javascript-))
+  - [Typescript](#typescript) ([tsfmt](#tsfmt), [prettier](#prettier), [ESLint](#eslint-typescript))
+  - [Javascript](#javascript) ([prettier](#prettier), [ESLint](#eslint-javascript))
   - [JSON](#json)
   - Multiple languages
     - [Prettier](#prettier) ([plugins](#prettier-plugins), [npm detection](#npm-detection), [`.npmrc` detection](#npmrc-detection))
@@ -724,7 +724,7 @@ For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#n
 The auto-discovery of config files (up the file tree) will not work when using ESLint within spotless,
 hence you are required to provide resolvable file paths for config files, or alternatively provide the configuration inline.
 
-The configuration is very similar to the [ESLint (Javascript)](#eslint--javascript-) configuration. It differs in supported
+The configuration is very similar to the [ESLint (Javascript)](#eslint-javascript) configuration. It differs in supported
 styleguides and the requirement for a tsconfigFile.
 
 ```xml
@@ -803,7 +803,7 @@ For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#n
 The auto-discovery of config files (up the file tree) will not work when using ESLint within spotless,
 hence you are required to provide resolvable file paths for config files, or alternatively provide the configuration inline.
 
-The configuration is very similar to the [ESLint (Typescript)](#eslint--typescript-) configuration. It differs in supported
+The configuration is very similar to the [ESLint (Typescript)](#eslint-typescript) configuration. It differs in supported
 styleguides and no requirement for a tsconfig (of course).
 
 ```xml

From 04a6bcbf46bca245bf5e6bead7218b38ae6a3845 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 10 Jan 2023 13:06:39 +0000
Subject: [PATCH 0534/2068] Update dependency org.junit.jupiter:junit-jupiter
 to v5.9.2

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index e966c09437..71f755522f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -26,7 +26,7 @@ VER_SLF4J=[1.6,2.0[
 # Used in multiple places
 VER_DURIAN=1.2.0
 VER_JGIT=5.13.1.202206130422-r
-VER_JUNIT=5.9.1
+VER_JUNIT=5.9.2
 VER_ASSERTJ=3.24.1
 VER_MOCKITO=4.11.0
 

From 0227e89d641ab85dc8f2e48f715867c0992add06 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 10 Jan 2023 15:09:03 +0100
Subject: [PATCH 0535/2068] eslint: cleanup doc

---
 plugin-gradle/README.md | 8 ++++----
 plugin-maven/README.md  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 878885f645..b44d79ef3d 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -624,8 +624,8 @@ For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#n
 The auto-discovery of config files (up the file tree) will not work when using ESLint within spotless,
 hence you are required to provide resolvable file paths for config files, or alternatively provide the configuration inline.
 
-The configuration is very similar to the [ESLint (Javascript)](#eslint-javascript) configuration. It differs in supported
-styleguides and the requirement for a tsconfigFile.
+The configuration is very similar to the [ESLint (Javascript)](#eslint-javascript) configuration. In typescript, a
+reference to a `tsconfig.json` is required.
 
 ```gradle
 spotless {
@@ -689,8 +689,8 @@ spotless {
 The auto-discovery of config files (up the file tree) will not work when using ESLint within spotless,
 hence you are required to provide resolvable file paths for config files, or alternatively provide the configuration inline.
 
-The configuration is very similar to the [ESLint (Typescript)](#eslint-typescript) configuration. It differs in supported
-styleguides and no requirement for a tsconfig (of course).
+The configuration is very similar to the [ESLint (Typescript)](#eslint-typescript) configuration. In javascript, *no*
+`tsconfig.json` is supported.
 
 ```gradle
 
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index e74e1b27cf..3ec338bf10 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -724,8 +724,8 @@ For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#n
 The auto-discovery of config files (up the file tree) will not work when using ESLint within spotless,
 hence you are required to provide resolvable file paths for config files, or alternatively provide the configuration inline.
 
-The configuration is very similar to the [ESLint (Javascript)](#eslint-javascript) configuration. It differs in supported
-styleguides and the requirement for a tsconfigFile.
+The configuration is very similar to the [ESLint (Javascript)](#eslint-javascript) configuration. In typescript, a
+reference to a `tsconfig.json` is required.
 
 ```xml
 <eslint>
@@ -803,8 +803,8 @@ For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#n
 The auto-discovery of config files (up the file tree) will not work when using ESLint within spotless,
 hence you are required to provide resolvable file paths for config files, or alternatively provide the configuration inline.
 
-The configuration is very similar to the [ESLint (Typescript)](#eslint-typescript) configuration. It differs in supported
-styleguides and no requirement for a tsconfig (of course).
+The configuration is very similar to the [ESLint (Typescript)](#eslint-typescript) configuration. In javascript, *no*
+`tsconfig.json` is supported.
 
 ```xml
 <eslint>

From 4438d1845f94cfa25f01576f1f9f60850de4690e Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Tue, 10 Jan 2023 21:43:13 +0400
Subject: [PATCH 0536/2068] Small fixes

---
 plugin-maven/README.md                        | 11 +++++-----
 .../spotless/maven/AbstractSpotlessMojo.java  | 12 +++++++++--
 .../yaml/{JacksonYaml.java => Jackson.java}   |  2 +-
 .../diffplug/spotless/maven/yaml/Yaml.java    |  6 +++---
 .../maven/MavenIntegrationHarness.java        |  2 +-
 .../spotless/maven/json/JsonTest.java         |  4 ++--
 .../spotless/maven/yaml/YamlTest.java         | 20 +++++++++----------
 .../yaml/multiple_document.clean.yaml         |  8 --------
 .../yaml/multiple_documents.clean.yaml        |  8 ++++++++
 ..._document.yaml => multiple_documents.yaml} |  0
 .../yaml/separator_comments.clean.yaml        |  1 +
 11 files changed, 41 insertions(+), 33 deletions(-)
 rename plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/{JacksonYaml.java => Jackson.java} (96%)
 delete mode 100644 testlib/src/main/resources/yaml/multiple_document.clean.yaml
 create mode 100644 testlib/src/main/resources/yaml/multiple_documents.clean.yaml
 rename testlib/src/main/resources/yaml/{multiple_document.yaml => multiple_documents.yaml} (100%)

diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 9255594375..0fe8bb52b4 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -768,9 +768,8 @@ for details.
 ```xml
 <configuration>
   <yaml>
-    <includes>   <!-- These are the default includes -->
-      <include>**/*.yaml</include>
-      <include>**/*.yml</include>
+    <includes>     <!-- You have to set the target manually -->
+      <include>src/**/*.yaml</include>
     </includes>
 
     <jackson />    <!-- has its own section below -->
@@ -785,11 +784,11 @@ Uses Jackson and YAMLFactory to pretty print objects:
 ```xml
 <jackson>
   <version>2.13.4</version>    <!-- optional: The version of 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml' to be used -->
-  <enabledFeatures>    <!-- optional: Customize the set of enabled features -->
+  <enabledFeatures>            <!-- optional: Customize the set of enabled features -->
     <enabledFeature>INDENT_OUTPUT<enabledFeature/>
   </enabledFeatures>
-  <disabledFeatures>    <!-- optional: Customize the set of disabled features -->
-    <disabledFeature>DEFAULT_HAS_TO_DISABLED_FEATURE<disabledFeature/>
+  <disabledFeatures>           <!-- optional: Customize the set of disabled features -->
+    <disabledFeature>DEFAULT_HAS_NO_DISABLED_FEATURE<disabledFeature/>
   </disabledFeatures>
 </jackson>
 ```
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
index e4fdc7dcd0..31fd5fd5e3 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -64,6 +64,7 @@
 import com.diffplug.spotless.maven.incremental.UpToDateChecker;
 import com.diffplug.spotless.maven.incremental.UpToDateChecking;
 import com.diffplug.spotless.maven.java.Java;
+import com.diffplug.spotless.maven.json.Json;
 import com.diffplug.spotless.maven.kotlin.Kotlin;
 import com.diffplug.spotless.maven.markdown.Markdown;
 import com.diffplug.spotless.maven.pom.Pom;
@@ -71,6 +72,7 @@
 import com.diffplug.spotless.maven.scala.Scala;
 import com.diffplug.spotless.maven.sql.Sql;
 import com.diffplug.spotless.maven.typescript.Typescript;
+import com.diffplug.spotless.maven.yaml.Yaml;
 
 public abstract class AbstractSpotlessMojo extends AbstractMojo {
 	private static final String DEFAULT_INDEX_FILE_NAME = "spotless-index";
@@ -167,6 +169,12 @@ public abstract class AbstractSpotlessMojo extends AbstractMojo {
 	@Parameter
 	private Markdown markdown;
 
+	@Parameter
+	private Json json;
+
+	@Parameter
+	private Yaml yaml;
+
 	@Parameter(property = "spotlessFiles")
 	private String filePatterns;
 
@@ -331,7 +339,7 @@ private FileLocator getFileLocator() {
 	}
 
 	private List<FormatterFactory> getFormatterFactories() {
-		return Stream.concat(formats.stream(), Stream.of(groovy, java, scala, kotlin, cpp, typescript, antlr4, pom, sql, python, markdown))
+		return Stream.concat(formats.stream(), Stream.of(groovy, java, scala, kotlin, cpp, typescript, antlr4, pom, sql, python, markdown, json, yaml))
 				.filter(Objects::nonNull)
 				.collect(toList());
 	}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/JacksonYaml.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/Jackson.java
similarity index 96%
rename from plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/JacksonYaml.java
rename to plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/Jackson.java
index 86b52aac7d..2bc7617a38 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/JacksonYaml.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/Jackson.java
@@ -25,7 +25,7 @@
 import com.diffplug.spotless.maven.FormatterStepFactory;
 import com.diffplug.spotless.yaml.YamlJacksonStep;
 
-public class JacksonYaml implements FormatterStepFactory {
+public class Jackson implements FormatterStepFactory {
 
 	@Parameter
 	private String version = YamlJacksonStep.defaultVersion();
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/Yaml.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/Yaml.java
index 20e609ceb4..6cba1b2ebd 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/Yaml.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/Yaml.java
@@ -15,9 +15,9 @@
  */
 package com.diffplug.spotless.maven.yaml;
 
+import java.util.Collections;
 import java.util.Set;
 
-import com.diffplug.common.collect.Sets;
 import com.diffplug.spotless.maven.FormatterFactory;
 
 /**
@@ -26,7 +26,7 @@
 public class Yaml extends FormatterFactory {
 	@Override
 	public Set<String> defaultIncludes() {
-		return Sets.newHashSet("**/*.yaml", "**/*.yml");
+		return Collections.emptySet();
 	}
 
 	@Override
@@ -34,7 +34,7 @@ public String licenseHeaderDelimiter() {
 		return null;
 	}
 
-	public void addJackson(JacksonYaml jackson) {
+	public void addJackson(Jackson jackson) {
 		addStepFactory(jackson);
 	}
 
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
index 5dbd3e0075..a008a8bf4f 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
@@ -161,7 +161,7 @@ protected void writePomWithJsonSteps(String... steps) throws IOException {
 	}
 
 	protected void writePomWithYamlSteps(String... steps) throws IOException {
-		writePom(groupWithSteps("yaml", steps));
+		writePom(groupWithSteps("yaml", including("**/*.yaml"), steps));
 	}
 
 	protected void writePom(String... configuration) throws IOException {
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java
index fe6560cbec..f63dc708e9 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java
@@ -22,7 +22,7 @@
 public class JsonTest extends MavenIntegrationHarness {
 	@Test
 	public void testFormatJson_WithSimple_defaultConfig() throws Exception {
-		writePomWithJsonSteps("<json><simple/></json>");
+		writePomWithJsonSteps("<simple/>");
 
 		setFile("json_test.json").toResource("json/sortByKeysBefore.json");
 		mavenRunner().withArguments("spotless:apply").runNoError().error();
@@ -31,7 +31,7 @@ public void testFormatJson_WithSimple_defaultConfig() throws Exception {
 
 	@Test
 	public void testFormatJson_WithGson_defaultConfig() throws Exception {
-		writePomWithJsonSteps("<json><gson/></json>");
+		writePomWithJsonSteps("<gson/>");
 
 		setFile("json_test.json").toResource("json/sortByKeysBefore.json");
 		mavenRunner().withArguments("spotless:apply").runNoError().error();
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java
index b2168ff05f..4614b42f22 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java
@@ -22,28 +22,28 @@
 public class YamlTest extends MavenIntegrationHarness {
 	@Test
 	public void testFormatYaml_WithJackson_defaultConfig_separatorComments() throws Exception {
-		writePomWithJsonSteps("<yaml><jackson/></yaml>");
+		writePomWithYamlSteps("<jackson/>");
 
-		setFile("yaml_test.json").toResource("yaml/separator_comments.yaml");
+		setFile("yaml_test.yaml").toResource("yaml/separator_comments.yaml");
 		mavenRunner().withArguments("spotless:apply").runNoError().error();
-		assertFile("yaml_test.json").sameAsResource("yaml/separator_comments.clean.yaml");
+		assertFile("yaml_test.yaml").sameAsResource("yaml/separator_comments.clean.yaml");
 	}
 
 	@Test
 	public void testFormatYaml_WithJackson_defaultConfig_arrayBrackets() throws Exception {
-		writePomWithJsonSteps("<yaml><jackson/></yaml>");
+		writePomWithYamlSteps("<jackson/>");
 
-		setFile("yaml_test.json").toResource("yaml/array_with_bracket.yaml");
+		setFile("yaml_test.yaml").toResource("yaml/array_with_bracket.yaml");
 		mavenRunner().withArguments("spotless:apply").runNoError().error();
-		assertFile("yaml_test.json").sameAsResource("yaml/array_with_bracket.clean.yaml");
+		assertFile("yaml_test.yaml").sameAsResource("yaml/array_with_bracket.clean.yaml");
 	}
 
 	@Test
-	public void testFormatYaml_WithJackson_defaultConfig_multipleComments() throws Exception {
-		writePomWithJsonSteps("<yaml><jackson/></yaml>");
+	public void testFormatYaml_WithJackson_defaultConfig_multipleDocuments() throws Exception {
+		writePomWithYamlSteps("<jackson/>");
 
-		setFile("yaml_test.json").toResource("yaml/multiple_documents.yaml");
+		setFile("yaml_test.yaml").toResource("yaml/multiple_documents.yaml");
 		mavenRunner().withArguments("spotless:apply").runNoError().error();
-		assertFile("yaml_test.json").sameAsResource("yaml/multiple_documents.clean.yaml");
+		assertFile("yaml_test.yaml").sameAsResource("yaml/multiple_documents.clean.yaml");
 	}
 }
diff --git a/testlib/src/main/resources/yaml/multiple_document.clean.yaml b/testlib/src/main/resources/yaml/multiple_document.clean.yaml
deleted file mode 100644
index bf46f753c0..0000000000
--- a/testlib/src/main/resources/yaml/multiple_document.clean.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-hr:
-  - Mark McGwire
-  # Following node labeled SS
-  - &SS Sammy Sosa
-rbi:
-  - *SS # Subsequent occurrence
-  - Ken Griffey
\ No newline at end of file
diff --git a/testlib/src/main/resources/yaml/multiple_documents.clean.yaml b/testlib/src/main/resources/yaml/multiple_documents.clean.yaml
new file mode 100644
index 0000000000..612497c0ab
--- /dev/null
+++ b/testlib/src/main/resources/yaml/multiple_documents.clean.yaml
@@ -0,0 +1,8 @@
+document: this is document 1
+---
+
+document: this is document 2
+
+---
+
+document: this is document 3
\ No newline at end of file
diff --git a/testlib/src/main/resources/yaml/multiple_document.yaml b/testlib/src/main/resources/yaml/multiple_documents.yaml
similarity index 100%
rename from testlib/src/main/resources/yaml/multiple_document.yaml
rename to testlib/src/main/resources/yaml/multiple_documents.yaml
diff --git a/testlib/src/main/resources/yaml/separator_comments.clean.yaml b/testlib/src/main/resources/yaml/separator_comments.clean.yaml
index bf46f753c0..98160e910f 100644
--- a/testlib/src/main/resources/yaml/separator_comments.clean.yaml
+++ b/testlib/src/main/resources/yaml/separator_comments.clean.yaml
@@ -1,4 +1,5 @@
 ---
+
 hr:
   - Mark McGwire
   # Following node labeled SS

From dcf727c4ceb1c1c1cff88d3dc4e5c38a1f6ab99e Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Wed, 11 Jan 2023 08:46:12 +0400
Subject: [PATCH 0537/2068] Add not trivial json tests

---
 .../spotless/maven/json/JsonTest.java         | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java
index f63dc708e9..45607807b1 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java
@@ -21,7 +21,7 @@
 
 public class JsonTest extends MavenIntegrationHarness {
 	@Test
-	public void testFormatJson_WithSimple_defaultConfig() throws Exception {
+	public void testFormatJson_WithSimple_defaultConfig_sortByKeys() throws Exception {
 		writePomWithJsonSteps("<simple/>");
 
 		setFile("json_test.json").toResource("json/sortByKeysBefore.json");
@@ -30,11 +30,30 @@ public void testFormatJson_WithSimple_defaultConfig() throws Exception {
 	}
 
 	@Test
-	public void testFormatJson_WithGson_defaultConfig() throws Exception {
+	public void testFormatJson_WithSimple_defaultConfig_nestedObject() throws Exception {
+		writePomWithJsonSteps("<simple/>");
+
+		setFile("json_test.json").toResource("json/nestedObjectBefore.json");
+		mavenRunner().withArguments("spotless:apply").runNoError().error();
+		assertFile("json_test.json").sameAsResource("json/nestedObjectAfter.json");
+	}
+
+	@Test
+	public void testFormatJson_WithGson_defaultConfig_sortByKeys() throws Exception {
 		writePomWithJsonSteps("<gson/>");
 
 		setFile("json_test.json").toResource("json/sortByKeysBefore.json");
 		mavenRunner().withArguments("spotless:apply").runNoError().error();
 		assertFile("json_test.json").sameAsResource("json/sortByKeysAfterDisabled.json");
 	}
+
+	@Test
+	public void testFormatJson_WithGson_sortByKeys() throws Exception {
+		writePomWithJsonSteps("<gson><sortByKeys>true</sortByKeys></gson>");
+
+		setFile("json_test.json").toResource("json/sortByKeysBefore.json");
+		mavenRunner().withArguments("spotless:apply").runNoError().error();
+		assertFile("json_test.json").sameAsResource("json/sortByKeysAfter.json");
+	}
+
 }

From 0d6e8ea33bd4f77c60acfafe8c4b7c3c0df9b701 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emil=20Sier=C5=BC=C4=99ga?= <e.sierzega@usos.edu.pl>
Date: Wed, 11 Jan 2023 09:20:52 +0100
Subject: [PATCH 0538/2068] Docs: additional info about Eclipse formatter
 version

---
 plugin-maven/README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 3ec338bf10..5197f92255 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -241,7 +241,7 @@ any other maven phase (i.e. compile) then it can be configured as below;
 
 ```xml
 <eclipse>
-  <version>4.13.0</version>                     <!-- optional -->
+  <version>4.13.0</version>                     <!-- optional version of Eclipse Formatter -->
   <file>${project.basedir}/eclipse-formatter.xml</file> <!-- optional -->
 </eclipse>
 ```
@@ -316,7 +316,7 @@ These mechanisms already exist for the Gradle plugin.
 
 ```xml
 <greclipse>
-  <version>4.13.0</version>                     <!-- optional -->
+  <version>4.13.0</version>                     <!-- optional version of Eclipse Formatter -->
   <file>${project.basedir}/greclipse.properties</file> <!-- optional -->
 </greclipse>
 ```
@@ -466,7 +466,7 @@ Additionally, `editorConfigOverride` options will override what's supplied in `.
 
 ```xml
 <eclipseCdt>
-  <version>4.13.0</version>               <!-- optional -->
+  <version>4.13.0</version>               <!-- optional version of Eclipse Formatter -->
   <file>${project.basedir}/eclipse-cdt.xml</file> <!-- optional -->
 </eclipseCdt>
 ```
@@ -1052,7 +1052,7 @@ Alternatively you can supply spotless with a location of the `.npmrc` file to us
           <file>${project.basedir}/xml.prefs</file>
           <file>${project.basedir}/additional.properties</file>
         </files>
-        <version>4.13.0</version> <!-- optional -->
+        <version>4.13.0</version> <!-- optional version of Eclipse Formatter -->
       </eclipseWtp>
     </format>
   </formats>

From e9c840f9b15bffa7a377c35df07a489f6744e9d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emil=20Sier=C5=BC=C4=99ga?= <e.sierzega@usos.edu.pl>
Date: Wed, 11 Jan 2023 09:22:09 +0100
Subject: [PATCH 0539/2068] Docs: update version of Eclipse formatter (4.13.0
 -> 4.21.0)

4.21.0 is the latest supported version.
---
 plugin-maven/README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 5197f92255..0e2c2982b5 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -241,7 +241,7 @@ any other maven phase (i.e. compile) then it can be configured as below;
 
 ```xml
 <eclipse>
-  <version>4.13.0</version>                     <!-- optional version of Eclipse Formatter -->
+  <version>4.21.0</version>                     <!-- optional version of Eclipse Formatter -->
   <file>${project.basedir}/eclipse-formatter.xml</file> <!-- optional -->
 </eclipse>
 ```
@@ -316,7 +316,7 @@ These mechanisms already exist for the Gradle plugin.
 
 ```xml
 <greclipse>
-  <version>4.13.0</version>                     <!-- optional version of Eclipse Formatter -->
+  <version>4.21.0</version>                     <!-- optional version of Eclipse Formatter -->
   <file>${project.basedir}/greclipse.properties</file> <!-- optional -->
 </greclipse>
 ```
@@ -466,7 +466,7 @@ Additionally, `editorConfigOverride` options will override what's supplied in `.
 
 ```xml
 <eclipseCdt>
-  <version>4.13.0</version>               <!-- optional version of Eclipse Formatter -->
+  <version>4.21.0</version>               <!-- optional version of Eclipse Formatter -->
   <file>${project.basedir}/eclipse-cdt.xml</file> <!-- optional -->
 </eclipseCdt>
 ```
@@ -1052,7 +1052,7 @@ Alternatively you can supply spotless with a location of the `.npmrc` file to us
           <file>${project.basedir}/xml.prefs</file>
           <file>${project.basedir}/additional.properties</file>
         </files>
-        <version>4.13.0</version> <!-- optional version of Eclipse Formatter -->
+        <version>4.21.0</version> <!-- optional version of Eclipse Formatter -->
       </eclipseWtp>
     </format>
   </formats>

From a43274a225331fa753a5d70980fb33bcaaacdafc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emil=20Sier=C5=BC=C4=99ga?= <e.sierzega@usos.edu.pl>
Date: Wed, 11 Jan 2023 09:25:27 +0100
Subject: [PATCH 0540/2068] Docs: fixed broken link to Eclipse WTP compatible
 versions

---
 plugin-maven/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 0e2c2982b5..c159e1ca45 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -1035,7 +1035,7 @@ Alternatively you can supply spotless with a location of the `.npmrc` file to us
 
 ## Eclipse web tools platform
 
-[changelog](https://www.eclipse.org/webtools/). [compatible versions](https://github.com/diffplug/spotless/tree/main/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_wtp_formatters).
+[changelog](https://www.eclipse.org/webtools/). [compatible versions](https://github.com/diffplug/spotless/tree/main/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_wtp_formatter).
 
 ```xml
 <configuration>

From 5041562dfa5e24bbc8f6cb9d3d85008d8e8e5ad1 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Wed, 11 Jan 2023 14:48:22 +0400
Subject: [PATCH 0541/2068] Fix reflection on stringToObject

---
 .../main/java/com/diffplug/spotless/yaml/YamlJacksonStep.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/yaml/YamlJacksonStep.java b/lib/src/main/java/com/diffplug/spotless/yaml/YamlJacksonStep.java
index 4e76bb2941..b29c6ad267 100644
--- a/lib/src/main/java/com/diffplug/spotless/yaml/YamlJacksonStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/yaml/YamlJacksonStep.java
@@ -132,7 +132,7 @@ FormatterFunc toFormatter() {
 		private String format(Object objectMapper, Method stringToObject, Method objectToString, String s)
 				throws IllegalAccessException, IllegalArgumentException {
 			try {
-				Object parsed = stringToObject.invoke(s, Object.class);
+				Object parsed = stringToObject.invoke(objectMapper, s, Object.class);
 				return (String) objectToString.invoke(objectMapper, parsed);
 			} catch (InvocationTargetException ex) {
 				throw new AssertionError("Unable to format YAML", ex.getCause());

From dcb82ae3d82437252cf93d70e3ccb8c7016b467c Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Wed, 11 Jan 2023 15:55:48 +0400
Subject: [PATCH 0542/2068] Fix cleaned YAML given limitations of Jackson

---
 .../resources/yaml/array_with_bracket.clean.yaml   | 14 ++++++++++++--
 .../resources/yaml/multiple_documents.clean.yaml   |  4 ++--
 .../resources/yaml/separator_comments.clean.yaml   |  6 ++----
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/testlib/src/main/resources/yaml/array_with_bracket.clean.yaml b/testlib/src/main/resources/yaml/array_with_bracket.clean.yaml
index 8e9d80065e..88fc8fd541 100644
--- a/testlib/src/main/resources/yaml/array_with_bracket.clean.yaml
+++ b/testlib/src/main/resources/yaml/array_with_bracket.clean.yaml
@@ -1,2 +1,12 @@
-episodes: [1, 2, 3, 4, 5, 6, 7]
-best-jedi: {name: Obi-Wan, side: light} 
\ No newline at end of file
+---
+episodes:
+- 1
+- 2
+- 3
+- 4
+- 5
+- 6
+- 7
+best-jedi:
+  name: Obi-Wan
+  side: light 
\ No newline at end of file
diff --git a/testlib/src/main/resources/yaml/multiple_documents.clean.yaml b/testlib/src/main/resources/yaml/multiple_documents.clean.yaml
index 612497c0ab..45e0b0916b 100644
--- a/testlib/src/main/resources/yaml/multiple_documents.clean.yaml
+++ b/testlib/src/main/resources/yaml/multiple_documents.clean.yaml
@@ -1,8 +1,8 @@
-document: this is document 1
 ---
+document: this is document 1
 
+---
 document: this is document 2
 
 ---
-
 document: this is document 3
\ No newline at end of file
diff --git a/testlib/src/main/resources/yaml/separator_comments.clean.yaml b/testlib/src/main/resources/yaml/separator_comments.clean.yaml
index 98160e910f..7dac8a279f 100644
--- a/testlib/src/main/resources/yaml/separator_comments.clean.yaml
+++ b/testlib/src/main/resources/yaml/separator_comments.clean.yaml
@@ -1,9 +1,7 @@
 ---
-
 hr:
   - Mark McGwire
-  # Following node labeled SS
-  - &SS Sammy Sosa
+  - Sammy Sosa
 rbi:
-  - *SS # Subsequent occurrence
+  - Sammy Sosa
   - Ken Griffey
\ No newline at end of file

From fb3bb169b6d0df3322b30fa585511bb952a2163b Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Wed, 11 Jan 2023 16:42:03 +0400
Subject: [PATCH 0543/2068] Fix cleaned YAMLs

---
 .../src/main/resources/yaml/array_with_bracket.clean.yaml | 4 ++--
 .../src/main/resources/yaml/separator_comments.clean.yaml | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/testlib/src/main/resources/yaml/array_with_bracket.clean.yaml b/testlib/src/main/resources/yaml/array_with_bracket.clean.yaml
index 88fc8fd541..c6f891b9de 100644
--- a/testlib/src/main/resources/yaml/array_with_bracket.clean.yaml
+++ b/testlib/src/main/resources/yaml/array_with_bracket.clean.yaml
@@ -8,5 +8,5 @@ episodes:
 - 6
 - 7
 best-jedi:
-  name: Obi-Wan
-  side: light 
\ No newline at end of file
+  name: "Obi-Wan"
+  side: "light"
\ No newline at end of file
diff --git a/testlib/src/main/resources/yaml/separator_comments.clean.yaml b/testlib/src/main/resources/yaml/separator_comments.clean.yaml
index 7dac8a279f..35bb8717dd 100644
--- a/testlib/src/main/resources/yaml/separator_comments.clean.yaml
+++ b/testlib/src/main/resources/yaml/separator_comments.clean.yaml
@@ -1,7 +1,7 @@
 ---
 hr:
-  - Mark McGwire
-  - Sammy Sosa
+- "Mark McGwire"
+- "Sammy Sosa"
 rbi:
-  - Sammy Sosa
-  - Ken Griffey
\ No newline at end of file
+- "SS"
+- "Ken Griffey"
\ No newline at end of file

From 13d9d3cd19eaa8812191c44db045aee754df569b Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Thu, 12 Jan 2023 11:06:03 +0400
Subject: [PATCH 0544/2068] Fix YAML and JSON tests

---
 .gitignore                                    |  3 +
 .java-version                                 |  1 -
 lib/build.gradle                              |  6 +-
 .../glue/yaml/YamlJacksonFormatterFunc.java   | 99 +++++++++++++++++++
 .../spotless/yaml/YamlJacksonStep.java        | 31 ++++--
 .../spotless/yaml/YamlJacksonV2Step.java      | 77 +++++++++++++++
 .../diffplug/spotless/maven/yaml/Jackson.java |  3 +-
 .../spotless/maven/json/JsonTest.java         | 26 ++++-
 .../spotless/maven/yaml/YamlTest.java         | 18 +++-
 .../json/sortByKeysAfterDisabled_Simple.json  | 19 ++++
 .../multiple_documents.clean.jackson.yaml     |  2 +
 11 files changed, 263 insertions(+), 22 deletions(-)
 delete mode 100644 .java-version
 create mode 100644 lib/src/jackson/java/com/diffplug/spotless/glue/yaml/YamlJacksonFormatterFunc.java
 create mode 100644 lib/src/main/java/com/diffplug/spotless/yaml/YamlJacksonV2Step.java
 create mode 100644 testlib/src/main/resources/json/sortByKeysAfterDisabled_Simple.json
 create mode 100644 testlib/src/main/resources/yaml/multiple_documents.clean.jackson.yaml

diff --git a/.gitignore b/.gitignore
index 1a95765d37..138bb77159 100644
--- a/.gitignore
+++ b/.gitignore
@@ -121,3 +121,6 @@ nbdist/
 nbactions.xml
 nb-configuration.xml
 .nb-gradle/
+
+# MacOS jenv
+.java-version
diff --git a/.java-version b/.java-version
deleted file mode 100644
index 2dbc24b32d..0000000000
--- a/.java-version
+++ /dev/null
@@ -1 +0,0 @@
-11.0
diff --git a/lib/build.gradle b/lib/build.gradle
index 115d27195f..0cf07f9531 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -14,7 +14,8 @@ def NEEDS_GLUE = [
 	'ktlint',
 	'flexmark',
 	'diktat',
-	'scalafmt'
+	'scalafmt',
+	'jackson'
 ]
 for (glue in NEEDS_GLUE) {
 	sourceSets.register(glue) {
@@ -55,6 +56,9 @@ dependencies {
 
 	palantirJavaFormatCompileOnly 'com.palantir.javaformat:palantir-java-format:1.1.0' 	// this version needs to stay compilable against Java 8 for CI Job testNpm
 
+	// used jackson-based formatters
+	jacksonCompileOnly 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.4'
+
 	String VER_KTFMT = '0.42'
 	ktfmtCompileOnly "com.facebook:ktfmt:$VER_KTFMT"
 	String VER_KTLINT_GOOGLE_JAVA_FORMAT = '1.7' // for JDK 8 compatibility
diff --git a/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/YamlJacksonFormatterFunc.java b/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/YamlJacksonFormatterFunc.java
new file mode 100644
index 0000000000..604ad048c8
--- /dev/null
+++ b/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/YamlJacksonFormatterFunc.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2021-2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.glue.yaml;
+
+import java.io.IOException;
+import java.util.List;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+
+import com.diffplug.spotless.FormatterFunc;
+
+public class YamlJacksonFormatterFunc implements FormatterFunc {
+	private List<String> enabledFeatures;
+	private List<String> disabledFeatures;
+
+	// private static final Logger logger = LoggerFactory.getLogger(YamlJacksonFormatterFunc.class);
+
+	public YamlJacksonFormatterFunc(List<String> enabledFeatures, List<String> disabledFeatures) {
+		this.enabledFeatures = enabledFeatures;
+		this.disabledFeatures = disabledFeatures;
+	}
+
+	@Override
+	public String apply(String input) throws Exception {
+		ObjectMapper objectMapper = makeObjectMapper();
+
+		return format(objectMapper, input);
+	}
+
+	protected ObjectMapper makeObjectMapper() {
+		YAMLFactory yamlFactory = new YAMLFactory();
+		ObjectMapper objectMapper = new ObjectMapper(yamlFactory);
+
+		// Configure the ObjectMapper
+		// https://github.com/FasterXML/jackson-databind#commonly-used-features
+		for (String rawFeature : enabledFeatures) {
+			// https://stackoverflow.com/questions/3735927/java-instantiating-an-enum-using-reflection
+			SerializationFeature feature = SerializationFeature.valueOf(rawFeature);
+
+			objectMapper.enable(feature);
+		}
+
+		for (String rawFeature : disabledFeatures) {
+			// https://stackoverflow.com/questions/3735927/java-instantiating-an-enum-using-reflection
+			SerializationFeature feature = SerializationFeature.valueOf(rawFeature);
+
+			objectMapper.disable(feature);
+		}
+		return objectMapper;
+	}
+
+	protected String format(ObjectMapper objectMapper, String input) throws IllegalArgumentException, IOException {
+		// We may consider adding manually an initial '---' prefix to help management of multiple documents
+		// if (!input.trim().startsWith("---")) {
+		// 	input = "---" + "\n" + input;
+		// }
+
+		try {
+			// https://stackoverflow.com/questions/25222327/deserialize-pojos-from-multiple-yaml-documents-in-a-single-file-in-jackson
+			// https://github.com/FasterXML/jackson-dataformats-text/issues/66#issuecomment-375328648
+			// 2023-01: For now, we get 'Cannot deserialize value of type `com.fasterxml.jackson.databind.node.ObjectNode` from Array value'
+			//			JsonParser yamlParser = objectMapper.getFactory().createParser(input);
+			//			List<ObjectNode> docs = objectMapper.readValues(yamlParser, ObjectNode.class).readAll();
+			//			return objectMapper.writeValueAsString(docs);
+
+			// 2023-01: This returns JSON instead of YAML
+			// This will transit with a JsonNode
+			// A JsonNode may keep the comments from the input node
+			// JsonNode jsonNode = objectMapper.readTree(input);
+			//Not 'toPrettyString' as one could require no INDENT_OUTPUT
+			// return jsonNode.toPrettyString();
+			ObjectNode objectNode = objectMapper.readValue(input, ObjectNode.class);
+			return objectMapper.writeValueAsString(objectNode);
+		} catch (JsonProcessingException e) {
+			throw new AssertionError("Unable to format YAML. input='" + input + "'", e);
+		}
+	}
+
+	// Spotbugs
+	private static class ObjectNodeTypeReference extends TypeReference<ObjectNode> {}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/yaml/YamlJacksonStep.java b/lib/src/main/java/com/diffplug/spotless/yaml/YamlJacksonStep.java
index b29c6ad267..c0c660694b 100644
--- a/lib/src/main/java/com/diffplug/spotless/yaml/YamlJacksonStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/yaml/YamlJacksonStep.java
@@ -31,9 +31,10 @@
 /**
  * Simple YAML formatter which reformats the file according to Jackson YAMLFactory.
  */
+// https://stackoverflow.com/questions/14515994/convert-json-string-to-pretty-print-json-output-using-jackson
 public final class YamlJacksonStep {
-	private static final String MAVEN_COORDINATE = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:";
-	private static final String DEFAULT_VERSION = "2.13.4";
+	static final String MAVEN_COORDINATE = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:";
+	static final String DEFAULT_VERSION = "2.13.4";
 
 	public static String defaultVersion() {
 		return DEFAULT_VERSION;
@@ -80,8 +81,8 @@ FormatterFunc toFormatter() {
 			Method enableFeature;
 			Method disableFeature;
 
-			Method stringToObject;
-			Method objectToString;
+			Method stringToNode;
+			Method nodeToString;
 			try {
 				ClassLoader classLoader = jarState.getClassLoader();
 				jsonFactoryClass = classLoader.loadClass("com.fasterxml.jackson.core.JsonFactory");
@@ -97,8 +98,18 @@ FormatterFunc toFormatter() {
 					disableFeature = objectMapperClass.getMethod("disable", serializationFeatureClass);
 				}
 
-				stringToObject = objectMapperClass.getMethod("readValue", String.class, Class.class);
-				objectToString = objectMapperClass.getMethod("writeValueAsString", Object.class);
+				// https://stackoverflow.com/questions/25222327/deserialize-pojos-from-multiple-yaml-documents-in-a-single-file-in-jackson
+				// List<ObjectNode> docs = mapper
+				// .readValues<ObjectNode>(yamlParser, new TypeReference<ObjectNode> {})
+				// .readAll();
+
+				Class<?> jsonNodeClass = classLoader.loadClass("com.fasterxml.jackson.databind.JsonNode");
+
+				// This will transit with a JsonNode
+				// A JsonNode may keep the comments from the input node
+				stringToNode = objectMapperClass.getMethod("readTree", String.class);
+				// Not 'toPrettyString' as one could require no INDENT_OUTPUT
+				nodeToString = jsonNodeClass.getMethod("toPrettyString");
 			} catch (ClassNotFoundException | NoSuchMethodException e) {
 				throw new IllegalStateException("There was a problem preparing org.json dependencies", e);
 			}
@@ -125,15 +136,15 @@ FormatterFunc toFormatter() {
 					disableFeature.invoke(objectMapper, indentOutput);
 				}
 
-				return format(objectMapper, stringToObject, objectToString, s);
+				return format(objectMapper, stringToNode, nodeToString, s);
 			};
 		}
 
-		private String format(Object objectMapper, Method stringToObject, Method objectToString, String s)
+		private String format(Object objectMapper, Method stringToNode, Method nodeToString, String s)
 				throws IllegalAccessException, IllegalArgumentException {
 			try {
-				Object parsed = stringToObject.invoke(objectMapper, s, Object.class);
-				return (String) objectToString.invoke(objectMapper, parsed);
+				Object node = stringToNode.invoke(objectMapper, s);
+				return (String) nodeToString.invoke(node);
 			} catch (InvocationTargetException ex) {
 				throw new AssertionError("Unable to format YAML", ex.getCause());
 			}
diff --git a/lib/src/main/java/com/diffplug/spotless/yaml/YamlJacksonV2Step.java b/lib/src/main/java/com/diffplug/spotless/yaml/YamlJacksonV2Step.java
new file mode 100644
index 0000000000..f9b1d6b7dc
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/yaml/YamlJacksonV2Step.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2021-2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.yaml;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
+import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.JarState;
+import com.diffplug.spotless.Provisioner;
+
+public class YamlJacksonV2Step {
+	private YamlJacksonV2Step() {}
+
+	public static String defaultVersion() {
+		return YamlJacksonStep.DEFAULT_VERSION;
+	}
+
+	public static FormatterStep create(List<String> enabledFeatures,
+			List<String> disabledFeatures,
+			String jacksonVersion,
+			Provisioner provisioner) {
+		Objects.requireNonNull(provisioner, "provisioner cannot be null");
+		return FormatterStep.createLazy("yaml",
+				() -> new State(enabledFeatures, disabledFeatures, jacksonVersion, provisioner),
+				State::toFormatter);
+	}
+
+	public static FormatterStep create(Provisioner provisioner) {
+		return create(Arrays.asList("INDENT_OUTPUT"), Arrays.asList(), defaultVersion(), provisioner);
+	}
+
+	private static final class State implements Serializable {
+		private static final long serialVersionUID = 1L;
+
+		private final List<String> enabledFeatures;
+		private final List<String> disabledFeatures;
+
+		private final JarState jarState;
+
+		private State(List<String> enabledFeatures,
+				List<String> disabledFeatures,
+				String jacksonVersion,
+				Provisioner provisioner) throws IOException {
+			this.enabledFeatures = enabledFeatures;
+			this.disabledFeatures = disabledFeatures;
+
+			this.jarState = JarState.from(YamlJacksonStep.MAVEN_COORDINATE + jacksonVersion, provisioner);
+		}
+
+		FormatterFunc toFormatter() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException,
+				InstantiationException, IllegalAccessException {
+			Class<?> formatterFunc = jarState.getClassLoader().loadClass("com.diffplug.spotless.glue.yaml.YamlJacksonFormatterFunc");
+			Constructor<?> constructor = formatterFunc.getConstructor(List.class, List.class);
+			return (FormatterFunc) constructor.newInstance(enabledFeatures, disabledFeatures);
+		}
+	}
+}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/Jackson.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/Jackson.java
index 2bc7617a38..28fdf5809c 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/Jackson.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/Jackson.java
@@ -24,6 +24,7 @@
 import com.diffplug.spotless.maven.FormatterStepConfig;
 import com.diffplug.spotless.maven.FormatterStepFactory;
 import com.diffplug.spotless.yaml.YamlJacksonStep;
+import com.diffplug.spotless.yaml.YamlJacksonV2Step;
 
 public class Jackson implements FormatterStepFactory {
 
@@ -40,7 +41,7 @@ public class Jackson implements FormatterStepFactory {
 	public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 		List<String> enabledFeaturesAsList = Arrays.asList(enabledFeatures);
 		List<String> disabledFeaturesAsList = Arrays.asList(disabledFeatures);
-		return YamlJacksonStep
+		return YamlJacksonV2Step
 				.create(enabledFeaturesAsList, disabledFeaturesAsList, version, stepConfig.getProvisioner());
 	}
 }
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java
index 45607807b1..e492109faa 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java
@@ -16,17 +16,21 @@
 package com.diffplug.spotless.maven.json;
 
 import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
 
 public class JsonTest extends MavenIntegrationHarness {
+	private static final Logger LOGGER = LoggerFactory.getLogger(JsonTest.class);
+
 	@Test
 	public void testFormatJson_WithSimple_defaultConfig_sortByKeys() throws Exception {
 		writePomWithJsonSteps("<simple/>");
 
 		setFile("json_test.json").toResource("json/sortByKeysBefore.json");
-		mavenRunner().withArguments("spotless:apply").runNoError().error();
-		assertFile("json_test.json").sameAsResource("json/sortByKeysAfterDisabled.json");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("json_test.json").sameAsResource("json/sortByKeysAfterDisabled_Simple.json");
 	}
 
 	@Test
@@ -34,7 +38,7 @@ public void testFormatJson_WithSimple_defaultConfig_nestedObject() throws Except
 		writePomWithJsonSteps("<simple/>");
 
 		setFile("json_test.json").toResource("json/nestedObjectBefore.json");
-		mavenRunner().withArguments("spotless:apply").runNoError().error();
+		mavenRunner().withArguments("spotless:apply").runNoError();
 		assertFile("json_test.json").sameAsResource("json/nestedObjectAfter.json");
 	}
 
@@ -43,7 +47,7 @@ public void testFormatJson_WithGson_defaultConfig_sortByKeys() throws Exception
 		writePomWithJsonSteps("<gson/>");
 
 		setFile("json_test.json").toResource("json/sortByKeysBefore.json");
-		mavenRunner().withArguments("spotless:apply").runNoError().error();
+		mavenRunner().withArguments("spotless:apply").runNoError();
 		assertFile("json_test.json").sameAsResource("json/sortByKeysAfterDisabled.json");
 	}
 
@@ -52,8 +56,20 @@ public void testFormatJson_WithGson_sortByKeys() throws Exception {
 		writePomWithJsonSteps("<gson><sortByKeys>true</sortByKeys></gson>");
 
 		setFile("json_test.json").toResource("json/sortByKeysBefore.json");
-		mavenRunner().withArguments("spotless:apply").runNoError().error();
+
+		String output = mavenRunner().withArguments("spotless:apply").runNoError().output();
+		LOGGER.error(output);
+		System.err.println(output);
 		assertFile("json_test.json").sameAsResource("json/sortByKeysAfter.json");
 	}
 
+	@Test
+	public void testFormatJson_WithGson_defaultConfig_nestedObject() throws Exception {
+		writePomWithJsonSteps("<gson/>");
+
+		setFile("json_test.json").toResource("json/nestedObjectBefore.json");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("json_test.json").sameAsResource("json/nestedObjectAfter.json");
+	}
+
 }
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java
index 4614b42f22..b5a417c536 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java
@@ -15,17 +15,27 @@
  */
 package com.diffplug.spotless.maven.yaml;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
+import com.diffplug.spotless.maven.MavenRunner.Result;
 
 public class YamlTest extends MavenIntegrationHarness {
+	private static final Logger LOGGER = LoggerFactory.getLogger(YamlTest.class);
+
 	@Test
 	public void testFormatYaml_WithJackson_defaultConfig_separatorComments() throws Exception {
 		writePomWithYamlSteps("<jackson/>");
 
 		setFile("yaml_test.yaml").toResource("yaml/separator_comments.yaml");
-		mavenRunner().withArguments("spotless:apply").runNoError().error();
+		Result runNoError = mavenRunner().withArguments("spotless:apply").runNoError();
+		LOGGER.error("result: {}", runNoError);
+		assertThat(runNoError.exitValue()).as("Run without error %s", runNoError).isEqualTo(0);
+		LOGGER.error("GOGO");
 		assertFile("yaml_test.yaml").sameAsResource("yaml/separator_comments.clean.yaml");
 	}
 
@@ -34,7 +44,7 @@ public void testFormatYaml_WithJackson_defaultConfig_arrayBrackets() throws Exce
 		writePomWithYamlSteps("<jackson/>");
 
 		setFile("yaml_test.yaml").toResource("yaml/array_with_bracket.yaml");
-		mavenRunner().withArguments("spotless:apply").runNoError().error();
+		mavenRunner().withArguments("spotless:apply").runNoError();
 		assertFile("yaml_test.yaml").sameAsResource("yaml/array_with_bracket.clean.yaml");
 	}
 
@@ -43,7 +53,7 @@ public void testFormatYaml_WithJackson_defaultConfig_multipleDocuments() throws
 		writePomWithYamlSteps("<jackson/>");
 
 		setFile("yaml_test.yaml").toResource("yaml/multiple_documents.yaml");
-		mavenRunner().withArguments("spotless:apply").runNoError().error();
-		assertFile("yaml_test.yaml").sameAsResource("yaml/multiple_documents.clean.yaml");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("yaml_test.yaml").sameAsResource("yaml/multiple_documents.clean.jackson.yaml");
 	}
 }
diff --git a/testlib/src/main/resources/json/sortByKeysAfterDisabled_Simple.json b/testlib/src/main/resources/json/sortByKeysAfterDisabled_Simple.json
new file mode 100644
index 0000000000..d2d3612fbd
--- /dev/null
+++ b/testlib/src/main/resources/json/sortByKeysAfterDisabled_Simple.json
@@ -0,0 +1,19 @@
+{
+    "A": 1,
+    "a": 3,
+    "c": 4,
+    "x": 5,
+    "X": 2,
+    "z": {
+        "A": 1,
+        "a": 3,
+        "c": 4,
+        "x": 5,
+        "X": 2
+    },
+    "_arraysNotSorted": [
+        3,
+        2,
+        1
+    ]
+}
diff --git a/testlib/src/main/resources/yaml/multiple_documents.clean.jackson.yaml b/testlib/src/main/resources/yaml/multiple_documents.clean.jackson.yaml
new file mode 100644
index 0000000000..aa731919b4
--- /dev/null
+++ b/testlib/src/main/resources/yaml/multiple_documents.clean.jackson.yaml
@@ -0,0 +1,2 @@
+---
+document: "this is document 1"

From fa203e4ebb2606383f8c5253e5fa52a6b9ab9099 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Thu, 12 Jan 2023 11:15:40 +0400
Subject: [PATCH 0545/2068] Remove reflection impl to rely on glue impl

---
 lib/build.gradle                              |  2 +-
 .../glue/yaml/YamlJacksonFormatterFunc.java   |  2 -
 .../spotless/yaml/YamlJacksonStep.java        | 96 +++----------------
 .../spotless/yaml/YamlJacksonV2Step.java      | 77 ---------------
 plugin-maven/README.md                        |  2 +-
 .../diffplug/spotless/maven/yaml/Jackson.java |  3 +-
 6 files changed, 15 insertions(+), 167 deletions(-)
 delete mode 100644 lib/src/main/java/com/diffplug/spotless/yaml/YamlJacksonV2Step.java

diff --git a/lib/build.gradle b/lib/build.gradle
index 0cf07f9531..3ef2064765 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -57,7 +57,7 @@ dependencies {
 	palantirJavaFormatCompileOnly 'com.palantir.javaformat:palantir-java-format:1.1.0' 	// this version needs to stay compilable against Java 8 for CI Job testNpm
 
 	// used jackson-based formatters
-	jacksonCompileOnly 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.4'
+	jacksonCompileOnly 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.14.1'
 
 	String VER_KTFMT = '0.42'
 	ktfmtCompileOnly "com.facebook:ktfmt:$VER_KTFMT"
diff --git a/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/YamlJacksonFormatterFunc.java b/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/YamlJacksonFormatterFunc.java
index 604ad048c8..30cf538159 100644
--- a/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/YamlJacksonFormatterFunc.java
+++ b/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/YamlJacksonFormatterFunc.java
@@ -31,8 +31,6 @@ public class YamlJacksonFormatterFunc implements FormatterFunc {
 	private List<String> enabledFeatures;
 	private List<String> disabledFeatures;
 
-	// private static final Logger logger = LoggerFactory.getLogger(YamlJacksonFormatterFunc.class);
-
 	public YamlJacksonFormatterFunc(List<String> enabledFeatures, List<String> disabledFeatures) {
 		this.enabledFeatures = enabledFeatures;
 		this.disabledFeatures = disabledFeatures;
diff --git a/lib/src/main/java/com/diffplug/spotless/yaml/YamlJacksonStep.java b/lib/src/main/java/com/diffplug/spotless/yaml/YamlJacksonStep.java
index c0c660694b..db2525ab97 100644
--- a/lib/src/main/java/com/diffplug/spotless/yaml/YamlJacksonStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/yaml/YamlJacksonStep.java
@@ -17,8 +17,8 @@
 
 import java.io.IOException;
 import java.io.Serializable;
+import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -32,9 +32,12 @@
  * Simple YAML formatter which reformats the file according to Jackson YAMLFactory.
  */
 // https://stackoverflow.com/questions/14515994/convert-json-string-to-pretty-print-json-output-using-jackson
-public final class YamlJacksonStep {
+public class YamlJacksonStep {
 	static final String MAVEN_COORDINATE = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:";
-	static final String DEFAULT_VERSION = "2.13.4";
+	// https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml
+	static final String DEFAULT_VERSION = "2.14.1";
+
+	private YamlJacksonStep() {}
 
 	public static String defaultVersion() {
 		return DEFAULT_VERSION;
@@ -69,89 +72,14 @@ private State(List<String> enabledFeatures,
 			this.enabledFeatures = enabledFeatures;
 			this.disabledFeatures = disabledFeatures;
 
-			this.jarState = JarState.from(MAVEN_COORDINATE + jacksonVersion, provisioner);
+			this.jarState = JarState.from(YamlJacksonStep.MAVEN_COORDINATE + jacksonVersion, provisioner);
 		}
 
-		FormatterFunc toFormatter() {
-			Class<?> jsonFactoryClass;
-			Class<?> yamlFactoryClass;
-			Class<?> objectMapperClass;
-
-			Class<?> serializationFeatureClass;
-			Method enableFeature;
-			Method disableFeature;
-
-			Method stringToNode;
-			Method nodeToString;
-			try {
-				ClassLoader classLoader = jarState.getClassLoader();
-				jsonFactoryClass = classLoader.loadClass("com.fasterxml.jackson.core.JsonFactory");
-				yamlFactoryClass = classLoader.loadClass("com.fasterxml.jackson.dataformat.yaml.YAMLFactory");
-
-				objectMapperClass = classLoader.loadClass("com.fasterxml.jackson.databind.ObjectMapper");
-
-				// Configure the ObjectMapper
-				// https://github.com/FasterXML/jackson-databind#commonly-used-features
-				{
-					serializationFeatureClass = classLoader.loadClass("com.fasterxml.jackson.databind.SerializationFeature");
-					enableFeature = objectMapperClass.getMethod("enable", serializationFeatureClass);
-					disableFeature = objectMapperClass.getMethod("disable", serializationFeatureClass);
-				}
-
-				// https://stackoverflow.com/questions/25222327/deserialize-pojos-from-multiple-yaml-documents-in-a-single-file-in-jackson
-				// List<ObjectNode> docs = mapper
-				// .readValues<ObjectNode>(yamlParser, new TypeReference<ObjectNode> {})
-				// .readAll();
-
-				Class<?> jsonNodeClass = classLoader.loadClass("com.fasterxml.jackson.databind.JsonNode");
-
-				// This will transit with a JsonNode
-				// A JsonNode may keep the comments from the input node
-				stringToNode = objectMapperClass.getMethod("readTree", String.class);
-				// Not 'toPrettyString' as one could require no INDENT_OUTPUT
-				nodeToString = jsonNodeClass.getMethod("toPrettyString");
-			} catch (ClassNotFoundException | NoSuchMethodException e) {
-				throw new IllegalStateException("There was a problem preparing org.json dependencies", e);
-			}
-
-			return s -> {
-				if (s.isEmpty()) {
-					return s;
-				}
-
-				Object yamlFactory = yamlFactoryClass.getConstructor().newInstance();
-				Object objectMapper = objectMapperClass.getConstructor(jsonFactoryClass).newInstance(yamlFactory);
-
-				for (String feature : enabledFeatures) {
-					// https://stackoverflow.com/questions/3735927/java-instantiating-an-enum-using-reflection
-					Object indentOutput = Enum.valueOf(serializationFeatureClass.asSubclass(Enum.class), feature);
-
-					enableFeature.invoke(objectMapper, indentOutput);
-				}
-
-				for (String feature : disabledFeatures) {
-					// https://stackoverflow.com/questions/3735927/java-instantiating-an-enum-using-reflection
-					Object indentOutput = Enum.valueOf(serializationFeatureClass.asSubclass(Enum.class), feature);
-
-					disableFeature.invoke(objectMapper, indentOutput);
-				}
-
-				return format(objectMapper, stringToNode, nodeToString, s);
-			};
+		FormatterFunc toFormatter() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException,
+				InstantiationException, IllegalAccessException {
+			Class<?> formatterFunc = jarState.getClassLoader().loadClass("com.diffplug.spotless.glue.yaml.YamlJacksonFormatterFunc");
+			Constructor<?> constructor = formatterFunc.getConstructor(List.class, List.class);
+			return (FormatterFunc) constructor.newInstance(enabledFeatures, disabledFeatures);
 		}
-
-		private String format(Object objectMapper, Method stringToNode, Method nodeToString, String s)
-				throws IllegalAccessException, IllegalArgumentException {
-			try {
-				Object node = stringToNode.invoke(objectMapper, s);
-				return (String) nodeToString.invoke(node);
-			} catch (InvocationTargetException ex) {
-				throw new AssertionError("Unable to format YAML", ex.getCause());
-			}
-		}
-	}
-
-	private YamlJacksonStep() {
-		// cannot be directly instantiated
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/yaml/YamlJacksonV2Step.java b/lib/src/main/java/com/diffplug/spotless/yaml/YamlJacksonV2Step.java
deleted file mode 100644
index f9b1d6b7dc..0000000000
--- a/lib/src/main/java/com/diffplug/spotless/yaml/YamlJacksonV2Step.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright 2021-2023 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.yaml;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-
-import com.diffplug.spotless.FormatterFunc;
-import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.JarState;
-import com.diffplug.spotless.Provisioner;
-
-public class YamlJacksonV2Step {
-	private YamlJacksonV2Step() {}
-
-	public static String defaultVersion() {
-		return YamlJacksonStep.DEFAULT_VERSION;
-	}
-
-	public static FormatterStep create(List<String> enabledFeatures,
-			List<String> disabledFeatures,
-			String jacksonVersion,
-			Provisioner provisioner) {
-		Objects.requireNonNull(provisioner, "provisioner cannot be null");
-		return FormatterStep.createLazy("yaml",
-				() -> new State(enabledFeatures, disabledFeatures, jacksonVersion, provisioner),
-				State::toFormatter);
-	}
-
-	public static FormatterStep create(Provisioner provisioner) {
-		return create(Arrays.asList("INDENT_OUTPUT"), Arrays.asList(), defaultVersion(), provisioner);
-	}
-
-	private static final class State implements Serializable {
-		private static final long serialVersionUID = 1L;
-
-		private final List<String> enabledFeatures;
-		private final List<String> disabledFeatures;
-
-		private final JarState jarState;
-
-		private State(List<String> enabledFeatures,
-				List<String> disabledFeatures,
-				String jacksonVersion,
-				Provisioner provisioner) throws IOException {
-			this.enabledFeatures = enabledFeatures;
-			this.disabledFeatures = disabledFeatures;
-
-			this.jarState = JarState.from(YamlJacksonStep.MAVEN_COORDINATE + jacksonVersion, provisioner);
-		}
-
-		FormatterFunc toFormatter() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException,
-				InstantiationException, IllegalAccessException {
-			Class<?> formatterFunc = jarState.getClassLoader().loadClass("com.diffplug.spotless.glue.yaml.YamlJacksonFormatterFunc");
-			Constructor<?> constructor = formatterFunc.getConstructor(List.class, List.class);
-			return (FormatterFunc) constructor.newInstance(enabledFeatures, disabledFeatures);
-		}
-	}
-}
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 720c9bfee7..c5c5cf0ac3 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -923,7 +923,7 @@ Uses Jackson and YAMLFactory to pretty print objects:
 
 ```xml
 <jackson>
-  <version>2.13.4</version>    <!-- optional: The version of 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml' to be used -->
+  <version>2.14.1</version>    <!-- optional: The version of 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml' to be used -->
   <enabledFeatures>            <!-- optional: Customize the set of enabled features -->
     <enabledFeature>INDENT_OUTPUT<enabledFeature/>
   </enabledFeatures>
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/Jackson.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/Jackson.java
index 28fdf5809c..2bc7617a38 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/Jackson.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/Jackson.java
@@ -24,7 +24,6 @@
 import com.diffplug.spotless.maven.FormatterStepConfig;
 import com.diffplug.spotless.maven.FormatterStepFactory;
 import com.diffplug.spotless.yaml.YamlJacksonStep;
-import com.diffplug.spotless.yaml.YamlJacksonV2Step;
 
 public class Jackson implements FormatterStepFactory {
 
@@ -41,7 +40,7 @@ public class Jackson implements FormatterStepFactory {
 	public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 		List<String> enabledFeaturesAsList = Arrays.asList(enabledFeatures);
 		List<String> disabledFeaturesAsList = Arrays.asList(disabledFeatures);
-		return YamlJacksonV2Step
+		return YamlJacksonStep
 				.create(enabledFeaturesAsList, disabledFeaturesAsList, version, stepConfig.getProvisioner());
 	}
 }

From e4dd33a852949b79acc1a59e9352cade6cdb8e02 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 12 Jan 2023 09:29:43 -0800
Subject: [PATCH 0546/2068] Miinor readme and changelog updates to #1478.

---
 README.md               | 2 ++
 plugin-maven/CHANGES.md | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8171886965..637781d894 100644
--- a/README.md
+++ b/README.md
@@ -77,6 +77,7 @@ lib('python.BlackStep')                          +'{{yes}}       | {{no}}
 lib('scala.ScalaFmtStep')                        +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
 lib('sql.DBeaverSQLFormatterStep')               +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
 extra('wtp.EclipseWtpFormatterStep')             +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
+lib('yaml.YamlJacksonStep')                      +'{{no}}        | {{yes}}      | {{no}}      | {{no}}  |',
 '| [(Your FormatterStep here)](CONTRIBUTING.md#how-to-add-a-new-formatterstep) | {{no}} | {{no}} | {{no}} | {{no}} |',
 ].join('\n');
 -->
@@ -122,6 +123,7 @@ extra('wtp.EclipseWtpFormatterStep')             +'{{yes}}       | {{yes}}
 | [`scala.ScalaFmtStep`](lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`sql.DBeaverSQLFormatterStep`](lib/src/main/java/com/diffplug/spotless/sql/DBeaverSQLFormatterStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`wtp.EclipseWtpFormatterStep`](lib-extra/src/main/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
+| [`yaml.YamlJacksonStep`](lib/src/main/java/com/diffplug/spotless/yaml/YamlJacksonStep.java) | :white_large_square:        | :+1:      | :white_large_square:      | :white_large_square:  |
 | [(Your FormatterStep here)](CONTRIBUTING.md#how-to-add-a-new-formatterstep) | :white_large_square: | :white_large_square: | :white_large_square: | :white_large_square: |
 <!---freshmark /matrix -->
 
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index ed87752a98..15d83725ea 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,7 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Add option `editorConfigFile` for `ktLint` [#142](https://github.com/diffplug/spotless/issues/142)
-* **POTENTIALLY BREAKING** `ktlint` step now modifies license headers. Make sure to put `licenseHeader` *after* `ktlint`.
+  * **POTENTIALLY BREAKING** `ktlint` step now modifies license headers. Make sure to put `licenseHeader` *after* `ktlint`.
 * Added `skipLinesMatching` option to `licenseHeader` to support formats where license header cannot be immediately added to the top of the file (e.g. xml, sh). ([#1441](https://github.com/diffplug/spotless/pull/1441))
 * Add JSON support ([#1446](https://github.com/diffplug/spotless/pull/1446))
 * Add YAML support through Jackson ([#1478](https://github.com/diffplug/spotless/pull/1478))

From 2785f17c1b4d8c3f27d675c661f03101d182e5bd Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 12 Jan 2023 09:42:45 -0800
Subject: [PATCH 0547/2068] Fix GPG key name.

---
 .github/workflows/deploy.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 7f93bb01f6..c271788c20 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -2,7 +2,7 @@
 # NEXUS_USER
 # NEXUS_PASS
 # GPG_PASSPHRASE
-# GPG_KEY (base64)
+# GPG_KEY64 (base64)
 #   gpg --export-secret-keys --armor KEY_ID | openssl base64 | pbcopy
 # GRADLE_PORTAL_KEY
 # GRADLE_PORTAL_SECRET
@@ -31,7 +31,7 @@ jobs:
       ORG_GRADLE_PROJECT_nexus_user: ${{ secrets.NEXUS_USER }}
       ORG_GRADLE_PROJECT_nexus_pass: ${{ secrets.NEXUS_PASS }}
       ORG_GRADLE_PROJECT_gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
-      ORG_GRADLE_PROJECT_gpg_key64: ${{ secrets.GPG_KEY }}
+      ORG_GRADLE_PROJECT_gpg_key64: ${{ secrets.GPG_KEY64 }}
 
         gradle_key
     steps:

From a0a35b2fdbda2f92b394f005ffe69dbacd8f905d Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 12 Jan 2023 10:16:04 -0800
Subject: [PATCH 0548/2068] Fix nonsense characters polluting gpg_key64.

---
 .github/workflows/deploy.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index c271788c20..c7e184e890 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -32,8 +32,6 @@ jobs:
       ORG_GRADLE_PROJECT_nexus_pass: ${{ secrets.NEXUS_PASS }}
       ORG_GRADLE_PROJECT_gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
       ORG_GRADLE_PROJECT_gpg_key64: ${{ secrets.GPG_KEY64 }}
-
-        gradle_key
     steps:
       - uses: actions/checkout@v3
       - name: jdk 11

From 3d7dde729e835efbec122601890dbd4d5697ff1a Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Thu, 12 Jan 2023 19:09:57 +0100
Subject: [PATCH 0549/2068] eslint: move eslint addition to "Added" part

---
 CHANGES.md              | 2 +-
 plugin-maven/CHANGES.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 1c6f0781ef..36911cc6ee 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,9 +15,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
   * **POTENTIALLY BREAKING** `ktlint` step now modifies license headers. Make sure to put `licenseHeader` *after* `ktlint`.
 * Added `skipLinesMatching` option to `licenseHeader` to support formats where license header cannot be immediately added to the top of the file (e.g. xml, sh). ([#1441](https://github.com/diffplug/spotless/pull/1441)).
 * Add YAML support through Jackson ([#1478](https://github.com/diffplug/spotless/pull/1478))
+* Added support for npm-based [ESLint](https://eslint.org/)-formatter for javascript and typescript ([#1453](https://github.com/diffplug/spotless/pull/1453))
 ### Fixed
 * Support `ktlint` 0.48+ new rule disabling syntax ([#1456](https://github.com/diffplug/spotless/pull/1456)) fixes ([#1444](https://github.com/diffplug/spotless/issues/1444))
-* Added support for npm-based [ESLint](https://eslint.org/)-formatter for javascript and typescript ([#1453](https://github.com/diffplug/spotless/pull/1453))
 
 ### Changes
 * Bump default version for `prettier` from `2.0.5` to `2.8.1` ([#1453](https://github.com/diffplug/spotless/pull/1453))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 15d83725ea..2f95b164b9 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -9,9 +9,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Added `skipLinesMatching` option to `licenseHeader` to support formats where license header cannot be immediately added to the top of the file (e.g. xml, sh). ([#1441](https://github.com/diffplug/spotless/pull/1441))
 * Add JSON support ([#1446](https://github.com/diffplug/spotless/pull/1446))
 * Add YAML support through Jackson ([#1478](https://github.com/diffplug/spotless/pull/1478))
+* Added support for npm-based [ESLint](https://eslint.org/)-formatter for javascript and typescript ([#1453](https://github.com/diffplug/spotless/pull/1453))
 ### Fixed
 * Support `ktlint` 0.48+ new rule disabling syntax ([#1456](https://github.com/diffplug/spotless/pull/1456)) fixes ([#1444](https://github.com/diffplug/spotless/issues/1444))
-* Added support for npm-based [ESLint](https://eslint.org/)-formatter for javascript and typescript ([#1453](https://github.com/diffplug/spotless/pull/1453))
 ### Changes
 * Bump default `ktlint` version to latest `0.47.1` -> `0.48.1` ([#1456](https://github.com/diffplug/spotless/pull/1456))
 * Reduce spurious invalidations of the up-to-date index file ([#1461](https://github.com/diffplug/spotless/pull/1461))

From 27686d4402a4b038d2d4a8ddc924c78e6ffa98ac Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 12 Jan 2023 10:55:54 -0800
Subject: [PATCH 0550/2068] Try base64 encoding the nexus password also.

---
 .github/workflows/deploy.yml |  2 +-
 gradle/java-publish.gradle   | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index c7e184e890..67d9449e9b 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -29,7 +29,7 @@ jobs:
     env:
       gh_token: ${{ secrets.GH_TOKEN }}
       ORG_GRADLE_PROJECT_nexus_user: ${{ secrets.NEXUS_USER }}
-      ORG_GRADLE_PROJECT_nexus_pass: ${{ secrets.NEXUS_PASS }}
+      ORG_GRADLE_PROJECT_nexus_pass64: ${{ secrets.NEXUS_PASS64 }}
       ORG_GRADLE_PROJECT_gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
       ORG_GRADLE_PROJECT_gpg_key64: ${{ secrets.GPG_KEY64 }}
     steps:
diff --git a/gradle/java-publish.gradle b/gradle/java-publish.gradle
index 78e73a351f..17819c8da9 100644
--- a/gradle/java-publish.gradle
+++ b/gradle/java-publish.gradle
@@ -1,6 +1,20 @@
+import java.nio.charset.StandardCharsets
+
+def decode64(String varNam) {
+	String envValue = System.env['ORG_GRADLE_PROJECT_nexus_user']
+	if (envValue == null) {
+		return ""
+	} else {
+		return new String(envValue.decodeBase64(), "UTF-8")
+	}
+}
 
 if (project.parent == null) {
 	group = 'com.diffplug.spotless'
+	def pass = System.env['ORG_GRADLE_PROJECT_nexus_pass64']
+	if (pass != null) {
+		pass = pass.decodeBase64()
+	}
 	// it's the root project
 	apply plugin: 'io.github.gradle-nexus.publish-plugin'
 	nexusPublishing {
@@ -9,7 +23,7 @@ if (project.parent == null) {
 				nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/"))
 				snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
 				username = System.env['ORG_GRADLE_PROJECT_nexus_user']
-				password = System.env['ORG_GRADLE_PROJECT_nexus_pass']
+				password = decode64('ORG_GRADLE_PROJECT_nexus_pass64')
 			}
 		}
 	}
@@ -158,7 +172,7 @@ model {
 
 if (!version.endsWith('-SNAPSHOT')) {
 	signing {
-		String gpg_key = new String(System.env['ORG_GRADLE_PROJECT_gpg_key64'].decodeBase64())
+		String gpg_key = decode64('ORG_GRADLE_PROJECT_gpg_key64')
 		useInMemoryPgpKeys(gpg_key, System.env['ORG_GRADLE_PROJECT_gpg_passphrase'])
 		sign(publishing.publications)
 	}

From 8f8951ed6db38e8b117a194f01fb181d8a6ec296 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 12 Jan 2023 11:52:12 -0800
Subject: [PATCH 0551/2068] Fix stupid mistake in our publishing.

---
 gradle/java-publish.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/java-publish.gradle b/gradle/java-publish.gradle
index 17819c8da9..3d1ddd1c4f 100644
--- a/gradle/java-publish.gradle
+++ b/gradle/java-publish.gradle
@@ -1,7 +1,7 @@
 import java.nio.charset.StandardCharsets
 
-def decode64(String varNam) {
-	String envValue = System.env['ORG_GRADLE_PROJECT_nexus_user']
+def decode64(String varName) {
+	String envValue = System.env[varName]
 	if (envValue == null) {
 		return ""
 	} else {

From fd9b2af6acbcefb36a58c6614decc584da11122c Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 12 Jan 2023 11:59:44 -0800
Subject: [PATCH 0552/2068] Update changelogs.

---
 CHANGES.md               | 2 +-
 plugin-gradle/CHANGES.md | 1 +
 plugin-maven/CHANGES.md  | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 36911cc6ee..28a857950b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -16,9 +16,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Added `skipLinesMatching` option to `licenseHeader` to support formats where license header cannot be immediately added to the top of the file (e.g. xml, sh). ([#1441](https://github.com/diffplug/spotless/pull/1441)).
 * Add YAML support through Jackson ([#1478](https://github.com/diffplug/spotless/pull/1478))
 * Added support for npm-based [ESLint](https://eslint.org/)-formatter for javascript and typescript ([#1453](https://github.com/diffplug/spotless/pull/1453))
+* Better suggested messages when user's default is set by JVM limitation. ([#995](https://github.com/diffplug/spotless/pull/995))
 ### Fixed
 * Support `ktlint` 0.48+ new rule disabling syntax ([#1456](https://github.com/diffplug/spotless/pull/1456)) fixes ([#1444](https://github.com/diffplug/spotless/issues/1444))
-
 ### Changes
 * Bump default version for `prettier` from `2.0.5` to `2.8.1` ([#1453](https://github.com/diffplug/spotless/pull/1453))
 * Bump the dev version of Gradle from `7.5.1` to `7.6` ([#1409](https://github.com/diffplug/spotless/pull/1409))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 7ca75d1b34..d8b9c26275 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -8,6 +8,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
   * **POTENTIALLY BREAKING** `ktlint` step now modifies license headers. Make sure to put `licenseHeader` *after* `ktlint`.
 * Added `skipLinesMatching` option to `licenseHeader` to support formats where license header cannot be immediately added to the top of the file (e.g. xml, sh). ([#1441](https://github.com/diffplug/spotless/pull/1441))
 * Added support for npm-based [ESLint](https://eslint.org/) formatter for javascript and typescript ([#1453](https://github.com/diffplug/spotless/pull/1453))
+* Better suggested messages when user's default is set by JVM limitation. ([#995](https://github.com/diffplug/spotless/pull/995))
 ### Fixed
 * Prevent tool configurations from being resolved outside project ([#1447](https://github.com/diffplug/spotless/pull/1447) fixes [#1215](https://github.com/diffplug/spotless/issues/1215))
 * Support `ktlint` 0.48+ new rule disabling syntax ([#1456](https://github.com/diffplug/spotless/pull/1456)) fixes ([#1444](https://github.com/diffplug/spotless/issues/1444))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 2f95b164b9..03a2a0b018 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -10,6 +10,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Add JSON support ([#1446](https://github.com/diffplug/spotless/pull/1446))
 * Add YAML support through Jackson ([#1478](https://github.com/diffplug/spotless/pull/1478))
 * Added support for npm-based [ESLint](https://eslint.org/)-formatter for javascript and typescript ([#1453](https://github.com/diffplug/spotless/pull/1453))
+* Better suggested messages when user's default is set by JVM limitation. ([#995](https://github.com/diffplug/spotless/pull/995))
 ### Fixed
 * Support `ktlint` 0.48+ new rule disabling syntax ([#1456](https://github.com/diffplug/spotless/pull/1456)) fixes ([#1444](https://github.com/diffplug/spotless/issues/1444))
 ### Changes

From 445971c68f42aaa0651c08613ba7a74737ed4bd2 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 12 Jan 2023 12:09:53 -0800
Subject: [PATCH 0553/2068] Fixup test and spotless.

---
 lib/src/main/java/com/diffplug/spotless/Jvm.java         | 2 +-
 testlib/src/test/java/com/diffplug/spotless/JvmTest.java | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/Jvm.java b/lib/src/main/java/com/diffplug/spotless/Jvm.java
index 0f7e1ff1a6..c9c71b72df 100644
--- a/lib/src/main/java/com/diffplug/spotless/Jvm.java
+++ b/lib/src/main/java/com/diffplug/spotless/Jvm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/testlib/src/test/java/com/diffplug/spotless/JvmTest.java b/testlib/src/test/java/com/diffplug/spotless/JvmTest.java
index 2bb374d0ed..737c058b37 100644
--- a/testlib/src/test/java/com/diffplug/spotless/JvmTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/JvmTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2021-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -140,9 +140,9 @@ void supportProposesFormatterUpgrade() {
 					throw new Exception("Some test exception");
 				}).apply("");
 			}).getMessage();
-			assertThat(proposal).contains("not using latest version");
-			assertThat(proposal).contains(String.format("on JVM %d+", requiredJvm));
-			assertThat(proposal).contains(String.format("upgrade to %s %s", TEST_NAME, "2"));
+			assertThat(proposal).isEqualTo("My Test Formatter " + fmtVersion + " is currently being used, but outdated.\n" +
+					"My Test Formatter 2 is the recommended version, which may have fixed this problem.\n" +
+					"My Test Formatter 2 requires JVM 10+.");
 		}
 	}
 

From 8de6dd574a9a85bb160dc9e0c078cd8bec994d4d Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 12 Jan 2023 12:24:32 -0800
Subject: [PATCH 0554/2068] Fix JvmTest on other JVMs.

---
 testlib/src/test/java/com/diffplug/spotless/JvmTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testlib/src/test/java/com/diffplug/spotless/JvmTest.java b/testlib/src/test/java/com/diffplug/spotless/JvmTest.java
index 737c058b37..2f4cf3a806 100644
--- a/testlib/src/test/java/com/diffplug/spotless/JvmTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/JvmTest.java
@@ -142,7 +142,7 @@ void supportProposesFormatterUpgrade() {
 			}).getMessage();
 			assertThat(proposal).isEqualTo("My Test Formatter " + fmtVersion + " is currently being used, but outdated.\n" +
 					"My Test Formatter 2 is the recommended version, which may have fixed this problem.\n" +
-					"My Test Formatter 2 requires JVM 10+.");
+					"My Test Formatter 2 requires JVM " + (requiredJvm) + "+.");
 		}
 	}
 

From 66b8dd27c2169cf8dd6a95136183c1568bec2566 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 12 Jan 2023 13:05:59 -0800
Subject: [PATCH 0555/2068] Fix newlines in JvmTest.

---
 testlib/src/test/java/com/diffplug/spotless/JvmTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testlib/src/test/java/com/diffplug/spotless/JvmTest.java b/testlib/src/test/java/com/diffplug/spotless/JvmTest.java
index 2f4cf3a806..ca7fb71305 100644
--- a/testlib/src/test/java/com/diffplug/spotless/JvmTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/JvmTest.java
@@ -140,7 +140,7 @@ void supportProposesFormatterUpgrade() {
 					throw new Exception("Some test exception");
 				}).apply("");
 			}).getMessage();
-			assertThat(proposal).isEqualTo("My Test Formatter " + fmtVersion + " is currently being used, but outdated.\n" +
+			assertThat(proposal.replace("\r", "")).isEqualTo("My Test Formatter " + fmtVersion + " is currently being used, but outdated.\n" +
 					"My Test Formatter 2 is the recommended version, which may have fixed this problem.\n" +
 					"My Test Formatter 2 requires JVM " + (requiredJvm) + "+.");
 		}

From e2f82c4ec56c422c501957b8e55468a81b815511 Mon Sep 17 00:00:00 2001
From: tison <wander4096@gmail.com>
Date: Fri, 13 Jan 2023 13:18:44 +0800
Subject: [PATCH 0556/2068] Fix subgroups leading catch all matcher

Signed-off-by: tison <wander4096@gmail.com>
---
 .../main/java/com/diffplug/spotless/java/ImportSorterImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java b/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java
index 0390d99c1b..8ed263a780 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java
@@ -45,7 +45,7 @@ private static class ImportsGroup {
 		private final List<String> subGroups;
 
 		public ImportsGroup(String importOrder) {
-			this.subGroups = Stream.of(importOrder.split("\\" + SUBGROUP_SEPARATOR))
+			this.subGroups = Stream.of(importOrder.split("\\" + SUBGROUP_SEPARATOR, -1))
 					.map(this::normalizeStatic)
 					.collect(Collectors.toList());
 		}

From c2d60ba1aa2e9076842c8a1cabc963be524a7297 Mon Sep 17 00:00:00 2001
From: tison <wander4096@gmail.com>
Date: Fri, 13 Jan 2023 13:23:01 +0800
Subject: [PATCH 0557/2068] Add
 sortImportsFromArrayWithSubgroupsLeadingCatchAll test case

Signed-off-by: tison <wander4096@gmail.com>
---
 ...aCodeSortedImportsSubgroupsLeadingCatchAll.test | 14 ++++++++++++++
 .../spotless/java/ImportOrderStepTest.java         |  6 ++++++
 2 files changed, 20 insertions(+)
 create mode 100644 testlib/src/main/resources/java/importsorter/JavaCodeSortedImportsSubgroupsLeadingCatchAll.test

diff --git a/testlib/src/main/resources/java/importsorter/JavaCodeSortedImportsSubgroupsLeadingCatchAll.test b/testlib/src/main/resources/java/importsorter/JavaCodeSortedImportsSubgroupsLeadingCatchAll.test
new file mode 100644
index 0000000000..62efc65e21
--- /dev/null
+++ b/testlib/src/main/resources/java/importsorter/JavaCodeSortedImportsSubgroupsLeadingCatchAll.test
@@ -0,0 +1,14 @@
+import static com.foo.Bar;
+import static com.github.tomakehurst.wiremock.client.WireMock.*;
+import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
+import static java.lang.Exception.*;
+import static java.lang.Runnable.*;
+import static org.hamcrest.Matchers.*;
+import java.awt.*;
+import java.lang.Runnable;
+import java.lang.Thread;
+import java.util.*;
+import java.util.List;
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import org.dooda.Didoo;
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/ImportOrderStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/ImportOrderStepTest.java
index 8f3bd799bc..ca6bd39825 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/ImportOrderStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/ImportOrderStepTest.java
@@ -41,6 +41,12 @@ void sortImportsFromArrayWithSubgroups() {
 		StepHarness.forStep(step).testResource("java/importsorter/JavaCodeUnsortedImportsSubgroups.test", "java/importsorter/JavaCodeSortedImportsSubgroups.test");
 	}
 
+	@Test
+	void sortImportsFromArrayWithSubgroupsLeadingCatchAll() {
+		FormatterStep step = ImportOrderStep.forJava().createFrom("\\#|");
+		StepHarness.forStep(step).testResource("java/importsorter/JavaCodeUnsortedImportsSubgroups.test", "java/importsorter/JavaCodeSortedImportsSubgroupsLeadingCatchAll.test");
+	}
+
 	@Test
 	void sortImportsFromFile() {
 		FormatterStep step = ImportOrderStep.forJava().createFrom(createTestFile("java/importsorter/import.properties"));

From 6688e3f0a9c12b5d6b38c8991af00bc89fa72e27 Mon Sep 17 00:00:00 2001
From: tison <wander4096@gmail.com>
Date: Fri, 13 Jan 2023 13:24:57 +0800
Subject: [PATCH 0558/2068] Update CHANGES files

Signed-off-by: tison <wander4096@gmail.com>
---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 1 +
 plugin-maven/CHANGES.md  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index f0db002dc1..035c636e0e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -16,6 +16,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Added `skipLinesMatching` option to `licenseHeader` to support formats where license header cannot be immediately added to the top of the file (e.g. xml, sh). ([#1441](https://github.com/diffplug/spotless/pull/1441)).
 ### Fixed
 * Support `ktlint` 0.48+ new rule disabling syntax ([#1456](https://github.com/diffplug/spotless/pull/1456)) fixes ([#1444](https://github.com/diffplug/spotless/issues/1444))
+* Fix subgroups leading catch all matcher.
 
 ### Changes
 * Bump the dev version of Gradle from `7.5.1` to `7.6` ([#1409](https://github.com/diffplug/spotless/pull/1409))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index e8758188b6..39cbb07ad4 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -10,6 +10,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Prevent tool configurations from being resolved outside project ([#1447](https://github.com/diffplug/spotless/pull/1447) fixes [#1215](https://github.com/diffplug/spotless/issues/1215))
 * Support `ktlint` 0.48+ new rule disabling syntax ([#1456](https://github.com/diffplug/spotless/pull/1456)) fixes ([#1444](https://github.com/diffplug/spotless/issues/1444))
+* Fix subgroups leading catch all matcher.
 ### Changes
 * Bump default `ktlint` version to latest `0.47.1` -> `0.48.1` ([#1456](https://github.com/diffplug/spotless/pull/1456))
 
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index cb38f95de1..dfa7a39a45 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -10,6 +10,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Add JSON support ([#1446](https://github.com/diffplug/spotless/pull/1446))
 ### Fixed
 * Support `ktlint` 0.48+ new rule disabling syntax ([#1456](https://github.com/diffplug/spotless/pull/1456)) fixes ([#1444](https://github.com/diffplug/spotless/issues/1444))
+* Fix subgroups leading catch all matcher.
 ### Changes
 * Bump default `ktlint` version to latest `0.47.1` -> `0.48.1` ([#1456](https://github.com/diffplug/spotless/pull/1456))
 * Reduce spurious invalidations of the up-to-date index file ([#1461](https://github.com/diffplug/spotless/pull/1461))

From 109ffa6b65e71027787e11c8f66187d8c7b888da Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 13 Jan 2023 12:08:56 -0800
Subject: [PATCH 0559/2068] spotlessApply

---
 .../main/java/com/diffplug/spotless/java/ImportSorterImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java b/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java
index 8ed263a780..1f014ba95e 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 49e370b92772c0a6ef9ac1959b60738dd60e9028 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 13 Jan 2023 14:49:39 -0800
Subject: [PATCH 0560/2068] Published lib/2.32.0

---
 CHANGES.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 95c4897c7a..c08ca86796 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.32.0] - 2023-01-13
 ### Added
 * Add option `editorConfigFile` for `ktLint` [#142](https://github.com/diffplug/spotless/issues/142)
   * **POTENTIALLY BREAKING** `ktlint` step now modifies license headers. Make sure to put `licenseHeader` *after* `ktlint`.
@@ -33,7 +35,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Switch our publishing infrastructure from CircleCI to GitHub Actions ([#1462](https://github.com/diffplug/spotless/pull/1462)).
   * Help wanted for moving our tests too ([#1472](https://github.com/diffplug/spotless/issues/1472))
 
-
 ## [2.31.1] - 2023-01-02
 ### Fixed
 * Improve memory usage when using git ratchet ([#1426](https://github.com/diffplug/spotless/pull/1426))

From 49505b819ca756e510cc20c9f7f912c62d1fc994 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 13 Jan 2023 14:50:44 -0800
Subject: [PATCH 0561/2068] Improve deploy.yml docs since we're actually using
 Base64.

---
 .github/workflows/deploy.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 67d9449e9b..ce7b82f820 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,6 +1,9 @@
 # GH_TOKEN
 # NEXUS_USER
-# NEXUS_PASS
+# NEXUS_PASS64 (base64 NOTE: `base64` and `openssl base64` failed, had to use Java
+#   byte[] data = "{{password}}".getBytes(StandardCharsets.UTF_8);
+#   String encoded = new String(Base64.getEncoder().encode(data), StandardCharsets.UTF_8);
+#   System.out.println(encoded);
 # GPG_PASSPHRASE
 # GPG_KEY64 (base64)
 #   gpg --export-secret-keys --armor KEY_ID | openssl base64 | pbcopy

From 84b42b46e850009936359d57a04ee7f25835de96 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 13 Jan 2023 15:10:12 -0800
Subject: [PATCH 0562/2068] Fix deprecation in how gradle plugins are
 published.

---
 plugin-gradle/build.gradle | 42 +++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/plugin-gradle/build.gradle b/plugin-gradle/build.gradle
index ba60eb450f..6a7f7dca01 100644
--- a/plugin-gradle/build.gradle
+++ b/plugin-gradle/build.gradle
@@ -38,12 +38,31 @@ apply from: rootProject.file('gradle/special-tests.gradle')
 // GRADLE PLUGIN PORTAL //
 //////////////////////////
 gradlePlugin {
+	website = "https://github.com/diffplug/spotless"
+	vcsUrl = "https://github.com/diffplug/spotless"
 	plugins {
 		spotlessPlugin {
 			id = 'com.diffplug.spotless'
 			implementationClass = 'com.diffplug.gradle.spotless.SpotlessPlugin'
 			displayName = 'Spotless formatting plugin'
 			description = project.description
+			tags.set([
+				'format',
+				'style',
+				'license',
+				'header',
+				'google-java-format',
+				'eclipse',
+				'ktlint',
+				'ktfmt',
+				'diktat',
+				'tsfmt',
+				'prettier',
+				'scalafmt',
+				'scalafix',
+				'black',
+				'clang-format'
+			])
 		}
 		spotlessPluginLegacy {
 			id = 'com.diffplug.gradle.spotless'
@@ -55,29 +74,6 @@ gradlePlugin {
 }
 if (version.endsWith('-SNAPSHOT')) {
 	publishPlugins.enabled = false
-} else {
-	pluginBundle {
-		// These settings are set for the whole plugin bundle
-		website = "https://github.com/diffplug/spotless"
-		vcsUrl = "https://github.com/diffplug/spotless"
-		tags = [
-			'format',
-			'style',
-			'license',
-			'header',
-			'google-java-format',
-			'eclipse',
-			'ktlint',
-			'ktfmt',
-			'diktat',
-			'tsfmt',
-			'prettier',
-			'scalafmt',
-			'scalafix',
-			'black',
-			'clang-format'
-		]
-	}
 }
 
 // have to apply java-publish after setting up the pluginBundle

From be90ffcf49cb9fce8224ce91b11631fc391c83c6 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 13 Jan 2023 15:13:41 -0800
Subject: [PATCH 0563/2068] Oops, fix the gradle plugin build.

---
 .github/workflows/deploy.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index ce7b82f820..9a1dcdf609 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -7,8 +7,8 @@
 # GPG_PASSPHRASE
 # GPG_KEY64 (base64)
 #   gpg --export-secret-keys --armor KEY_ID | openssl base64 | pbcopy
-# GRADLE_PORTAL_KEY
-# GRADLE_PORTAL_SECRET
+# GRADLE_KEY
+# GRADLE_SECRET
 
 name: deploy
 on:
@@ -49,12 +49,12 @@ jobs:
         if: "${{ github.event.inputs.to_publish == 'all' }}"
         run: |
           ./gradlew :changelogPush -Prelease=true --stacktrace --warning-mode all
-          ./gradlew :plugin-gradle:changelogPush -Prelease=true -Pgradle.publish.key=${{ secrets.GRADLE_PORTAL_KEY }} -Pgradle.publish.secret=${{ secrets.GRADLE_PORTAL_SECRET }} --stacktrace --warning-mode all
+          ./gradlew :plugin-gradle:changelogPush -Prelease=true -Pgradle.publish.key=${{ secrets.GRADLE_KEY }} -Pgradle.publish.secret=${{ secrets.GRADLE_SECRET }} --stacktrace --warning-mode all
           ./gradlew :plugin-maven:changelogPush -Prelease=true --stacktrace --warning-mode all
       - name: publish just plugin-gradle
         if: "${{ github.event.inputs.to_publish == 'plugin-gradle' }}"
         run: |
-          ./gradlew :plugin-gradle:changelogPush -Prelease=true -Pgradle.publish.key=${{ secrets.GRADLE_PORTAL_KEY }} -Pgradle.publish.secret=${{ secrets.GRADLE_PORTAL_SECRET }} --stacktrace --warning-mode all
+          ./gradlew :plugin-gradle:changelogPush -Prelease=true -Pgradle.publish.key=${{ secrets.GRADLE_KEY }} -Pgradle.publish.secret=${{ secrets.GRADLE_SECRET }} --stacktrace --warning-mode all
       - name: publish just plugin-maven
         if: "${{ github.event.inputs.to_publish == 'plugin-maven' }}"
         run: |

From 5c10387fa94d90277bf665bc321e1ad3cdd647a3 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 13 Jan 2023 15:19:40 -0800
Subject: [PATCH 0564/2068] Bump plugin-maven changelog.

---
 plugin-maven/CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 6f59030a8e..05cc349e9f 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.30.0] - 2023-01-13
 ### Added
 * Add option `editorConfigFile` for `ktLint` [#142](https://github.com/diffplug/spotless/issues/142)
   * **POTENTIALLY BREAKING** `ktlint` step now modifies license headers. Make sure to put `licenseHeader` *after* `ktlint`.

From 54bcc6068debe62d87c489532821bd284786d2da Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 13 Jan 2023 15:43:36 -0800
Subject: [PATCH 0565/2068] spotlessApply

---
 plugin-maven/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 60975f1e52..4232f76e39 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -12,8 +12,8 @@ output = [
   ].join('\n');
 -->
 [![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.29.0/index.html)
-[![Changelog](https://img.shields.io/badge/changelog-2.29.0-brightgreen.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.30.0/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.30.0-brightgreen.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)

From 8734c3b1f27302c504b0c33e817f887deb5e2d44 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 14 Jan 2023 11:53:17 +0000
Subject: [PATCH 0566/2068] Update dependency org.mockito:mockito-core to v5

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 71f755522f..23ec1efd7a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -28,7 +28,7 @@ VER_DURIAN=1.2.0
 VER_JGIT=5.13.1.202206130422-r
 VER_JUNIT=5.9.2
 VER_ASSERTJ=3.24.1
-VER_MOCKITO=4.11.0
+VER_MOCKITO=5.0.0
 
 # Used for Maven Plugin
 VER_MAVEN_API=3.0

From 5d73b3ba2313d2d511cc51a18d746031f2ee47d1 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sat, 14 Jan 2023 15:01:55 -0800
Subject: [PATCH 0567/2068] Fix bug in gradle publishing.

---
 plugin-gradle/build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugin-gradle/build.gradle b/plugin-gradle/build.gradle
index 6a7f7dca01..e65bda9f70 100644
--- a/plugin-gradle/build.gradle
+++ b/plugin-gradle/build.gradle
@@ -69,6 +69,7 @@ gradlePlugin {
 			implementationClass = 'com.diffplug.gradle.spotless.SpotlessPluginRedirect'
 			displayName = 'Spotless formatting plugin (legacy)'
 			description = project.description
+			tags.set(['format'])
 		}
 	}
 }

From fdb58d79c7952e8fcf55ff049fefd84faeb5f01c Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sat, 14 Jan 2023 15:04:02 -0800
Subject: [PATCH 0568/2068] Published plugin-gradle/6.13.0

---
 plugin-gradle/CHANGES.md   |  2 ++
 plugin-gradle/README.md    | 48 +++++++++++++++++++-------------------
 plugin-gradle/build.gradle |  4 +++-
 3 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index f6210ce8de..e2e32680fe 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [6.13.0] - 2023-01-14
 ### Added
 * **POTENTIALLY BREAKING** `ktlint` step now supports `.editorconfig` ([#1442](https://github.com/diffplug/spotless/pull/1442) implements [#142](https://github.com/diffplug/spotless/issues/142))
   * **POTENTIALLY BREAKING** `ktlint` step now modifies license headers. Make sure to put `licenseHeader` *after* `ktlint`.
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index b44d79ef3d..f2567a5924 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -18,9 +18,9 @@ output = [
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
 [![Maven central](https://img.shields.io/badge/mavencentral-yes-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/index.html)
 [![License Apache](https://img.shields.io/badge/license-apache-blue.svg)](https://tldrlegal.com/license/apache-license-2.0-(apache-2.0))
-[![Changelog](https://img.shields.io/badge/changelog-6.12.1-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-6.13.0-blue.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)
@@ -129,10 +129,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -144,7 +144,7 @@ If you're stuck on an older version of Gradle, `id 'com.diffplug.gradle.spotless
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -268,8 +268,8 @@ You can make a pull request to add new annotations to Spotless's default list.
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -320,8 +320,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -392,7 +392,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -424,7 +424,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -456,7 +456,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -490,7 +490,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -511,7 +511,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -536,7 +536,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -576,7 +576,7 @@ sql.formatter.indent.size=4
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -668,7 +668,7 @@ For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#n
 
 ## Javascript
 
-- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
+- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
 
 ```gradle
 spotless {
@@ -732,7 +732,7 @@ For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#n
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -957,7 +957,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -1030,9 +1030,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -1065,11 +1065,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.12.1/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension
diff --git a/plugin-gradle/build.gradle b/plugin-gradle/build.gradle
index e65bda9f70..8a3260d943 100644
--- a/plugin-gradle/build.gradle
+++ b/plugin-gradle/build.gradle
@@ -69,7 +69,9 @@ gradlePlugin {
 			implementationClass = 'com.diffplug.gradle.spotless.SpotlessPluginRedirect'
 			displayName = 'Spotless formatting plugin (legacy)'
 			description = project.description
-			tags.set(['format'])
+			tags.set([
+				'format'
+			])
 		}
 	}
 }

From 67f0db5c53b3877627e018c0b79bd93559cd9277 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sat, 14 Jan 2023 16:06:41 -0800
Subject: [PATCH 0569/2068] First steps in adapting #1477 to match #1472.

---
 .github/workflows/build-ci.yml | 67 ----------------------------------
 .github/workflows/ci.yml       | 43 ++++++++++++++++++++++
 2 files changed, 43 insertions(+), 67 deletions(-)
 delete mode 100644 .github/workflows/build-ci.yml
 create mode 100644 .github/workflows/ci.yml

diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml
deleted file mode 100644
index ea12b03764..0000000000
--- a/.github/workflows/build-ci.yml
+++ /dev/null
@@ -1,67 +0,0 @@
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    types: [assigned, opened, synchronize, reopened]
-
-jobs:
-  buildTest:
-    name: Build CI
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        java_version: [11, 17]
-        distribution: ["temurin"]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Install JDK ${{ matrix.distribution }} ${{ matrix.java_version }}
-        uses: actions/setup-java@v3.9.0
-        with:
-          distribution: ${{ matrix.distribution }}
-          java-version: ${{ matrix.java_version }}
-          cache: gradle
-      - name: Build project
-        run: ./gradlew build -x spotlessCheck -S
-  spotless:
-    name: Check Spotless
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        java_version: [11]
-        distribution: ["temurin"]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Install JDK ${{ matrix.distribution }} ${{ matrix.java_version }}
-        uses: actions/setup-java@v3.9.0
-        with:
-          distribution: ${{ matrix.distribution }}
-          java-version: ${{ matrix.java_version }}
-          cache: gradle
-      - name: Check spotless
-        run: ./gradlew spotlessCheck -S
-  buildTestOnWindows:
-    name: Build on Windows CI
-    runs-on: windows-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        java_version: [11, 17]
-        distribution: ["temurin"]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Install JDK ${{ matrix.distribution }} ${{ matrix.java_version }}
-        uses: actions/setup-java@v3.9.0
-        with:
-          distribution: ${{ matrix.distribution }}
-          java-version: ${{ matrix.java_version }}
-          cache: gradle
-      - name: Build project
-        run: ./gradlew build -x spotlessCheck -S
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000000..53a1f49cf6
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,43 @@
+# BUILDCACHE_USER
+# BUILDCACHE_PASS
+#   - rw access to buildcache.diffplug.com
+
+on: [push, pull_request]
+jobs:
+  testClasses:
+    name: spotlessCheck assemble testClasses
+    runs-on: ubuntu-latest
+    env:
+      buildcacheuser: ${{ secrets.BUILDCACHE_USER }}
+      buildcachepass: ${{ secrets.BUILDCACHE_PASS }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Install JDK 11
+        uses: actions/setup-java@v3
+        with:
+          distribution: "temurin"
+          java-version: 11
+          cache: gradle
+      - name: Build project
+        run: ./gradlew spotlessCheck assemble testClasses --build-cache
+  test_windows:
+    needs: testClasses
+    name: test_windows
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        java_version: [17]
+        distribution: ["temurin"]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Install JDK ${{ matrix.distribution }} ${{ matrix.java_version }}
+        uses: actions/setup-java@v3
+        with:
+          distribution: ${{ matrix.distribution }}
+          java-version: ${{ matrix.java_version }}
+          cache: gradle
+      - name: Build project
+        run: ./gradlew test --build-cache -PSPOTLESS_EXCLUDE_MAVEN=true

From b513d23dbe5839ba65ee04a05f58724f4a9cad1c Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sat, 14 Jan 2023 16:09:21 -0800
Subject: [PATCH 0570/2068] Fix spotless ratchetFrom

---
 .github/workflows/ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 53a1f49cf6..1282ef2a20 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,6 +13,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
       - name: Install JDK 11
         uses: actions/setup-java@v3
         with:

From 8a69785b16cfccde04450a4454b2e9277d61bab5 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sat, 14 Jan 2023 16:26:31 -0800
Subject: [PATCH 0571/2068] Start running our tests also.

---
 .github/workflows/ci.yml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1282ef2a20..c6974d8de8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,15 +23,13 @@ jobs:
           cache: gradle
       - name: Build project
         run: ./gradlew spotlessCheck assemble testClasses --build-cache
-  test_windows:
+  check:
     needs: testClasses
-    name: test_windows
-    runs-on: windows-latest
     strategy:
       fail-fast: false
-      matrix:
-        java_version: [17]
-        distribution: ["temurin"]
+      maven_or_gradle: [maven, gradle]
+      os: [ubuntu-latest, windows-latest]
+      jre: [11, 17]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -41,5 +39,9 @@ jobs:
           distribution: ${{ matrix.distribution }}
           java-version: ${{ matrix.java_version }}
           cache: gradle
-      - name: Build project
-        run: ./gradlew test --build-cache -PSPOTLESS_EXCLUDE_MAVEN=true
+      - name: check maven
+        if: matrix.maven_or_gradle == 'maven'
+        run: ./gradlew :plugin-maven:check -x spotlessCheck --build-cache
+      - name: check everything but maven
+        if: matrix.maven_or_gradle == 'gradle'
+        run: export SPOTLESS_EXCLUDE_MAVEN=true && ./gradlew check -x spotlessCheck --build-cache

From 0a120eceb177f4a3e78158a42bbc1fea66e250a3 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sat, 14 Jan 2023 16:28:05 -0800
Subject: [PATCH 0572/2068] Oops. Fix the matrix syntax.

---
 .github/workflows/ci.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c6974d8de8..7f0d8d5f7f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,9 +27,10 @@ jobs:
     needs: testClasses
     strategy:
       fail-fast: false
-      maven_or_gradle: [maven, gradle]
-      os: [ubuntu-latest, windows-latest]
-      jre: [11, 17]
+      matrix:
+        maven_or_gradle: [maven, gradle]
+        os: [ubuntu-latest, windows-latest]
+        jre: [11, 17]
     steps:
       - name: Checkout
         uses: actions/checkout@v3

From 136f96d350529407e860c665fb460d83b61dd4b3 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sat, 14 Jan 2023 16:33:07 -0800
Subject: [PATCH 0573/2068] Try again.

---
 .github/workflows/ci.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7f0d8d5f7f..16952dca28 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,14 +31,15 @@ jobs:
         maven_or_gradle: [maven, gradle]
         os: [ubuntu-latest, windows-latest]
         jre: [11, 17]
+    runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Install JDK ${{ matrix.distribution }} ${{ matrix.java_version }}
         uses: actions/setup-java@v3
         with:
-          distribution: ${{ matrix.distribution }}
-          java-version: ${{ matrix.java_version }}
+          distribution: "temurin"
+          java-version: ${{ matrix.jre }}
           cache: gradle
       - name: check maven
         if: matrix.maven_or_gradle == 'maven'

From d0af06ef766bb8482c122749027a2f232a2e0cf0 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sat, 14 Jan 2023 16:43:57 -0800
Subject: [PATCH 0574/2068] Exclude maven from the assemble testClasses because
 it's not cacheable anyway.

---
 .github/workflows/ci.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 16952dca28..3bc9de5157 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,8 +21,11 @@ jobs:
           distribution: "temurin"
           java-version: 11
           cache: gradle
-      - name: Build project
-        run: ./gradlew spotlessCheck assemble testClasses --build-cache
+      - name: spotlessCheck
+        run: ./gradlew spotlessCheck --build-cache
+      - name: assemble testClasses
+        run: export SPOTLESS_EXCLUDE_MAVEN=true && ./gradlew assemble testClasses --build-cache
+        # If this gets resolved, remove the EXCLUDE_MAVEN https://github.com/diffplug/spotless/issues/554
   check:
     needs: testClasses
     strategy:

From 692ad62635ab05b03955dea17406157f92ebb11d Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sat, 14 Jan 2023 16:54:41 -0800
Subject: [PATCH 0575/2068] Add java8 and npm tests.

---
 .github/workflows/ci.yml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3bc9de5157..b14769569b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,16 +24,16 @@ jobs:
       - name: spotlessCheck
         run: ./gradlew spotlessCheck --build-cache
       - name: assemble testClasses
-        run: export SPOTLESS_EXCLUDE_MAVEN=true && ./gradlew assemble testClasses --build-cache
+        run: ./gradlew assemble testClasses --build-cache -PSPOTLESS_EXCLUDE_MAVEN=true
         # If this gets resolved, remove the EXCLUDE_MAVEN https://github.com/diffplug/spotless/issues/554
   check:
     needs: testClasses
     strategy:
       fail-fast: false
       matrix:
-        maven_or_gradle: [maven, gradle]
+        kind: [maven, gradle, npm]
         os: [ubuntu-latest, windows-latest]
-        jre: [11, 17]
+        jre: [8, 11, 17]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
@@ -45,8 +45,11 @@ jobs:
           java-version: ${{ matrix.jre }}
           cache: gradle
       - name: check maven
-        if: matrix.maven_or_gradle == 'maven'
+        if: matrix.kind == 'maven'
         run: ./gradlew :plugin-maven:check -x spotlessCheck --build-cache
       - name: check everything but maven
-        if: matrix.maven_or_gradle == 'gradle'
-        run: export SPOTLESS_EXCLUDE_MAVEN=true && ./gradlew check -x spotlessCheck --build-cache
+        if: matrix.kind == 'gradle'
+        run: ./gradlew check -x spotlessCheck --build-cache -PSPOTLESS_EXCLUDE_MAVEN=true
+      - name: check npm
+        if: matrix.kind == 'npm'
+        run: ./gradlew testNpm --build-cache

From a6c5dd48b902dcd013bed91d15f764ddd783458a Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sat, 14 Jan 2023 16:58:38 -0800
Subject: [PATCH 0576/2068] Change the matrix order a bit.

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b14769569b..ac9d5be617 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -32,8 +32,8 @@ jobs:
       fail-fast: false
       matrix:
         kind: [maven, gradle, npm]
-        os: [ubuntu-latest, windows-latest]
         jre: [8, 11, 17]
+        os: [ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout

From 35a2dc9640b358f8dd74b3807434310ef76718e5 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sat, 14 Jan 2023 17:01:21 -0800
Subject: [PATCH 0577/2068] No more double-build by building only pushes to
 master.

---
 .github/workflows/ci.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ac9d5be617..9a34e0d42d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,7 +2,10 @@
 # BUILDCACHE_PASS
 #   - rw access to buildcache.diffplug.com
 
-on: [push, pull_request]
+on:
+  pull_request:
+  push:
+    branches: [main]
 jobs:
   testClasses:
     name: spotlessCheck assemble testClasses

From 71d0e85724beaede77f6c1d116ea2f1e7e13a2c2 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sat, 14 Jan 2023 17:09:08 -0800
Subject: [PATCH 0578/2068] Cancel in-progress builds that aren't working for
 us.

---
 .github/workflows/ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9a34e0d42d..ed526a16ca 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,6 +6,9 @@ on:
   pull_request:
   push:
     branches: [main]
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 jobs:
   testClasses:
     name: spotlessCheck assemble testClasses

From d0faac2dda2c586e589f2f42e6754ebc7f789240 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sat, 14 Jan 2023 17:22:02 -0800
Subject: [PATCH 0579/2068] Switch from `check` to `build`

---
 .github/workflows/ci.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ed526a16ca..4ce6347755 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 jobs:
-  testClasses:
+  sanityCheck:
     name: spotlessCheck assemble testClasses
     runs-on: ubuntu-latest
     env:
@@ -32,8 +32,8 @@ jobs:
       - name: assemble testClasses
         run: ./gradlew assemble testClasses --build-cache -PSPOTLESS_EXCLUDE_MAVEN=true
         # If this gets resolved, remove the EXCLUDE_MAVEN https://github.com/diffplug/spotless/issues/554
-  check:
-    needs: testClasses
+  build:
+    needs: sanityCheck
     strategy:
       fail-fast: false
       matrix:
@@ -50,12 +50,12 @@ jobs:
           distribution: "temurin"
           java-version: ${{ matrix.jre }}
           cache: gradle
-      - name: check maven
+      - name: build (maven-only)
         if: matrix.kind == 'maven'
-        run: ./gradlew :plugin-maven:check -x spotlessCheck --build-cache
-      - name: check everything but maven
+        run: ./gradlew :plugin-maven:build -x spotlessCheck --build-cache
+      - name: build (everything-but-maven)
         if: matrix.kind == 'gradle'
-        run: ./gradlew check -x spotlessCheck --build-cache -PSPOTLESS_EXCLUDE_MAVEN=true
-      - name: check npm
+        run: ./gradlew build -x spotlessCheck --build-cache -PSPOTLESS_EXCLUDE_MAVEN=true
+      - name: testNpm
         if: matrix.kind == 'npm'
         run: ./gradlew testNpm --build-cache

From 707719668fc04fbcd626c725cd35cb4e87fb4745 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sat, 14 Jan 2023 17:26:41 -0800
Subject: [PATCH 0580/2068] Revert "Update dependency org.mockito:mockito-core
 to v5" (#1487) b/c it breaks Java 8

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 23ec1efd7a..71f755522f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -28,7 +28,7 @@ VER_DURIAN=1.2.0
 VER_JGIT=5.13.1.202206130422-r
 VER_JUNIT=5.9.2
 VER_ASSERTJ=3.24.1
-VER_MOCKITO=5.0.0
+VER_MOCKITO=4.11.0
 
 # Used for Maven Plugin
 VER_MAVEN_API=3.0

From 549558e05f661aab8ea2f2bf361f7a18af52ce51 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sat, 14 Jan 2023 17:50:06 -0800
Subject: [PATCH 0581/2068] Grab JUnit reports.

---
 .github/workflows/ci.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4ce6347755..63fc565b4a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -56,6 +56,12 @@ jobs:
       - name: build (everything-but-maven)
         if: matrix.kind == 'gradle'
         run: ./gradlew build -x spotlessCheck --build-cache -PSPOTLESS_EXCLUDE_MAVEN=true
-      - name: testNpm
+      - name: test npm
         if: matrix.kind == 'npm'
         run: ./gradlew testNpm --build-cache
+      - name: junit result
+        uses: mikepenz/action-junit-report@v3
+        if: always() # always run even if the previous step fails
+        with:
+          check_name: JUnit ${{ matrix.kind }} ${{ matrix.jre }} ${{ matrix.os }}
+          report_paths: '*/build/test-results/*/TEST-*.xml'

From 9cae4966b8b30c976c330c201d64ee6b453227d6 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sat, 14 Jan 2023 18:05:36 -0800
Subject: [PATCH 0582/2068] Be more efficient with runner minutes.

---
 .github/workflows/ci.yml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 63fc565b4a..2e302e6637 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -37,9 +37,21 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kind: [maven, gradle, npm]
+        kind: [maven, gradle]
         jre: [8, 11, 17]
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest]
+        include:
+          # test windows at the diagonals of the above matrix
+          - kind: maven
+            jre: 8
+            os: windows-latest
+          - kind: gradle
+            jre: 17
+            os: windows-latest
+          # npm on linux only (crazy slow on windows)
+          - kind: npm
+            jre: 8
+            os: ubuntu-latest
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout

From 6b67bf17b0d7b1887b0df1a3fb6d656b487ba9e8 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sat, 14 Jan 2023 18:06:39 -0800
Subject: [PATCH 0583/2068] Fully remove CircleCI.

---
 .circleci/config.yml | 161 -------------------------------------------
 1 file changed, 161 deletions(-)
 delete mode 100644 .circleci/config.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
deleted file mode 100644
index b9f91766c9..0000000000
--- a/.circleci/config.yml
+++ /dev/null
@@ -1,161 +0,0 @@
-version: 2.1
-orbs:
-  win: circleci/windows@5.0.0
-
-anchors:
-  env_gradle: &env_gradle
-    environment:
-       # we're only allowed to use 2 vCPUs
-      GRADLE_OPTS: "-Dorg.gradle.workers.max=2"
-    docker:
-      - image: cimg/openjdk:11.0
-  env_gradle_large: &env_gradle_large
-    << : *env_gradle
-    resource_class: large # https://circleci.com/docs/2.0/configuration-reference/#resource_class
-    environment:
-      GRADLE_OPTS: "-Dorg.gradle.workers.max=4"
-
-  restore_cache_wrapper: &restore_cache_wrapper
-    restore_cache:
-      key: gradle-wrapper2-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}
-  restore_cache_deps: &restore_cache_deps
-    restore_cache:
-      keys:
-        - gradle-deps3-{{ checksum "build.gradle" }}-{{ checksum "gradle.properties" }}
-        - gradle-deps3-
-  set_git_origin_to_https: &set_git_origin_to_https
-    run:
-      name: set git origin to https
-      command: git remote set-url --push origin https://github.com/diffplug/spotless
-
-  test_nomaven: &test_nomaven
-    steps:
-      - checkout
-      - *restore_cache_wrapper
-      - *restore_cache_deps
-      - run:
-          name: gradlew check -x spotlessCheck
-          command: export SPOTLESS_EXCLUDE_MAVEN=true && ./gradlew check -x spotlessCheck --build-cache
-      - store_test_results:
-          path: testlib/build/test-results/test
-      - store_test_results:
-          path: lib-extra/build/test-results/test
-      - store_test_results:
-          path: plugin-gradle/build/test-results/test
-      - store_artifacts:
-          path: lib/build/spotbugs
-      - store_artifacts:
-          path: lib-extra/build/spotbugs
-      - store_artifacts:
-          path: testlib/build/spotbugs
-      - store_artifacts:
-          path: plugin-gradle/build/spotbugs
-
-jobs:
-  # gradlew spotlessCheck assemble testClasses
-  assemble_testClasses:
-    <<: *env_gradle_large
-    steps:
-      - checkout
-      - *restore_cache_wrapper
-      - *restore_cache_deps
-      - run:
-          name: gradlew spotlessCheck assemble testClasses
-          command: ./gradlew spotlessCheck assemble testClasses --build-cache
-      - save_cache:
-          paths:
-            - ~/.gradle/wrapper
-          key: gradle-wrapper2-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}
-      - save_cache:
-          paths:
-            - ~/.gradle/caches
-            - ~/.m2
-          key: gradle-deps3-{{ checksum "build.gradle" }}-{{ checksum "gradle.properties" }}
-  test_nomaven_11:
-    # latest LTS version
-    <<: *env_gradle_large
-    docker:
-      - image: cimg/openjdk:11.0
-    <<: *test_nomaven
-  test_nomaven_17:
-    # latest JDK
-    <<: *env_gradle_large
-    docker:
-      - image: cimg/openjdk:17.0
-    <<: *test_nomaven
-  test_justmaven_11:
-    << : *env_gradle
-    steps:
-      - checkout
-      - *restore_cache_wrapper
-      - *restore_cache_deps
-      - run:
-          name: gradlew :plugin-maven:check
-          command: ./gradlew :plugin-maven:check --build-cache
-      - store_test_results:
-          path: plugin-maven/build/test-results/test
-  test_npm_8:
-    << : *env_gradle
-    environment:
-      # java doesn't play nice with containers, it tries to hog the entire machine
-      # https://circleci.com/blog/how-to-handle-java-oom-errors/
-      # try the experimental JVM option
-      _JAVA_OPTIONS: "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap"
-    docker:
-      - image: cimg/openjdk:8.0-node
-    steps:
-      - checkout
-      - *restore_cache_wrapper
-      - *restore_cache_deps
-      - run:
-          name: gradlew testNpm
-          command: export SPOTLESS_EXCLUDE_MAVEN=true && ./gradlew testNpm --build-cache
-      - store_test_results:
-          path: testlib/build/test-results/testNpm
-      - store_test_results:
-          path: plugin-maven/build/test-results/testNpm
-      - store_test_results:
-          path: plugin-gradle/build/test-results/testNpm
-      - run:
-          name: gradlew test
-          command: export SPOTLESS_EXCLUDE_MAVEN=true && ./gradlew test --build-cache
-      - store_test_results:
-          path: testlib/build/test-results/test
-      - store_test_results:
-          path: lib-extra/build/test-results/test
-      - store_test_results:
-          path: plugin-gradle/build/test-results/test
-  test_windows:
-    executor:
-      name: win/default
-      shell: cmd.exe
-    steps:
-      - checkout
-      - run:
-          name: gradlew test
-          command: gradlew test --build-cache -PSPOTLESS_EXCLUDE_MAVEN=true
-      - store_test_results:
-          path: testlib/build/test-results/test
-      - store_test_results:
-          path: lib-extra/build/test-results/test
-      - store_test_results:
-          path: plugin-gradle/build/test-results/test
-
-workflows:
-  version: 2
-  assemble_and_test:
-    jobs:
-      - test_windows
-      - assemble_testClasses
-      - test_justmaven_11:
-          requires:
-            - assemble_testClasses
-      - test_nomaven_11:
-          requires:
-            - assemble_testClasses
-      - test_nomaven_17:
-          requires:
-            - assemble_testClasses
-      - test_npm_8:
-          requires:
-            - assemble_testClasses

From c238f0c672a7d0a5702818b3ac90000ed3f654e0 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 15 Jan 2023 02:09:45 +0000
Subject: [PATCH 0584/2068] Update plugin com.diffplug.spotless to v6.13.0

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 741e4b6ccc..57498bf23f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,6 @@
 pluginManagement {
 	plugins {
-		id 'com.diffplug.spotless'                 version '6.12.1'
+		id 'com.diffplug.spotless'                 version '6.13.0'
 		// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
 		id 'com.gradle.plugin-publish'             version '1.1.0'
 		// https://github.com/gradle-nexus/publish-plugin/releases

From 33cafc069ed8b5c5fc6258458ebcf0084639cc16 Mon Sep 17 00:00:00 2001
From: tison <wander4096@gmail.com>
Date: Sun, 15 Jan 2023 17:20:23 +0800
Subject: [PATCH 0585/2068] docs: Correct espace syntax

Maven XML can interpret `\#` correctly, `\\#` will mismatch code internal.
---
 plugin-maven/README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 4232f76e39..2a455dfe07 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -197,8 +197,8 @@ any other maven phase (i.e. compile) then it can be configured as below;
     <importOrder /> <!-- standard import order -->
     <importOrder>  <!-- or a custom ordering -->
       <wildcardsLast>false</wildcardsLast> <!-- Optional, default false. Sort wildcard import after specific imports -->
-      <order>java|javax,org,com,com.diffplug,,\\#com.diffplug,\\#</order>  <!-- or use <file>${project.basedir}/eclipse.importorder</file> -->
-      <!-- you can use an empty string for all the imports you didn't specify explicitly, '|' to join group without blank line, and '\\#` prefix for static imports. -->
+      <order>java|javax,org,com,com.diffplug,,\#com.diffplug,\#</order>  <!-- or use <file>${project.basedir}/eclipse.importorder</file> -->
+      <!-- you can use an empty string for all the imports you didn't specify explicitly, '|' to join group without blank line, and '\#` prefix for static imports. -->
     </importOrder>
 
     <removeUnusedImports /> <!-- self-explanatory -->
@@ -298,8 +298,8 @@ These mechanisms already exist for the Gradle plugin.
 
     <importOrder /> <!-- standard import order -->
     <importOrder>  <!-- or a custom ordering -->
-      <order>java|javax,org,com,com.diffplug,,\\#com.diffplug,\\#</order>  <!-- or use <file>${project.basedir}/eclipse.importorder</file> -->
-      <!-- you can use an empty string for all the imports you didn't specify explicitly, '|' to join group without blank line, and '\\#` prefix for static imports. -->
+      <order>java|javax,org,com,com.diffplug,,\#com.diffplug,\#</order>  <!-- or use <file>${project.basedir}/eclipse.importorder</file> -->
+      <!-- you can use an empty string for all the imports you didn't specify explicitly, '|' to join group without blank line, and '\#` prefix for static imports. -->
     </importOrder>
 
     <greclipse />          <!-- has its own section below -->

From eae8ffc0fc20997bda6e540b4da448bf00a0d8d7 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Sun, 15 Jan 2023 16:52:19 +0400
Subject: [PATCH 0586/2068] Add JSON jackson step, Refactor with Yaml, enable
 endWithEol, features are defined in a Map -> boolean

---
 lib/build.gradle                              |   1 +
 .../glue/json/JsonJacksonFormatterFunc.java   | 103 ++++++++++++++++++
 .../glue/yaml/YamlJacksonFormatterFunc.java   |  77 ++-----------
 .../diffplug/spotless/json/JacksonConfig.java |  71 ++++++++++++
 .../spotless/json/JacksonJsonStep.java        |  79 ++++++++++++++
 ...lJacksonStep.java => JacksonYamlStep.java} |  31 +++---
 .../Jackson.java => json/JacksonJson.java}    |  34 ++++--
 .../diffplug/spotless/maven/json/Json.java    |   4 +
 .../spotless/maven/yaml/JacksonYaml.java      |  60 ++++++++++
 .../diffplug/spotless/maven/yaml/Yaml.java    |   2 +-
 .../spotless/maven/json/JsonTest.java         |  23 +++-
 .../spotless/maven/yaml/YamlTest.java         |   9 ++
 .../json/sortByKeysAfter_Jackson.json         |  19 ++++
 ...fter_Jackson_noSpaceAfterKeySeparator.json |  19 ++++
 .../array_with_bracket.clean_with_eol.yaml    |  12 ++
 15 files changed, 441 insertions(+), 103 deletions(-)
 create mode 100644 lib/src/jackson/java/com/diffplug/spotless/glue/json/JsonJacksonFormatterFunc.java
 create mode 100644 lib/src/main/java/com/diffplug/spotless/json/JacksonConfig.java
 create mode 100644 lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java
 rename lib/src/main/java/com/diffplug/spotless/yaml/{YamlJacksonStep.java => JacksonYamlStep.java} (70%)
 rename plugin-maven/src/main/java/com/diffplug/spotless/maven/{yaml/Jackson.java => json/JacksonJson.java} (51%)
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/JacksonYaml.java
 create mode 100644 testlib/src/main/resources/json/sortByKeysAfter_Jackson.json
 create mode 100644 testlib/src/main/resources/json/sortByKeysAfter_Jackson_noSpaceAfterKeySeparator.json
 create mode 100644 testlib/src/main/resources/yaml/array_with_bracket.clean_with_eol.yaml

diff --git a/lib/build.gradle b/lib/build.gradle
index 3ef2064765..3c36aa0188 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -57,6 +57,7 @@ dependencies {
 	palantirJavaFormatCompileOnly 'com.palantir.javaformat:palantir-java-format:1.1.0' 	// this version needs to stay compilable against Java 8 for CI Job testNpm
 
 	// used jackson-based formatters
+	jacksonCompileOnly 'com.fasterxml.jackson.core:jackson-databind:2.14.1'
 	jacksonCompileOnly 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.14.1'
 
 	String VER_KTFMT = '0.42'
diff --git a/lib/src/jackson/java/com/diffplug/spotless/glue/json/JsonJacksonFormatterFunc.java b/lib/src/jackson/java/com/diffplug/spotless/glue/json/JsonJacksonFormatterFunc.java
new file mode 100644
index 0000000000..0a13ab6626
--- /dev/null
+++ b/lib/src/jackson/java/com/diffplug/spotless/glue/json/JsonJacksonFormatterFunc.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2021-2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.glue.json;
+
+import java.io.IOException;
+
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.json.JacksonConfig;
+
+/**
+ * A {@link FormatterFunc} based on Jackson library
+ */
+// https://github.com/FasterXML/jackson-dataformats-text/issues/372
+public class JsonJacksonFormatterFunc implements FormatterFunc {
+	private JacksonConfig jacksonConfig;
+
+	public JsonJacksonFormatterFunc(JacksonConfig jacksonConfig) {
+		this.jacksonConfig = jacksonConfig;
+	}
+
+	@Override
+	public String apply(String input) throws Exception {
+		ObjectMapper objectMapper = makeObjectMapper();
+
+		return format(objectMapper, input);
+	}
+
+	/**
+	 * @return a {@link JsonFactory}. May be overridden to handle alternative formats.
+	 * @see <a href="https://github.com/FasterXML/jackson-dataformats-text">jackson-dataformats-text</a>
+	 */
+	protected JsonFactory makeJsonFactory() {
+		return new JsonFactory();
+	}
+
+	protected ObjectMapper makeObjectMapper() {
+		JsonFactory jsonFactory = makeJsonFactory();
+		ObjectMapper objectMapper = new ObjectMapper(jsonFactory);
+
+		// Configure the ObjectMapper
+		// https://github.com/FasterXML/jackson-databind#commonly-used-features
+		jacksonConfig.getFeatureToToggle().forEach((rawFeature, toggle) -> {
+			// https://stackoverflow.com/questions/3735927/java-instantiating-an-enum-using-reflection
+			SerializationFeature feature = SerializationFeature.valueOf(rawFeature);
+
+			objectMapper.configure(feature, toggle);
+		});
+
+		return objectMapper;
+	}
+
+	protected String format(ObjectMapper objectMapper, String input) throws IllegalArgumentException, IOException {
+		// We may consider adding manually an initial '---' prefix to help management of multiple documents
+		// if (!input.trim().startsWith("---")) {
+		// 	input = "---" + "\n" + input;
+		// }
+
+		try {
+			// https://stackoverflow.com/questions/25222327/deserialize-pojos-from-multiple-yaml-documents-in-a-single-file-in-jackson
+			// https://github.com/FasterXML/jackson-dataformats-text/issues/66#issuecomment-375328648
+			// 2023-01: For now, we get 'Cannot deserialize value of type `com.fasterxml.jackson.databind.node.ObjectNode` from Array value'
+			//			JsonParser yamlParser = objectMapper.getFactory().createParser(input);
+			//			List<ObjectNode> docs = objectMapper.readValues(yamlParser, ObjectNode.class).readAll();
+			//			return objectMapper.writeValueAsString(docs);
+
+			// 2023-01: This returns JSON instead of YAML
+			// This will transit with a JsonNode
+			// A JsonNode may keep the comments from the input node
+			// JsonNode jsonNode = objectMapper.readTree(input);
+			//Not 'toPrettyString' as one could require no INDENT_OUTPUT
+			// return jsonNode.toPrettyString();
+			ObjectNode objectNode = objectMapper.readValue(input, ObjectNode.class);
+			String outputFromjackson = objectMapper.writeValueAsString(objectNode);
+
+			if (jacksonConfig.isEndWithEol() && !outputFromjackson.endsWith("\n")) {
+				outputFromjackson += "\n";
+			}
+
+			return outputFromjackson;
+		} catch (JsonProcessingException e) {
+			throw new AssertionError("Unable to format. input='" + input + "'", e);
+		}
+	}
+}
diff --git a/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/YamlJacksonFormatterFunc.java b/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/YamlJacksonFormatterFunc.java
index 30cf538159..eda2675985 100644
--- a/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/YamlJacksonFormatterFunc.java
+++ b/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/YamlJacksonFormatterFunc.java
@@ -15,83 +15,20 @@
  */
 package com.diffplug.spotless.glue.yaml;
 
-import java.io.IOException;
-import java.util.List;
+import com.diffplug.spotless.glue.json.JsonJacksonFormatterFunc;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 
-import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.json.JacksonConfig;
 
-public class YamlJacksonFormatterFunc implements FormatterFunc {
-	private List<String> enabledFeatures;
-	private List<String> disabledFeatures;
+public class YamlJacksonFormatterFunc extends JsonJacksonFormatterFunc {
 
-	public YamlJacksonFormatterFunc(List<String> enabledFeatures, List<String> disabledFeatures) {
-		this.enabledFeatures = enabledFeatures;
-		this.disabledFeatures = disabledFeatures;
+	public YamlJacksonFormatterFunc(JacksonConfig jacksonConfig) {
+		super(jacksonConfig);
 	}
 
 	@Override
-	public String apply(String input) throws Exception {
-		ObjectMapper objectMapper = makeObjectMapper();
-
-		return format(objectMapper, input);
-	}
-
-	protected ObjectMapper makeObjectMapper() {
-		YAMLFactory yamlFactory = new YAMLFactory();
-		ObjectMapper objectMapper = new ObjectMapper(yamlFactory);
-
-		// Configure the ObjectMapper
-		// https://github.com/FasterXML/jackson-databind#commonly-used-features
-		for (String rawFeature : enabledFeatures) {
-			// https://stackoverflow.com/questions/3735927/java-instantiating-an-enum-using-reflection
-			SerializationFeature feature = SerializationFeature.valueOf(rawFeature);
-
-			objectMapper.enable(feature);
-		}
-
-		for (String rawFeature : disabledFeatures) {
-			// https://stackoverflow.com/questions/3735927/java-instantiating-an-enum-using-reflection
-			SerializationFeature feature = SerializationFeature.valueOf(rawFeature);
-
-			objectMapper.disable(feature);
-		}
-		return objectMapper;
-	}
-
-	protected String format(ObjectMapper objectMapper, String input) throws IllegalArgumentException, IOException {
-		// We may consider adding manually an initial '---' prefix to help management of multiple documents
-		// if (!input.trim().startsWith("---")) {
-		// 	input = "---" + "\n" + input;
-		// }
-
-		try {
-			// https://stackoverflow.com/questions/25222327/deserialize-pojos-from-multiple-yaml-documents-in-a-single-file-in-jackson
-			// https://github.com/FasterXML/jackson-dataformats-text/issues/66#issuecomment-375328648
-			// 2023-01: For now, we get 'Cannot deserialize value of type `com.fasterxml.jackson.databind.node.ObjectNode` from Array value'
-			//			JsonParser yamlParser = objectMapper.getFactory().createParser(input);
-			//			List<ObjectNode> docs = objectMapper.readValues(yamlParser, ObjectNode.class).readAll();
-			//			return objectMapper.writeValueAsString(docs);
-
-			// 2023-01: This returns JSON instead of YAML
-			// This will transit with a JsonNode
-			// A JsonNode may keep the comments from the input node
-			// JsonNode jsonNode = objectMapper.readTree(input);
-			//Not 'toPrettyString' as one could require no INDENT_OUTPUT
-			// return jsonNode.toPrettyString();
-			ObjectNode objectNode = objectMapper.readValue(input, ObjectNode.class);
-			return objectMapper.writeValueAsString(objectNode);
-		} catch (JsonProcessingException e) {
-			throw new AssertionError("Unable to format YAML. input='" + input + "'", e);
-		}
+	protected YAMLFactory makeJsonFactory() {
+		return new YAMLFactory();
 	}
-
-	// Spotbugs
-	private static class ObjectNodeTypeReference extends TypeReference<ObjectNode> {}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/json/JacksonConfig.java b/lib/src/main/java/com/diffplug/spotless/json/JacksonConfig.java
new file mode 100644
index 0000000000..526e235eb7
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/json/JacksonConfig.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.json;
+
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * A DTO holding the options for Jackson-based formatters
+ */
+public class JacksonConfig {
+
+	private static final Map<String, Boolean> DEFAULT_FEATURE_TOGGLES;
+
+	static {
+		Map<String, Boolean> defaultFeatureToggles = new LinkedHashMap<>();
+		// We activate by default the PrettyPrinter from Jackson
+		defaultFeatureToggles.put("INDENT_OUTPUT", true);
+		DEFAULT_FEATURE_TOGGLES = defaultFeatureToggles;
+	}
+
+	protected Map<String, Boolean> featureToToggle;
+
+	// https://github.com/revelc/formatter-maven-plugin/pull/405
+	protected boolean endWithEol = false;
+
+	// https://github.com/revelc/formatter-maven-plugin/pull/280
+	protected boolean spaceBeforeSeparator = false;
+
+	public Map<String, Boolean> getFeatureToToggle() {
+		return Collections.unmodifiableMap(featureToToggle);
+	}
+
+	public void setFeatureToToggle(Map<String, Boolean> featureToToggle) {
+		this.featureToToggle = featureToToggle;
+	}
+
+	public void appendFeatureToToggle(Map<String, Boolean> features) {
+		this.featureToToggle.putAll(features);
+	}
+
+	public boolean isEndWithEol() {
+		return endWithEol;
+	}
+
+	public void setEndWithEol(boolean endWithEol) {
+		this.endWithEol = endWithEol;
+	}
+
+	public boolean isSpaceBeforeSeparator() {
+		return spaceBeforeSeparator;
+	}
+
+	public void setSpaceBeforeSeparator(boolean spaceBeforeSeparator) {
+		this.spaceBeforeSeparator = spaceBeforeSeparator;
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java b/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java
new file mode 100644
index 0000000000..0fe1ab057b
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2021-2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.json;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Objects;
+
+import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.JarState;
+import com.diffplug.spotless.Provisioner;
+
+/**
+ * Simple YAML formatter which reformats the file according to Jackson YAMLFactory.
+ */
+// https://stackoverflow.com/questions/14515994/convert-json-string-to-pretty-print-json-output-using-jackson
+public class JacksonJsonStep {
+	static final String MAVEN_COORDINATE = "com.fasterxml.jackson.core:jackson-databind:";
+	// https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind
+	static final String DEFAULT_VERSION = "2.14.1";
+
+	private JacksonJsonStep() {}
+
+	public static String defaultVersion() {
+		return DEFAULT_VERSION;
+	}
+
+	public static FormatterStep create(JacksonConfig jacksonConfig,
+			String jacksonVersion,
+			Provisioner provisioner) {
+		Objects.requireNonNull(provisioner, "provisioner cannot be null");
+		return FormatterStep.createLazy("json",
+				() -> new State(jacksonConfig, jacksonVersion, provisioner),
+				State::toFormatter);
+	}
+
+	public static FormatterStep create(Provisioner provisioner) {
+		return create(new JacksonConfig(), defaultVersion(), provisioner);
+	}
+
+	private static final class State implements Serializable {
+		private static final long serialVersionUID = 1L;
+
+		private final JacksonConfig jacksonConfig;
+
+		private final JarState jarState;
+
+		private State(JacksonConfig jacksonConfig,
+				String jacksonVersion,
+				Provisioner provisioner) throws IOException {
+			this.jacksonConfig = jacksonConfig;
+
+			this.jarState = JarState.from(JacksonJsonStep.MAVEN_COORDINATE + jacksonVersion, provisioner);
+		}
+
+		FormatterFunc toFormatter() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException,
+				InstantiationException, IllegalAccessException {
+			Class<?> formatterFunc = jarState.getClassLoader().loadClass("com.diffplug.spotless.glue.json.JacksonJsonFormatterFunc");
+			Constructor<?> constructor = formatterFunc.getConstructor(JacksonConfig.class);
+			return (FormatterFunc) constructor.newInstance(jacksonConfig);
+		}
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/yaml/YamlJacksonStep.java b/lib/src/main/java/com/diffplug/spotless/yaml/JacksonYamlStep.java
similarity index 70%
rename from lib/src/main/java/com/diffplug/spotless/yaml/YamlJacksonStep.java
rename to lib/src/main/java/com/diffplug/spotless/yaml/JacksonYamlStep.java
index db2525ab97..944d90e6c9 100644
--- a/lib/src/main/java/com/diffplug/spotless/yaml/YamlJacksonStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/yaml/JacksonYamlStep.java
@@ -19,67 +19,62 @@
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
-import java.util.Arrays;
-import java.util.List;
 import java.util.Objects;
 
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
+import com.diffplug.spotless.json.JacksonConfig;
 
 /**
  * Simple YAML formatter which reformats the file according to Jackson YAMLFactory.
  */
 // https://stackoverflow.com/questions/14515994/convert-json-string-to-pretty-print-json-output-using-jackson
-public class YamlJacksonStep {
+public class JacksonYamlStep {
 	static final String MAVEN_COORDINATE = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:";
 	// https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml
 	static final String DEFAULT_VERSION = "2.14.1";
 
-	private YamlJacksonStep() {}
+	private JacksonYamlStep() {}
 
 	public static String defaultVersion() {
 		return DEFAULT_VERSION;
 	}
 
-	public static FormatterStep create(List<String> enabledFeatures,
-			List<String> disabledFeatures,
+	public static FormatterStep create(JacksonConfig jacksonConfig,
 			String jacksonVersion,
 			Provisioner provisioner) {
 		Objects.requireNonNull(provisioner, "provisioner cannot be null");
 		return FormatterStep.createLazy("yaml",
-				() -> new State(enabledFeatures, disabledFeatures, jacksonVersion, provisioner),
+				() -> new State(jacksonConfig, jacksonVersion, provisioner),
 				State::toFormatter);
 	}
 
 	public static FormatterStep create(Provisioner provisioner) {
-		return create(Arrays.asList("INDENT_OUTPUT"), Arrays.asList(), defaultVersion(), provisioner);
+		return create(new JacksonConfig(), defaultVersion(), provisioner);
 	}
 
 	private static final class State implements Serializable {
 		private static final long serialVersionUID = 1L;
 
-		private final List<String> enabledFeatures;
-		private final List<String> disabledFeatures;
+		private final JacksonConfig jacksonConfig;
 
 		private final JarState jarState;
 
-		private State(List<String> enabledFeatures,
-				List<String> disabledFeatures,
+		private State(JacksonConfig jacksonConfig,
 				String jacksonVersion,
 				Provisioner provisioner) throws IOException {
-			this.enabledFeatures = enabledFeatures;
-			this.disabledFeatures = disabledFeatures;
+			this.jacksonConfig = jacksonConfig;
 
-			this.jarState = JarState.from(YamlJacksonStep.MAVEN_COORDINATE + jacksonVersion, provisioner);
+			this.jarState = JarState.from(JacksonYamlStep.MAVEN_COORDINATE + jacksonVersion, provisioner);
 		}
 
 		FormatterFunc toFormatter() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException,
 				InstantiationException, IllegalAccessException {
-			Class<?> formatterFunc = jarState.getClassLoader().loadClass("com.diffplug.spotless.glue.yaml.YamlJacksonFormatterFunc");
-			Constructor<?> constructor = formatterFunc.getConstructor(List.class, List.class);
-			return (FormatterFunc) constructor.newInstance(enabledFeatures, disabledFeatures);
+			Class<?> formatterFunc = jarState.getClassLoader().loadClass("com.diffplug.spotless.glue.yaml.JacksonYamlFormatterFunc");
+			Constructor<?> constructor = formatterFunc.getConstructor(JacksonConfig.class);
+			return (FormatterFunc) constructor.newInstance(jacksonConfig);
 		}
 	}
 }
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/Jackson.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/JacksonJson.java
similarity index 51%
rename from plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/Jackson.java
rename to plugin-maven/src/main/java/com/diffplug/spotless/maven/json/JacksonJson.java
index 2bc7617a38..cf03ef21ca 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/Jackson.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/JacksonJson.java
@@ -13,34 +13,44 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.diffplug.spotless.maven.yaml;
+package com.diffplug.spotless.maven.json;
 
-import java.util.Arrays;
-import java.util.List;
+import java.util.Collections;
+import java.util.Map;
 
 import org.apache.maven.plugins.annotations.Parameter;
 
 import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.json.JacksonConfig;
+import com.diffplug.spotless.json.JacksonJsonStep;
+import com.diffplug.spotless.maven.FormatterFactory;
 import com.diffplug.spotless.maven.FormatterStepConfig;
 import com.diffplug.spotless.maven.FormatterStepFactory;
-import com.diffplug.spotless.yaml.YamlJacksonStep;
 
-public class Jackson implements FormatterStepFactory {
+/**
+ * A {@link FormatterFactory} implementation that corresponds to {@code <jackson>...</jackson>} configuration element.
+ */
+public class JacksonJson implements FormatterStepFactory {
 
 	@Parameter
-	private String version = YamlJacksonStep.defaultVersion();
+	String version = JacksonJsonStep.defaultVersion();
 
 	@Parameter
-	private String[] enabledFeatures = new String[]{"INDENT_OUTPUT"};
+	boolean endWithEol = new JacksonConfig().isEndWithEol();
 
 	@Parameter
-	private String[] disabledFeatures = new String[0];
+	private Map<String, Boolean> features = Collections.emptyMap();
 
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
-		List<String> enabledFeaturesAsList = Arrays.asList(enabledFeatures);
-		List<String> disabledFeaturesAsList = Arrays.asList(disabledFeatures);
-		return YamlJacksonStep
-				.create(enabledFeaturesAsList, disabledFeaturesAsList, version, stepConfig.getProvisioner());
+		JacksonConfig jacksonConfig = new JacksonConfig();
+
+		if (features != null) {
+			jacksonConfig.appendFeatureToToggle(features);
+		}
+		jacksonConfig.setEndWithEol(endWithEol);
+
+		return JacksonJsonStep
+				.create(jacksonConfig, version, stepConfig.getProvisioner());
 	}
 }
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java
index c326525d0c..852088278a 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java
@@ -44,4 +44,8 @@ public void addGson(Gson gson) {
 		addStepFactory(gson);
 	}
 
+	public void addJackson(JacksonJson jackson) {
+		addStepFactory(jackson);
+	}
+
 }
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/JacksonYaml.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/JacksonYaml.java
new file mode 100644
index 0000000000..d3d9558cf4
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/JacksonYaml.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.yaml;
+
+import java.util.Collections;
+import java.util.Map;
+
+import com.diffplug.spotless.maven.FormatterFactory;
+
+import org.apache.maven.plugins.annotations.Parameter;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.json.JacksonConfig;
+import com.diffplug.spotless.maven.FormatterStepConfig;
+import com.diffplug.spotless.maven.FormatterStepFactory;
+import com.diffplug.spotless.yaml.JacksonYamlStep;
+
+/**
+ * A {@link FormatterFactory} implementation that corresponds to {@code <jackson>...</jackson>} configuration element.
+ */
+public class JacksonYaml implements FormatterStepFactory {
+
+	@Parameter
+	private String version = JacksonYamlStep.defaultVersion();
+
+	@Parameter
+	boolean endWithEol = new JacksonConfig().isEndWithEol();
+
+	@Parameter
+	boolean spaceBeforeSeparator = new JacksonConfig().isSpaceBeforeSeparator();
+
+	@Parameter
+	private Map<String, Boolean> features = Collections.emptyMap();
+
+	@Override
+	public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
+		JacksonConfig jacksonConfig = new JacksonConfig();
+
+		if (features != null) {
+			jacksonConfig.appendFeatureToToggle(features);
+		}
+		jacksonConfig.setEndWithEol(endWithEol);
+
+		return JacksonYamlStep
+				.create(jacksonConfig, version, stepConfig.getProvisioner());
+	}
+}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/Yaml.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/Yaml.java
index 6cba1b2ebd..a6ceaaa592 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/Yaml.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/Yaml.java
@@ -34,7 +34,7 @@ public String licenseHeaderDelimiter() {
 		return null;
 	}
 
-	public void addJackson(Jackson jackson) {
+	public void addJackson(JacksonYaml jackson) {
 		addStepFactory(jackson);
 	}
 
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java
index e492109faa..90b3a2f077 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java
@@ -58,8 +58,6 @@ public void testFormatJson_WithGson_sortByKeys() throws Exception {
 		setFile("json_test.json").toResource("json/sortByKeysBefore.json");
 
 		String output = mavenRunner().withArguments("spotless:apply").runNoError().output();
-		LOGGER.error(output);
-		System.err.println(output);
 		assertFile("json_test.json").sameAsResource("json/sortByKeysAfter.json");
 	}
 
@@ -72,4 +70,25 @@ public void testFormatJson_WithGson_defaultConfig_nestedObject() throws Exceptio
 		assertFile("json_test.json").sameAsResource("json/nestedObjectAfter.json");
 	}
 
+
+	@Test
+	public void testFormatJson_WithJackson_sortByKeys() throws Exception {
+		writePomWithJsonSteps("<jackson><features><ORDER_MAP_ENTRIES_BY_KEYS>true</ORDER_MAP_ENTRIES_BY_KEYS></features></jackson>");
+
+		setFile("json_test.json").toResource("json/sortByKeysBefore.json");
+
+		String output = mavenRunner().withArguments("spotless:apply").runNoError().output();
+		assertFile("json_test.json").sameAsResource("json/sortByKeysAfter.json");
+	}
+
+	@Test
+	public void testFormatJson_WithJackson_sortByKeys_noSpaceAfterKeySeparator() throws Exception {
+		writePomWithJsonSteps("<jackson><spaceBeforeSeparator>false</spaceBeforeSeparator><features><ORDER_MAP_ENTRIES_BY_KEYS>true</ORDER_MAP_ENTRIES_BY_KEYS></features></jackson>");
+
+		setFile("json_test.json").toResource("json/sortByKeysBefore.json");
+
+		String output = mavenRunner().withArguments("spotless:apply").runNoError().output();
+		assertFile("json_test.json").sameAsResource("json/sortByKeysAfter.json");
+	}
+
 }
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java
index b5a417c536..15366ab2e6 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java
@@ -48,6 +48,15 @@ public void testFormatYaml_WithJackson_defaultConfig_arrayBrackets() throws Exce
 		assertFile("yaml_test.yaml").sameAsResource("yaml/array_with_bracket.clean.yaml");
 	}
 
+	@Test
+	public void testFormatYaml_WithJackson_defaultConfig_arrayBrackets_withEol() throws Exception {
+		writePomWithYamlSteps("<jackson><endWithEol>true</endWithEol></jackson>");
+
+		setFile("yaml_test.yaml").toResource("yaml/array_with_bracket.yaml");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("yaml_test.yaml").sameAsResource("yaml/array_with_bracket.clean_with_eol.yaml");
+	}
+
 	@Test
 	public void testFormatYaml_WithJackson_defaultConfig_multipleDocuments() throws Exception {
 		writePomWithYamlSteps("<jackson/>");
diff --git a/testlib/src/main/resources/json/sortByKeysAfter_Jackson.json b/testlib/src/main/resources/json/sortByKeysAfter_Jackson.json
new file mode 100644
index 0000000000..c4a48de2f2
--- /dev/null
+++ b/testlib/src/main/resources/json/sortByKeysAfter_Jackson.json
@@ -0,0 +1,19 @@
+{
+    "A": 1,
+    "X": 2,
+    "_arraysNotSorted": [
+        3,
+        2,
+        1
+    ],
+    "a": 3,
+    "c": 4,
+    "x": 5,
+    "z": {
+        "A": 1,
+        "X": 2,
+        "a": 3,
+        "c": 4,
+        "x": 5
+    }
+}
diff --git a/testlib/src/main/resources/json/sortByKeysAfter_Jackson_noSpaceAfterKeySeparator.json b/testlib/src/main/resources/json/sortByKeysAfter_Jackson_noSpaceAfterKeySeparator.json
new file mode 100644
index 0000000000..c4a48de2f2
--- /dev/null
+++ b/testlib/src/main/resources/json/sortByKeysAfter_Jackson_noSpaceAfterKeySeparator.json
@@ -0,0 +1,19 @@
+{
+    "A": 1,
+    "X": 2,
+    "_arraysNotSorted": [
+        3,
+        2,
+        1
+    ],
+    "a": 3,
+    "c": 4,
+    "x": 5,
+    "z": {
+        "A": 1,
+        "X": 2,
+        "a": 3,
+        "c": 4,
+        "x": 5
+    }
+}
diff --git a/testlib/src/main/resources/yaml/array_with_bracket.clean_with_eol.yaml b/testlib/src/main/resources/yaml/array_with_bracket.clean_with_eol.yaml
new file mode 100644
index 0000000000..6080ba1f82
--- /dev/null
+++ b/testlib/src/main/resources/yaml/array_with_bracket.clean_with_eol.yaml
@@ -0,0 +1,12 @@
+---
+episodes:
+- 1
+- 2
+- 3
+- 4
+- 5
+- 6
+- 7
+best-jedi:
+  name: "Obi-Wan"
+  side: "light"

From 6c20790c626b05045dc8e53afce004cbac9b8d9c Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Sun, 15 Jan 2023 16:21:38 -0800
Subject: [PATCH 0587/2068] Format more type annotations as type annotations

---
 CHANGES.md                                                | 2 ++
 .../com/diffplug/spotless/java/FormatAnnotationsStep.java | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index c08ca86796..b871fc4be8 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -22,6 +22,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Support `ktlint` 0.48+ new rule disabling syntax ([#1456](https://github.com/diffplug/spotless/pull/1456)) fixes ([#1444](https://github.com/diffplug/spotless/issues/1444))
 * Fix subgroups leading catch all matcher.
+* Format more type annotations as type annotations [#????](https://github.com/diffplug/spotless/pull/????)
+
 ### Changes
 * Bump default version for `prettier` from `2.0.5` to `2.8.1` ([#1453](https://github.com/diffplug/spotless/pull/1453))
 * Bump the dev version of Gradle from `7.5.1` to `7.6` ([#1409](https://github.com/diffplug/spotless/pull/1409))
diff --git a/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java b/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java
index d05a53ee1b..f37502d145 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java
@@ -55,6 +55,13 @@ public final class FormatAnnotationsStep {
 					"Acceleration",
 					"ACCTop",
 					"AinferBottom",
+					"AinferDefaultType",
+					"AinferParent",
+					"AinferSibling1",
+					"AinferSibling2",
+					"AinferTop",
+					"AinferImplicitAnno",
+					"AinferSiblingWithFields",
 					"AlwaysSafe",
 					"Angle",
 					"AnnoWithStringArg",
@@ -102,6 +109,7 @@ public final class FormatAnnotationsStep {
 					"DefaultType",
 					"degrees",
 					"Det",
+					"DoesNotMatchRegex",
 					"DotSeparatedIdentifiers",
 					"DotSeparatedIdentifiersOrPrimitiveType",
 					"DoubleVal",

From b4c0f1b8abf725ad5adc3dcd6f377613b901d0d4 Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Sun, 15 Jan 2023 16:24:54 -0800
Subject: [PATCH 0588/2068] Update `CHANGES.md` files

---
 CHANGES.md               | 3 +--
 plugin-gradle/CHANGES.md | 1 +
 plugin-maven/CHANGES.md  | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index b871fc4be8..2f8ecc46f5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -22,8 +22,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Support `ktlint` 0.48+ new rule disabling syntax ([#1456](https://github.com/diffplug/spotless/pull/1456)) fixes ([#1444](https://github.com/diffplug/spotless/issues/1444))
 * Fix subgroups leading catch all matcher.
-* Format more type annotations as type annotations [#????](https://github.com/diffplug/spotless/pull/????)
-
+* Format more type annotations as type annotations [#1494](https://github.com/diffplug/spotless/pull/1494)
 ### Changes
 * Bump default version for `prettier` from `2.0.5` to `2.8.1` ([#1453](https://github.com/diffplug/spotless/pull/1453))
 * Bump the dev version of Gradle from `7.5.1` to `7.6` ([#1409](https://github.com/diffplug/spotless/pull/1409))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index f6210ce8de..ef2b7a74c3 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -13,6 +13,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Prevent tool configurations from being resolved outside project ([#1447](https://github.com/diffplug/spotless/pull/1447) fixes [#1215](https://github.com/diffplug/spotless/issues/1215))
 * Support `ktlint` 0.48+ new rule disabling syntax ([#1456](https://github.com/diffplug/spotless/pull/1456)) fixes ([#1444](https://github.com/diffplug/spotless/issues/1444))
 * Fix subgroups leading catch all matcher.
+* Format more type annotations as type annotations [#1494](https://github.com/diffplug/spotless/pull/1494)
 ### Changes
 * Bump default `ktlint` version to latest `0.47.1` -> `0.48.1` ([#1456](https://github.com/diffplug/spotless/pull/1456))
 * Bump default version for `prettier` from `2.0.5` to `2.8.1` ([#1453](https://github.com/diffplug/spotless/pull/1453))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 6f59030a8e..71d44df464 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -14,6 +14,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Support `ktlint` 0.48+ new rule disabling syntax ([#1456](https://github.com/diffplug/spotless/pull/1456)) fixes ([#1444](https://github.com/diffplug/spotless/issues/1444))
 * Fix subgroups leading catch all matcher.
+* Format more type annotations as type annotations [#1494](https://github.com/diffplug/spotless/pull/1494)
 ### Changes
 * Bump default `ktlint` version to latest `0.47.1` -> `0.48.1` ([#1456](https://github.com/diffplug/spotless/pull/1456))
 * Reduce spurious invalidations of the up-to-date index file ([#1461](https://github.com/diffplug/spotless/pull/1461))

From 48245dfa47abf5ce4d87189a5eb8883ec7f3d698 Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Sun, 15 Jan 2023 16:27:02 -0800
Subject: [PATCH 0589/2068] Update copyright date

---
 .../java/com/diffplug/spotless/java/FormatAnnotationsStep.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java b/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java
index f37502d145..5a2d856850 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 DiffPlug
+ * Copyright 2022-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 70f38248ba47310e58e58970e0885d437e77c775 Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Sun, 15 Jan 2023 16:34:20 -0800
Subject: [PATCH 0590/2068] Move changelog entry

---
 CHANGES.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 2f8ecc46f5..9c0ed23980 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,10 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+### Fixed
+* Format more type annotations as type annotations [#1494](https://github.com/diffplug/spotless/pull/1494)
+### Changes
 
 ## [2.32.0] - 2023-01-13
 ### Added
@@ -22,7 +26,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Support `ktlint` 0.48+ new rule disabling syntax ([#1456](https://github.com/diffplug/spotless/pull/1456)) fixes ([#1444](https://github.com/diffplug/spotless/issues/1444))
 * Fix subgroups leading catch all matcher.
-* Format more type annotations as type annotations [#1494](https://github.com/diffplug/spotless/pull/1494)
 ### Changes
 * Bump default version for `prettier` from `2.0.5` to `2.8.1` ([#1453](https://github.com/diffplug/spotless/pull/1453))
 * Bump the dev version of Gradle from `7.5.1` to `7.6` ([#1409](https://github.com/diffplug/spotless/pull/1409))

From 65e74655e9191d1c891cafb6e3c5683da35bb041 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Mon, 16 Jan 2023 21:17:46 +0400
Subject: [PATCH 0591/2068] Add doc, Improve tests

---
 CHANGES.md                                    |  2 +
 ...unc.java => JacksonJsonFormatterFunc.java} | 53 +++++++++++++--
 .../glue/yaml/JacksonYamlFormatterFunc.java   | 66 +++++++++++++++++++
 .../glue/yaml/YamlJacksonFormatterFunc.java   | 34 ----------
 .../diffplug/spotless/json/JacksonConfig.java | 27 ++++----
 plugin-maven/CHANGES.md                       |  5 ++
 plugin-maven/README.md                        | 12 ++--
 .../spotless/maven/json/JacksonJson.java      | 10 ++-
 .../spotless/maven/yaml/JacksonYaml.java      | 14 ++--
 .../spotless/maven/json/JsonTest.java         |  9 ++-
 .../spotless/maven/yaml/YamlTest.java         |  6 +-
 ...After_Jackson_spaceAfterKeySeparator.json} |  0
 ...h_bracket.clean.spaceBeforeSeparator.yaml} |  2 +-
 13 files changed, 156 insertions(+), 84 deletions(-)
 rename lib/src/jackson/java/com/diffplug/spotless/glue/json/{JsonJacksonFormatterFunc.java => JacksonJsonFormatterFunc.java} (70%)
 create mode 100644 lib/src/jackson/java/com/diffplug/spotless/glue/yaml/JacksonYamlFormatterFunc.java
 delete mode 100644 lib/src/jackson/java/com/diffplug/spotless/glue/yaml/YamlJacksonFormatterFunc.java
 rename testlib/src/main/resources/json/{sortByKeysAfter_Jackson_noSpaceAfterKeySeparator.json => sortByKeysAfter_Jackson_spaceAfterKeySeparator.json} (100%)
 rename testlib/src/main/resources/yaml/{array_with_bracket.clean_with_eol.yaml => array_with_bracket.clean.spaceBeforeSeparator.yaml} (81%)

diff --git a/CHANGES.md b/CHANGES.md
index c08ca86796..fd10d2c14e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Changes
+* Rename `YamlJacksonStep` into `JacksonYamlStep` while normalizing Jackson usage ([#1492](https://github.com/diffplug/spotless/pull/1492))
 
 ## [2.32.0] - 2023-01-13
 ### Added
diff --git a/lib/src/jackson/java/com/diffplug/spotless/glue/json/JsonJacksonFormatterFunc.java b/lib/src/jackson/java/com/diffplug/spotless/glue/json/JacksonJsonFormatterFunc.java
similarity index 70%
rename from lib/src/jackson/java/com/diffplug/spotless/glue/json/JsonJacksonFormatterFunc.java
rename to lib/src/jackson/java/com/diffplug/spotless/glue/json/JacksonJsonFormatterFunc.java
index 0a13ab6626..c19e56b549 100644
--- a/lib/src/jackson/java/com/diffplug/spotless/glue/json/JsonJacksonFormatterFunc.java
+++ b/lib/src/jackson/java/com/diffplug/spotless/glue/json/JacksonJsonFormatterFunc.java
@@ -16,9 +16,14 @@
 package com.diffplug.spotless.glue.json;
 
 import java.io.IOException;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.util.DefaultIndenter;
+import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
+import com.fasterxml.jackson.core.util.Separators;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -30,10 +35,10 @@
  * A {@link FormatterFunc} based on Jackson library
  */
 // https://github.com/FasterXML/jackson-dataformats-text/issues/372
-public class JsonJacksonFormatterFunc implements FormatterFunc {
+public class JacksonJsonFormatterFunc implements FormatterFunc {
 	private JacksonConfig jacksonConfig;
 
-	public JsonJacksonFormatterFunc(JacksonConfig jacksonConfig) {
+	public JacksonJsonFormatterFunc(JacksonConfig jacksonConfig) {
 		this.jacksonConfig = jacksonConfig;
 	}
 
@@ -56,6 +61,8 @@ protected ObjectMapper makeObjectMapper() {
 		JsonFactory jsonFactory = makeJsonFactory();
 		ObjectMapper objectMapper = new ObjectMapper(jsonFactory);
 
+		objectMapper.setDefaultPrettyPrinter(makePrinter());
+
 		// Configure the ObjectMapper
 		// https://github.com/FasterXML/jackson-databind#commonly-used-features
 		jacksonConfig.getFeatureToToggle().forEach((rawFeature, toggle) -> {
@@ -68,6 +75,44 @@ protected ObjectMapper makeObjectMapper() {
 		return objectMapper;
 	}
 
+	protected DefaultPrettyPrinter makePrinter() {
+		boolean spaceBeforeSeparator = jacksonConfig.isSpaceBeforeSeparator();
+
+		DefaultPrettyPrinter.Indenter indenter = new DefaultIndenter(getIndentation(), "\n");
+		DefaultPrettyPrinter printer = new DefaultPrettyPrinter() {
+			private static final long serialVersionUID = 1L;
+
+			@Override
+			public DefaultPrettyPrinter createInstance() {
+				return new DefaultPrettyPrinter(this);
+			}
+
+			@Override
+			public DefaultPrettyPrinter withSeparators(Separators separators) {
+				this._separators = separators;
+				if (spaceBeforeSeparator) {
+					this._objectFieldValueSeparatorWithSpaces = " " + separators.getObjectFieldValueSeparator() + " ";
+				} else {
+					this._objectFieldValueSeparatorWithSpaces = separators.getObjectFieldValueSeparator() + " ";
+				}
+				return this;
+			}
+		};
+
+		printer.indentObjectsWith(indenter);
+		printer.indentArraysWith(indenter);
+		return printer;
+	}
+
+	protected String getIndentation() {
+		int indentSpaces = jacksonConfig.getIndentSpaces();
+		if (indentSpaces < 0) {
+			return "\t";
+		} else {
+			return IntStream.range(0, indentSpaces).mapToObj(i -> "").collect(Collectors.joining());
+		}
+	}
+
 	protected String format(ObjectMapper objectMapper, String input) throws IllegalArgumentException, IOException {
 		// We may consider adding manually an initial '---' prefix to help management of multiple documents
 		// if (!input.trim().startsWith("---")) {
@@ -91,10 +136,6 @@ protected String format(ObjectMapper objectMapper, String input) throws IllegalA
 			ObjectNode objectNode = objectMapper.readValue(input, ObjectNode.class);
 			String outputFromjackson = objectMapper.writeValueAsString(objectNode);
 
-			if (jacksonConfig.isEndWithEol() && !outputFromjackson.endsWith("\n")) {
-				outputFromjackson += "\n";
-			}
-
 			return outputFromjackson;
 		} catch (JsonProcessingException e) {
 			throw new AssertionError("Unable to format. input='" + input + "'", e);
diff --git a/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/JacksonYamlFormatterFunc.java b/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/JacksonYamlFormatterFunc.java
new file mode 100644
index 0000000000..6a471a884c
--- /dev/null
+++ b/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/JacksonYamlFormatterFunc.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2021-2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.glue.yaml;
+
+import java.io.IOException;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+
+import com.diffplug.spotless.glue.json.JacksonJsonFormatterFunc;
+import com.diffplug.spotless.json.JacksonConfig;
+
+public class JacksonYamlFormatterFunc extends JacksonJsonFormatterFunc {
+
+	public JacksonYamlFormatterFunc(JacksonConfig jacksonConfig) {
+		super(jacksonConfig);
+	}
+
+	@Override
+	protected YAMLFactory makeJsonFactory() {
+		return new YAMLFactory();
+	}
+
+	@Override
+	protected String format(ObjectMapper objectMapper, String input) throws IllegalArgumentException, IOException {
+		// We may consider adding manually an initial '---' prefix to help management of multiple documents
+		// if (!input.trim().startsWith("---")) {
+		// 	input = "---" + "\n" + input;
+		// }
+
+		try {
+			// https://stackoverflow.com/questions/25222327/deserialize-pojos-from-multiple-yaml-documents-in-a-single-file-in-jackson
+			// https://github.com/FasterXML/jackson-dataformats-text/issues/66#issuecomment-375328648
+			// 2023-01: For now, we get 'Cannot deserialize value of type `com.fasterxml.jackson.databind.node.ObjectNode` from Array value'
+			//			JsonParser yamlParser = objectMapper.getFactory().createParser(input);
+			//			List<ObjectNode> docs = objectMapper.readValues(yamlParser, ObjectNode.class).readAll();
+			//			return objectMapper.writeValueAsString(docs);
+
+			// A JsonNode may keep the comments from the input node
+			// JsonNode jsonNode = objectMapper.readTree(input);
+			//Not 'toPrettyString' as one could require no INDENT_OUTPUT
+			// return jsonNode.toPrettyString();
+			ObjectNode objectNode = objectMapper.readValue(input, ObjectNode.class);
+			String outputFromjackson = objectMapper.writeValueAsString(objectNode);
+
+			return outputFromjackson;
+		} catch (JsonProcessingException e) {
+			throw new AssertionError("Unable to format. input='" + input + "'", e);
+		}
+	}
+}
diff --git a/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/YamlJacksonFormatterFunc.java b/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/YamlJacksonFormatterFunc.java
deleted file mode 100644
index eda2675985..0000000000
--- a/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/YamlJacksonFormatterFunc.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2021-2023 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.glue.yaml;
-
-import com.diffplug.spotless.glue.json.JsonJacksonFormatterFunc;
-
-import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
-
-import com.diffplug.spotless.json.JacksonConfig;
-
-public class YamlJacksonFormatterFunc extends JsonJacksonFormatterFunc {
-
-	public YamlJacksonFormatterFunc(JacksonConfig jacksonConfig) {
-		super(jacksonConfig);
-	}
-
-	@Override
-	protected YAMLFactory makeJsonFactory() {
-		return new YAMLFactory();
-	}
-}
diff --git a/lib/src/main/java/com/diffplug/spotless/json/JacksonConfig.java b/lib/src/main/java/com/diffplug/spotless/json/JacksonConfig.java
index 526e235eb7..2fadf31d78 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/JacksonConfig.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/JacksonConfig.java
@@ -15,6 +15,7 @@
  */
 package com.diffplug.spotless.json;
 
+import java.io.Serializable;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -22,7 +23,7 @@
 /**
  * A DTO holding the options for Jackson-based formatters
  */
-public class JacksonConfig {
+public class JacksonConfig implements Serializable {
 
 	private static final Map<String, Boolean> DEFAULT_FEATURE_TOGGLES;
 
@@ -33,14 +34,14 @@ public class JacksonConfig {
 		DEFAULT_FEATURE_TOGGLES = defaultFeatureToggles;
 	}
 
-	protected Map<String, Boolean> featureToToggle;
-
-	// https://github.com/revelc/formatter-maven-plugin/pull/405
-	protected boolean endWithEol = false;
+	protected Map<String, Boolean> featureToToggle = new LinkedHashMap<>();
 
 	// https://github.com/revelc/formatter-maven-plugin/pull/280
+	// By default, Jackson adds a ' ' before separator, which is not standard with most IDE/JSON libraries
 	protected boolean spaceBeforeSeparator = false;
 
+	// protected int indentSpaces;
+
 	public Map<String, Boolean> getFeatureToToggle() {
 		return Collections.unmodifiableMap(featureToToggle);
 	}
@@ -53,14 +54,6 @@ public void appendFeatureToToggle(Map<String, Boolean> features) {
 		this.featureToToggle.putAll(features);
 	}
 
-	public boolean isEndWithEol() {
-		return endWithEol;
-	}
-
-	public void setEndWithEol(boolean endWithEol) {
-		this.endWithEol = endWithEol;
-	}
-
 	public boolean isSpaceBeforeSeparator() {
 		return spaceBeforeSeparator;
 	}
@@ -68,4 +61,12 @@ public boolean isSpaceBeforeSeparator() {
 	public void setSpaceBeforeSeparator(boolean spaceBeforeSeparator) {
 		this.spaceBeforeSeparator = spaceBeforeSeparator;
 	}
+
+	//	public int getIndentSpaces() {
+	//		return indentSpaces;
+	//	}
+
+	//	public void setIndentSpaces(int indentSpaces) {
+	//		this.indentSpaces = indentSpaces;
+	//	}
 }
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 05cc349e9f..d6326cba12 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,11 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* Introduce `<json><jackson/></json>` ([#1492](https://github.com/diffplug/spotless/pull/1492))
+  * **POTENTIALLY BREAKING** `JacksonYaml` is now configured with a `Map<String, Boolean>` to configure features
+* Jackson (JSON and YAML) has new `spaceBeforeSeparator` option
+  * **POTENTIALLY BREAKING** `spaceBeforeSeparator` is defaulted to false while the formatter was behaving with `<spaceBeforeSeparator>true<spaceBeforeSeparator/>`
 
 ## [2.30.0] - 2023-01-13
 ### Added
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 2a455dfe07..6dca992591 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -924,12 +924,12 @@ Uses Jackson and YAMLFactory to pretty print objects:
 ```xml
 <jackson>
   <version>2.14.1</version>    <!-- optional: The version of 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml' to be used -->
-  <enabledFeatures>            <!-- optional: Customize the set of enabled features -->
-    <enabledFeature>INDENT_OUTPUT<enabledFeature/>
-  </enabledFeatures>
-  <disabledFeatures>           <!-- optional: Customize the set of disabled features -->
-    <disabledFeature>DEFAULT_HAS_NO_DISABLED_FEATURE<disabledFeature/>
-  </disabledFeatures>
+  <features>                   <!-- optional: Customize the set of features -->
+    <INDENT_OUTPUT>true<INDENT_OUTPUT/>                            <!-- true by default -->
+    <ORDER_MAP_ENTRIES_BY_KEYS>false</ORDER_MAP_ENTRIES_BY_KEYS>   <!-- false by default -->
+    <ANY_OTHER_FEATURE>true|false</ANY_OTHER_FEATURE>
+  </features>
+  <spaceBeforeSeparator>false</spaceBeforeSeparator>   <!-- optional: false by default -->
 </jackson>
 ```
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/JacksonJson.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/JacksonJson.java
index cf03ef21ca..31c59a5f81 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/JacksonJson.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/JacksonJson.java
@@ -33,10 +33,10 @@
 public class JacksonJson implements FormatterStepFactory {
 
 	@Parameter
-	String version = JacksonJsonStep.defaultVersion();
+	private String version = JacksonJsonStep.defaultVersion();
 
 	@Parameter
-	boolean endWithEol = new JacksonConfig().isEndWithEol();
+	private boolean spaceBeforeSeparator = new JacksonConfig().isSpaceBeforeSeparator();
 
 	@Parameter
 	private Map<String, Boolean> features = Collections.emptyMap();
@@ -45,10 +45,8 @@ public class JacksonJson implements FormatterStepFactory {
 	public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 		JacksonConfig jacksonConfig = new JacksonConfig();
 
-		if (features != null) {
-			jacksonConfig.appendFeatureToToggle(features);
-		}
-		jacksonConfig.setEndWithEol(endWithEol);
+		jacksonConfig.appendFeatureToToggle(features);
+		jacksonConfig.setSpaceBeforeSeparator(spaceBeforeSeparator);
 
 		return JacksonJsonStep
 				.create(jacksonConfig, version, stepConfig.getProvisioner());
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/JacksonYaml.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/JacksonYaml.java
index d3d9558cf4..1cd23bc3cc 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/JacksonYaml.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/JacksonYaml.java
@@ -18,12 +18,11 @@
 import java.util.Collections;
 import java.util.Map;
 
-import com.diffplug.spotless.maven.FormatterFactory;
-
 import org.apache.maven.plugins.annotations.Parameter;
 
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.json.JacksonConfig;
+import com.diffplug.spotless.maven.FormatterFactory;
 import com.diffplug.spotless.maven.FormatterStepConfig;
 import com.diffplug.spotless.maven.FormatterStepFactory;
 import com.diffplug.spotless.yaml.JacksonYamlStep;
@@ -37,10 +36,7 @@ public class JacksonYaml implements FormatterStepFactory {
 	private String version = JacksonYamlStep.defaultVersion();
 
 	@Parameter
-	boolean endWithEol = new JacksonConfig().isEndWithEol();
-
-	@Parameter
-	boolean spaceBeforeSeparator = new JacksonConfig().isSpaceBeforeSeparator();
+	private boolean spaceBeforeSeparator = new JacksonConfig().isSpaceBeforeSeparator();
 
 	@Parameter
 	private Map<String, Boolean> features = Collections.emptyMap();
@@ -49,10 +45,8 @@ public class JacksonYaml implements FormatterStepFactory {
 	public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 		JacksonConfig jacksonConfig = new JacksonConfig();
 
-		if (features != null) {
-			jacksonConfig.appendFeatureToToggle(features);
-		}
-		jacksonConfig.setEndWithEol(endWithEol);
+		jacksonConfig.appendFeatureToToggle(features);
+		jacksonConfig.setSpaceBeforeSeparator(spaceBeforeSeparator);
 
 		return JacksonYamlStep
 				.create(jacksonConfig, version, stepConfig.getProvisioner());
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java
index 90b3a2f077..b263be8173 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java
@@ -70,7 +70,6 @@ public void testFormatJson_WithGson_defaultConfig_nestedObject() throws Exceptio
 		assertFile("json_test.json").sameAsResource("json/nestedObjectAfter.json");
 	}
 
-
 	@Test
 	public void testFormatJson_WithJackson_sortByKeys() throws Exception {
 		writePomWithJsonSteps("<jackson><features><ORDER_MAP_ENTRIES_BY_KEYS>true</ORDER_MAP_ENTRIES_BY_KEYS></features></jackson>");
@@ -78,17 +77,17 @@ public void testFormatJson_WithJackson_sortByKeys() throws Exception {
 		setFile("json_test.json").toResource("json/sortByKeysBefore.json");
 
 		String output = mavenRunner().withArguments("spotless:apply").runNoError().output();
-		assertFile("json_test.json").sameAsResource("json/sortByKeysAfter.json");
+		assertFile("json_test.json").sameAsResource("json/sortByKeysAfter_Jackson.json");
 	}
 
 	@Test
-	public void testFormatJson_WithJackson_sortByKeys_noSpaceAfterKeySeparator() throws Exception {
-		writePomWithJsonSteps("<jackson><spaceBeforeSeparator>false</spaceBeforeSeparator><features><ORDER_MAP_ENTRIES_BY_KEYS>true</ORDER_MAP_ENTRIES_BY_KEYS></features></jackson>");
+	public void testFormatJson_WithJackson_sortByKeys_spaceAfterKeySeparator() throws Exception {
+		writePomWithJsonSteps("<jackson><spaceBeforeSeparator>true</spaceBeforeSeparator><features><ORDER_MAP_ENTRIES_BY_KEYS>true</ORDER_MAP_ENTRIES_BY_KEYS></features></jackson>");
 
 		setFile("json_test.json").toResource("json/sortByKeysBefore.json");
 
 		String output = mavenRunner().withArguments("spotless:apply").runNoError().output();
-		assertFile("json_test.json").sameAsResource("json/sortByKeysAfter.json");
+		assertFile("json_test.json").sameAsResource("json/sortByKeysAfter_Jackson_spaceAfterKeySeparator.json");
 	}
 
 }
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java
index 15366ab2e6..51f8da99f4 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java
@@ -49,12 +49,12 @@ public void testFormatYaml_WithJackson_defaultConfig_arrayBrackets() throws Exce
 	}
 
 	@Test
-	public void testFormatYaml_WithJackson_defaultConfig_arrayBrackets_withEol() throws Exception {
-		writePomWithYamlSteps("<jackson><endWithEol>true</endWithEol></jackson>");
+	public void testFormatYaml_WithJackson_defaultConfig_arrayBrackets_spaceBeforeSeparator() throws Exception {
+		writePomWithYamlSteps("<jackson><spaceBeforeSeparator>true</spaceBeforeSeparator></jackson>");
 
 		setFile("yaml_test.yaml").toResource("yaml/array_with_bracket.yaml");
 		mavenRunner().withArguments("spotless:apply").runNoError();
-		assertFile("yaml_test.yaml").sameAsResource("yaml/array_with_bracket.clean_with_eol.yaml");
+		assertFile("yaml_test.yaml").sameAsResource("yaml/array_with_bracket.clean.spaceBeforeSeparator.yaml");
 	}
 
 	@Test
diff --git a/testlib/src/main/resources/json/sortByKeysAfter_Jackson_noSpaceAfterKeySeparator.json b/testlib/src/main/resources/json/sortByKeysAfter_Jackson_spaceAfterKeySeparator.json
similarity index 100%
rename from testlib/src/main/resources/json/sortByKeysAfter_Jackson_noSpaceAfterKeySeparator.json
rename to testlib/src/main/resources/json/sortByKeysAfter_Jackson_spaceAfterKeySeparator.json
diff --git a/testlib/src/main/resources/yaml/array_with_bracket.clean_with_eol.yaml b/testlib/src/main/resources/yaml/array_with_bracket.clean.spaceBeforeSeparator.yaml
similarity index 81%
rename from testlib/src/main/resources/yaml/array_with_bracket.clean_with_eol.yaml
rename to testlib/src/main/resources/yaml/array_with_bracket.clean.spaceBeforeSeparator.yaml
index 6080ba1f82..c6f891b9de 100644
--- a/testlib/src/main/resources/yaml/array_with_bracket.clean_with_eol.yaml
+++ b/testlib/src/main/resources/yaml/array_with_bracket.clean.spaceBeforeSeparator.yaml
@@ -9,4 +9,4 @@ episodes:
 - 7
 best-jedi:
   name: "Obi-Wan"
-  side: "light"
+  side: "light"
\ No newline at end of file

From f05126de68661f584b1b5865b406f35f700ae2e5 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Mon, 16 Jan 2023 23:02:39 +0400
Subject: [PATCH 0592/2068] Fix Spotbugs

---
 .../glue/json/JacksonJsonFormatterFunc.java   | 79 ++++++++-----------
 .../diffplug/spotless/json/JacksonConfig.java |  1 +
 2 files changed, 35 insertions(+), 45 deletions(-)

diff --git a/lib/src/jackson/java/com/diffplug/spotless/glue/json/JacksonJsonFormatterFunc.java b/lib/src/jackson/java/com/diffplug/spotless/glue/json/JacksonJsonFormatterFunc.java
index c19e56b549..c44ff0d0d1 100644
--- a/lib/src/jackson/java/com/diffplug/spotless/glue/json/JacksonJsonFormatterFunc.java
+++ b/lib/src/jackson/java/com/diffplug/spotless/glue/json/JacksonJsonFormatterFunc.java
@@ -16,8 +16,6 @@
 package com.diffplug.spotless.glue.json;
 
 import java.io.IOException;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
 
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -79,25 +77,7 @@ protected DefaultPrettyPrinter makePrinter() {
 		boolean spaceBeforeSeparator = jacksonConfig.isSpaceBeforeSeparator();
 
 		DefaultPrettyPrinter.Indenter indenter = new DefaultIndenter(getIndentation(), "\n");
-		DefaultPrettyPrinter printer = new DefaultPrettyPrinter() {
-			private static final long serialVersionUID = 1L;
-
-			@Override
-			public DefaultPrettyPrinter createInstance() {
-				return new DefaultPrettyPrinter(this);
-			}
-
-			@Override
-			public DefaultPrettyPrinter withSeparators(Separators separators) {
-				this._separators = separators;
-				if (spaceBeforeSeparator) {
-					this._objectFieldValueSeparatorWithSpaces = " " + separators.getObjectFieldValueSeparator() + " ";
-				} else {
-					this._objectFieldValueSeparatorWithSpaces = separators.getObjectFieldValueSeparator() + " ";
-				}
-				return this;
-			}
-		};
+		DefaultPrettyPrinter printer = new SpotlessDefaultPrettyPrinter(spaceBeforeSeparator);
 
 		printer.indentObjectsWith(indenter);
 		printer.indentArraysWith(indenter);
@@ -105,34 +85,18 @@ public DefaultPrettyPrinter withSeparators(Separators separators) {
 	}
 
 	protected String getIndentation() {
-		int indentSpaces = jacksonConfig.getIndentSpaces();
-		if (indentSpaces < 0) {
-			return "\t";
-		} else {
-			return IntStream.range(0, indentSpaces).mapToObj(i -> "").collect(Collectors.joining());
-		}
+		// DefaultIndenter default constructor relies on this
+		return "  ";
+		//		int indentSpaces = jacksonConfig.getIndentSpaces();
+		//		if (indentSpaces < 0) {
+		//			return "\t";
+		//		} else {
+		//			return IntStream.range(0, indentSpaces).mapToObj(i -> "").collect(Collectors.joining());
+		//		}
 	}
 
 	protected String format(ObjectMapper objectMapper, String input) throws IllegalArgumentException, IOException {
-		// We may consider adding manually an initial '---' prefix to help management of multiple documents
-		// if (!input.trim().startsWith("---")) {
-		// 	input = "---" + "\n" + input;
-		// }
-
 		try {
-			// https://stackoverflow.com/questions/25222327/deserialize-pojos-from-multiple-yaml-documents-in-a-single-file-in-jackson
-			// https://github.com/FasterXML/jackson-dataformats-text/issues/66#issuecomment-375328648
-			// 2023-01: For now, we get 'Cannot deserialize value of type `com.fasterxml.jackson.databind.node.ObjectNode` from Array value'
-			//			JsonParser yamlParser = objectMapper.getFactory().createParser(input);
-			//			List<ObjectNode> docs = objectMapper.readValues(yamlParser, ObjectNode.class).readAll();
-			//			return objectMapper.writeValueAsString(docs);
-
-			// 2023-01: This returns JSON instead of YAML
-			// This will transit with a JsonNode
-			// A JsonNode may keep the comments from the input node
-			// JsonNode jsonNode = objectMapper.readTree(input);
-			//Not 'toPrettyString' as one could require no INDENT_OUTPUT
-			// return jsonNode.toPrettyString();
 			ObjectNode objectNode = objectMapper.readValue(input, ObjectNode.class);
 			String outputFromjackson = objectMapper.writeValueAsString(objectNode);
 
@@ -141,4 +105,29 @@ protected String format(ObjectMapper objectMapper, String input) throws IllegalA
 			throw new AssertionError("Unable to format. input='" + input + "'", e);
 		}
 	}
+
+	protected static class SpotlessDefaultPrettyPrinter extends DefaultPrettyPrinter {
+		private static final long serialVersionUID = 1L;
+		private final boolean spaceBeforeSeparator;
+
+		public SpotlessDefaultPrettyPrinter(boolean spaceBeforeSeparator) {
+			this.spaceBeforeSeparator = spaceBeforeSeparator;
+		}
+
+		@Override
+		public DefaultPrettyPrinter createInstance() {
+			return new DefaultPrettyPrinter(this);
+		}
+
+		@Override
+		public DefaultPrettyPrinter withSeparators(Separators separators) {
+			this._separators = separators;
+			if (spaceBeforeSeparator) {
+				this._objectFieldValueSeparatorWithSpaces = " " + separators.getObjectFieldValueSeparator() + " ";
+			} else {
+				this._objectFieldValueSeparatorWithSpaces = separators.getObjectFieldValueSeparator() + " ";
+			}
+			return this;
+		}
+	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/json/JacksonConfig.java b/lib/src/main/java/com/diffplug/spotless/json/JacksonConfig.java
index 2fadf31d78..7690913f34 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/JacksonConfig.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/JacksonConfig.java
@@ -24,6 +24,7 @@
  * A DTO holding the options for Jackson-based formatters
  */
 public class JacksonConfig implements Serializable {
+	private static final long serialVersionUID = 1L;
 
 	private static final Map<String, Boolean> DEFAULT_FEATURE_TOGGLES;
 

From beb99af54563b473cd8f209afa78aca35f813d7b Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 16 Jan 2023 16:06:43 -0800
Subject: [PATCH 0593/2068] Adopt `de.benediktritter.maven-plugin-development`

---
 plugin-maven/build.gradle                     | 169 +++---------------
 .../src/test/resources/pom-build.xml.mustache |  96 ----------
 2 files changed, 21 insertions(+), 244 deletions(-)
 delete mode 100644 plugin-maven/src/test/resources/pom-build.xml.mustache

diff --git a/plugin-maven/build.gradle b/plugin-maven/build.gradle
index 3ea73e6101..6cf17dd986 100644
--- a/plugin-maven/build.gradle
+++ b/plugin-maven/build.gradle
@@ -1,42 +1,15 @@
-buildscript {
-	repositories { mavenCentral() }
-	dependencies { classpath "com.github.spullara.mustache.java:compiler:${VER_MUSTACHE}" }
-}
 plugins {
-	id 'cz.malohlava.visteg' version '1.0.5' // https://github.com/mmalohlava/gradle-visteg
+	// https://www.benediktritter.de/maven-plugin-development/#release-history
+	id 'de.benediktritter.maven-plugin-development' version '0.4.0'
 }
+
 repositories { mavenCentral() }
 apply from: rootProject.file('gradle/changelog.gradle')
-apply from: rootProject.file('gradle/spotless-freshmark.gradle')
-
-// to generate taskGraph.pdf
-// - set enabled (below) to true
-// - run: ./gradlew :plugin-maven:test
-// - run: rm plugin-maven/output.pdf
-// - run: dot -Tpdf plugin-maven/build/reports/visteg.dot > plugin-maven/taskGraph.pdf
-visteg {
-	enabled = false
-	nodeShape = 'box'
-	startNodeShape = 'box'
-	endNodeShape = 'box'
-	colorscheme = 'pastel24' // https://www.graphviz.org/doc/info/colors.html
-}
-
-import com.github.mustachejava.DefaultMustacheFactory
-
-import java.nio.file.Files
-
-import static java.nio.charset.StandardCharsets.UTF_8
-import static java.nio.file.StandardOpenOption.CREATE
-import static java.nio.file.StandardOpenOption.TRUNCATE_EXISTING
-
 ext.artifactId = project.artifactIdMaven
 version = spotlessChangelog.versionNext
-apply from: rootProject.file("gradle/java-setup.gradle")
-apply from: rootProject.file("gradle/java-publish.gradle")
 
-final MAVEN_PROJECT_DIR = project.layout.buildDirectory.dir("mavenProject").get()
-final LOCAL_MAVEN_REPO_DIR = project.layout.buildDirectory.dir("localMavenRepository").get()
+apply from: rootProject.file("gradle/java-setup.gradle")
+apply from: rootProject.file('gradle/spotless-freshmark.gradle')
 
 def mvnw(String args) {
 	boolean isWin = System.getProperty('os.name').toLowerCase().contains('win')
@@ -55,17 +28,15 @@ def mvnw(String args) {
 	}
 }
 
-String libVersion = version.endsWith('-SNAPSHOT') ?
-		rootProject.spotlessChangelog.versionNext :
-		rootProject.spotlessChangelog.versionLast
+apply plugin: 'de.benediktritter.maven-plugin-development'
+mavenPlugin {
+	name = 'Spotless Maven Plugin'
+	artifactId = project.artifactIdMaven
+	description = project.description
+}
 dependencies {
-	if (version.endsWith('-SNAPSHOT') || (rootProject.spotlessChangelog.versionNext == rootProject.spotlessChangelog.versionLast)) {
-		implementation project(':lib')
-		implementation project(':lib-extra')
-	} else {
-		implementation "com.diffplug.spotless:spotless-lib:${libVersion}"
-		implementation "com.diffplug.spotless:spotless-lib-extra:${libVersion}"
-	}
+	implementation project(':lib')
+	implementation project(':lib-extra')
 
 	compileOnly "org.apache.maven:maven-plugin-api:${VER_MAVEN_API}"
 	compileOnly "org.apache.maven.plugin-tools:maven-plugin-annotations:${VER_MAVEN_API}"
@@ -90,112 +61,14 @@ dependencies {
 	testImplementation "org.apache.maven:maven-core:${VER_MAVEN_API}"
 }
 
-task copySourceFiles(type: Sync) {
-	from "src/main/java"
-	into MAVEN_PROJECT_DIR.dir("src/main/java")
-}
-
-task copyMvnw(type: Copy, dependsOn: copySourceFiles) {
-	from 'src/test/resources'
-	include 'mvnw'
-	include 'mvnw.cmd'
-	include '.mvn/**'
-	into MAVEN_PROJECT_DIR
-}
-
-task installLocalDependencies
-def libs = [
-	'lib',
-	'lib-extra',
-	'testlib'
-]
-libs.each {
-	def groupId = 'com.diffplug.spotless'
-	def artifactId = "spotless-${it}"
-	def jarTask = tasks.getByPath(":${it}:jar")
-	def file = jarTask.archivePath
-
-	def installDependency = task "install_${artifactId}"(type: Exec) {
-		workingDir MAVEN_PROJECT_DIR
-
-		inputs.file(file)
-		outputs.dir(LOCAL_MAVEN_REPO_DIR.file(groupId.replace('.', '/') + "/" + artifactId + "/" + version))
-		commandLine mvnw("org.apache.maven.plugins:maven-install-plugin:2.3.1:install-file " +
-				"-Dfile=${file} " +
-				"-DgroupId=${groupId} " +
-				"-DartifactId=${artifactId} " +
-				"-Dversion=${libVersion} " +
-				"-Dpackaging=jar " +
-				"-DlocalRepositoryPath=${LOCAL_MAVEN_REPO_DIR}")
-	}
-	installDependency.dependsOn(jarTask)
-
-	installLocalDependencies.dependsOn installDependency
-}
-
-task createPomXml(dependsOn: installLocalDependencies) {
-	def newPomXml = MAVEN_PROJECT_DIR.file("pom.xml").asFile.toPath()
-
-	outputs.file(newPomXml)
-	doLast {
-		def additionalDependencies = project.configurations.runtimeClasspath.resolvedConfiguration.resolvedArtifacts.findAll {
-			return !libs.contains(it.moduleVersion.id.name)
-		}.collect {
-			return  "    <dependency>\n" +
-					"      <groupId>${it.moduleVersion.id.group}</groupId>\n" +
-					"      <artifactId>${it.moduleVersion.id.name}</artifactId>\n" +
-					"      <version>${it.moduleVersion.id.version}</version>\n" +
-					"    </dependency>\n"
-		}.join()
-
-		def versions = [
-			spotlessMavenPluginVersion: version,
-			mavenApiVersion           : VER_MAVEN_API,
-			eclipseAetherVersion      : VER_ECLIPSE_AETHER,
-			spotlessLibVersion        : libVersion,
-			jsr305Version             : VER_JSR_305,
-			additionalDependencies    : additionalDependencies
-		]
-
-		def pomXmlTemplate = project.layout.projectDirectory.file("src/test/resources/pom-build.xml.mustache").asFile.toPath()
-
-		Files.newBufferedReader(pomXmlTemplate).withCloseable { reader ->
-			Files.newBufferedWriter(newPomXml, UTF_8, CREATE, TRUNCATE_EXISTING).withCloseable { writer ->
-				def mustache = new DefaultMustacheFactory().compile(reader, "pom")
-				mustache.execute(writer, versions)
-			}
-		}
-	}
-}
-
-task runMavenBuild(type: Exec, dependsOn: [
-	copySourceFiles,
-	copyMvnw,
-	createPomXml
-]) {
-	outputs.dir(LOCAL_MAVEN_REPO_DIR)
-
-	workingDir MAVEN_PROJECT_DIR
-	// -B batch mode to make dependency download logging less verbose
-	commandLine mvnw("clean install -B -Dmaven.repo.local=${LOCAL_MAVEN_REPO_DIR}")
-}
-
-jar.setActions Arrays.asList()
-jar.dependsOn(runMavenBuild)
-File jarIn = MAVEN_PROJECT_DIR.file("target/spotless-maven-plugin-${version}.jar").asFile
-File jarOut = jar.archivePath
-jar.inputs.file(jarIn)
-jar.outputs.file(jarOut)
-jar.doLast {
-	Files.copy(jarIn.toPath(), jarOut.toPath(), java.nio.file.StandardCopyOption.REPLACE_EXISTING)
-}
-
-test { useJUnitPlatform() }
-
 apply from: rootProject.file('gradle/special-tests.gradle')
 
-tasks.withType(Test) {
-	systemProperty "localMavenRepositoryDir", LOCAL_MAVEN_REPO_DIR.asFile
-	systemProperty "spotlessMavenPluginVersion", project.version
-	dependsOn(jar)
+tasks.withType(Test).configureEach {
+	useJUnitPlatform()
+	systemProperty 'spotlessMavenPluginVersion', project.version
+	dependsOn 'publishToMavenLocal'
+	dependsOn ':lib:publishToMavenLocal'
+	dependsOn ':lib-extra:publishToMavenLocal'
 }
+
+apply from: rootProject.file("gradle/java-publish.gradle")
diff --git a/plugin-maven/src/test/resources/pom-build.xml.mustache b/plugin-maven/src/test/resources/pom-build.xml.mustache
deleted file mode 100644
index 3c1d1a7d5b..0000000000
--- a/plugin-maven/src/test/resources/pom-build.xml.mustache
+++ /dev/null
@@ -1,96 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>com.diffplug.spotless</groupId>
-  <artifactId>spotless-maven-plugin</artifactId>
-  <version>{{spotlessMavenPluginVersion}}</version>
-  <packaging>maven-plugin</packaging>
-
-  <name>Spotless Maven Plugin</name>
-
-  <!-- Require plugin to be built with Maven 3.1.0+ -->
-  <prerequisites>
-    <maven>3.1.0</maven>
-  </prerequisites>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.target>1.8</maven.compiler.target>
-    <maven.compiler.source>1.8</maven.compiler.source>
-
-    <!-- Following versions are expected to be injected by the Gradle build script -->
-    <maven.api.version>{{mavenApiVersion}}</maven.api.version>
-    <eclipse.aether.version>{{eclipseAetherVersion}}</eclipse.aether.version>
-    <spotless.lib.version>{{spotlessLibVersion}}</spotless.lib.version>
-    <jsr305.version>{{jsr305Version}}</jsr305.version>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-core</artifactId>
-      <version>${maven.api.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-      <version>${maven.api.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.plugin-tools</groupId>
-      <artifactId>maven-plugin-annotations</artifactId>
-      <version>${maven.api.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.aether</groupId>
-      <artifactId>aether-api</artifactId>
-      <version>${eclipse.aether.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.aether</groupId>
-      <artifactId>aether-util</artifactId>
-      <version>${eclipse.aether.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-      <version>${jsr305.version}</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>com.diffplug.spotless</groupId>
-      <artifactId>spotless-lib</artifactId>
-      <version>${spotless.lib.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.diffplug.spotless</groupId>
-      <artifactId>spotless-lib-extra</artifactId>
-      <version>${spotless.lib.version}</version>
-    </dependency>
-
-{{{additionalDependencies}}}
-
-  </dependencies>
-
-  <build>
-    <plugins>
-      <!--
-      New-ish version of the maven-plugin-plugin is required because of Java 8.
-      See https://issues.apache.org/jira/browse/MPLUGIN-272 for more details.
-       -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-plugin-plugin</artifactId>
-        <version>3.5</version>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>

From 48ded12b4812b562065f54db20b4214ddae1f019 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 16 Jan 2023 16:07:18 -0800
Subject: [PATCH 0594/2068] We now use the default local maven repository.

---
 .../spotless/maven/MavenIntegrationHarness.java        |  6 +-----
 .../java/com/diffplug/spotless/maven/MavenRunner.java  | 10 ++--------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
index e37bb0f13d..ad19f44624 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
@@ -53,7 +53,6 @@ public class MavenIntegrationHarness extends ResourceHarness {
 	 */
 	private static final String SPOTLESS_MAVEN_VERSION_IDE = null;
 
-	private static final String LOCAL_MAVEN_REPOSITORY_DIR = "localMavenRepositoryDir";
 	private static final String SPOTLESS_MAVEN_PLUGIN_VERSION = "spotlessMavenPluginVersion";
 	private static final String CONFIGURATION = "configuration";
 	private static final String EXECUTIONS = "executions";
@@ -179,8 +178,7 @@ protected void writePom(String[] executions, String[] configuration, String[] de
 
 	protected MavenRunner mavenRunner() throws IOException {
 		return MavenRunner.create()
-				.withProjectDir(rootFolder())
-				.withLocalRepository(new File(getSystemProperty(LOCAL_MAVEN_REPOSITORY_DIR)));
+				.withProjectDir(rootFolder());
 	}
 
 	/**
@@ -247,8 +245,6 @@ private static String getSystemProperty(String name) {
 		if (SPOTLESS_MAVEN_VERSION_IDE != null) {
 			if (name.equals("spotlessMavenPluginVersion")) {
 				return SPOTLESS_MAVEN_VERSION_IDE;
-			} else if (name.equals("localMavenRepositoryDir")) {
-				return new File("build/localMavenRepository").getAbsolutePath();
 			} else {
 				throw Unhandled.stringException(name);
 			}
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenRunner.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenRunner.java
index a86e000187..b5e2392a24 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenRunner.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,7 +46,6 @@ private MavenRunner() {}
 
 	private File projectDir;
 	private String[] args;
-	private File localRepositoryDir;
 	private Map<String, String> environment = new HashMap<>();
 
 	public MavenRunner withProjectDir(File projectDir) {
@@ -59,11 +58,6 @@ public MavenRunner withArguments(String... args) {
 		return this;
 	}
 
-	public MavenRunner withLocalRepository(File localRepositoryDir) {
-		this.localRepositoryDir = localRepositoryDir;
-		return this;
-	}
-
 	public MavenRunner withRemoteDebug(int port) {
 		String address = (Jvm.version() < 9 ? "" : "*:") + port;
 		environment.put("MAVEN_OPTS", "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=" + address);
@@ -75,7 +69,7 @@ private Result run() throws IOException, InterruptedException {
 		Objects.requireNonNull(args, "Need to call withArguments() first");
 		// run maven with the given args in the given directory
 		String argsString = String.join(" ", Arrays.asList(args));
-		List<String> cmds = getPlatformCmds("-e -Dmaven.repo.local=" + localRepositoryDir + ' ' + argsString);
+		List<String> cmds = getPlatformCmds("-e " + argsString);
 		ProcessBuilder builder = new ProcessBuilder(cmds);
 		builder.directory(projectDir);
 		builder.environment().putAll(environment);

From 491da2e1fc0968080c6ad4860873c30d142ed1b3 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 16 Jan 2023 16:07:41 -0800
Subject: [PATCH 0595/2068] We don't need to exclude maven from the initial
 assemble anymore.

---
 .github/workflows/ci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2e302e6637..1f08c201f5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,8 +30,7 @@ jobs:
       - name: spotlessCheck
         run: ./gradlew spotlessCheck --build-cache
       - name: assemble testClasses
-        run: ./gradlew assemble testClasses --build-cache -PSPOTLESS_EXCLUDE_MAVEN=true
-        # If this gets resolved, remove the EXCLUDE_MAVEN https://github.com/diffplug/spotless/issues/554
+        run: ./gradlew assemble testClasses --build-cache
   build:
     needs: sanityCheck
     strategy:

From 0f18e245981ad1909aad7bf91cf634446a6d1aab Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 16 Jan 2023 16:18:01 -0800
Subject: [PATCH 0596/2068] Update changelog.

---
 plugin-maven/CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 05cc349e9f..6b22962cba 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Changes
+* Spotless' custom build was replaced by [`maven-plugin-development`](https://github.com/britter/maven-plugin-development). ([#1496](https://github.com/diffplug/spotless/pull/1496) fixes [#554](https://github.com/diffplug/spotless/issues/554))
 
 ## [2.30.0] - 2023-01-13
 ### Added

From 8b73372dd286fe43efeb23dcdc8dfa03d85f5fda Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 16 Jan 2023 16:20:33 -0800
Subject: [PATCH 0597/2068] Move maven version constants to the maven
 buildfile.

---
 gradle.properties         | 8 +-------
 plugin-maven/build.gradle | 5 +++++
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 71f755522f..c3b71fd92e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -28,10 +28,4 @@ VER_DURIAN=1.2.0
 VER_JGIT=5.13.1.202206130422-r
 VER_JUNIT=5.9.2
 VER_ASSERTJ=3.24.1
-VER_MOCKITO=4.11.0
-
-# Used for Maven Plugin
-VER_MAVEN_API=3.0
-VER_ECLIPSE_AETHER=1.1.0
-VER_MUSTACHE=0.9.10
-VER_PLEXUS_RESOURCES=1.2.0
+VER_MOCKITO=4.11.0
\ No newline at end of file
diff --git a/plugin-maven/build.gradle b/plugin-maven/build.gradle
index 6cf17dd986..e06fce9ace 100644
--- a/plugin-maven/build.gradle
+++ b/plugin-maven/build.gradle
@@ -34,6 +34,11 @@ mavenPlugin {
 	artifactId = project.artifactIdMaven
 	description = project.description
 }
+
+String VER_MAVEN_API = '3.0'
+String VER_ECLIPSE_AETHER = '1.1.0'
+String VER_MUSTACHE = '0.9.10'
+String VER_PLEXUS_RESOURCES = '1.2.0'
 dependencies {
 	implementation project(':lib')
 	implementation project(':lib-extra')

From 5d7c3b741a4518097bffaacf7e6c30342302c1de Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 16 Jan 2023 16:38:18 -0800
Subject: [PATCH 0598/2068] Move the multimodule harnessing to the only place
 where it is used.

---
 .../maven/MavenIntegrationHarness.java        | 93 +----------------
 .../maven/MultiModuleProjectTest.java         | 99 ++++++++++++++++++-
 2 files changed, 99 insertions(+), 93 deletions(-)

diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
index ad19f44624..15c504fc72 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
@@ -16,9 +16,7 @@
 package com.diffplug.spotless.maven;
 
 import static com.diffplug.common.base.Strings.isNullOrEmpty;
-import static java.util.Arrays.asList;
 import static java.util.Arrays.stream;
-import static java.util.Collections.emptyMap;
 import static java.util.Collections.singletonMap;
 import static java.util.stream.Collectors.toList;
 import static org.junit.jupiter.api.Assertions.fail;
@@ -59,7 +57,6 @@ public class MavenIntegrationHarness extends ResourceHarness {
 	private static final String MODULES = "modules";
 	private static final String DEPENDENCIES = "dependencies";
 	private static final String MODULE_NAME = "name";
-	private static final String CHILD_ID = "childId";
 	private static final int REMOTE_DEBUG_PORT = 5005;
 
 	private final MustacheFactory mustacheFactory = new DefaultMustacheFactory();
@@ -190,10 +187,6 @@ protected MavenRunner mavenRunnerWithRemoteDebug() throws IOException {
 		return mavenRunner().withRemoteDebug(REMOTE_DEBUG_PORT);
 	}
 
-	protected MultiModuleProjectCreator multiModuleProject() {
-		return new MultiModuleProjectCreator();
-	}
-
 	protected String createPomXmlContent(String pluginVersion, String[] executions, String[] configuration, String[] dependencies) throws IOException {
 		return createPomXmlContent("/pom-test.xml.mustache", pluginVersion, executions, configuration, dependencies);
 	}
@@ -207,7 +200,7 @@ protected String createPomXmlContent(String pluginVersion, String[] executions,
 		return createPomXmlContent(pluginVersion, executions, configuration, null);
 	}
 
-	private String createPomXmlContent(String pomTemplate, Map<String, Object> params) throws IOException {
+	protected String createPomXmlContent(String pomTemplate, Map<String, Object> params) throws IOException {
 		URL url = MavenIntegrationHarness.class.getResource(pomTemplate);
 		try (BufferedReader reader = Resources.asCharSource(url, StandardCharsets.UTF_8).openBufferedStream()) {
 			Mustache mustache = mustacheFactory.compile(reader, "pom");
@@ -217,7 +210,7 @@ private String createPomXmlContent(String pomTemplate, Map<String, Object> param
 		}
 	}
 
-	private static Map<String, Object> buildPomXmlParams(String pluginVersion, String[] executions, String[] configuration, String[] modules, String[] dependencies) {
+	protected static Map<String, Object> buildPomXmlParams(String pluginVersion, String[] executions, String[] configuration, String[] modules, String[] dependencies) {
 		Map<String, Object> params = new HashMap<>();
 		params.put(SPOTLESS_MAVEN_PLUGIN_VERSION, pluginVersion == null ? getSystemProperty(SPOTLESS_MAVEN_PLUGIN_VERSION) : pluginVersion);
 
@@ -276,86 +269,4 @@ private static String[] including(String... includes) {
 	private static String[] formats(String... formats) {
 		return groupWithSteps("formats", formats);
 	}
-
-	protected class MultiModuleProjectCreator {
-
-		private String configSubProject;
-		private SubProjectFile[] configSubProjectFiles;
-		private String[] configuration;
-		private final Map<String, List<SubProjectFile>> subProjects = new LinkedHashMap<>();
-
-		protected MultiModuleProjectCreator withConfigSubProject(String name, SubProjectFile... files) {
-			configSubProject = name;
-			configSubProjectFiles = files;
-			return this;
-		}
-
-		protected MultiModuleProjectCreator withConfiguration(String... lines) {
-			configuration = lines;
-			return this;
-		}
-
-		protected MultiModuleProjectCreator addSubProject(String name, SubProjectFile... files) {
-			subProjects.put(name, asList(files));
-			return this;
-		}
-
-		protected void create() throws IOException {
-			createRootPom();
-			createConfigSubProject();
-			createSubProjects();
-		}
-
-		private void createRootPom() throws IOException {
-			List<Object> modulesList = new ArrayList<>();
-			modulesList.add(configSubProject);
-			modulesList.addAll(subProjects.keySet());
-			String[] modules = modulesList.toArray(new String[0]);
-
-			Map<String, Object> rootPomParams = buildPomXmlParams(null, null, configuration, modules, null);
-			setFile("pom.xml").toContent(createPomXmlContent("/multi-module/pom-parent.xml.mustache", rootPomParams));
-		}
-
-		private void createConfigSubProject() throws IOException {
-			if (configSubProject != null) {
-				String content = createPomXmlContent("/multi-module/pom-config.xml.mustache", emptyMap());
-				setFile(configSubProject + "/pom.xml").toContent(content);
-
-				createSubProjectFiles(configSubProject, asList(configSubProjectFiles));
-			}
-		}
-
-		private void createSubProjects() throws IOException {
-			for (Map.Entry<String, List<SubProjectFile>> entry : subProjects.entrySet()) {
-				String subProjectName = entry.getKey();
-				List<SubProjectFile> subProjectFiles = entry.getValue();
-
-				String content = createPomXmlContent("/multi-module/pom-child.xml.mustache", singletonMap(CHILD_ID, subProjectName));
-				setFile(subProjectName + "/pom.xml").toContent(content);
-
-				createSubProjectFiles(subProjectName, subProjectFiles);
-			}
-		}
-
-		private void createSubProjectFiles(String subProjectName, List<SubProjectFile> subProjectFiles) throws IOException {
-			for (SubProjectFile file : subProjectFiles) {
-				setFile(subProjectName + '/' + file.to).toResource(file.from);
-			}
-		}
-	}
-
-	protected static class SubProjectFile {
-
-		private final String from;
-		private final String to;
-
-		private SubProjectFile(String from, String to) {
-			this.from = from;
-			this.to = to;
-		}
-
-		protected static SubProjectFile file(String from, String to) {
-			return new SubProjectFile(from, to);
-		}
-	}
 }
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MultiModuleProjectTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MultiModuleProjectTest.java
index e67b1bcad3..ae8378c566 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MultiModuleProjectTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MultiModuleProjectTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,15 @@
  */
 package com.diffplug.spotless.maven;
 
-import static com.diffplug.spotless.maven.MavenIntegrationHarness.SubProjectFile.file;
+import static java.util.Arrays.asList;
+import static java.util.Collections.emptyMap;
+import static java.util.Collections.singletonMap;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 import org.junit.jupiter.api.Test;
 
@@ -96,4 +104,91 @@ void testConfigurationDependency() throws Exception {
 		assertFile("three/src/main/scala/test1.scala").sameAsResource("scala/scalafmt/basic.cleanWithCustomConf_3.0.0");
 		assertFile("three/src/test/scala/test2.scala").sameAsResource("scala/scalafmt/basic.cleanWithCustomConf_3.0.0");
 	}
+
+	private static final String CHILD_ID = "childId";
+
+	protected MultiModuleProjectCreator multiModuleProject() {
+		return new MultiModuleProjectCreator();
+	}
+
+	class MultiModuleProjectCreator {
+		private String configSubProject;
+		private SubProjectFile[] configSubProjectFiles;
+		private String[] configuration;
+		private final Map<String, List<SubProjectFile>> subProjects = new LinkedHashMap<>();
+
+		protected MultiModuleProjectCreator withConfigSubProject(String name, SubProjectFile... files) {
+			configSubProject = name;
+			configSubProjectFiles = files;
+			return this;
+		}
+
+		protected MultiModuleProjectCreator withConfiguration(String... lines) {
+			configuration = lines;
+			return this;
+		}
+
+		protected MultiModuleProjectCreator addSubProject(String name, SubProjectFile... files) {
+			subProjects.put(name, asList(files));
+			return this;
+		}
+
+		protected void create() throws IOException {
+			createRootPom();
+			createConfigSubProject();
+			createSubProjects();
+		}
+
+		private void createRootPom() throws IOException {
+			List<String> modulesList = new ArrayList<>();
+			modulesList.add(configSubProject);
+			modulesList.addAll(subProjects.keySet());
+			String[] modules = modulesList.toArray(new String[0]);
+
+			Map<String, Object> rootPomParams = buildPomXmlParams(null, null, configuration, modules, null);
+			setFile("pom.xml").toContent(createPomXmlContent("/multi-module/pom-parent.xml.mustache", rootPomParams));
+		}
+
+		private void createConfigSubProject() throws IOException {
+			if (configSubProject != null) {
+				String content = createPomXmlContent("/multi-module/pom-config.xml.mustache", emptyMap());
+				setFile(configSubProject + "/pom.xml").toContent(content);
+
+				createSubProjectFiles(configSubProject, asList(configSubProjectFiles));
+			}
+		}
+
+		private void createSubProjects() throws IOException {
+			for (Map.Entry<String, List<SubProjectFile>> entry : subProjects.entrySet()) {
+				String subProjectName = entry.getKey();
+				List<SubProjectFile> subProjectFiles = entry.getValue();
+
+				String content = createPomXmlContent("/multi-module/pom-child.xml.mustache", singletonMap(CHILD_ID, subProjectName));
+				setFile(subProjectName + "/pom.xml").toContent(content);
+
+				createSubProjectFiles(subProjectName, subProjectFiles);
+			}
+		}
+
+		private void createSubProjectFiles(String subProjectName, List<SubProjectFile> subProjectFiles) {
+			for (SubProjectFile file : subProjectFiles) {
+				setFile(subProjectName + '/' + file.to).toResource(file.from);
+			}
+		}
+	}
+
+	static class SubProjectFile {
+
+		private final String from;
+		private final String to;
+
+		private SubProjectFile(String from, String to) {
+			this.from = from;
+			this.to = to;
+		}
+	}
+
+	static SubProjectFile file(String from, String to) {
+		return new SubProjectFile(from, to);
+	}
 }

From 7294dbcfa94778d2f2c25e2e7d34237faac33685 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 16 Jan 2023 17:38:08 -0800
Subject: [PATCH 0599/2068] MavenRunner now uses a single ProcessRunner across
 an entire test class.

---
 .../com/diffplug/spotless/ProcessRunner.java  |  34 +++++-
 .../maven/MavenIntegrationHarness.java        |  16 +++
 .../diffplug/spotless/maven/MavenRunner.java  | 111 +++---------------
 3 files changed, 63 insertions(+), 98 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java b/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
index c798ed6c07..7a1d0ac774 100644
--- a/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
+++ b/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 DiffPlug
+ * Copyright 2020-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,12 @@
 package com.diffplug.spotless;
 
 import java.io.ByteArrayOutputStream;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
@@ -55,13 +57,18 @@ public Result shell(String cmd) throws IOException, InterruptedException {
 
 	/** Executes the given shell command (using {@code cmd} on windows and {@code sh} on unix). */
 	public Result shellWinUnix(String cmdWin, String cmdUnix) throws IOException, InterruptedException {
+		return shellWinUnix(null, cmdWin, cmdUnix);
+	}
+
+	/** Executes the given shell command (using {@code cmd} on windows and {@code sh} on unix). */
+	public Result shellWinUnix(File cwd, String cmdWin, String cmdUnix) throws IOException, InterruptedException {
 		List<String> args;
 		if (FileSignature.machineIsWin()) {
 			args = Arrays.asList("cmd", "/c", cmdWin);
 		} else {
 			args = Arrays.asList("sh", "-c", cmdUnix);
 		}
-		return exec(args);
+		return exec(cwd, args);
 	}
 
 	/** Creates a process with the given arguments. */
@@ -76,12 +83,25 @@ public Result exec(byte[] stdin, String... args) throws IOException, Interrupted
 
 	/** Creates a process with the given arguments. */
 	public Result exec(List<String> args) throws IOException, InterruptedException {
-		return exec(new byte[0], args);
+		return exec((File) null, args);
+	}
+
+	/** Creates a process with the given arguments. */
+	public Result exec(File cwd, List<String> args) throws IOException, InterruptedException {
+		return exec(cwd, new byte[0], args);
 	}
 
 	/** Creates a process with the given arguments, the given byte array is written to stdin immediately. */
 	public Result exec(byte[] stdin, List<String> args) throws IOException, InterruptedException {
+		return exec(null, stdin, args);
+	}
+
+	/** Creates a process with the given arguments, the given byte array is written to stdin immediately. */
+	public Result exec(File cwd, byte[] stdin, List<String> args) throws IOException, InterruptedException {
 		ProcessBuilder builder = new ProcessBuilder(args);
+		if (cwd != null) {
+			builder.directory(cwd);
+		}
 		Process process = builder.start();
 		Future<byte[]> outputFut = threadStdOut.submit(() -> drainToBytes(process.getInputStream(), bufStdOut));
 		Future<byte[]> errorFut = threadStdErr.submit(() -> drainToBytes(process.getErrorStream(), bufStdErr));
@@ -147,6 +167,14 @@ public byte[] stdErr() {
 			return stdErr;
 		}
 
+		public String stdOutUtf8() {
+			return new String(stdOut, StandardCharsets.UTF_8);
+		}
+
+		public String stdErrUtf8() {
+			return new String(stdErr, StandardCharsets.UTF_8);
+		}
+
 		/** Returns true if the exit code was not zero. */
 		public boolean exitNotZero() {
 			return exitCode != 0;
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
index 15c504fc72..1c44eef55e 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
@@ -31,6 +31,8 @@
 import java.nio.file.Path;
 import java.util.*;
 
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 
 import com.github.mustachejava.DefaultMustacheFactory;
@@ -40,6 +42,7 @@
 import com.diffplug.common.base.Unhandled;
 import com.diffplug.common.io.Resources;
 import com.diffplug.spotless.Jvm;
+import com.diffplug.spotless.ProcessRunner;
 import com.diffplug.spotless.ResourceHarness;
 
 public class MavenIntegrationHarness extends ResourceHarness {
@@ -175,9 +178,22 @@ protected void writePom(String[] executions, String[] configuration, String[] de
 
 	protected MavenRunner mavenRunner() throws IOException {
 		return MavenRunner.create()
+				.withRunner(runner)
 				.withProjectDir(rootFolder());
 	}
 
+	private static ProcessRunner runner;
+
+	@BeforeAll
+	static void setupRunner() throws IOException {
+		runner = new ProcessRunner();
+	}
+
+	@AfterAll
+	static void closeRunner() throws IOException {
+		runner.close();
+	}
+
 	/**
 	 * Useful for local development. Allows debugging the Spotless Maven Plugin remotely.
 	 * Effectively translates into running {@code mvnDebug} on port 5005. The forked JVM will be
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenRunner.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenRunner.java
index b5e2392a24..4fe454ceba 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenRunner.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenRunner.java
@@ -17,21 +17,15 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.Charset;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
-import com.diffplug.common.base.Throwables;
-import com.diffplug.common.io.ByteStreams;
-import com.diffplug.spotless.FileSignature;
 import com.diffplug.spotless.Jvm;
+import com.diffplug.spotless.ProcessRunner;
 
 /**
  * Harness for running a maven build, same idea as the
@@ -47,6 +41,7 @@ private MavenRunner() {}
 	private File projectDir;
 	private String[] args;
 	private Map<String, String> environment = new HashMap<>();
+	private ProcessRunner runner;
 
 	public MavenRunner withProjectDir(File projectDir) {
 		this.projectDir = Objects.requireNonNull(projectDir);
@@ -58,110 +53,36 @@ public MavenRunner withArguments(String... args) {
 		return this;
 	}
 
+	public MavenRunner withRunner(ProcessRunner runner) {
+		this.runner = runner;
+		return this;
+	}
+
 	public MavenRunner withRemoteDebug(int port) {
 		String address = (Jvm.version() < 9 ? "" : "*:") + port;
 		environment.put("MAVEN_OPTS", "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=" + address);
 		return this;
 	}
 
-	private Result run() throws IOException, InterruptedException {
+	private ProcessRunner.Result run() throws IOException, InterruptedException {
 		Objects.requireNonNull(projectDir, "Need to call withProjectDir() first");
 		Objects.requireNonNull(args, "Need to call withArguments() first");
 		// run maven with the given args in the given directory
-		String argsString = String.join(" ", Arrays.asList(args));
-		List<String> cmds = getPlatformCmds("-e " + argsString);
-		ProcessBuilder builder = new ProcessBuilder(cmds);
-		builder.directory(projectDir);
-		builder.environment().putAll(environment);
-		Process process = builder.start();
-		// slurp and return the stdout, stderr, and exitValue
-		Slurper output = new Slurper(process.getInputStream());
-		Slurper error = new Slurper(process.getErrorStream());
-		int exitValue = process.waitFor();
-		output.join();
-		error.join();
-		return new Result(exitValue, output.result(), error.result());
+		String argsString = "-e " + String.join(" ", Arrays.asList(args));
+		return runner.shellWinUnix(projectDir, "mvnw " + argsString, "./mvnw " + argsString);
 	}
 
 	/** Runs the command and asserts that exit code is 0. */
-	public Result runNoError() throws IOException, InterruptedException {
-		Result result = run();
-		assertThat(result.exitValue()).as("Run without error %s", result).isEqualTo(0);
+	public ProcessRunner.Result runNoError() throws IOException, InterruptedException {
+		ProcessRunner.Result result = run();
+		assertThat(result.exitCode()).as("Run without error %s", result).isEqualTo(0);
 		return result;
 	}
 
 	/** Runs the command and asserts that exit code is not 0. */
-	public Result runHasError() throws IOException, InterruptedException {
-		Result result = run();
-		assertThat(result.exitValue()).as("Run with error %s", result).isNotEqualTo(0);
+	public ProcessRunner.Result runHasError() throws IOException, InterruptedException {
+		ProcessRunner.Result result = run();
+		assertThat(result.exitCode()).as("Run with error %s", result).isNotEqualTo(0);
 		return result;
 	}
-
-	public static class Result {
-		private final int exitValue;
-		private final String output;
-		private final String error;
-
-		public Result(int exitValue, String output, String error) {
-			super();
-			this.exitValue = exitValue;
-			this.output = Objects.requireNonNull(output);
-			this.error = Objects.requireNonNull(error);
-		}
-
-		public int exitValue() {
-			return exitValue;
-		}
-
-		public String output() {
-			return output;
-		}
-
-		public String error() {
-			return error;
-		}
-
-		@Override
-		public String toString() {
-			return "Result{" +
-					"exitValue=" + exitValue +
-					", output='" + output + '\'' +
-					", error='" + error + '\'' +
-					'}';
-		}
-	}
-
-	/** Prepends any arguments necessary to run a console command. */
-	private static List<String> getPlatformCmds(String cmd) {
-		if (FileSignature.machineIsWin()) {
-			return Arrays.asList("cmd", "/c", "mvnw " + cmd);
-		} else {
-			return Arrays.asList("/bin/sh", "-c", "./mvnw " + cmd);
-		}
-	}
-
-	private static class Slurper extends Thread {
-		private final InputStream input;
-		private volatile String result;
-
-		Slurper(InputStream input) {
-			this.input = Objects.requireNonNull(input);
-			start();
-		}
-
-		@Override
-		public void run() {
-			try {
-				ByteArrayOutputStream output = new ByteArrayOutputStream();
-				ByteStreams.copy(input, output);
-				result = output.toString(Charset.defaultCharset().name());
-			} catch (Exception e) {
-				result = Throwables.getStackTraceAsString(e);
-			}
-		}
-
-		public String result() {
-			return result;
-		}
-	}
 }

From b314a0126abd90098e1c4d79dacd9ccd551cb35b Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 16 Jan 2023 17:38:26 -0800
Subject: [PATCH 0600/2068] Adapt maven tests to use ProcessRunner.

---
 .../spotless/maven/SpotlessCheckMojoTest.java    |  8 +++++---
 .../maven/incremental/UpToDateCheckingTest.java  |  8 ++++----
 .../javascript/JavascriptFormatStepTest.java     |  5 ++---
 .../diffplug/spotless/maven/json/JsonTest.java   |  2 +-
 .../maven/markdown/FlexmarkMavenTest.java        |  5 ++---
 .../spotless/maven/pom/SortPomMavenTest.java     |  4 ++--
 .../maven/prettier/PrettierFormatStepTest.java   | 16 ++++++++--------
 .../typescript/TypescriptFormatStepTest.java     | 16 ++++++++--------
 .../diffplug/spotless/maven/yaml/YamlTest.java   |  6 +++---
 9 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpotlessCheckMojoTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpotlessCheckMojoTest.java
index cb37e4a4c5..566851c26c 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpotlessCheckMojoTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpotlessCheckMojoTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,8 @@
 
 import org.junit.jupiter.api.Test;
 
+import com.diffplug.spotless.ProcessRunner;
+
 class SpotlessCheckMojoTest extends MavenIntegrationHarness {
 
 	private static final String UNFORMATTED_FILE = "license/MissingLicense.test";
@@ -72,8 +74,8 @@ private void testSpotlessCheck(String fileName, String command, boolean expectEr
 		MavenRunner mavenRunner = mavenRunner().withArguments(command);
 
 		if (expectError) {
-			MavenRunner.Result result = mavenRunner.runHasError();
-			assertThat(result.output()).contains("The following files had format violations");
+			ProcessRunner.Result result = mavenRunner.runHasError();
+			assertThat(result.stdOutUtf8()).contains("The following files had format violations");
 		} else {
 			mavenRunner.runNoError();
 		}
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/UpToDateCheckingTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/UpToDateCheckingTest.java
index f315c7eefe..6afcba7430 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/UpToDateCheckingTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/UpToDateCheckingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 DiffPlug
+ * Copyright 2021-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -254,15 +254,15 @@ private List<File> writeFiles(String resource, String suffix, int count) throws
 	}
 
 	private String runSpotlessApply() throws Exception {
-		return mavenRunnerForGoal("apply").runNoError().output();
+		return mavenRunnerForGoal("apply").runNoError().stdOutUtf8();
 	}
 
 	private String runSpotlessCheck() throws Exception {
-		return mavenRunnerForGoal("check").runNoError().output();
+		return mavenRunnerForGoal("check").runNoError().stdOutUtf8();
 	}
 
 	private String runSpotlessCheckOnUnformattedFiles() throws Exception {
-		return mavenRunnerForGoal("check").runHasError().output();
+		return mavenRunnerForGoal("check").runHasError().stdOutUtf8();
 	}
 
 	private MavenRunner mavenRunnerForGoal(String goal) throws IOException {
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/javascript/JavascriptFormatStepTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/javascript/JavascriptFormatStepTest.java
index 5c8a5f04b3..d738e17dac 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/javascript/JavascriptFormatStepTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/javascript/JavascriptFormatStepTest.java
@@ -20,9 +20,9 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
+import com.diffplug.spotless.ProcessRunner;
 import com.diffplug.spotless.ResourceHarness;
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
-import com.diffplug.spotless.maven.MavenRunner.Result;
 import com.diffplug.spotless.npm.EslintFormatterStep;
 import com.diffplug.spotless.npm.EslintStyleGuide;
 import com.diffplug.spotless.tag.NpmTest;
@@ -50,8 +50,7 @@ void eslintConfigFile() throws Exception {
 			setFile(".eslintrc.js").toResource("npm/eslint/javascript/custom_rules/.eslintrc.js");
 			setFile(TEST_FILE_PATH).toResource("npm/eslint/javascript/custom_rules/javascript-es6.dirty");
 
-			Result result = mavenRunner().withArguments("spotless:apply").runNoError();
-			System.out.println(result.output());
+			ProcessRunner.Result result = mavenRunner().withArguments("spotless:apply").runNoError();
 			assertFile(TEST_FILE_PATH).sameAsResource("npm/eslint/javascript/custom_rules/javascript-es6.clean");
 		}
 
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java
index e492109faa..884aba79c7 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java
@@ -57,7 +57,7 @@ public void testFormatJson_WithGson_sortByKeys() throws Exception {
 
 		setFile("json_test.json").toResource("json/sortByKeysBefore.json");
 
-		String output = mavenRunner().withArguments("spotless:apply").runNoError().output();
+		String output = mavenRunner().withArguments("spotless:apply").runNoError().stdOutUtf8();
 		LOGGER.error(output);
 		System.err.println(output);
 		assertFile("json_test.json").sameAsResource("json/sortByKeysAfter.json");
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/markdown/FlexmarkMavenTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/markdown/FlexmarkMavenTest.java
index a623ca7f3c..eb1c6cc95f 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/markdown/FlexmarkMavenTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/markdown/FlexmarkMavenTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2021-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,8 +26,7 @@ public void testFlexmarkWithDefaultConfig() throws Exception {
 		writePomWithMarkdownSteps("<flexmark />");
 
 		setFile("markdown_test.md").toResource("markdown/flexmark/FlexmarkUnformatted.md");
-		mavenRunner().withArguments("spotless:apply").runNoError().error();
+		mavenRunner().withArguments("spotless:apply").runNoError();
 		assertFile("markdown_test.md").sameAsResource("markdown/flexmark/FlexmarkFormatted.md");
 	}
-
 }
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/pom/SortPomMavenTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/pom/SortPomMavenTest.java
index ca9d77a6e3..93eb8a9633 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/pom/SortPomMavenTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/pom/SortPomMavenTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2021-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@ public void testSortPomWithDefaultConfig() throws Exception {
 		writePomWithPomSteps("<sortPom/>");
 
 		setFile("pom_test.xml").toResource("pom/pom_dirty.xml");
-		mavenRunner().withArguments("spotless:apply").runNoError().error();
+		mavenRunner().withArguments("spotless:apply").runNoError();
 		assertFile("pom_test.xml").sameAsResource("pom/pom_clean_default.xml");
 	}
 }
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/prettier/PrettierFormatStepTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/prettier/PrettierFormatStepTest.java
index c0a9267b93..47dab5d152 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/prettier/PrettierFormatStepTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/prettier/PrettierFormatStepTest.java
@@ -21,8 +21,8 @@
 
 import org.junit.jupiter.api.Test;
 
+import com.diffplug.spotless.ProcessRunner;
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
-import com.diffplug.spotless.maven.MavenRunner.Result;
 import com.diffplug.spotless.maven.generic.Prettier;
 import com.diffplug.spotless.tag.NpmTest;
 
@@ -43,7 +43,7 @@ private String prepareRun(String kind, String suffix) throws IOException {
 		return path;
 	}
 
-	private Result runExpectingError(String kind, String suffix) throws IOException, InterruptedException {
+	private ProcessRunner.Result runExpectingError(String kind, String suffix) throws IOException, InterruptedException {
 		String path = prepareRun(kind, suffix);
 		return mavenRunner().withArguments("spotless:apply").runHasError();
 	}
@@ -102,8 +102,8 @@ void unique_dependency_config() throws Exception {
 				"  <devDependencies><prettier>1.16.4</prettier></devDependencies>",
 				"</prettier>");
 
-		Result result = mavenRunner().withArguments("spotless:apply").runHasError();
-		assertThat(result.output()).contains(Prettier.ERROR_MESSAGE_ONLY_ONE_CONFIG);
+		ProcessRunner.Result result = mavenRunner().withArguments("spotless:apply").runHasError();
+		assertThat(result.stdOutUtf8()).contains(Prettier.ERROR_MESSAGE_ONLY_ONE_CONFIG);
 	}
 
 	@Test
@@ -156,8 +156,8 @@ void autodetect_npmrc_file() throws Exception {
 				"  <prettierVersion>1.16.4</prettierVersion>",
 				"  <configFile>.prettierrc.yml</configFile>",
 				"</prettier>");
-		Result result = runExpectingError("typescript", suffix);
-		assertThat(result.output()).containsPattern("Running npm command.*npm install.* failed with exit code: 1");
+		ProcessRunner.Result result = runExpectingError("typescript", suffix);
+		assertThat(result.stdOutUtf8()).containsPattern("Running npm command.*npm install.* failed with exit code: 1");
 	}
 
 	@Test
@@ -174,7 +174,7 @@ void select_configured_npmrc_file() throws Exception {
 				"  <configFile>.prettierrc.yml</configFile>",
 				"  <npmrc>${basedir}/.custom_npmrc</npmrc>",
 				"</prettier>");
-		Result result = runExpectingError("typescript", suffix);
-		assertThat(result.output()).containsPattern("Running npm command.*npm install.* failed with exit code: 1");
+		ProcessRunner.Result result = runExpectingError("typescript", suffix);
+		assertThat(result.stdOutUtf8()).containsPattern("Running npm command.*npm install.* failed with exit code: 1");
 	}
 }
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/typescript/TypescriptFormatStepTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/typescript/TypescriptFormatStepTest.java
index 95097fe467..a09111d30d 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/typescript/TypescriptFormatStepTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/typescript/TypescriptFormatStepTest.java
@@ -21,9 +21,9 @@
 
 import org.junit.jupiter.api.Test;
 
+import com.diffplug.spotless.ProcessRunner;
 import com.diffplug.spotless.ResourceHarness;
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
-import com.diffplug.spotless.maven.MavenRunner.Result;
 import com.diffplug.spotless.npm.EslintFormatterStep;
 import com.diffplug.spotless.npm.EslintStyleGuide;
 import com.diffplug.spotless.tag.NpmTest;
@@ -48,7 +48,7 @@ private String prepareRunTsfmt(String kind) throws IOException {
 		return TEST_FILE_PATH;
 	}
 
-	private Result runExpectingErrorTsfmt(String kind) throws IOException, InterruptedException {
+	private ProcessRunner.Result runExpectingErrorTsfmt(String kind) throws IOException, InterruptedException {
 		prepareRunTsfmt(kind);
 		return mavenRunner().withArguments("spotless:apply").runHasError();
 	}
@@ -124,8 +124,8 @@ void testTypescript_2_Configs() throws Exception {
 		setFile("tsfmt.json").toResource("npm/tsfmt/tsfmt/tsfmt.json");
 
 		setFile(path).toResource("npm/tsfmt/tsfmt/tsfmt.dirty");
-		Result result = mavenRunner().withArguments("spotless:apply").runHasError();
-		assertThat(result.output()).contains("must specify exactly one configFile or config");
+		ProcessRunner.Result result = mavenRunner().withArguments("spotless:apply").runHasError();
+		assertThat(result.stdOutUtf8()).contains("must specify exactly one configFile or config");
 	}
 
 	@Test
@@ -141,8 +141,8 @@ void testNpmrcIsAutoPickedUp() throws Exception {
 				"  <tslintFile>${basedir}/tslint.json</tslintFile>",
 				"</tsfmt>");
 		setFile("tslint.json").toResource("npm/tsfmt/tslint/tslint.json");
-		Result result = runExpectingErrorTsfmt("tslint");
-		assertThat(result.output()).containsPattern("Running npm command.*npm install.* failed with exit code: 1");
+		ProcessRunner.Result result = runExpectingErrorTsfmt("tslint");
+		assertThat(result.stdOutUtf8()).containsPattern("Running npm command.*npm install.* failed with exit code: 1");
 	}
 
 	@Test
@@ -159,8 +159,8 @@ void testNpmrcIsConfigurativelyPickedUp() throws Exception {
 				"  <npmrc>${basedir}/.custom_npmrc</npmrc>",
 				"</tsfmt>");
 		setFile("tslint.json").toResource("npm/tsfmt/tslint/tslint.json");
-		Result result = runExpectingErrorTsfmt("tslint");
-		assertThat(result.output()).containsPattern("Running npm command.*npm install.* failed with exit code: 1");
+		ProcessRunner.Result result = runExpectingErrorTsfmt("tslint");
+		assertThat(result.stdOutUtf8()).containsPattern("Running npm command.*npm install.* failed with exit code: 1");
 	}
 
 	@Test
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java
index b5a417c536..f17feeb10a 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java
@@ -21,8 +21,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.diffplug.spotless.ProcessRunner;
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
-import com.diffplug.spotless.maven.MavenRunner.Result;
 
 public class YamlTest extends MavenIntegrationHarness {
 	private static final Logger LOGGER = LoggerFactory.getLogger(YamlTest.class);
@@ -32,9 +32,9 @@ public void testFormatYaml_WithJackson_defaultConfig_separatorComments() throws
 		writePomWithYamlSteps("<jackson/>");
 
 		setFile("yaml_test.yaml").toResource("yaml/separator_comments.yaml");
-		Result runNoError = mavenRunner().withArguments("spotless:apply").runNoError();
+		ProcessRunner.Result runNoError = mavenRunner().withArguments("spotless:apply").runNoError();
 		LOGGER.error("result: {}", runNoError);
-		assertThat(runNoError.exitValue()).as("Run without error %s", runNoError).isEqualTo(0);
+		assertThat(runNoError.exitCode()).as("Run without error %s", runNoError).isEqualTo(0);
 		LOGGER.error("GOGO");
 		assertFile("yaml_test.yaml").sameAsResource("yaml/separator_comments.clean.yaml");
 	}

From bc4a2684d118b63818803bc1e99417023a229133 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 16 Jan 2023 17:46:43 -0800
Subject: [PATCH 0601/2068] Add support for environment variables into
 ProcessRunner so that MavenRunner's support for remote debug works again.

---
 .../com/diffplug/spotless/ProcessRunner.java  | 21 +++++++++----------
 .../diffplug/spotless/maven/MavenRunner.java  |  2 +-
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java b/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
index 7a1d0ac774..e2149a03d6 100644
--- a/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
+++ b/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
@@ -24,6 +24,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -57,18 +58,18 @@ public Result shell(String cmd) throws IOException, InterruptedException {
 
 	/** Executes the given shell command (using {@code cmd} on windows and {@code sh} on unix). */
 	public Result shellWinUnix(String cmdWin, String cmdUnix) throws IOException, InterruptedException {
-		return shellWinUnix(null, cmdWin, cmdUnix);
+		return shellWinUnix(null, null, cmdWin, cmdUnix);
 	}
 
 	/** Executes the given shell command (using {@code cmd} on windows and {@code sh} on unix). */
-	public Result shellWinUnix(File cwd, String cmdWin, String cmdUnix) throws IOException, InterruptedException {
+	public Result shellWinUnix(File cwd, Map<String, String> environment, String cmdWin, String cmdUnix) throws IOException, InterruptedException {
 		List<String> args;
 		if (FileSignature.machineIsWin()) {
 			args = Arrays.asList("cmd", "/c", cmdWin);
 		} else {
 			args = Arrays.asList("sh", "-c", cmdUnix);
 		}
-		return exec(cwd, args);
+		return exec(cwd, environment, new byte[0], args);
 	}
 
 	/** Creates a process with the given arguments. */
@@ -83,25 +84,23 @@ public Result exec(byte[] stdin, String... args) throws IOException, Interrupted
 
 	/** Creates a process with the given arguments. */
 	public Result exec(List<String> args) throws IOException, InterruptedException {
-		return exec((File) null, args);
-	}
-
-	/** Creates a process with the given arguments. */
-	public Result exec(File cwd, List<String> args) throws IOException, InterruptedException {
-		return exec(cwd, new byte[0], args);
+		return exec(null, args);
 	}
 
 	/** Creates a process with the given arguments, the given byte array is written to stdin immediately. */
 	public Result exec(byte[] stdin, List<String> args) throws IOException, InterruptedException {
-		return exec(null, stdin, args);
+		return exec(null, null, stdin, args);
 	}
 
 	/** Creates a process with the given arguments, the given byte array is written to stdin immediately. */
-	public Result exec(File cwd, byte[] stdin, List<String> args) throws IOException, InterruptedException {
+	public Result exec(File cwd, Map<String, String> environment, byte[] stdin, List<String> args) throws IOException, InterruptedException {
 		ProcessBuilder builder = new ProcessBuilder(args);
 		if (cwd != null) {
 			builder.directory(cwd);
 		}
+		if (environment != null) {
+			builder.environment().putAll(environment);
+		}
 		Process process = builder.start();
 		Future<byte[]> outputFut = threadStdOut.submit(() -> drainToBytes(process.getInputStream(), bufStdOut));
 		Future<byte[]> errorFut = threadStdErr.submit(() -> drainToBytes(process.getErrorStream(), bufStdErr));
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenRunner.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenRunner.java
index 4fe454ceba..d878b18c5f 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenRunner.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenRunner.java
@@ -69,7 +69,7 @@ private ProcessRunner.Result run() throws IOException, InterruptedException {
 		Objects.requireNonNull(args, "Need to call withArguments() first");
 		// run maven with the given args in the given directory
 		String argsString = "-e " + String.join(" ", Arrays.asList(args));
-		return runner.shellWinUnix(projectDir, "mvnw " + argsString, "./mvnw " + argsString);
+		return runner.shellWinUnix(projectDir, environment, "mvnw " + argsString, "./mvnw " + argsString);
 	}
 
 	/** Runs the command and asserts that exit code is 0. */

From 7b5f01949713ea90dbc6928346545d15c704a1f2 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 16 Jan 2023 17:49:33 -0800
Subject: [PATCH 0602/2068] Fix a bug in how ProcessRunner handled null stdin.

---
 lib/src/main/java/com/diffplug/spotless/ProcessRunner.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java b/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
index e2149a03d6..1356c0ac0d 100644
--- a/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
+++ b/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
@@ -69,7 +69,7 @@ public Result shellWinUnix(File cwd, Map<String, String> environment, String cmd
 		} else {
 			args = Arrays.asList("sh", "-c", cmdUnix);
 		}
-		return exec(cwd, environment, new byte[0], args);
+		return exec(cwd, environment, null, args);
 	}
 
 	/** Creates a process with the given arguments. */
@@ -101,6 +101,9 @@ public Result exec(File cwd, Map<String, String> environment, byte[] stdin, List
 		if (environment != null) {
 			builder.environment().putAll(environment);
 		}
+		if (stdin == null) {
+			stdin = new byte[0];
+		}
 		Process process = builder.start();
 		Future<byte[]> outputFut = threadStdOut.submit(() -> drainToBytes(process.getInputStream(), bufStdOut));
 		Future<byte[]> errorFut = threadStdErr.submit(() -> drainToBytes(process.getErrorStream(), bufStdErr));

From 9d894cd364bcb20bc38d1f22a61e1f37b956f870 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 16 Jan 2023 17:52:02 -0800
Subject: [PATCH 0603/2068] Update the core changelog since ProcessRunner has
 gotten a few new methods.

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index c08ca86796..bff243b753 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* `ProcessRunner` has added some convenience methods so it can be used for maven testing. ([#1496](https://github.com/diffplug/spotless/pull/1496))
 
 ## [2.32.0] - 2023-01-13
 ### Added

From 86c613b08be06ff9dab3a59e1dcc7e1227e59d91 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 16 Jan 2023 17:54:36 -0800
Subject: [PATCH 0604/2068] Small tweak to reduce diff.

---
 .../com/diffplug/spotless/maven/MavenIntegrationHarness.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
index 1c44eef55e..5a724408c8 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
@@ -178,8 +178,8 @@ protected void writePom(String[] executions, String[] configuration, String[] de
 
 	protected MavenRunner mavenRunner() throws IOException {
 		return MavenRunner.create()
-				.withRunner(runner)
-				.withProjectDir(rootFolder());
+				.withProjectDir(rootFolder())
+				.withRunner(runner);
 	}
 
 	private static ProcessRunner runner;

From aa0c878c8817ef0afcc192e1e5257a3e3d7e83f7 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 16 Jan 2023 17:57:18 -0800
Subject: [PATCH 0605/2068] Fix spotbugs warning.

---
 .../main/java/com/diffplug/spotless/ProcessRunner.java   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java b/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
index 1356c0ac0d..41c664cafe 100644
--- a/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
+++ b/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
@@ -31,6 +31,7 @@
 import java.util.concurrent.Future;
 import java.util.function.BiConsumer;
 
+import edu.umd.cs.findbugs.annotations.Nullable;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -62,7 +63,7 @@ public Result shellWinUnix(String cmdWin, String cmdUnix) throws IOException, In
 	}
 
 	/** Executes the given shell command (using {@code cmd} on windows and {@code sh} on unix). */
-	public Result shellWinUnix(File cwd, Map<String, String> environment, String cmdWin, String cmdUnix) throws IOException, InterruptedException {
+	public Result shellWinUnix(@Nullable File cwd, @Nullable Map<String, String> environment, String cmdWin, String cmdUnix) throws IOException, InterruptedException {
 		List<String> args;
 		if (FileSignature.machineIsWin()) {
 			args = Arrays.asList("cmd", "/c", cmdWin);
@@ -78,7 +79,7 @@ public Result exec(String... args) throws IOException, InterruptedException {
 	}
 
 	/** Creates a process with the given arguments, the given byte array is written to stdin immediately. */
-	public Result exec(byte[] stdin, String... args) throws IOException, InterruptedException {
+	public Result exec(@Nullable byte[] stdin, String... args) throws IOException, InterruptedException {
 		return exec(stdin, Arrays.asList(args));
 	}
 
@@ -88,12 +89,12 @@ public Result exec(List<String> args) throws IOException, InterruptedException {
 	}
 
 	/** Creates a process with the given arguments, the given byte array is written to stdin immediately. */
-	public Result exec(byte[] stdin, List<String> args) throws IOException, InterruptedException {
+	public Result exec(@Nullable byte[] stdin, List<String> args) throws IOException, InterruptedException {
 		return exec(null, null, stdin, args);
 	}
 
 	/** Creates a process with the given arguments, the given byte array is written to stdin immediately. */
-	public Result exec(File cwd, Map<String, String> environment, byte[] stdin, List<String> args) throws IOException, InterruptedException {
+	public Result exec(@Nullable File cwd, @Nullable Map<String, String> environment, @Nullable byte[] stdin, List<String> args) throws IOException, InterruptedException {
 		ProcessBuilder builder = new ProcessBuilder(args);
 		if (cwd != null) {
 			builder.directory(cwd);

From e9bea7e369cd2b1bbbda8d5cda958d2f74b1a6a7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 17 Jan 2023 03:02:14 +0000
Subject: [PATCH 0606/2068] fix(deps): update dependency
 org.assertj:assertj-core to v3.24.2

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 71f755522f..ecf51ea654 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -27,7 +27,7 @@ VER_SLF4J=[1.6,2.0[
 VER_DURIAN=1.2.0
 VER_JGIT=5.13.1.202206130422-r
 VER_JUNIT=5.9.2
-VER_ASSERTJ=3.24.1
+VER_ASSERTJ=3.24.2
 VER_MOCKITO=4.11.0
 
 # Used for Maven Plugin

From c51331dc79298ba3a2cdf6356ddcb405dfd65ef1 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 16 Jan 2023 22:47:38 -0800
Subject: [PATCH 0607/2068] Centralize test configuration into `special-tests`
 and make sure it doesn't get overwritten.

---
 lib-extra/build.gradle     |  4 ++--
 lib/build.gradle           |  5 +----
 plugin-gradle/build.gradle |  6 ++----
 plugin-maven/build.gradle  |  2 --
 testlib/build.gradle       | 16 ----------------
 5 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index d94992f8d3..08bf286d8d 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -25,8 +25,8 @@ dependencies {
 // we'll hold the core lib to a high standard
 spotbugs { reportLevel = 'low' } // low|medium|high (low = sensitive to even minor mistakes)
 
-test {
-	useJUnitPlatform()
+apply from: rootProject.file('gradle/special-tests.gradle')
+tasks.named('test') {
 	if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_16)) {
 		// needed for EclipseCdtFormatterStepTest
 		jvmArgs '--add-opens=java.base/java.lang=ALL-UNNAMED'
diff --git a/lib/build.gradle b/lib/build.gradle
index 3ef2064765..e7b0298132 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -112,10 +112,7 @@ dependencies {
 // we'll hold the core lib to a high standard
 spotbugs { reportLevel = 'low' } // low|medium|high (low = sensitive to even minor mistakes)
 
-tasks.withType(Test).configureEach {
-	useJUnitPlatform()
-}
-
+apply from: rootProject.file('gradle/special-tests.gradle')
 jar {
 	for (glue in NEEDS_GLUE) {
 		from sourceSets.getByName(glue).output.classesDirs
diff --git a/plugin-gradle/build.gradle b/plugin-gradle/build.gradle
index 8a3260d943..11258db0e6 100644
--- a/plugin-gradle/build.gradle
+++ b/plugin-gradle/build.gradle
@@ -27,13 +27,11 @@ dependencies {
 	testImplementation "com.diffplug.durian:durian-testlib:${VER_DURIAN}"
 }
 
-test {
-	useJUnitPlatform()
+apply from: rootProject.file('gradle/special-tests.gradle')
+tasks.named('test') {
 	testLogging.showStandardStreams = true
 }
 
-apply from: rootProject.file('gradle/special-tests.gradle')
-
 //////////////////////////
 // GRADLE PLUGIN PORTAL //
 //////////////////////////
diff --git a/plugin-maven/build.gradle b/plugin-maven/build.gradle
index e06fce9ace..b46cdda708 100644
--- a/plugin-maven/build.gradle
+++ b/plugin-maven/build.gradle
@@ -67,9 +67,7 @@ dependencies {
 }
 
 apply from: rootProject.file('gradle/special-tests.gradle')
-
 tasks.withType(Test).configureEach {
-	useJUnitPlatform()
 	systemProperty 'spotlessMavenPluginVersion', project.version
 	dependsOn 'publishToMavenLocal'
 	dependsOn ':lib:publishToMavenLocal'
diff --git a/testlib/build.gradle b/testlib/build.gradle
index 30c44ece23..4b16572a8c 100644
--- a/testlib/build.gradle
+++ b/testlib/build.gradle
@@ -21,22 +21,6 @@ dependencies {
 // we'll hold the testlib to a low standard (prize brevity)
 spotbugs { reportLevel = 'high' } // low|medium|high (low = sensitive to even minor mistakes)
 
-test {
-	useJUnitPlatform()
-	if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_16)) {
-		// for GJF https://github.com/diffplug/spotless/issues/834
-		def args = [
-			'--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED',
-			'--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED',
-			'--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED',
-			'--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED',
-			'--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED',
-			'--add-opens=java.base/java.lang=ALL-UNNAMED'
-		]
-		jvmArgs args
-	}
-}
-
 apply from: rootProject.file('gradle/special-tests.gradle')
 
 javadoc {

From 5e1a0e97ed6d53f3694309e161460b459e9cb802 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Tue, 17 Jan 2023 12:53:20 +0400
Subject: [PATCH 0608/2068] Jackson - Yaml starts diverging to enable
 yanml-specific options

---
 .../glue/json/JacksonJsonFormatterFunc.java   | 40 ++++-----
 .../glue/yaml/JacksonYamlFormatterFunc.java   | 28 +++++--
 .../diffplug/spotless/json/JacksonConfig.java | 11 +--
 .../spotless/yaml/JacksonYamlConfig.java      | 50 ++++++++++++
 .../spotless/yaml/JacksonYamlStep.java        |  2 +-
 .../gradle/spotless/JacksonGradleConfig.java  | 67 +++++++++++++++
 .../gradle/spotless/JsonExtension.java        | 23 +++++-
 .../gradle/spotless/SpotlessExtension.java    |  6 ++
 .../gradle/spotless/YamlExtension.java        | 75 +++++++++++++++++
 .../gradle/spotless/YamlExtensionTest.java    | 81 +++++++++++++++++++
 plugin-maven/CHANGES.md                       |  7 +-
 plugin-maven/README.md                        | 28 +++++--
 .../spotless/maven/yaml/JacksonYaml.java      | 10 ++-
 .../spotless/maven/yaml/YamlTest.java         |  8 +-
 ...ay_with_bracket.clean.no_start_marker.yaml | 11 +++
 ...th_bracket.clean.spaceBeforeSeparator.yaml |  6 +-
 16 files changed, 387 insertions(+), 66 deletions(-)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/yaml/JacksonYamlConfig.java
 create mode 100644 plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JacksonGradleConfig.java
 create mode 100644 plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java
 create mode 100644 plugin-gradle/src/test/java/com/diffplug/gradle/spotless/YamlExtensionTest.java
 create mode 100644 testlib/src/main/resources/yaml/array_with_bracket.clean.no_start_marker.yaml

diff --git a/lib/src/jackson/java/com/diffplug/spotless/glue/json/JacksonJsonFormatterFunc.java b/lib/src/jackson/java/com/diffplug/spotless/glue/json/JacksonJsonFormatterFunc.java
index c44ff0d0d1..934e60fcd8 100644
--- a/lib/src/jackson/java/com/diffplug/spotless/glue/json/JacksonJsonFormatterFunc.java
+++ b/lib/src/jackson/java/com/diffplug/spotless/glue/json/JacksonJsonFormatterFunc.java
@@ -18,6 +18,7 @@
 import java.io.IOException;
 
 import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonFactoryBuilder;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.util.DefaultIndenter;
 import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
@@ -47,12 +48,22 @@ public String apply(String input) throws Exception {
 		return format(objectMapper, input);
 	}
 
+	protected String format(ObjectMapper objectMapper, String input) throws IllegalArgumentException, IOException {
+		try {
+			ObjectNode objectNode = objectMapper.readValue(input, ObjectNode.class);
+			return objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(objectNode);
+		} catch (JsonProcessingException e) {
+			throw new AssertionError("Unable to format. input='" + input + "'", e);
+		}
+	}
+
 	/**
 	 * @return a {@link JsonFactory}. May be overridden to handle alternative formats.
 	 * @see <a href="https://github.com/FasterXML/jackson-dataformats-text">jackson-dataformats-text</a>
 	 */
 	protected JsonFactory makeJsonFactory() {
-		return new JsonFactory();
+		// We may later accept JsonFactory.Features
+		return new JsonFactoryBuilder().build();
 	}
 
 	protected ObjectMapper makeObjectMapper() {
@@ -76,7 +87,9 @@ protected ObjectMapper makeObjectMapper() {
 	protected DefaultPrettyPrinter makePrinter() {
 		boolean spaceBeforeSeparator = jacksonConfig.isSpaceBeforeSeparator();
 
-		DefaultPrettyPrinter.Indenter indenter = new DefaultIndenter(getIndentation(), "\n");
+		// DefaultIndenter default constructor relies on 2 whitespaces as default tabulation
+		// By we want to force '\n' as eol given Spotless provides LF-input (whatever the actual File content/current OS)
+		DefaultPrettyPrinter.Indenter indenter = new DefaultIndenter("  ", "\n");
 		DefaultPrettyPrinter printer = new SpotlessDefaultPrettyPrinter(spaceBeforeSeparator);
 
 		printer.indentObjectsWith(indenter);
@@ -84,28 +97,6 @@ protected DefaultPrettyPrinter makePrinter() {
 		return printer;
 	}
 
-	protected String getIndentation() {
-		// DefaultIndenter default constructor relies on this
-		return "  ";
-		//		int indentSpaces = jacksonConfig.getIndentSpaces();
-		//		if (indentSpaces < 0) {
-		//			return "\t";
-		//		} else {
-		//			return IntStream.range(0, indentSpaces).mapToObj(i -> "").collect(Collectors.joining());
-		//		}
-	}
-
-	protected String format(ObjectMapper objectMapper, String input) throws IllegalArgumentException, IOException {
-		try {
-			ObjectNode objectNode = objectMapper.readValue(input, ObjectNode.class);
-			String outputFromjackson = objectMapper.writeValueAsString(objectNode);
-
-			return outputFromjackson;
-		} catch (JsonProcessingException e) {
-			throw new AssertionError("Unable to format. input='" + input + "'", e);
-		}
-	}
-
 	protected static class SpotlessDefaultPrettyPrinter extends DefaultPrettyPrinter {
 		private static final long serialVersionUID = 1L;
 		private final boolean spaceBeforeSeparator;
@@ -123,6 +114,7 @@ public DefaultPrettyPrinter createInstance() {
 		public DefaultPrettyPrinter withSeparators(Separators separators) {
 			this._separators = separators;
 			if (spaceBeforeSeparator) {
+				// This is Jackson default behavior
 				this._objectFieldValueSeparatorWithSpaces = " " + separators.getObjectFieldValueSeparator() + " ";
 			} else {
 				this._objectFieldValueSeparatorWithSpaces = separators.getObjectFieldValueSeparator() + " ";
diff --git a/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/JacksonYamlFormatterFunc.java b/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/JacksonYamlFormatterFunc.java
index 6a471a884c..f7686ad503 100644
--- a/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/JacksonYamlFormatterFunc.java
+++ b/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/JacksonYamlFormatterFunc.java
@@ -17,23 +17,39 @@
 
 import java.io.IOException;
 
+import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactoryBuilder;
+import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator;
 
 import com.diffplug.spotless.glue.json.JacksonJsonFormatterFunc;
-import com.diffplug.spotless.json.JacksonConfig;
+import com.diffplug.spotless.yaml.JacksonYamlConfig;
 
 public class JacksonYamlFormatterFunc extends JacksonJsonFormatterFunc {
+	final JacksonYamlConfig yamlConfig;
 
-	public JacksonYamlFormatterFunc(JacksonConfig jacksonConfig) {
+	public JacksonYamlFormatterFunc(JacksonYamlConfig jacksonConfig) {
 		super(jacksonConfig);
+		this.yamlConfig = jacksonConfig;
 	}
 
-	@Override
-	protected YAMLFactory makeJsonFactory() {
-		return new YAMLFactory();
+	protected JsonFactory makeJsonFactory() {
+		YAMLFactoryBuilder yamlFactoryBuilder = new YAMLFactoryBuilder(new YAMLFactory());
+
+		// Configure the ObjectMapper
+		// https://github.com/FasterXML/jackson-databind#commonly-used-features
+		yamlConfig.getYamlFeatureToToggle().forEach((rawFeature, toggle) -> {
+			// https://stackoverflow.com/questions/3735927/java-instantiating-an-enum-using-reflection
+			// Refers to 'com.fasterxml.jackson.dataformat.yaml.YAMLGenerator.Feature'
+			YAMLGenerator.Feature feature = YAMLGenerator.Feature.valueOf(rawFeature);
+
+			yamlFactoryBuilder.configure(feature, toggle);
+		});
+
+		return yamlFactoryBuilder.build();
 	}
 
 	@Override
@@ -56,7 +72,7 @@ protected String format(ObjectMapper objectMapper, String input) throws IllegalA
 			//Not 'toPrettyString' as one could require no INDENT_OUTPUT
 			// return jsonNode.toPrettyString();
 			ObjectNode objectNode = objectMapper.readValue(input, ObjectNode.class);
-			String outputFromjackson = objectMapper.writeValueAsString(objectNode);
+			String outputFromjackson = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(objectNode);
 
 			return outputFromjackson;
 		} catch (JsonProcessingException e) {
diff --git a/lib/src/main/java/com/diffplug/spotless/json/JacksonConfig.java b/lib/src/main/java/com/diffplug/spotless/json/JacksonConfig.java
index 7690913f34..d5ca990b08 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/JacksonConfig.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/JacksonConfig.java
@@ -31,6 +31,7 @@ public class JacksonConfig implements Serializable {
 	static {
 		Map<String, Boolean> defaultFeatureToggles = new LinkedHashMap<>();
 		// We activate by default the PrettyPrinter from Jackson
+		// @see com.fasterxml.jackson.databind.SerializationFeature.INDENT_OUTPUT
 		defaultFeatureToggles.put("INDENT_OUTPUT", true);
 		DEFAULT_FEATURE_TOGGLES = defaultFeatureToggles;
 	}
@@ -41,8 +42,6 @@ public class JacksonConfig implements Serializable {
 	// By default, Jackson adds a ' ' before separator, which is not standard with most IDE/JSON libraries
 	protected boolean spaceBeforeSeparator = false;
 
-	// protected int indentSpaces;
-
 	public Map<String, Boolean> getFeatureToToggle() {
 		return Collections.unmodifiableMap(featureToToggle);
 	}
@@ -62,12 +61,4 @@ public boolean isSpaceBeforeSeparator() {
 	public void setSpaceBeforeSeparator(boolean spaceBeforeSeparator) {
 		this.spaceBeforeSeparator = spaceBeforeSeparator;
 	}
-
-	//	public int getIndentSpaces() {
-	//		return indentSpaces;
-	//	}
-
-	//	public void setIndentSpaces(int indentSpaces) {
-	//		this.indentSpaces = indentSpaces;
-	//	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/yaml/JacksonYamlConfig.java b/lib/src/main/java/com/diffplug/spotless/yaml/JacksonYamlConfig.java
new file mode 100644
index 0000000000..2463b9603f
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/yaml/JacksonYamlConfig.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.yaml;
+
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import com.diffplug.spotless.json.JacksonConfig;
+
+/**
+ * Specialization of {@link JacksonConfig} for YAML documents
+ */
+public class JacksonYamlConfig extends JacksonConfig {
+	private static final long serialVersionUID = 1L;
+
+	protected Map<String, Boolean> yamlFeatureToToggle = new LinkedHashMap<>();
+
+	public Map<String, Boolean> getYamlFeatureToToggle() {
+		return Collections.unmodifiableMap(yamlFeatureToToggle);
+	}
+
+	/**
+	 * @see com.fasterxml.jackson.dataformat.yaml.YAMLGenerator.Feature
+	 */
+	public void setYamlFeatureToToggle(Map<String, Boolean> yamlFeatureToToggle) {
+		this.yamlFeatureToToggle = yamlFeatureToToggle;
+	}
+
+	/**
+	 * @see com.fasterxml.jackson.dataformat.yaml.YAMLGenerator.Feature
+	 */
+	public void appendYamlFeatureToToggle(Map<String, Boolean> features) {
+		this.yamlFeatureToToggle.putAll(features);
+	}
+
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/yaml/JacksonYamlStep.java b/lib/src/main/java/com/diffplug/spotless/yaml/JacksonYamlStep.java
index 944d90e6c9..04d1895fe0 100644
--- a/lib/src/main/java/com/diffplug/spotless/yaml/JacksonYamlStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/yaml/JacksonYamlStep.java
@@ -73,7 +73,7 @@ private State(JacksonConfig jacksonConfig,
 		FormatterFunc toFormatter() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException,
 				InstantiationException, IllegalAccessException {
 			Class<?> formatterFunc = jarState.getClassLoader().loadClass("com.diffplug.spotless.glue.yaml.JacksonYamlFormatterFunc");
-			Constructor<?> constructor = formatterFunc.getConstructor(JacksonConfig.class);
+			Constructor<?> constructor = formatterFunc.getConstructor(JacksonYamlConfig.class);
 			return (FormatterFunc) constructor.newInstance(jacksonConfig);
 		}
 	}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JacksonGradleConfig.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JacksonGradleConfig.java
new file mode 100644
index 0000000000..d388f45d11
--- /dev/null
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JacksonGradleConfig.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.gradle.spotless;
+
+import java.util.Collections;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.json.JacksonConfig;
+import com.diffplug.spotless.json.JacksonJsonStep;
+
+public abstract class JacksonGradleConfig {
+	protected final FormatExtension formatExtension;
+
+	protected JacksonConfig jacksonConfig;
+
+	protected String version = JacksonJsonStep.defaultVersion();
+
+	public JacksonGradleConfig(JacksonConfig jacksonConfig, FormatExtension formatExtension) {
+		this.formatExtension = formatExtension;
+
+		this.jacksonConfig = jacksonConfig;
+		formatExtension.addStep(createStep());
+	}
+
+	public JacksonGradleConfig(FormatExtension formatExtension) {
+		this(new JacksonConfig(), formatExtension);
+	}
+
+	public JacksonGradleConfig config(JacksonConfig jacksonConfig) {
+		this.jacksonConfig = jacksonConfig;
+		formatExtension.replaceStep(createStep());
+		return this;
+	}
+
+	public JacksonGradleConfig feature(String feature, boolean toggle) {
+		this.jacksonConfig.appendFeatureToToggle(Collections.singletonMap(feature, toggle));
+		formatExtension.replaceStep(createStep());
+		return this;
+	}
+
+	public JacksonGradleConfig spaceBeforeSeparator(boolean toggle) {
+		this.jacksonConfig.setSpaceBeforeSeparator(toggle);
+		formatExtension.replaceStep(createStep());
+		return this;
+	}
+
+	public JacksonGradleConfig version(String version) {
+		this.version = version;
+		formatExtension.replaceStep(createStep());
+		return this;
+	}
+
+	protected abstract FormatterStep createStep();
+}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
index 25182fa4bc..542b2d5431 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,8 @@
 import javax.inject.Inject;
 
 import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.json.JacksonConfig;
+import com.diffplug.spotless.json.JacksonJsonStep;
 import com.diffplug.spotless.json.JsonSimpleStep;
 import com.diffplug.spotless.json.gson.GsonStep;
 
@@ -47,6 +49,10 @@ public GsonConfig gson() {
 		return new GsonConfig();
 	}
 
+	public JacksonJsonGradleConfig jackson() {
+		return new JacksonJsonGradleConfig(this);
+	}
+
 	public class SimpleConfig {
 		private int indent;
 
@@ -108,4 +114,19 @@ private FormatterStep createStep() {
 		}
 	}
 
+	public static class JacksonJsonGradleConfig extends JacksonGradleConfig {
+
+		public JacksonJsonGradleConfig(JacksonConfig jacksonConfig, FormatExtension formatExtension) {
+			super(jacksonConfig, formatExtension);
+		}
+
+		public JacksonJsonGradleConfig(FormatExtension formatExtension) {
+			this(new JacksonConfig(), formatExtension);
+		}
+
+		@Override
+		protected FormatterStep createStep() {
+			return JacksonJsonStep.create(jacksonConfig, version, formatExtension.provisioner());
+		}
+	}
 }
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
index 1c65fad310..8c3128e02d 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
@@ -193,6 +193,12 @@ public void json(Action<JsonExtension> closure) {
 		format(JsonExtension.NAME, JsonExtension.class, closure);
 	}
 
+	/** Configures the special YAML-specific extension. */
+	public void yaml(Action<YamlExtension> closure) {
+		requireNonNull(closure);
+		format(JsonExtension.NAME, YamlExtension.class, closure);
+	}
+
 	/** Configures a custom extension. */
 	public void format(String name, Action<FormatExtension> closure) {
 		requireNonNull(name, "name");
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java
new file mode 100644
index 0000000000..5907ea985a
--- /dev/null
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2016-2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.gradle.spotless;
+
+import java.util.Collections;
+
+import javax.inject.Inject;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.json.JacksonJsonStep;
+import com.diffplug.spotless.yaml.JacksonYamlConfig;
+import com.diffplug.spotless.yaml.JacksonYamlStep;
+
+public class YamlExtension extends FormatExtension {
+	private static final String DEFAULT_GSON_VERSION = JacksonJsonStep.defaultVersion();
+	static final String NAME = "yaml";
+
+	@Inject
+	public YamlExtension(SpotlessExtension spotless) {
+		super(spotless);
+	}
+
+	@Override
+	protected void setupTask(SpotlessTask task) {
+		if (target == null) {
+			throw noDefaultTargetException();
+		}
+		super.setupTask(task);
+	}
+
+	public JacksonGradleConfig jackson() {
+		return new JacksonYamlGradleConfig(this);
+	}
+
+	public class JacksonYamlGradleConfig extends JacksonGradleConfig {
+		protected JacksonYamlConfig jacksonConfig;
+
+		public JacksonYamlGradleConfig(JacksonYamlConfig jacksonConfig, FormatExtension formatExtension) {
+			super(jacksonConfig, formatExtension);
+
+			this.jacksonConfig = jacksonConfig;
+		}
+
+		public JacksonYamlGradleConfig(FormatExtension formatExtension) {
+			this(new JacksonYamlConfig(), formatExtension);
+		}
+
+		/**
+		 * @see com.fasterxml.jackson.dataformat.yaml.YAMLGenerator.Feature
+		 */
+		public JacksonGradleConfig yamlFeature(String feature, boolean toggle) {
+			this.jacksonConfig.appendYamlFeatureToToggle(Collections.singletonMap(feature, toggle));
+			formatExtension.replaceStep(createStep());
+			return this;
+		}
+
+		@Override
+		protected FormatterStep createStep() {
+			return JacksonYamlStep.create(jacksonConfig, version, provisioner());
+		}
+	}
+}
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/YamlExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/YamlExtensionTest.java
new file mode 100644
index 0000000000..c16053a661
--- /dev/null
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/YamlExtensionTest.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2021-2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.gradle.spotless;
+
+import java.io.IOException;
+
+import org.junit.jupiter.api.Test;
+
+class YamlExtensionTest extends GradleIntegrationHarness {
+	@Test
+	void testFormatYaml_WithJackson_defaultConfig_separatorComments() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'java'",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    yaml {",
+				"    target 'src/**/*.yaml'",
+				"    jackson()",
+				"}",
+				"}");
+		setFile("src/main/resources/example.yaml").toResource("yaml/separator_comments.yaml");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("src/main/resources/example.yaml").sameAsResource("yaml/separator_comments.clean.yaml");
+	}
+
+	@Test
+	void testFormatYaml_WithJackson_defaultConfig_arrayBrackets_spaceBeforeSeparator() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'java'",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    yaml {",
+				"    target 'src/**/*.yaml'",
+				"    jackson().spaceBeforeSeparator(true)",
+				"}",
+				"}");
+		setFile("src/main/resources/example.yaml").toResource("yaml/array_with_bracket.yaml");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("src/main/resources/example.yaml").sameAsResource("yaml/array_with_bracket.clean.spaceBeforeSeparator.yaml");
+	}
+
+	// see YAMLGenerator.Feature.WRITE_DOC_START_MARKER
+	@Test
+	void testFormatYaml_WithJackson_skipDocStartMarker() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'java'",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    yaml {",
+				"    target 'src/**/*.yaml'",
+				"    jackson().yamlFeature('WRITE_DOC_START_MARKER', false)",
+				"}",
+				"}");
+		setFile("src/main/resources/example.yaml").toResource("yaml/array_with_bracket.yaml");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("src/main/resources/example.yaml").sameAsResource("yaml/array_with_bracket.clean.no_start_marker.yaml");
+	}
+
+}
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index d6326cba12..5bcc4b24c6 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,13 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
-### Added
-* Introduce `<json><jackson/></json>` ([#1492](https://github.com/diffplug/spotless/pull/1492))
-  * **POTENTIALLY BREAKING** `JacksonYaml` is now configured with a `Map<String, Boolean>` to configure features
-* Jackson (JSON and YAML) has new `spaceBeforeSeparator` option
-  * **POTENTIALLY BREAKING** `spaceBeforeSeparator` is defaulted to false while the formatter was behaving with `<spaceBeforeSeparator>true<spaceBeforeSeparator/>`
 
-## [2.30.0] - 2023-01-13
+# [2.30.0] - 2023-01-13
 ### Added
 * Add option `editorConfigFile` for `ktLint` [#142](https://github.com/diffplug/spotless/issues/142)
   * **POTENTIALLY BREAKING** `ktlint` step now modifies license headers. Make sure to put `licenseHeader` *after* `ktlint`.
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 6dca992591..e76d424611 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -12,8 +12,8 @@ output = [
   ].join('\n');
 -->
 [![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.30.0/index.html)
-[![Changelog](https://img.shields.io/badge/changelog-2.30.0-brightgreen.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.29.0/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.29.0-brightgreen.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)
@@ -864,6 +864,7 @@ For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#n
 
     <simple />    <!-- has its own section below -->
     <gson />      <!-- has its own section below -->
+    <jackson />   <!-- has its own section below -->
   </json>
 </configuration>
 ```
@@ -898,6 +899,22 @@ all HTML characters are written escaped or none. Set `escapeHtml` if you prefer
 [javadoc of String](https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/String.html#compareTo(java.lang.String))
 for details.
 
+### Jackson
+
+Uses Jackson for formatting.
+
+```xml
+<jackson>
+  <version>2.14.1</version>    <!-- optional: The version of 'com.fasterxml.jackson.core:jackson-databind' to be used -->
+  <features>                   <!-- optional: Customize the set of features (based on com.fasterxml.jackson.databind.SerializationFeature) -->
+    <INDENT_OUTPUT>true</INDENT_OUTPUT>                            <!-- true by default -->
+    <ORDER_MAP_ENTRIES_BY_KEYS>false</ORDER_MAP_ENTRIES_BY_KEYS>   <!-- false by default -->
+    <ANY_OTHER_FEATURE>true|false</ANY_OTHER_FEATURE>              <!-- any feature can be toggled on or off -->
+  </features>
+  <spaceBeforeSeparator>false</spaceBeforeSeparator>   <!-- optional: false by default -->
+</jackson>
+```
+
 <a name="applying-prettier-to-javascript--flow--typescript--css--scss--less--jsx--graphql--yaml--etc"></a>
 
 
@@ -924,10 +941,11 @@ Uses Jackson and YAMLFactory to pretty print objects:
 ```xml
 <jackson>
   <version>2.14.1</version>    <!-- optional: The version of 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml' to be used -->
-  <features>                   <!-- optional: Customize the set of features -->
-    <INDENT_OUTPUT>true<INDENT_OUTPUT/>                            <!-- true by default -->
+  <features>                   <!-- optional: Customize the set of features (based on com.fasterxml.jackson.databind.SerializationFeature) -->
+    <INDENT_OUTPUT>true</INDENT_OUTPUT>                            <!-- true by default -->
     <ORDER_MAP_ENTRIES_BY_KEYS>false</ORDER_MAP_ENTRIES_BY_KEYS>   <!-- false by default -->
-    <ANY_OTHER_FEATURE>true|false</ANY_OTHER_FEATURE>
+    <com.fasterxml.jackson.dataformat.yaml.YAMLGenerator.Feature.WRITE_DOC_START_MARKER>false</com.fasterxml.jackson.dataformat.yaml.YAMLGenerator.Feature.WRITE_DOC_START_MARKER>   <!-- feature can be referenced by their fully qualified className -->
+    <ANY_OTHER_FEATURE>true|false</ANY_OTHER_FEATURE>              <!-- any feature can be toggled on or off -->
   </features>
   <spaceBeforeSeparator>false</spaceBeforeSeparator>   <!-- optional: false by default -->
 </jackson>
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/JacksonYaml.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/JacksonYaml.java
index 1cd23bc3cc..9741c3f5d0 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/JacksonYaml.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/JacksonYaml.java
@@ -21,10 +21,10 @@
 import org.apache.maven.plugins.annotations.Parameter;
 
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.json.JacksonConfig;
 import com.diffplug.spotless.maven.FormatterFactory;
 import com.diffplug.spotless.maven.FormatterStepConfig;
 import com.diffplug.spotless.maven.FormatterStepFactory;
+import com.diffplug.spotless.yaml.JacksonYamlConfig;
 import com.diffplug.spotless.yaml.JacksonYamlStep;
 
 /**
@@ -36,16 +36,20 @@ public class JacksonYaml implements FormatterStepFactory {
 	private String version = JacksonYamlStep.defaultVersion();
 
 	@Parameter
-	private boolean spaceBeforeSeparator = new JacksonConfig().isSpaceBeforeSeparator();
+	private boolean spaceBeforeSeparator = new JacksonYamlConfig().isSpaceBeforeSeparator();
 
 	@Parameter
 	private Map<String, Boolean> features = Collections.emptyMap();
 
+	@Parameter
+	private Map<String, Boolean> yamlFeatures = Collections.emptyMap();
+
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
-		JacksonConfig jacksonConfig = new JacksonConfig();
+		JacksonYamlConfig jacksonConfig = new JacksonYamlConfig();
 
 		jacksonConfig.appendFeatureToToggle(features);
+		jacksonConfig.appendYamlFeatureToToggle(yamlFeatures);
 		jacksonConfig.setSpaceBeforeSeparator(spaceBeforeSeparator);
 
 		return JacksonYamlStep
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java
index 51f8da99f4..aaea2c65b1 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java
@@ -15,14 +15,11 @@
  */
 package com.diffplug.spotless.maven.yaml;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
-import com.diffplug.spotless.maven.MavenRunner.Result;
 
 public class YamlTest extends MavenIntegrationHarness {
 	private static final Logger LOGGER = LoggerFactory.getLogger(YamlTest.class);
@@ -32,10 +29,7 @@ public void testFormatYaml_WithJackson_defaultConfig_separatorComments() throws
 		writePomWithYamlSteps("<jackson/>");
 
 		setFile("yaml_test.yaml").toResource("yaml/separator_comments.yaml");
-		Result runNoError = mavenRunner().withArguments("spotless:apply").runNoError();
-		LOGGER.error("result: {}", runNoError);
-		assertThat(runNoError.exitValue()).as("Run without error %s", runNoError).isEqualTo(0);
-		LOGGER.error("GOGO");
+		mavenRunner().withArguments("spotless:apply").runNoError();
 		assertFile("yaml_test.yaml").sameAsResource("yaml/separator_comments.clean.yaml");
 	}
 
diff --git a/testlib/src/main/resources/yaml/array_with_bracket.clean.no_start_marker.yaml b/testlib/src/main/resources/yaml/array_with_bracket.clean.no_start_marker.yaml
new file mode 100644
index 0000000000..7f2f5a96cd
--- /dev/null
+++ b/testlib/src/main/resources/yaml/array_with_bracket.clean.no_start_marker.yaml
@@ -0,0 +1,11 @@
+episodes:
+- 1
+- 2
+- 3
+- 4
+- 5
+- 6
+- 7
+best-jedi:
+  name: "Obi-Wan"
+  side: "light"
diff --git a/testlib/src/main/resources/yaml/array_with_bracket.clean.spaceBeforeSeparator.yaml b/testlib/src/main/resources/yaml/array_with_bracket.clean.spaceBeforeSeparator.yaml
index c6f891b9de..7dc9255e06 100644
--- a/testlib/src/main/resources/yaml/array_with_bracket.clean.spaceBeforeSeparator.yaml
+++ b/testlib/src/main/resources/yaml/array_with_bracket.clean.spaceBeforeSeparator.yaml
@@ -7,6 +7,6 @@ episodes:
 - 5
 - 6
 - 7
-best-jedi:
-  name: "Obi-Wan"
-  side: "light"
\ No newline at end of file
+best-jedi :
+  name : "Obi-Wan"
+  side : "light"

From 533dc9999c56ca8dbd381f3ea74b79bcd5774e50 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Wed, 18 Jan 2023 00:33:53 +0400
Subject: [PATCH 0609/2068] Progress with gradle and tests

---
 .../glue/json/AJacksonFormatterFunc.java      | 87 +++++++++++++++++++
 .../glue/json/JacksonJsonFormatterFunc.java   | 59 ++++---------
 .../glue/yaml/JacksonYamlFormatterFunc.java   |  9 +-
 .../diffplug/spotless/json/JacksonConfig.java | 14 +--
 .../spotless/json/JacksonJsonConfig.java      | 59 +++++++++++++
 .../spotless/json/JacksonJsonStep.java        |  6 +-
 .../spotless/yaml/JacksonYamlStep.java        | 13 +--
 .../gradle/spotless/JacksonGradleConfig.java  |  6 --
 .../gradle/spotless/JsonExtension.java        | 28 +++++-
 .../gradle/spotless/YamlExtension.java        |  6 +-
 .../gradle/spotless/JsonExtensionTest.java    | 56 ++++++++----
 .../gradle/spotless/YamlExtensionTest.java    | 33 ++-----
 .../spotless/maven/json/JacksonJson.java      |  6 +-
 .../spotless/maven/yaml/JacksonYaml.java      |  4 -
 ...ay_with_bracket.clean.no_start_marker.yaml |  4 +-
 15 files changed, 259 insertions(+), 131 deletions(-)
 create mode 100644 lib/src/jackson/java/com/diffplug/spotless/glue/json/AJacksonFormatterFunc.java
 create mode 100644 lib/src/main/java/com/diffplug/spotless/json/JacksonJsonConfig.java

diff --git a/lib/src/jackson/java/com/diffplug/spotless/glue/json/AJacksonFormatterFunc.java b/lib/src/jackson/java/com/diffplug/spotless/glue/json/AJacksonFormatterFunc.java
new file mode 100644
index 0000000000..a835c85f9a
--- /dev/null
+++ b/lib/src/jackson/java/com/diffplug/spotless/glue/json/AJacksonFormatterFunc.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2021-2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.glue.json;
+
+import java.io.IOException;
+
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.json.JacksonConfig;
+
+/**
+ * A {@link FormatterFunc} based on Jackson library
+ */
+// https://github.com/FasterXML/jackson-dataformats-text/issues/372
+public abstract class AJacksonFormatterFunc implements FormatterFunc {
+	private JacksonConfig jacksonConfig;
+
+	public AJacksonFormatterFunc(JacksonConfig jacksonConfig) {
+		this.jacksonConfig = jacksonConfig;
+	}
+
+	@Override
+	public String apply(String input) throws Exception {
+		ObjectMapper objectMapper = makeObjectMapper();
+
+		return format(objectMapper, input);
+	}
+
+	protected String format(ObjectMapper objectMapper, String input) throws IllegalArgumentException, IOException {
+		try {
+			ObjectNode objectNode = objectMapper.readValue(input, ObjectNode.class);
+			return objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(objectNode);
+		} catch (JsonProcessingException e) {
+			throw new AssertionError("Unable to format. input='" + input + "'", e);
+		}
+	}
+
+	/**
+	 * @return a {@link JsonFactory}. May be overridden to handle alternative formats.
+	 * @see <a href="https://github.com/FasterXML/jackson-dataformats-text">jackson-dataformats-text</a>
+	 */
+	protected abstract JsonFactory makeJsonFactory();
+
+	protected ObjectMapper makeObjectMapper() {
+		JsonFactory jsonFactory = makeJsonFactory();
+		ObjectMapper objectMapper = new ObjectMapper(jsonFactory);
+
+		objectMapper.setDefaultPrettyPrinter(makePrinter());
+
+		// Configure the ObjectMapper
+		// https://github.com/FasterXML/jackson-databind#commonly-used-features
+		jacksonConfig.getFeatureToToggle().forEach((rawFeature, toggle) -> {
+			// https://stackoverflow.com/questions/3735927/java-instantiating-an-enum-using-reflection
+			SerializationFeature feature = SerializationFeature.valueOf(rawFeature);
+
+			objectMapper.configure(feature, toggle);
+		});
+
+		new JsonFactory().configure(JsonGenerator.Feature.AUTO_CLOSE_JSON_CONTENT, true);
+
+		return objectMapper;
+	}
+
+	protected DefaultPrettyPrinter makePrinter() {
+		return new DefaultPrettyPrinter();
+	}
+}
diff --git a/lib/src/jackson/java/com/diffplug/spotless/glue/json/JacksonJsonFormatterFunc.java b/lib/src/jackson/java/com/diffplug/spotless/glue/json/JacksonJsonFormatterFunc.java
index 934e60fcd8..5aadcc568f 100644
--- a/lib/src/jackson/java/com/diffplug/spotless/glue/json/JacksonJsonFormatterFunc.java
+++ b/lib/src/jackson/java/com/diffplug/spotless/glue/json/JacksonJsonFormatterFunc.java
@@ -15,99 +15,72 @@
  */
 package com.diffplug.spotless.glue.json;
 
-import java.io.IOException;
-
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonFactoryBuilder;
-import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.util.DefaultIndenter;
 import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
 import com.fasterxml.jackson.core.util.Separators;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.databind.node.ObjectNode;
 
 import com.diffplug.spotless.FormatterFunc;
-import com.diffplug.spotless.json.JacksonConfig;
+import com.diffplug.spotless.json.JacksonJsonConfig;
 
 /**
  * A {@link FormatterFunc} based on Jackson library
  */
 // https://github.com/FasterXML/jackson-dataformats-text/issues/372
-public class JacksonJsonFormatterFunc implements FormatterFunc {
-	private JacksonConfig jacksonConfig;
+public class JacksonJsonFormatterFunc extends AJacksonFormatterFunc {
+	private JacksonJsonConfig jacksonConfig;
 
-	public JacksonJsonFormatterFunc(JacksonConfig jacksonConfig) {
+	public JacksonJsonFormatterFunc(JacksonJsonConfig jacksonConfig) {
+		super(jacksonConfig);
 		this.jacksonConfig = jacksonConfig;
 	}
 
-	@Override
-	public String apply(String input) throws Exception {
-		ObjectMapper objectMapper = makeObjectMapper();
-
-		return format(objectMapper, input);
-	}
-
-	protected String format(ObjectMapper objectMapper, String input) throws IllegalArgumentException, IOException {
-		try {
-			ObjectNode objectNode = objectMapper.readValue(input, ObjectNode.class);
-			return objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(objectNode);
-		} catch (JsonProcessingException e) {
-			throw new AssertionError("Unable to format. input='" + input + "'", e);
-		}
-	}
-
 	/**
 	 * @return a {@link JsonFactory}. May be overridden to handle alternative formats.
 	 * @see <a href="https://github.com/FasterXML/jackson-dataformats-text">jackson-dataformats-text</a>
 	 */
 	protected JsonFactory makeJsonFactory() {
-		// We may later accept JsonFactory.Features
-		return new JsonFactoryBuilder().build();
-	}
-
-	protected ObjectMapper makeObjectMapper() {
-		JsonFactory jsonFactory = makeJsonFactory();
-		ObjectMapper objectMapper = new ObjectMapper(jsonFactory);
-
-		objectMapper.setDefaultPrettyPrinter(makePrinter());
+		JsonFactory jsonFactory = new JsonFactoryBuilder().build();
 
 		// Configure the ObjectMapper
 		// https://github.com/FasterXML/jackson-databind#commonly-used-features
-		jacksonConfig.getFeatureToToggle().forEach((rawFeature, toggle) -> {
+		jacksonConfig.getJsonFeatureToToggle().forEach((rawFeature, toggle) -> {
 			// https://stackoverflow.com/questions/3735927/java-instantiating-an-enum-using-reflection
-			SerializationFeature feature = SerializationFeature.valueOf(rawFeature);
+			JsonGenerator.Feature feature = JsonGenerator.Feature.valueOf(rawFeature);
 
-			objectMapper.configure(feature, toggle);
+			jsonFactory.configure(feature, toggle);
 		});
 
-		return objectMapper;
+		return jsonFactory;
 	}
 
+	@Override
 	protected DefaultPrettyPrinter makePrinter() {
 		boolean spaceBeforeSeparator = jacksonConfig.isSpaceBeforeSeparator();
 
 		// DefaultIndenter default constructor relies on 2 whitespaces as default tabulation
 		// By we want to force '\n' as eol given Spotless provides LF-input (whatever the actual File content/current OS)
 		DefaultPrettyPrinter.Indenter indenter = new DefaultIndenter("  ", "\n");
-		DefaultPrettyPrinter printer = new SpotlessDefaultPrettyPrinter(spaceBeforeSeparator);
+		DefaultPrettyPrinter printer = new SpotlessJsonPrettyPrinter(spaceBeforeSeparator);
 
 		printer.indentObjectsWith(indenter);
 		printer.indentArraysWith(indenter);
 		return printer;
 	}
 
-	protected static class SpotlessDefaultPrettyPrinter extends DefaultPrettyPrinter {
+	protected static class SpotlessJsonPrettyPrinter extends DefaultPrettyPrinter {
 		private static final long serialVersionUID = 1L;
 		private final boolean spaceBeforeSeparator;
 
-		public SpotlessDefaultPrettyPrinter(boolean spaceBeforeSeparator) {
+		public SpotlessJsonPrettyPrinter(boolean spaceBeforeSeparator) {
 			this.spaceBeforeSeparator = spaceBeforeSeparator;
 		}
 
 		@Override
 		public DefaultPrettyPrinter createInstance() {
-			return new DefaultPrettyPrinter(this);
+			return new SpotlessJsonPrettyPrinter(spaceBeforeSeparator);
 		}
 
 		@Override
diff --git a/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/JacksonYamlFormatterFunc.java b/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/JacksonYamlFormatterFunc.java
index f7686ad503..3986374c9e 100644
--- a/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/JacksonYamlFormatterFunc.java
+++ b/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/JacksonYamlFormatterFunc.java
@@ -25,15 +25,19 @@
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactoryBuilder;
 import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator;
 
-import com.diffplug.spotless.glue.json.JacksonJsonFormatterFunc;
+import com.diffplug.spotless.glue.json.AJacksonFormatterFunc;
 import com.diffplug.spotless.yaml.JacksonYamlConfig;
 
-public class JacksonYamlFormatterFunc extends JacksonJsonFormatterFunc {
+public class JacksonYamlFormatterFunc extends AJacksonFormatterFunc {
 	final JacksonYamlConfig yamlConfig;
 
 	public JacksonYamlFormatterFunc(JacksonYamlConfig jacksonConfig) {
 		super(jacksonConfig);
 		this.yamlConfig = jacksonConfig;
+
+		if (jacksonConfig == null) {
+			throw new IllegalArgumentException("ARG");
+		}
 	}
 
 	protected JsonFactory makeJsonFactory() {
@@ -43,7 +47,6 @@ protected JsonFactory makeJsonFactory() {
 		// https://github.com/FasterXML/jackson-databind#commonly-used-features
 		yamlConfig.getYamlFeatureToToggle().forEach((rawFeature, toggle) -> {
 			// https://stackoverflow.com/questions/3735927/java-instantiating-an-enum-using-reflection
-			// Refers to 'com.fasterxml.jackson.dataformat.yaml.YAMLGenerator.Feature'
 			YAMLGenerator.Feature feature = YAMLGenerator.Feature.valueOf(rawFeature);
 
 			yamlFactoryBuilder.configure(feature, toggle);
diff --git a/lib/src/main/java/com/diffplug/spotless/json/JacksonConfig.java b/lib/src/main/java/com/diffplug/spotless/json/JacksonConfig.java
index d5ca990b08..250b77d1f1 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/JacksonConfig.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/JacksonConfig.java
@@ -21,7 +21,7 @@
 import java.util.Map;
 
 /**
- * A DTO holding the options for Jackson-based formatters
+ * A DTO holding the basic for Jackson-based formatters
  */
 public class JacksonConfig implements Serializable {
 	private static final long serialVersionUID = 1L;
@@ -38,10 +38,6 @@ public class JacksonConfig implements Serializable {
 
 	protected Map<String, Boolean> featureToToggle = new LinkedHashMap<>();
 
-	// https://github.com/revelc/formatter-maven-plugin/pull/280
-	// By default, Jackson adds a ' ' before separator, which is not standard with most IDE/JSON libraries
-	protected boolean spaceBeforeSeparator = false;
-
 	public Map<String, Boolean> getFeatureToToggle() {
 		return Collections.unmodifiableMap(featureToToggle);
 	}
@@ -53,12 +49,4 @@ public void setFeatureToToggle(Map<String, Boolean> featureToToggle) {
 	public void appendFeatureToToggle(Map<String, Boolean> features) {
 		this.featureToToggle.putAll(features);
 	}
-
-	public boolean isSpaceBeforeSeparator() {
-		return spaceBeforeSeparator;
-	}
-
-	public void setSpaceBeforeSeparator(boolean spaceBeforeSeparator) {
-		this.spaceBeforeSeparator = spaceBeforeSeparator;
-	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonConfig.java b/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonConfig.java
new file mode 100644
index 0000000000..50b28605d1
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonConfig.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.json;
+
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * Specialization of {@link JacksonConfig} for JSON documents
+ */
+public class JacksonJsonConfig extends JacksonConfig {
+	private static final long serialVersionUID = 1L;
+
+	protected Map<String, Boolean> jsonFeatureToToggle = new LinkedHashMap<>();
+
+	// https://github.com/revelc/formatter-maven-plugin/pull/280
+	// By default, Jackson adds a ' ' before separator, which is not standard with most IDE/JSON libraries
+	protected boolean spaceBeforeSeparator = false;
+
+	public Map<String, Boolean> getJsonFeatureToToggle() {
+		return Collections.unmodifiableMap(jsonFeatureToToggle);
+	}
+
+	/**
+	 * @see com.fasterxml.jackson.core.JsonGenerator.Feature
+	 */
+	public void setJsonFeatureToToggle(Map<String, Boolean> jsonFeatureToToggle) {
+		this.jsonFeatureToToggle = jsonFeatureToToggle;
+	}
+
+	/**
+	 * @see com.fasterxml.jackson.core.JsonGenerator.Feature
+	 */
+	public void appendJsonFeatureToToggle(Map<String, Boolean> features) {
+		this.jsonFeatureToToggle.putAll(features);
+	}
+
+	public boolean isSpaceBeforeSeparator() {
+		return spaceBeforeSeparator;
+	}
+
+	public void setSpaceBeforeSeparator(boolean spaceBeforeSeparator) {
+		this.spaceBeforeSeparator = spaceBeforeSeparator;
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java b/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java
index 0fe1ab057b..f15edbbd42 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java
@@ -41,7 +41,7 @@ public static String defaultVersion() {
 		return DEFAULT_VERSION;
 	}
 
-	public static FormatterStep create(JacksonConfig jacksonConfig,
+	public static FormatterStep create(JacksonJsonConfig jacksonConfig,
 			String jacksonVersion,
 			Provisioner provisioner) {
 		Objects.requireNonNull(provisioner, "provisioner cannot be null");
@@ -51,7 +51,7 @@ public static FormatterStep create(JacksonConfig jacksonConfig,
 	}
 
 	public static FormatterStep create(Provisioner provisioner) {
-		return create(new JacksonConfig(), defaultVersion(), provisioner);
+		return create(new JacksonJsonConfig(), defaultVersion(), provisioner);
 	}
 
 	private static final class State implements Serializable {
@@ -72,7 +72,7 @@ private State(JacksonConfig jacksonConfig,
 		FormatterFunc toFormatter() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException,
 				InstantiationException, IllegalAccessException {
 			Class<?> formatterFunc = jarState.getClassLoader().loadClass("com.diffplug.spotless.glue.json.JacksonJsonFormatterFunc");
-			Constructor<?> constructor = formatterFunc.getConstructor(JacksonConfig.class);
+			Constructor<?> constructor = formatterFunc.getConstructor(JacksonJsonConfig.class);
 			return (FormatterFunc) constructor.newInstance(jacksonConfig);
 		}
 	}
diff --git a/lib/src/main/java/com/diffplug/spotless/yaml/JacksonYamlStep.java b/lib/src/main/java/com/diffplug/spotless/yaml/JacksonYamlStep.java
index 04d1895fe0..201199fe8b 100644
--- a/lib/src/main/java/com/diffplug/spotless/yaml/JacksonYamlStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/yaml/JacksonYamlStep.java
@@ -25,7 +25,6 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
-import com.diffplug.spotless.json.JacksonConfig;
 
 /**
  * Simple YAML formatter which reformats the file according to Jackson YAMLFactory.
@@ -42,7 +41,7 @@ public static String defaultVersion() {
 		return DEFAULT_VERSION;
 	}
 
-	public static FormatterStep create(JacksonConfig jacksonConfig,
+	public static FormatterStep create(JacksonYamlConfig jacksonConfig,
 			String jacksonVersion,
 			Provisioner provisioner) {
 		Objects.requireNonNull(provisioner, "provisioner cannot be null");
@@ -52,21 +51,25 @@ public static FormatterStep create(JacksonConfig jacksonConfig,
 	}
 
 	public static FormatterStep create(Provisioner provisioner) {
-		return create(new JacksonConfig(), defaultVersion(), provisioner);
+		return create(new JacksonYamlConfig(), defaultVersion(), provisioner);
 	}
 
 	private static final class State implements Serializable {
 		private static final long serialVersionUID = 1L;
 
-		private final JacksonConfig jacksonConfig;
+		private final JacksonYamlConfig jacksonConfig;
 
 		private final JarState jarState;
 
-		private State(JacksonConfig jacksonConfig,
+		private State(JacksonYamlConfig jacksonConfig,
 				String jacksonVersion,
 				Provisioner provisioner) throws IOException {
 			this.jacksonConfig = jacksonConfig;
 
+			if (jacksonConfig == null) {
+				throw new IllegalArgumentException("ARG");
+			}
+
 			this.jarState = JarState.from(JacksonYamlStep.MAVEN_COORDINATE + jacksonVersion, provisioner);
 		}
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JacksonGradleConfig.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JacksonGradleConfig.java
index d388f45d11..afc0c36371 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JacksonGradleConfig.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JacksonGradleConfig.java
@@ -51,12 +51,6 @@ public JacksonGradleConfig feature(String feature, boolean toggle) {
 		return this;
 	}
 
-	public JacksonGradleConfig spaceBeforeSeparator(boolean toggle) {
-		this.jacksonConfig.setSpaceBeforeSeparator(toggle);
-		formatExtension.replaceStep(createStep());
-		return this;
-	}
-
 	public JacksonGradleConfig version(String version) {
 		this.version = version;
 		formatExtension.replaceStep(createStep());
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
index 542b2d5431..31f605809c 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
@@ -15,10 +15,12 @@
  */
 package com.diffplug.gradle.spotless;
 
+import java.util.Collections;
+
 import javax.inject.Inject;
 
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.json.JacksonConfig;
+import com.diffplug.spotless.json.JacksonJsonConfig;
 import com.diffplug.spotless.json.JacksonJsonStep;
 import com.diffplug.spotless.json.JsonSimpleStep;
 import com.diffplug.spotless.json.gson.GsonStep;
@@ -49,7 +51,7 @@ public GsonConfig gson() {
 		return new GsonConfig();
 	}
 
-	public JacksonJsonGradleConfig jackson() {
+	public JacksonJsonGradleConfig jacksonJson() {
 		return new JacksonJsonGradleConfig(this);
 	}
 
@@ -115,17 +117,35 @@ private FormatterStep createStep() {
 	}
 
 	public static class JacksonJsonGradleConfig extends JacksonGradleConfig {
+		protected JacksonJsonConfig jacksonConfig;
 
-		public JacksonJsonGradleConfig(JacksonConfig jacksonConfig, FormatExtension formatExtension) {
+		public JacksonJsonGradleConfig(JacksonJsonConfig jacksonConfig, FormatExtension formatExtension) {
 			super(jacksonConfig, formatExtension);
+			this.jacksonConfig = jacksonConfig;
+
+			if (jacksonConfig == null) {
+				throw new IllegalArgumentException("ARG2");
+			}
 		}
 
 		public JacksonJsonGradleConfig(FormatExtension formatExtension) {
-			this(new JacksonConfig(), formatExtension);
+			this(new JacksonJsonConfig(), formatExtension);
+		}
+
+		/**
+		 * @see com.fasterxml.jackson.core.JsonGenerator.Feature
+		 */
+		public JacksonGradleConfig jsonFeature(String feature, boolean toggle) {
+			this.jacksonConfig.appendJsonFeatureToToggle(Collections.singletonMap(feature, toggle));
+			formatExtension.replaceStep(createStep());
+			return this;
 		}
 
 		@Override
 		protected FormatterStep createStep() {
+			if (jacksonConfig == null) {
+				throw new IllegalArgumentException("ARG3");
+			}
 			return JacksonJsonStep.create(jacksonConfig, version, formatExtension.provisioner());
 		}
 	}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java
index 5907ea985a..3fc12e0495 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java
@@ -41,7 +41,7 @@ protected void setupTask(SpotlessTask task) {
 		super.setupTask(task);
 	}
 
-	public JacksonGradleConfig jackson() {
+	public JacksonGradleConfig jacksonYaml() {
 		return new JacksonYamlGradleConfig(this);
 	}
 
@@ -52,6 +52,10 @@ public JacksonYamlGradleConfig(JacksonYamlConfig jacksonConfig, FormatExtension
 			super(jacksonConfig, formatExtension);
 
 			this.jacksonConfig = jacksonConfig;
+
+			if (jacksonConfig == null) {
+				throw new IllegalArgumentException("ARG");
+			}
 		}
 
 		public JacksonYamlGradleConfig(FormatExtension formatExtension) {
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JsonExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JsonExtensionTest.java
index e2fb9f70aa..945c72cf75 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JsonExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JsonExtensionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 DiffPlug
+ * Copyright 2021-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,9 +30,9 @@ void simpleDefaultFormatting() throws IOException {
 				"repositories { mavenCentral() }",
 				"spotless {",
 				"    json {",
-				"    target 'examples/**/*.json'",
-				"    simple()",
-				"}",
+				"        target 'examples/**/*.json'",
+				"        simple()",
+				"    }",
 				"}");
 		setFile("src/main/resources/example.json").toResource("json/nestedObjectBefore.json");
 		setFile("examples/main/resources/example.json").toResource("json/nestedObjectBefore.json");
@@ -51,9 +51,9 @@ void simpleFormattingWithCustomNumberOfSpaces() throws IOException {
 				"repositories { mavenCentral() }",
 				"spotless {",
 				"    json {",
-				"    target 'src/**/*.json'",
-				"    simple().indentWithSpaces(6)",
-				"}",
+				"        target 'src/**/*.json'",
+				"        simple().indentWithSpaces(6)",
+				"    }",
 				"}");
 		setFile("src/main/resources/example.json").toResource("json/singletonArrayBefore.json");
 		gradleRunner().withArguments("spotlessApply").build();
@@ -70,9 +70,9 @@ void gsonDefaultFormatting() throws IOException {
 				"repositories { mavenCentral() }",
 				"spotless {",
 				"    json {",
-				"    target 'examples/**/*.json'",
-				"    gson()",
-				"}",
+				"        target 'examples/**/*.json'",
+				"        gson()",
+				"    }",
 				"}");
 		setFile("src/main/resources/example.json").toResource("json/nestedObjectBefore.json");
 		setFile("examples/main/resources/example.json").toResource("json/nestedObjectBefore.json");
@@ -91,9 +91,9 @@ void gsonFormattingWithCustomNumberOfSpaces() throws IOException {
 				"repositories { mavenCentral() }",
 				"spotless {",
 				"    json {",
-				"    target 'src/**/*.json'",
-				"    gson().indentWithSpaces(6)",
-				"}",
+				"        target 'src/**/*.json'",
+				"        gson().indentWithSpaces(6)",
+				"    }",
 				"}");
 		setFile("src/main/resources/example.json").toResource("json/singletonArrayBefore.json");
 		gradleRunner().withArguments("spotlessApply").build();
@@ -110,9 +110,9 @@ void gsonFormattingWithSortingByKeys() throws IOException {
 				"repositories { mavenCentral() }",
 				"spotless {",
 				"    json {",
-				"    target 'src/**/*.json'",
-				"    gson().sortByKeys()",
-				"}",
+				"        target 'src/**/*.json'",
+				"        gson().sortByKeys()",
+				"    }",
 				"}");
 		setFile("src/main/resources/example.json").toResource("json/sortByKeysBefore.json");
 		gradleRunner().withArguments("spotlessApply").build();
@@ -129,13 +129,31 @@ void gsonFormattingWithHtmlEscape() throws IOException {
 				"repositories { mavenCentral() }",
 				"spotless {",
 				"    json {",
-				"    target 'src/**/*.json'",
-				"    gson().escapeHtml()",
-				"}",
+				"        target 'src/**/*.json'",
+				"        gson().escapeHtml()",
+				"    }",
 				"}");
 		setFile("src/main/resources/example.json").toResource("json/escapeHtmlGsonBefore.json");
 		gradleRunner().withArguments("spotlessApply").build();
 		assertFile("src/main/resources/example.json").sameAsResource("json/escapeHtmlGsonAfter.json");
 	}
 
+	@Test
+	void jacksonFormattingWithSortingByKeys() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'java'",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    json {",
+				"        target 'src/**/*.json'",
+				"        jacksonJson().feature('ORDER_MAP_ENTRIES_BY_KEYS', true)",
+				"    }",
+				"}");
+		setFile("src/main/resources/example.json").toResource("json/sortByKeysBefore.json");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("src/main/resources/example.json").sameAsResource("json/sortByKeysAfter_Jackson.json");
+	}
 }
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/YamlExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/YamlExtensionTest.java
index c16053a661..79e0df0d8d 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/YamlExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/YamlExtensionTest.java
@@ -30,34 +30,15 @@ void testFormatYaml_WithJackson_defaultConfig_separatorComments() throws IOExcep
 				"repositories { mavenCentral() }",
 				"spotless {",
 				"    yaml {",
-				"    target 'src/**/*.yaml'",
-				"    jackson()",
-				"}",
+				"        target 'src/**/*.yaml'",
+				"        jacksonYaml()",
+				"    }",
 				"}");
 		setFile("src/main/resources/example.yaml").toResource("yaml/separator_comments.yaml");
 		gradleRunner().withArguments("spotlessApply").build();
 		assertFile("src/main/resources/example.yaml").sameAsResource("yaml/separator_comments.clean.yaml");
 	}
 
-	@Test
-	void testFormatYaml_WithJackson_defaultConfig_arrayBrackets_spaceBeforeSeparator() throws IOException {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'java'",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    yaml {",
-				"    target 'src/**/*.yaml'",
-				"    jackson().spaceBeforeSeparator(true)",
-				"}",
-				"}");
-		setFile("src/main/resources/example.yaml").toResource("yaml/array_with_bracket.yaml");
-		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("src/main/resources/example.yaml").sameAsResource("yaml/array_with_bracket.clean.spaceBeforeSeparator.yaml");
-	}
-
 	// see YAMLGenerator.Feature.WRITE_DOC_START_MARKER
 	@Test
 	void testFormatYaml_WithJackson_skipDocStartMarker() throws IOException {
@@ -69,9 +50,11 @@ void testFormatYaml_WithJackson_skipDocStartMarker() throws IOException {
 				"repositories { mavenCentral() }",
 				"spotless {",
 				"    yaml {",
-				"    target 'src/**/*.yaml'",
-				"    jackson().yamlFeature('WRITE_DOC_START_MARKER', false)",
-				"}",
+				"        target 'src/**/*.yaml'",
+				"        jacksonYaml()" +
+				"	        .yamlFeature('WRITE_DOC_START_MARKER', false)" +
+				"	        .yamlFeature('MINIMIZE_QUOTES', true)",
+				"    }",
 				"}");
 		setFile("src/main/resources/example.yaml").toResource("yaml/array_with_bracket.yaml");
 		gradleRunner().withArguments("spotlessApply").build();
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/JacksonJson.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/JacksonJson.java
index 31c59a5f81..9bca852754 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/JacksonJson.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/JacksonJson.java
@@ -21,7 +21,7 @@
 import org.apache.maven.plugins.annotations.Parameter;
 
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.json.JacksonConfig;
+import com.diffplug.spotless.json.JacksonJsonConfig;
 import com.diffplug.spotless.json.JacksonJsonStep;
 import com.diffplug.spotless.maven.FormatterFactory;
 import com.diffplug.spotless.maven.FormatterStepConfig;
@@ -36,14 +36,14 @@ public class JacksonJson implements FormatterStepFactory {
 	private String version = JacksonJsonStep.defaultVersion();
 
 	@Parameter
-	private boolean spaceBeforeSeparator = new JacksonConfig().isSpaceBeforeSeparator();
+	private boolean spaceBeforeSeparator = new JacksonJsonConfig().isSpaceBeforeSeparator();
 
 	@Parameter
 	private Map<String, Boolean> features = Collections.emptyMap();
 
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
-		JacksonConfig jacksonConfig = new JacksonConfig();
+		JacksonJsonConfig jacksonConfig = new JacksonJsonConfig();
 
 		jacksonConfig.appendFeatureToToggle(features);
 		jacksonConfig.setSpaceBeforeSeparator(spaceBeforeSeparator);
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/JacksonYaml.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/JacksonYaml.java
index 9741c3f5d0..d97cc41647 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/JacksonYaml.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/JacksonYaml.java
@@ -35,9 +35,6 @@ public class JacksonYaml implements FormatterStepFactory {
 	@Parameter
 	private String version = JacksonYamlStep.defaultVersion();
 
-	@Parameter
-	private boolean spaceBeforeSeparator = new JacksonYamlConfig().isSpaceBeforeSeparator();
-
 	@Parameter
 	private Map<String, Boolean> features = Collections.emptyMap();
 
@@ -50,7 +47,6 @@ public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 
 		jacksonConfig.appendFeatureToToggle(features);
 		jacksonConfig.appendYamlFeatureToToggle(yamlFeatures);
-		jacksonConfig.setSpaceBeforeSeparator(spaceBeforeSeparator);
 
 		return JacksonYamlStep
 				.create(jacksonConfig, version, stepConfig.getProvisioner());
diff --git a/testlib/src/main/resources/yaml/array_with_bracket.clean.no_start_marker.yaml b/testlib/src/main/resources/yaml/array_with_bracket.clean.no_start_marker.yaml
index 7f2f5a96cd..0e5571531a 100644
--- a/testlib/src/main/resources/yaml/array_with_bracket.clean.no_start_marker.yaml
+++ b/testlib/src/main/resources/yaml/array_with_bracket.clean.no_start_marker.yaml
@@ -7,5 +7,5 @@ episodes:
 - 6
 - 7
 best-jedi:
-  name: "Obi-Wan"
-  side: "light"
+  name: Obi-Wan
+  side: light

From 4d6f9610e6542dd91029c9031d2a93c5c89319bb Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Wed, 18 Jan 2023 00:50:12 +0400
Subject: [PATCH 0610/2068] Small fixes

---
 ...leConfig.java => AJacksonGradleConfig.java} | 18 ++++--------------
 .../gradle/spotless/JsonExtension.java         |  4 ++--
 .../gradle/spotless/YamlExtension.java         |  6 +++---
 .../gradle/spotless/YamlExtensionTest.java     |  4 ++--
 4 files changed, 11 insertions(+), 21 deletions(-)
 rename plugin-gradle/src/main/java/com/diffplug/gradle/spotless/{JacksonGradleConfig.java => AJacksonGradleConfig.java} (71%)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JacksonGradleConfig.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/AJacksonGradleConfig.java
similarity index 71%
rename from plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JacksonGradleConfig.java
rename to plugin-gradle/src/main/java/com/diffplug/gradle/spotless/AJacksonGradleConfig.java
index afc0c36371..e3d5cee661 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JacksonGradleConfig.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/AJacksonGradleConfig.java
@@ -21,37 +21,27 @@
 import com.diffplug.spotless.json.JacksonConfig;
 import com.diffplug.spotless.json.JacksonJsonStep;
 
-public abstract class JacksonGradleConfig {
+public abstract class AJacksonGradleConfig {
 	protected final FormatExtension formatExtension;
 
 	protected JacksonConfig jacksonConfig;
 
 	protected String version = JacksonJsonStep.defaultVersion();
 
-	public JacksonGradleConfig(JacksonConfig jacksonConfig, FormatExtension formatExtension) {
+	public AJacksonGradleConfig(JacksonConfig jacksonConfig, FormatExtension formatExtension) {
 		this.formatExtension = formatExtension;
 
 		this.jacksonConfig = jacksonConfig;
 		formatExtension.addStep(createStep());
 	}
 
-	public JacksonGradleConfig(FormatExtension formatExtension) {
-		this(new JacksonConfig(), formatExtension);
-	}
-
-	public JacksonGradleConfig config(JacksonConfig jacksonConfig) {
-		this.jacksonConfig = jacksonConfig;
-		formatExtension.replaceStep(createStep());
-		return this;
-	}
-
-	public JacksonGradleConfig feature(String feature, boolean toggle) {
+	public AJacksonGradleConfig feature(String feature, boolean toggle) {
 		this.jacksonConfig.appendFeatureToToggle(Collections.singletonMap(feature, toggle));
 		formatExtension.replaceStep(createStep());
 		return this;
 	}
 
-	public JacksonGradleConfig version(String version) {
+	public AJacksonGradleConfig version(String version) {
 		this.version = version;
 		formatExtension.replaceStep(createStep());
 		return this;
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
index 31f605809c..94e94c639e 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
@@ -116,7 +116,7 @@ private FormatterStep createStep() {
 		}
 	}
 
-	public static class JacksonJsonGradleConfig extends JacksonGradleConfig {
+	public static class JacksonJsonGradleConfig extends AJacksonGradleConfig {
 		protected JacksonJsonConfig jacksonConfig;
 
 		public JacksonJsonGradleConfig(JacksonJsonConfig jacksonConfig, FormatExtension formatExtension) {
@@ -135,7 +135,7 @@ public JacksonJsonGradleConfig(FormatExtension formatExtension) {
 		/**
 		 * @see com.fasterxml.jackson.core.JsonGenerator.Feature
 		 */
-		public JacksonGradleConfig jsonFeature(String feature, boolean toggle) {
+		public AJacksonGradleConfig jsonFeature(String feature, boolean toggle) {
 			this.jacksonConfig.appendJsonFeatureToToggle(Collections.singletonMap(feature, toggle));
 			formatExtension.replaceStep(createStep());
 			return this;
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java
index 3fc12e0495..e5dc3d79ac 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java
@@ -41,11 +41,11 @@ protected void setupTask(SpotlessTask task) {
 		super.setupTask(task);
 	}
 
-	public JacksonGradleConfig jacksonYaml() {
+	public AJacksonGradleConfig jacksonYaml() {
 		return new JacksonYamlGradleConfig(this);
 	}
 
-	public class JacksonYamlGradleConfig extends JacksonGradleConfig {
+	public class JacksonYamlGradleConfig extends AJacksonGradleConfig {
 		protected JacksonYamlConfig jacksonConfig;
 
 		public JacksonYamlGradleConfig(JacksonYamlConfig jacksonConfig, FormatExtension formatExtension) {
@@ -65,7 +65,7 @@ public JacksonYamlGradleConfig(FormatExtension formatExtension) {
 		/**
 		 * @see com.fasterxml.jackson.dataformat.yaml.YAMLGenerator.Feature
 		 */
-		public JacksonGradleConfig yamlFeature(String feature, boolean toggle) {
+		public AJacksonGradleConfig yamlFeature(String feature, boolean toggle) {
 			this.jacksonConfig.appendYamlFeatureToToggle(Collections.singletonMap(feature, toggle));
 			formatExtension.replaceStep(createStep());
 			return this;
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/YamlExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/YamlExtensionTest.java
index 79e0df0d8d..618b8d17ca 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/YamlExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/YamlExtensionTest.java
@@ -51,8 +51,8 @@ void testFormatYaml_WithJackson_skipDocStartMarker() throws IOException {
 				"spotless {",
 				"    yaml {",
 				"        target 'src/**/*.yaml'",
-				"        jacksonYaml()" +
-				"	        .yamlFeature('WRITE_DOC_START_MARKER', false)" +
+				"        jacksonYaml()" ,
+				"	        .yamlFeature('WRITE_DOC_START_MARKER', false)" ,
 				"	        .yamlFeature('MINIMIZE_QUOTES', true)",
 				"    }",
 				"}");

From 38bc206a73283d0ddff1d10bb1fb45b3493edff3 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Wed, 18 Jan 2023 00:53:57 +0400
Subject: [PATCH 0611/2068] Fix style

---
 .../java/com/diffplug/gradle/spotless/YamlExtensionTest.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/YamlExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/YamlExtensionTest.java
index 618b8d17ca..ee5ee33366 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/YamlExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/YamlExtensionTest.java
@@ -51,8 +51,8 @@ void testFormatYaml_WithJackson_skipDocStartMarker() throws IOException {
 				"spotless {",
 				"    yaml {",
 				"        target 'src/**/*.yaml'",
-				"        jacksonYaml()" ,
-				"	        .yamlFeature('WRITE_DOC_START_MARKER', false)" ,
+				"        jacksonYaml()",
+				"	        .yamlFeature('WRITE_DOC_START_MARKER', false)",
 				"	        .yamlFeature('MINIMIZE_QUOTES', true)",
 				"    }",
 				"}");

From b42a1453b385b4320072eaf654da1b6cc4d2297d Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Tue, 17 Jan 2023 12:54:28 -0800
Subject: [PATCH 0612/2068] Make changelog entries more informative

---
 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 9c0ed23980..3e648d9e0c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,7 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 ### Fixed
-* Format more type annotations as type annotations [#1494](https://github.com/diffplug/spotless/pull/1494)
+* The default list of type annotations used by `formatAnnotations` has had 8 more annotations from the Checker Framework added [#1494](https://github.com/diffplug/spotless/pull/1494)
 ### Changes
 
 ## [2.32.0] - 2023-01-13
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index d3ee07acad..0ed49a3408 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -15,7 +15,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Prevent tool configurations from being resolved outside project ([#1447](https://github.com/diffplug/spotless/pull/1447) fixes [#1215](https://github.com/diffplug/spotless/issues/1215))
 * Support `ktlint` 0.48+ new rule disabling syntax ([#1456](https://github.com/diffplug/spotless/pull/1456)) fixes ([#1444](https://github.com/diffplug/spotless/issues/1444))
 * Fix subgroups leading catch all matcher.
-* Format more type annotations as type annotations [#1494](https://github.com/diffplug/spotless/pull/1494)
+* The default list of type annotations used by `formatAnnotations` has had 8 more annotations from the Checker Framework added [#1494](https://github.com/diffplug/spotless/pull/1494)
 ### Changes
 * Bump default `ktlint` version to latest `0.47.1` -> `0.48.1` ([#1456](https://github.com/diffplug/spotless/pull/1456))
 * Bump default version for `prettier` from `2.0.5` to `2.8.1` ([#1453](https://github.com/diffplug/spotless/pull/1453))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index d7d40f65c7..d0942d2ca8 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -16,7 +16,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Support `ktlint` 0.48+ new rule disabling syntax ([#1456](https://github.com/diffplug/spotless/pull/1456)) fixes ([#1444](https://github.com/diffplug/spotless/issues/1444))
 * Fix subgroups leading catch all matcher.
-* Format more type annotations as type annotations [#1494](https://github.com/diffplug/spotless/pull/1494)
+* The default list of type annotations used by `formatAnnotations` has had 8 more annotations from the Checker Framework added [#1494](https://github.com/diffplug/spotless/pull/1494)
 ### Changes
 * Bump default `ktlint` version to latest `0.47.1` -> `0.48.1` ([#1456](https://github.com/diffplug/spotless/pull/1456))
 * Reduce spurious invalidations of the up-to-date index file ([#1461](https://github.com/diffplug/spotless/pull/1461))

From 4ff0c33c8055fb661680724db0ddba265d0de6eb Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Tue, 17 Jan 2023 12:57:39 -0800
Subject: [PATCH 0613/2068] Put changelog entries in "unreleased" section

---
 plugin-gradle/CHANGES.md | 5 ++++-
 plugin-maven/CHANGES.md  | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 0ed49a3408..63e5b43d74 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,10 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Added
+### Fixed
+* The default list of type annotations used by `formatAnnotations` has had 8 more annotations from the Checker Framework added [#1494](https://github.com/diffplug/spotless/pull/1494)
+### Changes
 
 ## [6.13.0] - 2023-01-14
 ### Added
@@ -15,7 +19,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Prevent tool configurations from being resolved outside project ([#1447](https://github.com/diffplug/spotless/pull/1447) fixes [#1215](https://github.com/diffplug/spotless/issues/1215))
 * Support `ktlint` 0.48+ new rule disabling syntax ([#1456](https://github.com/diffplug/spotless/pull/1456)) fixes ([#1444](https://github.com/diffplug/spotless/issues/1444))
 * Fix subgroups leading catch all matcher.
-* The default list of type annotations used by `formatAnnotations` has had 8 more annotations from the Checker Framework added [#1494](https://github.com/diffplug/spotless/pull/1494)
 ### Changes
 * Bump default `ktlint` version to latest `0.47.1` -> `0.48.1` ([#1456](https://github.com/diffplug/spotless/pull/1456))
 * Bump default version for `prettier` from `2.0.5` to `2.8.1` ([#1453](https://github.com/diffplug/spotless/pull/1453))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index d0942d2ca8..e951241a09 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,10 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+### Fixed
+* The default list of type annotations used by `formatAnnotations` has had 8 more annotations from the Checker Framework added [#1494](https://github.com/diffplug/spotless/pull/1494)
+### Changes
 
 ## [2.30.0] - 2023-01-13
 ### Added
@@ -16,7 +20,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Support `ktlint` 0.48+ new rule disabling syntax ([#1456](https://github.com/diffplug/spotless/pull/1456)) fixes ([#1444](https://github.com/diffplug/spotless/issues/1444))
 * Fix subgroups leading catch all matcher.
-* The default list of type annotations used by `formatAnnotations` has had 8 more annotations from the Checker Framework added [#1494](https://github.com/diffplug/spotless/pull/1494)
 ### Changes
 * Bump default `ktlint` version to latest `0.47.1` -> `0.48.1` ([#1456](https://github.com/diffplug/spotless/pull/1456))
 * Reduce spurious invalidations of the up-to-date index file ([#1461](https://github.com/diffplug/spotless/pull/1461))

From 87c4a2a23fc9a3e74fd7e525d31dc8e41c9c852d Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 17 Jan 2023 14:42:24 -0800
Subject: [PATCH 0614/2068] Remove mvnw beacuse we don't need it here anymore.

---
 plugin-maven/build.gradle | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/plugin-maven/build.gradle b/plugin-maven/build.gradle
index b46cdda708..1fad11be70 100644
--- a/plugin-maven/build.gradle
+++ b/plugin-maven/build.gradle
@@ -11,23 +11,6 @@ version = spotlessChangelog.versionNext
 apply from: rootProject.file("gradle/java-setup.gradle")
 apply from: rootProject.file('gradle/spotless-freshmark.gradle')
 
-def mvnw(String args) {
-	boolean isWin = System.getProperty('os.name').toLowerCase().contains('win')
-	if (isWin) {
-		return [
-			'cmd',
-			'/c',
-			'mvnw.cmd -e ' + args
-		]
-	} else {
-		return [
-			'/bin/sh',
-			'-c',
-			'./mvnw -e ' + args
-		]
-	}
-}
-
 apply plugin: 'de.benediktritter.maven-plugin-development'
 mavenPlugin {
 	name = 'Spotless Maven Plugin'

From c3a88cb2df3e1ddae20e388f5fbbdffee48e2e05 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 17 Jan 2023 14:43:08 -0800
Subject: [PATCH 0615/2068] Inline the mustache dependency because it's only
 used in one place.

---
 plugin-maven/build.gradle | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugin-maven/build.gradle b/plugin-maven/build.gradle
index 1fad11be70..ad51318d93 100644
--- a/plugin-maven/build.gradle
+++ b/plugin-maven/build.gradle
@@ -20,7 +20,6 @@ mavenPlugin {
 
 String VER_MAVEN_API = '3.0'
 String VER_ECLIPSE_AETHER = '1.1.0'
-String VER_MUSTACHE = '0.9.10'
 String VER_PLEXUS_RESOURCES = '1.2.0'
 dependencies {
 	implementation project(':lib')
@@ -42,7 +41,7 @@ dependencies {
 	testImplementation "org.assertj:assertj-core:${VER_ASSERTJ}"
 	testImplementation "org.mockito:mockito-core:${VER_MOCKITO}"
 	testImplementation "com.diffplug.durian:durian-io:${VER_DURIAN}"
-	testImplementation "com.github.spullara.mustache.java:compiler:${VER_MUSTACHE}"
+	testImplementation 'com.github.spullara.mustache.java:compiler:0.9.10'
 	testImplementation "org.apache.maven:maven-plugin-api:${VER_MAVEN_API}"
 	testImplementation "org.eclipse.aether:aether-api:${VER_ECLIPSE_AETHER}"
 	testImplementation "org.codehaus.plexus:plexus-resources:${VER_PLEXUS_RESOURCES}"

From b256bd48ef418e0f4c04e8409bcca357964c25b3 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 17 Jan 2023 14:48:42 -0800
Subject: [PATCH 0616/2068] Fix testlib test.

---
 testlib/build.gradle | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/testlib/build.gradle b/testlib/build.gradle
index 4b16572a8c..64d4681805 100644
--- a/testlib/build.gradle
+++ b/testlib/build.gradle
@@ -22,6 +22,15 @@ dependencies {
 spotbugs { reportLevel = 'high' } // low|medium|high (low = sensitive to even minor mistakes)
 
 apply from: rootProject.file('gradle/special-tests.gradle')
+tasks.named('test') {
+	if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_16)) {
+		// for Antlr4FormatterStepTest and KtLintStepTest
+		def args = [
+			'--add-opens=java.base/java.lang=ALL-UNNAMED'
+		]
+		jvmArgs args
+	}
+}
 
 javadoc {
 	options.addStringOption('Xdoclint:none', '-quiet')

From 4b2097c3ed3a1ef7ee9550aa20e7a02948106b07 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 17 Jan 2023 15:25:09 -0800
Subject: [PATCH 0617/2068] Update changelogs.

---
 CHANGES.md               | 6 ++++--
 lib/build.gradle         | 3 +++
 plugin-gradle/CHANGES.md | 6 ++++--
 plugin-maven/CHANGES.md  | 6 ++++--
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 45627807f3..0bdcf657b2 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,6 +15,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * The default list of type annotations used by `formatAnnotations` has had 8 more annotations from the Checker Framework added [#1494](https://github.com/diffplug/spotless/pull/1494)
 ### Changes
+#### Removed
+* Removed support for KtLint 0.3x and 0.45.2 ([#1475](https://github.com/diffplug/spotless/pull/1475))
+  * `KtLint` does not maintain a stable API - before this PR, we supported every breaking change in the API since 2019.
+  * From now on, we will support no more than 2 breaking changes at a time.
 
 ## [2.32.0] - 2023-01-13
 ### Added
@@ -39,8 +43,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
   * Bump default `ktlint` version to latest `0.47.1` -> `0.48.1` ([#1456](https://github.com/diffplug/spotless/pull/1456))
 * Switch our publishing infrastructure from CircleCI to GitHub Actions ([#1462](https://github.com/diffplug/spotless/pull/1462)).
   * Help wanted for moving our tests too ([#1472](https://github.com/diffplug/spotless/issues/1472))
-#### Removed
-* Removed support for KtLint 0.3x and 0.45.2 ([#1475](https://github.com/diffplug/spotless/pull/1475))
 
 ## [2.31.1] - 2023-01-02
 ### Fixed
diff --git a/lib/build.gradle b/lib/build.gradle
index 7e2496139c..fc2c1c04a0 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -28,6 +28,9 @@ for (glue in NEEDS_GLUE) {
 versionCompatibility {
 	adapters {
 		namespaces.register('KtLint') {
+			// as discussed at https://github.com/diffplug/spotless/pull/1475
+			// we will support no more than 2 breaking changes at a time = 3 incompatible versions
+			// we will try to drop down to only one version if a stable API can be maintained for a full year
 			versions = [
 				'0.46.0',
 				'0.47.0',
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 84fc0f4d83..bc4f2bd5e5 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -7,6 +7,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * The default list of type annotations used by `formatAnnotations` has had 8 more annotations from the Checker Framework added [#1494](https://github.com/diffplug/spotless/pull/1494)
 ### Changes
+#### Removed
+* Removed support for KtLint 0.3x and 0.45.2 ([#1475](https://github.com/diffplug/spotless/pull/1475))
+  * `KtLint` does not maintain a stable API - before this PR, we supported every breaking change in the API since 2019.
+  * From now on, we will support no more than 2 breaking changes at a time.
 
 ## [6.13.0] - 2023-01-14
 ### Added
@@ -22,8 +26,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changes
 * Bump default `ktlint` version to latest `0.47.1` -> `0.48.1` ([#1456](https://github.com/diffplug/spotless/pull/1456))
 * Bump default version for `prettier` from `2.0.5` to `2.8.1` ([#1453](https://github.com/diffplug/spotless/pull/1453))
-#### Removed
-* Removed support for KtLint 0.3x and 0.45.2 ([#1475](https://github.com/diffplug/spotless/pull/1475))
 
 ## [6.12.1] - 2023-01-02
 ### Fixed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 7556875183..ce07394b98 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -8,6 +8,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * The default list of type annotations used by `formatAnnotations` has had 8 more annotations from the Checker Framework added [#1494](https://github.com/diffplug/spotless/pull/1494)
 ### Changes
 * Spotless' custom build was replaced by [`maven-plugin-development`](https://github.com/britter/maven-plugin-development). ([#1496](https://github.com/diffplug/spotless/pull/1496) fixes [#554](https://github.com/diffplug/spotless/issues/554))
+#### Removed
+* Removed support for KtLint 0.3x and 0.45.2 ([#1475](https://github.com/diffplug/spotless/pull/1475))
+  * `KtLint` does not maintain a stable API - before this PR, we supported every breaking change in the API since 2019.
+  * From now on, we will support no more than 2 breaking changes at a time.
 
 ## [2.30.0] - 2023-01-13
 ### Added
@@ -25,8 +29,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktlint` version to latest `0.47.1` -> `0.48.1` ([#1456](https://github.com/diffplug/spotless/pull/1456))
 * Reduce spurious invalidations of the up-to-date index file ([#1461](https://github.com/diffplug/spotless/pull/1461))
 * Bump default version for `prettier` from `2.0.5` to `2.8.1` ([#1453](https://github.com/diffplug/spotless/pull/1453))
-#### Removed
-* Removed support for KtLint 0.3x and 0.45.2 ([#1475](https://github.com/diffplug/spotless/pull/1475))
 
 ## [2.29.0] - 2023-01-02
 ### Added

From 949c0984671a3092219d0e7674d885bbe160f51a Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Wed, 18 Jan 2023 09:35:44 +0400
Subject: [PATCH 0618/2068] Fix Yaml referring to Json

---
 .../com/diffplug/gradle/spotless/SpotlessExtension.java     | 2 +-
 plugin-maven/CHANGES.md                                     | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
index 8c3128e02d..0a31a15764 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
@@ -196,7 +196,7 @@ public void json(Action<JsonExtension> closure) {
 	/** Configures the special YAML-specific extension. */
 	public void yaml(Action<YamlExtension> closure) {
 		requireNonNull(closure);
-		format(JsonExtension.NAME, YamlExtension.class, closure);
+		format(YamlExtension.NAME, YamlExtension.class, closure);
 	}
 
 	/** Configures a custom extension. */
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 97eea5d7c0..cba82652cc 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -4,12 +4,16 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
+* Introduce `<json><jackson/></json>` ([#1492](https://github.com/diffplug/spotless/pull/1492))
+  * **POTENTIALLY BREAKING** `JacksonYaml` is now configured with a `Map<String, Boolean>` to configure features
+* Jackson (`json` and `yaml`) has new `spaceBeforeSeparator` option
+  * **POTENTIALLY BREAKING** `spaceBeforeSeparator` is defaulted to false while the formatter was behaving with `<spaceBeforeSeparator>true<spaceBeforeSeparator/>`
 ### Fixed
 * The default list of type annotations used by `formatAnnotations` has had 8 more annotations from the Checker Framework added [#1494](https://github.com/diffplug/spotless/pull/1494)
 ### Changes
 * Spotless' custom build was replaced by [`maven-plugin-development`](https://github.com/britter/maven-plugin-development). ([#1496](https://github.com/diffplug/spotless/pull/1496) fixes [#554](https://github.com/diffplug/spotless/issues/554))
 
-# [2.30.0] - 2023-01-13
+## [2.30.0] - 2023-01-13
 ### Added
 * Add option `editorConfigFile` for `ktLint` [#142](https://github.com/diffplug/spotless/issues/142)
   * **POTENTIALLY BREAKING** `ktlint` step now modifies license headers. Make sure to put `licenseHeader` *after* `ktlint`.

From 37875ce62ef876c08a6357a191aa2abf80221f38 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Wed, 18 Jan 2023 10:28:10 +0400
Subject: [PATCH 0619/2068] Rename to jackson step for both yaml and json

---
 .../com/diffplug/spotless/yaml/JacksonYamlStep.java  |  6 ++----
 .../gradle/spotless/AJacksonGradleConfig.java        |  2 +-
 .../com/diffplug/gradle/spotless/JsonExtension.java  | 12 ++++--------
 .../com/diffplug/gradle/spotless/YamlExtension.java  | 10 +++++-----
 .../diffplug/gradle/spotless/JsonExtensionTest.java  |  2 +-
 .../diffplug/gradle/spotless/YamlExtensionTest.java  |  6 +++---
 ...ith_bracket.clean.no_start_marker.no_quotes.yaml} |  0
 7 files changed, 16 insertions(+), 22 deletions(-)
 rename testlib/src/main/resources/yaml/{array_with_bracket.clean.no_start_marker.yaml => array_with_bracket.clean.no_start_marker.no_quotes.yaml} (100%)

diff --git a/lib/src/main/java/com/diffplug/spotless/yaml/JacksonYamlStep.java b/lib/src/main/java/com/diffplug/spotless/yaml/JacksonYamlStep.java
index 201199fe8b..a87e40f420 100644
--- a/lib/src/main/java/com/diffplug/spotless/yaml/JacksonYamlStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/yaml/JacksonYamlStep.java
@@ -30,6 +30,7 @@
  * Simple YAML formatter which reformats the file according to Jackson YAMLFactory.
  */
 // https://stackoverflow.com/questions/14515994/convert-json-string-to-pretty-print-json-output-using-jackson
+// https://stackoverflow.com/questions/60891174/i-want-to-load-a-yaml-file-possibly-edit-the-data-and-then-dump-it-again-how
 public class JacksonYamlStep {
 	static final String MAVEN_COORDINATE = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:";
 	// https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml
@@ -44,6 +45,7 @@ public static String defaultVersion() {
 	public static FormatterStep create(JacksonYamlConfig jacksonConfig,
 			String jacksonVersion,
 			Provisioner provisioner) {
+		Objects.requireNonNull(jacksonConfig, "jacksonConfig cannot be null");
 		Objects.requireNonNull(provisioner, "provisioner cannot be null");
 		return FormatterStep.createLazy("yaml",
 				() -> new State(jacksonConfig, jacksonVersion, provisioner),
@@ -66,10 +68,6 @@ private State(JacksonYamlConfig jacksonConfig,
 				Provisioner provisioner) throws IOException {
 			this.jacksonConfig = jacksonConfig;
 
-			if (jacksonConfig == null) {
-				throw new IllegalArgumentException("ARG");
-			}
-
 			this.jarState = JarState.from(JacksonYamlStep.MAVEN_COORDINATE + jacksonVersion, provisioner);
 		}
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/AJacksonGradleConfig.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/AJacksonGradleConfig.java
index e3d5cee661..c017d41d04 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/AJacksonGradleConfig.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/AJacksonGradleConfig.java
@@ -28,11 +28,11 @@ public abstract class AJacksonGradleConfig {
 
 	protected String version = JacksonJsonStep.defaultVersion();
 
+	// Make sure to call 'formatExtension.addStep(createStep());' in the extented constructors
 	public AJacksonGradleConfig(JacksonConfig jacksonConfig, FormatExtension formatExtension) {
 		this.formatExtension = formatExtension;
 
 		this.jacksonConfig = jacksonConfig;
-		formatExtension.addStep(createStep());
 	}
 
 	public AJacksonGradleConfig feature(String feature, boolean toggle) {
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
index 94e94c639e..b964fcb54d 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
@@ -51,7 +51,7 @@ public GsonConfig gson() {
 		return new GsonConfig();
 	}
 
-	public JacksonJsonGradleConfig jacksonJson() {
+	public JacksonJsonGradleConfig jackson() {
 		return new JacksonJsonGradleConfig(this);
 	}
 
@@ -123,9 +123,7 @@ public JacksonJsonGradleConfig(JacksonJsonConfig jacksonConfig, FormatExtension
 			super(jacksonConfig, formatExtension);
 			this.jacksonConfig = jacksonConfig;
 
-			if (jacksonConfig == null) {
-				throw new IllegalArgumentException("ARG2");
-			}
+			formatExtension.addStep(createStep());
 		}
 
 		public JacksonJsonGradleConfig(FormatExtension formatExtension) {
@@ -141,11 +139,9 @@ public AJacksonGradleConfig jsonFeature(String feature, boolean toggle) {
 			return this;
 		}
 
+		// 'final' as it is called in the constructor
 		@Override
-		protected FormatterStep createStep() {
-			if (jacksonConfig == null) {
-				throw new IllegalArgumentException("ARG3");
-			}
+		protected final FormatterStep createStep() {
 			return JacksonJsonStep.create(jacksonConfig, version, formatExtension.provisioner());
 		}
 	}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java
index e5dc3d79ac..26b742f02a 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java
@@ -19,6 +19,7 @@
 
 import javax.inject.Inject;
 
+import com.diffplug.common.base.Throwables;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.json.JacksonJsonStep;
 import com.diffplug.spotless.yaml.JacksonYamlConfig;
@@ -41,7 +42,7 @@ protected void setupTask(SpotlessTask task) {
 		super.setupTask(task);
 	}
 
-	public AJacksonGradleConfig jacksonYaml() {
+	public AJacksonGradleConfig jackson() {
 		return new JacksonYamlGradleConfig(this);
 	}
 
@@ -53,9 +54,7 @@ public JacksonYamlGradleConfig(JacksonYamlConfig jacksonConfig, FormatExtension
 
 			this.jacksonConfig = jacksonConfig;
 
-			if (jacksonConfig == null) {
-				throw new IllegalArgumentException("ARG");
-			}
+			formatExtension.addStep(createStep());
 		}
 
 		public JacksonYamlGradleConfig(FormatExtension formatExtension) {
@@ -71,8 +70,9 @@ public AJacksonGradleConfig yamlFeature(String feature, boolean toggle) {
 			return this;
 		}
 
+		// 'final' as it is called in the constructor
 		@Override
-		protected FormatterStep createStep() {
+		protected final FormatterStep createStep() {
 			return JacksonYamlStep.create(jacksonConfig, version, provisioner());
 		}
 	}
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JsonExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JsonExtensionTest.java
index 945c72cf75..a878615eaa 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JsonExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JsonExtensionTest.java
@@ -149,7 +149,7 @@ void jacksonFormattingWithSortingByKeys() throws IOException {
 				"spotless {",
 				"    json {",
 				"        target 'src/**/*.json'",
-				"        jacksonJson().feature('ORDER_MAP_ENTRIES_BY_KEYS', true)",
+				"        jackson().feature('ORDER_MAP_ENTRIES_BY_KEYS', true)",
 				"    }",
 				"}");
 		setFile("src/main/resources/example.json").toResource("json/sortByKeysBefore.json");
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/YamlExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/YamlExtensionTest.java
index ee5ee33366..455dfc6dcf 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/YamlExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/YamlExtensionTest.java
@@ -31,7 +31,7 @@ void testFormatYaml_WithJackson_defaultConfig_separatorComments() throws IOExcep
 				"spotless {",
 				"    yaml {",
 				"        target 'src/**/*.yaml'",
-				"        jacksonYaml()",
+				"        jackson()",
 				"    }",
 				"}");
 		setFile("src/main/resources/example.yaml").toResource("yaml/separator_comments.yaml");
@@ -51,14 +51,14 @@ void testFormatYaml_WithJackson_skipDocStartMarker() throws IOException {
 				"spotless {",
 				"    yaml {",
 				"        target 'src/**/*.yaml'",
-				"        jacksonYaml()",
+				"        jackson()",
 				"	        .yamlFeature('WRITE_DOC_START_MARKER', false)",
 				"	        .yamlFeature('MINIMIZE_QUOTES', true)",
 				"    }",
 				"}");
 		setFile("src/main/resources/example.yaml").toResource("yaml/array_with_bracket.yaml");
 		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("src/main/resources/example.yaml").sameAsResource("yaml/array_with_bracket.clean.no_start_marker.yaml");
+		assertFile("src/main/resources/example.yaml").sameAsResource("yaml/array_with_bracket.clean.no_start_marker.no_quotes.yaml");
 	}
 
 }
diff --git a/testlib/src/main/resources/yaml/array_with_bracket.clean.no_start_marker.yaml b/testlib/src/main/resources/yaml/array_with_bracket.clean.no_start_marker.no_quotes.yaml
similarity index 100%
rename from testlib/src/main/resources/yaml/array_with_bracket.clean.no_start_marker.yaml
rename to testlib/src/main/resources/yaml/array_with_bracket.clean.no_start_marker.no_quotes.yaml

From a22109e5e4b3e7daf4ae41b308d39bead18a06ef Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Wed, 18 Jan 2023 10:41:53 +0400
Subject: [PATCH 0620/2068] spotlessApply

---
 .../spotless/glue/yaml/JacksonYamlFormatterFunc.java         | 5 -----
 .../java/com/diffplug/gradle/spotless/YamlExtension.java     | 1 -
 .../java/com/diffplug/gradle/spotless/YamlExtensionTest.java | 2 +-
 plugin-maven/README.md                                       | 4 ++--
 .../test/java/com/diffplug/spotless/maven/yaml/YamlTest.java | 1 -
 5 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/JacksonYamlFormatterFunc.java b/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/JacksonYamlFormatterFunc.java
index 3986374c9e..0cf4591717 100644
--- a/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/JacksonYamlFormatterFunc.java
+++ b/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/JacksonYamlFormatterFunc.java
@@ -57,11 +57,6 @@ protected JsonFactory makeJsonFactory() {
 
 	@Override
 	protected String format(ObjectMapper objectMapper, String input) throws IllegalArgumentException, IOException {
-		// We may consider adding manually an initial '---' prefix to help management of multiple documents
-		// if (!input.trim().startsWith("---")) {
-		// 	input = "---" + "\n" + input;
-		// }
-
 		try {
 			// https://stackoverflow.com/questions/25222327/deserialize-pojos-from-multiple-yaml-documents-in-a-single-file-in-jackson
 			// https://github.com/FasterXML/jackson-dataformats-text/issues/66#issuecomment-375328648
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java
index 26b742f02a..bf268914fc 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java
@@ -19,7 +19,6 @@
 
 import javax.inject.Inject;
 
-import com.diffplug.common.base.Throwables;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.json.JacksonJsonStep;
 import com.diffplug.spotless.yaml.JacksonYamlConfig;
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/YamlExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/YamlExtensionTest.java
index 455dfc6dcf..7baddc4177 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/YamlExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/YamlExtensionTest.java
@@ -57,7 +57,7 @@ void testFormatYaml_WithJackson_skipDocStartMarker() throws IOException {
 				"    }",
 				"}");
 		setFile("src/main/resources/example.yaml").toResource("yaml/array_with_bracket.yaml");
-		gradleRunner().withArguments("spotlessApply").build();
+		gradleRunner().withArguments("spotlessApply", "--stacktrace").build();
 		assertFile("src/main/resources/example.yaml").sameAsResource("yaml/array_with_bracket.clean.no_start_marker.no_quotes.yaml");
 	}
 
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index e76d424611..7673a440c6 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -12,8 +12,8 @@ output = [
   ].join('\n');
 -->
 [![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.29.0/index.html)
-[![Changelog](https://img.shields.io/badge/changelog-2.29.0-brightgreen.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.30.0/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.30.0-brightgreen.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java
index 084f1495eb..aaea2c65b1 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java
@@ -19,7 +19,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.diffplug.spotless.ProcessRunner;
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
 
 public class YamlTest extends MavenIntegrationHarness {

From 7bc34f48328a42bdc26a58c2b1d22f2b68892256 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Wed, 18 Jan 2023 11:46:36 +0400
Subject: [PATCH 0621/2068] Switch from ObjectNode to Map to enable
 SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS

---
 .../glue/json/AJacksonFormatterFunc.java      | 16 ++++++++------
 .../glue/json/JacksonJsonFormatterFunc.java   |  2 +-
 .../diffplug/spotless/json/JacksonConfig.java |  2 +-
 .../spotless/json/JacksonJsonConfig.java      |  4 ++--
 .../spotless/yaml/JacksonYamlConfig.java      |  4 ++--
 .../gradle/spotless/JsonExtension.java        |  2 +-
 .../gradle/spotless/YamlExtension.java        |  3 +--
 .../spotless/maven/json/JsonTest.java         |  2 +-
 .../spotless/maven/yaml/YamlTest.java         |  9 --------
 .../json/sortByKeysAfter_Jackson.json         | 22 ++++++++-----------
 ...sAfter_Jackson_spaceAfterKeySeparator.json | 22 ++++++++-----------
 ...th_bracket.clean.spaceBeforeSeparator.yaml | 12 ----------
 12 files changed, 36 insertions(+), 64 deletions(-)
 delete mode 100644 testlib/src/main/resources/yaml/array_with_bracket.clean.spaceBeforeSeparator.yaml

diff --git a/lib/src/jackson/java/com/diffplug/spotless/glue/json/AJacksonFormatterFunc.java b/lib/src/jackson/java/com/diffplug/spotless/glue/json/AJacksonFormatterFunc.java
index a835c85f9a..a41ecf90d2 100644
--- a/lib/src/jackson/java/com/diffplug/spotless/glue/json/AJacksonFormatterFunc.java
+++ b/lib/src/jackson/java/com/diffplug/spotless/glue/json/AJacksonFormatterFunc.java
@@ -16,10 +16,11 @@
 package com.diffplug.spotless.glue.json;
 
 import java.io.IOException;
+import java.util.Map;
 
 import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.PrettyPrinter;
 import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
@@ -48,8 +49,11 @@ public String apply(String input) throws Exception {
 
 	protected String format(ObjectMapper objectMapper, String input) throws IllegalArgumentException, IOException {
 		try {
-			ObjectNode objectNode = objectMapper.readValue(input, ObjectNode.class);
-			return objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(objectNode);
+			// ObjectNode is not compatible with SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS
+			Map objectNode = objectMapper.readValue(input, Map.class);
+			String output = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(objectNode);
+
+			return output;
 		} catch (JsonProcessingException e) {
 			throw new AssertionError("Unable to format. input='" + input + "'", e);
 		}
@@ -65,7 +69,7 @@ protected ObjectMapper makeObjectMapper() {
 		JsonFactory jsonFactory = makeJsonFactory();
 		ObjectMapper objectMapper = new ObjectMapper(jsonFactory);
 
-		objectMapper.setDefaultPrettyPrinter(makePrinter());
+		objectMapper.setDefaultPrettyPrinter(makePrettyPrinter());
 
 		// Configure the ObjectMapper
 		// https://github.com/FasterXML/jackson-databind#commonly-used-features
@@ -76,12 +80,10 @@ protected ObjectMapper makeObjectMapper() {
 			objectMapper.configure(feature, toggle);
 		});
 
-		new JsonFactory().configure(JsonGenerator.Feature.AUTO_CLOSE_JSON_CONTENT, true);
-
 		return objectMapper;
 	}
 
-	protected DefaultPrettyPrinter makePrinter() {
+	protected PrettyPrinter makePrettyPrinter() {
 		return new DefaultPrettyPrinter();
 	}
 }
diff --git a/lib/src/jackson/java/com/diffplug/spotless/glue/json/JacksonJsonFormatterFunc.java b/lib/src/jackson/java/com/diffplug/spotless/glue/json/JacksonJsonFormatterFunc.java
index 5aadcc568f..ae455fbbb4 100644
--- a/lib/src/jackson/java/com/diffplug/spotless/glue/json/JacksonJsonFormatterFunc.java
+++ b/lib/src/jackson/java/com/diffplug/spotless/glue/json/JacksonJsonFormatterFunc.java
@@ -57,7 +57,7 @@ protected JsonFactory makeJsonFactory() {
 	}
 
 	@Override
-	protected DefaultPrettyPrinter makePrinter() {
+	protected DefaultPrettyPrinter makePrettyPrinter() {
 		boolean spaceBeforeSeparator = jacksonConfig.isSpaceBeforeSeparator();
 
 		// DefaultIndenter default constructor relies on 2 whitespaces as default tabulation
diff --git a/lib/src/main/java/com/diffplug/spotless/json/JacksonConfig.java b/lib/src/main/java/com/diffplug/spotless/json/JacksonConfig.java
index 250b77d1f1..f0dba8f072 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/JacksonConfig.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/JacksonConfig.java
@@ -36,7 +36,7 @@ public class JacksonConfig implements Serializable {
 		DEFAULT_FEATURE_TOGGLES = defaultFeatureToggles;
 	}
 
-	protected Map<String, Boolean> featureToToggle = new LinkedHashMap<>();
+	protected Map<String, Boolean> featureToToggle = new LinkedHashMap<>(DEFAULT_FEATURE_TOGGLES);
 
 	public Map<String, Boolean> getFeatureToToggle() {
 		return Collections.unmodifiableMap(featureToToggle);
diff --git a/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonConfig.java b/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonConfig.java
index 50b28605d1..efff594663 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonConfig.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonConfig.java
@@ -36,14 +36,14 @@ public Map<String, Boolean> getJsonFeatureToToggle() {
 	}
 
 	/**
-	 * @see com.fasterxml.jackson.core.JsonGenerator.Feature
+	 * Refers to com.fasterxml.jackson.core.JsonGenerator.Feature
 	 */
 	public void setJsonFeatureToToggle(Map<String, Boolean> jsonFeatureToToggle) {
 		this.jsonFeatureToToggle = jsonFeatureToToggle;
 	}
 
 	/**
-	 * @see com.fasterxml.jackson.core.JsonGenerator.Feature
+	 * Refers to com.fasterxml.jackson.core.JsonGenerator.Feature
 	 */
 	public void appendJsonFeatureToToggle(Map<String, Boolean> features) {
 		this.jsonFeatureToToggle.putAll(features);
diff --git a/lib/src/main/java/com/diffplug/spotless/yaml/JacksonYamlConfig.java b/lib/src/main/java/com/diffplug/spotless/yaml/JacksonYamlConfig.java
index 2463b9603f..166ee5f307 100644
--- a/lib/src/main/java/com/diffplug/spotless/yaml/JacksonYamlConfig.java
+++ b/lib/src/main/java/com/diffplug/spotless/yaml/JacksonYamlConfig.java
@@ -34,14 +34,14 @@ public Map<String, Boolean> getYamlFeatureToToggle() {
 	}
 
 	/**
-	 * @see com.fasterxml.jackson.dataformat.yaml.YAMLGenerator.Feature
+	 * Refers to com.fasterxml.jackson.dataformat.yaml.YAMLGenerator.Feature
 	 */
 	public void setYamlFeatureToToggle(Map<String, Boolean> yamlFeatureToToggle) {
 		this.yamlFeatureToToggle = yamlFeatureToToggle;
 	}
 
 	/**
-	 * @see com.fasterxml.jackson.dataformat.yaml.YAMLGenerator.Feature
+	 * Refers to com.fasterxml.jackson.dataformat.yaml.YAMLGenerator.Feature
 	 */
 	public void appendYamlFeatureToToggle(Map<String, Boolean> features) {
 		this.yamlFeatureToToggle.putAll(features);
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
index b964fcb54d..ef0e993d37 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
@@ -131,7 +131,7 @@ public JacksonJsonGradleConfig(FormatExtension formatExtension) {
 		}
 
 		/**
-		 * @see com.fasterxml.jackson.core.JsonGenerator.Feature
+		 * @Refers to com.fasterxml.jackson.core.JsonGenerator.Feature
 		 */
 		public AJacksonGradleConfig jsonFeature(String feature, boolean toggle) {
 			this.jacksonConfig.appendJsonFeatureToToggle(Collections.singletonMap(feature, toggle));
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java
index bf268914fc..7be3264102 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java
@@ -25,7 +25,6 @@
 import com.diffplug.spotless.yaml.JacksonYamlStep;
 
 public class YamlExtension extends FormatExtension {
-	private static final String DEFAULT_GSON_VERSION = JacksonJsonStep.defaultVersion();
 	static final String NAME = "yaml";
 
 	@Inject
@@ -61,7 +60,7 @@ public JacksonYamlGradleConfig(FormatExtension formatExtension) {
 		}
 
 		/**
-		 * @see com.fasterxml.jackson.dataformat.yaml.YAMLGenerator.Feature
+		 * Refers to com.fasterxml.jackson.dataformat.yaml.YAMLGenerator.Feature
 		 */
 		public AJacksonGradleConfig yamlFeature(String feature, boolean toggle) {
 			this.jacksonConfig.appendYamlFeatureToToggle(Collections.singletonMap(feature, toggle));
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java
index 47de001a73..1897cc764a 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java
@@ -76,7 +76,7 @@ public void testFormatJson_WithJackson_sortByKeys() throws Exception {
 
 		setFile("json_test.json").toResource("json/sortByKeysBefore.json");
 
-		mavenRunner().withArguments("spotless:apply").runNoError();
+		mavenRunner().withArguments("spotless:apply", "-X").runNoError();
 		assertFile("json_test.json").sameAsResource("json/sortByKeysAfter_Jackson.json");
 	}
 
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java
index aaea2c65b1..6af4d09ce9 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java
@@ -42,15 +42,6 @@ public void testFormatYaml_WithJackson_defaultConfig_arrayBrackets() throws Exce
 		assertFile("yaml_test.yaml").sameAsResource("yaml/array_with_bracket.clean.yaml");
 	}
 
-	@Test
-	public void testFormatYaml_WithJackson_defaultConfig_arrayBrackets_spaceBeforeSeparator() throws Exception {
-		writePomWithYamlSteps("<jackson><spaceBeforeSeparator>true</spaceBeforeSeparator></jackson>");
-
-		setFile("yaml_test.yaml").toResource("yaml/array_with_bracket.yaml");
-		mavenRunner().withArguments("spotless:apply").runNoError();
-		assertFile("yaml_test.yaml").sameAsResource("yaml/array_with_bracket.clean.spaceBeforeSeparator.yaml");
-	}
-
 	@Test
 	public void testFormatYaml_WithJackson_defaultConfig_multipleDocuments() throws Exception {
 		writePomWithYamlSteps("<jackson/>");
diff --git a/testlib/src/main/resources/json/sortByKeysAfter_Jackson.json b/testlib/src/main/resources/json/sortByKeysAfter_Jackson.json
index c4a48de2f2..3af39fd0fb 100644
--- a/testlib/src/main/resources/json/sortByKeysAfter_Jackson.json
+++ b/testlib/src/main/resources/json/sortByKeysAfter_Jackson.json
@@ -1,19 +1,15 @@
 {
+  "A": 1,
+  "X": 2,
+  "_arraysNotSorted": [ 3, 2, 1 ],
+  "a": 3,
+  "c": 4,
+  "x": 5,
+  "z": {
     "A": 1,
     "X": 2,
-    "_arraysNotSorted": [
-        3,
-        2,
-        1
-    ],
     "a": 3,
     "c": 4,
-    "x": 5,
-    "z": {
-        "A": 1,
-        "X": 2,
-        "a": 3,
-        "c": 4,
-        "x": 5
-    }
+    "x": 5
+  }
 }
diff --git a/testlib/src/main/resources/json/sortByKeysAfter_Jackson_spaceAfterKeySeparator.json b/testlib/src/main/resources/json/sortByKeysAfter_Jackson_spaceAfterKeySeparator.json
index c4a48de2f2..3af39fd0fb 100644
--- a/testlib/src/main/resources/json/sortByKeysAfter_Jackson_spaceAfterKeySeparator.json
+++ b/testlib/src/main/resources/json/sortByKeysAfter_Jackson_spaceAfterKeySeparator.json
@@ -1,19 +1,15 @@
 {
+  "A": 1,
+  "X": 2,
+  "_arraysNotSorted": [ 3, 2, 1 ],
+  "a": 3,
+  "c": 4,
+  "x": 5,
+  "z": {
     "A": 1,
     "X": 2,
-    "_arraysNotSorted": [
-        3,
-        2,
-        1
-    ],
     "a": 3,
     "c": 4,
-    "x": 5,
-    "z": {
-        "A": 1,
-        "X": 2,
-        "a": 3,
-        "c": 4,
-        "x": 5
-    }
+    "x": 5
+  }
 }
diff --git a/testlib/src/main/resources/yaml/array_with_bracket.clean.spaceBeforeSeparator.yaml b/testlib/src/main/resources/yaml/array_with_bracket.clean.spaceBeforeSeparator.yaml
deleted file mode 100644
index 7dc9255e06..0000000000
--- a/testlib/src/main/resources/yaml/array_with_bracket.clean.spaceBeforeSeparator.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-episodes:
-- 1
-- 2
-- 3
-- 4
-- 5
-- 6
-- 7
-best-jedi :
-  name : "Obi-Wan"
-  side : "light"

From 8d2cdd3d5c800161fa8149a8c4aa6f9d7d596849 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Wed, 18 Jan 2023 12:33:38 +0400
Subject: [PATCH 0622/2068] Fix management of multiple documents YAML

---
 .../glue/json/AJacksonFormatterFunc.java      |  2 +-
 .../glue/yaml/JacksonYamlFormatterFunc.java   | 31 +++++----
 .../spotless/json/JsonSimpleStep.java         |  6 +-
 .../gradle/spotless/YamlExtensionTest.java    | 67 +++++++++++++++----
 .../resources/yaml/array_at_root.clean.yaml   |  5 ++
 .../main/resources/yaml/array_at_root.yaml    |  7 ++
 .../yaml/multiple_documents.clean.yaml        | 12 ++--
 .../resources/yaml/multiple_documents.yaml    | 14 ++--
 8 files changed, 99 insertions(+), 45 deletions(-)
 create mode 100644 testlib/src/main/resources/yaml/array_at_root.clean.yaml
 create mode 100644 testlib/src/main/resources/yaml/array_at_root.yaml

diff --git a/lib/src/jackson/java/com/diffplug/spotless/glue/json/AJacksonFormatterFunc.java b/lib/src/jackson/java/com/diffplug/spotless/glue/json/AJacksonFormatterFunc.java
index a41ecf90d2..244ce05a9e 100644
--- a/lib/src/jackson/java/com/diffplug/spotless/glue/json/AJacksonFormatterFunc.java
+++ b/lib/src/jackson/java/com/diffplug/spotless/glue/json/AJacksonFormatterFunc.java
@@ -55,7 +55,7 @@ protected String format(ObjectMapper objectMapper, String input) throws IllegalA
 
 			return output;
 		} catch (JsonProcessingException e) {
-			throw new AssertionError("Unable to format. input='" + input + "'", e);
+			throw new IllegalArgumentException("Unable to format. input='" + input + "'", e);
 		}
 	}
 
diff --git a/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/JacksonYamlFormatterFunc.java b/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/JacksonYamlFormatterFunc.java
index 0cf4591717..96012e1041 100644
--- a/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/JacksonYamlFormatterFunc.java
+++ b/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/JacksonYamlFormatterFunc.java
@@ -15,12 +15,18 @@
  */
 package com.diffplug.spotless.glue.yaml;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.StringWriter;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
 
 import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fasterxml.jackson.databind.SequenceWriter;
+import com.fasterxml.jackson.databind.node.ContainerNode;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactoryBuilder;
 import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator;
@@ -57,24 +63,21 @@ protected JsonFactory makeJsonFactory() {
 
 	@Override
 	protected String format(ObjectMapper objectMapper, String input) throws IllegalArgumentException, IOException {
+		//if (true)
+		//	throw new IllegalArgumentException("input = \r\n" + input);
 		try {
 			// https://stackoverflow.com/questions/25222327/deserialize-pojos-from-multiple-yaml-documents-in-a-single-file-in-jackson
 			// https://github.com/FasterXML/jackson-dataformats-text/issues/66#issuecomment-375328648
-			// 2023-01: For now, we get 'Cannot deserialize value of type `com.fasterxml.jackson.databind.node.ObjectNode` from Array value'
-			//			JsonParser yamlParser = objectMapper.getFactory().createParser(input);
-			//			List<ObjectNode> docs = objectMapper.readValues(yamlParser, ObjectNode.class).readAll();
-			//			return objectMapper.writeValueAsString(docs);
+			JsonParser yamlParser = objectMapper.getFactory().createParser(input);
+			List<ContainerNode> documents = objectMapper.readValues(yamlParser, ContainerNode.class).readAll();
 
-			// A JsonNode may keep the comments from the input node
-			// JsonNode jsonNode = objectMapper.readTree(input);
-			//Not 'toPrettyString' as one could require no INDENT_OUTPUT
-			// return jsonNode.toPrettyString();
-			ObjectNode objectNode = objectMapper.readValue(input, ObjectNode.class);
-			String outputFromjackson = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(objectNode);
-
-			return outputFromjackson;
+			// https://github.com/FasterXML/jackson-dataformats-text/issues/66#issuecomment-554265055
+			// https://github.com/FasterXML/jackson-dataformats-text/issues/66#issuecomment-554265055
+			StringWriter stringWriter = new StringWriter();
+			objectMapper.writer().writeValues(stringWriter).writeAll(documents).close();
+			return stringWriter.toString();
 		} catch (JsonProcessingException e) {
-			throw new AssertionError("Unable to format. input='" + input + "'", e);
+			throw new IllegalArgumentException("Unable to format. input='" + input + "'", e);
 		}
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/json/JsonSimpleStep.java b/lib/src/main/java/com/diffplug/spotless/json/JsonSimpleStep.java
index a970149133..1f4db3e059 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/JsonSimpleStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/JsonSimpleStep.java
@@ -81,7 +81,7 @@ FormatterFunc toFormatter() {
 					return format(arrayConstructor, arrayToString, s);
 				}
 
-				throw new AssertionError(String.format("Unable to determine JSON type, expected a '{' or '[' but found '%s'", first));
+				throw new IllegalArgumentException(String.format("Unable to determine JSON type, expected a '{' or '[' but found '%s'", first));
 			};
 		}
 
@@ -89,8 +89,8 @@ private String format(Constructor<?> constructor, Method toString, String input)
 			try {
 				Object parsed = constructor.newInstance(input);
 				return toString.invoke(parsed, indentSpaces) + "\n";
-			} catch (InvocationTargetException ex) {
-				throw new AssertionError("Unable to format JSON", ex.getCause());
+			} catch (InvocationTargetException e) {
+				throw new IllegalArgumentException("Unable to format JSON", e);
 			}
 		}
 	}
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/YamlExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/YamlExtensionTest.java
index 7baddc4177..295934dd26 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/YamlExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/YamlExtensionTest.java
@@ -43,22 +43,63 @@ void testFormatYaml_WithJackson_defaultConfig_separatorComments() throws IOExcep
 	@Test
 	void testFormatYaml_WithJackson_skipDocStartMarker() throws IOException {
 		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'java'",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    yaml {",
-				"        target 'src/**/*.yaml'",
-				"        jackson()",
-				"	        .yamlFeature('WRITE_DOC_START_MARKER', false)",
-				"	        .yamlFeature('MINIMIZE_QUOTES', true)",
-				"    }",
-				"}");
+			"plugins {",
+			"    id 'java'",
+			"    id 'com.diffplug.spotless'",
+			"}",
+			"repositories { mavenCentral() }",
+			"spotless {",
+			"    yaml {",
+			"        target 'src/**/*.yaml'",
+			"        jackson()",
+			"	        .yamlFeature('WRITE_DOC_START_MARKER', false)",
+			"	        .yamlFeature('MINIMIZE_QUOTES', true)",
+			"    }",
+			"}");
 		setFile("src/main/resources/example.yaml").toResource("yaml/array_with_bracket.yaml");
 		gradleRunner().withArguments("spotlessApply", "--stacktrace").build();
 		assertFile("src/main/resources/example.yaml").sameAsResource("yaml/array_with_bracket.clean.no_start_marker.no_quotes.yaml");
 	}
 
+	@Test
+	void testFormatYaml_WithJackson_multipleDocuments() throws IOException {
+		setFile("build.gradle").toLines(
+			"plugins {",
+			"    id 'java'",
+			"    id 'com.diffplug.spotless'",
+			"}",
+			"repositories { mavenCentral() }",
+			"spotless {",
+			"    yaml {",
+			"        target 'src/**/*.yaml'",
+			"        jackson()",
+			"	        .yamlFeature('MINIMIZE_QUOTES', true)",
+			"    }",
+			"}");
+		setFile("src/main/resources/example.yaml").toResource("yaml/multiple_documents.yaml");
+		gradleRunner().withArguments("spotlessApply", "--stacktrace").build();
+		assertFile("src/main/resources/example.yaml").sameAsResource("yaml/multiple_documents.clean.jackson.yaml");
+	}
+
+
+	@Test
+	void testFormatYaml_WithJackson_arrayAtRoot() throws IOException {
+		setFile("build.gradle").toLines(
+			"plugins {",
+			"    id 'java'",
+			"    id 'com.diffplug.spotless'",
+			"}",
+			"repositories { mavenCentral() }",
+			"spotless {",
+			"    yaml {",
+			"        target 'src/**/*.yaml'",
+			"        jackson()",
+			"    }",
+			"}");
+		setFile("src/main/resources/example.yaml").toResource("yaml/array_at_root.yaml");
+		gradleRunner().withArguments("spotlessApply", "--stacktrace").build();
+		assertFile("src/main/resources/example.yaml").sameAsResource("yaml/array_at_root.clean.yaml");
+	}
+
+
 }
diff --git a/testlib/src/main/resources/yaml/array_at_root.clean.yaml b/testlib/src/main/resources/yaml/array_at_root.clean.yaml
new file mode 100644
index 0000000000..f9bae04114
--- /dev/null
+++ b/testlib/src/main/resources/yaml/array_at_root.clean.yaml
@@ -0,0 +1,5 @@
+---
+- key1: "value1"
+  key2: "value2"
+- key3: "value3"
+  key4: "value4"
diff --git a/testlib/src/main/resources/yaml/array_at_root.yaml b/testlib/src/main/resources/yaml/array_at_root.yaml
new file mode 100644
index 0000000000..b26f6bb246
--- /dev/null
+++ b/testlib/src/main/resources/yaml/array_at_root.yaml
@@ -0,0 +1,7 @@
+- key1: value1
+  key2:  value2
+
+
+- key3: value3
+  key4: value4
+
diff --git a/testlib/src/main/resources/yaml/multiple_documents.clean.yaml b/testlib/src/main/resources/yaml/multiple_documents.clean.yaml
index 45e0b0916b..3651473955 100644
--- a/testlib/src/main/resources/yaml/multiple_documents.clean.yaml
+++ b/testlib/src/main/resources/yaml/multiple_documents.clean.yaml
@@ -1,8 +1,8 @@
----
-document: this is document 1
-
----
-document: this is document 2
+# Document 1
+key1: value1
+key2: value2
 
 ---
-document: this is document 3
\ No newline at end of file
+# Document 2
+key3: value3
+key4: value4
diff --git a/testlib/src/main/resources/yaml/multiple_documents.yaml b/testlib/src/main/resources/yaml/multiple_documents.yaml
index 51f14a5862..3651473955 100644
--- a/testlib/src/main/resources/yaml/multiple_documents.yaml
+++ b/testlib/src/main/resources/yaml/multiple_documents.yaml
@@ -1,10 +1,8 @@
-document: this is document 1
----
-
-document: this is document 2
-
+# Document 1
+key1: value1
+key2: value2
 
 ---
-
-
-document: this is document 3
\ No newline at end of file
+# Document 2
+key3: value3
+key4: value4

From a3693e78c1326a281dac76de9327515243d3f27e Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Wed, 18 Jan 2023 12:36:06 +0400
Subject: [PATCH 0623/2068] spotlessApply

---
 .../glue/json/AJacksonFormatterFunc.java      |  1 -
 .../glue/yaml/JacksonYamlFormatterFunc.java   |  3 -
 .../spotless/json/JsonSimpleStep.java         |  2 +-
 .../gradle/spotless/YamlExtension.java        |  1 -
 .../gradle/spotless/YamlExtensionTest.java    | 74 +++++++++----------
 5 files changed, 37 insertions(+), 44 deletions(-)

diff --git a/lib/src/jackson/java/com/diffplug/spotless/glue/json/AJacksonFormatterFunc.java b/lib/src/jackson/java/com/diffplug/spotless/glue/json/AJacksonFormatterFunc.java
index 244ce05a9e..6f363ad1b7 100644
--- a/lib/src/jackson/java/com/diffplug/spotless/glue/json/AJacksonFormatterFunc.java
+++ b/lib/src/jackson/java/com/diffplug/spotless/glue/json/AJacksonFormatterFunc.java
@@ -24,7 +24,6 @@
 import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.databind.node.ObjectNode;
 
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.json.JacksonConfig;
diff --git a/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/JacksonYamlFormatterFunc.java b/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/JacksonYamlFormatterFunc.java
index 96012e1041..edb350c559 100644
--- a/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/JacksonYamlFormatterFunc.java
+++ b/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/JacksonYamlFormatterFunc.java
@@ -15,17 +15,14 @@
  */
 package com.diffplug.spotless.glue.yaml;
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.StringWriter;
-import java.nio.charset.StandardCharsets;
 import java.util.List;
 
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SequenceWriter;
 import com.fasterxml.jackson.databind.node.ContainerNode;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactoryBuilder;
diff --git a/lib/src/main/java/com/diffplug/spotless/json/JsonSimpleStep.java b/lib/src/main/java/com/diffplug/spotless/json/JsonSimpleStep.java
index 1f4db3e059..85ccbfa6e2 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/JsonSimpleStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/JsonSimpleStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2021-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java
index 7be3264102..abc2dce359 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java
@@ -20,7 +20,6 @@
 import javax.inject.Inject;
 
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.json.JacksonJsonStep;
 import com.diffplug.spotless.yaml.JacksonYamlConfig;
 import com.diffplug.spotless.yaml.JacksonYamlStep;
 
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/YamlExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/YamlExtensionTest.java
index 295934dd26..82801eb0fd 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/YamlExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/YamlExtensionTest.java
@@ -43,19 +43,19 @@ void testFormatYaml_WithJackson_defaultConfig_separatorComments() throws IOExcep
 	@Test
 	void testFormatYaml_WithJackson_skipDocStartMarker() throws IOException {
 		setFile("build.gradle").toLines(
-			"plugins {",
-			"    id 'java'",
-			"    id 'com.diffplug.spotless'",
-			"}",
-			"repositories { mavenCentral() }",
-			"spotless {",
-			"    yaml {",
-			"        target 'src/**/*.yaml'",
-			"        jackson()",
-			"	        .yamlFeature('WRITE_DOC_START_MARKER', false)",
-			"	        .yamlFeature('MINIMIZE_QUOTES', true)",
-			"    }",
-			"}");
+				"plugins {",
+				"    id 'java'",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    yaml {",
+				"        target 'src/**/*.yaml'",
+				"        jackson()",
+				"	        .yamlFeature('WRITE_DOC_START_MARKER', false)",
+				"	        .yamlFeature('MINIMIZE_QUOTES', true)",
+				"    }",
+				"}");
 		setFile("src/main/resources/example.yaml").toResource("yaml/array_with_bracket.yaml");
 		gradleRunner().withArguments("spotlessApply", "--stacktrace").build();
 		assertFile("src/main/resources/example.yaml").sameAsResource("yaml/array_with_bracket.clean.no_start_marker.no_quotes.yaml");
@@ -64,42 +64,40 @@ void testFormatYaml_WithJackson_skipDocStartMarker() throws IOException {
 	@Test
 	void testFormatYaml_WithJackson_multipleDocuments() throws IOException {
 		setFile("build.gradle").toLines(
-			"plugins {",
-			"    id 'java'",
-			"    id 'com.diffplug.spotless'",
-			"}",
-			"repositories { mavenCentral() }",
-			"spotless {",
-			"    yaml {",
-			"        target 'src/**/*.yaml'",
-			"        jackson()",
-			"	        .yamlFeature('MINIMIZE_QUOTES', true)",
-			"    }",
-			"}");
+				"plugins {",
+				"    id 'java'",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    yaml {",
+				"        target 'src/**/*.yaml'",
+				"        jackson()",
+				"	        .yamlFeature('MINIMIZE_QUOTES', true)",
+				"    }",
+				"}");
 		setFile("src/main/resources/example.yaml").toResource("yaml/multiple_documents.yaml");
 		gradleRunner().withArguments("spotlessApply", "--stacktrace").build();
 		assertFile("src/main/resources/example.yaml").sameAsResource("yaml/multiple_documents.clean.jackson.yaml");
 	}
 
-
 	@Test
 	void testFormatYaml_WithJackson_arrayAtRoot() throws IOException {
 		setFile("build.gradle").toLines(
-			"plugins {",
-			"    id 'java'",
-			"    id 'com.diffplug.spotless'",
-			"}",
-			"repositories { mavenCentral() }",
-			"spotless {",
-			"    yaml {",
-			"        target 'src/**/*.yaml'",
-			"        jackson()",
-			"    }",
-			"}");
+				"plugins {",
+				"    id 'java'",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    yaml {",
+				"        target 'src/**/*.yaml'",
+				"        jackson()",
+				"    }",
+				"}");
 		setFile("src/main/resources/example.yaml").toResource("yaml/array_at_root.yaml");
 		gradleRunner().withArguments("spotlessApply", "--stacktrace").build();
 		assertFile("src/main/resources/example.yaml").sameAsResource("yaml/array_at_root.clean.yaml");
 	}
 
-
 }

From c613302d0b1d4edece0c1d6a9a408aea716cedf4 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Wed, 18 Jan 2023 13:01:25 +0400
Subject: [PATCH 0624/2068] Improve documentation, fix tests

---
 plugin-gradle/CHANGES.md                      |  2 +
 plugin-gradle/README.md                       | 65 +++++++++++++++++--
 plugin-maven/README.md                        | 20 ++++--
 .../spotless/maven/json/JacksonJson.java      |  4 ++
 .../multiple_documents.clean.jackson.yaml     |  6 +-
 5 files changed, 83 insertions(+), 14 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 63e5b43d74..94d7a90409 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -4,6 +4,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
+* Support `jackson()` for YAML files ([#1492](https://github.com/diffplug/spotless/pull/1492))
+* Support `jackson()` for JSON files ([#1492](https://github.com/diffplug/spotless/pull/1492))
 ### Fixed
 * The default list of type annotations used by `formatAnnotations` has had 8 more annotations from the Checker Framework added [#1494](https://github.com/diffplug/spotless/pull/1494)
 ### Changes
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index f2567a5924..e1bd2fe0dd 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -737,11 +737,12 @@ For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#n
 ```gradle
 spotless {
   json {
-    target 'src/**/*.json' // you have to set the target manually
-    simple() // has its own section below
+    target 'src/**/*.json'                // you have to set the target manually
+    simple()                              // has its own section below
     prettier().config(['parser': 'json']) // see Prettier section below
-    eclipseWtp('json') // see Eclipse web tools platform section
-    gson() // has its own section below
+    eclipseWtp('json')                    // see Eclipse web tools platform section
+    gson()                                // has its own section below
+    jackson()                             // has its own section below
   }
 }
 ```
@@ -780,10 +781,60 @@ spotless {
 
 Notes:
 * There's no option in Gson to leave HTML as-is (i.e. escaped HTML would remain escaped, raw would remain raw). Either
-all HTML characters are written escaped or none. Set `escapeHtml` if you prefer the former.
+  all HTML characters are written escaped or none. Set `escapeHtml` if you prefer the former.
 * `sortByKeys` will apply lexicographic order on the keys of the input JSON. See the
-[javadoc of String](https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/String.html#compareTo(java.lang.String))
-for details.
+  [javadoc of String](https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/String.html#compareTo(java.lang.String))
+  for details.
+
+### Jackson
+
+Uses Jackson for json files.
+
+```gradle
+spotless {
+  json {
+    target 'src/**/*.json'
+    jackson()
+      .spaceBeforeSeparator(false)                   // optional: add a whitespace before key separator. False by default
+      .feature('INDENT_OUTPUT', true)                // optional: true by default
+      .feature('ORDER_MAP_ENTRIES_BY_KEYS', true)    // optional: false by default
+      .feature('ANY_OTHER_FEATURE', true|false)      // optional: any SerializationFeature can be toggled on or off
+      .jsonFeature('ANY_OTHER_FEATURE', true|false)  // any JsonGenerator.Feature can be toggled on or off
+  }
+}
+```
+
+
+## YAML
+
+- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
+
+```gradle
+spotless {
+  yaml {
+    target 'src/**/*.yaml'                // you have to set the target manually
+    jackson()                             // has its own section below
+  }
+}
+```
+
+### Jackson
+
+Uses Jackson for `yaml` files.
+
+```gradle
+spotless {
+  yaml {
+    target 'src/**/*.yaml'
+    jackson()
+      .spaceBeforeSeparator(false)                   // optional: add a whitespace before key separator. False by default
+      .feature('INDENT_OUTPUT', true)                // optional: true by default
+      .feature('ORDER_MAP_ENTRIES_BY_KEYS', true)    // optional: false by default
+      .feature('ANY_OTHER_FEATURE', true|false)      // optional: any SerializationFeature can be toggled on or off
+      .yamlFeature('ANY_OTHER_FEATURE', true|false)  // any YAMLGenerator.Feature can be toggled on or off
+  }
+}
+```
 
 <a name="applying-prettier-to-javascript--flow--typescript--css--scss--less--jsx--graphql--yaml--etc"></a>
 
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 7673a440c6..37d1046b1d 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -907,11 +907,15 @@ Uses Jackson for formatting.
 <jackson>
   <version>2.14.1</version>    <!-- optional: The version of 'com.fasterxml.jackson.core:jackson-databind' to be used -->
   <features>                   <!-- optional: Customize the set of features (based on com.fasterxml.jackson.databind.SerializationFeature) -->
-    <INDENT_OUTPUT>true</INDENT_OUTPUT>                            <!-- true by default -->
-    <ORDER_MAP_ENTRIES_BY_KEYS>false</ORDER_MAP_ENTRIES_BY_KEYS>   <!-- false by default -->
-    <ANY_OTHER_FEATURE>true|false</ANY_OTHER_FEATURE>              <!-- any feature can be toggled on or off -->
+    <INDENT_OUTPUT>true</INDENT_OUTPUT>                            <!-- optional: true by default -->
+    <ORDER_MAP_ENTRIES_BY_KEYS>false</ORDER_MAP_ENTRIES_BY_KEYS>   <!-- optional: false by default -->
+    <ANY_OTHER_FEATURE>true|false</ANY_OTHER_FEATURE>              <!-- any SerializationFeature can be toggled on or off -->
   </features>
-  <spaceBeforeSeparator>false</spaceBeforeSeparator>   <!-- optional: false by default -->
+  <jsonFeatures>
+    <QUOTE_FIELD_NAMES>false</QUOTE_FIELD_NAMES>                   <!-- false by default -->
+    <ANY_OTHER_FEATURE>true|false</ANY_OTHER_FEATURE>              <!-- any JsonGenerator.Feature can be toggled on or off -->
+  </jsonFeatures>
+  <spaceBeforeSeparator>false</spaceBeforeSeparator>               <!-- optional: false by default -->
 </jackson>
 ```
 
@@ -944,9 +948,13 @@ Uses Jackson and YAMLFactory to pretty print objects:
   <features>                   <!-- optional: Customize the set of features (based on com.fasterxml.jackson.databind.SerializationFeature) -->
     <INDENT_OUTPUT>true</INDENT_OUTPUT>                            <!-- true by default -->
     <ORDER_MAP_ENTRIES_BY_KEYS>false</ORDER_MAP_ENTRIES_BY_KEYS>   <!-- false by default -->
-    <com.fasterxml.jackson.dataformat.yaml.YAMLGenerator.Feature.WRITE_DOC_START_MARKER>false</com.fasterxml.jackson.dataformat.yaml.YAMLGenerator.Feature.WRITE_DOC_START_MARKER>   <!-- feature can be referenced by their fully qualified className -->
-    <ANY_OTHER_FEATURE>true|false</ANY_OTHER_FEATURE>              <!-- any feature can be toggled on or off -->
+    <ANY_OTHER_FEATURE>true|false</ANY_OTHER_FEATURE>              <!-- any SerializationFeature can be toggled on or off -->
   </features>
+  <yamlFeatures>
+    <WRITE_DOC_START_MARKER>true</WRITE_DOC_START_MARKER>          <!-- false by default -->
+    <MINIMIZE_QUOTES>false</MINIMIZE_QUOTES>                       <!-- false by default -->
+    <ANY_OTHER_FEATURE>true|false</ANY_OTHER_FEATURE>              <!-- any YAMLGenerator.Feature can be toggled on or off -->
+  </yamlFeatures>
   <spaceBeforeSeparator>false</spaceBeforeSeparator>   <!-- optional: false by default -->
 </jackson>
 ```
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/JacksonJson.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/JacksonJson.java
index 9bca852754..ecf925ddbe 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/JacksonJson.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/JacksonJson.java
@@ -41,11 +41,15 @@ public class JacksonJson implements FormatterStepFactory {
 	@Parameter
 	private Map<String, Boolean> features = Collections.emptyMap();
 
+	@Parameter
+	private Map<String, Boolean> jsonFeatures = Collections.emptyMap();
+
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 		JacksonJsonConfig jacksonConfig = new JacksonJsonConfig();
 
 		jacksonConfig.appendFeatureToToggle(features);
+		jacksonConfig.appendJsonFeatureToToggle(jsonFeatures);
 		jacksonConfig.setSpaceBeforeSeparator(spaceBeforeSeparator);
 
 		return JacksonJsonStep
diff --git a/testlib/src/main/resources/yaml/multiple_documents.clean.jackson.yaml b/testlib/src/main/resources/yaml/multiple_documents.clean.jackson.yaml
index aa731919b4..ff56b4f77a 100644
--- a/testlib/src/main/resources/yaml/multiple_documents.clean.jackson.yaml
+++ b/testlib/src/main/resources/yaml/multiple_documents.clean.jackson.yaml
@@ -1,2 +1,6 @@
 ---
-document: "this is document 1"
+key1: "value1"
+key2: "value2"
+---
+key3: "value3"
+key4: "value4"

From 97ecda34a74bb07e86fa3f4db38e70b9352f49ed Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Wed, 18 Jan 2023 13:27:27 +0400
Subject: [PATCH 0625/2068] Fix Javadoc

---
 .../main/java/com/diffplug/gradle/spotless/JsonExtension.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
index ef0e993d37..1e9de2e831 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
@@ -131,7 +131,7 @@ public JacksonJsonGradleConfig(FormatExtension formatExtension) {
 		}
 
 		/**
-		 * @Refers to com.fasterxml.jackson.core.JsonGenerator.Feature
+		 * Refers to com.fasterxml.jackson.core.JsonGenerator.Feature
 		 */
 		public AJacksonGradleConfig jsonFeature(String feature, boolean toggle) {
 			this.jacksonConfig.appendJsonFeatureToToggle(Collections.singletonMap(feature, toggle));

From a80ed394092c9cdd76427f60221136db3795649f Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Wed, 18 Jan 2023 13:51:01 +0400
Subject: [PATCH 0626/2068] Sync mvn and gradle tests on YAML

---
 .../java/com/diffplug/gradle/spotless/YamlExtensionTest.java     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/YamlExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/YamlExtensionTest.java
index 82801eb0fd..067c809846 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/YamlExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/YamlExtensionTest.java
@@ -73,7 +73,6 @@ void testFormatYaml_WithJackson_multipleDocuments() throws IOException {
 				"    yaml {",
 				"        target 'src/**/*.yaml'",
 				"        jackson()",
-				"	        .yamlFeature('MINIMIZE_QUOTES', true)",
 				"    }",
 				"}");
 		setFile("src/main/resources/example.yaml").toResource("yaml/multiple_documents.yaml");

From 4b3cb2421996895eef8f871ac47a3089867780ae Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Mon, 16 Jan 2023 20:45:45 +0100
Subject: [PATCH 0627/2068] allow supplying node-binary path

or look for it as a sibling to npm binary.

the path of the npm binary is then prepended to the system PATH before launching the npm process.
---
 .../spotless/npm/EslintFormatterStep.java     | 10 +--
 .../spotless/npm/NodeExecutableResolver.java  | 45 ++++++++++++++
 .../npm/NpmFormatterStepLocations.java        | 62 +++++++++++++++++++
 .../npm/NpmFormatterStepStateBase.java        | 18 ++----
 .../spotless/npm/NpmPathResolver.java         | 18 ++++--
 .../com/diffplug/spotless/npm/NpmProcess.java | 16 +++--
 .../spotless/npm/PrettierFormatterStep.java   |  8 ++-
 .../spotless/npm/TsFmtFormatterStep.java      |  8 ++-
 .../gradle/spotless/FormatExtension.java      | 17 ++++-
 .../gradle/spotless/JavascriptExtension.java  |  3 +-
 .../gradle/spotless/TypescriptExtension.java  |  5 +-
 .../NpmTestsWithoutNpmInstallationTest.java   | 59 ++++++++++++++++++
 .../npm/AbstractNpmFormatterStepFactory.java  | 11 +++-
 .../npm/NpmFormatterStepCommonTests.java      |  9 ++-
 14 files changed, 252 insertions(+), 37 deletions(-)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/npm/NodeExecutableResolver.java
 create mode 100644 lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepLocations.java
 create mode 100644 plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
index 81c5b6ce78..74979d90aa 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
@@ -94,9 +94,11 @@ private static class State extends NpmFormatterStepStateBase implements Serializ
 									"/com/diffplug/spotless/npm/common-serve.js",
 									"/com/diffplug/spotless/npm/eslint-serve.js"),
 							npmPathResolver.resolveNpmrcContent()),
-					projectDir,
-					buildDir,
-					npmPathResolver.resolveNpmExecutable());
+					new NpmFormatterStepLocations(
+							projectDir,
+							buildDir,
+							npmPathResolver.resolveNpmExecutable(),
+							npmPathResolver.resolveNodeExecutable()));
 			this.eslintConfig = localCopyFiles(requireNonNull(eslintConfig));
 		}
 
@@ -119,7 +121,7 @@ public FormatterFunc createFormatterFunc() {
 				FormattedPrinter.SYSOUT.print("creating formatter function (starting server)");
 				ServerProcessInfo eslintRestServer = npmRunServer();
 				EslintRestService restService = new EslintRestService(eslintRestServer.getBaseUrl());
-				return Closeable.ofDangerous(() -> endServer(restService, eslintRestServer), new EslintFilePathPassingFormatterFunc(projectDir, nodeModulesDir, eslintConfig, restService));
+				return Closeable.ofDangerous(() -> endServer(restService, eslintRestServer), new EslintFilePathPassingFormatterFunc(locations.projectDir(), nodeModulesDir, eslintConfig, restService));
 			} catch (IOException e) {
 				throw ThrowingEx.asRuntime(e);
 			}
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NodeExecutableResolver.java b/lib/src/main/java/com/diffplug/spotless/npm/NodeExecutableResolver.java
new file mode 100644
index 0000000000..c9e04da620
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NodeExecutableResolver.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.npm;
+
+import java.io.File;
+import java.util.Optional;
+
+class NodeExecutableResolver {
+
+	private NodeExecutableResolver() {
+		// no instance
+	}
+
+	static String nodeExecutableName() {
+		String nodeName = "node";
+		if (PlatformInfo.normalizedOS() == PlatformInfo.OS.WINDOWS) {
+			nodeName += ".exe";
+		}
+		return nodeName;
+	}
+
+	static Optional<File> tryFindNextTo(File npmExecutable) {
+		if (npmExecutable == null) {
+			return Optional.empty();
+		}
+		File nodeExecutable = new File(npmExecutable.getParentFile(), nodeExecutableName());
+		if (nodeExecutable.exists() && nodeExecutable.isFile() && nodeExecutable.canExecute()) {
+			return Optional.of(nodeExecutable);
+		}
+		return Optional.empty();
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepLocations.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepLocations.java
new file mode 100644
index 0000000000..0c417733e8
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepLocations.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.npm;
+
+import static java.util.Objects.requireNonNull;
+
+import java.io.File;
+import java.io.Serializable;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+class NpmFormatterStepLocations implements Serializable {
+
+	private static final long serialVersionUID = -1055408537924029969L;
+	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
+	private final transient File projectDir;
+
+	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
+	private final transient File buildDir;
+
+	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
+	private final transient File npmExecutable;
+
+	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
+	private final transient File nodeExecutable;
+
+	public NpmFormatterStepLocations(File projectDir, File buildDir, File npmExecutable, File nodeExecutable) {
+		this.projectDir = requireNonNull(projectDir);
+		this.buildDir = requireNonNull(buildDir);
+		this.npmExecutable = requireNonNull(npmExecutable);
+		this.nodeExecutable = requireNonNull(nodeExecutable);
+	}
+
+	public File projectDir() {
+		return projectDir;
+	}
+
+	public File buildDir() {
+		return buildDir;
+	}
+
+	public File npmExecutable() {
+		return npmExecutable;
+	}
+
+	public File nodeExecutable() {
+		return nodeExecutable;
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
index 49a166e45c..4f555a177e 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
@@ -48,23 +48,17 @@ abstract class NpmFormatterStepStateBase implements Serializable {
 	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
 	public final transient File nodeModulesDir;
 
-	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
-	private final transient File npmExecutable;
-
-	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
-	public final transient File projectDir;
+	public final NpmFormatterStepLocations locations;
 
 	private final NpmConfig npmConfig;
 
 	private final String stepName;
 
-	protected NpmFormatterStepStateBase(String stepName, NpmConfig npmConfig, File projectDir, File buildDir, File npm) throws IOException {
+	protected NpmFormatterStepStateBase(String stepName, NpmConfig npmConfig, NpmFormatterStepLocations locations) throws IOException {
 		this.stepName = requireNonNull(stepName);
 		this.npmConfig = requireNonNull(npmConfig);
-		this.projectDir = requireNonNull(projectDir);
-		this.npmExecutable = npm;
-
-		NodeServerLayout layout = prepareNodeServer(buildDir);
+		this.locations = locations;
+		NodeServerLayout layout = prepareNodeServer(locations.buildDir());
 		this.nodeModulesDir = layout.nodeModulesDir();
 		this.packageJsonSignature = FileSignature.signAsList(layout.packageJsonFile());
 	}
@@ -88,7 +82,7 @@ private NodeServerLayout prepareNodeServer(File buildDir) throws IOException {
 	}
 
 	private void runNpmInstall(File npmProjectDir) throws IOException {
-		new NpmProcess(npmProjectDir, this.npmExecutable).install();
+		new NpmProcess(npmProjectDir, this.locations.npmExecutable(), this.locations.nodeExecutable()).install();
 	}
 
 	protected ServerProcessInfo npmRunServer() throws ServerStartException, IOException {
@@ -102,7 +96,7 @@ protected ServerProcessInfo npmRunServer() throws ServerStartException, IOExcept
 			final File serverPortFile = new File(this.nodeModulesDir, "server.port");
 			NpmResourceHelper.deleteFileIfExists(serverPortFile);
 			// start the http server in node
-			Process server = new NpmProcess(this.nodeModulesDir, this.npmExecutable).start();
+			Process server = new NpmProcess(this.nodeModulesDir, this.locations.npmExecutable(), this.locations.nodeExecutable()).start();
 
 			// await the readiness of the http server - wait for at most 60 seconds
 			try {
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmPathResolver.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmPathResolver.java
index a9a15bd49d..d18146188d 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmPathResolver.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmPathResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 DiffPlug
+ * Copyright 2020-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,8 @@
 package com.diffplug.spotless.npm;
 
 import java.io.File;
-import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
@@ -24,14 +25,17 @@ public class NpmPathResolver {
 
 	private final File explicitNpmExecutable;
 
+	private final File explicitNodeExecutable;
+
 	private final File explicitNpmrcFile;
 
 	private final List<File> additionalNpmrcLocations;
 
-	public NpmPathResolver(File explicitNpmExecutable, File explicitNpmrcFile, File... additionalNpmrcLocations) {
+	public NpmPathResolver(File explicitNpmExecutable, File explicitNodeExecutable, File explicitNpmrcFile, List<File> additionalNpmrcLocations) {
 		this.explicitNpmExecutable = explicitNpmExecutable;
+		this.explicitNodeExecutable = explicitNodeExecutable;
 		this.explicitNpmrcFile = explicitNpmrcFile;
-		this.additionalNpmrcLocations = Arrays.asList(additionalNpmrcLocations);
+		this.additionalNpmrcLocations = Collections.unmodifiableList(new ArrayList<>(additionalNpmrcLocations));
 	}
 
 	public File resolveNpmExecutable() {
@@ -40,6 +44,12 @@ public File resolveNpmExecutable() {
 						.orElseThrow(() -> new IllegalStateException("Can't automatically determine npm executable and none was specifically supplied!\n\n" + NpmExecutableResolver.explainMessage())));
 	}
 
+	public File resolveNodeExecutable() {
+		return Optional.ofNullable(this.explicitNodeExecutable)
+				.orElseGet(() -> NodeExecutableResolver.tryFindNextTo(resolveNpmExecutable())
+						.orElseThrow(() -> new IllegalStateException("Can't automatically determine node executable and none was specifically supplied!\n\n" + NpmExecutableResolver.explainMessage())));
+	}
+
 	public String resolveNpmrcContent() {
 		File npmrcFile = Optional.ofNullable(this.explicitNpmrcFile)
 				.orElseGet(() -> new NpmrcResolver(additionalNpmrcLocations).tryFind()
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java
index 8be94a9ea3..1675a4aa4e 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java
@@ -28,9 +28,12 @@ class NpmProcess {
 
 	private final File npmExecutable;
 
-	NpmProcess(File workingDir, File npmExecutable) {
+	private final File nodeExecutable;
+
+	NpmProcess(File workingDir, File npmExecutable, File nodeExecutable) {
 		this.workingDir = workingDir;
 		this.npmExecutable = npmExecutable;
+		this.nodeExecutable = nodeExecutable;
 	}
 
 	void install() {
@@ -61,11 +64,12 @@ private void npmAwait(String... args) {
 	private Process npm(String... args) {
 		List<String> processCommand = processCommand(args);
 		try {
-			return new ProcessBuilder()
+			ProcessBuilder processBuilder = new ProcessBuilder()
 					.inheritIO()
 					.directory(this.workingDir)
-					.command(processCommand)
-					.start();
+					.command(processCommand);
+			addEnvironmentVariables(processBuilder);
+			return processBuilder.start();
 		} catch (IOException e) {
 			throw new NpmProcessException("Failed to launch npm command '" + commandLine(args) + "'.", e);
 		}
@@ -78,6 +82,10 @@ private List<String> processCommand(String... args) {
 		return command;
 	}
 
+	private void addEnvironmentVariables(ProcessBuilder processBuilder) {
+		processBuilder.environment().put("PATH", this.nodeExecutable.getParentFile().getAbsolutePath() + File.pathSeparator + System.getenv("PATH"));
+	}
+
 	private String commandLine(String... args) {
 		return "npm " + Arrays.stream(args).collect(Collectors.joining(" "));
 	}
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
index 22a162eb0b..20ff71d08e 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
@@ -74,9 +74,11 @@ private static class State extends NpmFormatterStepStateBase implements Serializ
 									"/com/diffplug/spotless/npm/common-serve.js",
 									"/com/diffplug/spotless/npm/prettier-serve.js"),
 							npmPathResolver.resolveNpmrcContent()),
-					projectDir,
-					buildDir,
-					npmPathResolver.resolveNpmExecutable());
+					new NpmFormatterStepLocations(
+							projectDir,
+							buildDir,
+							npmPathResolver.resolveNpmExecutable(),
+							npmPathResolver.resolveNodeExecutable()));
 			this.prettierConfig = requireNonNull(prettierConfig);
 		}
 
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java
index 98d694ec33..14d6b1bbd0 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java
@@ -80,9 +80,11 @@ public State(String stepName, Map<String, String> versions, File projectDir, Fil
 									"/com/diffplug/spotless/npm/common-serve.js",
 									"/com/diffplug/spotless/npm/tsfmt-serve.js"),
 							npmPathResolver.resolveNpmrcContent()),
-					projectDir,
-					buildDir,
-					npmPathResolver.resolveNpmExecutable());
+					new NpmFormatterStepLocations(
+							projectDir,
+							buildDir,
+							npmPathResolver.resolveNpmExecutable(),
+							npmPathResolver.resolveNodeExecutable()));
 			this.buildDir = requireNonNull(buildDir);
 			this.configFile = configFile;
 			this.inlineTsFmtSettings = inlineTsFmtSettings == null ? new TreeMap<>() : new TreeMap<>(inlineTsFmtSettings);
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index 4e33c45ed0..8012102200 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -23,6 +23,7 @@
 import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -524,6 +525,9 @@ public abstract static class NpmStepConfig<T extends NpmStepConfig<?>> {
 		@Nullable
 		protected Object npmFile;
 
+		@Nullable
+		protected Object nodeFile;
+
 		@Nullable
 		protected Object npmrcFile;
 
@@ -543,6 +547,13 @@ public T npmExecutable(final Object npmFile) {
 			return (T) this;
 		}
 
+		@SuppressWarnings("unchecked")
+		public T nodeExecutable(final Object nodeFile) {
+			this.nodeFile = nodeFile;
+			replaceStep();
+			return (T) this;
+		}
+
 		public T npmrc(final Object npmrcFile) {
 			this.npmrcFile = npmrcFile;
 			replaceStep();
@@ -553,6 +564,10 @@ File npmFileOrNull() {
 			return fileOrNull(npmFile);
 		}
 
+		File nodeFileOrNull() {
+			return fileOrNull(nodeFile);
+		}
+
 		File npmrcFileOrNull() {
 			return fileOrNull(npmrcFile);
 		}
@@ -604,7 +619,7 @@ protected FormatterStep createStep() {
 					provisioner(),
 					project.getProjectDir(),
 					project.getBuildDir(),
-					new NpmPathResolver(npmFileOrNull(), npmrcFileOrNull(), project.getProjectDir(), project.getRootDir()),
+					new NpmPathResolver(npmFileOrNull(), nodeFileOrNull(), npmrcFileOrNull(), Arrays.asList(project.getProjectDir(), project.getRootDir())),
 					new com.diffplug.spotless.npm.PrettierConfig(
 							this.prettierConfigFile != null ? project.file(this.prettierConfigFile) : null,
 							this.prettierConfig));
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
index dd476b6a69..e829c2b53a 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
@@ -17,6 +17,7 @@
 
 import static java.util.Objects.requireNonNull;
 
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -107,7 +108,7 @@ public FormatterStep createStep() {
 					provisioner(),
 					project.getProjectDir(),
 					project.getBuildDir(),
-					new NpmPathResolver(npmFileOrNull(), npmrcFileOrNull(), project.getProjectDir(), project.getRootDir()),
+					new NpmPathResolver(npmFileOrNull(), nodeFileOrNull(), npmrcFileOrNull(), Arrays.asList(project.getProjectDir(), project.getRootDir())),
 					eslintConfig());
 		}
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
index 0824caa769..2283afccff 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
@@ -17,6 +17,7 @@
 
 import static java.util.Objects.requireNonNull;
 
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Objects;
@@ -116,7 +117,7 @@ public FormatterStep createStep() {
 					provisioner(),
 					project.getProjectDir(),
 					project.getBuildDir(),
-					new NpmPathResolver(npmFileOrNull(), npmrcFileOrNull(), project.getProjectDir(), project.getRootDir()),
+					new NpmPathResolver(npmFileOrNull(), nodeFileOrNull(), npmrcFileOrNull(), Arrays.asList(project.getProjectDir(), project.getRootDir())),
 					typedConfigFile(),
 					config);
 		}
@@ -212,7 +213,7 @@ public FormatterStep createStep() {
 					provisioner(),
 					project.getProjectDir(),
 					project.getBuildDir(),
-					new NpmPathResolver(npmFileOrNull(), npmrcFileOrNull(), project.getProjectDir(), project.getRootDir()),
+					new NpmPathResolver(npmFileOrNull(), nodeFileOrNull(), npmrcFileOrNull(), Arrays.asList(project.getProjectDir(), project.getRootDir())),
 					eslintConfig());
 		}
 
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
new file mode 100644
index 0000000000..93bc4b699b
--- /dev/null
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2016-2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.gradle.spotless;
+
+import org.assertj.core.api.Assertions;
+import org.gradle.testkit.runner.BuildResult;
+import org.junit.jupiter.api.Test;
+
+class NpmTestsWithoutNpmInstallationTest extends GradleIntegrationHarness {
+
+	@Test
+	void useNodeFromNodeGradlePlugin() throws Exception {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"    id 'com.github.node-gradle.node' version '3.5.1'",
+				"}",
+				"repositories { mavenCentral() }",
+				"node {",
+				"    download = true",
+				"    version = '18.13.0'",
+				"    npmVersion = '8.19.2'",
+				"    workDir = file(\"${buildDir}/nodejs\")",
+				"    npmWorkDir = file(\"${buildDir}/npm\")",
+				"}",
+				"def prettierConfig = [:]",
+				"prettierConfig['printWidth'] = 50",
+				"prettierConfig['parser'] = 'typescript'",
+				"spotless {",
+				"    format 'mytypescript', {",
+				"        target 'test.ts'",
+				"        prettier()",
+				"            .npmExecutable(\"${tasks.named('npmSetup').get().npmDir.get()}/bin/npm\")",
+				"            .nodeExecutable(\"${tasks.named('nodeSetup').get().nodeDir.get()}/bin/node\")",
+				"            .config(prettierConfig)",
+				"    }",
+				"}");
+		setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
+		// make sure node binary is there
+		gradleRunner().withArguments("nodeSetup", "npmSetup").build();
+		// then run spotless using that node installation
+		final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+		Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile.clean");
+	}
+}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/npm/AbstractNpmFormatterStepFactory.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/npm/AbstractNpmFormatterStepFactory.java
index 5467f4c3bc..e4a052106a 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/npm/AbstractNpmFormatterStepFactory.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/npm/AbstractNpmFormatterStepFactory.java
@@ -18,6 +18,7 @@
 import java.io.File;
 import java.util.AbstractMap;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Properties;
@@ -34,6 +35,9 @@ public abstract class AbstractNpmFormatterStepFactory implements FormatterStepFa
 	@Parameter
 	private String npmExecutable;
 
+	@Parameter
+	private String nodeExecutable;
+
 	@Parameter
 	private String npmrc;
 
@@ -42,6 +46,11 @@ protected File npm(FormatterStepConfig stepConfig) {
 		return npm;
 	}
 
+	protected File node(FormatterStepConfig stepConfig) {
+		File node = nodeExecutable != null ? stepConfig.getFileLocator().locateFile(nodeExecutable) : null;
+		return node;
+	}
+
 	protected File npmrc(FormatterStepConfig stepConfig) {
 		File npmrc = this.npmrc != null ? stepConfig.getFileLocator().locateFile(this.npmrc) : null;
 		return npmrc;
@@ -56,7 +65,7 @@ protected File baseDir(FormatterStepConfig stepConfig) {
 	}
 
 	protected NpmPathResolver npmPathResolver(FormatterStepConfig stepConfig) {
-		return new NpmPathResolver(npm(stepConfig), npmrc(stepConfig), baseDir(stepConfig));
+		return new NpmPathResolver(npm(stepConfig), node(stepConfig), npmrc(stepConfig), Collections.singletonList(baseDir(stepConfig)));
 	}
 
 	protected boolean moreThanOneNonNull(Object... objects) {
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/NpmFormatterStepCommonTests.java b/testlib/src/test/java/com/diffplug/spotless/npm/NpmFormatterStepCommonTests.java
index dff105108a..60dd42801a 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/NpmFormatterStepCommonTests.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/NpmFormatterStepCommonTests.java
@@ -17,17 +17,22 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Collections;
 
 import com.diffplug.spotless.ResourceHarness;
 
 public abstract class NpmFormatterStepCommonTests extends ResourceHarness {
 
 	protected NpmPathResolver npmPathResolver() {
-		return new NpmPathResolver(npmExecutable(), npmrc());
+		return new NpmPathResolver(npmExecutable(), nodeExecutable(), npmrc(), Collections.emptyList());
 	}
 
 	private File npmExecutable() {
-		return NpmExecutableResolver.tryFind().orElseThrow(() -> new IllegalStateException("cannot detect node binary"));
+		return NpmExecutableResolver.tryFind().orElseThrow(() -> new IllegalStateException("cannot detect npm binary"));
+	}
+
+	private File nodeExecutable() {
+		return NodeExecutableResolver.tryFindNextTo(npmExecutable()).orElseThrow(() -> new IllegalStateException("cannot detect node binary"));
 	}
 
 	private File npmrc() {

From f4f8da7a259fbe55fdb66fc97b31f6d55c47a266 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 17 Jan 2023 13:11:59 +0100
Subject: [PATCH 0628/2068] add test for supplying only npm when binary

---
 .../NpmTestsWithoutNpmInstallationTest.java   | 42 +++++++++++++++++--
 1 file changed, 39 insertions(+), 3 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
index 93bc4b699b..621d953868 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
@@ -22,7 +22,7 @@
 class NpmTestsWithoutNpmInstallationTest extends GradleIntegrationHarness {
 
 	@Test
-	void useNodeFromNodeGradlePlugin() throws Exception {
+	void useNodeAndNpmFromNodeGradlePlugin() throws Exception {
 		setFile("build.gradle").toLines(
 				"plugins {",
 				"    id 'com.diffplug.spotless'",
@@ -39,12 +39,48 @@ void useNodeFromNodeGradlePlugin() throws Exception {
 				"def prettierConfig = [:]",
 				"prettierConfig['printWidth'] = 50",
 				"prettierConfig['parser'] = 'typescript'",
+				"def npmExecExtension = System.getProperty('os.name').toLowerCase().contains('windows') ? '.cmd' : ''",
+				"def nodeExecExtension = System.getProperty('os.name').toLowerCase().contains('windows') ? '.exe' : ''",
 				"spotless {",
 				"    format 'mytypescript', {",
 				"        target 'test.ts'",
 				"        prettier()",
-				"            .npmExecutable(\"${tasks.named('npmSetup').get().npmDir.get()}/bin/npm\")",
-				"            .nodeExecutable(\"${tasks.named('nodeSetup').get().nodeDir.get()}/bin/node\")",
+				"            .npmExecutable(\"${tasks.named('npmSetup').get().npmDir.get()}/bin/npm${npmExecExtension}\")",
+				"            .nodeExecutable(\"${tasks.named('nodeSetup').get().nodeDir.get()}/bin/node${nodeExecExtension}\")",
+				"            .config(prettierConfig)",
+				"    }",
+				"}");
+		setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
+		// make sure node binary is there
+		gradleRunner().withArguments("nodeSetup", "npmSetup").build();
+		// then run spotless using that node installation
+		final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+		Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile.clean");
+	}
+
+	@Test
+	void useNpmFromNodeGradlePlugin() throws Exception {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"    id 'com.github.node-gradle.node' version '3.5.1'",
+				"}",
+				"repositories { mavenCentral() }",
+				"node {",
+				"    download = true",
+				"    version = '18.13.0'",
+				"    workDir = file(\"${buildDir}/nodejs\")",
+				"}",
+				"def prettierConfig = [:]",
+				"prettierConfig['printWidth'] = 50",
+				"prettierConfig['parser'] = 'typescript'",
+				"def npmExecExtension = System.getProperty('os.name').toLowerCase().contains('windows') ? '.cmd' : ''",
+				"spotless {",
+				"    format 'mytypescript', {",
+				"        target 'test.ts'",
+				"        prettier()",
+				"            .npmExecutable(\"${tasks.named('npmSetup').get().npmDir.get()}/bin/npm${npmExecExtension}\")",
 				"            .config(prettierConfig)",
 				"    }",
 				"}");

From 27f9919da7cc5079cfb2823d6c65484c6e542bb9 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 17 Jan 2023 19:51:54 +0100
Subject: [PATCH 0629/2068] also allow to configure node executable only

---
 .../spotless/npm/NodeExecutableResolver.java  |  5 +++
 .../spotless/npm/NpmPathResolver.java         | 41 ++++++++++++++++---
 .../NpmTestsWithoutNpmInstallationTest.java   | 34 +++++++++++++++
 3 files changed, 74 insertions(+), 6 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NodeExecutableResolver.java b/lib/src/main/java/com/diffplug/spotless/npm/NodeExecutableResolver.java
index c9e04da620..eb30ae78b8 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NodeExecutableResolver.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NodeExecutableResolver.java
@@ -42,4 +42,9 @@ static Optional<File> tryFindNextTo(File npmExecutable) {
 		}
 		return Optional.empty();
 	}
+
+	public static String explainMessage() {
+		return "Spotless was unable to find a node executable.\n" +
+				"Either specify the node executable explicitly or make sure it can be found next to the npm executable.";
+	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmPathResolver.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmPathResolver.java
index d18146188d..4759d2f914 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmPathResolver.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmPathResolver.java
@@ -38,16 +38,45 @@ public NpmPathResolver(File explicitNpmExecutable, File explicitNodeExecutable,
 		this.additionalNpmrcLocations = Collections.unmodifiableList(new ArrayList<>(additionalNpmrcLocations));
 	}
 
+	/**
+	 * Finds the npm executable to use.
+	 * <br>
+	 * Either the explicit npm executable is returned, or - if an explicit node executable is configured - tries to find
+	 * the npm executable relative to the node executable.
+	 * Falls back to looking for npm on the user's system using {@link NpmExecutableResolver}
+	 *
+	 * @return the npm executable to use
+	 * @throws IllegalStateException if no npm executable could be found
+	 */
 	public File resolveNpmExecutable() {
-		return Optional.ofNullable(this.explicitNpmExecutable)
-				.orElseGet(() -> NpmExecutableResolver.tryFind()
-						.orElseThrow(() -> new IllegalStateException("Can't automatically determine npm executable and none was specifically supplied!\n\n" + NpmExecutableResolver.explainMessage())));
+		if (this.explicitNpmExecutable != null) {
+			return this.explicitNpmExecutable;
+		}
+		if (this.explicitNodeExecutable != null) {
+			File nodeExecutableCandidate = new File(this.explicitNodeExecutable.getParentFile(), NpmExecutableResolver.npmExecutableName());
+			if (nodeExecutableCandidate.canExecute()) {
+				return nodeExecutableCandidate;
+			}
+		}
+		return NpmExecutableResolver.tryFind()
+				.orElseThrow(() -> new IllegalStateException("Can't automatically determine npm executable and none was specifically supplied!\n\n" + NpmExecutableResolver.explainMessage()));
 	}
 
+	/**
+	 * Finds the node executable to use.
+	 * <br>
+	 * Either the explicit node executable is returned, or tries to find the node executable relative to the npm executable
+	 * found by {@link #resolveNpmExecutable()}.
+	 * @return the node executable to use
+	 * @throws IllegalStateException if no node executable could be found
+	 */
 	public File resolveNodeExecutable() {
-		return Optional.ofNullable(this.explicitNodeExecutable)
-				.orElseGet(() -> NodeExecutableResolver.tryFindNextTo(resolveNpmExecutable())
-						.orElseThrow(() -> new IllegalStateException("Can't automatically determine node executable and none was specifically supplied!\n\n" + NpmExecutableResolver.explainMessage())));
+		if (this.explicitNodeExecutable != null) {
+			return this.explicitNodeExecutable;
+		}
+		File npmExecutable = resolveNpmExecutable();
+		return NodeExecutableResolver.tryFindNextTo(npmExecutable)
+				.orElseThrow(() -> new IllegalStateException("Can't automatically determine node executable and none was specifically supplied!\n\n" + NodeExecutableResolver.explainMessage()));
 	}
 
 	public String resolveNpmrcContent() {
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
index 621d953868..8147c79228 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
@@ -92,4 +92,38 @@ void useNpmFromNodeGradlePlugin() throws Exception {
 		Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
 		assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile.clean");
 	}
+
+	@Test
+	void useNpmNextToConfiguredNodePluginFromNodeGradlePlugin() throws Exception {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"    id 'com.github.node-gradle.node' version '3.5.1'",
+				"}",
+				"repositories { mavenCentral() }",
+				"node {",
+				"    download = true",
+				"    version = '18.13.0'",
+				"    workDir = file(\"${buildDir}/nodejs\")",
+				"}",
+				"def prettierConfig = [:]",
+				"prettierConfig['printWidth'] = 50",
+				"prettierConfig['parser'] = 'typescript'",
+				"def nodeExecExtension = System.getProperty('os.name').toLowerCase().contains('windows') ? '.exe' : ''",
+				"spotless {",
+				"    format 'mytypescript', {",
+				"        target 'test.ts'",
+				"        prettier()",
+				"            .nodeExecutable(\"${tasks.named('nodeSetup').get().nodeDir.get()}/bin/node${nodeExecExtension}\")",
+				"            .config(prettierConfig)",
+				"    }",
+				"}");
+		setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
+		// make sure node binary is there
+		gradleRunner().withArguments("nodeSetup", "npmSetup").build();
+		// then run spotless using that node installation
+		final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+		Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile.clean");
+	}
 }

From a96d92c0f524f71fc73476ffed6ab8f6b0425308 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 17 Jan 2023 20:46:32 +0100
Subject: [PATCH 0630/2068] add tests that verifies issue #1499

---
 .../NpmTestsWithoutNpmInstallationTest.java   | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
index 8147c79228..d5c4e8f092 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
@@ -17,6 +17,7 @@
 
 import org.assertj.core.api.Assertions;
 import org.gradle.testkit.runner.BuildResult;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 class NpmTestsWithoutNpmInstallationTest extends GradleIntegrationHarness {
@@ -59,6 +60,46 @@ void useNodeAndNpmFromNodeGradlePlugin() throws Exception {
 		assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile.clean");
 	}
 
+	@Test
+	@Disabled("This test is disabled because we currently don't support using npm/node installed by the" +
+			"node-gradle-plugin as the installation takes place in the *execution* phase, but spotless needs it in the *configuration* phase.")
+	void useNodeAndNpmFromNodeGradlePluginInOneSweep() throws Exception {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"    id 'com.github.node-gradle.node' version '3.5.1'",
+				"}",
+				"repositories { mavenCentral() }",
+				"node {",
+				"    download = true",
+				"    version = '18.13.0'",
+				"    npmVersion = '8.19.2'",
+				"    workDir = file(\"${buildDir}/nodejs\")",
+				"    npmWorkDir = file(\"${buildDir}/npm\")",
+				"}",
+				"def prettierConfig = [:]",
+				"prettierConfig['printWidth'] = 50",
+				"prettierConfig['parser'] = 'typescript'",
+				"def npmExecExtension = System.getProperty('os.name').toLowerCase().contains('windows') ? '.cmd' : ''",
+				"def nodeExecExtension = System.getProperty('os.name').toLowerCase().contains('windows') ? '.exe' : ''",
+				"spotless {",
+				"    format 'mytypescript', {",
+				"        target 'test.ts'",
+				"        prettier()",
+				"            .npmExecutable(\"${tasks.named('npmSetup').get().npmDir.get()}/bin/npm${npmExecExtension}\")",
+				"            .nodeExecutable(\"${tasks.named('nodeSetup').get().nodeDir.get()}/bin/node${nodeExecExtension}\")",
+				"            .config(prettierConfig)",
+				"    }",
+				"}",
+				"tasks.named('spotlessMytypescript').configure {",
+				"    it.dependsOn('nodeSetup', 'npmSetup')",
+				"}");
+		setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
+		final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+		Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile.clean");
+	}
+
 	@Test
 	void useNpmFromNodeGradlePlugin() throws Exception {
 		setFile("build.gradle").toLines(

From b9437cd78b16d4ef2aeee942bc8d7b6f367068ef Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Wed, 18 Jan 2023 13:02:15 +0100
Subject: [PATCH 0631/2068] add maven test to verify dynamically installed npm
 works

---
 .../maven/MavenIntegrationHarness.java        | 27 +++++---
 .../maven/MultiModuleProjectTest.java         |  2 +-
 .../spotless/maven/SpotlessCheckMojoTest.java |  1 +
 .../incremental/UpToDateCheckingTest.java     |  3 +-
 .../maven/npm/NpmFrontendMavenPlugin.java     | 66 +++++++++++++++++++
 ...namicallyInstalledNpmInstallationTest.java | 48 ++++++++++++++
 .../src/test/resources/pom-test.xml.mustache  |  1 +
 7 files changed, 137 insertions(+), 11 deletions(-)
 create mode 100644 plugin-maven/src/test/java/com/diffplug/spotless/maven/npm/NpmFrontendMavenPlugin.java
 create mode 100644 plugin-maven/src/test/java/com/diffplug/spotless/maven/npm/NpmTestsWithDynamicallyInstalledNpmInstallationTest.java

diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
index 5a724408c8..f4e94e573c 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
@@ -59,6 +59,7 @@ public class MavenIntegrationHarness extends ResourceHarness {
 	private static final String EXECUTIONS = "executions";
 	private static final String MODULES = "modules";
 	private static final String DEPENDENCIES = "dependencies";
+	private static final String PLUGINS = "plugins";
 	private static final String MODULE_NAME = "name";
 	private static final int REMOTE_DEBUG_PORT = 5005;
 
@@ -151,6 +152,10 @@ protected void writePomWithPrettierSteps(String includes, String... steps) throw
 		writePom(formats(groupWithSteps("format", including(includes), steps)));
 	}
 
+	protected void writePomWithPrettierSteps(String[] plugins, String includes, String... steps) throws IOException {
+		writePom(null, formats(groupWithSteps("format", including(includes), steps)), null, plugins);
+	}
+
 	protected void writePomWithPomSteps(String... steps) throws IOException {
 		writePom(groupWithSteps("pom", including("pom_test.xml"), steps));
 	}
@@ -168,11 +173,11 @@ protected void writePomWithYamlSteps(String... steps) throws IOException {
 	}
 
 	protected void writePom(String... configuration) throws IOException {
-		writePom(null, configuration, null);
+		writePom(null, configuration, null, null);
 	}
 
-	protected void writePom(String[] executions, String[] configuration, String[] dependencies) throws IOException {
-		String pomXmlContent = createPomXmlContent(null, executions, configuration, dependencies);
+	protected void writePom(String[] executions, String[] configuration, String[] dependencies, String[] plugins) throws IOException {
+		String pomXmlContent = createPomXmlContent(null, executions, configuration, dependencies, plugins);
 		setFile("pom.xml").toContent(pomXmlContent);
 	}
 
@@ -203,17 +208,17 @@ protected MavenRunner mavenRunnerWithRemoteDebug() throws IOException {
 		return mavenRunner().withRemoteDebug(REMOTE_DEBUG_PORT);
 	}
 
-	protected String createPomXmlContent(String pluginVersion, String[] executions, String[] configuration, String[] dependencies) throws IOException {
-		return createPomXmlContent("/pom-test.xml.mustache", pluginVersion, executions, configuration, dependencies);
+	protected String createPomXmlContent(String pluginVersion, String[] executions, String[] configuration, String[] dependencies, String[] plugins) throws IOException {
+		return createPomXmlContent("/pom-test.xml.mustache", pluginVersion, executions, configuration, dependencies, plugins);
 	}
 
-	protected String createPomXmlContent(String pomTemplate, String pluginVersion, String[] executions, String[] configuration, String[] dependencies) throws IOException {
-		Map<String, Object> params = buildPomXmlParams(pluginVersion, executions, configuration, null, dependencies);
+	protected String createPomXmlContent(String pomTemplate, String pluginVersion, String[] executions, String[] configuration, String[] dependencies, String[] plugins) throws IOException {
+		Map<String, Object> params = buildPomXmlParams(pluginVersion, executions, configuration, null, dependencies, plugins);
 		return createPomXmlContent(pomTemplate, params);
 	}
 
 	protected String createPomXmlContent(String pluginVersion, String[] executions, String[] configuration) throws IOException {
-		return createPomXmlContent(pluginVersion, executions, configuration, null);
+		return createPomXmlContent(pluginVersion, executions, configuration, null, null);
 	}
 
 	protected String createPomXmlContent(String pomTemplate, Map<String, Object> params) throws IOException {
@@ -226,7 +231,7 @@ protected String createPomXmlContent(String pomTemplate, Map<String, Object> par
 		}
 	}
 
-	protected static Map<String, Object> buildPomXmlParams(String pluginVersion, String[] executions, String[] configuration, String[] modules, String[] dependencies) {
+	protected static Map<String, Object> buildPomXmlParams(String pluginVersion, String[] executions, String[] configuration, String[] modules, String[] dependencies, String[] plugins) {
 		Map<String, Object> params = new HashMap<>();
 		params.put(SPOTLESS_MAVEN_PLUGIN_VERSION, pluginVersion == null ? getSystemProperty(SPOTLESS_MAVEN_PLUGIN_VERSION) : pluginVersion);
 
@@ -247,6 +252,10 @@ protected static Map<String, Object> buildPomXmlParams(String pluginVersion, Str
 			params.put(DEPENDENCIES, String.join("\n", dependencies));
 		}
 
+		if (plugins != null) {
+			params.put(PLUGINS, String.join("\n", plugins));
+		}
+
 		return params;
 	}
 
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MultiModuleProjectTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MultiModuleProjectTest.java
index ae8378c566..6206affc04 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MultiModuleProjectTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MultiModuleProjectTest.java
@@ -145,7 +145,7 @@ private void createRootPom() throws IOException {
 			modulesList.addAll(subProjects.keySet());
 			String[] modules = modulesList.toArray(new String[0]);
 
-			Map<String, Object> rootPomParams = buildPomXmlParams(null, null, configuration, modules, null);
+			Map<String, Object> rootPomParams = buildPomXmlParams(null, null, configuration, modules, null, null);
 			setFile("pom.xml").toContent(createPomXmlContent("/multi-module/pom-parent.xml.mustache", rootPomParams));
 		}
 
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpotlessCheckMojoTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpotlessCheckMojoTest.java
index 566851c26c..92a78e3923 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpotlessCheckMojoTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpotlessCheckMojoTest.java
@@ -62,6 +62,7 @@ void testSpotlessCheckBindingToVerifyPhase() throws Exception {
 						"    <file>${basedir}/license.txt</file>",
 						"  </licenseHeader>",
 						"</java>"},
+				null,
 				null);
 
 		testSpotlessCheck(UNFORMATTED_FILE, "verify", true);
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/UpToDateCheckingTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/UpToDateCheckingTest.java
index 6afcba7430..0a9fe8f2d4 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/UpToDateCheckingTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/UpToDateCheckingTest.java
@@ -98,7 +98,8 @@ private void writePomWithPluginManagementAndDependency() throws IOException {
 						"    <artifactId>javax.inject</artifactId>",
 						"    <version>1</version>",
 						"  </dependency>",
-						"</dependencies>"}));
+						"</dependencies>"},
+				null));
 	}
 
 	@Test
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/npm/NpmFrontendMavenPlugin.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/npm/NpmFrontendMavenPlugin.java
new file mode 100644
index 0000000000..3d20170fab
--- /dev/null
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/npm/NpmFrontendMavenPlugin.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.npm;
+
+/**
+ * Helper class to configure a maven pom to use frontend-maven-plugin.
+ * @see <a href="https://github.com/eirslett/frontend-maven-plugin">frontend-maven-plugin on github</a>
+ */
+public final class NpmFrontendMavenPlugin {
+
+	public static final String GROUP_ID = "com.github.eirslett";
+	public static final String ARTIFACT_ID = "frontend-maven-plugin";
+	public static final String VERSION = "1.11.3"; // for now, we stick with this version, as it is the last to support maven 3.1 (see pom-test.xml.mustache)
+
+	public static final String GOAL_INSTALL_NODE_AND_NPM = "install-node-and-npm";
+
+	public static final String INSTALL_DIRECTORY = "target";
+
+	private NpmFrontendMavenPlugin() {
+		// prevent instantiation
+	}
+
+	public static String[] pomPluginLines(String nodeVersion, String npmVersion) {
+		return new String[]{
+				"<plugin>",
+				String.format("  <groupId>%s</groupId>", GROUP_ID),
+				String.format("  <artifactId>%s</artifactId>", ARTIFACT_ID),
+				String.format("  <version>%s</version>", VERSION),
+				"  <executions>",
+				"    <execution>",
+				"      <id>install node and npm</id>",
+				"      <goals>",
+				String.format("        <goal>%s</goal>", GOAL_INSTALL_NODE_AND_NPM),
+				"      </goals>",
+				"    </execution>",
+				"  </executions>",
+				"  <configuration>",
+				(nodeVersion != null ? "    <nodeVersion>" + nodeVersion + "</nodeVersion>" : ""),
+				(npmVersion != null ? "     <npmVersion>" + npmVersion + "</npmVersion>" : ""),
+				String.format("    <installDirectory>%s</installDirectory>", INSTALL_DIRECTORY),
+				"  </configuration>",
+				"</plugin>"
+		};
+	}
+
+	public static String installNpmMavenGoal() {
+		return String.format("%s:%s:%s", GROUP_ID, ARTIFACT_ID, GOAL_INSTALL_NODE_AND_NPM);
+	}
+
+	public static String installedNpmPath() {
+		return String.format("%s/node/npm", INSTALL_DIRECTORY);
+	}
+}
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/npm/NpmTestsWithDynamicallyInstalledNpmInstallationTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/npm/NpmTestsWithDynamicallyInstalledNpmInstallationTest.java
new file mode 100644
index 0000000000..78830bf09d
--- /dev/null
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/npm/NpmTestsWithDynamicallyInstalledNpmInstallationTest.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.npm;
+
+import static com.diffplug.spotless.maven.npm.NpmFrontendMavenPlugin.installNpmMavenGoal;
+import static com.diffplug.spotless.maven.npm.NpmFrontendMavenPlugin.installedNpmPath;
+import static com.diffplug.spotless.maven.npm.NpmFrontendMavenPlugin.pomPluginLines;
+
+import org.junit.jupiter.api.Test;
+
+import com.diffplug.spotless.maven.MavenIntegrationHarness;
+
+public class NpmTestsWithDynamicallyInstalledNpmInstallationTest extends MavenIntegrationHarness {
+
+	@Test
+	void useDownloadedNpmInstallation() throws Exception {
+		writePomWithPrettierSteps(
+				pomPluginLines("v18.13.0", null),
+				"src/main/typescript/test.ts",
+				"<prettier>",
+				"    <npmExecutable>" + installedNpmPath() + "</npmExecutable>",
+				"</prettier>");
+
+		String kind = "typescript";
+		String suffix = "ts";
+		String configPath = ".prettierrc.yml";
+		setFile(configPath).toResource("npm/prettier/filetypes/" + kind + "/" + ".prettierrc.yml");
+		String path = "src/main/" + kind + "/test." + suffix;
+		setFile(path).toResource("npm/prettier/filetypes/" + kind + "/" + kind + ".dirty");
+
+		mavenRunner().withArguments(installNpmMavenGoal(), "spotless:apply").runNoError();
+		assertFile(path).sameAsResource("npm/prettier/filetypes/" + kind + "/" + kind + ".clean");
+	}
+
+}
diff --git a/plugin-maven/src/test/resources/pom-test.xml.mustache b/plugin-maven/src/test/resources/pom-test.xml.mustache
index 122f5d9218..6db3cb0c15 100644
--- a/plugin-maven/src/test/resources/pom-test.xml.mustache
+++ b/plugin-maven/src/test/resources/pom-test.xml.mustache
@@ -21,6 +21,7 @@
 
     <build>
         <plugins>
+            {{{plugins}}}
             <plugin>
                 <groupId>com.diffplug.spotless</groupId>
                 <artifactId>spotless-maven-plugin</artifactId>

From 789b9d210a4b1555f0eee41d7e178798ecdd16f1 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Wed, 18 Jan 2023 14:22:13 +0100
Subject: [PATCH 0632/2068] add nodeExecutable configuration to README

---
 plugin-gradle/README.md | 11 ++++++++---
 plugin-maven/README.md  | 10 ++++++++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index f2567a5924..11f7866644 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -844,18 +844,23 @@ spotless {
 ### npm detection
 
 Prettier is based on NodeJS, so a working NodeJS installation (especially npm) is required on the host running spotless.
-Spotless will try to auto-discover an npm installation. If that is not working for you, it is possible to directly configure the npm binary to use.
+Spotless will try to auto-discover an npm installation. If that is not working for you, it is possible to directly configure the npm
+and/or node binary to use.
 
 ```gradle
 spotless {
   format 'javascript', {
-    prettier().npmExecutable('/usr/bin/npm').config(...)
+    prettier().npmExecutable('/usr/bin/npm').nodeExecutable('/usr/bin/node').config(...)
 ```
 
+If you provide both `npmExecutable` and `nodeExecutable`, spotless will use these paths. If you specify only one of the
+two, spotless will assume the other one is in the same directory.
+
 ### `.npmrc` detection
 
 Spotless picks up npm configuration stored in a `.npmrc` file either in the project directory or in your user home.
-Alternatively you can supply spotless with a location of the `.npmrc` file to use. (This can be combined with `npmExecutable`, of course.)
+Alternatively you can supply spotless with a location of the `.npmrc` file to use. (This can be combined with
+`npmExecutable` and `nodeExecutable`, of course.)
 
 ```gradle
 spotless {
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 2a455dfe07..dc3795927a 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -1050,17 +1050,23 @@ Since spotless uses the actual npm prettier package behind the scenes, it is pos
 ### npm detection
 
 Prettier is based on NodeJS, so to use it, a working NodeJS installation (especially npm) is required on the host running spotless.
-Spotless will try to auto-discover an npm installation. If that is not working for you, it is possible to directly configure the npm binary to use.
+Spotless will try to auto-discover an npm installation. If that is not working for you, it is possible to directly configure the npm
+and/or node binary to use.
 
 ```xml
 <prettier>
   <npmExecutable>/usr/bin/npm</npmExecutable>
+  <nodeExecutable>/usr/bin/node</nodeExecutable>
 ```
 
+If you provide both `npmExecutable` and `nodeExecutable`, spotless will use these paths. If you specify only one of the
+two, spotless will assume the other one is in the same directory.
+
 ### `.npmrc` detection
 
 Spotless picks up npm configuration stored in a `.npmrc` file either in the project directory or in your user home.
-Alternatively you can supply spotless with a location of the `.npmrc` file to use. (This can be combined with `npmExecutable`, of course.)
+Alternatively you can supply spotless with a location of the `.npmrc` file to use. (This can be combined with
+`npmExecutable` and `nodeExecutable`, of course.)
 
 ```xml
 <prettier>

From a9c79aee0929dc15ac1683cf64831d85f589e7d9 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Wed, 18 Jan 2023 14:31:57 +0100
Subject: [PATCH 0633/2068] add `nodeExecutable` to changes.md

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 1 +
 plugin-maven/CHANGES.md  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 60c723f62d..dee5bb6175 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * `ProcessRunner` has added some convenience methods so it can be used for maven testing. ([#1496](https://github.com/diffplug/spotless/pull/1496))
+* Allow to specify node executable for node-based formatters using `nodeExecutable` parameter ([#1500](https://github.com/diffplug/spotless/pull/1500))
 ### Fixed
 * The default list of type annotations used by `formatAnnotations` has had 8 more annotations from the Checker Framework added [#1494](https://github.com/diffplug/spotless/pull/1494)
 ### Changes
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 63e5b43d74..58142c6755 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -4,6 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
+* Allow to specify node executable for node-based formatters using `nodeExecutable` parameter ([#1500](https://github.com/diffplug/spotless/pull/1500))
 ### Fixed
 * The default list of type annotations used by `formatAnnotations` has had 8 more annotations from the Checker Framework added [#1494](https://github.com/diffplug/spotless/pull/1494)
 ### Changes
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 1bb49898f1..d93893f35b 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -4,6 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
+* Allow to specify node executable for node-based formatters using `nodeExecutable` parameter ([#1500](https://github.com/diffplug/spotless/pull/1500))
 ### Fixed
 * The default list of type annotations used by `formatAnnotations` has had 8 more annotations from the Checker Framework added [#1494](https://github.com/diffplug/spotless/pull/1494)
 ### Changes

From 6b9b870c8754c4af9967ea094b1049f4dc941d25 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Wed, 18 Jan 2023 23:08:33 +0400
Subject: [PATCH 0634/2068] Rely on generic JsonNode

---
 .../spotless/glue/yaml/JacksonYamlFormatterFunc.java         | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/JacksonYamlFormatterFunc.java b/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/JacksonYamlFormatterFunc.java
index edb350c559..ae6b85530b 100644
--- a/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/JacksonYamlFormatterFunc.java
+++ b/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/JacksonYamlFormatterFunc.java
@@ -22,6 +22,7 @@
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ContainerNode;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
@@ -60,13 +61,11 @@ protected JsonFactory makeJsonFactory() {
 
 	@Override
 	protected String format(ObjectMapper objectMapper, String input) throws IllegalArgumentException, IOException {
-		//if (true)
-		//	throw new IllegalArgumentException("input = \r\n" + input);
 		try {
 			// https://stackoverflow.com/questions/25222327/deserialize-pojos-from-multiple-yaml-documents-in-a-single-file-in-jackson
 			// https://github.com/FasterXML/jackson-dataformats-text/issues/66#issuecomment-375328648
 			JsonParser yamlParser = objectMapper.getFactory().createParser(input);
-			List<ContainerNode> documents = objectMapper.readValues(yamlParser, ContainerNode.class).readAll();
+			List<JsonNode> documents = objectMapper.readValues(yamlParser, JsonNode.class).readAll();
 
 			// https://github.com/FasterXML/jackson-dataformats-text/issues/66#issuecomment-554265055
 			// https://github.com/FasterXML/jackson-dataformats-text/issues/66#issuecomment-554265055

From 6b6e854e19b0969d23918ae9bd9ec705f25fc46d Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Wed, 18 Jan 2023 23:20:27 +0400
Subject: [PATCH 0635/2068] Fix style

---
 .../diffplug/spotless/glue/yaml/JacksonYamlFormatterFunc.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/JacksonYamlFormatterFunc.java b/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/JacksonYamlFormatterFunc.java
index ae6b85530b..89304d8d0a 100644
--- a/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/JacksonYamlFormatterFunc.java
+++ b/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/JacksonYamlFormatterFunc.java
@@ -24,7 +24,6 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ContainerNode;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactoryBuilder;
 import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator;

From e8f0d2d27bb542987b8cc97b7a4c2b5a04880306 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Wed, 18 Jan 2023 19:59:56 +0100
Subject: [PATCH 0636/2068] try fix windows build: set binary name for win

---
 .../spotless/GradleIntegrationHarness.java    |  47 ++-
 .../NpmTestsWithoutNpmInstallationTest.java   | 284 ++++++++++--------
 .../maven/npm/NpmFrontendMavenPlugin.java     |   2 +-
 3 files changed, 193 insertions(+), 140 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
index 9e2f490429..1763fd088f 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
@@ -21,6 +21,7 @@
 import java.io.IOException;
 import java.util.List;
 import java.util.ListIterator;
+import java.util.function.BiConsumer;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
@@ -117,11 +118,34 @@ protected GradleRunner gradleRunner() throws IOException {
 	}
 
 	/** Dumps the complete file contents of the folder to the console. */
-	protected String getContents() throws IOException {
+	protected String getContents() {
 		return getContents(subPath -> !subPath.startsWith(".gradle"));
 	}
 
-	protected String getContents(Predicate<String> subpathsToInclude) throws IOException {
+	protected String getContents(Predicate<String> subpathsToInclude) {
+		return StringPrinter.buildString(printer -> Errors.rethrow().run(() -> iterateFiles(subpathsToInclude, (subpath, file) -> {
+			printer.println("### " + subpath + " ###");
+			try {
+				printer.println(read(subpath));
+			} catch (IOException e) {
+				throw new RuntimeException(e);
+			}
+		})));
+	}
+
+	/** Dumps the filtered file listing of the folder to the console. */
+	protected String listFiles(Predicate<String> subpathsToInclude) {
+		return StringPrinter.buildString(printer -> iterateFiles(subpathsToInclude, (subPath, file) -> {
+			printer.println(subPath + " [" + getFileAttributes(file) + "]");
+		}));
+	}
+
+	/** Dumps the file listing of the folder to the console. */
+	protected String listFiles() {
+		return listFiles(subPath -> !subPath.startsWith(".gradle"));
+	}
+
+	protected void iterateFiles(Predicate<String> subpathsToInclude, BiConsumer<String, File> consumer) {
 		TreeDef<File> treeDef = TreeDef.forFile(Errors.rethrow());
 		List<File> files = TreeStream.depthFirst(treeDef, rootFolder())
 				.filter(File::isFile)
@@ -129,16 +153,17 @@ protected String getContents(Predicate<String> subpathsToInclude) throws IOExcep
 
 		ListIterator<File> iterator = files.listIterator(files.size());
 		int rootLength = rootFolder().getAbsolutePath().length() + 1;
-		return StringPrinter.buildString(printer -> Errors.rethrow().run(() -> {
-			while (iterator.hasPrevious()) {
-				File file = iterator.previous();
-				String subPath = file.getAbsolutePath().substring(rootLength);
-				if (subpathsToInclude.test(subPath)) {
-					printer.println("### " + subPath + " ###");
-					printer.println(read(subPath));
-				}
+		while (iterator.hasPrevious()) {
+			File file = iterator.previous();
+			String subPath = file.getAbsolutePath().substring(rootLength);
+			if (subpathsToInclude.test(subPath)) {
+				consumer.accept(subPath, file);
 			}
-		}));
+		}
+	}
+
+	protected String getFileAttributes(File file) {
+		return (file.canRead() ? "r" : "-") + (file.canWrite() ? "w" : "-") + (file.canExecute() ? "x" : "-");
 	}
 
 	protected void checkRunsThenUpToDate() throws IOException {
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
index d5c4e8f092..916d853920 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
@@ -20,151 +20,179 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+import com.diffplug.common.base.Predicates;
+
 class NpmTestsWithoutNpmInstallationTest extends GradleIntegrationHarness {
 
 	@Test
 	void useNodeAndNpmFromNodeGradlePlugin() throws Exception {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'com.diffplug.spotless'",
-				"    id 'com.github.node-gradle.node' version '3.5.1'",
-				"}",
-				"repositories { mavenCentral() }",
-				"node {",
-				"    download = true",
-				"    version = '18.13.0'",
-				"    npmVersion = '8.19.2'",
-				"    workDir = file(\"${buildDir}/nodejs\")",
-				"    npmWorkDir = file(\"${buildDir}/npm\")",
-				"}",
-				"def prettierConfig = [:]",
-				"prettierConfig['printWidth'] = 50",
-				"prettierConfig['parser'] = 'typescript'",
-				"def npmExecExtension = System.getProperty('os.name').toLowerCase().contains('windows') ? '.cmd' : ''",
-				"def nodeExecExtension = System.getProperty('os.name').toLowerCase().contains('windows') ? '.exe' : ''",
-				"spotless {",
-				"    format 'mytypescript', {",
-				"        target 'test.ts'",
-				"        prettier()",
-				"            .npmExecutable(\"${tasks.named('npmSetup').get().npmDir.get()}/bin/npm${npmExecExtension}\")",
-				"            .nodeExecutable(\"${tasks.named('nodeSetup').get().nodeDir.get()}/bin/node${nodeExecExtension}\")",
-				"            .config(prettierConfig)",
-				"    }",
-				"}");
-		setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
-		// make sure node binary is there
-		gradleRunner().withArguments("nodeSetup", "npmSetup").build();
-		// then run spotless using that node installation
-		final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
-		Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
-		assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile.clean");
+		try {
+			setFile("build.gradle").toLines(
+					"plugins {",
+					"    id 'com.diffplug.spotless'",
+					"    id 'com.github.node-gradle.node' version '3.5.1'",
+					"}",
+					"repositories { mavenCentral() }",
+					"node {",
+					"    download = true",
+					"    version = '18.13.0'",
+					"    npmVersion = '8.19.2'",
+					"    workDir = file(\"${buildDir}/nodejs\")",
+					"    npmWorkDir = file(\"${buildDir}/npm\")",
+					"}",
+					"def prettierConfig = [:]",
+					"prettierConfig['printWidth'] = 50",
+					"prettierConfig['parser'] = 'typescript'",
+					"def npmExec = System.getProperty('os.name').toLowerCase().contains('windows') ? '/npm.cmd' : '/bin/npm'",
+					"def nodeExec = System.getProperty('os.name').toLowerCase().contains('windows') ? '/node.exe' : '/bin/node'",
+					"spotless {",
+					"    format 'mytypescript', {",
+					"        target 'test.ts'",
+					"        prettier()",
+					"            .npmExecutable(\"${tasks.named('npmSetup').get().npmDir.get()}${npmExec}\")",
+					"            .nodeExecutable(\"${tasks.named('nodeSetup').get().nodeDir.get()}${nodeExec}\")",
+					"            .config(prettierConfig)",
+					"    }",
+					"}");
+			setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
+			// make sure node binary is there
+			gradleRunner().withArguments("nodeSetup", "npmSetup").build();
+			// then run spotless using that node installation
+			final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+			Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+			assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile.clean");
+		} catch (Exception e) {
+			printContents();
+			throw e;
+		}
+	}
+
+	private void printContents() {
+		System.out.println("************* Folder contents **************************");
+		System.out.println(listFiles(Predicates.and(path -> !path.startsWith(".gradle"), path -> !path.contains("/node_modules/"), path -> !path.contains("/include/"))));
+		System.out.println("********************************************************");
 	}
 
 	@Test
 	@Disabled("This test is disabled because we currently don't support using npm/node installed by the" +
 			"node-gradle-plugin as the installation takes place in the *execution* phase, but spotless needs it in the *configuration* phase.")
 	void useNodeAndNpmFromNodeGradlePluginInOneSweep() throws Exception {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'com.diffplug.spotless'",
-				"    id 'com.github.node-gradle.node' version '3.5.1'",
-				"}",
-				"repositories { mavenCentral() }",
-				"node {",
-				"    download = true",
-				"    version = '18.13.0'",
-				"    npmVersion = '8.19.2'",
-				"    workDir = file(\"${buildDir}/nodejs\")",
-				"    npmWorkDir = file(\"${buildDir}/npm\")",
-				"}",
-				"def prettierConfig = [:]",
-				"prettierConfig['printWidth'] = 50",
-				"prettierConfig['parser'] = 'typescript'",
-				"def npmExecExtension = System.getProperty('os.name').toLowerCase().contains('windows') ? '.cmd' : ''",
-				"def nodeExecExtension = System.getProperty('os.name').toLowerCase().contains('windows') ? '.exe' : ''",
-				"spotless {",
-				"    format 'mytypescript', {",
-				"        target 'test.ts'",
-				"        prettier()",
-				"            .npmExecutable(\"${tasks.named('npmSetup').get().npmDir.get()}/bin/npm${npmExecExtension}\")",
-				"            .nodeExecutable(\"${tasks.named('nodeSetup').get().nodeDir.get()}/bin/node${nodeExecExtension}\")",
-				"            .config(prettierConfig)",
-				"    }",
-				"}",
-				"tasks.named('spotlessMytypescript').configure {",
-				"    it.dependsOn('nodeSetup', 'npmSetup')",
-				"}");
-		setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
-		final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
-		Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
-		assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile.clean");
+		try {
+			setFile("build.gradle").toLines(
+					"plugins {",
+					"    id 'com.diffplug.spotless'",
+					"    id 'com.github.node-gradle.node' version '3.5.1'",
+					"}",
+					"repositories { mavenCentral() }",
+					"node {",
+					"    download = true",
+					"    version = '18.13.0'",
+					"    npmVersion = '8.19.2'",
+					"    workDir = file(\"${buildDir}/nodejs\")",
+					"    npmWorkDir = file(\"${buildDir}/npm\")",
+					"}",
+					"def prettierConfig = [:]",
+					"prettierConfig['printWidth'] = 50",
+					"prettierConfig['parser'] = 'typescript'",
+					"def npmExec = System.getProperty('os.name').toLowerCase().contains('windows') ? '/npm.cmd' : '/bin/npm'",
+					"def nodeExec = System.getProperty('os.name').toLowerCase().contains('windows') ? '/node.exe' : '/bin/node'",
+					"spotless {",
+					"    format 'mytypescript', {",
+					"        target 'test.ts'",
+					"        prettier()",
+					"            .npmExecutable(\"${tasks.named('npmSetup').get().npmDir.get()}${npmExec}\")",
+					"            .nodeExecutable(\"${tasks.named('nodeSetup').get().nodeDir.get()}${nodeExec}\")",
+					"            .config(prettierConfig)",
+					"    }",
+					"}",
+					"tasks.named('spotlessMytypescript').configure {",
+					"    it.dependsOn('nodeSetup', 'npmSetup')",
+					"}");
+			setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
+			final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+			Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+			assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile.clean");
+		} catch (Exception e) {
+			printContents();
+			throw e;
+		}
 	}
 
 	@Test
 	void useNpmFromNodeGradlePlugin() throws Exception {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'com.diffplug.spotless'",
-				"    id 'com.github.node-gradle.node' version '3.5.1'",
-				"}",
-				"repositories { mavenCentral() }",
-				"node {",
-				"    download = true",
-				"    version = '18.13.0'",
-				"    workDir = file(\"${buildDir}/nodejs\")",
-				"}",
-				"def prettierConfig = [:]",
-				"prettierConfig['printWidth'] = 50",
-				"prettierConfig['parser'] = 'typescript'",
-				"def npmExecExtension = System.getProperty('os.name').toLowerCase().contains('windows') ? '.cmd' : ''",
-				"spotless {",
-				"    format 'mytypescript', {",
-				"        target 'test.ts'",
-				"        prettier()",
-				"            .npmExecutable(\"${tasks.named('npmSetup').get().npmDir.get()}/bin/npm${npmExecExtension}\")",
-				"            .config(prettierConfig)",
-				"    }",
-				"}");
-		setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
-		// make sure node binary is there
-		gradleRunner().withArguments("nodeSetup", "npmSetup").build();
-		// then run spotless using that node installation
-		final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
-		Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
-		assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile.clean");
+		try {
+			setFile("build.gradle").toLines(
+					"plugins {",
+					"    id 'com.diffplug.spotless'",
+					"    id 'com.github.node-gradle.node' version '3.5.1'",
+					"}",
+					"repositories { mavenCentral() }",
+					"node {",
+					"    download = true",
+					"    version = '18.13.0'",
+					"    workDir = file(\"${buildDir}/nodejs\")",
+					"}",
+					"def prettierConfig = [:]",
+					"prettierConfig['printWidth'] = 50",
+					"prettierConfig['parser'] = 'typescript'",
+					"def npmExec = System.getProperty('os.name').toLowerCase().contains('windows') ? '/npm.cmd' : '/bin/npm'",
+					"spotless {",
+					"    format 'mytypescript', {",
+					"        target 'test.ts'",
+					"        prettier()",
+					"            .npmExecutable(\"${tasks.named('npmSetup').get().npmDir.get()}${npmExec}\")",
+					"            .config(prettierConfig)",
+					"    }",
+					"}");
+			setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
+			// make sure node binary is there
+			gradleRunner().withArguments("nodeSetup", "npmSetup").build();
+			// then run spotless using that node installation
+			final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+			Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+			assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile.clean");
+		} catch (Exception e) {
+			printContents();
+			throw e;
+		}
 	}
 
 	@Test
 	void useNpmNextToConfiguredNodePluginFromNodeGradlePlugin() throws Exception {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'com.diffplug.spotless'",
-				"    id 'com.github.node-gradle.node' version '3.5.1'",
-				"}",
-				"repositories { mavenCentral() }",
-				"node {",
-				"    download = true",
-				"    version = '18.13.0'",
-				"    workDir = file(\"${buildDir}/nodejs\")",
-				"}",
-				"def prettierConfig = [:]",
-				"prettierConfig['printWidth'] = 50",
-				"prettierConfig['parser'] = 'typescript'",
-				"def nodeExecExtension = System.getProperty('os.name').toLowerCase().contains('windows') ? '.exe' : ''",
-				"spotless {",
-				"    format 'mytypescript', {",
-				"        target 'test.ts'",
-				"        prettier()",
-				"            .nodeExecutable(\"${tasks.named('nodeSetup').get().nodeDir.get()}/bin/node${nodeExecExtension}\")",
-				"            .config(prettierConfig)",
-				"    }",
-				"}");
-		setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
-		// make sure node binary is there
-		gradleRunner().withArguments("nodeSetup", "npmSetup").build();
-		// then run spotless using that node installation
-		final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
-		Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
-		assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile.clean");
+		try {
+			setFile("build.gradle").toLines(
+					"plugins {",
+					"    id 'com.diffplug.spotless'",
+					"    id 'com.github.node-gradle.node' version '3.5.1'",
+					"}",
+					"repositories { mavenCentral() }",
+					"node {",
+					"    download = true",
+					"    version = '18.13.0'",
+					"    workDir = file(\"${buildDir}/nodejs\")",
+					"}",
+					"def prettierConfig = [:]",
+					"prettierConfig['printWidth'] = 50",
+					"prettierConfig['parser'] = 'typescript'",
+					"def nodeExec = System.getProperty('os.name').toLowerCase().contains('windows') ? '/node.exe' : '/bin/node'",
+					"spotless {",
+					"    format 'mytypescript', {",
+					"        target 'test.ts'",
+					"        prettier()",
+					"            .nodeExecutable(\"${tasks.named('nodeSetup').get().nodeDir.get()}${nodeExec}\")",
+					"            .config(prettierConfig)",
+					"    }",
+					"}");
+			setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
+			// make sure node binary is there
+			gradleRunner().withArguments("nodeSetup", "npmSetup").build();
+			// then run spotless using that node installation
+			final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+			Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+			assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile.clean");
+		} catch (Exception e) {
+			printContents();
+			throw e;
+		}
 	}
 }
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/npm/NpmFrontendMavenPlugin.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/npm/NpmFrontendMavenPlugin.java
index 3d20170fab..de030ab81c 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/npm/NpmFrontendMavenPlugin.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/npm/NpmFrontendMavenPlugin.java
@@ -61,6 +61,6 @@ public static String installNpmMavenGoal() {
 	}
 
 	public static String installedNpmPath() {
-		return String.format("%s/node/npm", INSTALL_DIRECTORY);
+		return String.format("%s/node/npm%s", INSTALL_DIRECTORY, System.getProperty("os.name").toLowerCase().contains("win") ? ".cmd" : "");
 	}
 }

From 5315110b4b42dbc4c105ce06d0cf153965877cc3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 19 Jan 2023 14:20:10 +0000
Subject: [PATCH 0637/2068] chore(deps): update plugin org.gradle.test-retry to
 v1.5.1

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 57498bf23f..fb9e7dcf0b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,7 +12,7 @@ pluginManagement {
 		// https://github.com/diffplug/goomph/blob/main/CHANGES.md
 		id 'com.diffplug.p2.asmaven'               version '3.27.0' // DO NOT UPDATE, see https://github.com/diffplug/spotless/pull/874
 		// https://github.com/gradle/test-retry-gradle-plugin/releases
-		id 'org.gradle.test-retry'                 version '1.5.0'
+		id 'org.gradle.test-retry'                 version '1.5.1'
 		// https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md
 		id 'com.adarshr.test-logger'               version '3.2.0'
 		// https://github.com/davidburstrom/version-compatibility-gradle-plugin/tags

From fed3ffc811da37a30921aa9835627e8ca377c2e2 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Thu, 19 Jan 2023 19:42:01 +0400
Subject: [PATCH 0638/2068] First commit to discuss the idea

---
 .../spotless/maven/ImpactedFilesTracker.java  | 24 +++++++++++++++++++
 .../spotless/maven/SpotlessApplyMojo.java     |  8 +++++++
 2 files changed, 32 insertions(+)
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/ImpactedFilesTracker.java

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/ImpactedFilesTracker.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/ImpactedFilesTracker.java
new file mode 100644
index 0000000000..6019591e09
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/ImpactedFilesTracker.java
@@ -0,0 +1,24 @@
+package com.diffplug.spotless.maven;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class ImpactedFilesTracker {
+	protected final AtomicInteger nbChecked = new AtomicInteger();
+	protected final AtomicInteger nbCleaned = new AtomicInteger();
+
+	public void checked() {
+		nbChecked.incrementAndGet();
+	}
+
+	public int getChecked() {
+		return nbChecked.get();
+	}
+
+	public void cleaned() {
+		nbCleaned.incrementAndGet();
+	}
+
+	public int getCleaned() {
+		return nbCleaned.get();
+	}
+}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
index 7a15d01b17..b617505826 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
@@ -33,6 +33,8 @@ public class SpotlessApplyMojo extends AbstractSpotlessMojo {
 
 	@Override
 	protected void process(Iterable<File> files, Formatter formatter, UpToDateChecker upToDateChecker) throws MojoExecutionException {
+		ImpactedFilesTracker impactedFilesTracker = new ImpactedFilesTracker();
+
 		for (File file : files) {
 			if (upToDateChecker.isUpToDate(file.toPath())) {
 				if (getLog().isDebugEnabled()) {
@@ -42,10 +44,13 @@ protected void process(Iterable<File> files, Formatter formatter, UpToDateChecke
 			}
 
 			try {
+				impactedFilesTracker.checked();
 				PaddedCell.DirtyState dirtyState = PaddedCell.calculateDirtyState(formatter, file);
 				if (!dirtyState.isClean() && !dirtyState.didNotConverge()) {
+					getLog().info(String.format("Writing clean file: %s", file));
 					dirtyState.writeCanonicalTo(file);
 					buildContext.refresh(file);
+					impactedFilesTracker.cleaned();
 				}
 			} catch (IOException e) {
 				throw new MojoExecutionException("Unable to format file " + file, e);
@@ -53,5 +58,8 @@ protected void process(Iterable<File> files, Formatter formatter, UpToDateChecke
 
 			upToDateChecker.setUpToDate(file.toPath());
 		}
+
+		// We print the number of considered files which is useful when ratchetFrom is setup
+		getLog().info(String.format("A formatter with %s steps cleaned: %s files (for %s considered)", formatter.getSteps().size(), impactedFilesTracker.getCleaned(), impactedFilesTracker.getChecked()));
 	}
 }

From 00e6282d2cab0c067614e3b2cd5138c47ee54bb1 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 19 Jan 2023 10:19:25 -0800
Subject: [PATCH 0639/2068] Add the Jackson steps to the root README.md

---
 README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 637781d894..0743b69427 100644
--- a/README.md
+++ b/README.md
@@ -63,6 +63,7 @@ lib('java.RemoveUnusedImportsStep')              +'{{yes}}       | {{yes}}
 extra('java.EclipseJdtFormatterStep')            +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
 lib('java.FormatAnnotationsStep')                +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('json.gson.GsonStep')                        +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
+lib('json.JacksonJsonStep')                      +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('json.JsonSimpleStep')                       +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('kotlin.KtLintStep')                         +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
 lib('kotlin.KtfmtStep')                          +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
@@ -77,7 +78,7 @@ lib('python.BlackStep')                          +'{{yes}}       | {{no}}
 lib('scala.ScalaFmtStep')                        +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
 lib('sql.DBeaverSQLFormatterStep')               +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
 extra('wtp.EclipseWtpFormatterStep')             +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
-lib('yaml.YamlJacksonStep')                      +'{{no}}        | {{yes}}      | {{no}}      | {{no}}  |',
+lib('yaml.JacksonYamlStep')                      +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 '| [(Your FormatterStep here)](CONTRIBUTING.md#how-to-add-a-new-formatterstep) | {{no}} | {{no}} | {{no}} | {{no}} |',
 ].join('\n');
 -->
@@ -109,6 +110,7 @@ lib('yaml.YamlJacksonStep')                      +'{{no}}        | {{yes}}
 | [`java.EclipseJdtFormatterStep`](lib-extra/src/main/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`java.FormatAnnotationsStep`](lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`json.gson.GsonStep`](lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
+| [`json.JacksonJsonStep`](lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`json.JsonSimpleStep`](lib/src/main/java/com/diffplug/spotless/json/JsonSimpleStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`kotlin.KtLintStep`](lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`kotlin.KtfmtStep`](lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
@@ -123,7 +125,7 @@ lib('yaml.YamlJacksonStep')                      +'{{no}}        | {{yes}}
 | [`scala.ScalaFmtStep`](lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`sql.DBeaverSQLFormatterStep`](lib/src/main/java/com/diffplug/spotless/sql/DBeaverSQLFormatterStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`wtp.EclipseWtpFormatterStep`](lib-extra/src/main/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
-| [`yaml.YamlJacksonStep`](lib/src/main/java/com/diffplug/spotless/yaml/YamlJacksonStep.java) | :white_large_square:        | :+1:      | :white_large_square:      | :white_large_square:  |
+| [`yaml.JacksonYamlStep`](lib/src/main/java/com/diffplug/spotless/yaml/JacksonYamlStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [(Your FormatterStep here)](CONTRIBUTING.md#how-to-add-a-new-formatterstep) | :white_large_square: | :white_large_square: | :white_large_square: | :white_large_square: |
 <!---freshmark /matrix -->
 

From 10f04deb64ca671d8cc448665243dd74337e2ff3 Mon Sep 17 00:00:00 2001
From: Abel Keszei <keszeiabel@gmail.com>
Date: Thu, 19 Jan 2023 22:06:16 +0100
Subject: [PATCH 0640/2068] move gson formatter to custom compile sourceset

---
 lib/build.gradle                              |  5 +-
 .../spotless/glue/gson/GsonFormatterFunc.java | 77 ++++++++++++++++++
 .../json/gson/GsonBuilderWrapper.java         | 54 -------------
 .../spotless/json/gson/GsonConfig.java        | 51 ++++++++++++
 .../diffplug/spotless/json/gson/GsonStep.java | 78 ++++---------------
 .../spotless/json/gson/GsonWrapper.java       | 41 ----------
 .../spotless/json/gson/GsonWrapperBase.java   | 71 -----------------
 .../json/gson/JsonElementWrapper.java         | 40 ----------
 .../spotless/json/gson/JsonObjectWrapper.java | 56 -------------
 .../spotless/json/gson/JsonWriterWrapper.java | 48 ------------
 .../gradle/spotless/JsonExtension.java        | 21 ++---
 .../diffplug/spotless/maven/json/Gson.java    |  6 +-
 12 files changed, 161 insertions(+), 387 deletions(-)
 create mode 100644 lib/src/gson/java/com/diffplug/spotless/glue/gson/GsonFormatterFunc.java
 delete mode 100644 lib/src/main/java/com/diffplug/spotless/json/gson/GsonBuilderWrapper.java
 create mode 100644 lib/src/main/java/com/diffplug/spotless/json/gson/GsonConfig.java
 delete mode 100644 lib/src/main/java/com/diffplug/spotless/json/gson/GsonWrapper.java
 delete mode 100644 lib/src/main/java/com/diffplug/spotless/json/gson/GsonWrapperBase.java
 delete mode 100644 lib/src/main/java/com/diffplug/spotless/json/gson/JsonElementWrapper.java
 delete mode 100644 lib/src/main/java/com/diffplug/spotless/json/gson/JsonObjectWrapper.java
 delete mode 100644 lib/src/main/java/com/diffplug/spotless/json/gson/JsonWriterWrapper.java

diff --git a/lib/build.gradle b/lib/build.gradle
index 30c8fe8b15..bb1a389993 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -15,7 +15,8 @@ def NEEDS_GLUE = [
 	'flexmark',
 	'diktat',
 	'scalafmt',
-	'jackson'
+	'jackson',
+	'gson'
 ]
 for (glue in NEEDS_GLUE) {
 	sourceSets.register(glue) {
@@ -108,6 +109,8 @@ dependencies {
 
 	// used for markdown formatting
 	flexmarkCompileOnly 'com.vladsch.flexmark:flexmark-all:0.62.2'
+
+	gsonCompileOnly 'com.google.code.gson:gson:2.10.1'
 }
 
 // we'll hold the core lib to a high standard
diff --git a/lib/src/gson/java/com/diffplug/spotless/glue/gson/GsonFormatterFunc.java b/lib/src/gson/java/com/diffplug/spotless/glue/gson/GsonFormatterFunc.java
new file mode 100644
index 0000000000..33db1faaa6
--- /dev/null
+++ b/lib/src/gson/java/com/diffplug/spotless/glue/gson/GsonFormatterFunc.java
@@ -0,0 +1,77 @@
+package com.diffplug.spotless.glue.gson;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.Collections;
+
+import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.ThrowingEx;
+import com.diffplug.spotless.json.gson.GsonConfig;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.stream.JsonWriter;
+
+public class GsonFormatterFunc implements FormatterFunc {
+
+	private static final String FAILED_TO_PARSE_ERROR_MESSAGE = "Unable to format JSON";
+
+	private final Gson gson;
+	private final GsonConfig gsonConfig;
+	private final String generatedIndent;
+
+	public GsonFormatterFunc(GsonConfig gsonConfig) {
+		GsonBuilder gsonBuilder = new GsonBuilder().serializeNulls();
+		if (!gsonConfig.isEscapeHtml()) {
+			gsonBuilder = gsonBuilder.disableHtmlEscaping();
+		}
+		this.gson = gsonBuilder.create();
+		this.gsonConfig = gsonConfig;
+		this.generatedIndent = generateIndent(gsonConfig.getIndentSpaces());
+	}
+
+	@Override
+	public String apply(String inputString) {
+		String result;
+		if (inputString.isEmpty()) {
+			result = "";
+		} else {
+			JsonElement jsonElement = gson.fromJson(inputString, JsonElement.class);
+			if (jsonElement == null) {
+				throw new AssertionError(FAILED_TO_PARSE_ERROR_MESSAGE);
+			}
+			if (gsonConfig.isSortByKeys() && jsonElement.isJsonObject()) {
+				jsonElement = sortByKeys(jsonElement.getAsJsonObject());
+			}
+			try (StringWriter stringWriter = new StringWriter()) {
+				JsonWriter jsonWriter = new JsonWriter(stringWriter);
+				jsonWriter.setIndent(this.generatedIndent);
+				gson.toJson(jsonElement, jsonWriter);
+				result = stringWriter + "\n";
+			} catch (IOException ioException) {
+				throw ThrowingEx.asRuntime(ioException);
+			}
+		}
+		return result;
+	}
+
+	private JsonElement sortByKeys(JsonObject jsonObject) {
+		JsonObject result = new JsonObject();
+		result.keySet().stream().sorted()
+			.forEach(key -> {
+				JsonElement element = jsonObject.get(key);
+				if (element.isJsonObject()) {
+					element = sortByKeys(element.getAsJsonObject());
+				}
+				result.add(key, element);
+			});
+		return result;
+	}
+
+	private String generateIndent(int indentSpaces) {
+		return String.join("", Collections.nCopies(indentSpaces, " "));
+	}
+
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonBuilderWrapper.java b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonBuilderWrapper.java
deleted file mode 100644
index c2e56f39b8..0000000000
--- a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonBuilderWrapper.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2022 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.json.gson;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-
-import com.diffplug.spotless.JarState;
-
-class GsonBuilderWrapper extends GsonWrapperBase {
-
-	private final Constructor<?> constructor;
-	private final Method serializeNullsMethod;
-	private final Method disableHtmlEscapingMethod;
-	private final Method createMethod;
-
-	GsonBuilderWrapper(JarState jarState) {
-		Class<?> clazz = loadClass(jarState.getClassLoader(), "com.google.gson.GsonBuilder");
-		this.constructor = getConstructor(clazz);
-		this.serializeNullsMethod = getMethod(clazz, "serializeNulls");
-		this.disableHtmlEscapingMethod = getMethod(clazz, "disableHtmlEscaping");
-		this.createMethod = getMethod(clazz, "create");
-	}
-
-	Object createGsonBuilder() {
-		return newInstance(constructor);
-	}
-
-	Object serializeNulls(Object gsonBuilder) {
-		return invoke(serializeNullsMethod, gsonBuilder);
-	}
-
-	Object disableHtmlEscaping(Object gsonBuilder) {
-		return invoke(disableHtmlEscapingMethod, gsonBuilder);
-	}
-
-	Object create(Object gsonBuilder) {
-		return invoke(createMethod, gsonBuilder);
-	}
-
-}
diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonConfig.java b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonConfig.java
new file mode 100644
index 0000000000..c63ad0aaba
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonConfig.java
@@ -0,0 +1,51 @@
+package com.diffplug.spotless.json.gson;
+
+import java.io.Serializable;
+
+public class GsonConfig implements Serializable {
+	private static final long serialVersionUID = 6039715618937332633L;
+
+	private boolean sortByKeys;
+	private boolean escapeHtml;
+	private int indentSpaces;
+	private String version;
+
+	public GsonConfig(boolean sortByKeys, boolean escapeHtml, int indentSpaces, String version) {
+		this.sortByKeys = sortByKeys;
+		this.escapeHtml = escapeHtml;
+		this.indentSpaces = indentSpaces;
+		this.version = version;
+	}
+
+	public boolean isSortByKeys() {
+		return sortByKeys;
+	}
+
+	public void setSortByKeys(boolean sortByKeys) {
+		this.sortByKeys = sortByKeys;
+	}
+
+	public boolean isEscapeHtml() {
+		return escapeHtml;
+	}
+
+	public void setEscapeHtml(boolean escapeHtml) {
+		this.escapeHtml = escapeHtml;
+	}
+
+	public int getIndentSpaces() {
+		return indentSpaces;
+	}
+
+	public void setIndentSpaces(int indentSpaces) {
+		this.indentSpaces = indentSpaces;
+	}
+
+	public String getVersion() {
+		return version;
+	}
+
+	public void setVersion(String version) {
+		this.version = version;
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
index 06519ae39d..624c4f2533 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
@@ -17,8 +17,8 @@
 
 import java.io.IOException;
 import java.io.Serializable;
-import java.io.StringWriter;
-import java.util.Collections;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
 import java.util.Objects;
 
 import com.diffplug.spotless.FormatterFunc;
@@ -29,77 +29,27 @@
 public class GsonStep {
 	private static final String MAVEN_COORDINATES = "com.google.code.gson:gson";
 
-	public static FormatterStep create(int indentSpaces, boolean sortByKeys, boolean escapeHtml, String version, Provisioner provisioner) {
+	public static FormatterStep create(GsonConfig gsonConfig, Provisioner provisioner) {
 		Objects.requireNonNull(provisioner, "provisioner cannot be null");
-		return FormatterStep.createLazy("gson", () -> new State(indentSpaces, sortByKeys, escapeHtml, version, provisioner), State::toFormatter);
+		return FormatterStep.createLazy("gson", () -> new State(gsonConfig, provisioner), State::toFormatter);
 	}
 
 	private static final class State implements Serializable {
-		private static final long serialVersionUID = -1493479043249379485L;
+		private static final long serialVersionUID = -3240568265160440420L;
 
-		private final int indentSpaces;
-		private final boolean sortByKeys;
-		private final boolean escapeHtml;
 		private final JarState jarState;
+		private final GsonConfig gsonConfig;
 
-		private State(int indentSpaces, boolean sortByKeys, boolean escapeHtml, String version, Provisioner provisioner) throws IOException {
-			this.indentSpaces = indentSpaces;
-			this.sortByKeys = sortByKeys;
-			this.escapeHtml = escapeHtml;
-			this.jarState = JarState.from(MAVEN_COORDINATES + ":" + version, provisioner);
+		private State(GsonConfig gsonConfig, Provisioner provisioner) throws IOException {
+			this.gsonConfig = gsonConfig;
+			this.jarState = JarState.from(MAVEN_COORDINATES + ":" + gsonConfig.getVersion(), provisioner);
 		}
 
-		FormatterFunc toFormatter() {
-			JsonWriterWrapper jsonWriterWrapper = new JsonWriterWrapper(jarState);
-			JsonElementWrapper jsonElementWrapper = new JsonElementWrapper(jarState);
-			JsonObjectWrapper jsonObjectWrapper = new JsonObjectWrapper(jarState, jsonElementWrapper);
-			GsonBuilderWrapper gsonBuilderWrapper = new GsonBuilderWrapper(jarState);
-			GsonWrapper gsonWrapper = new GsonWrapper(jarState, jsonElementWrapper, jsonWriterWrapper);
-
-			Object gsonBuilder = gsonBuilderWrapper.serializeNulls(gsonBuilderWrapper.createGsonBuilder());
-			if (!escapeHtml) {
-				gsonBuilder = gsonBuilderWrapper.disableHtmlEscaping(gsonBuilder);
-			}
-			Object gson = gsonBuilderWrapper.create(gsonBuilder);
-
-			return inputString -> {
-				String result;
-				if (inputString.isEmpty()) {
-					result = "";
-				} else {
-					Object jsonElement = gsonWrapper.fromJson(gson, inputString, jsonElementWrapper.getWrappedClass());
-					if (jsonElement == null) {
-						throw new AssertionError(GsonWrapperBase.FAILED_TO_PARSE_ERROR_MESSAGE);
-					}
-					if (sortByKeys && jsonElementWrapper.isJsonObject(jsonElement)) {
-						jsonElement = sortByKeys(jsonObjectWrapper, jsonElementWrapper, jsonElement);
-					}
-					try (StringWriter stringWriter = new StringWriter()) {
-						Object jsonWriter = jsonWriterWrapper.createJsonWriter(stringWriter);
-						jsonWriterWrapper.setIndent(jsonWriter, generateIndent(indentSpaces));
-						gsonWrapper.toJson(gson, jsonElement, jsonWriter);
-						result = stringWriter + "\n";
-					}
-				}
-				return result;
-			};
-		}
-
-		private Object sortByKeys(JsonObjectWrapper jsonObjectWrapper, JsonElementWrapper jsonElementWrapper, Object jsonObject) {
-			Object result = jsonObjectWrapper.createJsonObject();
-			jsonObjectWrapper.keySet(jsonObject).stream().sorted()
-					.forEach(key -> {
-						Object element = jsonObjectWrapper.get(jsonObject, key);
-						if (jsonElementWrapper.isJsonObject(element)) {
-							element = sortByKeys(jsonObjectWrapper, jsonElementWrapper, element);
-						}
-						jsonObjectWrapper.add(result, key, element);
-					});
-			return result;
-		}
-
-		private String generateIndent(int indentSpaces) {
-			return String.join("", Collections.nCopies(indentSpaces, " "));
+		FormatterFunc toFormatter() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException,
+			InstantiationException, IllegalAccessException {
+			Class<?> formatterFunc = jarState.getClassLoader().loadClass("com.diffplug.spotless.glue.gson.GsonFormatterFunc");
+			Constructor<?> constructor = formatterFunc.getConstructor(GsonConfig.class);
+			return (FormatterFunc) constructor.newInstance(gsonConfig);
 		}
 	}
 
diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonWrapper.java b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonWrapper.java
deleted file mode 100644
index eaca499eed..0000000000
--- a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonWrapper.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2022 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.json.gson;
-
-import java.lang.reflect.Method;
-
-import com.diffplug.spotless.JarState;
-
-class GsonWrapper extends GsonWrapperBase {
-
-	private final Method fromJsonMethod;
-	private final Method toJsonMethod;
-
-	GsonWrapper(JarState jarState, JsonElementWrapper jsonElementWrapper, JsonWriterWrapper jsonWriterWrapper) {
-		Class<?> clazz = loadClass(jarState.getClassLoader(), "com.google.gson.Gson");
-		this.fromJsonMethod = getMethod(clazz, "fromJson", String.class, Class.class);
-		this.toJsonMethod = getMethod(clazz, "toJson", jsonElementWrapper.getWrappedClass(), jsonWriterWrapper.getWrappedClass());
-	}
-
-	Object fromJson(Object gson, String json, Class<?> type) {
-		return invoke(fromJsonMethod, gson, json, type);
-	}
-
-	void toJson(Object gson, Object jsonElement, Object jsonWriter) {
-		invoke(toJsonMethod, gson, jsonElement, jsonWriter);
-	}
-
-}
diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonWrapperBase.java b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonWrapperBase.java
deleted file mode 100644
index 24d12a5722..0000000000
--- a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonWrapperBase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2022 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.json.gson;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-abstract class GsonWrapperBase {
-
-	static final String INCOMPATIBLE_ERROR_MESSAGE = "There was a problem interacting with Gson; maybe you set an incompatible version?";
-	static final String FAILED_TO_PARSE_ERROR_MESSAGE = "Unable to format JSON";
-
-	protected final Class<?> loadClass(ClassLoader classLoader, String className) {
-		try {
-			return classLoader.loadClass(className);
-		} catch (ClassNotFoundException cause) {
-			throw new IllegalStateException(INCOMPATIBLE_ERROR_MESSAGE, cause);
-		}
-	}
-
-	protected final Constructor<?> getConstructor(Class<?> clazz, Class<?>... argumentTypes) {
-		try {
-			return clazz.getConstructor(argumentTypes);
-		} catch (NoSuchMethodException cause) {
-			throw new IllegalStateException(INCOMPATIBLE_ERROR_MESSAGE, cause);
-		}
-	}
-
-	protected final Method getMethod(Class<?> clazz, String name, Class<?>... argumentTypes) {
-		try {
-			return clazz.getMethod(name, argumentTypes);
-		} catch (NoSuchMethodException cause) {
-			throw new IllegalStateException(INCOMPATIBLE_ERROR_MESSAGE, cause);
-		}
-	}
-
-	protected final <T> T newInstance(Constructor<T> constructor, Object... args) {
-		try {
-			return constructor.newInstance(args);
-		} catch (InstantiationException | IllegalAccessException cause) {
-			throw new IllegalStateException(INCOMPATIBLE_ERROR_MESSAGE, cause);
-		} catch (InvocationTargetException cause) {
-			throw new AssertionError(FAILED_TO_PARSE_ERROR_MESSAGE, cause.getCause());
-		}
-	}
-
-	protected Object invoke(Method method, Object targetObject, Object... args) {
-		try {
-			return method.invoke(targetObject, args);
-		} catch (IllegalAccessException cause) {
-			throw new IllegalStateException(INCOMPATIBLE_ERROR_MESSAGE, cause);
-		} catch (InvocationTargetException cause) {
-			throw new AssertionError(FAILED_TO_PARSE_ERROR_MESSAGE, cause.getCause());
-		}
-	}
-
-}
diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/JsonElementWrapper.java b/lib/src/main/java/com/diffplug/spotless/json/gson/JsonElementWrapper.java
deleted file mode 100644
index ffdfa649ce..0000000000
--- a/lib/src/main/java/com/diffplug/spotless/json/gson/JsonElementWrapper.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2022 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.json.gson;
-
-import java.lang.reflect.Method;
-
-import com.diffplug.spotless.JarState;
-
-class JsonElementWrapper extends GsonWrapperBase {
-
-	private final Class<?> clazz;
-	private final Method isJsonObjectMethod;
-
-	JsonElementWrapper(JarState jarState) {
-		this.clazz = loadClass(jarState.getClassLoader(), "com.google.gson.JsonElement");
-		this.isJsonObjectMethod = getMethod(clazz, "isJsonObject");
-	}
-
-	boolean isJsonObject(Object jsonElement) {
-		return (boolean) invoke(isJsonObjectMethod, jsonElement);
-	}
-
-	Class<?> getWrappedClass() {
-		return clazz;
-	}
-
-}
diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/JsonObjectWrapper.java b/lib/src/main/java/com/diffplug/spotless/json/gson/JsonObjectWrapper.java
deleted file mode 100644
index 35ec0d876b..0000000000
--- a/lib/src/main/java/com/diffplug/spotless/json/gson/JsonObjectWrapper.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2022 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.json.gson;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.util.Set;
-
-import com.diffplug.spotless.JarState;
-
-class JsonObjectWrapper extends GsonWrapperBase {
-
-	private final Constructor<?> constructor;
-	private final Method keySetMethod;
-	private final Method getMethod;
-	private final Method addMethod;
-
-	JsonObjectWrapper(JarState jarState, JsonElementWrapper jsonElementWrapper) {
-		Class<?> clazz = loadClass(jarState.getClassLoader(), "com.google.gson.JsonObject");
-		this.constructor = getConstructor(clazz);
-		this.keySetMethod = getMethod(clazz, "keySet");
-		this.getMethod = getMethod(clazz, "get", String.class);
-		this.addMethod = getMethod(clazz, "add", String.class, jsonElementWrapper.getWrappedClass());
-	}
-
-	Object createJsonObject() {
-		return newInstance(constructor);
-	}
-
-	@SuppressWarnings("unchecked")
-	Set<String> keySet(Object jsonObject) {
-		return (Set<String>) invoke(keySetMethod, jsonObject);
-	}
-
-	Object get(Object jsonObject, String key) {
-		return invoke(getMethod, jsonObject, key);
-	}
-
-	void add(Object jsonObject, String key, Object element) {
-		invoke(addMethod, jsonObject, key, element);
-	}
-
-}
diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/JsonWriterWrapper.java b/lib/src/main/java/com/diffplug/spotless/json/gson/JsonWriterWrapper.java
deleted file mode 100644
index c9d682e2c2..0000000000
--- a/lib/src/main/java/com/diffplug/spotless/json/gson/JsonWriterWrapper.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2022 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.json.gson;
-
-import java.io.Writer;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-
-import com.diffplug.spotless.JarState;
-
-class JsonWriterWrapper extends GsonWrapperBase {
-
-	private final Class<?> clazz;
-	private final Constructor<?> constructor;
-	private final Method setIndentMethod;
-
-	JsonWriterWrapper(JarState jarState) {
-		this.clazz = loadClass(jarState.getClassLoader(), "com.google.gson.stream.JsonWriter");
-		this.constructor = getConstructor(clazz, Writer.class);
-		this.setIndentMethod = getMethod(clazz, "setIndent", String.class);
-	}
-
-	Object createJsonWriter(Writer writer) {
-		return newInstance(constructor, writer);
-	}
-
-	void setIndent(Object jsonWriter, String indent) {
-		invoke(setIndentMethod, jsonWriter, indent);
-	}
-
-	Class<?> getWrappedClass() {
-		return clazz;
-	}
-
-}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
index 1e9de2e831..c684dab291 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
@@ -23,11 +23,12 @@
 import com.diffplug.spotless.json.JacksonJsonConfig;
 import com.diffplug.spotless.json.JacksonJsonStep;
 import com.diffplug.spotless.json.JsonSimpleStep;
+import com.diffplug.spotless.json.gson.GsonConfig;
 import com.diffplug.spotless.json.gson.GsonStep;
 
 public class JsonExtension extends FormatExtension {
 	private static final int DEFAULT_INDENTATION = 4;
-	private static final String DEFAULT_GSON_VERSION = "2.8.9";
+	private static final String DEFAULT_GSON_VERSION = "2.10.1";
 	static final String NAME = "json";
 
 	@Inject
@@ -47,8 +48,8 @@ public SimpleConfig simple() {
 		return new SimpleConfig(DEFAULT_INDENTATION);
 	}
 
-	public GsonConfig gson() {
-		return new GsonConfig();
+	public GsonGradleConfig gson() {
+		return new GsonGradleConfig();
 	}
 
 	public JacksonJsonGradleConfig jackson() {
@@ -73,13 +74,13 @@ private FormatterStep createStep() {
 		}
 	}
 
-	public class GsonConfig {
+	public class GsonGradleConfig {
 		private int indentSpaces;
 		private boolean sortByKeys;
 		private boolean escapeHtml;
 		private String version;
 
-		public GsonConfig() {
+		public GsonGradleConfig() {
 			this.indentSpaces = DEFAULT_INDENTATION;
 			this.sortByKeys = false;
 			this.escapeHtml = false;
@@ -87,32 +88,32 @@ public GsonConfig() {
 			addStep(createStep());
 		}
 
-		public GsonConfig indentWithSpaces(int indentSpaces) {
+		public GsonGradleConfig indentWithSpaces(int indentSpaces) {
 			this.indentSpaces = indentSpaces;
 			replaceStep(createStep());
 			return this;
 		}
 
-		public GsonConfig sortByKeys() {
+		public GsonGradleConfig sortByKeys() {
 			this.sortByKeys = true;
 			replaceStep(createStep());
 			return this;
 		}
 
-		public GsonConfig escapeHtml() {
+		public GsonGradleConfig escapeHtml() {
 			this.escapeHtml = true;
 			replaceStep(createStep());
 			return this;
 		}
 
-		public GsonConfig version(String version) {
+		public GsonGradleConfig version(String version) {
 			this.version = version;
 			replaceStep(createStep());
 			return this;
 		}
 
 		private FormatterStep createStep() {
-			return GsonStep.create(indentSpaces, sortByKeys, escapeHtml, version, provisioner());
+			return GsonStep.create(new GsonConfig(sortByKeys, escapeHtml, indentSpaces, version), provisioner());
 		}
 	}
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Gson.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Gson.java
index 7962ecb1f7..7dda88dcd9 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Gson.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Gson.java
@@ -15,6 +15,8 @@
  */
 package com.diffplug.spotless.maven.json;
 
+import com.diffplug.spotless.json.gson.GsonConfig;
+
 import org.apache.maven.plugins.annotations.Parameter;
 
 import com.diffplug.spotless.FormatterStep;
@@ -23,7 +25,7 @@
 import com.diffplug.spotless.maven.FormatterStepFactory;
 
 public class Gson implements FormatterStepFactory {
-	private static final String DEFAULT_GSON_VERSION = "2.8.9";
+	private static final String DEFAULT_GSON_VERSION = "2.10.1";
 
 	@Parameter
 	int indentSpaces = Json.DEFAULT_INDENTATION;
@@ -40,6 +42,6 @@ public class Gson implements FormatterStepFactory {
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 		int indentSpaces = this.indentSpaces;
-		return GsonStep.create(indentSpaces, sortByKeys, escapeHtml, version, stepConfig.getProvisioner());
+		return GsonStep.create(new GsonConfig(sortByKeys, escapeHtml, indentSpaces, version), stepConfig.getProvisioner());
 	}
 }

From 0a86bad22192c5453cc08f8eebe3f28b44abd3d5 Mon Sep 17 00:00:00 2001
From: Abel Keszei <keszeiabel@gmail.com>
Date: Thu, 19 Jan 2023 22:07:36 +0100
Subject: [PATCH 0641/2068] apply format

---
 .../spotless/glue/gson/GsonFormatterFunc.java | 37 +++++++++++++------
 .../spotless/json/gson/GsonConfig.java        | 15 ++++++++
 .../diffplug/spotless/json/gson/GsonStep.java |  4 +-
 .../diffplug/spotless/maven/json/Gson.java    |  3 +-
 4 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/lib/src/gson/java/com/diffplug/spotless/glue/gson/GsonFormatterFunc.java b/lib/src/gson/java/com/diffplug/spotless/glue/gson/GsonFormatterFunc.java
index 33db1faaa6..c1426a06d1 100644
--- a/lib/src/gson/java/com/diffplug/spotless/glue/gson/GsonFormatterFunc.java
+++ b/lib/src/gson/java/com/diffplug/spotless/glue/gson/GsonFormatterFunc.java
@@ -1,19 +1,34 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.glue.gson;
 
 import java.io.IOException;
 import java.io.StringWriter;
 import java.util.Collections;
 
-import com.diffplug.spotless.FormatterFunc;
-import com.diffplug.spotless.ThrowingEx;
-import com.diffplug.spotless.json.gson.GsonConfig;
-
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.stream.JsonWriter;
 
+import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.ThrowingEx;
+import com.diffplug.spotless.json.gson.GsonConfig;
+
 public class GsonFormatterFunc implements FormatterFunc {
 
 	private static final String FAILED_TO_PARSE_ERROR_MESSAGE = "Unable to format JSON";
@@ -60,13 +75,13 @@ public String apply(String inputString) {
 	private JsonElement sortByKeys(JsonObject jsonObject) {
 		JsonObject result = new JsonObject();
 		result.keySet().stream().sorted()
-			.forEach(key -> {
-				JsonElement element = jsonObject.get(key);
-				if (element.isJsonObject()) {
-					element = sortByKeys(element.getAsJsonObject());
-				}
-				result.add(key, element);
-			});
+				.forEach(key -> {
+					JsonElement element = jsonObject.get(key);
+					if (element.isJsonObject()) {
+						element = sortByKeys(element.getAsJsonObject());
+					}
+					result.add(key, element);
+				});
 		return result;
 	}
 
diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonConfig.java b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonConfig.java
index c63ad0aaba..a11c1ee296 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonConfig.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonConfig.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.json.gson;
 
 import java.io.Serializable;
diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
index 624c4f2533..1fb0f11d62 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 DiffPlug
+ * Copyright 2022-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,7 +46,7 @@ private State(GsonConfig gsonConfig, Provisioner provisioner) throws IOException
 		}
 
 		FormatterFunc toFormatter() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException,
-			InstantiationException, IllegalAccessException {
+				InstantiationException, IllegalAccessException {
 			Class<?> formatterFunc = jarState.getClassLoader().loadClass("com.diffplug.spotless.glue.gson.GsonFormatterFunc");
 			Constructor<?> constructor = formatterFunc.getConstructor(GsonConfig.class);
 			return (FormatterFunc) constructor.newInstance(gsonConfig);
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Gson.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Gson.java
index 7dda88dcd9..fb5a38e890 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Gson.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Gson.java
@@ -15,11 +15,10 @@
  */
 package com.diffplug.spotless.maven.json;
 
-import com.diffplug.spotless.json.gson.GsonConfig;
-
 import org.apache.maven.plugins.annotations.Parameter;
 
 import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.json.gson.GsonConfig;
 import com.diffplug.spotless.json.gson.GsonStep;
 import com.diffplug.spotless.maven.FormatterStepConfig;
 import com.diffplug.spotless.maven.FormatterStepFactory;

From 290a522e154db4ce10116273b35139e5f64ea8bd Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 20 Jan 2023 21:43:58 +0000
Subject: [PATCH 0642/2068] Update plugin
 de.benediktritter.maven-plugin-development to v0.4.1

---
 plugin-maven/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-maven/build.gradle b/plugin-maven/build.gradle
index ad51318d93..664101a0fd 100644
--- a/plugin-maven/build.gradle
+++ b/plugin-maven/build.gradle
@@ -1,6 +1,6 @@
 plugins {
 	// https://www.benediktritter.de/maven-plugin-development/#release-history
-	id 'de.benediktritter.maven-plugin-development' version '0.4.0'
+	id 'de.benediktritter.maven-plugin-development' version '0.4.1'
 }
 
 repositories { mavenCentral() }

From eea5d5c1d07f23c7381222bd5010b4933008dee9 Mon Sep 17 00:00:00 2001
From: Abel Keszei <keszeiabel@gmail.com>
Date: Sun, 22 Jan 2023 14:36:44 +0100
Subject: [PATCH 0643/2068] fix tests

---
 .../spotless/glue/gson/GsonFormatterFunc.java     |  2 +-
 .../com/diffplug/spotless/json/gson/GsonStep.java | 15 ++++++++++-----
 .../diffplug/spotless/json/gson/GsonStepTest.java | 14 +++++++-------
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/lib/src/gson/java/com/diffplug/spotless/glue/gson/GsonFormatterFunc.java b/lib/src/gson/java/com/diffplug/spotless/glue/gson/GsonFormatterFunc.java
index c1426a06d1..b19476a1a8 100644
--- a/lib/src/gson/java/com/diffplug/spotless/glue/gson/GsonFormatterFunc.java
+++ b/lib/src/gson/java/com/diffplug/spotless/glue/gson/GsonFormatterFunc.java
@@ -74,7 +74,7 @@ public String apply(String inputString) {
 
 	private JsonElement sortByKeys(JsonObject jsonObject) {
 		JsonObject result = new JsonObject();
-		result.keySet().stream().sorted()
+		jsonObject.keySet().stream().sorted()
 				.forEach(key -> {
 					JsonElement element = jsonObject.get(key);
 					if (element.isJsonObject()) {
diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
index 1fb0f11d62..58993017fa 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
@@ -28,6 +28,7 @@
 
 public class GsonStep {
 	private static final String MAVEN_COORDINATES = "com.google.code.gson:gson";
+	private static final String INCOMPATIBLE_ERROR_MESSAGE = "There was a problem interacting with Gson; maybe you set an incompatible version?";
 
 	public static FormatterStep create(GsonConfig gsonConfig, Provisioner provisioner) {
 		Objects.requireNonNull(provisioner, "provisioner cannot be null");
@@ -45,11 +46,15 @@ private State(GsonConfig gsonConfig, Provisioner provisioner) throws IOException
 			this.jarState = JarState.from(MAVEN_COORDINATES + ":" + gsonConfig.getVersion(), provisioner);
 		}
 
-		FormatterFunc toFormatter() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException,
-				InstantiationException, IllegalAccessException {
-			Class<?> formatterFunc = jarState.getClassLoader().loadClass("com.diffplug.spotless.glue.gson.GsonFormatterFunc");
-			Constructor<?> constructor = formatterFunc.getConstructor(GsonConfig.class);
-			return (FormatterFunc) constructor.newInstance(gsonConfig);
+		FormatterFunc toFormatter() {
+			try {
+				Class<?> formatterFunc = jarState.getClassLoader().loadClass("com.diffplug.spotless.glue.gson.GsonFormatterFunc");
+				Constructor<?> constructor = formatterFunc.getConstructor(GsonConfig.class);
+				return (FormatterFunc) constructor.newInstance(gsonConfig);
+			} catch (ClassNotFoundException | NoSuchMethodException | InvocationTargetException
+					 | InstantiationException | IllegalAccessException | NoClassDefFoundError cause) {
+				throw new IllegalStateException(INCOMPATIBLE_ERROR_MESSAGE, cause);
+			}
 		}
 	}
 
diff --git a/testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java b/testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java
index 8f1d758836..3f4d2a84e0 100644
--- a/testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java
@@ -28,7 +28,7 @@
 
 public class GsonStepTest extends JsonFormatterStepCommonTests {
 
-	private static final String DEFAULT_VERSION = "2.8.9";
+	private static final String DEFAULT_VERSION = "2.10.1";
 
 	@Test
 	void handlesComplexNestedObject() {
@@ -52,34 +52,34 @@ void handlesNotJson() {
 
 	@Test
 	void handlesSortingWhenSortByKeyEnabled() {
-		FormatterStep step = GsonStep.create(INDENT, true, false, DEFAULT_VERSION, TestProvisioner.mavenCentral());
+		FormatterStep step = GsonStep.create(new GsonConfig(true, false, INDENT, DEFAULT_VERSION), TestProvisioner.mavenCentral());
 		StepHarness.forStep(step).testResource("json/sortByKeysBefore.json", "json/sortByKeysAfter.json");
 	}
 
 	@Test
 	void doesNoSortingWhenSortByKeyDisabled() {
-		FormatterStep step = GsonStep.create(INDENT, false, false, DEFAULT_VERSION, TestProvisioner.mavenCentral());
+		FormatterStep step = GsonStep.create(new GsonConfig(false, false, INDENT, DEFAULT_VERSION), TestProvisioner.mavenCentral());
 		StepHarness.forStep(step)
 				.testResource("json/sortByKeysBefore.json", "json/sortByKeysAfterDisabled.json");
 	}
 
 	@Test
 	void handlesHtmlEscapeWhenEnabled() {
-		FormatterStep step = GsonStep.create(INDENT, false, true, DEFAULT_VERSION, TestProvisioner.mavenCentral());
+		FormatterStep step = GsonStep.create(new GsonConfig(false, true, INDENT, DEFAULT_VERSION), TestProvisioner.mavenCentral());
 		StepHarness.forStep(step)
 				.testResource("json/escapeHtmlGsonBefore.json", "json/escapeHtmlGsonAfter.json");
 	}
 
 	@Test
 	void writesRawHtmlWhenHtmlEscapeDisabled() {
-		FormatterStep step = GsonStep.create(INDENT, false, false, DEFAULT_VERSION, TestProvisioner.mavenCentral());
+		FormatterStep step = GsonStep.create(new GsonConfig(false, false, INDENT, DEFAULT_VERSION), TestProvisioner.mavenCentral());
 		StepHarness.forStep(step)
 				.testResource("json/escapeHtmlGsonBefore.json", "json/escapeHtmlGsonAfterDisabled.json");
 	}
 
 	@Test
 	void handlesVersionIncompatibility() {
-		FormatterStep step = GsonStep.create(INDENT, false, false, "1.7", TestProvisioner.mavenCentral());
+		FormatterStep step = GsonStep.create(new GsonConfig(false, false, INDENT, "1.7"), TestProvisioner.mavenCentral());
 		Assertions.assertThatThrownBy(() -> step.format("", new File("")))
 				.isInstanceOf(IllegalStateException.class)
 				.hasMessage("There was a problem interacting with Gson; maybe you set an incompatible version?");
@@ -87,6 +87,6 @@ void handlesVersionIncompatibility() {
 
 	@Override
 	protected FormatterStep createFormatterStep(int indent, Provisioner provisioner) {
-		return GsonStep.create(indent, false, false, DEFAULT_VERSION, provisioner);
+		return GsonStep.create(new GsonConfig(false, false, indent, DEFAULT_VERSION), provisioner);
 	}
 }

From f3481bee7c5f03ad450c2f7a875a204c594ef66f Mon Sep 17 00:00:00 2001
From: Abel Keszei <keszeiabel@gmail.com>
Date: Sun, 22 Jan 2023 14:37:14 +0100
Subject: [PATCH 0644/2068] apply format

---
 lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
index 58993017fa..03baec5104 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
@@ -52,7 +52,7 @@ FormatterFunc toFormatter() {
 				Constructor<?> constructor = formatterFunc.getConstructor(GsonConfig.class);
 				return (FormatterFunc) constructor.newInstance(gsonConfig);
 			} catch (ClassNotFoundException | NoSuchMethodException | InvocationTargetException
-					 | InstantiationException | IllegalAccessException | NoClassDefFoundError cause) {
+					| InstantiationException | IllegalAccessException | NoClassDefFoundError cause) {
 				throw new IllegalStateException(INCOMPATIBLE_ERROR_MESSAGE, cause);
 			}
 		}

From 85d727e19a149fec2144e40fbe3c656ca83df0e2 Mon Sep 17 00:00:00 2001
From: Abel Keszei <keszeiabel@gmail.com>
Date: Sun, 22 Jan 2023 14:55:19 +0100
Subject: [PATCH 0645/2068] update CHANGES.md

---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index 07b81a8fc5..32c7a7f5a5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,6 +17,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * The default list of type annotations used by `formatAnnotations` has had 8 more annotations from the Checker Framework added [#1494](https://github.com/diffplug/spotless/pull/1494)
 ### Changes
 * Rename `YamlJacksonStep` into `JacksonYamlStep` while normalizing Jackson usage ([#1492](https://github.com/diffplug/spotless/pull/1492))
+* Convert `gson` integration to use a compile-only source set ([#1510](https://github.com/diffplug/spotless/pull/1510)).
 
 ## [2.32.0] - 2023-01-13
 ### Added

From bba246d883a3ad9847d75c4379b7e8b9be1f1907 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Fri, 20 Jan 2023 22:00:22 +0100
Subject: [PATCH 0646/2068] 1416: use process runner to catch output

---
 .../com/diffplug/spotless/ProcessRunner.java  | 146 ++++++++++++++++--
 .../com/diffplug/spotless/npm/NpmProcess.java |  34 ++--
 2 files changed, 153 insertions(+), 27 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java b/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
index 41c664cafe..4c076e537c 100644
--- a/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
+++ b/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
@@ -15,6 +15,8 @@
  */
 package com.diffplug.spotless;
 
+import static java.util.Objects.requireNonNull;
+
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
@@ -29,9 +31,12 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
 import java.util.function.BiConsumer;
 
-import edu.umd.cs.findbugs.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -95,6 +100,36 @@ public Result exec(@Nullable byte[] stdin, List<String> args) throws IOException
 
 	/** Creates a process with the given arguments, the given byte array is written to stdin immediately. */
 	public Result exec(@Nullable File cwd, @Nullable Map<String, String> environment, @Nullable byte[] stdin, List<String> args) throws IOException, InterruptedException {
+		LongRunningProcess process = start(cwd, environment, stdin, args);
+		try {
+			// wait for the process to finish
+			process.waitFor();
+			// collect the output
+			return process.result();
+		} catch (ExecutionException e) {
+			throw ThrowingEx.asRuntime(e);
+		}
+	}
+
+	/**
+	 * Creates a process with the given arguments, the given byte array is written to stdin immediately.
+	 * <br>
+	 * Delegates to {@link #start(File, Map, byte[], boolean, List)} with {@code false} for {@code redirectErrorStream}.
+	 */
+	public LongRunningProcess start(@Nullable File cwd, @Nullable Map<String, String> environment, @Nullable byte[] stdin, List<String> args) throws IOException {
+		return start(cwd, environment, stdin, false, args);
+	}
+
+	/**
+	 * Creates a process with the given arguments, the given byte array is written to stdin immediately.
+	 * <br>
+	 * The process is not waited for, so the caller is responsible for calling {@link LongRunningProcess#waitFor()} (if needed).
+	 * <br>
+	 * To dispose this {@code ProcessRunner} instance, either call {@link #close()} or {@link LongRunningProcess#close()}. After
+	 * {@link #close()} or {@link LongRunningProcess#close()} has been called, this {@code ProcessRunner} instance must not be used anymore.
+	 */
+	public LongRunningProcess start(@Nullable File cwd, @Nullable Map<String, String> environment, @Nullable byte[] stdin, boolean redirectErrorStream, List<String> args) throws IOException {
+		checkState();
 		ProcessBuilder builder = new ProcessBuilder(args);
 		if (cwd != null) {
 			builder.directory(cwd);
@@ -105,20 +140,20 @@ public Result exec(@Nullable File cwd, @Nullable Map<String, String> environment
 		if (stdin == null) {
 			stdin = new byte[0];
 		}
+		if (redirectErrorStream) {
+			builder.redirectErrorStream(true);
+		}
+
 		Process process = builder.start();
 		Future<byte[]> outputFut = threadStdOut.submit(() -> drainToBytes(process.getInputStream(), bufStdOut));
-		Future<byte[]> errorFut = threadStdErr.submit(() -> drainToBytes(process.getErrorStream(), bufStdErr));
+		Future<byte[]> errorFut = null;
+		if (!redirectErrorStream) {
+			errorFut = threadStdErr.submit(() -> drainToBytes(process.getErrorStream(), bufStdErr));
+		}
 		// write stdin
 		process.getOutputStream().write(stdin);
 		process.getOutputStream().close();
-		// wait for the process to finish
-		int exitCode = process.waitFor();
-		try {
-			// collect the output
-			return new Result(args, exitCode, outputFut.get(), errorFut.get());
-		} catch (ExecutionException e) {
-			throw ThrowingEx.asRuntime(e);
-		}
+		return new LongRunningProcess(process, args, outputFut, errorFut);
 	}
 
 	private static void drain(InputStream input, OutputStream output) throws IOException {
@@ -141,17 +176,24 @@ public void close() {
 		threadStdErr.shutdown();
 	}
 
+	/** Checks if this {@code ProcessRunner} instance is still usable. */
+	private void checkState() {
+		if (threadStdOut.isShutdown() || threadStdErr.isShutdown()) {
+			throw new IllegalStateException("ProcessRunner has been closed and must not be used anymore.");
+		}
+	}
+
 	@SuppressFBWarnings({"EI_EXPOSE_REP", "EI_EXPOSE_REP2"})
 	public static class Result {
 		private final List<String> args;
 		private final int exitCode;
 		private final byte[] stdOut, stdErr;
 
-		public Result(List<String> args, int exitCode, byte[] stdOut, byte[] stdErr) {
+		public Result(@Nonnull List<String> args, int exitCode, @Nonnull byte[] stdOut, @Nullable byte[] stdErr) {
 			this.args = args;
 			this.exitCode = exitCode;
 			this.stdOut = stdOut;
-			this.stdErr = stdErr;
+			this.stdErr = (stdErr == null ? new byte[0] : stdErr);
 		}
 
 		public List<String> args() {
@@ -222,8 +264,86 @@ public String toString() {
 				}
 			};
 			perStream.accept("   stdout", stdOut);
-			perStream.accept("   stderr", stdErr);
+			if (stdErr.length > 0) {
+				perStream.accept("   stderr", stdErr);
+			}
 			return builder.toString();
 		}
 	}
+
+	/**
+	 * A long-running process that can be waited for.
+	 */
+	public class LongRunningProcess extends Process implements AutoCloseable {
+
+		private final Process delegate;
+		private final List<String> args;
+		private final Future<byte[]> outputFut;
+		private final Future<byte[]> errorFut;
+
+		public LongRunningProcess(@Nonnull Process delegate, @Nonnull List<String> args, @Nonnull Future<byte[]> outputFut, @Nullable Future<byte[]> errorFut) {
+			this.delegate = requireNonNull(delegate);
+			this.args = args;
+			this.outputFut = outputFut;
+			this.errorFut = errorFut;
+		}
+
+		@Override
+		public OutputStream getOutputStream() {
+			return delegate.getOutputStream();
+		}
+
+		@Override
+		public InputStream getInputStream() {
+			return delegate.getInputStream();
+		}
+
+		@Override
+		public InputStream getErrorStream() {
+			return delegate.getErrorStream();
+		}
+
+		@Override
+		public int waitFor() throws InterruptedException {
+			return delegate.waitFor();
+		}
+
+		@Override
+		public boolean waitFor(long timeout, TimeUnit unit) throws InterruptedException {
+			return delegate.waitFor(timeout, unit);
+		}
+
+		@Override
+		public int exitValue() {
+			return delegate.exitValue();
+		}
+
+		@Override
+		public void destroy() {
+			delegate.destroy();
+		}
+
+		@Override
+		public Process destroyForcibly() {
+			return delegate.destroyForcibly();
+		}
+
+		@Override
+		public boolean isAlive() {
+			return delegate.isAlive();
+		}
+
+		public Result result() throws ExecutionException, InterruptedException {
+			int exitCode = waitFor();
+			return new Result(args, exitCode, this.outputFut.get(), (this.errorFut != null ? this.errorFut.get() : null));
+		}
+
+		@Override
+		public void close() {
+			if (isAlive()) {
+				destroy();
+			}
+			ProcessRunner.this.close();
+		}
+	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java
index 1675a4aa4e..b622cbd8ba 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java
@@ -19,9 +19,15 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
 
+import com.diffplug.spotless.ProcessRunner;
+import com.diffplug.spotless.ProcessRunner.LongRunningProcess;
+
 class NpmProcess {
 
 	private final File workingDir;
@@ -30,10 +36,13 @@ class NpmProcess {
 
 	private final File nodeExecutable;
 
+	private final ProcessRunner processRunner;
+
 	NpmProcess(File workingDir, File npmExecutable, File nodeExecutable) {
 		this.workingDir = workingDir;
 		this.npmExecutable = npmExecutable;
 		this.nodeExecutable = nodeExecutable;
+		processRunner = new ProcessRunner();
 	}
 
 	void install() {
@@ -44,32 +53,27 @@ void install() {
 				"--prefer-offline");
 	}
 
-	Process start() {
+	LongRunningProcess start() {
 		// adding --scripts-prepend-node-path=true due to https://github.com/diffplug/spotless/issues/619#issuecomment-648018679
 		return npm("start", "--scripts-prepend-node-path=true");
 	}
 
 	private void npmAwait(String... args) {
-		final Process npmProcess = npm(args);
-
-		try {
+		try (LongRunningProcess npmProcess = npm(args)) {
 			if (npmProcess.waitFor() != 0) {
-				throw new NpmProcessException("Running npm command '" + commandLine(args) + "' failed with exit code: " + npmProcess.exitValue());
+				throw new NpmProcessException("Running npm command '" + commandLine(args) + "' failed with exit code: " + npmProcess.exitValue() + "\n\n" + npmProcess.result());
 			}
 		} catch (InterruptedException e) {
 			throw new NpmProcessException("Running npm command '" + commandLine(args) + "' was interrupted.", e);
+		} catch (ExecutionException e) {
+			throw new NpmProcessException("Running npm command '" + commandLine(args) + "' failed.", e);
 		}
 	}
 
-	private Process npm(String... args) {
+	private LongRunningProcess npm(String... args) {
 		List<String> processCommand = processCommand(args);
 		try {
-			ProcessBuilder processBuilder = new ProcessBuilder()
-					.inheritIO()
-					.directory(this.workingDir)
-					.command(processCommand);
-			addEnvironmentVariables(processBuilder);
-			return processBuilder.start();
+			return processRunner.start(this.workingDir, environmentVariables(), null, true, processCommand);
 		} catch (IOException e) {
 			throw new NpmProcessException("Failed to launch npm command '" + commandLine(args) + "'.", e);
 		}
@@ -82,8 +86,10 @@ private List<String> processCommand(String... args) {
 		return command;
 	}
 
-	private void addEnvironmentVariables(ProcessBuilder processBuilder) {
-		processBuilder.environment().put("PATH", this.nodeExecutable.getParentFile().getAbsolutePath() + File.pathSeparator + System.getenv("PATH"));
+	private Map<String, String> environmentVariables() {
+		Map<String, String> environmentVariables = new HashMap<>();
+		environmentVariables.put("PATH", this.nodeExecutable.getParentFile().getAbsolutePath() + File.pathSeparator + System.getenv("PATH"));
+		return environmentVariables;
 	}
 
 	private String commandLine(String... args) {

From 1c285ecfcd321c0ba37c2ca5d993566e2ce15398 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Fri, 20 Jan 2023 23:04:26 +0100
Subject: [PATCH 0647/2068] 1416: suggest prettier plugins

---
 .../spotless/npm/PrettierFormatterStep.java   |  10 +-
 .../npm/PrettierMissingParserException.java   | 116 ++++++++++++++++++
 .../spotless/PrettierIntegrationTest.java     |  23 ++++
 3 files changed, 148 insertions(+), 1 deletion(-)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/npm/PrettierMissingParserException.java

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
index 20ff71d08e..22dd4586ee 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
@@ -122,7 +122,14 @@ public String applyWithFile(String unix, File file) throws Exception {
 			FormattedPrinter.SYSOUT.print("formatting String '" + unix.substring(0, Math.min(50, unix.length())) + "[...]' in file '" + file + "'");
 
 			final String prettierConfigOptionsWithFilepath = assertFilepathInConfigOptions(file);
-			return restService.format(unix, prettierConfigOptionsWithFilepath);
+			try {
+				return restService.format(unix, prettierConfigOptionsWithFilepath);
+			} catch (SimpleRestClient.SimpleRestResponseException e) {
+				if (e.getStatusCode() != 200 && e.getResponseMessage().contains("No parser could be inferred")) {
+					throw new PrettierMissingParserException(file, e);
+				}
+				throw e;
+			}
 		}
 
 		private String assertFilepathInConfigOptions(File file) {
@@ -141,4 +148,5 @@ private String assertFilepathInConfigOptions(File file) {
 			return "{" + filePathOption + (hasAnyConfigOption ? "," : "") + prettierConfigOptions.substring(startOfConfigOption + 1);
 		}
 	}
+
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/PrettierMissingParserException.java b/lib/src/main/java/com/diffplug/spotless/npm/PrettierMissingParserException.java
new file mode 100644
index 0000000000..73f81a0e07
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/npm/PrettierMissingParserException.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.npm;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+import javax.annotation.Nonnull;
+
+class PrettierMissingParserException extends RuntimeException {
+	private static final long serialVersionUID = 1L;
+
+	private static final Map<String, String> EXTENSIONS_TO_PLUGINS;
+
+	static {
+		Map<String, String> plugins = new HashMap<>();
+		// ---- official plugins
+		plugins.put(".php", "@prettier/plugin-php");
+		plugins.put(".pug", "@prettier/plugin-pug");
+		plugins.put(".rb", "@prettier/plugin-ruby");
+		plugins.put(".xml", "@prettier/plugin-xml");
+
+		// ---- community plugins
+		// default namings: astro, elm, java, jsonata, prisma, properties, sh, sql, svelte, toml
+		plugins.put(".trigger", "prettier-plugin-apex");
+		plugins.put(".cls", "prettier-plugin-apex");
+		plugins.put(".html.erb", "prettier-plugin-erb");
+		Arrays.asList(".glsl",
+				".fp",
+				".frag",
+				".frg",
+				".fs",
+				".fsh",
+				".fshader",
+				".geo",
+				".geom",
+				".glslf",
+				".glslv",
+				".gs",
+				".gshader",
+				".rchit",
+				".rmiss",
+				".shader",
+				".tesc",
+				".tese",
+				".vert",
+				".vrx",
+				".vsh",
+				".vshader").forEach(ext -> plugins.put(ext, "prettier-plugin-glsl"));
+		Arrays.asList(".go.html",
+				".gohtml",
+				".gotmpl",
+				".go.tmpl",
+				".tmpl",
+				".tpl",
+				".html.tmpl",
+				".html.tpl").forEach(ext -> plugins.put(ext, "prettier-plugin-go-template"));
+		plugins.put(".kt", "kotlin");
+		plugins.put(".mo", "motoko");
+		Arrays.asList(".nginx", ".nginxconf").forEach(ext -> plugins.put(ext, "prettier-plugin-nginx"));
+		plugins.put(".sol", "prettier-plugin-solidity");
+
+		EXTENSIONS_TO_PLUGINS = Collections.unmodifiableMap(plugins);
+	}
+
+	private final File file;
+
+	public PrettierMissingParserException(@Nonnull File file, Exception cause) {
+		super("Prettier could not infer a parser for file '" + file + "'. Maybe you need to include a prettier plugin in devDependencies?\n\n" + recommendPlugin(file), cause);
+		this.file = Objects.requireNonNull(file);
+	}
+
+	private static String recommendPlugin(File file) {
+		String pluginName = guessPlugin(file);
+		return "A good candidate for file '" + file + "' is '" + pluginName + "\n"
+				+ "See if you can find it on <https://prettier.io/docs/en/plugins.html#official-plugins>\n"
+				+ "or search on npmjs.com for a plugin matching that name: "
+				+ String.format("<https://www.npmjs.com/search?ranking=popularity&q=%s>\n\n", pluginName)
+				+ "For instructions on how to include plugins for prettier in spotless see our documentation:\n"
+				+ "- for gradle <https://github.com/diffplug/spotless/tree/main/plugin-gradle#prettier-plugins>\n"
+				+ "- for maven <https://github.com/diffplug/spotless/tree/main/plugin-maven#prettier-plugins>";
+	}
+
+	private static String guessPlugin(File file) {
+		return EXTENSIONS_TO_PLUGINS.entrySet().stream()
+				.filter(entry -> file.getName().endsWith(entry.getKey()))
+				.findFirst()
+				.map(entry -> entry.getValue())
+				.orElse("prettier-plugin-" + extension(file));
+	}
+
+	public String fileType() {
+		return extension(file);
+	}
+
+	private static String extension(File file) {
+		return file.getName().substring(file.getName().lastIndexOf('.') + 1);
+	}
+}
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java
index bc8ad1148e..4c458e3ca7 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java
@@ -135,6 +135,29 @@ void useJavaCommunityPlugin() throws IOException {
 		assertFile("JavaTest.java").sameAsResource("npm/prettier/plugins/java-test.clean");
 	}
 
+	@Test
+	void suggestsMissingJavaCommunityPlugin() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"def prettierConfig = [:]",
+				"prettierConfig['tabWidth'] = 4",
+				"def prettierPackages = [:]",
+				"prettierPackages['prettier'] = '2.0.5'",
+				"spotless {",
+				"    format 'java', {",
+				"        target 'JavaTest.java'",
+				"        prettier(prettierPackages).config(prettierConfig)",
+				"    }",
+				"}");
+		setFile("JavaTest.java").toResource("npm/prettier/plugins/java-test.dirty");
+		final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").buildAndFail();
+		Assertions.assertThat(spotlessApply.getOutput()).contains("could not infer a parser");
+		Assertions.assertThat(spotlessApply.getOutput()).contains("prettier-plugin-java");
+	}
+
 	@Test
 	void usePhpCommunityPlugin() throws IOException {
 		setFile("build.gradle").toLines(

From 32eee78c9ed3dfc542213f5a72fdfde2503c005c Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Sun, 22 Jan 2023 21:15:32 +0100
Subject: [PATCH 0648/2068] 1416: limit output fetched by npm process

usually only the last few lines are of interest anyway, so be kind to memory usage.
---
 ...mitedOverwritingByteArrayOutputStream.java | 132 +++++++++++++
 .../com/diffplug/spotless/ProcessRunner.java  |  13 +-
 .../com/diffplug/spotless/npm/NpmProcess.java |   2 +-
 ...dOverwritingByteArrayOutputStreamTest.java | 179 ++++++++++++++++++
 4 files changed, 322 insertions(+), 4 deletions(-)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/LimitedOverwritingByteArrayOutputStream.java
 create mode 100644 lib/src/test/java/com/diffplug/spotless/LimitedOverwritingByteArrayOutputStreamTest.java

diff --git a/lib/src/main/java/com/diffplug/spotless/LimitedOverwritingByteArrayOutputStream.java b/lib/src/main/java/com/diffplug/spotless/LimitedOverwritingByteArrayOutputStream.java
new file mode 100644
index 0000000000..a76039fccd
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/LimitedOverwritingByteArrayOutputStream.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+
+public class LimitedOverwritingByteArrayOutputStream extends ByteArrayOutputStream {
+
+	private final int limit;
+
+	private int zeroIndexPointer = 0;
+
+	private boolean isOverLimit = false;
+
+	public LimitedOverwritingByteArrayOutputStream(int limit) {
+		this(limit, 32);
+	}
+
+	public LimitedOverwritingByteArrayOutputStream(int limit, int initialCapacity) {
+		super(initialCapacity);
+		if (limit < initialCapacity) {
+			throw new IllegalArgumentException("Limit must be greater than initial capacity");
+		}
+		if (limit < 0) {
+			throw new IllegalArgumentException("Limit must be greater than 0");
+		}
+		if (limit % 2 != 0) {
+			throw new IllegalArgumentException("Limit must be even"); // to fit 16 bit unicode chars
+		}
+		this.limit = limit;
+	}
+
+	// ---- writing
+	@Override
+	public synchronized void write(int b) {
+		if (count < limit) {
+			super.write(b);
+			return;
+		}
+		isOverLimit = true;
+		buf[zeroIndexPointer] = (byte) b;
+		zeroIndexPointer = (zeroIndexPointer + 1) % limit;
+	}
+
+	@Override
+	public synchronized void write(byte[] b, int off, int len) {
+		int remaining = limit - count;
+		if (remaining >= len) {
+			super.write(b, off, len);
+			return;
+		}
+		if (remaining > 0) {
+			// write what we can "normally"
+			super.write(b, off, remaining);
+			// rest delegated
+			write(b, off + remaining, len - remaining);
+			return;
+		}
+		// we are over the limit
+		isOverLimit = true;
+		// write till limit is reached
+		int writeTillLimit = Math.min(len, limit - zeroIndexPointer);
+		System.arraycopy(b, off, buf, zeroIndexPointer, writeTillLimit);
+		zeroIndexPointer = (zeroIndexPointer + writeTillLimit) % limit;
+		if (writeTillLimit < len) {
+			// write rest
+			write(b, off + writeTillLimit, len - writeTillLimit);
+		}
+	}
+
+	@Override
+	public synchronized void reset() {
+		super.reset();
+		zeroIndexPointer = 0;
+		isOverLimit = false;
+	}
+
+	// ---- output
+	@Override
+	public synchronized void writeTo(OutputStream out) throws IOException {
+		if (!isOverLimit) {
+			super.writeTo(out);
+			return;
+		}
+		out.write(buf, zeroIndexPointer, limit - zeroIndexPointer);
+		out.write(buf, 0, zeroIndexPointer);
+	}
+
+	@Override
+	public synchronized byte[] toByteArray() {
+		if (!isOverLimit) {
+			return super.toByteArray();
+		}
+		byte[] result = new byte[limit];
+		System.arraycopy(buf, zeroIndexPointer, result, 0, limit - zeroIndexPointer);
+		System.arraycopy(buf, 0, result, limit - zeroIndexPointer, zeroIndexPointer);
+		return result;
+	}
+
+	@Override
+	public synchronized String toString() {
+		if (!isOverLimit) {
+			return super.toString();
+		}
+		return new String(buf, zeroIndexPointer, limit - zeroIndexPointer) + new String(buf, 0, zeroIndexPointer);
+	}
+
+	@Override
+	public synchronized String toString(String charsetName) throws UnsupportedEncodingException {
+		if (!isOverLimit) {
+			return super.toString(charsetName);
+		}
+		return new String(buf, zeroIndexPointer, limit - zeroIndexPointer, charsetName) + new String(buf, 0, zeroIndexPointer, charsetName);
+	}
+
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java b/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
index 4c076e537c..0979c4cbd4 100644
--- a/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
+++ b/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
@@ -52,10 +52,17 @@
 public class ProcessRunner implements AutoCloseable {
 	private final ExecutorService threadStdOut = Executors.newSingleThreadExecutor();
 	private final ExecutorService threadStdErr = Executors.newSingleThreadExecutor();
-	private final ByteArrayOutputStream bufStdOut = new ByteArrayOutputStream();
-	private final ByteArrayOutputStream bufStdErr = new ByteArrayOutputStream();
+	private final ByteArrayOutputStream bufStdOut;
+	private final ByteArrayOutputStream bufStdErr;
 
-	public ProcessRunner() {}
+	public ProcessRunner() {
+		this(-1);
+	}
+
+	public ProcessRunner(int limitedBuffers) {
+		this.bufStdOut = limitedBuffers >= 0 ? new LimitedOverwritingByteArrayOutputStream(limitedBuffers) : new ByteArrayOutputStream();
+		this.bufStdErr = limitedBuffers >= 0 ? new LimitedOverwritingByteArrayOutputStream(limitedBuffers) : new ByteArrayOutputStream();
+	}
 
 	/** Executes the given shell command (using {@code cmd} on windows and {@code sh} on unix). */
 	public Result shell(String cmd) throws IOException, InterruptedException {
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java
index b622cbd8ba..f97193745d 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java
@@ -42,7 +42,7 @@ class NpmProcess {
 		this.workingDir = workingDir;
 		this.npmExecutable = npmExecutable;
 		this.nodeExecutable = nodeExecutable;
-		processRunner = new ProcessRunner();
+		processRunner = new ProcessRunner(100 * 1024); // 100kB
 	}
 
 	void install() {
diff --git a/lib/src/test/java/com/diffplug/spotless/LimitedOverwritingByteArrayOutputStreamTest.java b/lib/src/test/java/com/diffplug/spotless/LimitedOverwritingByteArrayOutputStreamTest.java
new file mode 100644
index 0000000000..63998a4d75
--- /dev/null
+++ b/lib/src/test/java/com/diffplug/spotless/LimitedOverwritingByteArrayOutputStreamTest.java
@@ -0,0 +1,179 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.stream.Stream;
+
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+class LimitedOverwritingByteArrayOutputStreamTest {
+
+	private final byte[] bytes = new byte[]{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9'};
+
+	@ParameterizedTest(name = "{index} writeStrategy: {0}")
+	@MethodSource("writeStrategies")
+	void toStringBehavesNormallyWithinLimit(String name, ByteWriteStrategy writeStrategy) {
+		LimitedOverwritingByteArrayOutputStream stream = new LimitedOverwritingByteArrayOutputStream(12, 1);
+		writeStrategy.write(stream, bytes);
+		Assertions.assertThat(stream.toString()).isEqualTo("0123456789");
+	}
+
+	@ParameterizedTest(name = "{index} writeStrategy: {0}")
+	@MethodSource("writeStrategies")
+	void toStringBehavesOverwritingOverLimit(String name, ByteWriteStrategy writeStrategy) {
+		LimitedOverwritingByteArrayOutputStream stream = new LimitedOverwritingByteArrayOutputStream(4, 1);
+		writeStrategy.write(stream, bytes);
+		Assertions.assertThat(stream.toString()).hasSize(4);
+		Assertions.assertThat(stream.toString()).isEqualTo("6789");
+	}
+
+	@ParameterizedTest(name = "{index} writeStrategy: {0}")
+	@MethodSource("writeStrategies")
+	void toStringBehavesNormallyAtExactlyLimit(String name, ByteWriteStrategy writeStrategy) {
+		LimitedOverwritingByteArrayOutputStream stream = new LimitedOverwritingByteArrayOutputStream(bytes.length, 1);
+		writeStrategy.write(stream, bytes);
+		Assertions.assertThat(stream.toString()).isEqualTo("0123456789");
+	}
+
+	@ParameterizedTest(name = "{index} writeStrategy: {0}")
+	@MethodSource("writeStrategies")
+	void toByteArrayBehavesNormallyWithinLimit(String name, ByteWriteStrategy writeStrategy) {
+		LimitedOverwritingByteArrayOutputStream stream = new LimitedOverwritingByteArrayOutputStream(12, 1);
+		writeStrategy.write(stream, bytes);
+		Assertions.assertThat(stream.toByteArray()).isEqualTo(bytes);
+	}
+
+	@ParameterizedTest(name = "{index} writeStrategy: {0}")
+	@MethodSource("writeStrategies")
+	void toByteArrayBehavesOverwritingOverLimit(String name, ByteWriteStrategy writeStrategy) {
+		LimitedOverwritingByteArrayOutputStream stream = new LimitedOverwritingByteArrayOutputStream(4, 1);
+		writeStrategy.write(stream, bytes);
+		Assertions.assertThat(stream.toByteArray()).hasSize(4);
+		Assertions.assertThat(stream.toByteArray()).isEqualTo(new byte[]{'6', '7', '8', '9'});
+	}
+
+	@ParameterizedTest(name = "{index} writeStrategy: {0}")
+	@MethodSource("writeStrategies")
+	void toByteArrayBehavesOverwritingAtExactlyLimit(String name, ByteWriteStrategy writeStrategy) {
+		LimitedOverwritingByteArrayOutputStream stream = new LimitedOverwritingByteArrayOutputStream(bytes.length, 1);
+		writeStrategy.write(stream, bytes);
+		Assertions.assertThat(stream.toByteArray()).isEqualTo(bytes);
+	}
+
+	@ParameterizedTest(name = "{index} writeStrategy: {0}")
+	@MethodSource("writeStrategies")
+	void writeToBehavesNormallyWithinLimit(String name, ByteWriteStrategy writeStrategy) throws IOException {
+		LimitedOverwritingByteArrayOutputStream stream = new LimitedOverwritingByteArrayOutputStream(12, 1);
+		writeStrategy.write(stream, bytes);
+		ByteArrayOutputStream target = new ByteArrayOutputStream();
+		stream.writeTo(target);
+		Assertions.assertThat(target.toByteArray()).isEqualTo(bytes);
+	}
+
+	@ParameterizedTest(name = "{index} writeStrategy: {0}")
+	@MethodSource("writeStrategies")
+	void writeToBehavesOverwritingOverLimit(String name, ByteWriteStrategy writeStrategy) throws IOException {
+		LimitedOverwritingByteArrayOutputStream stream = new LimitedOverwritingByteArrayOutputStream(4, 1);
+		writeStrategy.write(stream, bytes);
+		ByteArrayOutputStream target = new ByteArrayOutputStream();
+		stream.writeTo(target);
+		Assertions.assertThat(target.toByteArray()).hasSize(4);
+		Assertions.assertThat(target.toByteArray()).isEqualTo(new byte[]{'6', '7', '8', '9'});
+	}
+
+	@ParameterizedTest(name = "{index} writeStrategy: {0}")
+	@MethodSource("writeStrategies")
+	void writeToBehavesNormallyAtExactlyLimit(String name, ByteWriteStrategy writeStrategy) throws IOException {
+		LimitedOverwritingByteArrayOutputStream stream = new LimitedOverwritingByteArrayOutputStream(bytes.length, 1);
+		writeStrategy.write(stream, bytes);
+		ByteArrayOutputStream target = new ByteArrayOutputStream();
+		stream.writeTo(target);
+		Assertions.assertThat(target.toByteArray()).isEqualTo(bytes);
+	}
+
+	@Test
+	void writeToBehavesCorrectlyWhenOverLimitMultipleCalls() {
+		// this test explicitly captures a border case where the buffer is not empty but can exactly fit what we are writing
+		LimitedOverwritingByteArrayOutputStream stream = new LimitedOverwritingByteArrayOutputStream(2, 1);
+		stream.write('0');
+		stream.write(new byte[]{'1', '2'}, 0, 2);
+		Assertions.assertThat(stream.toString()).hasSize(2);
+		Assertions.assertThat(stream.toString()).isEqualTo("12");
+	}
+
+	private static Stream<Arguments> writeStrategies() {
+		return Stream.of(
+				Arguments.of("writeAllAtOnce", allAtOnce()),
+				Arguments.of("writeOneByteAtATime", oneByteAtATime()),
+				Arguments.of("writeTwoBytesAtATime", twoBytesAtATime()),
+				Arguments.of("writeOneAndThenTwoBytesAtATime", oneAndThenTwoBytesAtATime()),
+				Arguments.of("firstFourBytesAndThenTheRest", firstFourBytesAndThenTheRest()));
+	}
+
+	private static ByteWriteStrategy allAtOnce() {
+		return (stream, bytes) -> stream.write(bytes, 0, bytes.length);
+	}
+
+	private static ByteWriteStrategy oneByteAtATime() {
+		return (stream, bytes) -> {
+			for (byte b : bytes) {
+				stream.write(b);
+			}
+		};
+	}
+
+	private static ByteWriteStrategy twoBytesAtATime() {
+		return (stream, bytes) -> {
+			for (int i = 0; i < bytes.length; i += 2) {
+				stream.write(bytes, i, 2);
+			}
+		};
+	}
+
+	private static ByteWriteStrategy oneAndThenTwoBytesAtATime() {
+		return (stream, bytes) -> {
+			int written = 0;
+			for (int i = 0; i + 3 < bytes.length; i += 3) {
+				stream.write(bytes, i, 1);
+				stream.write(bytes, i + 1, 2);
+				written += 3;
+			}
+			if (written < bytes.length) {
+				stream.write(bytes, written, bytes.length - written);
+			}
+
+		};
+	}
+
+	private static ByteWriteStrategy firstFourBytesAndThenTheRest() {
+		return (stream, bytes) -> {
+			stream.write(bytes, 0, 4);
+			stream.write(bytes, 4, bytes.length - 4);
+		};
+	}
+
+	@FunctionalInterface
+	private interface ByteWriteStrategy {
+		void write(LimitedOverwritingByteArrayOutputStream stream, byte[] bytes);
+	}
+
+}

From 8b56d5dafa4af82b6c327121df14ad0612e6494d Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Sun, 22 Jan 2023 21:24:24 +0100
Subject: [PATCH 0649/2068] 1416: document changes

---
 CHANGES.md               | 2 ++
 plugin-gradle/CHANGES.md | 2 ++
 plugin-maven/CHANGES.md  | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 07b81a8fc5..f5882e5d99 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * `ProcessRunner` has added some convenience methods so it can be used for maven testing. ([#1496](https://github.com/diffplug/spotless/pull/1496))
+* `ProcessRunner` allows to limit captured output to a certain number of bytes. ([#1511](https://github.com/diffplug/spotless/pull/1511))
+* `ProcessRunner` is now capable of handling long-running tasks where waiting for exit is delegated to the caller. ([#1511](https://github.com/diffplug/spotless/pull/1511))
 * Allow to specify node executable for node-based formatters using `nodeExecutable` parameter ([#1500](https://github.com/diffplug/spotless/pull/1500))
 ### Fixed
 * The default list of type annotations used by `formatAnnotations` has had 8 more annotations from the Checker Framework added [#1494](https://github.com/diffplug/spotless/pull/1494)
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index cac247a307..f8a6242adf 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 (
 ### Fixed
 * The default list of type annotations used by `formatAnnotations` has had 8 more annotations from the Checker Framework added [#1494](https://github.com/diffplug/spotless/pull/1494)
 ### Changes
+* Prettier will now suggest to install plugins if a parser cannot be inferred from the file extension ([#1511](https://github.com/diffplug/spotless/pull/1511))
+
 
 ## [6.13.0] - 2023-01-14
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index ecb67f231f..f1ab739b62 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -13,6 +13,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * The default list of type annotations used by `formatAnnotations` has had 8 more annotations from the Checker Framework added [#1494](https://github.com/diffplug/spotless/pull/1494)
 ### Changes
 * Spotless' custom build was replaced by [`maven-plugin-development`](https://github.com/britter/maven-plugin-development). ([#1496](https://github.com/diffplug/spotless/pull/1496) fixes [#554](https://github.com/diffplug/spotless/issues/554))
+* Prettier will now suggest to install plugins if a parser cannot be inferred from the file extension ([#1511](https://github.com/diffplug/spotless/pull/1511))
+
 
 ## [2.30.0] - 2023-01-13
 ### Added

From 2c54ee976245a486572c1b728b5f1dd8db1d06e3 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Mon, 23 Jan 2023 08:59:28 +0100
Subject: [PATCH 0650/2068] 1416: Integrate PR Feedback

---
 .../com/diffplug/spotless/ProcessRunner.java  | 10 +++++---
 ...a => RingBufferByteArrayOutputStream.java} | 14 +++++------
 .../com/diffplug/spotless/npm/NpmProcess.java |  2 +-
 ... RingBufferByteArrayOutputStreamTest.java} | 24 +++++++++----------
 4 files changed, 27 insertions(+), 23 deletions(-)
 rename lib/src/main/java/com/diffplug/spotless/{LimitedOverwritingByteArrayOutputStream.java => RingBufferByteArrayOutputStream.java} (88%)
 rename lib/src/test/java/com/diffplug/spotless/{LimitedOverwritingByteArrayOutputStreamTest.java => RingBufferByteArrayOutputStreamTest.java} (83%)

diff --git a/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java b/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
index 0979c4cbd4..4e48042184 100644
--- a/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
+++ b/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
@@ -59,9 +59,13 @@ public ProcessRunner() {
 		this(-1);
 	}
 
-	public ProcessRunner(int limitedBuffers) {
-		this.bufStdOut = limitedBuffers >= 0 ? new LimitedOverwritingByteArrayOutputStream(limitedBuffers) : new ByteArrayOutputStream();
-		this.bufStdErr = limitedBuffers >= 0 ? new LimitedOverwritingByteArrayOutputStream(limitedBuffers) : new ByteArrayOutputStream();
+	public static ProcessRunner usingRingBuffersOfCapacity(int limit) {
+		return new ProcessRunner(limit);
+	}
+
+	private ProcessRunner(int limitedBuffers) {
+		this.bufStdOut = limitedBuffers >= 0 ? new RingBufferByteArrayOutputStream(limitedBuffers) : new ByteArrayOutputStream();
+		this.bufStdErr = limitedBuffers >= 0 ? new RingBufferByteArrayOutputStream(limitedBuffers) : new ByteArrayOutputStream();
 	}
 
 	/** Executes the given shell command (using {@code cmd} on windows and {@code sh} on unix). */
diff --git a/lib/src/main/java/com/diffplug/spotless/LimitedOverwritingByteArrayOutputStream.java b/lib/src/main/java/com/diffplug/spotless/RingBufferByteArrayOutputStream.java
similarity index 88%
rename from lib/src/main/java/com/diffplug/spotless/LimitedOverwritingByteArrayOutputStream.java
rename to lib/src/main/java/com/diffplug/spotless/RingBufferByteArrayOutputStream.java
index a76039fccd..0353b50846 100644
--- a/lib/src/main/java/com/diffplug/spotless/LimitedOverwritingByteArrayOutputStream.java
+++ b/lib/src/main/java/com/diffplug/spotless/RingBufferByteArrayOutputStream.java
@@ -20,7 +20,7 @@
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 
-public class LimitedOverwritingByteArrayOutputStream extends ByteArrayOutputStream {
+class RingBufferByteArrayOutputStream extends ByteArrayOutputStream {
 
 	private final int limit;
 
@@ -28,20 +28,20 @@ public class LimitedOverwritingByteArrayOutputStream extends ByteArrayOutputStre
 
 	private boolean isOverLimit = false;
 
-	public LimitedOverwritingByteArrayOutputStream(int limit) {
+	public RingBufferByteArrayOutputStream(int limit) {
 		this(limit, 32);
 	}
 
-	public LimitedOverwritingByteArrayOutputStream(int limit, int initialCapacity) {
+	public RingBufferByteArrayOutputStream(int limit, int initialCapacity) {
 		super(initialCapacity);
 		if (limit < initialCapacity) {
-			throw new IllegalArgumentException("Limit must be greater than initial capacity");
+			throw new IllegalArgumentException("Limit must be greater than initial capacity. Limit: " + limit + ", initial capacity: " + initialCapacity);
 		}
-		if (limit < 0) {
-			throw new IllegalArgumentException("Limit must be greater than 0");
+		if (limit < 2) {
+			throw new IllegalArgumentException("Limit must be greater than or equal to 2 but is " + limit);
 		}
 		if (limit % 2 != 0) {
-			throw new IllegalArgumentException("Limit must be even"); // to fit 16 bit unicode chars
+			throw new IllegalArgumentException("Limit must be an even number but is " + limit); // to fit 16 bit unicode chars
 		}
 		this.limit = limit;
 	}
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java
index f97193745d..6384900d82 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java
@@ -42,7 +42,7 @@ class NpmProcess {
 		this.workingDir = workingDir;
 		this.npmExecutable = npmExecutable;
 		this.nodeExecutable = nodeExecutable;
-		processRunner = new ProcessRunner(100 * 1024); // 100kB
+		processRunner = ProcessRunner.usingRingBuffersOfCapacity(100 * 1024); // 100kB
 	}
 
 	void install() {
diff --git a/lib/src/test/java/com/diffplug/spotless/LimitedOverwritingByteArrayOutputStreamTest.java b/lib/src/test/java/com/diffplug/spotless/RingBufferByteArrayOutputStreamTest.java
similarity index 83%
rename from lib/src/test/java/com/diffplug/spotless/LimitedOverwritingByteArrayOutputStreamTest.java
rename to lib/src/test/java/com/diffplug/spotless/RingBufferByteArrayOutputStreamTest.java
index 63998a4d75..94fa49dbc1 100644
--- a/lib/src/test/java/com/diffplug/spotless/LimitedOverwritingByteArrayOutputStreamTest.java
+++ b/lib/src/test/java/com/diffplug/spotless/RingBufferByteArrayOutputStreamTest.java
@@ -25,14 +25,14 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-class LimitedOverwritingByteArrayOutputStreamTest {
+class RingBufferByteArrayOutputStreamTest {
 
 	private final byte[] bytes = new byte[]{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9'};
 
 	@ParameterizedTest(name = "{index} writeStrategy: {0}")
 	@MethodSource("writeStrategies")
 	void toStringBehavesNormallyWithinLimit(String name, ByteWriteStrategy writeStrategy) {
-		LimitedOverwritingByteArrayOutputStream stream = new LimitedOverwritingByteArrayOutputStream(12, 1);
+		RingBufferByteArrayOutputStream stream = new RingBufferByteArrayOutputStream(12, 1);
 		writeStrategy.write(stream, bytes);
 		Assertions.assertThat(stream.toString()).isEqualTo("0123456789");
 	}
@@ -40,7 +40,7 @@ void toStringBehavesNormallyWithinLimit(String name, ByteWriteStrategy writeStra
 	@ParameterizedTest(name = "{index} writeStrategy: {0}")
 	@MethodSource("writeStrategies")
 	void toStringBehavesOverwritingOverLimit(String name, ByteWriteStrategy writeStrategy) {
-		LimitedOverwritingByteArrayOutputStream stream = new LimitedOverwritingByteArrayOutputStream(4, 1);
+		RingBufferByteArrayOutputStream stream = new RingBufferByteArrayOutputStream(4, 1);
 		writeStrategy.write(stream, bytes);
 		Assertions.assertThat(stream.toString()).hasSize(4);
 		Assertions.assertThat(stream.toString()).isEqualTo("6789");
@@ -49,7 +49,7 @@ void toStringBehavesOverwritingOverLimit(String name, ByteWriteStrategy writeStr
 	@ParameterizedTest(name = "{index} writeStrategy: {0}")
 	@MethodSource("writeStrategies")
 	void toStringBehavesNormallyAtExactlyLimit(String name, ByteWriteStrategy writeStrategy) {
-		LimitedOverwritingByteArrayOutputStream stream = new LimitedOverwritingByteArrayOutputStream(bytes.length, 1);
+		RingBufferByteArrayOutputStream stream = new RingBufferByteArrayOutputStream(bytes.length, 1);
 		writeStrategy.write(stream, bytes);
 		Assertions.assertThat(stream.toString()).isEqualTo("0123456789");
 	}
@@ -57,7 +57,7 @@ void toStringBehavesNormallyAtExactlyLimit(String name, ByteWriteStrategy writeS
 	@ParameterizedTest(name = "{index} writeStrategy: {0}")
 	@MethodSource("writeStrategies")
 	void toByteArrayBehavesNormallyWithinLimit(String name, ByteWriteStrategy writeStrategy) {
-		LimitedOverwritingByteArrayOutputStream stream = new LimitedOverwritingByteArrayOutputStream(12, 1);
+		RingBufferByteArrayOutputStream stream = new RingBufferByteArrayOutputStream(12, 1);
 		writeStrategy.write(stream, bytes);
 		Assertions.assertThat(stream.toByteArray()).isEqualTo(bytes);
 	}
@@ -65,7 +65,7 @@ void toByteArrayBehavesNormallyWithinLimit(String name, ByteWriteStrategy writeS
 	@ParameterizedTest(name = "{index} writeStrategy: {0}")
 	@MethodSource("writeStrategies")
 	void toByteArrayBehavesOverwritingOverLimit(String name, ByteWriteStrategy writeStrategy) {
-		LimitedOverwritingByteArrayOutputStream stream = new LimitedOverwritingByteArrayOutputStream(4, 1);
+		RingBufferByteArrayOutputStream stream = new RingBufferByteArrayOutputStream(4, 1);
 		writeStrategy.write(stream, bytes);
 		Assertions.assertThat(stream.toByteArray()).hasSize(4);
 		Assertions.assertThat(stream.toByteArray()).isEqualTo(new byte[]{'6', '7', '8', '9'});
@@ -74,7 +74,7 @@ void toByteArrayBehavesOverwritingOverLimit(String name, ByteWriteStrategy write
 	@ParameterizedTest(name = "{index} writeStrategy: {0}")
 	@MethodSource("writeStrategies")
 	void toByteArrayBehavesOverwritingAtExactlyLimit(String name, ByteWriteStrategy writeStrategy) {
-		LimitedOverwritingByteArrayOutputStream stream = new LimitedOverwritingByteArrayOutputStream(bytes.length, 1);
+		RingBufferByteArrayOutputStream stream = new RingBufferByteArrayOutputStream(bytes.length, 1);
 		writeStrategy.write(stream, bytes);
 		Assertions.assertThat(stream.toByteArray()).isEqualTo(bytes);
 	}
@@ -82,7 +82,7 @@ void toByteArrayBehavesOverwritingAtExactlyLimit(String name, ByteWriteStrategy
 	@ParameterizedTest(name = "{index} writeStrategy: {0}")
 	@MethodSource("writeStrategies")
 	void writeToBehavesNormallyWithinLimit(String name, ByteWriteStrategy writeStrategy) throws IOException {
-		LimitedOverwritingByteArrayOutputStream stream = new LimitedOverwritingByteArrayOutputStream(12, 1);
+		RingBufferByteArrayOutputStream stream = new RingBufferByteArrayOutputStream(12, 1);
 		writeStrategy.write(stream, bytes);
 		ByteArrayOutputStream target = new ByteArrayOutputStream();
 		stream.writeTo(target);
@@ -92,7 +92,7 @@ void writeToBehavesNormallyWithinLimit(String name, ByteWriteStrategy writeStrat
 	@ParameterizedTest(name = "{index} writeStrategy: {0}")
 	@MethodSource("writeStrategies")
 	void writeToBehavesOverwritingOverLimit(String name, ByteWriteStrategy writeStrategy) throws IOException {
-		LimitedOverwritingByteArrayOutputStream stream = new LimitedOverwritingByteArrayOutputStream(4, 1);
+		RingBufferByteArrayOutputStream stream = new RingBufferByteArrayOutputStream(4, 1);
 		writeStrategy.write(stream, bytes);
 		ByteArrayOutputStream target = new ByteArrayOutputStream();
 		stream.writeTo(target);
@@ -103,7 +103,7 @@ void writeToBehavesOverwritingOverLimit(String name, ByteWriteStrategy writeStra
 	@ParameterizedTest(name = "{index} writeStrategy: {0}")
 	@MethodSource("writeStrategies")
 	void writeToBehavesNormallyAtExactlyLimit(String name, ByteWriteStrategy writeStrategy) throws IOException {
-		LimitedOverwritingByteArrayOutputStream stream = new LimitedOverwritingByteArrayOutputStream(bytes.length, 1);
+		RingBufferByteArrayOutputStream stream = new RingBufferByteArrayOutputStream(bytes.length, 1);
 		writeStrategy.write(stream, bytes);
 		ByteArrayOutputStream target = new ByteArrayOutputStream();
 		stream.writeTo(target);
@@ -113,7 +113,7 @@ void writeToBehavesNormallyAtExactlyLimit(String name, ByteWriteStrategy writeSt
 	@Test
 	void writeToBehavesCorrectlyWhenOverLimitMultipleCalls() {
 		// this test explicitly captures a border case where the buffer is not empty but can exactly fit what we are writing
-		LimitedOverwritingByteArrayOutputStream stream = new LimitedOverwritingByteArrayOutputStream(2, 1);
+		RingBufferByteArrayOutputStream stream = new RingBufferByteArrayOutputStream(2, 1);
 		stream.write('0');
 		stream.write(new byte[]{'1', '2'}, 0, 2);
 		Assertions.assertThat(stream.toString()).hasSize(2);
@@ -173,7 +173,7 @@ private static ByteWriteStrategy firstFourBytesAndThenTheRest() {
 
 	@FunctionalInterface
 	private interface ByteWriteStrategy {
-		void write(LimitedOverwritingByteArrayOutputStream stream, byte[] bytes);
+		void write(RingBufferByteArrayOutputStream stream, byte[] bytes);
 	}
 
 }

From c0cd99ddc2cdf630423cc4c38b7a0b97dec225ea Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Mon, 23 Jan 2023 09:10:30 +0100
Subject: [PATCH 0651/2068] 1416: spotbugs adaptions

---
 .../com/diffplug/spotless/RingBufferByteArrayOutputStream.java | 3 +++
 .../diffplug/spotless/npm/PrettierMissingParserException.java  | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/RingBufferByteArrayOutputStream.java b/lib/src/main/java/com/diffplug/spotless/RingBufferByteArrayOutputStream.java
index 0353b50846..da4fc6aa04 100644
--- a/lib/src/main/java/com/diffplug/spotless/RingBufferByteArrayOutputStream.java
+++ b/lib/src/main/java/com/diffplug/spotless/RingBufferByteArrayOutputStream.java
@@ -20,6 +20,8 @@
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 class RingBufferByteArrayOutputStream extends ByteArrayOutputStream {
 
 	private final int limit;
@@ -113,6 +115,7 @@ public synchronized byte[] toByteArray() {
 		return result;
 	}
 
+	@SuppressFBWarnings(value = "DM_DEFAULT_ENCODING", justification = "We want to use the default encoding here since this is contract on ByteArrayOutputStream")
 	@Override
 	public synchronized String toString() {
 		if (!isOverLimit) {
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/PrettierMissingParserException.java b/lib/src/main/java/com/diffplug/spotless/npm/PrettierMissingParserException.java
index 73f81a0e07..6956545135 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/PrettierMissingParserException.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/PrettierMissingParserException.java
@@ -92,7 +92,8 @@ private static String recommendPlugin(File file) {
 		return "A good candidate for file '" + file + "' is '" + pluginName + "\n"
 				+ "See if you can find it on <https://prettier.io/docs/en/plugins.html#official-plugins>\n"
 				+ "or search on npmjs.com for a plugin matching that name: "
-				+ String.format("<https://www.npmjs.com/search?ranking=popularity&q=%s>\n\n", pluginName)
+				+ String.format("<https://www.npmjs.com/search?ranking=popularity&q=%s>", pluginName)
+				+ "\n\n"
 				+ "For instructions on how to include plugins for prettier in spotless see our documentation:\n"
 				+ "- for gradle <https://github.com/diffplug/spotless/tree/main/plugin-gradle#prettier-plugins>\n"
 				+ "- for maven <https://github.com/diffplug/spotless/tree/main/plugin-maven#prettier-plugins>";

From 4aa3b7e0f460eaa7a7c329a7868e71060151c95b Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 23 Jan 2023 12:13:01 -0800
Subject: [PATCH 0652/2068] Run spotbugs in all configurations because it's not
 that slow (17 seconds on my M1) and it's confusing to PR authors to not run.

---
 gradle/java-setup.gradle | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gradle/java-setup.gradle b/gradle/java-setup.gradle
index 9c9f394405..f8f2dedf39 100644
--- a/gradle/java-setup.gradle
+++ b/gradle/java-setup.gradle
@@ -34,8 +34,6 @@ tasks.withType(com.github.spotbugs.snom.SpotBugsTask).configureEach {
 }
 
 tasks.named('spotbugsMain') {
-	// only run on Java 8 (no benefit to running twice)
-	enabled = org.gradle.api.JavaVersion.current() == org.gradle.api.JavaVersion.VERSION_11
 	reports {
 		html.enabled = true
 	}

From c849de8a376989005235263e5172fb7141218499 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 23 Jan 2023 15:59:14 -0800
Subject: [PATCH 0653/2068] Revert previous commit b/c spotbugs gives errant
 warnings on Java 8.

---
 gradle/java-setup.gradle | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gradle/java-setup.gradle b/gradle/java-setup.gradle
index f8f2dedf39..9c9f394405 100644
--- a/gradle/java-setup.gradle
+++ b/gradle/java-setup.gradle
@@ -34,6 +34,8 @@ tasks.withType(com.github.spotbugs.snom.SpotBugsTask).configureEach {
 }
 
 tasks.named('spotbugsMain') {
+	// only run on Java 8 (no benefit to running twice)
+	enabled = org.gradle.api.JavaVersion.current() == org.gradle.api.JavaVersion.VERSION_11
 	reports {
 		html.enabled = true
 	}

From 0b2a3295487b43d13f2cc6ab5e058c751588cc9b Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 23 Jan 2023 16:58:29 -0800
Subject: [PATCH 0654/2068] Stop running CI on java 8.

---
 .github/workflows/ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1f08c201f5..e78061fc4c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -37,19 +37,19 @@ jobs:
       fail-fast: false
       matrix:
         kind: [maven, gradle]
-        jre: [8, 11, 17]
+        jre: [11, 17]
         os: [ubuntu-latest]
         include:
           # test windows at the diagonals of the above matrix
           - kind: maven
-            jre: 8
+            jre: 11
             os: windows-latest
           - kind: gradle
             jre: 17
             os: windows-latest
           # npm on linux only (crazy slow on windows)
           - kind: npm
-            jre: 8
+            jre: 11
             os: ubuntu-latest
     runs-on: ${{ matrix.os }}
     steps:

From 826760dbad1912590068c5b6ea0c3c7bb9c4250b Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 23 Jan 2023 16:58:53 -0800
Subject: [PATCH 0655/2068] Run spotbugs on all supported JRE because it's not
 that slow (17 seconds on my M1) and it's confusing to PR authors to not run.

---
 gradle/java-setup.gradle | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gradle/java-setup.gradle b/gradle/java-setup.gradle
index 9c9f394405..f8f2dedf39 100644
--- a/gradle/java-setup.gradle
+++ b/gradle/java-setup.gradle
@@ -34,8 +34,6 @@ tasks.withType(com.github.spotbugs.snom.SpotBugsTask).configureEach {
 }
 
 tasks.named('spotbugsMain') {
-	// only run on Java 8 (no benefit to running twice)
-	enabled = org.gradle.api.JavaVersion.current() == org.gradle.api.JavaVersion.VERSION_11
 	reports {
 		html.enabled = true
 	}

From 1c5a3ef960f1e55f72be0c39c5803e69e23c2291 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 23 Jan 2023 16:59:40 -0800
Subject: [PATCH 0656/2068] Remove `@EnabledForJreRange(min = JAVA_11)` since
 we don't support < Java 11 anymore anyway.

---
 .../extra/java/EclipseJdtFormatterStepTest.java     |  7 ++-----
 .../gradle/spotless/KotlinExtensionTest.java        | 13 -------------
 .../gradle/spotless/KotlinGradleExtensionTest.java  |  6 +-----
 .../spotless/maven/java/GoogleJavaFormatTest.java   |  6 +-----
 .../spotless/maven/java/PalantirJavaFormatTest.java |  6 +-----
 .../diffplug/spotless/maven/kotlin/KtfmtTest.java   |  6 +-----
 .../spotless/java/GoogleJavaFormatStepTest.java     |  6 ++----
 .../spotless/java/PalantirJavaFormatStepTest.java   |  4 +---
 .../com/diffplug/spotless/kotlin/KtfmtStepTest.java |  8 +-------
 9 files changed, 10 insertions(+), 52 deletions(-)

diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepTest.java
index 3e5e1853c7..2ade78f742 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,14 +15,11 @@
  */
 package com.diffplug.spotless.extra.java;
 
-import static org.junit.jupiter.api.condition.JRE.JAVA_11;
-
 import java.io.File;
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledForJreRange;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
@@ -57,7 +54,7 @@ private static Stream<String> formatWithVersion() {
 
 	/** New format interface requires source file information to distinguish module-info from compilation unit */
 	@Nested
-	@EnabledForJreRange(min = JAVA_11)
+
 	class NewFormatInterface extends EclipseResourceHarness {
 		public NewFormatInterface() throws Exception {
 			super(createBuilder(), "module-info.java", getTestResource("java/eclipse/ModuleInfoUnformatted.test"), getTestResource("java/eclipse/ModuleInfoFormatted.test"));
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
index d77b22d0d3..a15a51412e 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
@@ -15,12 +15,9 @@
  */
 package com.diffplug.gradle.spotless;
 
-import static org.junit.jupiter.api.condition.JRE.JAVA_11;
-
 import java.io.IOException;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledForJreRange;
 
 class KotlinExtensionTest extends GradleIntegrationHarness {
 	private static final String HEADER = "// License Header";
@@ -63,7 +60,6 @@ void integrationDiktat() throws IOException {
 	}
 
 	@Test
-	@EnabledForJreRange(min = JAVA_11) // ktfmt's dependency, google-java-format 1.8 requires a minimum of JRE 11+.
 	void integrationKtfmt() throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
@@ -82,7 +78,6 @@ void integrationKtfmt() throws IOException {
 	}
 
 	@Test
-	@EnabledForJreRange(min = JAVA_11) // ktfmt's dependency, google-java-format 1.8 requires a minimum of JRE 11+.
 	void integrationKtfmt_dropboxStyle_0_18() throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
@@ -101,7 +96,6 @@ void integrationKtfmt_dropboxStyle_0_18() throws IOException {
 	}
 
 	@Test
-	@EnabledForJreRange(min = JAVA_11) // ktfmt's dependency, google-java-format 1.8 requires a minimum of JRE 11+.
 	void integrationKtfmt_dropboxStyle_0_19() throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
@@ -197,7 +191,6 @@ void testWithHeader() throws IOException {
 	}
 
 	@Test
-	@EnabledForJreRange(min = JAVA_11) // ktfmt's dependency, google-java-format 1.8 requires a minimum of JRE 11+.
 	void testWithHeaderKtfmt() throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
@@ -236,7 +229,6 @@ void testWithCustomHeaderSeparator() throws IOException {
 	}
 
 	@Test
-	@EnabledForJreRange(min = JAVA_11) // ktfmt's dependency, google-java-format 1.8 requires a minimum of JRE 11+.
 	void testWithCustomHeaderSeparatorKtfmt() throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
@@ -282,7 +274,6 @@ void testWithNonStandardYearSeparator() throws IOException {
 	}
 
 	@Test
-	@EnabledForJreRange(min = JAVA_11) // ktfmt's dependency, google-java-format 1.8 requires a minimum of JRE 11+.
 	void testWithNonStandardYearSeparatorKtfmt() throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
@@ -309,7 +300,6 @@ void testWithNonStandardYearSeparatorKtfmt() throws IOException {
 	}
 
 	@Test
-	@EnabledForJreRange(min = JAVA_11) // ktfmt's dependency, google-java-format 1.8 requires a minimum of JRE 11+.
 	void testWithCustomMaxWidthDefaultStyleKtfmt() throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
@@ -331,7 +321,6 @@ void testWithCustomMaxWidthDefaultStyleKtfmt() throws IOException {
 	}
 
 	@Test
-	@EnabledForJreRange(min = JAVA_11) // ktfmt's dependency, google-java-format 1.8 requires a minimum of JRE 11+.
 	void testWithCustomMaxWidthDefaultStyleKtfmtGradleKts() throws IOException {
 		setFile("build.gradle.kts").toLines(
 				"plugins {",
@@ -353,7 +342,6 @@ void testWithCustomMaxWidthDefaultStyleKtfmtGradleKts() throws IOException {
 	}
 
 	@Test
-	@EnabledForJreRange(min = JAVA_11) // ktfmt's dependency, google-java-format 1.8 requires a minimum of JRE 11+.
 	void testWithCustomMaxWidthDropboxStyleKtfmt() throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
@@ -375,7 +363,6 @@ void testWithCustomMaxWidthDropboxStyleKtfmt() throws IOException {
 	}
 
 	@Test
-	@EnabledForJreRange(min = JAVA_11) // ktfmt's dependency, google-java-format 1.8 requires a minimum of JRE 11+.
 	void testWithCustomMaxWidthDropboxStyleKtfmtGradleKts() throws IOException {
 		setFile("build.gradle.kts").toLines(
 				"plugins {",
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
index 0f3438ffff..015414c331 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,13 +16,11 @@
 package com.diffplug.gradle.spotless;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.condition.JRE.JAVA_11;
 
 import java.io.IOException;
 
 import org.gradle.testkit.runner.BuildResult;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledForJreRange;
 
 class KotlinGradleExtensionTest extends GradleIntegrationHarness {
 	@Test
@@ -151,7 +149,6 @@ void withExperimentalEditorConfigOverride() throws IOException {
 	}
 
 	@Test
-	@EnabledForJreRange(min = JAVA_11) // ktfmt's dependency, google-java-format 1.8 requires a minimum of JRE 11+.
 	void integration_ktfmt() throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
@@ -170,7 +167,6 @@ void integration_ktfmt() throws IOException {
 	}
 
 	@Test
-	@EnabledForJreRange(min = JAVA_11) // ktfmt's dependency, google-java-format 1.8 requires a minimum of JRE 11+.
 	void integration_ktfmt_with_dropbox_style() throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/GoogleJavaFormatTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/GoogleJavaFormatTest.java
index 6fbff78cc7..98a83d612c 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/GoogleJavaFormatTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/GoogleJavaFormatTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +15,7 @@
  */
 package com.diffplug.spotless.maven.java;
 
-import static org.junit.jupiter.api.condition.JRE.JAVA_11;
-
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledForJreRange;
 
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
 
@@ -45,7 +42,6 @@ void specificVersionSpecificStyle() throws Exception {
 	}
 
 	@Test
-	@EnabledForJreRange(min = JAVA_11)
 	void specificVersionReflowLongStrings() throws Exception {
 		writePomWithJavaSteps(
 				"<googleJavaFormat>",
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/PalantirJavaFormatTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/PalantirJavaFormatTest.java
index 33ec8ea84f..d8d66fa46d 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/PalantirJavaFormatTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/PalantirJavaFormatTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 DiffPlug
+ * Copyright 2022-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +15,7 @@
  */
 package com.diffplug.spotless.maven.java;
 
-import static org.junit.jupiter.api.condition.JRE.JAVA_11;
-
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledForJreRange;
 
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
 
@@ -34,7 +31,6 @@ void specificVersionDefaultStyle() throws Exception {
 	}
 
 	@Test
-	@EnabledForJreRange(min = JAVA_11)
 	void specificJava11Version2() throws Exception {
 		writePomWithJavaSteps(
 				"<palantirJavaFormat>",
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtfmtTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtfmtTest.java
index 88dcd172e0..4ae266cc23 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtfmtTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtfmtTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,14 +15,10 @@
  */
 package com.diffplug.spotless.maven.kotlin;
 
-import static org.junit.jupiter.api.condition.JRE.JAVA_11;
-
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledForJreRange;
 
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
 
-@EnabledForJreRange(min = JAVA_11) // ktfmt's dependency, google-java-format 1.8 requires a minimum of JRE 11+.
 class KtfmtTest extends MavenIntegrationHarness {
 	@Test
 	void testKtfmt() throws Exception {
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java
index cf2a90ad79..ff64b574e1 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  */
 package com.diffplug.spotless.java;
 
-import static org.junit.jupiter.api.condition.JRE.JAVA_11;
 import static org.junit.jupiter.api.condition.JRE.JAVA_13;
 import static org.junit.jupiter.api.condition.JRE.JAVA_15;
 
@@ -42,7 +41,7 @@ void jvm13Features() throws Exception {
 	}
 
 	@Test
-	@EnabledForJreRange(min = JAVA_11, max = JAVA_15) // google-java-format requires JRE 11+
+	@EnabledForJreRange(max = JAVA_15) // google-java-format requires JRE 11+
 	void behavior18() throws Exception {
 		FormatterStep step = GoogleJavaFormatStep.create("1.8", TestProvisioner.mavenCentral());
 		StepHarness.forStep(step)
@@ -125,7 +124,6 @@ protected FormatterStep create() {
 	}
 
 	@Test
-	@EnabledForJreRange(min = JAVA_11) // google-java-format requires JRE 11+
 	void equalityGroupArtifact() throws Exception {
 		new SerializableEqualityTester() {
 			String groupArtifact = GoogleJavaFormatStep.defaultGroupArtifact();
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/PalantirJavaFormatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/PalantirJavaFormatStepTest.java
index ad358cafc6..dfd59c2655 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/PalantirJavaFormatStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/PalantirJavaFormatStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 DiffPlug
+ * Copyright 2022-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  */
 package com.diffplug.spotless.java;
 
-import static org.junit.jupiter.api.condition.JRE.JAVA_11;
 import static org.junit.jupiter.api.condition.JRE.JAVA_13;
 
 import org.junit.jupiter.api.Test;
@@ -38,7 +37,6 @@ void jvm13Features() throws Exception {
 	}
 
 	@Test
-	@EnabledForJreRange(min = JAVA_11)
 	void behavior2() throws Exception {
 		FormatterStep step = PalantirJavaFormatStep.create("2.28.0", TestProvisioner.mavenCentral());
 		StepHarness.forStep(step)
diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java
index ddaf1b324b..bfa971fc40 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,32 +15,26 @@
  */
 package com.diffplug.spotless.kotlin;
 
-import static org.junit.jupiter.api.condition.JRE.JAVA_11;
-
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledForJreRange;
 
 import com.diffplug.spotless.*;
 
 @Disabled
 class KtfmtStepTest extends ResourceHarness {
 	@Test
-	@EnabledForJreRange(min = JAVA_11) // ktfmt's dependency, google-java-format 1.8 requires a minimum of JRE 11+.
 	void behavior() throws Exception {
 		FormatterStep step = KtfmtStep.create(TestProvisioner.mavenCentral());
 		StepHarness.forStep(step).testResource("kotlin/ktfmt/basic.dirty", "kotlin/ktfmt/basic.clean");
 	}
 
 	@Test
-	@EnabledForJreRange(min = JAVA_11) // ktfmt's dependency, google-java-format 1.8 requires a minimum of JRE 11+.
 	void dropboxStyle_0_18() throws Exception {
 		FormatterStep step = KtfmtStep.create("0.18", TestProvisioner.mavenCentral(), KtfmtStep.Style.DROPBOX, null);
 		StepHarness.forStep(step).testResource("kotlin/ktfmt/basic.dirty", "kotlin/ktfmt/basic-dropboxstyle.clean");
 	}
 
 	@Test
-	@EnabledForJreRange(min = JAVA_11) // ktfmt's dependency, google-java-format 1.8 requires a minimum of JRE 11+.
 	void dropboxStyle_0_19() throws Exception {
 		FormatterStep step = KtfmtStep.create("0.19", TestProvisioner.mavenCentral(), KtfmtStep.Style.DROPBOX, null);
 		StepHarness.forStep(step).testResource("kotlin/ktfmt/basic.dirty", "kotlin/ktfmt/basic-dropboxstyle.clean");

From 14e71fb57d313726b0b11f9ece946001540d55cc Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 23 Jan 2023 17:02:39 -0800
Subject: [PATCH 0657/2068] The maven and gradle plugins yell at their users to
 update to Java 11, and how to update without affecting their users.

---
 .../com/diffplug/gradle/spotless/SpotlessPlugin.java  | 10 +++++++++-
 .../diffplug/spotless/maven/AbstractSpotlessMojo.java | 11 +++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPlugin.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPlugin.java
index 868502d216..91847af0cf 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPlugin.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,21 +16,29 @@
 package com.diffplug.gradle.spotless;
 
 import org.gradle.api.GradleException;
+import org.gradle.api.JavaVersion;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.plugins.BasePlugin;
 
+import com.diffplug.spotless.Jvm;
 import com.diffplug.spotless.SpotlessCache;
 
 public class SpotlessPlugin implements Plugin<Project> {
 	static final String SPOTLESS_MODERN = "spotlessModern";
 	static final String MINIMUM_GRADLE = "6.1.1";
+	private static final int MINIMUM_JRE = 11;
 
 	@Override
 	public void apply(Project project) {
 		if (SpotlessPluginRedirect.gradleIsTooOld(project)) {
 			throw new GradleException("Spotless requires Gradle " + MINIMUM_GRADLE + " or newer, this was " + project.getGradle().getGradleVersion());
 		}
+		if (Jvm.version() < MINIMUM_JRE) {
+			throw new GradleException("Spotless requires JRE " + MINIMUM_JRE + " or newer, this was " + JavaVersion.current() + ".\n"
+					+ "You can upgrade your build JRE and still compile for older targets, see below\n"
+					+ "https://docs.gradle.org/current/userguide/building_java_projects.html#sec:java_cross_compilation");
+		}
 		// if -PspotlessModern=true, then use the modern stuff instead of the legacy stuff
 		if (project.hasProperty(SPOTLESS_MODERN)) {
 			project.getLogger().warn("'spotlessModern' has no effect as of Spotless 5.0, recommend removing it.");
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
index e594c724ef..c4082f52e0 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
@@ -53,6 +53,7 @@
 import org.sonatype.plexus.build.incremental.BuildContext;
 
 import com.diffplug.spotless.Formatter;
+import com.diffplug.spotless.Jvm;
 import com.diffplug.spotless.LineEnding;
 import com.diffplug.spotless.Provisioner;
 import com.diffplug.spotless.generic.LicenseHeaderStep;
@@ -190,6 +191,16 @@ public abstract class AbstractSpotlessMojo extends AbstractMojo {
 
 	protected abstract void process(Iterable<File> files, Formatter formatter, UpToDateChecker upToDateChecker) throws MojoExecutionException;
 
+	private static final int MINIMUM_JRE = 11;
+
+	protected AbstractSpotlessMojo() {
+		if (Jvm.version() < MINIMUM_JRE) {
+			throw new RuntimeException("Spotless requires JRE " + MINIMUM_JRE + " or newer, this was " + Jvm.version() + ".\n"
+					+ "You can upgrade your build JRE and still compile for older targets, see below\n"
+					+ "https://docs.gradle.org/current/userguide/building_java_projects.html#sec:java_cross_compilation");
+		}
+	}
+
 	@Override
 	public final void execute() throws MojoExecutionException {
 		if (shouldSkip()) {

From b0975be27dab83fb62012650a273662e193f648a Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 23 Jan 2023 17:02:48 -0800
Subject: [PATCH 0658/2068] Update changelogs.

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 3 ++-
 plugin-maven/CHANGES.md  | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index f5882e5d99..4c6a1aa0c4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -18,6 +18,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * The default list of type annotations used by `formatAnnotations` has had 8 more annotations from the Checker Framework added [#1494](https://github.com/diffplug/spotless/pull/1494)
 ### Changes
+* **POTENTIALLY BREAKING** Bump minimum JRE from 8 to 11, next release likely to bump bytecode to Java 11 ([#1514](https://github.com/diffplug/spotless/pull/1514) part 1 of [#1337](https://github.com/diffplug/spotless/issues/1337))
 * Rename `YamlJacksonStep` into `JacksonYamlStep` while normalizing Jackson usage ([#1492](https://github.com/diffplug/spotless/pull/1492))
 
 ## [2.32.0] - 2023-01-13
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index f8a6242adf..fa2119f8c5 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -10,9 +10,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * The default list of type annotations used by `formatAnnotations` has had 8 more annotations from the Checker Framework added [#1494](https://github.com/diffplug/spotless/pull/1494)
 ### Changes
+* **POTENTIALLY BREAKING** Bump minimum JRE from 8 to 11 ([#1514](https://github.com/diffplug/spotless/pull/1514) part 1 of [#1337](https://github.com/diffplug/spotless/issues/1337))
+  * You can bump your build JRE without bumping your requirements ([docs](https://docs.gradle.org/current/userguide/building_java_projects.html#sec:java_cross_compilation)).
 * Prettier will now suggest to install plugins if a parser cannot be inferred from the file extension ([#1511](https://github.com/diffplug/spotless/pull/1511))
 
-
 ## [6.13.0] - 2023-01-14
 ### Added
 * **POTENTIALLY BREAKING** `ktlint` step now supports `.editorconfig` ([#1442](https://github.com/diffplug/spotless/pull/1442) implements [#142](https://github.com/diffplug/spotless/issues/142))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index f1ab739b62..66ef83fb6f 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -12,10 +12,11 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * The default list of type annotations used by `formatAnnotations` has had 8 more annotations from the Checker Framework added [#1494](https://github.com/diffplug/spotless/pull/1494)
 ### Changes
+* **POTENTIALLY BREAKING** Bump minimum JRE from 8 to 11 ([#1514](https://github.com/diffplug/spotless/pull/1514) part 1 of [#1337](https://github.com/diffplug/spotless/issues/1337))
+  * You can bump your build JRE without bumping your requirements ([docs](https://maven.apache.org/plugins/maven-compiler-plugin/examples/set-compiler-source-and-target.html)).
 * Spotless' custom build was replaced by [`maven-plugin-development`](https://github.com/britter/maven-plugin-development). ([#1496](https://github.com/diffplug/spotless/pull/1496) fixes [#554](https://github.com/diffplug/spotless/issues/554))
 * Prettier will now suggest to install plugins if a parser cannot be inferred from the file extension ([#1511](https://github.com/diffplug/spotless/pull/1511))
 
-
 ## [2.30.0] - 2023-01-13
 ### Added
 * Add option `editorConfigFile` for `ktLint` [#142](https://github.com/diffplug/spotless/issues/142)

From 5955883bf5fb7bb77f8a970725040a74e8b56205 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 24 Jan 2023 16:12:13 +0800
Subject: [PATCH 0659/2068] Defer more test configurations

---
 _ext/eclipse-wtp/build.gradle | 2 +-
 _ext/gradle/java-setup.gradle | 4 +++-
 gradle/special-tests.gradle   | 2 +-
 lib-extra/build.gradle        | 2 +-
 plugin-gradle/build.gradle    | 2 +-
 testlib/build.gradle          | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/_ext/eclipse-wtp/build.gradle b/_ext/eclipse-wtp/build.gradle
index 92a78578f6..feacfbf4c1 100644
--- a/_ext/eclipse-wtp/build.gradle
+++ b/_ext/eclipse-wtp/build.gradle
@@ -100,7 +100,7 @@ sourceSets {
  * All test classes need to run separately since they all instatiate different setups of the
  * Eclipse framework.
  */
-test {
+tasks.withType(Test).configureEach {
 	//Skip default tests, which would run every test case.
 	exclude '**'
 }
diff --git a/_ext/gradle/java-setup.gradle b/_ext/gradle/java-setup.gradle
index 598077d73c..9572fc2955 100644
--- a/_ext/gradle/java-setup.gradle
+++ b/_ext/gradle/java-setup.gradle
@@ -22,4 +22,6 @@ dependencies {
 	testImplementation project(':testlib')
 }
 
-test { useJUnitPlatform() }
+tasks.withType(Test).configureEach {
+	useJUnitPlatform()
+}
diff --git a/gradle/special-tests.gradle b/gradle/special-tests.gradle
index c435bc7e81..fd5f602243 100644
--- a/gradle/special-tests.gradle
+++ b/gradle/special-tests.gradle
@@ -7,7 +7,7 @@ def special = [
 ]
 
 boolean isCiServer = System.getenv().containsKey("CI")
-tasks.named('test') {
+tasks.withType(Test).configureEach {
 	// See com.diffplug.spotless.tag package for available JUnit 5 @Tag annotations
 	useJUnitPlatform {
 		excludeTags special as String[]
diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index 08bf286d8d..8381d14041 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -26,7 +26,7 @@ dependencies {
 spotbugs { reportLevel = 'low' } // low|medium|high (low = sensitive to even minor mistakes)
 
 apply from: rootProject.file('gradle/special-tests.gradle')
-tasks.named('test') {
+tasks.withType(Test).configureEach {
 	if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_16)) {
 		// needed for EclipseCdtFormatterStepTest
 		jvmArgs '--add-opens=java.base/java.lang=ALL-UNNAMED'
diff --git a/plugin-gradle/build.gradle b/plugin-gradle/build.gradle
index 11258db0e6..3e44335276 100644
--- a/plugin-gradle/build.gradle
+++ b/plugin-gradle/build.gradle
@@ -28,7 +28,7 @@ dependencies {
 }
 
 apply from: rootProject.file('gradle/special-tests.gradle')
-tasks.named('test') {
+tasks.withType(Test).configureEach {
 	testLogging.showStandardStreams = true
 }
 
diff --git a/testlib/build.gradle b/testlib/build.gradle
index 64d4681805..639df8a2ab 100644
--- a/testlib/build.gradle
+++ b/testlib/build.gradle
@@ -22,7 +22,7 @@ dependencies {
 spotbugs { reportLevel = 'high' } // low|medium|high (low = sensitive to even minor mistakes)
 
 apply from: rootProject.file('gradle/special-tests.gradle')
-tasks.named('test') {
+tasks.withType(Test).configureEach {
 	if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_16)) {
 		// for Antlr4FormatterStepTest and KtLintStepTest
 		def args = [

From c4df046be318e7a780a7e3b9ba100ceb62d1be3a Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 24 Jan 2023 16:43:18 +0800
Subject: [PATCH 0660/2068] Let check depend on version compatibility tasks

https://github.com/davidburstrom/version-compatibility-gradle-plugin#lifecycle-tasks
---
 lib/build.gradle | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/build.gradle b/lib/build.gradle
index 30c8fe8b15..0b42c7bcc1 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -42,6 +42,11 @@ versionCompatibility {
 	}
 }
 
+tasks.named("check").configure {
+	dependsOn(tasks.named("testCompatibilityAdapters"))
+	dependsOn(tasks.named("testCompatibility"))
+}
+
 dependencies {
 	compileOnly 'org.slf4j:slf4j-api:2.0.0'
 	// zero runtime reqs is a hard requirements for spotless-lib

From 057f6c42a0dbbe61f7a77ec14828a7f233e6b250 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 24 Jan 2023 17:09:22 +0800
Subject: [PATCH 0661/2068] Make KtLintCompat0Dot48Dot0AdapterTest workable

https://github.com/pinterest/ktlint/blob/2642124cfec306050dd0258870a16dc95aaa106c/build-logic/src/main/kotlin/ToolchainForTests.kt#L16-L35
---
 lib/build.gradle                                | 17 +++++++++++++++++
 .../KtLintCompat0Dot48Dot0AdapterTest.java      |  7 +++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 0b42c7bcc1..1a112c78cc 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -119,6 +119,23 @@ dependencies {
 spotbugs { reportLevel = 'low' } // low|medium|high (low = sensitive to even minor mistakes)
 
 apply from: rootProject.file('gradle/special-tests.gradle')
+tasks.withType(Test).configureEach {
+	def jdkVersion = JavaVersion.current().majorVersion.toInteger()
+	def args = []
+	if (jdkVersion >= 16) {
+		// https://docs.gradle.org/7.5/userguide/upgrading_version_7.html#removes_implicit_add_opens_for_test_workers
+		args += [
+			"--add-opens=java.base/java.lang=ALL-UNNAMED",
+			"--add-opens=java.base/java.util=ALL-UNNAMED",
+		]
+	}
+	if (jdkVersion >= 18) {
+		// https://openjdk.org/jeps/411
+		args += "-Djava.security.manager=allow"
+	}
+	jvmArgs(args)
+}
+
 jar {
 	for (glue in NEEDS_GLUE) {
 		from sourceSets.getByName(glue).output.classesDirs
diff --git a/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java b/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java
index 6825b3d818..8804f86b08 100644
--- a/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java
+++ b/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java
@@ -22,6 +22,7 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -33,12 +34,13 @@ public class KtLintCompat0Dot48Dot0AdapterTest {
 	public void testDefaults(@TempDir Path path) throws IOException {
 		KtLintCompat0Dot48Dot0Adapter ktLintCompat0Dot48Dot0Adapter = new KtLintCompat0Dot48Dot0Adapter();
 		String text = loadAndWriteText(path, "empty_class_body.kt");
+		final Path filePath = Paths.get(path.toString(), "empty_class_body.kt");
 
 		Map<String, String> userData = new HashMap<>();
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 
-		String formatted = ktLintCompat0Dot48Dot0Adapter.format(text, path, false, false, null, userData, editorConfigOverrideMap);
+		String formatted = ktLintCompat0Dot48Dot0Adapter.format(text, filePath, false, false, null, userData, editorConfigOverrideMap);
 		assertEquals("class empty_class_body\n", formatted);
 	}
 
@@ -46,6 +48,7 @@ public void testDefaults(@TempDir Path path) throws IOException {
 	public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		KtLintCompat0Dot48Dot0Adapter ktLintCompat0Dot48Dot0Adapter = new KtLintCompat0Dot48Dot0Adapter();
 		String text = loadAndWriteText(path, "fails_no_semicolons.kt");
+		final Path filePath = Paths.get(path.toString(), "fails_no_semicolons.kt");
 
 		Map<String, String> userData = new HashMap<>();
 
@@ -53,7 +56,7 @@ public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		editorConfigOverrideMap.put("indent_style", "tab");
 		editorConfigOverrideMap.put("ktlint_standard_no-semi", "disabled");
 
-		String formatted = ktLintCompat0Dot48Dot0Adapter.format(text, path, false, false, null, userData, editorConfigOverrideMap);
+		String formatted = ktLintCompat0Dot48Dot0Adapter.format(text, filePath, false, false, null, userData, editorConfigOverrideMap);
 		assertEquals("class fails_no_semicolons {\n\tval i = 0;\n}\n", formatted);
 	}
 

From e6b290084e7b1e40a031ae4c1cf954aeef7b5cc9 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 24 Jan 2023 23:13:36 +0800
Subject: [PATCH 0662/2068] Cleanup usages of gradle/gradle-build-action

- Remove cache from actions/setup-java.
- Enable gradle-home-cache-cleanup flag, see https://github.com/gradle/gradle-build-action/blob/main/README.md#removing-unused-files-from-gradle-user-home-before-saving-to-cache.
---
 .github/workflows/changelog-print.yml |  3 ++-
 .github/workflows/ci.yml              | 10 ++++++++--
 .github/workflows/deploy.yml          |  3 ++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/changelog-print.yml b/.github/workflows/changelog-print.yml
index 330f78cda0..a3009e3a39 100644
--- a/.github/workflows/changelog-print.yml
+++ b/.github/workflows/changelog-print.yml
@@ -15,7 +15,8 @@ jobs:
         with:
           java-version: 11
           distribution: 'temurin'
-          cache: 'gradle'
       - name: gradle caching
         uses: gradle/gradle-build-action@v2
+        with:
+          gradle-home-cache-cleanup: true
       - run: ./gradlew changelogPrint
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1f08c201f5..86cf955059 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,7 +26,10 @@ jobs:
         with:
           distribution: "temurin"
           java-version: 11
-          cache: gradle
+      - name: gradle caching
+        uses: gradle/gradle-build-action@v2
+        with:
+          gradle-home-cache-cleanup: true
       - name: spotlessCheck
         run: ./gradlew spotlessCheck --build-cache
       - name: assemble testClasses
@@ -60,7 +63,10 @@ jobs:
         with:
           distribution: "temurin"
           java-version: ${{ matrix.jre }}
-          cache: gradle
+      - name: gradle caching
+        uses: gradle/gradle-build-action@v2
+        with:
+          gradle-home-cache-cleanup: true
       - name: build (maven-only)
         if: matrix.kind == 'maven'
         run: ./gradlew :plugin-maven:build -x spotlessCheck --build-cache
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 9a1dcdf609..d41dc8fc30 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -42,9 +42,10 @@ jobs:
         with:
           java-version: 11
           distribution: 'temurin'
-          cache: 'gradle'
       - name: gradle caching
         uses: gradle/gradle-build-action@v2
+        with:
+          gradle-home-cache-cleanup: true
       - name: publish all
         if: "${{ github.event.inputs.to_publish == 'all' }}"
         run: |

From 8be92ffc42d6beb9a62397b9d0d9cccb075e9b90 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 24 Jan 2023 23:17:01 +0800
Subject: [PATCH 0663/2068] Mark bat files end with CRLF

---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitattributes b/.gitattributes
index e6141d8894..dc4cb6b0bd 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,4 @@
 * text eol=lf
+*.bat eol=crlf
 *.png binary
 *.jar binary

From 92b3cf85596384115ea04d41a039b5e3c47bfb7f Mon Sep 17 00:00:00 2001
From: Abel Keszei <keszeiabel@gmail.com>
Date: Tue, 24 Jan 2023 21:17:32 +0100
Subject: [PATCH 0664/2068] keep old signature of GsonStep.create() and restore
 GsonConfig classname

---
 .../diffplug/spotless/json/gson/GsonStep.java |  5 +++++
 .../gradle/spotless/JsonExtension.java        | 19 +++++++++----------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
index 03baec5104..ec90255b77 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
@@ -30,6 +30,11 @@ public class GsonStep {
 	private static final String MAVEN_COORDINATES = "com.google.code.gson:gson";
 	private static final String INCOMPATIBLE_ERROR_MESSAGE = "There was a problem interacting with Gson; maybe you set an incompatible version?";
 
+	@Deprecated
+	public static FormatterStep create(int indentSpaces, boolean sortByKeys, boolean escapeHtml, String version, Provisioner provisioner) {
+		return create(new GsonConfig(sortByKeys, escapeHtml, indentSpaces, version), provisioner);
+	}
+
 	public static FormatterStep create(GsonConfig gsonConfig, Provisioner provisioner) {
 		Objects.requireNonNull(provisioner, "provisioner cannot be null");
 		return FormatterStep.createLazy("gson", () -> new State(gsonConfig, provisioner), State::toFormatter);
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
index c684dab291..39b158ce1e 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
@@ -23,7 +23,6 @@
 import com.diffplug.spotless.json.JacksonJsonConfig;
 import com.diffplug.spotless.json.JacksonJsonStep;
 import com.diffplug.spotless.json.JsonSimpleStep;
-import com.diffplug.spotless.json.gson.GsonConfig;
 import com.diffplug.spotless.json.gson.GsonStep;
 
 public class JsonExtension extends FormatExtension {
@@ -48,8 +47,8 @@ public SimpleConfig simple() {
 		return new SimpleConfig(DEFAULT_INDENTATION);
 	}
 
-	public GsonGradleConfig gson() {
-		return new GsonGradleConfig();
+	public GsonConfig gson() {
+		return new GsonConfig();
 	}
 
 	public JacksonJsonGradleConfig jackson() {
@@ -74,13 +73,13 @@ private FormatterStep createStep() {
 		}
 	}
 
-	public class GsonGradleConfig {
+	public class GsonConfig {
 		private int indentSpaces;
 		private boolean sortByKeys;
 		private boolean escapeHtml;
 		private String version;
 
-		public GsonGradleConfig() {
+		public GsonConfig() {
 			this.indentSpaces = DEFAULT_INDENTATION;
 			this.sortByKeys = false;
 			this.escapeHtml = false;
@@ -88,32 +87,32 @@ public GsonGradleConfig() {
 			addStep(createStep());
 		}
 
-		public GsonGradleConfig indentWithSpaces(int indentSpaces) {
+		public GsonConfig indentWithSpaces(int indentSpaces) {
 			this.indentSpaces = indentSpaces;
 			replaceStep(createStep());
 			return this;
 		}
 
-		public GsonGradleConfig sortByKeys() {
+		public GsonConfig sortByKeys() {
 			this.sortByKeys = true;
 			replaceStep(createStep());
 			return this;
 		}
 
-		public GsonGradleConfig escapeHtml() {
+		public GsonConfig escapeHtml() {
 			this.escapeHtml = true;
 			replaceStep(createStep());
 			return this;
 		}
 
-		public GsonGradleConfig version(String version) {
+		public GsonConfig version(String version) {
 			this.version = version;
 			replaceStep(createStep());
 			return this;
 		}
 
 		private FormatterStep createStep() {
-			return GsonStep.create(new GsonConfig(sortByKeys, escapeHtml, indentSpaces, version), provisioner());
+			return GsonStep.create(new com.diffplug.spotless.json.gson.GsonConfig(sortByKeys, escapeHtml, indentSpaces, version), provisioner());
 		}
 	}
 

From 9982c3a7f30cd3a12467f9fb7f18fde6b155a815 Mon Sep 17 00:00:00 2001
From: Eir Nym <485399+eirnym@users.noreply.github.com>
Date: Wed, 25 Jan 2023 02:08:01 +0100
Subject: [PATCH 0665/2068] Drop some old tests

---
 .../spotless/kotlin/KtLintStepTest.java       | 62 -------------------
 1 file changed, 62 deletions(-)

diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
index 1be0c7b72f..f69d038b6a 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
@@ -37,68 +37,6 @@ void behavior() {
 								"Wildcard import");
 	}
 
-	@Test
-	void worksShyiko() {
-		FormatterStep step = KtLintStep.create("0.31.0", TestProvisioner.mavenCentral());
-		StepHarnessWithFile.forStep(this, step)
-				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean")
-				.testResourceExceptionMsg("kotlin/ktlint/unsolvable.dirty").isEqualTo(
-						"Error on line: 1, column: 1\n" +
-								"rule: no-wildcard-imports\n" +
-								"Wildcard import");
-	}
-
-	// Regression test to ensure it works on the version it switched to Pinterest (version 0.32.0)
-	// but before 0.34.
-	// https://github.com/diffplug/spotless/issues/419
-	@Test
-	void worksPinterestAndPre034() {
-		FormatterStep step = KtLintStep.create("0.32.0", TestProvisioner.mavenCentral());
-		StepHarnessWithFile.forStep(this, step)
-				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean")
-				.testResourceExceptionMsg("kotlin/ktlint/unsolvable.dirty").isEqualTo("Error on line: 1, column: 1\n" +
-						"rule: no-wildcard-imports\n" +
-						"Wildcard import");
-	}
-
-	// Regression test to handle alpha and 1.x version numbers
-	// https://github.com/diffplug/spotless/issues/668
-	@Test
-	void worksAlpha1() {
-		FormatterStep step = KtLintStep.create("0.38.0-alpha01", TestProvisioner.mavenCentral());
-		StepHarness.forStep(step)
-				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean");
-	}
-
-	@Test
-	void works0_44_0() {
-		FormatterStep step = KtLintStep.create("0.44.0", TestProvisioner.mavenCentral());
-		StepHarness.forStep(step)
-				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean");
-	}
-
-	@Disabled("https://github.com/pinterest/ktlint/issues/1421")
-	@Test
-	void works0_45_0() {
-		FormatterStep step = KtLintStep.create("0.45.0", TestProvisioner.mavenCentral());
-		StepHarness.forStep(step)
-				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean");
-	}
-
-	@Test
-	void works0_45_1() {
-		FormatterStep step = KtLintStep.create("0.45.1", TestProvisioner.mavenCentral());
-		StepHarness.forStep(step)
-				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean");
-	}
-
-	@Test
-	void works0_45_2() {
-		FormatterStep step = KtLintStep.create("0.45.2", TestProvisioner.mavenCentral());
-		StepHarness.forStep(step)
-				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean");
-	}
-
 	@Test
 	void works0_46_0() {
 		FormatterStep step = KtLintStep.create("0.46.0", TestProvisioner.mavenCentral());

From aab121d345486bbc4a9eaf8ac9d4ef3bd1417622 Mon Sep 17 00:00:00 2001
From: Eir Nym <485399+eirnym@users.noreply.github.com>
Date: Wed, 25 Jan 2023 02:14:48 +0100
Subject: [PATCH 0666/2068] Remove stale imports

---
 .../test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
index f69d038b6a..3047245298 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
@@ -15,13 +15,11 @@
  */
 package com.diffplug.spotless.kotlin;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.ResourceHarness;
 import com.diffplug.spotless.SerializableEqualityTester;
-import com.diffplug.spotless.StepHarness;
 import com.diffplug.spotless.StepHarnessWithFile;
 import com.diffplug.spotless.TestProvisioner;
 

From a35e23b400ac05d187b4c144a1d2ff0b2f83c88a Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Wed, 25 Jan 2023 09:44:15 +0800
Subject: [PATCH 0667/2068] Enable Gradle's build scan

---
 settings.gradle | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/settings.gradle b/settings.gradle
index fb9e7dcf0b..ca48729297 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -29,6 +29,7 @@ plugins {
 	id 'org.gradle.test-retry'                 apply false
 	id 'com.adarshr.test-logger'               apply false
 	id 'io.github.davidburstrom.version-compatibility' apply false
+	id "com.gradle.enterprise" version "3.12.2"
 }
 if (System.env['CI'] != null) {
 	// use the remote buildcache on all CI builds
@@ -58,6 +59,14 @@ if (System.env['CI'] != null) {
 	}
 }
 
+gradleEnterprise {
+	buildScan {
+		termsOfServiceUrl = "https://gradle.com/terms-of-service"
+		termsOfServiceAgree = "yes"
+		publishAlways()
+	}
+}
+
 rootProject.name = 'spotless'
 
 include 'lib'		// reusable library with no dependencies

From 27629933ab7dcd9d95c008735e789f5a46620b65 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Thu, 19 Jan 2023 00:12:18 +0800
Subject: [PATCH 0668/2068] Generate the correct qualifiedRuleId for Ktlint
 0.48.x

---
 .../glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java       | 2 +-
 .../glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java   | 2 ++
 plugin-gradle/CHANGES.md                                        | 1 +
 plugin-maven/CHANGES.md                                         | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
index 5d24603f70..1e54a80859 100644
--- a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
@@ -140,7 +140,7 @@ private static EditorConfigOverride createEditorConfigOverride(final List<Rule>
 						String[] parts = entry.getKey().substring(7).split("_", 2);
 						if (parts.length == 1) {
 							// convert ktlint_{ruleset} to {ruleset}
-							String qualifiedRuleId = parts[0];
+							String qualifiedRuleId = parts[0] + ":";
 							property = RuleExecutionEditorConfigPropertyKt.createRuleSetExecutionEditorConfigProperty(qualifiedRuleId);
 						} else {
 							// convert ktlint_{ruleset}_{rulename} to {ruleset}:{rulename}
diff --git a/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java b/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java
index 8804f86b08..c811b51233 100644
--- a/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java
+++ b/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java
@@ -55,6 +55,8 @@ public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 		editorConfigOverrideMap.put("indent_style", "tab");
 		editorConfigOverrideMap.put("ktlint_standard_no-semi", "disabled");
+		// ktlint_filename is an invalid rule in ktlint 0.48.0
+		editorConfigOverrideMap.put("ktlint_filename", "disabled");
 
 		String formatted = ktLintCompat0Dot48Dot0Adapter.format(text, filePath, false, false, null, userData, editorConfigOverrideMap);
 		assertEquals("class fails_no_semicolons {\n\tval i = 0;\n}\n", formatted);
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 17bf123b41..37d08f9b75 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -10,6 +10,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Prettier will now suggest to install plugins if a parser cannot be inferred from the file extension ([#1511](https://github.com/diffplug/spotless/pull/1511))
 ### Fixed
 * The default list of type annotations used by `formatAnnotations` has had 8 more annotations from the Checker Framework added [#1494](https://github.com/diffplug/spotless/pull/1494)
+* **POTENTIALLY BREAKING** Generate the correct qualifiedRuleId for Ktlint 0.48.x [#1495](https://github.com/diffplug/spotless/pull/1495)
 ### Changes
 * **POTENTIALLY BREAKING** Removed support for KtLint 0.3x and 0.45.2 ([#1475](https://github.com/diffplug/spotless/pull/1475))
   * `KtLint` does not maintain a stable API - before this PR, we supported every breaking change in the API since 2019.
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 448011be3c..2a23405d35 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -11,6 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Allow to specify node executable for node-based formatters using `nodeExecutable` parameter ([#1500](https://github.com/diffplug/spotless/pull/1500))
 ### Fixed
 * The default list of type annotations used by `formatAnnotations` has had 8 more annotations from the Checker Framework added [#1494](https://github.com/diffplug/spotless/pull/1494)
+* **POTENTIALLY BREAKING** Generate the correct qualifiedRuleId for Ktlint 0.48.x [#1495](https://github.com/diffplug/spotless/pull/1495)
 ### Changes
 * Spotless' custom build was replaced by [`maven-plugin-development`](https://github.com/britter/maven-plugin-development). ([#1496](https://github.com/diffplug/spotless/pull/1496) fixes [#554](https://github.com/diffplug/spotless/issues/554))
 * Prettier will now suggest to install plugins if a parser cannot be inferred from the file extension ([#1511](https://github.com/diffplug/spotless/pull/1511))

From 70ad96cd566396097e53520f3ebf8b2aa32011b9 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 24 Jan 2023 16:48:14 +0100
Subject: [PATCH 0669/2068] 1499: delay npmInstall and npmExec resolution

to enable interoperability with `node-gradle-plugin`
---
 .../spotless/npm/EslintFormatterStep.java     | 32 +++++++------
 .../npm/NpmFormatterStepLocations.java        | 11 +++--
 .../npm/NpmFormatterStepStateBase.java        | 47 ++++++++++---------
 .../spotless/npm/PrettierFormatterStep.java   |  4 +-
 .../spotless/npm/TsFmtFormatterStep.java      |  4 +-
 .../NpmTestsWithoutNpmInstallationTest.java   |  3 --
 6 files changed, 53 insertions(+), 48 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
index 74979d90aa..2a095e9ad7 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
@@ -81,7 +81,9 @@ public static FormatterStep create(Map<String, String> devDependencies, Provisio
 	private static class State extends NpmFormatterStepStateBase implements Serializable {
 
 		private static final long serialVersionUID = -539537027004745812L;
-		private final EslintConfig eslintConfig;
+		private final EslintConfig origEslintConfig;
+
+		private transient EslintConfig eslintConfigInUse;
 
 		State(String stepName, Map<String, String> devDependencies, File projectDir, File buildDir, NpmPathResolver npmPathResolver, EslintConfig eslintConfig) throws IOException {
 			super(stepName,
@@ -97,21 +99,23 @@ private static class State extends NpmFormatterStepStateBase implements Serializ
 					new NpmFormatterStepLocations(
 							projectDir,
 							buildDir,
-							npmPathResolver.resolveNpmExecutable(),
-							npmPathResolver.resolveNodeExecutable()));
-			this.eslintConfig = localCopyFiles(requireNonNull(eslintConfig));
+							npmPathResolver::resolveNpmExecutable,
+							npmPathResolver::resolveNodeExecutable));
+			this.origEslintConfig = requireNonNull(eslintConfig.verify());
+			this.eslintConfigInUse = eslintConfig;
 		}
 
-		private EslintConfig localCopyFiles(EslintConfig orig) {
-			if (orig.getEslintConfigPath() == null) {
-				return orig.verify();
+		@Override
+		protected void prepareNodeServerLayout() throws IOException {
+			super.prepareNodeServerLayout();
+			if (origEslintConfig.getEslintConfigPath() != null) {
+				// If any config files are provided, we need to make sure they are at the same location as the node modules
+				// as eslint will try to resolve plugin/config names relatively to the config file location and some
+				// eslint configs contain relative paths to additional config files (such as tsconfig.json e.g.)
+				FormattedPrinter.SYSOUT.print("Copying config file <%s> to <%s> and using the copy", origEslintConfig.getEslintConfigPath(), nodeServerLayout.nodeModulesDir());
+				File configFileCopy = NpmResourceHelper.copyFileToDir(origEslintConfig.getEslintConfigPath(), nodeServerLayout.nodeModulesDir());
+				this.eslintConfigInUse = this.origEslintConfig.withEslintConfigPath(configFileCopy).verify();
 			}
-			// If any config files are provided, we need to make sure they are at the same location as the node modules
-			// as eslint will try to resolve plugin/config names relatively to the config file location and some
-			// eslint configs contain relative paths to additional config files (such as tsconfig.json e.g.)
-			FormattedPrinter.SYSOUT.print("Copying config file <%s> to <%s> and using the copy", orig.getEslintConfigPath(), nodeModulesDir);
-			File configFileCopy = NpmResourceHelper.copyFileToDir(orig.getEslintConfigPath(), nodeModulesDir);
-			return orig.withEslintConfigPath(configFileCopy).verify();
 		}
 
 		@Override
@@ -121,7 +125,7 @@ public FormatterFunc createFormatterFunc() {
 				FormattedPrinter.SYSOUT.print("creating formatter function (starting server)");
 				ServerProcessInfo eslintRestServer = npmRunServer();
 				EslintRestService restService = new EslintRestService(eslintRestServer.getBaseUrl());
-				return Closeable.ofDangerous(() -> endServer(restService, eslintRestServer), new EslintFilePathPassingFormatterFunc(locations.projectDir(), nodeModulesDir, eslintConfig, restService));
+				return Closeable.ofDangerous(() -> endServer(restService, eslintRestServer), new EslintFilePathPassingFormatterFunc(locations.projectDir(), nodeServerLayout.nodeModulesDir(), eslintConfigInUse, restService));
 			} catch (IOException e) {
 				throw ThrowingEx.asRuntime(e);
 			}
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepLocations.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepLocations.java
index 0c417733e8..0e99e1afab 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepLocations.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepLocations.java
@@ -19,6 +19,7 @@
 
 import java.io.File;
 import java.io.Serializable;
+import java.util.function.Supplier;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
@@ -32,12 +33,12 @@ class NpmFormatterStepLocations implements Serializable {
 	private final transient File buildDir;
 
 	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
-	private final transient File npmExecutable;
+	private final transient Supplier<File> npmExecutable;
 
 	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
-	private final transient File nodeExecutable;
+	private final transient Supplier<File> nodeExecutable;
 
-	public NpmFormatterStepLocations(File projectDir, File buildDir, File npmExecutable, File nodeExecutable) {
+	public NpmFormatterStepLocations(File projectDir, File buildDir, Supplier<File> npmExecutable, Supplier<File> nodeExecutable) {
 		this.projectDir = requireNonNull(projectDir);
 		this.buildDir = requireNonNull(buildDir);
 		this.npmExecutable = requireNonNull(npmExecutable);
@@ -53,10 +54,10 @@ public File buildDir() {
 	}
 
 	public File npmExecutable() {
-		return npmExecutable;
+		return npmExecutable.get();
 	}
 
 	public File nodeExecutable() {
-		return nodeExecutable;
+		return nodeExecutable.get();
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
index 4f555a177e..996400ce33 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
@@ -31,7 +31,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.diffplug.spotless.FileSignature;
 import com.diffplug.spotless.FormatterFunc;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -42,11 +41,8 @@ abstract class NpmFormatterStepStateBase implements Serializable {
 
 	private static final long serialVersionUID = 1460749955865959948L;
 
-	@SuppressWarnings("unused")
-	private final FileSignature packageJsonSignature;
-
 	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
-	public final transient File nodeModulesDir;
+	protected final transient NodeServerLayout nodeServerLayout;
 
 	public final NpmFormatterStepLocations locations;
 
@@ -58,45 +54,52 @@ protected NpmFormatterStepStateBase(String stepName, NpmConfig npmConfig, NpmFor
 		this.stepName = requireNonNull(stepName);
 		this.npmConfig = requireNonNull(npmConfig);
 		this.locations = locations;
-		NodeServerLayout layout = prepareNodeServer(locations.buildDir());
-		this.nodeModulesDir = layout.nodeModulesDir();
-		this.packageJsonSignature = FileSignature.signAsList(layout.packageJsonFile());
+		this.nodeServerLayout = new NodeServerLayout(locations.buildDir(), stepName);
 	}
 
-	private NodeServerLayout prepareNodeServer(File buildDir) throws IOException {
-		NodeServerLayout layout = new NodeServerLayout(buildDir, stepName);
-		NpmResourceHelper.assertDirectoryExists(layout.nodeModulesDir());
-		NpmResourceHelper.writeUtf8StringToFile(layout.packageJsonFile(),
+	protected void prepareNodeServerLayout() throws IOException {
+		NpmResourceHelper.assertDirectoryExists(nodeServerLayout.nodeModulesDir());
+		NpmResourceHelper.writeUtf8StringToFile(nodeServerLayout.packageJsonFile(),
 				this.npmConfig.getPackageJsonContent());
 		NpmResourceHelper
-				.writeUtf8StringToFile(layout.serveJsFile(), this.npmConfig.getServeScriptContent());
+				.writeUtf8StringToFile(nodeServerLayout.serveJsFile(), this.npmConfig.getServeScriptContent());
 		if (this.npmConfig.getNpmrcContent() != null) {
-			NpmResourceHelper.writeUtf8StringToFile(layout.npmrcFile(), this.npmConfig.getNpmrcContent());
+			NpmResourceHelper.writeUtf8StringToFile(nodeServerLayout.npmrcFile(), this.npmConfig.getNpmrcContent());
 		} else {
-			NpmResourceHelper.deleteFileIfExists(layout.npmrcFile());
+			NpmResourceHelper.deleteFileIfExists(nodeServerLayout.npmrcFile());
 		}
+	}
+
+	protected void prepareNodeServer() throws IOException {
 		FormattedPrinter.SYSOUT.print("running npm install");
-		runNpmInstall(layout.nodeModulesDir());
+		runNpmInstall(nodeServerLayout.nodeModulesDir());
 		FormattedPrinter.SYSOUT.print("npm install finished");
-		return layout;
 	}
 
 	private void runNpmInstall(File npmProjectDir) throws IOException {
 		new NpmProcess(npmProjectDir, this.locations.npmExecutable(), this.locations.nodeExecutable()).install();
 	}
 
-	protected ServerProcessInfo npmRunServer() throws ServerStartException, IOException {
-		if (!this.nodeModulesDir.exists()) {
-			prepareNodeServer(NodeServerLayout.getBuildDirFromNodeModulesDir(this.nodeModulesDir));
+	protected void assertNodeServerDirReady() throws IOException {
+		if (!this.nodeServerLayout.nodeModulesDir().exists() || !this.nodeServerLayout.packageJsonFile().isFile()) {
+			// reinstall if missing
+			prepareNodeServerLayout();
 		}
+		if (!new File(this.nodeServerLayout.nodeModulesDir(), "node_modules").isDirectory()) {
+			// run npm install if node_modules is missing
+			prepareNodeServer();
+		}
+	}
 
+	protected ServerProcessInfo npmRunServer() throws ServerStartException, IOException {
+		assertNodeServerDirReady();
 		try {
 			// The npm process will output the randomly selected port of the http server process to 'server.port' file
 			// so in order to be safe, remove such a file if it exists before starting.
-			final File serverPortFile = new File(this.nodeModulesDir, "server.port");
+			final File serverPortFile = new File(this.nodeServerLayout.nodeModulesDir(), "server.port");
 			NpmResourceHelper.deleteFileIfExists(serverPortFile);
 			// start the http server in node
-			Process server = new NpmProcess(this.nodeModulesDir, this.locations.npmExecutable(), this.locations.nodeExecutable()).start();
+			Process server = new NpmProcess(this.nodeServerLayout.nodeModulesDir(), this.locations.npmExecutable(), this.locations.nodeExecutable()).start();
 
 			// await the readiness of the http server - wait for at most 60 seconds
 			try {
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
index 22dd4586ee..22f1a69e7c 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
@@ -77,8 +77,8 @@ private static class State extends NpmFormatterStepStateBase implements Serializ
 					new NpmFormatterStepLocations(
 							projectDir,
 							buildDir,
-							npmPathResolver.resolveNpmExecutable(),
-							npmPathResolver.resolveNodeExecutable()));
+							npmPathResolver::resolveNpmExecutable,
+							npmPathResolver::resolveNodeExecutable));
 			this.prettierConfig = requireNonNull(prettierConfig);
 		}
 
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java
index 14d6b1bbd0..4bd665c764 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java
@@ -83,8 +83,8 @@ public State(String stepName, Map<String, String> versions, File projectDir, Fil
 					new NpmFormatterStepLocations(
 							projectDir,
 							buildDir,
-							npmPathResolver.resolveNpmExecutable(),
-							npmPathResolver.resolveNodeExecutable()));
+							npmPathResolver::resolveNpmExecutable,
+							npmPathResolver::resolveNodeExecutable));
 			this.buildDir = requireNonNull(buildDir);
 			this.configFile = configFile;
 			this.inlineTsFmtSettings = inlineTsFmtSettings == null ? new TreeMap<>() : new TreeMap<>(inlineTsFmtSettings);
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
index 916d853920..986e2726cb 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
@@ -17,7 +17,6 @@
 
 import org.assertj.core.api.Assertions;
 import org.gradle.testkit.runner.BuildResult;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.common.base.Predicates;
@@ -74,8 +73,6 @@ private void printContents() {
 	}
 
 	@Test
-	@Disabled("This test is disabled because we currently don't support using npm/node installed by the" +
-			"node-gradle-plugin as the installation takes place in the *execution* phase, but spotless needs it in the *configuration* phase.")
 	void useNodeAndNpmFromNodeGradlePluginInOneSweep() throws Exception {
 		try {
 			setFile("build.gradle").toLines(

From fac7fd1ece0887111e06a2b24def6b24d1cee77c Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 24 Jan 2023 19:51:51 +0100
Subject: [PATCH 0670/2068] 1499: document changes for delaying npm install

---
 CHANGES.md               | 2 ++
 plugin-gradle/CHANGES.md | 3 +++
 plugin-maven/CHANGES.md  | 1 +
 3 files changed, 6 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index e8af5aec03..d41f40aaa6 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -23,6 +23,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * ** POTENTIALLY BREAKING** Removed support for KtLint 0.3x and 0.45.2 ([#1475](https://github.com/diffplug/spotless/pull/1475))
   * `KtLint` does not maintain a stable API - before this PR, we supported every breaking change in the API since 2019.
   * From now on, we will support no more than 2 breaking changes at a time.
+* NpmFormatterStepStateBase delays `npm install` call until the formatter is first used. This enables better integration
+  with `gradle-node-plugin`. ([#1522](https://github.com/diffplug/spotless/pull/1522))
 
 ## [2.32.0] - 2023-01-13
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 37d08f9b75..cbcd3bd953 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -15,6 +15,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * **POTENTIALLY BREAKING** Removed support for KtLint 0.3x and 0.45.2 ([#1475](https://github.com/diffplug/spotless/pull/1475))
   * `KtLint` does not maintain a stable API - before this PR, we supported every breaking change in the API since 2019.
   * From now on, we will support no more than 2 breaking changes at a time.
+* `npm`-based formatters `ESLint`, `prettier` and `tsfmt` delay their `npm install` call until the formatters are first
+  used. For gradle this effectively moves the `npm install` call out of the configuration phase and as such enables
+  better integration with `gradle-node-plugin`. ([#1522](https://github.com/diffplug/spotless/pull/1522))
 
 ## [6.13.0] - 2023-01-14
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 2a23405d35..93dd005ab6 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -18,6 +18,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * **POTENTIALLY BREAKING** Removed support for KtLint 0.3x and 0.45.2 ([#1475](https://github.com/diffplug/spotless/pull/1475))
   * `KtLint` does not maintain a stable API - before this PR, we supported every breaking change in the API since 2019.
   * From now on, we will support no more than 2 breaking changes at a time.
+* `npm`-based formatters `ESLint`, `prettier` and `tsfmt` delay their `npm install` call until the formatters are first used. ([#1522](https://github.com/diffplug/spotless/pull/1522)
 
 ## [2.30.0] - 2023-01-13
 ### Added

From 7caf4c08c0daea72d15439bd8cd364e77638158f Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 24 Jan 2023 20:52:34 +0100
Subject: [PATCH 0671/2068] 1499: add documentation and examples showcasing the
 integration

---
 plugin-gradle/README.md                       |  7 +++
 .../NpmTestsWithoutNpmInstallationTest.java   | 47 +++++++------------
 ...onTest_gradle_node_plugin_example_1.gradle | 38 +++++++++++++++
 ...onTest_gradle_node_plugin_example_2.gradle | 35 ++++++++++++++
 4 files changed, 96 insertions(+), 31 deletions(-)
 create mode 100644 plugin-gradle/src/test/resources/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest_gradle_node_plugin_example_1.gradle
 create mode 100644 plugin-gradle/src/test/resources/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest_gradle_node_plugin_example_2.gradle

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index b6e95807d9..7e486719e7 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -907,6 +907,13 @@ spotless {
 If you provide both `npmExecutable` and `nodeExecutable`, spotless will use these paths. If you specify only one of the
 two, spotless will assume the other one is in the same directory.
 
+If you use the `gradle-node-plugin` ([github](https://github.com/node-gradle/gradle-node-plugin)), it is possible to use the
+node- and npm-binaries dynamically installed by this plugin. See
+[this](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/test/resources/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest_gradle_node_plugin_example_1.gradle)
+or [this](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/test/resources/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest_gradle_node_plugin_example_2.gradle) example.
+
+```gradle
+
 ### `.npmrc` detection
 
 Spotless picks up npm configuration stored in a `.npmrc` file either in the project directory or in your user home.
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
index 986e2726cb..03d14292e9 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
@@ -73,38 +73,23 @@ private void printContents() {
 	}
 
 	@Test
-	void useNodeAndNpmFromNodeGradlePluginInOneSweep() throws Exception {
+	void useNodeAndNpmFromNodeGradlePlugin_example1() throws Exception {
 		try {
-			setFile("build.gradle").toLines(
-					"plugins {",
-					"    id 'com.diffplug.spotless'",
-					"    id 'com.github.node-gradle.node' version '3.5.1'",
-					"}",
-					"repositories { mavenCentral() }",
-					"node {",
-					"    download = true",
-					"    version = '18.13.0'",
-					"    npmVersion = '8.19.2'",
-					"    workDir = file(\"${buildDir}/nodejs\")",
-					"    npmWorkDir = file(\"${buildDir}/npm\")",
-					"}",
-					"def prettierConfig = [:]",
-					"prettierConfig['printWidth'] = 50",
-					"prettierConfig['parser'] = 'typescript'",
-					"def npmExec = System.getProperty('os.name').toLowerCase().contains('windows') ? '/npm.cmd' : '/bin/npm'",
-					"def nodeExec = System.getProperty('os.name').toLowerCase().contains('windows') ? '/node.exe' : '/bin/node'",
-					"spotless {",
-					"    format 'mytypescript', {",
-					"        target 'test.ts'",
-					"        prettier()",
-					"            .npmExecutable(\"${tasks.named('npmSetup').get().npmDir.get()}${npmExec}\")",
-					"            .nodeExecutable(\"${tasks.named('nodeSetup').get().nodeDir.get()}${nodeExec}\")",
-					"            .config(prettierConfig)",
-					"    }",
-					"}",
-					"tasks.named('spotlessMytypescript').configure {",
-					"    it.dependsOn('nodeSetup', 'npmSetup')",
-					"}");
+			setFile("build.gradle").toResource("com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest_gradle_node_plugin_example_1.gradle");
+			setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
+			final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+			Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+			assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile.clean");
+		} catch (Exception e) {
+			printContents();
+			throw e;
+		}
+	}
+
+	@Test
+	void useNpmFromNodeGradlePlugin_example2() throws Exception {
+		try {
+			setFile("build.gradle").toResource("com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest_gradle_node_plugin_example_2.gradle");
 			setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
 			final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
 			Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
diff --git a/plugin-gradle/src/test/resources/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest_gradle_node_plugin_example_1.gradle b/plugin-gradle/src/test/resources/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest_gradle_node_plugin_example_1.gradle
new file mode 100644
index 0000000000..7ec7a2c592
--- /dev/null
+++ b/plugin-gradle/src/test/resources/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest_gradle_node_plugin_example_1.gradle
@@ -0,0 +1,38 @@
+/**
+ * This example shows how to use the gradle-node-plugin to install node and npm in separate directories
+ * and use these binaries with the prettier formatter.
+ */
+plugins {
+    id 'com.diffplug.spotless'
+    id 'com.github.node-gradle.node' version '3.5.1'
+}
+repositories { mavenCentral() }
+node {
+    download = true
+    version = '18.13.0'
+    npmVersion = '8.19.2'
+	// when setting both these directories, npm and node will be in separate directories
+    workDir = file("${buildDir}/nodejs")
+    npmWorkDir = file("${buildDir}/npm")
+}
+def prettierConfig = [:]
+prettierConfig['printWidth'] = 50
+prettierConfig['parser'] = 'typescript'
+
+// the executable names
+def npmExec = System.getProperty('os.name').toLowerCase().contains('windows') ? '/npm.cmd' : '/bin/npm'
+def nodeExec = System.getProperty('os.name').toLowerCase().contains('windows') ? '/node.exe' : '/bin/node'
+
+spotless {
+    format 'mytypescript', {
+        target 'test.ts'
+        prettier()
+            .npmExecutable("${tasks.named('npmSetup').get().npmDir.get()}${npmExec}") // get the npm executable path from gradle-node-plugin
+            .nodeExecutable("${tasks.named('nodeSetup').get().nodeDir.get()}${nodeExec}") // get the node executable path from gradle-node-plugin
+            .config(prettierConfig)
+    }
+}
+
+tasks.named('spotlessMytypescript').configure {
+    it.dependsOn('nodeSetup', 'npmSetup')
+}
diff --git a/plugin-gradle/src/test/resources/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest_gradle_node_plugin_example_2.gradle b/plugin-gradle/src/test/resources/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest_gradle_node_plugin_example_2.gradle
new file mode 100644
index 0000000000..eb59b85cf0
--- /dev/null
+++ b/plugin-gradle/src/test/resources/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest_gradle_node_plugin_example_2.gradle
@@ -0,0 +1,35 @@
+/**
+ * This example shows how to use the gradle-node-plugin to install node and npm together and
+ * use these binaries with the prettier formatter.
+ */
+plugins {
+    id 'com.diffplug.spotless'
+    id 'com.github.node-gradle.node' version '3.5.1'
+}
+repositories { mavenCentral() }
+node {
+    download = true
+    version = '18.13.0'
+	// when not setting an explicit `npmWorkDir`, the npm binary will be installed next to the node binary
+    workDir = file("${buildDir}/nodejs")
+}
+def prettierConfig = [:]
+prettierConfig['printWidth'] = 50
+prettierConfig['parser'] = 'typescript'
+
+// the executable name
+def npmExec = System.getProperty('os.name').toLowerCase().contains('windows') ? '/npm.cmd' : '/bin/npm'
+
+spotless {
+    typescript {
+        target 'test.ts'
+        prettier()
+            .npmExecutable("${tasks.named('npmSetup').get().npmDir.get()}${npmExec}") // get the npm executable path from gradle-node-plugin
+		    // setting the nodeExecutable is not necessary, since it will be found in the same directory as the npm executable (see above)
+            .config(prettierConfig)
+    }
+}
+
+tasks.named('spotlessTypescript').configure {
+    it.dependsOn('nodeSetup', 'npmSetup')
+}

From 28ba93b8f3098b5ec104c87ab97d1eecb67b18ff Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 24 Jan 2023 20:54:09 +0100
Subject: [PATCH 0672/2068] 1499: drive-by-bugfix

when using singleton map directly, it could occur that we tried to manipulate that map later (combination of using `prettier()` inside `typescript` block while supplying a prettier config via `config([...])`
---
 .../java/com/diffplug/gradle/spotless/TypescriptExtension.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
index 2283afccff..a11f1b0c39 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
@@ -166,7 +166,7 @@ protected FormatterStep createStep() {
 
 		private void fixParserToTypescript() {
 			if (this.prettierConfig == null) {
-				this.prettierConfig = Collections.singletonMap("parser", "typescript");
+				this.prettierConfig = new TreeMap<>(Collections.singletonMap("parser", "typescript"));
 			} else {
 				final Object replaced = this.prettierConfig.put("parser", "typescript");
 				if (replaced != null) {

From 292d7e2bd4fb86f10c05207fc4ff918f3a9dd5df Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Wed, 25 Jan 2023 11:18:36 +0100
Subject: [PATCH 0673/2068] 1499: refactor re-install needed detection

---
 .../spotless/npm/NodeServerLayout.java        | 34 ++++++++++++++++++-
 .../npm/NpmFormatterStepStateBase.java        | 12 +++++--
 2 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NodeServerLayout.java b/lib/src/main/java/com/diffplug/spotless/npm/NodeServerLayout.java
index a175080517..63a6a923da 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NodeServerLayout.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NodeServerLayout.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 DiffPlug
+ * Copyright 2020-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,11 @@
 package com.diffplug.spotless.npm;
 
 import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.stream.Stream;
+
+import com.diffplug.spotless.ThrowingEx;
 
 class NodeServerLayout {
 
@@ -50,4 +55,31 @@ public File npmrcFile() {
 	static File getBuildDirFromNodeModulesDir(File nodeModulesDir) {
 		return nodeModulesDir.getParentFile();
 	}
+
+	public boolean isLayoutPrepared() {
+		if (!nodeModulesDir().isDirectory()) {
+			return false;
+		}
+		if (!packageJsonFile().isFile()) {
+			return false;
+		}
+		if (!serveJsFile().isFile()) {
+			return false;
+		}
+		// npmrc is optional, so must not be checked here
+		return true;
+	}
+
+	public boolean isNodeModulesPrepared() {
+		Path nodeModulesInstallDirPath = new File(nodeModulesDir(), "node_modules").toPath();
+		if (!Files.isDirectory(nodeModulesInstallDirPath)) {
+			return false;
+		}
+		// check if it is NOT empty
+		return ThrowingEx.get(() -> {
+			try (Stream<Path> entries = Files.list(nodeModulesInstallDirPath)) {
+				return entries.findFirst().isPresent();
+			}
+		});
+	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
index 996400ce33..9cff41e604 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
@@ -81,16 +81,24 @@ private void runNpmInstall(File npmProjectDir) throws IOException {
 	}
 
 	protected void assertNodeServerDirReady() throws IOException {
-		if (!this.nodeServerLayout.nodeModulesDir().exists() || !this.nodeServerLayout.packageJsonFile().isFile()) {
+		if (needsPrepareNodeServerLayout()) {
 			// reinstall if missing
 			prepareNodeServerLayout();
 		}
-		if (!new File(this.nodeServerLayout.nodeModulesDir(), "node_modules").isDirectory()) {
+		if (needsPrepareNodeServer()) {
 			// run npm install if node_modules is missing
 			prepareNodeServer();
 		}
 	}
 
+	protected boolean needsPrepareNodeServer() {
+		return this.nodeServerLayout.isNodeModulesPrepared();
+	}
+
+	protected boolean needsPrepareNodeServerLayout() {
+		return !this.nodeServerLayout.isLayoutPrepared();
+	}
+
 	protected ServerProcessInfo npmRunServer() throws ServerStartException, IOException {
 		assertNodeServerDirReady();
 		try {

From 7326772bad72c2855fecc62421b4e43031609af6 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Wed, 25 Jan 2023 11:27:58 +0100
Subject: [PATCH 0674/2068] 1499: spotbugs

---
 .../java/com/diffplug/spotless/npm/EslintFormatterStep.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
index 2a095e9ad7..221a745ad7 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
@@ -39,6 +39,8 @@
 import com.diffplug.spotless.ThrowingEx;
 import com.diffplug.spotless.npm.EslintRestService.FormatOption;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 public class EslintFormatterStep {
 
 	private static final Logger logger = LoggerFactory.getLogger(EslintFormatterStep.class);
@@ -83,6 +85,7 @@ private static class State extends NpmFormatterStepStateBase implements Serializ
 		private static final long serialVersionUID = -539537027004745812L;
 		private final EslintConfig origEslintConfig;
 
+		@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
 		private transient EslintConfig eslintConfigInUse;
 
 		State(String stepName, Map<String, String> devDependencies, File projectDir, File buildDir, NpmPathResolver npmPathResolver, EslintConfig eslintConfig) throws IOException {

From e9f73f02e37cd8c2e1ea6d70e6da7235ce9dd18a Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 25 Jan 2023 04:47:26 -0800
Subject: [PATCH 0675/2068] Run `equoIde` and get an IDE with the Spotless
 project imported and ready to go.

---
 CONTRIBUTING.md |  2 +-
 build.gradle    | 22 +++++++++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 782e377d58..af2e690784 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 # Contributing to Spotless
 
-Pull requests are welcome, preferably against `main`.  Feel free to develop spotless any way you like.
+Pull requests are welcome, preferably against `main`.  Feel free to develop spotless any way you like, but if you like Eclipse and Gradle Buildship then [`gradlew equoIde` will install an IDE and set it up for you](https://github.com/equodev/equo-ide).
 
 ## How Spotless works
 
diff --git a/build.gradle b/build.gradle
index f9e3d0de21..450ee61583 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,26 @@
+plugins {
+	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
+	id 'dev.equo.ide'                          version '0.12.1'
+}
+equoIde {
+	branding.title('Spotless').icon(file('_images/spotless_logo.png'))
+
+	// waiting on https://github.com/equodev/equo-ide/pull/65
+	//welcome().openUrlOnStartup('https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md')
+
+	// everything below becomes the default after https://github.com/equodev/equo-ide/pull/66
+	p2repo 'https://download.eclipse.org/eclipse/updates/4.26/'
+	install 'org.eclipse.releng.java.languages.categoryIU'
+	install 'org.eclipse.platform.ide.categoryIU'
+
+	p2repo 'https://download.eclipse.org/buildship/updates/e423/releases/3.x/3.1.6.v20220511-1359/'
+	install 'org.eclipse.buildship.feature.group'
+}
+
 repositories {
 	mavenCentral()
 }
+
 apply from: rootProject.file('gradle/java-publish.gradle')
 apply from: rootProject.file('gradle/changelog.gradle')
 allprojects {
@@ -18,4 +38,4 @@ spotless {
 		trimTrailingWhitespace()
 		endWithNewline()
 	}
-}
\ No newline at end of file
+}

From 2a8f9890919ef6a73d0112f79415f22addedc897 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Wed, 25 Jan 2023 20:49:27 +0800
Subject: [PATCH 0676/2068] Remove retry plugin

https://docs.gradle.com/enterprise/gradle-plugin/#test_retry_migration
---
 gradle/special-tests.gradle | 1 -
 settings.gradle             | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/gradle/special-tests.gradle b/gradle/special-tests.gradle
index fd5f602243..52f82e4e1b 100644
--- a/gradle/special-tests.gradle
+++ b/gradle/special-tests.gradle
@@ -1,4 +1,3 @@
-apply plugin: 'org.gradle.test-retry'
 apply plugin: 'com.adarshr.test-logger'
 def special = [
 	'Npm',
diff --git a/settings.gradle b/settings.gradle
index ca48729297..8ab9430f00 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -11,8 +11,6 @@ pluginManagement {
 		id 'com.diffplug.spotless-changelog'       version '2.4.1'
 		// https://github.com/diffplug/goomph/blob/main/CHANGES.md
 		id 'com.diffplug.p2.asmaven'               version '3.27.0' // DO NOT UPDATE, see https://github.com/diffplug/spotless/pull/874
-		// https://github.com/gradle/test-retry-gradle-plugin/releases
-		id 'org.gradle.test-retry'                 version '1.5.1'
 		// https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md
 		id 'com.adarshr.test-logger'               version '3.2.0'
 		// https://github.com/davidburstrom/version-compatibility-gradle-plugin/tags
@@ -26,7 +24,6 @@ plugins {
 	id 'com.github.spotbugs'                   apply false
 	id 'com.diffplug.spotless-changelog'       apply false
 	id 'com.diffplug.p2.asmaven'               apply false
-	id 'org.gradle.test-retry'                 apply false
 	id 'com.adarshr.test-logger'               apply false
 	id 'io.github.davidburstrom.version-compatibility' apply false
 	id "com.gradle.enterprise" version "3.12.2"

From b722ec38fe1c63f57dc36aacf285075ea6c1f002 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 25 Jan 2023 04:24:02 -0800
Subject: [PATCH 0677/2068] We'll need to bump our minimum Java to 11, which is
 already happening in our next release.

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 5702d21bdd..f06bdef37e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,7 +16,7 @@ artifactIdMaven=spotless-maven-plugin
 artifactIdGradle=spotless-plugin-gradle
 
 # Build requirements
-VER_JAVA=1.8
+VER_JAVA=11
 VER_SPOTBUGS=4.7.3
 VER_JSR_305=3.0.2
 
@@ -28,4 +28,4 @@ VER_DURIAN=1.2.0
 VER_JGIT=5.13.1.202206130422-r
 VER_JUNIT=5.9.2
 VER_ASSERTJ=3.24.2
-VER_MOCKITO=4.11.0
\ No newline at end of file
+VER_MOCKITO=4.11.0

From 20c5e75d3b65e3b0dde4dbab0eca0779126d4d9c Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 25 Jan 2023 05:11:05 -0800
Subject: [PATCH 0678/2068] Setup the p2deps plugin and add solstice to
 lib-extra.

---
 lib-extra/build.gradle | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index 8381d14041..5a225ee272 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -1,5 +1,6 @@
 plugins {
 	id 'java-library'
+	id 'dev.equo.p2deps' version '0.12.1'
 }
 ext.artifactId = project.artifactIdLibExtra
 version = rootProject.spotlessChangelog.versionNext
@@ -14,6 +15,8 @@ dependencies {
 	// needed by GitAttributesLineEndings
 	implementation "org.eclipse.jgit:org.eclipse.jgit:${VER_JGIT}"
 	implementation "com.googlecode.concurrent-trees:concurrent-trees:2.6.1"
+	// for eclipse
+	implementation "dev.equo.ide:solstice:0.11.0"
 
 	// testing
 	testImplementation project(':testlib')
@@ -22,6 +25,24 @@ dependencies {
 	testImplementation "com.diffplug.durian:durian-testlib:${VER_DURIAN}"
 }
 
+def NEEDS_P2_DEPS = []
+for (needsP2 in NEEDS_P2_DEPS) {
+	sourceSets.register(needsP2) {
+		compileClasspath += sourceSets.main.output
+		runtimeClasspath += sourceSets.main.output
+		java {}
+	}
+}
+jar {
+	for (needsP2 in NEEDS_P2_DEPS) {
+		from sourceSets.getByName(needsP2).output.classesDirs
+	}
+}
+
+apply plugin: 'dev.equo.p2deps'
+p2deps {
+}
+
 // we'll hold the core lib to a high standard
 spotbugs { reportLevel = 'low' } // low|medium|high (low = sensitive to even minor mistakes)
 

From 5be0c69beb7bce66993c3ffbe9c965a48b8005f0 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 25 Jan 2023 05:14:31 -0800
Subject: [PATCH 0679/2068] Move the build deps out of _ext and into lib-extra.

---
 _ext/eclipse-jdt/build.gradle |  8 +-------
 lib-extra/build.gradle        | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/_ext/eclipse-jdt/build.gradle b/_ext/eclipse-jdt/build.gradle
index 283e52f86d..8b71deba18 100644
--- a/_ext/eclipse-jdt/build.gradle
+++ b/_ext/eclipse-jdt/build.gradle
@@ -10,10 +10,4 @@ ext {
 }
 
 dependencies {
-	implementation "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLIPSE_BASE}"
-	implementation("org.eclipse.jdt:org.eclipse.jdt.core:${VER_ECLIPSE_JDT_CORE}") {
-		exclude group: 'org.eclipse.platform', module: 'org.eclipse.ant.core'
-		exclude group: 'org.eclipse.platform', module: 'org.eclipse.core.expressions'
-		exclude group: 'org.eclipse.platform', module: 'org.eclipse.core.filesystem'
-	}
-}
\ No newline at end of file
+}
diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index 5a225ee272..b24f3ed5cc 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -25,7 +25,9 @@ dependencies {
 	testImplementation "com.diffplug.durian:durian-testlib:${VER_DURIAN}"
 }
 
-def NEEDS_P2_DEPS = []
+def NEEDS_P2_DEPS = [
+	'jdt'
+]
 for (needsP2 in NEEDS_P2_DEPS) {
 	sourceSets.register(needsP2) {
 		compileClasspath += sourceSets.main.output
@@ -41,6 +43,15 @@ jar {
 
 apply plugin: 'dev.equo.p2deps'
 p2deps {
+	into 'jdtCompileOnly', {
+		p2repo 'https://download.eclipse.org/eclipse/updates/4.26/'
+		install 'org.eclipse.jdt.core'
+		addFilter 'minimize', { filter ->
+			filter.exclude 'org.eclipse.ant.core'
+			filter.exclude 'org.eclipse.core.expressions'
+			filter.exclude 'org.eclipse.core.filesystem'
+		}
+	}
 }
 
 // we'll hold the core lib to a high standard

From f564cc8a679bb516841e4ba2532fcd148d51f56c Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 25 Jan 2023 05:15:16 -0800
Subject: [PATCH 0680/2068] Move the JDT shim code out of _ext and into
 lib-extra, compiling against p2deps.

---
 .../extra/eclipse/java/package-info.java      | 20 ------------
 .../jdt}/EclipseJdtFormatterStepImpl.java     | 31 ++++---------------
 2 files changed, 6 insertions(+), 45 deletions(-)
 delete mode 100644 _ext/eclipse-jdt/src/main/java/com/diffplug/spotless/extra/eclipse/java/package-info.java
 rename {_ext/eclipse-jdt/src/main/java/com/diffplug/spotless/extra/eclipse/java => lib-extra/src/jdt/java/com/diffplug/spotless/extra/jdt}/EclipseJdtFormatterStepImpl.java (65%)

diff --git a/_ext/eclipse-jdt/src/main/java/com/diffplug/spotless/extra/eclipse/java/package-info.java b/_ext/eclipse-jdt/src/main/java/com/diffplug/spotless/extra/eclipse/java/package-info.java
deleted file mode 100644
index 190557cc74..0000000000
--- a/_ext/eclipse-jdt/src/main/java/com/diffplug/spotless/extra/eclipse/java/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/** Eclipse JDT based Spotless formatter */
-@ParametersAreNonnullByDefault
-package com.diffplug.spotless.extra.eclipse.java;
-
-import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/_ext/eclipse-jdt/src/main/java/com/diffplug/spotless/extra/eclipse/java/EclipseJdtFormatterStepImpl.java b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/jdt/EclipseJdtFormatterStepImpl.java
similarity index 65%
rename from _ext/eclipse-jdt/src/main/java/com/diffplug/spotless/extra/eclipse/java/EclipseJdtFormatterStepImpl.java
rename to lib-extra/src/jdt/java/com/diffplug/spotless/extra/jdt/EclipseJdtFormatterStepImpl.java
index b3fb7acaf3..7e59744149 100644
--- a/_ext/eclipse-jdt/src/main/java/com/diffplug/spotless/extra/eclipse/java/EclipseJdtFormatterStepImpl.java
+++ b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/jdt/EclipseJdtFormatterStepImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,12 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.diffplug.spotless.extra.eclipse.java;
+package com.diffplug.spotless.extra.jdt;
 
 import java.io.File;
 import java.util.Properties;
 
-import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.ToolFactory;
 import org.eclipse.jdt.core.formatter.CodeFormatter;
 import org.eclipse.jdt.internal.compiler.env.IModule;
@@ -26,35 +25,17 @@
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.text.edits.TextEdit;
 
-import com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseConfig;
-import com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseFramework;
-import com.diffplug.spotless.extra.eclipse.base.SpotlessEclipsePluginConfig;
-import com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseServiceConfig;
-
 /** Formatter step which calls out to the Eclipse JDT formatter. */
 public class EclipseJdtFormatterStepImpl {
+	/** Spotless demands for internal formatter chains Unix (LF) line endings. */
+	public static final String LINE_DELIMITER = "\n";
 
 	private final CodeFormatter codeFormatter;
 
-	public EclipseJdtFormatterStepImpl(Properties settings) throws Exception {
-		SpotlessEclipseFramework.setup(new FrameworkConfig());
+	public EclipseJdtFormatterStepImpl(Properties settings) {
 		this.codeFormatter = ToolFactory.createCodeFormatter(settings, ToolFactory.M_FORMAT_EXISTING);
 	}
 
-	private static class FrameworkConfig implements SpotlessEclipseConfig {
-		@Override
-		public void registerServices(SpotlessEclipseServiceConfig config) {
-			config.applyDefault();
-			config.useSlf4J(EclipseJdtFormatterStepImpl.class.getPackage().getName());
-		}
-
-		@Override
-		public void activatePlugins(SpotlessEclipsePluginConfig config) {
-			config.applyDefault();
-			config.add(new JavaCore());
-		}
-	}
-
 	/** @deprecated  Use {@link #format(String, File)} instead. */
 	@Deprecated
 	public String format(String raw) throws Exception {
@@ -66,7 +47,7 @@ public String format(String raw, File file) throws Exception {
 		int kind = (file.getName().equals(IModule.MODULE_INFO_JAVA) ? CodeFormatter.K_MODULE_INFO
 				: CodeFormatter.K_COMPILATION_UNIT) | CodeFormatter.F_INCLUDE_COMMENTS;
 
-		TextEdit edit = codeFormatter.format(kind, raw, 0, raw.length(), 0, SpotlessEclipseFramework.LINE_DELIMITER);
+		TextEdit edit = codeFormatter.format(kind, raw, 0, raw.length(), 0, LINE_DELIMITER);
 		if (edit == null) {
 			throw new IllegalArgumentException("Invalid java syntax for formatting.");
 		} else {

From c61ddbdf9d548182893b007511c8de56b49fd960 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 25 Jan 2023 05:34:13 -0800
Subject: [PATCH 0681/2068] Use host (maven/gradle) to get maven deps and
 solstice to get p2 deps.

---
 .../extra/eclipse/EquoBasedStepBuilder.java   | 83 +++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 lib-extra/src/main/java/com/diffplug/spotless/extra/eclipse/EquoBasedStepBuilder.java

diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/eclipse/EquoBasedStepBuilder.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/eclipse/EquoBasedStepBuilder.java
new file mode 100644
index 0000000000..c9a9bc4cf3
--- /dev/null
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/eclipse/EquoBasedStepBuilder.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2016-2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.extra.eclipse;
+
+import java.io.File;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.Provisioner;
+import com.diffplug.spotless.ThrowingEx;
+
+import dev.equo.solstice.p2.P2Client;
+import dev.equo.solstice.p2.P2Model;
+import dev.equo.solstice.p2.P2Unit;
+
+/**
+ * Generic Eclipse based formatter step {@link State} builder.
+ */
+public class EquoBasedStepBuilder {
+	private final String formatterName;
+	private final Provisioner mavenProvisioner;
+	private final P2Model p2;
+	private final ThrowingEx.Function<State, FormatterFunc> stateToFormatter;
+	private String formatterVersion;
+
+	/** Initialize valid default configuration, taking latest version */
+	public EquoBasedStepBuilder(String formatterName, Provisioner mavenProvisioner, P2Model p2, ThrowingEx.Function<State, FormatterFunc> stateToFormatter) {
+		this.formatterName = formatterName;
+		this.mavenProvisioner = mavenProvisioner;
+		this.p2 = p2;
+		this.stateToFormatter = stateToFormatter;
+	}
+
+	/** Returns the FormatterStep (whose state will be calculated lazily). */
+	public FormatterStep build() throws Exception {
+		return FormatterStep.createLazy(formatterName, this::get, stateToFormatter);
+	}
+
+	/** Creates the state of the configuration. */
+	EquoBasedStepBuilder.State get() throws Exception {
+		var caching = P2Client.Caching.PREFER_OFFLINE;
+		var p2query = p2.query(caching);
+
+		List<P2Unit> p2units = p2query.getJarsNotOnMavenCentral();
+		List<String> mavenCoords = p2query.getJarsOnMavenCentral();
+
+		List<File> p2Jars = new ArrayList<>();
+		if (!p2units.isEmpty()) {
+			try (P2Client client = new P2Client(caching)) {
+				for (var p2unit : p2units) {
+					p2Jars.add(client.download(p2unit));
+				}
+			}
+		}
+		boolean withTransitives = false;
+		Set<File> mavenJars = mavenProvisioner.provisionWithTransitives(withTransitives, mavenCoords);
+
+		throw new UnsupportedOperationException("TODO");
+	}
+
+	/**
+	 * State of Eclipse configuration items, providing functionality to derived information
+	 * based on the state.
+	 */
+	public static class State implements Serializable {}
+}

From 01adf6f4484a40ea87ea6030128a14766e8fa2ad Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 25 Jan 2023 00:27:34 -0800
Subject: [PATCH 0682/2068] Now we don't need any JDT lockfiles, because we can
 easily compute them at runtime.

---
 .../eclipse_jdt_formatter/v4.10.0.lockfile    | 18 -----------------
 .../eclipse_jdt_formatter/v4.11.0.lockfile    | 19 ------------------
 .../eclipse_jdt_formatter/v4.12.0.lockfile    | 18 -----------------
 .../eclipse_jdt_formatter/v4.13.0.lockfile    | 18 -----------------
 .../eclipse_jdt_formatter/v4.14.0.lockfile    | 19 ------------------
 .../eclipse_jdt_formatter/v4.15.0.lockfile    | 19 ------------------
 .../eclipse_jdt_formatter/v4.16.0.lockfile    | 19 ------------------
 .../eclipse_jdt_formatter/v4.17.0.lockfile    | 19 ------------------
 .../eclipse_jdt_formatter/v4.18.0.lockfile    | 19 ------------------
 .../eclipse_jdt_formatter/v4.19.0.lockfile    | 19 ------------------
 .../eclipse_jdt_formatter/v4.20.0.lockfile    | 20 -------------------
 .../eclipse_jdt_formatter/v4.21.0.lockfile    | 20 -------------------
 .../eclipse_jdt_formatter/v4.6.1.lockfile     |  2 --
 .../eclipse_jdt_formatter/v4.6.2.lockfile     | 18 -----------------
 .../eclipse_jdt_formatter/v4.6.3.lockfile     |  2 --
 .../eclipse_jdt_formatter/v4.7.0.lockfile     |  2 --
 .../eclipse_jdt_formatter/v4.7.1.lockfile     |  2 --
 .../eclipse_jdt_formatter/v4.7.2.lockfile     |  2 --
 .../eclipse_jdt_formatter/v4.7.3a.lockfile    | 18 -----------------
 .../eclipse_jdt_formatter/v4.8.0.lockfile     | 18 -----------------
 .../eclipse_jdt_formatter/v4.9.0.lockfile     | 18 -----------------
 21 files changed, 309 deletions(-)
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.10.0.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.11.0.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.12.0.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.13.0.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.14.0.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.15.0.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.16.0.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.17.0.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.18.0.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.19.0.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.20.0.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.21.0.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.6.1.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.6.2.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.6.3.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.7.0.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.7.1.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.7.2.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.7.3a.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.8.0.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.9.0.lockfile

diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.10.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.10.0.lockfile
deleted file mode 100644
index 42d81d7324..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.10.0.lockfile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Spotless formatter based on JDT version 4.10.0 (see https://projects.eclipse.org/projects/eclipse.jdt)
-# Compare tag in M2 pom with https://git.eclipse.org/c/jdt/eclipse.jdt.core.git/tag/?h=R4_10 to determine core version.
-com.diffplug.spotless:spotless-eclipse-jdt:4.8.0
-com.diffplug.spotless:spotless-eclipse-base:3.1.1
-com.google.code.findbugs:annotations:3.0.0
-com.google.code.findbugs:jsr305:3.0.0
-org.eclipse.jdt:org.eclipse.jdt.core:3.16.0
-org.eclipse.platform:org.eclipse.core.commands:3.9.100
-org.eclipse.platform:org.eclipse.core.contenttype:3.7.0
-org.eclipse.platform:org.eclipse.core.jobs:3.10.0
-org.eclipse.platform:org.eclipse.core.resources:3.13.0
-org.eclipse.platform:org.eclipse.core.runtime:3.14.0
-org.eclipse.platform:org.eclipse.equinox.app:1.3.500
-org.eclipse.platform:org.eclipse.equinox.common:3.10.0
-org.eclipse.platform:org.eclipse.equinox.preferences:3.7.100
-org.eclipse.platform:org.eclipse.equinox.registry:3.8.0
-org.eclipse.platform:org.eclipse.osgi:3.13.0
-org.eclipse.platform:org.eclipse.text:3.6.300
\ No newline at end of file
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.11.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.11.0.lockfile
deleted file mode 100644
index 3bbf59db23..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.11.0.lockfile
+++ /dev/null
@@ -1,19 +0,0 @@
-# Spotless formatter based on JDT version 4.11.0 (see https://projects.eclipse.org/projects/eclipse.jdt)
-# Compare tag in M2 pom with https://git.eclipse.org/c/jdt/eclipse.jdt.core.git/tag/?h=R4_11 to determine core version.
-com.diffplug.spotless:spotless-eclipse-jdt:4.8.0
-com.diffplug.spotless:spotless-eclipse-base:3.1.1
-com.google.code.findbugs:annotations:3.0.0
-com.google.code.findbugs:jsr305:3.0.0
-org.eclipse.jdt:org.eclipse.jdt.core:3.17.0
-org.eclipse.platform:org.eclipse.core.commands:3.9.100
-org.eclipse.platform:org.eclipse.core.contenttype:3.7.0
-org.eclipse.platform:org.eclipse.core.jobs:3.10.0
-org.eclipse.platform:org.eclipse.core.resources:3.13.0
-org.eclipse.platform:org.eclipse.core.runtime:3.14.0
-org.eclipse.platform:org.eclipse.equinox.app:1.3.500
-org.eclipse.platform:org.eclipse.equinox.common:3.10.0
-org.eclipse.platform:org.eclipse.equinox.preferences:3.7.100
-org.eclipse.platform:org.eclipse.equinox.registry:3.8.0
-org.eclipse.platform:org.eclipse.osgi:3.13.0
-org.eclipse.platform:org.eclipse.text:3.6.300
-
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.12.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.12.0.lockfile
deleted file mode 100644
index c9bfc9a57d..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.12.0.lockfile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Spotless formatter based on JDT version 4.12.0 (see https://projects.eclipse.org/projects/eclipse.jdt)
-# Compare tag in M2 pom with https://git.eclipse.org/c/jdt/eclipse.jdt.core.git/tag/?h=R4_12 to determine core version.
-com.diffplug.spotless:spotless-eclipse-jdt:4.8.0
-com.diffplug.spotless:spotless-eclipse-base:3.2.1
-com.google.code.findbugs:annotations:3.0.0
-com.google.code.findbugs:jsr305:3.0.0
-org.eclipse.jdt:org.eclipse.jdt.core:3.18.0
-org.eclipse.platform:org.eclipse.core.commands:3.9.400
-org.eclipse.platform:org.eclipse.core.contenttype:3.7.300
-org.eclipse.platform:org.eclipse.core.jobs:3.10.400
-org.eclipse.platform:org.eclipse.core.resources:3.13.400
-org.eclipse.platform:org.eclipse.core.runtime:3.15.300
-org.eclipse.platform:org.eclipse.equinox.app:1.4.200
-org.eclipse.platform:org.eclipse.equinox.common:3.10.400
-org.eclipse.platform:org.eclipse.equinox.preferences:3.7.400
-org.eclipse.platform:org.eclipse.equinox.registry:3.8.400
-org.eclipse.platform:org.eclipse.osgi:3.14.0
-org.eclipse.platform:org.eclipse.text:3.8.200
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.13.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.13.0.lockfile
deleted file mode 100644
index 4ee0adb3cf..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.13.0.lockfile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Spotless formatter based on JDT version 4.13.0 (see https://projects.eclipse.org/projects/eclipse.jdt)
-# Compare tag in M2 pom with https://git.eclipse.org/c/jdt/eclipse.jdt.core.git/tag/?h=R4_13 to determine core version.
-com.diffplug.spotless:spotless-eclipse-jdt:4.8.0
-com.diffplug.spotless:spotless-eclipse-base:3.2.1
-com.google.code.findbugs:annotations:3.0.0
-com.google.code.findbugs:jsr305:3.0.0
-org.eclipse.jdt:org.eclipse.jdt.core:3.19.0
-org.eclipse.platform:org.eclipse.core.commands:3.9.500
-org.eclipse.platform:org.eclipse.core.contenttype:3.7.400
-org.eclipse.platform:org.eclipse.core.jobs:3.10.500
-org.eclipse.platform:org.eclipse.core.resources:3.13.500
-org.eclipse.platform:org.eclipse.core.runtime:3.16.0
-org.eclipse.platform:org.eclipse.equinox.app:1.4.300
-org.eclipse.platform:org.eclipse.equinox.common:3.10.500
-org.eclipse.platform:org.eclipse.equinox.preferences:3.7.500
-org.eclipse.platform:org.eclipse.equinox.registry:3.8.500
-org.eclipse.platform:org.eclipse.osgi:3.15.0
-org.eclipse.platform:org.eclipse.text:3.9.0
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.14.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.14.0.lockfile
deleted file mode 100644
index b42352633a..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.14.0.lockfile
+++ /dev/null
@@ -1,19 +0,0 @@
-# Spotless formatter based on JDT version 4.14.0 (see https://projects.eclipse.org/projects/eclipse.jdt)
-# Compare tag in M2 pom with https://git.eclipse.org/c/jdt/eclipse.jdt.core.git/log/?h=R4_14 to determine core version.
-com.diffplug.spotless:spotless-eclipse-jdt:4.8.0
-com.diffplug.spotless:spotless-eclipse-base:3.3.0
-com.github.spotbugs:spotbugs-annotations:4.0.2
-com.google.code.findbugs:jsr305:3.0.2
-net.jcip:jcip-annotations:1.0
-org.eclipse.jdt:org.eclipse.jdt.core:3.20.0
-org.eclipse.platform:org.eclipse.core.commands:3.9.600
-org.eclipse.platform:org.eclipse.core.contenttype:3.7.500
-org.eclipse.platform:org.eclipse.core.jobs:3.10.600
-org.eclipse.platform:org.eclipse.core.resources:3.13.600
-org.eclipse.platform:org.eclipse.core.runtime:3.17.0
-org.eclipse.platform:org.eclipse.equinox.app:1.4.300
-org.eclipse.platform:org.eclipse.equinox.common:3.10.600
-org.eclipse.platform:org.eclipse.equinox.preferences:3.7.600
-org.eclipse.platform:org.eclipse.equinox.registry:3.8.600
-org.eclipse.platform:org.eclipse.osgi:3.15.100
-org.eclipse.platform:org.eclipse.text:3.10.0
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.15.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.15.0.lockfile
deleted file mode 100644
index ee21631962..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.15.0.lockfile
+++ /dev/null
@@ -1,19 +0,0 @@
-# Spotless formatter based on JDT version 4.15.0 (see https://projects.eclipse.org/projects/eclipse.jdt)
-# Compare tag in M2 pom with https://git.eclipse.org/c/jdt/eclipse.jdt.core.git/log/?h=R4_15 to determine core version.
-com.diffplug.spotless:spotless-eclipse-jdt:4.8.0
-com.diffplug.spotless:spotless-eclipse-base:3.3.0
-com.github.spotbugs:spotbugs-annotations:4.0.2
-com.google.code.findbugs:jsr305:3.0.2
-net.jcip:jcip-annotations:1.0
-org.eclipse.jdt:org.eclipse.jdt.core:3.21.0
-org.eclipse.platform:org.eclipse.core.commands:3.9.700
-org.eclipse.platform:org.eclipse.core.contenttype:3.7.600
-org.eclipse.platform:org.eclipse.core.jobs:3.10.700
-org.eclipse.platform:org.eclipse.core.resources:3.13.600
-org.eclipse.platform:org.eclipse.core.runtime:3.17.100
-org.eclipse.platform:org.eclipse.equinox.app:1.4.400
-org.eclipse.platform:org.eclipse.equinox.common:3.11.0
-org.eclipse.platform:org.eclipse.equinox.preferences:3.7.700
-org.eclipse.platform:org.eclipse.equinox.registry:3.8.700
-org.eclipse.platform:org.eclipse.osgi:3.15.200
-org.eclipse.platform:org.eclipse.text:3.10.100
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.16.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.16.0.lockfile
deleted file mode 100644
index 7ff27b440a..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.16.0.lockfile
+++ /dev/null
@@ -1,19 +0,0 @@
-# Spotless formatter based on JDT version 4.16.0 (see https://projects.eclipse.org/projects/eclipse.jdt)
-# Compare tag in M2 pom with https://git.eclipse.org/c/jdt/eclipse.jdt.core.git/log/?h=R4_16 to determine core version.
-com.diffplug.spotless:spotless-eclipse-jdt:4.8.0
-com.diffplug.spotless:spotless-eclipse-base:3.3.0
-com.github.spotbugs:spotbugs-annotations:4.0.2
-com.google.code.findbugs:jsr305:3.0.2
-net.jcip:jcip-annotations:1.0
-org.eclipse.jdt:org.eclipse.jdt.core:3.22.0
-org.eclipse.platform:org.eclipse.core.commands:3.9.700
-org.eclipse.platform:org.eclipse.core.contenttype:3.7.700
-org.eclipse.platform:org.eclipse.core.jobs:3.10.800
-org.eclipse.platform:org.eclipse.core.resources:3.13.700
-org.eclipse.platform:org.eclipse.core.runtime:3.18.0
-org.eclipse.platform:org.eclipse.equinox.app:1.4.500
-org.eclipse.platform:org.eclipse.equinox.common:3.12.0
-org.eclipse.platform:org.eclipse.equinox.preferences:3.8.0
-org.eclipse.platform:org.eclipse.equinox.registry:3.8.800
-org.eclipse.platform:org.eclipse.osgi:3.15.300
-org.eclipse.platform:org.eclipse.text:3.10.200
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.17.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.17.0.lockfile
deleted file mode 100644
index 47cb5f10dd..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.17.0.lockfile
+++ /dev/null
@@ -1,19 +0,0 @@
-# Spotless formatter based on JDT version 4.17.0 (see https://projects.eclipse.org/projects/eclipse.jdt)
-# Compare tag in M2 pom with https://git.eclipse.org/c/jdt/eclipse.jdt.core.git/log/?h=R4_17 to determine core version.
-com.diffplug.spotless:spotless-eclipse-jdt:4.8.0
-com.diffplug.spotless:spotless-eclipse-base:3.4.1
-com.github.spotbugs:spotbugs-annotations:4.0.2
-com.google.code.findbugs:jsr305:3.0.2
-net.jcip:jcip-annotations:1.0
-org.eclipse.jdt:org.eclipse.jdt.core:3.23.0
-org.eclipse.platform:org.eclipse.core.commands:3.9.700
-org.eclipse.platform:org.eclipse.core.contenttype:3.7.800
-org.eclipse.platform:org.eclipse.core.jobs:3.10.800
-org.eclipse.platform:org.eclipse.core.resources:3.13.800
-org.eclipse.platform:org.eclipse.core.runtime:3.19.0
-org.eclipse.platform:org.eclipse.equinox.app:1.5.0
-org.eclipse.platform:org.eclipse.equinox.common:3.13.0
-org.eclipse.platform:org.eclipse.equinox.preferences:3.8.0
-org.eclipse.platform:org.eclipse.equinox.registry:3.9.0
-org.eclipse.platform:org.eclipse.osgi:3.16.0
-org.eclipse.platform:org.eclipse.text:3.10.300
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.18.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.18.0.lockfile
deleted file mode 100644
index c5b2799c11..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.18.0.lockfile
+++ /dev/null
@@ -1,19 +0,0 @@
-# Spotless formatter based on JDT version 4.18.0 (see https://projects.eclipse.org/projects/eclipse.jdt)
-# Compare tag in M2 pom with https://git.eclipse.org/c/jdt/eclipse.jdt.core.git/log/?h=R4_18 to determine core version.
-com.diffplug.spotless:spotless-eclipse-jdt:4.8.0
-com.diffplug.spotless:spotless-eclipse-base:3.4.2
-com.github.spotbugs:spotbugs-annotations:4.0.2
-com.google.code.findbugs:jsr305:3.0.2
-net.jcip:jcip-annotations:1.0
-org.eclipse.jdt:org.eclipse.jdt.core:3.24.0
-org.eclipse.platform:org.eclipse.core.commands:3.9.800
-org.eclipse.platform:org.eclipse.core.contenttype:3.7.800
-org.eclipse.platform:org.eclipse.core.jobs:3.10.1000
-org.eclipse.platform:org.eclipse.core.resources:3.13.900
-org.eclipse.platform:org.eclipse.core.runtime:3.20.0
-org.eclipse.platform:org.eclipse.equinox.app:1.5.0
-org.eclipse.platform:org.eclipse.equinox.common:3.14.0
-org.eclipse.platform:org.eclipse.equinox.preferences:3.8.100
-org.eclipse.platform:org.eclipse.equinox.registry:3.10.0
-org.eclipse.platform:org.eclipse.osgi:3.16.100
-org.eclipse.platform:org.eclipse.text:3.10.400
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.19.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.19.0.lockfile
deleted file mode 100644
index fcc96b8520..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.19.0.lockfile
+++ /dev/null
@@ -1,19 +0,0 @@
-# Spotless formatter based on JDT version 4.19.0 (see https://projects.eclipse.org/projects/eclipse.jdt)
-# Compare tag in M2 pom with https://git.eclipse.org/c/jdt/eclipse.jdt.core.git/log/?h=R4_19 to determine core version.
-com.diffplug.spotless:spotless-eclipse-jdt:4.8.0
-com.diffplug.spotless:spotless-eclipse-base:3.4.2
-com.github.spotbugs:spotbugs-annotations:4.0.2
-com.google.code.findbugs:jsr305:3.0.2
-net.jcip:jcip-annotations:1.0
-org.eclipse.jdt:org.eclipse.jdt.core:3.25.0
-org.eclipse.platform:org.eclipse.core.commands:3.9.800
-org.eclipse.platform:org.eclipse.core.contenttype:3.7.900
-org.eclipse.platform:org.eclipse.core.jobs:3.10.1100
-org.eclipse.platform:org.eclipse.core.resources:3.14.0
-org.eclipse.platform:org.eclipse.core.runtime:3.20.100
-org.eclipse.platform:org.eclipse.equinox.app:1.5.100
-org.eclipse.platform:org.eclipse.equinox.common:3.14.100
-org.eclipse.platform:org.eclipse.equinox.preferences:3.8.200
-org.eclipse.platform:org.eclipse.equinox.registry:3.10.100
-org.eclipse.platform:org.eclipse.osgi:3.16.200
-org.eclipse.platform:org.eclipse.text:3.11.0
\ No newline at end of file
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.20.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.20.0.lockfile
deleted file mode 100644
index b06a9bc617..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.20.0.lockfile
+++ /dev/null
@@ -1,20 +0,0 @@
-# Spotless formatter based on JDT version 4.20.0 (see https://projects.eclipse.org/projects/eclipse.jdt)
-# Compare tag in M2 pom with https://git.eclipse.org/c/jdt/eclipse.jdt.core.git/log/?h=R4_20 to determine core version.
-com.diffplug.spotless:spotless-eclipse-jdt:4.8.1
-com.diffplug.spotless:spotless-eclipse-base:3.5.2
-com.github.spotbugs:spotbugs-annotations:4.0.2
-com.google.code.findbugs:jsr305:3.0.2
-net.jcip:jcip-annotations:1.0
-org.eclipse.jdt:org.eclipse.jdt.core:3.26.0
-org.eclipse.platform:org.eclipse.core.commands:3.10.0
-org.eclipse.platform:org.eclipse.core.contenttype:3.7.1000
-org.eclipse.platform:org.eclipse.core.filesystem:1.9.0
-org.eclipse.platform:org.eclipse.core.jobs:3.11.0
-org.eclipse.platform:org.eclipse.core.resources:3.15.0
-org.eclipse.platform:org.eclipse.core.runtime:3.22.0
-org.eclipse.platform:org.eclipse.equinox.app:1.5.100
-org.eclipse.platform:org.eclipse.equinox.common:3.15.0
-org.eclipse.platform:org.eclipse.equinox.preferences:3.8.200
-org.eclipse.platform:org.eclipse.equinox.registry:3.10.200
-org.eclipse.platform:org.eclipse.osgi:3.16.300
-org.eclipse.platform:org.eclipse.text:3.12.0
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.21.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.21.0.lockfile
deleted file mode 100644
index 84a90489c9..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.21.0.lockfile
+++ /dev/null
@@ -1,20 +0,0 @@
-# Spotless formatter based on JDT version 4.21.0 (see https://projects.eclipse.org/projects/eclipse.jdt)
-# Compare tag in M2 pom with https://git.eclipse.org/c/jdt/eclipse.jdt.core.git/log/?h=R4_21 to determine core version.
-com.diffplug.spotless:spotless-eclipse-jdt:4.8.1
-com.diffplug.spotless:spotless-eclipse-base:3.5.2
-com.github.spotbugs:spotbugs-annotations:4.0.2
-com.google.code.findbugs:jsr305:3.0.2
-net.jcip:jcip-annotations:1.0
-org.eclipse.jdt:org.eclipse.jdt.core:3.27.0
-org.eclipse.platform:org.eclipse.core.commands:3.10.100
-org.eclipse.platform:org.eclipse.core.contenttype:3.8.0
-org.eclipse.platform:org.eclipse.core.filesystem:1.9.100
-org.eclipse.platform:org.eclipse.core.jobs:3.12.0
-org.eclipse.platform:org.eclipse.core.resources:3.15.100
-org.eclipse.platform:org.eclipse.core.runtime:3.23.0
-org.eclipse.platform:org.eclipse.equinox.app:1.6.0
-org.eclipse.platform:org.eclipse.equinox.common:3.15.0
-org.eclipse.platform:org.eclipse.equinox.preferences:3.9.0
-org.eclipse.platform:org.eclipse.equinox.registry:3.11.0
-org.eclipse.platform:org.eclipse.osgi:3.17.0
-org.eclipse.platform:org.eclipse.text:3.12.0
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.6.1.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.6.1.lockfile
deleted file mode 100644
index fd408e7ecc..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.6.1.lockfile
+++ /dev/null
@@ -1,2 +0,0 @@
-# Spotless formatter based on JDT version 4.6.1 (see https://projects.eclipse.org/projects/eclipse.jdt)
-com.diffplug.spotless:spotless-ext-eclipse-jdt:4.6.1
\ No newline at end of file
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.6.2.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.6.2.lockfile
deleted file mode 100644
index a042b7e734..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.6.2.lockfile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Spotless formatter based on JDT version 4.6.2 (see https://projects.eclipse.org/projects/eclipse.jdt)
-# Compare tag in M2 pom with https://git.eclipse.org/c/jdt/eclipse.jdt.core.git/log/?h=R4_6_maintenance to determine core version.
-com.diffplug.spotless:spotless-eclipse-jdt:4.8.0
-com.diffplug.spotless:spotless-eclipse-base:3.1.1
-com.google.code.findbugs:annotations:3.0.0
-com.google.code.findbugs:jsr305:3.0.0
-org.eclipse.jdt:org.eclipse.jdt.core:3.12.2
-org.eclipse.platform:org.eclipse.core.commands:3.9.100
-org.eclipse.platform:org.eclipse.core.contenttype:3.7.0
-org.eclipse.platform:org.eclipse.core.jobs:3.10.0
-org.eclipse.platform:org.eclipse.core.resources:3.13.0
-org.eclipse.platform:org.eclipse.core.runtime:3.14.0
-org.eclipse.platform:org.eclipse.equinox.app:1.3.500
-org.eclipse.platform:org.eclipse.equinox.common:3.10.0
-org.eclipse.platform:org.eclipse.equinox.preferences:3.7.100
-org.eclipse.platform:org.eclipse.equinox.registry:3.8.0
-org.eclipse.platform:org.eclipse.osgi:3.13.0
-org.eclipse.platform:org.eclipse.text:3.6.300
\ No newline at end of file
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.6.3.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.6.3.lockfile
deleted file mode 100644
index 714ff708c8..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.6.3.lockfile
+++ /dev/null
@@ -1,2 +0,0 @@
-# Spotless formatter based on JDT version 4.6.3 (see https://projects.eclipse.org/projects/eclipse.jdt)
-com.diffplug.spotless:spotless-ext-eclipse-jdt:4.6.3
\ No newline at end of file
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.7.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.7.0.lockfile
deleted file mode 100644
index 9e3eefbcb1..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.7.0.lockfile
+++ /dev/null
@@ -1,2 +0,0 @@
-# Spotless formatter based on JDT version 4.7 (see https://projects.eclipse.org/projects/eclipse.jdt)
-com.diffplug.spotless:spotless-ext-eclipse-jdt:4.7.0
\ No newline at end of file
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.7.1.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.7.1.lockfile
deleted file mode 100644
index 650c67e13b..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.7.1.lockfile
+++ /dev/null
@@ -1,2 +0,0 @@
-# Spotless formatter based on JDT version 4.7.1 (see https://projects.eclipse.org/projects/eclipse.jdt)
-com.diffplug.spotless:spotless-ext-eclipse-jdt:4.7.1
\ No newline at end of file
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.7.2.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.7.2.lockfile
deleted file mode 100644
index 35abd036aa..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.7.2.lockfile
+++ /dev/null
@@ -1,2 +0,0 @@
-# Spotless formatter based on JDT version 4.7.2 (see https://projects.eclipse.org/projects/eclipse.jdt)
-com.diffplug.spotless:spotless-ext-eclipse-jdt:4.7.2
\ No newline at end of file
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.7.3a.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.7.3a.lockfile
deleted file mode 100644
index a5e7aaa57b..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.7.3a.lockfile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Spotless formatter based on JDT version 4.7.3a (see https://projects.eclipse.org/projects/eclipse.jdt)
-# Compare tag in M2 pom with https://git.eclipse.org/c/jdt/eclipse.jdt.core.git/log/?h=R4_7_maintenance to determine core version.
-com.diffplug.spotless:spotless-eclipse-jdt:4.8.0
-com.diffplug.spotless:spotless-eclipse-base:3.1.1
-com.google.code.findbugs:annotations:3.0.0
-com.google.code.findbugs:jsr305:3.0.0
-org.eclipse.jdt:org.eclipse.jdt.core:3.13.101
-org.eclipse.platform:org.eclipse.core.commands:3.9.100
-org.eclipse.platform:org.eclipse.core.contenttype:3.7.0
-org.eclipse.platform:org.eclipse.core.jobs:3.10.0
-org.eclipse.platform:org.eclipse.core.resources:3.13.0
-org.eclipse.platform:org.eclipse.core.runtime:3.14.0
-org.eclipse.platform:org.eclipse.equinox.app:1.3.500
-org.eclipse.platform:org.eclipse.equinox.common:3.10.0
-org.eclipse.platform:org.eclipse.equinox.preferences:3.7.100
-org.eclipse.platform:org.eclipse.equinox.registry:3.8.0
-org.eclipse.platform:org.eclipse.osgi:3.13.0
-org.eclipse.platform:org.eclipse.text:3.6.300
\ No newline at end of file
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.8.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.8.0.lockfile
deleted file mode 100644
index a9204f5a45..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.8.0.lockfile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Spotless formatter based on JDT version 4.8.0 (see https://projects.eclipse.org/projects/eclipse.jdt)
-# Compare tag in M2 pom with https://git.eclipse.org/c/jdt/eclipse.jdt.core.git/tag/?h=R4_8 to determine core version.
-com.diffplug.spotless:spotless-eclipse-jdt:4.8.0
-com.diffplug.spotless:spotless-eclipse-base:3.1.1
-com.google.code.findbugs:annotations:3.0.0
-com.google.code.findbugs:jsr305:3.0.0
-org.eclipse.jdt:org.eclipse.jdt.core:3.14.0
-org.eclipse.platform:org.eclipse.core.commands:3.9.100
-org.eclipse.platform:org.eclipse.core.contenttype:3.7.0
-org.eclipse.platform:org.eclipse.core.jobs:3.10.0
-org.eclipse.platform:org.eclipse.core.resources:3.13.0
-org.eclipse.platform:org.eclipse.core.runtime:3.14.0
-org.eclipse.platform:org.eclipse.equinox.app:1.3.500
-org.eclipse.platform:org.eclipse.equinox.common:3.10.0
-org.eclipse.platform:org.eclipse.equinox.preferences:3.7.100
-org.eclipse.platform:org.eclipse.equinox.registry:3.8.0
-org.eclipse.platform:org.eclipse.osgi:3.13.0
-org.eclipse.platform:org.eclipse.text:3.6.300
\ No newline at end of file
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.9.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.9.0.lockfile
deleted file mode 100644
index 5a19c69254..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.9.0.lockfile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Spotless formatter based on JDT version 4.9.0 (see https://projects.eclipse.org/projects/eclipse.jdt)
-# Compare tag in M2 pom with https://git.eclipse.org/c/jdt/eclipse.jdt.core.git/tag/?h=R4_9 to determine core version.
-com.diffplug.spotless:spotless-eclipse-jdt:4.8.0
-com.diffplug.spotless:spotless-eclipse-base:3.1.1
-com.google.code.findbugs:annotations:3.0.0
-com.google.code.findbugs:jsr305:3.0.0
-org.eclipse.jdt:org.eclipse.jdt.core:3.15.0
-org.eclipse.platform:org.eclipse.core.commands:3.9.100
-org.eclipse.platform:org.eclipse.core.contenttype:3.7.0
-org.eclipse.platform:org.eclipse.core.jobs:3.10.0
-org.eclipse.platform:org.eclipse.core.resources:3.13.0
-org.eclipse.platform:org.eclipse.core.runtime:3.14.0
-org.eclipse.platform:org.eclipse.equinox.app:1.3.500
-org.eclipse.platform:org.eclipse.equinox.common:3.10.0
-org.eclipse.platform:org.eclipse.equinox.preferences:3.7.100
-org.eclipse.platform:org.eclipse.equinox.registry:3.8.0
-org.eclipse.platform:org.eclipse.osgi:3.13.0
-org.eclipse.platform:org.eclipse.text:3.6.300
\ No newline at end of file

From 46d370dd5e5e0ebaadcd4ebca2eef1927d2806f3 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Wed, 25 Jan 2023 19:20:05 +0100
Subject: [PATCH 0683/2068] 1499: provide npm output if server starting fails

---
 .../diffplug/spotless/npm/NpmFormatterStepStateBase.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
index 9cff41e604..3e5fa1ff18 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
@@ -32,6 +32,8 @@
 import org.slf4j.LoggerFactory;
 
 import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.ProcessRunner.LongRunningProcess;
+import com.diffplug.spotless.ThrowingEx;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
@@ -101,13 +103,14 @@ protected boolean needsPrepareNodeServerLayout() {
 
 	protected ServerProcessInfo npmRunServer() throws ServerStartException, IOException {
 		assertNodeServerDirReady();
+		LongRunningProcess server = null;
 		try {
 			// The npm process will output the randomly selected port of the http server process to 'server.port' file
 			// so in order to be safe, remove such a file if it exists before starting.
 			final File serverPortFile = new File(this.nodeServerLayout.nodeModulesDir(), "server.port");
 			NpmResourceHelper.deleteFileIfExists(serverPortFile);
 			// start the http server in node
-			Process server = new NpmProcess(this.nodeServerLayout.nodeModulesDir(), this.locations.npmExecutable(), this.locations.nodeExecutable()).start();
+			server = new NpmProcess(this.nodeServerLayout.nodeModulesDir(), this.locations.npmExecutable(), this.locations.nodeExecutable()).start();
 
 			// await the readiness of the http server - wait for at most 60 seconds
 			try {
@@ -128,7 +131,7 @@ protected ServerProcessInfo npmRunServer() throws ServerStartException, IOExcept
 			String serverPort = NpmResourceHelper.readUtf8StringFromFile(serverPortFile).trim();
 			return new ServerProcessInfo(server, serverPort, serverPortFile);
 		} catch (IOException | TimeoutException e) {
-			throw new ServerStartException(e);
+			throw new ServerStartException("Starting server failed." + (server != null ? "\n\nProcess result:\n" + ThrowingEx.get(server::result) : ""), e);
 		}
 	}
 
@@ -197,7 +200,7 @@ public void close() throws Exception {
 	protected static class ServerStartException extends RuntimeException {
 		private static final long serialVersionUID = -8803977379866483002L;
 
-		public ServerStartException(Throwable cause) {
+		public ServerStartException(String message, Throwable cause) {
 			super(cause);
 		}
 	}

From 012e4ae55cd0c9c3783ed6130e6edf6e10700277 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Wed, 25 Jan 2023 19:21:35 +0100
Subject: [PATCH 0684/2068] 1499: fix condition

---
 .../com/diffplug/spotless/npm/NpmFormatterStepStateBase.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
index 3e5fa1ff18..92ac7df6f2 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
@@ -94,7 +94,7 @@ protected void assertNodeServerDirReady() throws IOException {
 	}
 
 	protected boolean needsPrepareNodeServer() {
-		return this.nodeServerLayout.isNodeModulesPrepared();
+		return !this.nodeServerLayout.isNodeModulesPrepared();
 	}
 
 	protected boolean needsPrepareNodeServerLayout() {

From 76b626cc73ef469c499a3b5fc33f807c0645766f Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Wed, 25 Jan 2023 22:29:12 +0400
Subject: [PATCH 0685/2068] Handle specifically empty filePath, and not default
 FS rootDir

---
 gradle.properties                             |  2 +-
 .../java/com/diffplug/spotless/Formatter.java | 12 +++-
 testlib/build.gradle                          |  1 +
 .../com/diffplug/spotless/FormatterTest.java  | 66 ++++++++++++++++++-
 4 files changed, 76 insertions(+), 5 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 5702d21bdd..523440be25 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -28,4 +28,4 @@ VER_DURIAN=1.2.0
 VER_JGIT=5.13.1.202206130422-r
 VER_JUNIT=5.9.2
 VER_ASSERTJ=3.24.2
-VER_MOCKITO=4.11.0
\ No newline at end of file
+VER_MOCKITO=5.0.0
diff --git a/lib/src/main/java/com/diffplug/spotless/Formatter.java b/lib/src/main/java/com/diffplug/spotless/Formatter.java
index 038e77fa64..3a38893cd6 100644
--- a/lib/src/main/java/com/diffplug/spotless/Formatter.java
+++ b/lib/src/main/java/com/diffplug/spotless/Formatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -237,8 +237,14 @@ public String compute(String unix, File file) {
 					unix = LineEnding.toUnix(formatted);
 				}
 			} catch (Throwable e) {
-				String relativePath = rootDir.relativize(file.toPath()).toString();
-				exceptionPolicy.handleError(e, step, relativePath);
+				if (file.getPath().isEmpty()) {
+					// Path.relativize would fail if rootDir is an absolute path
+					exceptionPolicy.handleError(e, step, "");
+				} else {
+					// Path may be forged from a different FileSystem than Filesystem.default
+					String relativePath = rootDir.relativize(rootDir.getFileSystem().getPath(file.getPath())).toString();
+					exceptionPolicy.handleError(e, step, relativePath);
+				}
 			}
 		}
 		return unix;
diff --git a/testlib/build.gradle b/testlib/build.gradle
index 64d4681805..97b17d0dc6 100644
--- a/testlib/build.gradle
+++ b/testlib/build.gradle
@@ -12,6 +12,7 @@ dependencies {
 	api "com.diffplug.durian:durian-testlib:${VER_DURIAN}"
 	api "org.junit.jupiter:junit-jupiter:${VER_JUNIT}"
 	api "org.assertj:assertj-core:${VER_ASSERTJ}"
+	api "org.mockito:mockito-core:$VER_MOCKITO"
 
 	implementation "com.diffplug.durian:durian-io:${VER_DURIAN}"
 	implementation "com.diffplug.durian:durian-collect:${VER_DURIAN}"
diff --git a/testlib/src/test/java/com/diffplug/spotless/FormatterTest.java b/testlib/src/test/java/com/diffplug/spotless/FormatterTest.java
index 06b8e64d31..0faf40bb95 100644
--- a/testlib/src/test/java/com/diffplug/spotless/FormatterTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/FormatterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,15 +15,19 @@
  */
 package com.diffplug.spotless;
 
+import java.io.File;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.FileSystems;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
 
 import com.diffplug.common.base.StandardSystemProperty;
 import com.diffplug.spotless.generic.EndWithNewlineStep;
@@ -89,4 +93,64 @@ protected Formatter create() {
 			}
 		}.testEquals();
 	}
+
+	// new File("") can be used if there is no File representing this content. It should not conflict with rootDir.relativize(...)
+	@Test
+	public void testExceptionWithEmptyPath() throws Exception {
+		LineEnding.Policy lineEndingsPolicy = LineEnding.UNIX.createPolicy();
+		Charset encoding = StandardCharsets.UTF_8;
+		FormatExceptionPolicy exceptionPolicy = FormatExceptionPolicy.failOnlyOnError();
+
+		Path rootDir = Paths.get(StandardSystemProperty.USER_DIR.value());
+
+		FormatterStep step = Mockito.mock(FormatterStep.class);
+		Mockito.when(step.getName()).thenReturn("someFailingStep");
+		Mockito.when(step.format(Mockito.anyString(), Mockito.any(File.class))).thenThrow(new IllegalArgumentException("someReason"));
+		List<FormatterStep> steps = Collections.singletonList(step);
+
+		Formatter formatter = Formatter.builder()
+				.lineEndingsPolicy(lineEndingsPolicy)
+				.encoding(encoding)
+				.rootDir(rootDir)
+				.steps(steps)
+				.exceptionPolicy(exceptionPolicy)
+				.build();
+
+		formatter.compute("someFileContent", new File(""));
+	}
+
+	// rootDir may be a path not from the default FileSystem
+	@Test
+	public void testExceptionWithRootDirIsNotFileSystem() throws Exception {
+		LineEnding.Policy lineEndingsPolicy = LineEnding.UNIX.createPolicy();
+		Charset encoding = StandardCharsets.UTF_8;
+		FormatExceptionPolicy exceptionPolicy = FormatExceptionPolicy.failOnlyOnError();
+
+		Path rootDir = Mockito.mock(Path.class);
+		Path relativized = Mockito.mock(Path.class);
+		Mockito.when(rootDir.relativize(Mockito.any(Path.class))).then(invok -> {
+			Path filePath = invok.getArgument(0);
+			if (filePath.getFileSystem() == FileSystems.getDefault()) {
+				throw new IllegalArgumentException("Can not relativize through different FileSystems");
+			}
+
+			return relativized;
+		});
+
+		FormatterStep step = Mockito.mock(FormatterStep.class);
+		Mockito.when(step.getName()).thenReturn("someFailingStep");
+		Mockito.when(step.format(Mockito.anyString(), Mockito.any(File.class))).thenThrow(new IllegalArgumentException("someReason"));
+		List<FormatterStep> steps = Collections.singletonList(step);
+
+		Formatter formatter = Formatter.builder()
+				.lineEndingsPolicy(lineEndingsPolicy)
+				.encoding(encoding)
+				.rootDir(rootDir)
+				.steps(steps)
+				.exceptionPolicy(exceptionPolicy)
+				.build();
+
+		formatter.compute("someFileContent", new File(""));
+	}
+
 }

From a8c0bb818de07242feeb08f5731af6ce6fd7a0cb Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Wed, 25 Jan 2023 22:53:07 +0400
Subject: [PATCH 0686/2068] Rollback Mockito to 4.X (as 5.X requires JDK11)

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 523440be25..d99bdac6ce 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -28,4 +28,4 @@ VER_DURIAN=1.2.0
 VER_JGIT=5.13.1.202206130422-r
 VER_JUNIT=5.9.2
 VER_ASSERTJ=3.24.2
-VER_MOCKITO=5.0.0
+VER_MOCKITO=4.11.0

From 469351773f1a6577a8fea6b328a4986581d385bd Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Wed, 25 Jan 2023 21:18:49 +0800
Subject: [PATCH 0687/2068] Compare current Java version via isCompatibleWith

---
 lib/build.gradle | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 82595da399..f2ca13ccb1 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -107,16 +107,15 @@ spotbugs { reportLevel = 'low' } // low|medium|high (low = sensitive to even min
 
 apply from: rootProject.file('gradle/special-tests.gradle')
 tasks.withType(Test).configureEach {
-	def jdkVersion = JavaVersion.current().majorVersion.toInteger()
 	def args = []
-	if (jdkVersion >= 16) {
+	if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_16)) {
 		// https://docs.gradle.org/7.5/userguide/upgrading_version_7.html#removes_implicit_add_opens_for_test_workers
 		args += [
 			"--add-opens=java.base/java.lang=ALL-UNNAMED",
 			"--add-opens=java.base/java.util=ALL-UNNAMED",
 		]
 	}
-	if (jdkVersion >= 18) {
+	if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_18)) {
 		// https://openjdk.org/jeps/411
 		args += "-Djava.security.manager=allow"
 	}

From bdf09a4071708af3fd4e10ecc68975c8df89cc56 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Wed, 25 Jan 2023 21:23:25 +0800
Subject: [PATCH 0688/2068] Apply mavenCentral in
 dependencyResolutionManagement

---
 build.gradle              | 5 +----
 gradle/java-setup.gradle  | 1 -
 plugin-maven/build.gradle | 1 -
 settings.gradle           | 8 ++++++++
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index f9e3d0de21..9d43f50135 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,3 @@
-repositories {
-	mavenCentral()
-}
 apply from: rootProject.file('gradle/java-publish.gradle')
 apply from: rootProject.file('gradle/changelog.gradle')
 allprojects {
@@ -18,4 +15,4 @@ spotless {
 		trimTrailingWhitespace()
 		endWithNewline()
 	}
-}
\ No newline at end of file
+}
diff --git a/gradle/java-setup.gradle b/gradle/java-setup.gradle
index 9c9f394405..0f80c89d81 100644
--- a/gradle/java-setup.gradle
+++ b/gradle/java-setup.gradle
@@ -1,7 +1,6 @@
 //////////
 // JAVA //
 //////////
-repositories { mavenCentral() }
 
 // setup java
 apply plugin: 'java'
diff --git a/plugin-maven/build.gradle b/plugin-maven/build.gradle
index 664101a0fd..8ab478d6ba 100644
--- a/plugin-maven/build.gradle
+++ b/plugin-maven/build.gradle
@@ -3,7 +3,6 @@ plugins {
 	id 'de.benediktritter.maven-plugin-development' version '0.4.1'
 }
 
-repositories { mavenCentral() }
 apply from: rootProject.file('gradle/changelog.gradle')
 ext.artifactId = project.artifactIdMaven
 version = spotlessChangelog.versionNext
diff --git a/settings.gradle b/settings.gradle
index 8ab9430f00..996d5e6b74 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -17,6 +17,7 @@ pluginManagement {
 		id 'io.github.davidburstrom.version-compatibility' version '0.4.0'
 	}
 }
+
 plugins {
 	id 'com.diffplug.spotless'                 apply false
 	id 'com.gradle.plugin-publish'             apply false
@@ -28,6 +29,13 @@ plugins {
 	id 'io.github.davidburstrom.version-compatibility' apply false
 	id "com.gradle.enterprise" version "3.12.2"
 }
+
+dependencyResolutionManagement {
+	repositories {
+		mavenCentral()
+	}
+}
+
 if (System.env['CI'] != null) {
 	// use the remote buildcache on all CI builds
 	buildCache {

From 57edefb327936a8149d730cbc5863707d139db70 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Wed, 25 Jan 2023 21:29:54 +0800
Subject: [PATCH 0689/2068] Apply plugin versions in root plugins block

---
 settings.gradle | 43 +++++++++++++++++++------------------------
 1 file changed, 19 insertions(+), 24 deletions(-)

diff --git a/settings.gradle b/settings.gradle
index 996d5e6b74..d925058035 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,32 +1,27 @@
 pluginManagement {
-	plugins {
-		id 'com.diffplug.spotless'                 version '6.13.0'
-		// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
-		id 'com.gradle.plugin-publish'             version '1.1.0'
-		// https://github.com/gradle-nexus/publish-plugin/releases
-		id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
-		// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
-		id 'com.github.spotbugs'                   version '5.0.13'
-		// https://github.com/diffplug/spotless-changelog
-		id 'com.diffplug.spotless-changelog'       version '2.4.1'
-		// https://github.com/diffplug/goomph/blob/main/CHANGES.md
-		id 'com.diffplug.p2.asmaven'               version '3.27.0' // DO NOT UPDATE, see https://github.com/diffplug/spotless/pull/874
-		// https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md
-		id 'com.adarshr.test-logger'               version '3.2.0'
-		// https://github.com/davidburstrom/version-compatibility-gradle-plugin/tags
-		id 'io.github.davidburstrom.version-compatibility' version '0.4.0'
+	repositories {
+		mavenCentral()
+		gradlePluginPortal()
 	}
 }
 
 plugins {
-	id 'com.diffplug.spotless'                 apply false
-	id 'com.gradle.plugin-publish'             apply false
-	id 'io.github.gradle-nexus.publish-plugin' apply false
-	id 'com.github.spotbugs'                   apply false
-	id 'com.diffplug.spotless-changelog'       apply false
-	id 'com.diffplug.p2.asmaven'               apply false
-	id 'com.adarshr.test-logger'               apply false
-	id 'io.github.davidburstrom.version-compatibility' apply false
+	id 'com.diffplug.spotless' version '6.13.0' apply false
+	// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
+	id 'com.gradle.plugin-publish' version '1.1.0' apply false
+	// https://github.com/gradle-nexus/publish-plugin/releases
+	id 'io.github.gradle-nexus.publish-plugin' version '1.1.0' apply false
+	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
+	id 'com.github.spotbugs' version '5.0.13' apply false
+	// https://github.com/diffplug/spotless-changelog
+	id 'com.diffplug.spotless-changelog' version '2.4.1' apply false
+	// https://github.com/diffplug/goomph/blob/main/CHANGES.md
+	// DO NOT UPDATE, see https://github.com/diffplug/spotless/pull/874
+	id 'com.diffplug.p2.asmaven' version '3.27.0' apply false
+	// https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md
+	id 'com.adarshr.test-logger' version '3.2.0' apply false
+	// https://github.com/davidburstrom/version-compatibility-gradle-plugin/tags
+	id 'io.github.davidburstrom.version-compatibility' version '0.4.0' apply false
 	id "com.gradle.enterprise" version "3.12.2"
 }
 

From fff6fdf98af32af8ef089c87477177648bb3bd5b Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Wed, 25 Jan 2023 21:38:07 +0800
Subject: [PATCH 0690/2068] Defer more task configurations

---
 _ext/gradle/java-setup.gradle      | 2 +-
 _ext/gradle/update-lockfile.gradle | 4 ++--
 gradle/java-setup.gradle           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/_ext/gradle/java-setup.gradle b/_ext/gradle/java-setup.gradle
index 9572fc2955..0d620a6519 100644
--- a/_ext/gradle/java-setup.gradle
+++ b/_ext/gradle/java-setup.gradle
@@ -9,7 +9,7 @@ apply from: rootProject.file('gradle/java-setup.gradle')
 apply plugin: 'java-library'
 
 // Show warning locations, fail on warnings
-tasks.withType(JavaCompile) {
+tasks.withType(JavaCompile).configureEach {
 	options.compilerArgs << "-Xlint:unchecked"
 	options.compilerArgs << "-Xlint:deprecation"
 	options.compilerArgs << "-Werror"
diff --git a/_ext/gradle/update-lockfile.gradle b/_ext/gradle/update-lockfile.gradle
index 098d960eff..3c23bb860b 100644
--- a/_ext/gradle/update-lockfile.gradle
+++ b/_ext/gradle/update-lockfile.gradle
@@ -1,6 +1,6 @@
 // Use file locking
-configurations.all {
+configurations.configureEach {
 	resolutionStrategy {
 		activateDependencyLocking()
 	}
-}
\ No newline at end of file
+}
diff --git a/gradle/java-setup.gradle b/gradle/java-setup.gradle
index 0f80c89d81..b048229b75 100644
--- a/gradle/java-setup.gradle
+++ b/gradle/java-setup.gradle
@@ -7,7 +7,7 @@ apply plugin: 'java'
 
 sourceCompatibility = VER_JAVA
 targetCompatibility = VER_JAVA
-tasks.withType(JavaCompile) { options.encoding = 'UTF-8' }
+tasks.withType(JavaCompile).configureEach { options.encoding = 'UTF-8' }
 
 //////////////
 // SPOTBUGS //

From 05950364f603bc45648660813cc6e7ab692de11d Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Thu, 26 Jan 2023 13:04:10 +0800
Subject: [PATCH 0691/2068] Trigger gradle/wrapper-validation-action after
 related files changed

---
 .github/workflows/gradle-wrapper-validation.yml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index c80a7e5278..2c02ce0fc4 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -1,5 +1,15 @@
 name: "Validate Gradle Wrapper"
-on: [push, pull_request]
+on:
+  push:
+    paths:
+      - 'gradlew'
+      - 'gradlew.bat'
+      - 'gradle/wrapper/'
+  pull_request:
+    paths:
+      - 'gradlew'
+      - 'gradlew.bat'
+      - 'gradle/wrapper/'
 
 permissions:
   contents: read

From f634ef00ec2fc70288601e439f8e1f86440171e4 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 25 Jan 2023 22:45:17 -0800
Subject: [PATCH 0692/2068] https://github.com/equodev/equo-ide/pull/65 has
 merged

---
 build.gradle | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 450ee61583..d1ae14750e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,9 +4,7 @@ plugins {
 }
 equoIde {
 	branding.title('Spotless').icon(file('_images/spotless_logo.png'))
-
-	// waiting on https://github.com/equodev/equo-ide/pull/65
-	//welcome().openUrlOnStartup('https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md')
+	welcome().openUrlOnStartup('https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md')
 
 	// everything below becomes the default after https://github.com/equodev/equo-ide/pull/66
 	p2repo 'https://download.eclipse.org/eclipse/updates/4.26/'

From 56a6f7e3d1ccfcdb2fd385a5d06cc3e831c49b22 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 25 Jan 2023 23:03:33 -0800
Subject: [PATCH 0693/2068] Improved KtLintStepTest.equality to not download so
 much.

---
 .../java/com/diffplug/spotless/kotlin/KtLintStepTest.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
index 3047245298..6700be168d 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
@@ -88,14 +88,14 @@ void works0_48_1() {
 	@Test
 	void equality() {
 		new SerializableEqualityTester() {
-			String version = "0.32.0";
+			String version = "0.48.0";
 
 			@Override
 			protected void setupTest(API api) {
 				// same version == same
 				api.areDifferentThan();
 				// change the version, and it's different
-				version = "0.38.0-alpha01";
+				version = "0.48.1";
 				api.areDifferentThan();
 			}
 

From fb03922888f9a1e3c3e987249c121df191fe3abd Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 26 Jan 2023 10:15:08 -0800
Subject: [PATCH 0694/2068] The Kotlin gradle integration tests had tested
 every possible combination. A job for the unit tests, not the integration
 tests.

---
 .../gradle/spotless/KotlinExtensionTest.java  | 262 ------------------
 .../spotless/KotlinGradleExtensionTest.java   | 121 --------
 2 files changed, 383 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
index a15a51412e..947b5bd728 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
@@ -23,24 +23,6 @@ class KotlinExtensionTest extends GradleIntegrationHarness {
 	private static final String HEADER = "// License Header";
 	private static final String HEADER_WITH_YEAR = "// License Header $YEAR";
 
-	@Test
-	void integration() throws IOException {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    kotlin {",
-				"        ktlint()",
-				"    }",
-				"}");
-		setFile("src/main/kotlin/Main.kt").toResource("kotlin/ktlint/basic.dirty");
-		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("src/main/kotlin/Main.kt").sameAsResource("kotlin/ktlint/basic.clean");
-	}
-
 	@Test
 	void integrationDiktat() throws IOException {
 		setFile("build.gradle").toLines(
@@ -59,42 +41,6 @@ void integrationDiktat() throws IOException {
 		assertFile("src/main/kotlin/com/example/Main.kt").sameAsResource("kotlin/diktat/main.clean");
 	}
 
-	@Test
-	void integrationKtfmt() throws IOException {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    kotlin {",
-				"        ktfmt()",
-				"    }",
-				"}");
-		setFile("src/main/kotlin/basic.kt").toResource("kotlin/ktfmt/basic.dirty");
-		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("src/main/kotlin/basic.kt").sameAsResource("kotlin/ktfmt/basic.clean");
-	}
-
-	@Test
-	void integrationKtfmt_dropboxStyle_0_18() throws IOException {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    kotlin {",
-				"        ktfmt('0.18').dropboxStyle()",
-				"    }",
-				"}");
-		setFile("src/main/kotlin/basic.kt").toResource("kotlin/ktfmt/basic.dirty");
-		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("src/main/kotlin/basic.kt").sameAsResource("kotlin/ktfmt/basic-dropboxstyle.clean");
-	}
-
 	@Test
 	void integrationKtfmt_dropboxStyle_0_19() throws IOException {
 		setFile("build.gradle").toLines(
@@ -113,42 +59,6 @@ void integrationKtfmt_dropboxStyle_0_19() throws IOException {
 		assertFile("src/main/kotlin/basic.kt").sameAsResource("kotlin/ktfmt/basic-dropboxstyle.clean");
 	}
 
-	@Test
-	void testWithIndentation() throws IOException {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    kotlin {",
-				"        ktlint().editorConfigOverride(['indent_size': '6'])",
-				"    }",
-				"}");
-		setFile("src/main/kotlin/Main.kt").toResource("kotlin/ktlint/basic.dirty");
-		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("src/main/kotlin/Main.kt").sameAsResource("kotlin/ktlint/basic.clean-indent6");
-	}
-
-	@Test
-	void withExperimental() throws IOException {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    kotlin {",
-				"        ktlint().setUseExperimental(true)",
-				"    }",
-				"}");
-		setFile("src/main/kotlin/Main.kt").toResource("kotlin/ktlint/experimental.dirty");
-		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("src/main/kotlin/Main.kt").sameAsResource("kotlin/ktlint/experimental.clean");
-	}
-
 	@Test
 	void withExperimentalEditorConfigOverride() throws IOException {
 		setFile("build.gradle").toLines(
@@ -190,115 +100,6 @@ void testWithHeader() throws IOException {
 		assertFile("src/main/kotlin/AnObject.kt").hasContent(HEADER + "\n" + getTestResource("kotlin/licenseheader/KotlinCodeWithoutHeader.test"));
 	}
 
-	@Test
-	void testWithHeaderKtfmt() throws IOException {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    kotlin {",
-				"        licenseHeader('" + HEADER + "')",
-				"        ktfmt()",
-				"    }",
-				"}");
-		setFile("src/main/kotlin/AnObject.kt").toResource("kotlin/licenseheader/KotlinCodeWithoutHeader.test");
-		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("src/main/kotlin/AnObject.kt").hasContent(HEADER + "\n" + getTestResource("kotlin/licenseheader/KotlinCodeWithoutHeaderKtfmt.test"));
-	}
-
-	@Test
-	void testWithCustomHeaderSeparator() throws IOException {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    kotlin {",
-				"        ktlint()",
-				"        licenseHeader ('" + HEADER + "', '@file')",
-				"    }",
-				"}");
-		setFile("src/main/kotlin/AnObject.kt").toResource("kotlin/licenseheader/KotlinCodeWithoutHeader.test");
-		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("src/main/kotlin/AnObject.kt").hasContent(HEADER + "\n" + getTestResource("kotlin/licenseheader/KotlinCodeWithoutHeader.test"));
-	}
-
-	@Test
-	void testWithCustomHeaderSeparatorKtfmt() throws IOException {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    kotlin {",
-				"        licenseHeader ('" + HEADER + "', '@file')",
-				"        ktfmt()",
-				"    }",
-				"}");
-		setFile("src/main/kotlin/AnObject.kt").toResource("kotlin/licenseheader/KotlinCodeWithoutHeader.test");
-		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("src/main/kotlin/AnObject.kt").hasContent(HEADER + "\n" + getTestResource("kotlin/licenseheader/KotlinCodeWithoutHeaderKtfmt.test"));
-	}
-
-	@Test
-	void testWithNonStandardYearSeparator() throws IOException {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    kotlin {",
-				"        ktlint()",
-				"        licenseHeader('" + HEADER_WITH_YEAR + "').yearSeparator(', ')",
-				"    }",
-				"}");
-
-		setFile("src/main/kotlin/AnObject.kt").toResource("kotlin/licenseheader/KotlinCodeWithMultiYearHeader.test");
-		setFile("src/main/kotlin/AnObject2.kt").toResource("kotlin/licenseheader/KotlinCodeWithMultiYearHeader2.test");
-		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("src/main/kotlin/AnObject.kt").matches(matcher -> {
-			matcher.startsWith("// License Header 2012, 2014");
-		});
-		assertFile("src/main/kotlin/AnObject2.kt").matches(matcher -> {
-			matcher.startsWith("// License Header 2012, 2014");
-		});
-	}
-
-	@Test
-	void testWithNonStandardYearSeparatorKtfmt() throws IOException {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    kotlin {",
-				"        licenseHeader('" + HEADER_WITH_YEAR + "').yearSeparator(', ')",
-				"        ktfmt()",
-				"    }",
-				"}");
-
-		setFile("src/main/kotlin/AnObject.kt").toResource("kotlin/licenseheader/KotlinCodeWithMultiYearHeader.test");
-		setFile("src/main/kotlin/AnObject2.kt").toResource("kotlin/licenseheader/KotlinCodeWithMultiYearHeader2.test");
-		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("src/main/kotlin/AnObject.kt").matches(matcher -> {
-			matcher.startsWith("// License Header 2012, 2014");
-		});
-		assertFile("src/main/kotlin/AnObject2.kt").matches(matcher -> {
-			matcher.startsWith("// License Header 2012, 2014");
-		});
-	}
-
 	@Test
 	void testWithCustomMaxWidthDefaultStyleKtfmt() throws IOException {
 		setFile("build.gradle").toLines(
@@ -319,67 +120,4 @@ void testWithCustomMaxWidthDefaultStyleKtfmt() throws IOException {
 		gradleRunner().withArguments("spotlessApply").build();
 		assertFile("src/main/kotlin/max-width.kt").sameAsResource("kotlin/ktfmt/max-width.clean");
 	}
-
-	@Test
-	void testWithCustomMaxWidthDefaultStyleKtfmtGradleKts() throws IOException {
-		setFile("build.gradle.kts").toLines(
-				"plugins {",
-				"    id(\"org.jetbrains.kotlin.jvm\") version \"1.5.31\"",
-				"    id(\"com.diffplug.spotless\")",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    kotlin {",
-				"        ktfmt().configure { options ->",
-				"            options.setMaxWidth(120)",
-				"		 }",
-				"    }",
-				"}");
-
-		setFile("src/main/kotlin/max-width.kt").toResource("kotlin/ktfmt/max-width.dirty");
-		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("src/main/kotlin/max-width.kt").sameAsResource("kotlin/ktfmt/max-width.clean");
-	}
-
-	@Test
-	void testWithCustomMaxWidthDropboxStyleKtfmt() throws IOException {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    kotlin {",
-				"        ktfmt().dropboxStyle().configure { options ->",
-				"            options.maxWidth = 120",
-				"		 }",
-				"    }",
-				"}");
-
-		setFile("src/main/kotlin/max-width.kt").toResource("kotlin/ktfmt/max-width.dirty");
-		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("src/main/kotlin/max-width.kt").sameAsResource("kotlin/ktfmt/max-width-dropbox.clean");
-	}
-
-	@Test
-	void testWithCustomMaxWidthDropboxStyleKtfmtGradleKts() throws IOException {
-		setFile("build.gradle.kts").toLines(
-				"plugins {",
-				"    id(\"org.jetbrains.kotlin.jvm\") version \"1.5.31\"",
-				"    id(\"com.diffplug.spotless\")",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    kotlin {",
-				"        ktfmt().dropboxStyle().configure { options ->",
-				"            options.setMaxWidth(120)",
-				"		 }",
-				"    }",
-				"}");
-
-		setFile("src/main/kotlin/max-width.kt").toResource("kotlin/ktfmt/max-width.dirty");
-		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("src/main/kotlin/max-width.kt").sameAsResource("kotlin/ktfmt/max-width-dropbox.clean");
-	}
 }
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
index 015414c331..13a7cd8472 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
@@ -23,56 +23,6 @@
 import org.junit.jupiter.api.Test;
 
 class KotlinGradleExtensionTest extends GradleIntegrationHarness {
-	@Test
-	void integration() throws IOException {
-		testInDirectory(null);
-	}
-
-	@Test
-	void integration_script_in_subdir() throws IOException {
-		testInDirectory("companionScripts");
-	}
-
-	private void testInDirectory(final String directory) throws IOException {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    kotlinGradle {",
-				"        ktlint()",
-				"        target '**/*.gradle.kts'",
-				"    }",
-				"}");
-		String filePath = "configuration.gradle.kts";
-		if (directory != null) {
-			filePath = directory + "/" + filePath;
-		}
-		setFile(filePath).toResource("kotlin/ktlint/basic.dirty");
-		gradleRunner().withArguments("spotlessApply").build();
-		assertFile(filePath).sameAsResource("kotlin/ktlint/basic.clean");
-	}
-
-	@Test
-	void integration_default() throws IOException {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    kotlinGradle {",
-				"        ktlint()",
-				"    }",
-				"}");
-		setFile("configuration.gradle.kts").toResource("kotlin/ktlint/basic.dirty");
-		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("configuration.gradle.kts").sameAsResource("kotlin/ktlint/basic.clean");
-	}
-
 	@Test
 	void integration_default_diktat() throws IOException {
 		setFile("build.gradle").toLines(
@@ -91,41 +41,6 @@ void integration_default_diktat() throws IOException {
 		assertThat(result.getOutput()).contains("[AVOID_NESTED_FUNCTIONS] try to avoid using nested functions");
 	}
 
-	@Test
-	void indentStep() throws IOException {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    kotlinGradle {",
-				"        ktlint().userData(['indent_size': '6'])",
-				"    }",
-				"}");
-		setFile("configuration.gradle.kts").toResource("kotlin/ktlint/basic.dirty");
-		gradleRunner().withArguments("spotlessCheck").buildAndFail();
-	}
-
-	@Test
-	void withExperimental() throws IOException {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    kotlinGradle {",
-				"        ktlint().setUseExperimental(true)",
-				"    }",
-				"}");
-		setFile("configuration.gradle.kts").toResource("kotlin/ktlint/experimental.dirty");
-		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("configuration.gradle.kts").sameAsResource("kotlin/ktlint/experimental.clean");
-	}
-
 	@Test
 	void withExperimentalEditorConfigOverride() throws IOException {
 		setFile("build.gradle").toLines(
@@ -148,24 +63,6 @@ void withExperimentalEditorConfigOverride() throws IOException {
 		assertFile("configuration.gradle.kts").sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.clean");
 	}
 
-	@Test
-	void integration_ktfmt() throws IOException {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    kotlinGradle {",
-				"        ktfmt()",
-				"    }",
-				"}");
-		setFile("configuration.gradle.kts").toResource("kotlin/ktfmt/basic.dirty");
-		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("configuration.gradle.kts").sameAsResource("kotlin/ktfmt/basic.clean");
-	}
-
 	@Test
 	void integration_ktfmt_with_dropbox_style() throws IOException {
 		setFile("build.gradle").toLines(
@@ -183,22 +80,4 @@ void integration_ktfmt_with_dropbox_style() throws IOException {
 		gradleRunner().withArguments("spotlessApply").build();
 		assertFile("configuration.gradle.kts").sameAsResource("kotlin/ktfmt/dropboxstyle.clean");
 	}
-
-	@Test
-	void integration_lint_script_files_without_top_level_declaration() throws IOException {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    kotlinGradle {",
-				"        ktlint()",
-				"    }",
-				"}");
-		setFile("configuration.gradle.kts").toContent("buildscript {}");
-		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("configuration.gradle.kts").hasContent("buildscript {}");
-	}
 }

From 87a168b877a216dd0c397e58aa37e5c319dd8c7c Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 26 Jan 2023 10:36:35 -0800
Subject: [PATCH 0695/2068] Bump default KtLint `0.48.1` -> `0.48.2`

---
 .../diffplug/spotless/kotlin/KtLintStep.java  | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index 7bcae36fb0..0d75460902 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -36,11 +36,9 @@ public class KtLintStep {
 	// prevent direct instantiation
 	private KtLintStep() {}
 
-	private static final String DEFAULT_VERSION = "0.48.1";
+	private static final String DEFAULT_VERSION = "0.48.2";
 	static final String NAME = "ktlint";
-	static final String PACKAGE_PRE_0_32 = "com.github.shyiko";
 	static final String PACKAGE = "com.pinterest";
-	static final String MAVEN_COORDINATE_PRE_0_32 = PACKAGE_PRE_0_32 + ":ktlint:";
 	static final String MAVEN_COORDINATE = PACKAGE + ":ktlint:";
 
 	public static FormatterStep create(Provisioner provisioner) {
@@ -114,21 +112,14 @@ static final class State implements Serializable {
 				@Nullable FileSignature editorConfigPath,
 				Map<String, String> userData,
 				Map<String, Object> editorConfigOverride) throws IOException {
-			this.version = version;
-
-			String coordinate;
-			if (BadSemver.version(version) < BadSemver.version(0, 32)) {
-				coordinate = MAVEN_COORDINATE_PRE_0_32;
-			} else {
-				coordinate = MAVEN_COORDINATE;
-			}
-			if (BadSemver.version(version) < BadSemver.version(0, 31, 0)) {
-				throw new IllegalStateException("KtLint versions < 0.31.0 not supported!");
+			if (BadSemver.version(version) < BadSemver.version(0, 46, 0)) {
+				throw new IllegalStateException("KtLint versions < 0.46.0 not supported!");
 			}
+			this.version = version;
 			this.useExperimental = useExperimental;
 			this.userData = new TreeMap<>(userData);
 			this.editorConfigOverride = new TreeMap<>(editorConfigOverride);
-			this.jarState = JarState.from(coordinate + version, provisioner);
+			this.jarState = JarState.from(MAVEN_COORDINATE + version, provisioner);
 			this.editorConfigPath = editorConfigPath;
 			this.isScript = isScript;
 		}

From 87b6dd8b8bd8a3848d02f612f38b1d547a95bcbe Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 26 Jan 2023 10:36:58 -0800
Subject: [PATCH 0696/2068] Bump default scalafmt `3.6.1` -> `3.7.1`

---
 .../main/java/com/diffplug/spotless/scala/ScalaFmtStep.java   | 4 ++--
 testlib/src/main/resources/scala/scalafmt/scalafmt.conf       | 2 +-
 .../java/com/diffplug/spotless/scala/ScalaFmtStepTest.java    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java b/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java
index bff0d9b215..264ca679db 100644
--- a/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ public class ScalaFmtStep {
 	// prevent direct instantiation
 	private ScalaFmtStep() {}
 
-	private static final String DEFAULT_VERSION = "3.6.1";
+	static final String DEFAULT_VERSION = "3.7.1";
 
 	private static final String DEFAULT_SCALA_MAJOR_VERSION = "2.13";
 	static final String NAME = "scalafmt";
diff --git a/testlib/src/main/resources/scala/scalafmt/scalafmt.conf b/testlib/src/main/resources/scala/scalafmt/scalafmt.conf
index e15d7318fa..f3cfb3a031 100644
--- a/testlib/src/main/resources/scala/scalafmt/scalafmt.conf
+++ b/testlib/src/main/resources/scala/scalafmt/scalafmt.conf
@@ -1,4 +1,4 @@
-version = 3.6.1
+version = 3.7.1
 runner.dialect = scala213
 style = defaultWithAlign # For pretty alignment.
 maxColumn = 20           # For my teensy narrow display
diff --git a/testlib/src/test/java/com/diffplug/spotless/scala/ScalaFmtStepTest.java b/testlib/src/test/java/com/diffplug/spotless/scala/ScalaFmtStepTest.java
index 1714dd9e29..c28046e148 100644
--- a/testlib/src/test/java/com/diffplug/spotless/scala/ScalaFmtStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/scala/ScalaFmtStepTest.java
@@ -30,13 +30,13 @@
 class ScalaFmtStepTest extends ResourceHarness {
 	@Test
 	void behaviorDefaultConfig() {
-		StepHarness.forStep(ScalaFmtStep.create("3.0.0", TestProvisioner.mavenCentral(), null))
+		StepHarness.forStep(ScalaFmtStep.create(TestProvisioner.mavenCentral()))
 				.testResource("scala/scalafmt/basic.dirty", "scala/scalafmt/basic.clean_3.0.0");
 	}
 
 	@Test
 	void behaviorCustomConfig() {
-		StepHarness.forStep(ScalaFmtStep.create("3.0.0", TestProvisioner.mavenCentral(), createTestFile("scala/scalafmt/scalafmt.conf")))
+		StepHarness.forStep(ScalaFmtStep.create(ScalaFmtStep.DEFAULT_VERSION, TestProvisioner.mavenCentral(), createTestFile("scala/scalafmt/scalafmt.conf")))
 				.testResource("scala/scalafmt/basic.dirty", "scala/scalafmt/basic.cleanWithCustomConf_3.0.0");
 	}
 

From 5d6714d5666194e3b418a23d3d2379b797fb31fc Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 26 Jan 2023 10:41:32 -0800
Subject: [PATCH 0697/2068] Update changelogs.

---
 CHANGES.md               | 2 ++
 plugin-gradle/CHANGES.md | 2 ++
 plugin-maven/CHANGES.md  | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index efbf1e5ae0..363dac1758 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -26,6 +26,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
   * From now on, we will support no more than 2 breaking changes at a time.
 * NpmFormatterStepStateBase delays `npm install` call until the formatter is first used. This enables better integration
   with `gradle-node-plugin`. ([#1522](https://github.com/diffplug/spotless/pull/1522))
+* Bump default `ktlint` version to latest `0.48.1` -> `0.48.2` ([#1529](https://github.com/diffplug/spotless/pull/1529))
+* Bump default `scalafmt` version to latest `3.6.1` -> `3.7.1` ([#1529](https://github.com/diffplug/spotless/pull/1529))
 
 ## [2.32.0] - 2023-01-13
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 693712cbff..8d01068383 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -20,6 +20,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * `npm`-based formatters `ESLint`, `prettier` and `tsfmt` delay their `npm install` call until the formatters are first
   used. For gradle this effectively moves the `npm install` call out of the configuration phase and as such enables
   better integration with `gradle-node-plugin`. ([#1522](https://github.com/diffplug/spotless/pull/1522))
+* Bump default `ktlint` version to latest `0.48.1` -> `0.48.2` ([#1529](https://github.com/diffplug/spotless/pull/1529))
+* Bump default `scalafmt` version to latest `3.6.1` -> `3.7.1` ([#1529](https://github.com/diffplug/spotless/pull/1529))
 
 ## [6.13.0] - 2023-01-14
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 9cda0d2785..3967f468fd 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -21,6 +21,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
   * `KtLint` does not maintain a stable API - before this PR, we supported every breaking change in the API since 2019.
   * From now on, we will support no more than 2 breaking changes at a time.
 * `npm`-based formatters `ESLint`, `prettier` and `tsfmt` delay their `npm install` call until the formatters are first used. ([#1522](https://github.com/diffplug/spotless/pull/1522)
+* Bump default `ktlint` version to latest `0.48.1` -> `0.48.2` ([#1529](https://github.com/diffplug/spotless/pull/1529))
+* Bump default `scalafmt` version to latest `3.6.1` -> `3.7.1` ([#1529](https://github.com/diffplug/spotless/pull/1529))
 
 ## [2.30.0] - 2023-01-13
 ### Added

From 5c3411d00a120c59f301c6ea57f4e2aff2fb4164 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 26 Jan 2023 11:07:05 -0800
Subject: [PATCH 0698/2068] Add missing changelog links to root
 `settings.gradle`

---
 settings.gradle | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/settings.gradle b/settings.gradle
index d925058035..a5bb6c0062 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -13,7 +13,7 @@ plugins {
 	id 'io.github.gradle-nexus.publish-plugin' version '1.1.0' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
 	id 'com.github.spotbugs' version '5.0.13' apply false
-	// https://github.com/diffplug/spotless-changelog
+	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
 	id 'com.diffplug.spotless-changelog' version '2.4.1' apply false
 	// https://github.com/diffplug/goomph/blob/main/CHANGES.md
 	// DO NOT UPDATE, see https://github.com/diffplug/spotless/pull/874
@@ -22,7 +22,8 @@ plugins {
 	id 'com.adarshr.test-logger' version '3.2.0' apply false
 	// https://github.com/davidburstrom/version-compatibility-gradle-plugin/tags
 	id 'io.github.davidburstrom.version-compatibility' version '0.4.0' apply false
-	id "com.gradle.enterprise" version "3.12.2"
+	// https://plugins.gradle.org/plugin/com.gradle.enterprise
+	id 'com.gradle.enterprise' version '3.12.2'
 }
 
 dependencyResolutionManagement {

From f71b28658bf015b20d7b3a4dc084c8b4fa4f0c19 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 26 Jan 2023 11:07:37 -0800
Subject: [PATCH 0699/2068] Fix bug in changelog publish setup.

---
 gradle/java-publish.gradle | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/gradle/java-publish.gradle b/gradle/java-publish.gradle
index 3d1ddd1c4f..7d2055d78d 100644
--- a/gradle/java-publish.gradle
+++ b/gradle/java-publish.gradle
@@ -186,14 +186,12 @@ if (!version.endsWith('-SNAPSHOT')) {
 	}
 	// ensures that changelog bump and push only happens if the publish was successful
 	def thisProj = project
-	afterEvaluate {
-		changelogTasks.named('changelogBump').configure {
-			dependsOn thisProj.tasks.named('publishPluginMavenPublicationToSonatypeRepository')
-			dependsOn rootProject.tasks.named('closeAndReleaseSonatypeStagingRepository')
-			// if we have a gradle plugin, we need to push it up to the plugin portal too
-			if (thisProj.tasks.names.contains('publishPlugins')) {
-				dependsOn thisProj.tasks.named('publishPlugins')
-			}
+	changelogTasks.named('changelogBump').configure {
+		dependsOn ":${thisProj.path}:publishPluginMavenPublicationToSonatypeRepository"
+		dependsOn ":closeAndReleaseSonatypeStagingRepository"
+		// if we have a gradle plugin, we need to push it up to the plugin portal too
+		if (thisProj.tasks.names.contains('publishPlugins')) {
+			dependsOn thisProj.tasks.named('publishPlugins')
 		}
 	}
 }

From 0d34fa703536b7f83b35d45f7eea153d724e2cc3 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Thu, 26 Jan 2023 23:20:30 +0400
Subject: [PATCH 0700/2068] Switch from new File() to a Sentinel reference

---
 .../java/com/diffplug/spotless/Formatter.java |  6 ++-
 .../com/diffplug/spotless/FormatterStep.java  |  6 +--
 .../diffplug/spotless/FormatterStepImpl.java  |  9 ++---
 .../com/diffplug/spotless/FormatterTest.java  | 38 +++++++++++++++++--
 4 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/Formatter.java b/lib/src/main/java/com/diffplug/spotless/Formatter.java
index 3a38893cd6..be045e7fe1 100644
--- a/lib/src/main/java/com/diffplug/spotless/Formatter.java
+++ b/lib/src/main/java/com/diffplug/spotless/Formatter.java
@@ -39,6 +39,9 @@
 public final class Formatter implements Serializable, AutoCloseable {
 	private static final long serialVersionUID = 1L;
 
+	// This Sentinel reference may be used where Formatter requires a File, while there is no actual File to format
+	public static final File SENTINEL_NO_FILE_ON_DISK = new File("NO_FILE_ON_DISK.sentinel");
+
 	private LineEnding.Policy lineEndingsPolicy;
 	private Charset encoding;
 	private Path rootDir;
@@ -237,8 +240,7 @@ public String compute(String unix, File file) {
 					unix = LineEnding.toUnix(formatted);
 				}
 			} catch (Throwable e) {
-				if (file.getPath().isEmpty()) {
-					// Path.relativize would fail if rootDir is an absolute path
+				if (file == SENTINEL_NO_FILE_ON_DISK) {
 					exceptionPolicy.handleError(e, step, "");
 				} else {
 					// Path may be forged from a different FileSystem than Filesystem.default
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
index 5729f676b2..79793a403e 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,8 +37,8 @@ public interface FormatterStep extends Serializable {
 	 * @param rawUnix
 	 *            the content to format, guaranteed to have unix-style newlines ('\n'); never null
 	 * @param file
-	 *            the file which {@code rawUnix} was obtained from; never null. Pass an empty file using
-	 *            {@code new File("")} if and only if no file is actually associated with {@code rawUnix}
+	 *            the file which {@code rawUnix} was obtained from; never null. Pass the reference
+	 *            {@code Formatter#SENTINEL_NO_FILE_ON_DISK} if and only if no file is actually associated with {@code rawUnix}
 	 * @return the formatted content, guaranteed to only have unix-style newlines; may return null
 	 *         if the formatter step doesn't have any changes to make
 	 * @throws Exception if the formatter step experiences a problem
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStepImpl.java b/lib/src/main/java/com/diffplug/spotless/FormatterStepImpl.java
index 7663145f51..fe7cabca49 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStepImpl.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStepImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -109,18 +109,15 @@ protected String format(Integer state, String rawUnix, File file) throws Excepti
 			if (formatter == null) {
 				formatter = formatterSupplier.get();
 				if (formatter instanceof FormatterFunc.Closeable) {
-					throw new AssertionError("NeverUpToDate does not support FormatterFunc.Closeable.  See https://github.com/diffplug/spotless/pull/284");
+					throw new AssertionError("NeverUpToDate does not support FormatterFunc.Closeable. See https://github.com/diffplug/spotless/pull/284");
 				}
 			}
 			return formatter.apply(rawUnix, file);
 		}
 	}
 
-	/** A dummy SENTINEL file. */
-	static final File SENTINEL = new File("");
-
 	static void checkNotSentinel(File file) {
-		if (file == SENTINEL) {
+		if (file == Formatter.SENTINEL_NO_FILE_ON_DISK) {
 			throw new IllegalArgumentException("This step requires the underlying file. If this is a test, use StepHarnessWithFile");
 		}
 	}
diff --git a/testlib/src/test/java/com/diffplug/spotless/FormatterTest.java b/testlib/src/test/java/com/diffplug/spotless/FormatterTest.java
index 0faf40bb95..de96cd2ae3 100644
--- a/testlib/src/test/java/com/diffplug/spotless/FormatterTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/FormatterTest.java
@@ -18,6 +18,7 @@
 import java.io.File;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -94,7 +95,7 @@ protected Formatter create() {
 		}.testEquals();
 	}
 
-	// new File("") can be used if there is no File representing this content. It should not conflict with rootDir.relativize(...)
+	// new File("") as filePath is known to fail
 	@Test
 	public void testExceptionWithEmptyPath() throws Exception {
 		LineEnding.Policy lineEndingsPolicy = LineEnding.UNIX.createPolicy();
@@ -116,7 +117,32 @@ public void testExceptionWithEmptyPath() throws Exception {
 				.exceptionPolicy(exceptionPolicy)
 				.build();
 
-		formatter.compute("someFileContent", new File(""));
+		Assertions.assertThrows(IllegalArgumentException.class, () -> formatter.compute("someFileContent", new File("")));
+	}
+
+	// If there is no File actually holding the content, one may rely on Formatter.NO_FILE_ON_DISK
+	@Test
+	public void testExceptionWithSentinelNoFileOnDisk() throws Exception {
+		LineEnding.Policy lineEndingsPolicy = LineEnding.UNIX.createPolicy();
+		Charset encoding = StandardCharsets.UTF_8;
+		FormatExceptionPolicy exceptionPolicy = FormatExceptionPolicy.failOnlyOnError();
+
+		Path rootDir = Paths.get(StandardSystemProperty.USER_DIR.value());
+
+		FormatterStep step = Mockito.mock(FormatterStep.class);
+		Mockito.when(step.getName()).thenReturn("someFailingStep");
+		Mockito.when(step.format(Mockito.anyString(), Mockito.any(File.class))).thenThrow(new IllegalArgumentException("someReason"));
+		List<FormatterStep> steps = Collections.singletonList(step);
+
+		Formatter formatter = Formatter.builder()
+				.lineEndingsPolicy(lineEndingsPolicy)
+				.encoding(encoding)
+				.rootDir(rootDir)
+				.steps(steps)
+				.exceptionPolicy(exceptionPolicy)
+				.build();
+
+		formatter.compute("someFileContent", Formatter.SENTINEL_NO_FILE_ON_DISK);
 	}
 
 	// rootDir may be a path not from the default FileSystem
@@ -127,6 +153,12 @@ public void testExceptionWithRootDirIsNotFileSystem() throws Exception {
 		FormatExceptionPolicy exceptionPolicy = FormatExceptionPolicy.failOnlyOnError();
 
 		Path rootDir = Mockito.mock(Path.class);
+		FileSystem customFileSystem = Mockito.mock(FileSystem.class);
+		Mockito.when(rootDir.getFileSystem()).thenReturn(customFileSystem);
+
+		Path pathFromFile = Mockito.mock(Path.class);
+		Mockito.when(customFileSystem.getPath(Mockito.anyString())).thenReturn(pathFromFile);
+
 		Path relativized = Mockito.mock(Path.class);
 		Mockito.when(rootDir.relativize(Mockito.any(Path.class))).then(invok -> {
 			Path filePath = invok.getArgument(0);
@@ -150,7 +182,7 @@ public void testExceptionWithRootDirIsNotFileSystem() throws Exception {
 				.exceptionPolicy(exceptionPolicy)
 				.build();
 
-		formatter.compute("someFileContent", new File(""));
+		formatter.compute("someFileContent", new File("/some/folder/some.file"));
 	}
 
 }

From c55e736b620456bfae55e1cac26619bb20c827a4 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 26 Jan 2023 11:29:08 -0800
Subject: [PATCH 0701/2068] Published lib/2.33.0

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 363dac1758..22e568f566 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.33.0] - 2023-01-26
 ### Added
 * `ProcessRunner` has added some convenience methods so it can be used for maven testing. ([#1496](https://github.com/diffplug/spotless/pull/1496))
 * `ProcessRunner` allows to limit captured output to a certain number of bytes. ([#1511](https://github.com/diffplug/spotless/pull/1511))

From dbea734458f3323cf121f84744838fa865c1a1a6 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Thu, 26 Jan 2023 23:33:27 +0400
Subject: [PATCH 0702/2068] Refactor mire usages

---
 lib/src/main/java/com/diffplug/spotless/FormatterFunc.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java b/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java
index 48a8e810ee..8a8a15076e 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java
@@ -127,7 +127,7 @@ public String apply(String unix, File file) throws Exception {
 
 				@Override
 				public String apply(String unix) throws Exception {
-					return apply(unix, FormatterStepImpl.SENTINEL);
+					return apply(unix, Formatter.SENTINEL_NO_FILE_ON_DISK);
 				}
 			};
 		}
@@ -156,7 +156,7 @@ default String apply(String unix, File file) throws Exception {
 
 		@Override
 		default String apply(String unix) throws Exception {
-			return apply(unix, FormatterStepImpl.SENTINEL);
+			return apply(unix, Formatter.SENTINEL_NO_FILE_ON_DISK);
 		}
 	}
 }

From 378a4e8e7f022320b4f0d26844ff390025ee0992 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Thu, 26 Jan 2023 23:39:00 +0400
Subject: [PATCH 0703/2068] Fix style

---
 lib/src/main/java/com/diffplug/spotless/FormatterFunc.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java b/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java
index 8a8a15076e..90d576e8a0 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 4439934095209a332a8b1cfe1037756cbe878108 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Thu, 26 Jan 2023 23:48:21 +0400
Subject: [PATCH 0704/2068] Rely on existing Sentinel

---
 lib/src/main/java/com/diffplug/spotless/Formatter.java     | 5 +----
 lib/src/main/java/com/diffplug/spotless/FormatterFunc.java | 6 +++---
 lib/src/main/java/com/diffplug/spotless/FormatterStep.java | 2 +-
 .../main/java/com/diffplug/spotless/FormatterStepImpl.java | 7 +++++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/Formatter.java b/lib/src/main/java/com/diffplug/spotless/Formatter.java
index be045e7fe1..035452e29c 100644
--- a/lib/src/main/java/com/diffplug/spotless/Formatter.java
+++ b/lib/src/main/java/com/diffplug/spotless/Formatter.java
@@ -39,9 +39,6 @@
 public final class Formatter implements Serializable, AutoCloseable {
 	private static final long serialVersionUID = 1L;
 
-	// This Sentinel reference may be used where Formatter requires a File, while there is no actual File to format
-	public static final File SENTINEL_NO_FILE_ON_DISK = new File("NO_FILE_ON_DISK.sentinel");
-
 	private LineEnding.Policy lineEndingsPolicy;
 	private Charset encoding;
 	private Path rootDir;
@@ -240,7 +237,7 @@ public String compute(String unix, File file) {
 					unix = LineEnding.toUnix(formatted);
 				}
 			} catch (Throwable e) {
-				if (file == SENTINEL_NO_FILE_ON_DISK) {
+				if (file == FormatterStepImpl.SENTINEL) {
 					exceptionPolicy.handleError(e, step, "");
 				} else {
 					// Path may be forged from a different FileSystem than Filesystem.default
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java b/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java
index 90d576e8a0..48a8e810ee 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2021 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -127,7 +127,7 @@ public String apply(String unix, File file) throws Exception {
 
 				@Override
 				public String apply(String unix) throws Exception {
-					return apply(unix, Formatter.SENTINEL_NO_FILE_ON_DISK);
+					return apply(unix, FormatterStepImpl.SENTINEL);
 				}
 			};
 		}
@@ -156,7 +156,7 @@ default String apply(String unix, File file) throws Exception {
 
 		@Override
 		default String apply(String unix) throws Exception {
-			return apply(unix, Formatter.SENTINEL_NO_FILE_ON_DISK);
+			return apply(unix, FormatterStepImpl.SENTINEL);
 		}
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
index 79793a403e..11a4d5f99e 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
@@ -38,7 +38,7 @@ public interface FormatterStep extends Serializable {
 	 *            the content to format, guaranteed to have unix-style newlines ('\n'); never null
 	 * @param file
 	 *            the file which {@code rawUnix} was obtained from; never null. Pass the reference
-	 *            {@code Formatter#SENTINEL_NO_FILE_ON_DISK} if and only if no file is actually associated with {@code rawUnix}
+	 *            {@code FormatterStepImpl#SENTINEL} if and only if no file is actually associated with {@code rawUnix}
 	 * @return the formatted content, guaranteed to only have unix-style newlines; may return null
 	 *         if the formatter step doesn't have any changes to make
 	 * @throws Exception if the formatter step experiences a problem
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStepImpl.java b/lib/src/main/java/com/diffplug/spotless/FormatterStepImpl.java
index fe7cabca49..3b1b5cf278 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStepImpl.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStepImpl.java
@@ -109,15 +109,18 @@ protected String format(Integer state, String rawUnix, File file) throws Excepti
 			if (formatter == null) {
 				formatter = formatterSupplier.get();
 				if (formatter instanceof FormatterFunc.Closeable) {
-					throw new AssertionError("NeverUpToDate does not support FormatterFunc.Closeable. See https://github.com/diffplug/spotless/pull/284");
+					throw new AssertionError("NeverUpToDate does not support FormatterFunc.Closeable.  See https://github.com/diffplug/spotless/pull/284");
 				}
 			}
 			return formatter.apply(rawUnix, file);
 		}
 	}
 
+	/**This Sentinel reference may be used where Formatter requires a File, while there is no actual File to format */
+	public static final File SENTINEL = new File("");
+
 	static void checkNotSentinel(File file) {
-		if (file == Formatter.SENTINEL_NO_FILE_ON_DISK) {
+		if (file == SENTINEL) {
 			throw new IllegalArgumentException("This step requires the underlying file. If this is a test, use StepHarnessWithFile");
 		}
 	}

From 7f7cc49fed67ea9b8fc5706427dfc16c830570e0 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Thu, 26 Jan 2023 23:54:13 +0400
Subject: [PATCH 0705/2068] Fix compilation

---
 testlib/src/test/java/com/diffplug/spotless/FormatterTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testlib/src/test/java/com/diffplug/spotless/FormatterTest.java b/testlib/src/test/java/com/diffplug/spotless/FormatterTest.java
index de96cd2ae3..76f11b3d15 100644
--- a/testlib/src/test/java/com/diffplug/spotless/FormatterTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/FormatterTest.java
@@ -142,7 +142,7 @@ public void testExceptionWithSentinelNoFileOnDisk() throws Exception {
 				.exceptionPolicy(exceptionPolicy)
 				.build();
 
-		formatter.compute("someFileContent", Formatter.SENTINEL_NO_FILE_ON_DISK);
+		formatter.compute("someFileContent", FormatterStepImpl.SENTINEL);
 	}
 
 	// rootDir may be a path not from the default FileSystem

From 27522dc85e2a368cb8e0d60b3f162fc186ea25e0 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 26 Jan 2023 12:00:39 -0800
Subject: [PATCH 0706/2068] Start publishing against the `release` branch to
 fix a new issue with GitHub branch protection. It will be a manual process to
 move `main` towards `release` after a release is complete.

---
 gradle/changelog.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gradle/changelog.gradle b/gradle/changelog.gradle
index 316e98a2d7..83c16f474e 100644
--- a/gradle/changelog.gradle
+++ b/gradle/changelog.gradle
@@ -17,6 +17,7 @@ spotlessChangelog {
 	// need -Prelease=true in order to do a publish
 	appendDashSnapshotUnless_dashPrelease=true
 
+	branch        'release'
 	tagPrefix     "${kind}/"
 	commitMessage "Published ${kind}/{{version}}" // {{version}} will be replaced
 }

From 2aa7f51bc665e23b685c2a6df9fa930584ad8b3c Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 26 Jan 2023 12:06:53 -0800
Subject: [PATCH 0707/2068] Another shot at fixing our publish workflow.

---
 .github/workflows/deploy.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index d41dc8fc30..b2a8f58cf0 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -46,6 +46,8 @@ jobs:
         uses: gradle/gradle-build-action@v2
         with:
           gradle-home-cache-cleanup: true
+      - name: git fetch origin release
+        run: git fetch origin release
       - name: publish all
         if: "${{ github.event.inputs.to_publish == 'all' }}"
         run: |

From 2995371d0baf3707886cc387c91c58b9f7ebbe95 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 26 Jan 2023 12:12:38 -0800
Subject: [PATCH 0708/2068] So we have to run the workflow on the `release`
 branch, *and* we need to pull `main` so that git ratchet is happy.

---
 .github/workflows/deploy.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index b2a8f58cf0..e692fe8735 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -46,8 +46,8 @@ jobs:
         uses: gradle/gradle-build-action@v2
         with:
           gradle-home-cache-cleanup: true
-      - name: git fetch origin release
-        run: git fetch origin release
+      - name: git fetch origin main
+        run: git fetch origin main
       - name: publish all
         if: "${{ github.event.inputs.to_publish == 'all' }}"
         run: |

From f1cfc6189fb0d52d6239348594c6daecb0ce7997 Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az447-593.p3dygwdgouvunktllai24op1ra.cx.internal.cloudapp.net>
Date: Thu, 26 Jan 2023 20:16:06 +0000
Subject: [PATCH 0709/2068] Published gradle/6.14.0

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 50 ++++++++++++++++++++--------------------
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 8d01068383..49ef0adbbe 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [6.14.0] - 2023-01-26
 ### Added
 * Support `jackson()` for YAML and JSON files ([#1492](https://github.com/diffplug/spotless/pull/1492))
 * Prettier will now suggest to install plugins if a parser cannot be inferred from the file extension ([#1511](https://github.com/diffplug/spotless/pull/1511))
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 7e486719e7..67f3cdd69f 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -18,9 +18,9 @@ output = [
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
 [![Maven central](https://img.shields.io/badge/mavencentral-yes-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/index.html)
 [![License Apache](https://img.shields.io/badge/license-apache-blue.svg)](https://tldrlegal.com/license/apache-license-2.0-(apache-2.0))
-[![Changelog](https://img.shields.io/badge/changelog-6.13.0-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-6.14.0-blue.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)
@@ -129,10 +129,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -144,7 +144,7 @@ If you're stuck on an older version of Gradle, `id 'com.diffplug.gradle.spotless
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -268,8 +268,8 @@ You can make a pull request to add new annotations to Spotless's default list.
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -320,8 +320,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -392,7 +392,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -424,7 +424,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -456,7 +456,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -490,7 +490,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -511,7 +511,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -536,7 +536,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -576,7 +576,7 @@ sql.formatter.indent.size=4
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -668,7 +668,7 @@ For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#n
 
 ## Javascript
 
-- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
+- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
 
 ```gradle
 spotless {
@@ -732,7 +732,7 @@ For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#n
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -807,7 +807,7 @@ spotless {
 
 ## YAML
 
-- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
+- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
 
 ```gradle
 spotless {
@@ -1020,7 +1020,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -1093,9 +1093,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -1128,11 +1128,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.13.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From 07a57ff66f3fa0ffd8abea94e7c0f6ac4f025b5f Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 26 Jan 2023 12:18:26 -0800
Subject: [PATCH 0710/2068] Rename the sentinel and move it to `Formatter`.

---
 lib/src/main/java/com/diffplug/spotless/Formatter.java      | 5 ++++-
 lib/src/main/java/com/diffplug/spotless/FormatterFunc.java  | 6 +++---
 .../main/java/com/diffplug/spotless/FormatterStepImpl.java  | 5 +----
 .../src/main/java/com/diffplug/spotless/StepHarness.java    | 2 +-
 .../src/test/java/com/diffplug/spotless/FormatterTest.java  | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/Formatter.java b/lib/src/main/java/com/diffplug/spotless/Formatter.java
index 035452e29c..a55e8e6504 100644
--- a/lib/src/main/java/com/diffplug/spotless/Formatter.java
+++ b/lib/src/main/java/com/diffplug/spotless/Formatter.java
@@ -237,7 +237,7 @@ public String compute(String unix, File file) {
 					unix = LineEnding.toUnix(formatted);
 				}
 			} catch (Throwable e) {
-				if (file == FormatterStepImpl.SENTINEL) {
+				if (file == NO_FILE_SENTINEL) {
 					exceptionPolicy.handleError(e, step, "");
 				} else {
 					// Path may be forged from a different FileSystem than Filesystem.default
@@ -289,4 +289,7 @@ public void close() {
 			}
 		}
 	}
+
+	/** This Sentinel reference may be used to  Formatter requires a File, while there is no actual File to format */
+	public static final File NO_FILE_SENTINEL = new File("NO_FILE_SENTINEL");
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java b/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java
index 48a8e810ee..14b407a2eb 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -127,7 +127,7 @@ public String apply(String unix, File file) throws Exception {
 
 				@Override
 				public String apply(String unix) throws Exception {
-					return apply(unix, FormatterStepImpl.SENTINEL);
+					return apply(unix, Formatter.NO_FILE_SENTINEL);
 				}
 			};
 		}
@@ -156,7 +156,7 @@ default String apply(String unix, File file) throws Exception {
 
 		@Override
 		default String apply(String unix) throws Exception {
-			return apply(unix, FormatterStepImpl.SENTINEL);
+			return apply(unix, Formatter.NO_FILE_SENTINEL);
 		}
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStepImpl.java b/lib/src/main/java/com/diffplug/spotless/FormatterStepImpl.java
index 3b1b5cf278..17b62e75c6 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStepImpl.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStepImpl.java
@@ -116,11 +116,8 @@ protected String format(Integer state, String rawUnix, File file) throws Excepti
 		}
 	}
 
-	/**This Sentinel reference may be used where Formatter requires a File, while there is no actual File to format */
-	public static final File SENTINEL = new File("");
-
 	static void checkNotSentinel(File file) {
-		if (file == SENTINEL) {
+		if (file == Formatter.NO_FILE_SENTINEL) {
 			throw new IllegalArgumentException("This step requires the underlying file. If this is a test, use StepHarnessWithFile");
 		}
 	}
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarness.java b/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
index 71e2a663b5..c611cc738a 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
@@ -88,7 +88,7 @@ public AbstractStringAssert<?> testResourceExceptionMsg(String resourceBefore) {
 
 	public AbstractStringAssert<?> testExceptionMsg(String before) {
 		try {
-			formatter.compute(LineEnding.toUnix(before), FormatterStepImpl.SENTINEL);
+			formatter.compute(LineEnding.toUnix(before), Formatter.NO_FILE_SENTINEL);
 			throw new SecurityException("Expected exception");
 		} catch (Throwable e) {
 			if (e instanceof SecurityException) {
diff --git a/testlib/src/test/java/com/diffplug/spotless/FormatterTest.java b/testlib/src/test/java/com/diffplug/spotless/FormatterTest.java
index 76f11b3d15..314507bd8d 100644
--- a/testlib/src/test/java/com/diffplug/spotless/FormatterTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/FormatterTest.java
@@ -142,7 +142,7 @@ public void testExceptionWithSentinelNoFileOnDisk() throws Exception {
 				.exceptionPolicy(exceptionPolicy)
 				.build();
 
-		formatter.compute("someFileContent", FormatterStepImpl.SENTINEL);
+		formatter.compute("someFileContent", Formatter.NO_FILE_SENTINEL);
 	}
 
 	// rootDir may be a path not from the default FileSystem

From 5bef415be2d600d4b796301ca694de59b77b1171 Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az206-25.oyyoanllshxeloefraqm4plxqh.jx.internal.cloudapp.net>
Date: Thu, 26 Jan 2023 20:23:34 +0000
Subject: [PATCH 0711/2068] Published maven/2.31.0

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 3967f468fd..ad79193ad8 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.31.0] - 2023-01-26
 ### Added
 * Prettier will now suggest to install plugins if a parser cannot be inferred from the file extension ([#1511](https://github.com/diffplug/spotless/pull/1511))
 * Jackson (`json` and `yaml`) has new `spaceBeforeSeparator` option
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index f0fc2bb818..2ade34b67b 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -12,8 +12,8 @@ output = [
   ].join('\n');
 -->
 [![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.30.0/index.html)
-[![Changelog](https://img.shields.io/badge/changelog-2.30.0-brightgreen.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.31.0/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.31.0-brightgreen.svg)](CHANGES.md)
 
 [![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)

From 9adce647c6dd3e605ddc555c5a972f32d9b192d4 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 26 Jan 2023 12:25:17 -0800
Subject: [PATCH 0712/2068] Fix javadoc.

---
 lib/src/main/java/com/diffplug/spotless/Formatter.java     | 2 +-
 lib/src/main/java/com/diffplug/spotless/FormatterStep.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/Formatter.java b/lib/src/main/java/com/diffplug/spotless/Formatter.java
index a55e8e6504..3470a3dc69 100644
--- a/lib/src/main/java/com/diffplug/spotless/Formatter.java
+++ b/lib/src/main/java/com/diffplug/spotless/Formatter.java
@@ -290,6 +290,6 @@ public void close() {
 		}
 	}
 
-	/** This Sentinel reference may be used to  Formatter requires a File, while there is no actual File to format */
+	/** This Sentinel reference may be used to pass string content to a Formatter or FormatterStep when there is no actual File to format */
 	public static final File NO_FILE_SENTINEL = new File("NO_FILE_SENTINEL");
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
index 11a4d5f99e..ce09f68450 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
@@ -38,7 +38,7 @@ public interface FormatterStep extends Serializable {
 	 *            the content to format, guaranteed to have unix-style newlines ('\n'); never null
 	 * @param file
 	 *            the file which {@code rawUnix} was obtained from; never null. Pass the reference
-	 *            {@code FormatterStepImpl#SENTINEL} if and only if no file is actually associated with {@code rawUnix}
+	 *            {@link Formatter#NO_FILE_SENTINEL} if and only if no file is actually associated with {@code rawUnix}
 	 * @return the formatted content, guaranteed to only have unix-style newlines; may return null
 	 *         if the formatter step doesn't have any changes to make
 	 * @throws Exception if the formatter step experiences a problem

From 1f78affc868f275b92ad3db7aa9eb7ab3416c16d Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 26 Jan 2023 12:28:40 -0800
Subject: [PATCH 0713/2068] Update changelog.

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 22e568f566..2af0ab7090 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* `Formatter` now has a field `public static final File NO_FILE_SENTINEL` which can be used to pass string content to a Formatter or FormatterStep when there is no actual File to format. ([#1525](https://github.com/diffplug/spotless/pull/1525))
 
 ## [2.33.0] - 2023-01-26
 ### Added

From 599e1e450183b8492a79b3dd14d37485820f3ce8 Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az451-766.zkhrb0euhfxurc1edhqu2t3cih.jx.internal.cloudapp.net>
Date: Thu, 26 Jan 2023 20:49:15 +0000
Subject: [PATCH 0714/2068] Published lib/2.34.0

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 2af0ab7090..1f27bbb299 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.34.0] - 2023-01-26
 ### Added
 * `Formatter` now has a field `public static final File NO_FILE_SENTINEL` which can be used to pass string content to a Formatter or FormatterStep when there is no actual File to format. ([#1525](https://github.com/diffplug/spotless/pull/1525))
 

From 5c4fe0a02935cbdbb3f2bcacbea1948494c87190 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 26 Jan 2023 11:12:46 -0800
Subject: [PATCH 0715/2068] Start compiling as Java 11 bytecode.

---
 gradle.properties        | 2 +-
 gradle/java-setup.gradle | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index d99bdac6ce..f06bdef37e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,7 +16,7 @@ artifactIdMaven=spotless-maven-plugin
 artifactIdGradle=spotless-plugin-gradle
 
 # Build requirements
-VER_JAVA=1.8
+VER_JAVA=11
 VER_SPOTBUGS=4.7.3
 VER_JSR_305=3.0.2
 
diff --git a/gradle/java-setup.gradle b/gradle/java-setup.gradle
index 5de128bda7..10eca7a2d4 100644
--- a/gradle/java-setup.gradle
+++ b/gradle/java-setup.gradle
@@ -4,10 +4,10 @@
 
 // setup java
 apply plugin: 'java'
-
-sourceCompatibility = VER_JAVA
-targetCompatibility = VER_JAVA
-tasks.withType(JavaCompile).configureEach { options.encoding = 'UTF-8' }
+tasks.withType(JavaCompile).configureEach {
+	options.encoding = 'UTF-8'
+	options.release = Integer.parseInt(VER_JAVA)
+}
 
 //////////////
 // SPOTBUGS //

From 63eb5589fd6e8d20d710124ea559cfee618a2024 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 16 Jan 2023 19:49:23 -0800
Subject: [PATCH 0716/2068] Remove Java 8 workaround in EncodingErrorMsg.

---
 .../com/diffplug/spotless/EncodingErrorMsg.java    | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/EncodingErrorMsg.java b/lib/src/main/java/com/diffplug/spotless/EncodingErrorMsg.java
index 168bf9acff..3e4bb3423b 100644
--- a/lib/src/main/java/com/diffplug/spotless/EncodingErrorMsg.java
+++ b/lib/src/main/java/com/diffplug/spotless/EncodingErrorMsg.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  */
 package com.diffplug.spotless;
 
-import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
 import java.nio.charset.Charset;
@@ -116,8 +115,8 @@ private static void addIfAvailable(Collection<Charset> charsets, String name) {
 	}
 
 	private void appendExample(Charset charset, boolean must) {
-		java8fix(byteBuf).clear();
-		java8fix(charBuf).clear();
+		byteBuf.clear();
+		charBuf.clear();
 
 		CharsetDecoder decoder = charset.newDecoder();
 		if (!must) {
@@ -135,7 +134,7 @@ private void appendExample(Charset charset, boolean must) {
 					.onUnmappableCharacter(CodingErrorAction.REPLACE)
 					.decode(byteBuf, charBuf, true);
 		}
-		java8fix(charBuf).flip();
+		charBuf.flip();
 
 		int start = Math.max(unrepresentable - CONTEXT, 0);
 		int end = Math.min(charBuf.limit(), unrepresentable + CONTEXT + 1);
@@ -147,9 +146,4 @@ private void appendExample(Charset charset, boolean must) {
 		message.append(" <- ");
 		message.append(charset.name());
 	}
-
-	/** Fixes https://jira.mongodb.org/browse/JAVA-2559, as reported in https://github.com/diffplug/spotless/issues/1081 */
-	private static Buffer java8fix(Buffer b) {
-		return b;
-	}
 }

From 2fe1bb2030d0690b6c60b26a95bbd9babca77383 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 16 Jan 2023 19:53:45 -0800
Subject: [PATCH 0717/2068] Remove Java 8 workarounds from FeatureClassLoader.

---
 .../diffplug/spotless/FeatureClassLoader.java | 24 ++-----------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/FeatureClassLoader.java b/lib/src/main/java/com/diffplug/spotless/FeatureClassLoader.java
index b4a69bef11..998c2082df 100644
--- a/lib/src/main/java/com/diffplug/spotless/FeatureClassLoader.java
+++ b/lib/src/main/java/com/diffplug/spotless/FeatureClassLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,8 +24,6 @@
 import java.security.ProtectionDomain;
 import java.util.Objects;
 
-import javax.annotation.Nullable;
-
 /**
  * This class loader is used to load classes of Spotless features from a search
  * path of URLs.<br/>
@@ -113,25 +111,7 @@ private static ByteBuffer urlToByteBuffer(URL url) throws IOException {
 		return ByteBuffer.wrap(buffer.toByteArray());
 	}
 
-	/**
-	 * Making spotless Java 9+ compatible. In Java 8 (and minor) the bootstrap
-	 * class loader saw every platform class. In Java 9+ it was changed so the
-	 * bootstrap class loader does not see all classes anymore. This might lead
-	 * to ClassNotFoundException in formatters (e.g. freshmark).
-	 *
-	 * @return <code>null</code> on Java 8 (and minor), otherwise <code>PlatformClassLoader</code>
-	 */
-	@Nullable
 	private static ClassLoader getParentClassLoader() {
-		double version = Double.parseDouble(System.getProperty("java.specification.version"));
-		if (version > 1.8) {
-			try {
-				return (ClassLoader) ClassLoader.class.getMethod("getPlatformClassLoader").invoke(null);
-			} catch (Exception e) {
-				throw ThrowingEx.asRuntime(e);
-			}
-		} else {
-			return null;
-		}
+		return ThrowingEx.get(() -> (ClassLoader) ClassLoader.class.getMethod("getPlatformClassLoader").invoke(null));
 	}
 }

From 1f1a53a25990870e2d40d5f953af3c0cf73e87f0 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 26 Jan 2023 12:48:42 -0800
Subject: [PATCH 0718/2068] Use Java 11 methods to simplify FeatureClassLoader.

---
 .../java/com/diffplug/spotless/FeatureClassLoader.java     | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/FeatureClassLoader.java b/lib/src/main/java/com/diffplug/spotless/FeatureClassLoader.java
index 998c2082df..0703a91318 100644
--- a/lib/src/main/java/com/diffplug/spotless/FeatureClassLoader.java
+++ b/lib/src/main/java/com/diffplug/spotless/FeatureClassLoader.java
@@ -101,11 +101,8 @@ public URL findResource(String name) {
 
 	private static ByteBuffer urlToByteBuffer(URL url) throws IOException {
 		ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-		int nRead;
-		byte[] data = new byte[1024];
-		InputStream inputStream = url.openStream();
-		while ((nRead = inputStream.read(data, 0, data.length)) != -1) {
-			buffer.write(data, 0, nRead);
+		try (InputStream inputStream = url.openStream()) {
+			inputStream.transferTo(buffer);
 		}
 		buffer.flush();
 		return ByteBuffer.wrap(buffer.toByteArray());

From 77b24bdd325782e23334ab7ee350e7afb68587b4 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 26 Jan 2023 12:52:20 -0800
Subject: [PATCH 0719/2068] Bump JGit and Mockito to latest (which required
 Java 11).

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index f06bdef37e..dc4f24a36b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,7 +25,7 @@ VER_SLF4J=[1.6,2.0[
 
 # Used in multiple places
 VER_DURIAN=1.2.0
-VER_JGIT=5.13.1.202206130422-r
+VER_JGIT=6.4.0.202211300538-r
 VER_JUNIT=5.9.2
 VER_ASSERTJ=3.24.2
-VER_MOCKITO=4.11.0
+VER_MOCKITO=5.0.0

From a4db1d344b871b81c0b07bf0604a1037f9dbbe7d Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 26 Jan 2023 12:52:39 -0800
Subject: [PATCH 0720/2068] Update a stray old dep.

---
 lib/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index f2ca13ccb1..9d95007bc1 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -90,7 +90,7 @@ dependencies {
 	compatKtLint0Dot48Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-ruleset-experimental:0.48.0'
 	compatKtLint0Dot48Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.48.0'
 
-	String VER_SCALAFMT="3.6.1"
+	String VER_SCALAFMT="3.7.1"
 	scalafmtCompileOnly "org.scalameta:scalafmt-core_2.13:$VER_SCALAFMT"
 
 	String VER_DIKTAT = "1.2.4.2"

From 0ba186ee1a1d99802ab2e0467d838837ef8b64c0 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 26 Jan 2023 13:00:18 -0800
Subject: [PATCH 0721/2068] Update changelog.

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 1f27bbb299..401998b233 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Changes
+* **POTENTIALLY BREAKING** Bump bytecode from Java 8 to 11 ([#1530](https://github.com/diffplug/spotless/pull/1530) part 2 of [#1337](https://github.com/diffplug/spotless/issues/1337))
 
 ## [2.34.0] - 2023-01-26
 ### Added

From 4222e95f5726f13cb2d3268d149f372f1af12c66 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 26 Jan 2023 21:08:47 +0000
Subject: [PATCH 0722/2068] Update plugin com.diffplug.spotless to v6.14.0

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index a5bb6c0062..0ee51448dd 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-	id 'com.diffplug.spotless' version '6.13.0' apply false
+	id 'com.diffplug.spotless' version '6.14.0' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
 	id 'com.gradle.plugin-publish' version '1.1.0' apply false
 	// https://github.com/gradle-nexus/publish-plugin/releases

From 2046daf067bdbb350d078267a2b26a93deca58af Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 26 Jan 2023 13:16:49 -0800
Subject: [PATCH 0723/2068] Looks like spotbugs is stricter now that we're on
 Java 11.

---
 .../integration/DiffMessageFormatter.java     | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/integration/DiffMessageFormatter.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/integration/DiffMessageFormatter.java
index 15c43c815b..55336e8c04 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/integration/DiffMessageFormatter.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/integration/DiffMessageFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -143,7 +143,7 @@ public String getMessage() {
 				Objects.requireNonNull(runToFix, "runToFix");
 				Objects.requireNonNull(formatter, "formatter");
 				Objects.requireNonNull(problemFiles, "problemFiles");
-				DiffMessageFormatter diffFormater = new DiffMessageFormatter(this);
+				DiffMessageFormatter diffFormater = new DiffMessageFormatter(formatter, problemFiles);
 				return "The following files had format violations:\n"
 						+ diffFormater.buffer
 						+ runToFix;
@@ -151,10 +151,6 @@ public String getMessage() {
 				throw Errors.asRuntime(e);
 			}
 		}
-
-		String relativePath(File file) {
-			return formatter.getRootDir().relativize(file.toPath()).toString();
-		}
 	}
 
 	private static final int MAX_CHECK_MESSAGE_LINES = 50;
@@ -163,25 +159,32 @@ String relativePath(File file) {
 	private final StringBuilder buffer = new StringBuilder(MAX_CHECK_MESSAGE_LINES * 64);
 	private int numLines = 0;
 
-	private DiffMessageFormatter(Builder builder) throws IOException {
-		ListIterator<File> problemIter = builder.problemFiles.listIterator();
+	private final CleanProvider formatter;
+
+	private DiffMessageFormatter(CleanProvider formatter, List<File> problemFiles) throws IOException {
+		this.formatter = Objects.requireNonNull(formatter, "formatter");
+		ListIterator<File> problemIter = problemFiles.listIterator();
 		while (problemIter.hasNext() && numLines < MAX_CHECK_MESSAGE_LINES) {
 			File file = problemIter.next();
-			addFile(builder.relativePath(file) + "\n" + DiffMessageFormatter.diff(builder, file));
+			addFile(relativePath(file) + "\n" + diff(file));
 		}
 		if (problemIter.hasNext()) {
-			int remainingFiles = builder.problemFiles.size() - problemIter.nextIndex();
+			int remainingFiles = problemFiles.size() - problemIter.nextIndex();
 			if (remainingFiles >= MAX_FILES_TO_LIST) {
 				buffer.append("Violations also present in ").append(remainingFiles).append(" other files.\n");
 			} else {
 				buffer.append("Violations also present in:\n");
 				while (problemIter.hasNext()) {
-					addIntendedLine(NORMAL_INDENT, builder.relativePath(problemIter.next()));
+					addIntendedLine(NORMAL_INDENT, relativePath(problemIter.next()));
 				}
 			}
 		}
 	}
 
+	private String relativePath(File file) {
+		return formatter.getRootDir().relativize(file.toPath()).toString();
+	}
+
 	private static final int MIN_LINES_PER_FILE = 4;
 	private static final Splitter NEWLINE_SPLITTER = Splitter.on('\n');
 
@@ -230,10 +233,10 @@ private void addIntendedLine(String indent, String line) {
 	 * look like if formatted using the given formatter. Does not end with any newline
 	 * sequence (\n, \r, \r\n).
 	 */
-	private static String diff(Builder builder, File file) throws IOException {
-		String raw = new String(Files.readAllBytes(file.toPath()), builder.formatter.getEncoding());
+	private String diff(File file) throws IOException {
+		String raw = new String(Files.readAllBytes(file.toPath()), formatter.getEncoding());
 		String rawUnix = LineEnding.toUnix(raw);
-		String formatted = builder.formatter.getFormatted(file, rawUnix);
+		String formatted = formatter.getFormatted(file, rawUnix);
 		String formattedUnix = LineEnding.toUnix(formatted);
 
 		if (rawUnix.equals(formattedUnix)) {

From 8e1865052fb0300123a2bed4ca271a945bde0574 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 26 Jan 2023 13:49:53 -0800
Subject: [PATCH 0724/2068] spotlessApply for 2023

---
 .../main/java/com/diffplug/spotless/markdown/FreshMarkStep.java | 2 +-
 .../java/com/diffplug/spotless/markdown/FreshMarkStepTest.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/markdown/FreshMarkStep.java b/lib/src/main/java/com/diffplug/spotless/markdown/FreshMarkStep.java
index fd03e95046..fca5ac39a4 100644
--- a/lib/src/main/java/com/diffplug/spotless/markdown/FreshMarkStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/markdown/FreshMarkStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/testlib/src/test/java/com/diffplug/spotless/markdown/FreshMarkStepTest.java b/testlib/src/test/java/com/diffplug/spotless/markdown/FreshMarkStepTest.java
index a5fede28bc..586212383d 100644
--- a/testlib/src/test/java/com/diffplug/spotless/markdown/FreshMarkStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/markdown/FreshMarkStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From a610fbf1ae9d64f39e2f9b7b49904e104166f556 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 26 Jan 2023 14:49:05 -0800
Subject: [PATCH 0725/2068] Minor tweaks to homepage.

---
 README.md | 46 ++++++++++++++++++++++++++++++++++------------
 1 file changed, 34 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 0743b69427..d2527034ca 100644
--- a/README.md
+++ b/README.md
@@ -1,23 +1,45 @@
 # <img align="left" src="_images/spotless_logo.png"> Spotless: Keep your code spotless
 
-<!---freshmark shields
-output = [
-   link(image('Circle CI', 'https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield'), 'https://circleci.com/gh/diffplug/spotless/tree/main'),
-  link(shield('Live chat', 'gitter', 'chat', 'brightgreen'), 'https://gitter.im/{{org}}/{{name}}'),
-  link(shield('License Apache', 'license', 'apache', 'brightgreen'), 'https://tldrlegal.com/license/apache-license-2.0-(apache-2.0)')
-  ].join('\n');
--->
-[![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
-[![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)
-[![License Apache](https://img.shields.io/badge/license-apache-brightgreen.svg)](https://tldrlegal.com/license/apache-license-2.0-(apache-2.0))
-<!---freshmark /shields -->
+[![Gradle Plugin](https://img.shields.io/gradle-plugin-portal/v/com.diffplug.spotless?color=blue&label=gradle%20plugin)](plugin-gradle)
+[![Maven Plugin](https://img.shields.io/maven-central/v/com.diffplug.spotless/spotless-maven-plugin?color=blue&label=maven%20plugin)](plugin-maven)
+[![SBT Plugin](https://img.shields.io/badge/sbt%20plugin-0.1.3-blue)](https://github.com/moznion/sbt-spotless)
 
-Spotless can format &lt;antlr | c | c# | c++ | css | flow | graphql | groovy | html | java | javascript | json | jsx | kotlin | less | license headers | markdown | objective-c | protobuf | python | scala | scss | sql | typeScript | vue | yaml | anything> using &lt;gradle | maven | anything>.
+Spotless can format &lt;antlr | c | c# | c++ | css | flow | graphql | groovy | html | java | javascript | json | jsx | kotlin | less | license headers | markdown | objective-c | protobuf | python | scala | scss | sql | typeScript | vue | yaml | anything> using &lt;gradle | maven | sbt | anything>.
 
 You probably want one of the links below:
 
 ## [❇️ Spotless for Gradle](plugin-gradle) (with integrations for [VS Code](https://marketplace.visualstudio.com/items?itemName=richardwillis.vscode-spotless-gradle) and [IntelliJ](https://plugins.jetbrains.com/plugin/18321-spotless-gradle))
+
+```console
+user@machine repo % ./gradlew build
+:spotlessJavaCheck FAILED
+  The following files had format violations:
+  src\main\java\com\diffplug\gradle\spotless\FormatExtension.java
+    -\t\t····if·(targets.length·==·0)·{
+    +\t\tif·(targets.length·==·0)·{
+  Run './gradlew spotlessApply' to fix these violations.
+user@machine repo % ./gradlew spotlessApply
+:spotlessApply
+BUILD SUCCESSFUL
+user@machine repo % ./gradlew build
+BUILD SUCCESSFUL
+```
+
 ## [❇️ Spotless for Maven](plugin-maven)
+
+```console
+user@machine repo % mvn spotless:check
+[ERROR]  > The following files had format violations:
+[ERROR]  src\main\java\com\diffplug\gradle\spotless\FormatExtension.java
+[ERROR]    -\t\t····if·(targets.length·==·0)·{
+[ERROR]    +\t\tif·(targets.length·==·0)·{
+[ERROR]  Run 'mvn spotless:apply' to fix these violations.
+user@machine repo % mvn spotless:apply
+[INFO] BUILD SUCCESS
+user@machine repo % mvn spotless:check
+[INFO] BUILD SUCCESS
+```
+
 ## [❇️ Spotless for SBT (external for now)](https://github.com/moznion/sbt-spotless)
 ## [Other build systems](CONTRIBUTING.md#how-to-add-a-new-plugin-for-a-build-system)
 

From 054ccd12ea39201b39d307d3b1749613f77152a6 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 26 Jan 2023 15:06:57 -0800
Subject: [PATCH 0726/2068] Update public user counts and remove extra shields
 (Gitter and CircleCI in particular).

---
 plugin-gradle/README.md | 16 +++++-----------
 plugin-maven/README.md  | 18 +++++-------------
 2 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 67f3cdd69f..6a56d26e20 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -4,26 +4,20 @@
 <!---freshmark shields
 output = [
   link(shield('Gradle plugin', 'plugins.gradle.org', 'com.diffplug.spotless', 'blue'), 'https://plugins.gradle.org/plugin/com.diffplug.spotless'),
-  link(shield('Maven central', 'mavencentral', 'yes', 'blue'), 'https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22'),
-  link(shield('Javadoc', 'javadoc', 'yes', 'blue'), 'https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/{{versionLast}}/index.html'),
-  link(shield('License Apache', 'license', 'apache', 'blue'), 'https://tldrlegal.com/license/apache-license-2.0-(apache-2.0)'),
   link(shield('Changelog', 'changelog', '{{versionLast}}', 'blue'), 'CHANGES.md'),
+  link(shield('Maven central', 'mavencentral', 'here', 'blue'), 'https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22'),
+  link(shield('Javadoc', 'javadoc', 'here', 'blue'), 'https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/{{versionLast}}/index.html'),
   '',
-  link(image('Circle CI', 'https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield'), 'https://circleci.com/gh/diffplug/spotless/tree/main'),
-  link(shield('Live chat', 'gitter', 'chat', 'brightgreen'), 'https://gitter.im/{{org}}/{{name}}'),
   link(shield('VS Code plugin', 'IDE', 'VS Code', 'blueviolet'), 'https://marketplace.visualstudio.com/items?itemName=richardwillis.vscode-spotless-gradle'),
   link(shield('IntelliJ plugin', 'IDE', 'IntelliJ', 'blueviolet'), 'https://plugins.jetbrains.com/plugin/18321-spotless-gradle'),
   link(shield('Add other IDE', 'IDE', 'add yours', 'blueviolet'), 'IDE_HOOK.md')
   ].join('\n');
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
-[![Maven central](https://img.shields.io/badge/mavencentral-yes-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/index.html)
-[![License Apache](https://img.shields.io/badge/license-apache-blue.svg)](https://tldrlegal.com/license/apache-license-2.0-(apache-2.0))
 [![Changelog](https://img.shields.io/badge/changelog-6.14.0-blue.svg)](CHANGES.md)
+[![Maven central](https://img.shields.io/badge/mavencentral-here-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/index.html)
 
-[![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
-[![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)
 [![VS Code plugin](https://img.shields.io/badge/IDE-VS_Code-blueviolet.svg)](https://marketplace.visualstudio.com/items?itemName=richardwillis.vscode-spotless-gradle)
 [![IntelliJ plugin](https://img.shields.io/badge/IDE-IntelliJ-blueviolet.svg)](https://plugins.jetbrains.com/plugin/18321-spotless-gradle)
 [![Add other IDE](https://img.shields.io/badge/IDE-add_yours-blueviolet.svg)](IDE_HOOK.md)
@@ -33,7 +27,7 @@ output = [
 output = prefixDelimiterReplace(input, 'https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/', '/', versionLast)
 -->
 
-Spotless is a general-purpose formatting plugin used by [4,000 projects on GitHub (August 2020)](https://github.com/search?l=gradle&q=spotless&type=Code).  It is completely à la carte, but also includes powerful "batteries-included" if you opt-in.
+Spotless is a general-purpose formatting plugin used by [15,000 projects on GitHub (Jan 2023)](https://github.com/search?l=gradle&q=spotless&type=Code).  It is completely à la carte, but also includes powerful "batteries-included" if you opt-in.
 
 To people who use your build, it looks like this ([IDE support also available](IDE_HOOK.md)):
 
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 2ade34b67b..73402cd929 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -3,28 +3,20 @@
 <!---freshmark shields
 output = [
   link(shield('Maven central', 'mavencentral', '{{group}}:{{artifactIdMaven}}', 'blue'), 'https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22{{group}}%22%20AND%20a%3A%22{{artifactIdMaven}}%22'),
-  link(shield('Javadoc', 'javadoc', 'yes', 'blue'), 'https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/{{versionLast}}/index.html'),
-  link(shield('Changelog', 'changelog', '{{versionLast}}', 'brightgreen'), 'CHANGES.md'),
-  '',
-  link(image('Circle CI', 'https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield'), 'https://circleci.com/gh/diffplug/spotless/tree/main'),
-  link(shield('Live chat', 'gitter', 'chat', 'brightgreen'), 'https://gitter.im/{{org}}/{{name}}'),
-  link(shield('License Apache', 'license', 'apache', 'brightgreen'), 'https://tldrlegal.com/license/apache-license-2.0-(apache-2.0)')
+  link(shield('Changelog', 'changelog', '{{versionLast}}', 'blue'), 'CHANGES.md'),
+  link(shield('Javadoc', 'javadoc', 'here', 'blue'), 'https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/{{versionLast}}/index.html')
   ].join('\n');
 -->
 [![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.31.0/index.html)
-[![Changelog](https://img.shields.io/badge/changelog-2.31.0-brightgreen.svg)](CHANGES.md)
-
-[![Circle CI](https://circleci.com/gh/diffplug/spotless/tree/main.svg?style=shield)](https://circleci.com/gh/diffplug/spotless/tree/main)
-[![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/spotless)
-[![License Apache](https://img.shields.io/badge/license-apache-brightgreen.svg)](https://tldrlegal.com/license/apache-license-2.0-(apache-2.0))
+[![Changelog](https://img.shields.io/badge/changelog-2.31.0-blue.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.31.0/index.html)
 <!---freshmark /shields -->
 
 <!---freshmark javadoc
 output = prefixDelimiterReplace(input, 'https://{{org}}.github.io/{{name}}/javadoc/spotless-plugin-maven/', '/', versionLast)
 -->
 
-Spotless is a general-purpose formatting plugin used by [4,000 projects on GitHub (August 2020)](https://github.com/search?l=gradle&q=spotless&type=Code).  It is completely à la carte, but also includes powerful "batteries-included" if you opt-in. Plugin requires a version of Maven higher or equal to 3.1.0.
+Spotless is a general-purpose formatting plugin used by [6,000 projects on GitHub (Jan 2023)](https://github.com/search?l=Maven+POM&q=spotless&type=Code).  It is completely à la carte, but also includes powerful "batteries-included" if you opt-in. Plugin requires a version of Maven higher or equal to 3.1.0.
 
 To people who use your build, it looks like this:
 

From b0d16195d45c04a06965217b2bc14bd69d3fe2aa Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Sat, 28 Jan 2023 18:39:41 +0400
Subject: [PATCH 0727/2068] Introduce Formatter.name, Improve synthesis log

---
 .../java/com/diffplug/spotless/Formatter.java | 26 +++++++++++++---
 .../gradle/spotless/SpotlessTask.java         |  3 +-
 .../spotless/maven/FormatterFactory.java      |  4 ++-
 .../spotless/maven/ImpactedFilesTracker.java  | 31 +++++++++++++++++++
 .../spotless/maven/SpotlessApplyMojo.java     | 10 ++++--
 .../spotless/StepHarnessWithFile.java         |  1 +
 6 files changed, 67 insertions(+), 8 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/Formatter.java b/lib/src/main/java/com/diffplug/spotless/Formatter.java
index 038e77fa64..bdfe008a61 100644
--- a/lib/src/main/java/com/diffplug/spotless/Formatter.java
+++ b/lib/src/main/java/com/diffplug/spotless/Formatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,13 +39,16 @@
 public final class Formatter implements Serializable, AutoCloseable {
 	private static final long serialVersionUID = 1L;
 
+	// The name is used for logging purpose. It does not convey any applicative purpose
+	private String name;
 	private LineEnding.Policy lineEndingsPolicy;
 	private Charset encoding;
 	private Path rootDir;
 	private List<FormatterStep> steps;
 	private FormatExceptionPolicy exceptionPolicy;
 
-	private Formatter(LineEnding.Policy lineEndingsPolicy, Charset encoding, Path rootDirectory, List<FormatterStep> steps, FormatExceptionPolicy exceptionPolicy) {
+	private Formatter(String name, LineEnding.Policy lineEndingsPolicy, Charset encoding, Path rootDirectory, List<FormatterStep> steps, FormatExceptionPolicy exceptionPolicy) {
+		this.name = name;
 		this.lineEndingsPolicy = Objects.requireNonNull(lineEndingsPolicy, "lineEndingsPolicy");
 		this.encoding = Objects.requireNonNull(encoding, "encoding");
 		this.rootDir = Objects.requireNonNull(rootDirectory, "rootDir");
@@ -55,6 +58,7 @@ private Formatter(LineEnding.Policy lineEndingsPolicy, Charset encoding, Path ro
 
 	// override serialize output
 	private void writeObject(ObjectOutputStream out) throws IOException {
+		out.writeObject(name);
 		out.writeObject(lineEndingsPolicy);
 		out.writeObject(encoding.name());
 		out.writeObject(rootDir.toString());
@@ -65,6 +69,7 @@ private void writeObject(ObjectOutputStream out) throws IOException {
 	// override serialize input
 	@SuppressWarnings("unchecked")
 	private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+		name = (String) in.readObject();
 		lineEndingsPolicy = (LineEnding.Policy) in.readObject();
 		encoding = Charset.forName((String) in.readObject());
 		rootDir = Paths.get((String) in.readObject());
@@ -78,6 +83,10 @@ private void readObjectNoData() throws ObjectStreamException {
 		throw new UnsupportedOperationException();
 	}
 
+	public String getName() {
+		return name;
+	}
+
 	public LineEnding.Policy getLineEndingsPolicy() {
 		return lineEndingsPolicy;
 	}
@@ -103,6 +112,8 @@ public static Formatter.Builder builder() {
 	}
 
 	public static class Builder {
+		// optional parameters
+		private String name = "misc";
 		// required parameters
 		private LineEnding.Policy lineEndingsPolicy;
 		private Charset encoding;
@@ -112,6 +123,11 @@ public static class Builder {
 
 		private Builder() {}
 
+		public Builder name(String name) {
+			this.name = name;
+			return this;
+		}
+
 		public Builder lineEndingsPolicy(LineEnding.Policy lineEndingsPolicy) {
 			this.lineEndingsPolicy = lineEndingsPolicy;
 			return this;
@@ -138,7 +154,7 @@ public Builder exceptionPolicy(FormatExceptionPolicy exceptionPolicy) {
 		}
 
 		public Formatter build() {
-			return new Formatter(lineEndingsPolicy, encoding, rootDir, steps,
+			return new Formatter(name, lineEndingsPolicy, encoding, rootDir, steps,
 					exceptionPolicy == null ? FormatExceptionPolicy.failOnlyOnError() : exceptionPolicy);
 		}
 	}
@@ -248,6 +264,7 @@ public String compute(String unix, File file) {
 	public int hashCode() {
 		final int prime = 31;
 		int result = 1;
+		result = prime * result + name.hashCode();
 		result = prime * result + encoding.hashCode();
 		result = prime * result + lineEndingsPolicy.hashCode();
 		result = prime * result + rootDir.hashCode();
@@ -268,7 +285,8 @@ public boolean equals(Object obj) {
 			return false;
 		}
 		Formatter other = (Formatter) obj;
-		return encoding.equals(other.encoding) &&
+		return name.equals(other.name) &&
+				encoding.equals(other.encoding) &&
 				lineEndingsPolicy.equals(other.lineEndingsPolicy) &&
 				rootDir.equals(other.rootDir) &&
 				steps.equals(other.steps) &&
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
index 6f2279b2e0..c23cea0845 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 DiffPlug
+ * Copyright 2020-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -184,6 +184,7 @@ String formatName() {
 
 	Formatter buildFormatter() {
 		return Formatter.builder()
+				.name(formatName())
 				.lineEndingsPolicy(lineEndingsPolicy.get())
 				.encoding(Charset.forName(encoding))
 				.rootDir(getProjectDir().get().getAsFile().toPath())
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java
index d5fbe60370..b78e987d34 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -101,7 +101,9 @@ public final Formatter newFormatter(Supplier<Iterable<File>> filesToFormat, Form
 			formatterSteps.add(pair.out());
 		}
 
+		String formatterName = this.getClass().getSimpleName();
 		return Formatter.builder()
+				.name(formatterName)
 				.encoding(formatterEncoding)
 				.lineEndingsPolicy(formatterLineEndingPolicy)
 				.exceptionPolicy(new FormatExceptionPolicyStrict())
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/ImpactedFilesTracker.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/ImpactedFilesTracker.java
index 6019591e09..7474c109bc 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/ImpactedFilesTracker.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/ImpactedFilesTracker.java
@@ -1,11 +1,41 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.maven;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
+/**
+ * Tracks the number of processed files, typically by a single Formatter for a whole repository
+ */
 public class ImpactedFilesTracker {
+	protected final AtomicInteger nbSkipped = new AtomicInteger();
 	protected final AtomicInteger nbChecked = new AtomicInteger();
 	protected final AtomicInteger nbCleaned = new AtomicInteger();
 
+	/**
+	 * Some cache mechanism may indicate some content is clean, without having to execute the cleaning process
+	 */
+	public void skippedAsCleanCache() {
+		nbSkipped.incrementAndGet();
+	}
+
+	public int getSkipped() {
+		return nbSkipped.get();
+	}
+
 	public void checked() {
 		nbChecked.incrementAndGet();
 	}
@@ -21,4 +51,5 @@ public void cleaned() {
 	public int getCleaned() {
 		return nbCleaned.get();
 	}
+
 }
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
index b617505826..0f712ecd12 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,6 +37,7 @@ protected void process(Iterable<File> files, Formatter formatter, UpToDateChecke
 
 		for (File file : files) {
 			if (upToDateChecker.isUpToDate(file.toPath())) {
+				impactedFilesTracker.skippedAsCleanCache();
 				if (getLog().isDebugEnabled()) {
 					getLog().debug("Spotless will not format an up-to-date file: " + file);
 				}
@@ -60,6 +61,11 @@ protected void process(Iterable<File> files, Formatter formatter, UpToDateChecke
 		}
 
 		// We print the number of considered files which is useful when ratchetFrom is setup
-		getLog().info(String.format("A formatter with %s steps cleaned: %s files (for %s considered)", formatter.getSteps().size(), impactedFilesTracker.getCleaned(), impactedFilesTracker.getChecked()));
+		int nbSkipped = impactedFilesTracker.getSkipped();
+		int nbChecked = impactedFilesTracker.getChecked();
+		int nbCleaned = impactedFilesTracker.getCleaned();
+		int totalProcessed = nbSkipped + nbChecked + nbCleaned;
+		getLog().info(String.format("Spotless.%s is keeping %s files clean - %s were changed to be clean, %s were already clean, %s were skipped because caching determined they were already clean",
+				formatter.getName(), totalProcessed, nbCleaned, nbChecked, nbSkipped));
 	}
 }
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java b/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java
index 98a709c59f..9a9eb4042b 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java
@@ -38,6 +38,7 @@ private StepHarnessWithFile(ResourceHarness harness, Formatter formatter) {
 	/** Creates a harness for testing steps which do depend on the file. */
 	public static StepHarnessWithFile forStep(ResourceHarness harness, FormatterStep step) {
 		return new StepHarnessWithFile(harness, Formatter.builder()
+				.name(step.getName())
 				.encoding(StandardCharsets.UTF_8)
 				.lineEndingsPolicy(LineEnding.UNIX.createPolicy())
 				.steps(Collections.singletonList(step))

From 2da48e6f0c1c6a0ae4e7669d43a3756f7df72eb9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 29 Jan 2023 04:16:38 +0000
Subject: [PATCH 0728/2068] Update dependency
 com.fasterxml.jackson.core:jackson-databind to v2.14.2

---
 lib/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 9d95007bc1..fa80767047 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -62,7 +62,7 @@ dependencies {
 	palantirJavaFormatCompileOnly 'com.palantir.javaformat:palantir-java-format:1.1.0' 	// this version needs to stay compilable against Java 8 for CI Job testNpm
 
 	// used jackson-based formatters
-	jacksonCompileOnly 'com.fasterxml.jackson.core:jackson-databind:2.14.1'
+	jacksonCompileOnly 'com.fasterxml.jackson.core:jackson-databind:2.14.2'
 	jacksonCompileOnly 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.14.1'
 
 	String VER_KTFMT = '0.42'

From 0bb25119d7f96220f4aa5b4072053849a9b06662 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 29 Jan 2023 13:17:02 +0000
Subject: [PATCH 0729/2068] Update dependency org.mockito:mockito-core to
 v5.1.0

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index dc4f24a36b..6256e51203 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -28,4 +28,4 @@ VER_DURIAN=1.2.0
 VER_JGIT=6.4.0.202211300538-r
 VER_JUNIT=5.9.2
 VER_ASSERTJ=3.24.2
-VER_MOCKITO=5.0.0
+VER_MOCKITO=5.1.0

From cc03d541e9e2a8b645e54e535ad0259c959c1ff7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 30 Jan 2023 09:08:11 +0000
Subject: [PATCH 0730/2068] Update plugin com.diffplug.spotless-changelog to v3

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 0ee51448dd..379daca7bb 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -14,7 +14,7 @@ plugins {
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
 	id 'com.github.spotbugs' version '5.0.13' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
-	id 'com.diffplug.spotless-changelog' version '2.4.1' apply false
+	id 'com.diffplug.spotless-changelog' version '3.0.1' apply false
 	// https://github.com/diffplug/goomph/blob/main/CHANGES.md
 	// DO NOT UPDATE, see https://github.com/diffplug/spotless/pull/874
 	id 'com.diffplug.p2.asmaven' version '3.27.0' apply false

From cf2a4eb08d002db8b4c51fa4c43ad022361a6013 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 30 Jan 2023 16:37:03 +0000
Subject: [PATCH 0731/2068] Update plugin com.gradle.enterprise to v3.12.3

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 0ee51448dd..e476425c96 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -23,7 +23,7 @@ plugins {
 	// https://github.com/davidburstrom/version-compatibility-gradle-plugin/tags
 	id 'io.github.davidburstrom.version-compatibility' version '0.4.0' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.enterprise
-	id 'com.gradle.enterprise' version '3.12.2'
+	id 'com.gradle.enterprise' version '3.12.3'
 }
 
 dependencyResolutionManagement {

From cf434f2eecf9a9369f22c1c95f56adbb792df30f Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Mon, 30 Jan 2023 23:19:53 +0400
Subject: [PATCH 0732/2068] Start with Cleanthat Java refactorer

---
 .../java/JavaCleanthatRefactorerFunc.java     |  56 +++++++
 .../spotless/java/CleanthatStepFactory.java   | 140 ++++++++++++++++++
 2 files changed, 196 insertions(+)
 create mode 100644 lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java
 create mode 100644 lib/src/main/java/com/diffplug/spotless/java/CleanthatStepFactory.java

diff --git a/lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java b/lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java
new file mode 100644
index 0000000000..bc96f0019b
--- /dev/null
+++ b/lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2021-2023 Solven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.glue.java;
+
+import com.diffplug.spotless.FormatterFunc;
+import eu.solven.cleanthat.config.pojo.CleanthatEngineProperties;
+import eu.solven.cleanthat.engine.java.refactorer.JavaRefactorer;
+import eu.solven.cleanthat.engine.java.refactorer.JavaRefactorerProperties;
+import eu.solven.cleanthat.formatter.LineEnding;
+import eu.solven.cleanthat.formatter.PathAndContent;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+public class JavaCleanthatRefactorerFunc implements FormatterFunc {
+	private List<String> included;
+	private List<String> excluded;
+
+	public JavaCleanthatRefactorerFunc(List<String> included, List<String> excluded) {
+		this.included = included == null ? Collections.emptyList() : included;
+		this.excluded = excluded == null ? Collections.emptyList() : excluded;
+	}
+
+	public JavaCleanthatRefactorerFunc() {
+		this(Arrays.asList(JavaRefactorerProperties.WILDCARD), Arrays.asList());
+	}
+
+	@Override
+	public String apply(String input) throws Exception {
+		JavaRefactorerProperties refactorerProperties = new JavaRefactorerProperties();
+
+		refactorerProperties.setIncluded(included);
+		refactorerProperties.setExcluded(excluded);
+
+		JavaRefactorer refactorer =
+				new JavaRefactorer(CleanthatEngineProperties.builder().build(), refactorerProperties);
+
+		// Spotless calls steps always with LF eol.
+		return refactorer.doFormat(new PathAndContent(Paths.get("fake"), input), LineEnding.LF);
+	}
+
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/java/CleanthatStepFactory.java b/lib/src/main/java/com/diffplug/spotless/java/CleanthatStepFactory.java
new file mode 100644
index 0000000000..fa9936fb1e
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/java/CleanthatStepFactory.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright 2016-2023 Solven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.java;
+
+import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.JarState;
+import com.diffplug.spotless.Jvm;
+import com.diffplug.spotless.Provisioner;
+import java.io.IOException;
+import java.io.Serializable;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Enables CleanThat as a SpotLess step. This may be moved to Spotless own repo
+ * (https://github.com/diffplug/spotless/tree/main/lib)
+ *
+ * @author Benoit Lacelle
+ */
+// https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep
+public final class CleanthatStepFactory {
+
+	private static final String NAME = "cleanthat";
+	private static final String MAVEN_COORDINATE = "io.github.solven-eu.cleanthat:java:";
+
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String>support(NAME).add(8, "2.0");
+
+	// prevent direct instantiation
+	private CleanthatStepFactory() {
+	}
+
+	/** Creates a step which formats everything - code, import order, and unused imports. */
+	public static FormatterStep create(Provisioner provisioner) {
+		return create(defaultVersion(), provisioner);
+	}
+
+	/** Creates a step which formats everything - code, import order, and unused imports. */
+	public static FormatterStep create(String version, Provisioner provisioner) {
+		return create(MAVEN_COORDINATE, version, defaultExcluded(), defaultIncluded(), provisioner);
+	}
+
+	private static List<String> defaultExcluded() {
+		return List.of();
+	}
+
+	private static List<String> defaultIncluded() {
+		return List.of("*");
+	}
+
+	/** Creates a step which formats everything - groupArtifact, code, import order, and unused imports. */
+	public static FormatterStep create(String groupArtifact,
+			String version,
+			List<String> excluded,
+			List<String> included,
+			Provisioner provisioner) {
+		Objects.requireNonNull(groupArtifact, "groupArtifact");
+		if (groupArtifact.chars().filter(ch -> ch == ':').count() != 1) {
+			throw new IllegalArgumentException("groupArtifact must be in the form 'groupId:artifactId'");
+		}
+		Objects.requireNonNull(version, "version");
+		Objects.requireNonNull(provisioner, "provisioner");
+		return FormatterStep.createLazy(NAME,
+				() -> new JavaRulesState(NAME, groupArtifact, version, excluded, included, provisioner),
+				JavaRulesState::createFormat);
+	}
+
+	/** Get default formatter version */
+	public static String defaultVersion() {
+		return JVM_SUPPORT.getRecommendedFormatterVersion();
+	}
+
+	static final class JavaRulesState implements Serializable {
+		private static final long serialVersionUID = 1L;
+
+		final JarState jarState;
+		final String stepName;
+		final String version;
+
+		final List<String> included;
+		final List<String> excluded;
+
+		JavaRulesState(String stepName, String version, Provisioner provisioner) throws IOException {
+			this(stepName, MAVEN_COORDINATE, version, defaultExcluded(), defaultIncluded(), provisioner);
+		}
+
+		JavaRulesState(String stepName,
+				String groupArtifact,
+				String version,
+				List<String> included,
+				List<String> excluded,
+				Provisioner provisioner) throws IOException {
+			JVM_SUPPORT.assertFormatterSupported(version);
+			// ModuleHelper.doOpenInternalPackagesIfRequired();
+			this.jarState = JarState.from(groupArtifact + ":" + version, provisioner);
+			this.stepName = stepName;
+			this.version = version;
+
+			this.included = included;
+			this.excluded = excluded;
+		}
+
+		@SuppressWarnings("PMD.UseProperClassLoader")
+		FormatterFunc createFormat() {
+			ClassLoader classLoader = jarState.getClassLoader();
+
+			Object formatter;
+			Method formatterMethod;
+			try {
+				Class<?> formatterClazz =
+						classLoader.loadClass("com.diffplug.spotless.glue.java.JavaCleanthatRefactoringFunc");
+				Constructor<?> formatterConstructor = formatterClazz.getConstructor(List.class, List.class);
+
+				formatter = formatterConstructor.newInstance(included, excluded);
+				formatterMethod = formatterClazz.getMethod("apply", String.class);
+			} catch (ReflectiveOperationException e) {
+				throw new IllegalStateException("Issue executing the formatter", e);
+			}
+			return JVM_SUPPORT.suggestLaterVersionOnError(version, input -> {
+				return (String) formatterMethod.invoke(formatter, input);
+			});
+		}
+
+	}
+}

From 8fcce07eee63e064ad1c8e3583dd6c89c32899fa Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Tue, 31 Jan 2023 00:10:27 +0400
Subject: [PATCH 0733/2068] Apply suggestions

---
 .../java/com/diffplug/spotless/Formatter.java |  2 +-
 .../spotless/maven/ImpactedFilesTracker.java  | 28 +++++++++----------
 .../spotless/maven/SpotlessApplyMojo.java     | 13 +++++----
 3 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/Formatter.java b/lib/src/main/java/com/diffplug/spotless/Formatter.java
index bdfe008a61..dede79c1b3 100644
--- a/lib/src/main/java/com/diffplug/spotless/Formatter.java
+++ b/lib/src/main/java/com/diffplug/spotless/Formatter.java
@@ -113,7 +113,7 @@ public static Formatter.Builder builder() {
 
 	public static class Builder {
 		// optional parameters
-		private String name = "misc";
+		private String name = "unnamed";
 		// required parameters
 		private LineEnding.Policy lineEndingsPolicy;
 		private Charset encoding;
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/ImpactedFilesTracker.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/ImpactedFilesTracker.java
index 7474c109bc..f66802475e 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/ImpactedFilesTracker.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/ImpactedFilesTracker.java
@@ -15,41 +15,39 @@
  */
 package com.diffplug.spotless.maven;
 
-import java.util.concurrent.atomic.AtomicInteger;
-
 /**
  * Tracks the number of processed files, typically by a single Formatter for a whole repository
  */
-public class ImpactedFilesTracker {
-	protected final AtomicInteger nbSkipped = new AtomicInteger();
-	protected final AtomicInteger nbChecked = new AtomicInteger();
-	protected final AtomicInteger nbCleaned = new AtomicInteger();
+class ImpactedFilesTracker {
+	protected int nbskippedAsCleanCache = 0;
+	protected int nbCheckedButAlreadyClean = 0;
+	protected int nbCleaned = 0;
 
 	/**
 	 * Some cache mechanism may indicate some content is clean, without having to execute the cleaning process
 	 */
 	public void skippedAsCleanCache() {
-		nbSkipped.incrementAndGet();
+		nbskippedAsCleanCache++;
 	}
 
-	public int getSkipped() {
-		return nbSkipped.get();
+	public int getSkippedAsCleanCache() {
+		return nbskippedAsCleanCache;
 	}
 
-	public void checked() {
-		nbChecked.incrementAndGet();
+	public void checkedButAlreadyClean() {
+		nbCheckedButAlreadyClean++;
 	}
 
-	public int getChecked() {
-		return nbChecked.get();
+	public int getCheckedButAlreadyClean() {
+		return nbCheckedButAlreadyClean;
 	}
 
 	public void cleaned() {
-		nbCleaned.incrementAndGet();
+		nbCleaned++;
 	}
 
 	public int getCleaned() {
-		return nbCleaned.get();
+		return nbCleaned;
 	}
 
 }
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
index 0f712ecd12..0c1cbf8785 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
@@ -45,13 +45,14 @@ protected void process(Iterable<File> files, Formatter formatter, UpToDateChecke
 			}
 
 			try {
-				impactedFilesTracker.checked();
 				PaddedCell.DirtyState dirtyState = PaddedCell.calculateDirtyState(formatter, file);
 				if (!dirtyState.isClean() && !dirtyState.didNotConverge()) {
 					getLog().info(String.format("Writing clean file: %s", file));
 					dirtyState.writeCanonicalTo(file);
 					buildContext.refresh(file);
 					impactedFilesTracker.cleaned();
+				} else {
+					impactedFilesTracker.checkedButAlreadyClean();
 				}
 			} catch (IOException e) {
 				throw new MojoExecutionException("Unable to format file " + file, e);
@@ -61,11 +62,11 @@ protected void process(Iterable<File> files, Formatter formatter, UpToDateChecke
 		}
 
 		// We print the number of considered files which is useful when ratchetFrom is setup
-		int nbSkipped = impactedFilesTracker.getSkipped();
-		int nbChecked = impactedFilesTracker.getChecked();
-		int nbCleaned = impactedFilesTracker.getCleaned();
-		int totalProcessed = nbSkipped + nbChecked + nbCleaned;
+		int skippedAsCleanCache = impactedFilesTracker.getSkippedAsCleanCache();
+		int checkedButAlreadyClean = impactedFilesTracker.getCheckedButAlreadyClean();
+		int cleaned = impactedFilesTracker.getCleaned();
+		int totalProcessed = skippedAsCleanCache + checkedButAlreadyClean + cleaned;
 		getLog().info(String.format("Spotless.%s is keeping %s files clean - %s were changed to be clean, %s were already clean, %s were skipped because caching determined they were already clean",
-				formatter.getName(), totalProcessed, nbCleaned, nbChecked, nbSkipped));
+				formatter.getName(), totalProcessed, cleaned, checkedButAlreadyClean, skippedAsCleanCache));
 	}
 }

From ed45e5b57bdd4b62874d8d55aa7f5d93a0d7e138 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 30 Jan 2023 23:12:28 +0000
Subject: [PATCH 0734/2068] Update dependency org.mockito:mockito-core to
 v5.1.1

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 6256e51203..c72fa0429d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -28,4 +28,4 @@ VER_DURIAN=1.2.0
 VER_JGIT=6.4.0.202211300538-r
 VER_JUNIT=5.9.2
 VER_ASSERTJ=3.24.2
-VER_MOCKITO=5.1.0
+VER_MOCKITO=5.1.1

From c890b89c7fb4430858bac8277bc5cfffad87ebac Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Tue, 31 Jan 2023 08:39:13 +0400
Subject: [PATCH 0735/2068] Add a CHANGES entry. Log only if totalProcessed>0

---
 plugin-maven/CHANGES.md                                     | 1 +
 .../java/com/diffplug/spotless/maven/SpotlessApplyMojo.java | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 1bb49898f1..2ecb7735ff 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -4,6 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
+* A synthesis log with the number of considered files is added after each formatter execution [#1507](https://github.com/diffplug/spotless/pull/1507)
 ### Fixed
 * The default list of type annotations used by `formatAnnotations` has had 8 more annotations from the Checker Framework added [#1494](https://github.com/diffplug/spotless/pull/1494)
 ### Changes
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
index 0c1cbf8785..8dd758e84b 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
@@ -66,7 +66,9 @@ protected void process(Iterable<File> files, Formatter formatter, UpToDateChecke
 		int checkedButAlreadyClean = impactedFilesTracker.getCheckedButAlreadyClean();
 		int cleaned = impactedFilesTracker.getCleaned();
 		int totalProcessed = skippedAsCleanCache + checkedButAlreadyClean + cleaned;
-		getLog().info(String.format("Spotless.%s is keeping %s files clean - %s were changed to be clean, %s were already clean, %s were skipped because caching determined they were already clean",
-				formatter.getName(), totalProcessed, cleaned, checkedButAlreadyClean, skippedAsCleanCache));
+		if (totalProcessed > 0) {
+			getLog().info(String.format("Spotless.%s is keeping %s files clean - %s were changed to be clean, %s were already clean, %s were skipped because caching determined they were already clean",
+					formatter.getName(), totalProcessed, cleaned, checkedButAlreadyClean, skippedAsCleanCache));
+		}
 	}
 }

From 6f6b34fe35753064fdd35e5fcce8b42ec62660fb Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Tue, 31 Jan 2023 08:45:30 +0400
Subject: [PATCH 0736/2068] Add debug log if no concerned filers

---
 .../java/com/diffplug/spotless/maven/SpotlessApplyMojo.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
index 8dd758e84b..5f99f6a126 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
@@ -69,6 +69,9 @@ protected void process(Iterable<File> files, Formatter formatter, UpToDateChecke
 		if (totalProcessed > 0) {
 			getLog().info(String.format("Spotless.%s is keeping %s files clean - %s were changed to be clean, %s were already clean, %s were skipped because caching determined they were already clean",
 					formatter.getName(), totalProcessed, cleaned, checkedButAlreadyClean, skippedAsCleanCache));
+		} else {
+			getLog().debug(String.format("Spotless.%s is not considering a single file",
+					formatter.getName()));
 		}
 	}
 }

From b48f511c652282ff04738b84214dbc8944ba5412 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 30 Jan 2023 22:41:18 -0800
Subject: [PATCH 0737/2068] Move towards API changes.

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index d1ae14750e..7cfca1fb56 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,8 +3,8 @@ plugins {
 	id 'dev.equo.ide'                          version '0.12.1'
 }
 equoIde {
-	branding.title('Spotless').icon(file('_images/spotless_logo.png'))
-	welcome().openUrlOnStartup('https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md')
+	branding().title('Spotless').icon(file('_images/spotless_logo.png'))
+	welcome().openUrl('https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md')
 
 	// everything below becomes the default after https://github.com/equodev/equo-ide/pull/66
 	p2repo 'https://download.eclipse.org/eclipse/updates/4.26/'

From d7ff074095b4bbcbe1acb6a7e4ad1edf6fccb78f Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 30 Jan 2023 22:46:21 -0800
Subject: [PATCH 0738/2068] Treat empty target as a warning (likely a mistake,
 e.g. #437).

---
 .../java/com/diffplug/spotless/maven/SpotlessApplyMojo.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
index 5f99f6a126..440b72c21e 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
@@ -70,8 +70,7 @@ protected void process(Iterable<File> files, Formatter formatter, UpToDateChecke
 			getLog().info(String.format("Spotless.%s is keeping %s files clean - %s were changed to be clean, %s were already clean, %s were skipped because caching determined they were already clean",
 					formatter.getName(), totalProcessed, cleaned, checkedButAlreadyClean, skippedAsCleanCache));
 		} else {
-			getLog().debug(String.format("Spotless.%s is not considering a single file",
-					formatter.getName()));
+			getLog().warn(String.format("Spotless.%s has no target files. Examine your `<includes>`: https://github.com/diffplug/spotless/tree/main/plugin-maven#quickstart", formatter.getName()));
 		}
 	}
 }

From eeee68aaa9e605d23b0622af7ff2650237c96fa5 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 30 Jan 2023 22:48:52 -0800
Subject: [PATCH 0739/2068] Minor renaming to condense SpotlessApplyMojo.

---
 .../spotless/maven/ImpactedFilesTracker.java     |  3 +++
 .../spotless/maven/SpotlessApplyMojo.java        | 16 ++++++----------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/ImpactedFilesTracker.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/ImpactedFilesTracker.java
index f66802475e..60eb8af762 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/ImpactedFilesTracker.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/ImpactedFilesTracker.java
@@ -50,4 +50,7 @@ public int getCleaned() {
 		return nbCleaned;
 	}
 
+	public int getTotal() {
+		return nbskippedAsCleanCache + nbCheckedButAlreadyClean + nbCleaned;
+	}
 }
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
index 440b72c21e..f7f23d6d75 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
@@ -33,11 +33,11 @@ public class SpotlessApplyMojo extends AbstractSpotlessMojo {
 
 	@Override
 	protected void process(Iterable<File> files, Formatter formatter, UpToDateChecker upToDateChecker) throws MojoExecutionException {
-		ImpactedFilesTracker impactedFilesTracker = new ImpactedFilesTracker();
+		ImpactedFilesTracker counter = new ImpactedFilesTracker();
 
 		for (File file : files) {
 			if (upToDateChecker.isUpToDate(file.toPath())) {
-				impactedFilesTracker.skippedAsCleanCache();
+				counter.skippedAsCleanCache();
 				if (getLog().isDebugEnabled()) {
 					getLog().debug("Spotless will not format an up-to-date file: " + file);
 				}
@@ -50,9 +50,9 @@ protected void process(Iterable<File> files, Formatter formatter, UpToDateChecke
 					getLog().info(String.format("Writing clean file: %s", file));
 					dirtyState.writeCanonicalTo(file);
 					buildContext.refresh(file);
-					impactedFilesTracker.cleaned();
+					counter.cleaned();
 				} else {
-					impactedFilesTracker.checkedButAlreadyClean();
+					counter.checkedButAlreadyClean();
 				}
 			} catch (IOException e) {
 				throw new MojoExecutionException("Unable to format file " + file, e);
@@ -62,13 +62,9 @@ protected void process(Iterable<File> files, Formatter formatter, UpToDateChecke
 		}
 
 		// We print the number of considered files which is useful when ratchetFrom is setup
-		int skippedAsCleanCache = impactedFilesTracker.getSkippedAsCleanCache();
-		int checkedButAlreadyClean = impactedFilesTracker.getCheckedButAlreadyClean();
-		int cleaned = impactedFilesTracker.getCleaned();
-		int totalProcessed = skippedAsCleanCache + checkedButAlreadyClean + cleaned;
-		if (totalProcessed > 0) {
+		if (counter.getTotal() > 0) {
 			getLog().info(String.format("Spotless.%s is keeping %s files clean - %s were changed to be clean, %s were already clean, %s were skipped because caching determined they were already clean",
-					formatter.getName(), totalProcessed, cleaned, checkedButAlreadyClean, skippedAsCleanCache));
+					formatter.getName(), counter.getTotal(), counter.getCleaned(), counter.getCheckedButAlreadyClean(), counter.getSkippedAsCleanCache()));
 		} else {
 			getLog().warn(String.format("Spotless.%s has no target files. Examine your `<includes>`: https://github.com/diffplug/spotless/tree/main/plugin-maven#quickstart", formatter.getName()));
 		}

From 1981d4b2c8f521264e1d3ece408daf4bebf97e49 Mon Sep 17 00:00:00 2001
From: Aleksey Genus <agenus@projectx019.com>
Date: Tue, 31 Jan 2023 16:31:50 +0600
Subject: [PATCH 0740/2068] Sort by keys inside json arrays

---
 .../spotless/glue/gson/GsonFormatterFunc.java | 32 +++++++++++++++----
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/lib/src/gson/java/com/diffplug/spotless/glue/gson/GsonFormatterFunc.java b/lib/src/gson/java/com/diffplug/spotless/glue/gson/GsonFormatterFunc.java
index b19476a1a8..0ff5037cba 100644
--- a/lib/src/gson/java/com/diffplug/spotless/glue/gson/GsonFormatterFunc.java
+++ b/lib/src/gson/java/com/diffplug/spotless/glue/gson/GsonFormatterFunc.java
@@ -21,6 +21,7 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.stream.JsonWriter;
@@ -57,8 +58,8 @@ public String apply(String inputString) {
 			if (jsonElement == null) {
 				throw new AssertionError(FAILED_TO_PARSE_ERROR_MESSAGE);
 			}
-			if (gsonConfig.isSortByKeys() && jsonElement.isJsonObject()) {
-				jsonElement = sortByKeys(jsonElement.getAsJsonObject());
+			if (gsonConfig.isSortByKeys()) {
+				jsonElement = sortByKeys(jsonElement);
 			}
 			try (StringWriter stringWriter = new StringWriter()) {
 				JsonWriter jsonWriter = new JsonWriter(stringWriter);
@@ -72,19 +73,36 @@ public String apply(String inputString) {
 		return result;
 	}
 
+	private JsonElement sortByKeys(JsonElement jsonElement) {
+		if (jsonElement.isJsonArray()) {
+			return sortByKeys(jsonElement.getAsJsonArray());
+		} else if (jsonElement.isJsonObject()) {
+			return sortByKeys(jsonElement.getAsJsonObject());
+		} else {
+			return jsonElement;
+		}
+	}
+
 	private JsonElement sortByKeys(JsonObject jsonObject) {
 		JsonObject result = new JsonObject();
 		jsonObject.keySet().stream().sorted()
 				.forEach(key -> {
-					JsonElement element = jsonObject.get(key);
-					if (element.isJsonObject()) {
-						element = sortByKeys(element.getAsJsonObject());
-					}
-					result.add(key, element);
+					JsonElement sorted = sortByKeys(jsonObject.get(key));
+					result.add(key, sorted);
 				});
 		return result;
 	}
 
+	private JsonElement sortByKeys(JsonArray jsonArray) {
+		var result = new JsonArray();
+		for (JsonElement element : jsonArray) {
+			JsonElement sorted = sortByKeys(element);
+			result.add(sorted);
+		}
+
+		return result;
+	}
+
 	private String generateIndent(int indentSpaces) {
 		return String.join("", Collections.nCopies(indentSpaces, " "));
 	}

From d77a3390fd4a378467f2c5b5a790aed2febaa48f Mon Sep 17 00:00:00 2001
From: Aleksey Genus <agenus@projectx019.com>
Date: Tue, 31 Jan 2023 17:24:14 +0600
Subject: [PATCH 0741/2068] Add changes

---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index 401998b233..72a4b99e93 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changes
 * **POTENTIALLY BREAKING** Bump bytecode from Java 8 to 11 ([#1530](https://github.com/diffplug/spotless/pull/1530) part 2 of [#1337](https://github.com/diffplug/spotless/issues/1337))
+* **POTENTIALLY BREAKING** `sortByKeys` for JSON formatting now takes into account objects inside arrays ([#1546](https://github.com/diffplug/spotless/pull/1546))
 
 ## [2.34.0] - 2023-01-26
 ### Added

From 6a9dcfd99ccdf5bec5f7330bd4bae9b404d78fc5 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 31 Jan 2023 09:31:49 -0800
Subject: [PATCH 0742/2068] Stop disabling plugin-maven on JITPACK.

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index ac0e81a61b..9573775884 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -91,7 +91,7 @@ def getStartProperty(java.lang.String name) {
 
 }
 
-if (System.getenv('SPOTLESS_EXCLUDE_MAVEN') != 'true' && getStartProperty('SPOTLESS_EXCLUDE_MAVEN') != 'true' && System.getenv('JITPACK') != 'true') {
+if (System.getenv('SPOTLESS_EXCLUDE_MAVEN') != 'true' && getStartProperty('SPOTLESS_EXCLUDE_MAVEN') != 'true') {
 	include 'plugin-maven'	// maven-specific glue code
 }
 

From 4c7b616e510bd83167ff329361ad819fac28ae6e Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 31 Jan 2023 09:36:09 -0800
Subject: [PATCH 0743/2068] Set JitPack build JDK to 11.

---
 jitpack.yml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 jitpack.yml

diff --git a/jitpack.yml b/jitpack.yml
new file mode 100644
index 0000000000..adb3fe10c8
--- /dev/null
+++ b/jitpack.yml
@@ -0,0 +1,2 @@
+jdk:
+  - openjdk11

From c77a4a609afa04b4f5969b7eabecd468cf88664e Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 31 Jan 2023 09:49:13 -0800
Subject: [PATCH 0744/2068] Disable signing on JitPack.

---
 gradle/java-publish.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/java-publish.gradle b/gradle/java-publish.gradle
index 7d2055d78d..4f77a43ac2 100644
--- a/gradle/java-publish.gradle
+++ b/gradle/java-publish.gradle
@@ -170,7 +170,7 @@ model {
 	}
 }
 
-if (!version.endsWith('-SNAPSHOT')) {
+if (!version.endsWith('-SNAPSHOT') && System.getenv('JITPACK') != 'true') {
 	signing {
 		String gpg_key = decode64('ORG_GRADLE_PROJECT_gpg_key64')
 		useInMemoryPgpKeys(gpg_key, System.env['ORG_GRADLE_PROJECT_gpg_passphrase'])

From 1c060830640b39f04b2e16b6ac49da52d7d0d276 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 31 Jan 2023 09:58:13 -0800
Subject: [PATCH 0745/2068] Another attempt to disable signing on JitPack.

---
 gradle/java-publish.gradle | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gradle/java-publish.gradle b/gradle/java-publish.gradle
index 4f77a43ac2..3839391d3a 100644
--- a/gradle/java-publish.gradle
+++ b/gradle/java-publish.gradle
@@ -170,7 +170,11 @@ model {
 	}
 }
 
-if (!version.endsWith('-SNAPSHOT') && System.getenv('JITPACK') != 'true') {
+if (System.getenv('JITPACK') == 'true') {
+	signing {
+		setRequired(false)
+	}
+} else if (!version.endsWith('-SNAPSHOT')) {
 	signing {
 		String gpg_key = decode64('ORG_GRADLE_PROJECT_gpg_key64')
 		useInMemoryPgpKeys(gpg_key, System.env['ORG_GRADLE_PROJECT_gpg_passphrase'])

From cc43cf1becc90cf964234fa00bd542c0b873d279 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 31 Jan 2023 13:47:59 -0800
Subject: [PATCH 0746/2068] Another attempt at fixing JitPack.

---
 gradle/java-publish.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/java-publish.gradle b/gradle/java-publish.gradle
index 3839391d3a..7583bbe344 100644
--- a/gradle/java-publish.gradle
+++ b/gradle/java-publish.gradle
@@ -170,7 +170,7 @@ model {
 	}
 }
 
-if (System.getenv('JITPACK') == 'true') {
+if (System.env['JITPACK'] == 'true') {
 	signing {
 		setRequired(false)
 	}

From e3f1ca4c9cd37356c8940c28814e441e78fe02c5 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 31 Jan 2023 13:59:54 -0800
Subject: [PATCH 0747/2068] Update contributing guide and changelog.

---
 CONTRIBUTING.md         | 2 +-
 plugin-maven/CHANGES.md | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 782e377d58..783f58b9af 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -207,7 +207,7 @@ If it doesn't work, you can check the JitPack log at `https://jitpack.io/com/git
 
 ### Maven
 
-Run `./gradlew publishToMavenLocal` to publish this to your local repository. The maven plugin is not published to JitPack due to [jitpack/jitpack.io#4112](https://github.com/jitpack/jitpack.io/issues/4112).
+Run `./gradlew publishToMavenLocal` to publish this to your local repository. You can also use the JitPack artifacts, using the same principles as Gradle above.
 
 ## License
 
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index c9e0f420a5..0029814ae9 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * A synthesis log with the number of considered files is added after each formatter execution ([#1507](https://github.com/diffplug/spotless/pull/1507))
+* Any commit of the Spotless maven plugin now available via JitPack ([#1547](https://github.com/diffplug/spotless/pull/1547))
 
 ## [2.31.0] - 2023-01-26
 ### Added

From a413524f4fc09814c51522897453e6dae453e0d7 Mon Sep 17 00:00:00 2001
From: Aleksey Genus <agenus@projectx019.com>
Date: Wed, 1 Feb 2023 11:47:14 +0600
Subject: [PATCH 0748/2068] Add changes to maven and gradle changelogs Add
 tests

---
 plugin-gradle/CHANGES.md                                    | 2 ++
 plugin-maven/CHANGES.md                                     | 2 ++
 testlib/src/main/resources/json/sortByKeysAfter.json        | 6 ++++++
 .../src/main/resources/json/sortByKeysAfterDisabled.json    | 6 ++++++
 testlib/src/main/resources/json/sortByKeysBefore.json       | 6 ++++++
 5 files changed, 22 insertions(+)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 49ef0adbbe..a81ee7bd93 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Changes
+* **POTENTIALLY BREAKING** `sortByKeys` for JSON formatting now takes into account objects inside arrays ([#1546](https://github.com/diffplug/spotless/pull/1546))
 
 ## [6.14.0] - 2023-01-26
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index c9e0f420a5..1ffea0faa7 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,6 +5,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * A synthesis log with the number of considered files is added after each formatter execution ([#1507](https://github.com/diffplug/spotless/pull/1507))
+### Changes
+* **POTENTIALLY BREAKING** `sortByKeys` for JSON formatting now takes into account objects inside arrays ([#1546](https://github.com/diffplug/spotless/pull/1546))
 
 ## [2.31.0] - 2023-01-26
 ### Added
diff --git a/testlib/src/main/resources/json/sortByKeysAfter.json b/testlib/src/main/resources/json/sortByKeysAfter.json
index c4a48de2f2..7a83087f1d 100644
--- a/testlib/src/main/resources/json/sortByKeysAfter.json
+++ b/testlib/src/main/resources/json/sortByKeysAfter.json
@@ -6,6 +6,12 @@
         2,
         1
     ],
+    "_objectsInArraysAreSorted": [
+        {
+            "a": "1",
+            "b": 2
+        }
+    ],
     "a": 3,
     "c": 4,
     "x": 5,
diff --git a/testlib/src/main/resources/json/sortByKeysAfterDisabled.json b/testlib/src/main/resources/json/sortByKeysAfterDisabled.json
index de7462bb98..81d81e6891 100644
--- a/testlib/src/main/resources/json/sortByKeysAfterDisabled.json
+++ b/testlib/src/main/resources/json/sortByKeysAfterDisabled.json
@@ -15,5 +15,11 @@
         3,
         2,
         1
+    ],
+    "_objectsInArraysAreSorted": [
+        {
+            "b": 2,
+            "a": "1"
+        }
     ]
 }
diff --git a/testlib/src/main/resources/json/sortByKeysBefore.json b/testlib/src/main/resources/json/sortByKeysBefore.json
index de7462bb98..81d81e6891 100644
--- a/testlib/src/main/resources/json/sortByKeysBefore.json
+++ b/testlib/src/main/resources/json/sortByKeysBefore.json
@@ -15,5 +15,11 @@
         3,
         2,
         1
+    ],
+    "_objectsInArraysAreSorted": [
+        {
+            "b": 2,
+            "a": "1"
+        }
     ]
 }

From c060599aa9c8cb2ee9ad8660cf891ec3e4765f31 Mon Sep 17 00:00:00 2001
From: Aleksey Genus <agenus@projectx019.com>
Date: Wed, 1 Feb 2023 11:48:14 +0600
Subject: [PATCH 0749/2068] Make values consistent

---
 testlib/src/main/resources/json/sortByKeysAfter.json         | 2 +-
 testlib/src/main/resources/json/sortByKeysAfterDisabled.json | 2 +-
 testlib/src/main/resources/json/sortByKeysBefore.json        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/testlib/src/main/resources/json/sortByKeysAfter.json b/testlib/src/main/resources/json/sortByKeysAfter.json
index 7a83087f1d..070904e872 100644
--- a/testlib/src/main/resources/json/sortByKeysAfter.json
+++ b/testlib/src/main/resources/json/sortByKeysAfter.json
@@ -8,7 +8,7 @@
     ],
     "_objectsInArraysAreSorted": [
         {
-            "a": "1",
+            "a": 1,
             "b": 2
         }
     ],
diff --git a/testlib/src/main/resources/json/sortByKeysAfterDisabled.json b/testlib/src/main/resources/json/sortByKeysAfterDisabled.json
index 81d81e6891..eb9e38241f 100644
--- a/testlib/src/main/resources/json/sortByKeysAfterDisabled.json
+++ b/testlib/src/main/resources/json/sortByKeysAfterDisabled.json
@@ -19,7 +19,7 @@
     "_objectsInArraysAreSorted": [
         {
             "b": 2,
-            "a": "1"
+            "a": 1
         }
     ]
 }
diff --git a/testlib/src/main/resources/json/sortByKeysBefore.json b/testlib/src/main/resources/json/sortByKeysBefore.json
index 81d81e6891..eb9e38241f 100644
--- a/testlib/src/main/resources/json/sortByKeysBefore.json
+++ b/testlib/src/main/resources/json/sortByKeysBefore.json
@@ -19,7 +19,7 @@
     "_objectsInArraysAreSorted": [
         {
             "b": 2,
-            "a": "1"
+            "a": 1
         }
     ]
 }

From a7b4da4934957d051f5da027efcd157d92aed586 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 31 Jan 2023 23:29:02 -0800
Subject: [PATCH 0750/2068] We can rely on the defaults within equoIde now.

---
 build.gradle | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7cfca1fb56..28bc589212 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,14 +5,6 @@ plugins {
 equoIde {
 	branding().title('Spotless').icon(file('_images/spotless_logo.png'))
 	welcome().openUrl('https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md')
-
-	// everything below becomes the default after https://github.com/equodev/equo-ide/pull/66
-	p2repo 'https://download.eclipse.org/eclipse/updates/4.26/'
-	install 'org.eclipse.releng.java.languages.categoryIU'
-	install 'org.eclipse.platform.ide.categoryIU'
-
-	p2repo 'https://download.eclipse.org/buildship/updates/e423/releases/3.x/3.1.6.v20220511-1359/'
-	install 'org.eclipse.buildship.feature.group'
 }
 
 repositories {

From 62ddd9eb084721f963fadd03ef235f0e1f00fa84 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Wed, 1 Feb 2023 12:30:32 +0400
Subject: [PATCH 0751/2068] Switch from WARN to DEBUG

---
 .../java/com/diffplug/spotless/maven/SpotlessApplyMojo.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
index f7f23d6d75..028cc3fb9c 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
@@ -66,7 +66,7 @@ protected void process(Iterable<File> files, Formatter formatter, UpToDateChecke
 			getLog().info(String.format("Spotless.%s is keeping %s files clean - %s were changed to be clean, %s were already clean, %s were skipped because caching determined they were already clean",
 					formatter.getName(), counter.getTotal(), counter.getCleaned(), counter.getCheckedButAlreadyClean(), counter.getSkippedAsCleanCache()));
 		} else {
-			getLog().warn(String.format("Spotless.%s has no target files. Examine your `<includes>`: https://github.com/diffplug/spotless/tree/main/plugin-maven#quickstart", formatter.getName()));
+			getLog().debug(String.format("Spotless.%s has no target files. Examine your `<includes>`: https://github.com/diffplug/spotless/tree/main/plugin-maven#quickstart", formatter.getName()));
 		}
 	}
 }

From df8fbf22848a61dd0fff91c19eaff19ca080630a Mon Sep 17 00:00:00 2001
From: Aleksey Genus <agenus@projectx019.com>
Date: Wed, 1 Feb 2023 14:36:20 +0600
Subject: [PATCH 0752/2068] Fix jackson tests

---
 .../main/resources/json/sortByKeysAfterDisabled_Simple.json   | 4 ++++
 testlib/src/main/resources/json/sortByKeysAfter_Jackson.json  | 4 ++++
 .../json/sortByKeysAfter_Jackson_spaceAfterKeySeparator.json  | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/testlib/src/main/resources/json/sortByKeysAfterDisabled_Simple.json b/testlib/src/main/resources/json/sortByKeysAfterDisabled_Simple.json
index d2d3612fbd..cd7ebc2be1 100644
--- a/testlib/src/main/resources/json/sortByKeysAfterDisabled_Simple.json
+++ b/testlib/src/main/resources/json/sortByKeysAfterDisabled_Simple.json
@@ -11,6 +11,10 @@
         "x": 5,
         "X": 2
     },
+    "_objectsInArraysAreSorted": [{
+        "a": 1,
+        "b": 2
+    }],
     "_arraysNotSorted": [
         3,
         2,
diff --git a/testlib/src/main/resources/json/sortByKeysAfter_Jackson.json b/testlib/src/main/resources/json/sortByKeysAfter_Jackson.json
index 3af39fd0fb..003b2ba66f 100644
--- a/testlib/src/main/resources/json/sortByKeysAfter_Jackson.json
+++ b/testlib/src/main/resources/json/sortByKeysAfter_Jackson.json
@@ -2,6 +2,10 @@
   "A": 1,
   "X": 2,
   "_arraysNotSorted": [ 3, 2, 1 ],
+  "_objectsInArraysAreSorted": [ {
+    "a": 1,
+    "b": 2
+  } ],
   "a": 3,
   "c": 4,
   "x": 5,
diff --git a/testlib/src/main/resources/json/sortByKeysAfter_Jackson_spaceAfterKeySeparator.json b/testlib/src/main/resources/json/sortByKeysAfter_Jackson_spaceAfterKeySeparator.json
index 3af39fd0fb..003b2ba66f 100644
--- a/testlib/src/main/resources/json/sortByKeysAfter_Jackson_spaceAfterKeySeparator.json
+++ b/testlib/src/main/resources/json/sortByKeysAfter_Jackson_spaceAfterKeySeparator.json
@@ -2,6 +2,10 @@
   "A": 1,
   "X": 2,
   "_arraysNotSorted": [ 3, 2, 1 ],
+  "_objectsInArraysAreSorted": [ {
+    "a": 1,
+    "b": 2
+  } ],
   "a": 3,
   "c": 4,
   "x": 5,

From dc9878b949b7e00058ef69d341e3824135f76640 Mon Sep 17 00:00:00 2001
From: Kostiantyn Liutovych <lutovich@gmail.com>
Date: Sat, 4 Feb 2023 14:24:18 +0100
Subject: [PATCH 0753/2068] Respect sourceDirectory/testSourceDirectory configs
 for Java formatters

---
 plugin-maven/CHANGES.md                       |   2 +
 .../spotless/maven/AbstractSpotlessMojo.java  |   2 +-
 .../spotless/maven/FormatterFactory.java      |   3 +-
 .../spotless/maven/antlr4/Antlr4.java         |   6 +-
 .../com/diffplug/spotless/maven/cpp/Cpp.java  |   6 +-
 .../spotless/maven/generic/Format.java        |   6 +-
 .../spotless/maven/groovy/Groovy.java         |   6 +-
 .../diffplug/spotless/maven/java/Java.java    |  31 +++-
 .../spotless/maven/javascript/Javascript.java |   4 +-
 .../diffplug/spotless/maven/json/Json.java    |   4 +-
 .../spotless/maven/kotlin/Kotlin.java         |   6 +-
 .../spotless/maven/markdown/Markdown.java     |   6 +-
 .../com/diffplug/spotless/maven/pom/Pom.java  |   6 +-
 .../spotless/maven/python/Python.java         |   6 +-
 .../diffplug/spotless/maven/scala/Scala.java  |   6 +-
 .../com/diffplug/spotless/maven/sql/Sql.java  |   6 +-
 .../spotless/maven/typescript/Typescript.java |   4 +-
 .../diffplug/spotless/maven/yaml/Yaml.java    |   4 +-
 .../maven/MavenIntegrationHarness.java        |  17 +-
 .../maven/MultiModuleProjectTest.java         |   2 +-
 .../maven/java/JavaDefaultIncludesTest.java   | 151 ++++++++++++++++++
 .../src/test/resources/pom-test.xml.mustache  |   1 +
 22 files changed, 250 insertions(+), 35 deletions(-)
 create mode 100644 plugin-maven/src/test/java/com/diffplug/spotless/maven/java/JavaDefaultIncludesTest.java

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 9c0b237ea3..b924c07fd6 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,6 +5,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * A synthesis log with the number of considered files is added after each formatter execution ([#1507](https://github.com/diffplug/spotless/pull/1507))
+### Fixed
+* Respect `sourceDirectory` and `testSourceDirectory` POM configurations for Java formatters ([#1553](https://github.com/diffplug/spotless/pull/1553))
 ### Changes
 * **POTENTIALLY BREAKING** `sortByKeys` for JSON formatting now takes into account objects inside arrays ([#1546](https://github.com/diffplug/spotless/pull/1546))
 * Any commit of the Spotless maven plugin now available via JitPack ([#1547](https://github.com/diffplug/spotless/pull/1547))
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
index c4082f52e0..f6aab0eabb 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
@@ -320,7 +320,7 @@ private static String withTrailingSeparator(String path) {
 
 	private Set<String> getIncludes(FormatterFactory formatterFactory) {
 		Set<String> configuredIncludes = formatterFactory.includes();
-		Set<String> includes = configuredIncludes.isEmpty() ? formatterFactory.defaultIncludes() : configuredIncludes;
+		Set<String> includes = configuredIncludes.isEmpty() ? formatterFactory.defaultIncludes(project) : configuredIncludes;
 		if (includes.isEmpty()) {
 			throw new PluginException("You must specify some files to include, such as '<includes><include>src/**/*.blah</include></includes>'");
 		}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java
index b78e987d34..c4a6663087 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java
@@ -29,6 +29,7 @@
 import java.util.stream.Collectors;
 
 import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.project.MavenProject;
 
 import com.diffplug.common.collect.Sets;
 import com.diffplug.spotless.FormatExceptionPolicyStrict;
@@ -71,7 +72,7 @@ public abstract class FormatterFactory {
 
 	private ToggleOffOn toggle;
 
-	public abstract Set<String> defaultIncludes();
+	public abstract Set<String> defaultIncludes(MavenProject project);
 
 	public abstract String licenseHeaderDelimiter();
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/antlr4/Antlr4.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/antlr4/Antlr4.java
index bc24ebcf16..a43416fb4e 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/antlr4/Antlr4.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/antlr4/Antlr4.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,8 @@
 
 import java.util.Set;
 
+import org.apache.maven.project.MavenProject;
+
 import com.diffplug.common.collect.ImmutableSet;
 import com.diffplug.spotless.antlr4.Antlr4Defaults;
 import com.diffplug.spotless.maven.FormatterFactory;
@@ -30,7 +32,7 @@
  */
 public class Antlr4 extends FormatterFactory {
 	@Override
-	public Set<String> defaultIncludes() {
+	public Set<String> defaultIncludes(MavenProject project) {
 		return ImmutableSet.of(Antlr4Defaults.includes());
 	}
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/cpp/Cpp.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/cpp/Cpp.java
index f1d07d8552..44940ae4d8 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/cpp/Cpp.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/cpp/Cpp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,8 @@
 import java.util.Collections;
 import java.util.Set;
 
+import org.apache.maven.project.MavenProject;
+
 import com.diffplug.spotless.cpp.CppDefaults;
 import com.diffplug.spotless.maven.FormatterFactory;
 import com.diffplug.spotless.maven.generic.LicenseHeader;
@@ -30,7 +32,7 @@
  */
 public class Cpp extends FormatterFactory {
 	@Override
-	public Set<String> defaultIncludes() {
+	public Set<String> defaultIncludes(MavenProject project) {
 		return Collections.emptySet();
 	}
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Format.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Format.java
index 465381fb52..a696e13ffb 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Format.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Format.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,8 @@
 import java.util.Collections;
 import java.util.Set;
 
+import org.apache.maven.project.MavenProject;
+
 import com.diffplug.spotless.maven.FormatterFactory;
 
 /**
@@ -29,7 +31,7 @@
 public class Format extends FormatterFactory {
 
 	@Override
-	public Set<String> defaultIncludes() {
+	public Set<String> defaultIncludes(MavenProject project) {
 		return Collections.emptySet();
 	}
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy/Groovy.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy/Groovy.java
index e9b3c6c412..8041b812f9 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy/Groovy.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy/Groovy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 DiffPlug
+ * Copyright 2020-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,8 @@
 
 import java.util.Set;
 
+import org.apache.maven.project.MavenProject;
+
 import com.diffplug.common.collect.ImmutableSet;
 import com.diffplug.spotless.maven.FormatterFactory;
 import com.diffplug.spotless.maven.generic.LicenseHeader;
@@ -33,7 +35,7 @@ public class Groovy extends FormatterFactory {
 	private static final String LICENSE_HEADER_DELIMITER = "package ";
 
 	@Override
-	public Set<String> defaultIncludes() {
+	public Set<String> defaultIncludes(MavenProject project) {
 		return DEFAULT_INCLUDES;
 	}
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Java.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Java.java
index 4bd018d53c..0921a838b3 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Java.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Java.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,9 +15,17 @@
  */
 package com.diffplug.spotless.maven.java;
 
+import static java.util.stream.Collectors.toSet;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Set;
+import java.util.stream.Stream;
+
+import org.apache.maven.model.Build;
+import org.apache.maven.project.MavenProject;
 
-import com.diffplug.common.collect.ImmutableSet;
 import com.diffplug.spotless.maven.FormatterFactory;
 import com.diffplug.spotless.maven.generic.LicenseHeader;
 
@@ -29,12 +37,17 @@
  */
 public class Java extends FormatterFactory {
 
-	private static final Set<String> DEFAULT_INCLUDES = ImmutableSet.of("src/main/java/**/*.java", "src/test/java/**/*.java");
 	private static final String LICENSE_HEADER_DELIMITER = "package ";
 
 	@Override
-	public Set<String> defaultIncludes() {
-		return DEFAULT_INCLUDES;
+	public Set<String> defaultIncludes(MavenProject project) {
+		Path projectDir = project.getBasedir().toPath();
+		Build build = project.getBuild();
+		return Stream.of(build.getSourceDirectory(), build.getTestSourceDirectory())
+				.map(Paths::get)
+				.map(projectDir::relativize)
+				.map(Java::fileMask)
+				.collect(toSet());
 	}
 
 	@Override
@@ -65,4 +78,12 @@ public void addRemoveUnusedImports(RemoveUnusedImports removeUnusedImports) {
 	public void addFormatAnnotations(FormatAnnotations formatAnnotations) {
 		addStepFactory(formatAnnotations);
 	}
+
+	private static String fileMask(Path path) {
+		String dir = path.toString();
+		if (!dir.endsWith(File.separator)) {
+			dir += File.separator;
+		}
+		return dir + "**" + File.separator + "*.java";
+	}
 }
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/Javascript.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/Javascript.java
index 7ca35dd258..31a5917e06 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/Javascript.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/Javascript.java
@@ -18,6 +18,8 @@
 import java.util.Collections;
 import java.util.Set;
 
+import org.apache.maven.project.MavenProject;
+
 import com.diffplug.spotless.maven.FormatterFactory;
 
 /**
@@ -27,7 +29,7 @@
  */
 public class Javascript extends FormatterFactory {
 	@Override
-	public Set<String> defaultIncludes() {
+	public Set<String> defaultIncludes(MavenProject project) {
 		return Collections.emptySet();
 	}
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java
index 852088278a..5bb7c17b3a 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java
@@ -18,6 +18,8 @@
 import java.util.Collections;
 import java.util.Set;
 
+import org.apache.maven.project.MavenProject;
+
 import com.diffplug.spotless.maven.FormatterFactory;
 
 /**
@@ -27,7 +29,7 @@ public class Json extends FormatterFactory {
 	public static final int DEFAULT_INDENTATION = 4;
 
 	@Override
-	public Set<String> defaultIncludes() {
+	public Set<String> defaultIncludes(MavenProject project) {
 		return Collections.emptySet();
 	}
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Kotlin.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Kotlin.java
index cfb0aad39e..18eb13773d 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Kotlin.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Kotlin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,8 @@
 
 import java.util.Set;
 
+import org.apache.maven.project.MavenProject;
+
 import com.diffplug.common.collect.ImmutableSet;
 import com.diffplug.spotless.maven.FormatterFactory;
 
@@ -27,7 +29,7 @@ public class Kotlin extends FormatterFactory {
 	private static final Set<String> DEFAULT_INCLUDES = ImmutableSet.of("src/main/kotlin/**/*.kt", "src/test/kotlin/**/*.kt");
 
 	@Override
-	public Set<String> defaultIncludes() {
+	public Set<String> defaultIncludes(MavenProject project) {
 		return DEFAULT_INCLUDES;
 	}
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/markdown/Markdown.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/markdown/Markdown.java
index 2ba9b1f58f..0941beb76a 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/markdown/Markdown.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/markdown/Markdown.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2021-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,8 @@
 import java.util.Collections;
 import java.util.Set;
 
+import org.apache.maven.project.MavenProject;
+
 import com.diffplug.spotless.maven.FormatterFactory;
 import com.diffplug.spotless.maven.generic.LicenseHeader;
 
@@ -29,7 +31,7 @@
  */
 public class Markdown extends FormatterFactory {
 	@Override
-	public Set<String> defaultIncludes() {
+	public Set<String> defaultIncludes(MavenProject project) {
 		return Collections.emptySet();
 	}
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/pom/Pom.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/pom/Pom.java
index f083a17c89..9a4d3eea06 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/pom/Pom.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/pom/Pom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2021-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,8 @@
 
 import java.util.Set;
 
+import org.apache.maven.project.MavenProject;
+
 import com.diffplug.common.collect.ImmutableSet;
 import com.diffplug.spotless.maven.FormatterFactory;
 import com.diffplug.spotless.maven.generic.LicenseHeader;
@@ -29,7 +31,7 @@
  */
 public class Pom extends FormatterFactory {
 	@Override
-	public Set<String> defaultIncludes() {
+	public Set<String> defaultIncludes(MavenProject project) {
 		return ImmutableSet.of("pom.xml");
 	}
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/python/Python.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/python/Python.java
index 09443f070b..df7348c16c 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/python/Python.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/python/Python.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2021-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,8 @@
 import java.util.Collections;
 import java.util.Set;
 
+import org.apache.maven.project.MavenProject;
+
 import com.diffplug.spotless.maven.FormatterFactory;
 import com.diffplug.spotless.maven.generic.LicenseHeader;
 
@@ -30,7 +32,7 @@
 public class Python extends FormatterFactory {
 
 	@Override
-	public Set<String> defaultIncludes() {
+	public Set<String> defaultIncludes(MavenProject project) {
 		return Collections.emptySet();
 	}
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/scala/Scala.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/scala/Scala.java
index 423ca71930..7a9e455f5f 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/scala/Scala.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/scala/Scala.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,8 @@
 
 import java.util.Set;
 
+import org.apache.maven.project.MavenProject;
+
 import com.diffplug.common.collect.ImmutableSet;
 import com.diffplug.spotless.maven.FormatterFactory;
 import com.diffplug.spotless.maven.generic.LicenseHeader;
@@ -34,7 +36,7 @@ public class Scala extends FormatterFactory {
 	private static final String LICENSE_HEADER_DELIMITER = "package ";
 
 	@Override
-	public Set<String> defaultIncludes() {
+	public Set<String> defaultIncludes(MavenProject project) {
 		return DEFAULT_INCLUDES;
 	}
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/sql/Sql.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/sql/Sql.java
index c49ac074d9..64ebcb55d7 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/sql/Sql.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/sql/Sql.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 DiffPlug
+ * Copyright 2020-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,8 @@
 import java.util.Collections;
 import java.util.Set;
 
+import org.apache.maven.project.MavenProject;
+
 import com.diffplug.spotless.maven.FormatterFactory;
 
 /**
@@ -27,7 +29,7 @@
  */
 public class Sql extends FormatterFactory {
 	@Override
-	public Set<String> defaultIncludes() {
+	public Set<String> defaultIncludes(MavenProject project) {
 		return Collections.emptySet();
 	}
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Typescript.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Typescript.java
index 6f0d7f91b2..6ba45ab719 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Typescript.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Typescript.java
@@ -18,6 +18,8 @@
 import java.util.Collections;
 import java.util.Set;
 
+import org.apache.maven.project.MavenProject;
+
 import com.diffplug.spotless.maven.FormatterFactory;
 
 /**
@@ -27,7 +29,7 @@
  */
 public class Typescript extends FormatterFactory {
 	@Override
-	public Set<String> defaultIncludes() {
+	public Set<String> defaultIncludes(MavenProject project) {
 		return Collections.emptySet();
 	}
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/Yaml.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/Yaml.java
index a6ceaaa592..e22f6d40ce 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/Yaml.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/Yaml.java
@@ -18,6 +18,8 @@
 import java.util.Collections;
 import java.util.Set;
 
+import org.apache.maven.project.MavenProject;
+
 import com.diffplug.spotless.maven.FormatterFactory;
 
 /**
@@ -25,7 +27,7 @@
  */
 public class Yaml extends FormatterFactory {
 	@Override
-	public Set<String> defaultIncludes() {
+	public Set<String> defaultIncludes(MavenProject project) {
 		return Collections.emptySet();
 	}
 
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
index f4e94e573c..fdc4a745a1 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
@@ -54,7 +54,9 @@ public class MavenIntegrationHarness extends ResourceHarness {
 	 */
 	private static final String SPOTLESS_MAVEN_VERSION_IDE = null;
 
+	private static final String POM_TEMPLATE = "/pom-test.xml.mustache";
 	private static final String SPOTLESS_MAVEN_PLUGIN_VERSION = "spotlessMavenPluginVersion";
+	private static final String BUILD = "build";
 	private static final String CONFIGURATION = "configuration";
 	private static final String EXECUTIONS = "executions";
 	private static final String MODULES = "modules";
@@ -209,11 +211,11 @@ protected MavenRunner mavenRunnerWithRemoteDebug() throws IOException {
 	}
 
 	protected String createPomXmlContent(String pluginVersion, String[] executions, String[] configuration, String[] dependencies, String[] plugins) throws IOException {
-		return createPomXmlContent("/pom-test.xml.mustache", pluginVersion, executions, configuration, dependencies, plugins);
+		return createPomXmlContent(POM_TEMPLATE, pluginVersion, executions, configuration, dependencies, plugins);
 	}
 
 	protected String createPomXmlContent(String pomTemplate, String pluginVersion, String[] executions, String[] configuration, String[] dependencies, String[] plugins) throws IOException {
-		Map<String, Object> params = buildPomXmlParams(pluginVersion, executions, configuration, null, dependencies, plugins);
+		Map<String, Object> params = buildPomXmlParams(pluginVersion, null, executions, configuration, null, dependencies, plugins);
 		return createPomXmlContent(pomTemplate, params);
 	}
 
@@ -221,6 +223,11 @@ protected String createPomXmlContent(String pluginVersion, String[] executions,
 		return createPomXmlContent(pluginVersion, executions, configuration, null, null);
 	}
 
+	protected String createPomXmlContent(String[] build, String[] configuration) throws IOException {
+		Map<String, Object> params = buildPomXmlParams(null, build, null, configuration, null, null, null);
+		return createPomXmlContent(POM_TEMPLATE, params);
+	}
+
 	protected String createPomXmlContent(String pomTemplate, Map<String, Object> params) throws IOException {
 		URL url = MavenIntegrationHarness.class.getResource(pomTemplate);
 		try (BufferedReader reader = Resources.asCharSource(url, StandardCharsets.UTF_8).openBufferedStream()) {
@@ -231,10 +238,14 @@ protected String createPomXmlContent(String pomTemplate, Map<String, Object> par
 		}
 	}
 
-	protected static Map<String, Object> buildPomXmlParams(String pluginVersion, String[] executions, String[] configuration, String[] modules, String[] dependencies, String[] plugins) {
+	protected static Map<String, Object> buildPomXmlParams(String pluginVersion, String[] build, String[] executions, String[] configuration, String[] modules, String[] dependencies, String[] plugins) {
 		Map<String, Object> params = new HashMap<>();
 		params.put(SPOTLESS_MAVEN_PLUGIN_VERSION, pluginVersion == null ? getSystemProperty(SPOTLESS_MAVEN_PLUGIN_VERSION) : pluginVersion);
 
+		if (build != null) {
+			params.put(BUILD, String.join("\n", build));
+		}
+
 		if (configuration != null) {
 			params.put(CONFIGURATION, String.join("\n", configuration));
 		}
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MultiModuleProjectTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MultiModuleProjectTest.java
index 6206affc04..1c9521c402 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MultiModuleProjectTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MultiModuleProjectTest.java
@@ -145,7 +145,7 @@ private void createRootPom() throws IOException {
 			modulesList.addAll(subProjects.keySet());
 			String[] modules = modulesList.toArray(new String[0]);
 
-			Map<String, Object> rootPomParams = buildPomXmlParams(null, null, configuration, modules, null, null);
+			Map<String, Object> rootPomParams = buildPomXmlParams(null, null, null, configuration, modules, null, null);
 			setFile("pom.xml").toContent(createPomXmlContent("/multi-module/pom-parent.xml.mustache", rootPomParams));
 		}
 
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/JavaDefaultIncludesTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/JavaDefaultIncludesTest.java
new file mode 100644
index 0000000000..57f717ad07
--- /dev/null
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/JavaDefaultIncludesTest.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.java;
+
+import java.io.IOException;
+import java.util.Arrays;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import com.diffplug.spotless.maven.MavenIntegrationHarness;
+
+public class JavaDefaultIncludesTest extends MavenIntegrationHarness {
+
+	private static final String UNFORMATTED = "java/removeunusedimports/JavaCodeWithPackageUnformatted.test";
+	private static final String FORMATTED = "java/removeunusedimports/JavaCodeWithPackageFormatted.test";
+
+	private static final String FILE_1 = "src/main/java/com/diffplug/spotless/One.java";
+	private static final String FILE_2 = "src/test/java/com/diffplug/spotless/Two.java";
+	private static final String FILE_3 = "src/com/diffplug/spotless/Three.java";
+	private static final String FILE_4 = "test/com/diffplug/spotless/Four.java";
+	private static final String FILE_5 = "foo/bar/Five.java";
+
+	@BeforeEach
+	void beforeEach() {
+		for (String file : Arrays.asList(FILE_1, FILE_2, FILE_3, FILE_4, FILE_5)) {
+			setFile(file).toResource(UNFORMATTED);
+		}
+	}
+
+	@Test
+	void noCustomConfiguration() throws Exception {
+		writePomWithBuildConfiguration();
+
+		mavenRunner().withArguments("spotless:apply").runNoError();
+
+		// Files 1, 2 are formatted because they live under default Maven source & test source dirs
+		assertFile(FILE_1).sameAsResource(FORMATTED);
+		assertFile(FILE_2).sameAsResource(FORMATTED);
+
+		// Files 3, 4, 5 are not formatted because they live outside default Maven source & test source dirs
+		assertFile(FILE_3).sameAsResource(UNFORMATTED);
+		assertFile(FILE_4).sameAsResource(UNFORMATTED);
+		assertFile(FILE_5).sameAsResource(UNFORMATTED);
+	}
+
+	@Test
+	void customSourceDirConfiguration() throws Exception {
+		writePomWithBuildConfiguration("<sourceDirectory>src</sourceDirectory>");
+
+		mavenRunner().withArguments("spotless:apply").runNoError();
+
+		// Files 1, 2, 3 are formatted because they live under the custom-configured source dir
+		assertFile(FILE_1).sameAsResource(FORMATTED);
+		assertFile(FILE_2).sameAsResource(FORMATTED);
+		assertFile(FILE_3).sameAsResource(FORMATTED);
+
+		// File 4, 5 are not formatted because they live outside the custom-configured source dir and default test source dir
+		assertFile(FILE_4).sameAsResource(UNFORMATTED);
+		assertFile(FILE_5).sameAsResource(UNFORMATTED);
+	}
+
+	@Test
+	void customTestSourceDirConfiguration() throws Exception {
+		writePomWithBuildConfiguration("<testSourceDirectory>test</testSourceDirectory>");
+
+		mavenRunner().withArguments("spotless:apply").runNoError();
+
+		// File 1 is formatted because it lives under the default source dir
+		assertFile(FILE_1).sameAsResource(FORMATTED);
+		// File 4 is formatted because it lives under the custom-configured test source dir
+		assertFile(FILE_4).sameAsResource(FORMATTED);
+
+		// Files 2, 3, 5 are not formatted because they live outside the default source dir and custom-configured test source dir
+		assertFile(FILE_2).sameAsResource(UNFORMATTED);
+		assertFile(FILE_3).sameAsResource(UNFORMATTED);
+		assertFile(FILE_5).sameAsResource(UNFORMATTED);
+	}
+
+	@Test
+	void customSourceDirAndTestSourceDirConfiguration() throws Exception {
+		writePomWithBuildConfiguration(
+				"<sourceDirectory>src</sourceDirectory>",
+				"<testSourceDirectory>test</testSourceDirectory>");
+
+		mavenRunner().withArguments("spotless:apply").runNoError();
+
+		// Files 1, 2, 3, 4 are formatted because they live under custom-configured source and test source dirs
+		assertFile(FILE_1).sameAsResource(FORMATTED);
+		assertFile(FILE_2).sameAsResource(FORMATTED);
+		assertFile(FILE_3).sameAsResource(FORMATTED);
+		assertFile(FILE_4).sameAsResource(FORMATTED);
+
+		// File 5 is not formatted because it lives outside custom-configured source and test source dirs
+		assertFile(FILE_5).sameAsResource(UNFORMATTED);
+	}
+
+	@Test
+	void sameCustomSourceDirAndTestSourceDirConfiguration() throws Exception {
+		writePomWithBuildConfiguration(
+				"<sourceDirectory>foo/bar</sourceDirectory>",
+				"<testSourceDirectory>foo/bar</testSourceDirectory>");
+
+		mavenRunner().withArguments("spotless:apply").runNoError();
+
+		// Files 1, 2, 3, 4 are not formatted because they live outside custom-configured source and test source dirs
+		assertFile(FILE_1).sameAsResource(UNFORMATTED);
+		assertFile(FILE_2).sameAsResource(UNFORMATTED);
+		assertFile(FILE_3).sameAsResource(UNFORMATTED);
+		assertFile(FILE_4).sameAsResource(UNFORMATTED);
+
+		// File 5 is formatted because it lives under the custom-configured source/test source dir
+		assertFile(FILE_5).sameAsResource(FORMATTED);
+	}
+
+	@Test
+	void nestedCustomSourceDirAndTestSourceDirConfiguration() throws Exception {
+		writePomWithBuildConfiguration(
+				"<sourceDirectory>foo</sourceDirectory>",
+				"<testSourceDirectory>foo/bar</testSourceDirectory>");
+
+		mavenRunner().withArguments("spotless:apply").runNoError();
+
+		// Files 1, 2, 3, 4 are not formatted because they live outside custom-configured source and test source dirs
+		assertFile(FILE_1).sameAsResource(UNFORMATTED);
+		assertFile(FILE_2).sameAsResource(UNFORMATTED);
+		assertFile(FILE_3).sameAsResource(UNFORMATTED);
+		assertFile(FILE_4).sameAsResource(UNFORMATTED);
+
+		// File 5 is formatted because it lives under the custom-configured source/test source dir
+		assertFile(FILE_5).sameAsResource(FORMATTED);
+	}
+
+	private void writePomWithBuildConfiguration(String... build) throws IOException {
+		String xml = createPomXmlContent(build, new String[]{"<java>", "<removeUnusedImports/>", "</java>"});
+		setFile("pom.xml").toContent(xml);
+	}
+}
diff --git a/plugin-maven/src/test/resources/pom-test.xml.mustache b/plugin-maven/src/test/resources/pom-test.xml.mustache
index 6db3cb0c15..f87e8c1a3e 100644
--- a/plugin-maven/src/test/resources/pom-test.xml.mustache
+++ b/plugin-maven/src/test/resources/pom-test.xml.mustache
@@ -20,6 +20,7 @@
     </properties>
 
     <build>
+        {{{build}}}
         <plugins>
             {{{plugins}}}
             <plugin>

From 6d3862c702dd522fbb5f989a670b03720f8a49d9 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 5 Feb 2023 01:07:51 -0800
Subject: [PATCH 0754/2068] Use the latest JScriptBox on Java 15+

---
 .../main/java/com/diffplug/spotless/markdown/FreshMarkStep.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/src/main/java/com/diffplug/spotless/markdown/FreshMarkStep.java b/lib/src/main/java/com/diffplug/spotless/markdown/FreshMarkStep.java
index fca5ac39a4..4477c640c7 100644
--- a/lib/src/main/java/com/diffplug/spotless/markdown/FreshMarkStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/markdown/FreshMarkStep.java
@@ -66,6 +66,7 @@ public static FormatterStep create(String version, Supplier<Map<String, ?>> prop
 		List<String> mavenCoordinates = new ArrayList<>();
 		mavenCoordinates.add(MAVEN_COORDINATE + version);
 		if (Jvm.version() >= 15) {
+			mavenCoordinates.add("com.diffplug.jscriptbox:jscriptbox:3.0.1");
 			mavenCoordinates.add(NASHORN_MAVEN_COORDINATE + NASHORN_VERSION);
 		}
 

From e9d72aa093a70a8ed66d71aa8625394fa4d0f147 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 5 Feb 2023 01:13:31 -0800
Subject: [PATCH 0755/2068] Update changelogs.

---
 CHANGES.md               | 2 ++
 plugin-gradle/CHANGES.md | 3 ++-
 plugin-maven/CHANGES.md  | 1 -
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 72a4b99e93..c8add05b6a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,7 +12,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changes
 * **POTENTIALLY BREAKING** Bump bytecode from Java 8 to 11 ([#1530](https://github.com/diffplug/spotless/pull/1530) part 2 of [#1337](https://github.com/diffplug/spotless/issues/1337))
+### Fixed
 * **POTENTIALLY BREAKING** `sortByKeys` for JSON formatting now takes into account objects inside arrays ([#1546](https://github.com/diffplug/spotless/pull/1546))
+* `freshmark` fixed on java 15+ ([#1304](https://github.com/diffplug/spotless/pull/1304) fixes [#803](https://github.com/diffplug/spotless/issues/803))
 
 ## [2.34.0] - 2023-01-26
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index a81ee7bd93..fef2c71346 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,7 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
-### Changes
+### Fixed
+* `freshmark` fixed on java 15+ ([#1304](https://github.com/diffplug/spotless/pull/1304) fixes [#803](https://github.com/diffplug/spotless/issues/803))
 * **POTENTIALLY BREAKING** `sortByKeys` for JSON formatting now takes into account objects inside arrays ([#1546](https://github.com/diffplug/spotless/pull/1546))
 
 ## [6.14.0] - 2023-01-26
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index b924c07fd6..d498b868c7 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -7,7 +7,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * A synthesis log with the number of considered files is added after each formatter execution ([#1507](https://github.com/diffplug/spotless/pull/1507))
 ### Fixed
 * Respect `sourceDirectory` and `testSourceDirectory` POM configurations for Java formatters ([#1553](https://github.com/diffplug/spotless/pull/1553))
-### Changes
 * **POTENTIALLY BREAKING** `sortByKeys` for JSON formatting now takes into account objects inside arrays ([#1546](https://github.com/diffplug/spotless/pull/1546))
 * Any commit of the Spotless maven plugin now available via JitPack ([#1547](https://github.com/diffplug/spotless/pull/1547))
 

From 0252904844cbd3a182f9668c49073b809aee97ab Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az344-618.gmg1d1ggmrrupiaxmptgzqcbbf.gx.internal.cloudapp.net>
Date: Sun, 5 Feb 2023 16:46:18 +0000
Subject: [PATCH 0756/2068] Published lib/2.34.1

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index c8add05b6a..5f1a1ffa9f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.34.1] - 2023-02-05
 ### Changes
 * **POTENTIALLY BREAKING** Bump bytecode from Java 8 to 11 ([#1530](https://github.com/diffplug/spotless/pull/1530) part 2 of [#1337](https://github.com/diffplug/spotless/issues/1337))
 ### Fixed

From 2fece0442035a72fc3be978d47dca483e8d02b2c Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az344-618.gmg1d1ggmrrupiaxmptgzqcbbf.gx.internal.cloudapp.net>
Date: Sun, 5 Feb 2023 16:48:11 +0000
Subject: [PATCH 0757/2068] Published gradle/6.14.1

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 50 ++++++++++++++++++++--------------------
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index fef2c71346..e3234584b8 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [6.14.1] - 2023-02-05
 ### Fixed
 * `freshmark` fixed on java 15+ ([#1304](https://github.com/diffplug/spotless/pull/1304) fixes [#803](https://github.com/diffplug/spotless/issues/803))
 * **POTENTIALLY BREAKING** `sortByKeys` for JSON formatting now takes into account objects inside arrays ([#1546](https://github.com/diffplug/spotless/pull/1546))
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 6a56d26e20..f61280bc7e 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -14,9 +14,9 @@ output = [
   ].join('\n');
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
-[![Changelog](https://img.shields.io/badge/changelog-6.14.0-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-6.14.1-blue.svg)](CHANGES.md)
 [![Maven central](https://img.shields.io/badge/mavencentral-here-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/index.html)
 
 [![VS Code plugin](https://img.shields.io/badge/IDE-VS_Code-blueviolet.svg)](https://marketplace.visualstudio.com/items?itemName=richardwillis.vscode-spotless-gradle)
 [![IntelliJ plugin](https://img.shields.io/badge/IDE-IntelliJ-blueviolet.svg)](https://plugins.jetbrains.com/plugin/18321-spotless-gradle)
@@ -123,10 +123,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -138,7 +138,7 @@ If you're stuck on an older version of Gradle, `id 'com.diffplug.gradle.spotless
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -262,8 +262,8 @@ You can make a pull request to add new annotations to Spotless's default list.
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -314,8 +314,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -386,7 +386,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -418,7 +418,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -450,7 +450,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -484,7 +484,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -505,7 +505,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -530,7 +530,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -570,7 +570,7 @@ sql.formatter.indent.size=4
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -662,7 +662,7 @@ For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#n
 
 ## Javascript
 
-- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
+- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
 
 ```gradle
 spotless {
@@ -726,7 +726,7 @@ For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#n
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -801,7 +801,7 @@ spotless {
 
 ## YAML
 
-- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
+- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
 
 ```gradle
 spotless {
@@ -1014,7 +1014,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -1087,9 +1087,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -1122,11 +1122,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From 8d99d7dc44b75fbfbcd25a2550332a11f40219cc Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az344-618.gmg1d1ggmrrupiaxmptgzqcbbf.gx.internal.cloudapp.net>
Date: Sun, 5 Feb 2023 16:50:20 +0000
Subject: [PATCH 0758/2068] Published maven/2.32.0

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index d498b868c7..567d880f4f 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.32.0] - 2023-02-05
 ### Added
 * A synthesis log with the number of considered files is added after each formatter execution ([#1507](https://github.com/diffplug/spotless/pull/1507))
 ### Fixed
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 73402cd929..0787150ee1 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -8,8 +8,8 @@ output = [
   ].join('\n');
 -->
 [![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Changelog](https://img.shields.io/badge/changelog-2.31.0-blue.svg)](CHANGES.md)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.31.0/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.32.0-blue.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.32.0/index.html)
 <!---freshmark /shields -->
 
 <!---freshmark javadoc

From e19c1562cc6ca96300ecd9e5b4aac100cccf5184 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 5 Feb 2023 09:02:28 -0800
Subject: [PATCH 0759/2068] Adopt latest spotless, and enable freshmark on all
 JRE versions thanks to #1304.

---
 gradle/spotless-freshmark.gradle | 26 --------------------------
 settings.gradle                  |  2 +-
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/gradle/spotless-freshmark.gradle b/gradle/spotless-freshmark.gradle
index 30c5ab6306..2a79ab01ba 100644
--- a/gradle/spotless-freshmark.gradle
+++ b/gradle/spotless-freshmark.gradle
@@ -1,30 +1,4 @@
 
-import java.util.regex.Matcher
-import java.util.regex.Pattern
-
-
-def thisVm() {
-	String jre = System.getProperty("java.version")
-	if (jre.startsWith("1.8")) {
-		return 8
-	} else {
-		Matcher matcher = Pattern.compile("(\\d+)").matcher(jre)
-		if (!matcher.find()) {
-			throw new IllegalArgumentException("Expected " + jre + " to start with an integer")
-		}
-		int version = Integer.parseInt(matcher.group(1))
-		if (version <= 8) {
-			throw new IllegalArgumentException("Expected " + jre + " to start with an integer greater than 8")
-		}
-		return version
-	}
-}
-
-if (thisVm() >= 15) {
-	// freshmark doesn't run on JRE 15+
-	return
-}
-
 apply plugin: 'com.diffplug.spotless'
 
 import com.diffplug.gradle.spotless.FreshMarkExtension
diff --git a/settings.gradle b/settings.gradle
index 9573775884..077fdd9336 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-	id 'com.diffplug.spotless' version '6.14.0' apply false
+	id 'com.diffplug.spotless' version '6.14.1' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
 	id 'com.gradle.plugin-publish' version '1.1.0' apply false
 	// https://github.com/gradle-nexus/publish-plugin/releases

From e116860449a4a2e60a745510bde296f780ffb913 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Sun, 5 Feb 2023 22:20:30 +0400
Subject: [PATCH 0760/2068] Switch from System.err to SLF4J

---
 .../spotless/extra/GitAttributesLineEndings.java      | 11 +++++++----
 .../diffplug/spotless/generic/LicenseHeaderStep.java  |  7 ++++++-
 .../java/com/diffplug/spotless/java/ModuleHelper.java | 11 ++++++++---
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
index c4ca8edacb..fb54be4ba0 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,6 +42,8 @@
 import org.eclipse.jgit.storage.file.FileBasedConfig;
 import org.eclipse.jgit.util.FS;
 import org.eclipse.jgit.util.SystemReader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.googlecode.concurrenttrees.radix.ConcurrentRadixTree;
 import com.googlecode.concurrenttrees.radix.node.concrete.DefaultCharSequenceNodeFactory;
@@ -61,6 +63,8 @@
  * back to the platform native.
  */
 public final class GitAttributesLineEndings {
+	private static final Logger LOGGER = LoggerFactory.getLogger(GitAttributesLineEndings.class);
+
 	// prevent direct instantiation
 	private GitAttributesLineEndings() {}
 
@@ -261,7 +265,7 @@ private static String convertEolToLineEnding(String eol, File file) {
 			case "crlf":
 				return LineEnding.WINDOWS.str();
 			default:
-				System.err.println(".gitattributes file has unspecified eol value: " + eol + " for " + file + ", defaulting to platform native");
+				LOGGER.warn(".gitattributes file has unspecified eol value: {} for {}, defaulting to platform native", eol, file);
 				return LineEnding.PLATFORM_NATIVE.str();
 			}
 		}
@@ -341,8 +345,7 @@ private static List<AttributesRule> parseRules(@Nullable File file) {
 				return parsed.getRules();
 			} catch (IOException e) {
 				// no need to crash the whole plugin
-				System.err.println("Problem parsing " + file.getAbsolutePath());
-				e.printStackTrace();
+				LOGGER.warn("Problem parsing {}", file.getAbsolutePath(), e);
 			}
 		}
 		return Collections.emptyList();
diff --git a/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java b/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
index 46312ca07a..b4c0cf2a6f 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
@@ -31,6 +31,9 @@
 
 import javax.annotation.Nullable;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.diffplug.spotless.FileSignature;
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
@@ -42,6 +45,8 @@
 
 /** Prefixes a license header before the package statement. */
 public final class LicenseHeaderStep {
+	private static final Logger LOGGER = LoggerFactory.getLogger(LicenseHeaderStep.class);
+
 	public enum YearMode {
 		PRESERVE, UPDATE_TO_TODAY, SET_FROM_GIT
 	}
@@ -381,7 +386,7 @@ private String calculateYearBySearching(String content) {
 					}
 				}
 			} else {
-				System.err.println("Can't parse copyright year '" + content + "', defaulting to " + yearToday);
+				LOGGER.warn("Can't parse copyright year '{}', defaulting to {}", content, yearToday);
 				// couldn't recognize the year format
 				return yearToday;
 			}
diff --git a/lib/src/main/java/com/diffplug/spotless/java/ModuleHelper.java b/lib/src/main/java/com/diffplug/spotless/java/ModuleHelper.java
index 415c58d69b..829d9c67d0 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/ModuleHelper.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/ModuleHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,12 +28,17 @@
 
 import javax.annotation.Nullable;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.diffplug.spotless.Jvm;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import sun.misc.Unsafe;
 
 final class ModuleHelper {
+	private static final Logger LOGGER = LoggerFactory.getLogger(ModuleHelper.class);
+
 	// prevent direct instantiation
 	private ModuleHelper() {}
 
@@ -66,11 +71,11 @@ public static synchronized void doOpenInternalPackagesIfRequired() {
 					for (String name : failedToOpen) {
 						message.append(String.format("--add-opens jdk.compiler/%s=ALL-UNNAMED", name));
 					}
-					System.err.println(message);
+					LOGGER.warn("{}", message);
 				}
 			}
 		} catch (Throwable e) {
-			System.err.println("WARNING: Failed to check for unavailable JDK packages. Reason: " + e.getMessage());
+			LOGGER.error("WARNING: Failed to check for unavailable JDK packages.", e);
 		}
 	}
 

From 46cb7e64a441c54824c4af99018f1cc845bde59d Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Sun, 5 Feb 2023 22:26:14 +0400
Subject: [PATCH 0761/2068] Fix typo in error msg

---
 lib/src/main/java/com/diffplug/spotless/java/ModuleHelper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/ModuleHelper.java b/lib/src/main/java/com/diffplug/spotless/java/ModuleHelper.java
index 829d9c67d0..e05a6a8b7f 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/ModuleHelper.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/ModuleHelper.java
@@ -75,7 +75,7 @@ public static synchronized void doOpenInternalPackagesIfRequired() {
 				}
 			}
 		} catch (Throwable e) {
-			LOGGER.error("WARNING: Failed to check for unavailable JDK packages.", e);
+			LOGGER.error("WARNING: Failed to check for available JDK packages.", e);
 		}
 	}
 

From ec4bb0ad20298f4b0d05d5fbe82e79276b34cf5c Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 5 Feb 2023 15:42:06 -0800
Subject: [PATCH 0762/2068] Fix a long-broken package-info that somehow only
 the Eclipse compiler noticed.

---
 lib/src/main/java/com/diffplug/spotless/json/package-info.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/json/package-info.java b/lib/src/main/java/com/diffplug/spotless/json/package-info.java
index 0d62356d77..625de57180 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/package-info.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/package-info.java
@@ -1,6 +1,6 @@
 @ParametersAreNonnullByDefault
 @ReturnValuesAreNonnullByDefault
-package com.diffplug.spotless.extra.json.java;
+package com.diffplug.spotless.json;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 

From 7ea0f3ab07acee00c4ece3bb2f8af0c9810dcc23 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Mon, 6 Feb 2023 10:00:28 +0400
Subject: [PATCH 0763/2068] Add custom JDK version

---
 lib/build.gradle                              |  5 +-
 .../java/JavaCleanthatRefactorerFunc.java     | 12 +++--
 .../spotless/java/CleanthatStepFactory.java   |  4 ++
 .../spotless/maven/java/CleanthatJava.java    | 53 +++++++++++++++++++
 4 files changed, 69 insertions(+), 5 deletions(-)
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/java/CleanthatJava.java

diff --git a/lib/build.gradle b/lib/build.gradle
index 9d95007bc1..9918e4c330 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -16,7 +16,8 @@ def NEEDS_GLUE = [
 	'diktat',
 	'scalafmt',
 	'jackson',
-	'gson'
+	'gson',
+	'cleanthat'
 ]
 for (glue in NEEDS_GLUE) {
 	sourceSets.register(glue) {
@@ -100,6 +101,8 @@ dependencies {
 	flexmarkCompileOnly 'com.vladsch.flexmark:flexmark-all:0.62.2'
 
 	gsonCompileOnly 'com.google.code.gson:gson:2.10.1'
+
+	cleanthatCompileOnly 'io.github.solven-eu.cleanthat:java:2.0-SNAPSHOT'
 }
 
 // we'll hold the core lib to a high standard
diff --git a/lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java b/lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java
index bc96f0019b..e114234b3f 100644
--- a/lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java
+++ b/lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 Solven
+ * Copyright 2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,10 +27,12 @@
 import java.util.List;
 
 public class JavaCleanthatRefactorerFunc implements FormatterFunc {
+	private String jdkVersion;
 	private List<String> included;
 	private List<String> excluded;
 
-	public JavaCleanthatRefactorerFunc(List<String> included, List<String> excluded) {
+	public JavaCleanthatRefactorerFunc(String jdkVersion, List<String> included, List<String> excluded) {
+		this.jdkVersion=jdkVersion == null ? IJdkVersionsConstant.JDK8 : jdkVersion;
 		this.included = included == null ? Collections.emptyList() : included;
 		this.excluded = excluded == null ? Collections.emptyList() : excluded;
 	}
@@ -41,16 +43,18 @@ public JavaCleanthatRefactorerFunc() {
 
 	@Override
 	public String apply(String input) throws Exception {
+		CleanthatEngineProperties engineProperties = CleanthatEngineProperties.builder().engineVersion(jdkVersion).build();
+
 		JavaRefactorerProperties refactorerProperties = new JavaRefactorerProperties();
 
 		refactorerProperties.setIncluded(included);
 		refactorerProperties.setExcluded(excluded);
 
 		JavaRefactorer refactorer =
-				new JavaRefactorer(CleanthatEngineProperties.builder().build(), refactorerProperties);
+				new JavaRefactorer(engineProperties, refactorerProperties);
 
 		// Spotless calls steps always with LF eol.
-		return refactorer.doFormat(new PathAndContent(Paths.get("fake"), input), LineEnding.LF);
+		return refactorer.doFormat(input, LineEnding.LF);
 	}
 
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/java/CleanthatStepFactory.java b/lib/src/main/java/com/diffplug/spotless/java/CleanthatStepFactory.java
index fa9936fb1e..2167052ff4 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/CleanthatStepFactory.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/CleanthatStepFactory.java
@@ -85,6 +85,10 @@ public static String defaultVersion() {
 		return JVM_SUPPORT.getRecommendedFormatterVersion();
 	}
 
+	public static String defaultGroupArtifact() {
+		return MAVEN_COORDINATE;
+	}
+
 	static final class JavaRulesState implements Serializable {
 		private static final long serialVersionUID = 1L;
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/CleanthatJava.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/CleanthatJava.java
new file mode 100644
index 0000000000..661dd7874f
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/CleanthatJava.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2016-2021 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.java;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.java.CleanthatStepFactory;
+import com.diffplug.spotless.java.GoogleJavaFormatStep;
+import com.diffplug.spotless.maven.FormatterStepConfig;
+import com.diffplug.spotless.maven.FormatterStepFactory;
+
+import org.apache.maven.plugins.annotations.Parameter;
+
+import java.util.List;
+
+public class CleanthatJava implements FormatterStepFactory {
+	@Parameter
+	private String groupArtifact;
+
+	@Parameter
+	private String version;
+
+	@Parameter
+	private List<String> mutators;
+
+	@Parameter
+	private List<String> excludedMutators;
+
+	@Override
+	public FormatterStep newFormatterStep(FormatterStepConfig config) {
+		String groupArtifact = this.groupArtifact != null ? this.groupArtifact : CleanthatStepFactory.defaultGroupArtifact();
+		String version = this.version != null ? this.version : CleanthatStepFactory.defaultVersion();
+
+		JavaRe
+		boolean reflowLongStrings = this.reflowLongStrings != null ? this.reflowLongStrings : GoogleJavaFormatStep.defaultReflowLongStrings();
+		return CleanthatStepFactory.create(groupArtifact, version, style, config.getProvisioner(), reflowLongStrings);
+	}
+
+	private static String defaultVersion() {
+	}
+}

From 2ebea99432e232ca73d8866703a93dbd97560bac Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Mon, 6 Feb 2023 11:49:58 +0400
Subject: [PATCH 0764/2068] Skip signature on SNAPSHOT

---
 gradle/java-publish.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/java-publish.gradle b/gradle/java-publish.gradle
index 7583bbe344..2eb877c429 100644
--- a/gradle/java-publish.gradle
+++ b/gradle/java-publish.gradle
@@ -170,11 +170,11 @@ model {
 	}
 }
 
-if (System.env['JITPACK'] == 'true') {
+if (System.env['JITPACK'] == 'true' || version.endsWith('-SNAPSHOT')) {
 	signing {
 		setRequired(false)
 	}
-} else if (!version.endsWith('-SNAPSHOT')) {
+} else {
 	signing {
 		String gpg_key = decode64('ORG_GRADLE_PROJECT_gpg_key64')
 		useInMemoryPgpKeys(gpg_key, System.env['ORG_GRADLE_PROJECT_gpg_passphrase'])

From 64d57006573b5d45b342a03f265155cdcbee38a4 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Mon, 6 Feb 2023 12:03:19 +0400
Subject: [PATCH 0765/2068] Add log on new FeatureClassLoader as it may help
 leak investigations

---
 .../java/com/diffplug/spotless/SpotlessCache.java    | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/SpotlessCache.java b/lib/src/main/java/com/diffplug/spotless/SpotlessCache.java
index b90682f1b6..237e326482 100644
--- a/lib/src/main/java/com/diffplug/spotless/SpotlessCache.java
+++ b/lib/src/main/java/com/diffplug/spotless/SpotlessCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,9 @@
 
 import javax.annotation.Nullable;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -34,6 +37,8 @@
  * when Spotless is no longer in use to release any resources it has grabbed.
  */
 public final class SpotlessCache {
+	private static final Logger LOGGER = LoggerFactory.getLogger(SpotlessCache.class);
+
 	/** Allows comparing keys based on their serialization. */
 	static final class SerializedKey {
 		final byte[] serialized;
@@ -68,7 +73,10 @@ synchronized ClassLoader classloader(JarState state) {
 	synchronized ClassLoader classloader(Serializable key, JarState state) {
 		SerializedKey serializedKey = new SerializedKey(key);
 		return cache
-				.computeIfAbsent(serializedKey, k -> new FeatureClassLoader(state.jarUrls(), this.getClass().getClassLoader()));
+				.computeIfAbsent(serializedKey, k -> {
+					LOGGER.debug("Allocating an additional FeatureClassLoader for key={} Cache.size was {}", key, cache.size());
+					return new FeatureClassLoader(state.jarUrls(), this.getClass().getClassLoader());
+				});
 	}
 
 	static SpotlessCache instance() {

From 23c97a4042e8c83bb9f703e4bf95469c5308ef4e Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Mon, 6 Feb 2023 23:28:25 +0400
Subject: [PATCH 0766/2068] Clean implementation based on CleanThat 2.0

---
 CHANGES.md                                    |  2 +
 lib/build.gradle                              |  2 +-
 .../java/JavaCleanthatRefactorerFunc.java     | 18 ++---
 .../spotless/java/CleanthatStepFactory.java   | 70 +++++++++++--------
 plugin-maven/CHANGES.md                       |  2 +
 .../spotless/maven/java/CleanthatJava.java    | 26 ++++---
 6 files changed, 68 insertions(+), 52 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 5f1a1ffa9f..46b8b926d1 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* CleanThat Java Refactorer ([#???](https://github.com/diffplug/spotless/pull/???))
 
 ## [2.34.1] - 2023-02-05
 ### Changes
diff --git a/lib/build.gradle b/lib/build.gradle
index 9918e4c330..0e1c2086ea 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -102,7 +102,7 @@ dependencies {
 
 	gsonCompileOnly 'com.google.code.gson:gson:2.10.1'
 
-	cleanthatCompileOnly 'io.github.solven-eu.cleanthat:java:2.0-SNAPSHOT'
+	cleanthatCompileOnly 'io.github.solven-eu.cleanthat:java:2.0'
 }
 
 // we'll hold the core lib to a high standard
diff --git a/lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java b/lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java
index e114234b3f..f86c53daa3 100644
--- a/lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java
+++ b/lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java
@@ -15,16 +15,17 @@
  */
 package com.diffplug.spotless.glue.java;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
 import com.diffplug.spotless.FormatterFunc;
+
 import eu.solven.cleanthat.config.pojo.CleanthatEngineProperties;
+import eu.solven.cleanthat.engine.java.IJdkVersionConstants;
 import eu.solven.cleanthat.engine.java.refactorer.JavaRefactorer;
 import eu.solven.cleanthat.engine.java.refactorer.JavaRefactorerProperties;
 import eu.solven.cleanthat.formatter.LineEnding;
-import eu.solven.cleanthat.formatter.PathAndContent;
-import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
 
 public class JavaCleanthatRefactorerFunc implements FormatterFunc {
 	private String jdkVersion;
@@ -32,13 +33,13 @@ public class JavaCleanthatRefactorerFunc implements FormatterFunc {
 	private List<String> excluded;
 
 	public JavaCleanthatRefactorerFunc(String jdkVersion, List<String> included, List<String> excluded) {
-		this.jdkVersion=jdkVersion == null ? IJdkVersionsConstant.JDK8 : jdkVersion;
+		this.jdkVersion = jdkVersion == null ? IJdkVersionConstants.JDK_8 : jdkVersion;
 		this.included = included == null ? Collections.emptyList() : included;
 		this.excluded = excluded == null ? Collections.emptyList() : excluded;
 	}
 
 	public JavaCleanthatRefactorerFunc() {
-		this(Arrays.asList(JavaRefactorerProperties.WILDCARD), Arrays.asList());
+		this(IJdkVersionConstants.JDK_8, Arrays.asList(JavaRefactorerProperties.WILDCARD), Arrays.asList());
 	}
 
 	@Override
@@ -50,8 +51,7 @@ public String apply(String input) throws Exception {
 		refactorerProperties.setIncluded(included);
 		refactorerProperties.setExcluded(excluded);
 
-		JavaRefactorer refactorer =
-				new JavaRefactorer(engineProperties, refactorerProperties);
+		JavaRefactorer refactorer = new JavaRefactorer(engineProperties, refactorerProperties);
 
 		// Spotless calls steps always with LF eol.
 		return refactorer.doFormat(input, LineEnding.LF);
diff --git a/lib/src/main/java/com/diffplug/spotless/java/CleanthatStepFactory.java b/lib/src/main/java/com/diffplug/spotless/java/CleanthatStepFactory.java
index 2167052ff4..b053f9f2e6 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/CleanthatStepFactory.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/CleanthatStepFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Solven
+ * Copyright 2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,11 +15,6 @@
  */
 package com.diffplug.spotless.java;
 
-import com.diffplug.spotless.FormatterFunc;
-import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.JarState;
-import com.diffplug.spotless.Jvm;
-import com.diffplug.spotless.Provisioner;
 import java.io.IOException;
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
@@ -27,9 +22,14 @@
 import java.util.List;
 import java.util.Objects;
 
+import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.JarState;
+import com.diffplug.spotless.Jvm;
+import com.diffplug.spotless.Provisioner;
+
 /**
- * Enables CleanThat as a SpotLess step. This may be moved to Spotless own repo
- * (https://github.com/diffplug/spotless/tree/main/lib)
+ * Enables CleanThat as a SpotLess step.
  *
  * @author Benoit Lacelle
  */
@@ -39,33 +39,45 @@ public final class CleanthatStepFactory {
 	private static final String NAME = "cleanthat";
 	private static final String MAVEN_COORDINATE = "io.github.solven-eu.cleanthat:java:";
 
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String>support(NAME).add(8, "2.0");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "2.0");
 
 	// prevent direct instantiation
-	private CleanthatStepFactory() {
-	}
+	private CleanthatStepFactory() {}
 
-	/** Creates a step which formats everything - code, import order, and unused imports. */
+	/** Creates a step which apply default CleanThat mutators. */
 	public static FormatterStep create(Provisioner provisioner) {
 		return create(defaultVersion(), provisioner);
 	}
 
-	/** Creates a step which formats everything - code, import order, and unused imports. */
+	/** Creates a step which apply default CleanThat mutators. */
 	public static FormatterStep create(String version, Provisioner provisioner) {
-		return create(MAVEN_COORDINATE, version, defaultExcluded(), defaultIncluded(), provisioner);
+		return create(MAVEN_COORDINATE, version, defaultJdkVersion(), defaultExcludedMutators(), defaultMutators(), provisioner);
+	}
+
+	public static String defaultJdkVersion() {
+		// see IJdkVersionConstants.JDK_7
+		// https://maven.apache.org/plugins/maven-compiler-plugin/compile-mojo.html#source
+		// 1.7 is the default for 'maven-compiler-plugin' since 3.9.0
+		return "1.7";
 	}
 
-	private static List<String> defaultExcluded() {
+	public static List<String> defaultExcludedMutators() {
 		return List.of();
 	}
 
-	private static List<String> defaultIncluded() {
+	/**
+	 * By default, we include all available rules
+	 * @return
+	 */
+	public static List<String> defaultMutators() {
+		// see JavaRefactorerProperties.WILDCARD
 		return List.of("*");
 	}
 
-	/** Creates a step which formats everything - groupArtifact, code, import order, and unused imports. */
+	/** Creates a step which apply selected CleanThat mutators. */
 	public static FormatterStep create(String groupArtifact,
 			String version,
+			String sourceJdkVersion,
 			List<String> excluded,
 			List<String> included,
 			Provisioner provisioner) {
@@ -76,8 +88,8 @@ public static FormatterStep create(String groupArtifact,
 		Objects.requireNonNull(version, "version");
 		Objects.requireNonNull(provisioner, "provisioner");
 		return FormatterStep.createLazy(NAME,
-				() -> new JavaRulesState(NAME, groupArtifact, version, excluded, included, provisioner),
-				JavaRulesState::createFormat);
+				() -> new JavaRefactorerState(NAME, groupArtifact, version, sourceJdkVersion, excluded, included, provisioner),
+				JavaRefactorerState::createFormat);
 	}
 
 	/** Get default formatter version */
@@ -89,32 +101,35 @@ public static String defaultGroupArtifact() {
 		return MAVEN_COORDINATE;
 	}
 
-	static final class JavaRulesState implements Serializable {
+	static final class JavaRefactorerState implements Serializable {
 		private static final long serialVersionUID = 1L;
 
 		final JarState jarState;
 		final String stepName;
 		final String version;
 
+		final String sourceJdkVersion;
 		final List<String> included;
 		final List<String> excluded;
 
-		JavaRulesState(String stepName, String version, Provisioner provisioner) throws IOException {
-			this(stepName, MAVEN_COORDINATE, version, defaultExcluded(), defaultIncluded(), provisioner);
+		JavaRefactorerState(String stepName, String version, Provisioner provisioner) throws IOException {
+			this(stepName, MAVEN_COORDINATE, version, defaultJdkVersion(), defaultExcludedMutators(), defaultMutators(), provisioner);
 		}
 
-		JavaRulesState(String stepName,
+		JavaRefactorerState(String stepName,
 				String groupArtifact,
 				String version,
+				String sourceJdkVersion,
 				List<String> included,
 				List<String> excluded,
 				Provisioner provisioner) throws IOException {
 			JVM_SUPPORT.assertFormatterSupported(version);
-			// ModuleHelper.doOpenInternalPackagesIfRequired();
+			ModuleHelper.doOpenInternalPackagesIfRequired();
 			this.jarState = JarState.from(groupArtifact + ":" + version, provisioner);
 			this.stepName = stepName;
 			this.version = version;
 
+			this.sourceJdkVersion = sourceJdkVersion;
 			this.included = included;
 			this.excluded = excluded;
 		}
@@ -126,11 +141,10 @@ FormatterFunc createFormat() {
 			Object formatter;
 			Method formatterMethod;
 			try {
-				Class<?> formatterClazz =
-						classLoader.loadClass("com.diffplug.spotless.glue.java.JavaCleanthatRefactoringFunc");
-				Constructor<?> formatterConstructor = formatterClazz.getConstructor(List.class, List.class);
+				Class<?> formatterClazz = classLoader.loadClass("com.diffplug.spotless.glue.java.JavaCleanthatRefactorerFunc");
+				Constructor<?> formatterConstructor = formatterClazz.getConstructor(String.class, List.class, List.class);
 
-				formatter = formatterConstructor.newInstance(included, excluded);
+				formatter = formatterConstructor.newInstance(sourceJdkVersion, included, excluded);
 				formatterMethod = formatterClazz.getMethod("apply", String.class);
 			} catch (ReflectiveOperationException e) {
 				throw new IllegalStateException("Issue executing the formatter", e);
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 567d880f4f..fc276f7c8d 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* CleanThat Java Refactorer ([#???](https://github.com/diffplug/spotless/pull/???))
 
 ## [2.32.0] - 2023-02-05
 ### Added
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/CleanthatJava.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/CleanthatJava.java
index 661dd7874f..76c130bcdd 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/CleanthatJava.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/CleanthatJava.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,16 +15,15 @@
  */
 package com.diffplug.spotless.maven.java;
 
+import java.util.List;
+
+import org.apache.maven.plugins.annotations.Parameter;
+
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.java.CleanthatStepFactory;
-import com.diffplug.spotless.java.GoogleJavaFormatStep;
 import com.diffplug.spotless.maven.FormatterStepConfig;
 import com.diffplug.spotless.maven.FormatterStepFactory;
 
-import org.apache.maven.plugins.annotations.Parameter;
-
-import java.util.List;
-
 public class CleanthatJava implements FormatterStepFactory {
 	@Parameter
 	private String groupArtifact;
@@ -32,22 +31,21 @@ public class CleanthatJava implements FormatterStepFactory {
 	@Parameter
 	private String version;
 
+	// https://maven.apache.org/plugins/maven-compiler-plugin/compile-mojo.html#source
+	@Parameter(property = "maven.compiler.source")
+	private String sourceJdk = CleanthatStepFactory.defaultJdkVersion();
+
 	@Parameter
-	private List<String> mutators;
+	private List<String> mutators = CleanthatStepFactory.defaultMutators();
 
 	@Parameter
-	private List<String> excludedMutators;
+	private List<String> excludedMutators = CleanthatStepFactory.defaultExcludedMutators();
 
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig config) {
 		String groupArtifact = this.groupArtifact != null ? this.groupArtifact : CleanthatStepFactory.defaultGroupArtifact();
 		String version = this.version != null ? this.version : CleanthatStepFactory.defaultVersion();
 
-		JavaRe
-		boolean reflowLongStrings = this.reflowLongStrings != null ? this.reflowLongStrings : GoogleJavaFormatStep.defaultReflowLongStrings();
-		return CleanthatStepFactory.create(groupArtifact, version, style, config.getProvisioner(), reflowLongStrings);
-	}
-
-	private static String defaultVersion() {
+		return CleanthatStepFactory.create(groupArtifact, version, sourceJdk, mutators, excludedMutators, config.getProvisioner());
 	}
 }

From e9efb1377f369e95c21505bd9b0a4aca080f0afb Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Tue, 7 Feb 2023 00:26:29 +0400
Subject: [PATCH 0767/2068] Add documentation, tests, and hit a wall as
 mutators are not detected

---
 README.md                                     |  2 +
 .../java/JavaCleanthatRefactorerFunc.java     |  8 ++
 ...tepFactory.java => CleanthatJavaStep.java} |  8 +-
 plugin-maven/README.md                        | 23 +++++-
 .../spotless/maven/java/CleanthatJava.java    | 14 ++--
 .../diffplug/spotless/maven/java/Java.java    |  4 +
 .../java/CleanthatJavaRefactorerTest.java     | 76 +++++++++++++++++++
 .../LiteralsFirstInComparisons.clean.java     |  8 ++
 .../LiteralsFirstInComparisons.dirty.java     |  8 ++
 .../cleanthat/MultipleMutators.clean.java     | 14 ++++
 ...tipleMutators.clean.onlyLiteralsFirst.java | 14 ++++
 .../cleanthat/MultipleMutators.dirty.java     | 14 ++++
 12 files changed, 181 insertions(+), 12 deletions(-)
 rename lib/src/main/java/com/diffplug/spotless/java/{CleanthatStepFactory.java => CleanthatJavaStep.java} (97%)
 create mode 100644 plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java
 create mode 100644 testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons.clean.java
 create mode 100644 testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons.dirty.java
 create mode 100644 testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.java
 create mode 100644 testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.onlyLiteralsFirst.java
 create mode 100644 testlib/src/main/resources/java/cleanthat/MultipleMutators.dirty.java

diff --git a/README.md b/README.md
index d2527034ca..5f59368677 100644
--- a/README.md
+++ b/README.md
@@ -84,6 +84,7 @@ lib('java.PalantirJavaFormatStep')               +'{{yes}}       | {{yes}}
 lib('java.RemoveUnusedImportsStep')              +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
 extra('java.EclipseJdtFormatterStep')            +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
 lib('java.FormatAnnotationsStep')                +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
+lib('java.CleanthatJavaStep')                    +'{{no}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('json.gson.GsonStep')                        +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('json.JacksonJsonStep')                      +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('json.JsonSimpleStep')                       +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
@@ -131,6 +132,7 @@ lib('yaml.JacksonYamlStep')                      +'{{yes}}       | {{yes}}
 | [`java.RemoveUnusedImportsStep`](lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`java.EclipseJdtFormatterStep`](lib-extra/src/main/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`java.FormatAnnotationsStep`](lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
+| [`java.CleanthatJavaStep`](lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java) | :white_large_square:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`json.gson.GsonStep`](lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`json.JacksonJsonStep`](lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`json.JsonSimpleStep`](lib/src/main/java/com/diffplug/spotless/json/JsonSimpleStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
diff --git a/lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java b/lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java
index f86c53daa3..5ec54e69be 100644
--- a/lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java
+++ b/lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java
@@ -19,6 +19,9 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.diffplug.spotless.FormatterFunc;
 
 import eu.solven.cleanthat.config.pojo.CleanthatEngineProperties;
@@ -28,6 +31,8 @@
 import eu.solven.cleanthat.formatter.LineEnding;
 
 public class JavaCleanthatRefactorerFunc implements FormatterFunc {
+	private static final Logger LOGGER = LoggerFactory.getLogger(JavaCleanthatRefactorerFunc.class);
+
 	private String jdkVersion;
 	private List<String> included;
 	private List<String> excluded;
@@ -53,6 +58,9 @@ public String apply(String input) throws Exception {
 
 		JavaRefactorer refactorer = new JavaRefactorer(engineProperties, refactorerProperties);
 
+		LOGGER.debug("Processing sourceJdk={} included={} excluded={}", jdkVersion, included, excluded);
+		LOGGER.debug("Available mutators: {}", JavaRefactorer.getAllIncluded());
+
 		// Spotless calls steps always with LF eol.
 		return refactorer.doFormat(input, LineEnding.LF);
 	}
diff --git a/lib/src/main/java/com/diffplug/spotless/java/CleanthatStepFactory.java b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
similarity index 97%
rename from lib/src/main/java/com/diffplug/spotless/java/CleanthatStepFactory.java
rename to lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
index b053f9f2e6..79434cba56 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/CleanthatStepFactory.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
@@ -34,15 +34,15 @@
  * @author Benoit Lacelle
  */
 // https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep
-public final class CleanthatStepFactory {
+public final class CleanthatJavaStep {
 
 	private static final String NAME = "cleanthat";
-	private static final String MAVEN_COORDINATE = "io.github.solven-eu.cleanthat:java:";
+	private static final String MAVEN_COORDINATE = "io.github.solven-eu.cleanthat:java";
 
 	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "2.0");
 
 	// prevent direct instantiation
-	private CleanthatStepFactory() {}
+	private CleanthatJavaStep() {}
 
 	/** Creates a step which apply default CleanThat mutators. */
 	public static FormatterStep create(Provisioner provisioner) {
@@ -83,7 +83,7 @@ public static FormatterStep create(String groupArtifact,
 			Provisioner provisioner) {
 		Objects.requireNonNull(groupArtifact, "groupArtifact");
 		if (groupArtifact.chars().filter(ch -> ch == ':').count() != 1) {
-			throw new IllegalArgumentException("groupArtifact must be in the form 'groupId:artifactId'");
+			throw new IllegalArgumentException("groupArtifact must be in the form 'groupId:artifactId'. it was: " + groupArtifact);
 		}
 		Objects.requireNonNull(version, "version");
 		Objects.requireNonNull(provisioner, "provisioner");
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 0787150ee1..36d46b2386 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -39,7 +39,7 @@ user@machine repo % mvn spotless:check
   - [Requirements](#requirements)
   - [Binding to maven phase](#binding-to-maven-phase)
 - **Languages**
-  - [Java](#java) ([google-java-format](#google-java-format), [eclipse jdt](#eclipse-jdt), [prettier](#prettier), [palantir-java-format](#palantir-java-format), [formatAnnotations](#formatAnnotations))
+  - [Java](#java) ([google-java-format](#google-java-format), [eclipse jdt](#eclipse-jdt), [prettier](#prettier), [palantir-java-format](#palantir-java-format), [formatAnnotations](#formatAnnotations), [cleanthat](#cleanthat))
   - [Groovy](#groovy) ([eclipse groovy](#eclipse-groovy))
   - [Kotlin](#kotlin) ([ktfmt](#ktfmt), [ktlint](#ktlint), [diktat](#diktat), [prettier](#prettier))
   - [Scala](#scala) ([scalafmt](#scalafmt))
@@ -182,6 +182,8 @@ any other maven phase (i.e. compile) then it can be configured as below;
       <include>src/test/java/**/*.java</include>
     </includes>
 
+    <cleanthat />        <!-- has its own section below -->
+
     <googleJavaFormat /> <!-- has its own section below -->
     <eclipse />          <!-- has its own section below -->
     <prettier />         <!-- has its own section below -->
@@ -274,6 +276,25 @@ list of well-known type annotations.  You can make a pull request to add new one
 In the future there will be mechanisms to add/remove annotations from the list.
 These mechanisms already exist for the Gradle plugin.
 
+### Cleanthat
+
+[homepage](https://github.com/solven-eu/cleanthat). CleanThat enables automatic refactoring of Java code
+
+```xml
+<cleanthat>
+  <version>2.0</version>                          <!-- optional version of Cleanthat -->
+  <sourceJdk>${maven.compiler.source}</sourceJdk> <!-- optional. Default to ${maven.compiler.source} else '1.7' -->
+  <mutators>
+    <mutator>*</mutator> <!-- optional. Default to '*' to include all mutators -->
+  </mutators>
+  <mutators> <!-- List of mutators: https://github.com/solven-eu/cleanthat/tree/master/java/src/main/java/eu/solven/cleanthat/engine/java/refactorer/mutators -->
+    <mutator>LiteralsFirstInComparisons</mutator> <!-- You may alternatively list the requested mutators -->
+  </mutators>
+  <excludedMutators>
+    <excludedMutator>OptionalNotEmpty</excludedMutator> <!-- You can discard specific rules -->
+  </excludedMutators>
+</cleanthat>
+```
 
 ## Groovy
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/CleanthatJava.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/CleanthatJava.java
index 76c130bcdd..7460ab67b9 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/CleanthatJava.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/CleanthatJava.java
@@ -20,7 +20,7 @@
 import org.apache.maven.plugins.annotations.Parameter;
 
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.java.CleanthatStepFactory;
+import com.diffplug.spotless.java.CleanthatJavaStep;
 import com.diffplug.spotless.maven.FormatterStepConfig;
 import com.diffplug.spotless.maven.FormatterStepFactory;
 
@@ -33,19 +33,19 @@ public class CleanthatJava implements FormatterStepFactory {
 
 	// https://maven.apache.org/plugins/maven-compiler-plugin/compile-mojo.html#source
 	@Parameter(property = "maven.compiler.source")
-	private String sourceJdk = CleanthatStepFactory.defaultJdkVersion();
+	private String sourceJdk = CleanthatJavaStep.defaultJdkVersion();
 
 	@Parameter
-	private List<String> mutators = CleanthatStepFactory.defaultMutators();
+	private List<String> mutators = CleanthatJavaStep.defaultMutators();
 
 	@Parameter
-	private List<String> excludedMutators = CleanthatStepFactory.defaultExcludedMutators();
+	private List<String> excludedMutators = CleanthatJavaStep.defaultExcludedMutators();
 
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig config) {
-		String groupArtifact = this.groupArtifact != null ? this.groupArtifact : CleanthatStepFactory.defaultGroupArtifact();
-		String version = this.version != null ? this.version : CleanthatStepFactory.defaultVersion();
+		String groupArtifact = this.groupArtifact != null ? this.groupArtifact : CleanthatJavaStep.defaultGroupArtifact();
+		String version = this.version != null ? this.version : CleanthatJavaStep.defaultVersion();
 
-		return CleanthatStepFactory.create(groupArtifact, version, sourceJdk, mutators, excludedMutators, config.getProvisioner());
+		return CleanthatJavaStep.create(groupArtifact, version, sourceJdk, mutators, excludedMutators, config.getProvisioner());
 	}
 }
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Java.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Java.java
index 0921a838b3..efdf0827db 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Java.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Java.java
@@ -79,6 +79,10 @@ public void addFormatAnnotations(FormatAnnotations formatAnnotations) {
 		addStepFactory(formatAnnotations);
 	}
 
+	public void addCleanthat(CleanthatJava cleanthat) {
+		addStepFactory(cleanthat);
+	}
+
 	private static String fileMask(Path path) {
 		String dir = path.toString();
 		if (!dir.endsWith(File.separator)) {
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java
new file mode 100644
index 0000000000..c72aeb15b2
--- /dev/null
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2022-2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.java;
+
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.diffplug.spotless.maven.MavenIntegrationHarness;
+
+class CleanthatJavaRefactorerTest extends MavenIntegrationHarness {
+	private static final Logger LOGGER = LoggerFactory.getLogger(CleanthatJavaRefactorerTest.class);
+
+	@Test
+	void testLiteralsFirstInComparisons() throws Exception {
+		writePomWithJavaSteps(
+				"<cleanthat>",
+				"</cleanthat>");
+
+		runTest("LiteralsFirstInComparisons.dirty.java", "LiteralsFirstInComparisons.clean.java");
+	}
+
+	@Test
+	void testMultipleMutators() throws Exception {
+		writePomWithJavaSteps(
+				"<cleanthat>",
+				"</cleanthat>");
+
+		runTest("MultipleMutators.dirty.java", "MultipleMutators.clean.java");
+	}
+
+	@Test
+	void testExcludeOptionalNotEmpty() throws Exception {
+		writePomWithJavaSteps(
+				"<cleanthat>",
+				"  <excludedMutators>",
+				"    <excludedMutator>OptionalNotEmpty</excludedMutator>",
+				"  </excludedMutators>",
+				"</cleanthat>");
+
+		runTest("MultipleMutators.dirty.java", "MultipleMutators.clean.onlyLiteralsFirst.java");
+	}
+
+	@Test
+	void testIncludeOnlyLiteralsFirstInComparisons() throws Exception {
+		writePomWithJavaSteps(
+				"<cleanthat>",
+				"  <mutators>",
+				"    <mutator>LiteralsFirstInComparisons</mutator>",
+				"  </mutators>",
+				"</cleanthat>");
+
+		runTest("MultipleMutators.dirty.java", "MultipleMutators.clean.onlyLiteralsFirst.java");
+	}
+
+	private void runTest(String dirtyPath, String cleanPath) throws Exception {
+		String path = "src/main/java/test.java";
+		setFile(path).toResource("java/cleanthat/" + dirtyPath);
+		Assertions.assertThat(mavenRunner().withArguments("spotless:apply -X").runNoError().stdOutUtf8()).isEmpty();
+		assertFile(path).sameAsResource("java/cleanthat/" + cleanPath);
+	}
+}
diff --git a/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons.clean.java b/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons.clean.java
new file mode 100644
index 0000000000..8bacfa58db
--- /dev/null
+++ b/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons.clean.java
@@ -0,0 +1,8 @@
+package eu.solven.cleanthat.engine.java.refactorer.cases.do_not_format_me;
+
+public class LiteralsFirstInComparisonsCases {
+
+	public boolean isHardcoded(String input) {
+		return "hardcoded".equals(input);
+	}
+}
diff --git a/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons.dirty.java b/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons.dirty.java
new file mode 100644
index 0000000000..3a1e074c91
--- /dev/null
+++ b/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons.dirty.java
@@ -0,0 +1,8 @@
+package eu.solven.cleanthat.engine.java.refactorer.cases.do_not_format_me;
+
+public class LiteralsFirstInComparisonsCases {
+
+	public boolean isHardcoded(String input) {
+		return input.equals("hardcoded");
+	}
+}
diff --git a/testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.java b/testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.java
new file mode 100644
index 0000000000..0829602dc1
--- /dev/null
+++ b/testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.java
@@ -0,0 +1,14 @@
+package eu.solven.cleanthat.engine.java.refactorer.cases.do_not_format_me;
+
+import java.util.Optional;
+
+public class LiteralsFirstInComparisonsCases {
+
+	public boolean isHardcoded(String input) {
+		return input.equals("hardcoded");
+	}
+
+	public boolean isPresent(Optional<?> optional) {
+		return optional.isPresent();
+	}
+}
diff --git a/testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.onlyLiteralsFirst.java b/testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.onlyLiteralsFirst.java
new file mode 100644
index 0000000000..629d24504b
--- /dev/null
+++ b/testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.onlyLiteralsFirst.java
@@ -0,0 +1,14 @@
+package eu.solven.cleanthat.engine.java.refactorer.cases.do_not_format_me;
+
+import java.util.Optional;
+
+public class LiteralsFirstInComparisonsCases {
+
+	public boolean isHardcoded(String input) {
+		return "hardcoded".equals(input);
+	}
+
+	public boolean isPresent(Optional<?> optional) {
+		return !optional.isEmpty();
+	}
+}
diff --git a/testlib/src/main/resources/java/cleanthat/MultipleMutators.dirty.java b/testlib/src/main/resources/java/cleanthat/MultipleMutators.dirty.java
new file mode 100644
index 0000000000..8ac230cabc
--- /dev/null
+++ b/testlib/src/main/resources/java/cleanthat/MultipleMutators.dirty.java
@@ -0,0 +1,14 @@
+package eu.solven.cleanthat.engine.java.refactorer.cases.do_not_format_me;
+
+import java.util.Optional;
+
+public class LiteralsFirstInComparisonsCases {
+
+	public boolean isHardcoded(String input) {
+		return input.equals("hardcoded");
+	}
+
+	public boolean isPresent(Optional<?> optional) {
+		return !optional.isEmpty();
+	}
+}

From f80b45f149e3de392a025b3ac8842b6231299fac Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 7 Feb 2023 18:04:35 +0000
Subject: [PATCH 0768/2068] Update dependency com.facebook:ktfmt to v0.43

---
 lib/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 9d95007bc1..1fa0e41409 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -65,7 +65,7 @@ dependencies {
 	jacksonCompileOnly 'com.fasterxml.jackson.core:jackson-databind:2.14.1'
 	jacksonCompileOnly 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.14.1'
 
-	String VER_KTFMT = '0.42'
+	String VER_KTFMT = '0.43'
 	ktfmtCompileOnly "com.facebook:ktfmt:$VER_KTFMT"
 	String VER_KTLINT_GOOGLE_JAVA_FORMAT = '1.7' // for JDK 8 compatibility
 	ktfmtCompileOnly("com.google.googlejavaformat:google-java-format") {

From 4f62769da7ba656ee47e9596d7f5b0f9c531c650 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20L=C3=B8nne?= <lonnelars@gmail.com>
Date: Wed, 8 Feb 2023 14:06:17 +0100
Subject: [PATCH 0769/2068] fixes continuation indent in ktfmt default
 formatter

---
 .../spotless/glue/ktfmt/KtfmtFormatterFunc.java       |  2 +-
 .../com/diffplug/spotless/maven/kotlin/KtfmtTest.java | 11 +++++++++++
 .../main/resources/kotlin/ktfmt/continuation.clean    |  6 ++++++
 .../main/resources/kotlin/ktfmt/continuation.dirty    |  4 ++++
 4 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 testlib/src/main/resources/kotlin/ktfmt/continuation.clean
 create mode 100644 testlib/src/main/resources/kotlin/ktfmt/continuation.dirty

diff --git a/lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtFormatterFunc.java b/lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtFormatterFunc.java
index 72e0e50e3c..e34f7b4755 100644
--- a/lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtFormatterFunc.java
+++ b/lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtFormatterFunc.java
@@ -78,7 +78,7 @@ private FormattingOptions createFormattingOptions() {
 					formattingOptions.getStyle(),
 					ktfmtFormattingOptions.getMaxWidth().orElse(formattingOptions.getMaxWidth()),
 					ktfmtFormattingOptions.getBlockIndent().orElse(formattingOptions.getBlockIndent()),
-					ktfmtFormattingOptions.getContinuationIndent().orElse(formattingOptions.getBlockIndent()),
+					ktfmtFormattingOptions.getContinuationIndent().orElse(formattingOptions.getContinuationIndent()),
 					ktfmtFormattingOptions.getRemoveUnusedImport().orElse(formattingOptions.getRemoveUnusedImports()),
 					formattingOptions.getDebuggingPrintOpsAfterFormatting());
 		}
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtfmtTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtfmtTest.java
index 4ae266cc23..25ecbc598d 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtfmtTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtfmtTest.java
@@ -19,6 +19,8 @@
 
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
 
+import java.io.IOException;
+
 class KtfmtTest extends MavenIntegrationHarness {
 	@Test
 	void testKtfmt() throws Exception {
@@ -36,6 +38,15 @@ void testKtfmt() throws Exception {
 		assertFile(path2).sameAsResource("kotlin/ktfmt/basic.clean");
 	}
 
+	@Test
+	void testContinuation() throws Exception {
+		writePomWithKotlinSteps("<ktfmt/>");
+
+		setFile("src/main/kotlin/main.kt").toResource("kotlin/ktfmt/continuation.dirty");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("src/main/kotlin/main.kt").sameAsResource("kotlin/ktfmt/continuation.clean");
+	}
+
 	@Test
 	void testKtfmtStyle() throws Exception {
 		writePomWithKotlinSteps("<ktfmt><style>DROPBOX</style></ktfmt>");
diff --git a/testlib/src/main/resources/kotlin/ktfmt/continuation.clean b/testlib/src/main/resources/kotlin/ktfmt/continuation.clean
new file mode 100644
index 0000000000..11677928fc
--- /dev/null
+++ b/testlib/src/main/resources/kotlin/ktfmt/continuation.clean
@@ -0,0 +1,6 @@
+fun myFunction() {
+  val location =
+      restTemplate.postForLocation(
+          "/v1/my-api", mapOf("name" to "some-name", "url" to "https://www.google.com"))
+  return location
+}
diff --git a/testlib/src/main/resources/kotlin/ktfmt/continuation.dirty b/testlib/src/main/resources/kotlin/ktfmt/continuation.dirty
new file mode 100644
index 0000000000..3652274d12
--- /dev/null
+++ b/testlib/src/main/resources/kotlin/ktfmt/continuation.dirty
@@ -0,0 +1,4 @@
+fun myFunction() {
+    val location = restTemplate.postForLocation("/v1/my-api", mapOf("name" to "some-name", "url" to "https://www.google.com"))
+    return location
+}

From 8c74020fd505ecbc46db645b7fa330cbf5fd9514 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20L=C3=B8nne?= <lonnelars@gmail.com>
Date: Wed, 8 Feb 2023 14:16:52 +0100
Subject: [PATCH 0770/2068] adds a summary of the change to
 plugin-maven/CHANGES.md

---
 plugin-maven/CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 567d880f4f..0e656e24ec 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Maven plugin with `ktfmt` default style uses correct continuation indent ([#1562](https://github.com/diffplug/spotless/pull/1562))
 
 ## [2.32.0] - 2023-02-05
 ### Added

From 69e8524c650a53eaae67df350a56bb389b0a8903 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Wed, 8 Feb 2023 22:28:15 +0400
Subject: [PATCH 0771/2068] Move to 2.1 to fix issue with class detection

---
 lib/build.gradle                              |  5 +-
 .../spotless/java/CleanthatJavaStep.java      |  2 +-
 .../java/JavaCleanthatRefactorerFuncTest.java | 28 ++++++++
 .../java/JavaCleanthatRefactorerFuncTest.java | 72 +++++++++++++++++++
 .../java/CleanthatJavaRefactorerTest.java     |  2 +-
 5 files changed, 106 insertions(+), 3 deletions(-)
 create mode 100644 lib/src/test/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFuncTest.java
 create mode 100644 lib/src/testCleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFuncTest.java

diff --git a/lib/build.gradle b/lib/build.gradle
index 0e1c2086ea..cd6996a979 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -55,6 +55,7 @@ dependencies {
 	testCommonImplementation "org.junit.jupiter:junit-jupiter:$VER_JUNIT"
 	testCommonImplementation "org.assertj:assertj-core:$VER_ASSERTJ"
 	testCommonImplementation "com.diffplug.durian:durian-testlib:$VER_DURIAN"
+	testCommonImplementation 'io.github.solven-eu.cleanthat:java:2.1'
 
 	// used for pom sorting
 	sortPomCompileOnly 'com.github.ekryd.sortpom:sortpom-sorter:3.0.0'
@@ -102,7 +103,9 @@ dependencies {
 
 	gsonCompileOnly 'com.google.code.gson:gson:2.10.1'
 
-	cleanthatCompileOnly 'io.github.solven-eu.cleanthat:java:2.0'
+	// TODO How can one add a test module like 'compatKtLint0Dot48Dot0'?
+	// cleanthatCompileAndTestOnly 'io.github.solven-eu.cleanthat:java:2.1'
+	cleanthatCompileOnly 'io.github.solven-eu.cleanthat:java:2.1'
 }
 
 // we'll hold the core lib to a high standard
diff --git a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
index 79434cba56..fe4966d873 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
@@ -39,7 +39,7 @@ public final class CleanthatJavaStep {
 	private static final String NAME = "cleanthat";
 	private static final String MAVEN_COORDINATE = "io.github.solven-eu.cleanthat:java";
 
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "2.0");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "2.1");
 
 	// prevent direct instantiation
 	private CleanthatJavaStep() {}
diff --git a/lib/src/test/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFuncTest.java b/lib/src/test/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFuncTest.java
new file mode 100644
index 0000000000..2f3cdc9646
--- /dev/null
+++ b/lib/src/test/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFuncTest.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.glue.java;
+
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import eu.solven.cleanthat.engine.java.refactorer.JavaRefactorer;
+
+public class JavaCleanthatRefactorerFuncTest {
+	@Test
+	public void testMutatorsDetection() {
+		Assertions.assertThat(JavaRefactorer.getAllIncluded()).isNotEmpty();
+	}
+}
diff --git a/lib/src/testCleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFuncTest.java b/lib/src/testCleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFuncTest.java
new file mode 100644
index 0000000000..c811b51233
--- /dev/null
+++ b/lib/src/testCleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFuncTest.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.glue.ktlint.compat;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+public class KtLintCompat0Dot48Dot0AdapterTest {
+	@Test
+	public void testDefaults(@TempDir Path path) throws IOException {
+		KtLintCompat0Dot48Dot0Adapter ktLintCompat0Dot48Dot0Adapter = new KtLintCompat0Dot48Dot0Adapter();
+		String text = loadAndWriteText(path, "empty_class_body.kt");
+		final Path filePath = Paths.get(path.toString(), "empty_class_body.kt");
+
+		Map<String, String> userData = new HashMap<>();
+
+		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
+
+		String formatted = ktLintCompat0Dot48Dot0Adapter.format(text, filePath, false, false, null, userData, editorConfigOverrideMap);
+		assertEquals("class empty_class_body\n", formatted);
+	}
+
+	@Test
+	public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
+		KtLintCompat0Dot48Dot0Adapter ktLintCompat0Dot48Dot0Adapter = new KtLintCompat0Dot48Dot0Adapter();
+		String text = loadAndWriteText(path, "fails_no_semicolons.kt");
+		final Path filePath = Paths.get(path.toString(), "fails_no_semicolons.kt");
+
+		Map<String, String> userData = new HashMap<>();
+
+		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
+		editorConfigOverrideMap.put("indent_style", "tab");
+		editorConfigOverrideMap.put("ktlint_standard_no-semi", "disabled");
+		// ktlint_filename is an invalid rule in ktlint 0.48.0
+		editorConfigOverrideMap.put("ktlint_filename", "disabled");
+
+		String formatted = ktLintCompat0Dot48Dot0Adapter.format(text, filePath, false, false, null, userData, editorConfigOverrideMap);
+		assertEquals("class fails_no_semicolons {\n\tval i = 0;\n}\n", formatted);
+	}
+
+	private static String loadAndWriteText(Path path, String name) throws IOException {
+		try (InputStream is = KtLintCompat0Dot48Dot0AdapterTest.class.getResourceAsStream("/" + name)) {
+			Files.copy(is, path.resolve(name));
+		}
+		return new String(Files.readAllBytes(path.resolve(name)), StandardCharsets.UTF_8);
+	}
+
+}
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java
index c72aeb15b2..833b19dda8 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java
@@ -70,7 +70,7 @@ void testIncludeOnlyLiteralsFirstInComparisons() throws Exception {
 	private void runTest(String dirtyPath, String cleanPath) throws Exception {
 		String path = "src/main/java/test.java";
 		setFile(path).toResource("java/cleanthat/" + dirtyPath);
-		Assertions.assertThat(mavenRunner().withArguments("spotless:apply -X").runNoError().stdOutUtf8()).isEmpty();
+		Assertions.assertThat(mavenRunner().withArguments("spotless:apply").withRemoteDebug(21654).runNoError().stdOutUtf8()).doesNotContain("[ERROR]");
 		assertFile(path).sameAsResource("java/cleanthat/" + cleanPath);
 	}
 }

From bcab5b4abb044d6ba9b730b56b99c74cd4408453 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Wed, 8 Feb 2023 22:32:23 +0400
Subject: [PATCH 0772/2068] Improve documentation and changelog ref

---
 .../spotless/glue/java/JavaCleanthatRefactorerFunc.java       | 4 ++++
 .../java/com/diffplug/spotless/java/CleanthatJavaStep.java    | 1 +
 plugin-maven/README.md                                        | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java b/lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java
index 5ec54e69be..7432ebf3f9 100644
--- a/lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java
+++ b/lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java
@@ -30,6 +30,10 @@
 import eu.solven.cleanthat.engine.java.refactorer.JavaRefactorerProperties;
 import eu.solven.cleanthat.formatter.LineEnding;
 
+/**
+ * The glue for CleanThat: it is build over the version in build.gradle, but at runtime it will be executed over
+ * the version loaded in JarState, which is by default defined in com.diffplug.spotless.java.CleanthatJavaStep#JVM_SUPPORT
+ */
 public class JavaCleanthatRefactorerFunc implements FormatterFunc {
 	private static final Logger LOGGER = LoggerFactory.getLogger(JavaCleanthatRefactorerFunc.class);
 
diff --git a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
index fe4966d873..1cd032a304 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
@@ -39,6 +39,7 @@ public final class CleanthatJavaStep {
 	private static final String NAME = "cleanthat";
 	private static final String MAVEN_COORDINATE = "io.github.solven-eu.cleanthat:java";
 
+	// CleanThat changelog is available at https://github.com/solven-eu/cleanthat/blob/master/CHANGES.MD
 	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "2.1");
 
 	// prevent direct instantiation
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 36d46b2386..b1b9098bfe 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -278,7 +278,7 @@ These mechanisms already exist for the Gradle plugin.
 
 ### Cleanthat
 
-[homepage](https://github.com/solven-eu/cleanthat). CleanThat enables automatic refactoring of Java code
+[homepage](https://github.com/solven-eu/cleanthat). CleanThat enables automatic refactoring of Java code. [ChangeLog](https://github.com/solven-eu/cleanthat/blob/master/CHANGES.MD)
 
 ```xml
 <cleanthat>

From 9aefc2ebc1e901e899e279f501879e83f77c0cf5 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 8 Feb 2023 10:56:45 -0800
Subject: [PATCH 0773/2068] Bump equo-ide to latest release.

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 28bc589212..0b00b4c9f1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
 	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
-	id 'dev.equo.ide'                          version '0.12.1'
+	id 'dev.equo.ide'                          version '0.13.0'
 }
 equoIde {
 	branding().title('Spotless').icon(file('_images/spotless_logo.png'))

From a5c8b4da6975b69e5d62ea29246a422a269610e1 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Wed, 8 Feb 2023 23:06:46 +0400
Subject: [PATCH 0774/2068] Fix classLoader issue

---
 .../java/JavaCleanthatRefactorerFunc.java     | 19 +++++++++++++++++++
 .../java/CleanthatJavaRefactorerTest.java     | 15 +++++++++++++--
 .../cleanthat/MultipleMutators.clean.java     |  2 +-
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java b/lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java
index 7432ebf3f9..c94fd3c7c4 100644
--- a/lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java
+++ b/lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java
@@ -15,6 +15,7 @@
  */
 package com.diffplug.spotless.glue.java;
 
+import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -25,6 +26,7 @@
 import com.diffplug.spotless.FormatterFunc;
 
 import eu.solven.cleanthat.config.pojo.CleanthatEngineProperties;
+import eu.solven.cleanthat.config.pojo.SourceCodeProperties;
 import eu.solven.cleanthat.engine.java.IJdkVersionConstants;
 import eu.solven.cleanthat.engine.java.refactorer.JavaRefactorer;
 import eu.solven.cleanthat.engine.java.refactorer.JavaRefactorerProperties;
@@ -53,8 +55,25 @@ public JavaCleanthatRefactorerFunc() {
 
 	@Override
 	public String apply(String input) throws Exception {
+		// https://stackoverflow.com/questions/1771679/difference-between-threads-context-class-loader-and-normal-classloader
+		ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader();
+		try {
+			// Ensure CleanThat main Thread has its custom classLoader while executing its refactoring
+			Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
+			return doApply(input);
+		} finally {
+			// Restore the originalClassLoader
+			Thread.currentThread().setContextClassLoader(originalClassLoader);
+		}
+	}
+
+	private String doApply(String input) throws InterruptedException, IOException {
+		// call some API that uses reflection without taking ClassLoader param
 		CleanthatEngineProperties engineProperties = CleanthatEngineProperties.builder().engineVersion(jdkVersion).build();
 
+		// Spotless will push us LF content
+		engineProperties.setSourceCode(SourceCodeProperties.builder().lineEnding(LineEnding.LF).build());
+
 		JavaRefactorerProperties refactorerProperties = new JavaRefactorerProperties();
 
 		refactorerProperties.setIncluded(included);
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java
index 833b19dda8..edb7a69cd5 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java
@@ -35,11 +35,21 @@ void testLiteralsFirstInComparisons() throws Exception {
 	}
 
 	@Test
-	void testMultipleMutators() throws Exception {
+	void testMultipleMutators_defaultIsJdk7() throws Exception {
 		writePomWithJavaSteps(
 				"<cleanthat>",
 				"</cleanthat>");
 
+		runTest("MultipleMutators.dirty.java", "MultipleMutators.clean.onlyLiteralsFirst.java");
+	}
+
+	@Test
+	void testMultipleMutators_Jdk11IntroducedOptionalisPresent() throws Exception {
+		writePomWithJavaSteps(
+				"<cleanthat>",
+				"<sourceJdk>11</sourceJdk>",
+				"</cleanthat>");
+
 		runTest("MultipleMutators.dirty.java", "MultipleMutators.clean.java");
 	}
 
@@ -70,7 +80,8 @@ void testIncludeOnlyLiteralsFirstInComparisons() throws Exception {
 	private void runTest(String dirtyPath, String cleanPath) throws Exception {
 		String path = "src/main/java/test.java";
 		setFile(path).toResource("java/cleanthat/" + dirtyPath);
-		Assertions.assertThat(mavenRunner().withArguments("spotless:apply").withRemoteDebug(21654).runNoError().stdOutUtf8()).doesNotContain("[ERROR]");
+		// .withRemoteDebug(21654)
+		Assertions.assertThat(mavenRunner().withArguments("spotless:apply").runNoError().stdOutUtf8()).doesNotContain("[ERROR]");
 		assertFile(path).sameAsResource("java/cleanthat/" + cleanPath);
 	}
 }
diff --git a/testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.java b/testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.java
index 0829602dc1..318e1efa15 100644
--- a/testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.java
+++ b/testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.java
@@ -5,7 +5,7 @@
 public class LiteralsFirstInComparisonsCases {
 
 	public boolean isHardcoded(String input) {
-		return input.equals("hardcoded");
+		return "hardcoded".equals(input);
 	}
 
 	public boolean isPresent(Optional<?> optional) {

From 14122d0f9254c570c4fb894560db91d6b681a528 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Wed, 8 Feb 2023 23:35:47 +0400
Subject: [PATCH 0775/2068] Add Gradle compatibility

---
 .../gradle/spotless/JavaExtension.java        | 74 ++++++++++++++++++-
 .../CleanthatJavaIntegrationTest.java         | 42 +++++++++++
 2 files changed, 115 insertions(+), 1 deletion(-)
 create mode 100644 plugin-gradle/src/test/java/com/diffplug/gradle/spotless/CleanthatJavaIntegrationTest.java

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
index 0f5926ec66..e65d0601e7 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,6 +34,7 @@
 import com.diffplug.spotless.extra.EclipseBasedStepBuilder;
 import com.diffplug.spotless.extra.java.EclipseJdtFormatterStep;
 import com.diffplug.spotless.generic.LicenseHeaderStep;
+import com.diffplug.spotless.java.CleanthatJavaStep;
 import com.diffplug.spotless.java.FormatAnnotationsStep;
 import com.diffplug.spotless.java.GoogleJavaFormatStep;
 import com.diffplug.spotless.java.ImportOrderStep;
@@ -270,6 +271,77 @@ private FormatterStep createStep() {
 		}
 	}
 
+	/** Apply CleanThat refactoring rules. */
+	public CleanthatJavaConfig cleanthat() {
+		return new CleanthatJavaConfig();
+	}
+
+	public class CleanthatJavaConfig {
+		private String groupArtifact = CleanthatJavaStep.defaultGroupArtifact();
+
+		private String version = CleanthatJavaStep.defaultVersion();
+
+		private String sourceJdk = CleanthatJavaStep.defaultJdkVersion();
+
+		private List<String> mutators = CleanthatJavaStep.defaultMutators();
+
+		private List<String> excludedMutators = CleanthatJavaStep.defaultExcludedMutators();
+
+		CleanthatJavaConfig() {
+			addStep(createStep());
+		}
+
+		public CleanthatJavaConfig groupArtifact(String groupArtifact) {
+			Objects.requireNonNull(groupArtifact);
+			this.groupArtifact = groupArtifact;
+			replaceStep(createStep());
+			return this;
+		}
+
+		public CleanthatJavaConfig version(String version) {
+			Objects.requireNonNull(version);
+			this.version = version;
+			replaceStep(createStep());
+			return this;
+		}
+
+		public CleanthatJavaConfig sourceJdk(String sourceJdk) {
+			Objects.requireNonNull(sourceJdk);
+			this.sourceJdk = sourceJdk;
+			replaceStep(createStep());
+			return this;
+		}
+
+		// Especially useful to clear default mutators
+		public CleanthatJavaConfig clearMutators() {
+			this.mutators.clear();
+			replaceStep(createStep());
+			return this;
+		}
+
+		// The fully qualified name of a class implementing eu.solven.cleanthat.engine.java.refactorer.meta.IMutator
+		// or '*' to include all default mutators
+		public CleanthatJavaConfig addMutator(String mutator) {
+			this.mutators.add(mutator);
+			replaceStep(createStep());
+			return this;
+		}
+
+		// useful to exclude a mutator amongst the default list of mutators
+		public CleanthatJavaConfig excludeMutator(String mutator) {
+			this.excludedMutators.add(mutator);
+			replaceStep(createStep());
+			return this;
+		}
+
+		private FormatterStep createStep() {
+			return CleanthatJavaStep.create(
+					groupArtifact,
+					version,
+					sourceJdk, mutators, excludedMutators, provisioner());
+		}
+	}
+
 	/** If the user hasn't specified the files yet, we'll assume he/she means all of the java files. */
 	@Override
 	protected void setupTask(SpotlessTask task) {
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/CleanthatJavaIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/CleanthatJavaIntegrationTest.java
new file mode 100644
index 0000000000..2b3ede1472
--- /dev/null
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/CleanthatJavaIntegrationTest.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2022-2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.gradle.spotless;
+
+import java.io.IOException;
+
+import org.junit.jupiter.api.Test;
+
+class CleanthatJavaIntegrationTest extends GradleIntegrationHarness {
+	@Test
+	void integration() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"",
+				"spotless {",
+				"    java {",
+				"        target file('test.java')",
+				"        cleanthat().sourceJdk('11')",
+				"    }",
+				"}");
+
+		setFile("test.java").toResource("java/cleanthat/MultipleMutators.dirty.java");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("test.java").sameAsResource("java/cleanthat/MultipleMutators.clean.java");
+	}
+}

From cfd07b06952840df641eea1c59d6f495e86544e6 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Wed, 8 Feb 2023 23:44:50 +0400
Subject: [PATCH 0776/2068] Improve Gradle integration

---
 .../spotless/java/CleanthatJavaStep.java      |  6 ++---
 plugin-gradle/CHANGES.md                      |  2 ++
 plugin-gradle/README.md                       | 22 ++++++++++++++++++-
 .../gradle/spotless/JavaExtension.java        |  8 +++----
 plugin-maven/CHANGES.md                       |  2 +-
 .../spotless/maven/java/CleanthatJava.java    |  2 +-
 6 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
index 1cd032a304..b5cc5452d1 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
@@ -52,10 +52,10 @@ public static FormatterStep create(Provisioner provisioner) {
 
 	/** Creates a step which apply default CleanThat mutators. */
 	public static FormatterStep create(String version, Provisioner provisioner) {
-		return create(MAVEN_COORDINATE, version, defaultJdkVersion(), defaultExcludedMutators(), defaultMutators(), provisioner);
+		return create(MAVEN_COORDINATE, version, defaultSourceJdk(), defaultExcludedMutators(), defaultMutators(), provisioner);
 	}
 
-	public static String defaultJdkVersion() {
+	public static String defaultSourceJdk() {
 		// see IJdkVersionConstants.JDK_7
 		// https://maven.apache.org/plugins/maven-compiler-plugin/compile-mojo.html#source
 		// 1.7 is the default for 'maven-compiler-plugin' since 3.9.0
@@ -114,7 +114,7 @@ static final class JavaRefactorerState implements Serializable {
 		final List<String> excluded;
 
 		JavaRefactorerState(String stepName, String version, Provisioner provisioner) throws IOException {
-			this(stepName, MAVEN_COORDINATE, version, defaultJdkVersion(), defaultExcludedMutators(), defaultMutators(), provisioner);
+			this(stepName, MAVEN_COORDINATE, version, defaultSourceJdk(), defaultExcludedMutators(), defaultMutators(), provisioner);
 		}
 
 		JavaRefactorerState(String stepName,
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index e3234584b8..1a5458c436 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Added
+* CleanThat Java Refactorer ([#1560](https://github.com/diffplug/spotless/pull/1560))
 
 ## [6.14.1] - 2023-02-05
 ### Fixed
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index f61280bc7e..c0f8adebfb 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -54,7 +54,7 @@ Spotless supports all of Gradle's built-in performance features (incremental bui
 - [**Quickstart**](#quickstart)
   - [Requirements](#requirements)
 - **Languages**
-  - [Java](#java) ([google-java-format](#google-java-format), [eclipse jdt](#eclipse-jdt), [clang-format](#clang-format), [prettier](#prettier), [palantir-java-format](#palantir-java-format), [formatAnnotations](#formatAnnotations))
+  - [Java](#java) ([google-java-format](#google-java-format), [eclipse jdt](#eclipse-jdt), [clang-format](#clang-format), [prettier](#prettier), [palantir-java-format](#palantir-java-format), [formatAnnotations](#formatAnnotations), [cleanthat](#cleanthat))
   - [Groovy](#groovy) ([eclipse groovy](#eclipse-groovy))
   - [Kotlin](#kotlin) ([ktfmt](#ktfmt), [ktlint](#ktlint), [diktat](#diktat), [prettier](#prettier))
   - [Scala](#scala) ([scalafmt](#scalafmt))
@@ -154,6 +154,9 @@ spotless {
 
     removeUnusedImports()
 
+    // Cleanthat will refactor your code, but it may break your style: apply it before your formatter
+    cleanthat()          // has its own section below
+
     // Choose one of these formatters.
     googleJavaFormat()   // has its own section below
     eclipse()            // has its own section below
@@ -257,6 +260,23 @@ You can use `addTypeAnnotation()` and `removeTypeAnnotation()` to override its d
 
 You can make a pull request to add new annotations to Spotless's default list.
 
+### cleanthat
+
+[homepage](https://github.com/solven-eu/cleanthat). CleanThat enables automatic refactoring of Java code. [ChangeLog](https://github.com/solven-eu/cleanthat/blob/master/CHANGES.MD)
+
+```gradle
+spotless {
+  java {
+    cleanthat()
+    // optional: you can specify a specific version and/or config file
+    cleanthat()
+      .groupArtifact('1.7')                 // default is 'io.github.solven-eu.cleanthat:java'
+      .version('2.1')                             // You may force a past of -SNAPSHOT
+      .sourceCompatibility('1.7')                 // default is '1.7'
+      .addMutator('your.custom.MagicMutator')
+      .excludeMutator('UseCollectionIsEmpty')
+```
+
 
 <a name="applying-to-groovy-source"></a>
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
index e65d0601e7..6e9f6de005 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
@@ -281,7 +281,7 @@ public class CleanthatJavaConfig {
 
 		private String version = CleanthatJavaStep.defaultVersion();
 
-		private String sourceJdk = CleanthatJavaStep.defaultJdkVersion();
+		private String sourceJdk = CleanthatJavaStep.defaultSourceJdk();
 
 		private List<String> mutators = CleanthatJavaStep.defaultMutators();
 
@@ -305,9 +305,9 @@ public CleanthatJavaConfig version(String version) {
 			return this;
 		}
 
-		public CleanthatJavaConfig sourceJdk(String sourceJdk) {
-			Objects.requireNonNull(sourceJdk);
-			this.sourceJdk = sourceJdk;
+		public CleanthatJavaConfig sourceCompatibility(String jdkVersion) {
+			Objects.requireNonNull(jdkVersion);
+			this.sourceJdk = jdkVersion;
 			replaceStep(createStep());
 			return this;
 		}
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index fc276f7c8d..a13353e68e 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -4,7 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* CleanThat Java Refactorer ([#???](https://github.com/diffplug/spotless/pull/???))
+* CleanThat Java Refactorer ([#1560](https://github.com/diffplug/spotless/pull/1560))
 
 ## [2.32.0] - 2023-02-05
 ### Added
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/CleanthatJava.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/CleanthatJava.java
index 7460ab67b9..d7dd1f2530 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/CleanthatJava.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/CleanthatJava.java
@@ -33,7 +33,7 @@ public class CleanthatJava implements FormatterStepFactory {
 
 	// https://maven.apache.org/plugins/maven-compiler-plugin/compile-mojo.html#source
 	@Parameter(property = "maven.compiler.source")
-	private String sourceJdk = CleanthatJavaStep.defaultJdkVersion();
+	private String sourceJdk = CleanthatJavaStep.defaultSourceJdk();
 
 	@Parameter
 	private List<String> mutators = CleanthatJavaStep.defaultMutators();

From 374acb6fec5484f92a1119e05e3a80e9f92a1bc0 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Thu, 9 Feb 2023 00:01:28 +0400
Subject: [PATCH 0777/2068] Fix unitTests

---
 README.md                                     |  2 +-
 lib/build.gradle                              |  9 ++-
 .../java/JavaCleanthatRefactorerFuncTest.java | 72 -------------------
 .../glue/java/JavaCleanthatRefactorerFuncTest | 28 ++++++++
 .../CleanthatJavaIntegrationTest.java         |  2 +-
 5 files changed, 37 insertions(+), 76 deletions(-)
 delete mode 100644 lib/src/testCleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFuncTest.java
 create mode 100644 lib/src/testCompatCleanthat2Dot1/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFuncTest

diff --git a/README.md b/README.md
index 5f59368677..420c13ab53 100644
--- a/README.md
+++ b/README.md
@@ -84,7 +84,7 @@ lib('java.PalantirJavaFormatStep')               +'{{yes}}       | {{yes}}
 lib('java.RemoveUnusedImportsStep')              +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
 extra('java.EclipseJdtFormatterStep')            +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
 lib('java.FormatAnnotationsStep')                +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
-lib('java.CleanthatJavaStep')                    +'{{no}}       | {{yes}}      | {{no}}       | {{no}}  |',
+lib('java.CleanthatJavaStep')                    +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('json.gson.GsonStep')                        +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('json.JacksonJsonStep')                      +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('json.JsonSimpleStep')                       +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
diff --git a/lib/build.gradle b/lib/build.gradle
index cd6996a979..154b2acd6a 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -40,6 +40,12 @@ versionCompatibility {
 			]
 			targetSourceSetName = 'ktlint'
 		}
+		namespaces.register('Cleanthat') {
+			versions = [
+				'2.1',
+			]
+			targetSourceSetName = 'cleanthat'
+		}
 	}
 }
 
@@ -103,9 +109,8 @@ dependencies {
 
 	gsonCompileOnly 'com.google.code.gson:gson:2.10.1'
 
-	// TODO How can one add a test module like 'compatKtLint0Dot48Dot0'?
-	// cleanthatCompileAndTestOnly 'io.github.solven-eu.cleanthat:java:2.1'
 	cleanthatCompileOnly 'io.github.solven-eu.cleanthat:java:2.1'
+	compatCleanthat2Dot1CompileAndTestOnly 'io.github.solven-eu.cleanthat:java:2.1'
 }
 
 // we'll hold the core lib to a high standard
diff --git a/lib/src/testCleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFuncTest.java b/lib/src/testCleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFuncTest.java
deleted file mode 100644
index c811b51233..0000000000
--- a/lib/src/testCleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFuncTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2023 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.glue.ktlint.compat;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
-
-public class KtLintCompat0Dot48Dot0AdapterTest {
-	@Test
-	public void testDefaults(@TempDir Path path) throws IOException {
-		KtLintCompat0Dot48Dot0Adapter ktLintCompat0Dot48Dot0Adapter = new KtLintCompat0Dot48Dot0Adapter();
-		String text = loadAndWriteText(path, "empty_class_body.kt");
-		final Path filePath = Paths.get(path.toString(), "empty_class_body.kt");
-
-		Map<String, String> userData = new HashMap<>();
-
-		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
-
-		String formatted = ktLintCompat0Dot48Dot0Adapter.format(text, filePath, false, false, null, userData, editorConfigOverrideMap);
-		assertEquals("class empty_class_body\n", formatted);
-	}
-
-	@Test
-	public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
-		KtLintCompat0Dot48Dot0Adapter ktLintCompat0Dot48Dot0Adapter = new KtLintCompat0Dot48Dot0Adapter();
-		String text = loadAndWriteText(path, "fails_no_semicolons.kt");
-		final Path filePath = Paths.get(path.toString(), "fails_no_semicolons.kt");
-
-		Map<String, String> userData = new HashMap<>();
-
-		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
-		editorConfigOverrideMap.put("indent_style", "tab");
-		editorConfigOverrideMap.put("ktlint_standard_no-semi", "disabled");
-		// ktlint_filename is an invalid rule in ktlint 0.48.0
-		editorConfigOverrideMap.put("ktlint_filename", "disabled");
-
-		String formatted = ktLintCompat0Dot48Dot0Adapter.format(text, filePath, false, false, null, userData, editorConfigOverrideMap);
-		assertEquals("class fails_no_semicolons {\n\tval i = 0;\n}\n", formatted);
-	}
-
-	private static String loadAndWriteText(Path path, String name) throws IOException {
-		try (InputStream is = KtLintCompat0Dot48Dot0AdapterTest.class.getResourceAsStream("/" + name)) {
-			Files.copy(is, path.resolve(name));
-		}
-		return new String(Files.readAllBytes(path.resolve(name)), StandardCharsets.UTF_8);
-	}
-
-}
diff --git a/lib/src/testCompatCleanthat2Dot1/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFuncTest b/lib/src/testCompatCleanthat2Dot1/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFuncTest
new file mode 100644
index 0000000000..2f3cdc9646
--- /dev/null
+++ b/lib/src/testCompatCleanthat2Dot1/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFuncTest
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.glue.java;
+
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import eu.solven.cleanthat.engine.java.refactorer.JavaRefactorer;
+
+public class JavaCleanthatRefactorerFuncTest {
+	@Test
+	public void testMutatorsDetection() {
+		Assertions.assertThat(JavaRefactorer.getAllIncluded()).isNotEmpty();
+	}
+}
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/CleanthatJavaIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/CleanthatJavaIntegrationTest.java
index 2b3ede1472..a754b963f2 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/CleanthatJavaIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/CleanthatJavaIntegrationTest.java
@@ -31,7 +31,7 @@ void integration() throws IOException {
 				"spotless {",
 				"    java {",
 				"        target file('test.java')",
-				"        cleanthat().sourceJdk('11')",
+				"        cleanthat().sourceCompatibility('11')",
 				"    }",
 				"}");
 

From 8fbbb7165a840fb8d5435266617a342e8fd21846 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Thu, 9 Feb 2023 00:02:25 +0400
Subject: [PATCH 0778/2068] Remove useless dependency

---
 lib/build.gradle | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 154b2acd6a..21181cd54b 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -61,7 +61,6 @@ dependencies {
 	testCommonImplementation "org.junit.jupiter:junit-jupiter:$VER_JUNIT"
 	testCommonImplementation "org.assertj:assertj-core:$VER_ASSERTJ"
 	testCommonImplementation "com.diffplug.durian:durian-testlib:$VER_DURIAN"
-	testCommonImplementation 'io.github.solven-eu.cleanthat:java:2.1'
 
 	// used for pom sorting
 	sortPomCompileOnly 'com.github.ekryd.sortpom:sortpom-sorter:3.0.0'

From 640a1c20426f1f5ef114a8b15176bf618d6b4d0d Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Thu, 9 Feb 2023 00:08:01 +0400
Subject: [PATCH 0779/2068] Remove irrelevant test file

---
 README.md                                     |  2 +-
 .../java/JavaCleanthatRefactorerFuncTest.java | 28 -------------------
 2 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 100644 lib/src/test/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFuncTest.java

diff --git a/README.md b/README.md
index 420c13ab53..662c624bdf 100644
--- a/README.md
+++ b/README.md
@@ -132,7 +132,7 @@ lib('yaml.JacksonYamlStep')                      +'{{yes}}       | {{yes}}
 | [`java.RemoveUnusedImportsStep`](lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`java.EclipseJdtFormatterStep`](lib-extra/src/main/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`java.FormatAnnotationsStep`](lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
-| [`java.CleanthatJavaStep`](lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java) | :white_large_square:       | :+1:      | :white_large_square:       | :white_large_square:  |
+| [`java.CleanthatJavaStep`](lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`json.gson.GsonStep`](lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`json.JacksonJsonStep`](lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`json.JsonSimpleStep`](lib/src/main/java/com/diffplug/spotless/json/JsonSimpleStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
diff --git a/lib/src/test/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFuncTest.java b/lib/src/test/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFuncTest.java
deleted file mode 100644
index 2f3cdc9646..0000000000
--- a/lib/src/test/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFuncTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2023 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.glue.java;
-
-import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-import eu.solven.cleanthat.engine.java.refactorer.JavaRefactorer;
-
-public class JavaCleanthatRefactorerFuncTest {
-	@Test
-	public void testMutatorsDetection() {
-		Assertions.assertThat(JavaRefactorer.getAllIncluded()).isNotEmpty();
-	}
-}

From fdee03ce774ceff7ef92b3d4db680b0e361ed0fd Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Thu, 9 Feb 2023 00:25:00 +0400
Subject: [PATCH 0780/2068] Fix extention of unitTest

---
 ...RefactorerFuncTest => JavaCleanthatRefactorerFuncTest.java} | 0
 plugin-maven/README.md                                         | 3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename lib/src/testCompatCleanthat2Dot1/java/com/diffplug/spotless/glue/java/{JavaCleanthatRefactorerFuncTest => JavaCleanthatRefactorerFuncTest.java} (100%)

diff --git a/lib/src/testCompatCleanthat2Dot1/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFuncTest b/lib/src/testCompatCleanthat2Dot1/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFuncTest.java
similarity index 100%
rename from lib/src/testCompatCleanthat2Dot1/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFuncTest
rename to lib/src/testCompatCleanthat2Dot1/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFuncTest.java
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index b1b9098bfe..f59a1d9004 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -182,6 +182,7 @@ any other maven phase (i.e. compile) then it can be configured as below;
       <include>src/test/java/**/*.java</include>
     </includes>
 
+    <!-- Cleanthat will refactor your code, but it may break your style: apply it before your formatter -->
     <cleanthat />        <!-- has its own section below -->
 
     <googleJavaFormat /> <!-- has its own section below -->
@@ -285,7 +286,7 @@ These mechanisms already exist for the Gradle plugin.
   <version>2.0</version>                          <!-- optional version of Cleanthat -->
   <sourceJdk>${maven.compiler.source}</sourceJdk> <!-- optional. Default to ${maven.compiler.source} else '1.7' -->
   <mutators>
-    <mutator>*</mutator> <!-- optional. Default to '*' to include all mutators -->
+    <mutator>*</mutator>                          <!-- optional. Default to '*' to include all mutators -->
   </mutators>
   <mutators> <!-- List of mutators: https://github.com/solven-eu/cleanthat/tree/master/java/src/main/java/eu/solven/cleanthat/engine/java/refactorer/mutators -->
     <mutator>LiteralsFirstInComparisons</mutator> <!-- You may alternatively list the requested mutators -->

From ce086ba1382f618a2cb0b93c9f2fac02f19cfdb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20L=C3=B8nne?= <lars.lonne@kantega.no>
Date: Wed, 8 Feb 2023 21:34:29 +0100
Subject: [PATCH 0781/2068] adds entry about continuation indent to the other
 changelogs

---
 CHANGES.md               | 2 ++
 plugin-gradle/CHANGES.md | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 5f1a1ffa9f..86a9eeabf2 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Maven plugin with `ktfmt` default style uses correct continuation indent ([#1562](https://github.com/diffplug/spotless/pull/1562))
 
 ## [2.34.1] - 2023-02-05
 ### Changes
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index e3234584b8..9927b56f07 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Maven plugin with `ktfmt` default style uses correct continuation indent ([#1562](https://github.com/diffplug/spotless/pull/1562))
 
 ## [6.14.1] - 2023-02-05
 ### Fixed

From 3e1ea286ca1d203e32f80b557e3fde54c91fa79a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20L=C3=B8nne?= <lonnelars@gmail.com>
Date: Thu, 9 Feb 2023 12:33:03 +0100
Subject: [PATCH 0782/2068] updates copyright

---
 .../com/diffplug/spotless/glue/ktfmt/KtfmtFormatterFunc.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtFormatterFunc.java b/lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtFormatterFunc.java
index e34f7b4755..80f4a42fcd 100644
--- a/lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtFormatterFunc.java
+++ b/lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtFormatterFunc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 DiffPlug
+ * Copyright 2022-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 1b990ab98d23561c4433bcab4175356903b2e5c2 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Thu, 26 Jan 2023 16:35:21 +0100
Subject: [PATCH 0783/2068] 1162: adding tests verifying issue

results in 'Couldn't resolve parser "php"' on gradle side and 'Couldn't resolve parser "java"' on maven side
---
 .../spotless/PrettierIntegrationTest.java     | 42 +++++++++++++++
 .../maven/MavenIntegrationHarness.java        | 15 ++++--
 .../prettier/PrettierFormatStepTest.java      | 52 +++++++++++++++++++
 3 files changed, 105 insertions(+), 4 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java
index 4c458e3ca7..8819d5bc07 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java
@@ -183,6 +183,48 @@ void usePhpCommunityPlugin() throws IOException {
 		assertFile("php-example.php").sameAsResource("npm/prettier/plugins/php.clean");
 	}
 
+	/**
+	 * This test is to ensure that we can have multiple prettier instances in one spotless config.
+	 *
+	 * @see <a href="https://github.com/diffplug/spotless/issues/1162">Issue #1162 on github</a>
+	 */
+	@Test
+	void usePhpAndJavaCommunityPlugin() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"def prettierConfigPhp = [:]",
+				"prettierConfigPhp['tabWidth'] = 3",
+				"prettierConfigPhp['parser'] = 'php'",
+				"def prettierPackagesPhp = [:]",
+				"prettierPackagesPhp['prettier'] = '2.0.5'",
+				"prettierPackagesPhp['@prettier/plugin-php'] = '0.14.2'",
+				"def prettierConfigJava = [:]",
+				"prettierConfigJava['tabWidth'] = 4",
+				"prettierConfigJava['parser'] = 'java'",
+				"def prettierPackagesJava = [:]",
+				"prettierPackagesJava['prettier'] = '2.0.5'",
+				"prettierPackagesJava['prettier-plugin-java'] = '0.8.0'",
+				"spotless {",
+				"    format 'php', {",
+				"        target 'php-example.php'",
+				"        prettier(prettierPackagesPhp).config(prettierConfigPhp)",
+				"    }",
+				"    java {",
+				"        target 'JavaTest.java'",
+				"        prettier(prettierPackagesJava).config(prettierConfigJava)",
+				"    }",
+				"}");
+		setFile("php-example.php").toResource("npm/prettier/plugins/php.dirty");
+		setFile("JavaTest.java").toResource("npm/prettier/plugins/java-test.dirty");
+		final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+		Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		assertFile("php-example.php").sameAsResource("npm/prettier/plugins/php.clean");
+		assertFile("JavaTest.java").sameAsResource("npm/prettier/plugins/java-test.clean");
+	}
+
 	@Test
 	void autodetectNpmrcFileConfig() throws IOException {
 		setFile(".npmrc").toLines(
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
index fdc4a745a1..2891ee3b2c 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
@@ -285,7 +285,7 @@ private static String getSystemProperty(String name) {
 		return value;
 	}
 
-	private static String[] groupWithSteps(String group, String[] includes, String... steps) {
+	protected static String[] groupWithSteps(String group, String[] includes, String... steps) {
 		String[] result = new String[steps.length + includes.length + 2];
 		result[0] = "<" + group + ">";
 		System.arraycopy(includes, 0, result, 1, includes.length);
@@ -294,15 +294,22 @@ private static String[] groupWithSteps(String group, String[] includes, String..
 		return result;
 	}
 
-	private static String[] groupWithSteps(String group, String... steps) {
+	protected static String[] groupWithSteps(String group, String... steps) {
 		return groupWithSteps(group, new String[]{}, steps);
 	}
 
-	private static String[] including(String... includes) {
+	protected static String[] including(String... includes) {
 		return groupWithSteps("includes", groupWithSteps("include", includes));
 	}
 
-	private static String[] formats(String... formats) {
+	protected static String[] formats(String... formats) {
 		return groupWithSteps("formats", formats);
 	}
+
+	protected static String[] formats(String[]... formats) {
+		String[] formatsArray = Arrays.stream(formats)
+				.flatMap(Arrays::stream)
+				.toArray(String[]::new);
+		return formats(formatsArray);
+	}
 }
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/prettier/PrettierFormatStepTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/prettier/PrettierFormatStepTest.java
index 47dab5d152..78a0fc30ff 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/prettier/PrettierFormatStepTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/prettier/PrettierFormatStepTest.java
@@ -106,6 +106,58 @@ void unique_dependency_config() throws Exception {
 		assertThat(result.stdOutUtf8()).contains(Prettier.ERROR_MESSAGE_ONLY_ONE_CONFIG);
 	}
 
+	/**
+	 * This test is to ensure that we can have multiple prettier instances in one spotless config.
+	 *
+	 * @see <a href="https://github.com/diffplug/spotless/issues/1162">Issue #1162 on github</a>
+	 */
+	@Test
+	void multiple_prettier_configs() throws Exception {
+		writePom(
+				formats(
+						groupWithSteps("format", including("php-example.php"),
+								"<prettier>",
+								"  <devDependencyProperties>",
+								"    <property>",
+								"      <name>prettier</name>",
+								"      <value>2.0.5</value>",
+								"    </property>",
+								"    <property>",
+								"      <name>@prettier/plugin-php</name>",
+								"      <value>0.14.2</value>",
+								"    </property>",
+								"  </devDependencyProperties>",
+								"  <config>",
+								"    <tabWidth>3</tabWidth>",
+								"    <parser>php</parser>",
+								"  </config>",
+								"</prettier>"),
+						groupWithSteps("java", including("JavaTest.java"),
+								"<prettier>",
+								"  <devDependencyProperties>",
+								"    <property>",
+								"      <name>prettier</name>",
+								"      <value>2.0.5</value>",
+								"    </property>",
+								"    <property>",
+								"      <name>prettier-plugin-java</name>",
+								"      <value>0.8.0</value>",
+								"    </property>",
+								"  </devDependencyProperties>",
+								"  <config>",
+								"    <tabWidth>4</tabWidth>",
+								"    <parser>java</parser>",
+								"  </config>",
+								"</prettier>")));
+
+		setFile("php-example.php").toResource("npm/prettier/plugins/php.dirty");
+		setFile("JavaTest.java").toResource("npm/prettier/plugins/java-test.dirty");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("php-example.php").sameAsResource("npm/prettier/plugins/php.clean");
+		assertFile("JavaTest.java").sameAsResource("npm/prettier/plugins/java-test.clean");
+
+	}
+
 	@Test
 	void custom_plugin() throws Exception {
 		writePomWithFormatSteps(

From fdbbd024158911d65cb567b04340f875d45dd46b Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Fri, 27 Jan 2023 20:21:18 +0100
Subject: [PATCH 0784/2068] 1162: add unique suffix reflecting package.json
 content

---
 .../diffplug/spotless/npm/NodeServerLayout.java |  4 ++--
 .../spotless/npm/NpmFormatterStepStateBase.java |  9 ++++++++-
 .../spotless/npm/NpmResourceHelper.java         | 17 +++++++++++++++++
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NodeServerLayout.java b/lib/src/main/java/com/diffplug/spotless/npm/NodeServerLayout.java
index 63a6a923da..60c34bcc8c 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NodeServerLayout.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NodeServerLayout.java
@@ -29,8 +29,8 @@ class NodeServerLayout {
 	private final File serveJsFile;
 	private final File npmrcFile;
 
-	NodeServerLayout(File buildDir, String stepName) {
-		this.nodeModulesDir = new File(buildDir, "spotless-node-modules-" + stepName);
+	NodeServerLayout(File buildDir, String stepName, String stepSuffix) {
+		this.nodeModulesDir = new File(buildDir, String.format("spotless-node-modules-%s-%s", stepName, stepSuffix));
 		this.packageJsonFile = new File(nodeModulesDir, "package.json");
 		this.serveJsFile = new File(nodeModulesDir, "serve.js");
 		this.npmrcFile = new File(nodeModulesDir, ".npmrc");
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
index 92ac7df6f2..412a827d9e 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
@@ -56,7 +56,14 @@ protected NpmFormatterStepStateBase(String stepName, NpmConfig npmConfig, NpmFor
 		this.stepName = requireNonNull(stepName);
 		this.npmConfig = requireNonNull(npmConfig);
 		this.locations = locations;
-		this.nodeServerLayout = new NodeServerLayout(locations.buildDir(), stepName);
+		String stateSuffix = stateSuffix();
+		logger.info("Creating {} with name {} and state suffix {}", this.getClass().getSimpleName(), stepName, stateSuffix);
+		this.nodeServerLayout = new NodeServerLayout(locations.buildDir(), stepName, stateSuffix);
+	}
+
+	protected String stateSuffix() {
+		String packageJsonContent = npmConfig.getPackageJsonContent();
+		return NpmResourceHelper.md5(packageJsonContent);
 	}
 
 	protected void prepareNodeServerLayout() throws IOException {
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmResourceHelper.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmResourceHelper.java
index 2acf3a180d..aa66c54fcf 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmResourceHelper.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmResourceHelper.java
@@ -21,6 +21,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
+import java.security.MessageDigest;
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.Objects;
@@ -122,4 +123,20 @@ static File copyFileToDirAtSubpath(File file, File targetDir, String relativePat
 			throw ThrowingEx.asRuntime(e);
 		}
 	}
+
+	static String md5(File file) {
+		return md5(readUtf8StringFromFile(file));
+	}
+
+	static String md5(String fileContent) {
+		MessageDigest md = ThrowingEx.get(() -> MessageDigest.getInstance("MD5"));
+		md.update(fileContent.getBytes(StandardCharsets.UTF_8));
+		byte[] digest = md.digest();
+		// convert byte array digest to hex string
+		StringBuilder sb = new StringBuilder();
+		for (byte b : digest) {
+			sb.append(String.format("%02x", b & 0xff));
+		}
+		return sb.toString();
+	}
 }

From e0a290a2b784b073eb13bac62f77dff57b9cee11 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Wed, 8 Feb 2023 21:09:13 +0100
Subject: [PATCH 0785/2068] 1162: separate node dirs per package.json

---
 .../spotless/npm/NodeServerLayout.java        | 40 ++++++++++++++++---
 .../npm/NpmFormatterStepStateBase.java        | 18 ++++-----
 .../diffplug/spotless/npm/eslint-package.json |  2 +-
 .../spotless/npm/prettier-package.json        |  2 +-
 .../diffplug/spotless/npm/tsfmt-package.json  |  2 +-
 5 files changed, 45 insertions(+), 19 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NodeServerLayout.java b/lib/src/main/java/com/diffplug/spotless/npm/NodeServerLayout.java
index 60c34bcc8c..8b39c5e4ab 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NodeServerLayout.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NodeServerLayout.java
@@ -18,25 +18,44 @@
 import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
 import com.diffplug.spotless.ThrowingEx;
 
 class NodeServerLayout {
 
+	private static final Pattern PACKAGE_JSON_NAME_PATTERN = Pattern.compile("\"name\"\\s*:\\s*\"([^\"]+)\"");
+
 	private final File nodeModulesDir;
 	private final File packageJsonFile;
+
+	private final File packageLockJsonFile;
+
 	private final File serveJsFile;
 	private final File npmrcFile;
 
-	NodeServerLayout(File buildDir, String stepName, String stepSuffix) {
-		this.nodeModulesDir = new File(buildDir, String.format("spotless-node-modules-%s-%s", stepName, stepSuffix));
+	NodeServerLayout(File buildDir, String packageJsonContent) {
+		this.nodeModulesDir = new File(buildDir, nodeModulesDirName(packageJsonContent));
 		this.packageJsonFile = new File(nodeModulesDir, "package.json");
+		this.packageLockJsonFile = new File(nodeModulesDir, "package-lock.json");
 		this.serveJsFile = new File(nodeModulesDir, "serve.js");
 		this.npmrcFile = new File(nodeModulesDir, ".npmrc");
 	}
 
+	private static String nodeModulesDirName(String packageJsonContent) {
+		String md5Hash = NpmResourceHelper.md5(packageJsonContent);
+		Matcher matcher = PACKAGE_JSON_NAME_PATTERN.matcher(packageJsonContent);
+		if (!matcher.find()) {
+			throw new IllegalArgumentException("package.json must contain a name property");
+		}
+		String packageName = matcher.group(1);
+		return String.format("%s-node-modules-%s", packageName, md5Hash);
+	}
+
 	File nodeModulesDir() {
+
 		return nodeModulesDir;
 	}
 
@@ -52,10 +71,6 @@ public File npmrcFile() {
 		return npmrcFile;
 	}
 
-	static File getBuildDirFromNodeModulesDir(File nodeModulesDir) {
-		return nodeModulesDir.getParentFile();
-	}
-
 	public boolean isLayoutPrepared() {
 		if (!nodeModulesDir().isDirectory()) {
 			return false;
@@ -63,6 +78,9 @@ public boolean isLayoutPrepared() {
 		if (!packageJsonFile().isFile()) {
 			return false;
 		}
+		if (!packageLockJsonFile.isFile()) {
+			return false;
+		}
 		if (!serveJsFile().isFile()) {
 			return false;
 		}
@@ -82,4 +100,14 @@ public boolean isNodeModulesPrepared() {
 			}
 		});
 	}
+
+	@Override
+	public String toString() {
+		return String.format(
+				"NodeServerLayout[nodeModulesDir=%s, packageJsonFile=%s, serveJsFile=%s, npmrcFile=%s]",
+				this.nodeModulesDir,
+				this.packageJsonFile,
+				this.serveJsFile,
+				this.npmrcFile);
+	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
index 412a827d9e..f3f8a80fe8 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
@@ -56,17 +56,13 @@ protected NpmFormatterStepStateBase(String stepName, NpmConfig npmConfig, NpmFor
 		this.stepName = requireNonNull(stepName);
 		this.npmConfig = requireNonNull(npmConfig);
 		this.locations = locations;
-		String stateSuffix = stateSuffix();
-		logger.info("Creating {} with name {} and state suffix {}", this.getClass().getSimpleName(), stepName, stateSuffix);
-		this.nodeServerLayout = new NodeServerLayout(locations.buildDir(), stepName, stateSuffix);
-	}
-
-	protected String stateSuffix() {
-		String packageJsonContent = npmConfig.getPackageJsonContent();
-		return NpmResourceHelper.md5(packageJsonContent);
+		this.nodeServerLayout = new NodeServerLayout(locations.buildDir(), npmConfig.getPackageJsonContent());
 	}
 
 	protected void prepareNodeServerLayout() throws IOException {
+		final long started = System.currentTimeMillis();
+		// maybe introduce trace logger?
+		logger.info("Preparing {} for npm step {}.", this.nodeServerLayout, getClass().getName());
 		NpmResourceHelper.assertDirectoryExists(nodeServerLayout.nodeModulesDir());
 		NpmResourceHelper.writeUtf8StringToFile(nodeServerLayout.packageJsonFile(),
 				this.npmConfig.getPackageJsonContent());
@@ -77,12 +73,14 @@ protected void prepareNodeServerLayout() throws IOException {
 		} else {
 			NpmResourceHelper.deleteFileIfExists(nodeServerLayout.npmrcFile());
 		}
+		logger.info("Prepared {} for npm step {} in {} ms.", this.nodeServerLayout, getClass().getName(), System.currentTimeMillis() - started);
 	}
 
 	protected void prepareNodeServer() throws IOException {
-		FormattedPrinter.SYSOUT.print("running npm install");
+		final long started = System.currentTimeMillis();
+		logger.info("running npm install in {} for npm step {}", this.nodeServerLayout.nodeModulesDir(), getClass().getName());
 		runNpmInstall(nodeServerLayout.nodeModulesDir());
-		FormattedPrinter.SYSOUT.print("npm install finished");
+		logger.info("npm install finished in {} ms in {} for npm step {}", System.currentTimeMillis() - started, this.nodeServerLayout.nodeModulesDir(), getClass().getName());
 	}
 
 	private void runNpmInstall(File npmProjectDir) throws IOException {
diff --git a/lib/src/main/resources/com/diffplug/spotless/npm/eslint-package.json b/lib/src/main/resources/com/diffplug/spotless/npm/eslint-package.json
index dcd91e729d..0d7ce930f7 100644
--- a/lib/src/main/resources/com/diffplug/spotless/npm/eslint-package.json
+++ b/lib/src/main/resources/com/diffplug/spotless/npm/eslint-package.json
@@ -1,5 +1,5 @@
 {
-	"name": "spotless-eslint-formatter-step",
+	"name": "spotless-eslint",
 	"version": "2.0.0",
 	"description": "Spotless formatter step for running eslint as a rest service.",
 	"repository": "https://github.com/diffplug/spotless",
diff --git a/lib/src/main/resources/com/diffplug/spotless/npm/prettier-package.json b/lib/src/main/resources/com/diffplug/spotless/npm/prettier-package.json
index 7bda08db8a..395a05da67 100644
--- a/lib/src/main/resources/com/diffplug/spotless/npm/prettier-package.json
+++ b/lib/src/main/resources/com/diffplug/spotless/npm/prettier-package.json
@@ -1,5 +1,5 @@
 {
-	"name": "spotless-prettier-formatter-step",
+	"name": "spotless-prettier",
 	"version": "2.0.0",
 	"description": "Spotless formatter step for running prettier as a rest service.",
 	"repository": "https://github.com/diffplug/spotless",
diff --git a/lib/src/main/resources/com/diffplug/spotless/npm/tsfmt-package.json b/lib/src/main/resources/com/diffplug/spotless/npm/tsfmt-package.json
index 7037bd2ec1..483dd0753d 100644
--- a/lib/src/main/resources/com/diffplug/spotless/npm/tsfmt-package.json
+++ b/lib/src/main/resources/com/diffplug/spotless/npm/tsfmt-package.json
@@ -1,5 +1,5 @@
 {
-	"name": "spotless-tsfmt-formatter-step",
+	"name": "spotless-tsfmt",
 	"version": "2.0.0",
 	"description": "Spotless formatter step for running tsfmt as a rest service.",
 	"repository": "https://github.com/diffplug/spotless",

From 080f2378af86d3fa8e8db5be207a03415dc47fe8 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Thu, 9 Feb 2023 20:44:38 +0100
Subject: [PATCH 0786/2068] 1162: use slf4j for logging

---
 .../com/diffplug/spotless/LazyArgLogger.java  | 40 ++++++++++++++++++
 .../spotless/npm/EslintFormatterStep.java     |  9 ++--
 .../spotless/npm/FormattedPrinter.java        | 42 -------------------
 .../spotless/npm/PrettierFormatterStep.java   |  7 ++--
 .../spotless/PrettierIntegrationTest.java     |  4 +-
 5 files changed, 52 insertions(+), 50 deletions(-)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/LazyArgLogger.java
 delete mode 100644 lib/src/main/java/com/diffplug/spotless/npm/FormattedPrinter.java

diff --git a/lib/src/main/java/com/diffplug/spotless/LazyArgLogger.java b/lib/src/main/java/com/diffplug/spotless/LazyArgLogger.java
new file mode 100644
index 0000000000..e3456a2317
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/LazyArgLogger.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless;
+
+import java.util.function.Supplier;
+
+/**
+ * This is a utility class to allow for lazy evaluation of arguments to be passed to a logger
+ * and thus avoid unnecessary computation of the arguments if the log level is not enabled.
+ */
+public final class LazyArgLogger {
+
+	private final Supplier<Object> argSupplier;
+
+	private LazyArgLogger(Supplier<Object> argSupplier) {
+		this.argSupplier = argSupplier;
+	}
+
+	public static LazyArgLogger lazy(Supplier<Object> argSupplier) {
+		return new LazyArgLogger(argSupplier);
+	}
+
+	@Override
+	public String toString() {
+		return String.valueOf(argSupplier.get());
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
index 221a745ad7..b262bb4b98 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
@@ -15,6 +15,7 @@
  */
 package com.diffplug.spotless.npm;
 
+import static com.diffplug.spotless.LazyArgLogger.lazy;
 import static java.util.Objects.requireNonNull;
 
 import java.io.File;
@@ -115,7 +116,7 @@ protected void prepareNodeServerLayout() throws IOException {
 				// If any config files are provided, we need to make sure they are at the same location as the node modules
 				// as eslint will try to resolve plugin/config names relatively to the config file location and some
 				// eslint configs contain relative paths to additional config files (such as tsconfig.json e.g.)
-				FormattedPrinter.SYSOUT.print("Copying config file <%s> to <%s> and using the copy", origEslintConfig.getEslintConfigPath(), nodeServerLayout.nodeModulesDir());
+				logger.info("Copying config file <{}> to <{}> and using the copy", origEslintConfig.getEslintConfigPath(), nodeServerLayout.nodeModulesDir());
 				File configFileCopy = NpmResourceHelper.copyFileToDir(origEslintConfig.getEslintConfigPath(), nodeServerLayout.nodeModulesDir());
 				this.eslintConfigInUse = this.origEslintConfig.withEslintConfigPath(configFileCopy).verify();
 			}
@@ -125,7 +126,7 @@ protected void prepareNodeServerLayout() throws IOException {
 		@Nonnull
 		public FormatterFunc createFormatterFunc() {
 			try {
-				FormattedPrinter.SYSOUT.print("creating formatter function (starting server)");
+				logger.info("Creating formatter function (starting server)");
 				ServerProcessInfo eslintRestServer = npmRunServer();
 				EslintRestService restService = new EslintRestService(eslintRestServer.getBaseUrl());
 				return Closeable.ofDangerous(() -> endServer(restService, eslintRestServer), new EslintFilePathPassingFormatterFunc(locations.projectDir(), nodeServerLayout.nodeModulesDir(), eslintConfigInUse, restService));
@@ -135,7 +136,7 @@ public FormatterFunc createFormatterFunc() {
 		}
 
 		private void endServer(BaseNpmRestService restService, ServerProcessInfo restServer) throws Exception {
-			FormattedPrinter.SYSOUT.print("Closing formatting function (ending server).");
+			logger.info("Closing formatting function (ending server).");
 			try {
 				restService.shutdown();
 			} catch (Throwable t) {
@@ -161,7 +162,7 @@ public EslintFilePathPassingFormatterFunc(File projectDir, File nodeModulesDir,
 
 		@Override
 		public String applyWithFile(String unix, File file) throws Exception {
-			FormattedPrinter.SYSOUT.print("formatting String '" + unix.substring(0, Math.min(50, unix.length())) + "[...]' in file '" + file + "'");
+			logger.info("formatting String '{}[...]' in file '{}'", lazy(() -> unix.substring(0, Math.min(50, unix.length()))), file);
 
 			Map<FormatOption, Object> eslintCallOptions = new HashMap<>();
 			setConfigToCallOptions(eslintCallOptions);
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/FormattedPrinter.java b/lib/src/main/java/com/diffplug/spotless/npm/FormattedPrinter.java
deleted file mode 100644
index 97d5cdb4c6..0000000000
--- a/lib/src/main/java/com/diffplug/spotless/npm/FormattedPrinter.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2020 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.npm;
-
-import static java.util.Objects.requireNonNull;
-
-import java.io.PrintStream;
-import java.time.LocalDateTime;
-
-enum FormattedPrinter {
-	SYSOUT(System.out);
-
-	private static final boolean enabled = false;
-
-	private final PrintStream printStream;
-
-	FormattedPrinter(PrintStream printStream) {
-		this.printStream = requireNonNull(printStream);
-	}
-
-	public void print(String msg, Object... paramsForStringFormat) {
-		if (!enabled) {
-			return;
-		}
-		String formatted = String.format(msg, paramsForStringFormat);
-		String prefixed = String.format("[%s] %s", LocalDateTime.now().toString(), formatted);
-		this.printStream.println(prefixed);
-	}
-}
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
index 22f1a69e7c..05c61f9bdf 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
@@ -15,6 +15,7 @@
  */
 package com.diffplug.spotless.npm;
 
+import static com.diffplug.spotless.LazyArgLogger.lazy;
 import static java.util.Objects.requireNonNull;
 
 import java.io.File;
@@ -86,7 +87,7 @@ private static class State extends NpmFormatterStepStateBase implements Serializ
 		@Nonnull
 		public FormatterFunc createFormatterFunc() {
 			try {
-				FormattedPrinter.SYSOUT.print("creating formatter function (starting server)");
+				logger.info("creating formatter function (starting server)");
 				ServerProcessInfo prettierRestServer = npmRunServer();
 				PrettierRestService restService = new PrettierRestService(prettierRestServer.getBaseUrl());
 				String prettierConfigOptions = restService.resolveConfig(this.prettierConfig.getPrettierConfigPath(), this.prettierConfig.getOptions());
@@ -97,7 +98,7 @@ public FormatterFunc createFormatterFunc() {
 		}
 
 		private void endServer(PrettierRestService restService, ServerProcessInfo restServer) throws Exception {
-			FormattedPrinter.SYSOUT.print("Closing formatting function (ending server).");
+			logger.info("Closing formatting function (ending server).");
 			try {
 				restService.shutdown();
 			} catch (Throwable t) {
@@ -119,7 +120,7 @@ public PrettierFilePathPassingFormatterFunc(String prettierConfigOptions, Pretti
 
 		@Override
 		public String applyWithFile(String unix, File file) throws Exception {
-			FormattedPrinter.SYSOUT.print("formatting String '" + unix.substring(0, Math.min(50, unix.length())) + "[...]' in file '" + file + "'");
+			logger.info("formatting String '{}[...]' in file '{}'", lazy(() -> unix.substring(0, Math.min(50, unix.length()))), file);
 
 			final String prettierConfigOptionsWithFilepath = assertFilepathInConfigOptions(file);
 			try {
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java
index 8819d5bc07..a6b2ea9dc8 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java
@@ -219,8 +219,10 @@ void usePhpAndJavaCommunityPlugin() throws IOException {
 				"}");
 		setFile("php-example.php").toResource("npm/prettier/plugins/php.dirty");
 		setFile("JavaTest.java").toResource("npm/prettier/plugins/java-test.dirty");
-		final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+		final BuildResult spotlessApply = gradleRunner().forwardOutput().withArguments("--stacktrace", "--info", "spotlessApply").build();
 		Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		final BuildResult spotlessApply2 = gradleRunner().forwardOutput().withArguments("--stacktrace", "--info", "spotlessApply").build();
+		Assertions.assertThat(spotlessApply2.getOutput()).contains("BUILD SUCCESSFUL");
 		assertFile("php-example.php").sameAsResource("npm/prettier/plugins/php.clean");
 		assertFile("JavaTest.java").sameAsResource("npm/prettier/plugins/java-test.clean");
 	}

From 92eb869d8a50a86dacc416b0d49052ccd4137ec5 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Thu, 9 Feb 2023 20:54:10 +0100
Subject: [PATCH 0787/2068] 1162: prepare changelog

---
 CHANGES.md               | 5 ++++-
 plugin-gradle/CHANGES.md | 3 +++
 plugin-maven/CHANGES.md  | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 5f1a1ffa9f..0e2e994a22 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,7 +10,10 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
-
+### Added
+* Introduce `LazyArgLogger` to allow for lazy evaluation of log messages in slf4j logging. ([#1565](https://github.com/diffplug/spotless/pull/1565))
+### Fixed
+* Allow multiple instances of the same npm-based formatter to be used by separating their `node_modules` directories. ([#1565](https://github.com/diffplug/spotless/pull/1565))
 ## [2.34.1] - 2023-02-05
 ### Changes
 * **POTENTIALLY BREAKING** Bump bytecode from Java 8 to 11 ([#1530](https://github.com/diffplug/spotless/pull/1530) part 2 of [#1337](https://github.com/diffplug/spotless/issues/1337))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index e3234584b8..ec5ae54c27 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,9 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Allow multiple instances of the same npm-based formatter to be used simultaneously. E.g. use prettier for typescript
+  *and* Java (using the community prettier-plugin-java) without messing up their respective `node_module` dependencies. ([#1565](https://github.com/diffplug/spotless/pull/1565))
 
 ## [6.14.1] - 2023-02-05
 ### Fixed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 567d880f4f..cce049488a 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,9 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Allow multiple instances of the same npm-based formatter to be used simultaneously. E.g. use prettier for typescript
+  *and* Java (using the community prettier-plugin-java) without messing up their respective `node_module` dependencies. ([#1565](https://github.com/diffplug/spotless/pull/1565))
 
 ## [2.32.0] - 2023-02-05
 ### Added

From 4cb02f30d815992dc23ef9dc8f4e20bd9b9c3147 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20L=C3=B8nne?= <lonnelars@gmail.com>
Date: Fri, 10 Feb 2023 12:59:00 +0100
Subject: [PATCH 0788/2068] runs spotlessApply and removes an unused import

---
 .../test/java/com/diffplug/spotless/maven/kotlin/KtfmtTest.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtfmtTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtfmtTest.java
index 25ecbc598d..e452c5d56b 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtfmtTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtfmtTest.java
@@ -19,8 +19,6 @@
 
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
 
-import java.io.IOException;
-
 class KtfmtTest extends MavenIntegrationHarness {
 	@Test
 	void testKtfmt() throws Exception {

From 2204510cec06405430325d7f41a0abb93a90f0f8 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 10 Feb 2023 10:05:05 -0800
Subject: [PATCH 0789/2068] Update default KtFmtStep version to 0.43

---
 lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
index b6f7a533eb..d6a20bc5b3 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
@@ -39,7 +39,7 @@ public class KtfmtStep {
 	// prevent direct instantiation
 	private KtfmtStep() {}
 
-	private static final String DEFAULT_VERSION = "0.42";
+	private static final String DEFAULT_VERSION = "0.43";
 	static final String NAME = "ktfmt";
 	static final String PACKAGE = "com.facebook";
 	static final String MAVEN_COORDINATE = PACKAGE + ":ktfmt:";

From 4fac2e978c36e1688784cf44541853731aa240b9 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 10 Feb 2023 10:10:13 -0800
Subject: [PATCH 0790/2068] Bump default version of jackston steps 2.14.1 ->
 2.14.2

---
 lib/build.gradle                                                | 2 +-
 .../main/java/com/diffplug/spotless/json/JacksonJsonStep.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index fa80767047..81a6229f35 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -63,7 +63,7 @@ dependencies {
 
 	// used jackson-based formatters
 	jacksonCompileOnly 'com.fasterxml.jackson.core:jackson-databind:2.14.2'
-	jacksonCompileOnly 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.14.1'
+	jacksonCompileOnly 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.14.2'
 
 	String VER_KTFMT = '0.42'
 	ktfmtCompileOnly "com.facebook:ktfmt:$VER_KTFMT"
diff --git a/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java b/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java
index f15edbbd42..94c48e0c5c 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java
@@ -33,7 +33,7 @@
 public class JacksonJsonStep {
 	static final String MAVEN_COORDINATE = "com.fasterxml.jackson.core:jackson-databind:";
 	// https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind
-	static final String DEFAULT_VERSION = "2.14.1";
+	static final String DEFAULT_VERSION = "2.14.2";
 
 	private JacksonJsonStep() {}
 

From 4f92a676b191aa109fb09d5f29c522e6ddf27810 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 10 Feb 2023 10:22:37 -0800
Subject: [PATCH 0791/2068] Update changelogs.

---
 CHANGES.md               | 2 ++
 plugin-gradle/CHANGES.md | 2 ++
 plugin-maven/CHANGES.md  | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 7c96483595..4909423395 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -16,6 +16,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Allow multiple instances of the same npm-based formatter to be used by separating their `node_modules` directories. ([#1565](https://github.com/diffplug/spotless/pull/1565))
 * `ktfmt` default style uses correct continuation indent. ([#1562](https://github.com/diffplug/spotless/pull/1562))
+### Changes
+* Bump default `ktfmt` version to latest `0.42` -> `0.43` ([#1561](https://github.com/diffplug/spotless/pull/1561))
 
 ## [2.34.1] - 2023-02-05
 ### Changes
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 5148a11e10..8cba44831d 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -9,6 +9,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Allow multiple instances of the same npm-based formatter to be used simultaneously. E.g. use prettier for typescript
   *and* Java (using the community prettier-plugin-java) without messing up their respective `node_module` dependencies. ([#1565](https://github.com/diffplug/spotless/pull/1565))
 * `ktfmt` default style uses correct continuation indent. ([#1562](https://github.com/diffplug/spotless/pull/1562))
+### Changes
+* Bump default `ktfmt` version to latest `0.42` -> `0.43` ([#1561](https://github.com/diffplug/spotless/pull/1561))
 
 ## [6.14.1] - 2023-02-05
 ### Fixed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 8600825903..035520076d 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -9,6 +9,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Allow multiple instances of the same npm-based formatter to be used simultaneously. E.g. use prettier for typescript
   *and* Java (using the community prettier-plugin-java) without messing up their respective `node_module` dependencies. ([#1565](https://github.com/diffplug/spotless/pull/1565))
 * `ktfmt` default style uses correct continuation indent. ([#1562](https://github.com/diffplug/spotless/pull/1562))
+### Changes
+* Bump default `ktfmt` version to latest `0.42` -> `0.43` ([#1561](https://github.com/diffplug/spotless/pull/1561))
 
 ## [2.32.0] - 2023-02-05
 ### Added

From c2979127467ee7abd976d3503779d9f4a1c2637c Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 10 Feb 2023 10:28:58 -0800
Subject: [PATCH 0792/2068] Bump changelogs.

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 1 +
 plugin-maven/CHANGES.md  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 4909423395..b59568d1d4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -18,6 +18,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * `ktfmt` default style uses correct continuation indent. ([#1562](https://github.com/diffplug/spotless/pull/1562))
 ### Changes
 * Bump default `ktfmt` version to latest `0.42` -> `0.43` ([#1561](https://github.com/diffplug/spotless/pull/1561))
+* Bump default `jackson` version to latest `2.14.1` -> `2.14.2` ([#1536](https://github.com/diffplug/spotless/pull/1536))
 
 ## [2.34.1] - 2023-02-05
 ### Changes
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 8cba44831d..10b2adaac7 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -11,6 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * `ktfmt` default style uses correct continuation indent. ([#1562](https://github.com/diffplug/spotless/pull/1562))
 ### Changes
 * Bump default `ktfmt` version to latest `0.42` -> `0.43` ([#1561](https://github.com/diffplug/spotless/pull/1561))
+* Bump default `jackson` version to latest `2.14.1` -> `2.14.2` ([#1536](https://github.com/diffplug/spotless/pull/1536))
 
 ## [6.14.1] - 2023-02-05
 ### Fixed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 035520076d..6de9a15d5e 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -11,6 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * `ktfmt` default style uses correct continuation indent. ([#1562](https://github.com/diffplug/spotless/pull/1562))
 ### Changes
 * Bump default `ktfmt` version to latest `0.42` -> `0.43` ([#1561](https://github.com/diffplug/spotless/pull/1561))
+* Bump default `jackson` version to latest `2.14.1` -> `2.14.2` ([#1536](https://github.com/diffplug/spotless/pull/1536))
 
 ## [2.32.0] - 2023-02-05
 ### Added

From c04253f80b7f8dfa9bdfafde9f7272e88c6db6ad Mon Sep 17 00:00:00 2001
From: runner <runner@fv-az257-126>
Date: Fri, 10 Feb 2023 18:43:54 +0000
Subject: [PATCH 0793/2068] Published lib/2.35.0

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index b59568d1d4..eec8753271 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.35.0] - 2023-02-10
 ### Added
 * CleanThat Java Refactorer. ([#1560](https://github.com/diffplug/spotless/pull/1560))
 * Introduce `LazyArgLogger` to allow for lazy evaluation of log messages in slf4j logging. ([#1565](https://github.com/diffplug/spotless/pull/1565))

From 32a240d7f3f46b1be5ffe133b4fbf6502eeb2028 Mon Sep 17 00:00:00 2001
From: runner <runner@fv-az257-126>
Date: Fri, 10 Feb 2023 18:46:05 +0000
Subject: [PATCH 0794/2068] Published gradle/6.15.0

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 50 ++++++++++++++++++++--------------------
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 10b2adaac7..087c1ade89 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [6.15.0] - 2023-02-10
 ### Added
 * CleanThat Java Refactorer. ([#1560](https://github.com/diffplug/spotless/pull/1560))
 ### Fixed
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index c0f8adebfb..7471138c60 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -14,9 +14,9 @@ output = [
   ].join('\n');
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
-[![Changelog](https://img.shields.io/badge/changelog-6.14.1-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-6.15.0-blue.svg)](CHANGES.md)
 [![Maven central](https://img.shields.io/badge/mavencentral-here-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/index.html)
 
 [![VS Code plugin](https://img.shields.io/badge/IDE-VS_Code-blueviolet.svg)](https://marketplace.visualstudio.com/items?itemName=richardwillis.vscode-spotless-gradle)
 [![IntelliJ plugin](https://img.shields.io/badge/IDE-IntelliJ-blueviolet.svg)](https://plugins.jetbrains.com/plugin/18321-spotless-gradle)
@@ -123,10 +123,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -138,7 +138,7 @@ If you're stuck on an older version of Gradle, `id 'com.diffplug.gradle.spotless
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -282,8 +282,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -334,8 +334,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -406,7 +406,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -438,7 +438,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -470,7 +470,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -504,7 +504,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -525,7 +525,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -550,7 +550,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -590,7 +590,7 @@ sql.formatter.indent.size=4
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -682,7 +682,7 @@ For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#n
 
 ## Javascript
 
-- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
+- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
 
 ```gradle
 spotless {
@@ -746,7 +746,7 @@ For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#n
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -821,7 +821,7 @@ spotless {
 
 ## YAML
 
-- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
+- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
 
 ```gradle
 spotless {
@@ -1034,7 +1034,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -1107,9 +1107,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -1142,11 +1142,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.14.1/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From 7f0807f20c96fcf46c3d9d6fff6a35ad3745d15f Mon Sep 17 00:00:00 2001
From: runner <runner@fv-az257-126>
Date: Fri, 10 Feb 2023 18:48:45 +0000
Subject: [PATCH 0795/2068] Published maven/2.33.0

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 6de9a15d5e..74c6a0299a 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.33.0] - 2023-02-10
 ### Added
 * CleanThat Java Refactorer. ([#1560](https://github.com/diffplug/spotless/pull/1560))
 ### Fixed
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index f59a1d9004..51ea9c23d7 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -8,8 +8,8 @@ output = [
   ].join('\n');
 -->
 [![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Changelog](https://img.shields.io/badge/changelog-2.32.0-blue.svg)](CHANGES.md)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.32.0/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.33.0-blue.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.33.0/index.html)
 <!---freshmark /shields -->
 
 <!---freshmark javadoc

From 1590327462aa3784e152a2c4c88bc131e1a9deb5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 11 Feb 2023 00:06:42 +0000
Subject: [PATCH 0796/2068] Update plugin com.diffplug.spotless to v6.15.0

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 077fdd9336..d5518d8a40 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-	id 'com.diffplug.spotless' version '6.14.1' apply false
+	id 'com.diffplug.spotless' version '6.15.0' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
 	id 'com.gradle.plugin-publish' version '1.1.0' apply false
 	// https://github.com/gradle-nexus/publish-plugin/releases

From a3c5edb9eaf8ac806f84b521824d7b299bbd19d5 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Sun, 12 Feb 2023 20:51:31 +0400
Subject: [PATCH 0797/2068] Update Cleanthat to 2.2. Tests workaround lack of
 OptionalNotEmpty

---
 .../spotless/java/CleanthatJavaStep.java       |  5 ++---
 .../java/CleanthatJavaRefactorerTest.java      | 18 +++++++++++++++++-
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
index b5cc5452d1..2ef68f4f85 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
@@ -40,7 +40,7 @@ public final class CleanthatJavaStep {
 	private static final String MAVEN_COORDINATE = "io.github.solven-eu.cleanthat:java";
 
 	// CleanThat changelog is available at https://github.com/solven-eu/cleanthat/blob/master/CHANGES.MD
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "2.1");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "2.2");
 
 	// prevent direct instantiation
 	private CleanthatJavaStep() {}
@@ -71,8 +71,7 @@ public static List<String> defaultExcludedMutators() {
 	 * @return
 	 */
 	public static List<String> defaultMutators() {
-		// see JavaRefactorerProperties.WILDCARD
-		return List.of("*");
+		return List.of("eu.solven.cleanthat.engine.java.refactorer.mutators.composite.SafeAndConsensualMutators");
 	}
 
 	/** Creates a step which apply selected CleanThat mutators. */
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java
index edb7a69cd5..a32ac337e4 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java
@@ -29,6 +29,9 @@ class CleanthatJavaRefactorerTest extends MavenIntegrationHarness {
 	void testLiteralsFirstInComparisons() throws Exception {
 		writePomWithJavaSteps(
 				"<cleanthat>",
+				"  <mutators>",
+				"    <mutator>LiteralsFirstInComparisons</mutator>",
+				"  </mutators>",
 				"</cleanthat>");
 
 		runTest("LiteralsFirstInComparisons.dirty.java", "LiteralsFirstInComparisons.clean.java");
@@ -36,8 +39,13 @@ void testLiteralsFirstInComparisons() throws Exception {
 
 	@Test
 	void testMultipleMutators_defaultIsJdk7() throws Exception {
+		// OptionalNotEmpty will be excluded as it is not compatible with JDK7
 		writePomWithJavaSteps(
 				"<cleanthat>",
+				"  <mutators>",
+				"    <mutator>LiteralsFirstInComparisons</mutator>",
+				"    <mutator>OptionalNotEmpty</mutator>",
+				"  </mutators>",
 				"</cleanthat>");
 
 		runTest("MultipleMutators.dirty.java", "MultipleMutators.clean.onlyLiteralsFirst.java");
@@ -47,7 +55,11 @@ void testMultipleMutators_defaultIsJdk7() throws Exception {
 	void testMultipleMutators_Jdk11IntroducedOptionalisPresent() throws Exception {
 		writePomWithJavaSteps(
 				"<cleanthat>",
-				"<sourceJdk>11</sourceJdk>",
+				"  <sourceJdk>11</sourceJdk>",
+				"  <mutators>",
+				"    <mutator>LiteralsFirstInComparisons</mutator>",
+				"    <mutator>OptionalNotEmpty</mutator>",
+				"  </mutators>",
 				"</cleanthat>");
 
 		runTest("MultipleMutators.dirty.java", "MultipleMutators.clean.java");
@@ -57,6 +69,10 @@ void testMultipleMutators_Jdk11IntroducedOptionalisPresent() throws Exception {
 	void testExcludeOptionalNotEmpty() throws Exception {
 		writePomWithJavaSteps(
 				"<cleanthat>",
+				"  <mutators>",
+				"    <mutator>LiteralsFirstInComparisons</mutator>",
+				"    <mutator>OptionalNotEmpty</mutator>",
+				"  </mutators>",
 				"  <excludedMutators>",
 				"    <excludedMutator>OptionalNotEmpty</excludedMutator>",
 				"  </excludedMutators>",

From 8131d058a103f091ee07182f7e31d07f9f4f198a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 12 Feb 2023 18:02:05 +0000
Subject: [PATCH 0798/2068] Update dependency
 io.github.solven-eu.cleanthat:java to v2.2

---
 lib/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index e35009c398..bfa54aaa13 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -108,8 +108,8 @@ dependencies {
 
 	gsonCompileOnly 'com.google.code.gson:gson:2.10.1'
 
-	cleanthatCompileOnly 'io.github.solven-eu.cleanthat:java:2.1'
-	compatCleanthat2Dot1CompileAndTestOnly 'io.github.solven-eu.cleanthat:java:2.1'
+	cleanthatCompileOnly 'io.github.solven-eu.cleanthat:java:2.2'
+	compatCleanthat2Dot1CompileAndTestOnly 'io.github.solven-eu.cleanthat:java:2.2'
 }
 
 // we'll hold the core lib to a high standard

From fec3fe58cf27740a69c66c771f97c3ec3128ce5d Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Sun, 12 Feb 2023 22:17:43 +0400
Subject: [PATCH 0799/2068] Impact changelog

---
 plugin-gradle/CHANGES.md | 1 +
 plugin-maven/CHANGES.md  | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 087c1ade89..afba5abdc7 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,7 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+* Bump default `cleanthat` version to latest `2.1` -> `2.2` ([#1569](https://github.com/diffplug/spotless/pull/1569))
 
 ## [6.15.0] - 2023-02-10
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 74c6a0299a..8d4c67a9b6 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Changes
+* Bump default `cleanthat` version to latest `2.1` -> `2.2` ([#1569](https://github.com/diffplug/spotless/pull/1569))
 
 ## [2.33.0] - 2023-02-10
 ### Added

From b9f274b71c41c9d0b66d5d5a58f8cbaf31bbbce6 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Sun, 12 Feb 2023 23:14:58 +0400
Subject: [PATCH 0800/2068] Fix gradle integration

---
 .../diffplug/gradle/spotless/JavaExtension.java   | 15 +++++++++++----
 .../spotless/CleanthatJavaIntegrationTest.java    |  4 +++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
index 6e9f6de005..7ab94ba7e4 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
@@ -19,6 +19,7 @@
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
 
@@ -283,9 +284,9 @@ public class CleanthatJavaConfig {
 
 		private String sourceJdk = CleanthatJavaStep.defaultSourceJdk();
 
-		private List<String> mutators = CleanthatJavaStep.defaultMutators();
+		private List<String> mutators = new ArrayList<>(CleanthatJavaStep.defaultMutators());
 
-		private List<String> excludedMutators = CleanthatJavaStep.defaultExcludedMutators();
+		private List<String> excludedMutators = new ArrayList<>(CleanthatJavaStep.defaultExcludedMutators());
 
 		CleanthatJavaConfig() {
 			addStep(createStep());
@@ -319,14 +320,20 @@ public CleanthatJavaConfig clearMutators() {
 			return this;
 		}
 
-		// The fully qualified name of a class implementing eu.solven.cleanthat.engine.java.refactorer.meta.IMutator
-		// or '*' to include all default mutators
+		// An id of a mutator (see IMutator.getIds()) or
+		// tThe fully qualified name of a class implementing eu.solven.cleanthat.engine.java.refactorer.meta.IMutator
 		public CleanthatJavaConfig addMutator(String mutator) {
 			this.mutators.add(mutator);
 			replaceStep(createStep());
 			return this;
 		}
 
+		public CleanthatJavaConfig addMutators(Collection<String> mutators) {
+			this.mutators.addAll(mutators);
+			replaceStep(createStep());
+			return this;
+		}
+
 		// useful to exclude a mutator amongst the default list of mutators
 		public CleanthatJavaConfig excludeMutator(String mutator) {
 			this.excludedMutators.add(mutator);
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/CleanthatJavaIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/CleanthatJavaIntegrationTest.java
index a754b963f2..e5024c835e 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/CleanthatJavaIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/CleanthatJavaIntegrationTest.java
@@ -31,7 +31,9 @@ void integration() throws IOException {
 				"spotless {",
 				"    java {",
 				"        target file('test.java')",
-				"        cleanthat().sourceCompatibility('11')",
+				"        cleanthat()" +
+				"          .sourceCompatibility('11')",
+				"          .addMutators(['LiteralsFirstInComparisons', 'OptionalNotEmpty'])",
 				"    }",
 				"}");
 

From bf9b811a4b2384dfc478124b084f2fd6706792fd Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Sun, 12 Feb 2023 23:18:47 +0400
Subject: [PATCH 0801/2068] Fix style

---
 .../diffplug/gradle/spotless/CleanthatJavaIntegrationTest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/CleanthatJavaIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/CleanthatJavaIntegrationTest.java
index e5024c835e..581bfe89b2 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/CleanthatJavaIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/CleanthatJavaIntegrationTest.java
@@ -31,7 +31,7 @@ void integration() throws IOException {
 				"spotless {",
 				"    java {",
 				"        target file('test.java')",
-				"        cleanthat()" +
+				"        cleanthat()",
 				"          .sourceCompatibility('11')",
 				"          .addMutators(['LiteralsFirstInComparisons', 'OptionalNotEmpty'])",
 				"    }",

From 22acca5034b72b0f121bc0c10bc7a44bc391d23e Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Sun, 19 Feb 2023 12:24:25 +0400
Subject: [PATCH 0802/2068] Upgrade Cleanthat. Enable draft

---
 lib/build.gradle                              |  4 +--
 .../java/JavaCleanthatRefactorerFunc.java     | 10 ++++---
 .../spotless/java/CleanthatJavaStep.java      | 26 ++++++++++++-------
 plugin-gradle/CHANGES.md                      |  4 +++
 .../gradle/spotless/JavaExtension.java        | 10 ++++++-
 plugin-maven/CHANGES.md                       |  3 +++
 .../spotless/maven/java/CleanthatJava.java    |  5 +++-
 7 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index bfa54aaa13..2b9be494c8 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -108,8 +108,8 @@ dependencies {
 
 	gsonCompileOnly 'com.google.code.gson:gson:2.10.1'
 
-	cleanthatCompileOnly 'io.github.solven-eu.cleanthat:java:2.2'
-	compatCleanthat2Dot1CompileAndTestOnly 'io.github.solven-eu.cleanthat:java:2.2'
+	cleanthatCompileOnly 'io.github.solven-eu.cleanthat:java:2.3'
+	compatCleanthat2Dot1CompileAndTestOnly 'io.github.solven-eu.cleanthat:java:2.3'
 }
 
 // we'll hold the core lib to a high standard
diff --git a/lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java b/lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java
index c94fd3c7c4..fca3adc02d 100644
--- a/lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java
+++ b/lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java
@@ -42,15 +42,17 @@ public class JavaCleanthatRefactorerFunc implements FormatterFunc {
 	private String jdkVersion;
 	private List<String> included;
 	private List<String> excluded;
+	private boolean includeDraft;
 
-	public JavaCleanthatRefactorerFunc(String jdkVersion, List<String> included, List<String> excluded) {
+	public JavaCleanthatRefactorerFunc(String jdkVersion, List<String> included, List<String> excluded, boolean includeDraft) {
 		this.jdkVersion = jdkVersion == null ? IJdkVersionConstants.JDK_8 : jdkVersion;
 		this.included = included == null ? Collections.emptyList() : included;
 		this.excluded = excluded == null ? Collections.emptyList() : excluded;
+		this.includeDraft = includeDraft;
 	}
 
 	public JavaCleanthatRefactorerFunc() {
-		this(IJdkVersionConstants.JDK_8, Arrays.asList(JavaRefactorerProperties.WILDCARD), Arrays.asList());
+		this(IJdkVersionConstants.JDK_8, Arrays.asList(JavaRefactorerProperties.WILDCARD), Arrays.asList(), false);
 	}
 
 	@Override
@@ -79,9 +81,11 @@ private String doApply(String input) throws InterruptedException, IOException {
 		refactorerProperties.setIncluded(included);
 		refactorerProperties.setExcluded(excluded);
 
+		refactorerProperties.setIncludeDraft(includeDraft);
+
 		JavaRefactorer refactorer = new JavaRefactorer(engineProperties, refactorerProperties);
 
-		LOGGER.debug("Processing sourceJdk={} included={} excluded={}", jdkVersion, included, excluded);
+		LOGGER.debug("Processing sourceJdk={} included={} excluded={}", jdkVersion, included, excluded, includeDraft);
 		LOGGER.debug("Available mutators: {}", JavaRefactorer.getAllIncluded());
 
 		// Spotless calls steps always with LF eol.
diff --git a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
index 2ef68f4f85..0f59f903b2 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
@@ -40,7 +40,7 @@ public final class CleanthatJavaStep {
 	private static final String MAVEN_COORDINATE = "io.github.solven-eu.cleanthat:java";
 
 	// CleanThat changelog is available at https://github.com/solven-eu/cleanthat/blob/master/CHANGES.MD
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "2.2");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "2.3");
 
 	// prevent direct instantiation
 	private CleanthatJavaStep() {}
@@ -52,7 +52,7 @@ public static FormatterStep create(Provisioner provisioner) {
 
 	/** Creates a step which apply default CleanThat mutators. */
 	public static FormatterStep create(String version, Provisioner provisioner) {
-		return create(MAVEN_COORDINATE, version, defaultSourceJdk(), defaultExcludedMutators(), defaultMutators(), provisioner);
+		return create(MAVEN_COORDINATE, version, defaultSourceJdk(), defaultMutators(), defaultExcludedMutators(), defaultIncludeDraft(), provisioner);
 	}
 
 	public static String defaultSourceJdk() {
@@ -62,16 +62,20 @@ public static String defaultSourceJdk() {
 		return "1.7";
 	}
 
-	public static List<String> defaultExcludedMutators() {
-		return List.of();
-	}
-
 	/**
-	 * By default, we include all available rules
+	 * By default, we include only safe and consensual mutators
 	 * @return
 	 */
 	public static List<String> defaultMutators() {
-		return List.of("eu.solven.cleanthat.engine.java.refactorer.mutators.composite.SafeAndConsensualMutators");
+		return List.of("SafeAndConsensualMutators");
+	}
+
+	public static List<String> defaultExcludedMutators() {
+		return List.of();
+	}
+
+	public static boolean defaultIncludeDraft() {
+		return false;
 	}
 
 	/** Creates a step which apply selected CleanThat mutators. */
@@ -80,6 +84,7 @@ public static FormatterStep create(String groupArtifact,
 			String sourceJdkVersion,
 			List<String> excluded,
 			List<String> included,
+			boolean includeDraft,
 			Provisioner provisioner) {
 		Objects.requireNonNull(groupArtifact, "groupArtifact");
 		if (groupArtifact.chars().filter(ch -> ch == ':').count() != 1) {
@@ -88,7 +93,7 @@ public static FormatterStep create(String groupArtifact,
 		Objects.requireNonNull(version, "version");
 		Objects.requireNonNull(provisioner, "provisioner");
 		return FormatterStep.createLazy(NAME,
-				() -> new JavaRefactorerState(NAME, groupArtifact, version, sourceJdkVersion, excluded, included, provisioner),
+				() -> new JavaRefactorerState(NAME, groupArtifact, version, sourceJdkVersion, excluded, included, includeDraft, provisioner),
 				JavaRefactorerState::createFormat);
 	}
 
@@ -113,7 +118,7 @@ static final class JavaRefactorerState implements Serializable {
 		final List<String> excluded;
 
 		JavaRefactorerState(String stepName, String version, Provisioner provisioner) throws IOException {
-			this(stepName, MAVEN_COORDINATE, version, defaultSourceJdk(), defaultExcludedMutators(), defaultMutators(), provisioner);
+			this(stepName, MAVEN_COORDINATE, version, defaultSourceJdk(), defaultExcludedMutators(), defaultMutators(), defaultIncludeDraft(), provisioner);
 		}
 
 		JavaRefactorerState(String stepName,
@@ -122,6 +127,7 @@ static final class JavaRefactorerState implements Serializable {
 				String sourceJdkVersion,
 				List<String> included,
 				List<String> excluded,
+				boolean includeDraft,
 				Provisioner provisioner) throws IOException {
 			JVM_SUPPORT.assertFormatterSupported(version);
 			ModuleHelper.doOpenInternalPackagesIfRequired();
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index afba5abdc7..91c1a7192c 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,10 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Added
+* Add `includeDraft` option, to include draft mutators from composite mutators ([#XXX](https://github.com/diffplug/spotless/pull/XXX))
+### Changes
+* Bump default `cleanthat` version to latest `2.2` -> `2.3` ([#XXX](https://github.com/diffplug/spotless/pull/XXX))
 * Bump default `cleanthat` version to latest `2.1` -> `2.2` ([#1569](https://github.com/diffplug/spotless/pull/1569))
 
 ## [6.15.0] - 2023-02-10
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
index 7ab94ba7e4..f351dd6188 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
@@ -288,6 +288,8 @@ public class CleanthatJavaConfig {
 
 		private List<String> excludedMutators = new ArrayList<>(CleanthatJavaStep.defaultExcludedMutators());
 
+		private boolean includeDraft = CleanthatJavaStep.defaultIncludeDraft();
+
 		CleanthatJavaConfig() {
 			addStep(createStep());
 		}
@@ -341,11 +343,17 @@ public CleanthatJavaConfig excludeMutator(String mutator) {
 			return this;
 		}
 
+		public CleanthatJavaConfig includeDraft(boolean includeDraft) {
+			this.includeDraft = includeDraft;
+			replaceStep(createStep());
+			return this;
+		}
+
 		private FormatterStep createStep() {
 			return CleanthatJavaStep.create(
 					groupArtifact,
 					version,
-					sourceJdk, mutators, excludedMutators, provisioner());
+					sourceJdk, mutators, excludedMutators, includeDraft, provisioner());
 		}
 	}
 
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 8d4c67a9b6..b26c664ed1 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,7 +3,10 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* Add `includeDraft` option, to include draft mutators from composite mutators ([#XXX](https://github.com/diffplug/spotless/pull/XXX))
 ### Changes
+* Bump default `cleanthat` version to latest `2.2` -> `2.3` ([#XXX](https://github.com/diffplug/spotless/pull/XXX))
 * Bump default `cleanthat` version to latest `2.1` -> `2.2` ([#1569](https://github.com/diffplug/spotless/pull/1569))
 
 ## [2.33.0] - 2023-02-10
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/CleanthatJava.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/CleanthatJava.java
index d7dd1f2530..4133409919 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/CleanthatJava.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/CleanthatJava.java
@@ -41,11 +41,14 @@ public class CleanthatJava implements FormatterStepFactory {
 	@Parameter
 	private List<String> excludedMutators = CleanthatJavaStep.defaultExcludedMutators();
 
+	@Parameter
+	private boolean includeDraft = CleanthatJavaStep.defaultIncludeDraft();
+
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig config) {
 		String groupArtifact = this.groupArtifact != null ? this.groupArtifact : CleanthatJavaStep.defaultGroupArtifact();
 		String version = this.version != null ? this.version : CleanthatJavaStep.defaultVersion();
 
-		return CleanthatJavaStep.create(groupArtifact, version, sourceJdk, mutators, excludedMutators, config.getProvisioner());
+		return CleanthatJavaStep.create(groupArtifact, version, sourceJdk, mutators, excludedMutators, includeDraft, config.getProvisioner());
 	}
 }

From 0f95eb9a7779ffbc74884d980e5273bd479af8f5 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Sun, 19 Feb 2023 12:59:47 +0400
Subject: [PATCH 0803/2068] Fix glue

---
 .../spotless/glue/java/JavaCleanthatRefactorerFunc.java     | 2 +-
 .../java/com/diffplug/spotless/java/CleanthatJavaStep.java  | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java b/lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java
index fca3adc02d..d7148f8892 100644
--- a/lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java
+++ b/lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java
@@ -52,7 +52,7 @@ public JavaCleanthatRefactorerFunc(String jdkVersion, List<String> included, Lis
 	}
 
 	public JavaCleanthatRefactorerFunc() {
-		this(IJdkVersionConstants.JDK_8, Arrays.asList(JavaRefactorerProperties.WILDCARD), Arrays.asList(), false);
+		this(IJdkVersionConstants.JDK_8, Arrays.asList("SafeAndConsensual"), Arrays.asList(), false);
 	}
 
 	@Override
diff --git a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
index 0f59f903b2..7c43524306 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
@@ -116,6 +116,7 @@ static final class JavaRefactorerState implements Serializable {
 		final String sourceJdkVersion;
 		final List<String> included;
 		final List<String> excluded;
+		final boolean includeDraft;
 
 		JavaRefactorerState(String stepName, String version, Provisioner provisioner) throws IOException {
 			this(stepName, MAVEN_COORDINATE, version, defaultSourceJdk(), defaultExcludedMutators(), defaultMutators(), defaultIncludeDraft(), provisioner);
@@ -138,6 +139,7 @@ static final class JavaRefactorerState implements Serializable {
 			this.sourceJdkVersion = sourceJdkVersion;
 			this.included = included;
 			this.excluded = excluded;
+			this.includeDraft = includeDraft;
 		}
 
 		@SuppressWarnings("PMD.UseProperClassLoader")
@@ -148,9 +150,9 @@ FormatterFunc createFormat() {
 			Method formatterMethod;
 			try {
 				Class<?> formatterClazz = classLoader.loadClass("com.diffplug.spotless.glue.java.JavaCleanthatRefactorerFunc");
-				Constructor<?> formatterConstructor = formatterClazz.getConstructor(String.class, List.class, List.class);
+				Constructor<?> formatterConstructor = formatterClazz.getConstructor(String.class, List.class, List.class, boolean.class);
 
-				formatter = formatterConstructor.newInstance(sourceJdkVersion, included, excluded);
+				formatter = formatterConstructor.newInstance(sourceJdkVersion, included, excluded, includeDraft);
 				formatterMethod = formatterClazz.getMethod("apply", String.class);
 			} catch (ReflectiveOperationException e) {
 				throw new IllegalStateException("Issue executing the formatter", e);

From 0f50f923ce7ae0b031403fa747e988c5362c2a49 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Sun, 19 Feb 2023 17:33:36 +0400
Subject: [PATCH 0804/2068] Upgrade Cleanthat to 2.4

---
 lib/build.gradle                                              | 4 ++--
 .../java/com/diffplug/spotless/java/CleanthatJavaStep.java    | 2 +-
 plugin-gradle/CHANGES.md                                      | 4 ++--
 plugin-maven/CHANGES.md                                       | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 2b9be494c8..8308eae3c0 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -108,8 +108,8 @@ dependencies {
 
 	gsonCompileOnly 'com.google.code.gson:gson:2.10.1'
 
-	cleanthatCompileOnly 'io.github.solven-eu.cleanthat:java:2.3'
-	compatCleanthat2Dot1CompileAndTestOnly 'io.github.solven-eu.cleanthat:java:2.3'
+	cleanthatCompileOnly 'io.github.solven-eu.cleanthat:java:2.4'
+	compatCleanthat2Dot1CompileAndTestOnly 'io.github.solven-eu.cleanthat:java:2.4'
 }
 
 // we'll hold the core lib to a high standard
diff --git a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
index 7c43524306..b5093fa680 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
@@ -40,7 +40,7 @@ public final class CleanthatJavaStep {
 	private static final String MAVEN_COORDINATE = "io.github.solven-eu.cleanthat:java";
 
 	// CleanThat changelog is available at https://github.com/solven-eu/cleanthat/blob/master/CHANGES.MD
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "2.3");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "2.4");
 
 	// prevent direct instantiation
 	private CleanthatJavaStep() {}
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 91c1a7192c..1f02827a5e 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -4,9 +4,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* Add `includeDraft` option, to include draft mutators from composite mutators ([#XXX](https://github.com/diffplug/spotless/pull/XXX))
+* Add `includeDraft` option, to include draft mutators from composite mutators ([#1574](https://github.com/diffplug/spotless/pull/1574))
 ### Changes
-* Bump default `cleanthat` version to latest `2.2` -> `2.3` ([#XXX](https://github.com/diffplug/spotless/pull/XXX))
+* Bump default `cleanthat` version to latest `2.2` -> `2.4` ([#1574](https://github.com/diffplug/spotless/pull/1574))
 * Bump default `cleanthat` version to latest `2.1` -> `2.2` ([#1569](https://github.com/diffplug/spotless/pull/1569))
 
 ## [6.15.0] - 2023-02-10
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index b26c664ed1..8cdc1bb1ac 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -6,7 +6,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * Add `includeDraft` option, to include draft mutators from composite mutators ([#XXX](https://github.com/diffplug/spotless/pull/XXX))
 ### Changes
-* Bump default `cleanthat` version to latest `2.2` -> `2.3` ([#XXX](https://github.com/diffplug/spotless/pull/XXX))
+* Bump default `cleanthat` version to latest `2.2` -> `2.4` ([#1574](https://github.com/diffplug/spotless/pull/1574))
 * Bump default `cleanthat` version to latest `2.1` -> `2.2` ([#1569](https://github.com/diffplug/spotless/pull/1569))
 
 ## [2.33.0] - 2023-02-10

From 7db2ce037a95e726935b2dc8b5e539868d58e3d2 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Sun, 19 Feb 2023 18:46:34 +0400
Subject: [PATCH 0805/2068] Revert to hardcoded SafeAndConsensualMutators
 className, addTest over includeDraft

---
 .../diffplug/spotless/java/CleanthatJavaStep.java  |  3 ++-
 .../maven/java/CleanthatJavaRefactorerTest.java    | 11 +++++++++++
 ...ltipleMutators.clean.onlyOptionalIsPresent.java | 14 ++++++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.onlyOptionalIsPresent.java

diff --git a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
index b5093fa680..20aef5d8d2 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
@@ -67,7 +67,8 @@ public static String defaultSourceJdk() {
 	 * @return
 	 */
 	public static List<String> defaultMutators() {
-		return List.of("SafeAndConsensualMutators");
+		// To be replaced by 'SafeAndConsensual'
+		return List.of("eu.solven.cleanthat.engine.java.refactorer.mutators.composite.SafeAndConsensualMutators");
 	}
 
 	public static List<String> defaultExcludedMutators() {
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java
index a32ac337e4..cb76ee71a3 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java
@@ -25,6 +25,17 @@
 class CleanthatJavaRefactorerTest extends MavenIntegrationHarness {
 	private static final Logger LOGGER = LoggerFactory.getLogger(CleanthatJavaRefactorerTest.class);
 
+	@Test
+	void testEnableDraft() throws Exception {
+		writePomWithJavaSteps(
+			"<cleanthat>",
+			"  <sourceJdk>11</sourceJdk>",
+			"  <includeDraft>true</includeDraft>",
+			"</cleanthat>");
+
+		runTest("MultipleMutators.dirty.java", "MultipleMutators.clean.onlyOptionalIsPresent.java");
+	}
+
 	@Test
 	void testLiteralsFirstInComparisons() throws Exception {
 		writePomWithJavaSteps(
diff --git a/testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.onlyOptionalIsPresent.java b/testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.onlyOptionalIsPresent.java
new file mode 100644
index 0000000000..318e1efa15
--- /dev/null
+++ b/testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.onlyOptionalIsPresent.java
@@ -0,0 +1,14 @@
+package eu.solven.cleanthat.engine.java.refactorer.cases.do_not_format_me;
+
+import java.util.Optional;
+
+public class LiteralsFirstInComparisonsCases {
+
+	public boolean isHardcoded(String input) {
+		return "hardcoded".equals(input);
+	}
+
+	public boolean isPresent(Optional<?> optional) {
+		return optional.isPresent();
+	}
+}

From 78fc52a2fb9bfb02d98e29754fc963d523e0864e Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Sun, 19 Feb 2023 18:49:49 +0400
Subject: [PATCH 0806/2068] Fix testCase as LiteralsFirstInComparisons is not
 applied

---
 .../cleanthat/MultipleMutators.clean.onlyOptionalIsPresent.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.onlyOptionalIsPresent.java b/testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.onlyOptionalIsPresent.java
index 318e1efa15..0829602dc1 100644
--- a/testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.onlyOptionalIsPresent.java
+++ b/testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.onlyOptionalIsPresent.java
@@ -5,7 +5,7 @@
 public class LiteralsFirstInComparisonsCases {
 
 	public boolean isHardcoded(String input) {
-		return "hardcoded".equals(input);
+		return input.equals("hardcoded");
 	}
 
 	public boolean isPresent(Optional<?> optional) {

From 24fb154c34b62dbbea9efc1a123dddfd400d2cb5 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Sun, 19 Feb 2023 22:04:03 +0400
Subject: [PATCH 0807/2068] Fix style

---
 .../spotless/maven/java/CleanthatJavaRefactorerTest.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java
index cb76ee71a3..379397f55b 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java
@@ -28,10 +28,10 @@ class CleanthatJavaRefactorerTest extends MavenIntegrationHarness {
 	@Test
 	void testEnableDraft() throws Exception {
 		writePomWithJavaSteps(
-			"<cleanthat>",
-			"  <sourceJdk>11</sourceJdk>",
-			"  <includeDraft>true</includeDraft>",
-			"</cleanthat>");
+				"<cleanthat>",
+				"  <sourceJdk>11</sourceJdk>",
+				"  <includeDraft>true</includeDraft>",
+				"</cleanthat>");
 
 		runTest("MultipleMutators.dirty.java", "MultipleMutators.clean.onlyOptionalIsPresent.java");
 	}

From 3b280165228f59e4dd8766705a8c7f5f13a6ce47 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Wed, 22 Feb 2023 01:29:21 +0800
Subject: [PATCH 0808/2068] Correct editorConfigPath in Ktlint setup

---
 plugin-gradle/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 7471138c60..106cf3dcfd 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -385,7 +385,7 @@ spotless {
     ktlint("0.45.2")
       .setUseExperimental(true)
       .userData(mapOf("android" to "true"))
-      .editorConfigPath("$projectDir/config/.editorconfig")  // sample unusual placement
+      .setEditorConfigPath("$projectDir/config/.editorconfig")  // sample unusual placement
       .editorConfigOverride(mapOf("indent_size" to 2))
   }
 }

From 845d32481fe290d5db55612aaba0cab17d83ae84 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 22 Feb 2023 02:45:55 +0000
Subject: [PATCH 0809/2068] Update plugin io.github.gradle-nexus.publish-plugin
 to v1.2.0

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index d5518d8a40..fa7b81bdb1 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -10,7 +10,7 @@ plugins {
 	// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
 	id 'com.gradle.plugin-publish' version '1.1.0' apply false
 	// https://github.com/gradle-nexus/publish-plugin/releases
-	id 'io.github.gradle-nexus.publish-plugin' version '1.1.0' apply false
+	id 'io.github.gradle-nexus.publish-plugin' version '1.2.0' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
 	id 'com.github.spotbugs' version '5.0.13' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md

From 1b73efc828e78acf0f3bb85cb021efbf3b6f8a90 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Wed, 22 Feb 2023 18:36:33 +0400
Subject: [PATCH 0810/2068] Upgrade to CleanThat 2.6

---
 lib/build.gradle                                            | 4 ++--
 .../java/com/diffplug/spotless/java/CleanthatJavaStep.java  | 6 +++---
 plugin-gradle/CHANGES.md                                    | 2 +-
 plugin-maven/CHANGES.md                                     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 8308eae3c0..f6e0446f73 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -108,8 +108,8 @@ dependencies {
 
 	gsonCompileOnly 'com.google.code.gson:gson:2.10.1'
 
-	cleanthatCompileOnly 'io.github.solven-eu.cleanthat:java:2.4'
-	compatCleanthat2Dot1CompileAndTestOnly 'io.github.solven-eu.cleanthat:java:2.4'
+	cleanthatCompileOnly 'io.github.solven-eu.cleanthat:java:2.6'
+	compatCleanthat2Dot1CompileAndTestOnly 'io.github.solven-eu.cleanthat:java:2.6'
 }
 
 // we'll hold the core lib to a high standard
diff --git a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
index 20aef5d8d2..87461b5efa 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
@@ -40,7 +40,7 @@ public final class CleanthatJavaStep {
 	private static final String MAVEN_COORDINATE = "io.github.solven-eu.cleanthat:java";
 
 	// CleanThat changelog is available at https://github.com/solven-eu/cleanthat/blob/master/CHANGES.MD
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "2.4");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "2.6");
 
 	// prevent direct instantiation
 	private CleanthatJavaStep() {}
@@ -67,8 +67,8 @@ public static String defaultSourceJdk() {
 	 * @return
 	 */
 	public static List<String> defaultMutators() {
-		// To be replaced by 'SafeAndConsensual'
-		return List.of("eu.solven.cleanthat.engine.java.refactorer.mutators.composite.SafeAndConsensualMutators");
+		// see ICleanthatStepParametersProperties.SAFE_AND_CONSENSUAL
+		return List.of("SafeAndConsensual");
 	}
 
 	public static List<String> defaultExcludedMutators() {
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 1f02827a5e..0b2185ba61 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -6,7 +6,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * Add `includeDraft` option, to include draft mutators from composite mutators ([#1574](https://github.com/diffplug/spotless/pull/1574))
 ### Changes
-* Bump default `cleanthat` version to latest `2.2` -> `2.4` ([#1574](https://github.com/diffplug/spotless/pull/1574))
+* Bump default `cleanthat` version to latest `2.2` -> `2.6` ([#1574](https://github.com/diffplug/spotless/pull/1574))
 * Bump default `cleanthat` version to latest `2.1` -> `2.2` ([#1569](https://github.com/diffplug/spotless/pull/1569))
 
 ## [6.15.0] - 2023-02-10
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 8cdc1bb1ac..4912e4ff52 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -6,7 +6,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * Add `includeDraft` option, to include draft mutators from composite mutators ([#XXX](https://github.com/diffplug/spotless/pull/XXX))
 ### Changes
-* Bump default `cleanthat` version to latest `2.2` -> `2.4` ([#1574](https://github.com/diffplug/spotless/pull/1574))
+* Bump default `cleanthat` version to latest `2.2` -> `2.6` ([#1574](https://github.com/diffplug/spotless/pull/1574))
 * Bump default `cleanthat` version to latest `2.1` -> `2.2` ([#1569](https://github.com/diffplug/spotless/pull/1569))
 
 ## [2.33.0] - 2023-02-10

From 224be58350e2d4f3fb7e3f82f492eeeed03e1194 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Thu, 23 Feb 2023 21:22:43 +0400
Subject: [PATCH 0811/2068] Add workaround for
 https://github.com/diffplug/spotless/issues/1583

---
 .../spotless/java/CleanthatJavaStep.java      | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
index 87461b5efa..c1e5ae1fa4 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
@@ -131,7 +131,10 @@ static final class JavaRefactorerState implements Serializable {
 				List<String> excluded,
 				boolean includeDraft,
 				Provisioner provisioner) throws IOException {
-			JVM_SUPPORT.assertFormatterSupported(version);
+			// https://github.com/diffplug/spotless/issues/1583
+			if (!version.endsWith("-SNAPSHOT")) {
+				JVM_SUPPORT.assertFormatterSupported(version);
+			}
 			ModuleHelper.doOpenInternalPackagesIfRequired();
 			this.jarState = JarState.from(groupArtifact + ":" + version, provisioner);
 			this.stepName = stepName;
@@ -158,9 +161,17 @@ FormatterFunc createFormat() {
 			} catch (ReflectiveOperationException e) {
 				throw new IllegalStateException("Issue executing the formatter", e);
 			}
-			return JVM_SUPPORT.suggestLaterVersionOnError(version, input -> {
-				return (String) formatterMethod.invoke(formatter, input);
-			});
+
+			// https://github.com/diffplug/spotless/issues/1583
+			if (!version.endsWith("-SNAPSHOT")) {
+				return JVM_SUPPORT.suggestLaterVersionOnError(version, input -> {
+					return (String) formatterMethod.invoke(formatter, input);
+				});
+			} else {
+				return input -> {
+					return (String) formatterMethod.invoke(formatter, input);
+				};
+			}
 		}
 
 	}

From 1557a0b6599efbd0ad246d19c149d59dbfcdc508 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Fri, 24 Feb 2023 13:23:29 +0400
Subject: [PATCH 0812/2068] Handle JSON with Array as root

---
 .../glue/json/AJacksonFormatterFunc.java      | 10 ++++-
 .../glue/json/JacksonJsonFormatterFunc.java   | 12 ++++++
 .../glue/yaml/JacksonYamlFormatterFunc.java   |  7 +++-
 .../json/singletonArrayAfter_Jackson.json     |  1 +
 .../resources/json/singletonArrayBefore.json  |  2 +-
 .../spotless/json/JacksonJsonStepTest.java    | 40 +++++++++++++++++++
 6 files changed, 68 insertions(+), 4 deletions(-)
 create mode 100644 testlib/src/main/resources/json/singletonArrayAfter_Jackson.json
 create mode 100644 testlib/src/test/java/com/diffplug/spotless/json/JacksonJsonStepTest.java

diff --git a/lib/src/jackson/java/com/diffplug/spotless/glue/json/AJacksonFormatterFunc.java b/lib/src/jackson/java/com/diffplug/spotless/glue/json/AJacksonFormatterFunc.java
index 6f363ad1b7..1f317fa3b4 100644
--- a/lib/src/jackson/java/com/diffplug/spotless/glue/json/AJacksonFormatterFunc.java
+++ b/lib/src/jackson/java/com/diffplug/spotless/glue/json/AJacksonFormatterFunc.java
@@ -16,7 +16,6 @@
 package com.diffplug.spotless.glue.json;
 
 import java.io.IOException;
-import java.util.Map;
 
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -49,7 +48,7 @@ public String apply(String input) throws Exception {
 	protected String format(ObjectMapper objectMapper, String input) throws IllegalArgumentException, IOException {
 		try {
 			// ObjectNode is not compatible with SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS
-			Map objectNode = objectMapper.readValue(input, Map.class);
+			Object objectNode = objectMapper.readValue(input, inferType(input));
 			String output = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(objectNode);
 
 			return output;
@@ -58,6 +57,13 @@ protected String format(ObjectMapper objectMapper, String input) throws IllegalA
 		}
 	}
 
+	/**
+	 *
+	 * @param input
+	 * @return the {@link Class} into which the String has to be deserialized
+	 */
+	protected abstract Class<?> inferType(String input);
+
 	/**
 	 * @return a {@link JsonFactory}. May be overridden to handle alternative formats.
 	 * @see <a href="https://github.com/FasterXML/jackson-dataformats-text">jackson-dataformats-text</a>
diff --git a/lib/src/jackson/java/com/diffplug/spotless/glue/json/JacksonJsonFormatterFunc.java b/lib/src/jackson/java/com/diffplug/spotless/glue/json/JacksonJsonFormatterFunc.java
index ae455fbbb4..71215eb4a3 100644
--- a/lib/src/jackson/java/com/diffplug/spotless/glue/json/JacksonJsonFormatterFunc.java
+++ b/lib/src/jackson/java/com/diffplug/spotless/glue/json/JacksonJsonFormatterFunc.java
@@ -15,6 +15,9 @@
  */
 package com.diffplug.spotless.glue.json;
 
+import java.util.Collection;
+import java.util.Map;
+
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonFactoryBuilder;
 import com.fasterxml.jackson.core.JsonGenerator;
@@ -37,6 +40,15 @@ public JacksonJsonFormatterFunc(JacksonJsonConfig jacksonConfig) {
 		this.jacksonConfig = jacksonConfig;
 	}
 
+	@Override
+	protected Class<?> inferType(String input) {
+		if (input.trim().startsWith("[")) {
+			return Collection.class;
+		} else {
+			return Map.class;
+		}
+	}
+
 	/**
 	 * @return a {@link JsonFactory}. May be overridden to handle alternative formats.
 	 * @see <a href="https://github.com/FasterXML/jackson-dataformats-text">jackson-dataformats-text</a>
diff --git a/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/JacksonYamlFormatterFunc.java b/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/JacksonYamlFormatterFunc.java
index 89304d8d0a..b4f8ca6aee 100644
--- a/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/JacksonYamlFormatterFunc.java
+++ b/lib/src/jackson/java/com/diffplug/spotless/glue/yaml/JacksonYamlFormatterFunc.java
@@ -58,13 +58,18 @@ protected JsonFactory makeJsonFactory() {
 		return yamlFactoryBuilder.build();
 	}
 
+	@Override
+	protected Class<?> inferType(String input) {
+		return JsonNode.class;
+	}
+
 	@Override
 	protected String format(ObjectMapper objectMapper, String input) throws IllegalArgumentException, IOException {
 		try {
 			// https://stackoverflow.com/questions/25222327/deserialize-pojos-from-multiple-yaml-documents-in-a-single-file-in-jackson
 			// https://github.com/FasterXML/jackson-dataformats-text/issues/66#issuecomment-375328648
 			JsonParser yamlParser = objectMapper.getFactory().createParser(input);
-			List<JsonNode> documents = objectMapper.readValues(yamlParser, JsonNode.class).readAll();
+			List<?> documents = objectMapper.readValues(yamlParser, inferType(input)).readAll();
 
 			// https://github.com/FasterXML/jackson-dataformats-text/issues/66#issuecomment-554265055
 			// https://github.com/FasterXML/jackson-dataformats-text/issues/66#issuecomment-554265055
diff --git a/testlib/src/main/resources/json/singletonArrayAfter_Jackson.json b/testlib/src/main/resources/json/singletonArrayAfter_Jackson.json
new file mode 100644
index 0000000000..243bc2550b
--- /dev/null
+++ b/testlib/src/main/resources/json/singletonArrayAfter_Jackson.json
@@ -0,0 +1 @@
+[ 1, 2, 3, 4 ]
\ No newline at end of file
diff --git a/testlib/src/main/resources/json/singletonArrayBefore.json b/testlib/src/main/resources/json/singletonArrayBefore.json
index 8290d39198..18d09f95fe 100644
--- a/testlib/src/main/resources/json/singletonArrayBefore.json
+++ b/testlib/src/main/resources/json/singletonArrayBefore.json
@@ -1 +1 @@
-[ 1, 2, 3, 4 ]
+[ 1  , 2, 3, 4 ]
diff --git a/testlib/src/test/java/com/diffplug/spotless/json/JacksonJsonStepTest.java b/testlib/src/test/java/com/diffplug/spotless/json/JacksonJsonStepTest.java
new file mode 100644
index 0000000000..be681653e1
--- /dev/null
+++ b/testlib/src/test/java/com/diffplug/spotless/json/JacksonJsonStepTest.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2021-2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.json;
+
+import org.junit.jupiter.api.Test;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.StepHarness;
+import com.diffplug.spotless.TestProvisioner;
+
+class JacksonJsonStepTest {
+
+	private static final int INDENT = 4;
+
+	private final FormatterStep step = JsonSimpleStep.create(INDENT, TestProvisioner.mavenCentral());
+	private final StepHarness stepHarness = StepHarness.forStep(step);
+
+	@Test
+	void canSetCustomIndentationLevel() {
+		FormatterStep step = JacksonJsonStep.create(TestProvisioner.mavenCentral());
+		StepHarness stepHarness = StepHarness.forStep(step);
+
+		String before = "json/singletonArrayBefore.json";
+		String after = "json/singletonArrayAfter_Jackson.json";
+		stepHarness.testResource(before, after);
+	}
+}

From d7129f64664be1f25014bc926445ec4e1c84baed Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Fri, 24 Feb 2023 13:27:59 +0400
Subject: [PATCH 0813/2068] Add entry in CHANGES

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index eec8753271..efb88d972d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* `JacksonJsonFormatterFunc` handles json files with an Array as root. ([#1585](https://github.com/diffplug/spotless/pull/1585))
 
 ## [2.35.0] - 2023-02-10
 ### Added

From 24b571d77c41766a6b4e6f0c35fcb9e58018e104 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 24 Feb 2023 18:56:57 +0000
Subject: [PATCH 0814/2068] Update dependency gradle to v7.6.1

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f398c33c4b..508322917b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From d39377d9ddec98e3eb55c1dc55273f9fce7abe01 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sun, 26 Feb 2023 15:57:40 +0800
Subject: [PATCH 0815/2068] Enable CI triggering by workflow_dispatch

https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#workflow_dispatch
---
 .github/workflows/ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8901a164d2..2c372f1668 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,6 +6,8 @@ on:
   pull_request:
   push:
     branches: [main]
+  workflow_dispatch:
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true

From a9ad736a7b73d0edcbec17603091af0de4bdbf6d Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sun, 26 Feb 2023 15:59:44 +0800
Subject: [PATCH 0816/2068] Enable more Gradle flags

---
 gradle.properties | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index c72fa0429d..9bf7a2a20b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,8 @@
 # To fix metaspace errors
-org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=1024m -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=1024m -Dfile.encoding=UTF-8
+org.gradle.parallel=true
+org.gradle.caching=true
+
 name=spotless
 description=Spotless - keep your code spotless with Gradle
 org=diffplug

From 32a5317ca3b08e26a3725f44afe22865c3a34010 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sun, 26 Feb 2023 16:00:15 +0800
Subject: [PATCH 0817/2068] Enable stable config cache

https://docs.gradle.org/7.6.1/userguide/configuration_cache.html
---
 _ext/gradle/p2-fat-jar-setup.gradle | 12 ++++++++----
 gradle.properties                   |  1 +
 gradle/java-publish.gradle          |  4 ++++
 gradle/java-setup.gradle            |  1 +
 plugin-gradle/build.gradle          |  6 ++++--
 plugin-maven/build.gradle           | 11 ++++++++++-
 settings.gradle                     |  2 ++
 7 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/_ext/gradle/p2-fat-jar-setup.gradle b/_ext/gradle/p2-fat-jar-setup.gradle
index a8f4e242af..0bba3c43c2 100644
--- a/_ext/gradle/p2-fat-jar-setup.gradle
+++ b/_ext/gradle/p2-fat-jar-setup.gradle
@@ -12,7 +12,7 @@ ext {
 		p2Dependencies = "p2Dependencies not defined in project"
 	}
 
-	// Some JARs may include JARs themselfs, which shall be unpacked and added to the embedded class folder. 
+	// Some JARs may include JARs themselfs, which shall be unpacked and added to the embedded class folder.
 	if (!project.hasProperty('internalJars')) {
 		internalJars = []
 	}
@@ -35,13 +35,13 @@ ext {
 			'META-INF/*.SF', // ... so all signatures are filtered
 		]
 	}
-	
+
 	// Map fat-JAR resources path if JAR file name does not correspond to plugin package name (e.g. required for internal plugins)
 	if (!project.hasProperty('fatJarResourcesMap')) {
 		fatJarResourcesMap = [:]
 	}
-	  
-	
+
+
 	// The directory contains all external classes for the fat-jar
 	embeddedClassesDirName = 'build/embeddedClasses'
 	embeddedClassesDir = project.file(embeddedClassesDirName)
@@ -163,3 +163,7 @@ apply plugin: 'idea'
 // Encure that the dependent classes are preovided for compilation if project is build via Eclipse instead of command line
 tasks.idea.dependsOn(unjarEmbeddedClasses)
 
+tasks.named('ideaModule') {
+	notCompatibleWithConfigurationCache("https://github.com/gradle/gradle/issues/13480")
+}
+
diff --git a/gradle.properties b/gradle.properties
index 9bf7a2a20b..8820a36e30 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,6 +2,7 @@
 org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=1024m -Dfile.encoding=UTF-8
 org.gradle.parallel=true
 org.gradle.caching=true
+org.gradle.unsafe.configuration-cache=true
 
 name=spotless
 description=Spotless - keep your code spotless with Gradle
diff --git a/gradle/java-publish.gradle b/gradle/java-publish.gradle
index 2eb877c429..2ebc2a66b5 100644
--- a/gradle/java-publish.gradle
+++ b/gradle/java-publish.gradle
@@ -200,6 +200,10 @@ if (System.env['JITPACK'] == 'true' || version.endsWith('-SNAPSHOT')) {
 	}
 }
 
+tasks.withType(Sign).configureEach {
+	notCompatibleWithConfigurationCache("https://github.com/gradle/gradle/issues/13470")
+}
+
 tasks.withType(AbstractArchiveTask).configureEach {
 	preserveFileTimestamps = false
 	reproducibleFileOrder = true
diff --git a/gradle/java-setup.gradle b/gradle/java-setup.gradle
index 10eca7a2d4..5a1e23ef0a 100644
--- a/gradle/java-setup.gradle
+++ b/gradle/java-setup.gradle
@@ -30,6 +30,7 @@ tasks.withType(com.github.spotbugs.snom.SpotBugsTask).configureEach {
 	reports {
 		html.enabled = true
 	}
+	notCompatibleWithConfigurationCache("https://github.com/spotbugs/spotbugs-gradle-plugin/issues/670")
 }
 
 tasks.named('spotbugsMain') {
diff --git a/plugin-gradle/build.gradle b/plugin-gradle/build.gradle
index 3e44335276..9a725dbf5d 100644
--- a/plugin-gradle/build.gradle
+++ b/plugin-gradle/build.gradle
@@ -73,8 +73,10 @@ gradlePlugin {
 		}
 	}
 }
-if (version.endsWith('-SNAPSHOT')) {
-	publishPlugins.enabled = false
+
+tasks.named("publishPlugins") {
+	enabled = !version.endsWith('-SNAPSHOT')
+	notCompatibleWithConfigurationCache("https://github.com/gradle/gradle/issues/21283")
 }
 
 // have to apply java-publish after setting up the pluginBundle
diff --git a/plugin-maven/build.gradle b/plugin-maven/build.gradle
index 8ab478d6ba..a8604c6ed9 100644
--- a/plugin-maven/build.gradle
+++ b/plugin-maven/build.gradle
@@ -1,3 +1,6 @@
+import de.benediktritter.maven.plugin.development.task.GenerateHelpMojoSourcesTask
+import de.benediktritter.maven.plugin.development.task.GenerateMavenPluginDescriptorTask
+
 plugins {
 	// https://www.benediktritter.de/maven-plugin-development/#release-history
 	id 'de.benediktritter.maven-plugin-development' version '0.4.1'
@@ -10,13 +13,19 @@ version = spotlessChangelog.versionNext
 apply from: rootProject.file("gradle/java-setup.gradle")
 apply from: rootProject.file('gradle/spotless-freshmark.gradle')
 
-apply plugin: 'de.benediktritter.maven-plugin-development'
 mavenPlugin {
 	name = 'Spotless Maven Plugin'
 	artifactId = project.artifactIdMaven
 	description = project.description
 }
 
+tasks.withType(GenerateMavenPluginDescriptorTask).configureEach {
+	notCompatibleWithConfigurationCache('https://github.com/britter/maven-plugin-development/issues/8')
+}
+tasks.withType(GenerateHelpMojoSourcesTask).configureEach {
+	notCompatibleWithConfigurationCache('https://github.com/britter/maven-plugin-development/issues/8')
+}
+
 String VER_MAVEN_API = '3.0'
 String VER_ECLIPSE_AETHER = '1.1.0'
 String VER_PLEXUS_RESOURCES = '1.2.0'
diff --git a/settings.gradle b/settings.gradle
index fa7b81bdb1..17a9679abd 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -68,6 +68,8 @@ gradleEnterprise {
 	}
 }
 
+enableFeaturePreview("STABLE_CONFIGURATION_CACHE")
+
 rootProject.name = 'spotless'
 
 include 'lib'		// reusable library with no dependencies

From af573360dab3c7004de0602e89e6552572aadfba Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Sun, 26 Feb 2023 13:29:21 +0400
Subject: [PATCH 0818/2068] Add reproduction case

---
 .../Jdk17MultineStringBlockFormatted.test     | 264 ++++++++++++++++++
 .../Jdk17MultineStringBlockUnformatted.test   | 264 ++++++++++++++++++
 .../java/RemoveUnusedImportsStepTest.java     |   3 +-
 3 files changed, 530 insertions(+), 1 deletion(-)
 create mode 100644 testlib/src/main/resources/java/removeunusedimports/Jdk17MultineStringBlockFormatted.test
 create mode 100644 testlib/src/main/resources/java/removeunusedimports/Jdk17MultineStringBlockUnformatted.test

diff --git a/testlib/src/main/resources/java/removeunusedimports/Jdk17MultineStringBlockFormatted.test b/testlib/src/main/resources/java/removeunusedimports/Jdk17MultineStringBlockFormatted.test
new file mode 100644
index 0000000000..c5abb923c3
--- /dev/null
+++ b/testlib/src/main/resources/java/removeunusedimports/Jdk17MultineStringBlockFormatted.test
@@ -0,0 +1,264 @@
+package io.github.shafthq.shaft.tools.tms;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;
+import com.shaft.cli.FileActions;
+import com.shaft.tools.io.ReportManager;
+import io.github.shafthq.shaft.tools.io.helpers.ReportManagerHelper;
+import io.restassured.config.RestAssuredConfig;
+import io.restassured.config.SSLConfig;
+import io.restassured.http.ContentType;
+import io.restassured.response.Response;
+import io.restassured.specification.RequestSpecification;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.text.SimpleDateFormat;
+import java.util.Base64;
+import java.util.Calendar;
+import java.util.List;
+
+import static io.restassured.RestAssured.*;
+import static io.restassured.config.EncoderConfig.encoderConfig;
+
+
+public class XrayIntegrationHelper {
+
+    private static String _JiraAuthorization =System.getProperty("authorization").trim();
+    private static final String authType= System.getProperty("authType").trim()+" ";
+    private static final String _ProjectKey = System.getProperty("projectKey").trim();
+    private static String _TestExecutionID = null;
+
+    private static void setup() {
+        baseURI = System.getProperty("jiraUrl");
+        if(authType.equals("Basic "))
+            _JiraAuthorization=Base64.getEncoder().encodeToString(_JiraAuthorization.getBytes());
+        given()
+                .config(RestAssuredConfig.config().sslConfig(SSLConfig.sslConfig().allowAllHostnames()))
+                .relaxedHTTPSValidation();
+    }
+
+    /**
+     * Import cucumber results recorded in cucumber.jsom file through /import/execution/cucumber endpoint
+     *
+     * @param filepath > the report relative path
+     */
+    public static void importCucumberResults(String filepath) throws Exception {
+
+        setup();
+        String reportPath = FileActions.getInstance().getAbsolutePath(filepath);
+        ReportManager.logDiscrete("uploading file: " + reportPath);
+        ReportManager.logDiscrete("Length: " + new File(reportPath).length());
+
+        Gson gson = new GsonBuilder().setPrettyPrinting().create();
+        JsonElement je = JsonParser.parseString(new String(Files.readAllBytes(Paths.get(reportPath))));
+        String prettyJsonString = gson.toJson(je);
+
+        try {
+            Response response = given()
+                    .contentType("application/json")
+                    .header("Authorization", authType + _JiraAuthorization)
+                    .body(prettyJsonString)
+                    .expect().statusCode(200)
+                    .when()
+                    .post("/rest/raven/1.0/import/execution/cucumber").then().extract().response();
+
+            _TestExecutionID = response.jsonPath().get("testExecIssue.key").toString();
+            ReportManager.logDiscrete("ExecutionID: " + _TestExecutionID);
+        } catch (Exception e) {
+            ReportManagerHelper.logDiscrete(e);
+        }
+    }
+
+    /**
+     * Import TestNG results recorded in testng-results.jsom file through /import/execution/testng?projectKey=[projectKey] endpoint
+     *
+     * @param executionName        > The execution name mentioned in JiraXray.properties
+     * @param executionDescription > The execution Description mentioned in JiraXray.properties
+     */
+    public static void renameTestExecutionSuit(String executionName, String executionDescription) {
+
+        if (_TestExecutionID == null) return;
+        setup();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+        String body = "{\r\n    \"fields\" : {\r\n       " +
+                " \"summary\": " +
+                "\"Execution results " + executionName + " | " + sdf.format(Calendar.getInstance().getTime()) + "\",\r\n        " +
+                "\"description\": " +
+                "\"" + executionDescription + "\"\r\n    }\r\n}";
+        try {
+            given()
+                    .contentType("application/json")
+                    .header("Authorization", authType + _JiraAuthorization)
+                    .body(body)
+                    .expect().statusCode(204)
+                    .when()
+                    .put("/rest/api/2/issue/" + _TestExecutionID).then().extract().response();
+
+        } catch (Exception e) {
+            ReportManagerHelper.logDiscrete(e);
+        }
+    }
+
+    /**
+     * Import TestNG results recorded in testng-results.jsom file through /import/execution/testng?projectKey=[projectKey] endpoint
+     *
+     * @param filepath > the report relative path
+     */
+    public static void importTestNGResults(String filepath) {
+        setup();
+        String reportPath = FileActions.getInstance().getAbsolutePath(filepath);
+        ReportManager.logDiscrete("uploading file: " + reportPath);
+        ReportManager.logDiscrete("Length: " + new File(reportPath).length());
+        try {
+            Response response = given()
+                    .config(config().encoderConfig(encoderConfig().encodeContentTypeAs("multipart/form-data", ContentType.TEXT)))
+                    .relaxedHTTPSValidation().contentType("multipart/form-data")
+                    .header("Authorization", authType + _JiraAuthorization)
+                    .multiPart(new File(reportPath))
+                    .when()
+                    .post("/rest/raven/1.0/import/execution/testng?projectKey=" + _ProjectKey)
+                    .then().log().all().extract().response();
+
+            _TestExecutionID = response.jsonPath().get("testExecIssue.key").toString();
+            ReportManager.logDiscrete("ExecutionID: " + _TestExecutionID);
+
+        } catch (Exception e) {
+            ReportManagerHelper.logDiscrete(e);
+        }
+    }
+
+    /**
+     * Create JIRA Bug to report execution failure.
+     *
+     * @param files        -> list of the failed testcase attachments.
+     * @param testCaseName -> the failed testcase name
+     * @param description  --> the failed test case execution log
+     * @return String bugID
+     */
+    public static String createIssue(List<String> files, String testCaseName, String description) {
+        setup();
+        try {
+            Response response = given()
+                    .config(config().encoderConfig(encoderConfig().encodeContentTypeAs("application/json", ContentType.JSON)))
+                    .relaxedHTTPSValidation().contentType("application/json")
+                    .header("Authorization", authType + _JiraAuthorization)
+                    .when()
+                    .body(getCreateIssueRequestBody()
+                            .replace("${PROJECT_KEY}", _ProjectKey)
+                            .replace("${BUG_SUMMERY}", "Execution Bug: " + testCaseName)
+                            .replace("${BUG_DESCRIPTION}", description
+                                    .replaceAll("[^a-zA-Z0-9.?=*$%@#&!<>|\\{\\}\\[\\]\"' /]", "")
+                                    .replaceAll("\"", "'")
+                            )
+                            .replace("${ASSIGNEE_NAME}", System.getProperty("assignee"))
+                    )
+                    .post("/rest/api/2/issue")
+                    .then().log().all().extract().response();
+
+            String id = response.jsonPath().get("key").toString();
+
+            ReportManager.logDiscrete("BugID: " + id);
+            attachFilesToIssue(id, files);
+            return id;
+
+        } catch (Exception e) {
+            ReportManagerHelper.logDiscrete(e);
+            return null;
+        }
+    }
+
+    /**
+     * Update the created issue with the attachments.
+     *
+     * @param issueID -> the created bug ID.
+     * @param files   -> list of the failed testcase attachments.
+     */
+    public static void attachFilesToIssue(String issueID, List<String> files) {
+        setup();
+        try {
+            RequestSpecification req = given()
+                    .relaxedHTTPSValidation().contentType(ContentType.MULTIPART)
+                    .header("Authorization", authType + _JiraAuthorization)
+                    .header("X-Atlassian-Token", "nocheck");
+            for (String file : files)
+                req.multiPart("file", new File(file));
+
+            ReportManager.logDiscrete("BugID: " + issueID);
+            req.when()
+                    .post("/rest/api/2/issue/" + issueID + "/attachments")
+                    .then().log().all().extract().response();
+        } catch (Exception e) {
+            ReportManagerHelper.logDiscrete(e);
+        }
+    }
+
+    /**
+     * Link any jira 2 tickets using the tickets IDs through PUT API request. the covered relation is relates.
+     *
+     * @param ticketID   -> the main ticket ID.
+     * @param linkedToID -> the one to be linked to.
+     */
+    public static void link2Tickets(String ticketID, String linkedToID) {
+        setup();
+        try {
+            given()
+                    .config(config().encoderConfig(encoderConfig().encodeContentTypeAs("application/json", ContentType.JSON)))
+                    .relaxedHTTPSValidation().contentType("application/json")
+                    .header("Authorization", authType + _JiraAuthorization)
+                    .when()
+                    .body(getLinkJIRATicketRequestBody()
+                            .replace("${TICKET_ID}", linkedToID)
+                    )
+                    .put("/rest/api/2/issue/" + ticketID)
+                    .then().log().all().extract().response();
+        } catch (Exception e) {
+            ReportManagerHelper.logDiscrete(e);
+        }
+    }
+
+    private static String getCreateIssueRequestBody() {
+        return """
+                {
+                  "fields":{
+                    "project":{
+                      "key":"${PROJECT_KEY}"
+                    },
+                    "summary":"${BUG_SUMMERY}",
+                    "description":"Reported By SHAFT Automation Engine|| Execution Log ${BUG_DESCRIPTION}",
+                    "assignee":{
+                      "name":"${ASSIGNEE_NAME}"
+                    },
+                    "issuetype":{
+                      "name":"Bug"
+                    }
+                  }
+                }
+                """;
+    }
+
+    private static String getLinkJIRATicketRequestBody() {
+        return """
+                {
+                   "update":{
+                     "issuelinks":[
+                       {
+                         "add":{
+                           "type":{
+                             "name":"Relates"
+                           },
+                           "outwardIssue":{
+                             "key":"${TICKET_ID}"
+                           }
+                         }
+                       }
+                     ]
+                   }
+                 }
+                """;
+    }
+}
diff --git a/testlib/src/main/resources/java/removeunusedimports/Jdk17MultineStringBlockUnformatted.test b/testlib/src/main/resources/java/removeunusedimports/Jdk17MultineStringBlockUnformatted.test
new file mode 100644
index 0000000000..c5abb923c3
--- /dev/null
+++ b/testlib/src/main/resources/java/removeunusedimports/Jdk17MultineStringBlockUnformatted.test
@@ -0,0 +1,264 @@
+package io.github.shafthq.shaft.tools.tms;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;
+import com.shaft.cli.FileActions;
+import com.shaft.tools.io.ReportManager;
+import io.github.shafthq.shaft.tools.io.helpers.ReportManagerHelper;
+import io.restassured.config.RestAssuredConfig;
+import io.restassured.config.SSLConfig;
+import io.restassured.http.ContentType;
+import io.restassured.response.Response;
+import io.restassured.specification.RequestSpecification;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.text.SimpleDateFormat;
+import java.util.Base64;
+import java.util.Calendar;
+import java.util.List;
+
+import static io.restassured.RestAssured.*;
+import static io.restassured.config.EncoderConfig.encoderConfig;
+
+
+public class XrayIntegrationHelper {
+
+    private static String _JiraAuthorization =System.getProperty("authorization").trim();
+    private static final String authType= System.getProperty("authType").trim()+" ";
+    private static final String _ProjectKey = System.getProperty("projectKey").trim();
+    private static String _TestExecutionID = null;
+
+    private static void setup() {
+        baseURI = System.getProperty("jiraUrl");
+        if(authType.equals("Basic "))
+            _JiraAuthorization=Base64.getEncoder().encodeToString(_JiraAuthorization.getBytes());
+        given()
+                .config(RestAssuredConfig.config().sslConfig(SSLConfig.sslConfig().allowAllHostnames()))
+                .relaxedHTTPSValidation();
+    }
+
+    /**
+     * Import cucumber results recorded in cucumber.jsom file through /import/execution/cucumber endpoint
+     *
+     * @param filepath > the report relative path
+     */
+    public static void importCucumberResults(String filepath) throws Exception {
+
+        setup();
+        String reportPath = FileActions.getInstance().getAbsolutePath(filepath);
+        ReportManager.logDiscrete("uploading file: " + reportPath);
+        ReportManager.logDiscrete("Length: " + new File(reportPath).length());
+
+        Gson gson = new GsonBuilder().setPrettyPrinting().create();
+        JsonElement je = JsonParser.parseString(new String(Files.readAllBytes(Paths.get(reportPath))));
+        String prettyJsonString = gson.toJson(je);
+
+        try {
+            Response response = given()
+                    .contentType("application/json")
+                    .header("Authorization", authType + _JiraAuthorization)
+                    .body(prettyJsonString)
+                    .expect().statusCode(200)
+                    .when()
+                    .post("/rest/raven/1.0/import/execution/cucumber").then().extract().response();
+
+            _TestExecutionID = response.jsonPath().get("testExecIssue.key").toString();
+            ReportManager.logDiscrete("ExecutionID: " + _TestExecutionID);
+        } catch (Exception e) {
+            ReportManagerHelper.logDiscrete(e);
+        }
+    }
+
+    /**
+     * Import TestNG results recorded in testng-results.jsom file through /import/execution/testng?projectKey=[projectKey] endpoint
+     *
+     * @param executionName        > The execution name mentioned in JiraXray.properties
+     * @param executionDescription > The execution Description mentioned in JiraXray.properties
+     */
+    public static void renameTestExecutionSuit(String executionName, String executionDescription) {
+
+        if (_TestExecutionID == null) return;
+        setup();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+        String body = "{\r\n    \"fields\" : {\r\n       " +
+                " \"summary\": " +
+                "\"Execution results " + executionName + " | " + sdf.format(Calendar.getInstance().getTime()) + "\",\r\n        " +
+                "\"description\": " +
+                "\"" + executionDescription + "\"\r\n    }\r\n}";
+        try {
+            given()
+                    .contentType("application/json")
+                    .header("Authorization", authType + _JiraAuthorization)
+                    .body(body)
+                    .expect().statusCode(204)
+                    .when()
+                    .put("/rest/api/2/issue/" + _TestExecutionID).then().extract().response();
+
+        } catch (Exception e) {
+            ReportManagerHelper.logDiscrete(e);
+        }
+    }
+
+    /**
+     * Import TestNG results recorded in testng-results.jsom file through /import/execution/testng?projectKey=[projectKey] endpoint
+     *
+     * @param filepath > the report relative path
+     */
+    public static void importTestNGResults(String filepath) {
+        setup();
+        String reportPath = FileActions.getInstance().getAbsolutePath(filepath);
+        ReportManager.logDiscrete("uploading file: " + reportPath);
+        ReportManager.logDiscrete("Length: " + new File(reportPath).length());
+        try {
+            Response response = given()
+                    .config(config().encoderConfig(encoderConfig().encodeContentTypeAs("multipart/form-data", ContentType.TEXT)))
+                    .relaxedHTTPSValidation().contentType("multipart/form-data")
+                    .header("Authorization", authType + _JiraAuthorization)
+                    .multiPart(new File(reportPath))
+                    .when()
+                    .post("/rest/raven/1.0/import/execution/testng?projectKey=" + _ProjectKey)
+                    .then().log().all().extract().response();
+
+            _TestExecutionID = response.jsonPath().get("testExecIssue.key").toString();
+            ReportManager.logDiscrete("ExecutionID: " + _TestExecutionID);
+
+        } catch (Exception e) {
+            ReportManagerHelper.logDiscrete(e);
+        }
+    }
+
+    /**
+     * Create JIRA Bug to report execution failure.
+     *
+     * @param files        -> list of the failed testcase attachments.
+     * @param testCaseName -> the failed testcase name
+     * @param description  --> the failed test case execution log
+     * @return String bugID
+     */
+    public static String createIssue(List<String> files, String testCaseName, String description) {
+        setup();
+        try {
+            Response response = given()
+                    .config(config().encoderConfig(encoderConfig().encodeContentTypeAs("application/json", ContentType.JSON)))
+                    .relaxedHTTPSValidation().contentType("application/json")
+                    .header("Authorization", authType + _JiraAuthorization)
+                    .when()
+                    .body(getCreateIssueRequestBody()
+                            .replace("${PROJECT_KEY}", _ProjectKey)
+                            .replace("${BUG_SUMMERY}", "Execution Bug: " + testCaseName)
+                            .replace("${BUG_DESCRIPTION}", description
+                                    .replaceAll("[^a-zA-Z0-9.?=*$%@#&!<>|\\{\\}\\[\\]\"' /]", "")
+                                    .replaceAll("\"", "'")
+                            )
+                            .replace("${ASSIGNEE_NAME}", System.getProperty("assignee"))
+                    )
+                    .post("/rest/api/2/issue")
+                    .then().log().all().extract().response();
+
+            String id = response.jsonPath().get("key").toString();
+
+            ReportManager.logDiscrete("BugID: " + id);
+            attachFilesToIssue(id, files);
+            return id;
+
+        } catch (Exception e) {
+            ReportManagerHelper.logDiscrete(e);
+            return null;
+        }
+    }
+
+    /**
+     * Update the created issue with the attachments.
+     *
+     * @param issueID -> the created bug ID.
+     * @param files   -> list of the failed testcase attachments.
+     */
+    public static void attachFilesToIssue(String issueID, List<String> files) {
+        setup();
+        try {
+            RequestSpecification req = given()
+                    .relaxedHTTPSValidation().contentType(ContentType.MULTIPART)
+                    .header("Authorization", authType + _JiraAuthorization)
+                    .header("X-Atlassian-Token", "nocheck");
+            for (String file : files)
+                req.multiPart("file", new File(file));
+
+            ReportManager.logDiscrete("BugID: " + issueID);
+            req.when()
+                    .post("/rest/api/2/issue/" + issueID + "/attachments")
+                    .then().log().all().extract().response();
+        } catch (Exception e) {
+            ReportManagerHelper.logDiscrete(e);
+        }
+    }
+
+    /**
+     * Link any jira 2 tickets using the tickets IDs through PUT API request. the covered relation is relates.
+     *
+     * @param ticketID   -> the main ticket ID.
+     * @param linkedToID -> the one to be linked to.
+     */
+    public static void link2Tickets(String ticketID, String linkedToID) {
+        setup();
+        try {
+            given()
+                    .config(config().encoderConfig(encoderConfig().encodeContentTypeAs("application/json", ContentType.JSON)))
+                    .relaxedHTTPSValidation().contentType("application/json")
+                    .header("Authorization", authType + _JiraAuthorization)
+                    .when()
+                    .body(getLinkJIRATicketRequestBody()
+                            .replace("${TICKET_ID}", linkedToID)
+                    )
+                    .put("/rest/api/2/issue/" + ticketID)
+                    .then().log().all().extract().response();
+        } catch (Exception e) {
+            ReportManagerHelper.logDiscrete(e);
+        }
+    }
+
+    private static String getCreateIssueRequestBody() {
+        return """
+                {
+                  "fields":{
+                    "project":{
+                      "key":"${PROJECT_KEY}"
+                    },
+                    "summary":"${BUG_SUMMERY}",
+                    "description":"Reported By SHAFT Automation Engine|| Execution Log ${BUG_DESCRIPTION}",
+                    "assignee":{
+                      "name":"${ASSIGNEE_NAME}"
+                    },
+                    "issuetype":{
+                      "name":"Bug"
+                    }
+                  }
+                }
+                """;
+    }
+
+    private static String getLinkJIRATicketRequestBody() {
+        return """
+                {
+                   "update":{
+                     "issuelinks":[
+                       {
+                         "add":{
+                           "type":{
+                             "name":"Relates"
+                           },
+                           "outwardIssue":{
+                             "key":"${TICKET_ID}"
+                           }
+                         }
+                       }
+                     ]
+                   }
+                 }
+                """;
+    }
+}
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStepTest.java
index 5e0baa86c2..199ef5486b 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStepTest.java
@@ -30,7 +30,8 @@ void behavior() throws Exception {
 				.testResource("java/removeunusedimports/JavaCodeUnformatted.test", "java/removeunusedimports/JavaCodeFormatted.test")
 				.testResource("java/removeunusedimports/JavaCodeWithLicenseUnformatted.test", "java/removeunusedimports/JavaCodeWithLicenseFormatted.test")
 				.testResource("java/removeunusedimports/JavaCodeWithLicensePackageUnformatted.test", "java/removeunusedimports/JavaCodeWithLicensePackageFormatted.test")
-				.testResource("java/removeunusedimports/JavaCodeWithPackageUnformatted.test", "java/removeunusedimports/JavaCodeWithPackageFormatted.test");
+				.testResource("java/removeunusedimports/JavaCodeWithPackageUnformatted.test", "java/removeunusedimports/JavaCodeWithPackageFormatted.test")
+				.testResource("java/removeunusedimports/Jdk17MultineStringBlockUnformatted.test", "java/removeunusedimports/Jdk17MultineStringBlockFormatted.test");
 	}
 
 	@Test

From a899b8cd83312d8e0a8b481121175e14d23bd836 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Sun, 26 Feb 2023 13:52:22 +0400
Subject: [PATCH 0819/2068] Simplify testCase

---
 .../Jdk17MultineStringBlockFormatted.test     | 215 ------------------
 .../Jdk17MultineStringBlockUnformatted.test   | 215 ------------------
 2 files changed, 430 deletions(-)

diff --git a/testlib/src/main/resources/java/removeunusedimports/Jdk17MultineStringBlockFormatted.test b/testlib/src/main/resources/java/removeunusedimports/Jdk17MultineStringBlockFormatted.test
index c5abb923c3..1bfad32664 100644
--- a/testlib/src/main/resources/java/removeunusedimports/Jdk17MultineStringBlockFormatted.test
+++ b/testlib/src/main/resources/java/removeunusedimports/Jdk17MultineStringBlockFormatted.test
@@ -26,221 +26,6 @@ import static io.restassured.config.EncoderConfig.encoderConfig;
 
 
 public class XrayIntegrationHelper {
-
-    private static String _JiraAuthorization =System.getProperty("authorization").trim();
-    private static final String authType= System.getProperty("authType").trim()+" ";
-    private static final String _ProjectKey = System.getProperty("projectKey").trim();
-    private static String _TestExecutionID = null;
-
-    private static void setup() {
-        baseURI = System.getProperty("jiraUrl");
-        if(authType.equals("Basic "))
-            _JiraAuthorization=Base64.getEncoder().encodeToString(_JiraAuthorization.getBytes());
-        given()
-                .config(RestAssuredConfig.config().sslConfig(SSLConfig.sslConfig().allowAllHostnames()))
-                .relaxedHTTPSValidation();
-    }
-
-    /**
-     * Import cucumber results recorded in cucumber.jsom file through /import/execution/cucumber endpoint
-     *
-     * @param filepath > the report relative path
-     */
-    public static void importCucumberResults(String filepath) throws Exception {
-
-        setup();
-        String reportPath = FileActions.getInstance().getAbsolutePath(filepath);
-        ReportManager.logDiscrete("uploading file: " + reportPath);
-        ReportManager.logDiscrete("Length: " + new File(reportPath).length());
-
-        Gson gson = new GsonBuilder().setPrettyPrinting().create();
-        JsonElement je = JsonParser.parseString(new String(Files.readAllBytes(Paths.get(reportPath))));
-        String prettyJsonString = gson.toJson(je);
-
-        try {
-            Response response = given()
-                    .contentType("application/json")
-                    .header("Authorization", authType + _JiraAuthorization)
-                    .body(prettyJsonString)
-                    .expect().statusCode(200)
-                    .when()
-                    .post("/rest/raven/1.0/import/execution/cucumber").then().extract().response();
-
-            _TestExecutionID = response.jsonPath().get("testExecIssue.key").toString();
-            ReportManager.logDiscrete("ExecutionID: " + _TestExecutionID);
-        } catch (Exception e) {
-            ReportManagerHelper.logDiscrete(e);
-        }
-    }
-
-    /**
-     * Import TestNG results recorded in testng-results.jsom file through /import/execution/testng?projectKey=[projectKey] endpoint
-     *
-     * @param executionName        > The execution name mentioned in JiraXray.properties
-     * @param executionDescription > The execution Description mentioned in JiraXray.properties
-     */
-    public static void renameTestExecutionSuit(String executionName, String executionDescription) {
-
-        if (_TestExecutionID == null) return;
-        setup();
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
-        String body = "{\r\n    \"fields\" : {\r\n       " +
-                " \"summary\": " +
-                "\"Execution results " + executionName + " | " + sdf.format(Calendar.getInstance().getTime()) + "\",\r\n        " +
-                "\"description\": " +
-                "\"" + executionDescription + "\"\r\n    }\r\n}";
-        try {
-            given()
-                    .contentType("application/json")
-                    .header("Authorization", authType + _JiraAuthorization)
-                    .body(body)
-                    .expect().statusCode(204)
-                    .when()
-                    .put("/rest/api/2/issue/" + _TestExecutionID).then().extract().response();
-
-        } catch (Exception e) {
-            ReportManagerHelper.logDiscrete(e);
-        }
-    }
-
-    /**
-     * Import TestNG results recorded in testng-results.jsom file through /import/execution/testng?projectKey=[projectKey] endpoint
-     *
-     * @param filepath > the report relative path
-     */
-    public static void importTestNGResults(String filepath) {
-        setup();
-        String reportPath = FileActions.getInstance().getAbsolutePath(filepath);
-        ReportManager.logDiscrete("uploading file: " + reportPath);
-        ReportManager.logDiscrete("Length: " + new File(reportPath).length());
-        try {
-            Response response = given()
-                    .config(config().encoderConfig(encoderConfig().encodeContentTypeAs("multipart/form-data", ContentType.TEXT)))
-                    .relaxedHTTPSValidation().contentType("multipart/form-data")
-                    .header("Authorization", authType + _JiraAuthorization)
-                    .multiPart(new File(reportPath))
-                    .when()
-                    .post("/rest/raven/1.0/import/execution/testng?projectKey=" + _ProjectKey)
-                    .then().log().all().extract().response();
-
-            _TestExecutionID = response.jsonPath().get("testExecIssue.key").toString();
-            ReportManager.logDiscrete("ExecutionID: " + _TestExecutionID);
-
-        } catch (Exception e) {
-            ReportManagerHelper.logDiscrete(e);
-        }
-    }
-
-    /**
-     * Create JIRA Bug to report execution failure.
-     *
-     * @param files        -> list of the failed testcase attachments.
-     * @param testCaseName -> the failed testcase name
-     * @param description  --> the failed test case execution log
-     * @return String bugID
-     */
-    public static String createIssue(List<String> files, String testCaseName, String description) {
-        setup();
-        try {
-            Response response = given()
-                    .config(config().encoderConfig(encoderConfig().encodeContentTypeAs("application/json", ContentType.JSON)))
-                    .relaxedHTTPSValidation().contentType("application/json")
-                    .header("Authorization", authType + _JiraAuthorization)
-                    .when()
-                    .body(getCreateIssueRequestBody()
-                            .replace("${PROJECT_KEY}", _ProjectKey)
-                            .replace("${BUG_SUMMERY}", "Execution Bug: " + testCaseName)
-                            .replace("${BUG_DESCRIPTION}", description
-                                    .replaceAll("[^a-zA-Z0-9.?=*$%@#&!<>|\\{\\}\\[\\]\"' /]", "")
-                                    .replaceAll("\"", "'")
-                            )
-                            .replace("${ASSIGNEE_NAME}", System.getProperty("assignee"))
-                    )
-                    .post("/rest/api/2/issue")
-                    .then().log().all().extract().response();
-
-            String id = response.jsonPath().get("key").toString();
-
-            ReportManager.logDiscrete("BugID: " + id);
-            attachFilesToIssue(id, files);
-            return id;
-
-        } catch (Exception e) {
-            ReportManagerHelper.logDiscrete(e);
-            return null;
-        }
-    }
-
-    /**
-     * Update the created issue with the attachments.
-     *
-     * @param issueID -> the created bug ID.
-     * @param files   -> list of the failed testcase attachments.
-     */
-    public static void attachFilesToIssue(String issueID, List<String> files) {
-        setup();
-        try {
-            RequestSpecification req = given()
-                    .relaxedHTTPSValidation().contentType(ContentType.MULTIPART)
-                    .header("Authorization", authType + _JiraAuthorization)
-                    .header("X-Atlassian-Token", "nocheck");
-            for (String file : files)
-                req.multiPart("file", new File(file));
-
-            ReportManager.logDiscrete("BugID: " + issueID);
-            req.when()
-                    .post("/rest/api/2/issue/" + issueID + "/attachments")
-                    .then().log().all().extract().response();
-        } catch (Exception e) {
-            ReportManagerHelper.logDiscrete(e);
-        }
-    }
-
-    /**
-     * Link any jira 2 tickets using the tickets IDs through PUT API request. the covered relation is relates.
-     *
-     * @param ticketID   -> the main ticket ID.
-     * @param linkedToID -> the one to be linked to.
-     */
-    public static void link2Tickets(String ticketID, String linkedToID) {
-        setup();
-        try {
-            given()
-                    .config(config().encoderConfig(encoderConfig().encodeContentTypeAs("application/json", ContentType.JSON)))
-                    .relaxedHTTPSValidation().contentType("application/json")
-                    .header("Authorization", authType + _JiraAuthorization)
-                    .when()
-                    .body(getLinkJIRATicketRequestBody()
-                            .replace("${TICKET_ID}", linkedToID)
-                    )
-                    .put("/rest/api/2/issue/" + ticketID)
-                    .then().log().all().extract().response();
-        } catch (Exception e) {
-            ReportManagerHelper.logDiscrete(e);
-        }
-    }
-
-    private static String getCreateIssueRequestBody() {
-        return """
-                {
-                  "fields":{
-                    "project":{
-                      "key":"${PROJECT_KEY}"
-                    },
-                    "summary":"${BUG_SUMMERY}",
-                    "description":"Reported By SHAFT Automation Engine|| Execution Log ${BUG_DESCRIPTION}",
-                    "assignee":{
-                      "name":"${ASSIGNEE_NAME}"
-                    },
-                    "issuetype":{
-                      "name":"Bug"
-                    }
-                  }
-                }
-                """;
-    }
-
     private static String getLinkJIRATicketRequestBody() {
         return """
                 {
diff --git a/testlib/src/main/resources/java/removeunusedimports/Jdk17MultineStringBlockUnformatted.test b/testlib/src/main/resources/java/removeunusedimports/Jdk17MultineStringBlockUnformatted.test
index c5abb923c3..1bfad32664 100644
--- a/testlib/src/main/resources/java/removeunusedimports/Jdk17MultineStringBlockUnformatted.test
+++ b/testlib/src/main/resources/java/removeunusedimports/Jdk17MultineStringBlockUnformatted.test
@@ -26,221 +26,6 @@ import static io.restassured.config.EncoderConfig.encoderConfig;
 
 
 public class XrayIntegrationHelper {
-
-    private static String _JiraAuthorization =System.getProperty("authorization").trim();
-    private static final String authType= System.getProperty("authType").trim()+" ";
-    private static final String _ProjectKey = System.getProperty("projectKey").trim();
-    private static String _TestExecutionID = null;
-
-    private static void setup() {
-        baseURI = System.getProperty("jiraUrl");
-        if(authType.equals("Basic "))
-            _JiraAuthorization=Base64.getEncoder().encodeToString(_JiraAuthorization.getBytes());
-        given()
-                .config(RestAssuredConfig.config().sslConfig(SSLConfig.sslConfig().allowAllHostnames()))
-                .relaxedHTTPSValidation();
-    }
-
-    /**
-     * Import cucumber results recorded in cucumber.jsom file through /import/execution/cucumber endpoint
-     *
-     * @param filepath > the report relative path
-     */
-    public static void importCucumberResults(String filepath) throws Exception {
-
-        setup();
-        String reportPath = FileActions.getInstance().getAbsolutePath(filepath);
-        ReportManager.logDiscrete("uploading file: " + reportPath);
-        ReportManager.logDiscrete("Length: " + new File(reportPath).length());
-
-        Gson gson = new GsonBuilder().setPrettyPrinting().create();
-        JsonElement je = JsonParser.parseString(new String(Files.readAllBytes(Paths.get(reportPath))));
-        String prettyJsonString = gson.toJson(je);
-
-        try {
-            Response response = given()
-                    .contentType("application/json")
-                    .header("Authorization", authType + _JiraAuthorization)
-                    .body(prettyJsonString)
-                    .expect().statusCode(200)
-                    .when()
-                    .post("/rest/raven/1.0/import/execution/cucumber").then().extract().response();
-
-            _TestExecutionID = response.jsonPath().get("testExecIssue.key").toString();
-            ReportManager.logDiscrete("ExecutionID: " + _TestExecutionID);
-        } catch (Exception e) {
-            ReportManagerHelper.logDiscrete(e);
-        }
-    }
-
-    /**
-     * Import TestNG results recorded in testng-results.jsom file through /import/execution/testng?projectKey=[projectKey] endpoint
-     *
-     * @param executionName        > The execution name mentioned in JiraXray.properties
-     * @param executionDescription > The execution Description mentioned in JiraXray.properties
-     */
-    public static void renameTestExecutionSuit(String executionName, String executionDescription) {
-
-        if (_TestExecutionID == null) return;
-        setup();
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
-        String body = "{\r\n    \"fields\" : {\r\n       " +
-                " \"summary\": " +
-                "\"Execution results " + executionName + " | " + sdf.format(Calendar.getInstance().getTime()) + "\",\r\n        " +
-                "\"description\": " +
-                "\"" + executionDescription + "\"\r\n    }\r\n}";
-        try {
-            given()
-                    .contentType("application/json")
-                    .header("Authorization", authType + _JiraAuthorization)
-                    .body(body)
-                    .expect().statusCode(204)
-                    .when()
-                    .put("/rest/api/2/issue/" + _TestExecutionID).then().extract().response();
-
-        } catch (Exception e) {
-            ReportManagerHelper.logDiscrete(e);
-        }
-    }
-
-    /**
-     * Import TestNG results recorded in testng-results.jsom file through /import/execution/testng?projectKey=[projectKey] endpoint
-     *
-     * @param filepath > the report relative path
-     */
-    public static void importTestNGResults(String filepath) {
-        setup();
-        String reportPath = FileActions.getInstance().getAbsolutePath(filepath);
-        ReportManager.logDiscrete("uploading file: " + reportPath);
-        ReportManager.logDiscrete("Length: " + new File(reportPath).length());
-        try {
-            Response response = given()
-                    .config(config().encoderConfig(encoderConfig().encodeContentTypeAs("multipart/form-data", ContentType.TEXT)))
-                    .relaxedHTTPSValidation().contentType("multipart/form-data")
-                    .header("Authorization", authType + _JiraAuthorization)
-                    .multiPart(new File(reportPath))
-                    .when()
-                    .post("/rest/raven/1.0/import/execution/testng?projectKey=" + _ProjectKey)
-                    .then().log().all().extract().response();
-
-            _TestExecutionID = response.jsonPath().get("testExecIssue.key").toString();
-            ReportManager.logDiscrete("ExecutionID: " + _TestExecutionID);
-
-        } catch (Exception e) {
-            ReportManagerHelper.logDiscrete(e);
-        }
-    }
-
-    /**
-     * Create JIRA Bug to report execution failure.
-     *
-     * @param files        -> list of the failed testcase attachments.
-     * @param testCaseName -> the failed testcase name
-     * @param description  --> the failed test case execution log
-     * @return String bugID
-     */
-    public static String createIssue(List<String> files, String testCaseName, String description) {
-        setup();
-        try {
-            Response response = given()
-                    .config(config().encoderConfig(encoderConfig().encodeContentTypeAs("application/json", ContentType.JSON)))
-                    .relaxedHTTPSValidation().contentType("application/json")
-                    .header("Authorization", authType + _JiraAuthorization)
-                    .when()
-                    .body(getCreateIssueRequestBody()
-                            .replace("${PROJECT_KEY}", _ProjectKey)
-                            .replace("${BUG_SUMMERY}", "Execution Bug: " + testCaseName)
-                            .replace("${BUG_DESCRIPTION}", description
-                                    .replaceAll("[^a-zA-Z0-9.?=*$%@#&!<>|\\{\\}\\[\\]\"' /]", "")
-                                    .replaceAll("\"", "'")
-                            )
-                            .replace("${ASSIGNEE_NAME}", System.getProperty("assignee"))
-                    )
-                    .post("/rest/api/2/issue")
-                    .then().log().all().extract().response();
-
-            String id = response.jsonPath().get("key").toString();
-
-            ReportManager.logDiscrete("BugID: " + id);
-            attachFilesToIssue(id, files);
-            return id;
-
-        } catch (Exception e) {
-            ReportManagerHelper.logDiscrete(e);
-            return null;
-        }
-    }
-
-    /**
-     * Update the created issue with the attachments.
-     *
-     * @param issueID -> the created bug ID.
-     * @param files   -> list of the failed testcase attachments.
-     */
-    public static void attachFilesToIssue(String issueID, List<String> files) {
-        setup();
-        try {
-            RequestSpecification req = given()
-                    .relaxedHTTPSValidation().contentType(ContentType.MULTIPART)
-                    .header("Authorization", authType + _JiraAuthorization)
-                    .header("X-Atlassian-Token", "nocheck");
-            for (String file : files)
-                req.multiPart("file", new File(file));
-
-            ReportManager.logDiscrete("BugID: " + issueID);
-            req.when()
-                    .post("/rest/api/2/issue/" + issueID + "/attachments")
-                    .then().log().all().extract().response();
-        } catch (Exception e) {
-            ReportManagerHelper.logDiscrete(e);
-        }
-    }
-
-    /**
-     * Link any jira 2 tickets using the tickets IDs through PUT API request. the covered relation is relates.
-     *
-     * @param ticketID   -> the main ticket ID.
-     * @param linkedToID -> the one to be linked to.
-     */
-    public static void link2Tickets(String ticketID, String linkedToID) {
-        setup();
-        try {
-            given()
-                    .config(config().encoderConfig(encoderConfig().encodeContentTypeAs("application/json", ContentType.JSON)))
-                    .relaxedHTTPSValidation().contentType("application/json")
-                    .header("Authorization", authType + _JiraAuthorization)
-                    .when()
-                    .body(getLinkJIRATicketRequestBody()
-                            .replace("${TICKET_ID}", linkedToID)
-                    )
-                    .put("/rest/api/2/issue/" + ticketID)
-                    .then().log().all().extract().response();
-        } catch (Exception e) {
-            ReportManagerHelper.logDiscrete(e);
-        }
-    }
-
-    private static String getCreateIssueRequestBody() {
-        return """
-                {
-                  "fields":{
-                    "project":{
-                      "key":"${PROJECT_KEY}"
-                    },
-                    "summary":"${BUG_SUMMERY}",
-                    "description":"Reported By SHAFT Automation Engine|| Execution Log ${BUG_DESCRIPTION}",
-                    "assignee":{
-                      "name":"${ASSIGNEE_NAME}"
-                    },
-                    "issuetype":{
-                      "name":"Bug"
-                    }
-                  }
-                }
-                """;
-    }
-
     private static String getLinkJIRATicketRequestBody() {
         return """
                 {

From 0bef59b146f9e66b93f94e6281df9b3e63ede3cd Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Sun, 26 Feb 2023 13:55:43 +0400
Subject: [PATCH 0820/2068] Fix style

---
 .../com/diffplug/spotless/java/RemoveUnusedImportsStepTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStepTest.java
index 199ef5486b..171d6753e0 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From e01cc9ac8ac8685a819f6ae8115d2a33505338f8 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Sun, 26 Feb 2023 21:05:54 +0400
Subject: [PATCH 0821/2068] Propose a JavaParser-based removeUnunsedImports

---
 lib/build.gradle                              |   6 +-
 .../JavaparserRemoveUnusedImportsFunc.java    | 213 ++++++++++++++++++
 .../JavaparserRemoveUnusedImportsStep.java    | 104 +++++++++
 .../Jdk17MultineStringBlockFormatted.test     |  22 --
 .../removeunusedimports/RevelcFormatted.test  |  81 +++++++
 .../RevelcUnformatted.test                    |  89 ++++++++
 ...JavaparserRemoveUnusedImportsStepTest.java |  54 +++++
 .../java/RemoveUnusedImportsStepTest.java     |   4 +-
 8 files changed, 549 insertions(+), 24 deletions(-)
 create mode 100644 lib/src/javaparser/java/com/diffplug/spotless/glue/java/JavaparserRemoveUnusedImportsFunc.java
 create mode 100644 lib/src/main/java/com/diffplug/spotless/java/JavaparserRemoveUnusedImportsStep.java
 create mode 100644 testlib/src/main/resources/java/removeunusedimports/RevelcFormatted.test
 create mode 100644 testlib/src/main/resources/java/removeunusedimports/RevelcUnformatted.test
 create mode 100644 testlib/src/test/java/com/diffplug/spotless/java/JavaparserRemoveUnusedImportsStepTest.java

diff --git a/lib/build.gradle b/lib/build.gradle
index bfa54aaa13..041c706657 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -17,7 +17,8 @@ def NEEDS_GLUE = [
 	'scalafmt',
 	'jackson',
 	'gson',
-	'cleanthat'
+	'cleanthat',
+	'javaparser'
 ]
 for (glue in NEEDS_GLUE) {
 	sourceSets.register(glue) {
@@ -110,6 +111,9 @@ dependencies {
 
 	cleanthatCompileOnly 'io.github.solven-eu.cleanthat:java:2.2'
 	compatCleanthat2Dot1CompileAndTestOnly 'io.github.solven-eu.cleanthat:java:2.2'
+
+	javaparserCompileOnly 'com.github.javaparser:javaparser-core:3.25.0'
+	javaparserCompileOnly 'org.slf4j:slf4j-api:2.0.6'
 }
 
 // we'll hold the core lib to a high standard
diff --git a/lib/src/javaparser/java/com/diffplug/spotless/glue/java/JavaparserRemoveUnusedImportsFunc.java b/lib/src/javaparser/java/com/diffplug/spotless/glue/java/JavaparserRemoveUnusedImportsFunc.java
new file mode 100644
index 0000000000..035daacadf
--- /dev/null
+++ b/lib/src/javaparser/java/com/diffplug/spotless/glue/java/JavaparserRemoveUnusedImportsFunc.java
@@ -0,0 +1,213 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.glue.java;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.javaparser.JavaParser;
+import com.github.javaparser.JavaToken;
+import com.github.javaparser.ParseResult;
+import com.github.javaparser.ParserConfiguration;
+import com.github.javaparser.TokenRange;
+import com.github.javaparser.ast.CompilationUnit;
+import com.github.javaparser.ast.ImportDeclaration;
+import com.github.javaparser.ast.Node;
+import com.github.javaparser.ast.NodeList;
+import com.github.javaparser.ast.PackageDeclaration;
+import com.github.javaparser.ast.comments.JavadocComment;
+import com.github.javaparser.javadoc.Javadoc;
+import com.github.javaparser.javadoc.JavadocBlockTag;
+import com.github.javaparser.javadoc.description.JavadocDescription;
+import com.github.javaparser.javadoc.description.JavadocInlineTag;
+import com.github.javaparser.javadoc.description.JavadocSnippet;
+import com.github.javaparser.printer.lexicalpreservation.LexicalPreservingPrinter;
+
+import com.diffplug.spotless.FormatterFunc;
+
+/**
+ * Remove imports from a Java source file by analyzing {@link ImportDeclaration}.
+ * <p>
+ * More precisely, it will analyze each Tokens beinh used in the code-base, and remove imports not matching given import.
+ * <p>
+ * One limitation is it will not strip away wildcard imports.
+ */
+// https://github.com/javaparser/javaparser/issues/1590
+// https://github.com/revelc/impsort-maven-plugin/blob/main/src/main/java/net/revelc/code/impsort/ImpSort.java
+public class JavaparserRemoveUnusedImportsFunc implements FormatterFunc {
+	private static final Logger LOGGER = LoggerFactory.getLogger(JavaparserRemoveUnusedImportsFunc.class);
+
+	public String apply(String input) throws InterruptedException, IOException {
+		// We consider the source is very recent, as source is retro-compatible (i.e. not feature get deprecated)
+		ParserConfiguration.LanguageLevel languageLevel = ParserConfiguration.LanguageLevel.BLEEDING_EDGE;
+		ParseResult<CompilationUnit> parseResult = new JavaParser(new ParserConfiguration().setLanguageLevel(languageLevel)).parse(input);
+		CompilationUnit unit = parseResult.getResult().orElseThrow(() -> {
+			return new IllegalArgumentException("Issue parsing the input: " + parseResult.getProblems());
+		});
+		if (!parseResult.isSuccessful()) {
+			throw new IllegalArgumentException("Issue parsing the input: " + parseResult.getProblems());
+		}
+
+		NodeList<ImportDeclaration> importDeclarations = unit.getImports();
+		if (importDeclarations.isEmpty()) {
+			return input;
+		}
+
+		Set<String> tokensInUse = tokensInUse(unit);
+
+		List<ImportDeclaration> unusedImports = removeUnusedImports(importDeclarations, tokensInUse);
+
+		if (unusedImports.isEmpty()) {
+			return input;
+		} else {
+			// This is necessary to get, after mutations, a source as similar as possible to the original one
+			LexicalPreservingPrinter.setup(unit);
+
+			// Remove all unused imports
+			unusedImports.forEach(importDeclaration -> {
+				try {
+					importDeclaration.remove();
+				} catch (RuntimeException e) {
+					throw new RuntimeException("Issue removing an import statement: " + importDeclaration, e);
+				}
+			});
+
+			// print the CompilationUnit after mutations
+			return LexicalPreservingPrinter.print(unit);
+		}
+	}
+
+	/*
+	 * Extract all of the tokens from the main body of the file.
+	 *
+	 * This set of tokens represents all of the file's dependencies, and is used to figure out whether
+	 * or not an import is unused.
+	 */
+	// https://github.com/revelc/impsort-maven-plugin/blob/main/src/main/java/net/revelc/code/impsort/ImpSort.java#L278
+	private static Set<String> tokensInUse(CompilationUnit unit) {
+		// Extract tokens from the java code:
+		Stream<Node> packageDecl = unit.getPackageDeclaration().isPresent()
+				? Stream.of(unit.getPackageDeclaration().get()).map(PackageDeclaration::getAnnotations)
+						.flatMap(NodeList::stream)
+				: Stream.empty();
+		Stream<String> typesInCode = Stream.concat(packageDecl, unit.getTypes().stream())
+				.map(Node::getTokenRange).filter(Optional::isPresent).map(Optional::get)
+				.filter(r -> r != TokenRange.INVALID).flatMap(r -> {
+					// get all JavaTokens as strings from each range
+					return StreamSupport.stream(r.spliterator(), false);
+				}).map(JavaToken::asString);
+
+		// Extract referenced class names from parsed javadoc comments:
+		Stream<String> typesInJavadocs = unit.getAllComments().stream()
+				.filter(c -> c instanceof JavadocComment).map(JavadocComment.class::cast)
+				.map(JavadocComment::parse).flatMap(JavaparserRemoveUnusedImportsFunc::parseJavadoc);
+
+		return Stream.concat(typesInCode, typesInJavadocs)
+				.filter(t -> t != null && !t.isEmpty() && Character.isJavaIdentifierStart(t.charAt(0)))
+				.collect(Collectors.toSet());
+	}
+
+	/*
+	 * Remove unused imports.
+	 *
+	 * This algorithm only looks at the file itself, and evaluates whether or not a given import is
+	 * unused, by checking if the last segment of the import path (typically a class name or a static
+	 * function name) appears in the file.
+	 *
+	 * This means that it is not possible to remove import statements with wildcards.
+	 */
+	// https://github.com/revelc/impsort-maven-plugin/blob/main/src/main/java/net/revelc/code/impsort/ImpSort.java#L350
+	private static List<ImportDeclaration> removeUnusedImports(Collection<ImportDeclaration> imports, Set<String> tokensInUse) {
+		// We clone the input Collection as it typically reflects dynamically the imports from the CompilationUnit
+		// Hence, removal during iteration may lead to issues
+		imports = new ArrayList<>(imports);
+
+		return imports.stream().filter(i -> {
+			String[] segments = i.getNameAsString().split("[.]");
+			if (segments.length == 0) {
+				throw new AssertionError("Parse tree includes invalid import statements");
+			}
+
+			String lastSegment = segments[segments.length - 1];
+			if (lastSegment.equals("*")) {
+				return false;
+			}
+
+			return !tokensInUse.contains(lastSegment);
+		}).collect(Collectors.toList());
+	}
+
+	// https://github.com/revelc/impsort-maven-plugin/blob/main/src/main/java/net/revelc/code/impsort/ImpSort.java#L366
+	static void removeSamePackageImports(Set<ImportDeclaration> imports,
+			Optional<PackageDeclaration> packageDeclaration) {
+		String packageName = packageDeclaration.map(p -> p.getName().toString()).orElse("");
+		imports.removeIf(i -> {
+			String imp = i.getNameAsString();
+			if (packageName.isEmpty()) {
+				return !imp.contains(".");
+			}
+			return imp.startsWith(packageName) && imp.lastIndexOf(".") <= packageName.length();
+		});
+	}
+
+	// parse both main doc description and any block tags
+	// https://github.com/revelc/impsort-maven-plugin/blob/main/src/main/java/net/revelc/code/impsort/ImpSort.java#L304
+	private static Stream<String> parseJavadoc(Javadoc javadoc) {
+		// parse main doc description
+		Stream<String> stringsFromJavadocDescription = Stream.of(javadoc.getDescription()).flatMap(JavaparserRemoveUnusedImportsFunc::parseJavadocDescription);
+		// grab tag names and parsed descriptions for block tags
+		Stream<String> stringsFromBlockTags = javadoc.getBlockTags().stream().flatMap(tag -> {
+			// only @throws and @exception have names who are importable; @param and others don't
+			EnumSet<JavadocBlockTag.Type> blockTagTypesWithImportableNames = EnumSet.of(JavadocBlockTag.Type.THROWS, JavadocBlockTag.Type.EXCEPTION);
+			Stream<String> importableTagNames = blockTagTypesWithImportableNames.contains(tag.getType())
+					? Stream.of(tag.getName()).filter(Optional::isPresent).map(Optional::get)
+					: Stream.empty();
+			Stream<String> tagDescriptions = Stream.of(tag.getContent()).flatMap(JavaparserRemoveUnusedImportsFunc::parseJavadocDescription);
+			return Stream.concat(importableTagNames, tagDescriptions);
+		});
+		return Stream.concat(stringsFromJavadocDescription, stringsFromBlockTags);
+	}
+
+	// https://github.com/revelc/impsort-maven-plugin/blob/main/src/main/java/net/revelc/code/impsort/ImpSort.java#L323
+	private static Stream<String> parseJavadocDescription(JavadocDescription description) {
+		return description.getElements().stream().map(element -> {
+			if (element instanceof JavadocInlineTag) {
+				// inline tags like {@link Foo}
+				return ((JavadocInlineTag) element).getContent();
+			} else if (element instanceof JavadocSnippet) {
+				// snippets like @see Foo
+				return element.toText();
+			} else {
+				// try to handle unknown elements as best we can
+				return element.toText();
+			}
+		}).flatMap(s -> {
+			// split text descriptions into word tokens
+			return Stream.of(s.split("\\W+"));
+		});
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/java/JavaparserRemoveUnusedImportsStep.java b/lib/src/main/java/com/diffplug/spotless/java/JavaparserRemoveUnusedImportsStep.java
new file mode 100644
index 0000000000..1399498afb
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/java/JavaparserRemoveUnusedImportsStep.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.java;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.util.Objects;
+
+import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.JarState;
+import com.diffplug.spotless.Provisioner;
+
+/** Uses java-parser, but only to remove unused imports. */
+public class JavaparserRemoveUnusedImportsStep {
+	private static final String MAVEN_COORDINATE = "com.github.javaparser:javaparser-core";
+
+	// prevent direct instantiation
+	private JavaparserRemoveUnusedImportsStep() {}
+
+	static final String NAME = "removeUnusedImports_javaParser";
+
+	public static FormatterStep create(Provisioner provisioner) {
+		return create(defaultGroupArtifact(), JavaparserRemoveUnusedImportsStep.defaultVersion(), provisioner);
+	}
+
+	/** Creates a step which apply selected CleanThat mutators. */
+	public static FormatterStep create(String groupArtifact,
+			String version,
+			Provisioner provisioner) {
+		Objects.requireNonNull(groupArtifact, "groupArtifact");
+		if (groupArtifact.chars().filter(ch -> ch == ':').count() != 1) {
+			throw new IllegalArgumentException("groupArtifact must be in the form 'groupId:artifactId'. It was: " + groupArtifact);
+		}
+		Objects.requireNonNull(version, "version");
+		Objects.requireNonNull(provisioner, "provisioner");
+		return FormatterStep.createLazy(NAME,
+				() -> new JavaParserUnusedImportsState(groupArtifact, version, provisioner),
+				JavaparserRemoveUnusedImportsStep.JavaParserUnusedImportsState::createFormat);
+	}
+
+	/** Get default formatter version */
+	public static String defaultVersion() {
+		return "3.25.0";
+	}
+
+	public static String defaultGroupArtifact() {
+		return MAVEN_COORDINATE;
+	}
+
+	static final class JavaParserUnusedImportsState implements Serializable {
+		private static final long serialVersionUID = 1L;
+
+		final JarState jarState;
+
+		JavaParserUnusedImportsState(String version, Provisioner provisioner) throws IOException {
+			this(MAVEN_COORDINATE, version, provisioner);
+		}
+
+		JavaParserUnusedImportsState(
+				String groupArtifact,
+				String version,
+				Provisioner provisioner) throws IOException {
+			ModuleHelper.doOpenInternalPackagesIfRequired();
+			this.jarState = JarState.from(groupArtifact + ":" + version, provisioner);
+		}
+
+		@SuppressWarnings("PMD.UseProperClassLoader")
+		FormatterFunc createFormat() {
+			ClassLoader classLoader = jarState.getClassLoader();
+
+			Object formatter;
+			Method formatterMethod;
+			try {
+				Class<?> formatterClazz = classLoader.loadClass("com.diffplug.spotless.glue.java.JavaparserRemoveUnusedImportsFunc");
+				Constructor<?> formatterConstructor = formatterClazz.getConstructor();
+
+				formatter = formatterConstructor.newInstance();
+				formatterMethod = formatterClazz.getMethod("apply", String.class);
+			} catch (ReflectiveOperationException e) {
+				throw new IllegalStateException("Issue executing the formatter", e);
+			}
+			return input -> {
+				return (String) formatterMethod.invoke(formatter, input);
+			};
+		}
+
+	}
+}
diff --git a/testlib/src/main/resources/java/removeunusedimports/Jdk17MultineStringBlockFormatted.test b/testlib/src/main/resources/java/removeunusedimports/Jdk17MultineStringBlockFormatted.test
index 1bfad32664..91692463a6 100644
--- a/testlib/src/main/resources/java/removeunusedimports/Jdk17MultineStringBlockFormatted.test
+++ b/testlib/src/main/resources/java/removeunusedimports/Jdk17MultineStringBlockFormatted.test
@@ -1,28 +1,6 @@
 package io.github.shafthq.shaft.tools.tms;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParser;
-import com.shaft.cli.FileActions;
-import com.shaft.tools.io.ReportManager;
-import io.github.shafthq.shaft.tools.io.helpers.ReportManagerHelper;
-import io.restassured.config.RestAssuredConfig;
-import io.restassured.config.SSLConfig;
-import io.restassured.http.ContentType;
-import io.restassured.response.Response;
-import io.restassured.specification.RequestSpecification;
 
-import java.io.File;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.text.SimpleDateFormat;
-import java.util.Base64;
-import java.util.Calendar;
-import java.util.List;
-
-import static io.restassured.RestAssured.*;
-import static io.restassured.config.EncoderConfig.encoderConfig;
 
 
 public class XrayIntegrationHelper {
diff --git a/testlib/src/main/resources/java/removeunusedimports/RevelcFormatted.test b/testlib/src/main/resources/java/removeunusedimports/RevelcFormatted.test
new file mode 100644
index 0000000000..672400fdb8
--- /dev/null
+++ b/testlib/src/main/resources/java/removeunusedimports/RevelcFormatted.test
@@ -0,0 +1,81 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@XmlSchema(
+		xmlns = {
+				@XmlNs(prefix = "order", namespaceURI = "http://www.camel.apache.org/jaxb/example/order/1"),
+				@XmlNs(prefix = "address", namespaceURI = "http://www.camel.apache.org/jaxb/example/address/1")
+		}
+)
+package net.revelc.code.imp;
+
+import com.foo.Type1;
+import com.foo.Type2;
+import com.foo.Type3;
+import com.foo.Type4;
+import com.foo.Type5;
+import com.foo.Type6;
+import com.foo.Type7;
+import com.foo.Type8;
+import com.foo.Type9;
+import com.foo.Type10;
+
+import com.google.common.collect.ImmutableMap;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.springframework.stereotype.Component;
+
+import com.foo.Type11;
+import com.foo.internal.Type12;
+import com.foo.params.Type13;
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlSchema;
+
+import static org.junit.Assert.assertFalse;
+
+import static org.junit.Assert.*;
+
+/**
+ * The import of {@link HashMap} should not be stripped away, since it
+ * is used in this comment.
+ */
+// https://github.com/revelc/impsort-maven-plugin/blob/main/src/test/resources/UnusedImports.java
+@Component
+public class UnusedImports {
+    ImmutableMap immutable;
+
+    /**
+     * The following should also not be removed:
+     *
+     * @param blah when {@link Type13} blah
+     * @see Map
+     */
+    public List<Integer> getList(String blah) {
+        assertFalse(false);
+        return null;
+    }
+
+	/**
+	 * {@link Type1#method()}
+	 * {@link Type2#method(Type3, Type4)}
+	 * {@link #method(Type5, Type6)}
+	 * {@value Type7#field}
+	 * @see Type8#method()
+	 * @see Type9#method(Type10)
+	 * @throws Type11 when {@link Type12} is seen
+	 */
+	public void foo() {
+	}
+}
diff --git a/testlib/src/main/resources/java/removeunusedimports/RevelcUnformatted.test b/testlib/src/main/resources/java/removeunusedimports/RevelcUnformatted.test
new file mode 100644
index 0000000000..bb43884a82
--- /dev/null
+++ b/testlib/src/main/resources/java/removeunusedimports/RevelcUnformatted.test
@@ -0,0 +1,89 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@XmlSchema(
+		xmlns = {
+				@XmlNs(prefix = "order", namespaceURI = "http://www.camel.apache.org/jaxb/example/order/1"),
+				@XmlNs(prefix = "address", namespaceURI = "http://www.camel.apache.org/jaxb/example/address/1")
+		}
+)
+package net.revelc.code.imp;
+
+import com.foo.Type1;
+import com.foo.Type2;
+import com.foo.Type3;
+import com.foo.Type4;
+import com.foo.Type5;
+import com.foo.Type6;
+import com.foo.Type7;
+import com.foo.Type8;
+import com.foo.Type9;
+import com.foo.Type10;
+import net.revelc.code.imp.Something;
+import net.revelc.code.imp.Something.Else;
+import net.revelc.code.imp.*;
+
+import com.google.common.base.Predicates;
+import com.google.common.collect.ImmutableMap;
+import io.swagger.annotations.ApiOperation;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.foo.Type11;
+import com.foo.internal.Type12;
+import com.foo.params.Type13;
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlSchema;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+import static org.junit.Assert.*;
+
+/**
+ * The import of {@link HashMap} should not be stripped away, since it
+ * is used in this comment.
+ */
+// https://github.com/revelc/impsort-maven-plugin/blob/main/src/test/resources/UnusedImports.java
+@Component
+public class UnusedImports {
+    ImmutableMap immutable;
+
+    /**
+     * The following should also not be removed:
+     *
+     * @param blah when {@link Type13} blah
+     * @see Map
+     */
+    public List<Integer> getList(String blah) {
+        assertFalse(false);
+        return null;
+    }
+
+	/**
+	 * {@link Type1#method()}
+	 * {@link Type2#method(Type3, Type4)}
+	 * {@link #method(Type5, Type6)}
+	 * {@value Type7#field}
+	 * @see Type8#method()
+	 * @see Type9#method(Type10)
+	 * @throws Type11 when {@link Type12} is seen
+	 */
+	public void foo() {
+	}
+}
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/JavaparserRemoveUnusedImportsStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/JavaparserRemoveUnusedImportsStepTest.java
new file mode 100644
index 0000000000..e1681f2c79
--- /dev/null
+++ b/testlib/src/test/java/com/diffplug/spotless/java/JavaparserRemoveUnusedImportsStepTest.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2016-2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.java;
+
+import org.junit.jupiter.api.Test;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.SerializableEqualityTester;
+import com.diffplug.spotless.StepHarness;
+import com.diffplug.spotless.TestProvisioner;
+
+class JavaparserRemoveUnusedImportsStepTest {
+	@Test
+	void behavior() throws Exception {
+		FormatterStep step = JavaparserRemoveUnusedImportsStep.create(TestProvisioner.mavenCentral());
+		StepHarness.forStep(step)
+				.testResource("java/removeunusedimports/JavaCodeUnformatted.test", "java/removeunusedimports/JavaCodeFormatted.test")
+				.testResource("java/removeunusedimports/JavaCodeWithLicenseUnformatted.test", "java/removeunusedimports/JavaCodeWithLicenseFormatted.test")
+				.testResource("java/removeunusedimports/JavaCodeWithLicensePackageUnformatted.test", "java/removeunusedimports/JavaCodeWithLicensePackageFormatted.test")
+				.testResource("java/removeunusedimports/JavaCodeWithPackageUnformatted.test", "java/removeunusedimports/JavaCodeWithPackageFormatted.test")
+				.testResource("java/removeunusedimports/Jdk17MultineStringBlockUnformatted.test", "java/removeunusedimports/Jdk17MultineStringBlockFormatted.test")
+		// JavaParser is failing over an annotated package: https://github.com/javaparser/javaparser/issues/3924
+		// .testResource("java/removeunusedimports/RevelcUnformatted.test", "java/removeunusedimports/RevelcFormatted.test")
+		;
+	}
+
+	@Test
+	void equality() throws Exception {
+		new SerializableEqualityTester() {
+			@Override
+			protected void setupTest(API api) {
+				api.areDifferentThan();
+			}
+
+			@Override
+			protected FormatterStep create() {
+				return JavaparserRemoveUnusedImportsStep.create(TestProvisioner.mavenCentral());
+			}
+		}.testEquals();
+	}
+}
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStepTest.java
index 171d6753e0..d3c0b55732 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStepTest.java
@@ -31,7 +31,9 @@ void behavior() throws Exception {
 				.testResource("java/removeunusedimports/JavaCodeWithLicenseUnformatted.test", "java/removeunusedimports/JavaCodeWithLicenseFormatted.test")
 				.testResource("java/removeunusedimports/JavaCodeWithLicensePackageUnformatted.test", "java/removeunusedimports/JavaCodeWithLicensePackageFormatted.test")
 				.testResource("java/removeunusedimports/JavaCodeWithPackageUnformatted.test", "java/removeunusedimports/JavaCodeWithPackageFormatted.test")
-				.testResource("java/removeunusedimports/Jdk17MultineStringBlockUnformatted.test", "java/removeunusedimports/Jdk17MultineStringBlockFormatted.test");
+				// GoogleFormat requires running over a JDK17 to handle JDK17 features
+				// .testResource("java/removeunusedimports/Jdk17MultineStringBlockUnformatted.test", "java/removeunusedimports/Jdk17MultineStringBlockFormatted.test")
+				.testResource("java/removeunusedimports/RevelcUnformatted.test", "java/removeunusedimports/RevelcFormatted.test");
 	}
 
 	@Test

From 2e58bd8af29abf5eb71ca2f474eaccd75ac4c424 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Fri, 10 Feb 2023 16:49:15 +0100
Subject: [PATCH 0822/2068] 1480: introduce timing logger

---
 lib/build.gradle                              |   2 +
 .../com/diffplug/spotless/TimedLogger.java    | 218 +++++++++++++++
 .../diffplug/spotless/TimedLoggerTest.java    | 255 ++++++++++++++++++
 3 files changed, 475 insertions(+)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/TimedLogger.java
 create mode 100644 lib/src/test/java/com/diffplug/spotless/TimedLoggerTest.java

diff --git a/lib/build.gradle b/lib/build.gradle
index f6e0446f73..9a6e7913d5 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -56,6 +56,8 @@ tasks.named("check").configure {
 
 dependencies {
 	compileOnly 'org.slf4j:slf4j-api:2.0.0'
+	testCommonImplementation 'org.slf4j:slf4j-api:2.0.0'
+
 	// zero runtime reqs is a hard requirements for spotless-lib
 	// if you need a dep, put it in lib-extra
 	testCommonImplementation "org.junit.jupiter:junit-jupiter:$VER_JUNIT"
diff --git a/lib/src/main/java/com/diffplug/spotless/TimedLogger.java b/lib/src/main/java/com/diffplug/spotless/TimedLogger.java
new file mode 100644
index 0000000000..f67d90c0ea
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/TimedLogger.java
@@ -0,0 +1,218 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless;
+
+import static com.diffplug.spotless.LazyArgLogger.lazy;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Stream;
+
+import javax.annotation.Nonnull;
+
+import org.slf4j.Logger;
+
+/**
+ * A logger that logs the time it took to execute a block of code.
+ */
+public class TimedLogger {
+
+	public static final String MESSAGE_PREFIX_BEGIN = "[BEGIN] ";
+
+	public static final String MESSAGE_PREFIX_END = "[END] ";
+
+	public static final String MESSAGE_SUFFIX_TOOK = " (took {})";
+
+	private final Logger logger;
+	private final Ticker ticker;
+
+	private TimedLogger(@Nonnull Logger logger, Ticker ticker) {
+		this.logger = Objects.requireNonNull(logger);
+		this.ticker = ticker;
+	}
+
+	public static TimedLogger forLogger(@Nonnull Logger logger) {
+		return forLogger(logger, Ticker.systemTicker());
+	}
+
+	public static TimedLogger forLogger(@Nonnull Logger logger, Ticker ticker) {
+		return new TimedLogger(logger, ticker);
+	}
+
+	public TimedExec withInfo(@Nonnull String message, Object... args) {
+		return new TimedExec(logger::isInfoEnabled, logger::info, ticker, message, args);
+	}
+
+	public TimedExec withDebug(@Nonnull String message, Object... args) {
+		return new TimedExec(logger::isDebugEnabled, logger::debug, ticker, message, args);
+	}
+
+	public TimedExec withTrace(@Nonnull String message, Object... args) {
+		return new TimedExec(logger::isTraceEnabled, logger::trace, ticker, message, args);
+	}
+
+	public TimedExec withWarn(@Nonnull String message, Object... args) {
+		return new TimedExec(logger::isWarnEnabled, logger::warn, ticker, message, args);
+	}
+
+	public TimedExec withError(@Nonnull String message, Object... args) {
+		return new TimedExec(logger::isErrorEnabled, logger::error, ticker, message, args);
+	}
+
+	public static class Timed implements AutoCloseable {
+
+		@Nonnull
+		private final String msg;
+
+		@Nonnull
+		private final List<Object> params;
+		@Nonnull
+		private final LogToLevelMethod delegatedLogger;
+		@Nonnull
+		private final Ticker ticker;
+
+		private final long startedAt;
+
+		public Timed(@Nonnull Ticker ticker, @Nonnull String msg, @Nonnull List<Object> params, @Nonnull LogToLevelMethod delegatedLogger) {
+			this.ticker = Objects.requireNonNull(ticker);
+			this.msg = Objects.requireNonNull(msg);
+			this.params = List.copyOf(Objects.requireNonNull(params));
+			this.delegatedLogger = Objects.requireNonNull(delegatedLogger);
+			this.startedAt = ticker.read();
+			logStart();
+		}
+
+		private void logStart() {
+			delegatedLogger.log(MESSAGE_PREFIX_BEGIN + msg, params.toArray());
+		}
+
+		private void logEnd() {
+			delegatedLogger.log(MESSAGE_PREFIX_END + msg + MESSAGE_SUFFIX_TOOK, paramsForEnd());
+		}
+
+		@Override
+		public final void close() {
+			logEnd();
+		}
+
+		private Object[] paramsForEnd() {
+			if (params.isEmpty() || !(params.get(params.size() - 1) instanceof Throwable)) {
+				// if the last element is not a throwable, we can add the duration as the last element
+				return Stream.concat(params.stream(), Stream.of(lazy(this::durationString))).toArray();
+			}
+			// if the last element is a throwable, we have to add the duration before the last element
+			return Stream.concat(
+					params.stream().limit(params.size() - 1),
+					Stream.of(lazy(this::durationString),
+							params.get(params.size() - 1)))
+					.toArray();
+		}
+
+		private String durationString() {
+			long duration = ticker.read() - startedAt;
+			if (duration < 1000) {
+				return duration + "ms";
+			} else if (duration < 1000 * 60) {
+				return (duration / 1000) + "s";
+			} else {
+				// output in the format 3m 4.321s
+				long minutes = duration / (1000 * 60);
+				long seconds = (duration - minutes * 1000 * 60) / 1000;
+				long millis = duration - minutes * 1000 * 60 - seconds * 1000;
+				return minutes + "m" + (seconds + millis > 0 ? " " + seconds + "." + millis + "s" : "");
+			}
+		}
+	}
+
+	public static final class NullStopWatchLogger extends Timed {
+		private static final NullStopWatchLogger INSTANCE = new NullStopWatchLogger();
+
+		private NullStopWatchLogger() {
+			super(Ticker.systemTicker(), "", List.of(), (m, a) -> {});
+		}
+	}
+
+	interface Ticker {
+		long read();
+
+		static Ticker systemTicker() {
+			return System::currentTimeMillis;
+		}
+	}
+
+	static class TestTicker implements Ticker {
+		private long time = 0;
+
+		@Override
+		public long read() {
+			return time;
+		}
+
+		public void tickMillis(long millis) {
+			time += millis;
+		}
+	}
+
+	public static class TimedExec {
+		@Nonnull
+		private final LogActiveMethod logActiveMethod;
+		@Nonnull
+		private final LogToLevelMethod logMethod;
+		@Nonnull
+		private final Ticker ticker;
+		@Nonnull
+		private final String message;
+		@Nonnull
+		private final Object[] args;
+
+		public TimedExec(LogActiveMethod logActiveMethod, LogToLevelMethod logMethod, Ticker ticker, String message, Object... args) {
+			this.logActiveMethod = Objects.requireNonNull(logActiveMethod);
+			this.logMethod = Objects.requireNonNull(logMethod);
+			this.ticker = Objects.requireNonNull(ticker);
+			this.message = Objects.requireNonNull(message);
+			this.args = Objects.requireNonNull(args);
+		}
+
+		public void run(ThrowingEx.Runnable r) {
+			try (Timed ignore = timed()) {
+				ThrowingEx.run(r);
+			}
+		}
+
+		public void runChecked(ThrowingEx.Runnable r) throws Exception {
+			try (Timed ignore = timed()) {
+				r.run();
+			}
+		}
+
+		private Timed timed() {
+			if (logActiveMethod.isLogLevelActive()) {
+				return new Timed(ticker, message, List.of(args), logMethod);
+			}
+			return NullStopWatchLogger.INSTANCE;
+		}
+	}
+
+	@FunctionalInterface
+	private interface LogActiveMethod {
+		boolean isLogLevelActive();
+	}
+
+	@FunctionalInterface
+	private interface LogToLevelMethod {
+		void log(String message, Object... args);
+	}
+}
diff --git a/lib/src/test/java/com/diffplug/spotless/TimedLoggerTest.java b/lib/src/test/java/com/diffplug/spotless/TimedLoggerTest.java
new file mode 100644
index 0000000000..167b5d24de
--- /dev/null
+++ b/lib/src/test/java/com/diffplug/spotless/TimedLoggerTest.java
@@ -0,0 +1,255 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless;
+
+import static com.diffplug.spotless.TimedLogger.MESSAGE_PREFIX_BEGIN;
+import static com.diffplug.spotless.TimedLogger.MESSAGE_PREFIX_END;
+import static com.diffplug.spotless.TimedLogger.MESSAGE_SUFFIX_TOOK;
+
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.assertj.core.api.Assertions;
+import org.assertj.core.api.Condition;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Marker;
+import org.slf4j.event.Level;
+import org.slf4j.helpers.LegacyAbstractLogger;
+
+import com.diffplug.spotless.TimedLogger.TestTicker;
+
+class TimedLoggerTest {
+
+	private TestLogger testLogger;
+
+	private TestTicker testTicker;
+
+	private TimedLogger timedLogger;
+
+	@BeforeEach
+	void setUp() {
+		testLogger = new TestLogger();
+		testTicker = new TestTicker();
+		timedLogger = TimedLogger.forLogger(testLogger, testTicker);
+	}
+
+	@Test
+	void itDoesNotLogWhenLevelDisabled() throws InterruptedException {
+
+		TestLogger logger = new TestLogger() {
+			@Override
+			public boolean isInfoEnabled() {
+				return false;
+			}
+
+			@Override
+			public boolean isDebugEnabled() {
+				return false;
+			}
+
+			@Override
+			public boolean isTraceEnabled() {
+				return false;
+			}
+		};
+		TimedLogger timedLogger = TimedLogger.forLogger(logger);
+
+		timedLogger.withInfo("This should not be logged").run(() -> Thread.sleep(1));
+		logger.assertNoEvents();
+	}
+
+	@Test
+	void itLogsMillisWhenTakingMillis() {
+		timedLogger.withInfo("This should be logged").run(() -> testTicker.tickMillis(999));
+
+		testLogger.assertEvents(2);
+		testLogger.assertHasEventWithMessageAndArguments(MESSAGE_SUFFIX_TOOK, "999ms");
+	}
+
+	@Test
+	void itLogsSecondsOnlyWhenTakingSeconds() {
+		timedLogger.withInfo("This should be logged").run(() -> testTicker.tickMillis(2_000));
+
+		testLogger.assertEvents(2);
+		testLogger.assertHasEventWithMessageAndArguments(MESSAGE_SUFFIX_TOOK, "2s");
+	}
+
+	@Test
+	void itLogsMinutesOnlyWhenTakingMinutes() {
+		timedLogger.withInfo("This should be logged").run(() -> testTicker.tickMillis(2 * 60 * 1_000));
+
+		testLogger.assertEvents(2);
+		testLogger.assertHasEventWithMessageAndArguments(MESSAGE_SUFFIX_TOOK, "2m");
+	}
+
+	@Test
+	void itLogsMinutesAndSecondsWhenTakingMinutesAndSeconds() {
+		timedLogger.withInfo("This should be logged").run(() -> testTicker.tickMillis(2 * 60 * 1_000 + 3 * 1_000));
+
+		testLogger.assertEvents(2);
+		testLogger.assertHasEventWithMessageAndArguments(MESSAGE_SUFFIX_TOOK, "2m 3.0s");
+	}
+
+	@Test
+	void itLogsBeginAndEndPrefixes() {
+		timedLogger.withInfo("This should be logged").run(() -> testTicker.tickMillis(1));
+
+		testLogger.assertHasEventWithMessageAndArguments(MESSAGE_PREFIX_BEGIN);
+		testLogger.assertHasEventWithMessageAndArguments(MESSAGE_PREFIX_END, "1ms");
+	}
+
+	@Test
+	void itThrowsExceptionsInChecked() {
+		Assertions.assertThatThrownBy(() -> timedLogger.withInfo("This should be logged").runChecked(() -> {
+			throw new Exception("This is an exception");
+		})).isInstanceOf(Exception.class).hasMessage("This is an exception");
+	}
+
+	@Test
+	void itLogsEvenWhenExceptionsAreThrown() {
+		Assertions.assertThatThrownBy(() -> timedLogger.withInfo("This should be logged").run(() -> {
+			testTicker.tickMillis(2);
+			throw new Exception("This is an exception");
+		})).isInstanceOf(RuntimeException.class)
+				.hasMessageContaining("This is an exception")
+				.hasCauseInstanceOf(Exception.class);
+
+		testLogger.assertEvents(2);
+		testLogger.assertHasEventWithMessageAndArguments(MESSAGE_PREFIX_BEGIN);
+		testLogger.assertHasEventWithMessageAndArguments(MESSAGE_PREFIX_END, "2ms");
+	}
+
+	private static class TestLogger extends LegacyAbstractLogger {
+
+		private final List<TestLoggingEvent> events = new LinkedList<>();
+
+		@Override
+		protected String getFullyQualifiedCallerName() {
+			return TestLogger.class.getName();
+		}
+
+		@Override
+		protected void handleNormalizedLoggingCall(Level level, Marker marker, String msg, Object[] arguments, Throwable throwable) {
+			events.add(new TestLoggingEvent(level, marker, msg, arguments, throwable));
+		}
+
+		@Override
+		public boolean isTraceEnabled() {
+			return true;
+		}
+
+		@Override
+		public boolean isDebugEnabled() {
+			return true;
+		}
+
+		@Override
+		public boolean isInfoEnabled() {
+			return true;
+		}
+
+		@Override
+		public boolean isWarnEnabled() {
+			return true;
+		}
+
+		@Override
+		public boolean isErrorEnabled() {
+			return true;
+		}
+
+		public List<TestLoggingEvent> getEvents() {
+			return events;
+		}
+
+		public void assertNoEvents() {
+			Assertions.assertThat(getEvents()).isEmpty();
+		}
+
+		public void assertEvents(int eventCount) {
+			Assertions.assertThat(getEvents()).hasSize(eventCount);
+		}
+
+		public void assertHasEventWithMessageAndArguments(String message, Object... arguments) {
+
+			Assertions.assertThat(getEvents()).haveAtLeastOne(new Condition<>(event -> {
+				if (!event.msg().contains(message)) {
+					return false;
+				}
+				if (event.arguments().length != arguments.length) {
+					return false;
+				}
+				for (int i = 0; i < arguments.length; i++) {
+					if (!String.valueOf(event.arguments()[i]).equals(arguments[i])) {
+						return false;
+					}
+				}
+				return true;
+			}, "Event with message containing '%s' and arguments '%s'", message, Arrays.toString(arguments)));
+		}
+	}
+
+	private static class TestLoggingEvent {
+
+		private final Level level;
+		private final Marker marker;
+		private final String msg;
+		private final Object[] arguments;
+		private final Throwable throwable;
+
+		public TestLoggingEvent(Level level, Marker marker, String msg, Object[] arguments, Throwable throwable) {
+			this.level = level;
+			this.marker = marker;
+			this.msg = msg;
+			this.arguments = arguments;
+			this.throwable = throwable;
+		}
+
+		public Level level() {
+			return level;
+		}
+
+		public Marker marker() {
+			return marker;
+		}
+
+		public String msg() {
+			return msg;
+		}
+
+		public Object[] arguments() {
+			return arguments;
+		}
+
+		public Throwable throwable() {
+			return throwable;
+		}
+
+		@Override
+		public String toString() {
+			return String.format(
+					"TestLoggingEvent[level=%s, marker=%s, msg=%s, arguments=%s, throwable=%s]",
+					this.level,
+					this.marker,
+					this.msg,
+					Arrays.toString(this.arguments),
+					this.throwable);
+		}
+	}
+
+}

From 4b663d48639633cc64bef0e9cb6292dab6d30e94 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Mon, 13 Feb 2023 20:10:02 +0100
Subject: [PATCH 0823/2068] 1480: add trace logger

---
 .../npm/NpmFormatterStepStateBase.java        | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
index f3f8a80fe8..66b1c51009 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
@@ -34,6 +34,7 @@
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.ProcessRunner.LongRunningProcess;
 import com.diffplug.spotless.ThrowingEx;
+import com.diffplug.spotless.TimedLogger;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
@@ -41,6 +42,8 @@ abstract class NpmFormatterStepStateBase implements Serializable {
 
 	private static final Logger logger = LoggerFactory.getLogger(NpmFormatterStepStateBase.class);
 
+	private static final TimedLogger timedLogger = TimedLogger.forLogger(logger);
+
 	private static final long serialVersionUID = 1460749955865959948L;
 
 	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
@@ -61,26 +64,24 @@ protected NpmFormatterStepStateBase(String stepName, NpmConfig npmConfig, NpmFor
 
 	protected void prepareNodeServerLayout() throws IOException {
 		final long started = System.currentTimeMillis();
-		// maybe introduce trace logger?
-		logger.info("Preparing {} for npm step {}.", this.nodeServerLayout, getClass().getName());
-		NpmResourceHelper.assertDirectoryExists(nodeServerLayout.nodeModulesDir());
-		NpmResourceHelper.writeUtf8StringToFile(nodeServerLayout.packageJsonFile(),
-				this.npmConfig.getPackageJsonContent());
-		NpmResourceHelper
-				.writeUtf8StringToFile(nodeServerLayout.serveJsFile(), this.npmConfig.getServeScriptContent());
-		if (this.npmConfig.getNpmrcContent() != null) {
-			NpmResourceHelper.writeUtf8StringToFile(nodeServerLayout.npmrcFile(), this.npmConfig.getNpmrcContent());
-		} else {
-			NpmResourceHelper.deleteFileIfExists(nodeServerLayout.npmrcFile());
-		}
-		logger.info("Prepared {} for npm step {} in {} ms.", this.nodeServerLayout, getClass().getName(), System.currentTimeMillis() - started);
+
+		timedLogger.withInfo("Preparing {} for npm step {}.", this.nodeServerLayout, getClass().getName()).run(() -> {
+			NpmResourceHelper.assertDirectoryExists(nodeServerLayout.nodeModulesDir());
+			NpmResourceHelper.writeUtf8StringToFile(nodeServerLayout.packageJsonFile(),
+					this.npmConfig.getPackageJsonContent());
+			NpmResourceHelper
+					.writeUtf8StringToFile(nodeServerLayout.serveJsFile(), this.npmConfig.getServeScriptContent());
+			if (this.npmConfig.getNpmrcContent() != null) {
+				NpmResourceHelper.writeUtf8StringToFile(nodeServerLayout.npmrcFile(), this.npmConfig.getNpmrcContent());
+			} else {
+				NpmResourceHelper.deleteFileIfExists(nodeServerLayout.npmrcFile());
+			}
+		});
 	}
 
 	protected void prepareNodeServer() throws IOException {
-		final long started = System.currentTimeMillis();
-		logger.info("running npm install in {} for npm step {}", this.nodeServerLayout.nodeModulesDir(), getClass().getName());
-		runNpmInstall(nodeServerLayout.nodeModulesDir());
-		logger.info("npm install finished in {} ms in {} for npm step {}", System.currentTimeMillis() - started, this.nodeServerLayout.nodeModulesDir(), getClass().getName());
+		timedLogger.withInfo("Running npm install in {} for npm step {}.", this.nodeServerLayout.nodeModulesDir(), getClass().getName())
+				.run(() -> runNpmInstall(nodeServerLayout.nodeModulesDir()));
 	}
 
 	private void runNpmInstall(File npmProjectDir) throws IOException {

From 050bb4503d9015717fd072024f51d0567b86bee5 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Mon, 13 Feb 2023 20:26:00 +0100
Subject: [PATCH 0824/2068] 1480: extract npm process as interface

to allow introducing another implementation
---
 .../npm/NpmFormatterStepStateBase.java        |   4 +-
 .../com/diffplug/spotless/npm/NpmProcess.java |  94 +--------------
 .../spotless/npm/StandardNpmProcess.java      | 112 ++++++++++++++++++
 3 files changed, 118 insertions(+), 92 deletions(-)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/npm/StandardNpmProcess.java

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
index 66b1c51009..140aff048e 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
@@ -85,7 +85,7 @@ protected void prepareNodeServer() throws IOException {
 	}
 
 	private void runNpmInstall(File npmProjectDir) throws IOException {
-		new NpmProcess(npmProjectDir, this.locations.npmExecutable(), this.locations.nodeExecutable()).install();
+		new StandardNpmProcess(npmProjectDir, this.locations.npmExecutable(), this.locations.nodeExecutable()).install();
 	}
 
 	protected void assertNodeServerDirReady() throws IOException {
@@ -116,7 +116,7 @@ protected ServerProcessInfo npmRunServer() throws ServerStartException, IOExcept
 			final File serverPortFile = new File(this.nodeServerLayout.nodeModulesDir(), "server.port");
 			NpmResourceHelper.deleteFileIfExists(serverPortFile);
 			// start the http server in node
-			server = new NpmProcess(this.nodeServerLayout.nodeModulesDir(), this.locations.npmExecutable(), this.locations.nodeExecutable()).start();
+			server = new StandardNpmProcess(this.nodeServerLayout.nodeModulesDir(), this.locations.npmExecutable(), this.locations.nodeExecutable()).start();
 
 			// await the readiness of the http server - wait for at most 60 seconds
 			try {
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java
index 6384900d82..1459d3fc6f 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,96 +15,10 @@
  */
 package com.diffplug.spotless.npm;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ExecutionException;
-import java.util.stream.Collectors;
-
 import com.diffplug.spotless.ProcessRunner;
-import com.diffplug.spotless.ProcessRunner.LongRunningProcess;
-
-class NpmProcess {
-
-	private final File workingDir;
-
-	private final File npmExecutable;
-
-	private final File nodeExecutable;
-
-	private final ProcessRunner processRunner;
-
-	NpmProcess(File workingDir, File npmExecutable, File nodeExecutable) {
-		this.workingDir = workingDir;
-		this.npmExecutable = npmExecutable;
-		this.nodeExecutable = nodeExecutable;
-		processRunner = ProcessRunner.usingRingBuffersOfCapacity(100 * 1024); // 100kB
-	}
-
-	void install() {
-		npmAwait("install",
-				"--no-audit",
-				"--no-package-lock",
-				"--no-fund",
-				"--prefer-offline");
-	}
-
-	LongRunningProcess start() {
-		// adding --scripts-prepend-node-path=true due to https://github.com/diffplug/spotless/issues/619#issuecomment-648018679
-		return npm("start", "--scripts-prepend-node-path=true");
-	}
-
-	private void npmAwait(String... args) {
-		try (LongRunningProcess npmProcess = npm(args)) {
-			if (npmProcess.waitFor() != 0) {
-				throw new NpmProcessException("Running npm command '" + commandLine(args) + "' failed with exit code: " + npmProcess.exitValue() + "\n\n" + npmProcess.result());
-			}
-		} catch (InterruptedException e) {
-			throw new NpmProcessException("Running npm command '" + commandLine(args) + "' was interrupted.", e);
-		} catch (ExecutionException e) {
-			throw new NpmProcessException("Running npm command '" + commandLine(args) + "' failed.", e);
-		}
-	}
-
-	private LongRunningProcess npm(String... args) {
-		List<String> processCommand = processCommand(args);
-		try {
-			return processRunner.start(this.workingDir, environmentVariables(), null, true, processCommand);
-		} catch (IOException e) {
-			throw new NpmProcessException("Failed to launch npm command '" + commandLine(args) + "'.", e);
-		}
-	}
-
-	private List<String> processCommand(String... args) {
-		List<String> command = new ArrayList<>(args.length + 1);
-		command.add(this.npmExecutable.getAbsolutePath());
-		command.addAll(Arrays.asList(args));
-		return command;
-	}
-
-	private Map<String, String> environmentVariables() {
-		Map<String, String> environmentVariables = new HashMap<>();
-		environmentVariables.put("PATH", this.nodeExecutable.getParentFile().getAbsolutePath() + File.pathSeparator + System.getenv("PATH"));
-		return environmentVariables;
-	}
-
-	private String commandLine(String... args) {
-		return "npm " + Arrays.stream(args).collect(Collectors.joining(" "));
-	}
-
-	static class NpmProcessException extends RuntimeException {
-		private static final long serialVersionUID = 6424331316676759525L;
 
-		public NpmProcessException(String message) {
-			super(message);
-		}
+interface NpmProcess {
+	void install();
 
-		public NpmProcessException(String message, Throwable cause) {
-			super(message, cause);
-		}
-	}
+	ProcessRunner.LongRunningProcess start();
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/StandardNpmProcess.java b/lib/src/main/java/com/diffplug/spotless/npm/StandardNpmProcess.java
new file mode 100644
index 0000000000..7524be4e74
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/npm/StandardNpmProcess.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2016-2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.npm;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+import java.util.stream.Collectors;
+
+import com.diffplug.spotless.ProcessRunner;
+import com.diffplug.spotless.ProcessRunner.LongRunningProcess;
+
+class StandardNpmProcess implements NpmProcess {
+
+	private final File workingDir;
+
+	private final File npmExecutable;
+
+	private final File nodeExecutable;
+
+	private final ProcessRunner processRunner;
+
+	StandardNpmProcess(File workingDir, File npmExecutable, File nodeExecutable) {
+		this.workingDir = workingDir;
+		this.npmExecutable = npmExecutable;
+		this.nodeExecutable = nodeExecutable;
+		processRunner = ProcessRunner.usingRingBuffersOfCapacity(100 * 1024); // 100kB
+	}
+
+	@Override
+	public void install() {
+		npmAwait("install",
+				"--no-audit",
+				"--no-package-lock",
+				"--no-fund",
+				"--prefer-offline");
+	}
+
+	@Override
+	public LongRunningProcess start() {
+		// adding --scripts-prepend-node-path=true due to https://github.com/diffplug/spotless/issues/619#issuecomment-648018679
+		return npm("start", "--scripts-prepend-node-path=true");
+	}
+
+	private void npmAwait(String... args) {
+		try (LongRunningProcess npmProcess = npm(args)) {
+			if (npmProcess.waitFor() != 0) {
+				throw new NpmProcessException("Running npm command '" + commandLine(args) + "' failed with exit code: " + npmProcess.exitValue() + "\n\n" + npmProcess.result());
+			}
+		} catch (InterruptedException e) {
+			throw new NpmProcessException("Running npm command '" + commandLine(args) + "' was interrupted.", e);
+		} catch (ExecutionException e) {
+			throw new NpmProcessException("Running npm command '" + commandLine(args) + "' failed.", e);
+		}
+	}
+
+	private LongRunningProcess npm(String... args) {
+		List<String> processCommand = processCommand(args);
+		try {
+			return processRunner.start(this.workingDir, environmentVariables(), null, true, processCommand);
+		} catch (IOException e) {
+			throw new NpmProcessException("Failed to launch npm command '" + commandLine(args) + "'.", e);
+		}
+	}
+
+	private List<String> processCommand(String... args) {
+		List<String> command = new ArrayList<>(args.length + 1);
+		command.add(this.npmExecutable.getAbsolutePath());
+		command.addAll(Arrays.asList(args));
+		return command;
+	}
+
+	private Map<String, String> environmentVariables() {
+		Map<String, String> environmentVariables = new HashMap<>();
+		environmentVariables.put("PATH", this.nodeExecutable.getParentFile().getAbsolutePath() + File.pathSeparator + System.getenv("PATH"));
+		return environmentVariables;
+	}
+
+	private String commandLine(String... args) {
+		return "npm " + Arrays.stream(args).collect(Collectors.joining(" "));
+	}
+
+	static class NpmProcessException extends RuntimeException {
+		private static final long serialVersionUID = 6424331316676759525L;
+
+		public NpmProcessException(String message) {
+			super(message);
+		}
+
+		public NpmProcessException(String message, Throwable cause) {
+			super(message, cause);
+		}
+	}
+}

From e724d884fa05bc41d9a4cf2a22693b1522a732b7 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 14 Feb 2023 20:48:19 +0100
Subject: [PATCH 0825/2068] 1480: extract NpmApp and npm exec calls

so they can be overwritten later for pnpm
---
 .../com/diffplug/spotless/TimedLogger.java    |   6 +
 .../spotless/npm/EslintFormatterStep.java     |   1 -
 .../com/diffplug/spotless/npm/NodeApp.java    |  81 +++++++++++++
 .../diffplug/spotless/npm/NodeServeApp.java   |  41 +++++++
 .../com/diffplug/spotless/npm/NpmConfig.java  |  17 +--
 .../npm/NpmFormatterStepStateBase.java        |  33 ++----
 .../com/diffplug/spotless/npm/NpmProcess.java |  35 +++++-
 .../spotless/npm/NpmProcessFactory.java       |  27 +++++
 .../spotless/npm/PrettierFormatterStep.java   |   1 -
 .../spotless/npm/StandardNpmProcess.java      | 112 ------------------
 .../npm/StandardNpmProcessFactory.java        | 104 ++++++++++++++++
 .../spotless/npm/TsFmtFormatterStep.java      |   1 -
 .../diffplug/spotless/TimedLoggerTest.java    |  14 +++
 13 files changed, 320 insertions(+), 153 deletions(-)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/npm/NodeApp.java
 create mode 100644 lib/src/main/java/com/diffplug/spotless/npm/NodeServeApp.java
 create mode 100644 lib/src/main/java/com/diffplug/spotless/npm/NpmProcessFactory.java
 delete mode 100644 lib/src/main/java/com/diffplug/spotless/npm/StandardNpmProcess.java
 create mode 100644 lib/src/main/java/com/diffplug/spotless/npm/StandardNpmProcessFactory.java

diff --git a/lib/src/main/java/com/diffplug/spotless/TimedLogger.java b/lib/src/main/java/com/diffplug/spotless/TimedLogger.java
index f67d90c0ea..f009a000f5 100644
--- a/lib/src/main/java/com/diffplug/spotless/TimedLogger.java
+++ b/lib/src/main/java/com/diffplug/spotless/TimedLogger.java
@@ -192,6 +192,12 @@ public void run(ThrowingEx.Runnable r) {
 			}
 		}
 
+		public <T> T call(ThrowingEx.Supplier<T> s) {
+			try (Timed ignore = timed()) {
+				return ThrowingEx.get(s);
+			}
+		}
+
 		public void runChecked(ThrowingEx.Runnable r) throws Exception {
 			try (Timed ignore = timed()) {
 				r.run();
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
index b262bb4b98..89a1bbddaa 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
@@ -95,7 +95,6 @@ private static class State extends NpmFormatterStepStateBase implements Serializ
 							replaceDevDependencies(
 									NpmResourceHelper.readUtf8StringFromClasspath(EslintFormatterStep.class, "/com/diffplug/spotless/npm/eslint-package.json"),
 									new TreeMap<>(devDependencies)),
-							"eslint",
 							NpmResourceHelper.readUtf8StringFromClasspath(EslintFormatterStep.class,
 									"/com/diffplug/spotless/npm/common-serve.js",
 									"/com/diffplug/spotless/npm/eslint-serve.js"),
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NodeApp.java b/lib/src/main/java/com/diffplug/spotless/npm/NodeApp.java
new file mode 100644
index 0000000000..42e2a2d77d
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NodeApp.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.npm;
+
+import java.util.Objects;
+
+import javax.annotation.Nonnull;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.diffplug.spotless.TimedLogger;
+
+public class NodeApp {
+
+	private static final Logger logger = LoggerFactory.getLogger(NodeApp.class);
+
+	private static final TimedLogger timedLogger = TimedLogger.forLogger(logger);
+
+	@Nonnull
+	protected final NodeServerLayout nodeServerLayout;
+
+	@Nonnull
+	protected final NpmConfig npmConfig;
+
+	@Nonnull
+	protected final NpmProcessFactory npmProcessFactory;
+
+	@Nonnull
+	protected final NpmFormatterStepLocations formatterStepLocations;
+
+	public NodeApp(@Nonnull NodeServerLayout nodeServerLayout, @Nonnull NpmConfig npmConfig, @Nonnull NpmProcessFactory npmProcessFactory, @Nonnull NpmFormatterStepLocations formatterStepLocations) {
+		this.nodeServerLayout = Objects.requireNonNull(nodeServerLayout);
+		this.npmConfig = Objects.requireNonNull(npmConfig);
+		this.npmProcessFactory = Objects.requireNonNull(npmProcessFactory);
+		this.formatterStepLocations = Objects.requireNonNull(formatterStepLocations);
+	}
+
+	boolean needsNpmInstall() {
+		return !this.nodeServerLayout.isNodeModulesPrepared();
+	}
+
+	boolean needsPrepareNodeAppLayout() {
+		return !this.nodeServerLayout.isLayoutPrepared();
+	}
+
+	void prepareNodeAppLayout() {
+		timedLogger.withInfo("Preparing {} for npm step {}.", this.nodeServerLayout, getClass().getName()).run(() -> {
+			NpmResourceHelper.assertDirectoryExists(nodeServerLayout.nodeModulesDir());
+			NpmResourceHelper.writeUtf8StringToFile(nodeServerLayout.packageJsonFile(), this.npmConfig.getPackageJsonContent());
+			if (this.npmConfig.getServeScriptContent() != null) {
+				NpmResourceHelper.writeUtf8StringToFile(nodeServerLayout.serveJsFile(), this.npmConfig.getServeScriptContent());
+			} else {
+				NpmResourceHelper.deleteFileIfExists(nodeServerLayout.serveJsFile());
+			}
+			if (this.npmConfig.getNpmrcContent() != null) {
+				NpmResourceHelper.writeUtf8StringToFile(nodeServerLayout.npmrcFile(), this.npmConfig.getNpmrcContent());
+			} else {
+				NpmResourceHelper.deleteFileIfExists(nodeServerLayout.npmrcFile());
+			}
+		});
+	}
+
+	void npmInstall() {
+		timedLogger.withInfo("Installing npm dependencies for {} with {}.", this.nodeServerLayout, this.npmProcessFactory.describe())
+				.run(() -> npmProcessFactory.createNpmInstallProcess(nodeServerLayout, formatterStepLocations).waitFor());
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NodeServeApp.java b/lib/src/main/java/com/diffplug/spotless/npm/NodeServeApp.java
new file mode 100644
index 0000000000..34b2e3d869
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NodeServeApp.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.npm;
+
+import javax.annotation.Nonnull;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.diffplug.spotless.ProcessRunner;
+import com.diffplug.spotless.TimedLogger;
+
+public class NodeServeApp extends NodeApp {
+
+	private static final Logger logger = LoggerFactory.getLogger(NodeApp.class);
+
+	private static final TimedLogger timedLogger = TimedLogger.forLogger(logger);
+
+	public NodeServeApp(@Nonnull NodeServerLayout nodeServerLayout, @Nonnull NpmConfig npmConfig, @Nonnull NpmProcessFactory npmProcessFactory, @Nonnull NpmFormatterStepLocations formatterStepLocations) {
+		super(nodeServerLayout, npmConfig, npmProcessFactory, formatterStepLocations);
+	}
+
+	ProcessRunner.LongRunningProcess startNpmServeProcess() {
+		return timedLogger.withInfo("Starting npm based server in {} with {}.", this.nodeServerLayout.nodeModulesDir(), this.npmProcessFactory.describe())
+				.call(() -> npmProcessFactory.createNpmServeProcess(nodeServerLayout, formatterStepLocations).start());
+	}
+
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmConfig.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmConfig.java
index 1492fe7a99..863be41193 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmConfig.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 package com.diffplug.spotless.npm;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 import javax.annotation.Nonnull;
 
@@ -23,30 +24,24 @@ class NpmConfig implements Serializable {
 
 	private static final long serialVersionUID = 684264546497914877L;
 
+	@Nonnull
 	private final String packageJsonContent;
 
-	private final String npmModule;
-
 	private final String serveScriptContent;
 
 	private final String npmrcContent;
 
-	public NpmConfig(String packageJsonContent, String npmModule, String serveScriptContent, String npmrcContent) {
-		this.packageJsonContent = packageJsonContent;
-		this.npmModule = npmModule;
+	public NpmConfig(@Nonnull String packageJsonContent, String serveScriptContent, String npmrcContent) {
+		this.packageJsonContent = Objects.requireNonNull(packageJsonContent);
 		this.serveScriptContent = serveScriptContent;
 		this.npmrcContent = npmrcContent;
 	}
 
+	@Nonnull
 	public String getPackageJsonContent() {
 		return packageJsonContent;
 	}
 
-	public String getNpmModule() {
-		return npmModule;
-	}
-
-	@Nonnull
 	public String getServeScriptContent() {
 		return serveScriptContent;
 	}
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
index 140aff048e..dbb561e54e 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
@@ -55,37 +55,22 @@ abstract class NpmFormatterStepStateBase implements Serializable {
 
 	private final String stepName;
 
+	private final transient NodeServeApp nodeServeApp;
+
 	protected NpmFormatterStepStateBase(String stepName, NpmConfig npmConfig, NpmFormatterStepLocations locations) throws IOException {
 		this.stepName = requireNonNull(stepName);
 		this.npmConfig = requireNonNull(npmConfig);
 		this.locations = locations;
 		this.nodeServerLayout = new NodeServerLayout(locations.buildDir(), npmConfig.getPackageJsonContent());
+		this.nodeServeApp = new NodeServeApp(nodeServerLayout, npmConfig, new StandardNpmProcessFactory(), locations);
 	}
 
 	protected void prepareNodeServerLayout() throws IOException {
-		final long started = System.currentTimeMillis();
-
-		timedLogger.withInfo("Preparing {} for npm step {}.", this.nodeServerLayout, getClass().getName()).run(() -> {
-			NpmResourceHelper.assertDirectoryExists(nodeServerLayout.nodeModulesDir());
-			NpmResourceHelper.writeUtf8StringToFile(nodeServerLayout.packageJsonFile(),
-					this.npmConfig.getPackageJsonContent());
-			NpmResourceHelper
-					.writeUtf8StringToFile(nodeServerLayout.serveJsFile(), this.npmConfig.getServeScriptContent());
-			if (this.npmConfig.getNpmrcContent() != null) {
-				NpmResourceHelper.writeUtf8StringToFile(nodeServerLayout.npmrcFile(), this.npmConfig.getNpmrcContent());
-			} else {
-				NpmResourceHelper.deleteFileIfExists(nodeServerLayout.npmrcFile());
-			}
-		});
+		nodeServeApp.prepareNodeAppLayout();
 	}
 
 	protected void prepareNodeServer() throws IOException {
-		timedLogger.withInfo("Running npm install in {} for npm step {}.", this.nodeServerLayout.nodeModulesDir(), getClass().getName())
-				.run(() -> runNpmInstall(nodeServerLayout.nodeModulesDir()));
-	}
-
-	private void runNpmInstall(File npmProjectDir) throws IOException {
-		new StandardNpmProcess(npmProjectDir, this.locations.npmExecutable(), this.locations.nodeExecutable()).install();
+		nodeServeApp.npmInstall();
 	}
 
 	protected void assertNodeServerDirReady() throws IOException {
@@ -100,11 +85,11 @@ protected void assertNodeServerDirReady() throws IOException {
 	}
 
 	protected boolean needsPrepareNodeServer() {
-		return !this.nodeServerLayout.isNodeModulesPrepared();
+		return nodeServeApp.needsNpmInstall();
 	}
 
 	protected boolean needsPrepareNodeServerLayout() {
-		return !this.nodeServerLayout.isLayoutPrepared();
+		return nodeServeApp.needsPrepareNodeAppLayout();
 	}
 
 	protected ServerProcessInfo npmRunServer() throws ServerStartException, IOException {
@@ -116,7 +101,7 @@ protected ServerProcessInfo npmRunServer() throws ServerStartException, IOExcept
 			final File serverPortFile = new File(this.nodeServerLayout.nodeModulesDir(), "server.port");
 			NpmResourceHelper.deleteFileIfExists(serverPortFile);
 			// start the http server in node
-			server = new StandardNpmProcess(this.nodeServerLayout.nodeModulesDir(), this.locations.npmExecutable(), this.locations.nodeExecutable()).start();
+			server = nodeServeApp.startNpmServeProcess();
 
 			// await the readiness of the http server - wait for at most 60 seconds
 			try {
@@ -207,7 +192,7 @@ protected static class ServerStartException extends RuntimeException {
 		private static final long serialVersionUID = -8803977379866483002L;
 
 		public ServerStartException(String message, Throwable cause) {
-			super(cause);
+			super(message, cause);
 		}
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java
index 1459d3fc6f..be675eecb7 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java
@@ -15,10 +15,39 @@
  */
 package com.diffplug.spotless.npm;
 
-import com.diffplug.spotless.ProcessRunner;
+import java.util.concurrent.ExecutionException;
+
+import com.diffplug.spotless.ProcessRunner.LongRunningProcess;
+import com.diffplug.spotless.ProcessRunner.Result;
 
 interface NpmProcess {
-	void install();
 
-	ProcessRunner.LongRunningProcess start();
+	String describe();
+
+	LongRunningProcess start();
+
+	default Result waitFor() {
+		try (LongRunningProcess npmProcess = start()) {
+			if (npmProcess.waitFor() != 0) {
+				throw new NpmProcessException("Running npm command '" + describe() + "' failed with exit code: " + npmProcess.exitValue() + "\n\n" + npmProcess.result());
+			}
+			return npmProcess.result();
+		} catch (InterruptedException e) {
+			throw new NpmProcessException("Running npm command '" + describe() + "' was interrupted.", e);
+		} catch (ExecutionException e) {
+			throw new NpmProcessException("Running npm command '" + describe() + "' failed.", e);
+		}
+	}
+
+	class NpmProcessException extends RuntimeException {
+		private static final long serialVersionUID = 6424331316676759525L;
+
+		public NpmProcessException(String message) {
+			super(message);
+		}
+
+		public NpmProcessException(String message, Throwable cause) {
+			super(message, cause);
+		}
+	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmProcessFactory.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmProcessFactory.java
new file mode 100644
index 0000000000..f588792f79
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmProcessFactory.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.npm;
+
+public interface NpmProcessFactory {
+	NpmProcess createNpmInstallProcess(NodeServerLayout nodeServerLayout, NpmFormatterStepLocations formatterStepLocations);
+
+	NpmProcess createNpmServeProcess(NodeServerLayout nodeServerLayout, NpmFormatterStepLocations formatterStepLocations);
+
+	default String describe() {
+		return getClass().getSimpleName();
+	}
+
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
index 05c61f9bdf..b09493792b 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
@@ -70,7 +70,6 @@ private static class State extends NpmFormatterStepStateBase implements Serializ
 							replaceDevDependencies(
 									NpmResourceHelper.readUtf8StringFromClasspath(PrettierFormatterStep.class, "/com/diffplug/spotless/npm/prettier-package.json"),
 									new TreeMap<>(devDependencies)),
-							"prettier",
 							NpmResourceHelper.readUtf8StringFromClasspath(PrettierFormatterStep.class,
 									"/com/diffplug/spotless/npm/common-serve.js",
 									"/com/diffplug/spotless/npm/prettier-serve.js"),
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/StandardNpmProcess.java b/lib/src/main/java/com/diffplug/spotless/npm/StandardNpmProcess.java
deleted file mode 100644
index 7524be4e74..0000000000
--- a/lib/src/main/java/com/diffplug/spotless/npm/StandardNpmProcess.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright 2016-2023 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.npm;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ExecutionException;
-import java.util.stream.Collectors;
-
-import com.diffplug.spotless.ProcessRunner;
-import com.diffplug.spotless.ProcessRunner.LongRunningProcess;
-
-class StandardNpmProcess implements NpmProcess {
-
-	private final File workingDir;
-
-	private final File npmExecutable;
-
-	private final File nodeExecutable;
-
-	private final ProcessRunner processRunner;
-
-	StandardNpmProcess(File workingDir, File npmExecutable, File nodeExecutable) {
-		this.workingDir = workingDir;
-		this.npmExecutable = npmExecutable;
-		this.nodeExecutable = nodeExecutable;
-		processRunner = ProcessRunner.usingRingBuffersOfCapacity(100 * 1024); // 100kB
-	}
-
-	@Override
-	public void install() {
-		npmAwait("install",
-				"--no-audit",
-				"--no-package-lock",
-				"--no-fund",
-				"--prefer-offline");
-	}
-
-	@Override
-	public LongRunningProcess start() {
-		// adding --scripts-prepend-node-path=true due to https://github.com/diffplug/spotless/issues/619#issuecomment-648018679
-		return npm("start", "--scripts-prepend-node-path=true");
-	}
-
-	private void npmAwait(String... args) {
-		try (LongRunningProcess npmProcess = npm(args)) {
-			if (npmProcess.waitFor() != 0) {
-				throw new NpmProcessException("Running npm command '" + commandLine(args) + "' failed with exit code: " + npmProcess.exitValue() + "\n\n" + npmProcess.result());
-			}
-		} catch (InterruptedException e) {
-			throw new NpmProcessException("Running npm command '" + commandLine(args) + "' was interrupted.", e);
-		} catch (ExecutionException e) {
-			throw new NpmProcessException("Running npm command '" + commandLine(args) + "' failed.", e);
-		}
-	}
-
-	private LongRunningProcess npm(String... args) {
-		List<String> processCommand = processCommand(args);
-		try {
-			return processRunner.start(this.workingDir, environmentVariables(), null, true, processCommand);
-		} catch (IOException e) {
-			throw new NpmProcessException("Failed to launch npm command '" + commandLine(args) + "'.", e);
-		}
-	}
-
-	private List<String> processCommand(String... args) {
-		List<String> command = new ArrayList<>(args.length + 1);
-		command.add(this.npmExecutable.getAbsolutePath());
-		command.addAll(Arrays.asList(args));
-		return command;
-	}
-
-	private Map<String, String> environmentVariables() {
-		Map<String, String> environmentVariables = new HashMap<>();
-		environmentVariables.put("PATH", this.nodeExecutable.getParentFile().getAbsolutePath() + File.pathSeparator + System.getenv("PATH"));
-		return environmentVariables;
-	}
-
-	private String commandLine(String... args) {
-		return "npm " + Arrays.stream(args).collect(Collectors.joining(" "));
-	}
-
-	static class NpmProcessException extends RuntimeException {
-		private static final long serialVersionUID = 6424331316676759525L;
-
-		public NpmProcessException(String message) {
-			super(message);
-		}
-
-		public NpmProcessException(String message, Throwable cause) {
-			super(message, cause);
-		}
-	}
-}
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/StandardNpmProcessFactory.java b/lib/src/main/java/com/diffplug/spotless/npm/StandardNpmProcessFactory.java
new file mode 100644
index 0000000000..393fba98e1
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/npm/StandardNpmProcessFactory.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.npm;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+import com.diffplug.spotless.ProcessRunner;
+
+public class StandardNpmProcessFactory implements NpmProcessFactory {
+	@Override
+	public NpmProcess createNpmInstallProcess(NodeServerLayout nodeServerLayout, NpmFormatterStepLocations formatterStepLocations) {
+		return new NpmInstall(nodeServerLayout.nodeModulesDir(), formatterStepLocations);
+	}
+
+	@Override
+	public NpmProcess createNpmServeProcess(NodeServerLayout nodeServerLayout, NpmFormatterStepLocations formatterStepLocations) {
+		return new NpmServe(nodeServerLayout.nodeModulesDir(), formatterStepLocations);
+	}
+
+	private static abstract class AbstractStandardNpmProcess implements NpmProcess {
+		protected final ProcessRunner processRunner = ProcessRunner.usingRingBuffersOfCapacity(100 * 1024); // 100kB
+
+		protected final File workingDir;
+		protected final NpmFormatterStepLocations formatterStepLocations;
+
+		public AbstractStandardNpmProcess(File workingDir, NpmFormatterStepLocations formatterStepLocations) {
+			this.formatterStepLocations = formatterStepLocations;
+			this.workingDir = workingDir;
+		}
+
+		protected String npmExecutable() {
+			return formatterStepLocations.npmExecutable().getAbsolutePath();
+		}
+
+		protected abstract List<String> commandLine();
+
+		protected Map<String, String> environmentVariables() {
+			return Map.of(
+					"PATH", formatterStepLocations.nodeExecutable().getParentFile().getAbsolutePath() + File.pathSeparator + System.getenv("PATH"));
+		}
+
+		@Override
+		public ProcessRunner.LongRunningProcess start() {
+			try {
+				return processRunner.start(workingDir, environmentVariables(), null, true, commandLine());
+			} catch (IOException e) {
+				throw new NpmProcessException("Failed to launch npm command '" + describe() + "'.", e);
+			}
+		}
+
+		@Override
+		public String describe() {
+			return String.format("%s in %s [%s]", getClass().getSimpleName(), workingDir, String.join(" ", commandLine()));
+		}
+	}
+
+	private static class NpmInstall extends AbstractStandardNpmProcess {
+
+		public NpmInstall(File workingDir, NpmFormatterStepLocations formatterStepLocations) {
+			super(workingDir, formatterStepLocations);
+		}
+
+		@Override
+		protected List<String> commandLine() {
+			return List.of(
+					npmExecutable(),
+					"install",
+					"--no-audit",
+					"--no-fund",
+					"--prefer-offline");
+		}
+	}
+
+	private static class NpmServe extends AbstractStandardNpmProcess {
+
+		public NpmServe(File workingDir, NpmFormatterStepLocations formatterStepLocations) {
+			super(workingDir, formatterStepLocations);
+		}
+
+		@Override
+		protected List<String> commandLine() {
+			return List.of(
+					npmExecutable(),
+					"start",
+					"--scripts-prepend-node-path=true");
+		}
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java
index 4bd665c764..c42d8b8361 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java
@@ -75,7 +75,6 @@ public State(String stepName, Map<String, String> versions, File projectDir, Fil
 			super(stepName,
 					new NpmConfig(
 							replaceDevDependencies(NpmResourceHelper.readUtf8StringFromClasspath(TsFmtFormatterStep.class, "/com/diffplug/spotless/npm/tsfmt-package.json"), new TreeMap<>(versions)),
-							"typescript-formatter",
 							NpmResourceHelper.readUtf8StringFromClasspath(PrettierFormatterStep.class,
 									"/com/diffplug/spotless/npm/common-serve.js",
 									"/com/diffplug/spotless/npm/tsfmt-serve.js"),
diff --git a/lib/src/test/java/com/diffplug/spotless/TimedLoggerTest.java b/lib/src/test/java/com/diffplug/spotless/TimedLoggerTest.java
index 167b5d24de..3c84ca09ce 100644
--- a/lib/src/test/java/com/diffplug/spotless/TimedLoggerTest.java
+++ b/lib/src/test/java/com/diffplug/spotless/TimedLoggerTest.java
@@ -134,6 +134,20 @@ void itLogsEvenWhenExceptionsAreThrown() {
 		testLogger.assertHasEventWithMessageAndArguments(MESSAGE_PREFIX_END, "2ms");
 	}
 
+	@Test
+	void itReturnsValueOfCallableWhileStillLogging() {
+		String result = timedLogger.withInfo("This should be logged").call(() -> {
+			testTicker.tickMillis(2);
+			return "This is the result";
+		});
+
+		Assertions.assertThat(result).isEqualTo("This is the result");
+
+		testLogger.assertEvents(2);
+		testLogger.assertHasEventWithMessageAndArguments(MESSAGE_PREFIX_BEGIN);
+		testLogger.assertHasEventWithMessageAndArguments(MESSAGE_PREFIX_END, "2ms");
+	}
+
 	private static class TestLogger extends LegacyAbstractLogger {
 
 		private final List<TestLoggingEvent> events = new LinkedList<>();

From c2bba799f158e482573ecc123863bec37932c755 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 21 Feb 2023 20:46:32 +0100
Subject: [PATCH 0826/2068] 1480: introduce facility to keep copies of node
 modules

---
 .../spotless/npm/NpmResourceHelper.java       |  12 ++
 .../com/diffplug/spotless/npm/ShadowCopy.java | 171 ++++++++++++++++
 .../diffplug/spotless/npm/ShadowCopyTest.java | 193 ++++++++++++++++++
 3 files changed, 376 insertions(+)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/npm/ShadowCopy.java
 create mode 100644 testlib/src/test/java/com/diffplug/spotless/npm/ShadowCopyTest.java

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmResourceHelper.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmResourceHelper.java
index aa66c54fcf..7a28685de0 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmResourceHelper.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmResourceHelper.java
@@ -103,6 +103,18 @@ static void awaitReadableFile(File file, Duration maxWaitTime) throws TimeoutExc
 			if ((System.currentTimeMillis() - startedAt) > maxWaitTime.toMillis()) {
 				throw new TimeoutException("The file did not appear within " + maxWaitTime);
 			}
+			ThrowingEx.run(() -> Thread.sleep(100));
+		}
+	}
+
+	static void awaitFileDeleted(File file, Duration maxWaitTime) throws TimeoutException {
+		final long startedAt = System.currentTimeMillis();
+		while (file.exists()) {
+			// wait for at most maxWaitTime
+			if ((System.currentTimeMillis() - startedAt) > maxWaitTime.toMillis()) {
+				throw new TimeoutException("The file did not disappear within " + maxWaitTime);
+			}
+			ThrowingEx.run(() -> Thread.sleep(100));
 		}
 	}
 
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/ShadowCopy.java b/lib/src/main/java/com/diffplug/spotless/npm/ShadowCopy.java
new file mode 100644
index 0000000000..295f8f6017
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/npm/ShadowCopy.java
@@ -0,0 +1,171 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.npm;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.FileAlreadyExistsException;
+import java.nio.file.FileSystemException;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.time.Duration;
+import java.util.concurrent.TimeoutException;
+
+import javax.annotation.Nonnull;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.diffplug.spotless.ThrowingEx;
+
+class ShadowCopy {
+
+	private static final Logger logger = LoggerFactory.getLogger(ShadowCopy.class);
+
+	private final File shadowCopyRoot;
+
+	public ShadowCopy(@Nonnull File shadowCopyRoot) {
+		this.shadowCopyRoot = shadowCopyRoot;
+		if (!shadowCopyRoot.isDirectory()) {
+			throw new IllegalArgumentException("Shadow copy root must be a directory: " + shadowCopyRoot);
+		}
+	}
+
+	public void addEntry(String key, File orig) {
+		if (!reserveSubFolder(key)) {
+			logger.debug("Shadow copy entry already on the way: {}. Awaiting finalization.", key);
+			try {
+				// maybe make the duration configurable?
+				NpmResourceHelper.awaitFileDeleted(markerFilePath(key).toFile(), Duration.ofSeconds(120));
+			} catch (TimeoutException e) {
+				throw new RuntimeException(e);
+			}
+		}
+		try {
+			storeEntry(key, orig);
+		} finally {
+			cleanupReservation(key);
+		}
+	}
+
+	public File getEntry(String key, String fileName) {
+		return entry(key, fileName);
+	}
+
+	private void storeEntry(String key, File orig) {
+		File target = entry(key, orig.getName());
+		if (target.exists()) {
+			logger.debug("Shadow copy entry already exists: {}", key);
+			// delete directory "target" recursively
+			// https://stackoverflow.com/questions/3775694/deleting-folder-from-java
+			ThrowingEx.run(() -> Files.walkFileTree(target.toPath(), new DeleteDirectoryRecursively()));
+		}
+		// copy directory "orig" to "target" using hard links if possible or a plain copy otherwise
+		ThrowingEx.run(() -> Files.walkFileTree(orig.toPath(), new CopyDirectoryRecursively(target, orig)));
+	}
+
+	private void cleanupReservation(String key) {
+		ThrowingEx.run(() -> Files.delete(markerFilePath(key)));
+	}
+
+	private Path markerFilePath(String key) {
+		return Paths.get(shadowCopyRoot.getAbsolutePath(), key + ".marker");
+	}
+
+	private File entry(String key, String origName) {
+		return Paths.get(shadowCopyRoot.getAbsolutePath(), key, origName).toFile();
+	}
+
+	private boolean reserveSubFolder(String key) {
+		// put a marker file named "key".marker in "shadowCopyRoot" to make sure no other process is using it or return false if it already exists
+		try {
+			Files.createFile(Paths.get(shadowCopyRoot.getAbsolutePath(), key + ".marker"));
+			return true;
+		} catch (FileAlreadyExistsException e) {
+			return false;
+		} catch (IOException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	public File copyEntryInto(String key, String origName, File targetParentFolder) {
+		File target = Paths.get(targetParentFolder.getAbsolutePath(), origName).toFile();
+		if (target.exists()) {
+			logger.warn("Shadow copy destination already exists, deleting! {}: {}", key, target);
+			ThrowingEx.run(() -> Files.walkFileTree(target.toPath(), new DeleteDirectoryRecursively()));
+		}
+		// copy directory "orig" to "target" using hard links if possible or a plain copy otherwise
+		ThrowingEx.run(() -> Files.walkFileTree(entry(key, origName).toPath(), new CopyDirectoryRecursively(target, entry(key, origName))));
+		return target;
+	}
+
+	private static class CopyDirectoryRecursively extends SimpleFileVisitor<Path> {
+		private final File target;
+		private final File orig;
+
+		private boolean tryHardLink = true;
+
+		public CopyDirectoryRecursively(File target, File orig) {
+			this.target = target;
+			this.orig = orig;
+		}
+
+		@Override
+		public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
+			// create directory on target
+			Files.createDirectories(target.toPath().resolve(orig.toPath().relativize(dir)));
+			return super.preVisitDirectory(dir, attrs);
+		}
+
+		@Override
+		public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+			// first try to hardlink, if that fails, copy
+			if (tryHardLink) {
+				try {
+					Files.createLink(target.toPath().resolve(orig.toPath().relativize(file)), file);
+					return super.visitFile(file, attrs);
+				} catch (UnsupportedOperationException | SecurityException | FileSystemException e) {
+					logger.debug("Shadow copy entry does not support hard links: {}", file, e);
+					tryHardLink = false; // remember that hard links are not supported
+				} catch (IOException e) {
+					logger.debug("Shadow copy entry failed to create hard link: {}", file, e);
+					tryHardLink = false; // remember that hard links are not supported
+				}
+			}
+			// copy file to target
+			Files.copy(file, target.toPath().resolve(orig.toPath().relativize(file)));
+			return super.visitFile(file, attrs);
+		}
+	}
+
+	private static class DeleteDirectoryRecursively extends SimpleFileVisitor<Path> {
+		@Override
+		public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+			Files.delete(file);
+			return super.visitFile(file, attrs);
+		}
+
+		@Override
+		public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
+			Files.delete(dir);
+			return super.postVisitDirectory(dir, exc);
+		}
+	}
+}
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/ShadowCopyTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/ShadowCopyTest.java
new file mode 100644
index 0000000000..c164b54092
--- /dev/null
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/ShadowCopyTest.java
@@ -0,0 +1,193 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.npm;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Random;
+import java.util.stream.Collectors;
+
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import com.diffplug.spotless.ResourceHarness;
+
+class ShadowCopyTest extends ResourceHarness {
+
+	public static final char[] CHARS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789".toCharArray();
+	private File shadowCopyRoot;
+
+	private ShadowCopy shadowCopy;
+
+	private final Random random = new Random();
+
+	@BeforeEach
+	void setUp() throws IOException {
+		shadowCopyRoot = newFolder("shadowCopyRoot");
+		shadowCopy = new ShadowCopy(shadowCopyRoot);
+	}
+
+	@Test
+	void anAddedEntryCanBeRetrieved() throws IOException {
+		File folderWithRandomFile = newFolderWithRandomFile();
+		shadowCopy.addEntry("someEntry", folderWithRandomFile);
+		File shadowCopyFile = shadowCopy.getEntry("someEntry", folderWithRandomFile.getName());
+		Assertions.assertThat(shadowCopyFile.listFiles()).hasSize(folderWithRandomFile.listFiles().length);
+		assertAllFilesAreEqualButNotSameAbsolutePath(folderWithRandomFile, shadowCopyFile);
+	}
+
+	@Test
+	void twoAddedEntriesCanBeRetrieved() throws IOException {
+		File folderWithRandomFile = newFolderWithRandomFile();
+		File folderWithRandomFile2 = newFolderWithRandomFile();
+		shadowCopy.addEntry("someEntry", folderWithRandomFile);
+		shadowCopy.addEntry("someOtherEntry", folderWithRandomFile2);
+		File shadowCopyFile = shadowCopy.getEntry("someEntry", folderWithRandomFile.getName());
+		File shadowCopyFile2 = shadowCopy.getEntry("someOtherEntry", folderWithRandomFile2.getName());
+		Assertions.assertThat(shadowCopyFile.listFiles()).hasSize(folderWithRandomFile.listFiles().length);
+		Assertions.assertThat(shadowCopyFile2.listFiles()).hasSize(folderWithRandomFile2.listFiles().length);
+		assertAllFilesAreEqualButNotSameAbsolutePath(folderWithRandomFile, shadowCopyFile);
+		assertAllFilesAreEqualButNotSameAbsolutePath(folderWithRandomFile2, shadowCopyFile2);
+	}
+
+	@Test
+	void addingTheSameEntryTwiceWorks() throws IOException {
+		File folderWithRandomFile = newFolderWithRandomFile();
+		shadowCopy.addEntry("someEntry", folderWithRandomFile);
+		shadowCopy.addEntry("someEntry", folderWithRandomFile);
+		File shadowCopyFile = shadowCopy.getEntry("someEntry", folderWithRandomFile.getName());
+		Assertions.assertThat(shadowCopyFile.listFiles()).hasSize(folderWithRandomFile.listFiles().length);
+		assertAllFilesAreEqualButNotSameAbsolutePath(folderWithRandomFile, shadowCopyFile);
+	}
+
+	@Test
+	void changingAFolderAfterAddingItDoesNotChangeTheShadowCopy() throws IOException {
+		File folderWithRandomFile = newFolderWithRandomFile();
+		shadowCopy.addEntry("someEntry", folderWithRandomFile);
+
+		// now change the orig
+		Files.delete(folderWithRandomFile.listFiles()[0].toPath());
+		File newRandomFile = new File(folderWithRandomFile, "replacedFile.txt");
+		writeRandomStringOfLengthToFile(newRandomFile, 100);
+
+		// now check that they are different
+		File shadowCopy = this.shadowCopy.getEntry("someEntry", folderWithRandomFile.getName());
+		Assertions.assertThat(shadowCopy.listFiles()).hasSize(folderWithRandomFile.listFiles().length);
+		Assertions.assertThat(shadowCopy.listFiles()[0].getName()).isNotEqualTo(folderWithRandomFile.listFiles()[0].getName());
+	}
+
+	@Test
+	void addingTheSameEntryTwiceResultsInSecondEntryBeingRetained() throws IOException {
+		File folderWithRandomFile = newFolderWithRandomFile();
+		shadowCopy.addEntry("someEntry", folderWithRandomFile);
+
+		// now change the orig
+		Files.delete(folderWithRandomFile.listFiles()[0].toPath());
+		File newRandomFile = new File(folderWithRandomFile, "replacedFile.txt");
+		writeRandomStringOfLengthToFile(newRandomFile, 100);
+
+		// and then add the same entry with new content again and check that they now are the same again
+		shadowCopy.addEntry("someEntry", folderWithRandomFile);
+		File shadowCopyFile = shadowCopy.getEntry("someEntry", folderWithRandomFile.getName());
+		Assertions.assertThat(shadowCopyFile.listFiles()).hasSize(folderWithRandomFile.listFiles().length);
+		assertAllFilesAreEqualButNotSameAbsolutePath(folderWithRandomFile, shadowCopyFile);
+	}
+
+	@Test
+	void aFolderCanBeCopiedUsingShadowCopy() throws IOException {
+		File folderWithRandomFile = newFolderWithRandomFile();
+		shadowCopy.addEntry("someEntry", folderWithRandomFile);
+		File copiedFolder = newFolder("copyDest");
+		File copiedEntry = shadowCopy.copyEntryInto("someEntry", folderWithRandomFile.getName(), copiedFolder);
+
+		Assertions.assertThat(copiedEntry.listFiles()).hasSize(folderWithRandomFile.listFiles().length);
+		assertAllFilesAreEqualButNotSameAbsolutePath(folderWithRandomFile, copiedEntry);
+	}
+
+	@Test
+	void aCopiedFolderIsDifferentFromShadowCopyEntry() throws IOException {
+		File folderWithRandomFile = newFolderWithRandomFile();
+		shadowCopy.addEntry("someEntry", folderWithRandomFile);
+		File copiedFolder = newFolder("copyDest");
+		File copiedEntry = shadowCopy.copyEntryInto("someEntry", folderWithRandomFile.getName(), copiedFolder);
+
+		File shadowCopyFile = shadowCopy.getEntry("someEntry", folderWithRandomFile.getName());
+		Assertions.assertThat(shadowCopyFile.listFiles()).hasSize(copiedEntry.listFiles().length);
+		assertAllFilesAreEqualButNotSameAbsolutePath(copiedEntry, shadowCopyFile);
+	}
+
+	private void assertAllFilesAreEqualButNotSameAbsolutePath(File expected, File actual) {
+		if (expected.isFile()) {
+			assertFileIsEqualButNotSameAbsolutePath(expected, actual);
+		} else {
+			assertDirectoryIsEqualButNotSameAbsolutePath(expected, actual);
+		}
+	}
+
+	private void assertDirectoryIsEqualButNotSameAbsolutePath(File expected, File actual) {
+		Assertions.assertThat(actual.getAbsolutePath()).as("absolute path should be different").isNotEqualTo(expected.getAbsolutePath());
+		Assertions.assertThat(actual.listFiles()).as("folder should have same amount of files").hasSize(expected.listFiles().length);
+		List<File> actualContent = filesInAlphabeticalOrder(actual);
+		List<File> expectedContent = filesInAlphabeticalOrder(expected);
+
+		for (int i = 0; i < expectedContent.size(); i++) {
+			assertAllFilesAreEqualButNotSameAbsolutePath(expectedContent.get(i), actualContent.get(i));
+		}
+	}
+
+	private List<File> filesInAlphabeticalOrder(File folder) {
+		if (!folder.isDirectory()) {
+			throw new IllegalArgumentException("folder must be a directory");
+		}
+		return Arrays.stream(folder.listFiles())
+				.sorted(Comparator.comparing(File::getName).thenComparing(File::getAbsolutePath))
+				.collect(Collectors.toList());
+	}
+
+	private void assertFileIsEqualButNotSameAbsolutePath(File expected, File actual) {
+		Assertions.assertThat(actual).as("Files have same name").hasName(expected.getName());
+		Assertions.assertThat(actual.getAbsolutePath()).as("absolute path is different").isNotEqualTo(expected.getAbsolutePath());
+		Assertions.assertThat(actual).as("files have same content").hasSameTextualContentAs(expected, StandardCharsets.UTF_8);
+	}
+
+	private File newFolderWithRandomFile() throws IOException {
+		File folder = newFolder(randomStringOfLength(10));
+		File file = new File(folder, randomStringOfLength(10) + ".txt");
+		writeRandomStringOfLengthToFile(file, 10);
+		return folder;
+	}
+
+	private void writeRandomStringOfLengthToFile(File file, int length) throws IOException {
+		Files.write(file.toPath(), randomStringOfLength(length).getBytes(StandardCharsets.UTF_8));
+	}
+
+	private String randomStringOfLength(int length) {
+		// returns a string of length containing characters a-z, A-Z, 0-9
+
+		StringBuilder sb = new StringBuilder();
+		for (int i = 0; i < length; i++) {
+			sb.append(CHARS[random.nextInt(CHARS.length)]);
+		}
+		return sb.toString();
+	}
+
+}

From 6efa928eb8b933f2d4c3b3536422bc4f5b7a9d5a Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 21 Feb 2023 21:37:28 +0100
Subject: [PATCH 0827/2068] 1480: add caching around npm install

---
 .../com/diffplug/spotless/TimedLogger.java    |   4 +-
 .../NodeModulesCachingNpmProcessFactory.java  | 112 ++++++++++++++++++
 .../spotless/npm/NodeServerLayout.java        |   4 +-
 .../npm/NpmFormatterStepStateBase.java        |   2 +-
 .../spotless/npm/NpmLongRunningProcess.java   |  26 ++++
 .../com/diffplug/spotless/npm/NpmProcess.java |  29 +----
 .../spotless/npm/NpmProcessException.java     |  28 +++++
 .../spotless/npm/NpmProcessFactory.java       |   2 +-
 .../com/diffplug/spotless/npm/ShadowCopy.java |   4 +
 .../npm/StandardNpmProcessFactory.java        |  53 +++++++--
 .../diffplug/spotless/npm/ShadowCopyTest.java |  13 ++
 11 files changed, 236 insertions(+), 41 deletions(-)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/npm/NodeModulesCachingNpmProcessFactory.java
 create mode 100644 lib/src/main/java/com/diffplug/spotless/npm/NpmLongRunningProcess.java
 create mode 100644 lib/src/main/java/com/diffplug/spotless/npm/NpmProcessException.java

diff --git a/lib/src/main/java/com/diffplug/spotless/TimedLogger.java b/lib/src/main/java/com/diffplug/spotless/TimedLogger.java
index f009a000f5..2badd435d2 100644
--- a/lib/src/main/java/com/diffplug/spotless/TimedLogger.java
+++ b/lib/src/main/java/com/diffplug/spotless/TimedLogger.java
@@ -126,7 +126,9 @@ private String durationString() {
 			if (duration < 1000) {
 				return duration + "ms";
 			} else if (duration < 1000 * 60) {
-				return (duration / 1000) + "s";
+				long seconds = duration / 1000;
+				long millis = duration - seconds * 1000;
+				return seconds + "." + millis + "s";
 			} else {
 				// output in the format 3m 4.321s
 				long minutes = duration / (1000 * 60);
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NodeModulesCachingNpmProcessFactory.java b/lib/src/main/java/com/diffplug/spotless/npm/NodeModulesCachingNpmProcessFactory.java
new file mode 100644
index 0000000000..69dda788cc
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NodeModulesCachingNpmProcessFactory.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.npm;
+
+import java.io.File;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.diffplug.spotless.ProcessRunner.Result;
+import com.diffplug.spotless.TimedLogger;
+
+public class NodeModulesCachingNpmProcessFactory implements NpmProcessFactory {
+
+	private static final Logger logger = LoggerFactory.getLogger(NodeModulesCachingNpmProcessFactory.class);
+
+	private static final TimedLogger timedLogger = TimedLogger.forLogger(logger);
+
+	private final File cacheDir;
+
+	private final ShadowCopy shadowCopy;
+
+	private NodeModulesCachingNpmProcessFactory(File cacheDir) {
+		this.cacheDir = cacheDir;
+		assertDir(cacheDir);
+		this.shadowCopy = new ShadowCopy(cacheDir);
+	}
+
+	private void assertDir(File cacheDir) {
+		if (cacheDir.exists() && !cacheDir.isDirectory()) {
+			throw new IllegalArgumentException("Cache dir must be a directory");
+		}
+		if (!cacheDir.exists()) {
+			if (!cacheDir.mkdirs()) {
+				throw new IllegalArgumentException("Cache dir could not be created.");
+			}
+		}
+	}
+
+	public static NodeModulesCachingNpmProcessFactory forCacheDir(File cacheDir) {
+		return new NodeModulesCachingNpmProcessFactory(cacheDir);
+	}
+
+	@Override
+	public NpmProcess createNpmInstallProcess(NodeServerLayout nodeServerLayout, NpmFormatterStepLocations formatterStepLocations) {
+		NpmProcess actualNpmInstallProcess = StandardNpmProcessFactory.INSTANCE.createNpmInstallProcess(nodeServerLayout, formatterStepLocations);
+		return new CachingNmpInstall(actualNpmInstallProcess, nodeServerLayout);
+	}
+
+	@Override
+	public NpmLongRunningProcess createNpmServeProcess(NodeServerLayout nodeServerLayout, NpmFormatterStepLocations formatterStepLocations) {
+		return StandardNpmProcessFactory.INSTANCE.createNpmServeProcess(nodeServerLayout, formatterStepLocations);
+	}
+
+	private class CachingNmpInstall implements NpmProcess {
+
+		private final NpmProcess actualNpmInstallProcess;
+		private final NodeServerLayout nodeServerLayout;
+
+		public CachingNmpInstall(NpmProcess actualNpmInstallProcess, NodeServerLayout nodeServerLayout) {
+			this.actualNpmInstallProcess = actualNpmInstallProcess;
+			this.nodeServerLayout = nodeServerLayout;
+		}
+
+		@Override
+		public Result waitFor() {
+			String entryName = entryName();
+			if (shadowCopy.entryExists(entryName, NodeServerLayout.NODE_MODULES)) {
+				timedLogger.withInfo("Using cached node_modules for {} from {}", entryName, cacheDir)
+						.run(() -> shadowCopy.copyEntryInto(entryName(), NodeServerLayout.NODE_MODULES, nodeServerLayout.nodeModulesDir()));
+				return new CachedResult();
+			} else {
+				Result result = actualNpmInstallProcess.waitFor();
+				assert result.exitCode() == 0;
+				// TODO: maybe spawn a thread to do this in the background?
+				timedLogger.withInfo("Caching node_modules for {} in {}", entryName, cacheDir)
+						.run(() -> shadowCopy.addEntry(entryName(), new File(nodeServerLayout.nodeModulesDir(), NodeServerLayout.NODE_MODULES)));
+				return result;
+			}
+		}
+
+		private String entryName() {
+			return nodeServerLayout.nodeModulesDir().getName();
+		}
+
+		@Override
+		public String describe() {
+			return String.format("Wrapper around [%s] to cache node_modules in [%s]", actualNpmInstallProcess.describe(), cacheDir.getAbsolutePath());
+		}
+	}
+
+	private class CachedResult extends Result {
+
+		public CachedResult() {
+			super(List.of("(from cache dir " + cacheDir + ")"), 0, new byte[0], new byte[0]);
+		}
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NodeServerLayout.java b/lib/src/main/java/com/diffplug/spotless/npm/NodeServerLayout.java
index 8b39c5e4ab..850ea4eb6b 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NodeServerLayout.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NodeServerLayout.java
@@ -27,6 +27,7 @@
 class NodeServerLayout {
 
 	private static final Pattern PACKAGE_JSON_NAME_PATTERN = Pattern.compile("\"name\"\\s*:\\s*\"([^\"]+)\"");
+	static final String NODE_MODULES = "node_modules";
 
 	private final File nodeModulesDir;
 	private final File packageJsonFile;
@@ -55,7 +56,6 @@ private static String nodeModulesDirName(String packageJsonContent) {
 	}
 
 	File nodeModulesDir() {
-
 		return nodeModulesDir;
 	}
 
@@ -89,7 +89,7 @@ public boolean isLayoutPrepared() {
 	}
 
 	public boolean isNodeModulesPrepared() {
-		Path nodeModulesInstallDirPath = new File(nodeModulesDir(), "node_modules").toPath();
+		Path nodeModulesInstallDirPath = new File(nodeModulesDir(), NODE_MODULES).toPath();
 		if (!Files.isDirectory(nodeModulesInstallDirPath)) {
 			return false;
 		}
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
index dbb561e54e..b92b43d0ef 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
@@ -62,7 +62,7 @@ protected NpmFormatterStepStateBase(String stepName, NpmConfig npmConfig, NpmFor
 		this.npmConfig = requireNonNull(npmConfig);
 		this.locations = locations;
 		this.nodeServerLayout = new NodeServerLayout(locations.buildDir(), npmConfig.getPackageJsonContent());
-		this.nodeServeApp = new NodeServeApp(nodeServerLayout, npmConfig, new StandardNpmProcessFactory(), locations);
+		this.nodeServeApp = new NodeServeApp(nodeServerLayout, npmConfig, NodeModulesCachingNpmProcessFactory.forCacheDir(new File(locations.buildDir(), "spotless-npm-cache"))/*StandardNpmProcessFactory.INSTANCE*/, locations);
 	}
 
 	protected void prepareNodeServerLayout() throws IOException {
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmLongRunningProcess.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmLongRunningProcess.java
new file mode 100644
index 0000000000..f5bece3e06
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmLongRunningProcess.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.npm;
+
+import com.diffplug.spotless.ProcessRunner.LongRunningProcess;
+
+interface NpmLongRunningProcess {
+
+	String describe();
+
+	LongRunningProcess start();
+
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java
index be675eecb7..473057a769 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmProcess.java
@@ -15,39 +15,12 @@
  */
 package com.diffplug.spotless.npm;
 
-import java.util.concurrent.ExecutionException;
-
-import com.diffplug.spotless.ProcessRunner.LongRunningProcess;
 import com.diffplug.spotless.ProcessRunner.Result;
 
 interface NpmProcess {
 
 	String describe();
 
-	LongRunningProcess start();
-
-	default Result waitFor() {
-		try (LongRunningProcess npmProcess = start()) {
-			if (npmProcess.waitFor() != 0) {
-				throw new NpmProcessException("Running npm command '" + describe() + "' failed with exit code: " + npmProcess.exitValue() + "\n\n" + npmProcess.result());
-			}
-			return npmProcess.result();
-		} catch (InterruptedException e) {
-			throw new NpmProcessException("Running npm command '" + describe() + "' was interrupted.", e);
-		} catch (ExecutionException e) {
-			throw new NpmProcessException("Running npm command '" + describe() + "' failed.", e);
-		}
-	}
-
-	class NpmProcessException extends RuntimeException {
-		private static final long serialVersionUID = 6424331316676759525L;
-
-		public NpmProcessException(String message) {
-			super(message);
-		}
+	Result waitFor();
 
-		public NpmProcessException(String message, Throwable cause) {
-			super(message, cause);
-		}
-	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmProcessException.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmProcessException.java
new file mode 100644
index 0000000000..bff621df07
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmProcessException.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.npm;
+
+public class NpmProcessException extends RuntimeException {
+	private static final long serialVersionUID = 6424331316676759525L;
+
+	public NpmProcessException(String message) {
+		super(message);
+	}
+
+	public NpmProcessException(String message, Throwable cause) {
+		super(message, cause);
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmProcessFactory.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmProcessFactory.java
index f588792f79..41543a2099 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmProcessFactory.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmProcessFactory.java
@@ -18,7 +18,7 @@
 public interface NpmProcessFactory {
 	NpmProcess createNpmInstallProcess(NodeServerLayout nodeServerLayout, NpmFormatterStepLocations formatterStepLocations);
 
-	NpmProcess createNpmServeProcess(NodeServerLayout nodeServerLayout, NpmFormatterStepLocations formatterStepLocations);
+	NpmLongRunningProcess createNpmServeProcess(NodeServerLayout nodeServerLayout, NpmFormatterStepLocations formatterStepLocations);
 
 	default String describe() {
 		return getClass().getSimpleName();
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/ShadowCopy.java b/lib/src/main/java/com/diffplug/spotless/npm/ShadowCopy.java
index 295f8f6017..82ce1f3ecf 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/ShadowCopy.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/ShadowCopy.java
@@ -116,6 +116,10 @@ public File copyEntryInto(String key, String origName, File targetParentFolder)
 		return target;
 	}
 
+	public boolean entryExists(String key, String origName) {
+		return entry(key, origName).exists();
+	}
+
 	private static class CopyDirectoryRecursively extends SimpleFileVisitor<Path> {
 		private final File target;
 		private final File orig;
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/StandardNpmProcessFactory.java b/lib/src/main/java/com/diffplug/spotless/npm/StandardNpmProcessFactory.java
index 393fba98e1..2c82768da2 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/StandardNpmProcessFactory.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/StandardNpmProcessFactory.java
@@ -19,21 +19,29 @@
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ExecutionException;
 
 import com.diffplug.spotless.ProcessRunner;
 
 public class StandardNpmProcessFactory implements NpmProcessFactory {
+
+	public static final StandardNpmProcessFactory INSTANCE = new StandardNpmProcessFactory();
+
+	private StandardNpmProcessFactory() {
+		// only one instance neeeded
+	}
+
 	@Override
 	public NpmProcess createNpmInstallProcess(NodeServerLayout nodeServerLayout, NpmFormatterStepLocations formatterStepLocations) {
 		return new NpmInstall(nodeServerLayout.nodeModulesDir(), formatterStepLocations);
 	}
 
 	@Override
-	public NpmProcess createNpmServeProcess(NodeServerLayout nodeServerLayout, NpmFormatterStepLocations formatterStepLocations) {
+	public NpmLongRunningProcess createNpmServeProcess(NodeServerLayout nodeServerLayout, NpmFormatterStepLocations formatterStepLocations) {
 		return new NpmServe(nodeServerLayout.nodeModulesDir(), formatterStepLocations);
 	}
 
-	private static abstract class AbstractStandardNpmProcess implements NpmProcess {
+	private static abstract class AbstractStandardNpmProcess {
 		protected final ProcessRunner processRunner = ProcessRunner.usingRingBuffersOfCapacity(100 * 1024); // 100kB
 
 		protected final File workingDir;
@@ -55,8 +63,7 @@ protected Map<String, String> environmentVariables() {
 					"PATH", formatterStepLocations.nodeExecutable().getParentFile().getAbsolutePath() + File.pathSeparator + System.getenv("PATH"));
 		}
 
-		@Override
-		public ProcessRunner.LongRunningProcess start() {
+		protected ProcessRunner.LongRunningProcess doStart() {
 			try {
 				return processRunner.start(workingDir, environmentVariables(), null, true, commandLine());
 			} catch (IOException e) {
@@ -64,13 +71,14 @@ public ProcessRunner.LongRunningProcess start() {
 			}
 		}
 
-		@Override
-		public String describe() {
+		protected abstract String describe();
+
+		public String doDescribe() {
 			return String.format("%s in %s [%s]", getClass().getSimpleName(), workingDir, String.join(" ", commandLine()));
 		}
 	}
 
-	private static class NpmInstall extends AbstractStandardNpmProcess {
+	private static class NpmInstall extends AbstractStandardNpmProcess implements NpmProcess {
 
 		public NpmInstall(File workingDir, NpmFormatterStepLocations formatterStepLocations) {
 			super(workingDir, formatterStepLocations);
@@ -85,9 +93,28 @@ protected List<String> commandLine() {
 					"--no-fund",
 					"--prefer-offline");
 		}
+
+		@Override
+		public String describe() {
+			return doDescribe();
+		}
+
+		@Override
+		public ProcessRunner.Result waitFor() {
+			try (ProcessRunner.LongRunningProcess npmProcess = doStart()) {
+				if (npmProcess.waitFor() != 0) {
+					throw new NpmProcessException("Running npm command '" + describe() + "' failed with exit code: " + npmProcess.exitValue() + "\n\n" + npmProcess.result());
+				}
+				return npmProcess.result();
+			} catch (InterruptedException e) {
+				throw new NpmProcessException("Running npm command '" + describe() + "' was interrupted.", e);
+			} catch (ExecutionException e) {
+				throw new NpmProcessException("Running npm command '" + describe() + "' failed.", e);
+			}
+		}
 	}
 
-	private static class NpmServe extends AbstractStandardNpmProcess {
+	private static class NpmServe extends AbstractStandardNpmProcess implements NpmLongRunningProcess {
 
 		public NpmServe(File workingDir, NpmFormatterStepLocations formatterStepLocations) {
 			super(workingDir, formatterStepLocations);
@@ -100,5 +127,15 @@ protected List<String> commandLine() {
 					"start",
 					"--scripts-prepend-node-path=true");
 		}
+
+		@Override
+		public String describe() {
+			return doDescribe();
+		}
+
+		@Override
+		public ProcessRunner.LongRunningProcess start() {
+			return doStart();
+		}
 	}
 }
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/ShadowCopyTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/ShadowCopyTest.java
index c164b54092..1ef1b77caa 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/ShadowCopyTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/ShadowCopyTest.java
@@ -135,6 +135,19 @@ void aCopiedFolderIsDifferentFromShadowCopyEntry() throws IOException {
 		assertAllFilesAreEqualButNotSameAbsolutePath(copiedEntry, shadowCopyFile);
 	}
 
+	@Test
+	void anAddedEntryExistsAfterAdding() throws IOException {
+		File folderWithRandomFile = newFolderWithRandomFile();
+		shadowCopy.addEntry("someEntry", folderWithRandomFile);
+		Assertions.assertThat(shadowCopy.entryExists("someEntry", folderWithRandomFile.getName())).isTrue();
+	}
+
+	@Test
+	void aEntryThatHasNotBeenAddedDoesNotExist() throws IOException {
+		File folderWithRandomFile = newFolderWithRandomFile();
+		Assertions.assertThat(shadowCopy.entryExists("someEntry", folderWithRandomFile.getName())).isFalse();
+	}
+
 	private void assertAllFilesAreEqualButNotSameAbsolutePath(File expected, File actual) {
 		if (expected.isFile()) {
 			assertFileIsEqualButNotSameAbsolutePath(expected, actual);

From bdceb884fad5f8b7307d809de05f33095a77e0f2 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Wed, 22 Feb 2023 06:12:35 +0100
Subject: [PATCH 0828/2068] 1480: improve logging

---
 .../spotless/npm/NodeModulesCachingNpmProcessFactory.java     | 3 ++-
 lib/src/main/java/com/diffplug/spotless/npm/ShadowCopy.java   | 4 ++--
 .../com/diffplug/gradle/spotless/JavascriptExtensionTest.java | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NodeModulesCachingNpmProcessFactory.java b/lib/src/main/java/com/diffplug/spotless/npm/NodeModulesCachingNpmProcessFactory.java
index 69dda788cc..e9368b4555 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NodeModulesCachingNpmProcessFactory.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NodeModulesCachingNpmProcessFactory.java
@@ -84,7 +84,8 @@ public Result waitFor() {
 						.run(() -> shadowCopy.copyEntryInto(entryName(), NodeServerLayout.NODE_MODULES, nodeServerLayout.nodeModulesDir()));
 				return new CachedResult();
 			} else {
-				Result result = actualNpmInstallProcess.waitFor();
+				Result result = timedLogger.withInfo("calling actual npm install {}", actualNpmInstallProcess.describe())
+						.call(actualNpmInstallProcess::waitFor);
 				assert result.exitCode() == 0;
 				// TODO: maybe spawn a thread to do this in the background?
 				timedLogger.withInfo("Caching node_modules for {} in {}", entryName, cacheDir)
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/ShadowCopy.java b/lib/src/main/java/com/diffplug/spotless/npm/ShadowCopy.java
index 82ce1f3ecf..8cd4098d82 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/ShadowCopy.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/ShadowCopy.java
@@ -146,10 +146,10 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO
 					Files.createLink(target.toPath().resolve(orig.toPath().relativize(file)), file);
 					return super.visitFile(file, attrs);
 				} catch (UnsupportedOperationException | SecurityException | FileSystemException e) {
-					logger.debug("Shadow copy entry does not support hard links: {}", file, e);
+					logger.info("Shadow copy entry does not support hard links: {}. Switching to copy.", file, e);
 					tryHardLink = false; // remember that hard links are not supported
 				} catch (IOException e) {
-					logger.debug("Shadow copy entry failed to create hard link: {}", file, e);
+					logger.info("Shadow copy entry failed to create hard link: {}. Switching to copy.", file, e);
 					tryHardLink = false; // remember that hard links are not supported
 				}
 			}
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavascriptExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavascriptExtensionTest.java
index 26354b93be..f1b00706d3 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavascriptExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavascriptExtensionTest.java
@@ -178,7 +178,7 @@ void formattingUsingStyleguide(String styleguide) throws Exception {
 					"    }",
 					"}");
 			setFile("test.js").toResource(styleguidePath + "javascript-es6.dirty");
-			gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+			gradleRunner().forwardOutput().withArguments("--info", "--stacktrace", "spotlessApply").build();
 			assertFile("test.js").sameAsResource(styleguidePath + "javascript-es6.clean");
 		}
 	}

From e97764ff2152c6ab29daa7fc5b445d59fe675cf5 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Fri, 24 Feb 2023 06:03:23 +0100
Subject: [PATCH 0829/2068] 1480: allow dynamic npmInstall process

based on cacheDir
---
 .../spotless/npm/EslintFormatterStep.java      |  7 ++++---
 .../com/diffplug/spotless/npm/NodeApp.java     | 13 +++++++++++--
 .../NodeModulesCachingNpmProcessFactory.java   | 18 ++++++++++++------
 .../diffplug/spotless/npm/NodeServeApp.java    |  4 ++--
 .../npm/NpmFormatterStepLocations.java         | 12 +++++++++++-
 .../npm/NpmFormatterStepStateBase.java         |  2 +-
 .../spotless/npm/PrettierFormatterStep.java    |  7 ++++---
 .../spotless/npm/TsFmtFormatterStep.java       |  7 ++++---
 .../spotless/npm/EslintFormatterStepTest.java  |  3 +++
 .../npm/NpmFormatterStepCommonTests.java       |  9 +++++++++
 .../npm/PrettierFormatterStepTest.java         |  5 +++++
 .../spotless/npm/TsFmtFormatterStepTest.java   |  2 ++
 12 files changed, 68 insertions(+), 21 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
index 89a1bbddaa..e1055731a8 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
@@ -71,13 +71,13 @@ public static Map<String, String> defaultDevDependenciesWithEslint(String versio
 		return Collections.singletonMap("eslint", version);
 	}
 
-	public static FormatterStep create(Map<String, String> devDependencies, Provisioner provisioner, File projectDir, File buildDir, NpmPathResolver npmPathResolver, EslintConfig eslintConfig) {
+	public static FormatterStep create(Map<String, String> devDependencies, Provisioner provisioner, File projectDir, File buildDir, File cacheDir, NpmPathResolver npmPathResolver, EslintConfig eslintConfig) {
 		requireNonNull(devDependencies);
 		requireNonNull(provisioner);
 		requireNonNull(projectDir);
 		requireNonNull(buildDir);
 		return FormatterStep.createLazy(NAME,
-				() -> new State(NAME, devDependencies, projectDir, buildDir, npmPathResolver, eslintConfig),
+				() -> new State(NAME, devDependencies, projectDir, buildDir, cacheDir, npmPathResolver, eslintConfig),
 				State::createFormatterFunc);
 	}
 
@@ -89,7 +89,7 @@ private static class State extends NpmFormatterStepStateBase implements Serializ
 		@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
 		private transient EslintConfig eslintConfigInUse;
 
-		State(String stepName, Map<String, String> devDependencies, File projectDir, File buildDir, NpmPathResolver npmPathResolver, EslintConfig eslintConfig) throws IOException {
+		State(String stepName, Map<String, String> devDependencies, File projectDir, File buildDir, File cacheDir, NpmPathResolver npmPathResolver, EslintConfig eslintConfig) throws IOException {
 			super(stepName,
 					new NpmConfig(
 							replaceDevDependencies(
@@ -102,6 +102,7 @@ private static class State extends NpmFormatterStepStateBase implements Serializ
 					new NpmFormatterStepLocations(
 							projectDir,
 							buildDir,
+							cacheDir,
 							npmPathResolver::resolveNpmExecutable,
 							npmPathResolver::resolveNodeExecutable));
 			this.origEslintConfig = requireNonNull(eslintConfig.verify());
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NodeApp.java b/lib/src/main/java/com/diffplug/spotless/npm/NodeApp.java
index 42e2a2d77d..50ce8ccc5c 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NodeApp.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NodeApp.java
@@ -42,13 +42,22 @@ public class NodeApp {
 	@Nonnull
 	protected final NpmFormatterStepLocations formatterStepLocations;
 
-	public NodeApp(@Nonnull NodeServerLayout nodeServerLayout, @Nonnull NpmConfig npmConfig, @Nonnull NpmProcessFactory npmProcessFactory, @Nonnull NpmFormatterStepLocations formatterStepLocations) {
+	public NodeApp(@Nonnull NodeServerLayout nodeServerLayout, @Nonnull NpmConfig npmConfig, @Nonnull NpmFormatterStepLocations formatterStepLocations) {
 		this.nodeServerLayout = Objects.requireNonNull(nodeServerLayout);
 		this.npmConfig = Objects.requireNonNull(npmConfig);
-		this.npmProcessFactory = Objects.requireNonNull(npmProcessFactory);
+		this.npmProcessFactory = processFactory(formatterStepLocations);
 		this.formatterStepLocations = Objects.requireNonNull(formatterStepLocations);
 	}
 
+	private static NpmProcessFactory processFactory(NpmFormatterStepLocations formatterStepLocations) {
+		if (formatterStepLocations.cacheDir() != null) {
+			logger.info("Caching npm install results in {}.", formatterStepLocations.cacheDir());
+			return NodeModulesCachingNpmProcessFactory.create(formatterStepLocations.cacheDir());
+		}
+		logger.debug("Not caching npm install results.");
+		return StandardNpmProcessFactory.INSTANCE;
+	}
+
 	boolean needsNpmInstall() {
 		return !this.nodeServerLayout.isNodeModulesPrepared();
 	}
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NodeModulesCachingNpmProcessFactory.java b/lib/src/main/java/com/diffplug/spotless/npm/NodeModulesCachingNpmProcessFactory.java
index e9368b4555..a995aac59f 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NodeModulesCachingNpmProcessFactory.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NodeModulesCachingNpmProcessFactory.java
@@ -17,6 +17,9 @@
 
 import java.io.File;
 import java.util.List;
+import java.util.Objects;
+
+import javax.annotation.Nonnull;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -34,8 +37,8 @@ public class NodeModulesCachingNpmProcessFactory implements NpmProcessFactory {
 
 	private final ShadowCopy shadowCopy;
 
-	private NodeModulesCachingNpmProcessFactory(File cacheDir) {
-		this.cacheDir = cacheDir;
+	private NodeModulesCachingNpmProcessFactory(@Nonnull File cacheDir) {
+		this.cacheDir = Objects.requireNonNull(cacheDir);
 		assertDir(cacheDir);
 		this.shadowCopy = new ShadowCopy(cacheDir);
 	}
@@ -51,7 +54,7 @@ private void assertDir(File cacheDir) {
 		}
 	}
 
-	public static NodeModulesCachingNpmProcessFactory forCacheDir(File cacheDir) {
+	public static NodeModulesCachingNpmProcessFactory create(@Nonnull File cacheDir) {
 		return new NodeModulesCachingNpmProcessFactory(cacheDir);
 	}
 
@@ -87,13 +90,16 @@ public Result waitFor() {
 				Result result = timedLogger.withInfo("calling actual npm install {}", actualNpmInstallProcess.describe())
 						.call(actualNpmInstallProcess::waitFor);
 				assert result.exitCode() == 0;
-				// TODO: maybe spawn a thread to do this in the background?
-				timedLogger.withInfo("Caching node_modules for {} in {}", entryName, cacheDir)
-						.run(() -> shadowCopy.addEntry(entryName(), new File(nodeServerLayout.nodeModulesDir(), NodeServerLayout.NODE_MODULES)));
+				storeShadowCopy(entryName);
 				return result;
 			}
 		}
 
+		private void storeShadowCopy(String entryName) {
+			timedLogger.withInfo("Caching node_modules for {} in {}", entryName, cacheDir)
+					.run(() -> shadowCopy.addEntry(entryName(), new File(nodeServerLayout.nodeModulesDir(), NodeServerLayout.NODE_MODULES)));
+		}
+
 		private String entryName() {
 			return nodeServerLayout.nodeModulesDir().getName();
 		}
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NodeServeApp.java b/lib/src/main/java/com/diffplug/spotless/npm/NodeServeApp.java
index 34b2e3d869..d811515971 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NodeServeApp.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NodeServeApp.java
@@ -29,8 +29,8 @@ public class NodeServeApp extends NodeApp {
 
 	private static final TimedLogger timedLogger = TimedLogger.forLogger(logger);
 
-	public NodeServeApp(@Nonnull NodeServerLayout nodeServerLayout, @Nonnull NpmConfig npmConfig, @Nonnull NpmProcessFactory npmProcessFactory, @Nonnull NpmFormatterStepLocations formatterStepLocations) {
-		super(nodeServerLayout, npmConfig, npmProcessFactory, formatterStepLocations);
+	public NodeServeApp(@Nonnull NodeServerLayout nodeServerLayout, @Nonnull NpmConfig npmConfig, @Nonnull NpmFormatterStepLocations formatterStepLocations) {
+		super(nodeServerLayout, npmConfig, formatterStepLocations);
 	}
 
 	ProcessRunner.LongRunningProcess startNpmServeProcess() {
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepLocations.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepLocations.java
index 0e99e1afab..67763e59ec 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepLocations.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepLocations.java
@@ -21,6 +21,8 @@
 import java.io.Serializable;
 import java.util.function.Supplier;
 
+import javax.annotation.Nonnull;
+
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 class NpmFormatterStepLocations implements Serializable {
@@ -32,15 +34,19 @@ class NpmFormatterStepLocations implements Serializable {
 	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
 	private final transient File buildDir;
 
+	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
+	private final transient File cacheDir;
+
 	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
 	private final transient Supplier<File> npmExecutable;
 
 	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
 	private final transient Supplier<File> nodeExecutable;
 
-	public NpmFormatterStepLocations(File projectDir, File buildDir, Supplier<File> npmExecutable, Supplier<File> nodeExecutable) {
+	public NpmFormatterStepLocations(@Nonnull File projectDir, @Nonnull File buildDir, File cacheDir, @Nonnull Supplier<File> npmExecutable, @Nonnull Supplier<File> nodeExecutable) {
 		this.projectDir = requireNonNull(projectDir);
 		this.buildDir = requireNonNull(buildDir);
+		this.cacheDir = cacheDir;
 		this.npmExecutable = requireNonNull(npmExecutable);
 		this.nodeExecutable = requireNonNull(nodeExecutable);
 	}
@@ -53,6 +59,10 @@ public File buildDir() {
 		return buildDir;
 	}
 
+	public File cacheDir() {
+		return cacheDir;
+	}
+
 	public File npmExecutable() {
 		return npmExecutable.get();
 	}
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
index b92b43d0ef..e4a8dd0fcb 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
@@ -62,7 +62,7 @@ protected NpmFormatterStepStateBase(String stepName, NpmConfig npmConfig, NpmFor
 		this.npmConfig = requireNonNull(npmConfig);
 		this.locations = locations;
 		this.nodeServerLayout = new NodeServerLayout(locations.buildDir(), npmConfig.getPackageJsonContent());
-		this.nodeServeApp = new NodeServeApp(nodeServerLayout, npmConfig, NodeModulesCachingNpmProcessFactory.forCacheDir(new File(locations.buildDir(), "spotless-npm-cache"))/*StandardNpmProcessFactory.INSTANCE*/, locations);
+		this.nodeServeApp = new NodeServeApp(nodeServerLayout, npmConfig, locations);
 	}
 
 	protected void prepareNodeServerLayout() throws IOException {
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
index b09493792b..afd490b63b 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
@@ -50,12 +50,12 @@ public static final Map<String, String> defaultDevDependenciesWithPrettier(Strin
 		return Collections.singletonMap("prettier", version);
 	}
 
-	public static FormatterStep create(Map<String, String> devDependencies, Provisioner provisioner, File projectDir, File buildDir, NpmPathResolver npmPathResolver, PrettierConfig prettierConfig) {
+	public static FormatterStep create(Map<String, String> devDependencies, Provisioner provisioner, File projectDir, File buildDir, File cacheDir, NpmPathResolver npmPathResolver, PrettierConfig prettierConfig) {
 		requireNonNull(devDependencies);
 		requireNonNull(provisioner);
 		requireNonNull(buildDir);
 		return FormatterStep.createLazy(NAME,
-				() -> new State(NAME, devDependencies, projectDir, buildDir, npmPathResolver, prettierConfig),
+				() -> new State(NAME, devDependencies, projectDir, buildDir, cacheDir, npmPathResolver, prettierConfig),
 				State::createFormatterFunc);
 	}
 
@@ -64,7 +64,7 @@ private static class State extends NpmFormatterStepStateBase implements Serializ
 		private static final long serialVersionUID = -539537027004745812L;
 		private final PrettierConfig prettierConfig;
 
-		State(String stepName, Map<String, String> devDependencies, File projectDir, File buildDir, NpmPathResolver npmPathResolver, PrettierConfig prettierConfig) throws IOException {
+		State(String stepName, Map<String, String> devDependencies, File projectDir, File buildDir, File cacheDir, NpmPathResolver npmPathResolver, PrettierConfig prettierConfig) throws IOException {
 			super(stepName,
 					new NpmConfig(
 							replaceDevDependencies(
@@ -77,6 +77,7 @@ private static class State extends NpmFormatterStepStateBase implements Serializ
 					new NpmFormatterStepLocations(
 							projectDir,
 							buildDir,
+							cacheDir,
 							npmPathResolver::resolveNpmExecutable,
 							npmPathResolver::resolveNodeExecutable));
 			this.prettierConfig = requireNonNull(prettierConfig);
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java
index c42d8b8361..a83c3e202a 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java
@@ -40,11 +40,11 @@ public class TsFmtFormatterStep {
 
 	public static final String NAME = "tsfmt-format";
 
-	public static FormatterStep create(Map<String, String> versions, Provisioner provisioner, File projectDir, File buildDir, NpmPathResolver npmPathResolver, @Nullable TypedTsFmtConfigFile configFile, @Nullable Map<String, Object> inlineTsFmtSettings) {
+	public static FormatterStep create(Map<String, String> versions, Provisioner provisioner, File projectDir, File buildDir, File cacheDir, NpmPathResolver npmPathResolver, @Nullable TypedTsFmtConfigFile configFile, @Nullable Map<String, Object> inlineTsFmtSettings) {
 		requireNonNull(provisioner);
 		requireNonNull(buildDir);
 		return FormatterStep.createLazy(NAME,
-				() -> new State(NAME, versions, projectDir, buildDir, npmPathResolver, configFile, inlineTsFmtSettings),
+				() -> new State(NAME, versions, projectDir, buildDir, cacheDir, npmPathResolver, configFile, inlineTsFmtSettings),
 				State::createFormatterFunc);
 	}
 
@@ -71,7 +71,7 @@ public static class State extends NpmFormatterStepStateBase implements Serializa
 		@Nullable
 		private final TypedTsFmtConfigFile configFile;
 
-		public State(String stepName, Map<String, String> versions, File projectDir, File buildDir, NpmPathResolver npmPathResolver, @Nullable TypedTsFmtConfigFile configFile, @Nullable Map<String, Object> inlineTsFmtSettings) throws IOException {
+		public State(String stepName, Map<String, String> versions, File projectDir, File buildDir, File cacheDir, NpmPathResolver npmPathResolver, @Nullable TypedTsFmtConfigFile configFile, @Nullable Map<String, Object> inlineTsFmtSettings) throws IOException {
 			super(stepName,
 					new NpmConfig(
 							replaceDevDependencies(NpmResourceHelper.readUtf8StringFromClasspath(TsFmtFormatterStep.class, "/com/diffplug/spotless/npm/tsfmt-package.json"), new TreeMap<>(versions)),
@@ -82,6 +82,7 @@ public State(String stepName, Map<String, String> versions, File projectDir, Fil
 					new NpmFormatterStepLocations(
 							projectDir,
 							buildDir,
+							cacheDir,
 							npmPathResolver::resolveNpmExecutable,
 							npmPathResolver::resolveNodeExecutable));
 			this.buildDir = requireNonNull(buildDir);
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
index 1bc0915ed3..fe1f33ccc6 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
@@ -64,6 +64,7 @@ void formattingUsingRulesetsFile(String ruleSetName) throws Exception {
 					TestProvisioner.mavenCentral(),
 					projectDir(),
 					buildDir(),
+					cacheDir(),
 					npmPathResolver(),
 					new EslintConfig(eslintRc, null));
 
@@ -107,6 +108,7 @@ void formattingUsingRulesetsFile(String ruleSetName) throws Exception {
 					TestProvisioner.mavenCentral(),
 					projectDir(),
 					buildDir(),
+					cacheDir(),
 					npmPathResolver(),
 					new EslintTypescriptConfig(eslintRc, null, tsconfigFile));
 
@@ -164,6 +166,7 @@ void formattingUsingInlineXoConfig() throws Exception {
 					TestProvisioner.mavenCentral(),
 					projectDir(),
 					buildDir(),
+					cacheDir(),
 					npmPathResolver(),
 					new EslintTypescriptConfig(null, esLintConfig, tsconfigFile));
 
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/NpmFormatterStepCommonTests.java b/testlib/src/test/java/com/diffplug/spotless/npm/NpmFormatterStepCommonTests.java
index 60dd42801a..93e70b4129 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/NpmFormatterStepCommonTests.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/NpmFormatterStepCommonTests.java
@@ -56,4 +56,13 @@ protected File projectDir() throws IOException {
 		}
 		return this.projectDir;
 	}
+
+	private File cacheDir = null;
+
+	protected File cacheDir() throws IOException {
+		if (this.cacheDir == null) {
+			this.cacheDir = newFolder("cache-dir");
+		}
+		return this.cacheDir;
+	}
 }
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
index acc756fa31..d308e6085a 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
@@ -52,6 +52,7 @@ void formattingUsingConfigFile(String fileType) throws Exception {
 					TestProvisioner.mavenCentral(),
 					projectDir(),
 					buildDir(),
+					cacheDir(),
 					npmPathResolver(),
 					new PrettierConfig(prettierRc, null));
 
@@ -77,6 +78,7 @@ void parserInferenceBasedOnExplicitFilepathIsWorking() throws Exception {
 					TestProvisioner.mavenCentral(),
 					projectDir(),
 					buildDir(),
+					cacheDir(),
 					npmPathResolver(),
 					new PrettierConfig(null, ImmutableMap.of("filepath", "anyname.json"))); // should select parser based on this name
 
@@ -97,6 +99,7 @@ void parserInferenceBasedOnFilenameIsWorking() throws Exception {
 					TestProvisioner.mavenCentral(),
 					projectDir(),
 					buildDir(),
+					cacheDir(),
 					npmPathResolver(),
 					new PrettierConfig(null, Collections.emptyMap()));
 
@@ -112,6 +115,7 @@ void verifyPrettierErrorMessageIsRelayed() throws Exception {
 					TestProvisioner.mavenCentral(),
 					projectDir(),
 					buildDir(),
+					cacheDir(),
 					npmPathResolver(),
 					new PrettierConfig(null, ImmutableMap.of("parser", "postcss")));
 			try (StepHarnessWithFile stepHarness = StepHarnessWithFile.forStep(this, formatterStep)) {
@@ -137,6 +141,7 @@ void runFormatTest(PrettierConfig config, String cleanFileNameSuffix) throws Exc
 					TestProvisioner.mavenCentral(),
 					projectDir(),
 					buildDir(),
+					cacheDir(),
 					npmPathResolver(),
 					config); // should select parser based on this name
 
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/TsFmtFormatterStepTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/TsFmtFormatterStepTest.java
index a774c7c1ee..9233239443 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/TsFmtFormatterStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/TsFmtFormatterStepTest.java
@@ -59,6 +59,7 @@ void formattingUsingConfigFile(String formattingConfigFile) throws Exception {
 					TestProvisioner.mavenCentral(),
 					projectDir(),
 					buildDir(),
+					cacheDir(),
 					npmPathResolver(),
 					TypedTsFmtConfigFile.named(configFileNameWithoutExtension, configFile),
 					Collections.emptyMap());
@@ -82,6 +83,7 @@ void formattingUsingInlineConfigWorks() throws Exception {
 					TestProvisioner.mavenCentral(),
 					projectDir(),
 					buildDir(),
+					cacheDir(),
 					npmPathResolver(),
 					null,
 					inlineConfig);

From 6f0dd0b27172ff5830fa93ecb84525305275f414 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Fri, 24 Feb 2023 06:05:14 +0100
Subject: [PATCH 0830/2068] 1480: add npmInstallCache to api

---
 .../gradle/spotless/FormatExtension.java      | 20 +++++++++++++++++++
 .../gradle/spotless/JavascriptExtension.java  |  1 +
 .../gradle/spotless/TypescriptExtension.java  |  2 ++
 .../spotless/maven/generic/Prettier.java      |  3 ++-
 .../maven/javascript/AbstractEslint.java      |  3 ++-
 .../npm/AbstractNpmFormatterStepFactory.java  | 14 +++++++++++++
 .../spotless/maven/typescript/Tsfmt.java      |  3 ++-
 7 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index 8012102200..c42d340b8b 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -528,6 +528,9 @@ public abstract static class NpmStepConfig<T extends NpmStepConfig<?>> {
 		@Nullable
 		protected Object nodeFile;
 
+		@Nullable
+		protected Object npmInstallCache;
+
 		@Nullable
 		protected Object npmrcFile;
 
@@ -560,6 +563,18 @@ public T npmrc(final Object npmrcFile) {
 			return (T) this;
 		}
 
+		public T npmInstallCache(final Object npmInstallCache) {
+			this.npmInstallCache = npmInstallCache;
+			replaceStep();
+			return (T) this;
+		}
+
+		public T npmInstallCache() {
+			this.npmInstallCache = new File(project.getBuildDir(), "spotless-npm-install-cache");
+			replaceStep();
+			return (T) this;
+		}
+
 		File npmFileOrNull() {
 			return fileOrNull(npmFile);
 		}
@@ -572,6 +587,10 @@ File npmrcFileOrNull() {
 			return fileOrNull(npmrcFile);
 		}
 
+		File npmModulesCacheOrNull() {
+			return fileOrNull(npmInstallCache);
+		}
+
 		private File fileOrNull(Object npmFile) {
 			return npmFile != null ? project.file(npmFile) : null;
 		}
@@ -619,6 +638,7 @@ protected FormatterStep createStep() {
 					provisioner(),
 					project.getProjectDir(),
 					project.getBuildDir(),
+					npmModulesCacheOrNull(),
 					new NpmPathResolver(npmFileOrNull(), nodeFileOrNull(), npmrcFileOrNull(), Arrays.asList(project.getProjectDir(), project.getRootDir())),
 					new com.diffplug.spotless.npm.PrettierConfig(
 							this.prettierConfigFile != null ? project.file(this.prettierConfigFile) : null,
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
index e829c2b53a..e8a76166bc 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
@@ -108,6 +108,7 @@ public FormatterStep createStep() {
 					provisioner(),
 					project.getProjectDir(),
 					project.getBuildDir(),
+					npmModulesCacheOrNull(),
 					new NpmPathResolver(npmFileOrNull(), nodeFileOrNull(), npmrcFileOrNull(), Arrays.asList(project.getProjectDir(), project.getRootDir())),
 					eslintConfig());
 		}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
index a11f1b0c39..0e1e04bd02 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
@@ -117,6 +117,7 @@ public FormatterStep createStep() {
 					provisioner(),
 					project.getProjectDir(),
 					project.getBuildDir(),
+					npmModulesCacheOrNull(),
 					new NpmPathResolver(npmFileOrNull(), nodeFileOrNull(), npmrcFileOrNull(), Arrays.asList(project.getProjectDir(), project.getRootDir())),
 					typedConfigFile(),
 					config);
@@ -213,6 +214,7 @@ public FormatterStep createStep() {
 					provisioner(),
 					project.getProjectDir(),
 					project.getBuildDir(),
+					npmModulesCacheOrNull(),
 					new NpmPathResolver(npmFileOrNull(), nodeFileOrNull(), npmrcFileOrNull(), Arrays.asList(project.getProjectDir(), project.getRootDir())),
 					eslintConfig());
 		}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Prettier.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Prettier.java
index 01ce2a5394..e92b2814bd 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Prettier.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Prettier.java
@@ -95,9 +95,10 @@ public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 		// create the format step
 		File baseDir = baseDir(stepConfig);
 		File buildDir = buildDir(stepConfig);
+		File cacheDir = cacheDir(stepConfig);
 		PrettierConfig prettierConfig = new PrettierConfig(configFileHandler, configInline);
 		NpmPathResolver npmPathResolver = npmPathResolver(stepConfig);
-		return PrettierFormatterStep.create(devDependencies, stepConfig.getProvisioner(), baseDir, buildDir, npmPathResolver, prettierConfig);
+		return PrettierFormatterStep.create(devDependencies, stepConfig.getProvisioner(), baseDir, buildDir, cacheDir, npmPathResolver, prettierConfig);
 	}
 
 	private static IllegalArgumentException onlyOneConfig() {
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/AbstractEslint.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/AbstractEslint.java
index b06d3079e7..ad113de833 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/AbstractEslint.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/AbstractEslint.java
@@ -67,8 +67,9 @@ public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 
 		File buildDir = buildDir(stepConfig);
 		File baseDir = baseDir(stepConfig);
+		File cacheDir = cacheDir(stepConfig);
 		NpmPathResolver npmPathResolver = npmPathResolver(stepConfig);
-		return EslintFormatterStep.create(devDependencies, stepConfig.getProvisioner(), baseDir, buildDir, npmPathResolver, eslintConfig(stepConfig));
+		return EslintFormatterStep.create(devDependencies, stepConfig.getProvisioner(), baseDir, buildDir, cacheDir, npmPathResolver, eslintConfig(stepConfig));
 	}
 
 	private static IllegalArgumentException onlyOneConfig() {
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/npm/AbstractNpmFormatterStepFactory.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/npm/AbstractNpmFormatterStepFactory.java
index e4a052106a..9e184045bb 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/npm/AbstractNpmFormatterStepFactory.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/npm/AbstractNpmFormatterStepFactory.java
@@ -19,6 +19,7 @@
 import java.util.AbstractMap;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Properties;
@@ -41,6 +42,9 @@ public abstract class AbstractNpmFormatterStepFactory implements FormatterStepFa
 	@Parameter
 	private String npmrc;
 
+	@Parameter
+	private String npmInstallCache;
+
 	protected File npm(FormatterStepConfig stepConfig) {
 		File npm = npmExecutable != null ? stepConfig.getFileLocator().locateFile(npmExecutable) : null;
 		return npm;
@@ -60,6 +64,16 @@ protected File buildDir(FormatterStepConfig stepConfig) {
 		return stepConfig.getFileLocator().getBuildDir();
 	}
 
+	protected File cacheDir(FormatterStepConfig stepConfig) {
+		if (this.npmInstallCache == null) {
+			return null;
+		}
+		if ("true".equals(this.npmInstallCache.toLowerCase(Locale.ROOT))) {
+			return new File(buildDir(stepConfig), "spotless-npm-install-cache");
+		}
+		return stepConfig.getFileLocator().locateFile(this.npmInstallCache);
+	}
+
 	protected File baseDir(FormatterStepConfig stepConfig) {
 		return stepConfig.getFileLocator().getBaseDir();
 	}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Tsfmt.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Tsfmt.java
index 685d473072..396c688635 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Tsfmt.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Tsfmt.java
@@ -111,8 +111,9 @@ public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 
 		File buildDir = buildDir(stepConfig);
 		File baseDir = baseDir(stepConfig);
+		File cacheDir = cacheDir(stepConfig);
 		NpmPathResolver npmPathResolver = npmPathResolver(stepConfig);
-		return TsFmtFormatterStep.create(devDependencies, stepConfig.getProvisioner(), baseDir, buildDir, npmPathResolver, configFile, configInline);
+		return TsFmtFormatterStep.create(devDependencies, stepConfig.getProvisioner(), baseDir, buildDir, cacheDir, npmPathResolver, configFile, configInline);
 	}
 
 	private static IllegalArgumentException onlyOneConfig() {

From c2c46bb63e5d140faf3e98b154479dbfe95c5de3 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Fri, 24 Feb 2023 06:13:49 +0100
Subject: [PATCH 0831/2068] 1582: cleanup logging

---
 .../java/com/diffplug/spotless/npm/EslintFormatterStep.java  | 5 +----
 .../com/diffplug/spotless/npm/PrettierFormatterStep.java     | 3 ---
 lib/src/main/java/com/diffplug/spotless/npm/ShadowCopy.java  | 4 ++--
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
index e1055731a8..a4480fe7fc 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
@@ -15,7 +15,6 @@
  */
 package com.diffplug.spotless.npm;
 
-import static com.diffplug.spotless.LazyArgLogger.lazy;
 import static java.util.Objects.requireNonNull;
 
 import java.io.File;
@@ -116,7 +115,7 @@ protected void prepareNodeServerLayout() throws IOException {
 				// If any config files are provided, we need to make sure they are at the same location as the node modules
 				// as eslint will try to resolve plugin/config names relatively to the config file location and some
 				// eslint configs contain relative paths to additional config files (such as tsconfig.json e.g.)
-				logger.info("Copying config file <{}> to <{}> and using the copy", origEslintConfig.getEslintConfigPath(), nodeServerLayout.nodeModulesDir());
+				logger.debug("Copying config file <{}> to <{}> and using the copy", origEslintConfig.getEslintConfigPath(), nodeServerLayout.nodeModulesDir());
 				File configFileCopy = NpmResourceHelper.copyFileToDir(origEslintConfig.getEslintConfigPath(), nodeServerLayout.nodeModulesDir());
 				this.eslintConfigInUse = this.origEslintConfig.withEslintConfigPath(configFileCopy).verify();
 			}
@@ -162,8 +161,6 @@ public EslintFilePathPassingFormatterFunc(File projectDir, File nodeModulesDir,
 
 		@Override
 		public String applyWithFile(String unix, File file) throws Exception {
-			logger.info("formatting String '{}[...]' in file '{}'", lazy(() -> unix.substring(0, Math.min(50, unix.length()))), file);
-
 			Map<FormatOption, Object> eslintCallOptions = new HashMap<>();
 			setConfigToCallOptions(eslintCallOptions);
 			setFilePathToCallOptions(eslintCallOptions, file);
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
index afd490b63b..11a6230e4c 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
@@ -15,7 +15,6 @@
  */
 package com.diffplug.spotless.npm;
 
-import static com.diffplug.spotless.LazyArgLogger.lazy;
 import static java.util.Objects.requireNonNull;
 
 import java.io.File;
@@ -120,8 +119,6 @@ public PrettierFilePathPassingFormatterFunc(String prettierConfigOptions, Pretti
 
 		@Override
 		public String applyWithFile(String unix, File file) throws Exception {
-			logger.info("formatting String '{}[...]' in file '{}'", lazy(() -> unix.substring(0, Math.min(50, unix.length()))), file);
-
 			final String prettierConfigOptionsWithFilepath = assertFilepathInConfigOptions(file);
 			try {
 				return restService.format(unix, prettierConfigOptionsWithFilepath);
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/ShadowCopy.java b/lib/src/main/java/com/diffplug/spotless/npm/ShadowCopy.java
index 8cd4098d82..179a1278b1 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/ShadowCopy.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/ShadowCopy.java
@@ -146,10 +146,10 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO
 					Files.createLink(target.toPath().resolve(orig.toPath().relativize(file)), file);
 					return super.visitFile(file, attrs);
 				} catch (UnsupportedOperationException | SecurityException | FileSystemException e) {
-					logger.info("Shadow copy entry does not support hard links: {}. Switching to copy.", file, e);
+					logger.debug("Shadow copy entry does not support hard links: {}. Switching to 'copy'.", file, e);
 					tryHardLink = false; // remember that hard links are not supported
 				} catch (IOException e) {
-					logger.info("Shadow copy entry failed to create hard link: {}. Switching to copy.", file, e);
+					logger.debug("Shadow copy entry failed to create hard link: {}. Switching to 'copy'.", file, e);
 					tryHardLink = false; // remember that hard links are not supported
 				}
 			}

From 3a20930672ebeba378bbd3d64132d3acdc3769b6 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Fri, 24 Feb 2023 14:44:29 +0100
Subject: [PATCH 0832/2068] 1480: add integration test for gradle side

---
 .../gradle/spotless/FormatExtension.java      |   5 +-
 .../NpmInstallCacheIntegrationTests.java      | 129 ++++++++++++++++++
 2 files changed, 133 insertions(+), 1 deletion(-)
 create mode 100644 plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmInstallCacheIntegrationTests.java

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index c42d340b8b..fd613e82e1 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -522,6 +522,9 @@ public LicenseHeaderConfig licenseHeaderFile(Object licenseHeaderFile, String de
 	}
 
 	public abstract static class NpmStepConfig<T extends NpmStepConfig<?>> {
+
+		public static final String SPOTLESS_NPM_INSTALL_CACHE_DEFAULT_NAME = "spotless-npm-install-cache";
+
 		@Nullable
 		protected Object npmFile;
 
@@ -570,7 +573,7 @@ public T npmInstallCache(final Object npmInstallCache) {
 		}
 
 		public T npmInstallCache() {
-			this.npmInstallCache = new File(project.getBuildDir(), "spotless-npm-install-cache");
+			this.npmInstallCache = new File(project.getBuildDir(), SPOTLESS_NPM_INSTALL_CACHE_DEFAULT_NAME);
 			replaceStep();
 			return (T) this;
 		}
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmInstallCacheIntegrationTests.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmInstallCacheIntegrationTests.java
new file mode 100644
index 0000000000..b4318b8771
--- /dev/null
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmInstallCacheIntegrationTests.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.gradle.spotless;
+
+import static com.diffplug.gradle.spotless.FormatExtension.NpmStepConfig.SPOTLESS_NPM_INSTALL_CACHE_DEFAULT_NAME;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Paths;
+
+import org.assertj.core.api.Assertions;
+import org.gradle.testkit.runner.BuildResult;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import com.diffplug.common.base.Errors;
+import com.diffplug.spotless.tag.NpmTest;
+
+@NpmTest
+class NpmInstallCacheIntegrationTests extends GradleIntegrationHarness {
+
+	static File pertainingCacheDir;
+
+	private static final File DEFAULT_DIR_FOR_NPM_INSTALL_CACHE_DO_NEVER_WRITE_TO_THIS = new File(".");
+
+	@BeforeAll
+	static void beforeAll(@TempDir File pertainingCacheDir) {
+		NpmInstallCacheIntegrationTests.pertainingCacheDir = Errors.rethrow().get(pertainingCacheDir::getCanonicalFile);
+	}
+
+	@Test
+	void prettierWithDefaultInstallCacheTest() throws IOException {
+		File dir1 = newFolder("npm-prettier-1");
+		File cacheDir = DEFAULT_DIR_FOR_NPM_INSTALL_CACHE_DO_NEVER_WRITE_TO_THIS;
+		BuildResult result = runPhpPrettierOnDir(dir1, cacheDir);
+		Assertions.assertThat(result.getOutput())
+				.doesNotContain("Using cached node_modules for")
+				.contains("Caching node_modules for ")
+				.contains(Paths.get(dir1.getAbsolutePath(), "build", SPOTLESS_NPM_INSTALL_CACHE_DEFAULT_NAME).toString());
+
+	}
+
+	@Test
+	void prettierWithSpecificInstallCacheTest() throws IOException {
+		File dir1 = newFolder("npm-prettier-1");
+		File cacheDir = newFolder("npm-prettier-cache");
+		BuildResult result = runPhpPrettierOnDir(dir1, cacheDir);
+		Assertions.assertThat(result.getOutput()).doesNotContainPattern("Using cached node_modules for .*\\Q" + cacheDir.getAbsolutePath() + "\\E");
+		File dir2 = newFolder("npm-prettier-2");
+		BuildResult result2 = runPhpPrettierOnDir(dir2, cacheDir);
+		Assertions.assertThat(result2.getOutput()).containsPattern("Using cached node_modules for .*\\Q" + cacheDir.getAbsolutePath() + "\\E");
+	}
+
+	@Test
+	@Order(1)
+	void prettierWithSpecificGlobalInstallCacheTest() throws IOException {
+		File dir1 = newFolder("npm-prettier-global-1");
+		File cacheDir = pertainingCacheDir;
+		BuildResult result = runPhpPrettierOnDir(dir1, cacheDir);
+		Assertions.assertThat(result.getOutput())
+				.doesNotContainPattern("Using cached node_modules for .*\\Q" + cacheDir.getAbsolutePath() + "\\E")
+				.containsPattern("Caching node_modules for .*\\Q" + cacheDir.getAbsolutePath() + "\\E");
+	}
+
+	@Test
+	@Order(2)
+	void prettierWithSpecificGlobalInstallCacheTest2() throws IOException {
+		File dir2 = newFolder("npm-prettier-global-2");
+		File cacheDir = pertainingCacheDir;
+		BuildResult result = runPhpPrettierOnDir(dir2, cacheDir);
+		Assertions.assertThat(result.getOutput())
+				.containsPattern("Using cached node_modules for .*\\Q" + cacheDir.getAbsolutePath() + "\\E")
+				.doesNotContainPattern("Caching node_modules for .*\\Q" + cacheDir.getAbsolutePath() + "\\E");
+	}
+
+	private BuildResult runPhpPrettierOnDir(File projDir, File cacheDir) throws IOException {
+		String baseDir = projDir.getName();
+		String cacheDirEnabled = cacheDirEnabledStringForCacheDir(cacheDir);
+		setFile(baseDir + "/build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"def prettierConfig = [:]",
+				"prettierConfig['tabWidth'] = 3",
+				"prettierConfig['parser'] = 'php'",
+				"def prettierPackages = [:]",
+				"prettierPackages['prettier'] = '2.0.5'",
+				"prettierPackages['@prettier/plugin-php'] = '0.14.2'",
+				"spotless {",
+				"    format 'php', {",
+				"        target 'php-example.php'",
+				"        prettier(prettierPackages).config(prettierConfig)" + cacheDirEnabled,
+				"    }",
+				"}");
+		setFile(baseDir + "/php-example.php").toResource("npm/prettier/plugins/php.dirty");
+		final BuildResult spotlessApply = gradleRunner().withProjectDir(projDir).withArguments("--stacktrace", "--info", "spotlessApply").build();
+		Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		assertFile(baseDir + "/php-example.php").sameAsResource("npm/prettier/plugins/php.clean");
+		return spotlessApply;
+	}
+
+	private static String cacheDirEnabledStringForCacheDir(File cacheDir) {
+		String cacheDirEnabled;
+		if (cacheDir == null) {
+			cacheDirEnabled = "";
+		} else if (cacheDir == DEFAULT_DIR_FOR_NPM_INSTALL_CACHE_DO_NEVER_WRITE_TO_THIS) {
+			cacheDirEnabled = ".npmInstallCache()";
+		} else {
+			cacheDirEnabled = ".npmInstallCache('" + cacheDir.getAbsolutePath() + "')";
+		}
+		return cacheDirEnabled;
+	}
+}

From 3c4b5bc8e21a9090d816ba2a15f65805afab2799 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Fri, 24 Feb 2023 14:57:25 +0100
Subject: [PATCH 0833/2068] 1480: add integration test for tsfmt (and fix api
 issue)

---
 .../gradle/spotless/TypescriptExtension.java  | 22 +++++----
 .../NpmInstallCacheIntegrationTests.java      | 48 +++++++++++++++++++
 2 files changed, 60 insertions(+), 10 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
index 0e1e04bd02..9f1d04abfd 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
@@ -82,31 +82,33 @@ public class TypescriptFormatExtension extends NpmStepConfig<TypescriptFormatExt
 			this.devDependencies = Objects.requireNonNull(devDependencies);
 		}
 
-		public void config(final Map<String, Object> config) {
+		public TypescriptFormatExtension config(final Map<String, Object> config) {
 			this.config = new TreeMap<>(requireNonNull(config));
 			replaceStep();
+			return this;
 		}
 
-		public void tsconfigFile(final Object path) {
-			configFile(TsConfigFileType.TSCONFIG, path);
+		public TypescriptFormatExtension tsconfigFile(final Object path) {
+			return configFile(TsConfigFileType.TSCONFIG, path);
 		}
 
-		public void tslintFile(final Object path) {
-			configFile(TsConfigFileType.TSLINT, path);
+		public TypescriptFormatExtension tslintFile(final Object path) {
+			return configFile(TsConfigFileType.TSLINT, path);
 		}
 
-		public void vscodeFile(final Object path) {
-			configFile(TsConfigFileType.VSCODE, path);
+		public TypescriptFormatExtension vscodeFile(final Object path) {
+			return configFile(TsConfigFileType.VSCODE, path);
 		}
 
-		public void tsfmtFile(final Object path) {
-			configFile(TsConfigFileType.TSFMT, path);
+		public TypescriptFormatExtension tsfmtFile(final Object path) {
+			return configFile(TsConfigFileType.TSFMT, path);
 		}
 
-		private void configFile(TsConfigFileType filetype, Object path) {
+		private TypescriptFormatExtension configFile(TsConfigFileType filetype, Object path) {
 			this.configFileType = requireNonNull(filetype);
 			this.configFilePath = requireNonNull(path);
 			replaceStep();
+			return this;
 		}
 
 		public FormatterStep createStep() {
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmInstallCacheIntegrationTests.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmInstallCacheIntegrationTests.java
index b4318b8771..893a834bca 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmInstallCacheIntegrationTests.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmInstallCacheIntegrationTests.java
@@ -24,13 +24,16 @@
 import org.assertj.core.api.Assertions;
 import org.gradle.testkit.runner.BuildResult;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
 import org.junit.jupiter.api.io.TempDir;
 
 import com.diffplug.common.base.Errors;
 import com.diffplug.spotless.tag.NpmTest;
 
+@TestMethodOrder(OrderAnnotation.class)
 @NpmTest
 class NpmInstallCacheIntegrationTests extends GradleIntegrationHarness {
 
@@ -115,6 +118,51 @@ private BuildResult runPhpPrettierOnDir(File projDir, File cacheDir) throws IOEx
 		return spotlessApply;
 	}
 
+	@Test
+	@Order(3)
+	void tsfmtWithSpecificGlobalInstallCacheTest() throws IOException {
+		File dir1 = newFolder("npm-tsfmt-global-1");
+		File cacheDir = pertainingCacheDir;
+		BuildResult result = runTsfmtOnDir(dir1, cacheDir);
+		Assertions.assertThat(result.getOutput())
+				.doesNotContainPattern("Using cached node_modules for .*\\Q" + cacheDir.getAbsolutePath() + "\\E")
+				.containsPattern("Caching node_modules for .*\\Q" + cacheDir.getAbsolutePath() + "\\E");
+	}
+
+	@Test
+	@Order(4)
+	void tsfmtWithSpecificGlobalInstallCacheTest2() throws IOException {
+		File dir2 = newFolder("npm-tsfmt-global-2");
+		File cacheDir = pertainingCacheDir;
+		BuildResult result = runTsfmtOnDir(dir2, cacheDir);
+		Assertions.assertThat(result.getOutput())
+				.containsPattern("Using cached node_modules for .*\\Q" + cacheDir.getAbsolutePath() + "\\E")
+				.doesNotContainPattern("Caching node_modules for .*\\Q" + cacheDir.getAbsolutePath() + "\\E");
+	}
+
+	private BuildResult runTsfmtOnDir(File projDir, File cacheDir) throws IOException {
+		String baseDir = projDir.getName();
+		String cacheDirEnabled = cacheDirEnabledStringForCacheDir(cacheDir);
+		setFile(baseDir + "/build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"def tsfmtconfig = [:]",
+				"tsfmtconfig['indentSize'] = 1",
+				"tsfmtconfig['convertTabsToSpaces'] = true",
+				"spotless {",
+				"    typescript {",
+				"        target 'test.ts'",
+				"        tsfmt().config(tsfmtconfig)" + cacheDirEnabled,
+				"    }",
+				"}");
+		setFile(baseDir + "/test.ts").toResource("npm/tsfmt/tsfmt/tsfmt.dirty");
+		final BuildResult spotlessApply = gradleRunner().withProjectDir(projDir).withArguments("--stacktrace", "--info", "spotlessApply").build();
+		assertFile(baseDir + "/test.ts").sameAsResource("npm/tsfmt/tsfmt/tsfmt.clean");
+		return spotlessApply;
+	}
+
 	private static String cacheDirEnabledStringForCacheDir(File cacheDir) {
 		String cacheDirEnabled;
 		if (cacheDir == null) {

From 64b201b6ea55d5ecdc8e62db8cf23fadb2715503 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Fri, 24 Feb 2023 15:49:17 +0100
Subject: [PATCH 0834/2068] 1480: adding tests without cache and for eslint

---
 .../NpmInstallCacheIntegrationTests.java      | 74 +++++++++++++++++++
 1 file changed, 74 insertions(+)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmInstallCacheIntegrationTests.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmInstallCacheIntegrationTests.java
index 893a834bca..5bef2b17a9 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmInstallCacheIntegrationTests.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmInstallCacheIntegrationTests.java
@@ -69,6 +69,16 @@ void prettierWithSpecificInstallCacheTest() throws IOException {
 		Assertions.assertThat(result2.getOutput()).containsPattern("Using cached node_modules for .*\\Q" + cacheDir.getAbsolutePath() + "\\E");
 	}
 
+	@Test
+	void prettierWithNoCacheTest() throws IOException {
+		File dir2 = newFolder("npm-prettier-1");
+		File cacheDir = null;
+		BuildResult result = runPhpPrettierOnDir(dir2, cacheDir);
+		Assertions.assertThat(result.getOutput())
+				.doesNotContainPattern("Using cached node_modules for .*")
+				.doesNotContainPattern("Caching node_modules for .*");
+	}
+
 	@Test
 	@Order(1)
 	void prettierWithSpecificGlobalInstallCacheTest() throws IOException {
@@ -140,6 +150,16 @@ void tsfmtWithSpecificGlobalInstallCacheTest2() throws IOException {
 				.doesNotContainPattern("Caching node_modules for .*\\Q" + cacheDir.getAbsolutePath() + "\\E");
 	}
 
+	@Test
+	void tsfmtWithNoCacheTest() throws IOException {
+		File dir2 = newFolder("npm-tsfmt-1");
+		File cacheDir = null;
+		BuildResult result = runTsfmtOnDir(dir2, cacheDir);
+		Assertions.assertThat(result.getOutput())
+				.doesNotContainPattern("Using cached node_modules for .*")
+				.doesNotContainPattern("Caching node_modules for .*");
+	}
+
 	private BuildResult runTsfmtOnDir(File projDir, File cacheDir) throws IOException {
 		String baseDir = projDir.getName();
 		String cacheDirEnabled = cacheDirEnabledStringForCacheDir(cacheDir);
@@ -163,6 +183,60 @@ private BuildResult runTsfmtOnDir(File projDir, File cacheDir) throws IOExceptio
 		return spotlessApply;
 	}
 
+	@Test
+	@Order(5)
+	void eslintWithSpecificGlobalInstallCacheTest() throws IOException {
+		File dir1 = newFolder("npm-eslint-global-1");
+		File cacheDir = pertainingCacheDir;
+		BuildResult result = runEslintOnDir(dir1, cacheDir);
+		Assertions.assertThat(result.getOutput())
+				.doesNotContainPattern("Using cached node_modules for .*\\Q" + cacheDir.getAbsolutePath() + "\\E")
+				.containsPattern("Caching node_modules for .*\\Q" + cacheDir.getAbsolutePath() + "\\E");
+	}
+
+	@Test
+	@Order(6)
+	void eslintWithSpecificGlobalInstallCacheTest2() throws IOException {
+		File dir2 = newFolder("npm-eslint-global-2");
+		File cacheDir = pertainingCacheDir;
+		BuildResult result = runEslintOnDir(dir2, cacheDir);
+		Assertions.assertThat(result.getOutput())
+				.containsPattern("Using cached node_modules for .*\\Q" + cacheDir.getAbsolutePath() + "\\E")
+				.doesNotContainPattern("Caching node_modules for .*\\Q" + cacheDir.getAbsolutePath() + "\\E");
+	}
+
+	@Test
+	void eslintWithNoCacheTest() throws IOException {
+		File dir2 = newFolder("npm-eslint-1");
+		File cacheDir = null;
+		BuildResult result = runEslintOnDir(dir2, cacheDir);
+		Assertions.assertThat(result.getOutput())
+				.doesNotContainPattern("Using cached node_modules for .*")
+				.doesNotContainPattern("Caching node_modules for .*");
+	}
+
+	private BuildResult runEslintOnDir(File projDir, File cacheDir) throws IOException {
+		String baseDir = projDir.getName();
+		String cacheDirEnabled = cacheDirEnabledStringForCacheDir(cacheDir);
+
+		setFile(baseDir + "/.eslintrc.js").toResource("npm/eslint/typescript/custom_rules/.eslintrc.js");
+		setFile(baseDir + "/build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    typescript {",
+				"        target 'test.ts'",
+				"        eslint().configFile('.eslintrc.js')" + cacheDirEnabled,
+				"    }",
+				"}");
+		setFile(baseDir + "/test.ts").toResource("npm/eslint/typescript/custom_rules/typescript.dirty");
+		BuildResult spotlessApply = gradleRunner().withProjectDir(projDir).withArguments("--stacktrace", "--info", "spotlessApply").build();
+		assertFile(baseDir + "/test.ts").sameAsResource("npm/eslint/typescript/custom_rules/typescript.clean");
+		return spotlessApply;
+	}
+
 	private static String cacheDirEnabledStringForCacheDir(File cacheDir) {
 		String cacheDirEnabled;
 		if (cacheDir == null) {

From de33c705bc833fdbeb4d838e2d7cfa522bf2dbd5 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Fri, 24 Feb 2023 20:06:26 +0100
Subject: [PATCH 0835/2068] 1480: clarifications/renamings

---
 .../com/diffplug/spotless/npm/ShadowCopy.java |  4 +--
 .../NpmInstallCacheIntegrationTests.java      | 28 +++++++++----------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/ShadowCopy.java b/lib/src/main/java/com/diffplug/spotless/npm/ShadowCopy.java
index 179a1278b1..044b5d70ea 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/ShadowCopy.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/ShadowCopy.java
@@ -49,10 +49,10 @@ public ShadowCopy(@Nonnull File shadowCopyRoot) {
 	}
 
 	public void addEntry(String key, File orig) {
+		// prevent concurrent adding of entry with same key
 		if (!reserveSubFolder(key)) {
-			logger.debug("Shadow copy entry already on the way: {}. Awaiting finalization.", key);
+			logger.debug("Shadow copy entry already in progress: {}. Awaiting finalization.", key);
 			try {
-				// maybe make the duration configurable?
 				NpmResourceHelper.awaitFileDeleted(markerFilePath(key).toFile(), Duration.ofSeconds(120));
 			} catch (TimeoutException e) {
 				throw new RuntimeException(e);
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmInstallCacheIntegrationTests.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmInstallCacheIntegrationTests.java
index 5bef2b17a9..3a690fbc55 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmInstallCacheIntegrationTests.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmInstallCacheIntegrationTests.java
@@ -47,7 +47,7 @@ static void beforeAll(@TempDir File pertainingCacheDir) {
 	}
 
 	@Test
-	void prettierWithDefaultInstallCacheTest() throws IOException {
+	void prettierCachesNodeModulesToADefaultFolderWhenCachingEnabled() throws IOException {
 		File dir1 = newFolder("npm-prettier-1");
 		File cacheDir = DEFAULT_DIR_FOR_NPM_INSTALL_CACHE_DO_NEVER_WRITE_TO_THIS;
 		BuildResult result = runPhpPrettierOnDir(dir1, cacheDir);
@@ -59,7 +59,7 @@ void prettierWithDefaultInstallCacheTest() throws IOException {
 	}
 
 	@Test
-	void prettierWithSpecificInstallCacheTest() throws IOException {
+	void prettierCachesAndReusesNodeModulesInSpecificInstallCacheFolder() throws IOException {
 		File dir1 = newFolder("npm-prettier-1");
 		File cacheDir = newFolder("npm-prettier-cache");
 		BuildResult result = runPhpPrettierOnDir(dir1, cacheDir);
@@ -70,10 +70,9 @@ void prettierWithSpecificInstallCacheTest() throws IOException {
 	}
 
 	@Test
-	void prettierWithNoCacheTest() throws IOException {
+	void prettierDoesNotCacheNodeModulesIfNotExplicitlyEnabled() throws IOException {
 		File dir2 = newFolder("npm-prettier-1");
-		File cacheDir = null;
-		BuildResult result = runPhpPrettierOnDir(dir2, cacheDir);
+		BuildResult result = runPhpPrettierOnDir(dir2, null);
 		Assertions.assertThat(result.getOutput())
 				.doesNotContainPattern("Using cached node_modules for .*")
 				.doesNotContainPattern("Caching node_modules for .*");
@@ -81,7 +80,7 @@ void prettierWithNoCacheTest() throws IOException {
 
 	@Test
 	@Order(1)
-	void prettierWithSpecificGlobalInstallCacheTest() throws IOException {
+	void prettierCachesNodeModuleInGlobalInstallCacheDir() throws IOException {
 		File dir1 = newFolder("npm-prettier-global-1");
 		File cacheDir = pertainingCacheDir;
 		BuildResult result = runPhpPrettierOnDir(dir1, cacheDir);
@@ -92,7 +91,7 @@ void prettierWithSpecificGlobalInstallCacheTest() throws IOException {
 
 	@Test
 	@Order(2)
-	void prettierWithSpecificGlobalInstallCacheTest2() throws IOException {
+	void prettierUsesCachedNodeModulesFromGlobalInstallCacheDir() throws IOException {
 		File dir2 = newFolder("npm-prettier-global-2");
 		File cacheDir = pertainingCacheDir;
 		BuildResult result = runPhpPrettierOnDir(dir2, cacheDir);
@@ -130,7 +129,7 @@ private BuildResult runPhpPrettierOnDir(File projDir, File cacheDir) throws IOEx
 
 	@Test
 	@Order(3)
-	void tsfmtWithSpecificGlobalInstallCacheTest() throws IOException {
+	void tsfmtCachesNodeModuleInGlobalInstallCacheDir() throws IOException {
 		File dir1 = newFolder("npm-tsfmt-global-1");
 		File cacheDir = pertainingCacheDir;
 		BuildResult result = runTsfmtOnDir(dir1, cacheDir);
@@ -141,7 +140,7 @@ void tsfmtWithSpecificGlobalInstallCacheTest() throws IOException {
 
 	@Test
 	@Order(4)
-	void tsfmtWithSpecificGlobalInstallCacheTest2() throws IOException {
+	void tsfmtUsesCachedNodeModulesFromGlobalInstallCacheDir() throws IOException {
 		File dir2 = newFolder("npm-tsfmt-global-2");
 		File cacheDir = pertainingCacheDir;
 		BuildResult result = runTsfmtOnDir(dir2, cacheDir);
@@ -151,10 +150,9 @@ void tsfmtWithSpecificGlobalInstallCacheTest2() throws IOException {
 	}
 
 	@Test
-	void tsfmtWithNoCacheTest() throws IOException {
+	void tsfmtDoesNotCacheNodeModulesIfNotExplicitlyEnabled() throws IOException {
 		File dir2 = newFolder("npm-tsfmt-1");
-		File cacheDir = null;
-		BuildResult result = runTsfmtOnDir(dir2, cacheDir);
+		BuildResult result = runTsfmtOnDir(dir2, null);
 		Assertions.assertThat(result.getOutput())
 				.doesNotContainPattern("Using cached node_modules for .*")
 				.doesNotContainPattern("Caching node_modules for .*");
@@ -185,7 +183,7 @@ private BuildResult runTsfmtOnDir(File projDir, File cacheDir) throws IOExceptio
 
 	@Test
 	@Order(5)
-	void eslintWithSpecificGlobalInstallCacheTest() throws IOException {
+	void eslintCachesNodeModuleInGlobalInstallCacheDir() throws IOException {
 		File dir1 = newFolder("npm-eslint-global-1");
 		File cacheDir = pertainingCacheDir;
 		BuildResult result = runEslintOnDir(dir1, cacheDir);
@@ -196,7 +194,7 @@ void eslintWithSpecificGlobalInstallCacheTest() throws IOException {
 
 	@Test
 	@Order(6)
-	void eslintWithSpecificGlobalInstallCacheTest2() throws IOException {
+	void eslintUsesCachedNodeModulesFromGlobalInstallCacheDir() throws IOException {
 		File dir2 = newFolder("npm-eslint-global-2");
 		File cacheDir = pertainingCacheDir;
 		BuildResult result = runEslintOnDir(dir2, cacheDir);
@@ -206,7 +204,7 @@ void eslintWithSpecificGlobalInstallCacheTest2() throws IOException {
 	}
 
 	@Test
-	void eslintWithNoCacheTest() throws IOException {
+	void eslintDoesNotCacheNodeModulesIfNotExplicitlyEnabled() throws IOException {
 		File dir2 = newFolder("npm-eslint-1");
 		File cacheDir = null;
 		BuildResult result = runEslintOnDir(dir2, cacheDir);

From cd84167cc20cf9b97e25d1d2ba741b5f2cf04ed4 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Sun, 26 Feb 2023 19:42:21 +0100
Subject: [PATCH 0836/2068] 1480: integration tests for maven + cleanup

---
 .../npm/AbstractNpmFormatterStepFactory.java  |   7 +-
 .../npm/NpmStepsWithNpmInstallCacheTest.java  | 188 ++++++++++++++++++
 .../spotless/npm/EslintFormatterStepTest.java |   6 +-
 .../npm/NpmFormatterStepCommonTests.java      |   8 -
 .../npm/PrettierFormatterStepTest.java        |  10 +-
 .../spotless/npm/TsFmtFormatterStepTest.java  |   4 +-
 6 files changed, 203 insertions(+), 20 deletions(-)
 create mode 100644 plugin-maven/src/test/java/com/diffplug/spotless/maven/npm/NpmStepsWithNpmInstallCacheTest.java

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/npm/AbstractNpmFormatterStepFactory.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/npm/AbstractNpmFormatterStepFactory.java
index 9e184045bb..b0645c151e 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/npm/AbstractNpmFormatterStepFactory.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/npm/AbstractNpmFormatterStepFactory.java
@@ -16,6 +16,7 @@
 package com.diffplug.spotless.maven.npm;
 
 import java.io.File;
+import java.nio.file.Paths;
 import java.util.AbstractMap;
 import java.util.Arrays;
 import java.util.Collections;
@@ -33,6 +34,8 @@
 
 public abstract class AbstractNpmFormatterStepFactory implements FormatterStepFactory {
 
+	public static final String SPOTLESS_NPM_INSTALL_CACHE_DEFAULT_NAME = "spotless-npm-install-cache";
+
 	@Parameter
 	private String npmExecutable;
 
@@ -69,9 +72,9 @@ protected File cacheDir(FormatterStepConfig stepConfig) {
 			return null;
 		}
 		if ("true".equals(this.npmInstallCache.toLowerCase(Locale.ROOT))) {
-			return new File(buildDir(stepConfig), "spotless-npm-install-cache");
+			return new File(buildDir(stepConfig), SPOTLESS_NPM_INSTALL_CACHE_DEFAULT_NAME);
 		}
-		return stepConfig.getFileLocator().locateFile(this.npmInstallCache);
+		return Paths.get(this.npmInstallCache).toFile();
 	}
 
 	protected File baseDir(FormatterStepConfig stepConfig) {
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/npm/NpmStepsWithNpmInstallCacheTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/npm/NpmStepsWithNpmInstallCacheTest.java
new file mode 100644
index 0000000000..aae587aadb
--- /dev/null
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/npm/NpmStepsWithNpmInstallCacheTest.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.npm;
+
+import static com.diffplug.spotless.maven.npm.AbstractNpmFormatterStepFactory.SPOTLESS_NPM_INSTALL_CACHE_DEFAULT_NAME;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
+
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import com.diffplug.spotless.ProcessRunner.Result;
+import com.diffplug.spotless.maven.MavenIntegrationHarness;
+import com.diffplug.spotless.tag.NpmTest;
+
+@NpmTest
+public class NpmStepsWithNpmInstallCacheTest extends MavenIntegrationHarness {
+
+	// TODO implement tests without cache and with various cache paths
+	// using only prettier is enough since the other cases are covered by gradle-side integration tests
+
+	@Test
+	void prettierTypescriptWithoutCache() throws Exception {
+		String suffix = "ts";
+		writePomWithPrettierSteps("**/*." + suffix,
+				"<prettier>",
+				"  <prettierVersion>1.16.4</prettierVersion>",
+				"  <configFile>.prettierrc.yml</configFile>",
+				"</prettier>");
+		Result result = run("typescript", suffix);
+		Assertions.assertThat(result.stdOutUtf8()).doesNotContain("Caching node_modules for").doesNotContain("Using cached node_modules for");
+	}
+
+	@Test
+	void prettierTypescriptWithDefaultCache() throws Exception {
+		String suffix = "ts";
+		writePomWithPrettierSteps("**/*." + suffix,
+				"<prettier>",
+				"  <prettierVersion>1.16.4</prettierVersion>",
+				"  <configFile>.prettierrc.yml</configFile>",
+				"  <npmInstallCache>true</npmInstallCache>",
+				"</prettier>");
+		Result result = run("typescript", suffix);
+		Assertions.assertThat(result.stdOutUtf8())
+				.contains("Caching node_modules for")
+				.contains(SPOTLESS_NPM_INSTALL_CACHE_DEFAULT_NAME)
+				.doesNotContain("Using cached node_modules for");
+	}
+
+	@Test
+	void prettierTypescriptWithDefaultCacheIsReusedOnSecondRun() throws Exception {
+		String suffix = "ts";
+		writePomWithPrettierSteps("**/*." + suffix,
+				"<prettier>",
+				"  <prettierVersion>1.16.4</prettierVersion>",
+				"  <configFile>.prettierrc.yml</configFile>",
+				"  <npmInstallCache>true</npmInstallCache>",
+				"</prettier>");
+		Result result1 = run("typescript", suffix);
+		Assertions.assertThat(result1.stdOutUtf8())
+				.contains("Caching node_modules for")
+				.contains(SPOTLESS_NPM_INSTALL_CACHE_DEFAULT_NAME)
+				.doesNotContain("Using cached node_modules for");
+
+		// recursively delete target folder to simulate a fresh run (except the default cache folder)
+		recursiveDelete(Paths.get(rootFolder().getAbsolutePath(), "target"), SPOTLESS_NPM_INSTALL_CACHE_DEFAULT_NAME);
+
+		Result result2 = run("typescript", suffix);
+		Assertions.assertThat(result2.stdOutUtf8())
+				.doesNotContain("Caching node_modules for")
+				.contains(SPOTLESS_NPM_INSTALL_CACHE_DEFAULT_NAME)
+				.contains("Using cached node_modules for");
+	}
+
+	@Test
+	void prettierTypescriptWithSpecificCache() throws Exception {
+		String suffix = "ts";
+		File cacheDir = newFolder("cache-prettier-1");
+		writePomWithPrettierSteps("**/*." + suffix,
+				"<prettier>",
+				"  <prettierVersion>1.16.4</prettierVersion>",
+				"  <configFile>.prettierrc.yml</configFile>",
+				"  <npmInstallCache>" + cacheDir.getAbsolutePath() + "</npmInstallCache>",
+				"</prettier>");
+		Result result = run("typescript", suffix);
+		Assertions.assertThat(result.stdOutUtf8())
+				.contains("Caching node_modules for")
+				.contains(Path.of(cacheDir.getAbsolutePath()).toAbsolutePath().toString())
+				.doesNotContain("Using cached node_modules for");
+	}
+
+	@Test
+	void prettierTypescriptWithSpecificCacheIsUsedOnSecondRun() throws Exception {
+		String suffix = "ts";
+		File cacheDir = newFolder("cache-prettier-1");
+		writePomWithPrettierSteps("**/*." + suffix,
+				"<prettier>",
+				"  <prettierVersion>1.16.4</prettierVersion>",
+				"  <configFile>.prettierrc.yml</configFile>",
+				"  <npmInstallCache>" + cacheDir.getAbsolutePath() + "</npmInstallCache>",
+				"</prettier>");
+		Result result1 = run("typescript", suffix);
+		Assertions.assertThat(result1.stdOutUtf8())
+				.contains("Caching node_modules for")
+				.contains(Path.of(cacheDir.getAbsolutePath()).toAbsolutePath().toString())
+				.doesNotContain("Using cached node_modules for");
+
+		// recursively delete target folder to simulate a fresh run
+		recursiveDelete(Paths.get(rootFolder().getAbsolutePath(), "target"), null);
+
+		Result result2 = run("typescript", suffix);
+		Assertions.assertThat(result2.stdOutUtf8())
+				.doesNotContain("Caching node_modules for")
+				.contains(Path.of(cacheDir.getAbsolutePath()).toAbsolutePath().toString())
+				.contains("Using cached node_modules for");
+	}
+
+	private void recursiveDelete(Path path, String exclusion) throws IOException {
+		Files.walkFileTree(path, new RecursiveDelete(exclusion));
+	}
+
+	private Result run(String kind, String suffix) throws IOException, InterruptedException {
+		String path = prepareRun(kind, suffix);
+		Result result = mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile(path).sameAsResource("npm/prettier/filetypes/" + kind + "/" + kind + ".clean");
+		return result;
+	}
+
+	private String prepareRun(String kind, String suffix) throws IOException {
+		String configPath = ".prettierrc.yml";
+		setFile(configPath).toResource("npm/prettier/filetypes/" + kind + "/" + ".prettierrc.yml");
+		String path = "src/main/" + kind + "/test." + suffix;
+		setFile(path).toResource("npm/prettier/filetypes/" + kind + "/" + kind + ".dirty");
+		return path;
+	}
+
+	private static class RecursiveDelete extends SimpleFileVisitor<Path> {
+		private final String exclusionDirectory;
+
+		public RecursiveDelete(String exclusionDirectory) {
+			this.exclusionDirectory = exclusionDirectory;
+		}
+
+		@Override
+		public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
+			if (exclusionDirectory != null && dir.toFile().getName().equals(exclusionDirectory)) {
+				return FileVisitResult.SKIP_SUBTREE;
+			}
+			return super.preVisitDirectory(dir, attrs);
+		}
+
+		@Override
+		public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+			Files.delete(file);
+			return super.visitFile(file, attrs);
+		}
+
+		@Override
+		public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
+			if (dir.toFile().listFiles().length != 0) {
+				// skip non-empty dir
+				return super.postVisitDirectory(dir, exc);
+			}
+			Files.delete(dir);
+			return super.postVisitDirectory(dir, exc);
+		}
+	}
+}
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
index fe1f33ccc6..631a4beaa7 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
@@ -64,7 +64,7 @@ void formattingUsingRulesetsFile(String ruleSetName) throws Exception {
 					TestProvisioner.mavenCentral(),
 					projectDir(),
 					buildDir(),
-					cacheDir(),
+					null,
 					npmPathResolver(),
 					new EslintConfig(eslintRc, null));
 
@@ -108,7 +108,7 @@ void formattingUsingRulesetsFile(String ruleSetName) throws Exception {
 					TestProvisioner.mavenCentral(),
 					projectDir(),
 					buildDir(),
-					cacheDir(),
+					null,
 					npmPathResolver(),
 					new EslintTypescriptConfig(eslintRc, null, tsconfigFile));
 
@@ -166,7 +166,7 @@ void formattingUsingInlineXoConfig() throws Exception {
 					TestProvisioner.mavenCentral(),
 					projectDir(),
 					buildDir(),
-					cacheDir(),
+					null,
 					npmPathResolver(),
 					new EslintTypescriptConfig(null, esLintConfig, tsconfigFile));
 
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/NpmFormatterStepCommonTests.java b/testlib/src/test/java/com/diffplug/spotless/npm/NpmFormatterStepCommonTests.java
index 93e70b4129..5eff34ef29 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/NpmFormatterStepCommonTests.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/NpmFormatterStepCommonTests.java
@@ -57,12 +57,4 @@ protected File projectDir() throws IOException {
 		return this.projectDir;
 	}
 
-	private File cacheDir = null;
-
-	protected File cacheDir() throws IOException {
-		if (this.cacheDir == null) {
-			this.cacheDir = newFolder("cache-dir");
-		}
-		return this.cacheDir;
-	}
 }
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
index d308e6085a..c0e587aa98 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
@@ -52,7 +52,7 @@ void formattingUsingConfigFile(String fileType) throws Exception {
 					TestProvisioner.mavenCentral(),
 					projectDir(),
 					buildDir(),
-					cacheDir(),
+					null,
 					npmPathResolver(),
 					new PrettierConfig(prettierRc, null));
 
@@ -78,7 +78,7 @@ void parserInferenceBasedOnExplicitFilepathIsWorking() throws Exception {
 					TestProvisioner.mavenCentral(),
 					projectDir(),
 					buildDir(),
-					cacheDir(),
+					null,
 					npmPathResolver(),
 					new PrettierConfig(null, ImmutableMap.of("filepath", "anyname.json"))); // should select parser based on this name
 
@@ -99,7 +99,7 @@ void parserInferenceBasedOnFilenameIsWorking() throws Exception {
 					TestProvisioner.mavenCentral(),
 					projectDir(),
 					buildDir(),
-					cacheDir(),
+					null,
 					npmPathResolver(),
 					new PrettierConfig(null, Collections.emptyMap()));
 
@@ -115,7 +115,7 @@ void verifyPrettierErrorMessageIsRelayed() throws Exception {
 					TestProvisioner.mavenCentral(),
 					projectDir(),
 					buildDir(),
-					cacheDir(),
+					null,
 					npmPathResolver(),
 					new PrettierConfig(null, ImmutableMap.of("parser", "postcss")));
 			try (StepHarnessWithFile stepHarness = StepHarnessWithFile.forStep(this, formatterStep)) {
@@ -141,7 +141,7 @@ void runFormatTest(PrettierConfig config, String cleanFileNameSuffix) throws Exc
 					TestProvisioner.mavenCentral(),
 					projectDir(),
 					buildDir(),
-					cacheDir(),
+					null,
 					npmPathResolver(),
 					config); // should select parser based on this name
 
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/TsFmtFormatterStepTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/TsFmtFormatterStepTest.java
index 9233239443..66fe6e05ac 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/TsFmtFormatterStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/TsFmtFormatterStepTest.java
@@ -59,7 +59,7 @@ void formattingUsingConfigFile(String formattingConfigFile) throws Exception {
 					TestProvisioner.mavenCentral(),
 					projectDir(),
 					buildDir(),
-					cacheDir(),
+					null,
 					npmPathResolver(),
 					TypedTsFmtConfigFile.named(configFileNameWithoutExtension, configFile),
 					Collections.emptyMap());
@@ -83,7 +83,7 @@ void formattingUsingInlineConfigWorks() throws Exception {
 					TestProvisioner.mavenCentral(),
 					projectDir(),
 					buildDir(),
-					cacheDir(),
+					null,
 					npmPathResolver(),
 					null,
 					inlineConfig);

From ed95a7ca9ffa129ec2bb9942b337c1bff82e1a4c Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Sun, 26 Feb 2023 20:19:36 +0100
Subject: [PATCH 0837/2068] 1480: add configuration to readme

---
 plugin-gradle/README.md | 27 +++++++++++++++++++++------
 plugin-maven/README.md  | 23 +++++++++++++++++++----
 2 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 106cf3dcfd..6c181c9330 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -67,7 +67,7 @@ Spotless supports all of Gradle's built-in performance features (incremental bui
   - [Javascript](#javascript) ([prettier](#prettier), [ESLint](#eslint-javascript))
   - [JSON](#json)
   - Multiple languages
-    - [Prettier](#prettier) ([plugins](#prettier-plugins), [npm detection](#npm-detection), [`.npmrc` detection](#npmrc-detection))
+    - [Prettier](#prettier) ([plugins](#prettier-plugins), [npm detection](#npm-detection), [`.npmrc` detection](#npmrc-detection), [caching `npm install` results](#caching-results-of-npm-install))
       - javascript, jsx, angular, vue, flow, typescript, css, less, scss, html, json, graphql, markdown, ymaml
     - [clang-format](#clang-format)
       - c, c++, c#, objective-c, protobuf, javascript, java
@@ -630,7 +630,8 @@ spotless {
 
 **Prerequisite: tsfmt requires a working NodeJS version**
 
-For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#npmrc-detection) sections of prettier, which apply also to tsfmt.
+For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmrc-detection) and [caching results of `npm install`](#caching-results-of-npm-install) sections of prettier, which apply also to tsfmt.
+
 
 ### ESLint (Typescript)
 
@@ -678,7 +679,7 @@ spotless {
 
 **Prerequisite: ESLint requires a working NodeJS version**
 
-For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#npmrc-detection) sections of prettier, which apply also to ESLint.
+For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmrc-detection) and [caching results of `npm install`](#caching-results-of-npm-install) sections of prettier, which apply also to ESLint.
 
 ## Javascript
 
@@ -742,7 +743,7 @@ spotless {
 
 **Prerequisite: ESLint requires a working NodeJS version**
 
-For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#npmrc-detection) sections of prettier, which apply also to ESLint.
+For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmrc-detection) and [caching results of `npm install`](#caching-results-of-npm-install) sections of prettier, which apply also to ESLint.
 
 ## JSON
 
@@ -926,8 +927,6 @@ node- and npm-binaries dynamically installed by this plugin. See
 [this](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/test/resources/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest_gradle_node_plugin_example_1.gradle)
 or [this](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/test/resources/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest_gradle_node_plugin_example_2.gradle) example.
 
-```gradle
-
 ### `.npmrc` detection
 
 Spotless picks up npm configuration stored in a `.npmrc` file either in the project directory or in your user home.
@@ -940,6 +939,22 @@ spotless {
     prettier().npmrc("$projectDir/config/.npmrc").config(...)
 ```
 
+### Caching results of `npm install`
+
+Spotless uses `npm` behind the scenes to install `prettier`. This can be a slow process, especially if you are using a slow internet connection or
+if you need large plugins. You can instruct spotless to cache the results of the `npm install` calls, so that for the next installation,
+it will not need to download the packages again, but instead reuse the cached version.
+
+```gradle
+spotless {
+  typescript {
+    prettier().npmInstallCache() // will use the default cache directory (the build-directory of the respective module)
+    prettier().npmInstallCache("${rootProject.rootDir}/.gradle/spotless-npm-cache") // will use the specified directory (creating it if not existing)
+```
+
+Depending on your filesystem and the location of the cache directory, spotless will use hardlinks when caching the npm packages. If that is not
+possible, it will fall back to copying the files.
+
 ## clang-format
 
 [homepage](https://clang.llvm.org/docs/ClangFormat.html). [changelog](https://releases.llvm.org/download.html). `clang-format` is a formatter for c, c++, c#, objective-c, protobuf, javascript, and java. You can use clang-format in any language-specific format, but usually you will be creating a generic format.
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 51ea9c23d7..c91c73f80a 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -54,7 +54,7 @@ user@machine repo % mvn spotless:check
   - [JSON](#json)
   - [YAML](#yaml)
   - Multiple languages
-    - [Prettier](#prettier) ([plugins](#prettier-plugins), [npm detection](#npm-detection), [`.npmrc` detection](#npmrc-detection))
+    - [Prettier](#prettier) ([plugins](#prettier-plugins), [npm detection](#npm-detection), [`.npmrc` detection](#npmrc-detection), [caching `npm install` results](#caching-results-of-npm-install))
     - [eclipse web tools platform](#eclipse-web-tools-platform)
 - **Language independent**
   - [Generic steps](#generic-steps)
@@ -731,7 +731,7 @@ The auto-discovery of config files (up the file tree) will not work when using t
 
 **Prerequisite: tsfmt requires a working NodeJS version**
 
-For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#npmrc-detection) sections of prettier, which apply also to tsfmt.
+For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmrc-detection) and [caching results of `npm install`](#caching-results-of-npm-install) sections of prettier, which apply also to tsfmt.
 
 ### ESLint (typescript)
 
@@ -787,7 +787,7 @@ reference to a `tsconfig.json` is required.
 
 **Prerequisite: ESLint requires a working NodeJS version**
 
-For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#npmrc-detection) sections of prettier, which apply also to ESLint.
+For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmrc-detection) and [caching results of `npm install`](#caching-results-of-npm-install) sections of prettier, which apply also to ESLint.
 
 
 ## Javascript
@@ -863,7 +863,7 @@ The configuration is very similar to the [ESLint (Typescript)](#eslint-typescrip
 
 **Prerequisite: ESLint requires a working NodeJS version**
 
-For details, see the [npm detection](#npm-detection) and [`.npmrc` detection](#npmrc-detection) sections of prettier, which apply also to ESLint.
+For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmrc-detection) and [caching results of `npm install`](#caching-results-of-npm-install) sections of prettier, which apply also to ESLint.
 
 ## JSON
 
@@ -1113,6 +1113,21 @@ Alternatively you can supply spotless with a location of the `.npmrc` file to us
   <npmrc>/usr/local/shared/.npmrc</npmrc>
 ```
 
+### Caching results of `npm install`
+
+Spotless uses `npm` behind the scenes to install `prettier`. This can be a slow process, especially if you are using a slow internet connection or
+if you need large plugins. You can instruct spotless to cache the results of the `npm install` calls, so that for the next installation,
+it will not need to download the packages again, but instead reuse the cached version.
+
+```xml
+<prettier>
+  <npmInstallCache>true</npmInstallCache> <!-- will use the default cache directory (the `target`-directory) -->
+  <npmInstallCache>/usr/local/shared/.spotless-npm-install-cache</npmInstallCache> <!-- will use the specified directory (creating it if not existing) -->
+```
+
+Depending on your filesystem and the location of the cache directory, spotless will use hardlinks when caching the npm packages. If that is not
+possible, it will fall back to copying the files.
+
 <a name="applying-eclipse-wtp-to-css--html--etc"></a>
 
 ## Eclipse web tools platform

From 00990dc16e948276e4cf671ac265096192100770 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Sun, 26 Feb 2023 20:20:53 +0100
Subject: [PATCH 0838/2068] 1480: update changes.md

---
 CHANGES.md               | 5 +++++
 plugin-gradle/CHANGES.md | 2 ++
 plugin-maven/CHANGES.md  | 2 ++
 3 files changed, 9 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index eec8753271..c7526360c5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,11 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* Introduce `TimedLogger` to allow for logging of time taken by a task using slf4j ([#1590](https://github.com/diffplug/spotless/pull/1590))
+* `npm`-based formatters now support caching of `node_modules` directory ([#1590](https://github.com/diffplug/spotless/pull/1590))
+### Fixed
+* Reduce logging-noise created by `npm`-based formatters ([#1590](https://github.com/diffplug/spotless/pull/1590) fixes [#1582](https://github.com/diffplug/spotless/issues/1582))
 
 ## [2.35.0] - 2023-02-10
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 0b2185ba61..c2b5940a71 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,6 +5,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Add `includeDraft` option, to include draft mutators from composite mutators ([#1574](https://github.com/diffplug/spotless/pull/1574))
+* `npm`-based formatters (`prettier`, `tsfmt` and `eslint`) now support caching of `node_modules` directory.
+  To enable it, provide `npmInstallCache()` option. ([#1590](https://github.com/diffplug/spotless/pull/1590))
 ### Changes
 * Bump default `cleanthat` version to latest `2.2` -> `2.6` ([#1574](https://github.com/diffplug/spotless/pull/1574))
 * Bump default `cleanthat` version to latest `2.1` -> `2.2` ([#1569](https://github.com/diffplug/spotless/pull/1569))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 4912e4ff52..c2b0c1bbc1 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,6 +5,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Add `includeDraft` option, to include draft mutators from composite mutators ([#XXX](https://github.com/diffplug/spotless/pull/XXX))
+* `npm`-based formatters (`prettier`, `tsfmt` and `eslint`) now support caching of `node_modules` directory.
+  To enable it, provide the `<npmInstallCache>` option. ([#1590](https://github.com/diffplug/spotless/pull/1590))
 ### Changes
 * Bump default `cleanthat` version to latest `2.2` -> `2.6` ([#1574](https://github.com/diffplug/spotless/pull/1574))
 * Bump default `cleanthat` version to latest `2.1` -> `2.2` ([#1569](https://github.com/diffplug/spotless/pull/1569))

From 37694c18b4bfa3294f58fd4036df19a02c2b1f25 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Sun, 26 Feb 2023 20:32:28 +0100
Subject: [PATCH 0839/2068] 1480: adapt test to actual output

---
 lib/src/test/java/com/diffplug/spotless/TimedLoggerTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/test/java/com/diffplug/spotless/TimedLoggerTest.java b/lib/src/test/java/com/diffplug/spotless/TimedLoggerTest.java
index 3c84ca09ce..cb36bbfbc0 100644
--- a/lib/src/test/java/com/diffplug/spotless/TimedLoggerTest.java
+++ b/lib/src/test/java/com/diffplug/spotless/TimedLoggerTest.java
@@ -86,7 +86,7 @@ void itLogsSecondsOnlyWhenTakingSeconds() {
 		timedLogger.withInfo("This should be logged").run(() -> testTicker.tickMillis(2_000));
 
 		testLogger.assertEvents(2);
-		testLogger.assertHasEventWithMessageAndArguments(MESSAGE_SUFFIX_TOOK, "2s");
+		testLogger.assertHasEventWithMessageAndArguments(MESSAGE_SUFFIX_TOOK, "2.0s");
 	}
 
 	@Test

From b4d9de586c6ca7d40a9f1c2ed21584c91e73497f Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 26 Feb 2023 12:15:32 -0800
Subject: [PATCH 0840/2068] Adopt the latest version of Equo now that it's
 production ready on Gradle.

---
 build.gradle | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 0b00b4c9f1..312f84727d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,10 +1,11 @@
 plugins {
 	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
-	id 'dev.equo.ide'                          version '0.13.0'
+	id 'dev.equo.ide'                          version '0.16.0'
 }
 equoIde {
 	branding().title('Spotless').icon(file('_images/spotless_logo.png'))
 	welcome().openUrl('https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md')
+	gradleBuildship()
 }
 
 repositories {

From c7e46d84cc7e81134d1b1df258ca9a51fd328dfb Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 26 Feb 2023 12:20:31 -0800
Subject: [PATCH 0841/2068] Update plugin changelogs.

---
 plugin-gradle/CHANGES.md | 3 +++
 plugin-maven/CHANGES.md  | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index afba5abdc7..7d70a74149 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,9 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Fixed
+* `json { jackson()` can now handle `Array` as a root element. ([#1585](https://github.com/diffplug/spotless/pull/1585))
+### Changes
 * Bump default `cleanthat` version to latest `2.1` -> `2.2` ([#1569](https://github.com/diffplug/spotless/pull/1569))
 
 ## [6.15.0] - 2023-02-10
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 8d4c67a9b6..e3ff459b33 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* `<json><jackson>` can now handle `Array` as a root element. ([#1585](https://github.com/diffplug/spotless/pull/1585))
 ### Changes
 * Bump default `cleanthat` version to latest `2.1` -> `2.2` ([#1569](https://github.com/diffplug/spotless/pull/1569))
 

From 2a54d8475296baeaa6557e8d269ccb441b7f11f8 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 26 Feb 2023 12:27:18 -0800
Subject: [PATCH 0842/2068] Update changelogs.

---
 CHANGES.md               | 5 +++++
 plugin-gradle/CHANGES.md | 4 ++--
 plugin-maven/CHANGES.md  | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index efb88d972d..11f3f9da3b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,8 +10,13 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* `gradlew equoIde` opens a repeatable clean Spotless dev environment. ([#1523](https://github.com/diffplug/spotless/pull/1523))
+* `cleanthat` added `includeDraft` option, to include draft mutators from composite mutators. ([#1574](https://github.com/diffplug/spotless/pull/1574))
 ### Fixed
 * `JacksonJsonFormatterFunc` handles json files with an Array as root. ([#1585](https://github.com/diffplug/spotless/pull/1585))
+### Changes
+* Bump default `cleanthat` version to latest `2.1` -> `2.6` ([#1569](https://github.com/diffplug/spotless/pull/1569) and [#1574](https://github.com/diffplug/spotless/pull/1574))
 
 ## [2.35.0] - 2023-02-10
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 84b02012b8..63aef7c8d9 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -4,11 +4,11 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* `cleanthat` now has `includeDraft` option, to include draft mutators from composite mutators ([#1574](https://github.com/diffplug/spotless/pull/1574))
+* `cleanthat` now has `includeDraft` option, to include draft mutators from composite mutators. ([#1574](https://github.com/diffplug/spotless/pull/1574))
 ### Fixed
 * `json { jackson()` can now handle `Array` as a root element. ([#1585](https://github.com/diffplug/spotless/pull/1585))
 ### Changes
-* Bump default `cleanthat` version to latest `2.1` -> `2.6` ([#1569](https://github.com/diffplug/spotless/pull/1569) and [#1574](https://github.com/diffplug/spotless/pull/1574))
+* Bump default `cleanthat` version to latest `2.1` -> `2.6`. ([#1569](https://github.com/diffplug/spotless/pull/1569) and [#1574](https://github.com/diffplug/spotless/pull/1574))
 
 ## [6.15.0] - 2023-02-10
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index c21ec5dcb9..f8930c6873 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,10 +3,10 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* `cleanthat` added `includeDraft` option, to include draft mutators from composite mutators. ([#1574](https://github.com/diffplug/spotless/pull/1574))
 ### Fixed
 * `<json><jackson>` can now handle `Array` as a root element. ([#1585](https://github.com/diffplug/spotless/pull/1585))
-### Added
-* `cleanthat` added `includeDraft` option, to include draft mutators from composite mutators ([#XXX](https://github.com/diffplug/spotless/pull/XXX))
 ### Changes
 * Bump default `cleanthat` version to latest `2.1` -> `2.6` ([#1569](https://github.com/diffplug/spotless/pull/1569) and [#1574](https://github.com/diffplug/spotless/pull/1574))
 

From cd2ff0f345f854f44a87f0944f400c98031b5f8c Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Mon, 27 Feb 2023 10:26:37 +0400
Subject: [PATCH 0843/2068] Less errors in equoIde

---
 .../maven/java/CleanthatJavaRefactorerTest.java      | 12 ++++++------
 .../cleanthat/LiteralsFirstInComparisons.clean.java  |  8 --------
 .../cleanthat/LiteralsFirstInComparisons.dirty.java  |  8 --------
 .../cleanthat/LiteralsFirstInComparisons_clean.java  |  8 ++++++++
 .../cleanthat/LiteralsFirstInComparisons_dirty.java  |  8 ++++++++
 ...tators.clean.java => MultipleMutators_clean.java} |  4 ++--
 ...=> MultipleMutators_clean_onlyLiteralsFirst.java} |  4 ++--
 ...ultipleMutators_clean_onlyOptionalIsPresent.java} |  4 ++--
 ...tators.dirty.java => MultipleMutators_dirty.java} |  4 ++--
 9 files changed, 30 insertions(+), 30 deletions(-)
 delete mode 100644 testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons.clean.java
 delete mode 100644 testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons.dirty.java
 create mode 100644 testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons_clean.java
 create mode 100644 testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons_dirty.java
 rename testlib/src/main/resources/java/cleanthat/{MultipleMutators.clean.java => MultipleMutators_clean.java} (62%)
 rename testlib/src/main/resources/java/cleanthat/{MultipleMutators.clean.onlyLiteralsFirst.java => MultipleMutators_clean_onlyLiteralsFirst.java} (61%)
 rename testlib/src/main/resources/java/cleanthat/{MultipleMutators.clean.onlyOptionalIsPresent.java => MultipleMutators_clean_onlyOptionalIsPresent.java} (62%)
 rename testlib/src/main/resources/java/cleanthat/{MultipleMutators.dirty.java => MultipleMutators_dirty.java} (61%)

diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java
index 379397f55b..67a4c2efb2 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java
@@ -33,7 +33,7 @@ void testEnableDraft() throws Exception {
 				"  <includeDraft>true</includeDraft>",
 				"</cleanthat>");
 
-		runTest("MultipleMutators.dirty.java", "MultipleMutators.clean.onlyOptionalIsPresent.java");
+		runTest("MultipleMutators_dirty.java", "MultipleMutators_clean_onlyOptionalIsPresent.java");
 	}
 
 	@Test
@@ -45,7 +45,7 @@ void testLiteralsFirstInComparisons() throws Exception {
 				"  </mutators>",
 				"</cleanthat>");
 
-		runTest("LiteralsFirstInComparisons.dirty.java", "LiteralsFirstInComparisons.clean.java");
+		runTest("LiteralsFirstInComparisons_dirty.java", "LiteralsFirstInComparisons_clean.java");
 	}
 
 	@Test
@@ -59,7 +59,7 @@ void testMultipleMutators_defaultIsJdk7() throws Exception {
 				"  </mutators>",
 				"</cleanthat>");
 
-		runTest("MultipleMutators.dirty.java", "MultipleMutators.clean.onlyLiteralsFirst.java");
+		runTest("MultipleMutators_dirty.java", "MultipleMutators_clean_onlyLiteralsFirst.java");
 	}
 
 	@Test
@@ -73,7 +73,7 @@ void testMultipleMutators_Jdk11IntroducedOptionalisPresent() throws Exception {
 				"  </mutators>",
 				"</cleanthat>");
 
-		runTest("MultipleMutators.dirty.java", "MultipleMutators.clean.java");
+		runTest("MultipleMutators_dirty.java", "MultipleMutators_clean.java");
 	}
 
 	@Test
@@ -89,7 +89,7 @@ void testExcludeOptionalNotEmpty() throws Exception {
 				"  </excludedMutators>",
 				"</cleanthat>");
 
-		runTest("MultipleMutators.dirty.java", "MultipleMutators.clean.onlyLiteralsFirst.java");
+		runTest("MultipleMutators_dirty.java", "MultipleMutators_clean_onlyLiteralsFirst.java");
 	}
 
 	@Test
@@ -101,7 +101,7 @@ void testIncludeOnlyLiteralsFirstInComparisons() throws Exception {
 				"  </mutators>",
 				"</cleanthat>");
 
-		runTest("MultipleMutators.dirty.java", "MultipleMutators.clean.onlyLiteralsFirst.java");
+		runTest("MultipleMutators_dirty.java", "MultipleMutators_clean_onlyLiteralsFirst.java");
 	}
 
 	private void runTest(String dirtyPath, String cleanPath) throws Exception {
diff --git a/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons.clean.java b/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons.clean.java
deleted file mode 100644
index 8bacfa58db..0000000000
--- a/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons.clean.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package eu.solven.cleanthat.engine.java.refactorer.cases.do_not_format_me;
-
-public class LiteralsFirstInComparisonsCases {
-
-	public boolean isHardcoded(String input) {
-		return "hardcoded".equals(input);
-	}
-}
diff --git a/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons.dirty.java b/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons.dirty.java
deleted file mode 100644
index 3a1e074c91..0000000000
--- a/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons.dirty.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package eu.solven.cleanthat.engine.java.refactorer.cases.do_not_format_me;
-
-public class LiteralsFirstInComparisonsCases {
-
-	public boolean isHardcoded(String input) {
-		return input.equals("hardcoded");
-	}
-}
diff --git a/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons_clean.java b/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons_clean.java
new file mode 100644
index 0000000000..07807a6721
--- /dev/null
+++ b/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons_clean.java
@@ -0,0 +1,8 @@
+package java.cleanthat;
+
+public class LiteralsFirstInComparisons_clean {
+
+	public boolean isHardcoded(String input) {
+		return "hardcoded".equals(input);
+	}
+}
diff --git a/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons_dirty.java b/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons_dirty.java
new file mode 100644
index 0000000000..249b8da8b3
--- /dev/null
+++ b/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons_dirty.java
@@ -0,0 +1,8 @@
+package java.cleanthat;
+
+public class LiteralsFirstInComparisons_dirty {
+
+	public boolean isHardcoded(String input) {
+		return input.equals("hardcoded");
+	}
+}
diff --git a/testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.java b/testlib/src/main/resources/java/cleanthat/MultipleMutators_clean.java
similarity index 62%
rename from testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.java
rename to testlib/src/main/resources/java/cleanthat/MultipleMutators_clean.java
index 318e1efa15..76837b6893 100644
--- a/testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.java
+++ b/testlib/src/main/resources/java/cleanthat/MultipleMutators_clean.java
@@ -1,8 +1,8 @@
-package eu.solven.cleanthat.engine.java.refactorer.cases.do_not_format_me;
+package java.cleanthat;
 
 import java.util.Optional;
 
-public class LiteralsFirstInComparisonsCases {
+public class MultipleMutators_clean {
 
 	public boolean isHardcoded(String input) {
 		return "hardcoded".equals(input);
diff --git a/testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.onlyLiteralsFirst.java b/testlib/src/main/resources/java/cleanthat/MultipleMutators_clean_onlyLiteralsFirst.java
similarity index 61%
rename from testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.onlyLiteralsFirst.java
rename to testlib/src/main/resources/java/cleanthat/MultipleMutators_clean_onlyLiteralsFirst.java
index 629d24504b..d9fb87dd80 100644
--- a/testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.onlyLiteralsFirst.java
+++ b/testlib/src/main/resources/java/cleanthat/MultipleMutators_clean_onlyLiteralsFirst.java
@@ -1,8 +1,8 @@
-package eu.solven.cleanthat.engine.java.refactorer.cases.do_not_format_me;
+package java.cleanthat;
 
 import java.util.Optional;
 
-public class LiteralsFirstInComparisonsCases {
+public class MultipleMutators_clean_onlyLiteralsFirst {
 
 	public boolean isHardcoded(String input) {
 		return "hardcoded".equals(input);
diff --git a/testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.onlyOptionalIsPresent.java b/testlib/src/main/resources/java/cleanthat/MultipleMutators_clean_onlyOptionalIsPresent.java
similarity index 62%
rename from testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.onlyOptionalIsPresent.java
rename to testlib/src/main/resources/java/cleanthat/MultipleMutators_clean_onlyOptionalIsPresent.java
index 0829602dc1..54600ebc1c 100644
--- a/testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.onlyOptionalIsPresent.java
+++ b/testlib/src/main/resources/java/cleanthat/MultipleMutators_clean_onlyOptionalIsPresent.java
@@ -1,8 +1,8 @@
-package eu.solven.cleanthat.engine.java.refactorer.cases.do_not_format_me;
+package java.cleanthat;
 
 import java.util.Optional;
 
-public class LiteralsFirstInComparisonsCases {
+public class MultipleMutators_clean_onlyOptionalIsPresent {
 
 	public boolean isHardcoded(String input) {
 		return input.equals("hardcoded");
diff --git a/testlib/src/main/resources/java/cleanthat/MultipleMutators.dirty.java b/testlib/src/main/resources/java/cleanthat/MultipleMutators_dirty.java
similarity index 61%
rename from testlib/src/main/resources/java/cleanthat/MultipleMutators.dirty.java
rename to testlib/src/main/resources/java/cleanthat/MultipleMutators_dirty.java
index 8ac230cabc..e71b810e2f 100644
--- a/testlib/src/main/resources/java/cleanthat/MultipleMutators.dirty.java
+++ b/testlib/src/main/resources/java/cleanthat/MultipleMutators_dirty.java
@@ -1,8 +1,8 @@
-package eu.solven.cleanthat.engine.java.refactorer.cases.do_not_format_me;
+package java.cleanthat;
 
 import java.util.Optional;
 
-public class LiteralsFirstInComparisonsCases {
+public class MultipleMutators_dirty {
 
 	public boolean isHardcoded(String input) {
 		return input.equals("hardcoded");

From 78ccbc9f4847c292eff3ed17350bee8e746b0f61 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Mon, 27 Feb 2023 13:18:36 +0100
Subject: [PATCH 0844/2068] 1480: make TimedLogger package-private (PR
 feedback)

---
 CHANGES.md                                           |  1 -
 .../main/java/com/diffplug/spotless/npm/NodeApp.java |  2 --
 .../npm/NodeModulesCachingNpmProcessFactory.java     |  1 -
 .../java/com/diffplug/spotless/npm/NodeServeApp.java |  1 -
 .../spotless/npm/NpmFormatterStepStateBase.java      |  1 -
 .../com/diffplug/spotless/{ => npm}/TimedLogger.java |  6 ++++--
 .../diffplug/spotless/{ => npm}/TimedLoggerTest.java | 12 ++++++------
 7 files changed, 10 insertions(+), 14 deletions(-)
 rename lib/src/main/java/com/diffplug/spotless/{ => npm}/TimedLogger.java (98%)
 rename lib/src/test/java/com/diffplug/spotless/{ => npm}/TimedLoggerTest.java (95%)

diff --git a/CHANGES.md b/CHANGES.md
index c7526360c5..462f93cadb 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,7 +11,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* Introduce `TimedLogger` to allow for logging of time taken by a task using slf4j ([#1590](https://github.com/diffplug/spotless/pull/1590))
 * `npm`-based formatters now support caching of `node_modules` directory ([#1590](https://github.com/diffplug/spotless/pull/1590))
 ### Fixed
 * Reduce logging-noise created by `npm`-based formatters ([#1590](https://github.com/diffplug/spotless/pull/1590) fixes [#1582](https://github.com/diffplug/spotless/issues/1582))
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NodeApp.java b/lib/src/main/java/com/diffplug/spotless/npm/NodeApp.java
index 50ce8ccc5c..edac59bbfd 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NodeApp.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NodeApp.java
@@ -22,8 +22,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.diffplug.spotless.TimedLogger;
-
 public class NodeApp {
 
 	private static final Logger logger = LoggerFactory.getLogger(NodeApp.class);
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NodeModulesCachingNpmProcessFactory.java b/lib/src/main/java/com/diffplug/spotless/npm/NodeModulesCachingNpmProcessFactory.java
index a995aac59f..0086064194 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NodeModulesCachingNpmProcessFactory.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NodeModulesCachingNpmProcessFactory.java
@@ -25,7 +25,6 @@
 import org.slf4j.LoggerFactory;
 
 import com.diffplug.spotless.ProcessRunner.Result;
-import com.diffplug.spotless.TimedLogger;
 
 public class NodeModulesCachingNpmProcessFactory implements NpmProcessFactory {
 
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NodeServeApp.java b/lib/src/main/java/com/diffplug/spotless/npm/NodeServeApp.java
index d811515971..c9311a5589 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NodeServeApp.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NodeServeApp.java
@@ -21,7 +21,6 @@
 import org.slf4j.LoggerFactory;
 
 import com.diffplug.spotless.ProcessRunner;
-import com.diffplug.spotless.TimedLogger;
 
 public class NodeServeApp extends NodeApp {
 
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
index e4a8dd0fcb..3f262c813c 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
@@ -34,7 +34,6 @@
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.ProcessRunner.LongRunningProcess;
 import com.diffplug.spotless.ThrowingEx;
-import com.diffplug.spotless.TimedLogger;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
diff --git a/lib/src/main/java/com/diffplug/spotless/TimedLogger.java b/lib/src/main/java/com/diffplug/spotless/npm/TimedLogger.java
similarity index 98%
rename from lib/src/main/java/com/diffplug/spotless/TimedLogger.java
rename to lib/src/main/java/com/diffplug/spotless/npm/TimedLogger.java
index 2badd435d2..537234fcee 100644
--- a/lib/src/main/java/com/diffplug/spotless/TimedLogger.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/TimedLogger.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.diffplug.spotless;
+package com.diffplug.spotless.npm;
 
 import static com.diffplug.spotless.LazyArgLogger.lazy;
 
@@ -25,10 +25,12 @@
 
 import org.slf4j.Logger;
 
+import com.diffplug.spotless.ThrowingEx;
+
 /**
  * A logger that logs the time it took to execute a block of code.
  */
-public class TimedLogger {
+class TimedLogger {
 
 	public static final String MESSAGE_PREFIX_BEGIN = "[BEGIN] ";
 
diff --git a/lib/src/test/java/com/diffplug/spotless/TimedLoggerTest.java b/lib/src/test/java/com/diffplug/spotless/npm/TimedLoggerTest.java
similarity index 95%
rename from lib/src/test/java/com/diffplug/spotless/TimedLoggerTest.java
rename to lib/src/test/java/com/diffplug/spotless/npm/TimedLoggerTest.java
index cb36bbfbc0..f08d4f1622 100644
--- a/lib/src/test/java/com/diffplug/spotless/TimedLoggerTest.java
+++ b/lib/src/test/java/com/diffplug/spotless/npm/TimedLoggerTest.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.diffplug.spotless;
+package com.diffplug.spotless.npm;
 
-import static com.diffplug.spotless.TimedLogger.MESSAGE_PREFIX_BEGIN;
-import static com.diffplug.spotless.TimedLogger.MESSAGE_PREFIX_END;
-import static com.diffplug.spotless.TimedLogger.MESSAGE_SUFFIX_TOOK;
+import static com.diffplug.spotless.npm.TimedLogger.MESSAGE_PREFIX_BEGIN;
+import static com.diffplug.spotless.npm.TimedLogger.MESSAGE_PREFIX_END;
+import static com.diffplug.spotless.npm.TimedLogger.MESSAGE_SUFFIX_TOOK;
 
 import java.util.Arrays;
 import java.util.LinkedList;
@@ -31,7 +31,7 @@
 import org.slf4j.event.Level;
 import org.slf4j.helpers.LegacyAbstractLogger;
 
-import com.diffplug.spotless.TimedLogger.TestTicker;
+import com.diffplug.spotless.npm.TimedLogger.TestTicker;
 
 class TimedLoggerTest {
 
@@ -49,7 +49,7 @@ void setUp() {
 	}
 
 	@Test
-	void itDoesNotLogWhenLevelDisabled() throws InterruptedException {
+	void itDoesNotLogWhenLevelDisabled() {
 
 		TestLogger logger = new TestLogger() {
 			@Override

From a601efc10714797a0324ed280f0578176752b84b Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 27 Feb 2023 15:05:20 -0800
Subject: [PATCH 0845/2068] Revert "Less errors in equoIde"

This reverts commit cd2ff0f345f854f44a87f0944f400c98031b5f8c.
---
 .../maven/java/CleanthatJavaRefactorerTest.java      | 12 ++++++------
 .../cleanthat/LiteralsFirstInComparisons.clean.java  |  8 ++++++++
 .../cleanthat/LiteralsFirstInComparisons.dirty.java  |  8 ++++++++
 .../cleanthat/LiteralsFirstInComparisons_clean.java  |  8 --------
 .../cleanthat/LiteralsFirstInComparisons_dirty.java  |  8 --------
 ...tators_clean.java => MultipleMutators.clean.java} |  4 ++--
 ...=> MultipleMutators.clean.onlyLiteralsFirst.java} |  4 ++--
 ...ultipleMutators.clean.onlyOptionalIsPresent.java} |  4 ++--
 ...tators_dirty.java => MultipleMutators.dirty.java} |  4 ++--
 9 files changed, 30 insertions(+), 30 deletions(-)
 create mode 100644 testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons.clean.java
 create mode 100644 testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons.dirty.java
 delete mode 100644 testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons_clean.java
 delete mode 100644 testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons_dirty.java
 rename testlib/src/main/resources/java/cleanthat/{MultipleMutators_clean.java => MultipleMutators.clean.java} (62%)
 rename testlib/src/main/resources/java/cleanthat/{MultipleMutators_clean_onlyLiteralsFirst.java => MultipleMutators.clean.onlyLiteralsFirst.java} (61%)
 rename testlib/src/main/resources/java/cleanthat/{MultipleMutators_clean_onlyOptionalIsPresent.java => MultipleMutators.clean.onlyOptionalIsPresent.java} (62%)
 rename testlib/src/main/resources/java/cleanthat/{MultipleMutators_dirty.java => MultipleMutators.dirty.java} (61%)

diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java
index 67a4c2efb2..379397f55b 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java
@@ -33,7 +33,7 @@ void testEnableDraft() throws Exception {
 				"  <includeDraft>true</includeDraft>",
 				"</cleanthat>");
 
-		runTest("MultipleMutators_dirty.java", "MultipleMutators_clean_onlyOptionalIsPresent.java");
+		runTest("MultipleMutators.dirty.java", "MultipleMutators.clean.onlyOptionalIsPresent.java");
 	}
 
 	@Test
@@ -45,7 +45,7 @@ void testLiteralsFirstInComparisons() throws Exception {
 				"  </mutators>",
 				"</cleanthat>");
 
-		runTest("LiteralsFirstInComparisons_dirty.java", "LiteralsFirstInComparisons_clean.java");
+		runTest("LiteralsFirstInComparisons.dirty.java", "LiteralsFirstInComparisons.clean.java");
 	}
 
 	@Test
@@ -59,7 +59,7 @@ void testMultipleMutators_defaultIsJdk7() throws Exception {
 				"  </mutators>",
 				"</cleanthat>");
 
-		runTest("MultipleMutators_dirty.java", "MultipleMutators_clean_onlyLiteralsFirst.java");
+		runTest("MultipleMutators.dirty.java", "MultipleMutators.clean.onlyLiteralsFirst.java");
 	}
 
 	@Test
@@ -73,7 +73,7 @@ void testMultipleMutators_Jdk11IntroducedOptionalisPresent() throws Exception {
 				"  </mutators>",
 				"</cleanthat>");
 
-		runTest("MultipleMutators_dirty.java", "MultipleMutators_clean.java");
+		runTest("MultipleMutators.dirty.java", "MultipleMutators.clean.java");
 	}
 
 	@Test
@@ -89,7 +89,7 @@ void testExcludeOptionalNotEmpty() throws Exception {
 				"  </excludedMutators>",
 				"</cleanthat>");
 
-		runTest("MultipleMutators_dirty.java", "MultipleMutators_clean_onlyLiteralsFirst.java");
+		runTest("MultipleMutators.dirty.java", "MultipleMutators.clean.onlyLiteralsFirst.java");
 	}
 
 	@Test
@@ -101,7 +101,7 @@ void testIncludeOnlyLiteralsFirstInComparisons() throws Exception {
 				"  </mutators>",
 				"</cleanthat>");
 
-		runTest("MultipleMutators_dirty.java", "MultipleMutators_clean_onlyLiteralsFirst.java");
+		runTest("MultipleMutators.dirty.java", "MultipleMutators.clean.onlyLiteralsFirst.java");
 	}
 
 	private void runTest(String dirtyPath, String cleanPath) throws Exception {
diff --git a/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons.clean.java b/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons.clean.java
new file mode 100644
index 0000000000..8bacfa58db
--- /dev/null
+++ b/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons.clean.java
@@ -0,0 +1,8 @@
+package eu.solven.cleanthat.engine.java.refactorer.cases.do_not_format_me;
+
+public class LiteralsFirstInComparisonsCases {
+
+	public boolean isHardcoded(String input) {
+		return "hardcoded".equals(input);
+	}
+}
diff --git a/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons.dirty.java b/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons.dirty.java
new file mode 100644
index 0000000000..3a1e074c91
--- /dev/null
+++ b/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons.dirty.java
@@ -0,0 +1,8 @@
+package eu.solven.cleanthat.engine.java.refactorer.cases.do_not_format_me;
+
+public class LiteralsFirstInComparisonsCases {
+
+	public boolean isHardcoded(String input) {
+		return input.equals("hardcoded");
+	}
+}
diff --git a/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons_clean.java b/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons_clean.java
deleted file mode 100644
index 07807a6721..0000000000
--- a/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons_clean.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package java.cleanthat;
-
-public class LiteralsFirstInComparisons_clean {
-
-	public boolean isHardcoded(String input) {
-		return "hardcoded".equals(input);
-	}
-}
diff --git a/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons_dirty.java b/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons_dirty.java
deleted file mode 100644
index 249b8da8b3..0000000000
--- a/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons_dirty.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package java.cleanthat;
-
-public class LiteralsFirstInComparisons_dirty {
-
-	public boolean isHardcoded(String input) {
-		return input.equals("hardcoded");
-	}
-}
diff --git a/testlib/src/main/resources/java/cleanthat/MultipleMutators_clean.java b/testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.java
similarity index 62%
rename from testlib/src/main/resources/java/cleanthat/MultipleMutators_clean.java
rename to testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.java
index 76837b6893..318e1efa15 100644
--- a/testlib/src/main/resources/java/cleanthat/MultipleMutators_clean.java
+++ b/testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.java
@@ -1,8 +1,8 @@
-package java.cleanthat;
+package eu.solven.cleanthat.engine.java.refactorer.cases.do_not_format_me;
 
 import java.util.Optional;
 
-public class MultipleMutators_clean {
+public class LiteralsFirstInComparisonsCases {
 
 	public boolean isHardcoded(String input) {
 		return "hardcoded".equals(input);
diff --git a/testlib/src/main/resources/java/cleanthat/MultipleMutators_clean_onlyLiteralsFirst.java b/testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.onlyLiteralsFirst.java
similarity index 61%
rename from testlib/src/main/resources/java/cleanthat/MultipleMutators_clean_onlyLiteralsFirst.java
rename to testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.onlyLiteralsFirst.java
index d9fb87dd80..629d24504b 100644
--- a/testlib/src/main/resources/java/cleanthat/MultipleMutators_clean_onlyLiteralsFirst.java
+++ b/testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.onlyLiteralsFirst.java
@@ -1,8 +1,8 @@
-package java.cleanthat;
+package eu.solven.cleanthat.engine.java.refactorer.cases.do_not_format_me;
 
 import java.util.Optional;
 
-public class MultipleMutators_clean_onlyLiteralsFirst {
+public class LiteralsFirstInComparisonsCases {
 
 	public boolean isHardcoded(String input) {
 		return "hardcoded".equals(input);
diff --git a/testlib/src/main/resources/java/cleanthat/MultipleMutators_clean_onlyOptionalIsPresent.java b/testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.onlyOptionalIsPresent.java
similarity index 62%
rename from testlib/src/main/resources/java/cleanthat/MultipleMutators_clean_onlyOptionalIsPresent.java
rename to testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.onlyOptionalIsPresent.java
index 54600ebc1c..0829602dc1 100644
--- a/testlib/src/main/resources/java/cleanthat/MultipleMutators_clean_onlyOptionalIsPresent.java
+++ b/testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.onlyOptionalIsPresent.java
@@ -1,8 +1,8 @@
-package java.cleanthat;
+package eu.solven.cleanthat.engine.java.refactorer.cases.do_not_format_me;
 
 import java.util.Optional;
 
-public class MultipleMutators_clean_onlyOptionalIsPresent {
+public class LiteralsFirstInComparisonsCases {
 
 	public boolean isHardcoded(String input) {
 		return input.equals("hardcoded");
diff --git a/testlib/src/main/resources/java/cleanthat/MultipleMutators_dirty.java b/testlib/src/main/resources/java/cleanthat/MultipleMutators.dirty.java
similarity index 61%
rename from testlib/src/main/resources/java/cleanthat/MultipleMutators_dirty.java
rename to testlib/src/main/resources/java/cleanthat/MultipleMutators.dirty.java
index e71b810e2f..8ac230cabc 100644
--- a/testlib/src/main/resources/java/cleanthat/MultipleMutators_dirty.java
+++ b/testlib/src/main/resources/java/cleanthat/MultipleMutators.dirty.java
@@ -1,8 +1,8 @@
-package java.cleanthat;
+package eu.solven.cleanthat.engine.java.refactorer.cases.do_not_format_me;
 
 import java.util.Optional;
 
-public class MultipleMutators_dirty {
+public class LiteralsFirstInComparisonsCases {
 
 	public boolean isHardcoded(String input) {
 		return input.equals("hardcoded");

From 5560214545a3d2655298bcb50691c1bf9325dc7f Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 27 Feb 2023 15:08:12 -0800
Subject: [PATCH 0846/2068] Rename `.java` to `.test` to match other java
 formatters.

---
 .../spotless/CleanthatJavaIntegrationTest.java     |  4 ++--
 .../maven/java/CleanthatJavaRefactorerTest.java    | 14 +++++++-------
 ....java => LiteralsFirstInComparisons.clean.test} |  0
 ....java => LiteralsFirstInComparisons.dirty.test} |  0
 ... MultipleMutators.clean.onlyLiteralsFirst.test} |  0
 ...tipleMutators.clean.onlyOptionalIsPresent.test} |  0
 ...tors.clean.java => MultipleMutators.clean.test} |  0
 ...tors.dirty.java => MultipleMutators.dirty.test} |  0
 8 files changed, 9 insertions(+), 9 deletions(-)
 rename testlib/src/main/resources/java/cleanthat/{LiteralsFirstInComparisons.clean.java => LiteralsFirstInComparisons.clean.test} (100%)
 rename testlib/src/main/resources/java/cleanthat/{LiteralsFirstInComparisons.dirty.java => LiteralsFirstInComparisons.dirty.test} (100%)
 rename testlib/src/main/resources/java/cleanthat/{MultipleMutators.clean.onlyLiteralsFirst.java => MultipleMutators.clean.onlyLiteralsFirst.test} (100%)
 rename testlib/src/main/resources/java/cleanthat/{MultipleMutators.clean.onlyOptionalIsPresent.java => MultipleMutators.clean.onlyOptionalIsPresent.test} (100%)
 rename testlib/src/main/resources/java/cleanthat/{MultipleMutators.clean.java => MultipleMutators.clean.test} (100%)
 rename testlib/src/main/resources/java/cleanthat/{MultipleMutators.dirty.java => MultipleMutators.dirty.test} (100%)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/CleanthatJavaIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/CleanthatJavaIntegrationTest.java
index 581bfe89b2..ad6fff9112 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/CleanthatJavaIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/CleanthatJavaIntegrationTest.java
@@ -37,8 +37,8 @@ void integration() throws IOException {
 				"    }",
 				"}");
 
-		setFile("test.java").toResource("java/cleanthat/MultipleMutators.dirty.java");
+		setFile("test.java").toResource("java/cleanthat/MultipleMutators.dirty.test");
 		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("test.java").sameAsResource("java/cleanthat/MultipleMutators.clean.java");
+		assertFile("test.java").sameAsResource("java/cleanthat/MultipleMutators.clean.test");
 	}
 }
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java
index 379397f55b..738624cd57 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.diffplug.spotless.maven.java;
+package com.diffplug.spotless.maven.test;
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -33,7 +33,7 @@ void testEnableDraft() throws Exception {
 				"  <includeDraft>true</includeDraft>",
 				"</cleanthat>");
 
-		runTest("MultipleMutators.dirty.java", "MultipleMutators.clean.onlyOptionalIsPresent.java");
+		runTest("MultipleMutators.dirty.test", "MultipleMutators.clean.onlyOptionalIsPresent.test");
 	}
 
 	@Test
@@ -45,7 +45,7 @@ void testLiteralsFirstInComparisons() throws Exception {
 				"  </mutators>",
 				"</cleanthat>");
 
-		runTest("LiteralsFirstInComparisons.dirty.java", "LiteralsFirstInComparisons.clean.java");
+		runTest("LiteralsFirstInComparisons.dirty.test", "LiteralsFirstInComparisons.clean.test");
 	}
 
 	@Test
@@ -59,7 +59,7 @@ void testMultipleMutators_defaultIsJdk7() throws Exception {
 				"  </mutators>",
 				"</cleanthat>");
 
-		runTest("MultipleMutators.dirty.java", "MultipleMutators.clean.onlyLiteralsFirst.java");
+		runTest("MultipleMutators.dirty.test", "MultipleMutators.clean.onlyLiteralsFirst.test");
 	}
 
 	@Test
@@ -73,7 +73,7 @@ void testMultipleMutators_Jdk11IntroducedOptionalisPresent() throws Exception {
 				"  </mutators>",
 				"</cleanthat>");
 
-		runTest("MultipleMutators.dirty.java", "MultipleMutators.clean.java");
+		runTest("MultipleMutators.dirty.test", "MultipleMutators.clean.test");
 	}
 
 	@Test
@@ -89,7 +89,7 @@ void testExcludeOptionalNotEmpty() throws Exception {
 				"  </excludedMutators>",
 				"</cleanthat>");
 
-		runTest("MultipleMutators.dirty.java", "MultipleMutators.clean.onlyLiteralsFirst.java");
+		runTest("MultipleMutators.dirty.test", "MultipleMutators.clean.onlyLiteralsFirst.test");
 	}
 
 	@Test
@@ -101,7 +101,7 @@ void testIncludeOnlyLiteralsFirstInComparisons() throws Exception {
 				"  </mutators>",
 				"</cleanthat>");
 
-		runTest("MultipleMutators.dirty.java", "MultipleMutators.clean.onlyLiteralsFirst.java");
+		runTest("MultipleMutators.dirty.test", "MultipleMutators.clean.onlyLiteralsFirst.test");
 	}
 
 	private void runTest(String dirtyPath, String cleanPath) throws Exception {
diff --git a/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons.clean.java b/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons.clean.test
similarity index 100%
rename from testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons.clean.java
rename to testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons.clean.test
diff --git a/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons.dirty.java b/testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons.dirty.test
similarity index 100%
rename from testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons.dirty.java
rename to testlib/src/main/resources/java/cleanthat/LiteralsFirstInComparisons.dirty.test
diff --git a/testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.onlyLiteralsFirst.java b/testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.onlyLiteralsFirst.test
similarity index 100%
rename from testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.onlyLiteralsFirst.java
rename to testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.onlyLiteralsFirst.test
diff --git a/testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.onlyOptionalIsPresent.java b/testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.onlyOptionalIsPresent.test
similarity index 100%
rename from testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.onlyOptionalIsPresent.java
rename to testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.onlyOptionalIsPresent.test
diff --git a/testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.java b/testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.test
similarity index 100%
rename from testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.java
rename to testlib/src/main/resources/java/cleanthat/MultipleMutators.clean.test
diff --git a/testlib/src/main/resources/java/cleanthat/MultipleMutators.dirty.java b/testlib/src/main/resources/java/cleanthat/MultipleMutators.dirty.test
similarity index 100%
rename from testlib/src/main/resources/java/cleanthat/MultipleMutators.dirty.java
rename to testlib/src/main/resources/java/cleanthat/MultipleMutators.dirty.test

From 78e00498120b9dbce12510982995b2783d0b026c Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az419-625.13cqfybjcexuves4lhs43phv1h.bx.internal.cloudapp.net>
Date: Mon, 27 Feb 2023 23:15:13 +0000
Subject: [PATCH 0847/2068] Published lib/2.36.0

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 87af50c159..53ceeedfaf 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.36.0] - 2023-02-27
 ### Added
 * `gradlew equoIde` opens a repeatable clean Spotless dev environment. ([#1523](https://github.com/diffplug/spotless/pull/1523))
 * `cleanthat` added `includeDraft` option, to include draft mutators from composite mutators. ([#1574](https://github.com/diffplug/spotless/pull/1574))

From c4d612d125e668231f428697014c6abc78b39336 Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az419-625.13cqfybjcexuves4lhs43phv1h.bx.internal.cloudapp.net>
Date: Mon, 27 Feb 2023 23:16:43 +0000
Subject: [PATCH 0848/2068] Published gradle/6.16.0

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 50 ++++++++++++++++++++--------------------
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 41bb70e556..c19a7de733 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [6.16.0] - 2023-02-27
 ### Added
 * `cleanthat` now has `includeDraft` option, to include draft mutators from composite mutators. ([#1574](https://github.com/diffplug/spotless/pull/1574))
 * `npm`-based formatters (`prettier`, `tsfmt` and `eslint`) now support caching of `node_modules` directory.
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 6c181c9330..b66d423e6b 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -14,9 +14,9 @@ output = [
   ].join('\n');
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
-[![Changelog](https://img.shields.io/badge/changelog-6.15.0-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-6.16.0-blue.svg)](CHANGES.md)
 [![Maven central](https://img.shields.io/badge/mavencentral-here-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/index.html)
 
 [![VS Code plugin](https://img.shields.io/badge/IDE-VS_Code-blueviolet.svg)](https://marketplace.visualstudio.com/items?itemName=richardwillis.vscode-spotless-gradle)
 [![IntelliJ plugin](https://img.shields.io/badge/IDE-IntelliJ-blueviolet.svg)](https://plugins.jetbrains.com/plugin/18321-spotless-gradle)
@@ -123,10 +123,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -138,7 +138,7 @@ If you're stuck on an older version of Gradle, `id 'com.diffplug.gradle.spotless
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -282,8 +282,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -334,8 +334,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -406,7 +406,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -438,7 +438,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -470,7 +470,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -504,7 +504,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -525,7 +525,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -550,7 +550,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -590,7 +590,7 @@ sql.formatter.indent.size=4
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -683,7 +683,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## Javascript
 
-- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
+- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
 
 ```gradle
 spotless {
@@ -747,7 +747,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -822,7 +822,7 @@ spotless {
 
 ## YAML
 
-- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
+- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
 
 ```gradle
 spotless {
@@ -1049,7 +1049,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -1122,9 +1122,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -1157,11 +1157,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.15.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From d95083d260138f09005fdcfc452c3d763bd193a3 Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az419-625.13cqfybjcexuves4lhs43phv1h.bx.internal.cloudapp.net>
Date: Mon, 27 Feb 2023 23:18:45 +0000
Subject: [PATCH 0849/2068] Published maven/2.34.0

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index f39449fb15..36a51d6ef2 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.34.0] - 2023-02-27
 ### Added
 * `cleanthat` added `includeDraft` option, to include draft mutators from composite mutators. ([#1574](https://github.com/diffplug/spotless/pull/1574))
 * `npm`-based formatters (`prettier`, `tsfmt` and `eslint`) now support caching of `node_modules` directory.
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index c91c73f80a..426b00184e 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -8,8 +8,8 @@ output = [
   ].join('\n');
 -->
 [![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Changelog](https://img.shields.io/badge/changelog-2.33.0-blue.svg)](CHANGES.md)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.33.0/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.34.0-blue.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.34.0/index.html)
 <!---freshmark /shields -->
 
 <!---freshmark javadoc

From 7de2dfada1e7b64e22b9a42d72f52b6d6c9d6491 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 27 Feb 2023 15:29:16 -0800
Subject: [PATCH 0850/2068] Update changelog.

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 53ceeedfaf..8540a44851 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Changes
+* We are now opting in to Gradle's new stable configuration cache. ([#1591](https://github.com/diffplug/spotless/pull/1591))
 
 ## [2.36.0] - 2023-02-27
 ### Added

From 66dc2cc1aa456f35c259ceefb133552ee7f86fd0 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 27 Feb 2023 16:10:09 -0800
Subject: [PATCH 0851/2068] Update build to latest.

---
 lib-extra/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index b24f3ed5cc..149ecad08f 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -1,6 +1,6 @@
 plugins {
 	id 'java-library'
-	id 'dev.equo.p2deps' version '0.12.1'
+	id 'dev.equo.p2deps'
 }
 ext.artifactId = project.artifactIdLibExtra
 version = rootProject.spotlessChangelog.versionNext
@@ -16,7 +16,7 @@ dependencies {
 	implementation "org.eclipse.jgit:org.eclipse.jgit:${VER_JGIT}"
 	implementation "com.googlecode.concurrent-trees:concurrent-trees:2.6.1"
 	// for eclipse
-	implementation "dev.equo.ide:solstice:0.11.0"
+	implementation "dev.equo.ide:solstice:0.17.0"
 
 	// testing
 	testImplementation project(':testlib')

From 5a22a9097e54db081ff6cdc6af4ec1496a7a4f99 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 28 Feb 2023 05:26:08 +0000
Subject: [PATCH 0852/2068] chore(deps): update plugin com.diffplug.spotless to
 v6.16.0

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 17a9679abd..1478f5af31 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-	id 'com.diffplug.spotless' version '6.15.0' apply false
+	id 'com.diffplug.spotless' version '6.16.0' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
 	id 'com.gradle.plugin-publish' version '1.1.0' apply false
 	// https://github.com/gradle-nexus/publish-plugin/releases

From 6b1109abd3f2f9cd64116f5efdf53d6733de90e7 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Wed, 1 Mar 2023 22:21:39 +0400
Subject: [PATCH 0853/2068] RemoveUnusedImport may rely on Cleamthat

---
 lib/build.gradle                              |  11 +-
 .../java/JavaCleanthatRefactorerFunc.java     |   3 +-
 .../spotless/java/CleanthatJavaStep.java      |  21 +---
 .../JavaparserRemoveUnusedImportsStep.java    | 104 ------------------
 .../java/RemoveUnusedImportsStep.java         |  35 ++++--
 .../Jdk17MultineStringBlockFormatted.test     |   1 +
 ...ortsStep_withCleanthatJavaparserTest.java} |   6 +-
 ...ImportsStep_withGoogleJavaFormatTest.java} |   6 +-
 8 files changed, 45 insertions(+), 142 deletions(-)
 delete mode 100644 lib/src/main/java/com/diffplug/spotless/java/JavaparserRemoveUnusedImportsStep.java
 rename testlib/src/test/java/com/diffplug/spotless/java/{JavaparserRemoveUnusedImportsStepTest.java => RemoveUnusedImportsStep_withCleanthatJavaparserTest.java} (87%)
 rename testlib/src/test/java/com/diffplug/spotless/java/{RemoveUnusedImportsStepTest.java => RemoveUnusedImportsStep_withGoogleJavaFormatTest.java} (88%)

diff --git a/lib/build.gradle b/lib/build.gradle
index 25a3942a03..4c01d46ec7 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -17,8 +17,7 @@ def NEEDS_GLUE = [
 	'scalafmt',
 	'jackson',
 	'gson',
-	'cleanthat',
-	'javaparser'
+	'cleanthat'
 ]
 for (glue in NEEDS_GLUE) {
 	sourceSets.register(glue) {
@@ -109,11 +108,9 @@ dependencies {
 
 	gsonCompileOnly 'com.google.code.gson:gson:2.10.1'
 
-	cleanthatCompileOnly 'io.github.solven-eu.cleanthat:java:2.6'
-	compatCleanthat2Dot1CompileAndTestOnly 'io.github.solven-eu.cleanthat:java:2.6'
-
-	javaparserCompileOnly 'com.github.javaparser:javaparser-core:3.25.0'
-	javaparserCompileOnly 'org.slf4j:slf4j-api:2.0.6'
+	String VER_CLEANTHAT="2.7"
+	cleanthatCompileOnly "io.github.solven-eu.cleanthat:java:$VER_CLEANTHAT"
+	compatCleanthat2Dot1CompileAndTestOnly "io.github.solven-eu.cleanthat:java:$VER_CLEANTHAT"
 }
 
 // we'll hold the core lib to a high standard
diff --git a/lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java b/lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java
index d7148f8892..1137604264 100644
--- a/lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java
+++ b/lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java
@@ -88,8 +88,7 @@ private String doApply(String input) throws InterruptedException, IOException {
 		LOGGER.debug("Processing sourceJdk={} included={} excluded={}", jdkVersion, included, excluded, includeDraft);
 		LOGGER.debug("Available mutators: {}", JavaRefactorer.getAllIncluded());
 
-		// Spotless calls steps always with LF eol.
-		return refactorer.doFormat(input, LineEnding.LF);
+		return refactorer.doFormat(input);
 	}
 
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
index c1e5ae1fa4..2f30006e5e 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
@@ -40,7 +40,7 @@ public final class CleanthatJavaStep {
 	private static final String MAVEN_COORDINATE = "io.github.solven-eu.cleanthat:java";
 
 	// CleanThat changelog is available at https://github.com/solven-eu/cleanthat/blob/master/CHANGES.MD
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "2.6");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "2.7");
 
 	// prevent direct instantiation
 	private CleanthatJavaStep() {}
@@ -131,10 +131,7 @@ static final class JavaRefactorerState implements Serializable {
 				List<String> excluded,
 				boolean includeDraft,
 				Provisioner provisioner) throws IOException {
-			// https://github.com/diffplug/spotless/issues/1583
-			if (!version.endsWith("-SNAPSHOT")) {
-				JVM_SUPPORT.assertFormatterSupported(version);
-			}
+			JVM_SUPPORT.assertFormatterSupported(version);
 			ModuleHelper.doOpenInternalPackagesIfRequired();
 			this.jarState = JarState.from(groupArtifact + ":" + version, provisioner);
 			this.stepName = stepName;
@@ -162,17 +159,9 @@ FormatterFunc createFormat() {
 				throw new IllegalStateException("Issue executing the formatter", e);
 			}
 
-			// https://github.com/diffplug/spotless/issues/1583
-			if (!version.endsWith("-SNAPSHOT")) {
-				return JVM_SUPPORT.suggestLaterVersionOnError(version, input -> {
-					return (String) formatterMethod.invoke(formatter, input);
-				});
-			} else {
-				return input -> {
-					return (String) formatterMethod.invoke(formatter, input);
-				};
-			}
+			return JVM_SUPPORT.suggestLaterVersionOnError(version, input -> {
+				return (String) formatterMethod.invoke(formatter, input);
+			});
 		}
-
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/java/JavaparserRemoveUnusedImportsStep.java b/lib/src/main/java/com/diffplug/spotless/java/JavaparserRemoveUnusedImportsStep.java
deleted file mode 100644
index 1399498afb..0000000000
--- a/lib/src/main/java/com/diffplug/spotless/java/JavaparserRemoveUnusedImportsStep.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright 2023 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.java;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.util.Objects;
-
-import com.diffplug.spotless.FormatterFunc;
-import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.JarState;
-import com.diffplug.spotless.Provisioner;
-
-/** Uses java-parser, but only to remove unused imports. */
-public class JavaparserRemoveUnusedImportsStep {
-	private static final String MAVEN_COORDINATE = "com.github.javaparser:javaparser-core";
-
-	// prevent direct instantiation
-	private JavaparserRemoveUnusedImportsStep() {}
-
-	static final String NAME = "removeUnusedImports_javaParser";
-
-	public static FormatterStep create(Provisioner provisioner) {
-		return create(defaultGroupArtifact(), JavaparserRemoveUnusedImportsStep.defaultVersion(), provisioner);
-	}
-
-	/** Creates a step which apply selected CleanThat mutators. */
-	public static FormatterStep create(String groupArtifact,
-			String version,
-			Provisioner provisioner) {
-		Objects.requireNonNull(groupArtifact, "groupArtifact");
-		if (groupArtifact.chars().filter(ch -> ch == ':').count() != 1) {
-			throw new IllegalArgumentException("groupArtifact must be in the form 'groupId:artifactId'. It was: " + groupArtifact);
-		}
-		Objects.requireNonNull(version, "version");
-		Objects.requireNonNull(provisioner, "provisioner");
-		return FormatterStep.createLazy(NAME,
-				() -> new JavaParserUnusedImportsState(groupArtifact, version, provisioner),
-				JavaparserRemoveUnusedImportsStep.JavaParserUnusedImportsState::createFormat);
-	}
-
-	/** Get default formatter version */
-	public static String defaultVersion() {
-		return "3.25.0";
-	}
-
-	public static String defaultGroupArtifact() {
-		return MAVEN_COORDINATE;
-	}
-
-	static final class JavaParserUnusedImportsState implements Serializable {
-		private static final long serialVersionUID = 1L;
-
-		final JarState jarState;
-
-		JavaParserUnusedImportsState(String version, Provisioner provisioner) throws IOException {
-			this(MAVEN_COORDINATE, version, provisioner);
-		}
-
-		JavaParserUnusedImportsState(
-				String groupArtifact,
-				String version,
-				Provisioner provisioner) throws IOException {
-			ModuleHelper.doOpenInternalPackagesIfRequired();
-			this.jarState = JarState.from(groupArtifact + ":" + version, provisioner);
-		}
-
-		@SuppressWarnings("PMD.UseProperClassLoader")
-		FormatterFunc createFormat() {
-			ClassLoader classLoader = jarState.getClassLoader();
-
-			Object formatter;
-			Method formatterMethod;
-			try {
-				Class<?> formatterClazz = classLoader.loadClass("com.diffplug.spotless.glue.java.JavaparserRemoveUnusedImportsFunc");
-				Constructor<?> formatterConstructor = formatterClazz.getConstructor();
-
-				formatter = formatterConstructor.newInstance();
-				formatterMethod = formatterClazz.getMethod("apply", String.class);
-			} catch (ReflectiveOperationException e) {
-				throw new IllegalStateException("Issue executing the formatter", e);
-			}
-			return input -> {
-				return (String) formatterMethod.invoke(formatter, input);
-			};
-		}
-
-	}
-}
diff --git a/lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java b/lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java
index 91ce3cc023..3f07b01549 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,22 +15,43 @@
  */
 package com.diffplug.spotless.java;
 
+import java.util.Arrays;
 import java.util.Objects;
 
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.Provisioner;
 
-/** Uses google-java-format, but only to remove unused imports. */
+/** Uses google-java-format or cleanthat.UnnecessaryImport, but only to remove unused imports. */
 public class RemoveUnusedImportsStep {
+	static final String NAME = "removeUnusedImports";
+
+	static final String GJF = "google-java-format";
+	static final String CLEANTHAT = "cleanthat-javaparser-unnecessaryimport";
+
+	// https://github.com/solven-eu/cleanthat/blob/master/java/src/main/java/eu/solven/cleanthat/engine/java/refactorer/mutators/UnnecessaryImport.java
+	private static final String CLEANTHAT_MUTATOR = "UnnecessaryImport";
+
 	// prevent direct instantiation
 	private RemoveUnusedImportsStep() {}
 
-	static final String NAME = "removeUnusedImports";
-
 	public static FormatterStep create(Provisioner provisioner) {
+		// The default importRemover is GJF
+		return create(GJF, provisioner);
+	}
+
+	public static FormatterStep create(String unusedImportRemover, Provisioner provisioner) {
 		Objects.requireNonNull(provisioner, "provisioner");
-		return FormatterStep.createLazy(NAME,
-				() -> new GoogleJavaFormatStep.State(NAME, GoogleJavaFormatStep.defaultVersion(), provisioner),
-				GoogleJavaFormatStep.State::createRemoveUnusedImportsOnly);
+
+		if (GJF.equals(unusedImportRemover)) {
+			return FormatterStep.createLazy(NAME,
+					() -> new GoogleJavaFormatStep.State(NAME, GoogleJavaFormatStep.defaultVersion(), provisioner),
+					GoogleJavaFormatStep.State::createRemoveUnusedImportsOnly);
+		} else if (CLEANTHAT.equals(unusedImportRemover)) {
+			return FormatterStep.createLazy(NAME,
+					() -> new CleanthatJavaStep.JavaRefactorerState(NAME, CleanthatJavaStep.defaultGroupArtifact(), CleanthatJavaStep.defaultVersion(), "99.9", Arrays.asList(CLEANTHAT_MUTATOR), Arrays.asList(), false, provisioner),
+					CleanthatJavaStep.JavaRefactorerState::createFormat);
+		} else {
+			throw new IllegalArgumentException("Invalid unusedImportRemover: " + unusedImportRemover);
+		}
 	}
 }
diff --git a/testlib/src/main/resources/java/removeunusedimports/Jdk17MultineStringBlockFormatted.test b/testlib/src/main/resources/java/removeunusedimports/Jdk17MultineStringBlockFormatted.test
index 91692463a6..d6abc3685c 100644
--- a/testlib/src/main/resources/java/removeunusedimports/Jdk17MultineStringBlockFormatted.test
+++ b/testlib/src/main/resources/java/removeunusedimports/Jdk17MultineStringBlockFormatted.test
@@ -2,6 +2,7 @@ package io.github.shafthq.shaft.tools.tms;
 
 
 
+import static io.restassured.RestAssured.*;
 
 public class XrayIntegrationHelper {
     private static String getLinkJIRATicketRequestBody() {
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/JavaparserRemoveUnusedImportsStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStep_withCleanthatJavaparserTest.java
similarity index 87%
rename from testlib/src/test/java/com/diffplug/spotless/java/JavaparserRemoveUnusedImportsStepTest.java
rename to testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStep_withCleanthatJavaparserTest.java
index e1681f2c79..70e466588f 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/JavaparserRemoveUnusedImportsStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStep_withCleanthatJavaparserTest.java
@@ -22,10 +22,10 @@
 import com.diffplug.spotless.StepHarness;
 import com.diffplug.spotless.TestProvisioner;
 
-class JavaparserRemoveUnusedImportsStepTest {
+class RemoveUnusedImportsStep_withCleanthatJavaparserTest {
 	@Test
 	void behavior() throws Exception {
-		FormatterStep step = JavaparserRemoveUnusedImportsStep.create(TestProvisioner.mavenCentral());
+		FormatterStep step = RemoveUnusedImportsStep.create(RemoveUnusedImportsStep.CLEANTHAT, TestProvisioner.mavenCentral());
 		StepHarness.forStep(step)
 				.testResource("java/removeunusedimports/JavaCodeUnformatted.test", "java/removeunusedimports/JavaCodeFormatted.test")
 				.testResource("java/removeunusedimports/JavaCodeWithLicenseUnformatted.test", "java/removeunusedimports/JavaCodeWithLicenseFormatted.test")
@@ -47,7 +47,7 @@ protected void setupTest(API api) {
 
 			@Override
 			protected FormatterStep create() {
-				return JavaparserRemoveUnusedImportsStep.create(TestProvisioner.mavenCentral());
+				return RemoveUnusedImportsStep.create(RemoveUnusedImportsStep.CLEANTHAT, TestProvisioner.mavenCentral());
 			}
 		}.testEquals();
 	}
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStep_withGoogleJavaFormatTest.java
similarity index 88%
rename from testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStepTest.java
rename to testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStep_withGoogleJavaFormatTest.java
index d3c0b55732..48815c3697 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStep_withGoogleJavaFormatTest.java
@@ -22,10 +22,10 @@
 import com.diffplug.spotless.StepHarness;
 import com.diffplug.spotless.TestProvisioner;
 
-class RemoveUnusedImportsStepTest {
+class RemoveUnusedImportsStep_withGoogleJavaFormatTest {
 	@Test
 	void behavior() throws Exception {
-		FormatterStep step = RemoveUnusedImportsStep.create(TestProvisioner.mavenCentral());
+		FormatterStep step = RemoveUnusedImportsStep.create(RemoveUnusedImportsStep.GJF, TestProvisioner.mavenCentral());
 		StepHarness.forStep(step)
 				.testResource("java/removeunusedimports/JavaCodeUnformatted.test", "java/removeunusedimports/JavaCodeFormatted.test")
 				.testResource("java/removeunusedimports/JavaCodeWithLicenseUnformatted.test", "java/removeunusedimports/JavaCodeWithLicenseFormatted.test")
@@ -46,7 +46,7 @@ protected void setupTest(API api) {
 
 			@Override
 			protected FormatterStep create() {
-				return RemoveUnusedImportsStep.create(TestProvisioner.mavenCentral());
+				return RemoveUnusedImportsStep.create(RemoveUnusedImportsStep.GJF, TestProvisioner.mavenCentral());
 			}
 		}.testEquals();
 	}

From 7a849bc76b45006f05ff050e831b535ab45826af Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Wed, 1 Mar 2023 22:44:04 +0400
Subject: [PATCH 0854/2068] Add tests, Add CHANGES entries

---
 .../java/RemoveUnusedImportsStep.java         |  4 ++++
 plugin-gradle/CHANGES.md                      |  2 ++
 .../gradle/spotless/JavaExtension.java        |  6 +++++-
 .../spotless/JavaDefaultTargetTest.java       | 20 ++++++++++++++++++-
 plugin-maven/CHANGES.md                       |  2 ++
 .../maven/java/RemoveUnusedImports.java       |  9 +++++++--
 ...tted.test => Jdk17TextBlockFormatted.test} |  0
 ...ed.test => Jdk17TextBlockUnformatted.test} |  0
 ...portsStep_withCleanthatJavaparserTest.java |  2 +-
 ...dImportsStep_withGoogleJavaFormatTest.java |  2 +-
 10 files changed, 41 insertions(+), 6 deletions(-)
 rename testlib/src/main/resources/java/removeunusedimports/{Jdk17MultineStringBlockFormatted.test => Jdk17TextBlockFormatted.test} (100%)
 rename testlib/src/main/resources/java/removeunusedimports/{Jdk17MultineStringBlockUnformatted.test => Jdk17TextBlockUnformatted.test} (100%)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java b/lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java
index 3f07b01549..a4c460e929 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java
@@ -34,6 +34,10 @@ public class RemoveUnusedImportsStep {
 	// prevent direct instantiation
 	private RemoveUnusedImportsStep() {}
 
+	public static final String defaultFormatter() {
+		return GJF;
+	}
+
 	public static FormatterStep create(Provisioner provisioner) {
 		// The default importRemover is GJF
 		return create(GJF, provisioner);
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index c19a7de733..a119827220 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Added
+* `removeUnusedImport` can be configured to rely on `cleanthat-javaparser-unnecessaryimport`. Default remains `google-java-format`. ([#1589](https://github.com/diffplug/spotless/pull/1589))
 
 ## [6.16.0] - 2023-02-27
 ### Added
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
index f351dd6188..b10295edd9 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
@@ -113,7 +113,11 @@ private FormatterStep createStep() {
 
 	/** Removes any unused imports. */
 	public void removeUnusedImports() {
-		addStep(RemoveUnusedImportsStep.create(provisioner()));
+		addStep(RemoveUnusedImportsStep.create(RemoveUnusedImportsStep.defaultFormatter(), provisioner()));
+	}
+
+	public void removeUnusedImports(String formatter) {
+		addStep(RemoveUnusedImportsStep.create(formatter, provisioner()));
 	}
 
 	/** Uses the <a href="https://github.com/google/google-java-format">google-java-format</a> jar to format source code. */
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavaDefaultTargetTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavaDefaultTargetTest.java
index 898008c27a..b80d49c164 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavaDefaultTargetTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavaDefaultTargetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -62,4 +62,22 @@ void multipleBlocksShouldWork() throws IOException {
 		gradleRunner().withArguments("spotlessApply").build();
 		gradleRunner().withArguments("spotlessApply").build();
 	}
+
+	@Test
+	void removeUnusedImportsWithCleanthat() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"  id 'com.diffplug.spotless'",
+				"  id 'java'",
+				"}",
+				"repositories { mavenCentral() }",
+				"",
+				"spotless {",
+				"  java {  removeUnusedImports('cleanthat-javaparser-unnecessaryimport')  }",
+				"}");
+
+		setFile("src/main/java/test.java").toResource("java/removeunusedimports/Jdk17TextBlockUnformatted.test");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("src/main/java/test.java").sameAsResource("java/removeunusedimports/Jdk17TextBlockFormatted.test");
+	}
 }
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 36a51d6ef2..081ca9f901 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* `removeUnusedImport` can be configured to rely on `cleanthat-javaparser-unnecessaryimport`. Default remains `google-java-format`. ([#1589](https://github.com/diffplug/spotless/pull/1589))
 
 ## [2.34.0] - 2023-02-27
 ### Added
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/RemoveUnusedImports.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/RemoveUnusedImports.java
index 54fd30a167..85c6bbb8fe 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/RemoveUnusedImports.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/RemoveUnusedImports.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
  */
 package com.diffplug.spotless.maven.java;
 
+import org.apache.maven.plugins.annotations.Parameter;
+
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.java.RemoveUnusedImportsStep;
 import com.diffplug.spotless.maven.FormatterStepConfig;
@@ -22,8 +24,11 @@
 
 public class RemoveUnusedImports implements FormatterStepFactory {
 
+	@Parameter
+	private String engine = RemoveUnusedImportsStep.defaultFormatter();
+
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig config) {
-		return RemoveUnusedImportsStep.create(config.getProvisioner());
+		return RemoveUnusedImportsStep.create(engine, config.getProvisioner());
 	}
 }
diff --git a/testlib/src/main/resources/java/removeunusedimports/Jdk17MultineStringBlockFormatted.test b/testlib/src/main/resources/java/removeunusedimports/Jdk17TextBlockFormatted.test
similarity index 100%
rename from testlib/src/main/resources/java/removeunusedimports/Jdk17MultineStringBlockFormatted.test
rename to testlib/src/main/resources/java/removeunusedimports/Jdk17TextBlockFormatted.test
diff --git a/testlib/src/main/resources/java/removeunusedimports/Jdk17MultineStringBlockUnformatted.test b/testlib/src/main/resources/java/removeunusedimports/Jdk17TextBlockUnformatted.test
similarity index 100%
rename from testlib/src/main/resources/java/removeunusedimports/Jdk17MultineStringBlockUnformatted.test
rename to testlib/src/main/resources/java/removeunusedimports/Jdk17TextBlockUnformatted.test
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStep_withCleanthatJavaparserTest.java b/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStep_withCleanthatJavaparserTest.java
index 70e466588f..af17e9c87b 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStep_withCleanthatJavaparserTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStep_withCleanthatJavaparserTest.java
@@ -31,7 +31,7 @@ void behavior() throws Exception {
 				.testResource("java/removeunusedimports/JavaCodeWithLicenseUnformatted.test", "java/removeunusedimports/JavaCodeWithLicenseFormatted.test")
 				.testResource("java/removeunusedimports/JavaCodeWithLicensePackageUnformatted.test", "java/removeunusedimports/JavaCodeWithLicensePackageFormatted.test")
 				.testResource("java/removeunusedimports/JavaCodeWithPackageUnformatted.test", "java/removeunusedimports/JavaCodeWithPackageFormatted.test")
-				.testResource("java/removeunusedimports/Jdk17MultineStringBlockUnformatted.test", "java/removeunusedimports/Jdk17MultineStringBlockFormatted.test")
+				.testResource("java/removeunusedimports/Jdk17TextBlockUnformatted.test", "java/removeunusedimports/Jdk17TextBlockFormatted.test")
 		// JavaParser is failing over an annotated package: https://github.com/javaparser/javaparser/issues/3924
 		// .testResource("java/removeunusedimports/RevelcUnformatted.test", "java/removeunusedimports/RevelcFormatted.test")
 		;
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStep_withGoogleJavaFormatTest.java b/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStep_withGoogleJavaFormatTest.java
index 48815c3697..ba7dfef4a3 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStep_withGoogleJavaFormatTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStep_withGoogleJavaFormatTest.java
@@ -32,7 +32,7 @@ void behavior() throws Exception {
 				.testResource("java/removeunusedimports/JavaCodeWithLicensePackageUnformatted.test", "java/removeunusedimports/JavaCodeWithLicensePackageFormatted.test")
 				.testResource("java/removeunusedimports/JavaCodeWithPackageUnformatted.test", "java/removeunusedimports/JavaCodeWithPackageFormatted.test")
 				// GoogleFormat requires running over a JDK17 to handle JDK17 features
-				// .testResource("java/removeunusedimports/Jdk17MultineStringBlockUnformatted.test", "java/removeunusedimports/Jdk17MultineStringBlockFormatted.test")
+				// .testResource("java/removeunusedimports/Jdk17TextBlockUnformatted.test", "java/removeunusedimports/Jdk17TextBlockFormatted.test")
 				.testResource("java/removeunusedimports/RevelcUnformatted.test", "java/removeunusedimports/RevelcFormatted.test");
 	}
 

From 80aad44cece97fa8a1b17b48df6439f239993482 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Wed, 1 Mar 2023 22:45:27 +0400
Subject: [PATCH 0855/2068] Remove class duplicated from CLeanthat

---
 .../JavaparserRemoveUnusedImportsFunc.java    | 213 ------------------
 1 file changed, 213 deletions(-)
 delete mode 100644 lib/src/javaparser/java/com/diffplug/spotless/glue/java/JavaparserRemoveUnusedImportsFunc.java

diff --git a/lib/src/javaparser/java/com/diffplug/spotless/glue/java/JavaparserRemoveUnusedImportsFunc.java b/lib/src/javaparser/java/com/diffplug/spotless/glue/java/JavaparserRemoveUnusedImportsFunc.java
deleted file mode 100644
index 035daacadf..0000000000
--- a/lib/src/javaparser/java/com/diffplug/spotless/glue/java/JavaparserRemoveUnusedImportsFunc.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * Copyright 2023 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.glue.java;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.EnumSet;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.javaparser.JavaParser;
-import com.github.javaparser.JavaToken;
-import com.github.javaparser.ParseResult;
-import com.github.javaparser.ParserConfiguration;
-import com.github.javaparser.TokenRange;
-import com.github.javaparser.ast.CompilationUnit;
-import com.github.javaparser.ast.ImportDeclaration;
-import com.github.javaparser.ast.Node;
-import com.github.javaparser.ast.NodeList;
-import com.github.javaparser.ast.PackageDeclaration;
-import com.github.javaparser.ast.comments.JavadocComment;
-import com.github.javaparser.javadoc.Javadoc;
-import com.github.javaparser.javadoc.JavadocBlockTag;
-import com.github.javaparser.javadoc.description.JavadocDescription;
-import com.github.javaparser.javadoc.description.JavadocInlineTag;
-import com.github.javaparser.javadoc.description.JavadocSnippet;
-import com.github.javaparser.printer.lexicalpreservation.LexicalPreservingPrinter;
-
-import com.diffplug.spotless.FormatterFunc;
-
-/**
- * Remove imports from a Java source file by analyzing {@link ImportDeclaration}.
- * <p>
- * More precisely, it will analyze each Tokens beinh used in the code-base, and remove imports not matching given import.
- * <p>
- * One limitation is it will not strip away wildcard imports.
- */
-// https://github.com/javaparser/javaparser/issues/1590
-// https://github.com/revelc/impsort-maven-plugin/blob/main/src/main/java/net/revelc/code/impsort/ImpSort.java
-public class JavaparserRemoveUnusedImportsFunc implements FormatterFunc {
-	private static final Logger LOGGER = LoggerFactory.getLogger(JavaparserRemoveUnusedImportsFunc.class);
-
-	public String apply(String input) throws InterruptedException, IOException {
-		// We consider the source is very recent, as source is retro-compatible (i.e. not feature get deprecated)
-		ParserConfiguration.LanguageLevel languageLevel = ParserConfiguration.LanguageLevel.BLEEDING_EDGE;
-		ParseResult<CompilationUnit> parseResult = new JavaParser(new ParserConfiguration().setLanguageLevel(languageLevel)).parse(input);
-		CompilationUnit unit = parseResult.getResult().orElseThrow(() -> {
-			return new IllegalArgumentException("Issue parsing the input: " + parseResult.getProblems());
-		});
-		if (!parseResult.isSuccessful()) {
-			throw new IllegalArgumentException("Issue parsing the input: " + parseResult.getProblems());
-		}
-
-		NodeList<ImportDeclaration> importDeclarations = unit.getImports();
-		if (importDeclarations.isEmpty()) {
-			return input;
-		}
-
-		Set<String> tokensInUse = tokensInUse(unit);
-
-		List<ImportDeclaration> unusedImports = removeUnusedImports(importDeclarations, tokensInUse);
-
-		if (unusedImports.isEmpty()) {
-			return input;
-		} else {
-			// This is necessary to get, after mutations, a source as similar as possible to the original one
-			LexicalPreservingPrinter.setup(unit);
-
-			// Remove all unused imports
-			unusedImports.forEach(importDeclaration -> {
-				try {
-					importDeclaration.remove();
-				} catch (RuntimeException e) {
-					throw new RuntimeException("Issue removing an import statement: " + importDeclaration, e);
-				}
-			});
-
-			// print the CompilationUnit after mutations
-			return LexicalPreservingPrinter.print(unit);
-		}
-	}
-
-	/*
-	 * Extract all of the tokens from the main body of the file.
-	 *
-	 * This set of tokens represents all of the file's dependencies, and is used to figure out whether
-	 * or not an import is unused.
-	 */
-	// https://github.com/revelc/impsort-maven-plugin/blob/main/src/main/java/net/revelc/code/impsort/ImpSort.java#L278
-	private static Set<String> tokensInUse(CompilationUnit unit) {
-		// Extract tokens from the java code:
-		Stream<Node> packageDecl = unit.getPackageDeclaration().isPresent()
-				? Stream.of(unit.getPackageDeclaration().get()).map(PackageDeclaration::getAnnotations)
-						.flatMap(NodeList::stream)
-				: Stream.empty();
-		Stream<String> typesInCode = Stream.concat(packageDecl, unit.getTypes().stream())
-				.map(Node::getTokenRange).filter(Optional::isPresent).map(Optional::get)
-				.filter(r -> r != TokenRange.INVALID).flatMap(r -> {
-					// get all JavaTokens as strings from each range
-					return StreamSupport.stream(r.spliterator(), false);
-				}).map(JavaToken::asString);
-
-		// Extract referenced class names from parsed javadoc comments:
-		Stream<String> typesInJavadocs = unit.getAllComments().stream()
-				.filter(c -> c instanceof JavadocComment).map(JavadocComment.class::cast)
-				.map(JavadocComment::parse).flatMap(JavaparserRemoveUnusedImportsFunc::parseJavadoc);
-
-		return Stream.concat(typesInCode, typesInJavadocs)
-				.filter(t -> t != null && !t.isEmpty() && Character.isJavaIdentifierStart(t.charAt(0)))
-				.collect(Collectors.toSet());
-	}
-
-	/*
-	 * Remove unused imports.
-	 *
-	 * This algorithm only looks at the file itself, and evaluates whether or not a given import is
-	 * unused, by checking if the last segment of the import path (typically a class name or a static
-	 * function name) appears in the file.
-	 *
-	 * This means that it is not possible to remove import statements with wildcards.
-	 */
-	// https://github.com/revelc/impsort-maven-plugin/blob/main/src/main/java/net/revelc/code/impsort/ImpSort.java#L350
-	private static List<ImportDeclaration> removeUnusedImports(Collection<ImportDeclaration> imports, Set<String> tokensInUse) {
-		// We clone the input Collection as it typically reflects dynamically the imports from the CompilationUnit
-		// Hence, removal during iteration may lead to issues
-		imports = new ArrayList<>(imports);
-
-		return imports.stream().filter(i -> {
-			String[] segments = i.getNameAsString().split("[.]");
-			if (segments.length == 0) {
-				throw new AssertionError("Parse tree includes invalid import statements");
-			}
-
-			String lastSegment = segments[segments.length - 1];
-			if (lastSegment.equals("*")) {
-				return false;
-			}
-
-			return !tokensInUse.contains(lastSegment);
-		}).collect(Collectors.toList());
-	}
-
-	// https://github.com/revelc/impsort-maven-plugin/blob/main/src/main/java/net/revelc/code/impsort/ImpSort.java#L366
-	static void removeSamePackageImports(Set<ImportDeclaration> imports,
-			Optional<PackageDeclaration> packageDeclaration) {
-		String packageName = packageDeclaration.map(p -> p.getName().toString()).orElse("");
-		imports.removeIf(i -> {
-			String imp = i.getNameAsString();
-			if (packageName.isEmpty()) {
-				return !imp.contains(".");
-			}
-			return imp.startsWith(packageName) && imp.lastIndexOf(".") <= packageName.length();
-		});
-	}
-
-	// parse both main doc description and any block tags
-	// https://github.com/revelc/impsort-maven-plugin/blob/main/src/main/java/net/revelc/code/impsort/ImpSort.java#L304
-	private static Stream<String> parseJavadoc(Javadoc javadoc) {
-		// parse main doc description
-		Stream<String> stringsFromJavadocDescription = Stream.of(javadoc.getDescription()).flatMap(JavaparserRemoveUnusedImportsFunc::parseJavadocDescription);
-		// grab tag names and parsed descriptions for block tags
-		Stream<String> stringsFromBlockTags = javadoc.getBlockTags().stream().flatMap(tag -> {
-			// only @throws and @exception have names who are importable; @param and others don't
-			EnumSet<JavadocBlockTag.Type> blockTagTypesWithImportableNames = EnumSet.of(JavadocBlockTag.Type.THROWS, JavadocBlockTag.Type.EXCEPTION);
-			Stream<String> importableTagNames = blockTagTypesWithImportableNames.contains(tag.getType())
-					? Stream.of(tag.getName()).filter(Optional::isPresent).map(Optional::get)
-					: Stream.empty();
-			Stream<String> tagDescriptions = Stream.of(tag.getContent()).flatMap(JavaparserRemoveUnusedImportsFunc::parseJavadocDescription);
-			return Stream.concat(importableTagNames, tagDescriptions);
-		});
-		return Stream.concat(stringsFromJavadocDescription, stringsFromBlockTags);
-	}
-
-	// https://github.com/revelc/impsort-maven-plugin/blob/main/src/main/java/net/revelc/code/impsort/ImpSort.java#L323
-	private static Stream<String> parseJavadocDescription(JavadocDescription description) {
-		return description.getElements().stream().map(element -> {
-			if (element instanceof JavadocInlineTag) {
-				// inline tags like {@link Foo}
-				return ((JavadocInlineTag) element).getContent();
-			} else if (element instanceof JavadocSnippet) {
-				// snippets like @see Foo
-				return element.toText();
-			} else {
-				// try to handle unknown elements as best we can
-				return element.toText();
-			}
-		}).flatMap(s -> {
-			// split text descriptions into word tokens
-			return Stream.of(s.split("\\W+"));
-		});
-	}
-}

From d6c5ac2597846830f018af4f187bfaa5160104d5 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 1 Mar 2023 11:31:14 -0800
Subject: [PATCH 0856/2068] Fix javadoc publishing.

---
 gradle/java-publish.gradle        |   5 +-
 gradle/javadoc/java8/package-list | 216 ------------------------------
 2 files changed, 2 insertions(+), 219 deletions(-)
 delete mode 100644 gradle/javadoc/java8/package-list

diff --git a/gradle/java-publish.gradle b/gradle/java-publish.gradle
index 2ebc2a66b5..495694a5be 100644
--- a/gradle/java-publish.gradle
+++ b/gradle/java-publish.gradle
@@ -77,12 +77,11 @@ javadoc {
 	//
 	// Thus, no javadoc warnings.
 	options.addStringOption('Xdoclint:none', '-quiet')
-	options.addStringOption('source', '8')
+	options.addStringOption('source', '11')
 	// setup the header
 	options.header javadocInfo
 	// setup links
-	options.linksOffline('https://docs.oracle.com/javase/8/docs/api/', "${dotdotGradle}/javadoc/java8")
-	options.linksOffline('https://docs.gradle.org/2.14/javadoc/', "${dotdotGradle}/javadoc/gradle")
+	options.linksOffline('https://docs.gradle.org/6.1.1/javadoc/', "${dotdotGradle}/javadoc/gradle")
 
 	// links to javadoc from the other versions
 	options.linksOffline("https://javadoc.io/static/com.diffplug.spotless/spotless-lib/${rootProject.spotlessChangelog.versionLast}", "${dotdotGradle}/javadoc/spotless-lib")
diff --git a/gradle/javadoc/java8/package-list b/gradle/javadoc/java8/package-list
deleted file mode 100644
index 496d90dbfa..0000000000
--- a/gradle/javadoc/java8/package-list
+++ /dev/null
@@ -1,216 +0,0 @@
-java.applet
-java.awt
-java.awt.color
-java.awt.datatransfer
-java.awt.dnd
-java.awt.event
-java.awt.font
-java.awt.geom
-java.awt.im
-java.awt.im.spi
-java.awt.image
-java.awt.image.renderable
-java.awt.print
-java.beans
-java.beans.beancontext
-java.io
-java.lang
-java.lang.annotation
-java.lang.instrument
-java.lang.invoke
-java.lang.management
-java.lang.ref
-java.lang.reflect
-java.math
-java.net
-java.nio
-java.nio.channels
-java.nio.channels.spi
-java.nio.charset
-java.nio.charset.spi
-java.nio.file
-java.nio.file.attribute
-java.nio.file.spi
-java.rmi
-java.rmi.activation
-java.rmi.dgc
-java.rmi.registry
-java.rmi.server
-java.security
-java.security.acl
-java.security.cert
-java.security.interfaces
-java.security.spec
-java.sql
-java.text
-java.text.spi
-java.time
-java.time.chrono
-java.time.format
-java.time.temporal
-java.time.zone
-java.util
-java.util.concurrent
-java.util.concurrent.atomic
-java.util.concurrent.locks
-java.util.function
-java.util.jar
-java.util.prefs
-java.util.regex
-java.util.spi
-java.util.stream
-java.util.zip
-javax.accessibility
-javax.activation
-javax.activity
-javax.annotation
-javax.annotation.processing
-javax.crypto
-javax.crypto.interfaces
-javax.crypto.spec
-javax.imageio
-javax.imageio.event
-javax.imageio.metadata
-javax.imageio.plugins.bmp
-javax.imageio.plugins.jpeg
-javax.imageio.spi
-javax.imageio.stream
-javax.jws
-javax.jws.soap
-javax.lang.model
-javax.lang.model.element
-javax.lang.model.type
-javax.lang.model.util
-javax.management
-javax.management.loading
-javax.management.modelmbean
-javax.management.monitor
-javax.management.openmbean
-javax.management.relation
-javax.management.remote
-javax.management.remote.rmi
-javax.management.timer
-javax.naming
-javax.naming.directory
-javax.naming.event
-javax.naming.ldap
-javax.naming.spi
-javax.net
-javax.net.ssl
-javax.print
-javax.print.attribute
-javax.print.attribute.standard
-javax.print.event
-javax.rmi
-javax.rmi.CORBA
-javax.rmi.ssl
-javax.script
-javax.security.auth
-javax.security.auth.callback
-javax.security.auth.kerberos
-javax.security.auth.login
-javax.security.auth.spi
-javax.security.auth.x500
-javax.security.cert
-javax.security.sasl
-javax.sound.midi
-javax.sound.midi.spi
-javax.sound.sampled
-javax.sound.sampled.spi
-javax.sql
-javax.sql.rowset
-javax.sql.rowset.serial
-javax.sql.rowset.spi
-javax.swing
-javax.swing.border
-javax.swing.colorchooser
-javax.swing.event
-javax.swing.filechooser
-javax.swing.plaf
-javax.swing.plaf.basic
-javax.swing.plaf.metal
-javax.swing.plaf.multi
-javax.swing.plaf.nimbus
-javax.swing.plaf.synth
-javax.swing.table
-javax.swing.text
-javax.swing.text.html
-javax.swing.text.html.parser
-javax.swing.text.rtf
-javax.swing.tree
-javax.swing.undo
-javax.tools
-javax.transaction
-javax.transaction.xa
-javax.xml
-javax.xml.bind
-javax.xml.bind.annotation
-javax.xml.bind.annotation.adapters
-javax.xml.bind.attachment
-javax.xml.bind.helpers
-javax.xml.bind.util
-javax.xml.crypto
-javax.xml.crypto.dom
-javax.xml.crypto.dsig
-javax.xml.crypto.dsig.dom
-javax.xml.crypto.dsig.keyinfo
-javax.xml.crypto.dsig.spec
-javax.xml.datatype
-javax.xml.namespace
-javax.xml.parsers
-javax.xml.soap
-javax.xml.stream
-javax.xml.stream.events
-javax.xml.stream.util
-javax.xml.transform
-javax.xml.transform.dom
-javax.xml.transform.sax
-javax.xml.transform.stax
-javax.xml.transform.stream
-javax.xml.validation
-javax.xml.ws
-javax.xml.ws.handler
-javax.xml.ws.handler.soap
-javax.xml.ws.http
-javax.xml.ws.soap
-javax.xml.ws.spi
-javax.xml.ws.spi.http
-javax.xml.ws.wsaddressing
-javax.xml.xpath
-org.ietf.jgss
-org.omg.CORBA
-org.omg.CORBA.DynAnyPackage
-org.omg.CORBA.ORBPackage
-org.omg.CORBA.TypeCodePackage
-org.omg.CORBA.portable
-org.omg.CORBA_2_3
-org.omg.CORBA_2_3.portable
-org.omg.CosNaming
-org.omg.CosNaming.NamingContextExtPackage
-org.omg.CosNaming.NamingContextPackage
-org.omg.Dynamic
-org.omg.DynamicAny
-org.omg.DynamicAny.DynAnyFactoryPackage
-org.omg.DynamicAny.DynAnyPackage
-org.omg.IOP
-org.omg.IOP.CodecFactoryPackage
-org.omg.IOP.CodecPackage
-org.omg.Messaging
-org.omg.PortableInterceptor
-org.omg.PortableInterceptor.ORBInitInfoPackage
-org.omg.PortableServer
-org.omg.PortableServer.CurrentPackage
-org.omg.PortableServer.POAManagerPackage
-org.omg.PortableServer.POAPackage
-org.omg.PortableServer.ServantLocatorPackage
-org.omg.PortableServer.portable
-org.omg.SendingContext
-org.omg.stub.java.rmi
-org.w3c.dom
-org.w3c.dom.bootstrap
-org.w3c.dom.events
-org.w3c.dom.ls
-org.w3c.dom.views
-org.xml.sax
-org.xml.sax.ext
-org.xml.sax.helpers

From bb37c4358f58da47d982d11a9b48ce86dda8850b Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 1 Mar 2023 11:31:36 -0800
Subject: [PATCH 0857/2068] Fix lib-extra testing with Solstice glue code.

---
 lib-extra/build.gradle | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index 149ecad08f..1c4cfa8c59 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -25,6 +25,14 @@ dependencies {
 	testImplementation "com.diffplug.durian:durian-testlib:${VER_DURIAN}"
 }
 
+apply from: rootProject.file('gradle/special-tests.gradle')
+tasks.withType(Test).configureEach {
+	if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_16)) {
+		// needed for EclipseCdtFormatterStepTest
+		jvmArgs '--add-opens=java.base/java.lang=ALL-UNNAMED'
+	}
+}
+
 def NEEDS_P2_DEPS = [
 	'jdt'
 ]
@@ -40,6 +48,12 @@ jar {
 		from sourceSets.getByName(needsP2).output.classesDirs
 	}
 }
+tasks.withType(Test).configureEach {
+	dependsOn jar
+	doFirst {
+		classpath += jar.outputs.files
+	}
+}
 
 apply plugin: 'dev.equo.p2deps'
 p2deps {
@@ -57,10 +71,3 @@ p2deps {
 // we'll hold the core lib to a high standard
 spotbugs { reportLevel = 'low' } // low|medium|high (low = sensitive to even minor mistakes)
 
-apply from: rootProject.file('gradle/special-tests.gradle')
-tasks.withType(Test).configureEach {
-	if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_16)) {
-		// needed for EclipseCdtFormatterStepTest
-		jvmArgs '--add-opens=java.base/java.lang=ALL-UNNAMED'
-	}
-}

From 8e0402ea548e4041cd4f73503114514233e8c199 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 1 Mar 2023 11:54:27 -0800
Subject: [PATCH 0858/2068] Fix classloading for the glue code.

---
 .../{ => glue}/jdt/EclipseJdtFormatterStepImpl.java    | 10 +---------
 .../java/com/diffplug/spotless/FeatureClassLoader.java |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)
 rename lib-extra/src/jdt/java/com/diffplug/spotless/extra/{ => glue}/jdt/EclipseJdtFormatterStepImpl.java (90%)

diff --git a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/jdt/EclipseJdtFormatterStepImpl.java b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtFormatterStepImpl.java
similarity index 90%
rename from lib-extra/src/jdt/java/com/diffplug/spotless/extra/jdt/EclipseJdtFormatterStepImpl.java
rename to lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtFormatterStepImpl.java
index 7e59744149..40c02d8f3a 100644
--- a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/jdt/EclipseJdtFormatterStepImpl.java
+++ b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtFormatterStepImpl.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.diffplug.spotless.extra.jdt;
+package com.diffplug.spotless.extra.glue.jdt;
 
 import java.io.File;
 import java.util.Properties;
@@ -36,17 +36,10 @@ public EclipseJdtFormatterStepImpl(Properties settings) {
 		this.codeFormatter = ToolFactory.createCodeFormatter(settings, ToolFactory.M_FORMAT_EXISTING);
 	}
 
-	/** @deprecated  Use {@link #format(String, File)} instead. */
-	@Deprecated
-	public String format(String raw) throws Exception {
-		return format(raw, new File(""));
-	}
-
 	/** Formatting Java string, distinguishing module-info and compilation unit by file name */
 	public String format(String raw, File file) throws Exception {
 		int kind = (file.getName().equals(IModule.MODULE_INFO_JAVA) ? CodeFormatter.K_MODULE_INFO
 				: CodeFormatter.K_COMPILATION_UNIT) | CodeFormatter.F_INCLUDE_COMMENTS;
-
 		TextEdit edit = codeFormatter.format(kind, raw, 0, raw.length(), 0, LINE_DELIMITER);
 		if (edit == null) {
 			throw new IllegalArgumentException("Invalid java syntax for formatting.");
@@ -56,5 +49,4 @@ public String format(String raw, File file) throws Exception {
 			return doc.get();
 		}
 	}
-
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/FeatureClassLoader.java b/lib/src/main/java/com/diffplug/spotless/FeatureClassLoader.java
index 0703a91318..d07e7e4324 100644
--- a/lib/src/main/java/com/diffplug/spotless/FeatureClassLoader.java
+++ b/lib/src/main/java/com/diffplug/spotless/FeatureClassLoader.java
@@ -62,7 +62,7 @@ class FeatureClassLoader extends URLClassLoader {
 
 	@Override
 	protected Class<?> findClass(String name) throws ClassNotFoundException {
-		if (name.startsWith("com.diffplug.spotless.glue.")) {
+		if (name.startsWith("com.diffplug.spotless.glue.") || name.startsWith("com.diffplug.spotless.extra.glue.")) {
 			String path = name.replace('.', '/') + ".class";
 			URL url = findResource(path);
 			if (url == null) {

From e32179ea6b962655b4566bcb9787fbf487c6ef33 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 1 Mar 2023 11:55:25 -0800
Subject: [PATCH 0859/2068] Eclipse 4.8 is now the oldest that we support.

---
 .../com/diffplug/spotless/maven/MultiModuleProjectTest.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MultiModuleProjectTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MultiModuleProjectTest.java
index 1c9521c402..f7ce7cd0d9 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MultiModuleProjectTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MultiModuleProjectTest.java
@@ -70,7 +70,7 @@ void testConfigurationDependency() throws Exception {
 						"<java>",
 						"  <eclipse>",
 						"    <file>configs/eclipse-formatter.xml</file>",
-						"    <version>4.7.1</version>",
+						"    <version>4.8</version>",
 						"  </eclipse>",
 						"</java>",
 						"<scala>",

From 26c50b7b08f535c2681e5eac64358acb017c6ec1 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 1 Mar 2023 11:55:41 -0800
Subject: [PATCH 0860/2068] Get EclipseJdtFormatterStep working.

---
 .../{eclipse => }/EquoBasedStepBuilder.java   | 77 ++++++++++-----
 .../extra/java/EclipseJdtFormatterStep.java   | 54 +++++-----
 .../extra/eclipse/EquoResourceHarness.java    | 99 +++++++++++++++++++
 .../java/EclipseJdtFormatterStepTest.java     | 20 ++--
 .../java/com/diffplug/spotless/JarState.java  | 12 ++-
 .../gradle/spotless/JavaExtension.java        |  4 +-
 .../diffplug/spotless/maven/java/Eclipse.java |  6 +-
 7 files changed, 196 insertions(+), 76 deletions(-)
 rename lib-extra/src/main/java/com/diffplug/spotless/extra/{eclipse => }/EquoBasedStepBuilder.java (51%)
 create mode 100644 lib-extra/src/test/java/com/diffplug/spotless/extra/eclipse/EquoResourceHarness.java

diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/eclipse/EquoBasedStepBuilder.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/EquoBasedStepBuilder.java
similarity index 51%
rename from lib-extra/src/main/java/com/diffplug/spotless/extra/eclipse/EquoBasedStepBuilder.java
rename to lib-extra/src/main/java/com/diffplug/spotless/extra/EquoBasedStepBuilder.java
index c9a9bc4cf3..9a0509edb7 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/eclipse/EquoBasedStepBuilder.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/EquoBasedStepBuilder.java
@@ -13,71 +13,94 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.diffplug.spotless.extra.eclipse;
+package com.diffplug.spotless.extra;
 
 import java.io.File;
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
+import java.util.Properties;
 
+import com.diffplug.spotless.FileSignature;
 import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.FormatterProperties;
 import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
 import com.diffplug.spotless.ThrowingEx;
 
 import dev.equo.solstice.p2.P2Client;
 import dev.equo.solstice.p2.P2Model;
-import dev.equo.solstice.p2.P2Unit;
+import dev.equo.solstice.p2.QueryCache;
 
 /**
  * Generic Eclipse based formatter step {@link State} builder.
  */
-public class EquoBasedStepBuilder {
+public abstract class EquoBasedStepBuilder {
 	private final String formatterName;
 	private final Provisioner mavenProvisioner;
-	private final P2Model p2;
 	private final ThrowingEx.Function<State, FormatterFunc> stateToFormatter;
 	private String formatterVersion;
+	private Iterable<File> settingsFiles = new ArrayList<>();
 
 	/** Initialize valid default configuration, taking latest version */
-	public EquoBasedStepBuilder(String formatterName, Provisioner mavenProvisioner, P2Model p2, ThrowingEx.Function<State, FormatterFunc> stateToFormatter) {
+	public EquoBasedStepBuilder(String formatterName, Provisioner mavenProvisioner, ThrowingEx.Function<State, FormatterFunc> stateToFormatter) {
 		this.formatterName = formatterName;
 		this.mavenProvisioner = mavenProvisioner;
-		this.p2 = p2;
 		this.stateToFormatter = stateToFormatter;
 	}
 
+	public void setVersion(String version) {
+		formatterVersion = version;
+	}
+
+	public void setPreferences(Iterable<File> settingsFiles) {
+		this.settingsFiles = settingsFiles;
+	}
+
 	/** Returns the FormatterStep (whose state will be calculated lazily). */
-	public FormatterStep build() throws Exception {
+	public FormatterStep build() {
 		return FormatterStep.createLazy(formatterName, this::get, stateToFormatter);
 	}
 
+	protected abstract P2Model model(String version);
+
 	/** Creates the state of the configuration. */
 	EquoBasedStepBuilder.State get() throws Exception {
-		var caching = P2Client.Caching.PREFER_OFFLINE;
-		var p2query = p2.query(caching);
-
-		List<P2Unit> p2units = p2query.getJarsNotOnMavenCentral();
-		List<String> mavenCoords = p2query.getJarsOnMavenCentral();
-
-		List<File> p2Jars = new ArrayList<>();
-		if (!p2units.isEmpty()) {
-			try (P2Client client = new P2Client(caching)) {
-				for (var p2unit : p2units) {
-					p2Jars.add(client.download(p2unit));
-				}
-			}
+		var query = model(formatterVersion).query(P2Client.Caching.PREFER_OFFLINE, QueryCache.ALLOW);
+		var classpath = new ArrayList<File>();
+		if (!query.getJarsOnMavenCentral().isEmpty()) {
+			classpath.addAll(mavenProvisioner.provisionWithTransitives(false, query.getJarsOnMavenCentral()));
 		}
-		boolean withTransitives = false;
-		Set<File> mavenJars = mavenProvisioner.provisionWithTransitives(withTransitives, mavenCoords);
-
-		throw new UnsupportedOperationException("TODO");
+		classpath.addAll(query.getJarsNotOnMavenCentral());
+		var jarState = JarState.forFiles(classpath);
+		return new State(formatterVersion, jarState, FileSignature.signAsList(settingsFiles));
 	}
 
 	/**
 	 * State of Eclipse configuration items, providing functionality to derived information
 	 * based on the state.
 	 */
-	public static class State implements Serializable {}
+	public static class State implements Serializable {
+		final String semanticVersion;
+		final JarState jarState;
+		final FileSignature settingsFiles;
+
+		public State(String semanticVersion, JarState jarState, FileSignature settingsFiles) {
+			this.semanticVersion = semanticVersion;
+			this.jarState = jarState;
+			this.settingsFiles = settingsFiles;
+		}
+
+		public JarState getJarState() {
+			return jarState;
+		}
+
+		public String getSemanticVersion() {
+			return semanticVersion;
+		}
+
+		public Properties getPreferences() {
+			return FormatterProperties.from(settingsFiles.files()).getProperties();
+		}
+	}
 }
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 d0d42f2814..98dea4ff60 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,15 @@
 package com.diffplug.spotless.extra.java;
 
 import java.io.File;
-import java.lang.reflect.Method;
 import java.util.Properties;
 
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.Jvm;
 import com.diffplug.spotless.Provisioner;
-import com.diffplug.spotless.extra.EclipseBasedStepBuilder;
-import com.diffplug.spotless.extra.EclipseBasedStepBuilder.State;
+import com.diffplug.spotless.extra.EquoBasedStepBuilder;
+import com.diffplug.spotless.extra.EquoBasedStepBuilder.State;
+
+import dev.equo.solstice.p2.P2Model;
 
 /** Formatter step which calls out to the Eclipse JDT formatter. */
 public final class EclipseJdtFormatterStep {
@@ -31,43 +32,34 @@ public final class EclipseJdtFormatterStep {
 	private EclipseJdtFormatterStep() {}
 
 	private static final String NAME = "eclipse jdt formatter";
-	private static final String FORMATTER_CLASS_OLD = "com.diffplug.gradle.spotless.java.eclipse.EclipseFormatterStepImpl";
-	private static final String FORMATTER_CLASS = "com.diffplug.spotless.extra.eclipse.java.EclipseJdtFormatterStepImpl";
-	private static final String MAVEN_GROUP_ARTIFACT = "com.diffplug.spotless:spotless-eclipse-jdt";
-	private static final String FORMATTER_METHOD = "format";
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(8, "4.19.0").add(11, "4.21.0");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(8, "4.16").add(11, "4.26");
 
 	public static String defaultVersion() {
 		return JVM_SUPPORT.getRecommendedFormatterVersion();
 	}
 
 	/** Provides default configuration */
-	public static EclipseBasedStepBuilder createBuilder(Provisioner provisioner) {
-		return new EclipseBasedStepBuilder(NAME, provisioner, EclipseJdtFormatterStep::apply);
+	public static EquoBasedStepBuilder createBuilder(Provisioner provisioner) {
+		return new EquoBasedStepBuilder(NAME, provisioner, EclipseJdtFormatterStep::apply) {
+			@Override
+			protected P2Model model(String version) {
+				var model = new P2Model();
+				if (version.endsWith(".0")) {
+					version = version.substring(0, version.length() - 2);
+				}
+				model.addP2Repo("https://download.eclipse.org/eclipse/updates/" + version + "/");
+				model.getInstall().add("org.eclipse.jdt.core");
+				return model;
+			}
+		};
 	}
 
 	private static FormatterFunc apply(State state) throws Exception {
 		JVM_SUPPORT.assertFormatterSupported(state.getSemanticVersion());
-		Class<?> formatterClazz = getClass(state);
-		Object formatter = formatterClazz.getConstructor(Properties.class).newInstance(state.getPreferences());
-		FormatterFunc formatterFunc = getFormatterFunc(formatter, formatterClazz);
+		Class<?> formatterClazz = state.getJarState().getClassLoader().loadClass("com.diffplug.spotless.extra.glue.jdt.EclipseJdtFormatterStepImpl");
+		var formatter = formatterClazz.getConstructor(Properties.class).newInstance(state.getPreferences());
+		var method = formatterClazz.getMethod("format", String.class, File.class);
+		FormatterFunc formatterFunc = (FormatterFunc.NeedsFile) (input, file) -> (String) method.invoke(formatter, input, file);
 		return JVM_SUPPORT.suggestLaterVersionOnError(state.getSemanticVersion(), formatterFunc);
 	}
-
-	private static Class<?> getClass(State state) {
-		if (state.getMavenCoordinate(MAVEN_GROUP_ARTIFACT).isPresent()) {
-			return state.loadClass(FORMATTER_CLASS);
-		}
-		return state.loadClass(FORMATTER_CLASS_OLD);
-	}
-
-	private static FormatterFunc getFormatterFunc(Object formatter, Class<?> formatterClazz) throws NoSuchMethodException, SecurityException {
-		try {
-			Method method = formatterClazz.getMethod(FORMATTER_METHOD, String.class, File.class);
-			return (FormatterFunc.NeedsFile) (input, file) -> (String) method.invoke(formatter, input, file);
-		} catch (NoSuchMethodException e) {
-			Method method = formatterClazz.getMethod(FORMATTER_METHOD, String.class);
-			return input -> (String) method.invoke(formatter, input);
-		}
-	}
 }
diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/eclipse/EquoResourceHarness.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/eclipse/EquoResourceHarness.java
new file mode 100644
index 0000000000..8d5d955c02
--- /dev/null
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/eclipse/EquoResourceHarness.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2016-2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.extra.eclipse;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+import java.util.Arrays;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.LineEnding;
+import com.diffplug.spotless.ResourceHarness;
+import com.diffplug.spotless.extra.EquoBasedStepBuilder;
+
+/**
+ * Provides a common formatter test for all Spotless Eclipse Formatter steps
+ * provided by lib-extra.
+ * <p>
+ * The external Spotless Eclipse Formatter Step implementations are responsible
+ * to test the functionality of the Spotless adaptations for the Eclipse formatter.
+ * This explicitly includes a check of various forms of valid and invalid input
+ * to cover all relevant execution paths during the code formatting and internal
+ * exception handling.
+ * </p>
+ * <p>
+ * The lib-extra users, like plugin-gradle and plugin-maven are responsible
+ * to test the correct provision of user settings to the generic
+ * Spotless Eclipse Formatter steps provided by lib-extra.
+ * </p>
+ */
+public class EquoResourceHarness extends ResourceHarness {
+	private final EquoBasedStepBuilder stepBuilder;
+	private final String fileName;
+	private final String input;
+	private final String expected;
+
+	/**
+	 * Create harness to be used for several versions of the formatter step
+	 * @param builder Eclipse Formatter step builder
+	 * @param unformatted Simple unformatted input
+	 * @param formatted Expected formatted output
+	 */
+	public EquoResourceHarness(EquoBasedStepBuilder builder, String unformatted, String formatted) {
+		this(builder, "someSourceFile", unformatted, formatted);
+	}
+
+	/**
+	 * Create harness to be used for several versions of the formatter step
+	 * @param builder Eclipse Formatter step builder
+	 * @param sourceFileName File name of the source file
+	 * @param unformatted Simple unformatted input
+	 * @param formatted Expected formatted output
+	 */
+	public EquoResourceHarness(EquoBasedStepBuilder builder, String sourceFileName, String unformatted, String formatted) {
+		stepBuilder = builder;
+		fileName = sourceFileName;
+		input = unformatted;
+		expected = formatted;
+	}
+
+	/**
+	 * Assert that formatting input results in expected output
+	 * @param formatterVersion Formatter version
+	 * @param settingsFiles Formatter settings
+	 * @return Formatted string
+	 */
+	protected String assertFormatted(String formatterVersion, File... settingsFiles) throws Exception {
+		String output = format(formatterVersion, settingsFiles);
+		assertThat(output).isEqualTo(expected);
+		return output;
+	}
+
+	/**
+	 * Formatting input results and returns output
+	 * @param formatterVersion Formatter version
+	 * @param settingsFiles Formatter settings
+	 * @return Formatted string
+	 */
+	protected String format(String formatterVersion, File... settingsFiles) throws Exception {
+		File inputFile = setFile(fileName).toContent(input);
+		stepBuilder.setVersion(formatterVersion);
+		stepBuilder.setPreferences(Arrays.asList(settingsFiles));
+		FormatterStep step = stepBuilder.build();
+		return LineEnding.toUnix(step.format(input, inputFile));
+	}
+}
diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepTest.java
index 2ade78f742..e73f51fa2f 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepTest.java
@@ -25,16 +25,15 @@
 
 import com.diffplug.spotless.Jvm;
 import com.diffplug.spotless.TestProvisioner;
-import com.diffplug.spotless.extra.EclipseBasedStepBuilder;
-import com.diffplug.spotless.extra.eclipse.EclipseResourceHarness;
+import com.diffplug.spotless.extra.EquoBasedStepBuilder;
+import com.diffplug.spotless.extra.eclipse.EquoResourceHarness;
 
-class EclipseJdtFormatterStepTest extends EclipseResourceHarness {
-	private final static String NON_SEMANTIC_ECLIPSE_VERSION = "4.7.3a";
-	private final static Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support("Oldest Version").add(8, "4.6.1").add(11, "4.20.0");
+class EclipseJdtFormatterStepTest extends EquoResourceHarness {
+	private final static Jvm.Support<String> OLDEST_FOR_JVM = Jvm.<String> support("Oldest Version").add(8, "4.8").add(11, "4.17");
 	private final static String INPUT = "package p; class C{}";
 	private final static String EXPECTED = "package p;\nclass C {\n}";
 
-	private static EclipseBasedStepBuilder createBuilder() {
+	private static EquoBasedStepBuilder createBuilder() {
 		return EclipseJdtFormatterStep.createBuilder(TestProvisioner.mavenCentral());
 	}
 
@@ -49,21 +48,20 @@ void formatWithVersion(String version) throws Exception {
 	}
 
 	private static Stream<String> formatWithVersion() {
-		return Stream.of(NON_SEMANTIC_ECLIPSE_VERSION, JVM_SUPPORT.getRecommendedFormatterVersion(), EclipseJdtFormatterStep.defaultVersion());
+		return Stream.of(OLDEST_FOR_JVM.getRecommendedFormatterVersion(), EclipseJdtFormatterStep.defaultVersion());
 	}
 
 	/** New format interface requires source file information to distinguish module-info from compilation unit */
 	@Nested
-
-	class NewFormatInterface extends EclipseResourceHarness {
-		public NewFormatInterface() throws Exception {
+	class NewFormatInterface extends EquoResourceHarness {
+		public NewFormatInterface() {
 			super(createBuilder(), "module-info.java", getTestResource("java/eclipse/ModuleInfoUnformatted.test"), getTestResource("java/eclipse/ModuleInfoFormatted.test"));
 		}
 
 		@Test
 		void formatModuleInfo() throws Exception {
 			File settingsFile = createTestFile("java/eclipse/ModuleInfo.prefs");
-			assertFormatted(JVM_SUPPORT.getRecommendedFormatterVersion(), settingsFile);
+			assertFormatted(OLDEST_FOR_JVM.getRecommendedFormatterVersion(), settingsFile);
 		}
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/JarState.java b/lib/src/main/java/com/diffplug/spotless/JarState.java
index abe595e608..d79451b70c 100644
--- a/lib/src/main/java/com/diffplug/spotless/JarState.java
+++ b/lib/src/main/java/com/diffplug/spotless/JarState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,11 +39,12 @@
 public final class JarState implements Serializable {
 	private static final long serialVersionUID = 1L;
 
+	@Deprecated
 	private final Set<String> mavenCoordinates;
 	private final FileSignature fileSignature;
 
 	private JarState(Collection<String> mavenCoordinates, FileSignature fileSignature) {
-		this.mavenCoordinates = new TreeSet<String>(mavenCoordinates);
+		this.mavenCoordinates = new TreeSet<>(mavenCoordinates);
 		this.fileSignature = fileSignature;
 	}
 
@@ -73,6 +74,12 @@ private static JarState provisionWithTransitives(boolean withTransitives, Collec
 		return new JarState(mavenCoordinates, fileSignature);
 	}
 
+	/** Wraps the given collection of a files as a JarState. */
+	public static JarState forFiles(Collection<File> jars) throws IOException {
+		FileSignature fileSignature = FileSignature.signAsSet(jars);
+		return new JarState(Collections.emptySet(), fileSignature);
+	}
+
 	URL[] jarUrls() {
 		return fileSignature.files().stream().map(File::toURI).map(ThrowingEx.wrap(URI::toURL)).toArray(URL[]::new);
 	}
@@ -102,6 +109,7 @@ public ClassLoader getClassLoader(Serializable key) {
 	}
 
 	/** Returns unmodifiable view on sorted Maven coordinates */
+	@Deprecated
 	public Set<String> getMavenCoordinates() {
 		return Collections.unmodifiableSet(mavenCoordinates);
 	}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
index f351dd6188..ed704a6906 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
@@ -32,7 +32,7 @@
 import org.gradle.api.tasks.SourceSet;
 
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.extra.EclipseBasedStepBuilder;
+import com.diffplug.spotless.extra.EquoBasedStepBuilder;
 import com.diffplug.spotless.extra.java.EclipseJdtFormatterStep;
 import com.diffplug.spotless.generic.LicenseHeaderStep;
 import com.diffplug.spotless.java.CleanthatJavaStep;
@@ -219,7 +219,7 @@ public EclipseConfig eclipse(String version) {
 	}
 
 	public class EclipseConfig {
-		private final EclipseBasedStepBuilder builder;
+		private final EquoBasedStepBuilder builder;
 
 		EclipseConfig(String version) {
 			builder = EclipseJdtFormatterStep.createBuilder(provisioner());
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Eclipse.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Eclipse.java
index 1e6508121e..e30a4faad9 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Eclipse.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Eclipse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 import org.apache.maven.plugins.annotations.Parameter;
 
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.extra.EclipseBasedStepBuilder;
+import com.diffplug.spotless.extra.EquoBasedStepBuilder;
 import com.diffplug.spotless.extra.java.EclipseJdtFormatterStep;
 import com.diffplug.spotless.maven.FormatterStepConfig;
 import com.diffplug.spotless.maven.FormatterStepFactory;
@@ -36,7 +36,7 @@ public class Eclipse implements FormatterStepFactory {
 
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
-		EclipseBasedStepBuilder eclipseConfig = EclipseJdtFormatterStep.createBuilder(stepConfig.getProvisioner());
+		EquoBasedStepBuilder eclipseConfig = EclipseJdtFormatterStep.createBuilder(stepConfig.getProvisioner());
 		eclipseConfig.setVersion(version == null ? EclipseJdtFormatterStep.defaultVersion() : version);
 		if (null != file) {
 			File settingsFile = stepConfig.getFileLocator().locateFile(file);

From 624c7786fc14a45900f2806f34a0af9ca27bd449 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 1 Mar 2023 11:55:53 -0800
Subject: [PATCH 0861/2068] We don't need _ext/eclipse-jdt anymore.

---
 _ext/eclipse-jdt/CHANGES.md                   |  15 ---
 _ext/eclipse-jdt/LICENSE.txt                  |  70 -----------
 _ext/eclipse-jdt/README.md                    |  12 --
 _ext/eclipse-jdt/build.gradle                 |  13 --
 _ext/eclipse-jdt/gradle.properties            |   9 --
 .../java/EclipseJdtFormatterStepImplTest.java | 116 ------------------
 6 files changed, 235 deletions(-)
 delete mode 100644 _ext/eclipse-jdt/CHANGES.md
 delete mode 100644 _ext/eclipse-jdt/LICENSE.txt
 delete mode 100644 _ext/eclipse-jdt/README.md
 delete mode 100644 _ext/eclipse-jdt/build.gradle
 delete mode 100644 _ext/eclipse-jdt/gradle.properties
 delete mode 100644 _ext/eclipse-jdt/src/test/java/com/diffplug/spotless/extra/eclipse/java/EclipseJdtFormatterStepImplTest.java

diff --git a/_ext/eclipse-jdt/CHANGES.md b/_ext/eclipse-jdt/CHANGES.md
deleted file mode 100644
index d698ce2c6c..0000000000
--- a/_ext/eclipse-jdt/CHANGES.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# spotless-eclipse-jdt
-
-We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `4.8.0`).
-
-## [Unreleased]
-
-## [4.8.1] - 2021-10-04
-### Changed
-* Bumped minimum supported Eclipse JDT core version to 3.27.0
-* `format` interface requires source file information to distinguish module-info from compilation unit. Old interface marked as deprecated.
-### Fixed
-* Fixed module-info formatting. Previous versions did not recognized content and skipped formatting.
-
-## [4.8.0] - 2018-07-19
-* Initial release!
diff --git a/_ext/eclipse-jdt/LICENSE.txt b/_ext/eclipse-jdt/LICENSE.txt
deleted file mode 100644
index 3d967aee74..0000000000
--- a/_ext/eclipse-jdt/LICENSE.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-i) changes to the Program, and
-ii) additions to the Program;
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-b) its license agreement:
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-b) a copy of this Agreement must be included with each copy of the Program.
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
\ No newline at end of file
diff --git a/_ext/eclipse-jdt/README.md b/_ext/eclipse-jdt/README.md
deleted file mode 100644
index 624e577e0d..0000000000
--- a/_ext/eclipse-jdt/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# spotless-eclipse-jdt
-
-Eclipse JDT and its dependencies require a large amount of byte code.
-Hence they should not be directly be required by the Spotless, but only be requested in case
-they are configured by the Spotless configuration. Hence we publish Eclipse's formatter and all its dependencies, along with a small amount of glue code, into the `com.diffplug.gradle.spotless:spotless-eclipse-jdt` artifact.
-
-To publish a new version, update the `_ext/eclipse-jdt/gradle.properties` appropriately and see [CONTRIBUTING.md](../../CONTRIBUTING.md) how to enable
-`_ext` projects.
-
-## License
-
-Spotless at large is under the Apache 2.0 license, but this jar is under the EPL v1.
diff --git a/_ext/eclipse-jdt/build.gradle b/_ext/eclipse-jdt/build.gradle
deleted file mode 100644
index 8b71deba18..0000000000
--- a/_ext/eclipse-jdt/build.gradle
+++ /dev/null
@@ -1,13 +0,0 @@
-apply from: rootProject.file('_ext/gradle/update-lockfile.gradle')
-apply from: rootProject.file('_ext/gradle/java-setup.gradle')
-apply from: rootProject.file('gradle/java-publish.gradle')
-
-ext {
-	developers = [
-		fvgh: [ name: 'Frank Vennemeyer', email: 'frankgh@zoho.com' ],
-		nedtwigg: [ name: 'Ned Twigg', email: 'ned.twigg@diffplug.com' ],
-	]
-}
-
-dependencies {
-}
diff --git a/_ext/eclipse-jdt/gradle.properties b/_ext/eclipse-jdt/gradle.properties
deleted file mode 100644
index 51d5f41014..0000000000
--- a/_ext/eclipse-jdt/gradle.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-artifactId=spotless-eclipse-jdt
-description=Eclipse's JDT formatter bundled for Spotless
-
-# Build requirements
-VER_JAVA=11
-
-# Compile
-VER_ECLIPSE_JDT_CORE=[3.13.0,4.0.0[
-VER_SPOTLESS_ECLIPSE_BASE=[3.5.0,4.0.0[
diff --git a/_ext/eclipse-jdt/src/test/java/com/diffplug/spotless/extra/eclipse/java/EclipseJdtFormatterStepImplTest.java b/_ext/eclipse-jdt/src/test/java/com/diffplug/spotless/extra/eclipse/java/EclipseJdtFormatterStepImplTest.java
deleted file mode 100644
index cef63072c9..0000000000
--- a/_ext/eclipse-jdt/src/test/java/com/diffplug/spotless/extra/eclipse/java/EclipseJdtFormatterStepImplTest.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright 2016-2021 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.java;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Properties;
-
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import com.diffplug.spotless.FormatterProperties;
-import com.diffplug.spotless.ResourceHarness;
-
-/** Eclipse JDT wrapper integration tests */
-class EclipseJdtFormatterStepImplTest extends ResourceHarness {
-
-	private static String UNFORMATTED;
-	private static String FORMATTED;
-
-	@BeforeAll
-	static void beforeAll() throws IOException {
-		UNFORMATTED = getTestResource("java/eclipse/JavaCodeUnformatted.test");
-		FORMATTED = getTestResource("java/eclipse/JavaCodeFormatted.test");
-	}
-
-	private Properties config;
-
-	@BeforeEach
-	void beforeEach() throws IOException {
-		File settingsFile = createTestFile("java/eclipse/formatter.xml");
-		config = FormatterProperties.from(settingsFile).getProperties();
-	}
-
-	private final static String ILLEGAL_CHAR = Character.toString((char) 254);
-
-	@Test
-	void nominal() throws Throwable {
-		assertEquals(FORMATTED, format(UNFORMATTED));
-	}
-
-	@Test
-	public void invalidSyntax() throws Throwable {
-		try {
-			String invalidSyntax = FORMATTED.replace("{", "");
-			assertEquals(invalidSyntax, format(invalidSyntax));
-		} catch (IndexOutOfBoundsException e) {
-			/*
-			 * Some JDT versions throw exception, but this changed again in later versions.
-			 * Anyhow, exceptions are acceptable, since Spotless should format valid Java code.
-			 */
-		}
-	}
-
-	@Test
-	void invalidCharater() throws Throwable {
-		String invalidInput = UNFORMATTED + ILLEGAL_CHAR;
-		assertEquals(invalidInput, format(invalidInput));
-	}
-
-	@Test
-	void invalidConfiguration() throws Throwable {
-		config.setProperty(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaCore.SPACE);
-		config.setProperty(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "noInteger");
-		String defaultTabReplacement = "    ";
-		assertEquals(FORMATTED.replace("\t", defaultTabReplacement), format(FORMATTED));
-	}
-
-	@Test
-	void htmlPreTag() throws Throwable {
-		config.clear();
-		config.setProperty(
-				DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_HEADER,
-				DefaultCodeFormatterConstants.TRUE);
-		String formatted = getTestResource("java/eclipse/HtmlPreTagFormatted.test");
-		String unformatted = getTestResource("java/eclipse/HtmlPreTagUnformatted.test");
-		assertEquals(formatted, format(unformatted), "Failed to create internal code formatter. See Spotless issue #191");
-	}
-
-	@Test
-	void moduleInfo() throws Throwable {
-		File settingsFile = createTestFile("java/eclipse/ModuleInfo.prefs");
-		config = FormatterProperties.from(settingsFile).getProperties();
-		String formatted = getTestResource("java/eclipse/ModuleInfoFormatted.test");
-		String unformatted = getTestResource("java/eclipse/ModuleInfoUnformatted.test");
-		assertEquals(formatted, format(unformatted, "whatever/module-info.java"), "Jvm9 module info not formatted.");
-	}
-
-	private String format(final String input) throws Exception {
-		return format(input, "");
-	}
-
-	private String format(final String input, final String fileName) throws Exception {
-		EclipseJdtFormatterStepImpl formatter = new EclipseJdtFormatterStepImpl(config);
-		return formatter.format(input, new File(fileName));
-	}
-
-}

From 85d61ba2633bd70deebb821cd4408261ddbcdf94 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 1 Mar 2023 12:03:09 -0800
Subject: [PATCH 0862/2068] Simplify the build.

---
 lib-extra/build.gradle | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index 1c4cfa8c59..df99e12f37 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -60,11 +60,6 @@ p2deps {
 	into 'jdtCompileOnly', {
 		p2repo 'https://download.eclipse.org/eclipse/updates/4.26/'
 		install 'org.eclipse.jdt.core'
-		addFilter 'minimize', { filter ->
-			filter.exclude 'org.eclipse.ant.core'
-			filter.exclude 'org.eclipse.core.expressions'
-			filter.exclude 'org.eclipse.core.filesystem'
-		}
 	}
 }
 

From fb2cf090dc83bd12212ac387c8439667c2bafb19 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 1 Mar 2023 12:03:21 -0800
Subject: [PATCH 0863/2068] Fix spotbugs warning.

---
 .../java/com/diffplug/spotless/extra/EquoBasedStepBuilder.java   | 1 +
 1 file changed, 1 insertion(+)

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 9a0509edb7..e52ec55f1c 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
@@ -81,6 +81,7 @@ EquoBasedStepBuilder.State get() throws Exception {
 	 * based on the state.
 	 */
 	public static class State implements Serializable {
+		private static final long serialVersionUID = 584400372246020995L;
 		final String semanticVersion;
 		final JarState jarState;
 		final FileSignature settingsFiles;

From 08652899d2bc0f4bc60a61b2b57405a20dc6815c Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 1 Mar 2023 12:03:38 -0800
Subject: [PATCH 0864/2068] Do a better job cleaning up `.0`.

---
 .../extra/java/EclipseJdtFormatterStep.java         | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 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 98dea4ff60..67318c113a 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
@@ -44,13 +44,20 @@ public static EquoBasedStepBuilder createBuilder(Provisioner provisioner) {
 			@Override
 			protected P2Model model(String version) {
 				var model = new P2Model();
-				if (version.endsWith(".0")) {
-					version = version.substring(0, version.length() - 2);
-				}
 				model.addP2Repo("https://download.eclipse.org/eclipse/updates/" + version + "/");
 				model.getInstall().add("org.eclipse.jdt.core");
 				return model;
 			}
+
+			@Override
+			public void setVersion(String version) {
+				if (version.endsWith(".0")) {
+					String newVersion = version.substring(0, version.length() - 2);
+					System.err.println("Recommend replacing '" + version + "' with '" + newVersion + "' for eclipse JDT");
+					version = newVersion;
+				}
+				super.setVersion(version);
+			}
 		};
 	}
 

From 96ab7a3552f37a60d6f3a8c254b32d7ec72e96ea Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 1 Mar 2023 12:18:10 -0800
Subject: [PATCH 0865/2068] Update changelog for the new JDT stuff.

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 8540a44851..64c3726e9f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changes
 * We are now opting in to Gradle's new stable configuration cache. ([#1591](https://github.com/diffplug/spotless/pull/1591))
+* Adopt [Equo Solstice OSGi and p2 shim](https://github.com/equodev/equo-ide/tree/main/solstice) to update all Eclipse-based plugins. ([#1524](https://github.com/diffplug/spotless/pull/1524))
+  * Eclipse JDT now supports `4.8` through `4.26`. Also we now recommend dropping the last `.0`, e.g. `4.26` instead of `4.26.0`, you'll get warnings to help you switch.
 
 ## [2.36.0] - 2023-02-27
 ### Added

From 771d5e30f834f3389dcafbcf72ab9dc0b9094f58 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 28 Feb 2023 17:24:03 +0800
Subject: [PATCH 0866/2068] Run with build cache by default

Follow up a9ad736a7b73d0edcbec17603091af0de4bdbf6d.
---
 .github/workflows/ci.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2c372f1668..2a8078339d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,9 +33,9 @@ jobs:
         with:
           gradle-home-cache-cleanup: true
       - name: spotlessCheck
-        run: ./gradlew spotlessCheck --build-cache
+        run: ./gradlew spotlessCheck
       - name: assemble testClasses
-        run: ./gradlew assemble testClasses --build-cache
+        run: ./gradlew assemble testClasses
   build:
     needs: sanityCheck
     strategy:
@@ -71,13 +71,13 @@ jobs:
           gradle-home-cache-cleanup: true
       - name: build (maven-only)
         if: matrix.kind == 'maven'
-        run: ./gradlew :plugin-maven:build -x spotlessCheck --build-cache
+        run: ./gradlew :plugin-maven:build -x spotlessCheck
       - name: build (everything-but-maven)
         if: matrix.kind == 'gradle'
-        run: ./gradlew build -x spotlessCheck --build-cache -PSPOTLESS_EXCLUDE_MAVEN=true
+        run: ./gradlew build -x spotlessCheck -PSPOTLESS_EXCLUDE_MAVEN=true
       - name: test npm
         if: matrix.kind == 'npm'
-        run: ./gradlew testNpm --build-cache
+        run: ./gradlew testNpm
       - name: junit result
         uses: mikepenz/action-junit-report@v3
         if: always() # always run even if the previous step fails

From 0f7293ce8700e87d1ecc952f50e6c6a371005e9d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 2 Mar 2023 11:56:26 +0000
Subject: [PATCH 0867/2068] chore(deps): update plugin com.gradle.enterprise to
 v3.12.4

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 1478f5af31..fb0c52fb35 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -23,7 +23,7 @@ plugins {
 	// https://github.com/davidburstrom/version-compatibility-gradle-plugin/tags
 	id 'io.github.davidburstrom.version-compatibility' version '0.4.0' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.enterprise
-	id 'com.gradle.enterprise' version '3.12.3'
+	id 'com.gradle.enterprise' version '3.12.4'
 }
 
 dependencyResolutionManagement {

From 1913e1c0b549bd382a82f7a42647be87cdc092f3 Mon Sep 17 00:00:00 2001
From: Kenji Abe <kenji.01.star@gmail.com>
Date: Sat, 4 Mar 2023 17:06:30 +0900
Subject: [PATCH 0868/2068] Support a file name field in license headers

---
 .../spotless/generic/LicenseHeaderStep.java   | 24 ++++++++++-----
 .../com/diffplug/spotless/StepHarness.java    | 14 +++++++--
 .../generic/LicenseHeaderStepTest.java        | 30 +++++++++++++++++++
 3 files changed, 57 insertions(+), 11 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java b/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
index b4c0cf2a6f..624ea16cc6 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
@@ -142,7 +142,7 @@ public FormatterStep build() {
 					throw new IllegalStateException(yearMode.toString());
 				}
 				return new Runtime(headerLazy.get(), delimiter, yearSeparator, updateYear, skipLinesMatching);
-			}, step -> step::format);
+			}, step -> FormatterFunc.needsFile(step::format));
 		}
 
 		if (contentPattern == null) {
@@ -214,6 +214,8 @@ private static class Runtime implements Serializable {
 		private final boolean updateYearWithLatest;
 		private final boolean licenseHeaderWithRange;
 
+		private static final Pattern FILENAME_PATTERN = Pattern.compile("\\$FILE");
+
 		/** The license that we'd like enforced. */
 		private Runtime(String licenseHeader, String delimiter, String yearSeparator, boolean updateYearWithLatest, @Nullable String skipLinesMatching) {
 			if (delimiter.contains("\n")) {
@@ -266,9 +268,9 @@ private static Optional<String> getYearToken(String licenseHeader) {
 		}
 
 		/** Formats the given string. */
-		private String format(String raw) {
+		private String format(String raw, File file) {
 			if (skipLinesMatching == null) {
-				return addOrUpdateLicenseHeader(raw);
+				return addOrUpdateLicenseHeader(raw, file);
 			} else {
 				String[] lines = raw.split("\n");
 				StringBuilder skippedLinesBuilder = new StringBuilder();
@@ -287,11 +289,11 @@ private String format(String raw) {
 						remainingLinesBuilder.append(line).append('\n');
 					}
 				}
-				return skippedLinesBuilder + addOrUpdateLicenseHeader(remainingLinesBuilder.toString());
+				return skippedLinesBuilder + addOrUpdateLicenseHeader(remainingLinesBuilder.toString(), file);
 			}
 		}
 
-		private String addOrUpdateLicenseHeader(String raw) {
+		private String addOrUpdateLicenseHeader(String raw, File file) {
 			Matcher contentMatcher = delimiterPattern.matcher(raw);
 			if (!contentMatcher.find()) {
 				throw new IllegalArgumentException("Unable to find delimiter regex " + delimiterPattern);
@@ -305,13 +307,14 @@ private String addOrUpdateLicenseHeader(String raw) {
 						return raw;
 					} else {
 						// otherwise we'll have to add the header
-						return yearSepOrFull + content;
+						return replaceFileName(yearSepOrFull, file) + content;
 					}
 				} else {
 					// the yes year case is a bit harder
 					int beforeYearIdx = raw.indexOf(beforeYear);
 					int afterYearIdx = raw.indexOf(afterYear, beforeYearIdx + beforeYear.length() + 1);
 
+					String header;
 					if (beforeYearIdx >= 0 && afterYearIdx >= 0 && afterYearIdx + afterYear.length() <= contentMatcher.start()) {
 						// and also ends with exactly the right header, so it's easy to parse the existing year
 						String existingYear = raw.substring(beforeYearIdx + beforeYear.length(), afterYearIdx);
@@ -323,12 +326,13 @@ private String addOrUpdateLicenseHeader(String raw) {
 								return raw;
 							}
 						}
-						return beforeYear + newYear + afterYear + content;
+						header = beforeYear + newYear + afterYear;
 					} else {
 						String newYear = calculateYearBySearching(raw.substring(0, contentMatcher.start()));
 						// at worst, we just say that it was made today
-						return beforeYear + newYear + afterYear + content;
+						header = beforeYear + newYear + afterYear;
 					}
+					return replaceFileName(header, file) + content;
 				}
 			}
 		}
@@ -421,6 +425,10 @@ private String setLicenseHeaderYearsFromGitHistory(String raw, File file) throws
 			return beforeYear + yearRange + afterYear + raw.substring(contentMatcher.start());
 		}
 
+		private String replaceFileName(String header, File file) {
+			return FILENAME_PATTERN.matcher(header).replaceAll(file.getName());
+		}
+
 		private static String parseYear(String cmd, File file) throws IOException {
 			String fullCmd = cmd + " -- " + file.getAbsolutePath();
 			ProcessBuilder builder = new ProcessBuilder().directory(file.getParentFile());
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarness.java b/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
index c611cc738a..032345827d 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
@@ -57,14 +57,22 @@ public static StepHarness forFormatter(Formatter formatter) {
 
 	/** Asserts that the given element is transformed as expected, and that the result is idempotent. */
 	public StepHarness test(String before, String after) {
-		String actual = formatter.compute(LineEnding.toUnix(before), new File(""));
+		return test(before, after, "");
+	}
+
+	public StepHarness test(String before, String after, String fileName) {
+		String actual = formatter.compute(LineEnding.toUnix(before), new File(fileName));
 		assertEquals(after, actual, "Step application failed");
-		return testUnaffected(after);
+		return testUnaffected(after, fileName);
 	}
 
 	/** Asserts that the given element is idempotent w.r.t the step under test. */
 	public StepHarness testUnaffected(String idempotentElement) {
-		String actual = formatter.compute(LineEnding.toUnix(idempotentElement), new File(""));
+		return testUnaffected(idempotentElement, "");
+	}
+
+	public StepHarness testUnaffected(String idempotentElement, String fileName) {
+		String actual = formatter.compute(LineEnding.toUnix(idempotentElement), new File(fileName));
 		assertEquals(idempotentElement, actual, "Step is not idempotent");
 		return this;
 	}
diff --git a/testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java b/testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java
index 2b1d0aff07..d8d7700be5 100644
--- a/testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java
@@ -35,6 +35,8 @@ class LicenseHeaderStepTest extends ResourceHarness {
 	private static final String package_ = "package ";
 	private static final String HEADER_WITH_$YEAR = "This is a fake license, $YEAR. ACME corp.";
 	private static final String HEADER_WITH_RANGE_TO_$YEAR = "This is a fake license with range, 2009-$YEAR. ACME corp.";
+	private static final String HEADER_WITH_$FILE = "This is a fake license, $FILE. ACME corp.";
+	private static final String HEADER_WITH_$YEAR_$FILE = "This is a fake license, $FILE, $YEAR. ACME corp.";
 
 	@Test
 	void parseExistingYear() throws Exception {
@@ -163,6 +165,16 @@ private String hasHeaderWithRangeAndWithYearTo(String toYear) throws IOException
 		return hasHeaderYear(HEADER_WITH_RANGE_TO_$YEAR, toYear);
 	}
 
+	private String hasHeaderFileName(String license, String fileName) throws IOException {
+		return header(license).replace("$FILE", fileName) + getTestResource(FILE_NO_LICENSE);
+	}
+
+	private String hasHeaderYearFileName(String license, String year, String fileName) throws IOException {
+		return header(license)
+			.replace("$YEAR", year)
+			.replace("$FILE", fileName) + getTestResource(FILE_NO_LICENSE);
+	}
+
 	private static String currentYear() {
 		return String.valueOf(YearMonth.now().getYear());
 	}
@@ -250,4 +262,22 @@ void should_preserve_year_for_license_with_address() throws Throwable {
 				hasHeader(licenceWithAddress().replace("$YEAR", "2015").replace("FooBar Inc. All", "FooBar Inc.  All")),
 				hasHeader(licenceWithAddress().replace("$YEAR", "2015")));
 	}
+
+	@Test
+	void should_apply_license_containing_filename_token() throws Exception {
+		FormatterStep step = LicenseHeaderStep.headerDelimiter(header(HEADER_WITH_$FILE), package_).build();
+		StepHarness.forStep(step)
+			.test(getTestResource(FILE_NO_LICENSE), hasHeaderFileName(HEADER_WITH_$FILE, "Test.java"), "Test.java");
+	}
+
+	@Test
+	void should_apply_license_containing_YEAR_filename_token() throws Exception {
+		FormatterStep step = LicenseHeaderStep.headerDelimiter(header(HEADER_WITH_$YEAR_$FILE), package_).build();
+		StepHarness.forStep(step)
+			.test(
+				getTestResource(FILE_NO_LICENSE),
+				hasHeaderYearFileName(HEADER_WITH_$YEAR_$FILE, currentYear(), "Test.java"),
+				"Test.java"
+			);
+	}
 }

From bdc857e8c1b55c87a138976742da702ef53ff373 Mon Sep 17 00:00:00 2001
From: Kenji Abe <kenji.01.star@gmail.com>
Date: Sat, 4 Mar 2023 17:31:22 +0900
Subject: [PATCH 0869/2068] Update CHANGES.md

---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index 8540a44851..f5033f6d2a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changes
 * We are now opting in to Gradle's new stable configuration cache. ([#1591](https://github.com/diffplug/spotless/pull/1591))
+* Support a file name field in license headers. ([#1605](https://github.com/diffplug/spotless/pull/1605))
 
 ## [2.36.0] - 2023-02-27
 ### Added

From e7eed3051a376c13b5a240d7cca88a09fd19862a Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Sat, 4 Mar 2023 17:52:00 +0400
Subject: [PATCH 0870/2068] Upgrade cleanthat to handle Annotated packages

---
 lib/build.gradle                                              | 2 +-
 .../java/com/diffplug/spotless/java/CleanthatJavaStep.java    | 2 +-
 plugin-gradle/CHANGES.md                                      | 2 ++
 plugin-maven/CHANGES.md                                       | 2 ++
 .../RemoveUnusedImportsStep_withCleanthatJavaparserTest.java  | 4 +---
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 6aaa3c0a6a..fbf9e0215b 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -110,7 +110,7 @@ dependencies {
 
 	gsonCompileOnly 'com.google.code.gson:gson:2.10.1'
 
-	String VER_CLEANTHAT="2.7"
+	String VER_CLEANTHAT="2.8"
 	cleanthatCompileOnly "io.github.solven-eu.cleanthat:java:$VER_CLEANTHAT"
 	compatCleanthat2Dot1CompileAndTestOnly "io.github.solven-eu.cleanthat:java:$VER_CLEANTHAT"
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
index 2f30006e5e..aef8237737 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
@@ -40,7 +40,7 @@ public final class CleanthatJavaStep {
 	private static final String MAVEN_COORDINATE = "io.github.solven-eu.cleanthat:java";
 
 	// CleanThat changelog is available at https://github.com/solven-eu/cleanthat/blob/master/CHANGES.MD
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "2.7");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "2.8");
 
 	// prevent direct instantiation
 	private CleanthatJavaStep() {}
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index a119827220..d42527aad1 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,6 +5,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * `removeUnusedImport` can be configured to rely on `cleanthat-javaparser-unnecessaryimport`. Default remains `google-java-format`. ([#1589](https://github.com/diffplug/spotless/pull/1589))
+### Changes
+* Bump default `cleanthat` version to latest `2.6` -> `2.8`. ([#1589](https://github.com/diffplug/spotless/pull/1589)
 
 ## [6.16.0] - 2023-02-27
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 081ca9f901..4bbaeeba31 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,6 +5,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * `removeUnusedImport` can be configured to rely on `cleanthat-javaparser-unnecessaryimport`. Default remains `google-java-format`. ([#1589](https://github.com/diffplug/spotless/pull/1589))
+### Changes
+* Bump default `cleanthat` version to latest `2.6` -> `2.8`. ([#1589](https://github.com/diffplug/spotless/pull/1589)
 
 ## [2.34.0] - 2023-02-27
 ### Added
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStep_withCleanthatJavaparserTest.java b/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStep_withCleanthatJavaparserTest.java
index af17e9c87b..d34096de87 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStep_withCleanthatJavaparserTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStep_withCleanthatJavaparserTest.java
@@ -32,9 +32,7 @@ void behavior() throws Exception {
 				.testResource("java/removeunusedimports/JavaCodeWithLicensePackageUnformatted.test", "java/removeunusedimports/JavaCodeWithLicensePackageFormatted.test")
 				.testResource("java/removeunusedimports/JavaCodeWithPackageUnformatted.test", "java/removeunusedimports/JavaCodeWithPackageFormatted.test")
 				.testResource("java/removeunusedimports/Jdk17TextBlockUnformatted.test", "java/removeunusedimports/Jdk17TextBlockFormatted.test")
-		// JavaParser is failing over an annotated package: https://github.com/javaparser/javaparser/issues/3924
-		// .testResource("java/removeunusedimports/RevelcUnformatted.test", "java/removeunusedimports/RevelcFormatted.test")
-		;
+				.testResource("java/removeunusedimports/RevelcUnformatted.test", "java/removeunusedimports/RevelcFormatted.test");
 	}
 
 	@Test

From 71d242fcbc1b4ed1c614d2b63de4e899751d9110 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Sat, 4 Mar 2023 23:36:36 +0400
Subject: [PATCH 0871/2068] Fix included vs excluded

---
 .../java/com/diffplug/spotless/java/CleanthatJavaStep.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
index aef8237737..0377af8bc5 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
@@ -83,8 +83,8 @@ public static boolean defaultIncludeDraft() {
 	public static FormatterStep create(String groupArtifact,
 			String version,
 			String sourceJdkVersion,
-			List<String> excluded,
 			List<String> included,
+			List<String> excluded,
 			boolean includeDraft,
 			Provisioner provisioner) {
 		Objects.requireNonNull(groupArtifact, "groupArtifact");
@@ -94,7 +94,7 @@ public static FormatterStep create(String groupArtifact,
 		Objects.requireNonNull(version, "version");
 		Objects.requireNonNull(provisioner, "provisioner");
 		return FormatterStep.createLazy(NAME,
-				() -> new JavaRefactorerState(NAME, groupArtifact, version, sourceJdkVersion, excluded, included, includeDraft, provisioner),
+				() -> new JavaRefactorerState(NAME, groupArtifact, version, sourceJdkVersion, included, excluded, includeDraft, provisioner),
 				JavaRefactorerState::createFormat);
 	}
 
@@ -120,7 +120,7 @@ static final class JavaRefactorerState implements Serializable {
 		final boolean includeDraft;
 
 		JavaRefactorerState(String stepName, String version, Provisioner provisioner) throws IOException {
-			this(stepName, MAVEN_COORDINATE, version, defaultSourceJdk(), defaultExcludedMutators(), defaultMutators(), defaultIncludeDraft(), provisioner);
+			this(stepName, MAVEN_COORDINATE, version, defaultSourceJdk(), defaultMutators(), defaultExcludedMutators(), defaultIncludeDraft(), provisioner);
 		}
 
 		JavaRefactorerState(String stepName,

From 8edc1ca889a55f891c1a28856c342734caa82738 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Sun, 5 Mar 2023 18:52:33 +0400
Subject: [PATCH 0872/2068] Improve CleanThat documentation

---
 plugin-gradle/README.md | 12 +++++++-----
 plugin-maven/README.md  |  7 ++++---
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index b66d423e6b..171504e4df 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -270,11 +270,13 @@ spotless {
     cleanthat()
     // optional: you can specify a specific version and/or config file
     cleanthat()
-      .groupArtifact('1.7')                 // default is 'io.github.solven-eu.cleanthat:java'
-      .version('2.1')                             // You may force a past of -SNAPSHOT
-      .sourceCompatibility('1.7')                 // default is '1.7'
-      .addMutator('your.custom.MagicMutator')
-      .excludeMutator('UseCollectionIsEmpty')
+      .groupArtifact('io.github.solven-eu.cleanthat:java') // Optional. Default is 'io.github.solven-eu.cleanthat:java'
+      .version('2.8')                                      // You may force a custom version of Cleanthat
+      .sourceCompatibility('1.7')                          // default is '1.7'
+      .addMutator('SafeAndConsensual')                     // Default includes the SafeAndConsensual composite mutator
+      .addMutator('your.custom.MagicMutator')              // List of mutators: https://github.com/solven-eu/cleanthat/blob/master/MUTATORS.generated.MD
+      .excludeMutator('UseCollectionIsEmpty')              // You may exclude some mutators (from Composite ones)
+      .includeDraft(false)                                 // You may exclude draft mutators (from Composite ones)
 ```
 
 
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 426b00184e..0520aa6d97 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -283,17 +283,18 @@ These mechanisms already exist for the Gradle plugin.
 
 ```xml
 <cleanthat>
-  <version>2.0</version>                          <!-- optional version of Cleanthat -->
+  <version>2.8</version>                          <!-- optional version of Cleanthat -->
   <sourceJdk>${maven.compiler.source}</sourceJdk> <!-- optional. Default to ${maven.compiler.source} else '1.7' -->
   <mutators>
-    <mutator>*</mutator>                          <!-- optional. Default to '*' to include all mutators -->
+    <mutator>SafeAndConsensual</mutator>          <!-- optional. Default to 'SafeAndConsensual' to include all mutators -->
   </mutators>
-  <mutators> <!-- List of mutators: https://github.com/solven-eu/cleanthat/tree/master/java/src/main/java/eu/solven/cleanthat/engine/java/refactorer/mutators -->
+  <mutators>            <!-- List of mutators: https://github.com/solven-eu/cleanthat/blob/master/MUTATORS.generated.MD -->
     <mutator>LiteralsFirstInComparisons</mutator> <!-- You may alternatively list the requested mutators -->
   </mutators>
   <excludedMutators>
     <excludedMutator>OptionalNotEmpty</excludedMutator> <!-- You can discard specific rules -->
   </excludedMutators>
+  <includeDraft>false</includeDraft>              <!-- optional. Default to false, not to include draft mutators from Composite mutators -->
 </cleanthat>
 ```
 

From c836a673025c1854ba9d0f4fca284ffc27141a20 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Sun, 5 Mar 2023 19:00:21 +0400
Subject: [PATCH 0873/2068] Improve documentation

---
 plugin-gradle/README.md | 11 +++++++++++
 plugin-maven/README.md  |  8 ++++++++
 2 files changed, 19 insertions(+)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 171504e4df..a345e45e23 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -180,6 +180,17 @@ spotless {
     target 'src/*/java/**/*.java'
 ```
 
+### removeUnusedImports
+
+```
+spotless {
+  java {
+  removeUnusedImports()
+  // optional: you may switch for `google-java-format` as underlying engine to `cleanthat-javaparser-unnecessaryimport`
+  // which enables processing any language level source file with a JDK8+ Runtime
+  removeUnusedImports().engine('cleanthat-javaparser-unnecessaryimport')
+```
+
 ### google-java-format
 
 [homepage](https://github.com/google/google-java-format). [changelog](https://github.com/google/google-java-format/releases).
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 0520aa6d97..82217a26f7 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -207,6 +207,14 @@ any other maven phase (i.e. compile) then it can be configured as below;
 </configuration>
 ```
 
+### removeUnusedImports
+
+```xml
+<removeUnusedImports>
+  <engine>google-java-format</engine>    <!-- optional. Defaults to `google-java-format`. Can be switched to `cleanthat-javaparser-unnecessaryimport` (e.g. to process JDK17 source files with a JDK8+ Runtime) -->
+</removeUnusedImports>
+```
+
 ### google-java-format
 
 [homepage](https://github.com/google/google-java-format). [changelog](https://github.com/google/google-java-format/releases). [code](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/GoogleJavaFormat.java).

From 3bcdda8aa510b7ddf8b7ee2e7608ec1ee5a5ccff Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 7 Mar 2023 06:08:34 +0000
Subject: [PATCH 0874/2068] chore(deps): update plugin
 io.github.gradle-nexus.publish-plugin to v1.3.0

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 1478f5af31..dbca443e3e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -10,7 +10,7 @@ plugins {
 	// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
 	id 'com.gradle.plugin-publish' version '1.1.0' apply false
 	// https://github.com/gradle-nexus/publish-plugin/releases
-	id 'io.github.gradle-nexus.publish-plugin' version '1.2.0' apply false
+	id 'io.github.gradle-nexus.publish-plugin' version '1.3.0' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
 	id 'com.github.spotbugs' version '5.0.13' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md

From f3c57711afe80079b2973a27250189192f957c8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksandar=20Dragojevi=C4=87?= <stingermssl@gmail.com>
Date: Tue, 7 Mar 2023 14:40:43 +0100
Subject: [PATCH 0875/2068] Use correct property for scalafmt

The example uses an outdated property for configuring scalafmt.
---
 plugin-gradle/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index b66d423e6b..267136e4ac 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -430,8 +430,8 @@ spotless {
 ```gradle
 spotless {
   scala {
-    // version and configFile, majorScalaVersion are all optional
-    scalafmt('3.5.9').configFile('scalafmt.conf').majorScalaVersion('2.13')
+    // version and configFile, scalaMajorVersion are all optional
+    scalafmt('3.5.9').configFile('scalafmt.conf').scalaMajorVersion('2.13')
 ```
 
 <a name="applying-to-cc-sources"></a>

From 7ad63c95f8983d1925ccc1a52605c515e551ea7b Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Tue, 7 Mar 2023 20:49:17 +0400
Subject: [PATCH 0876/2068] Add sealed class testCases

---
 .../SealedClassTestsFormatted.test            | 45 ++++++++++++++++++
 .../SealedClassTestsUnformatted.test          | 46 +++++++++++++++++++
 ...portsStep_withCleanthatJavaparserTest.java |  4 +-
 ...dImportsStep_withGoogleJavaFormatTest.java |  8 ++--
 4 files changed, 99 insertions(+), 4 deletions(-)
 create mode 100644 testlib/src/main/resources/java/removeunusedimports/SealedClassTestsFormatted.test
 create mode 100644 testlib/src/main/resources/java/removeunusedimports/SealedClassTestsUnformatted.test

diff --git a/testlib/src/main/resources/java/removeunusedimports/SealedClassTestsFormatted.test b/testlib/src/main/resources/java/removeunusedimports/SealedClassTestsFormatted.test
new file mode 100644
index 0000000000..2ef96e6c72
--- /dev/null
+++ b/testlib/src/main/resources/java/removeunusedimports/SealedClassTestsFormatted.test
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package java.removeunusedimports;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import org.junit.jupiter.api.Test;
+
+class SealedClassTests extends AbstractJupiterTestEngineTests {
+
+	@Test
+	void sealedTestClassesAreTestClasses() {
+		executeTestsForClass(TestCase.class).testEvents() //
+				.assertStatistics(stats -> stats.finished(2).succeeded(1).failed(1));
+	}
+
+	sealed
+	abstract static class AbstractTestCase
+	permits TestCase
+	{
+
+		@Test
+		void succeedingTest() {
+			assertTrue(true);
+		}
+
+		@Test
+		void failingTest() {
+			fail("always fails");
+		}
+	}
+
+	static final class TestCase extends AbstractTestCase {
+	}
+
+}
diff --git a/testlib/src/main/resources/java/removeunusedimports/SealedClassTestsUnformatted.test b/testlib/src/main/resources/java/removeunusedimports/SealedClassTestsUnformatted.test
new file mode 100644
index 0000000000..942aa4d235
--- /dev/null
+++ b/testlib/src/main/resources/java/removeunusedimports/SealedClassTestsUnformatted.test
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package java.removeunusedimports;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import org.junit.jupiter.api.Test;
+import useless.project.UnusedClass;
+
+class SealedClassTests extends AbstractJupiterTestEngineTests {
+
+	@Test
+	void sealedTestClassesAreTestClasses() {
+		executeTestsForClass(TestCase.class).testEvents() //
+				.assertStatistics(stats -> stats.finished(2).succeeded(1).failed(1));
+	}
+
+	sealed
+	abstract static class AbstractTestCase
+	permits TestCase
+	{
+
+		@Test
+		void succeedingTest() {
+			assertTrue(true);
+		}
+
+		@Test
+		void failingTest() {
+			fail("always fails");
+		}
+	}
+
+	static final class TestCase extends AbstractTestCase {
+	}
+
+}
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStep_withCleanthatJavaparserTest.java b/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStep_withCleanthatJavaparserTest.java
index d34096de87..11e31aeae2 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStep_withCleanthatJavaparserTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStep_withCleanthatJavaparserTest.java
@@ -32,7 +32,9 @@ void behavior() throws Exception {
 				.testResource("java/removeunusedimports/JavaCodeWithLicensePackageUnformatted.test", "java/removeunusedimports/JavaCodeWithLicensePackageFormatted.test")
 				.testResource("java/removeunusedimports/JavaCodeWithPackageUnformatted.test", "java/removeunusedimports/JavaCodeWithPackageFormatted.test")
 				.testResource("java/removeunusedimports/Jdk17TextBlockUnformatted.test", "java/removeunusedimports/Jdk17TextBlockFormatted.test")
-				.testResource("java/removeunusedimports/RevelcUnformatted.test", "java/removeunusedimports/RevelcFormatted.test");
+				.testResource("java/removeunusedimports/RevelcUnformatted.test", "java/removeunusedimports/RevelcFormatted.test")
+				// Sealed classes are introduced with JDK15: This syntax is not supported by javaParser: such files are not trimmed from unused imports (for now)
+				.testResource("java/removeunusedimports/SealedClassTestsUnformatted.test", "java/removeunusedimports/SealedClassTestsUnformatted.test");
 	}
 
 	@Test
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStep_withGoogleJavaFormatTest.java b/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStep_withGoogleJavaFormatTest.java
index ba7dfef4a3..44699a8215 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStep_withGoogleJavaFormatTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStep_withGoogleJavaFormatTest.java
@@ -31,9 +31,11 @@ void behavior() throws Exception {
 				.testResource("java/removeunusedimports/JavaCodeWithLicenseUnformatted.test", "java/removeunusedimports/JavaCodeWithLicenseFormatted.test")
 				.testResource("java/removeunusedimports/JavaCodeWithLicensePackageUnformatted.test", "java/removeunusedimports/JavaCodeWithLicensePackageFormatted.test")
 				.testResource("java/removeunusedimports/JavaCodeWithPackageUnformatted.test", "java/removeunusedimports/JavaCodeWithPackageFormatted.test")
-				// GoogleFormat requires running over a JDK17 to handle JDK17 features
-				// .testResource("java/removeunusedimports/Jdk17TextBlockUnformatted.test", "java/removeunusedimports/Jdk17TextBlockFormatted.test")
-				.testResource("java/removeunusedimports/RevelcUnformatted.test", "java/removeunusedimports/RevelcFormatted.test");
+				.testResource("java/removeunusedimports/RevelcUnformatted.test", "java/removeunusedimports/RevelcFormatted.test")
+		// GoogleFormat requires running over a JDK17 to handle JDK17 features
+		// .testResource("java/removeunusedimports/Jdk17TextBlockUnformatted.test", "java/removeunusedimports/Jdk17TextBlockFormatted.test")
+		//.testResource("java/removeunusedimports/SealedClassTestsUnformatted.test", "java/removeunusedimports/SealedClassTestsFormatted.test")
+		;
 	}
 
 	@Test

From d3c081262ac8ada9440ffff2c6b4c751822ac34e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 7 Mar 2023 23:51:50 +0000
Subject: [PATCH 0877/2068] fix(deps): update dependency
 org.eclipse.jgit:org.eclipse.jgit to v6.5.0.202303070854-r

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 8820a36e30..3f3ae9a2ee 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -29,7 +29,7 @@ VER_SLF4J=[1.6,2.0[
 
 # Used in multiple places
 VER_DURIAN=1.2.0
-VER_JGIT=6.4.0.202211300538-r
+VER_JGIT=6.5.0.202303070854-r
 VER_JUNIT=5.9.2
 VER_ASSERTJ=3.24.2
 VER_MOCKITO=5.1.1

From d8b0e20ef0a22d0aa03e668a4917f3f1ba4dc725 Mon Sep 17 00:00:00 2001
From: Kenji Abe <kenji.01.star@gmail.com>
Date: Wed, 8 Mar 2023 09:11:51 +0900
Subject: [PATCH 0878/2068] Use StepHarnessWithFile

---
 .../java/com/diffplug/spotless/StepHarness.java    | 14 +++-----------
 .../spotless/generic/LicenseHeaderStepTest.java    | 12 +++++++-----
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarness.java b/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
index 032345827d..c611cc738a 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
@@ -57,22 +57,14 @@ public static StepHarness forFormatter(Formatter formatter) {
 
 	/** Asserts that the given element is transformed as expected, and that the result is idempotent. */
 	public StepHarness test(String before, String after) {
-		return test(before, after, "");
-	}
-
-	public StepHarness test(String before, String after, String fileName) {
-		String actual = formatter.compute(LineEnding.toUnix(before), new File(fileName));
+		String actual = formatter.compute(LineEnding.toUnix(before), new File(""));
 		assertEquals(after, actual, "Step application failed");
-		return testUnaffected(after, fileName);
+		return testUnaffected(after);
 	}
 
 	/** Asserts that the given element is idempotent w.r.t the step under test. */
 	public StepHarness testUnaffected(String idempotentElement) {
-		return testUnaffected(idempotentElement, "");
-	}
-
-	public StepHarness testUnaffected(String idempotentElement, String fileName) {
-		String actual = formatter.compute(LineEnding.toUnix(idempotentElement), new File(fileName));
+		String actual = formatter.compute(LineEnding.toUnix(idempotentElement), new File(""));
 		assertEquals(idempotentElement, actual, "Step is not idempotent");
 		return this;
 	}
diff --git a/testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java b/testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java
index d8d7700be5..6df0c23950 100644
--- a/testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java
@@ -21,6 +21,8 @@
 import java.time.YearMonth;
 import java.time.ZoneOffset;
 
+import com.diffplug.spotless.StepHarnessWithFile;
+
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
@@ -266,18 +268,18 @@ void should_preserve_year_for_license_with_address() throws Throwable {
 	@Test
 	void should_apply_license_containing_filename_token() throws Exception {
 		FormatterStep step = LicenseHeaderStep.headerDelimiter(header(HEADER_WITH_$FILE), package_).build();
-		StepHarness.forStep(step)
-			.test(getTestResource(FILE_NO_LICENSE), hasHeaderFileName(HEADER_WITH_$FILE, "Test.java"), "Test.java");
+		StepHarnessWithFile.forStep(this, step)
+			.test(new File("Test.java"), getTestResource(FILE_NO_LICENSE), hasHeaderFileName(HEADER_WITH_$FILE, "Test.java"));
 	}
 
 	@Test
 	void should_apply_license_containing_YEAR_filename_token() throws Exception {
 		FormatterStep step = LicenseHeaderStep.headerDelimiter(header(HEADER_WITH_$YEAR_$FILE), package_).build();
-		StepHarness.forStep(step)
+		StepHarnessWithFile.forStep(this, step)
 			.test(
+				new File("Test.java"),
 				getTestResource(FILE_NO_LICENSE),
-				hasHeaderYearFileName(HEADER_WITH_$YEAR_$FILE, currentYear(), "Test.java"),
-				"Test.java"
+				hasHeaderYearFileName(HEADER_WITH_$YEAR_$FILE, currentYear(), "Test.java")
 			);
 	}
 }

From a414e937e2c89e56ea038096c8f0ac1ee6fb1eff Mon Sep 17 00:00:00 2001
From: Kenji Abe <kenji.01.star@gmail.com>
Date: Wed, 8 Mar 2023 09:16:38 +0900
Subject: [PATCH 0879/2068] Fix CHANGES.md

---
 CHANGES.md               | 3 ++-
 plugin-gradle/CHANGES.md | 2 ++
 plugin-maven/CHANGES.md  | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index f5033f6d2a..c44dfd9050 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,9 +10,10 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* You can now put the filename into a license header template with `$FILE`. ([#1605](https://github.com/diffplug/spotless/pull/1605) fixes [#1147](https://github.com/diffplug/spotless/issues/1147))
 ### Changes
 * We are now opting in to Gradle's new stable configuration cache. ([#1591](https://github.com/diffplug/spotless/pull/1591))
-* Support a file name field in license headers. ([#1605](https://github.com/diffplug/spotless/pull/1605))
 
 ## [2.36.0] - 2023-02-27
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index c19a7de733..3ecf10d071 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Added
+* You can now put the filename into a license header template with `$FILE`. ([#1605](https://github.com/diffplug/spotless/pull/1605) fixes [#1147](https://github.com/diffplug/spotless/issues/1147))
 
 ## [6.16.0] - 2023-02-27
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 36a51d6ef2..5c50b62027 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* You can now put the filename into a license header template with `$FILE`. ([#1605](https://github.com/diffplug/spotless/pull/1605) fixes [#1147](https://github.com/diffplug/spotless/issues/1147))
 
 ## [2.34.0] - 2023-02-27
 ### Added

From bc34a4b8e0b2fe5063df528411163d19e2ee8d85 Mon Sep 17 00:00:00 2001
From: Kenji Abe <kenji.01.star@gmail.com>
Date: Wed, 8 Mar 2023 09:19:04 +0900
Subject: [PATCH 0880/2068] Run spotlessApply

---
 .../generic/LicenseHeaderStepTest.java         | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java b/testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java
index 6df0c23950..7d2e018028 100644
--- a/testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java
@@ -21,8 +21,6 @@
 import java.time.YearMonth;
 import java.time.ZoneOffset;
 
-import com.diffplug.spotless.StepHarnessWithFile;
-
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
@@ -30,6 +28,7 @@
 import com.diffplug.spotless.ResourceHarness;
 import com.diffplug.spotless.SerializableEqualityTester;
 import com.diffplug.spotless.StepHarness;
+import com.diffplug.spotless.StepHarnessWithFile;
 import com.diffplug.spotless.generic.LicenseHeaderStep.YearMode;
 
 class LicenseHeaderStepTest extends ResourceHarness {
@@ -173,8 +172,8 @@ private String hasHeaderFileName(String license, String fileName) throws IOExcep
 
 	private String hasHeaderYearFileName(String license, String year, String fileName) throws IOException {
 		return header(license)
-			.replace("$YEAR", year)
-			.replace("$FILE", fileName) + getTestResource(FILE_NO_LICENSE);
+				.replace("$YEAR", year)
+				.replace("$FILE", fileName) + getTestResource(FILE_NO_LICENSE);
 	}
 
 	private static String currentYear() {
@@ -269,17 +268,16 @@ void should_preserve_year_for_license_with_address() throws Throwable {
 	void should_apply_license_containing_filename_token() throws Exception {
 		FormatterStep step = LicenseHeaderStep.headerDelimiter(header(HEADER_WITH_$FILE), package_).build();
 		StepHarnessWithFile.forStep(this, step)
-			.test(new File("Test.java"), getTestResource(FILE_NO_LICENSE), hasHeaderFileName(HEADER_WITH_$FILE, "Test.java"));
+				.test(new File("Test.java"), getTestResource(FILE_NO_LICENSE), hasHeaderFileName(HEADER_WITH_$FILE, "Test.java"));
 	}
 
 	@Test
 	void should_apply_license_containing_YEAR_filename_token() throws Exception {
 		FormatterStep step = LicenseHeaderStep.headerDelimiter(header(HEADER_WITH_$YEAR_$FILE), package_).build();
 		StepHarnessWithFile.forStep(this, step)
-			.test(
-				new File("Test.java"),
-				getTestResource(FILE_NO_LICENSE),
-				hasHeaderYearFileName(HEADER_WITH_$YEAR_$FILE, currentYear(), "Test.java")
-			);
+				.test(
+						new File("Test.java"),
+						getTestResource(FILE_NO_LICENSE),
+						hasHeaderYearFileName(HEADER_WITH_$YEAR_$FILE, currentYear(), "Test.java"));
 	}
 }

From 97ab64cb02f9e339be5d8f8cf5c610c1edc635f5 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 7 Mar 2023 16:24:25 -0800
Subject: [PATCH 0881/2068] Move `GrEclipseFormatterStepImpl`

---
 .../extra/glue}/groovy/GrEclipseFormatterStepImpl.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename {_ext/eclipse-groovy/src/main/java/com/diffplug/spotless/extra/eclipse => lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue}/groovy/GrEclipseFormatterStepImpl.java (97%)

diff --git a/_ext/eclipse-groovy/src/main/java/com/diffplug/spotless/extra/eclipse/groovy/GrEclipseFormatterStepImpl.java b/lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java
similarity index 97%
rename from _ext/eclipse-groovy/src/main/java/com/diffplug/spotless/extra/eclipse/groovy/GrEclipseFormatterStepImpl.java
rename to lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java
index 1d2b71c69f..122eabf471 100644
--- a/_ext/eclipse-groovy/src/main/java/com/diffplug/spotless/extra/eclipse/groovy/GrEclipseFormatterStepImpl.java
+++ b/lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.diffplug.spotless.extra.eclipse.groovy;
+package com.diffplug.spotless.extra.glue.groovy;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -106,7 +106,7 @@ public GroovyErrorListener() {
 			errors = Collections.synchronizedList(new ArrayList<String>());
 			ILog groovyLogger = GroovyCoreActivator.getDefault().getLog();
 			groovyLogger.addLogListener(this);
-			synchronized(GroovyLogManager.manager) {
+			synchronized (GroovyLogManager.manager) {
 				GroovyLogManager.manager.addLogger(this);
 			}
 		}
@@ -119,7 +119,7 @@ public void logging(final IStatus status, final String plugin) {
 		public boolean errorsDetected() {
 			ILog groovyLogger = GroovyCoreActivator.getDefault().getLog();
 			groovyLogger.removeLogListener(this);
-			synchronized(GroovyLogManager.manager) {
+			synchronized (GroovyLogManager.manager) {
 				GroovyLogManager.manager.removeLogger(this);
 			}
 			return 0 != errors.size();

From 060f3dbcbe66560c984d2b96c025a4ffca5a7727 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 7 Mar 2023 16:29:26 -0800
Subject: [PATCH 0882/2068] Prune GrEclipseFormatterStepImpl, details below:

- `org.codehaus.groovy` contains `eclipse-trace.jar`
- unless we do `NestedJars` stuff, GroovyLogManager jars will not be available
- let's see if we can run without them (not clear, we'll find out)
---
 .../groovy/GrEclipseFormatterStepImpl.java    | 47 +------------------
 1 file changed, 1 insertion(+), 46 deletions(-)

diff --git a/lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java b/lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java
index 122eabf471..1077eeaaf6 100644
--- a/lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java
+++ b/lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java
@@ -23,9 +23,6 @@
 import java.util.List;
 import java.util.Properties;
 
-import org.codehaus.groovy.eclipse.GroovyLogManager;
-import org.codehaus.groovy.eclipse.IGroovyLogger;
-import org.codehaus.groovy.eclipse.TraceCategory;
 import org.codehaus.groovy.eclipse.core.GroovyCoreActivator;
 import org.codehaus.groovy.eclipse.refactoring.formatter.DefaultGroovyFormatter;
 import org.codehaus.groovy.eclipse.refactoring.formatter.FormatterPreferencesOnStore;
@@ -39,11 +36,6 @@
 import org.eclipse.jface.text.TextSelection;
 import org.eclipse.text.edits.TextEdit;
 
-import com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseConfig;
-import com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseFramework;
-import com.diffplug.spotless.extra.eclipse.base.SpotlessEclipsePluginConfig;
-import com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseServiceConfig;
-
 /** Spotless-Formatter step which calls out to the Groovy-Eclipse formatter. */
 public class GrEclipseFormatterStepImpl {
 	/**
@@ -58,25 +50,11 @@ public class GrEclipseFormatterStepImpl {
 	private final boolean ignoreFormatterProblems;
 
 	public GrEclipseFormatterStepImpl(final Properties properties) throws Exception {
-		SpotlessEclipseFramework.setup(new FrameworkConfig());
 		PreferenceStore preferences = createPreferences(properties);
 		preferencesStore = new FormatterPreferencesOnStore(preferences);
 		ignoreFormatterProblems = Boolean.parseBoolean(properties.getProperty(IGNORE_FORMATTER_PROBLEMS, "false"));
 	}
 
-	private static class FrameworkConfig implements SpotlessEclipseConfig {
-		@Override
-		public void registerServices(SpotlessEclipseServiceConfig config) {
-			config.applyDefault();
-			config.useSlf4J(GrEclipseFormatterStepImpl.class.getPackage().getName());
-		}
-
-		@Override
-		public void activatePlugins(SpotlessEclipsePluginConfig config) {
-			config.add(new GroovyCoreActivator());
-		}
-	}
-
 	/** Formatting Groovy string  */
 	public String format(String raw) throws Exception {
 		IDocument doc = new Document(raw);
@@ -94,7 +72,7 @@ public String format(String raw) throws Exception {
 	/**
 	 * Eclipse Groovy formatter does not signal problems by its return value, but by logging errors.
 	 */
-	private static class GroovyErrorListener implements ILogListener, IGroovyLogger {
+	private static class GroovyErrorListener implements ILogListener {
 
 		private final List<String> errors;
 
@@ -106,9 +84,6 @@ public GroovyErrorListener() {
 			errors = Collections.synchronizedList(new ArrayList<String>());
 			ILog groovyLogger = GroovyCoreActivator.getDefault().getLog();
 			groovyLogger.addLogListener(this);
-			synchronized (GroovyLogManager.manager) {
-				GroovyLogManager.manager.addLogger(this);
-			}
 		}
 
 		@Override
@@ -119,9 +94,6 @@ public void logging(final IStatus status, final String plugin) {
 		public boolean errorsDetected() {
 			ILog groovyLogger = GroovyCoreActivator.getDefault().getLog();
 			groovyLogger.removeLogListener(this);
-			synchronized (GroovyLogManager.manager) {
-				GroovyLogManager.manager.removeLogger(this);
-			}
 			return 0 != errors.size();
 		}
 
@@ -140,23 +112,6 @@ public String toString() {
 
 			return string.toString();
 		}
-
-		@Override
-		public boolean isCategoryEnabled(TraceCategory cat) {
-			/*
-			 * Note that the compiler errors are just additionally caught here.
-			 * They are also printed directly to System.err.
-			 * See org.codehaus.jdt.groovy.internal.compiler.ast.GroovyCompilationUnitDeclaration.recordProblems
-			 * for details.
-			 */
-			return TraceCategory.COMPILER.equals(cat);
-		}
-
-		@Override
-		public void log(TraceCategory arg0, String arg1) {
-			errors.add(arg1);
-		}
-
 	}
 
 	private static PreferenceStore createPreferences(final Properties properties) throws IOException {

From 39aaa0a65f05027589b9783908d39820b13fbc14 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 7 Mar 2023 18:03:05 -0800
Subject: [PATCH 0883/2068] Remove _ext/eclipse-groovy

---
 _ext/eclipse-groovy/CHANGES.md                |  66 -----------
 _ext/eclipse-groovy/LICENSE.txt               |  70 ------------
 _ext/eclipse-groovy/README.md                 |  13 ---
 _ext/eclipse-groovy/build.gradle              |  56 ----------
 _ext/eclipse-groovy/gradle.properties         |  14 ---
 .../GrEclipseFormatterStepImplTest.java       | 105 ------------------
 .../extra/eclipse/groovy/TestData.java        |  67 -----------
 .../src/test/resources/expected/nominal.test  |  13 ---
 .../src/test/resources/input/nominal.test     |  15 ---
 9 files changed, 419 deletions(-)
 delete mode 100644 _ext/eclipse-groovy/CHANGES.md
 delete mode 100644 _ext/eclipse-groovy/LICENSE.txt
 delete mode 100644 _ext/eclipse-groovy/README.md
 delete mode 100644 _ext/eclipse-groovy/build.gradle
 delete mode 100644 _ext/eclipse-groovy/gradle.properties
 delete mode 100644 _ext/eclipse-groovy/src/test/java/com/diffplug/spotless/extra/eclipse/groovy/GrEclipseFormatterStepImplTest.java
 delete mode 100644 _ext/eclipse-groovy/src/test/java/com/diffplug/spotless/extra/eclipse/groovy/TestData.java
 delete mode 100644 _ext/eclipse-groovy/src/test/resources/expected/nominal.test
 delete mode 100644 _ext/eclipse-groovy/src/test/resources/input/nominal.test

diff --git a/_ext/eclipse-groovy/CHANGES.md b/_ext/eclipse-groovy/CHANGES.md
deleted file mode 100644
index b0f909ccb2..0000000000
--- a/_ext/eclipse-groovy/CHANGES.md
+++ /dev/null
@@ -1,66 +0,0 @@
-# spotless-eclipse-groovy
-
-We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.5.0`).
-
-## [Unreleased]
-### Fixed
-* Fix typo in gradle variable names ([#1425](https://github.com/diffplug/spotless/pull/1425))
-
-## [4.3.0] - 2021-10-13
-### Added
-* Switch to Groovy-Eclipse release 4.3.0 for Eclipse 4.21 using Groovy 4.0.0 Beta 1.
-
-## [4.2.0] - 2021-09-14
-### Added
-* Switch to Groovy-Eclipse release 4.2.0 for Eclipse 4.20 using Groovy 4.0.0 Alpha 3.
-
-### Fixed
-* Fixed IndexOutOfBoundsException in parallel execution of `eclipse-groovy` formatter ([#877](https://github.com/diffplug/spotless/issues/877))
-
-## [4.1.0] - 2021-06-05
-### Added
-* Switch to Groovy-Eclipse release 4.1.0 for Eclipse 4.19 using Groovy 4.0.0 Alpha 2.
-
-## [4.0.0] - 2021-04-10
-### Added
-* Switch to Groovy-Eclipse release 4.0.0 for Eclipse 4.18 using Groovy 4.0.0 Alpha 2.
-* **BREAKING** Keep spotless-eclipse-groovy major version in sync with Groovy-Eclipse version.
-
-## [3.9.0] - 2020-10-17
-### Added
-* Fixed version number determined by change log.
-
-## [3.8.1] - 2020-10-17
-### Added
-* Switch to Groovy-Eclipse release 3.9.0 for Eclipse 4.17 using Groovy-Indy 3.0.6.
-
-## [3.8.0] - 2020-10-04
-### Added
-* Switch to Groovy-Eclipse release 3.8.0 for Eclipse 4.16 using Groovy-Indy 3.0.4.
-
-## [3.7.0] - 2020-10-03
-### Added
-* Switch to Groovy-Eclipse release 3.7.0 for Eclipse 4.15 using Groovy-Indy 3.0.2.
-
-## [3.6.0] - 2020-09-26
-### Added
-* Switch to Groovy-Eclipse release 3.6.0 for Eclipse 4.14.
-
-## [3.5.0] - 2019-09-01
-* Switch to Groovy-Eclipse release 3.5.0 for Eclipse 4.13 ([#480](https://github.com/diffplug/spotless/issues/480)).
-
-## [3.4.0] - 2019-07-24
-* Switch to Groovy-Eclipse release 3.4.0 for Eclipse 4.12 using Groovy-Indy 3.0.0 ([#423](https://github.com/diffplug/spotless/pull/423)).
-
-## [3.2.0] - 2019-03-16
-* Switch to Groovy-Eclipse release 3.2.0 for Eclipse 4.10 ([#375](https://github.com/diffplug/spotless/pull/375)).
-* Include Eclipse logging allowing formatter warnings/errors to be logged via SLF4J ([#236](https://github.com/diffplug/spotless/issues/236)).
-
-## [3.0.1] - 2019-02-25
-* Replaced `http` update-site with `https` ([#360](https://github.com/diffplug/spotless/issues/360)).
-
-## [3.0.0] - 2018-09-04
-* Switch to Groovy-Eclipse release 3.0.0 and Groovy 2.6 ([#288](https://github.com/diffplug/spotless/issues/288)).
-
-## [2.9.2] - 2018-07-19
-* Initial release!
diff --git a/_ext/eclipse-groovy/LICENSE.txt b/_ext/eclipse-groovy/LICENSE.txt
deleted file mode 100644
index 3d967aee74..0000000000
--- a/_ext/eclipse-groovy/LICENSE.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-i) changes to the Program, and
-ii) additions to the Program;
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-b) its license agreement:
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-b) a copy of this Agreement must be included with each copy of the Program.
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
\ No newline at end of file
diff --git a/_ext/eclipse-groovy/README.md b/_ext/eclipse-groovy/README.md
deleted file mode 100644
index 687ed7a132..0000000000
--- a/_ext/eclipse-groovy/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# spotless-eclipse-groovy
-
-Groovy-Eclipse is not available in a form which can be easily consumed by maven or gradle.
-To fix this, we publish Groovy-Eclipse's formatter and all its dependencies, along with a small amount of glue code, into the `com.diffplug.gradle.spotless:spotless-eclipse-groovy` artifact.
-
-## Build
-
-To publish a new version, update the `_ext/eclipse-groovy/gradle.properties` appropriately and see [CONTRIBUTING.md](../../CONTRIBUTING.md) how to enable
-`_ext` projects.
-
-## License
-
-Spotless at large is under the Apache 2.0 license, but this jar is under the EPL v1.
diff --git a/_ext/eclipse-groovy/build.gradle b/_ext/eclipse-groovy/build.gradle
deleted file mode 100644
index a45590fada..0000000000
--- a/_ext/eclipse-groovy/build.gradle
+++ /dev/null
@@ -1,56 +0,0 @@
-ext {
-	developers = [
-		fvgh: [ name: 'Frank Vennemeyer', email: 'frankgh@zoho.com' ],
-	]
-
-	p2Repository = "https://dist.springsource.org/release/GRECLIPSE/${VER_GRECLIPSE}/e${VER_ECLIPSE}"
-
-	p2Dependencies = [
-		'org.codehaus.groovy.eclipse.refactoring':'+', // GroovyFormatter and related
-
-		// The following lists does not reflect the complete transitive required packages, but
-		// the once used during code formatting
-		'org.codehaus.groovy':'+', // Groovy compiler patches supporting use within GrEclipse and Groovy itself
-		'org.codehaus.groovy.eclipse.core':'+', // Groovy core classes (provides central logging used by formatter)
-		'org.eclipse.jdt.core':"${VAR_GRECLIPSE_JDT_PATCH}", // Patches org.eclipse.jdt.core classes supporting use within GrEclipse (provides AST generator)
-		'org.eclipse.jdt.groovy.core':'+' // Extends org.eclipse.jdt.core for Groovy
-	]
-
-	internalJars = [
-		//Jars included by org.codehaus.groovy
-		//////////////////////////////////////////////////////////////////////////
-		// Use Groovy compiler compatible with GrEclipse instead of localGroovy
-		"**/groovy-${VER_GROOVY}",
-		"**/groovy-parser2",
-		// Patches/Overrides some of the Groovy compiler classes
-		'**/groovy-eclipse',
-		// Provides logging capabilities for groovy-eclipse
-		'**/eclipse-trace',
-		//Jars included by org.eclipse.jdt.groovy.core
-		//////////////////////////////////////////////////////////////////////////
-		//Non locking class loader used by groovy compiler
-		'**/nlcl'
-	]
-
-}
-
-apply from: rootProject.file('_ext/gradle/update-lockfile.gradle')
-apply from: rootProject.file('_ext/gradle/p2-fat-jar-setup.gradle')
-apply from: rootProject.file('gradle/java-publish.gradle')
-
-dependencies {
-	implementation "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLIPSE_BASE}"
-	// Provides text partitioners for formatters
-	implementation ("org.eclipse.platform:org.eclipse.jface.text:${VER_ECLIPSE_JFACE}") {
-		exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt'
-	}
-	testImplementation("org.slf4j:slf4j-simple:${VER_SLF4J}")
-}
-
-//////////
-// Test //
-//////////
-sourceSets {
-	// Use JAR file with all resources for Eclipse-Groovy integration-tests
-	test.runtimeClasspath = jar.outputs.files + sourceSets.test.output + sourceSets.test.compileClasspath
-}
diff --git a/_ext/eclipse-groovy/gradle.properties b/_ext/eclipse-groovy/gradle.properties
deleted file mode 100644
index c1c6101caa..0000000000
--- a/_ext/eclipse-groovy/gradle.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-artifactId=spotless-eclipse-groovy
-description=Groovy Eclipse's formatter bundled for Spotless
-
-# Build requirements
-VER_JAVA=11
-
-# Compile
-VER_ECLIPSE=4.21
-VER_SPOTLESS_ECLIPSE_BASE=[3.4.2,4.0.0[
-VER_ECLIPSE_JFACE=[3.15.300,4.0.0[
-VER_GRECLIPSE=4.3.0
-VER_GROOVY=4.0.0
-# Use org.eclipse.jdt.core patched for Groovy-Eclipse
-VAR_GRECLIPSE_JDT_PATCH=3.27.0.v202109301420-e2109-RELEASE
diff --git a/_ext/eclipse-groovy/src/test/java/com/diffplug/spotless/extra/eclipse/groovy/GrEclipseFormatterStepImplTest.java b/_ext/eclipse-groovy/src/test/java/com/diffplug/spotless/extra/eclipse/groovy/GrEclipseFormatterStepImplTest.java
deleted file mode 100644
index 011c68e148..0000000000
--- a/_ext/eclipse-groovy/src/test/java/com/diffplug/spotless/extra/eclipse/groovy/GrEclipseFormatterStepImplTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright 2016-2021 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.groovy;
-
-import static com.diffplug.spotless.extra.eclipse.groovy.GrEclipseFormatterStepImpl.IGNORE_FORMATTER_PROBLEMS;
-import static org.codehaus.groovy.eclipse.refactoring.PreferenceConstants.*;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-import java.util.Properties;
-import java.util.function.Consumer;
-
-import org.eclipse.jdt.core.JavaCore;
-import org.junit.jupiter.api.Test;
-
-/** Smoke test checking that transitive dependencies are complete. */
-class GrEclipseFormatterStepImplTest {
-
-	private final static TestData TEST_DATA = TestData.getTestDataOnFileSystem();
-	private final static String PARSER_EXCEPTION = "class Test { void method() {} ";
-	private final static String SCANNER_EXCEPTION = "{";
-	private final static String BOUNDED_WILDCARDS_UNFORMATTED = "foo(Map<String, ? extends  Object> e)\n{\ne.clear();\n}";
-	private final static String BOUNDED_WILDCARDS_FORMATTED = "foo(Map<String, ? extends  Object> e) {\n\te.clear();\n}";
-
-	@Test
-	void defaultFormat() throws Throwable {
-		String output = format(TEST_DATA.input("nominal.test"), config -> {});
-		assertEquals(TEST_DATA.expected("nominal.test"),
-				output, "Unexpected default formatting.");
-	}
-
-	@Test
-	void validConfiguration() throws Throwable {
-		String output = format(TEST_DATA.input("nominal.test"), config -> {
-			config.put(GROOVY_FORMATTER_REMOVE_UNNECESSARY_SEMICOLONS, "true");
-		});
-		assertEquals(TEST_DATA.expected("nominal.test").replace(";", ""),
-				output, "Unexpected formatting for custom configuration.");
-	}
-
-	@Test
-	void invalidConfiguration() throws Throwable {
-		String output = format(TEST_DATA.input("nominal.test"), config -> {
-			config.put(GROOVY_FORMATTER_INDENTATION, JavaCore.SPACE);
-			config.put(GROOVY_FORMATTER_INDENTATION_SIZE, "noInteger");
-		});
-		assertEquals(TEST_DATA.expected("nominal.test").replace("\t", "    "),
-				output, "Groovy formatter does not replace invalid preferences by their defaults.");
-	}
-
-	/** Test the handling AntlrParserPlugin exceptions by GroovyLogManager.manager logging */
-	@Test
-	void parserException() throws Throwable {
-		assertThrows(IllegalArgumentException.class, () -> format(PARSER_EXCEPTION, config -> {}));
-	}
-
-	/** Test the handling GroovyDocumentScanner exceptions by GroovyCore logging */
-	@Test
-	void scannerException() throws Throwable {
-		assertThrows(IllegalArgumentException.class, () -> format(SCANNER_EXCEPTION, config -> {}));
-	}
-
-	/**
-	 * Test the handling bounded wildcards templates
-	 * No exception since Groovy-Eclipse 3.0.0.
-	 * Formatting fixed with Groovy-Eclipse 3.14 (org.codehaus.groovy:groovy[3.+]).
-	 */
-	@Test
-	void boundedWildCards() throws Throwable {
-		String output = format(BOUNDED_WILDCARDS_UNFORMATTED, config -> {});
-		assertEquals(BOUNDED_WILDCARDS_FORMATTED,
-				output, "Unexpected formatting after bounded wildcards.");
-	}
-
-	@Test
-	void ignoreCompilerProblems() throws Throwable {
-		Consumer<Properties> ignoreCompilerProblems = config -> {
-			config.setProperty(IGNORE_FORMATTER_PROBLEMS, "true");
-		};
-		format(PARSER_EXCEPTION, ignoreCompilerProblems);
-		format(SCANNER_EXCEPTION, ignoreCompilerProblems);
-		//Test is passed if it does not throw an exception. See issue 237.
-	}
-
-	private static String format(final String input, final Consumer<Properties> config) throws Exception {
-		Properties properties = new Properties();
-		config.accept(properties);
-		GrEclipseFormatterStepImpl formatter = new GrEclipseFormatterStepImpl(properties);
-		return formatter.format(input);
-	}
-
-}
diff --git a/_ext/eclipse-groovy/src/test/java/com/diffplug/spotless/extra/eclipse/groovy/TestData.java b/_ext/eclipse-groovy/src/test/java/com/diffplug/spotless/extra/eclipse/groovy/TestData.java
deleted file mode 100644
index b0e4f525da..0000000000
--- a/_ext/eclipse-groovy/src/test/java/com/diffplug/spotless/extra/eclipse/groovy/TestData.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2016-2021 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.groovy;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-public class TestData {
-	public static TestData getTestDataOnFileSystem() {
-		final String userDir = System.getProperty("user.dir", ".");
-		Path dataPath = Paths.get(userDir, "src", "test", "resources");
-		if (Files.isDirectory(dataPath)) {
-			return new TestData(dataPath);
-		}
-		return null;
-	}
-
-	private final Path inputPath;
-	private final Path expectedPath;
-
-	private TestData(Path dataPath) {
-		inputPath = dataPath.resolve("input").toAbsolutePath();
-		expectedPath = dataPath.resolve("expected").toAbsolutePath();
-		for (Path testDataDir : new Path[]{inputPath, expectedPath}) {
-			if (!Files.isDirectory(testDataDir)) {
-				throw new IllegalArgumentException(String.format("'%1$s' is not a directory.", testDataDir));
-			}
-		}
-	}
-
-	public String input(final String fileName) throws Exception {
-		return read(inputPath.resolve(fileName));
-	}
-
-	public String expected(final String fileName) {
-		Path path = expectedPath.resolve(fileName);
-		return read(path);
-	}
-
-	private String read(final Path xmlPath) {
-		if (!Files.isRegularFile(xmlPath)) {
-			throw new IllegalArgumentException(String.format("'%1$s' is not a regular file.", xmlPath));
-		}
-		try {
-			String checkedOutFileContent = new String(java.nio.file.Files.readAllBytes(xmlPath), "UTF8");
-			return checkedOutFileContent.replace("\r", ""); //Align GIT end-of-line normalization
-		} catch (IOException e) {
-			throw new IllegalArgumentException(String.format("Failed to read '%1$s'.", xmlPath), e);
-		}
-	}
-
-}
diff --git a/_ext/eclipse-groovy/src/test/resources/expected/nominal.test b/_ext/eclipse-groovy/src/test/resources/expected/nominal.test
deleted file mode 100644
index a40d247bad..0000000000
--- a/_ext/eclipse-groovy/src/test/resources/expected/nominal.test
+++ /dev/null
@@ -1,13 +0,0 @@
-class TestClass {
-	def a;
-
-	TestClass(String s) {
-		this.a = s
-	}
-	def methodNamedArgs(Map args) {
-		"named args: $args"
-	}
-}
-
-def t = new TestClass()
-def arr = [4, 'string1', 'string2']
diff --git a/_ext/eclipse-groovy/src/test/resources/input/nominal.test b/_ext/eclipse-groovy/src/test/resources/input/nominal.test
deleted file mode 100644
index 85f742677f..0000000000
--- a/_ext/eclipse-groovy/src/test/resources/input/nominal.test
+++ /dev/null
@@ -1,15 +0,0 @@
-class TestClass {
-	def a;
-	
-TestClass(String s) {
-this.a = s
-}
-	def methodNamedArgs(Map args) {
-	"named args: $args"
-	}
-}
-
-def t = new TestClass()
-def arr = [4, 
-'string1', 
-'string2']

From cd2efd3348a20de5352590e7be9d9a4476d180ef Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Wed, 8 Mar 2023 21:36:30 +0400
Subject: [PATCH 0884/2068] Improve LicenseHeader default regex for Java

---
 .../spotless/generic/LicenseHeaderStep.java   |  1 +
 .../gradle/spotless/JavaExtension.java        |  4 +---
 .../spotless/maven/groovy/Groovy.java         |  3 ++-
 .../diffplug/spotless/maven/java/Java.java    |  3 ++-
 .../diffplug/spotless/maven/scala/Scala.java  |  3 ++-
 .../resources/license/HelloWorld_java.test    |  5 +++++
 .../license/HelloWorld_withImport_java.test   |  7 +++++++
 .../main/resources/license/module-info.test   |  5 +++++
 .../generic/LicenseHeaderStepTest.java        | 20 ++++++++++++++++++-
 9 files changed, 44 insertions(+), 7 deletions(-)
 create mode 100644 testlib/src/main/resources/license/HelloWorld_java.test
 create mode 100644 testlib/src/main/resources/license/HelloWorld_withImport_java.test
 create mode 100644 testlib/src/main/resources/license/module-info.test

diff --git a/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java b/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
index b4c0cf2a6f..3b0bf829f8 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
@@ -45,6 +45,7 @@
 
 /** Prefixes a license header before the package statement. */
 public final class LicenseHeaderStep {
+	public static final String DEFAULT_JAVA_HEADER_DELIMITER = "(package|import|public|class|module) ";
 	private static final Logger LOGGER = LoggerFactory.getLogger(LicenseHeaderStep.class);
 
 	public enum YearMode {
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
index f351dd6188..bfe1a96955 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
@@ -50,9 +50,7 @@ public JavaExtension(SpotlessExtension spotless) {
 		super(spotless);
 	}
 
-	// If this constant changes, don't forget to change the similarly-named one in
-	// testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java as well
-	static final String LICENSE_HEADER_DELIMITER = "package ";
+	static final String LICENSE_HEADER_DELIMITER = LicenseHeaderStep.DEFAULT_JAVA_HEADER_DELIMITER;
 
 	@Override
 	public LicenseHeaderConfig licenseHeader(String licenseHeader) {
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy/Groovy.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy/Groovy.java
index 8041b812f9..35b91f3677 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy/Groovy.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy/Groovy.java
@@ -20,6 +20,7 @@
 import org.apache.maven.project.MavenProject;
 
 import com.diffplug.common.collect.ImmutableSet;
+import com.diffplug.spotless.generic.LicenseHeaderStep;
 import com.diffplug.spotless.maven.FormatterFactory;
 import com.diffplug.spotless.maven.generic.LicenseHeader;
 
@@ -32,7 +33,7 @@
 public class Groovy extends FormatterFactory {
 
 	private static final Set<String> DEFAULT_INCLUDES = ImmutableSet.of("src/main/groovy/**/*.groovy", "src/test/groovy/**/*.groovy");
-	private static final String LICENSE_HEADER_DELIMITER = "package ";
+	private static final String LICENSE_HEADER_DELIMITER = LicenseHeaderStep.DEFAULT_JAVA_HEADER_DELIMITER;
 
 	@Override
 	public Set<String> defaultIncludes(MavenProject project) {
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Java.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Java.java
index efdf0827db..b0692446b7 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Java.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Java.java
@@ -26,6 +26,7 @@
 import org.apache.maven.model.Build;
 import org.apache.maven.project.MavenProject;
 
+import com.diffplug.spotless.generic.LicenseHeaderStep;
 import com.diffplug.spotless.maven.FormatterFactory;
 import com.diffplug.spotless.maven.generic.LicenseHeader;
 
@@ -37,7 +38,7 @@
  */
 public class Java extends FormatterFactory {
 
-	private static final String LICENSE_HEADER_DELIMITER = "package ";
+	private static final String LICENSE_HEADER_DELIMITER = LicenseHeaderStep.DEFAULT_JAVA_HEADER_DELIMITER;
 
 	@Override
 	public Set<String> defaultIncludes(MavenProject project) {
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/scala/Scala.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/scala/Scala.java
index 7a9e455f5f..116d89263c 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/scala/Scala.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/scala/Scala.java
@@ -20,6 +20,7 @@
 import org.apache.maven.project.MavenProject;
 
 import com.diffplug.common.collect.ImmutableSet;
+import com.diffplug.spotless.generic.LicenseHeaderStep;
 import com.diffplug.spotless.maven.FormatterFactory;
 import com.diffplug.spotless.maven.generic.LicenseHeader;
 
@@ -33,7 +34,7 @@ public class Scala extends FormatterFactory {
 
 	private static final Set<String> DEFAULT_INCLUDES = ImmutableSet.of("src/main/scala/**/*.scala",
 			"src/test/scala/**/*.scala", "src/main/scala/**/*.sc", "src/test/scala/**/*.sc");
-	private static final String LICENSE_HEADER_DELIMITER = "package ";
+	private static final String LICENSE_HEADER_DELIMITER = LicenseHeaderStep.DEFAULT_JAVA_HEADER_DELIMITER;
 
 	@Override
 	public Set<String> defaultIncludes(MavenProject project) {
diff --git a/testlib/src/main/resources/license/HelloWorld_java.test b/testlib/src/main/resources/license/HelloWorld_java.test
new file mode 100644
index 0000000000..d9be2ea939
--- /dev/null
+++ b/testlib/src/main/resources/license/HelloWorld_java.test
@@ -0,0 +1,5 @@
+public class HelloWorld {
+	public static void main(String[] args) {
+		System.out.print("Hello World");
+	}
+}
diff --git a/testlib/src/main/resources/license/HelloWorld_withImport_java.test b/testlib/src/main/resources/license/HelloWorld_withImport_java.test
new file mode 100644
index 0000000000..fcfb64117e
--- /dev/null
+++ b/testlib/src/main/resources/license/HelloWorld_withImport_java.test
@@ -0,0 +1,7 @@
+import java.time.LocalDate;
+
+public class HelloWorld {
+	public static void main(String[] args) {
+		System.out.print("Hello World. Date: " + LocalDate.now());
+	}
+}
diff --git a/testlib/src/main/resources/license/module-info.test b/testlib/src/main/resources/license/module-info.test
new file mode 100644
index 0000000000..6678147b68
--- /dev/null
+++ b/testlib/src/main/resources/license/module-info.test
@@ -0,0 +1,5 @@
+module java.sql {
+   exports java.sql;
+   exports javax.sql;
+   exports javax.transaction.xa;
+}
diff --git a/testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java b/testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java
index 2b1d0aff07..912975dda5 100644
--- a/testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java
@@ -32,7 +32,7 @@
 
 class LicenseHeaderStepTest extends ResourceHarness {
 	private static final String FILE_NO_LICENSE = "license/FileWithoutLicenseHeader.test";
-	private static final String package_ = "package ";
+	private static final String package_ = LicenseHeaderStep.DEFAULT_JAVA_HEADER_DELIMITER;
 	private static final String HEADER_WITH_$YEAR = "This is a fake license, $YEAR. ACME corp.";
 	private static final String HEADER_WITH_RANGE_TO_$YEAR = "This is a fake license with range, 2009-$YEAR. ACME corp.";
 
@@ -250,4 +250,22 @@ void should_preserve_year_for_license_with_address() throws Throwable {
 				hasHeader(licenceWithAddress().replace("$YEAR", "2015").replace("FooBar Inc. All", "FooBar Inc.  All")),
 				hasHeader(licenceWithAddress().replace("$YEAR", "2015")));
 	}
+
+	@Test
+	void noPackage() throws Throwable {
+		String header = header(getTestResource("license/TestLicense"));
+		FormatterStep step = LicenseHeaderStep.headerDelimiter(header, package_).build();
+		StepHarness.forStep(step)
+				.test(ResourceHarness.getTestResource("license/HelloWorld_java.test"), header + ResourceHarness.getTestResource("license/HelloWorld_java.test"))
+				.test(ResourceHarness.getTestResource("license/HelloWorld_withImport_java.test"), header + ResourceHarness.getTestResource("license/HelloWorld_withImport_java.test"));
+	}
+
+	// The following demonstrate the use of 'module' keyword
+	@Test
+	void moduleInfo() throws Throwable {
+		String header = header(getTestResource("license/TestLicense"));
+		FormatterStep step = LicenseHeaderStep.headerDelimiter(header, package_).build();
+		StepHarness.forStep(step)
+				.test(ResourceHarness.getTestResource("license/module-info.test"), header + ResourceHarness.getTestResource("license/module-info.test"));
+	}
 }

From 318f453ee003aaf16b787ab5e947f44deb95fafb Mon Sep 17 00:00:00 2001
From: Kenji Abe <kenji.01.star@gmail.com>
Date: Thu, 9 Mar 2023 11:59:13 +0900
Subject: [PATCH 0885/2068] Fix file name not applied

---
 .../java/com/diffplug/spotless/generic/LicenseHeaderStep.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java b/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
index 624ea16cc6..ccc665bb0d 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
@@ -323,7 +323,7 @@ private String addOrUpdateLicenseHeader(String raw, File file) {
 							// fastpath where we don't need to make any changes at all
 							boolean noPadding = beforeYearIdx == 0 && afterYearIdx + afterYear.length() == contentMatcher.start(); // allows fastpath return raw
 							if (noPadding) {
-								return raw;
+								return replaceFileName(raw.substring(0, contentMatcher.start()), file) + content;
 							}
 						}
 						header = beforeYear + newYear + afterYear;

From 02338b9066d50d9809491686959f7431e8ae338d Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Thu, 9 Mar 2023 10:03:08 +0400
Subject: [PATCH 0886/2068] Homogeneize gradle and maven behavior around
 Formatter issues on a specific file

---
 .../gradle/spotless/SpotlessTaskImpl.java      | 18 +++++++++++++-----
 .../spotless/maven/SpotlessApplyMojo.java      |  2 +-
 .../spotless/maven/SpotlessCheckMojo.java      | 17 +++++++++++++++--
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
index b37e9f283a..d90c0441ac 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -94,26 +94,34 @@ public void performAction(InputChanges inputs) throws Exception {
 
 	private void processInputFile(@Nullable GitRatchet ratchet, Formatter formatter, File input) throws IOException {
 		File output = getOutputFile(input);
-		getLogger().debug("Applying format to " + input + " and writing to " + output);
+		getLogger().debug("Applying format to {} and writing to {}", input, output);
 		PaddedCell.DirtyState dirtyState;
 		if (ratchet != null && ratchet.isClean(getProjectDir().get().getAsFile(), getRootTreeSha(), input)) {
 			dirtyState = PaddedCell.isClean();
 		} else {
-			dirtyState = PaddedCell.calculateDirtyState(formatter, input);
+			try {
+				dirtyState = PaddedCell.calculateDirtyState(formatter, input);
+			} catch (IOException e) {
+				throw new IOException("Issue processing file: " + input, e);
+			} catch (RuntimeException e) {
+				throw new IllegalArgumentException("Issue processing file: " + input, e);
+			}
 		}
 		if (dirtyState.isClean()) {
 			// Remove previous output if it exists
 			Files.deleteIfExists(output.toPath());
 		} else if (dirtyState.didNotConverge()) {
-			getLogger().warn("Skipping '" + input + "' because it does not converge.  Run {@code spotlessDiagnose} to understand why");
+			getLogger().warn("Skipping '{}}' because it does not converge.  Run {@code spotlessDiagnose} to understand why", input);
 		} else {
 			Path parentDir = output.toPath().getParent();
 			if (parentDir == null) {
-				throw new IllegalStateException("Every file has a parent folder.");
+				throw new IllegalStateException("Every file has a parent folder. But not: " + output);
 			}
 			Files.createDirectories(parentDir);
 			// Need to copy the original file to the tmp location just to remember the file attributes
 			Files.copy(input.toPath(), output.toPath(), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.COPY_ATTRIBUTES);
+
+			getLogger().info(String.format("Writing clean file: %s", output));
 			dirtyState.writeCanonicalTo(output);
 		}
 	}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
index 028cc3fb9c..5ebe2885c9 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
@@ -54,7 +54,7 @@ protected void process(Iterable<File> files, Formatter formatter, UpToDateChecke
 				} else {
 					counter.checkedButAlreadyClean();
 				}
-			} catch (IOException e) {
+			} catch (IOException | RuntimeException e) {
 				throw new MojoExecutionException("Unable to format file " + file, e);
 			}
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java
index ad3230f583..03e55e224a 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,9 +38,12 @@ public class SpotlessCheckMojo extends AbstractSpotlessMojo {
 
 	@Override
 	protected void process(Iterable<File> files, Formatter formatter, UpToDateChecker upToDateChecker) throws MojoExecutionException {
+		ImpactedFilesTracker counter = new ImpactedFilesTracker();
+
 		List<File> problemFiles = new ArrayList<>();
 		for (File file : files) {
 			if (upToDateChecker.isUpToDate(file.toPath())) {
+				counter.skippedAsCleanCache();
 				if (getLog().isDebugEnabled()) {
 					getLog().debug("Spotless will not check an up-to-date file: " + file);
 				}
@@ -51,14 +54,24 @@ protected void process(Iterable<File> files, Formatter formatter, UpToDateChecke
 				PaddedCell.DirtyState dirtyState = PaddedCell.calculateDirtyState(formatter, file);
 				if (!dirtyState.isClean() && !dirtyState.didNotConverge()) {
 					problemFiles.add(file);
+					counter.cleaned();
 				} else {
+					counter.checkedButAlreadyClean();
 					upToDateChecker.setUpToDate(file.toPath());
 				}
-			} catch (IOException e) {
+			} catch (IOException | RuntimeException e) {
 				throw new MojoExecutionException("Unable to format file " + file, e);
 			}
 		}
 
+		// We print the number of considered files which is useful when ratchetFrom is setup
+		if (counter.getTotal() > 0) {
+			getLog().info(String.format("Spotless.%s is keeping %s files clean - %s needs changes to be clean, %s were already clean, %s were skipped because caching determined they were already clean",
+					formatter.getName(), counter.getTotal(), counter.getCleaned(), counter.getCheckedButAlreadyClean(), counter.getSkippedAsCleanCache()));
+		} else {
+			getLog().debug(String.format("Spotless.%s has no target files. Examine your `<includes>`: https://github.com/diffplug/spotless/tree/main/plugin-maven#quickstart", formatter.getName()));
+		}
+
 		if (!problemFiles.isEmpty()) {
 			throw new MojoExecutionException(DiffMessageFormatter.builder()
 					.runToFix("Run 'mvn spotless:apply' to fix these violations.")

From 86818f1c24db9f58db75fadeb61c94991c73ac55 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 9 Mar 2023 22:06:31 +0000
Subject: [PATCH 0887/2068] fix(deps): update dependency
 org.mockito:mockito-core to v5.2.0

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 8820a36e30..8d9f90f8b0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -32,4 +32,4 @@ VER_DURIAN=1.2.0
 VER_JGIT=6.4.0.202211300538-r
 VER_JUNIT=5.9.2
 VER_ASSERTJ=3.24.2
-VER_MOCKITO=5.1.1
+VER_MOCKITO=5.2.0

From 52d7bf74a22217e6c87aee78ccb3a7bf2d128e78 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Fri, 10 Mar 2023 09:02:28 +0400
Subject: [PATCH 0888/2068] Fix typo, add Unittest

---
 .../gradle/spotless/SpotlessTaskImpl.java     |  6 ++-
 .../gradle/spotless/SpotlessTaskImplTest.java | 45 +++++++++++++++++++
 2 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessTaskImplTest.java

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
index d90c0441ac..ab584fa7b6 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
@@ -35,6 +35,7 @@
 import org.gradle.work.FileChange;
 import org.gradle.work.InputChanges;
 
+import com.diffplug.common.annotations.VisibleForTesting;
 import com.diffplug.common.base.StringPrinter;
 import com.diffplug.spotless.Formatter;
 import com.diffplug.spotless.PaddedCell;
@@ -92,7 +93,8 @@ public void performAction(InputChanges inputs) throws Exception {
 		}
 	}
 
-	private void processInputFile(@Nullable GitRatchet ratchet, Formatter formatter, File input) throws IOException {
+	@VisibleForTesting
+	void processInputFile(@Nullable GitRatchet ratchet, Formatter formatter, File input) throws IOException {
 		File output = getOutputFile(input);
 		getLogger().debug("Applying format to {} and writing to {}", input, output);
 		PaddedCell.DirtyState dirtyState;
@@ -111,7 +113,7 @@ private void processInputFile(@Nullable GitRatchet ratchet, Formatter formatter,
 			// Remove previous output if it exists
 			Files.deleteIfExists(output.toPath());
 		} else if (dirtyState.didNotConverge()) {
-			getLogger().warn("Skipping '{}}' because it does not converge.  Run {@code spotlessDiagnose} to understand why", input);
+			getLogger().warn("Skipping '{}' because it does not converge.  Run {@code spotlessDiagnose} to understand why", input);
 		} else {
 			Path parentDir = output.toPath().getParent();
 			if (parentDir == null) {
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessTaskImplTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessTaskImplTest.java
new file mode 100644
index 0000000000..26ad28ae23
--- /dev/null
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessTaskImplTest.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.gradle.spotless;
+
+import java.io.File;
+
+import org.assertj.core.api.Assertions;
+import org.gradle.api.file.DirectoryProperty;
+import org.gradle.api.logging.Logger;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import com.diffplug.spotless.Formatter;
+
+public class SpotlessTaskImplTest {
+	@Test
+	public void testThrowsMessageContainsFilename() throws Exception {
+		SpotlessTaskImpl task = Mockito.mock(SpotlessTaskImpl.class, Mockito.CALLS_REAL_METHODS);
+		Mockito.when(task.getLogger()).thenReturn(Mockito.mock(Logger.class));
+
+		File projectDir = new File("unitTests/projectDir");
+		DirectoryProperty projectDirProperty = Mockito.mock(DirectoryProperty.class, Mockito.RETURNS_DEEP_STUBS);
+		Mockito.when(projectDirProperty.get().getAsFile()).thenReturn(projectDir);
+
+		Mockito.when(task.getProjectDir()).thenReturn(projectDirProperty);
+
+		File input = new File("unitTests/projectDir/someInput");
+		Formatter formatter = Mockito.mock(Formatter.class);
+
+		Assertions.assertThatThrownBy(() -> task.processInputFile(null, formatter, input)).hasMessageContaining("unitTests/projectDir/someInput");
+	}
+}

From b6cad0e4af5e5ec8b6b9a00d074447c2fa789fe0 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Fri, 10 Mar 2023 09:05:53 +0400
Subject: [PATCH 0889/2068] Add changelog entries

---
 plugin-gradle/CHANGES.md | 1 +
 plugin-maven/CHANGES.md  | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index c19a7de733..c39aff545d 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,7 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+* `licenseHeader` default pattern for Java files is updated to `(package|import|public|class|module) `. ([#1614](https://github.com/diffplug/spotless/pull/1614))
 
 ## [6.16.0] - 2023-02-27
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 36a51d6ef2..635459368a 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* `licenseHeader` default pattern for Java files is updated to `(package|import|public|class|module) `. ([#1614](https://github.com/diffplug/spotless/pull/1614))
 
 ## [2.34.0] - 2023-02-27
 ### Added

From e579b74e5f7fb69cd1b5d23ae0be388001400ddc Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Fri, 10 Mar 2023 09:45:58 +0400
Subject: [PATCH 0890/2068] Fix filePath for both Windows and Unix

---
 .../com/diffplug/gradle/spotless/SpotlessTaskImplTest.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessTaskImplTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessTaskImplTest.java
index 26ad28ae23..5f5200d8e5 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessTaskImplTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessTaskImplTest.java
@@ -16,6 +16,7 @@
 package com.diffplug.gradle.spotless;
 
 import java.io.File;
+import java.nio.file.Paths;
 
 import org.assertj.core.api.Assertions;
 import org.gradle.api.file.DirectoryProperty;
@@ -31,15 +32,15 @@ public void testThrowsMessageContainsFilename() throws Exception {
 		SpotlessTaskImpl task = Mockito.mock(SpotlessTaskImpl.class, Mockito.CALLS_REAL_METHODS);
 		Mockito.when(task.getLogger()).thenReturn(Mockito.mock(Logger.class));
 
-		File projectDir = new File("unitTests/projectDir");
+		File projectDir = Paths.get("unitTests","projectDir").toFile();
 		DirectoryProperty projectDirProperty = Mockito.mock(DirectoryProperty.class, Mockito.RETURNS_DEEP_STUBS);
 		Mockito.when(projectDirProperty.get().getAsFile()).thenReturn(projectDir);
 
 		Mockito.when(task.getProjectDir()).thenReturn(projectDirProperty);
 
-		File input = new File("unitTests/projectDir/someInput");
+		File input = Paths.get("unitTests","projectDir", "someInput").toFile();
 		Formatter formatter = Mockito.mock(Formatter.class);
 
-		Assertions.assertThatThrownBy(() -> task.processInputFile(null, formatter, input)).hasMessageContaining("unitTests/projectDir/someInput");
+		Assertions.assertThatThrownBy(() -> task.processInputFile(null, formatter, input)).hasMessageContaining(input.toString());
 	}
 }

From 7e261671a90b156a0d4077b81f97a5c5f05b4052 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Fri, 10 Mar 2023 09:54:54 +0400
Subject: [PATCH 0891/2068] Fix style

---
 .../com/diffplug/gradle/spotless/SpotlessTaskImplTest.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessTaskImplTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessTaskImplTest.java
index 5f5200d8e5..fc7fab9980 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessTaskImplTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessTaskImplTest.java
@@ -32,13 +32,13 @@ public void testThrowsMessageContainsFilename() throws Exception {
 		SpotlessTaskImpl task = Mockito.mock(SpotlessTaskImpl.class, Mockito.CALLS_REAL_METHODS);
 		Mockito.when(task.getLogger()).thenReturn(Mockito.mock(Logger.class));
 
-		File projectDir = Paths.get("unitTests","projectDir").toFile();
+		File projectDir = Paths.get("unitTests", "projectDir").toFile();
 		DirectoryProperty projectDirProperty = Mockito.mock(DirectoryProperty.class, Mockito.RETURNS_DEEP_STUBS);
 		Mockito.when(projectDirProperty.get().getAsFile()).thenReturn(projectDir);
 
 		Mockito.when(task.getProjectDir()).thenReturn(projectDirProperty);
 
-		File input = Paths.get("unitTests","projectDir", "someInput").toFile();
+		File input = Paths.get("unitTests", "projectDir", "someInput").toFile();
 		Formatter formatter = Mockito.mock(Formatter.class);
 
 		Assertions.assertThatThrownBy(() -> task.processInputFile(null, formatter, input)).hasMessageContaining(input.toString());

From 95bf5320716208df4326c0bb59b7ed4182d93b3d Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 9 Mar 2023 23:27:19 -0800
Subject: [PATCH 0892/2068] Remove EquoBasedStepBuilder.State import.

---
 .../diffplug/spotless/extra/java/EclipseJdtFormatterStep.java | 4 +---
 1 file changed, 1 insertion(+), 3 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 67318c113a..f618750b4e 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
@@ -22,7 +22,6 @@
 import com.diffplug.spotless.Jvm;
 import com.diffplug.spotless.Provisioner;
 import com.diffplug.spotless.extra.EquoBasedStepBuilder;
-import com.diffplug.spotless.extra.EquoBasedStepBuilder.State;
 
 import dev.equo.solstice.p2.P2Model;
 
@@ -38,7 +37,6 @@ public static String defaultVersion() {
 		return JVM_SUPPORT.getRecommendedFormatterVersion();
 	}
 
-	/** Provides default configuration */
 	public static EquoBasedStepBuilder createBuilder(Provisioner provisioner) {
 		return new EquoBasedStepBuilder(NAME, provisioner, EclipseJdtFormatterStep::apply) {
 			@Override
@@ -61,7 +59,7 @@ public void setVersion(String version) {
 		};
 	}
 
-	private static FormatterFunc apply(State state) throws Exception {
+	private static FormatterFunc apply(EquoBasedStepBuilder.State state) throws Exception {
 		JVM_SUPPORT.assertFormatterSupported(state.getSemanticVersion());
 		Class<?> formatterClazz = state.getJarState().getClassLoader().loadClass("com.diffplug.spotless.extra.glue.jdt.EclipseJdtFormatterStepImpl");
 		var formatter = formatterClazz.getConstructor(Properties.class).newInstance(state.getPreferences());

From 67daeac3b4d6209f8c156a70f1f98d2228327d44 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 9 Mar 2023 23:43:10 -0800
Subject: [PATCH 0893/2068] Enforce a consistent version of Solstice between
 the build and runtime.

---
 lib-extra/build.gradle                        | 22 +++++++++++++++++--
 .../spotless/extra/EquoBasedStepBuilder.java  | 13 ++++++-----
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index df99e12f37..a5a35fbde4 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -7,6 +7,7 @@ version = rootProject.spotlessChangelog.versionNext
 apply from: rootProject.file('gradle/java-setup.gradle')
 apply from: rootProject.file('gradle/java-publish.gradle')
 
+String VER_SOLSTICE = '0.18.0'
 dependencies {
 	api project(':lib')
 	// misc useful utilities
@@ -16,7 +17,7 @@ dependencies {
 	implementation "org.eclipse.jgit:org.eclipse.jgit:${VER_JGIT}"
 	implementation "com.googlecode.concurrent-trees:concurrent-trees:2.6.1"
 	// for eclipse
-	implementation "dev.equo.ide:solstice:0.17.0"
+	implementation "dev.equo.ide:solstice:${VER_SOLSTICE}"
 
 	// testing
 	testImplementation project(':testlib')
@@ -24,6 +25,11 @@ dependencies {
 	testImplementation "org.assertj:assertj-core:${VER_ASSERTJ}"
 	testImplementation "com.diffplug.durian:durian-testlib:${VER_DURIAN}"
 }
+spotless {
+	java {
+		replaceRegex 'enforceSolsticeVersion', '"dev.equo.ide:solstice:(.*)"', '"dev.equo.ide:solstice:' + VER_SOLSTICE + '"'
+	}
+}
 
 apply from: rootProject.file('gradle/special-tests.gradle')
 tasks.withType(Test).configureEach {
@@ -34,7 +40,8 @@ tasks.withType(Test).configureEach {
 }
 
 def NEEDS_P2_DEPS = [
-	'jdt'
+	'jdt',
+	'groovy'
 ]
 for (needsP2 in NEEDS_P2_DEPS) {
 	sourceSets.register(needsP2) {
@@ -42,6 +49,9 @@ for (needsP2 in NEEDS_P2_DEPS) {
 		runtimeClasspath += sourceSets.main.output
 		java {}
 	}
+	dependencies {
+		add("${needsP2}CompileOnly", "dev.equo.ide:solstice:${VER_SOLSTICE}")
+	}
 }
 jar {
 	for (needsP2 in NEEDS_P2_DEPS) {
@@ -61,6 +71,14 @@ p2deps {
 		p2repo 'https://download.eclipse.org/eclipse/updates/4.26/'
 		install 'org.eclipse.jdt.core'
 	}
+	into 'groovyCompileOnly', {
+		p2repo 'https://download.eclipse.org/eclipse/updates/4.26/'
+		p2repo 'https://groovy.jfrog.io/artifactory/plugins-release/org/codehaus/groovy/groovy-eclipse-integration/4.8.0/e4.26/'
+		install 'org.codehaus.groovy.eclipse.refactoring'
+		install 'org.codehaus.groovy.eclipse.core'
+		install 'org.eclipse.jdt.groovy.core'
+		install 'org.codehaus.groovy'
+	}
 }
 
 // we'll hold the core lib to a high standard
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 e52ec55f1c..f49ded688a 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
@@ -28,9 +28,9 @@
 import com.diffplug.spotless.Provisioner;
 import com.diffplug.spotless.ThrowingEx;
 
-import dev.equo.solstice.p2.P2Client;
+import dev.equo.solstice.p2.P2ClientCache;
 import dev.equo.solstice.p2.P2Model;
-import dev.equo.solstice.p2.QueryCache;
+import dev.equo.solstice.p2.P2QueryCache;
 
 /**
  * Generic Eclipse based formatter step {@link State} builder.
@@ -66,11 +66,12 @@ public FormatterStep build() {
 
 	/** Creates the state of the configuration. */
 	EquoBasedStepBuilder.State get() throws Exception {
-		var query = model(formatterVersion).query(P2Client.Caching.PREFER_OFFLINE, QueryCache.ALLOW);
+		var query = model(formatterVersion).query(P2ClientCache.PREFER_OFFLINE, P2QueryCache.ALLOW);
 		var classpath = new ArrayList<File>();
-		if (!query.getJarsOnMavenCentral().isEmpty()) {
-			classpath.addAll(mavenProvisioner.provisionWithTransitives(false, query.getJarsOnMavenCentral()));
-		}
+		var mavenDeps = new ArrayList<String>();
+		mavenDeps.add("dev.equo.ide:solstice:0.18.0");
+		mavenDeps.addAll(query.getJarsOnMavenCentral());
+		classpath.addAll(mavenProvisioner.provisionWithTransitives(false, mavenDeps));
 		classpath.addAll(query.getJarsNotOnMavenCentral());
 		var jarState = JarState.forFiles(classpath);
 		return new State(formatterVersion, jarState, FileSignature.signAsList(settingsFiles));

From bdfda85316d073f7d15b449f546c05b94e608c4e Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 10 Mar 2023 16:03:21 -0800
Subject: [PATCH 0894/2068] Adapt the GrEclipse plugins and tests to Equo.

---
 .../com/diffplug/spotless/extra/EquoBasedStepBuilder.java | 8 ++++++++
 .../spotless/extra/groovy/GrEclipseFormatterStepTest.java | 8 ++++----
 .../com/diffplug/gradle/spotless/GroovyExtension.java     | 6 +++---
 .../com/diffplug/spotless/maven/groovy/GrEclipse.java     | 6 +++---
 4 files changed, 18 insertions(+), 10 deletions(-)

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 f49ded688a..b5cc09f2fb 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
@@ -15,8 +15,12 @@
  */
 package com.diffplug.spotless.extra;
 
+import dev.equo.solstice.NestedJars;
+
 import java.io.File;
 import java.io.Serializable;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Properties;
 
@@ -73,6 +77,10 @@ EquoBasedStepBuilder.State get() throws Exception {
 		mavenDeps.addAll(query.getJarsOnMavenCentral());
 		classpath.addAll(mavenProvisioner.provisionWithTransitives(false, mavenDeps));
 		classpath.addAll(query.getJarsNotOnMavenCentral());
+		File nestedDir = new File("/Users/ntwigg/.equo/p2-blah");
+		for (var nested : NestedJars.inFiles(query.getJarsNotOnMavenCentral()).extractAllNestedJars(nestedDir)) {
+			classpath.add(nested.getValue());
+		}
 		var jarState = JarState.forFiles(classpath);
 		return new State(formatterVersion, jarState, FileSignature.signAsList(settingsFiles));
 	}
diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepTest.java
index f1823e5f52..d655008bbc 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,10 +22,10 @@
 
 import com.diffplug.spotless.Jvm;
 import com.diffplug.spotless.TestProvisioner;
-import com.diffplug.spotless.extra.eclipse.EclipseResourceHarness;
+import com.diffplug.spotless.extra.eclipse.EquoResourceHarness;
 
-class GrEclipseFormatterStepTest extends EclipseResourceHarness {
-	private final static Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support("Oldest Version").add(8, "2.3.0").add(11, "4.17.0");
+class GrEclipseFormatterStepTest extends EquoResourceHarness {
+	private final static Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support("Oldest Version").add(8, "4.8").add(11, "4.18");
 	private final static String INPUT = "class F{ def m(){} }";
 	private final static String EXPECTED = "class F{\n\tdef m(){}\n}";
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java
index 5e528e1b79..2062946b32 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@
 import org.gradle.api.tasks.GroovySourceSet;
 import org.gradle.api.tasks.SourceSet;
 
-import com.diffplug.spotless.extra.EclipseBasedStepBuilder;
+import com.diffplug.spotless.extra.EquoBasedStepBuilder;
 import com.diffplug.spotless.extra.groovy.GrEclipseFormatterStep;
 import com.diffplug.spotless.generic.LicenseHeaderStep;
 import com.diffplug.spotless.java.ImportOrderStep;
@@ -83,7 +83,7 @@ public GrEclipseConfig greclipse(String version) {
 	}
 
 	public static class GrEclipseConfig {
-		private final EclipseBasedStepBuilder builder;
+		private final EquoBasedStepBuilder builder;
 		private final FormatExtension extension;
 
 		GrEclipseConfig(String version, FormatExtension extension) {
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy/GrEclipse.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy/GrEclipse.java
index 81da109e04..8836993cce 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy/GrEclipse.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy/GrEclipse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 DiffPlug
+ * Copyright 2020-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 import org.apache.maven.plugins.annotations.Parameter;
 
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.extra.EclipseBasedStepBuilder;
+import com.diffplug.spotless.extra.EquoBasedStepBuilder;
 import com.diffplug.spotless.extra.groovy.GrEclipseFormatterStep;
 import com.diffplug.spotless.maven.FormatterStepConfig;
 import com.diffplug.spotless.maven.FormatterStepFactory;
@@ -36,7 +36,7 @@ public class GrEclipse implements FormatterStepFactory {
 
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
-		EclipseBasedStepBuilder grEclipseConfig = GrEclipseFormatterStep.createBuilder(stepConfig.getProvisioner());
+		EquoBasedStepBuilder grEclipseConfig = GrEclipseFormatterStep.createBuilder(stepConfig.getProvisioner());
 		grEclipseConfig.setVersion(version == null ? GrEclipseFormatterStep.defaultVersion() : version);
 		if (null != file) {
 			File settingsFile = stepConfig.getFileLocator().locateFile(file);

From 719ee0d4ca419402be23c45522f9a11e1213c80f Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 10 Mar 2023 16:54:31 -0800
Subject: [PATCH 0895/2068] JarState.forFiles now preserves classpath order
 rather than sorting.

---
 .../com/diffplug/spotless/extra/EquoBasedStepBuilder.java   | 4 +---
 lib/src/main/java/com/diffplug/spotless/JarState.java       | 6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

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 b5cc09f2fb..e3b8b37129 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
@@ -19,8 +19,6 @@
 
 import java.io.File;
 import java.io.Serializable;
-import java.nio.file.Files;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Properties;
 
@@ -81,7 +79,7 @@ EquoBasedStepBuilder.State get() throws Exception {
 		for (var nested : NestedJars.inFiles(query.getJarsNotOnMavenCentral()).extractAllNestedJars(nestedDir)) {
 			classpath.add(nested.getValue());
 		}
-		var jarState = JarState.forFiles(classpath);
+		var jarState = JarState.preserveOrder(classpath);
 		return new State(formatterVersion, jarState, FileSignature.signAsList(settingsFiles));
 	}
 
diff --git a/lib/src/main/java/com/diffplug/spotless/JarState.java b/lib/src/main/java/com/diffplug/spotless/JarState.java
index d79451b70c..afd7c1ddf2 100644
--- a/lib/src/main/java/com/diffplug/spotless/JarState.java
+++ b/lib/src/main/java/com/diffplug/spotless/JarState.java
@@ -74,9 +74,9 @@ private static JarState provisionWithTransitives(boolean withTransitives, Collec
 		return new JarState(mavenCoordinates, fileSignature);
 	}
 
-	/** Wraps the given collection of a files as a JarState. */
-	public static JarState forFiles(Collection<File> jars) throws IOException {
-		FileSignature fileSignature = FileSignature.signAsSet(jars);
+	/** Wraps the given collection of a files as a JarState, maintaining the order in the Collection. */
+	public static JarState preserveOrder(Collection<File> jars) throws IOException {
+		FileSignature fileSignature = FileSignature.signAsList(jars);
 		return new JarState(Collections.emptySet(), fileSignature);
 	}
 

From 67530b04146b8ca5f479082a13e8132f9f645974 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 10 Mar 2023 17:30:42 -0800
Subject: [PATCH 0896/2068] We can remove Jvm.Support for Java 8 since we don't
 run there anymore.

---
 .../spotless/extra/java/EclipseJdtFormatterStep.java        | 2 +-
 .../spotless/extra/java/EclipseJdtFormatterStepTest.java    | 6 ++----
 2 files changed, 3 insertions(+), 5 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 f618750b4e..50654899bd 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
@@ -31,7 +31,7 @@ public final class EclipseJdtFormatterStep {
 	private EclipseJdtFormatterStep() {}
 
 	private static final String NAME = "eclipse jdt formatter";
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(8, "4.16").add(11, "4.26");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "4.26");
 
 	public static String defaultVersion() {
 		return JVM_SUPPORT.getRecommendedFormatterVersion();
diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepTest.java
index e73f51fa2f..91bc8740ab 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepTest.java
@@ -23,13 +23,11 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import com.diffplug.spotless.Jvm;
 import com.diffplug.spotless.TestProvisioner;
 import com.diffplug.spotless.extra.EquoBasedStepBuilder;
 import com.diffplug.spotless.extra.eclipse.EquoResourceHarness;
 
 class EclipseJdtFormatterStepTest extends EquoResourceHarness {
-	private final static Jvm.Support<String> OLDEST_FOR_JVM = Jvm.<String> support("Oldest Version").add(8, "4.8").add(11, "4.17");
 	private final static String INPUT = "package p; class C{}";
 	private final static String EXPECTED = "package p;\nclass C {\n}";
 
@@ -48,7 +46,7 @@ void formatWithVersion(String version) throws Exception {
 	}
 
 	private static Stream<String> formatWithVersion() {
-		return Stream.of(OLDEST_FOR_JVM.getRecommendedFormatterVersion(), EclipseJdtFormatterStep.defaultVersion());
+		return Stream.of("4.9", EclipseJdtFormatterStep.defaultVersion());
 	}
 
 	/** New format interface requires source file information to distinguish module-info from compilation unit */
@@ -61,7 +59,7 @@ public NewFormatInterface() {
 		@Test
 		void formatModuleInfo() throws Exception {
 			File settingsFile = createTestFile("java/eclipse/ModuleInfo.prefs");
-			assertFormatted(OLDEST_FOR_JVM.getRecommendedFormatterVersion(), settingsFile);
+			assertFormatted("4.11", settingsFile);
 		}
 	}
 }

From 0591e499b3981f09a290d24de9db5358d9976d6c Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 10 Mar 2023 17:31:29 -0800
Subject: [PATCH 0897/2068] Bump the oldest supported JDT to 4.9.

---
 CHANGES.md                                                    | 2 +-
 .../com/diffplug/spotless/extra/EquoBasedStepBuilder.java     | 3 +--
 .../com/diffplug/spotless/maven/MavenProvisionerTest.java     | 4 ++--
 .../com/diffplug/spotless/maven/MultiModuleProjectTest.java   | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 64c3726e9f..c09f3a0cdd 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,7 +13,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changes
 * We are now opting in to Gradle's new stable configuration cache. ([#1591](https://github.com/diffplug/spotless/pull/1591))
 * Adopt [Equo Solstice OSGi and p2 shim](https://github.com/equodev/equo-ide/tree/main/solstice) to update all Eclipse-based plugins. ([#1524](https://github.com/diffplug/spotless/pull/1524))
-  * Eclipse JDT now supports `4.8` through `4.26`. Also we now recommend dropping the last `.0`, e.g. `4.26` instead of `4.26.0`, you'll get warnings to help you switch.
+  * Eclipse JDT now supports `4.9` through `4.26`. Also we now recommend dropping the last `.0`, e.g. `4.26` instead of `4.26.0`, you'll get warnings to help you switch.
 
 ## [2.36.0] - 2023-02-27
 ### Added
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 e3b8b37129..28aec41232 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
@@ -15,8 +15,6 @@
  */
 package com.diffplug.spotless.extra;
 
-import dev.equo.solstice.NestedJars;
-
 import java.io.File;
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -30,6 +28,7 @@
 import com.diffplug.spotless.Provisioner;
 import com.diffplug.spotless.ThrowingEx;
 
+import dev.equo.solstice.NestedJars;
 import dev.equo.solstice.p2.P2ClientCache;
 import dev.equo.solstice.p2.P2Model;
 import dev.equo.solstice.p2.P2QueryCache;
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenProvisionerTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenProvisionerTest.java
index 3e769d7705..cabbf7c5c0 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenProvisionerTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenProvisionerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ class MavenProvisionerTest extends MavenIntegrationHarness {
 	void testMultipleDependenciesExcludingTransitives() throws Exception {
 		writePomWithJavaSteps(
 				"<eclipse>",
-				"  <version>4.8.0</version>",
+				"  <version>4.9</version>",
 				"</eclipse>");
 		setFile("formatter.xml").toResource("java/eclipse/formatter.xml");
 		assertResolveDependenciesWorks();
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MultiModuleProjectTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MultiModuleProjectTest.java
index f7ce7cd0d9..0ed6c7c9fe 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MultiModuleProjectTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MultiModuleProjectTest.java
@@ -70,7 +70,7 @@ void testConfigurationDependency() throws Exception {
 						"<java>",
 						"  <eclipse>",
 						"    <file>configs/eclipse-formatter.xml</file>",
-						"    <version>4.8</version>",
+						"    <version>4.9</version>",
 						"  </eclipse>",
 						"</java>",
 						"<scala>",

From 2673e9117fd888890811a7550ee09a6d2148c7f6 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 10 Mar 2023 17:32:01 -0800
Subject: [PATCH 0898/2068] We have a working GrEclipse!

---
 .../groovy/GrEclipseFormatterStepImpl.java    |  8 +++
 .../extra/groovy/GrEclipseFormatterStep.java  | 71 +++++++++++++------
 .../groovy/GrEclipseFormatterStepTest.java    |  4 +-
 .../spotless/maven/groovy/GrEclipseTest.java  |  4 +-
 4 files changed, 59 insertions(+), 28 deletions(-)

diff --git a/lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java b/lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java
index 1077eeaaf6..ea51b637c5 100644
--- a/lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java
+++ b/lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java
@@ -21,6 +21,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Properties;
 
 import org.codehaus.groovy.eclipse.core.GroovyCoreActivator;
@@ -36,6 +37,8 @@
 import org.eclipse.jface.text.TextSelection;
 import org.eclipse.text.edits.TextEdit;
 
+import dev.equo.solstice.Solstice;
+
 /** Spotless-Formatter step which calls out to the Groovy-Eclipse formatter. */
 public class GrEclipseFormatterStepImpl {
 	/**
@@ -50,6 +53,11 @@ public class GrEclipseFormatterStepImpl {
 	private final boolean ignoreFormatterProblems;
 
 	public GrEclipseFormatterStepImpl(final Properties properties) throws Exception {
+		var solstice = Solstice.findBundlesOnClasspath();
+		solstice.warnAndModifyManifestsToFix();
+		solstice.openShim(Map.of());
+		solstice.startAllWithLazy(false);
+		solstice.startWithoutTransitives("org.codehaus.groovy.eclipse.core");
 		PreferenceStore preferences = createPreferences(properties);
 		preferencesStore = new FormatterPreferencesOnStore(preferences);
 		ignoreFormatterProblems = Boolean.parseBoolean(properties.getProperty(IGNORE_FORMATTER_PROBLEMS, "false"));
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 013f5b5c2c..312f9a786f 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,15 @@
 package com.diffplug.spotless.extra.groovy;
 
 import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
+import java.util.List;
 import java.util.Properties;
 
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.Jvm;
 import com.diffplug.spotless.Provisioner;
-import com.diffplug.spotless.extra.EclipseBasedStepBuilder;
-import com.diffplug.spotless.extra.EclipseBasedStepBuilder.State;
+import com.diffplug.spotless.extra.EquoBasedStepBuilder;
+
+import dev.equo.solstice.p2.P2Model;
 
 /** Formatter step which calls out to the Groovy-Eclipse formatter. */
 public final class GrEclipseFormatterStep {
@@ -31,26 +32,58 @@ public final class GrEclipseFormatterStep {
 	private GrEclipseFormatterStep() {}
 
 	private static final String NAME = "eclipse groovy formatter";
-	private static final String FORMATTER_CLASS = "com.diffplug.spotless.extra.eclipse.groovy.GrEclipseFormatterStepImpl";
-	private static final String FORMATTER_CLASS_OLD = "com.diffplug.gradle.spotless.groovy.eclipse.GrEclipseFormatterStepImpl";
-	private static final String MAVEN_GROUP_ARTIFACT = "com.diffplug.spotless:spotless-eclipse-groovy";
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(8, "4.19.0").add(11, "4.21.0");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "4.26");
 	private static final String FORMATTER_METHOD = "format";
 
 	public static String defaultVersion() {
 		return JVM_SUPPORT.getRecommendedFormatterVersion();
 	}
 
-	/** Provides default configuration */
-	public static EclipseBasedStepBuilder createBuilder(Provisioner provisioner) {
-		return new EclipseBasedStepBuilder(NAME, provisioner, GrEclipseFormatterStep::apply);
+	public static EquoBasedStepBuilder createBuilder(Provisioner provisioner) {
+		return new EquoBasedStepBuilder(NAME, provisioner, GrEclipseFormatterStep::apply) {
+			@Override
+			protected P2Model model(String version) {
+				if (!version.startsWith("4.")) {
+					throw new IllegalArgumentException("Expected version 4.x");
+				}
+				int eVersion = Integer.parseInt(version.substring("4.".length()));
+				if (eVersion < 8) {
+					throw new IllegalArgumentException("4.8 is the oldest version we support, this was " + version);
+				}
+				String greclipseVersion;
+				if (eVersion >= 18) {
+					greclipseVersion = "4." + (eVersion - 18) + ".0";
+				} else {
+					greclipseVersion = "3." + (eVersion - 8) + ".0";
+				}
+				var model = new P2Model();
+				model.addP2Repo("https://download.eclipse.org/eclipse/updates/" + version + "/");
+				model.addP2Repo("https://groovy.jfrog.io/artifactory/plugins-release/org/codehaus/groovy/groovy-eclipse-integration/" + greclipseVersion + "/e" + version + "/");
+				model.getInstall().addAll(List.of(
+						"org.codehaus.groovy.eclipse.refactoring",
+						"org.codehaus.groovy.eclipse.core",
+						"org.eclipse.jdt.groovy.core",
+						"org.codehaus.groovy"));
+				return model;
+			}
+
+			@Override
+			public void setVersion(String version) {
+				if (version.endsWith(".0")) {
+					String newVersion = version.substring(0, version.length() - 2);
+					System.err.println("Recommend replacing '" + version + "' with '" + newVersion + "' for eclipse JDT");
+					version = newVersion;
+				}
+				super.setVersion(version);
+			}
+		};
 	}
 
-	private static FormatterFunc apply(EclipseBasedStepBuilder.State state) throws Exception {
+	private static FormatterFunc apply(EquoBasedStepBuilder.State state) throws Exception {
 		JVM_SUPPORT.assertFormatterSupported(state.getSemanticVersion());
-		Class<?> formatterClazz = getClass(state);
-		Object formatter = formatterClazz.getConstructor(Properties.class).newInstance(state.getPreferences());
-		Method method = formatterClazz.getMethod(FORMATTER_METHOD, String.class);
+		Class<?> formatterClazz = state.getJarState().getClassLoader().loadClass("com.diffplug.spotless.extra.glue.groovy.GrEclipseFormatterStepImpl");
+		var formatter = formatterClazz.getConstructor(Properties.class).newInstance(state.getPreferences());
+		var method = formatterClazz.getMethod(FORMATTER_METHOD, String.class);
 		return JVM_SUPPORT.suggestLaterVersionOnError(state.getSemanticVersion(),
 				input -> {
 					try {
@@ -62,12 +95,4 @@ private static FormatterFunc apply(EclipseBasedStepBuilder.State state) throws E
 					}
 				});
 	}
-
-	private static Class<?> getClass(State state) {
-		if (state.getMavenCoordinate(MAVEN_GROUP_ARTIFACT).isPresent()) {
-			return state.loadClass(FORMATTER_CLASS);
-		}
-		return state.loadClass(FORMATTER_CLASS_OLD);
-	}
-
 }
diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepTest.java
index d655008bbc..d72fc2e1a4 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepTest.java
@@ -20,12 +20,10 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import com.diffplug.spotless.Jvm;
 import com.diffplug.spotless.TestProvisioner;
 import com.diffplug.spotless.extra.eclipse.EquoResourceHarness;
 
 class GrEclipseFormatterStepTest extends EquoResourceHarness {
-	private final static Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support("Oldest Version").add(8, "4.8").add(11, "4.18");
 	private final static String INPUT = "class F{ def m(){} }";
 	private final static String EXPECTED = "class F{\n\tdef m(){}\n}";
 
@@ -40,6 +38,6 @@ void formatWithVersion(String version) throws Exception {
 	}
 
 	private static Stream<String> formatWithVersion() {
-		return Stream.of(JVM_SUPPORT.getRecommendedFormatterVersion(), GrEclipseFormatterStep.defaultVersion());
+		return Stream.of("4.25", GrEclipseFormatterStep.defaultVersion());
 	}
 }
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/groovy/GrEclipseTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/groovy/GrEclipseTest.java
index 8807f47cc9..34d95dc7d2 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/groovy/GrEclipseTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/groovy/GrEclipseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 DiffPlug
+ * Copyright 2020-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,7 +60,7 @@ private void writePomWithGrEclipse() throws IOException {
 		writePomWithGroovySteps(
 				"<greclipse>",
 				"  <file>${basedir}/greclipse.properties</file>",
-				"  <version>4.19.0</version>",
+				"  <version>4.25</version>",
 				"</greclipse>");
 		setFile("greclipse.properties").toResource("groovy/greclipse/format/greclipse.properties");
 	}

From d4d3814b770219681aa985cb5cc50b76cdfa17f8 Mon Sep 17 00:00:00 2001
From: Kenji Abe <kenji.01.star@gmail.com>
Date: Sat, 11 Mar 2023 11:51:05 +0900
Subject: [PATCH 0899/2068] Refactor LicenseHeaderStep

---
 .../spotless/generic/LicenseHeaderStep.java   | 31 ++++++++++++++-----
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java b/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
index ccc665bb0d..0b7d076e12 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
@@ -213,6 +213,7 @@ private static class Runtime implements Serializable {
 		private final @Nullable String afterYear;
 		private final boolean updateYearWithLatest;
 		private final boolean licenseHeaderWithRange;
+		private final boolean hasFileToken;
 
 		private static final Pattern FILENAME_PATTERN = Pattern.compile("\\$FILE");
 
@@ -228,6 +229,7 @@ private Runtime(String licenseHeader, String delimiter, String yearSeparator, bo
 			}
 			this.delimiterPattern = Pattern.compile('^' + delimiter, Pattern.UNIX_LINES | Pattern.MULTILINE);
 			this.skipLinesMatching = skipLinesMatching == null ? null : Pattern.compile(skipLinesMatching);
+			this.hasFileToken = FILENAME_PATTERN.matcher(licenseHeader).find();
 
 			Optional<String> yearToken = getYearToken(licenseHeader);
 			if (yearToken.isPresent()) {
@@ -294,6 +296,12 @@ private String format(String raw, File file) {
 		}
 
 		private String addOrUpdateLicenseHeader(String raw, File file) {
+			raw = replaceYear(raw);
+			raw = replaceFileName(raw, file);
+			return raw;
+		}
+
+		private String replaceYear(String raw) {
 			Matcher contentMatcher = delimiterPattern.matcher(raw);
 			if (!contentMatcher.find()) {
 				throw new IllegalArgumentException("Unable to find delimiter regex " + delimiterPattern);
@@ -307,14 +315,13 @@ private String addOrUpdateLicenseHeader(String raw, File file) {
 						return raw;
 					} else {
 						// otherwise we'll have to add the header
-						return replaceFileName(yearSepOrFull, file) + content;
+						return yearSepOrFull + content;
 					}
 				} else {
 					// the yes year case is a bit harder
 					int beforeYearIdx = raw.indexOf(beforeYear);
 					int afterYearIdx = raw.indexOf(afterYear, beforeYearIdx + beforeYear.length() + 1);
 
-					String header;
 					if (beforeYearIdx >= 0 && afterYearIdx >= 0 && afterYearIdx + afterYear.length() <= contentMatcher.start()) {
 						// and also ends with exactly the right header, so it's easy to parse the existing year
 						String existingYear = raw.substring(beforeYearIdx + beforeYear.length(), afterYearIdx);
@@ -323,16 +330,15 @@ private String addOrUpdateLicenseHeader(String raw, File file) {
 							// fastpath where we don't need to make any changes at all
 							boolean noPadding = beforeYearIdx == 0 && afterYearIdx + afterYear.length() == contentMatcher.start(); // allows fastpath return raw
 							if (noPadding) {
-								return replaceFileName(raw.substring(0, contentMatcher.start()), file) + content;
+								return raw;
 							}
 						}
-						header = beforeYear + newYear + afterYear;
+						return beforeYear + newYear + afterYear + content;
 					} else {
 						String newYear = calculateYearBySearching(raw.substring(0, contentMatcher.start()));
 						// at worst, we just say that it was made today
-						header = beforeYear + newYear + afterYear;
+						return beforeYear + newYear + afterYear + content;
 					}
-					return replaceFileName(header, file) + content;
 				}
 			}
 		}
@@ -425,8 +431,17 @@ private String setLicenseHeaderYearsFromGitHistory(String raw, File file) throws
 			return beforeYear + yearRange + afterYear + raw.substring(contentMatcher.start());
 		}
 
-		private String replaceFileName(String header, File file) {
-			return FILENAME_PATTERN.matcher(header).replaceAll(file.getName());
+		private String replaceFileName(String raw, File file) {
+			if (!hasFileToken) {
+				return raw;
+			}
+			Matcher contentMatcher = delimiterPattern.matcher(raw);
+			if (!contentMatcher.find()) {
+				throw new IllegalArgumentException("Unable to find delimiter regex " + delimiterPattern);
+			}
+			String header = raw.substring(0, contentMatcher.start());
+			String content = raw.substring(contentMatcher.start());
+			return FILENAME_PATTERN.matcher(header).replaceAll(file.getName()) + content;
 		}
 
 		private static String parseYear(String cmd, File file) throws IOException {

From 91977a1a71a0a81a1be2324d30eb0746150b2027 Mon Sep 17 00:00:00 2001
From: Kenji Abe <kenji.01.star@gmail.com>
Date: Sat, 11 Mar 2023 11:55:45 +0900
Subject: [PATCH 0900/2068] Add tests

---
 .../spotless/generic/LicenseHeaderStepTest.java  | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java b/testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java
index 7d2e018028..760725229f 100644
--- a/testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java
@@ -268,7 +268,18 @@ void should_preserve_year_for_license_with_address() throws Throwable {
 	void should_apply_license_containing_filename_token() throws Exception {
 		FormatterStep step = LicenseHeaderStep.headerDelimiter(header(HEADER_WITH_$FILE), package_).build();
 		StepHarnessWithFile.forStep(this, step)
-				.test(new File("Test.java"), getTestResource(FILE_NO_LICENSE), hasHeaderFileName(HEADER_WITH_$FILE, "Test.java"));
+				.test(new File("Test.java"), getTestResource(FILE_NO_LICENSE), hasHeaderFileName(HEADER_WITH_$FILE, "Test.java"))
+				.testUnaffected(new File("Test.java"), hasHeaderFileName(HEADER_WITH_$FILE, "Test.java"));
+	}
+
+	@Test
+	void should_update_license_containing_filename_token() throws Exception {
+		FormatterStep step = LicenseHeaderStep.headerDelimiter(header(HEADER_WITH_$FILE), package_).build();
+		StepHarnessWithFile.forStep(this, step)
+				.test(
+						new File("After.java"),
+						hasHeaderFileName(HEADER_WITH_$FILE, "Before.java"),
+						hasHeaderFileName(HEADER_WITH_$FILE, "After.java"));
 	}
 
 	@Test
@@ -278,6 +289,9 @@ void should_apply_license_containing_YEAR_filename_token() throws Exception {
 				.test(
 						new File("Test.java"),
 						getTestResource(FILE_NO_LICENSE),
+						hasHeaderYearFileName(HEADER_WITH_$YEAR_$FILE, currentYear(), "Test.java"))
+				.testUnaffected(
+						new File("Test.java"),
 						hasHeaderYearFileName(HEADER_WITH_$YEAR_$FILE, currentYear(), "Test.java"));
 	}
 }

From 40488be7041de75d8bbfedeaf5cff20058202145 Mon Sep 17 00:00:00 2001
From: Kenji Abe <kenji.01.star@gmail.com>
Date: Sat, 11 Mar 2023 12:02:45 +0900
Subject: [PATCH 0901/2068] Run spotlessApply

---
 .../spotless/generic/LicenseHeaderStepTest.java    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java b/testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java
index ba65cdbafc..92c6794643 100644
--- a/testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java
@@ -286,13 +286,13 @@ void should_update_license_containing_filename_token() throws Exception {
 	void should_apply_license_containing_YEAR_filename_token() throws Exception {
 		FormatterStep step = LicenseHeaderStep.headerDelimiter(header(HEADER_WITH_$YEAR_$FILE), package_).build();
 		StepHarnessWithFile.forStep(this, step)
-			.test(
-				new File("Test.java"),
-				getTestResource(FILE_NO_LICENSE),
-				hasHeaderYearFileName(HEADER_WITH_$YEAR_$FILE, currentYear(), "Test.java"))
-			.testUnaffected(
-				new File("Test.java"),
-				hasHeaderYearFileName(HEADER_WITH_$YEAR_$FILE, currentYear(), "Test.java"));
+				.test(
+						new File("Test.java"),
+						getTestResource(FILE_NO_LICENSE),
+						hasHeaderYearFileName(HEADER_WITH_$YEAR_$FILE, currentYear(), "Test.java"))
+				.testUnaffected(
+						new File("Test.java"),
+						hasHeaderYearFileName(HEADER_WITH_$YEAR_$FILE, currentYear(), "Test.java"));
 	}
 
 	void noPackage() throws Throwable {

From f1ce2a0acf7819a392d811c608b355a207794e54 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 12 Mar 2023 09:52:12 -0700
Subject: [PATCH 0902/2068] Restore the more complex GrEclipse log manager.

---
 build.gradle                                  |  2 +-
 lib-extra/build.gradle                        |  6 +--
 .../groovy/GrEclipseFormatterStepImpl.java    | 39 +++++++++++++++++--
 .../spotless/extra/EquoBasedStepBuilder.java  |  5 +--
 4 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/build.gradle b/build.gradle
index 312f84727d..6755d486c0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
 	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
-	id 'dev.equo.ide'                          version '0.16.0'
+	id 'dev.equo.ide'                          version '0.17.1'
 }
 equoIde {
 	branding().title('Spotless').icon(file('_images/spotless_logo.png'))
diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index a5a35fbde4..f3b4b7c4b5 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -7,7 +7,7 @@ version = rootProject.spotlessChangelog.versionNext
 apply from: rootProject.file('gradle/java-setup.gradle')
 apply from: rootProject.file('gradle/java-publish.gradle')
 
-String VER_SOLSTICE = '0.18.0'
+String VER_SOLSTICE = '0.19.1'
 dependencies {
 	api project(':lib')
 	// misc useful utilities
@@ -72,8 +72,8 @@ p2deps {
 		install 'org.eclipse.jdt.core'
 	}
 	into 'groovyCompileOnly', {
-		p2repo 'https://download.eclipse.org/eclipse/updates/4.26/'
-		p2repo 'https://groovy.jfrog.io/artifactory/plugins-release/org/codehaus/groovy/groovy-eclipse-integration/4.8.0/e4.26/'
+		p2repo 'https://download.eclipse.org/eclipse/updates/4.23/'
+		p2repo 'https://groovy.jfrog.io/artifactory/plugins-release/org/codehaus/groovy/groovy-eclipse-integration/4.8.0/e4.23/'
 		install 'org.codehaus.groovy.eclipse.refactoring'
 		install 'org.codehaus.groovy.eclipse.core'
 		install 'org.eclipse.jdt.groovy.core'
diff --git a/lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java b/lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java
index ea51b637c5..18aed57aeb 100644
--- a/lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java
+++ b/lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java
@@ -24,6 +24,9 @@
 import java.util.Map;
 import java.util.Properties;
 
+import org.codehaus.groovy.eclipse.GroovyLogManager;
+import org.codehaus.groovy.eclipse.IGroovyLogger;
+import org.codehaus.groovy.eclipse.TraceCategory;
 import org.codehaus.groovy.eclipse.core.GroovyCoreActivator;
 import org.codehaus.groovy.eclipse.refactoring.formatter.DefaultGroovyFormatter;
 import org.codehaus.groovy.eclipse.refactoring.formatter.FormatterPreferencesOnStore;
@@ -37,7 +40,10 @@
 import org.eclipse.jface.text.TextSelection;
 import org.eclipse.text.edits.TextEdit;
 
+import dev.equo.solstice.NestedJars;
+import dev.equo.solstice.ShimIdeBootstrapServices;
 import dev.equo.solstice.Solstice;
+import dev.equo.solstice.p2.CacheLocations;
 
 /** Spotless-Formatter step which calls out to the Groovy-Eclipse formatter. */
 public class GrEclipseFormatterStepImpl {
@@ -54,10 +60,15 @@ public class GrEclipseFormatterStepImpl {
 
 	public GrEclipseFormatterStepImpl(final Properties properties) throws Exception {
 		var solstice = Solstice.findBundlesOnClasspath();
+		NestedJars.setToWarnOnly();
+		NestedJars.onClassPath().confirmAllNestedJarsArePresentOnClasspath(CacheLocations.nestedJars());
 		solstice.warnAndModifyManifestsToFix();
-		solstice.openShim(Map.of());
+		var props = Map.<String, String> of();
+		solstice.openShim(props);
+		ShimIdeBootstrapServices.apply(props, solstice.getContext());
 		solstice.startAllWithLazy(false);
 		solstice.startWithoutTransitives("org.codehaus.groovy.eclipse.core");
+
 		PreferenceStore preferences = createPreferences(properties);
 		preferencesStore = new FormatterPreferencesOnStore(preferences);
 		ignoreFormatterProblems = Boolean.parseBoolean(properties.getProperty(IGNORE_FORMATTER_PROBLEMS, "false"));
@@ -80,8 +91,7 @@ public String format(String raw) throws Exception {
 	/**
 	 * Eclipse Groovy formatter does not signal problems by its return value, but by logging errors.
 	 */
-	private static class GroovyErrorListener implements ILogListener {
-
+	private static class GroovyErrorListener implements ILogListener, IGroovyLogger {
 		private final List<String> errors;
 
 		public GroovyErrorListener() {
@@ -92,6 +102,9 @@ public GroovyErrorListener() {
 			errors = Collections.synchronizedList(new ArrayList<String>());
 			ILog groovyLogger = GroovyCoreActivator.getDefault().getLog();
 			groovyLogger.addLogListener(this);
+			synchronized (GroovyLogManager.manager) {
+				GroovyLogManager.manager.addLogger(this);
+			}
 		}
 
 		@Override
@@ -102,6 +115,9 @@ public void logging(final IStatus status, final String plugin) {
 		public boolean errorsDetected() {
 			ILog groovyLogger = GroovyCoreActivator.getDefault().getLog();
 			groovyLogger.removeLogListener(this);
+			synchronized (GroovyLogManager.manager) {
+				GroovyLogManager.manager.removeLogger(this);
+			}
 			return 0 != errors.size();
 		}
 
@@ -120,6 +136,22 @@ public String toString() {
 
 			return string.toString();
 		}
+
+		@Override
+		public boolean isCategoryEnabled(TraceCategory cat) {
+			/*
+			 * Note that the compiler errors are just additionally caught here.
+			 * They are also printed directly to System.err.
+			 * See org.codehaus.jdt.groovy.internal.compiler.ast.GroovyCompilationUnitDeclaration.recordProblems
+			 * for details.
+			 */
+			return TraceCategory.COMPILER.equals(cat);
+		}
+
+		@Override
+		public void log(TraceCategory arg0, String arg1) {
+			errors.add(arg1);
+		}
 	}
 
 	private static PreferenceStore createPreferences(final Properties properties) throws IOException {
@@ -130,5 +162,4 @@ private static PreferenceStore createPreferences(final Properties properties) th
 		preferences.load(input);
 		return preferences;
 	}
-
 }
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 28aec41232..fb2ed88df7 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
@@ -70,12 +70,11 @@ EquoBasedStepBuilder.State get() throws Exception {
 		var query = model(formatterVersion).query(P2ClientCache.PREFER_OFFLINE, P2QueryCache.ALLOW);
 		var classpath = new ArrayList<File>();
 		var mavenDeps = new ArrayList<String>();
-		mavenDeps.add("dev.equo.ide:solstice:0.18.0");
+		mavenDeps.add("dev.equo.ide:solstice:0.19.1");
 		mavenDeps.addAll(query.getJarsOnMavenCentral());
 		classpath.addAll(mavenProvisioner.provisionWithTransitives(false, mavenDeps));
 		classpath.addAll(query.getJarsNotOnMavenCentral());
-		File nestedDir = new File("/Users/ntwigg/.equo/p2-blah");
-		for (var nested : NestedJars.inFiles(query.getJarsNotOnMavenCentral()).extractAllNestedJars(nestedDir)) {
+		for (var nested : NestedJars.inFiles(query.getJarsNotOnMavenCentral()).extractAllNestedJars()) {
 			classpath.add(nested.getValue());
 		}
 		var jarState = JarState.preserveOrder(classpath);

From 3ed28db594cfffd274174d68fe4ec4e33768c98f Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 12 Mar 2023 13:24:29 -0700
Subject: [PATCH 0903/2068] Delete the Groovy lockfiles.

---
 .../eclipse_groovy_formatter/v2.3.0.lockfile  |  5 -----
 .../eclipse_groovy_formatter/v4.10.0.lockfile | 18 -----------------
 .../eclipse_groovy_formatter/v4.12.0.lockfile | 18 -----------------
 .../eclipse_groovy_formatter/v4.13.0.lockfile | 18 -----------------
 .../eclipse_groovy_formatter/v4.14.0.lockfile | 18 -----------------
 .../eclipse_groovy_formatter/v4.15.0.lockfile | 18 -----------------
 .../eclipse_groovy_formatter/v4.16.0.lockfile | 18 -----------------
 .../eclipse_groovy_formatter/v4.17.0.lockfile | 19 ------------------
 .../eclipse_groovy_formatter/v4.18.0.lockfile | 19 ------------------
 .../eclipse_groovy_formatter/v4.19.0.lockfile | 19 ------------------
 .../eclipse_groovy_formatter/v4.20.0.lockfile | 20 -------------------
 .../eclipse_groovy_formatter/v4.21.0.lockfile | 20 -------------------
 .../eclipse_groovy_formatter/v4.6.3.lockfile  |  2 --
 .../eclipse_groovy_formatter/v4.8.0.lockfile  | 18 -----------------
 .../eclipse_groovy_formatter/v4.8.1.lockfile  | 18 -----------------
 15 files changed, 248 deletions(-)
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v2.3.0.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.10.0.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.12.0.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.13.0.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.14.0.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.15.0.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.16.0.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.17.0.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.18.0.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.19.0.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.20.0.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.21.0.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.6.3.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.8.0.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.8.1.lockfile

diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v2.3.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v2.3.0.lockfile
deleted file mode 100644
index 878ddbe76a..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v2.3.0.lockfile
+++ /dev/null
@@ -1,5 +0,0 @@
-# Spotless formatter based on Groovy-Eclipse version 2.3.0 (see https://github.com/groovy/groovy-eclipse/wiki)
-#
-# This version is deprecated since the new version system is based on the Eclipse versioning.
-# Use the corresponding Eclipse version 4.6.3 instead.
-com.diffplug.spotless:spotless-ext-greclipse:2.3.0
\ No newline at end of file
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.10.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.10.0.lockfile
deleted file mode 100644
index 33f672b306..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.10.0.lockfile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Spotless formatter based on Groovy-Eclipse version 3.0.0 (see https://github.com/groovy/groovy-eclipse/releases)
-com.diffplug.spotless:spotless-eclipse-groovy:3.2.0
-com.diffplug.spotless:spotless-eclipse-base:3.1.1
-com.google.code.findbugs:annotations:3.0.0
-com.google.code.findbugs:jsr305:3.0.0
-org.eclipse.platform:org.eclipse.core.commands:3.9.300
-org.eclipse.platform:org.eclipse.core.contenttype:3.7.300
-org.eclipse.platform:org.eclipse.core.jobs:3.10.300
-org.eclipse.platform:org.eclipse.core.resources:3.13.300
-org.eclipse.platform:org.eclipse.core.runtime:3.15.200
-org.eclipse.platform:org.eclipse.equinox.app:1.4.100
-org.eclipse.platform:org.eclipse.equinox.common:3.10.300
-org.eclipse.platform:org.eclipse.equinox.preferences:3.7.300
-org.eclipse.platform:org.eclipse.equinox.registry:3.8.300
-org.eclipse.platform:org.eclipse.jface.text:3.15.100
-org.eclipse.platform:org.eclipse.jface:3.15.100
-org.eclipse.platform:org.eclipse.osgi:3.13.300
-org.eclipse.platform:org.eclipse.text:3.8.100
\ No newline at end of file
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.12.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.12.0.lockfile
deleted file mode 100644
index a60e5e8fb0..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.12.0.lockfile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Spotless formatter based on Groovy-Eclipse version 3.4.0 (see https://github.com/groovy/groovy-eclipse/releases)
-com.diffplug.spotless:spotless-eclipse-groovy:3.4.0
-com.diffplug.spotless:spotless-eclipse-base:3.2.1
-com.google.code.findbugs:annotations:3.0.0
-com.google.code.findbugs:jsr305:3.0.0
-org.eclipse.platform:org.eclipse.core.commands:3.9.400
-org.eclipse.platform:org.eclipse.core.contenttype:3.7.300
-org.eclipse.platform:org.eclipse.core.jobs:3.10.400
-org.eclipse.platform:org.eclipse.core.resources:3.13.400
-org.eclipse.platform:org.eclipse.core.runtime:3.15.300
-org.eclipse.platform:org.eclipse.equinox.app:1.4.200
-org.eclipse.platform:org.eclipse.equinox.common:3.10.400
-org.eclipse.platform:org.eclipse.equinox.preferences:3.7.400
-org.eclipse.platform:org.eclipse.equinox.registry:3.8.400
-org.eclipse.platform:org.eclipse.jface.text:3.15.200
-org.eclipse.platform:org.eclipse.jface:3.16.0
-org.eclipse.platform:org.eclipse.osgi:3.14.0
-org.eclipse.platform:org.eclipse.text:3.8.200
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.13.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.13.0.lockfile
deleted file mode 100644
index aede5b0a76..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.13.0.lockfile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Spotless formatter based on Groovy-Eclipse version 3.5.0 (see https://github.com/groovy/groovy-eclipse/releases)
-com.diffplug.spotless:spotless-eclipse-groovy:3.5.0
-com.diffplug.spotless:spotless-eclipse-base:3.2.1
-com.google.code.findbugs:annotations:3.0.0
-com.google.code.findbugs:jsr305:3.0.0
-org.eclipse.platform:org.eclipse.core.commands:3.9.500
-org.eclipse.platform:org.eclipse.core.contenttype:3.7.400
-org.eclipse.platform:org.eclipse.core.jobs:3.10.500
-org.eclipse.platform:org.eclipse.core.resources:3.13.500
-org.eclipse.platform:org.eclipse.core.runtime:3.16.0
-org.eclipse.platform:org.eclipse.equinox.app:1.4.300
-org.eclipse.platform:org.eclipse.equinox.common:3.10.500
-org.eclipse.platform:org.eclipse.equinox.preferences:3.7.500
-org.eclipse.platform:org.eclipse.equinox.registry:3.8.500
-org.eclipse.platform:org.eclipse.jface.text:3.15.300
-org.eclipse.platform:org.eclipse.jface:3.17.0
-org.eclipse.platform:org.eclipse.osgi:3.15.0
-org.eclipse.platform:org.eclipse.text:3.9.0
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.14.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.14.0.lockfile
deleted file mode 100644
index bca432c337..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.14.0.lockfile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Spotless formatter based on Groovy-Eclipse version 3.6.0 (see https://github.com/groovy/groovy-eclipse/releases)
-com.diffplug.spotless:spotless-eclipse-groovy:3.6.0
-com.diffplug.spotless:spotless-eclipse-base:3.3.0
-com.github.spotbugs:spotbugs-annotations:4.0.2
-com.google.code.findbugs:jsr305:3.0.2
-org.eclipse.platform:org.eclipse.core.commands:3.9.600
-org.eclipse.platform:org.eclipse.core.contenttype:3.7.500
-org.eclipse.platform:org.eclipse.core.jobs:3.10.600
-org.eclipse.platform:org.eclipse.core.resources:3.13.600
-org.eclipse.platform:org.eclipse.core.runtime:3.17.0
-org.eclipse.platform:org.eclipse.equinox.app:1.4.300
-org.eclipse.platform:org.eclipse.equinox.common:3.10.600
-org.eclipse.platform:org.eclipse.equinox.preferences:3.7.600
-org.eclipse.platform:org.eclipse.equinox.registry:3.8.600
-org.eclipse.platform:org.eclipse.jface.text:3.16.100
-org.eclipse.platform:org.eclipse.jface:3.18.0
-org.eclipse.platform:org.eclipse.osgi:3.15.100
-org.eclipse.platform:org.eclipse.text:3.10.0
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.15.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.15.0.lockfile
deleted file mode 100644
index fc91fae066..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.15.0.lockfile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Spotless formatter based on Groovy-Eclipse version 3.7.0 (see https://github.com/groovy/groovy-eclipse/releases)
-com.diffplug.spotless:spotless-eclipse-groovy:3.7.0
-com.diffplug.spotless:spotless-eclipse-base:3.3.0
-com.github.spotbugs:spotbugs-annotations:4.0.2
-com.google.code.findbugs:jsr305:3.0.2
-org.eclipse.platform:org.eclipse.core.commands:3.9.700
-org.eclipse.platform:org.eclipse.core.contenttype:3.7.600
-org.eclipse.platform:org.eclipse.core.jobs:3.10.700
-org.eclipse.platform:org.eclipse.core.resources:3.13.700
-org.eclipse.platform:org.eclipse.core.runtime:3.17.100
-org.eclipse.platform:org.eclipse.equinox.app:1.4.400
-org.eclipse.platform:org.eclipse.equinox.common:3.11.0
-org.eclipse.platform:org.eclipse.equinox.preferences:3.7.700
-org.eclipse.platform:org.eclipse.equinox.registry:3.8.700
-org.eclipse.platform:org.eclipse.jface.text:3.16.200
-org.eclipse.platform:org.eclipse.jface:3.19.0
-org.eclipse.platform:org.eclipse.osgi:3.15.200
-org.eclipse.platform:org.eclipse.text:3.10.100
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.16.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.16.0.lockfile
deleted file mode 100644
index 2c5f4ccd03..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.16.0.lockfile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Spotless formatter based on Groovy-Eclipse version 3.8.0 (see https://github.com/groovy/groovy-eclipse/releases)
-com.diffplug.spotless:spotless-eclipse-groovy:3.8.0
-com.diffplug.spotless:spotless-eclipse-base:3.3.0
-com.github.spotbugs:spotbugs-annotations:4.0.2
-com.google.code.findbugs:jsr305:3.0.2
-org.eclipse.platform:org.eclipse.core.commands:3.9.700
-org.eclipse.platform:org.eclipse.core.contenttype:3.7.700
-org.eclipse.platform:org.eclipse.core.jobs:3.10.800
-org.eclipse.platform:org.eclipse.core.resources:3.13.700
-org.eclipse.platform:org.eclipse.core.runtime:3.18.0
-org.eclipse.platform:org.eclipse.equinox.app:1.4.500
-org.eclipse.platform:org.eclipse.equinox.common:3.12.0
-org.eclipse.platform:org.eclipse.equinox.preferences:3.8.0
-org.eclipse.platform:org.eclipse.equinox.registry:3.8.800
-org.eclipse.platform:org.eclipse.jface.text:3.16.300
-org.eclipse.platform:org.eclipse.jface:3.20.0
-org.eclipse.platform:org.eclipse.osgi:3.15.300
-org.eclipse.platform:org.eclipse.text:3.10.200
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.17.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.17.0.lockfile
deleted file mode 100644
index 5242d0da8c..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.17.0.lockfile
+++ /dev/null
@@ -1,19 +0,0 @@
-# Spotless formatter based on Groovy-Eclipse version 3.9.0 (see https://github.com/groovy/groovy-eclipse/releases)
-com.diffplug.spotless:spotless-eclipse-groovy:3.9.0
-com.diffplug.spotless:spotless-eclipse-base:3.4.1
-com.github.spotbugs:spotbugs-annotations:4.0.2
-com.google.code.findbugs:jsr305:3.0.2
-net.jcip:jcip-annotations:1.0
-org.eclipse.platform:org.eclipse.core.commands:3.9.700
-org.eclipse.platform:org.eclipse.core.contenttype:3.7.800
-org.eclipse.platform:org.eclipse.core.jobs:3.10.800
-org.eclipse.platform:org.eclipse.core.resources:3.13.800
-org.eclipse.platform:org.eclipse.core.runtime:3.19.0
-org.eclipse.platform:org.eclipse.equinox.app:1.5.0
-org.eclipse.platform:org.eclipse.equinox.common:3.13.0
-org.eclipse.platform:org.eclipse.equinox.preferences:3.8.0
-org.eclipse.platform:org.eclipse.equinox.registry:3.9.0
-org.eclipse.platform:org.eclipse.jface.text:3.16.400
-org.eclipse.platform:org.eclipse.jface:3.21.0
-org.eclipse.platform:org.eclipse.osgi:3.16.0
-org.eclipse.platform:org.eclipse.text:3.10.300
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.18.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.18.0.lockfile
deleted file mode 100644
index 6bfec53756..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.18.0.lockfile
+++ /dev/null
@@ -1,19 +0,0 @@
-# Spotless formatter based on Groovy-Eclipse version 4.0.0 (see https://github.com/groovy/groovy-eclipse/releases)
-com.diffplug.spotless:spotless-eclipse-groovy:4.0.0
-com.diffplug.spotless:spotless-eclipse-base:3.4.2
-com.github.spotbugs:spotbugs-annotations:4.0.2
-com.google.code.findbugs:jsr305:3.0.2
-net.jcip:jcip-annotations:1.0
-org.eclipse.platform:org.eclipse.core.commands:3.9.800
-org.eclipse.platform:org.eclipse.core.contenttype:3.7.800
-org.eclipse.platform:org.eclipse.core.jobs:3.10.1000
-org.eclipse.platform:org.eclipse.core.resources:3.13.900
-org.eclipse.platform:org.eclipse.core.runtime:3.20.0
-org.eclipse.platform:org.eclipse.equinox.app:1.5.0
-org.eclipse.platform:org.eclipse.equinox.common:3.14.0
-org.eclipse.platform:org.eclipse.equinox.preferences:3.8.100
-org.eclipse.platform:org.eclipse.equinox.registry:3.10.0
-org.eclipse.platform:org.eclipse.jface.text:3.16.500
-org.eclipse.platform:org.eclipse.jface:3.22.0
-org.eclipse.platform:org.eclipse.osgi:3.16.100
-org.eclipse.platform:org.eclipse.text:3.10.400
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.19.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.19.0.lockfile
deleted file mode 100644
index 880d55ac8d..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.19.0.lockfile
+++ /dev/null
@@ -1,19 +0,0 @@
-# Spotless formatter based on Groovy-Eclipse version 4.1.0 (see https://github.com/groovy/groovy-eclipse/releases)
-com.diffplug.spotless:spotless-eclipse-groovy:4.1.0
-com.diffplug.spotless:spotless-eclipse-base:3.4.2
-com.github.spotbugs:spotbugs-annotations:4.0.2
-com.google.code.findbugs:jsr305:3.0.2
-net.jcip:jcip-annotations:1.0
-org.eclipse.platform:org.eclipse.core.commands:3.9.800
-org.eclipse.platform:org.eclipse.core.contenttype:3.7.900
-org.eclipse.platform:org.eclipse.core.jobs:3.10.1100
-org.eclipse.platform:org.eclipse.core.resources:3.14.0
-org.eclipse.platform:org.eclipse.core.runtime:3.20.100
-org.eclipse.platform:org.eclipse.equinox.app:1.5.100
-org.eclipse.platform:org.eclipse.equinox.common:3.14.100
-org.eclipse.platform:org.eclipse.equinox.preferences:3.8.200
-org.eclipse.platform:org.eclipse.equinox.registry:3.10.100
-org.eclipse.platform:org.eclipse.jface.text:3.17.0
-org.eclipse.platform:org.eclipse.jface:3.22.100
-org.eclipse.platform:org.eclipse.osgi:3.16.200
-org.eclipse.platform:org.eclipse.text:3.11.0
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.20.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.20.0.lockfile
deleted file mode 100644
index 2836c05982..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.20.0.lockfile
+++ /dev/null
@@ -1,20 +0,0 @@
-# Spotless formatter based on Groovy-Eclipse version 4.2.0 (see https://github.com/groovy/groovy-eclipse/releases)
-com.diffplug.spotless:spotless-eclipse-groovy:4.2.0
-com.diffplug.spotless:spotless-eclipse-base:3.5.2
-com.github.spotbugs:spotbugs-annotations:4.0.2
-com.google.code.findbugs:jsr305:3.0.2
-net.jcip:jcip-annotations:1.0
-org.eclipse.platform:org.eclipse.core.commands:3.10.0
-org.eclipse.platform:org.eclipse.core.contenttype:3.7.1000
-org.eclipse.platform:org.eclipse.core.filesystem:1.9.0
-org.eclipse.platform:org.eclipse.core.jobs:3.11.0
-org.eclipse.platform:org.eclipse.core.resources:3.15.0
-org.eclipse.platform:org.eclipse.core.runtime:3.22.0
-org.eclipse.platform:org.eclipse.equinox.app:1.5.100
-org.eclipse.platform:org.eclipse.equinox.common:3.15.0
-org.eclipse.platform:org.eclipse.equinox.preferences:3.8.200
-org.eclipse.platform:org.eclipse.equinox.registry:3.10.200
-org.eclipse.platform:org.eclipse.jface.text:3.18.0
-org.eclipse.platform:org.eclipse.jface:3.22.200
-org.eclipse.platform:org.eclipse.osgi:3.16.300
-org.eclipse.platform:org.eclipse.text:3.12.0
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.21.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.21.0.lockfile
deleted file mode 100644
index 38376d1b32..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.21.0.lockfile
+++ /dev/null
@@ -1,20 +0,0 @@
-# Spotless formatter based on Groovy-Eclipse version 4.3.0 (see https://github.com/groovy/groovy-eclipse/releases)
-com.diffplug.spotless:spotless-eclipse-groovy:4.3.0
-com.diffplug.spotless:spotless-eclipse-base:3.5.2
-com.github.spotbugs:spotbugs-annotations:4.0.2
-com.google.code.findbugs:jsr305:3.0.2
-net.jcip:jcip-annotations:1.0
-org.eclipse.platform:org.eclipse.core.commands:3.10.100
-org.eclipse.platform:org.eclipse.core.contenttype:3.8.0
-org.eclipse.platform:org.eclipse.core.filesystem:1.9.100
-org.eclipse.platform:org.eclipse.core.jobs:3.12.0
-org.eclipse.platform:org.eclipse.core.resources:3.15.100
-org.eclipse.platform:org.eclipse.core.runtime:3.23.0
-org.eclipse.platform:org.eclipse.equinox.app:1.6.0
-org.eclipse.platform:org.eclipse.equinox.common:3.15.0
-org.eclipse.platform:org.eclipse.equinox.preferences:3.9.0
-org.eclipse.platform:org.eclipse.equinox.registry:3.11.0
-org.eclipse.platform:org.eclipse.jface.text:3.18.100
-org.eclipse.platform:org.eclipse.jface:3.23.0
-org.eclipse.platform:org.eclipse.osgi:3.17.0
-org.eclipse.platform:org.eclipse.text:3.12.0
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.6.3.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.6.3.lockfile
deleted file mode 100644
index a6299ec57d..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.6.3.lockfile
+++ /dev/null
@@ -1,2 +0,0 @@
-# Spotless formatter based on Groovy-Eclipse version 2.3.0 (see https://github.com/groovy/groovy-eclipse/wiki)
-com.diffplug.spotless:spotless-ext-greclipse:2.3.0
\ No newline at end of file
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.8.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.8.0.lockfile
deleted file mode 100644
index bb95c71104..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.8.0.lockfile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Spotless formatter based on Groovy-Eclipse version 2.9.2 (see https://github.com/groovy/groovy-eclipse/releases)
-com.diffplug.spotless:spotless-eclipse-groovy:2.9.2
-com.diffplug.spotless:spotless-eclipse-base:3.1.1
-com.google.code.findbugs:annotations:3.0.0
-com.google.code.findbugs:jsr305:3.0.0
-org.eclipse.platform:org.eclipse.core.commands:3.9.100
-org.eclipse.platform:org.eclipse.core.contenttype:3.7.0
-org.eclipse.platform:org.eclipse.core.jobs:3.10.0
-org.eclipse.platform:org.eclipse.core.resources:3.13.0
-org.eclipse.platform:org.eclipse.core.runtime:3.14.0
-org.eclipse.platform:org.eclipse.equinox.app:1.3.500
-org.eclipse.platform:org.eclipse.equinox.common:3.10.0
-org.eclipse.platform:org.eclipse.equinox.preferences:3.7.100
-org.eclipse.platform:org.eclipse.equinox.registry:3.8.0
-org.eclipse.platform:org.eclipse.jface.text:3.13.0
-org.eclipse.platform:org.eclipse.jface:3.14.0
-org.eclipse.platform:org.eclipse.osgi:3.13.0
-org.eclipse.platform:org.eclipse.text:3.6.300
\ No newline at end of file
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.8.1.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.8.1.lockfile
deleted file mode 100644
index 9198eaccb9..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_groovy_formatter/v4.8.1.lockfile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Spotless formatter based on Groovy-Eclipse version 3.0.0 (see https://github.com/groovy/groovy-eclipse/releases)
-com.diffplug.spotless:spotless-eclipse-groovy:3.0.1
-com.diffplug.spotless:spotless-eclipse-base:3.1.1
-com.google.code.findbugs:annotations:3.0.0
-com.google.code.findbugs:jsr305:3.0.0
-org.eclipse.platform:org.eclipse.core.commands:3.9.100
-org.eclipse.platform:org.eclipse.core.contenttype:3.7.0
-org.eclipse.platform:org.eclipse.core.jobs:3.10.0
-org.eclipse.platform:org.eclipse.core.resources:3.13.0
-org.eclipse.platform:org.eclipse.core.runtime:3.14.0
-org.eclipse.platform:org.eclipse.equinox.app:1.3.500
-org.eclipse.platform:org.eclipse.equinox.common:3.10.0
-org.eclipse.platform:org.eclipse.equinox.preferences:3.7.100
-org.eclipse.platform:org.eclipse.equinox.registry:3.8.0
-org.eclipse.platform:org.eclipse.jface.text:3.13.0
-org.eclipse.platform:org.eclipse.jface:3.14.0
-org.eclipse.platform:org.eclipse.osgi:3.13.0
-org.eclipse.platform:org.eclipse.text:3.6.300
\ No newline at end of file

From 24abb541e5df9c69acc9333ffec1137099494eef Mon Sep 17 00:00:00 2001
From: Kostiantyn Liutovych <lutovich@gmail.com>
Date: Sun, 12 Mar 2023 21:05:16 +0100
Subject: [PATCH 0904/2068] Enable up-to-date checking in Maven plugin by
 default

Up-to-date checking has been supported for a long time. We haven't received any
negative feedback about it. Neo4j is an example project that has up-to-date
checking enabled to improve performance and haven't had problems with it:
https://github.com/neo4j/neo4j/blob/6ebc409772cea13354adb6a11aab4ed38da9d53e/pom.xml#L745-L747.

It should be safe to enable up-to-date checking for all users of the Spotless Maven plugin.

This commit also fixes the problem where plugin execution would fail on a parent of a multimodule
Maven project with up-to-date checking enabled. A parent project can configure Spotless as:

```xml
<build>
  <pluginManagement>
    <plugins>
      <plugin>
        <groupId>com.diffplug.spotless</groupId>
        <artifactId>spotless-maven-plugin</artifactId>
        ...
      </plugin>
    </plugins>
  </pluginManagement>
</build>
```

It allows child projects to inherit plugin's version and configuration but the
plugin is not enables by default.

PluginFingerprint did not handle such configuration correctly. It could only handle a simple
configuration like:

```xml
<build>
  <plugins>
    <plugin>
      <groupId>com.diffplug.spotless</groupId>
      <artifactId>spotless-maven-plugin</artifactId>
      ...
    </plugin>
  </plugins>
</build>
```

And failed with "Spotless plugin absent from the project" error for a multimodule
parent project with Spotless in `<pluginManagement>`.
---
 plugin-maven/CHANGES.md                       |  2 +
 plugin-maven/README.md                        |  2 +-
 .../spotless/maven/AbstractSpotlessMojo.java  |  4 +-
 .../maven/incremental/PluginFingerprint.java  | 24 +++++-
 .../maven/incremental/UpToDateChecking.java   |  8 +-
 .../maven/MultiModuleProjectTest.java         | 34 ++++-----
 .../incremental/PluginFingerprintTest.java    | 36 ++++++++-
 .../incremental/UpToDateCheckingTest.java     | 75 +++++++++----------
 8 files changed, 121 insertions(+), 64 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 73eb026796..f65f5e61d4 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -7,6 +7,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * You can now put the filename into a license header template with `$FILE`. ([#1605](https://github.com/diffplug/spotless/pull/1605) fixes [#1147](https://github.com/diffplug/spotless/issues/1147))
 ### Fixed
 * `licenseHeader` default pattern for Java files is updated to `(package|import|public|class|module) `. ([#1614](https://github.com/diffplug/spotless/pull/1614))
+### Changes
+* Enable incremental up-to-date checking by default. ([#1621](https://github.com/diffplug/spotless/pull/1621))
 
 ## [2.34.0] - 2023-02-27
 ### Added
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 426b00184e..4af6308b89 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -1262,7 +1262,7 @@ To define what lines to skip at the beginning of such files, fill the `skipLines
 
 ## Incremental up-to-date checking and formatting
 
-**This feature is turned off by default.**
+**This feature is enabled by default starting from version 2.35.0.**
 
 Execution of `spotless:check` and `spotless:apply` for large projects can take time.
 By default, Spotless Maven plugin needs to read and format each source file.
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
index f6aab0eabb..2c0d6e35e6 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
@@ -187,7 +187,7 @@ public abstract class AbstractSpotlessMojo extends AbstractMojo {
 	private String setLicenseHeaderYearsFromGitHistory;
 
 	@Parameter
-	private UpToDateChecking upToDateChecking;
+	private UpToDateChecking upToDateChecking = UpToDateChecking.enabled();
 
 	protected abstract void process(Iterable<File> files, Formatter formatter, UpToDateChecker upToDateChecker) throws MojoExecutionException;
 
@@ -373,9 +373,9 @@ private UpToDateChecker createUpToDateChecker(Iterable<Formatter> formatters) {
 		}
 		final UpToDateChecker checker;
 		if (upToDateChecking != null && upToDateChecking.isEnabled()) {
-			getLog().info("Up-to-date checking enabled");
 			checker = UpToDateChecker.forProject(project, indexFile, formatters, getLog());
 		} else {
+			getLog().info("Up-to-date checking disabled");
 			checker = UpToDateChecker.noop(project, indexFile, getLog());
 		}
 		return UpToDateChecker.wrapWithBuildContext(checker, buildContext);
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/PluginFingerprint.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/PluginFingerprint.java
index 9efd6f2586..34a01e235a 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/PluginFingerprint.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/PluginFingerprint.java
@@ -21,6 +21,7 @@
 import java.util.Objects;
 
 import org.apache.maven.model.Plugin;
+import org.apache.maven.model.PluginManagement;
 import org.apache.maven.project.MavenProject;
 
 import com.diffplug.spotless.Formatter;
@@ -43,10 +44,7 @@ private PluginFingerprint(String value) {
 	}
 
 	static PluginFingerprint from(MavenProject project, Iterable<Formatter> formatters) {
-		Plugin spotlessPlugin = project.getPlugin(SPOTLESS_PLUGIN_KEY);
-		if (spotlessPlugin == null) {
-			throw new IllegalArgumentException("Spotless plugin absent from the project: " + project);
-		}
+		Plugin spotlessPlugin = findSpotlessPlugin(project);
 		byte[] digest = digest(spotlessPlugin, formatters);
 		String value = Base64.getEncoder().encodeToString(digest);
 		return new PluginFingerprint(value);
@@ -86,6 +84,24 @@ public String toString() {
 		return "PluginFingerprint[" + value + "]";
 	}
 
+	private static Plugin findSpotlessPlugin(MavenProject project) {
+		// Try to find the plugin instance from <build><plugins><plugin> XML element
+		Plugin plugin = project.getPlugin(SPOTLESS_PLUGIN_KEY);
+		if (plugin == null) {
+			// Try to find the plugin instance from <build><pluginManagement><plugins><plugin> XML element. Useful when
+			// the current module is a parent of a multimodule project
+			PluginManagement pluginManagement = project.getPluginManagement();
+			if (pluginManagement != null) {
+				plugin = pluginManagement.getPluginsAsMap().get(SPOTLESS_PLUGIN_KEY);
+			}
+		}
+
+		if (plugin == null) {
+			throw new IllegalArgumentException("Spotless plugin absent from the project: " + project);
+		}
+		return plugin;
+	}
+
 	private static byte[] digest(Plugin plugin, Iterable<Formatter> formatters) {
 		try (ObjectDigestOutputStream out = ObjectDigestOutputStream.create()) {
 			out.writeObject(plugin.getVersion());
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/UpToDateChecking.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/UpToDateChecking.java
index d5eb6aa941..f044b847c9 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/UpToDateChecking.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/UpToDateChecking.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 DiffPlug
+ * Copyright 2021-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,4 +38,10 @@ public boolean isEnabled() {
 	public Path getIndexFile() {
 		return indexFile == null ? null : new File(indexFile).toPath();
 	}
+
+	public static UpToDateChecking enabled() {
+		UpToDateChecking upToDateChecking = new UpToDateChecking();
+		upToDateChecking.enabled = true;
+		return upToDateChecking;
+	}
 }
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MultiModuleProjectTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MultiModuleProjectTest.java
index 1c9521c402..a93b4ffdd0 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MultiModuleProjectTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MultiModuleProjectTest.java
@@ -32,31 +32,31 @@ class MultiModuleProjectTest extends MavenIntegrationHarness {
 	@Test
 	void testConfigurationDependency() throws Exception {
 		/*
-		create a multi-module project with the following stucture:
+		create a multi-module project with the following structure:
 
 		    /junit-tmp-dir
 		    ├── config
-		    │   ├── pom.xml
-		    │   └── src/main/resources/configs
-		    │       ├── eclipse-formatter.xml
-		    │       └── scalafmt.conf
+		    │   ├── pom.xml
+		    │   └── src/main/resources/configs
+		    │       ├── eclipse-formatter.xml
+		    │       └── scalafmt.conf
 		    ├── mvnw
 		    ├── mvnw.cmd
 		    ├── one
-		    │   ├── pom.xml
-		    │   └── src
-		    │       ├── main/java/test1.java
-		    │       └── test/java/test2.java
+		    │   ├── pom.xml
+		    │   └── src
+		    │       ├── main/java/test1.java
+		    │       └── test/java/test2.java
 		    ├── two
-		    │   ├── pom.xml
-		    │   └── src
-		    │       ├── main/java/test1.java
-		    │       └── test/java/test2.java
+		    │   ├── pom.xml
+		    │   └── src
+		    │       ├── main/java/test1.java
+		    │       └── test/java/test2.java
 		    ├── three
-		    │   ├── pom.xml
-		    │   └── src
-		    │       ├── main/scala/test1.scala
-		    │       └── test/scala/test2.scala
+		    │   ├── pom.xml
+		    │   └── src
+		    │       ├── main/scala/test1.scala
+		    │       └── test/scala/test2.scala
 		    ├── pom.xml
 		    ├── .mvn
 		    ├── mvnw
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/PluginFingerprintTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/PluginFingerprintTest.java
index c344580d37..ae61dec331 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/PluginFingerprintTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/PluginFingerprintTest.java
@@ -23,9 +23,12 @@
 import java.io.ByteArrayInputStream;
 import java.nio.file.Paths;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import org.apache.maven.model.Model;
+import org.apache.maven.model.Plugin;
+import org.apache.maven.model.PluginManagement;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.util.ReaderFactory;
@@ -106,7 +109,7 @@ void emptyFingerprint() {
 	}
 
 	@Test
-	void failsWhenProjectDoesNotContainSpotlessPlugin() {
+	void failsForProjectWithoutSpotlessPlugin() {
 		MavenProject projectWithoutSpotless = new MavenProject();
 
 		assertThatThrownBy(() -> PluginFingerprint.from(projectWithoutSpotless, FORMATTERS))
@@ -114,6 +117,37 @@ void failsWhenProjectDoesNotContainSpotlessPlugin() {
 				.hasMessageContaining("Spotless plugin absent from the project");
 	}
 
+	@Test
+	void buildsFingerprintForProjectWithSpotlessPluginInBuildPlugins() {
+		MavenProject project = new MavenProject();
+		Plugin spotlessPlugin = new Plugin();
+		spotlessPlugin.setGroupId("com.diffplug.spotless");
+		spotlessPlugin.setArtifactId("spotless-maven-plugin");
+		spotlessPlugin.setVersion("1.2.3");
+		project.getBuild().addPlugin(spotlessPlugin);
+
+		PluginFingerprint fingerprint = PluginFingerprint.from(project, Collections.emptyList());
+
+		assertThat(fingerprint).isNotNull();
+	}
+
+	@Test
+	void buildsFingerprintForProjectWithSpotlessPluginInPluginManagement() {
+		MavenProject project = new MavenProject();
+		Plugin spotlessPlugin = new Plugin();
+		spotlessPlugin.setGroupId("com.diffplug.spotless");
+		spotlessPlugin.setArtifactId("spotless-maven-plugin");
+		spotlessPlugin.setVersion("1.2.3");
+		project.getBuild().addPlugin(spotlessPlugin);
+		PluginManagement pluginManagement = new PluginManagement();
+		pluginManagement.addPlugin(spotlessPlugin);
+		project.getBuild().setPluginManagement(pluginManagement);
+
+		PluginFingerprint fingerprint = PluginFingerprint.from(project, Collections.emptyList());
+
+		assertThat(fingerprint).isNotNull();
+	}
+
 	private MavenProject mavenProject(String spotlessVersion) throws Exception {
 		String xml = createPomXmlContent(spotlessVersion, new String[0], new String[0]);
 		return new MavenProject(readPom(xml));
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/UpToDateCheckingTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/UpToDateCheckingTest.java
index 0a9fe8f2d4..cfc17594ca 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/UpToDateCheckingTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/UpToDateCheckingTest.java
@@ -31,8 +31,10 @@
 
 class UpToDateCheckingTest extends MavenIntegrationHarness {
 
+	private static final String DISABLED_MESSAGE = "Up-to-date checking disabled";
+
 	@Test
-	void upToDateCheckingDisabledByDefault() throws Exception {
+	void upToDateCheckingEnabledByDefault() throws Exception {
 		writePom(
 				"<java>",
 				"  <googleJavaFormat/>",
@@ -41,75 +43,53 @@ void upToDateCheckingDisabledByDefault() throws Exception {
 		List<File> files = writeUnformattedFiles(1);
 		String output = runSpotlessApply();
 
-		assertThat(output).doesNotContain("Up-to-date checking enabled");
+		assertThat(output).doesNotContain(DISABLED_MESSAGE);
 		assertFormatted(files);
 	}
 
 	@Test
-	void enableUpToDateChecking() throws Exception {
+	void explicitlyEnableUpToDateChecking() throws Exception {
 		writePomWithUpToDateCheckingEnabled(true);
 
 		List<File> files = writeUnformattedFiles(1);
 		String output = runSpotlessApply();
 
-		assertThat(output).contains("Up-to-date checking enabled");
+		assertThat(output).doesNotContain(DISABLED_MESSAGE);
 		assertFormatted(files);
 	}
 
 	@Test
-	void enableUpToDateCheckingWithPluginDependencies() throws Exception {
-		writePomWithPluginManagementAndDependency();
+	void explicitlyDisableUpToDateChecking() throws Exception {
+		writePomWithUpToDateCheckingEnabled(false);
 
 		List<File> files = writeUnformattedFiles(1);
 		String output = runSpotlessApply();
 
-		assertThat(output).contains("Up-to-date checking enabled");
+		assertThat(output).contains(DISABLED_MESSAGE);
 		assertFormatted(files);
 	}
 
 	@Test
-	void enableUpToDateCheckingWithPluginDependenciesMaven3_6_3() throws Exception {
+	void enableUpToDateCheckingWithPluginDependencies() throws Exception {
 		writePomWithPluginManagementAndDependency();
 
-		setFile(".mvn/wrapper/maven-wrapper.properties").toContent("distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip\n");
-
 		List<File> files = writeUnformattedFiles(1);
 		String output = runSpotlessApply();
 
-		assertThat(output).contains("Up-to-date checking enabled");
+		assertThat(output).doesNotContain(DISABLED_MESSAGE);
 		assertFormatted(files);
 	}
 
-	private void writePomWithPluginManagementAndDependency() throws IOException {
-		setFile("pom.xml").toContent(createPomXmlContent("/pom-test-management.xml.mustache",
-				null,
-				null,
-				new String[]{
-						"<java>",
-						"  <googleJavaFormat/>",
-						"</java>",
-						"<upToDateChecking>",
-						"  <enabled>true</enabled>",
-						"</upToDateChecking>"},
-				new String[]{
-						"<dependencies>",
-						"  <dependency>",
-						"    <groupId>javax.inject</groupId>",
-						"    <artifactId>javax.inject</artifactId>",
-						"    <version>1</version>",
-						"  </dependency>",
-						"</dependencies>"},
-				null));
-	}
-
 	@Test
-	void disableUpToDateChecking() throws Exception {
-		writePomWithUpToDateCheckingEnabled(false);
+	void enableUpToDateCheckingWithPluginDependenciesMaven3_6_3() throws Exception {
+		writePomWithPluginManagementAndDependency();
+
+		setFile(".mvn/wrapper/maven-wrapper.properties").toContent("distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip\n");
 
 		List<File> files = writeUnformattedFiles(1);
 		String output = runSpotlessApply();
 
-		assertThat(output).doesNotContain("Up-to-date checking enabled");
+		assertThat(output).doesNotContain(DISABLED_MESSAGE);
 		assertFormatted(files);
 	}
 
@@ -124,7 +104,7 @@ void enableUpToDateCheckingCustomIndexFile() throws Exception {
 		List<File> files = writeUnformattedFiles(1);
 		String output = runSpotlessApply();
 
-		assertThat(output).contains("Up-to-date checking enabled");
+		assertThat(output).doesNotContain(DISABLED_MESSAGE);
 		assertFormatted(files);
 		assertThat(indexFile.getParent()).exists();
 		assertThat(indexFile).exists();
@@ -143,7 +123,7 @@ void disableUpToDateCheckingCustomIndexFile() throws Exception {
 		List<File> files = writeUnformattedFiles(1);
 		String output = runSpotlessApply();
 
-		assertThat(output).doesNotContain("Up-to-date checking enabled");
+		assertThat(output).contains(DISABLED_MESSAGE);
 		assertFormatted(files);
 		assertThat(indexFile.getParent()).exists();
 		assertThat(indexFile).doesNotExist();
@@ -215,6 +195,25 @@ void spotlessCheckRecordsUnformattedFiles() throws Exception {
 		assertSpotlessCheckSkipped(files, checkOutput3);
 	}
 
+	private void writePomWithPluginManagementAndDependency() throws IOException {
+		setFile("pom.xml").toContent(createPomXmlContent("/pom-test-management.xml.mustache",
+				null,
+				null,
+				new String[]{
+						"<java>",
+						"  <googleJavaFormat/>",
+						"</java>"},
+				new String[]{
+						"<dependencies>",
+						"  <dependency>",
+						"    <groupId>javax.inject</groupId>",
+						"    <artifactId>javax.inject</artifactId>",
+						"    <version>1</version>",
+						"  </dependency>",
+						"</dependencies>"},
+				null));
+	}
+
 	private void writePomWithUpToDateCheckingEnabled(boolean enabled) throws IOException {
 		writePom(
 				"<java>",

From 657e0bc1f29da5a9a57bf2c2ab11f27809fbda52 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 12 Mar 2023 21:18:57 -0700
Subject: [PATCH 0905/2068] Added EquoBasedStepBuilder.addPlatformRepo which
 handles how the core platform IUs change with different versions.

---
 .../groovy/GrEclipseFormatterStepImpl.java    | 28 ++++++++++++-------
 .../spotless/extra/EquoBasedStepBuilder.java  | 20 +++++++++++++
 .../extra/groovy/GrEclipseFormatterStep.java  |  5 +++-
 .../extra/java/EclipseJdtFormatterStep.java   |  4 +--
 .../groovy/GrEclipseFormatterStepTest.java    |  2 +-
 5 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java b/lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java
index 18aed57aeb..dd3348a5a0 100644
--- a/lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java
+++ b/lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java
@@ -39,6 +39,7 @@
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.TextSelection;
 import org.eclipse.text.edits.TextEdit;
+import org.osgi.framework.Constants;
 
 import dev.equo.solstice.NestedJars;
 import dev.equo.solstice.ShimIdeBootstrapServices;
@@ -47,6 +48,23 @@
 
 /** Spotless-Formatter step which calls out to the Groovy-Eclipse formatter. */
 public class GrEclipseFormatterStepImpl {
+	static {
+		System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "info");
+		NestedJars.setToWarnOnly();
+		NestedJars.onClassPath().confirmAllNestedJarsArePresentOnClasspath(CacheLocations.nestedJars());
+
+		var solstice = Solstice.findBundlesOnClasspath();
+		solstice.warnAndModifyManifestsToFix();
+		var props = Map.of("osgi.nl", "en_US",
+				Constants.FRAMEWORK_STORAGE_CLEAN, Constants.FRAMEWORK_STORAGE_CLEAN_ONFIRSTINIT);
+		solstice.openShim(props);
+		ShimIdeBootstrapServices.apply(props, solstice.getContext());
+		solstice.start("org.apache.felix.scr");
+		solstice.startAllWithLazy(false);
+		//		solstice.start("org.eclipse.core.resources");
+		solstice.start("org.codehaus.groovy.eclipse.core");
+	}
+
 	/**
 	 * Groovy compiler problems can be ignored.
 	 * <p>
@@ -59,16 +77,6 @@ public class GrEclipseFormatterStepImpl {
 	private final boolean ignoreFormatterProblems;
 
 	public GrEclipseFormatterStepImpl(final Properties properties) throws Exception {
-		var solstice = Solstice.findBundlesOnClasspath();
-		NestedJars.setToWarnOnly();
-		NestedJars.onClassPath().confirmAllNestedJarsArePresentOnClasspath(CacheLocations.nestedJars());
-		solstice.warnAndModifyManifestsToFix();
-		var props = Map.<String, String> of();
-		solstice.openShim(props);
-		ShimIdeBootstrapServices.apply(props, solstice.getContext());
-		solstice.startAllWithLazy(false);
-		solstice.startWithoutTransitives("org.codehaus.groovy.eclipse.core");
-
 		PreferenceStore preferences = createPreferences(properties);
 		preferencesStore = new FormatterPreferencesOnStore(preferences);
 		ignoreFormatterProblems = Boolean.parseBoolean(properties.getProperty(IGNORE_FORMATTER_PROBLEMS, "false"));
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 fb2ed88df7..885d3bfbc6 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
@@ -18,6 +18,7 @@
 import java.io.File;
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Properties;
 
 import com.diffplug.spotless.FileSignature;
@@ -65,12 +66,31 @@ public FormatterStep build() {
 
 	protected abstract P2Model model(String version);
 
+	protected void addPlatformRepo(P2Model model, String version) {
+		if (!version.startsWith("4.")) {
+			throw new IllegalArgumentException("Expected 4.x");
+		}
+		int minorVersion = Integer.parseInt(version.substring("4.".length()));
+
+		model.addP2Repo("https://download.eclipse.org/eclipse/updates/" + version + "/");
+		model.getInstall().addAll(List.of(
+				"org.apache.felix.scr",
+				"org.eclipse.equinox.event"));
+		if (minorVersion >= 25) {
+			model.getInstall().addAll(List.of(
+					"org.osgi.service.cm",
+					"org.osgi.service.metatype"));
+		}
+	}
+
 	/** Creates the state of the configuration. */
 	EquoBasedStepBuilder.State get() throws Exception {
 		var query = model(formatterVersion).query(P2ClientCache.PREFER_OFFLINE, P2QueryCache.ALLOW);
 		var classpath = new ArrayList<File>();
 		var mavenDeps = new ArrayList<String>();
 		mavenDeps.add("dev.equo.ide:solstice:0.19.1");
+		mavenDeps.add("com.diffplug.durian:durian-swt.os:4.1.1");
+		mavenDeps.add("org.slf4j:slf4j-simple:1.7.36");
 		mavenDeps.addAll(query.getJarsOnMavenCentral());
 		classpath.addAll(mavenProvisioner.provisionWithTransitives(false, mavenDeps));
 		classpath.addAll(query.getJarsNotOnMavenCentral());
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 312f9a786f..657399ffa2 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
@@ -57,13 +57,16 @@ protected P2Model model(String version) {
 					greclipseVersion = "3." + (eVersion - 8) + ".0";
 				}
 				var model = new P2Model();
-				model.addP2Repo("https://download.eclipse.org/eclipse/updates/" + version + "/");
+				addPlatformRepo(model, version);
 				model.addP2Repo("https://groovy.jfrog.io/artifactory/plugins-release/org/codehaus/groovy/groovy-eclipse-integration/" + greclipseVersion + "/e" + version + "/");
 				model.getInstall().addAll(List.of(
 						"org.codehaus.groovy.eclipse.refactoring",
 						"org.codehaus.groovy.eclipse.core",
 						"org.eclipse.jdt.groovy.core",
 						"org.codehaus.groovy"));
+				model.addFilterAndValidate("no-debug", filter -> {
+					filter.exclude("org.eclipse.jdt.debug");
+				});
 				return model;
 			}
 
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 50654899bd..cd9314406f 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
@@ -42,7 +42,7 @@ public static EquoBasedStepBuilder createBuilder(Provisioner provisioner) {
 			@Override
 			protected P2Model model(String version) {
 				var model = new P2Model();
-				model.addP2Repo("https://download.eclipse.org/eclipse/updates/" + version + "/");
+				addPlatformRepo(model, version);
 				model.getInstall().add("org.eclipse.jdt.core");
 				return model;
 			}
@@ -51,7 +51,7 @@ protected P2Model model(String version) {
 			public void setVersion(String version) {
 				if (version.endsWith(".0")) {
 					String newVersion = version.substring(0, version.length() - 2);
-					System.err.println("Recommend replacing '" + version + "' with '" + newVersion + "' for eclipse JDT");
+					System.err.println("Recommend replacing '" + version + "' with '" + newVersion + "' for Eclipse JDT");
 					version = newVersion;
 				}
 				super.setVersion(version);
diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepTest.java
index d72fc2e1a4..f4e47cd798 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepTest.java
@@ -38,6 +38,6 @@ void formatWithVersion(String version) throws Exception {
 	}
 
 	private static Stream<String> formatWithVersion() {
-		return Stream.of("4.25", GrEclipseFormatterStep.defaultVersion());
+		return Stream.of("4.21", GrEclipseFormatterStep.defaultVersion());
 	}
 }

From 3d12662be876c5fd9de2f05f3c7a230ecfb06b76 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 12 Mar 2023 23:44:28 -0700
Subject: [PATCH 0906/2068] Fix GrEclipse for 4.18 through 4.26

---
 lib-extra/build.gradle                        |  2 +-
 .../groovy/GrEclipseFormatterStepImpl.java    | 29 +++++++++++--------
 .../spotless/extra/EquoBasedStepBuilder.java  |  2 +-
 .../groovy/GrEclipseFormatterStepTest.java    |  5 ++--
 4 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index f3b4b7c4b5..9506f9a2ad 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -7,7 +7,7 @@ version = rootProject.spotlessChangelog.versionNext
 apply from: rootProject.file('gradle/java-setup.gradle')
 apply from: rootProject.file('gradle/java-publish.gradle')
 
-String VER_SOLSTICE = '0.19.1'
+String VER_SOLSTICE = '0.19.2'
 dependencies {
 	api project(':lib')
 	// misc useful utilities
diff --git a/lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java b/lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java
index dd3348a5a0..ded0ef56bd 100644
--- a/lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java
+++ b/lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java
@@ -18,6 +18,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -38,8 +39,10 @@
 import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.TextSelection;
+import org.eclipse.osgi.internal.location.EquinoxLocations;
 import org.eclipse.text.edits.TextEdit;
 import org.osgi.framework.Constants;
+import org.slf4j.LoggerFactory;
 
 import dev.equo.solstice.NestedJars;
 import dev.equo.solstice.ShimIdeBootstrapServices;
@@ -49,20 +52,22 @@
 /** Spotless-Formatter step which calls out to the Groovy-Eclipse formatter. */
 public class GrEclipseFormatterStepImpl {
 	static {
-		System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "info");
 		NestedJars.setToWarnOnly();
 		NestedJars.onClassPath().confirmAllNestedJarsArePresentOnClasspath(CacheLocations.nestedJars());
-
-		var solstice = Solstice.findBundlesOnClasspath();
-		solstice.warnAndModifyManifestsToFix();
-		var props = Map.of("osgi.nl", "en_US",
-				Constants.FRAMEWORK_STORAGE_CLEAN, Constants.FRAMEWORK_STORAGE_CLEAN_ONFIRSTINIT);
-		solstice.openShim(props);
-		ShimIdeBootstrapServices.apply(props, solstice.getContext());
-		solstice.start("org.apache.felix.scr");
-		solstice.startAllWithLazy(false);
-		//		solstice.start("org.eclipse.core.resources");
-		solstice.start("org.codehaus.groovy.eclipse.core");
+		try {
+			var solstice = Solstice.findBundlesOnClasspath();
+			solstice.warnAndModifyManifestsToFix();
+			var props = Map.of("osgi.nl", "en_US",
+					Constants.FRAMEWORK_STORAGE_CLEAN, Constants.FRAMEWORK_STORAGE_CLEAN_ONFIRSTINIT,
+					EquinoxLocations.PROP_INSTANCE_AREA, Files.createTempDirectory("spotless-groovy").toAbsolutePath().toString());
+			solstice.openShim(props);
+			ShimIdeBootstrapServices.apply(props, solstice.getContext());
+			solstice.start("org.apache.felix.scr");
+			solstice.startAllWithLazy(false);
+			solstice.start("org.codehaus.groovy.eclipse.core");
+		} catch (IOException e) {
+			throw new RuntimeException(e);
+		}
 	}
 
 	/**
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 885d3bfbc6..f4cea50275 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
@@ -88,7 +88,7 @@ EquoBasedStepBuilder.State get() throws Exception {
 		var query = model(formatterVersion).query(P2ClientCache.PREFER_OFFLINE, P2QueryCache.ALLOW);
 		var classpath = new ArrayList<File>();
 		var mavenDeps = new ArrayList<String>();
-		mavenDeps.add("dev.equo.ide:solstice:0.19.1");
+		mavenDeps.add("dev.equo.ide:solstice:0.19.2");
 		mavenDeps.add("com.diffplug.durian:durian-swt.os:4.1.1");
 		mavenDeps.add("org.slf4j:slf4j-simple:1.7.36");
 		mavenDeps.addAll(query.getJarsOnMavenCentral());
diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepTest.java
index f4e47cd798..4121d49497 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepTest.java
@@ -23,12 +23,13 @@
 import com.diffplug.spotless.TestProvisioner;
 import com.diffplug.spotless.extra.eclipse.EquoResourceHarness;
 
-class GrEclipseFormatterStepTest extends EquoResourceHarness {
+public class GrEclipseFormatterStepTest extends EquoResourceHarness {
 	private final static String INPUT = "class F{ def m(){} }";
 	private final static String EXPECTED = "class F{\n\tdef m(){}\n}";
 
 	public GrEclipseFormatterStepTest() {
 		super(GrEclipseFormatterStep.createBuilder(TestProvisioner.mavenCentral()), INPUT, EXPECTED);
+		System.setProperty("org.gradle.logging.level", "info");
 	}
 
 	@ParameterizedTest
@@ -38,6 +39,6 @@ void formatWithVersion(String version) throws Exception {
 	}
 
 	private static Stream<String> formatWithVersion() {
-		return Stream.of("4.21", GrEclipseFormatterStep.defaultVersion());
+		return Stream.of("4.18", GrEclipseFormatterStep.defaultVersion());
 	}
 }

From 52a1d2450db8138e91cfa8cc160e6a1aee1fe72e Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 12 Mar 2023 23:44:37 -0700
Subject: [PATCH 0907/2068] Update changelog for Groovy.

---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index c09f3a0cdd..3295ef5013 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -14,6 +14,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * We are now opting in to Gradle's new stable configuration cache. ([#1591](https://github.com/diffplug/spotless/pull/1591))
 * Adopt [Equo Solstice OSGi and p2 shim](https://github.com/equodev/equo-ide/tree/main/solstice) to update all Eclipse-based plugins. ([#1524](https://github.com/diffplug/spotless/pull/1524))
   * Eclipse JDT now supports `4.9` through `4.26`. Also we now recommend dropping the last `.0`, e.g. `4.26` instead of `4.26.0`, you'll get warnings to help you switch.
+  * Eclipse Groovy now supports `4.18` through `4.26`. Also we now recommend dropping the last `.0`, e.g. `4.26` instead of `4.26.0`, you'll get warnings to help you switch.
 
 ## [2.36.0] - 2023-02-27
 ### Added

From 1d5888d58cc6e18ed69893948f7ce4befc3359fe Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 12 Mar 2023 23:45:50 -0700
Subject: [PATCH 0908/2068] Fix logging nonsense.

---
 .../spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java | 1 -
 .../java/com/diffplug/spotless/extra/EquoBasedStepBuilder.java | 1 -
 .../diffplug/spotless/extra/groovy/GrEclipseFormatterStep.java | 3 +--
 .../spotless/extra/groovy/GrEclipseFormatterStepTest.java      | 1 -
 4 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java b/lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java
index ded0ef56bd..0beb363b5a 100644
--- a/lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java
+++ b/lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java
@@ -42,7 +42,6 @@
 import org.eclipse.osgi.internal.location.EquinoxLocations;
 import org.eclipse.text.edits.TextEdit;
 import org.osgi.framework.Constants;
-import org.slf4j.LoggerFactory;
 
 import dev.equo.solstice.NestedJars;
 import dev.equo.solstice.ShimIdeBootstrapServices;
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 f4cea50275..2c3d083b1b 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
@@ -90,7 +90,6 @@ EquoBasedStepBuilder.State get() throws Exception {
 		var mavenDeps = new ArrayList<String>();
 		mavenDeps.add("dev.equo.ide:solstice:0.19.2");
 		mavenDeps.add("com.diffplug.durian:durian-swt.os:4.1.1");
-		mavenDeps.add("org.slf4j:slf4j-simple:1.7.36");
 		mavenDeps.addAll(query.getJarsOnMavenCentral());
 		classpath.addAll(mavenProvisioner.provisionWithTransitives(false, mavenDeps));
 		classpath.addAll(query.getJarsNotOnMavenCentral());
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 657399ffa2..08c28889f9 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
@@ -33,7 +33,6 @@ private GrEclipseFormatterStep() {}
 
 	private static final String NAME = "eclipse groovy formatter";
 	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "4.26");
-	private static final String FORMATTER_METHOD = "format";
 
 	public static String defaultVersion() {
 		return JVM_SUPPORT.getRecommendedFormatterVersion();
@@ -86,7 +85,7 @@ private static FormatterFunc apply(EquoBasedStepBuilder.State state) throws Exce
 		JVM_SUPPORT.assertFormatterSupported(state.getSemanticVersion());
 		Class<?> formatterClazz = state.getJarState().getClassLoader().loadClass("com.diffplug.spotless.extra.glue.groovy.GrEclipseFormatterStepImpl");
 		var formatter = formatterClazz.getConstructor(Properties.class).newInstance(state.getPreferences());
-		var method = formatterClazz.getMethod(FORMATTER_METHOD, String.class);
+		var method = formatterClazz.getMethod("format", String.class);
 		return JVM_SUPPORT.suggestLaterVersionOnError(state.getSemanticVersion(),
 				input -> {
 					try {
diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepTest.java
index 4121d49497..2bd68d0281 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepTest.java
@@ -29,7 +29,6 @@ public class GrEclipseFormatterStepTest extends EquoResourceHarness {
 
 	public GrEclipseFormatterStepTest() {
 		super(GrEclipseFormatterStep.createBuilder(TestProvisioner.mavenCentral()), INPUT, EXPECTED);
-		System.setProperty("org.gradle.logging.level", "info");
 	}
 
 	@ParameterizedTest

From a8db32b61ae6b3f760598c6dd1f97fdea1cf7d27 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 12 Mar 2023 23:57:55 -0700
Subject: [PATCH 0909/2068] Remove _ext/eclipse-cdt

---
 _ext/eclipse-cdt/CHANGES.md                   | 63 ------------
 _ext/eclipse-cdt/LICENSE.txt                  | 70 -------------
 _ext/eclipse-cdt/README.md                    | 10 --
 _ext/eclipse-cdt/build.gradle                 | 40 --------
 _ext/eclipse-cdt/gradle.properties            | 12 ---
 .../cdt/EclipseCdtFormatterStepImpl.java      | 74 --------------
 .../extra/eclipse/cdt/package-info.java       | 20 ----
 .../cdt/EclipseCdtFormatterStepImplTest.java  | 99 -------------------
 8 files changed, 388 deletions(-)
 delete mode 100644 _ext/eclipse-cdt/CHANGES.md
 delete mode 100644 _ext/eclipse-cdt/LICENSE.txt
 delete mode 100644 _ext/eclipse-cdt/README.md
 delete mode 100644 _ext/eclipse-cdt/build.gradle
 delete mode 100644 _ext/eclipse-cdt/gradle.properties
 delete mode 100644 _ext/eclipse-cdt/src/main/java/com/diffplug/spotless/extra/eclipse/cdt/EclipseCdtFormatterStepImpl.java
 delete mode 100644 _ext/eclipse-cdt/src/main/java/com/diffplug/spotless/extra/eclipse/cdt/package-info.java
 delete mode 100644 _ext/eclipse-cdt/src/test/java/com/diffplug/spotless/extra/eclipse/cdt/EclipseCdtFormatterStepImplTest.java

diff --git a/_ext/eclipse-cdt/CHANGES.md b/_ext/eclipse-cdt/CHANGES.md
deleted file mode 100644
index cda212bd3d..0000000000
--- a/_ext/eclipse-cdt/CHANGES.md
+++ /dev/null
@@ -1,63 +0,0 @@
-# spotless-eclipse-cdt
-
-We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `9.9.0`).
-
-## [Unreleased]
-### Fixed
-* Fix typo in gradle variable names ([#1425](https://github.com/diffplug/spotless/pull/1425))
-
-## [10.5.0] - 2021-12-13
-### Added
-* Switch to Eclipse CDT release 10.5 for Eclipse 2021-12.
-
-## [10.4.0] - 2021-09-23
-### Added
-* Switch to Eclipse CDT release 10.4 for Eclipse 4.21.
-
-## [10.3.0] - 2021-06-27
-### Added
-* Switch to Eclipse CDT release 10.3 for Eclipse 4.20.
-
-## [10.2.0] - 2021-06-07
-### Added
-* Switch to Eclipse CDT release 10.2 for Eclipse 4.19.
-
-## [10.1.0] - 2020-12-26
-### Added
-* Switch to Eclipse CDT release 10.1 for Eclipse 4.18.
-
-## [10.0.0] - 2020-10-17
-### Added
-* Switch to Eclipse CDT release 10.0 for Eclipse 4.17.
-* **BREAKING** Minimum required Java version changed from 8 to 11.
-
-## [9.11.0] - 2020-10-03
-### Added
-* Switch to Eclipse CDT release 9.11.1 for Eclipse 4.16.
-
-## [9.10.0] - 2020-09-25
-### Added
-* Switch to Eclipse CDT release 9.10 for Eclipse 4.14.
-
-## [9.9.0] - 2019-11-01
-* Switch to Eclipse CDT release 9.9 for Eclipse 4.13 ([#480](https://github.com/diffplug/spotless/issues/480)).
-
-## [9.8.1] - 2019-10-31
-* Really publish Eclipse CDT release 9.8 for Eclipse 4.12 ([#482](https://github.com/diffplug/spotless/pull/482)).
-
-## [9.8.0] - 2019-07-24
-* **Known bug** - we actually published Eclipse CDT 9.7 instead of 9.8 - fixed in 9.8.1
-* Switch to Eclipse CDT release 9.8 for Eclipse 4.12 ([#423](https://github.com/diffplug/spotless/pull/423)).
-
-## [9.7.0] - 2019-03-31
-* Switch to Eclipse CDT release 9.7 for Eclipse 4.11 ([#389](https://github.com/diffplug/spotless/pull/389)).
-* Include Eclipse logging allowing formatter warnings/errors to be logged via SLF4J ([#236](https://github.com/diffplug/spotless/issues/236)).
-
-## [9.4.5] - 2019-02-25
-* Replaced `http` update-site with `https` ([#360](https://github.com/diffplug/spotless/issues/360)).
-
-## [9.4.4] - 2018-09-04
-* Added missing log service, which caused exceptions on AST warnings ([#286](https://github.com/diffplug/spotless/pull/286)).
-
-## [9.4.3] - 2018-08-08
-* Initial release!
diff --git a/_ext/eclipse-cdt/LICENSE.txt b/_ext/eclipse-cdt/LICENSE.txt
deleted file mode 100644
index 3d967aee74..0000000000
--- a/_ext/eclipse-cdt/LICENSE.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-i) changes to the Program, and
-ii) additions to the Program;
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-b) its license agreement:
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-b) a copy of this Agreement must be included with each copy of the Program.
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
\ No newline at end of file
diff --git a/_ext/eclipse-cdt/README.md b/_ext/eclipse-cdt/README.md
deleted file mode 100644
index 842fbad606..0000000000
--- a/_ext/eclipse-cdt/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# spotless-eclipse-cdt
-
-Eclipse CDT is not available in a form which can be easily consumed by maven or gradle.  To fix this, we publish Eclipse's formatter and all its dependencies, along with a small amount of glue code, into the `com.diffplug.gradle.spotless:spotless-eclipse-cdt` artifact.
-
-To publish a new version, update the `_ext/eclipse-cdt/gradle.properties` appropriately and see [CONTRIBUTING.md](../../CONTRIBUTING.md) how to enable
-`_ext` projects.
-
-## License
-
-Spotless at large is under the Apache 2.0 license, but this jar is under the EPL v1.
diff --git a/_ext/eclipse-cdt/build.gradle b/_ext/eclipse-cdt/build.gradle
deleted file mode 100644
index 0982b7d555..0000000000
--- a/_ext/eclipse-cdt/build.gradle
+++ /dev/null
@@ -1,40 +0,0 @@
-ext {
-	developers = [
-		fvgh: [ name: 'Frank Vennemeyer', email: 'frankgh@zoho.com' ],
-	]
-
-	p2Repository = "https://download.eclipse.org/tools/cdt/releases/${VER_ECLIPSE_CDT}"
-
-	p2Dependencies = [
-		'org.eclipse.cdt.core':'+', // CodeFormatter and related
-	]
-
-}
-
-apply from: rootProject.file('_ext/gradle/update-lockfile.gradle')
-apply from: rootProject.file('_ext/gradle/p2-fat-jar-setup.gradle')
-apply from: rootProject.file('gradle/java-publish.gradle')
-
-
-dependencies {
-	implementation "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLIPSE_BASE}"
-	// Provides text partitioners for formatters
-	implementation ("org.eclipse.platform:org.eclipse.jface.text:${VER_ECLIPSE_JFACE}") {
-		exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt'
-	}
-	// Required to by CCorePlugin calling CDTLogWriter
-	implementation "com.ibm.icu:icu4j:${VER_IBM_ICU}"
-	// Required to by CCorePlugin calling PositionTrackerManager
-	implementation "org.eclipse.platform:org.eclipse.core.filebuffers:${VER_ECLIPSE_EFS}"
-
-	testImplementation("org.slf4j:slf4j-simple:${VER_SLF4J}")
-}
-
-
-//////////
-// Test //
-//////////
-sourceSets {
-	// Use JAR file with all resources for Eclipse-CDT integration-tests
-	test.runtimeClasspath = jar.outputs.files + sourceSets.test.output + sourceSets.test.compileClasspath
-}
diff --git a/_ext/eclipse-cdt/gradle.properties b/_ext/eclipse-cdt/gradle.properties
deleted file mode 100644
index 821ceea4d1..0000000000
--- a/_ext/eclipse-cdt/gradle.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-artifactId=spotless-eclipse-cdt
-description=Eclipse's CDT C/C++ formatter bundled for Spotless
-
-# Build requirements
-VER_JAVA=11
-
-# Compile dependencies
-VER_ECLIPSE_CDT=10.5
-VER_SPOTLESS_ECLIPSE_BASE=[3.5.0,4.0.0[
-VER_ECLIPSE_JFACE=[3.18.0,4.0.0[
-VER_ECLIPSE_EFS=[3.7.0,4.0.0[
-VER_IBM_ICU=[67.1,68[
diff --git a/_ext/eclipse-cdt/src/main/java/com/diffplug/spotless/extra/eclipse/cdt/EclipseCdtFormatterStepImpl.java b/_ext/eclipse-cdt/src/main/java/com/diffplug/spotless/extra/eclipse/cdt/EclipseCdtFormatterStepImpl.java
deleted file mode 100644
index 4482f3e752..0000000000
--- a/_ext/eclipse-cdt/src/main/java/com/diffplug/spotless/extra/eclipse/cdt/EclipseCdtFormatterStepImpl.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2016-2020 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.cdt;
-
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Properties;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import org.eclipse.cdt.core.CCorePlugin;
-import org.eclipse.cdt.core.formatter.CodeFormatter;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.text.edits.TextEdit;
-
-import com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseConfig;
-import com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseFramework;
-import com.diffplug.spotless.extra.eclipse.base.SpotlessEclipsePluginConfig;
-import com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseServiceConfig;
-
-/** Formatter step which calls out to the Eclipse CDT formatter. */
-public class EclipseCdtFormatterStepImpl {
-	private final CodeFormatter codeFormatter;
-
-	public EclipseCdtFormatterStepImpl(Properties settings) throws Exception {
-		SpotlessEclipseFramework.setup(new FrameworkConfig());
-		Stream<Entry<Object, Object>> stream = settings.entrySet().stream();
-		Map<String, String> settingsMap = stream.collect(Collectors.toMap(
-				e -> String.valueOf(e.getKey()),
-				e -> String.valueOf(e.getValue())));
-		codeFormatter = org.eclipse.cdt.core.ToolFactory.createDefaultCodeFormatter(settingsMap);
-	}
-
-	private static class FrameworkConfig implements SpotlessEclipseConfig {
-		@Override
-		public void registerServices(SpotlessEclipseServiceConfig config) {
-			config.applyDefault();
-			config.useSlf4J(EclipseCdtFormatterStepImpl.class.getPackage().getName());
-		}
-
-		@Override
-		public void activatePlugins(SpotlessEclipsePluginConfig config) {
-			config.applyDefault();
-			config.add(new CCorePlugin());
-		}
-	}
-
-	/** Formatting C/C++ string */
-	public String format(String raw) throws Exception {
-		//The 'kind' can be set to CodeFormatter.K_UNKNOWN, since it is anyway ignored by the internal formatter
-		TextEdit edit = codeFormatter.format(CodeFormatter.K_UNKNOWN, raw, 0, raw.length(), 0, SpotlessEclipseFramework.LINE_DELIMITER);
-		if (edit == null) {
-			throw new IllegalArgumentException("Invalid C/C++ syntax for formatting.");
-		} else {
-			IDocument doc = new Document(raw);
-			edit.apply(doc);
-			return doc.get();
-		}
-	}
-}
diff --git a/_ext/eclipse-cdt/src/main/java/com/diffplug/spotless/extra/eclipse/cdt/package-info.java b/_ext/eclipse-cdt/src/main/java/com/diffplug/spotless/extra/eclipse/cdt/package-info.java
deleted file mode 100644
index 831ab2b427..0000000000
--- a/_ext/eclipse-cdt/src/main/java/com/diffplug/spotless/extra/eclipse/cdt/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/** Eclipse CDT based Spotless formatter */
-@ParametersAreNonnullByDefault
-package com.diffplug.spotless.extra.eclipse.cdt;
-
-import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/_ext/eclipse-cdt/src/test/java/com/diffplug/spotless/extra/eclipse/cdt/EclipseCdtFormatterStepImplTest.java b/_ext/eclipse-cdt/src/test/java/com/diffplug/spotless/extra/eclipse/cdt/EclipseCdtFormatterStepImplTest.java
deleted file mode 100644
index 05637a4e22..0000000000
--- a/_ext/eclipse-cdt/src/test/java/com/diffplug/spotless/extra/eclipse/cdt/EclipseCdtFormatterStepImplTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright 2016-2021 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.cdt;
-
-import static com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseFramework.LINE_DELIMITER;
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.util.Properties;
-import java.util.function.Consumer;
-
-import org.eclipse.cdt.core.CCorePlugin;
-import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants;
-import org.junit.jupiter.api.Test;
-
-/** Eclipse CDT wrapper integration tests */
-class EclipseCdtFormatterStepImplTest {
-
-	private final static String CPP_UNFORMATTED = "#include <iostream>\n" +
-			"using namespace std;\n" +
-			"int main()\n{\n" +
-			"    cout <<\n\"Hello, World!\";\n" +
-			"    return 0;\n" +
-			"}".replaceAll("\n", LINE_DELIMITER);
-	private final static String CPP_FORMATTED = "#include <iostream>\n" +
-			"using namespace std;\n" +
-			"int main() {\n" +
-			"\tcout << \"Hello, World!\";\n" +
-			"\treturn 0;\n" +
-			"}\n".replaceAll("\n", LINE_DELIMITER);
-
-	private final static String DOXYGEN_HTML = "/**\n *<pre>void f() {int a =1;} </pre>\n */\n".replaceAll("\n", LINE_DELIMITER);
-
-	private final static String ILLEGAL_CHAR = Character.toString((char) 254);
-
-	private final static String FUNCT_PTR_UNFORMATTED = "void  (*getFunc(void))  (int);";
-	private final static String FUNCT_PTR_FORMATTED = "void (* getFunc(void)) (int);";
-
-	@Test
-	void defaultFormat() throws Throwable {
-		String output = format(CPP_UNFORMATTED, config -> {});
-		assertEquals(CPP_FORMATTED,
-				output, "Unexpected formatting with default preferences.");
-	}
-
-	@Test
-	void invalidFormat() throws Throwable {
-		String output = format(CPP_FORMATTED.replace("int main() {", "int main()  "), config -> {});
-		assertTrue(output.contains("int main()" + LINE_DELIMITER), "Incomplete CPP not formatted on best effort basis.");
-	}
-
-	@Test
-	void invalidCharater() throws Throwable {
-		String output = format(CPP_FORMATTED.replace("int main() {", "int main()" + ILLEGAL_CHAR + " {"), config -> {});
-		assertTrue(output.contains("int main()" + LINE_DELIMITER), "Invalid charater not formatted on best effort basis.");
-	}
-
-	@Test
-	void invalidConfiguration() throws Throwable {
-		String output = format(CPP_FORMATTED, config -> {
-			config.setProperty(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, CCorePlugin.SPACE);
-			config.setProperty(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "noInteger");
-		});
-		assertEquals(CPP_FORMATTED.replace("\t", "    "),
-				output, "Invalid indentation configuration not replaced by default value (4 spaces)");
-	}
-
-	@Test
-	void htmlCommentFormat() throws Throwable {
-		String output = format(DOXYGEN_HTML + CPP_FORMATTED, config -> {});
-		assertEquals(DOXYGEN_HTML + CPP_FORMATTED,
-				output, "HTML comments not ignored by formatter.");
-	}
-
-	@Test
-	void regionWarning() throws Throwable {
-		String output = format(FUNCT_PTR_UNFORMATTED, config -> {});
-		assertEquals(FUNCT_PTR_FORMATTED, output, "Code not formatted at all due to regional error.");
-	}
-
-	private static String format(final String input, final Consumer<Properties> config) throws Exception {
-		Properties properties = new Properties();
-		config.accept(properties);
-		EclipseCdtFormatterStepImpl formatter = new EclipseCdtFormatterStepImpl(properties);
-		return formatter.format(input);
-	}
-}

From 96a9017a6a68fdfdb48a7703f06816ca9d162e46 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 12 Mar 2023 23:58:08 -0700
Subject: [PATCH 0910/2068] Remove the cdt lockfiles.

---
 .../eclipse_cdt_formatter/v4.11.0.lockfile    | 21 ------------------
 .../eclipse_cdt_formatter/v4.12.0.lockfile    | 21 ------------------
 .../eclipse_cdt_formatter/v4.13.0.lockfile    | 21 ------------------
 .../eclipse_cdt_formatter/v4.14.0.lockfile    | 22 -------------------
 .../eclipse_cdt_formatter/v4.16.0.lockfile    | 22 -------------------
 .../eclipse_cdt_formatter/v4.17.0.lockfile    | 22 -------------------
 .../eclipse_cdt_formatter/v4.18.0.lockfile    | 22 -------------------
 .../eclipse_cdt_formatter/v4.19.0.lockfile    | 22 -------------------
 .../eclipse_cdt_formatter/v4.20.0.lockfile    | 22 -------------------
 .../eclipse_cdt_formatter/v4.21.0.lockfile    | 22 -------------------
 .../eclipse_cdt_formatter/v4.7.3a.lockfile    | 21 ------------------
 11 files changed, 238 deletions(-)
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.11.0.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.12.0.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.13.0.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.14.0.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.16.0.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.17.0.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.18.0.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.19.0.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.20.0.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.21.0.lockfile
 delete mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.7.3a.lockfile

diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.11.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.11.0.lockfile
deleted file mode 100644
index 7cad5634fe..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.11.0.lockfile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Spotless formatter based on CDT version 9.7.0 (see https://www.eclipse.org/cdt/)
-com.diffplug.spotless:spotless-eclipse-cdt:9.7.0
-com.diffplug.spotless:spotless-eclipse-base:3.1.1
-com.google.code.findbugs:annotations:3.0.0
-com.google.code.findbugs:jsr305:3.0.0
-com.ibm.icu:icu4j:61.1
-org.eclipse.platform:org.eclipse.core.commands:3.9.300
-org.eclipse.platform:org.eclipse.core.contenttype:3.7.300
-org.eclipse.platform:org.eclipse.core.filebuffers:3.6.500
-org.eclipse.platform:org.eclipse.core.filesystem:1.7.300
-org.eclipse.platform:org.eclipse.core.jobs:3.10.300
-org.eclipse.platform:org.eclipse.core.resources:3.13.300
-org.eclipse.platform:org.eclipse.core.runtime:3.15.200
-org.eclipse.platform:org.eclipse.equinox.app:1.4.100
-org.eclipse.platform:org.eclipse.equinox.common:3.10.300
-org.eclipse.platform:org.eclipse.equinox.preferences:3.7.300
-org.eclipse.platform:org.eclipse.equinox.registry:3.8.300
-org.eclipse.platform:org.eclipse.jface.text:3.15.100
-org.eclipse.platform:org.eclipse.jface:3.15.100
-org.eclipse.platform:org.eclipse.osgi:3.13.300
-org.eclipse.platform:org.eclipse.text:3.8.100
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.12.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.12.0.lockfile
deleted file mode 100644
index 6fd639528a..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.12.0.lockfile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Spotless formatter based on CDT version 9.8.0 (see https://www.eclipse.org/cdt/)
-com.diffplug.spotless:spotless-eclipse-cdt:9.8.1
-com.diffplug.spotless:spotless-eclipse-base:3.2.1
-com.google.code.findbugs:annotations:3.0.0
-com.google.code.findbugs:jsr305:3.0.0
-com.ibm.icu:icu4j:61.2
-org.eclipse.platform:org.eclipse.core.commands:3.9.400
-org.eclipse.platform:org.eclipse.core.contenttype:3.7.300
-org.eclipse.platform:org.eclipse.core.filebuffers:3.6.600
-org.eclipse.platform:org.eclipse.core.filesystem:1.7.400
-org.eclipse.platform:org.eclipse.core.jobs:3.10.400
-org.eclipse.platform:org.eclipse.core.resources:3.13.400
-org.eclipse.platform:org.eclipse.core.runtime:3.15.300
-org.eclipse.platform:org.eclipse.equinox.app:1.4.200
-org.eclipse.platform:org.eclipse.equinox.common:3.10.400
-org.eclipse.platform:org.eclipse.equinox.preferences:3.7.400
-org.eclipse.platform:org.eclipse.equinox.registry:3.8.400
-org.eclipse.platform:org.eclipse.jface.text:3.15.200
-org.eclipse.platform:org.eclipse.jface:3.16.0
-org.eclipse.platform:org.eclipse.osgi:3.14.0
-org.eclipse.platform:org.eclipse.text:3.8.200
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.13.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.13.0.lockfile
deleted file mode 100644
index 1d169ff087..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.13.0.lockfile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Spotless formatter based on CDT version 9.9.0 (see https://www.eclipse.org/cdt/)
-com.diffplug.spotless:spotless-eclipse-cdt:9.9.0
-com.diffplug.spotless:spotless-eclipse-base:3.2.1
-com.google.code.findbugs:annotations:3.0.0
-com.google.code.findbugs:jsr305:3.0.0
-com.ibm.icu:icu4j:61.2
-org.eclipse.platform:org.eclipse.core.commands:3.9.500
-org.eclipse.platform:org.eclipse.core.contenttype:3.7.400
-org.eclipse.platform:org.eclipse.core.filebuffers:3.6.700
-org.eclipse.platform:org.eclipse.core.filesystem:1.7.500
-org.eclipse.platform:org.eclipse.core.jobs:3.10.500
-org.eclipse.platform:org.eclipse.core.resources:3.13.500
-org.eclipse.platform:org.eclipse.core.runtime:3.16.0
-org.eclipse.platform:org.eclipse.equinox.app:1.4.300
-org.eclipse.platform:org.eclipse.equinox.common:3.10.500
-org.eclipse.platform:org.eclipse.equinox.preferences:3.7.500
-org.eclipse.platform:org.eclipse.equinox.registry:3.8.500
-org.eclipse.platform:org.eclipse.jface.text:3.15.300
-org.eclipse.platform:org.eclipse.jface:3.17.0
-org.eclipse.platform:org.eclipse.osgi:3.15.0
-org.eclipse.platform:org.eclipse.text:3.9.0
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.14.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.14.0.lockfile
deleted file mode 100644
index 43cb98774d..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.14.0.lockfile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Spotless formatter based on CDT version 9.10.0 (see https://www.eclipse.org/cdt/)
-com.diffplug.spotless:spotless-eclipse-cdt:9.10.0
-com.diffplug.spotless:spotless-eclipse-base:3.3.0
-com.github.spotbugs:spotbugs-annotations:4.0.2
-com.google.code.findbugs:jsr305:3.0.2
-com.ibm.icu:icu4j:64.2
-net.jcip:jcip-annotations:1.0
-org.eclipse.platform:org.eclipse.core.commands:3.9.600
-org.eclipse.platform:org.eclipse.core.contenttype:3.7.500
-org.eclipse.platform:org.eclipse.core.filebuffers:3.6.800
-org.eclipse.platform:org.eclipse.core.filesystem:1.7.600
-org.eclipse.platform:org.eclipse.core.jobs:3.10.600
-org.eclipse.platform:org.eclipse.core.resources:3.13.600
-org.eclipse.platform:org.eclipse.core.runtime:3.17.0
-org.eclipse.platform:org.eclipse.equinox.app:1.4.300
-org.eclipse.platform:org.eclipse.equinox.common:3.10.600
-org.eclipse.platform:org.eclipse.equinox.preferences:3.7.600
-org.eclipse.platform:org.eclipse.equinox.registry:3.8.600
-org.eclipse.platform:org.eclipse.jface.text:3.16.100
-org.eclipse.platform:org.eclipse.jface:3.18.0
-org.eclipse.platform:org.eclipse.osgi:3.15.100
-org.eclipse.platform:org.eclipse.text:3.10.0
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.16.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.16.0.lockfile
deleted file mode 100644
index 3bf6b1ca01..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.16.0.lockfile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Spotless formatter based on CDT version 9.11.1 (see https://www.eclipse.org/cdt/)
-com.diffplug.spotless:spotless-eclipse-cdt:9.11.0
-com.diffplug.spotless:spotless-eclipse-base:3.3.0
-com.github.spotbugs:spotbugs-annotations:4.0.2
-com.google.code.findbugs:jsr305:3.0.2
-com.google.j2objc:j2objc-annotations:1.3
-com.ibm.icu:icu4j:64.2
-org.eclipse.platform:org.eclipse.core.commands:3.9.700
-org.eclipse.platform:org.eclipse.core.contenttype:3.7.700
-org.eclipse.platform:org.eclipse.core.filebuffers:3.6.1000
-org.eclipse.platform:org.eclipse.core.filesystem:1.7.700
-org.eclipse.platform:org.eclipse.core.jobs:3.10.800
-org.eclipse.platform:org.eclipse.core.resources:3.13.700
-org.eclipse.platform:org.eclipse.core.runtime:3.18.0
-org.eclipse.platform:org.eclipse.equinox.app:1.4.500
-org.eclipse.platform:org.eclipse.equinox.common:3.12.0
-org.eclipse.platform:org.eclipse.equinox.preferences:3.8.0
-org.eclipse.platform:org.eclipse.equinox.registry:3.8.800
-org.eclipse.platform:org.eclipse.jface.text:3.16.300
-org.eclipse.platform:org.eclipse.jface:3.20.0
-org.eclipse.platform:org.eclipse.osgi:3.15.300
-org.eclipse.platform:org.eclipse.text:3.10.200
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.17.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.17.0.lockfile
deleted file mode 100644
index 78a6db147f..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.17.0.lockfile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Spotless formatter based on CDT version 10.0 (see https://www.eclipse.org/cdt/)
-com.diffplug.spotless:spotless-eclipse-cdt:10.0.0
-com.diffplug.spotless:spotless-eclipse-base:3.4.1
-com.github.spotbugs:spotbugs-annotations:4.0.2
-com.google.code.findbugs:jsr305:3.0.2
-com.ibm.icu:icu4j:64.2
-net.jcip:jcip-annotations:1.0
-org.eclipse.platform:org.eclipse.core.commands:3.9.700
-org.eclipse.platform:org.eclipse.core.contenttype:3.7.800
-org.eclipse.platform:org.eclipse.core.filebuffers:3.6.1000
-org.eclipse.platform:org.eclipse.core.filesystem:1.7.700
-org.eclipse.platform:org.eclipse.core.jobs:3.10.800
-org.eclipse.platform:org.eclipse.core.resources:3.13.800
-org.eclipse.platform:org.eclipse.core.runtime:3.19.0
-org.eclipse.platform:org.eclipse.equinox.app:1.5.0
-org.eclipse.platform:org.eclipse.equinox.common:3.13.0
-org.eclipse.platform:org.eclipse.equinox.preferences:3.8.0
-org.eclipse.platform:org.eclipse.equinox.registry:3.9.0
-org.eclipse.platform:org.eclipse.jface.text:3.16.400
-org.eclipse.platform:org.eclipse.jface:3.21.0
-org.eclipse.platform:org.eclipse.osgi:3.16.0
-org.eclipse.platform:org.eclipse.text:3.10.300
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.18.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.18.0.lockfile
deleted file mode 100644
index 7135a6826d..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.18.0.lockfile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Spotless formatter based on CDT version 10.1 (see https://www.eclipse.org/cdt/)
-com.diffplug.spotless:spotless-eclipse-cdt:10.1.0
-com.diffplug.spotless:spotless-eclipse-base:3.4.2
-com.github.spotbugs:spotbugs-annotations:4.0.2
-com.google.code.findbugs:jsr305:3.0.2
-com.ibm.icu:icu4j:64.2
-net.jcip:jcip-annotations:1.0
-org.eclipse.platform:org.eclipse.core.commands:3.9.800
-org.eclipse.platform:org.eclipse.core.contenttype:3.7.800
-org.eclipse.platform:org.eclipse.core.filebuffers:3.6.1100
-org.eclipse.platform:org.eclipse.core.filesystem:1.7.700
-org.eclipse.platform:org.eclipse.core.jobs:3.10.1000
-org.eclipse.platform:org.eclipse.core.resources:3.13.900
-org.eclipse.platform:org.eclipse.core.runtime:3.20.0
-org.eclipse.platform:org.eclipse.equinox.app:1.5.0
-org.eclipse.platform:org.eclipse.equinox.common:3.14.0
-org.eclipse.platform:org.eclipse.equinox.preferences:3.8.100
-org.eclipse.platform:org.eclipse.equinox.registry:3.10.0
-org.eclipse.platform:org.eclipse.jface.text:3.16.500
-org.eclipse.platform:org.eclipse.jface:3.22.0
-org.eclipse.platform:org.eclipse.osgi:3.16.100
-org.eclipse.platform:org.eclipse.text:3.10.400
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.19.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.19.0.lockfile
deleted file mode 100644
index 7c508e64bd..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.19.0.lockfile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Spotless formatter based on CDT version 10.2 (see https://www.eclipse.org/cdt/)
-com.diffplug.spotless:spotless-eclipse-cdt:10.2.0
-com.diffplug.spotless:spotless-eclipse-base:3.4.2
-com.github.spotbugs:spotbugs-annotations:4.0.2
-com.google.code.findbugs:jsr305:3.0.2
-com.ibm.icu:icu4j:67.1
-net.jcip:jcip-annotations:1.0
-org.eclipse.platform:org.eclipse.core.commands:3.9.800
-org.eclipse.platform:org.eclipse.core.contenttype:3.7.900
-org.eclipse.platform:org.eclipse.core.filebuffers:3.6.1100
-org.eclipse.platform:org.eclipse.core.filesystem:1.7.700
-org.eclipse.platform:org.eclipse.core.jobs:3.10.1100
-org.eclipse.platform:org.eclipse.core.resources:3.14.0
-org.eclipse.platform:org.eclipse.core.runtime:3.20.100
-org.eclipse.platform:org.eclipse.equinox.app:1.5.100
-org.eclipse.platform:org.eclipse.equinox.common:3.14.100
-org.eclipse.platform:org.eclipse.equinox.preferences:3.8.200
-org.eclipse.platform:org.eclipse.equinox.registry:3.10.100
-org.eclipse.platform:org.eclipse.jface.text:3.17.0
-org.eclipse.platform:org.eclipse.jface:3.22.100
-org.eclipse.platform:org.eclipse.osgi:3.16.200
-org.eclipse.platform:org.eclipse.text:3.11.0
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.20.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.20.0.lockfile
deleted file mode 100644
index 6cdb507d00..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.20.0.lockfile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Spotless formatter based on CDT version 10.3 (see https://www.eclipse.org/cdt/)
-com.diffplug.spotless:spotless-eclipse-cdt:10.3.0
-com.diffplug.spotless:spotless-eclipse-base:3.5.2
-com.github.spotbugs:spotbugs-annotations:4.0.2
-com.google.code.findbugs:jsr305:3.0.2
-com.ibm.icu:icu4j:67.1
-net.jcip:jcip-annotations:1.0
-org.eclipse.platform:org.eclipse.core.commands:3.10.0
-org.eclipse.platform:org.eclipse.core.contenttype:3.7.1000
-org.eclipse.platform:org.eclipse.core.filebuffers:3.7.0
-org.eclipse.platform:org.eclipse.core.filesystem:1.9.0
-org.eclipse.platform:org.eclipse.core.jobs:3.11.0
-org.eclipse.platform:org.eclipse.core.resources:3.15.0
-org.eclipse.platform:org.eclipse.core.runtime:3.22.0
-org.eclipse.platform:org.eclipse.equinox.app:1.5.100
-org.eclipse.platform:org.eclipse.equinox.common:3.15.0
-org.eclipse.platform:org.eclipse.equinox.preferences:3.8.200
-org.eclipse.platform:org.eclipse.equinox.registry:3.10.200
-org.eclipse.platform:org.eclipse.jface.text:3.18.0
-org.eclipse.platform:org.eclipse.jface:3.22.200
-org.eclipse.platform:org.eclipse.osgi:3.16.300
-org.eclipse.platform:org.eclipse.text:3.12.0
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.21.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.21.0.lockfile
deleted file mode 100644
index 4acd5a98ca..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.21.0.lockfile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Spotless formatter based on CDT version 10.4 (see https://www.eclipse.org/cdt/)
-com.diffplug.spotless:spotless-eclipse-cdt:10.4.0
-com.diffplug.spotless:spotless-eclipse-base:3.5.2
-com.github.spotbugs:spotbugs-annotations:4.0.2
-com.google.code.findbugs:jsr305:3.0.2
-com.ibm.icu:icu4j:67.1
-net.jcip:jcip-annotations:1.0
-org.eclipse.platform:org.eclipse.core.commands:3.10.100
-org.eclipse.platform:org.eclipse.core.contenttype:3.8.0
-org.eclipse.platform:org.eclipse.core.filebuffers:3.7.0
-org.eclipse.platform:org.eclipse.core.filesystem:1.9.100
-org.eclipse.platform:org.eclipse.core.jobs:3.12.0
-org.eclipse.platform:org.eclipse.core.resources:3.15.100
-org.eclipse.platform:org.eclipse.core.runtime:3.23.0
-org.eclipse.platform:org.eclipse.equinox.app:1.6.0
-org.eclipse.platform:org.eclipse.equinox.common:3.15.0
-org.eclipse.platform:org.eclipse.equinox.preferences:3.9.0
-org.eclipse.platform:org.eclipse.equinox.registry:3.11.0
-org.eclipse.platform:org.eclipse.jface.text:3.18.100
-org.eclipse.platform:org.eclipse.jface:3.23.0
-org.eclipse.platform:org.eclipse.osgi:3.17.0
-org.eclipse.platform:org.eclipse.text:3.12.0
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.7.3a.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.7.3a.lockfile
deleted file mode 100644
index 92a0d32cc7..0000000000
--- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.7.3a.lockfile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Spotless formatter based on CDT version 9.4.3 (see https://www.eclipse.org/cdt/)
-com.diffplug.spotless:spotless-eclipse-cdt:9.4.5
-com.diffplug.spotless:spotless-eclipse-base:3.1.1
-com.google.code.findbugs:annotations:3.0.0
-com.google.code.findbugs:jsr305:3.0.0
-com.ibm.icu:icu4j:61.1
-org.eclipse.platform:org.eclipse.core.commands:3.9.100
-org.eclipse.platform:org.eclipse.core.contenttype:3.7.0
-org.eclipse.platform:org.eclipse.core.filebuffers:3.6.200
-org.eclipse.platform:org.eclipse.core.filesystem:1.7.100
-org.eclipse.platform:org.eclipse.core.jobs:3.10.0
-org.eclipse.platform:org.eclipse.core.resources:3.13.0
-org.eclipse.platform:org.eclipse.core.runtime:3.14.0
-org.eclipse.platform:org.eclipse.equinox.app:1.3.500
-org.eclipse.platform:org.eclipse.equinox.common:3.10.0
-org.eclipse.platform:org.eclipse.equinox.preferences:3.7.100
-org.eclipse.platform:org.eclipse.equinox.registry:3.8.0
-org.eclipse.platform:org.eclipse.jface.text:3.13.0
-org.eclipse.platform:org.eclipse.jface:3.14.0
-org.eclipse.platform:org.eclipse.osgi:3.13.0
-org.eclipse.platform:org.eclipse.text:3.6.300

From 4b0e1fb865d7025b310941ae97416362eb421724 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 13 Mar 2023 00:10:06 -0700
Subject: [PATCH 0911/2068] Update EclipseCdtFormatterStep to Equo.

---
 lib-extra/build.gradle                        | 12 +++--
 .../glue/cdt/EclipseCdtFormatterStepImpl.java | 53 +++++++++++++++++++
 .../extra/cpp/EclipseCdtFormatterStep.java    | 46 ++++++++++------
 .../cpp/EclipseCdtFormatterStepTest.java      | 10 ++--
 4 files changed, 97 insertions(+), 24 deletions(-)
 create mode 100644 lib-extra/src/cdt/java/com/diffplug/spotless/extra/glue/cdt/EclipseCdtFormatterStepImpl.java

diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index 9506f9a2ad..73890dcdd1 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -41,7 +41,8 @@ tasks.withType(Test).configureEach {
 
 def NEEDS_P2_DEPS = [
 	'jdt',
-	'groovy'
+	'groovy',
+	'cdt'
 ]
 for (needsP2 in NEEDS_P2_DEPS) {
 	sourceSets.register(needsP2) {
@@ -72,13 +73,18 @@ p2deps {
 		install 'org.eclipse.jdt.core'
 	}
 	into 'groovyCompileOnly', {
-		p2repo 'https://download.eclipse.org/eclipse/updates/4.23/'
-		p2repo 'https://groovy.jfrog.io/artifactory/plugins-release/org/codehaus/groovy/groovy-eclipse-integration/4.8.0/e4.23/'
+		p2repo 'https://download.eclipse.org/eclipse/updates/4.26/'
+		p2repo 'https://groovy.jfrog.io/artifactory/plugins-release/org/codehaus/groovy/groovy-eclipse-integration/4.8.0/e4.26/'
 		install 'org.codehaus.groovy.eclipse.refactoring'
 		install 'org.codehaus.groovy.eclipse.core'
 		install 'org.eclipse.jdt.groovy.core'
 		install 'org.codehaus.groovy'
 	}
+	into 'cdtCompileOnly', {
+		p2repo 'https://download.eclipse.org/eclipse/updates/4.26/'
+		p2repo 'https://download.eclipse.org/tools/cdt/releases/11.0/'
+		install 'org.eclipse.cdt.core'
+	}
 }
 
 // we'll hold the core lib to a high standard
diff --git a/lib-extra/src/cdt/java/com/diffplug/spotless/extra/glue/cdt/EclipseCdtFormatterStepImpl.java b/lib-extra/src/cdt/java/com/diffplug/spotless/extra/glue/cdt/EclipseCdtFormatterStepImpl.java
new file mode 100644
index 0000000000..045860f535
--- /dev/null
+++ b/lib-extra/src/cdt/java/com/diffplug/spotless/extra/glue/cdt/EclipseCdtFormatterStepImpl.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2016-2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.extra.glue.cdt;
+
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Properties;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.eclipse.cdt.core.formatter.CodeFormatter;
+import org.eclipse.jface.text.Document;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.text.edits.TextEdit;
+
+/** Formatter step which calls out to the Eclipse CDT formatter. */
+public class EclipseCdtFormatterStepImpl {
+	private final CodeFormatter codeFormatter;
+
+	public EclipseCdtFormatterStepImpl(Properties settings) throws Exception {
+		Stream<Entry<Object, Object>> stream = settings.entrySet().stream();
+		Map<String, String> settingsMap = stream.collect(Collectors.toMap(
+				e -> String.valueOf(e.getKey()),
+				e -> String.valueOf(e.getValue())));
+		codeFormatter = org.eclipse.cdt.core.ToolFactory.createDefaultCodeFormatter(settingsMap);
+	}
+
+	/** Formatting C/C++ string */
+	public String format(String raw) throws Exception {
+		//The 'kind' can be set to CodeFormatter.K_UNKNOWN, since it is anyway ignored by the internal formatter
+		TextEdit edit = codeFormatter.format(CodeFormatter.K_UNKNOWN, raw, 0, raw.length(), 0, "\n");
+		if (edit == null) {
+			throw new IllegalArgumentException("Invalid C/C++ syntax for formatting.");
+		} else {
+			IDocument doc = new Document(raw);
+			edit.apply(doc);
+			return doc.get();
+		}
+	}
+}
diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java
index 4c2b06fc9a..003e438324 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,14 +15,15 @@
  */
 package com.diffplug.spotless.extra.cpp;
 
-import java.lang.reflect.Method;
+import java.lang.reflect.InvocationTargetException;
 import java.util.Properties;
 
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.Jvm;
 import com.diffplug.spotless.Provisioner;
-import com.diffplug.spotless.extra.EclipseBasedStepBuilder;
-import com.diffplug.spotless.extra.EclipseBasedStepBuilder.State;
+import com.diffplug.spotless.extra.EquoBasedStepBuilder;
+
+import dev.equo.solstice.p2.P2Model;
 
 /**
  * Formatter step which calls out to the Eclipse CDT formatter.
@@ -36,25 +37,40 @@ public final class EclipseCdtFormatterStep {
 	private EclipseCdtFormatterStep() {}
 
 	private static final String NAME = "eclipse cdt formatter";
-	private static final String FORMATTER_CLASS = "com.diffplug.spotless.extra.eclipse.cdt.EclipseCdtFormatterStepImpl";
-	private static final String FORMATTER_METHOD = "format";
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(8, "4.16.0").add(11, "4.21.0");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "11.0");
 
 	public static String defaultVersion() {
 		return JVM_SUPPORT.getRecommendedFormatterVersion();
 	}
 
 	/** Provides default configuration */
-	public static EclipseBasedStepBuilder createBuilder(Provisioner provisioner) {
-		return new EclipseBasedStepBuilder(NAME, provisioner, EclipseCdtFormatterStep::apply);
+	public static EquoBasedStepBuilder createBuilder(Provisioner provisioner) {
+		return new EquoBasedStepBuilder(NAME, provisioner, EclipseCdtFormatterStep::apply) {
+			@Override
+			protected P2Model model(String version) {
+				var model = new P2Model();
+				addPlatformRepo(model, "4.26");
+				model.addP2Repo("https://download.eclipse.org/tools/cdt/releases/" + version + "/");
+				model.getInstall().add("org.eclipse.cdt.core");
+				return model;
+			}
+		};
 	}
 
-	private static FormatterFunc apply(State state) throws Exception {
+	private static FormatterFunc apply(EquoBasedStepBuilder.State state) throws Exception {
 		JVM_SUPPORT.assertFormatterSupported(state.getSemanticVersion());
-		Class<?> formatterClazz = state.loadClass(FORMATTER_CLASS);
-		Object formatter = formatterClazz.getConstructor(Properties.class).newInstance(state.getPreferences());
-		Method method = formatterClazz.getMethod(FORMATTER_METHOD, String.class);
-		return JVM_SUPPORT.suggestLaterVersionOnError(state.getSemanticVersion(), input -> (String) method.invoke(formatter, input));
+		Class<?> formatterClazz = state.getJarState().getClassLoader().loadClass("com.diffplug.spotless.extra.glue.cdt.EclipseCdtFormatterStepImpl");
+		var formatter = formatterClazz.getConstructor(Properties.class).newInstance(state.getPreferences());
+		var method = formatterClazz.getMethod("format", String.class);
+		return JVM_SUPPORT.suggestLaterVersionOnError(state.getSemanticVersion(),
+				input -> {
+					try {
+						return (String) method.invoke(formatter, input);
+					} catch (InvocationTargetException exceptionWrapper) {
+						Throwable throwable = exceptionWrapper.getTargetException();
+						Exception exception = (throwable instanceof Exception) ? (Exception) throwable : null;
+						throw (null == exception) ? exceptionWrapper : exception;
+					}
+				});
 	}
-
 }
diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStepTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStepTest.java
index f39673cdc8..9ed9f2f227 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStepTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,12 +20,10 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import com.diffplug.spotless.Jvm;
 import com.diffplug.spotless.TestProvisioner;
-import com.diffplug.spotless.extra.eclipse.EclipseResourceHarness;
+import com.diffplug.spotless.extra.eclipse.EquoResourceHarness;
 
-class EclipseCdtFormatterStepTest extends EclipseResourceHarness {
-	private final static Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support("Oldest Version").add(8, "4.11.0");
+class EclipseCdtFormatterStepTest extends EquoResourceHarness {
 	private final static String INPUT = "#include <a.h>;\nint main(int argc,   \nchar *argv[]) {}";
 	private final static String EXPECTED = "#include <a.h>;\nint main(int argc, char *argv[]) {\n}\n";
 
@@ -40,6 +38,6 @@ void formatWithVersion(String version) throws Exception {
 	}
 
 	private static Stream<String> formatWithVersion() {
-		return Stream.of(JVM_SUPPORT.getRecommendedFormatterVersion(), EclipseCdtFormatterStep.defaultVersion());
+		return Stream.of("10.6", "10.7", EclipseCdtFormatterStep.defaultVersion());
 	}
 }

From c534ed9f51611700217b01af1b384ffc71a55362 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 13 Mar 2023 00:10:19 -0700
Subject: [PATCH 0912/2068] Update the plugins for EclipseCdt to Equo.

---
 .../java/com/diffplug/gradle/spotless/CppExtension.java     | 6 +++---
 .../java/com/diffplug/spotless/maven/cpp/EclipseCdt.java    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java
index 64dabc9ca5..a08dc07d05 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 import org.gradle.api.Project;
 
 import com.diffplug.spotless.cpp.CppDefaults;
-import com.diffplug.spotless.extra.EclipseBasedStepBuilder;
+import com.diffplug.spotless.extra.EquoBasedStepBuilder;
 import com.diffplug.spotless.extra.cpp.EclipseCdtFormatterStep;
 
 public class CppExtension extends FormatExtension implements HasBuiltinDelimiterForLicense {
@@ -42,7 +42,7 @@ public EclipseConfig eclipseCdt(String version) {
 	}
 
 	public class EclipseConfig {
-		private final EclipseBasedStepBuilder builder;
+		private final EquoBasedStepBuilder builder;
 
 		EclipseConfig(String version) {
 			builder = EclipseCdtFormatterStep.createBuilder(provisioner());
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/cpp/EclipseCdt.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/cpp/EclipseCdt.java
index 78484abfba..a92e7b2423 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/cpp/EclipseCdt.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/cpp/EclipseCdt.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 import org.apache.maven.plugins.annotations.Parameter;
 
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.extra.EclipseBasedStepBuilder;
+import com.diffplug.spotless.extra.EquoBasedStepBuilder;
 import com.diffplug.spotless.extra.cpp.EclipseCdtFormatterStep;
 import com.diffplug.spotless.maven.FormatterStepConfig;
 import com.diffplug.spotless.maven.FormatterStepFactory;
@@ -36,7 +36,7 @@ public class EclipseCdt implements FormatterStepFactory {
 
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
-		EclipseBasedStepBuilder eclipseConfig = EclipseCdtFormatterStep.createBuilder(stepConfig.getProvisioner());
+		EquoBasedStepBuilder eclipseConfig = EclipseCdtFormatterStep.createBuilder(stepConfig.getProvisioner());
 		eclipseConfig.setVersion(version == null ? EclipseCdtFormatterStep.defaultVersion() : version);
 		if (null != file) {
 			File settingsFile = stepConfig.getFileLocator().locateFile(file);

From 9da4348bf152897549efdb7e6efdb10e718e5e01 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 13 Mar 2023 00:15:25 -0700
Subject: [PATCH 0913/2068] Fix spotbugs.

---
 .../spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java b/lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java
index 0beb363b5a..9549847d74 100644
--- a/lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java
+++ b/lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java
@@ -103,7 +103,7 @@ public String format(String raw) throws Exception {
 	/**
 	 * Eclipse Groovy formatter does not signal problems by its return value, but by logging errors.
 	 */
-	private static class GroovyErrorListener implements ILogListener, IGroovyLogger {
+	private static final class GroovyErrorListener implements ILogListener, IGroovyLogger {
 		private final List<String> errors;
 
 		public GroovyErrorListener() {

From b7610d79f64851509a880c5d68a74b5c5178b19c Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 13 Mar 2023 00:15:38 -0700
Subject: [PATCH 0914/2068] Add Eclipse CDT to the changelog.

---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index 3295ef5013..8bf28910e2 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,6 +15,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Adopt [Equo Solstice OSGi and p2 shim](https://github.com/equodev/equo-ide/tree/main/solstice) to update all Eclipse-based plugins. ([#1524](https://github.com/diffplug/spotless/pull/1524))
   * Eclipse JDT now supports `4.9` through `4.26`. Also we now recommend dropping the last `.0`, e.g. `4.26` instead of `4.26.0`, you'll get warnings to help you switch.
   * Eclipse Groovy now supports `4.18` through `4.26`. Also we now recommend dropping the last `.0`, e.g. `4.26` instead of `4.26.0`, you'll get warnings to help you switch.
+  * Eclipse CDT now supports `10.6` through `11.0`.
 
 ## [2.36.0] - 2023-02-27
 ### Added

From f93fccc9d05906adec452f1d521e4936f0db0789 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 13 Mar 2023 00:26:10 -0700
Subject: [PATCH 0915/2068] Correct Eclipse CDT jvm requirements.

---
 lib-extra/build.gradle                                          | 2 +-
 .../diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index 73890dcdd1..d2d6542a52 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -82,7 +82,7 @@ p2deps {
 	}
 	into 'cdtCompileOnly', {
 		p2repo 'https://download.eclipse.org/eclipse/updates/4.26/'
-		p2repo 'https://download.eclipse.org/tools/cdt/releases/11.0/'
+		p2repo 'https://download.eclipse.org/tools/cdt/releases/10.7/'
 		install 'org.eclipse.cdt.core'
 	}
 }
diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java
index 003e438324..1a83389eaa 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java
@@ -37,7 +37,7 @@ public final class EclipseCdtFormatterStep {
 	private EclipseCdtFormatterStep() {}
 
 	private static final String NAME = "eclipse cdt formatter";
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "11.0");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "10.7").add(17, "11.0");
 
 	public static String defaultVersion() {
 		return JVM_SUPPORT.getRecommendedFormatterVersion();

From 25fc723a6a2585c0fcfe8edf7e95fdfcedb7ea6f Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 13 Mar 2023 01:45:48 -0700
Subject: [PATCH 0916/2068] Update readmes.

---
 plugin-gradle/README.md | 9 ++++-----
 plugin-maven/README.md  | 6 +++---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 267136e4ac..aa312e76ed 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -213,7 +213,7 @@ spotless {
   java {
     eclipse()
     // optional: you can specify a specific version and/or config file
-    eclipse('4.17').configFile('eclipse-prefs.xml')
+    eclipse('4.26').configFile('eclipse-prefs.xml')
 ```
 
 
@@ -325,9 +325,8 @@ spotless {
   groovy {
     // Use the default version and Groovy-Eclipse default configuration
     greclipse()
-    // optional: you can specify a specific version or config file(s)
-    // compatible versions: https://github.com/diffplug/spotless/tree/main/lib-extra/src/main/resources/com/diffplug/spotless/extra/groovy_eclipse_formatter
-    greclipse('2.3.0').configFile('spotless.eclipseformat.xml', 'org.codehaus.groovy.eclipse.ui.prefs')
+    // optional: you can specify a specific version or config file(s), version matches the Eclipse Platform
+    greclipse('4.26').configFile('spotless.eclipseformat.xml', 'org.codehaus.groovy.eclipse.ui.prefs')
 ```
 
 Groovy-Eclipse formatting errors/warnings lead per default to a build failure. This behavior can be changed by adding the property/key value `ignoreFormatterProblems=true` to a configuration file. In this scenario, files causing problems, will not be modified by this formatter step.
@@ -993,7 +992,7 @@ spotless {
   format 'xml', {
     target 'src/**/*.xml' // must specify target
     eclipseWtp('xml')     // must specify a type (table below)
-    eclipseWtp('xml', '4.13.0') // optional version
+    eclipseWtp('xml', '11.0') // optional version, others at https://download.eclipse.org/tools/cdt/releases/
     // you can also specify an arbitrary number of config files
     eclipseWtp('xml').configFile('spotless.xml.prefs', 'spotless.common.properties'
   }
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 4af6308b89..340da9ae9f 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -237,7 +237,7 @@ any other maven phase (i.e. compile) then it can be configured as below;
 
 ```xml
 <eclipse>
-  <version>4.21.0</version>                     <!-- optional version of Eclipse Formatter -->
+  <version>4.26</version>                     <!-- optional version of Eclipse Formatter -->
   <file>${project.basedir}/eclipse-formatter.xml</file> <!-- optional -->
 </eclipse>
 ```
@@ -331,7 +331,7 @@ These mechanisms already exist for the Gradle plugin.
 
 ```xml
 <greclipse>
-  <version>4.21.0</version>                     <!-- optional version of Eclipse Formatter -->
+  <version>4.26</version>  <!-- optional version of Eclipse Formatter -->
   <file>${project.basedir}/greclipse.properties</file> <!-- optional -->
 </greclipse>
 ```
@@ -481,7 +481,7 @@ Additionally, `editorConfigOverride` options will override what's supplied in `.
 
 ```xml
 <eclipseCdt>
-  <version>4.21.0</version>               <!-- optional version of Eclipse Formatter -->
+  <version>11.0</version> <!-- optional version of Eclipse Formatter, others at https://download.eclipse.org/tools/cdt/releases/ -->
   <file>${project.basedir}/eclipse-cdt.xml</file> <!-- optional -->
 </eclipseCdt>
 ```

From 3ab4c97e36a056638ad8a4966bd1f1d727aa106f Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 13 Mar 2023 01:46:12 -0700
Subject: [PATCH 0917/2068] Update changelog to reflect that WTP is still
 in-progress.

---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index 478b6cbde0..580a3b0d76 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -18,6 +18,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
   * Eclipse JDT now supports `4.9` through `4.26`. Also we now recommend dropping the last `.0`, e.g. `4.26` instead of `4.26.0`, you'll get warnings to help you switch.
   * Eclipse Groovy now supports `4.18` through `4.26`. Also we now recommend dropping the last `.0`, e.g. `4.26` instead of `4.26.0`, you'll get warnings to help you switch.
   * Eclipse CDT now supports `10.6` through `11.0`.
+  * Eclipse WTP is still WIP at [#1622](https://github.com/diffplug/spotless/pull/1622).
 
 ## [2.36.0] - 2023-02-27
 ### Added

From 73d7ed2a2bfe9eebb0f5ea06be13c37e4f9fc925 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 13 Mar 2023 01:52:51 -0700
Subject: [PATCH 0918/2068] Update plugin changelogs.

---
 plugin-gradle/CHANGES.md | 7 +++++++
 plugin-maven/CHANGES.md  | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index f3e5276d53..76fc2a9de9 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -6,6 +6,13 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * You can now put the filename into a license header template with `$FILE`. ([#1605](https://github.com/diffplug/spotless/pull/1605) fixes [#1147](https://github.com/diffplug/spotless/issues/1147))
 * `licenseHeader` default pattern for Java files is updated to `(package|import|public|class|module) `. ([#1614](https://github.com/diffplug/spotless/pull/1614))
+### Changes
+* All Eclipse formatters are now based on [Equo Solstice OSGi and p2 shim](https://github.com/equodev/equo-ide/tree/main/solstice). ([#1524](https://github.com/diffplug/spotless/pull/1524))
+  * Eclipse JDT bumped default to `4.26` from `4.21`, oldest supported is `4.9`.
+    * We now recommend dropping the last `.0`, e.g. `4.26` instead of `4.26.0`, you'll get warnings to help you switch.
+  * Eclipse Groovy bumped default to `4.26` from `4.21`, oldest supported is `4.18`.
+  * Eclipse CDT bumped default to `11.0` from `4.21`, oldest supported is `10.6`.
+  * Eclipse WTP is still WIP at [#1622](https://github.com/diffplug/spotless/pull/1622).
 
 ## [6.16.0] - 2023-02-27
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index f65f5e61d4..f324dda349 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -9,6 +9,12 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * `licenseHeader` default pattern for Java files is updated to `(package|import|public|class|module) `. ([#1614](https://github.com/diffplug/spotless/pull/1614))
 ### Changes
 * Enable incremental up-to-date checking by default. ([#1621](https://github.com/diffplug/spotless/pull/1621))
+* All Eclipse formatters are now based on [Equo Solstice OSGi and p2 shim](https://github.com/equodev/equo-ide/tree/main/solstice). ([#1524](https://github.com/diffplug/spotless/pull/1524))
+  * Eclipse JDT bumped default to `4.26` from `4.21`, oldest supported is `4.9`.
+    * We now recommend dropping the last `.0`, e.g. `4.26` instead of `4.26.0`, you'll get warnings to help you switch.
+  * Eclipse Groovy bumped default to `4.26` from `4.21`, oldest supported is `4.18`.
+  * Eclipse CDT bumped default to `11.0` from `4.21`, oldest supported is `10.6`.
+  * Eclipse WTP is still WIP at [#1622](https://github.com/diffplug/spotless/pull/1622).
 
 ## [2.34.0] - 2023-02-27
 ### Added

From cd2faeb0f70580a011972b052f174bf50cc9743c Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 13 Mar 2023 02:22:44 -0700
Subject: [PATCH 0919/2068] Bump Solstice to 1.0

---
 lib-extra/build.gradle                                          | 2 +-
 .../java/com/diffplug/spotless/extra/EquoBasedStepBuilder.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index d2d6542a52..491531f0c7 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -7,7 +7,7 @@ version = rootProject.spotlessChangelog.versionNext
 apply from: rootProject.file('gradle/java-setup.gradle')
 apply from: rootProject.file('gradle/java-publish.gradle')
 
-String VER_SOLSTICE = '0.19.2'
+String VER_SOLSTICE = '1.0.0'
 dependencies {
 	api project(':lib')
 	// misc useful utilities
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 2c3d083b1b..5283321cec 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
@@ -88,7 +88,7 @@ EquoBasedStepBuilder.State get() throws Exception {
 		var query = model(formatterVersion).query(P2ClientCache.PREFER_OFFLINE, P2QueryCache.ALLOW);
 		var classpath = new ArrayList<File>();
 		var mavenDeps = new ArrayList<String>();
-		mavenDeps.add("dev.equo.ide:solstice:0.19.2");
+		mavenDeps.add("dev.equo.ide:solstice:1.0.0");
 		mavenDeps.add("com.diffplug.durian:durian-swt.os:4.1.1");
 		mavenDeps.addAll(query.getJarsOnMavenCentral());
 		classpath.addAll(mavenProvisioner.provisionWithTransitives(false, mavenDeps));

From d807cf7a60b78f4d23de89128239e5e281aef6f1 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 13 Mar 2023 02:22:53 -0700
Subject: [PATCH 0920/2068] Bump build plugins to latest.

---
 build.gradle    | 5 +----
 settings.gradle | 2 ++
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6755d486c0..c51f73751c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,4 @@
-plugins {
-	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
-	id 'dev.equo.ide'                          version '0.17.1'
-}
+apply plugin: 'dev.equo.ide'
 equoIde {
 	branding().title('Spotless').icon(file('_images/spotless_logo.png'))
 	welcome().openUrl('https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md')
diff --git a/settings.gradle b/settings.gradle
index cf200a94f6..683692b6ec 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -24,6 +24,8 @@ plugins {
 	id 'io.github.davidburstrom.version-compatibility' version '0.4.0' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.enterprise
 	id 'com.gradle.enterprise' version '3.12.4'
+	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
+	id 'dev.equo.ide' version '0.17.2' apply false
 }
 
 dependencyResolutionManagement {

From a16b3a94c1fe85901267c7bb999115cc8cafcd24 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 13 Mar 2023 02:38:49 -0700
Subject: [PATCH 0921/2068] Try to fix publishing.

---
 .github/workflows/deploy.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index e692fe8735..f139032cf6 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -51,18 +51,18 @@ jobs:
       - name: publish all
         if: "${{ github.event.inputs.to_publish == 'all' }}"
         run: |
-          ./gradlew :changelogPush -Prelease=true --stacktrace --warning-mode all
-          ./gradlew :plugin-gradle:changelogPush -Prelease=true -Pgradle.publish.key=${{ secrets.GRADLE_KEY }} -Pgradle.publish.secret=${{ secrets.GRADLE_SECRET }} --stacktrace --warning-mode all
-          ./gradlew :plugin-maven:changelogPush -Prelease=true --stacktrace --warning-mode all
+          ./gradlew :changelogPush -Prelease=true --stacktrace --warning-mode all --no-configuration-cache
+          ./gradlew :plugin-gradle:changelogPush -Prelease=true -Pgradle.publish.key=${{ secrets.GRADLE_KEY }} -Pgradle.publish.secret=${{ secrets.GRADLE_SECRET }} --stacktrace --warning-mode all --no-configuration-cache
+          ./gradlew :plugin-maven:changelogPush -Prelease=true --stacktrace --warning-mode all --no-configuration-cache
       - name: publish just plugin-gradle
         if: "${{ github.event.inputs.to_publish == 'plugin-gradle' }}"
         run: |
-          ./gradlew :plugin-gradle:changelogPush -Prelease=true -Pgradle.publish.key=${{ secrets.GRADLE_KEY }} -Pgradle.publish.secret=${{ secrets.GRADLE_SECRET }} --stacktrace --warning-mode all
+          ./gradlew :plugin-gradle:changelogPush -Prelease=true -Pgradle.publish.key=${{ secrets.GRADLE_KEY }} -Pgradle.publish.secret=${{ secrets.GRADLE_SECRET }} --stacktrace --warning-mode all --no-configuration-cache
       - name: publish just plugin-maven
         if: "${{ github.event.inputs.to_publish == 'plugin-maven' }}"
         run: |
-          ./gradlew :plugin-maven:changelogPush -Prelease=true --stacktrace --warning-mode all
+          ./gradlew :plugin-maven:changelogPush -Prelease=true --stacktrace --warning-mode all --no-configuration-cache
       - name: publish just lib
         if: "${{ github.event.inputs.to_publish == 'lib' }}"
         run: |
-          ./gradlew :changelogPush -Prelease=true --stacktrace --warning-mode all
+          ./gradlew :changelogPush -Prelease=true --stacktrace --warning-mode all --no-configuration-cache

From b7eacad78e4a480b6900a4a65e5ddc0f7b609f1b Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az408-963.stwldmxhcooebg1zjdtrde3oze.gx.internal.cloudapp.net>
Date: Mon, 13 Mar 2023 09:42:07 +0000
Subject: [PATCH 0922/2068] Published lib/2.37.0

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 580a3b0d76..c0deba72dc 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.37.0] - 2023-03-13
 ### Added
 * You can now put the filename into a license header template with `$FILE`. ([#1605](https://github.com/diffplug/spotless/pull/1605) fixes [#1147](https://github.com/diffplug/spotless/issues/1147))
 ### Changes

From b39508f378f12213e8cca95b38db02c4bf37e17d Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az408-963.stwldmxhcooebg1zjdtrde3oze.gx.internal.cloudapp.net>
Date: Mon, 13 Mar 2023 09:43:41 +0000
Subject: [PATCH 0923/2068] Published gradle/6.17.0

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 50 ++++++++++++++++++++--------------------
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 76fc2a9de9..2c85978621 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [6.17.0] - 2023-03-13
 ### Added
 * You can now put the filename into a license header template with `$FILE`. ([#1605](https://github.com/diffplug/spotless/pull/1605) fixes [#1147](https://github.com/diffplug/spotless/issues/1147))
 * `licenseHeader` default pattern for Java files is updated to `(package|import|public|class|module) `. ([#1614](https://github.com/diffplug/spotless/pull/1614))
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index aa312e76ed..fffdb38518 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -14,9 +14,9 @@ output = [
   ].join('\n');
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
-[![Changelog](https://img.shields.io/badge/changelog-6.16.0-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-6.17.0-blue.svg)](CHANGES.md)
 [![Maven central](https://img.shields.io/badge/mavencentral-here-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/index.html)
 
 [![VS Code plugin](https://img.shields.io/badge/IDE-VS_Code-blueviolet.svg)](https://marketplace.visualstudio.com/items?itemName=richardwillis.vscode-spotless-gradle)
 [![IntelliJ plugin](https://img.shields.io/badge/IDE-IntelliJ-blueviolet.svg)](https://plugins.jetbrains.com/plugin/18321-spotless-gradle)
@@ -123,10 +123,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -138,7 +138,7 @@ If you're stuck on an older version of Gradle, `id 'com.diffplug.gradle.spotless
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -282,8 +282,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -333,8 +333,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -405,7 +405,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -437,7 +437,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -469,7 +469,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -503,7 +503,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -524,7 +524,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -549,7 +549,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -589,7 +589,7 @@ sql.formatter.indent.size=4
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -682,7 +682,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## Javascript
 
-- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
+- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
 
 ```gradle
 spotless {
@@ -746,7 +746,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -821,7 +821,7 @@ spotless {
 
 ## YAML
 
-- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
+- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
 
 ```gradle
 spotless {
@@ -1048,7 +1048,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -1121,9 +1121,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -1156,11 +1156,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.16.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From 124487befbe70f15cd52a2fab5fb4c40d7e0ae1a Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az408-963.stwldmxhcooebg1zjdtrde3oze.gx.internal.cloudapp.net>
Date: Mon, 13 Mar 2023 09:45:25 +0000
Subject: [PATCH 0924/2068] Published maven/2.35.0

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index f324dda349..33e85b9f26 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.35.0] - 2023-03-13
 ### Added
 * You can now put the filename into a license header template with `$FILE`. ([#1605](https://github.com/diffplug/spotless/pull/1605) fixes [#1147](https://github.com/diffplug/spotless/issues/1147))
 ### Fixed
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 340da9ae9f..6d13bc87f3 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -8,8 +8,8 @@ output = [
   ].join('\n');
 -->
 [![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Changelog](https://img.shields.io/badge/changelog-2.34.0-blue.svg)](CHANGES.md)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.34.0/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.35.0-blue.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.35.0/index.html)
 <!---freshmark /shields -->
 
 <!---freshmark javadoc

From 057ba18f5a7d9ed0dcaf50f4ca9f22864a42bee5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 13 Mar 2023 13:33:15 +0000
Subject: [PATCH 0925/2068] chore(deps): update plugin com.diffplug.spotless to
 v6.17.0

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 683692b6ec..cef059b2eb 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-	id 'com.diffplug.spotless' version '6.16.0' apply false
+	id 'com.diffplug.spotless' version '6.17.0' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
 	id 'com.gradle.plugin-publish' version '1.1.0' apply false
 	// https://github.com/gradle-nexus/publish-plugin/releases

From 76e27780cddc4bfcaeccc67a19272d76b2b1e1c7 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 13 Mar 2023 10:24:57 -0700
Subject: [PATCH 0926/2068] New Groovy formatter has slightly different
 formatting than the old one.

---
 settings.gradle | 1 -
 1 file changed, 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index cef059b2eb..62f28d12c9 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -92,7 +92,6 @@ def getStartProperty(java.lang.String name) {
 		userProperties.load(userPropertiesFile.newReader())
 	}
 	return userProperties.get(name)
-
 }
 
 if (System.getenv('SPOTLESS_EXCLUDE_MAVEN') != 'true' && getStartProperty('SPOTLESS_EXCLUDE_MAVEN') != 'true') {

From 6ce212dbc8d5b5e55427c1ae90ae6f7032f52afd Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 13 Mar 2023 16:01:18 -0700
Subject: [PATCH 0927/2068] Update EquoIDE to versions to latest.

---
 lib-extra/build.gradle | 2 +-
 settings.gradle        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index 491531f0c7..8ed36bede6 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -7,7 +7,7 @@ version = rootProject.spotlessChangelog.versionNext
 apply from: rootProject.file('gradle/java-setup.gradle')
 apply from: rootProject.file('gradle/java-publish.gradle')
 
-String VER_SOLSTICE = '1.0.0'
+String VER_SOLSTICE = '1.0.3'
 dependencies {
 	api project(':lib')
 	// misc useful utilities
diff --git a/settings.gradle b/settings.gradle
index 62f28d12c9..51c338b188 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -25,7 +25,7 @@ plugins {
 	// https://plugins.gradle.org/plugin/com.gradle.enterprise
 	id 'com.gradle.enterprise' version '3.12.4'
 	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
-	id 'dev.equo.ide' version '0.17.2' apply false
+	id 'dev.equo.ide' version '1.0.1' apply false
 }
 
 dependencyResolutionManagement {

From bec3b442f671a07f34714ab1a6cb0646277e83a6 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 13 Mar 2023 16:01:29 -0700
Subject: [PATCH 0928/2068] Update to the new "manual" autoImport.

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index c51f73751c..0ae84bd9c4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'dev.equo.ide'
 equoIde {
 	branding().title('Spotless').icon(file('_images/spotless_logo.png'))
 	welcome().openUrl('https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md')
-	gradleBuildship()
+	gradleBuildship().autoImport('.')
 }
 
 repositories {

From 8b24b220ffc5722c60fa9956f6023d92d30bd856 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 28 Feb 2023 20:55:40 +0100
Subject: [PATCH 0929/2068] use compile-only sourceset for gjf

---
 lib/build.gradle                              |  16 +-
 .../java/GoogleJavaFormatFormatterFunc.java   |  71 +++++++++
 ...rmatRemoveUnusedImporterFormatterFunc.java |  43 ++++++
 .../glue/java/GoogleJavaFormatUtils.java      |  54 +++++++
 .../spotless/java/GoogleJavaFormatStep.java   | 144 ++----------------
 .../glue/java/GoogleJavaFormatUtilsTest.java  |  63 ++++++++
 .../java/GoogleJavaFormatStepTest.java        |  40 -----
 7 files changed, 258 insertions(+), 173 deletions(-)
 create mode 100644 lib/src/googleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatFormatterFunc.java
 create mode 100644 lib/src/googleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatRemoveUnusedImporterFormatterFunc.java
 create mode 100644 lib/src/googleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatUtils.java
 create mode 100644 lib/src/testGoogleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatUtilsTest.java

diff --git a/lib/build.gradle b/lib/build.gradle
index 9a6e7913d5..e939f7249e 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -10,6 +10,7 @@ apply from: rootProject.file('gradle/java-publish.gradle')
 def NEEDS_GLUE = [
 	'sortPom',
 	'palantirJavaFormat',
+	'googleJavaFormat',
 	'ktfmt',
 	'ktlint',
 	'flexmark',
@@ -20,11 +21,21 @@ def NEEDS_GLUE = [
 	'cleanthat'
 ]
 for (glue in NEEDS_GLUE) {
-	sourceSets.register(glue) {
+	// main glue
+	def mainGlue = sourceSets.register(glue) {
 		compileClasspath += sourceSets.main.output
 		runtimeClasspath += sourceSets.main.output
 		java {}
 	}
+	// test glue
+	sourceSets.register("test${glue.capitalize()}") {
+		compileClasspath += mainGlue.get().compileClasspath + mainGlue.get().output + sourceSets.test.output
+		runtimeClasspath += mainGlue.get().compileClasspath + mainGlue.get().output + sourceSets.test.output
+		java {}
+	}
+	configurations.named("test${glue.capitalize()}Implementation").configure {
+		extendsFrom(configurations.named("testImplementation").get())
+	}
 }
 
 versionCompatibility {
@@ -70,6 +81,9 @@ dependencies {
 
 	palantirJavaFormatCompileOnly 'com.palantir.javaformat:palantir-java-format:1.1.0' 	// this version needs to stay compilable against Java 8 for CI Job testNpm
 
+	googleJavaFormatCompileOnly 'com.google.googlejavaformat:google-java-format:1.8' // minimum required version for jdk 11
+	testGoogleJavaFormatImplementation "com.diffplug.durian:durian-core:$VER_DURIAN"
+
 	// used jackson-based formatters
 	jacksonCompileOnly 'com.fasterxml.jackson.core:jackson-databind:2.14.2'
 	jacksonCompileOnly 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.14.2'
diff --git a/lib/src/googleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatFormatterFunc.java b/lib/src/googleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatFormatterFunc.java
new file mode 100644
index 0000000000..a326cf1f69
--- /dev/null
+++ b/lib/src/googleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatFormatterFunc.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.glue.java;
+
+import static com.diffplug.spotless.glue.java.GoogleJavaFormatUtils.fixWindowsBug;
+
+import java.util.Objects;
+
+import javax.annotation.Nonnull;
+
+import com.google.googlejavaformat.java.Formatter;
+import com.google.googlejavaformat.java.FormatterException;
+import com.google.googlejavaformat.java.ImportOrderer;
+import com.google.googlejavaformat.java.JavaFormatterOptions;
+import com.google.googlejavaformat.java.RemoveUnusedImports;
+import com.google.googlejavaformat.java.StringWrapper;
+
+import com.diffplug.spotless.FormatterFunc;
+
+public class GoogleJavaFormatFormatterFunc implements FormatterFunc {
+
+	@Nonnull
+	private final Formatter formatter;
+
+	@Nonnull
+	private final String version;
+	@Nonnull
+	private final JavaFormatterOptions.Style formatterStyle;
+	private final boolean reflowStrings;
+
+	public GoogleJavaFormatFormatterFunc(@Nonnull String version, @Nonnull String style, boolean reflowStrings) {
+		this.version = Objects.requireNonNull(version);
+		this.formatterStyle = JavaFormatterOptions.Style.valueOf(Objects.requireNonNull(style));
+		this.reflowStrings = reflowStrings;
+
+		this.formatter = new Formatter(JavaFormatterOptions.builder()
+				.style(formatterStyle)
+				.build());
+	}
+
+	@Override
+	@Nonnull
+	public String apply(@Nonnull String input) throws Exception {
+		String formatted = formatter.formatSource(input);
+		String removedUnused = RemoveUnusedImports.removeUnusedImports(formatted);
+		String sortedImports = ImportOrderer.reorderImports(removedUnused, formatterStyle);
+		String reflowedLongStrings = reflowLongStrings(sortedImports);
+		return fixWindowsBug(reflowedLongStrings, version);
+	}
+
+	private String reflowLongStrings(String input) throws FormatterException {
+		if (reflowStrings) {
+			return StringWrapper.wrap(input, formatter);
+		} else {
+			return input;
+		}
+	}
+}
diff --git a/lib/src/googleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatRemoveUnusedImporterFormatterFunc.java b/lib/src/googleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatRemoveUnusedImporterFormatterFunc.java
new file mode 100644
index 0000000000..0073ce9dc9
--- /dev/null
+++ b/lib/src/googleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatRemoveUnusedImporterFormatterFunc.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.glue.java;
+
+import static com.diffplug.spotless.glue.java.GoogleJavaFormatUtils.fixWindowsBug;
+
+import java.util.Objects;
+
+import javax.annotation.Nonnull;
+
+import com.google.googlejavaformat.java.RemoveUnusedImports;
+
+import com.diffplug.spotless.FormatterFunc;
+
+public class GoogleJavaFormatRemoveUnusedImporterFormatterFunc implements FormatterFunc {
+
+	@Nonnull
+	private final String version;
+
+	public GoogleJavaFormatRemoveUnusedImporterFormatterFunc(@Nonnull String version) {
+		this.version = Objects.requireNonNull(version);
+	}
+
+	@Override
+	@Nonnull
+	public String apply(@Nonnull String input) throws Exception {
+		String removedUnused = RemoveUnusedImports.removeUnusedImports(input);
+		return fixWindowsBug(removedUnused, version);
+	}
+}
diff --git a/lib/src/googleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatUtils.java b/lib/src/googleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatUtils.java
new file mode 100644
index 0000000000..98f47a6097
--- /dev/null
+++ b/lib/src/googleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatUtils.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.glue.java;
+
+import com.diffplug.spotless.LineEnding;
+
+public class GoogleJavaFormatUtils {
+
+	private static final boolean IS_WINDOWS = LineEnding.PLATFORM_NATIVE.str().equals("\r\n");
+
+	/**
+	 * google-java-format-1.1's removeUnusedImports does *wacky* stuff on Windows.
+	 * The beauty of normalizing all line endings to unix!
+	 */
+	static String fixWindowsBug(String input, String version) {
+		if (IS_WINDOWS && version.equals("1.1")) {
+			int firstImport = input.indexOf("\nimport ");
+			if (firstImport == 0) {
+				return input;
+			} else if (firstImport > 0) {
+				int numToTrim = 0;
+				char prevChar;
+				do {
+					++numToTrim;
+					prevChar = input.charAt(firstImport - numToTrim);
+				} while (Character.isWhitespace(prevChar) && (firstImport - numToTrim) > 0);
+				if (firstImport - numToTrim == 0) {
+					// import was the very first line, and we'd like to maintain a one-line gap
+					++numToTrim;
+				} else if (prevChar == ';' || prevChar == '/') {
+					// import came after either license or a package declaration
+					--numToTrim;
+				}
+				if (numToTrim > 0) {
+					return input.substring(0, firstImport - numToTrim + 2) + input.substring(firstImport + 1);
+				}
+			}
+		}
+		return input;
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
index 6390c619a9..9a3b49c095 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,17 +16,14 @@
 package com.diffplug.spotless.java;
 
 import java.io.Serializable;
-import java.lang.reflect.Method;
+import java.lang.reflect.Constructor;
 import java.util.Objects;
 
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Jvm;
-import com.diffplug.spotless.LineEnding;
 import com.diffplug.spotless.Provisioner;
-import com.diffplug.spotless.ThrowingEx.BiFunction;
-import com.diffplug.spotless.ThrowingEx.Function;
 
 /** Wraps up <a href="https://github.com/google/google-java-format">google-java-format</a> as a FormatterStep. */
 public class GoogleJavaFormatStep {
@@ -37,27 +34,6 @@ private GoogleJavaFormatStep() {}
 	private static final boolean DEFAULT_REFLOW_LONG_STRINGS = false;
 	static final String NAME = "google-java-format";
 	static final String MAVEN_COORDINATE = "com.google.googlejavaformat:google-java-format";
-	static final String FORMATTER_CLASS = "com.google.googlejavaformat.java.Formatter";
-	static final String FORMATTER_METHOD = "formatSource";
-
-	private static final String OPTIONS_CLASS = "com.google.googlejavaformat.java.JavaFormatterOptions";
-	private static final String OPTIONS_BUILDER_METHOD = "builder";
-	private static final String OPTIONS_BUILDER_CLASS = "com.google.googlejavaformat.java.JavaFormatterOptions$Builder";
-	private static final String OPTIONS_BUILDER_STYLE_METHOD = "style";
-	private static final String OPTIONS_BUILDER_BUILD_METHOD = "build";
-	private static final String OPTIONS_Style = "com.google.googlejavaformat.java.JavaFormatterOptions$Style";
-
-	private static final String REMOVE_UNUSED_CLASS = "com.google.googlejavaformat.java.RemoveUnusedImports";
-	private static final String REMOVE_UNUSED_METHOD = "removeUnusedImports";
-
-	private static final String REMOVE_UNUSED_IMPORT_JavadocOnlyImports = "com.google.googlejavaformat.java.RemoveUnusedImports$JavadocOnlyImports";
-	private static final String REMOVE_UNUSED_IMPORT_JavadocOnlyImports_Keep = "KEEP";
-
-	private static final String IMPORT_ORDERER_CLASS = "com.google.googlejavaformat.java.ImportOrderer";
-	private static final String IMPORT_ORDERER_METHOD = "reorderImports";
-
-	private static final String STRING_WRAPPER_CLASS = "com.google.googlejavaformat.java.StringWrapper";
-	private static final String STRING_WRAPPER_METHOD = "wrap";
 
 	/** Creates a step which formats everything - code, import order, and unused imports. */
 	public static FormatterStep create(Provisioner provisioner) {
@@ -93,7 +69,7 @@ public static FormatterStep create(String groupArtifact, String version, String
 				State::createFormat);
 	}
 
-	static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(8, "1.7").add(11, "1.15.0");
+	static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "1.15.0");
 
 	public static String defaultGroupArtifact() {
 		return MAVEN_COORDINATE;
@@ -144,120 +120,24 @@ static final class State implements Serializable {
 			this.reflowLongStrings = reflowLongStrings;
 		}
 
-		@SuppressWarnings({"unchecked", "rawtypes"})
 		FormatterFunc createFormat() throws Exception {
-			ClassLoader classLoader = jarState.getClassLoader();
-
-			// instantiate the formatter and get its format method
-			Class<?> optionsClass = classLoader.loadClass(OPTIONS_CLASS);
-			Class<?> optionsBuilderClass = classLoader.loadClass(OPTIONS_BUILDER_CLASS);
-			Method optionsBuilderMethod = optionsClass.getMethod(OPTIONS_BUILDER_METHOD);
-			Object optionsBuilder = optionsBuilderMethod.invoke(null);
-
-			Class<?> optionsStyleClass = classLoader.loadClass(OPTIONS_Style);
-			Object styleConstant = Enum.valueOf((Class<Enum>) optionsStyleClass, style);
-			Method optionsBuilderStyleMethod = optionsBuilderClass.getMethod(OPTIONS_BUILDER_STYLE_METHOD, optionsStyleClass);
-			optionsBuilderStyleMethod.invoke(optionsBuilder, styleConstant);
-
-			Method optionsBuilderBuildMethod = optionsBuilderClass.getMethod(OPTIONS_BUILDER_BUILD_METHOD);
-			Object options = optionsBuilderBuildMethod.invoke(optionsBuilder);
-
-			Class<?> formatterClazz = classLoader.loadClass(FORMATTER_CLASS);
-			Object formatter = formatterClazz.getConstructor(optionsClass).newInstance(options);
-			Method formatterMethod = formatterClazz.getMethod(FORMATTER_METHOD, String.class);
+			final ClassLoader classLoader = jarState.getClassLoader();
+			Class<?> formatterFunc = classLoader.loadClass("com.diffplug.spotless.glue.java.GoogleJavaFormatFormatterFunc");
+			Constructor<?> constructor = formatterFunc.getConstructor(String.class, String.class, boolean.class);
+			FormatterFunc googleJavaFormatFormatterFunc = (FormatterFunc) constructor.newInstance(version, style, reflowLongStrings);
 
-			Function<String, String> removeUnused = constructRemoveUnusedFunction(classLoader);
-
-			Class<?> importOrdererClass = classLoader.loadClass(IMPORT_ORDERER_CLASS);
-			Method importOrdererMethod = importOrdererClass.getMethod(IMPORT_ORDERER_METHOD, String.class);
-
-			BiFunction<String, Object, String> reflowLongStrings = this.reflowLongStrings ? constructReflowLongStringsFunction(classLoader, formatterClazz) : (s, f) -> s;
-
-			return JVM_SUPPORT.suggestLaterVersionOnError(version, (input -> {
-				String formatted = (String) formatterMethod.invoke(formatter, input);
-				String removedUnused = removeUnused.apply(formatted);
-				String sortedImports = (String) importOrdererMethod.invoke(null, removedUnused);
-				String reflowedLongStrings = reflowLongStrings.apply(sortedImports, formatter);
-				return fixWindowsBug(reflowedLongStrings, version);
-			}));
+			return JVM_SUPPORT.suggestLaterVersionOnError(version, googleJavaFormatFormatterFunc);
 		}
 
 		FormatterFunc createRemoveUnusedImportsOnly() throws Exception {
 			ClassLoader classLoader = jarState.getClassLoader();
-			Function<String, String> removeUnused = constructRemoveUnusedFunction(classLoader);
-			return JVM_SUPPORT.suggestLaterVersionOnError(version, (input -> fixWindowsBug(removeUnused.apply(input), version)));
-		}
-
-		private static Function<String, String> constructRemoveUnusedFunction(ClassLoader classLoader)
-				throws NoSuchMethodException, ClassNotFoundException {
-			Class<?> removeUnusedClass = classLoader.loadClass(REMOVE_UNUSED_CLASS);
-			Class<?> removeJavadocOnlyClass;
-			try {
-				// google-java-format 1.7 or lower
-				removeJavadocOnlyClass = classLoader.loadClass(REMOVE_UNUSED_IMPORT_JavadocOnlyImports);
-			} catch (ClassNotFoundException e) {
-				// google-java-format 1.8+
-				removeJavadocOnlyClass = null;
-			}
+			Class<?> formatterFunc = classLoader.loadClass("com.diffplug.spotless.glue.java.GoogleJavaFormatRemoveUnusedImporterFormatterFunc");
+			Constructor<?> constructor = formatterFunc.getConstructor(String.class); //version
+			FormatterFunc googleJavaFormatRemoveUnusedImporterFormatterFunc = (FormatterFunc) constructor.newInstance(version);
 
-			Function<String, String> removeUnused;
-			if (removeJavadocOnlyClass != null) {
-				@SuppressWarnings({"unchecked", "rawtypes"})
-				Object removeJavadocConstant = Enum.valueOf((Class<Enum>) removeJavadocOnlyClass, REMOVE_UNUSED_IMPORT_JavadocOnlyImports_Keep);
-				Method removeUnusedMethod = removeUnusedClass.getMethod(REMOVE_UNUSED_METHOD, String.class, removeJavadocOnlyClass);
-				removeUnused = (x) -> (String) removeUnusedMethod.invoke(null, x, removeJavadocConstant);
-			} else {
-				Method removeUnusedMethod = removeUnusedClass.getMethod(REMOVE_UNUSED_METHOD, String.class);
-				removeUnused = (x) -> (String) removeUnusedMethod.invoke(null, x);
-			}
-			return removeUnused;
+			return JVM_SUPPORT.suggestLaterVersionOnError(version, googleJavaFormatRemoveUnusedImporterFormatterFunc);
 		}
 
-		private static BiFunction<String, Object, String> constructReflowLongStringsFunction(ClassLoader classLoader, Class<?> formatterClazz) throws NoSuchMethodException {
-			Class<?> stringWrapperClass;
-			try {
-				stringWrapperClass = classLoader.loadClass(STRING_WRAPPER_CLASS);
-			} catch (ClassNotFoundException e) {
-				// google-java-format 1.7 or lower, which happen to be LATEST_VERSION_JRE_8, so rely on suggestJre11 for the error
-				return (s, f) -> {
-					throw e;
-				};
-			}
-			Method stringWrapperMethod = stringWrapperClass.getMethod(STRING_WRAPPER_METHOD, String.class, formatterClazz);
-			return (s, f) -> (String) stringWrapperMethod.invoke(null, s, f);
-		}
 	}
 
-	private static final boolean IS_WINDOWS = LineEnding.PLATFORM_NATIVE.str().equals("\r\n");
-
-	/**
-	 * google-java-format-1.1's removeUnusedImports does *wacky* stuff on Windows.
-	 * The beauty of normalizing all line endings to unix!
-	 */
-	static String fixWindowsBug(String input, String version) {
-		if (IS_WINDOWS && version.equals("1.1")) {
-			int firstImport = input.indexOf("\nimport ");
-			if (firstImport == 0) {
-				return input;
-			} else if (firstImport > 0) {
-				int numToTrim = 0;
-				char prevChar;
-				do {
-					++numToTrim;
-					prevChar = input.charAt(firstImport - numToTrim);
-				} while (Character.isWhitespace(prevChar) && (firstImport - numToTrim) > 0);
-				if (firstImport - numToTrim == 0) {
-					// import was the very first line, and we'd like to maintain a one-line gap
-					++numToTrim;
-				} else if (prevChar == ';' || prevChar == '/') {
-					// import came after either license or a package declaration
-					--numToTrim;
-				}
-				if (numToTrim > 0) {
-					return input.substring(0, firstImport - numToTrim + 2) + input.substring(firstImport + 1);
-				}
-			}
-		}
-		return input;
-	}
 }
diff --git a/lib/src/testGoogleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatUtilsTest.java b/lib/src/testGoogleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatUtilsTest.java
new file mode 100644
index 0000000000..a6403c18a0
--- /dev/null
+++ b/lib/src/testGoogleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatUtilsTest.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.glue.java;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import com.diffplug.common.base.StringPrinter;
+
+public class GoogleJavaFormatUtilsTest {
+
+	@Test
+	void fixWindowsBugForGfj1Point1() {
+		fixWindowsBugTestcase("");
+		fixWindowsBugTestcase(
+				"",
+				"import somepackage;",
+				"");
+		fixWindowsBugTestcase(
+				"import somepackage;",
+				"",
+				"public class SomeClass {}");
+		fixWindowsBugTestcase(
+				"/** Some license */",
+				"import somepackage;",
+				"",
+				"public class SomeClass {}");
+		fixWindowsBugTestcase(
+				"package thispackage;",
+				"",
+				"import somepackage;",
+				"",
+				"public class SomeClass {}");
+		fixWindowsBugTestcase(
+				"/*",
+				" * A License.",
+				" */",
+				"",
+				"package thispackage;",
+				"",
+				"import somepackage;",
+				"",
+				"public class SomeClass {}");
+	}
+
+	private void fixWindowsBugTestcase(String... lines) {
+		String input = StringPrinter.buildStringFromLines(lines);
+		Assertions.assertEquals(input, GoogleJavaFormatUtils.fixWindowsBug(input, "1.1"));
+	}
+}
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java
index ff64b574e1..e2f15360f5 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java
@@ -18,11 +18,9 @@
 import static org.junit.jupiter.api.condition.JRE.JAVA_13;
 import static org.junit.jupiter.api.condition.JRE.JAVA_15;
 
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledForJreRange;
 
-import com.diffplug.common.base.StringPrinter;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.Jvm;
 import com.diffplug.spotless.ResourceHarness;
@@ -147,42 +145,4 @@ protected FormatterStep create() {
 		}.testEquals();
 	}
 
-	@Test
-	void fixWindowsBugForGfj1Point1() {
-		fixWindowsBugTestcase("");
-		fixWindowsBugTestcase(
-				"",
-				"import somepackage;",
-				"");
-		fixWindowsBugTestcase(
-				"import somepackage;",
-				"",
-				"public class SomeClass {}");
-		fixWindowsBugTestcase(
-				"/** Some license */",
-				"import somepackage;",
-				"",
-				"public class SomeClass {}");
-		fixWindowsBugTestcase(
-				"package thispackage;",
-				"",
-				"import somepackage;",
-				"",
-				"public class SomeClass {}");
-		fixWindowsBugTestcase(
-				"/*",
-				" * A License.",
-				" */",
-				"",
-				"package thispackage;",
-				"",
-				"import somepackage;",
-				"",
-				"public class SomeClass {}");
-	}
-
-	private void fixWindowsBugTestcase(String... lines) {
-		String input = StringPrinter.buildStringFromLines(lines);
-		Assertions.assertEquals(input, GoogleJavaFormatStep.fixWindowsBug(input, "1.1"));
-	}
 }

From 30ef0d44e21f5a5ac7756eb700544075b99e5020 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Sat, 4 Mar 2023 20:28:11 +0100
Subject: [PATCH 0930/2068] check minimum required formatter version

(we would need to implement specific glue code for older versions)
---
 .../main/java/com/diffplug/spotless/Jvm.java  | 89 +++++++++++++------
 .../spotless/java/GoogleJavaFormatStep.java   |  4 +-
 2 files changed, 66 insertions(+), 27 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/Jvm.java b/lib/src/main/java/com/diffplug/spotless/Jvm.java
index c9c71b72df..fe8dc3e7a1 100644
--- a/lib/src/main/java/com/diffplug/spotless/Jvm.java
+++ b/lib/src/main/java/com/diffplug/spotless/Jvm.java
@@ -63,8 +63,9 @@ public static int version() {
 	public static class Support<V> {
 		private final String fmtName;
 		private final Comparator<? super V> fmtVersionComparator;
-		private final NavigableMap<Integer, V> jvm2fmtVersion;
-		private final NavigableMap<V, Integer> fmt2jvmVersion;
+		private final NavigableMap<Integer, V> jvm2fmtMaxVersion;
+		private final NavigableMap<Integer, V> jvm2fmtMinVersion;
+		private final NavigableMap<V, Integer> fmtMaxVersion2jvmVersion;
 
 		private Support(String fromatterName) {
 			this(fromatterName, new SemanticVersionComparator<V>());
@@ -73,40 +74,60 @@ private Support(String fromatterName) {
 		private Support(String formatterName, Comparator<? super V> formatterVersionComparator) {
 			fmtName = formatterName;
 			fmtVersionComparator = formatterVersionComparator;
-			jvm2fmtVersion = new TreeMap<Integer, V>();
-			fmt2jvmVersion = new TreeMap<V, Integer>(formatterVersionComparator);
+			jvm2fmtMaxVersion = new TreeMap<>();
+			jvm2fmtMinVersion = new TreeMap<>();
+			fmtMaxVersion2jvmVersion = new TreeMap<>(formatterVersionComparator);
 		}
 
 		/**
-		 * Add supported formatter version
+		 * Add maximum supported formatter version
 		 * @param minimumJvmVersion Minimum Java version required
 		 * @param maxFormatterVersion Maximum formatter version supported by the Java version
 		 * @return this
 		 */
 		public Support<V> add(int minimumJvmVersion, V maxFormatterVersion) {
 			Objects.requireNonNull(maxFormatterVersion);
-			if (null != jvm2fmtVersion.put(minimumJvmVersion, maxFormatterVersion)) {
+			if (null != jvm2fmtMaxVersion.put(minimumJvmVersion, maxFormatterVersion)) {
 				throw new IllegalArgumentException(String.format("Added duplicate entry for JVM %d+.", minimumJvmVersion));
 			}
-			if (null != fmt2jvmVersion.put(maxFormatterVersion, minimumJvmVersion)) {
+			if (null != fmtMaxVersion2jvmVersion.put(maxFormatterVersion, minimumJvmVersion)) {
 				throw new IllegalArgumentException(String.format("Added duplicate entry for formatter version %s.", maxFormatterVersion));
 			}
+			verifyVersionRangesDoNotIntersect(jvm2fmtMaxVersion, minimumJvmVersion, maxFormatterVersion);
+			return this;
+		}
+
+		public Support<V> addMin(int minimumJvmVersion, V minFormatterVersion) {
+			Objects.requireNonNull(minFormatterVersion);
+			if (null != jvm2fmtMinVersion.put(minimumJvmVersion, minFormatterVersion)) {
+				throw new IllegalArgumentException(String.format("Added duplicate entry for JVM %d+.", minimumJvmVersion));
+			}
+			verifyVersionRangesDoNotIntersect(jvm2fmtMinVersion, minimumJvmVersion, minFormatterVersion);
+			return this;
+		}
+
+		private void verifyVersionRangesDoNotIntersect(NavigableMap<Integer, V> jvm2fmtVersion, int minimumJvmVersion, V formatterVersion) {
 			Map.Entry<Integer, V> lower = jvm2fmtVersion.lowerEntry(minimumJvmVersion);
-			if ((null != lower) && (fmtVersionComparator.compare(maxFormatterVersion, lower.getValue()) <= 0)) {
-				throw new IllegalArgumentException(String.format("%d/%s should be lower than %d/%s", minimumJvmVersion, maxFormatterVersion, lower.getKey(), lower.getValue()));
+			if ((null != lower) && (fmtVersionComparator.compare(formatterVersion, lower.getValue()) <= 0)) {
+				throw new IllegalArgumentException(String.format("%d/%s should be lower than %d/%s", minimumJvmVersion, formatterVersion, lower.getKey(), lower.getValue()));
 			}
 			Map.Entry<Integer, V> higher = jvm2fmtVersion.higherEntry(minimumJvmVersion);
-			if ((null != higher) && (fmtVersionComparator.compare(maxFormatterVersion, higher.getValue()) >= 0)) {
-				throw new IllegalArgumentException(String.format("%d/%s should be higher than %d/%s", minimumJvmVersion, maxFormatterVersion, higher.getKey(), higher.getValue()));
+			if ((null != higher) && (fmtVersionComparator.compare(formatterVersion, higher.getValue()) >= 0)) {
+				throw new IllegalArgumentException(String.format("%d/%s should be higher than %d/%s", minimumJvmVersion, formatterVersion, higher.getKey(), higher.getValue()));
 			}
-			return this;
 		}
 
 		/** @return Highest formatter version recommended for this JVM (null, if JVM not supported) */
 		@Nullable
 		public V getRecommendedFormatterVersion() {
-			Integer configuredJvmVersionOrNull = jvm2fmtVersion.floorKey(Jvm.version());
-			return (null == configuredJvmVersionOrNull) ? null : jvm2fmtVersion.get(configuredJvmVersionOrNull);
+			Integer configuredJvmVersionOrNull = jvm2fmtMaxVersion.floorKey(Jvm.version());
+			return (null == configuredJvmVersionOrNull) ? null : jvm2fmtMaxVersion.get(configuredJvmVersionOrNull);
+		}
+
+		@Nullable
+		public V getMinimumRequiredFormatterVersion() {
+			Integer configuredJvmVersionOrNull = jvm2fmtMinVersion.floorKey(Jvm.version());
+			return (null == configuredJvmVersionOrNull) ? null : jvm2fmtMinVersion.get(configuredJvmVersionOrNull);
 		}
 
 		/**
@@ -123,10 +144,17 @@ public void assertFormatterSupported(V formatterVersion) {
 		}
 
 		private String buildUnsupportedFormatterMessage(V fmtVersion) {
+			// check if the jvm version is to low for the formatter version
 			int requiredJvmVersion = getRequiredJvmVersion(fmtVersion);
 			if (Jvm.version() < requiredJvmVersion) {
 				return buildUpgradeJvmMessage(fmtVersion) + "Upgrade your JVM or try " + toString();
 			}
+			// check if the formatter version is too low for the jvm version
+			V minimumFormatterVersion = getMinimumRequiredFormatterVersion();
+			if ((null != minimumFormatterVersion) && (fmtVersionComparator.compare(fmtVersion, minimumFormatterVersion) < 0)) {
+				return String.format("You are running Spotless on JVM %d, which requires %s of at least %s (you are using %s).%n", Jvm.version(), fmtName, minimumFormatterVersion, fmtVersion);
+			}
+			// otherwise all is well
 			return "";
 		}
 
@@ -137,7 +165,7 @@ private String buildUpgradeJvmMessage(V fmtVersion) {
 			if (null != recommendedFmtVersionOrNull) {
 				builder.append(String.format(", which limits you to %s %s.%n", fmtName, recommendedFmtVersionOrNull));
 			} else {
-				Entry<V, Integer> nextFmtVersionOrNull = fmt2jvmVersion.ceilingEntry(fmtVersion);
+				Entry<V, Integer> nextFmtVersionOrNull = fmtMaxVersion2jvmVersion.ceilingEntry(fmtVersion);
 				if (null != nextFmtVersionOrNull) {
 					builder.append(String.format(". %s %s requires JVM %d+", fmtName, fmtVersion, nextFmtVersionOrNull.getValue()));
 				}
@@ -147,12 +175,12 @@ private String buildUpgradeJvmMessage(V fmtVersion) {
 		}
 
 		private int getRequiredJvmVersion(V fmtVersion) {
-			Entry<V, Integer> entry = fmt2jvmVersion.ceilingEntry(fmtVersion);
+			Entry<V, Integer> entry = fmtMaxVersion2jvmVersion.ceilingEntry(fmtVersion);
 			if (null == entry) {
-				entry = fmt2jvmVersion.lastEntry();
+				entry = fmtMaxVersion2jvmVersion.lastEntry();
 			}
 			if (null != entry) {
-				V maxKnownFmtVersion = jvm2fmtVersion.get(entry.getValue());
+				V maxKnownFmtVersion = jvm2fmtMaxVersion.get(entry.getValue());
 				if (fmtVersionComparator.compare(fmtVersion, maxKnownFmtVersion) <= 0) {
 					return entry.getValue();
 				}
@@ -170,15 +198,15 @@ public FormatterFunc suggestLaterVersionOnError(V formatterVersion, FormatterFun
 			Objects.requireNonNull(formatterVersion);
 			Objects.requireNonNull(originalFunc);
 			final String hintUnsupportedProblem = buildUnsupportedFormatterMessage(formatterVersion);
-			final String proposeDiffererntFormatter = hintUnsupportedProblem.isEmpty() ? buildUpgradeFormatterMessage(formatterVersion) : hintUnsupportedProblem;
-			return proposeDiffererntFormatter.isEmpty() ? originalFunc : new FormatterFunc() {
+			final String proposeDifferentFormatter = hintUnsupportedProblem.isEmpty() ? buildUpgradeFormatterMessage(formatterVersion) : hintUnsupportedProblem;
+			return proposeDifferentFormatter.isEmpty() ? originalFunc : new FormatterFunc() {
 
 				@Override
 				public String apply(String unix, File file) throws Exception {
 					try {
 						return originalFunc.apply(unix, file);
 					} catch (Exception e) {
-						throw new Exception(proposeDiffererntFormatter, e);
+						throw new Exception(proposeDifferentFormatter, e);
 					}
 				}
 
@@ -187,7 +215,7 @@ public String apply(String input) throws Exception {
 					try {
 						return originalFunc.apply(input);
 					} catch (Exception e) {
-						throw new Exception(proposeDiffererntFormatter, e);
+						throw new Exception(proposeDifferentFormatter, e);
 					}
 				}
 
@@ -196,16 +224,25 @@ public String apply(String input) throws Exception {
 
 		private String buildUpgradeFormatterMessage(V fmtVersion) {
 			StringBuilder builder = new StringBuilder();
+			// check if the formatter is not supported on this jvm
+			V minimumFormatterVersion = getMinimumRequiredFormatterVersion();
 			V recommendedFmtVersionOrNull = getRecommendedFormatterVersion();
-			if (null != recommendedFmtVersionOrNull && (fmtVersionComparator.compare(fmtVersion, recommendedFmtVersionOrNull) < 0)) {
+			if ((null != minimumFormatterVersion) && (fmtVersionComparator.compare(fmtVersion, minimumFormatterVersion) < 0)) {
+				builder.append(String.format("You are running Spotless on JVM %d, which requires %s of at least %s.%n", Jvm.version(), fmtName, minimumFormatterVersion));
+				builder.append(String.format("You are using %s %s.%n", fmtName, fmtVersion));
+				if (null != recommendedFmtVersionOrNull) {
+					builder.append(String.format("%s %s is the recommended version, which may have fixed this problem.%n", fmtName, recommendedFmtVersionOrNull));
+				}
+				// check if the formatter is outdated on this jvm
+			} else if (null != recommendedFmtVersionOrNull && (fmtVersionComparator.compare(fmtVersion, recommendedFmtVersionOrNull) < 0)) {
 				builder.append(String.format("%s %s is currently being used, but outdated.%n", fmtName, fmtVersion));
 				builder.append(String.format("%s %s is the recommended version, which may have fixed this problem.%n", fmtName, recommendedFmtVersionOrNull));
 				builder.append(String.format("%s %s requires JVM %d+.", fmtName, recommendedFmtVersionOrNull, getRequiredJvmVersion(recommendedFmtVersionOrNull)));
 			} else {
-				V higherFormatterVersionOrNull = fmt2jvmVersion.higherKey(fmtVersion);
+				V higherFormatterVersionOrNull = fmtMaxVersion2jvmVersion.higherKey(fmtVersion);
 				if (null != higherFormatterVersionOrNull) {
 					builder.append(buildUpgradeJvmMessage(fmtVersion));
-					Integer higherJvmVersion = fmt2jvmVersion.get(higherFormatterVersionOrNull);
+					Integer higherJvmVersion = fmtMaxVersion2jvmVersion.get(higherFormatterVersionOrNull);
 					builder.append(String.format("If you upgrade your JVM to %d+, then you can use %s %s, which may have fixed this problem.", higherJvmVersion, fmtName, higherFormatterVersionOrNull));
 				}
 			}
@@ -215,7 +252,7 @@ private String buildUpgradeFormatterMessage(V fmtVersion) {
 		@Override
 		public String toString() {
 			return String.format("%s alternatives:%n", fmtName) +
-					jvm2fmtVersion.entrySet().stream().map(
+					jvm2fmtMaxVersion.entrySet().stream().map(
 							e -> String.format("- Version %s requires JVM %d+", e.getValue(), e.getKey())).collect(Collectors.joining(System.lineSeparator()));
 		}
 
diff --git a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
index 9a3b49c095..5ef33fd83a 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
@@ -69,7 +69,9 @@ public static FormatterStep create(String groupArtifact, String version, String
 				State::createFormat);
 	}
 
-	static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "1.15.0");
+	static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME)
+			.addMin(11, "1.8") // spotless requires java 11, so the min version of google java format we can support is 1.8
+			.add(11, "1.15.0"); // default version
 
 	public static String defaultGroupArtifact() {
 		return MAVEN_COORDINATE;

From 7355cb2ce341eaab5f695575cba505c2102c10e3 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Sat, 4 Mar 2023 20:28:49 +0100
Subject: [PATCH 0931/2068] add test for min version check + adapt others

---
 .../main/java/com/diffplug/spotless/Jvm.java   |  4 ++--
 .../spotless/java/GoogleJavaFormatStep.java    |  2 +-
 .../googlejavaformat/JavaCodeFormatted.test    |  1 -
 .../JavaCodeFormattedAOSP.test                 |  1 -
 .../java/GoogleJavaFormatStepTest.java         | 18 +++++++++++++-----
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/Jvm.java b/lib/src/main/java/com/diffplug/spotless/Jvm.java
index fe8dc3e7a1..7c9ad5b47a 100644
--- a/lib/src/main/java/com/diffplug/spotless/Jvm.java
+++ b/lib/src/main/java/com/diffplug/spotless/Jvm.java
@@ -152,7 +152,7 @@ private String buildUnsupportedFormatterMessage(V fmtVersion) {
 			// check if the formatter version is too low for the jvm version
 			V minimumFormatterVersion = getMinimumRequiredFormatterVersion();
 			if ((null != minimumFormatterVersion) && (fmtVersionComparator.compare(fmtVersion, minimumFormatterVersion) < 0)) {
-				return String.format("You are running Spotless on JVM %d, which requires %s of at least %s (you are using %s).%n", Jvm.version(), fmtName, minimumFormatterVersion, fmtVersion);
+				return String.format("You are running Spotless on JVM %d. This requires %s of at least %s (you are using %s).%n", Jvm.version(), fmtName, minimumFormatterVersion, fmtVersion);
 			}
 			// otherwise all is well
 			return "";
@@ -228,7 +228,7 @@ private String buildUpgradeFormatterMessage(V fmtVersion) {
 			V minimumFormatterVersion = getMinimumRequiredFormatterVersion();
 			V recommendedFmtVersionOrNull = getRecommendedFormatterVersion();
 			if ((null != minimumFormatterVersion) && (fmtVersionComparator.compare(fmtVersion, minimumFormatterVersion) < 0)) {
-				builder.append(String.format("You are running Spotless on JVM %d, which requires %s of at least %s.%n", Jvm.version(), fmtName, minimumFormatterVersion));
+				builder.append(String.format("You are running Spotless on JVM %d. This requires %s of at least %s.%n", Jvm.version(), fmtName, minimumFormatterVersion));
 				builder.append(String.format("You are using %s %s.%n", fmtName, fmtVersion));
 				if (null != recommendedFmtVersionOrNull) {
 					builder.append(String.format("%s %s is the recommended version, which may have fixed this problem.%n", fmtName, recommendedFmtVersionOrNull));
diff --git a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
index 5ef33fd83a..a3b9aad564 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
@@ -70,7 +70,7 @@ public static FormatterStep create(String groupArtifact, String version, String
 	}
 
 	static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME)
-			.addMin(11, "1.8") // spotless requires java 11, so the min version of google java format we can support is 1.8
+			.addMin(11, "1.8") // we only support google-java-format >= 1.8 due to api changes
 			.add(11, "1.15.0"); // default version
 
 	public static String defaultGroupArtifact() {
diff --git a/testlib/src/main/resources/java/googlejavaformat/JavaCodeFormatted.test b/testlib/src/main/resources/java/googlejavaformat/JavaCodeFormatted.test
index 7f7483f1bc..7a83a0a12c 100644
--- a/testlib/src/main/resources/java/googlejavaformat/JavaCodeFormatted.test
+++ b/testlib/src/main/resources/java/googlejavaformat/JavaCodeFormatted.test
@@ -1,4 +1,3 @@
-
 import mylib.UsedA;
 import mylib.UsedB;
 
diff --git a/testlib/src/main/resources/java/googlejavaformat/JavaCodeFormattedAOSP.test b/testlib/src/main/resources/java/googlejavaformat/JavaCodeFormattedAOSP.test
index dd1493b8c8..25ccbc25f5 100644
--- a/testlib/src/main/resources/java/googlejavaformat/JavaCodeFormattedAOSP.test
+++ b/testlib/src/main/resources/java/googlejavaformat/JavaCodeFormattedAOSP.test
@@ -1,4 +1,3 @@
-
 import mylib.UsedA;
 import mylib.UsedB;
 
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java
index e2f15360f5..2cac245adc 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java
@@ -51,7 +51,7 @@ void behavior18() throws Exception {
 
 	@Test
 	void behavior() throws Exception {
-		FormatterStep step = GoogleJavaFormatStep.create("1.2", TestProvisioner.mavenCentral());
+		FormatterStep step = GoogleJavaFormatStep.create("1.8", TestProvisioner.mavenCentral());
 		StepHarness.forStep(step)
 				.testResource("java/googlejavaformat/JavaCodeUnformatted.test", "java/googlejavaformat/JavaCodeFormatted.test")
 				.testResource("java/googlejavaformat/JavaCodeWithLicenseUnformatted.test", "java/googlejavaformat/JavaCodeWithLicenseFormatted.test")
@@ -60,8 +60,16 @@ void behavior() throws Exception {
 	}
 
 	@Test
-	void behaviorWithAospStyle() throws Exception {
+	void versionBelowMinimumRequiredVersionIsNotAllowed() throws Exception {
 		FormatterStep step = GoogleJavaFormatStep.create("1.2", "AOSP", TestProvisioner.mavenCentral());
+		StepHarness.forStep(step)
+				.testResourceExceptionMsg("java/googlejavaformat/JavaCodeWithLicenseUnformatted.test")
+				.contains("you are using 1.2");
+	}
+
+	@Test
+	void behaviorWithAospStyle() throws Exception {
+		FormatterStep step = GoogleJavaFormatStep.create("1.8", "AOSP", TestProvisioner.mavenCentral());
 		StepHarness.forStep(step)
 				.testResource("java/googlejavaformat/JavaCodeUnformatted.test", "java/googlejavaformat/JavaCodeFormattedAOSP.test")
 				.testResource("java/googlejavaformat/JavaCodeWithLicenseUnformatted.test", "java/googlejavaformat/JavaCodeWithLicenseFormattedAOSP.test")
@@ -83,7 +91,7 @@ void behaviorWithReflowLongStrings() throws Exception {
 
 	@Test
 	void behaviorWithCustomGroupArtifact() throws Exception {
-		FormatterStep step = GoogleJavaFormatStep.create(GoogleJavaFormatStep.defaultGroupArtifact(), "1.2", GoogleJavaFormatStep.defaultStyle(), TestProvisioner.mavenCentral(), false);
+		FormatterStep step = GoogleJavaFormatStep.create(GoogleJavaFormatStep.defaultGroupArtifact(), "1.8", GoogleJavaFormatStep.defaultStyle(), TestProvisioner.mavenCentral(), false);
 		StepHarness.forStep(step)
 				.testResource("java/googlejavaformat/JavaCodeUnformatted.test", "java/googlejavaformat/JavaCodeFormatted.test")
 				.testResource("java/googlejavaformat/JavaCodeWithLicenseUnformatted.test", "java/googlejavaformat/JavaCodeWithLicenseFormatted.test")
@@ -94,7 +102,7 @@ void behaviorWithCustomGroupArtifact() throws Exception {
 	@Test
 	void equality() throws Exception {
 		new SerializableEqualityTester() {
-			String version = "1.2";
+			String version = "1.8";
 			String style = "";
 			boolean reflowLongStrings = false;
 
@@ -103,7 +111,7 @@ protected void setupTest(API api) {
 				// same version == same
 				api.areDifferentThan();
 				// change the version, and it's different
-				version = "1.1";
+				version = "1.9";
 				api.areDifferentThan();
 				// change the style, and it's different
 				style = "AOSP";

From 25c4ab336a99b47ac31562abdf4688d765f2ffe4 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Sun, 5 Mar 2023 20:01:44 +0100
Subject: [PATCH 0932/2068] adapt tests to new required min versions

---
 .../gradle/spotless/GoogleJavaFormatIntegrationTest.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GoogleJavaFormatIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GoogleJavaFormatIntegrationTest.java
index 1f5cb6af05..468ba527df 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GoogleJavaFormatIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GoogleJavaFormatIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ void integration() throws IOException {
 				"spotless {",
 				"    java {",
 				"        target file('test.java')",
-				"        googleJavaFormat('1.2')",
+				"        googleJavaFormat('1.8')",
 				"    }",
 				"}");
 
@@ -41,8 +41,8 @@ void integration() throws IOException {
 
 		checkRunsThenUpToDate();
 		replace("build.gradle",
-				"googleJavaFormat('1.2')",
-				"googleJavaFormat('1.3')");
+				"googleJavaFormat('1.8')",
+				"googleJavaFormat('1.9')");
 		checkRunsThenUpToDate();
 	}
 }

From a7c224294e12c0fac714764456ffe55b07444a59 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Fri, 17 Mar 2023 09:25:40 +0100
Subject: [PATCH 0933/2068] gfj: bump default version to 1.16.0

---
 .../java/com/diffplug/spotless/java/GoogleJavaFormatStep.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
index a3b9aad564..9f41175ab8 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
@@ -71,7 +71,7 @@ public static FormatterStep create(String groupArtifact, String version, String
 
 	static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME)
 			.addMin(11, "1.8") // we only support google-java-format >= 1.8 due to api changes
-			.add(11, "1.15.0"); // default version
+			.add(11, "1.16.0"); // default version
 
 	public static String defaultGroupArtifact() {
 		return MAVEN_COORDINATE;

From e4ec8a55d38d91d580c302f98e8990948599d4f4 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Fri, 17 Mar 2023 09:29:53 +0100
Subject: [PATCH 0934/2068] add gjf conversion to CHANGES.md files

---
 CHANGES.md               | 3 +++
 plugin-gradle/CHANGES.md | 3 +++
 plugin-maven/CHANGES.md  | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index c0deba72dc..f25f24ac3a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,9 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Changes
+* **POTENTIALLY BREAKING** Converted `googleJavaFormat` to a compile-only dependency and drop support for versions &lt; `1.8`. ([#9999](https://github.com/diffplug/spotless/pull/9999))
+* Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#9999](https://github.com/diffplug/spotless/pull/9999))
 
 ## [2.37.0] - 2023-03-13
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 2c85978621..eeb68f2cc5 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,9 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Changes
+* **POTENTIALLY BREAKING** Drop support for `googleJavaFormat` versions &lt; `1.8`. ([#9999](https://github.com/diffplug/spotless/pull/9999))
+* Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#9999](https://github.com/diffplug/spotless/pull/9999))
 
 ## [6.17.0] - 2023-03-13
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 33e85b9f26..ac39f49d27 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,9 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Changes
+* **POTENTIALLY BREAKING** Drop support for `googleJavaFormat` versions &lt; `1.8`. ([#9999](https://github.com/diffplug/spotless/pull/9999))
+* Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#9999](https://github.com/diffplug/spotless/pull/9999))
 
 ## [2.35.0] - 2023-03-13
 ### Added

From b907a8870f740bb987a8675334ab6965e807550d Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Fri, 17 Mar 2023 09:34:57 +0100
Subject: [PATCH 0935/2068] adapt min. required GJF versions in READMEs

---
 plugin-gradle/README.md | 4 ++--
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index fffdb38518..616aacdb1f 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -187,8 +187,8 @@ spotless {
 spotless {
   java {
     googleJavaFormat()
-    // optional: you can specify a specific version and/or switch to AOSP style
-    //   and/or reflow long strings (requires at least 1.8)
+    // optional: you can specify a specific version (>= 1.8) and/or switch to AOSP style
+    //   and/or reflow long strings
     //   and/or use custom group artifact (you probably don't need this)
     googleJavaFormat('1.8').aosp().reflowLongStrings().groupArtifact('com.google.googlejavaformat:google-java-format')
 ```
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 6d13bc87f3..5971721e24 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -213,9 +213,9 @@ any other maven phase (i.e. compile) then it can be configured as below;
 
 ```xml
 <googleJavaFormat>
-  <version>1.8</version>                      <!-- optional -->
+  <version>1.8</version>                      <!-- optional, 1.8 is minimum supported version -->
   <style>GOOGLE</style>                       <!-- or AOSP (optional) -->
-  <reflowLongStrings>true</reflowLongStrings> <!-- optional (requires at least 1.8) -->
+  <reflowLongStrings>true</reflowLongStrings> <!-- optional -->
   <!-- optional: custom group artifact (you probably don't need this) -->
   <groupArtifact>com.google.googlejavaformat:google-java-format</groupArtifact>
 </googleJavaFormat>

From 94eaa5efc87e1a1d34d5b89d9b8db28ed1b45c65 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Fri, 17 Mar 2023 09:45:01 +0100
Subject: [PATCH 0936/2068] adapt to actual PR number

---
 CHANGES.md               | 4 ++--
 plugin-gradle/CHANGES.md | 4 ++--
 plugin-maven/CHANGES.md  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index f25f24ac3a..ec06be1db5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,8 +11,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Changes
-* **POTENTIALLY BREAKING** Converted `googleJavaFormat` to a compile-only dependency and drop support for versions &lt; `1.8`. ([#9999](https://github.com/diffplug/spotless/pull/9999))
-* Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#9999](https://github.com/diffplug/spotless/pull/9999))
+* **POTENTIALLY BREAKING** Converted `googleJavaFormat` to a compile-only dependency and drop support for versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
+* Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
 
 ## [2.37.0] - 2023-03-13
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index eeb68f2cc5..ef7b1b8dae 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -4,8 +4,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Changes
-* **POTENTIALLY BREAKING** Drop support for `googleJavaFormat` versions &lt; `1.8`. ([#9999](https://github.com/diffplug/spotless/pull/9999))
-* Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#9999](https://github.com/diffplug/spotless/pull/9999))
+* **POTENTIALLY BREAKING** Drop support for `googleJavaFormat` versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
+* Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
 
 ## [6.17.0] - 2023-03-13
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index ac39f49d27..421b5e56e7 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -4,8 +4,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Changes
-* **POTENTIALLY BREAKING** Drop support for `googleJavaFormat` versions &lt; `1.8`. ([#9999](https://github.com/diffplug/spotless/pull/9999))
-* Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#9999](https://github.com/diffplug/spotless/pull/9999))
+* **POTENTIALLY BREAKING** Drop support for `googleJavaFormat` versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
+* Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
 
 ## [2.35.0] - 2023-03-13
 ### Added

From cb0fd38fa4c8f2446a4832b70c3d9abee37b52ca Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Fri, 17 Mar 2023 11:06:17 +0100
Subject: [PATCH 0937/2068] adaptions to min-required gjf version

---
 .../gradle/spotless/ConfigAvoidanceTest.java     |  4 ++--
 .../gradle/spotless/ConfigurationCacheTest.java  |  8 ++++----
 .../gradle/spotless/FilePermissionsTest.java     |  4 ++--
 .../gradle/spotless/IndependentTaskTest.java     |  4 ++--
 .../gradle/spotless/JavaDefaultTargetTest.java   |  4 ++--
 .../gradle/spotless/MultiProjectTest.java        | 16 ++++++++--------
 .../spotless/RegisterDependenciesTaskTest.java   |  6 +++---
 .../gradle/spotless/WithinBlockTest.java         |  6 +++---
 8 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ConfigAvoidanceTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ConfigAvoidanceTest.java
index d5422a3631..bd521bd864 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ConfigAvoidanceTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ConfigAvoidanceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ void noConfigOnHelp() throws IOException {
 				"apply plugin: 'java'",
 				"spotless {",
 				"    java {",
-				"        googleJavaFormat('1.2')",
+				"        googleJavaFormat()",
 				"    }",
 				"}",
 				"",
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ConfigurationCacheTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ConfigurationCacheTest.java
index 4006752af2..396a884cc5 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ConfigurationCacheTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ConfigurationCacheTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 DiffPlug
+ * Copyright 2020-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@ public void helpConfigures() throws IOException {
 				"apply plugin: 'java'",
 				"spotless {",
 				"    java {",
-				"        googleJavaFormat('1.2')",
+				"        googleJavaFormat()",
 				"    }",
 				"}");
 		gradleRunner().withArguments("help").build();
@@ -55,7 +55,7 @@ public void helpConfiguresIfTasksAreCreated() throws IOException {
 				"apply plugin: 'java'",
 				"spotless {",
 				"    java {",
-				"        googleJavaFormat('1.2')",
+				"        googleJavaFormat()",
 				"    }",
 				"}",
 				"tasks.named('spotlessJavaApply').get()");
@@ -72,7 +72,7 @@ public void jvmLocalCache() throws IOException {
 				"spotless {",
 				"    java {",
 				"        target file('test.java')",
-				"        googleJavaFormat('1.2')",
+				"        googleJavaFormat()",
 				"    }",
 				"}");
 
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/FilePermissionsTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/FilePermissionsTest.java
index a5ce2d11cd..d342348a5b 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/FilePermissionsTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/FilePermissionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 DiffPlug
+ * Copyright 2020-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@ void spotlessApplyShouldPreservePermissions() throws IOException {
 				"spotless {",
 				"    java {",
 				"        target file('test.java')",
-				"        googleJavaFormat('1.2')",
+				"        googleJavaFormat()",
 				"    }",
 				"}");
 		setFile("test.java").toResource("java/googlejavaformat/JavaCodeUnformatted.test");
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/IndependentTaskTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/IndependentTaskTest.java
index 459b871b94..4062aae51d 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/IndependentTaskTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/IndependentTaskTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@ void independent() throws IOException {
 				"",
 				"def underTest = new JavaExtension(spotless)",
 				"underTest.target file('test.java')",
-				"underTest.googleJavaFormat('1.2')",
+				"underTest.googleJavaFormat()",
 				"",
 				"def independent = underTest.createIndependentApplyTask('independent')");
 		setFile("test.java").toResource("java/googlejavaformat/JavaCodeUnformatted.test");
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavaDefaultTargetTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavaDefaultTargetTest.java
index 898008c27a..e6569b2647 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavaDefaultTargetTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavaDefaultTargetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@ void integration() throws IOException {
 				"",
 				"spotless {",
 				"    java {",
-				"        googleJavaFormat('1.2')",
+				"        googleJavaFormat()",
 				"    }",
 				"}");
 		setFile("src/main/java/test.java").toResource("java/googlejavaformat/JavaCodeUnformatted.test");
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/MultiProjectTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/MultiProjectTest.java
index 086a2ddb1d..98761b472a 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/MultiProjectTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/MultiProjectTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@ void createSubproject(String name) throws IOException {
 				"spotless {",
 				"    java {",
 				"        target file('test.java')",
-				"        googleJavaFormat('1.2')",
+				"        googleJavaFormat('1.16.0')",
 				"    }",
 				"}");
 		setFile(name + "/test.java").toResource("java/googlejavaformat/JavaCodeUnformatted.test");
@@ -71,7 +71,7 @@ public void hasRootSpotless() throws IOException {
 				"spotless {",
 				"    java {",
 				"        target file('test.java')",
-				"        googleJavaFormat('1.2')",
+				"        googleJavaFormat('1.16.0')",
 				"    }",
 				"}");
 		setFile("test.java").toResource("java/googlejavaformat/JavaCodeUnformatted.test");
@@ -88,7 +88,7 @@ public void predeclaredFails() throws IOException {
 				"spotless { predeclareDeps() }");
 		createNSubprojects();
 		Assertions.assertThat(gradleRunner().withArguments("spotlessApply").buildAndFail().getOutput())
-				.contains("Add a step with [com.google.googlejavaformat:google-java-format:1.2] into the `spotlessPredeclare` block in the root project.");
+				.contains("Add a step with [com.google.googlejavaformat:google-java-format:1.16.0] into the `spotlessPredeclare` block in the root project.");
 	}
 
 	@Test
@@ -100,7 +100,7 @@ public void predeclaredSucceeds() throws IOException {
 				"repositories { mavenCentral() }",
 				"spotless { predeclareDeps() }",
 				"spotlessPredeclare {",
-				" java { googleJavaFormat('1.2') }",
+				" java { googleJavaFormat('1.16.0') }",
 				"}");
 		createNSubprojects();
 		gradleRunner().withArguments("spotlessApply").build();
@@ -115,7 +115,7 @@ public void predeclaredFromBuildscriptSucceeds() throws IOException {
 				"repositories { mavenCentral() }",
 				"spotless { predeclareDepsFromBuildscript() }",
 				"spotlessPredeclare {",
-				" java { googleJavaFormat('1.2') }",
+				" java { googleJavaFormat('1.16.0') }",
 				"}");
 		createNSubprojects();
 		gradleRunner().withArguments("spotlessApply").build();
@@ -129,7 +129,7 @@ public void predeclaredOrdering() throws IOException {
 				"}",
 				"repositories { mavenCentral() }",
 				"spotlessPredeclare {",
-				" java { googleJavaFormat('1.2') }",
+				" java { googleJavaFormat('1.16.0') }",
 				"}",
 				"spotless { predeclareDepsFromBuildscript() }");
 		createNSubprojects();
@@ -145,7 +145,7 @@ public void predeclaredUndeclared() throws IOException {
 				"}",
 				"repositories { mavenCentral() }",
 				"spotlessPredeclare {",
-				" java { googleJavaFormat('1.2') }",
+				" java { googleJavaFormat('1.16.0') }",
 				"}");
 		createNSubprojects();
 		Assertions.assertThat(gradleRunner().withArguments("spotlessApply").buildAndFail().getOutput())
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/RegisterDependenciesTaskTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/RegisterDependenciesTaskTest.java
index 480de4f01b..76d0449060 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/RegisterDependenciesTaskTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/RegisterDependenciesTaskTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,11 +32,11 @@ void duplicateConfigs() throws IOException {
 				"spotless {",
 				"  java {",
 				"    target 'src/main/java/**/*.java'",
-				"    googleJavaFormat('1.2')",
+				"    googleJavaFormat()",
 				"  }",
 				"  format 'javaDupe', com.diffplug.gradle.spotless.JavaExtension, {",
 				"    target 'src/boop/java/**/*.java'",
-				"    googleJavaFormat('1.2')",
+				"    googleJavaFormat()",
 				"  }",
 				"}");
 
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/WithinBlockTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/WithinBlockTest.java
index 01fb048b66..d1df8b5f96 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/WithinBlockTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/WithinBlockTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 DiffPlug
+ * Copyright 2020-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ void genericFormatTest() throws IOException {
 				"spotless {",
 				"  format 'customJava', JavaExtension, {",
 				"    target '*.java'",
-				"    googleJavaFormat('1.2')",
+				"    googleJavaFormat()",
 				"  }",
 				"}");
 		setFile("test.java").toResource("java/googlejavaformat/JavaCodeUnformatted.test");
@@ -53,7 +53,7 @@ void withinBlocksTourDeForce() throws IOException {
 				"      custom 'lowercase', { str -> str.toLowerCase() }",
 				"    }",
 				"    withinBlocks 'java only', '\\n```java\\n', '\\n```\\n', JavaExtension, {",
-				"      googleJavaFormat('1.2')",
+				"      googleJavaFormat()",
 				"    }",
 				"  }",
 				"}");

From 048947b20ef8ad7111efea8c11b94482b05a4548 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Fri, 17 Mar 2023 13:40:45 +0100
Subject: [PATCH 0938/2068] adapt more gjf format specifications

---
 .../spotless/java/GoogleJavaFormatStep.java   |  1 +
 .../spotless/maven/MavenProvisionerTest.java  |  2 +-
 .../spotless/maven/SpecificFilesTest.java     |  4 ++--
 .../maven/java/GoogleJavaFormatTest.java      |  6 +++---
 .../java/GoogleJavaFormatStepTest.java        | 20 ++++++++++++++-----
 5 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
index 9f41175ab8..d7ba26f384 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
@@ -71,6 +71,7 @@ public static FormatterStep create(String groupArtifact, String version, String
 
 	static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME)
 			.addMin(11, "1.8") // we only support google-java-format >= 1.8 due to api changes
+			.addMin(16, "1.10.0") // java 16 requires at least 1.10.0 due to jdk api changes in JavaTokenizer
 			.add(11, "1.16.0"); // default version
 
 	public static String defaultGroupArtifact() {
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenProvisionerTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenProvisionerTest.java
index cabbf7c5c0..5af146c736 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenProvisionerTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenProvisionerTest.java
@@ -33,7 +33,7 @@ void testMultipleDependenciesExcludingTransitives() throws Exception {
 	void testSingleDependencyIncludingTransitives() throws Exception {
 		writePomWithJavaSteps(
 				"<googleJavaFormat>",
-				"  <version>1.2</version>",
+				"  <version>1.10.0</version>",
 				"</googleJavaFormat>");
 		assertResolveDependenciesWorks();
 	}
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpecificFilesTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpecificFilesTest.java
index 55cd586582..11cca5994a 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpecificFilesTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpecificFilesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -58,7 +58,7 @@ private void integration(String patterns, boolean firstFormatted, boolean second
 				"  <include>src/**/java/**/*.java</include>",
 				"</includes>",
 				"<googleJavaFormat>",
-				"  <version>1.2</version>",
+				"  <version>1.10.0</version>",
 				"</googleJavaFormat>");
 
 		setFile(testFile(1)).toResource(fixture(false));
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/GoogleJavaFormatTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/GoogleJavaFormatTest.java
index 98a83d612c..407d089999 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/GoogleJavaFormatTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/GoogleJavaFormatTest.java
@@ -24,7 +24,7 @@ class GoogleJavaFormatTest extends MavenIntegrationHarness {
 	void specificVersionDefaultStyle() throws Exception {
 		writePomWithJavaSteps(
 				"<googleJavaFormat>",
-				"  <version>1.2</version>",
+				"  <version>1.10.0</version>",
 				"</googleJavaFormat>");
 
 		runTest("java/googlejavaformat/JavaCodeFormatted.test");
@@ -34,7 +34,7 @@ void specificVersionDefaultStyle() throws Exception {
 	void specificVersionSpecificStyle() throws Exception {
 		writePomWithJavaSteps(
 				"<googleJavaFormat>",
-				"  <version>1.2</version>",
+				"  <version>1.10.0</version>",
 				"  <style>AOSP</style>",
 				"</googleJavaFormat>");
 
@@ -45,7 +45,7 @@ void specificVersionSpecificStyle() throws Exception {
 	void specificVersionReflowLongStrings() throws Exception {
 		writePomWithJavaSteps(
 				"<googleJavaFormat>",
-				"  <version>1.8</version>",
+				"  <version>1.10.0</version>",
 				"  <reflowLongStrings>true</reflowLongStrings>",
 				"</googleJavaFormat>");
 
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java
index 2cac245adc..694e390727 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java
@@ -17,6 +17,7 @@
 
 import static org.junit.jupiter.api.condition.JRE.JAVA_13;
 import static org.junit.jupiter.api.condition.JRE.JAVA_15;
+import static org.junit.jupiter.api.condition.JRE.JAVA_16;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledForJreRange;
@@ -51,7 +52,7 @@ void behavior18() throws Exception {
 
 	@Test
 	void behavior() throws Exception {
-		FormatterStep step = GoogleJavaFormatStep.create("1.8", TestProvisioner.mavenCentral());
+		FormatterStep step = GoogleJavaFormatStep.create("1.10.0", TestProvisioner.mavenCentral());
 		StepHarness.forStep(step)
 				.testResource("java/googlejavaformat/JavaCodeUnformatted.test", "java/googlejavaformat/JavaCodeFormatted.test")
 				.testResource("java/googlejavaformat/JavaCodeWithLicenseUnformatted.test", "java/googlejavaformat/JavaCodeWithLicenseFormatted.test")
@@ -67,9 +68,18 @@ void versionBelowMinimumRequiredVersionIsNotAllowed() throws Exception {
 				.contains("you are using 1.2");
 	}
 
+	@Test
+	@EnabledForJreRange(min = JAVA_16)
+	void versionBelowOneDotTenIsNotAllowed() throws Exception {
+		FormatterStep step = GoogleJavaFormatStep.create("1.9", "AOSP", TestProvisioner.mavenCentral());
+		StepHarness.forStep(step)
+				.testResourceExceptionMsg("java/googlejavaformat/JavaCodeWithLicenseUnformatted.test")
+				.contains("you are using 1.9");
+	}
+
 	@Test
 	void behaviorWithAospStyle() throws Exception {
-		FormatterStep step = GoogleJavaFormatStep.create("1.8", "AOSP", TestProvisioner.mavenCentral());
+		FormatterStep step = GoogleJavaFormatStep.create("1.10.0", "AOSP", TestProvisioner.mavenCentral());
 		StepHarness.forStep(step)
 				.testResource("java/googlejavaformat/JavaCodeUnformatted.test", "java/googlejavaformat/JavaCodeFormattedAOSP.test")
 				.testResource("java/googlejavaformat/JavaCodeWithLicenseUnformatted.test", "java/googlejavaformat/JavaCodeWithLicenseFormattedAOSP.test")
@@ -91,7 +101,7 @@ void behaviorWithReflowLongStrings() throws Exception {
 
 	@Test
 	void behaviorWithCustomGroupArtifact() throws Exception {
-		FormatterStep step = GoogleJavaFormatStep.create(GoogleJavaFormatStep.defaultGroupArtifact(), "1.8", GoogleJavaFormatStep.defaultStyle(), TestProvisioner.mavenCentral(), false);
+		FormatterStep step = GoogleJavaFormatStep.create(GoogleJavaFormatStep.defaultGroupArtifact(), "1.10.0", GoogleJavaFormatStep.defaultStyle(), TestProvisioner.mavenCentral(), false);
 		StepHarness.forStep(step)
 				.testResource("java/googlejavaformat/JavaCodeUnformatted.test", "java/googlejavaformat/JavaCodeFormatted.test")
 				.testResource("java/googlejavaformat/JavaCodeWithLicenseUnformatted.test", "java/googlejavaformat/JavaCodeWithLicenseFormatted.test")
@@ -102,7 +112,7 @@ void behaviorWithCustomGroupArtifact() throws Exception {
 	@Test
 	void equality() throws Exception {
 		new SerializableEqualityTester() {
-			String version = "1.8";
+			String version = "1.10.0";
 			String style = "";
 			boolean reflowLongStrings = false;
 
@@ -111,7 +121,7 @@ protected void setupTest(API api) {
 				// same version == same
 				api.areDifferentThan();
 				// change the version, and it's different
-				version = "1.9";
+				version = "1.11.0";
 				api.areDifferentThan();
 				// change the style, and it's different
 				style = "AOSP";

From b0adcfaadeaf96d11266c36187720dc0f87cea94 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Fri, 17 Mar 2023 13:42:52 +0100
Subject: [PATCH 0939/2068] clarify comment

---
 lib/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index e939f7249e..19bc98f710 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -81,7 +81,7 @@ dependencies {
 
 	palantirJavaFormatCompileOnly 'com.palantir.javaformat:palantir-java-format:1.1.0' 	// this version needs to stay compilable against Java 8 for CI Job testNpm
 
-	googleJavaFormatCompileOnly 'com.google.googlejavaformat:google-java-format:1.8' // minimum required version for jdk 11
+	googleJavaFormatCompileOnly 'com.google.googlejavaformat:google-java-format:1.8' // minimum required version due to api changes before then
 	testGoogleJavaFormatImplementation "com.diffplug.durian:durian-core:$VER_DURIAN"
 
 	// used jackson-based formatters

From ab982d2480d36a29d32ae0b2ed6063153295ad5e Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Fri, 17 Mar 2023 14:01:17 +0100
Subject: [PATCH 0940/2068] another pinned version to be upgraded

---
 .../gradle/spotless/GoogleJavaFormatIntegrationTest.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GoogleJavaFormatIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GoogleJavaFormatIntegrationTest.java
index 468ba527df..5c7fe54f59 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GoogleJavaFormatIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GoogleJavaFormatIntegrationTest.java
@@ -31,7 +31,7 @@ void integration() throws IOException {
 				"spotless {",
 				"    java {",
 				"        target file('test.java')",
-				"        googleJavaFormat('1.8')",
+				"        googleJavaFormat('1.10.0')",
 				"    }",
 				"}");
 
@@ -41,8 +41,8 @@ void integration() throws IOException {
 
 		checkRunsThenUpToDate();
 		replace("build.gradle",
-				"googleJavaFormat('1.8')",
-				"googleJavaFormat('1.9')");
+				"googleJavaFormat('1.10.0')",
+				"googleJavaFormat()");
 		checkRunsThenUpToDate();
 	}
 }

From abe30b897345fd973f0506e8c77e8849f99c37fa Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Sat, 18 Mar 2023 09:36:49 +0100
Subject: [PATCH 0941/2068] remove obsolete fix code

PR Feedback: this version is no longer supported anyway
---
 .../java/GoogleJavaFormatFormatterFunc.java   |  5 +-
 ...rmatRemoveUnusedImporterFormatterFunc.java |  5 +-
 .../glue/java/GoogleJavaFormatUtils.java      | 54 ----------------
 .../glue/java/GoogleJavaFormatUtilsTest.java  | 63 -------------------
 4 files changed, 2 insertions(+), 125 deletions(-)
 delete mode 100644 lib/src/googleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatUtils.java
 delete mode 100644 lib/src/testGoogleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatUtilsTest.java

diff --git a/lib/src/googleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatFormatterFunc.java b/lib/src/googleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatFormatterFunc.java
index a326cf1f69..97d31da268 100644
--- a/lib/src/googleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatFormatterFunc.java
+++ b/lib/src/googleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatFormatterFunc.java
@@ -15,8 +15,6 @@
  */
 package com.diffplug.spotless.glue.java;
 
-import static com.diffplug.spotless.glue.java.GoogleJavaFormatUtils.fixWindowsBug;
-
 import java.util.Objects;
 
 import javax.annotation.Nonnull;
@@ -57,8 +55,7 @@ public String apply(@Nonnull String input) throws Exception {
 		String formatted = formatter.formatSource(input);
 		String removedUnused = RemoveUnusedImports.removeUnusedImports(formatted);
 		String sortedImports = ImportOrderer.reorderImports(removedUnused, formatterStyle);
-		String reflowedLongStrings = reflowLongStrings(sortedImports);
-		return fixWindowsBug(reflowedLongStrings, version);
+		return reflowLongStrings(sortedImports);
 	}
 
 	private String reflowLongStrings(String input) throws FormatterException {
diff --git a/lib/src/googleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatRemoveUnusedImporterFormatterFunc.java b/lib/src/googleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatRemoveUnusedImporterFormatterFunc.java
index 0073ce9dc9..de21a18795 100644
--- a/lib/src/googleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatRemoveUnusedImporterFormatterFunc.java
+++ b/lib/src/googleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatRemoveUnusedImporterFormatterFunc.java
@@ -15,8 +15,6 @@
  */
 package com.diffplug.spotless.glue.java;
 
-import static com.diffplug.spotless.glue.java.GoogleJavaFormatUtils.fixWindowsBug;
-
 import java.util.Objects;
 
 import javax.annotation.Nonnull;
@@ -37,7 +35,6 @@ public GoogleJavaFormatRemoveUnusedImporterFormatterFunc(@Nonnull String version
 	@Override
 	@Nonnull
 	public String apply(@Nonnull String input) throws Exception {
-		String removedUnused = RemoveUnusedImports.removeUnusedImports(input);
-		return fixWindowsBug(removedUnused, version);
+		return RemoveUnusedImports.removeUnusedImports(input);
 	}
 }
diff --git a/lib/src/googleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatUtils.java b/lib/src/googleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatUtils.java
deleted file mode 100644
index 98f47a6097..0000000000
--- a/lib/src/googleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatUtils.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2023 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.glue.java;
-
-import com.diffplug.spotless.LineEnding;
-
-public class GoogleJavaFormatUtils {
-
-	private static final boolean IS_WINDOWS = LineEnding.PLATFORM_NATIVE.str().equals("\r\n");
-
-	/**
-	 * google-java-format-1.1's removeUnusedImports does *wacky* stuff on Windows.
-	 * The beauty of normalizing all line endings to unix!
-	 */
-	static String fixWindowsBug(String input, String version) {
-		if (IS_WINDOWS && version.equals("1.1")) {
-			int firstImport = input.indexOf("\nimport ");
-			if (firstImport == 0) {
-				return input;
-			} else if (firstImport > 0) {
-				int numToTrim = 0;
-				char prevChar;
-				do {
-					++numToTrim;
-					prevChar = input.charAt(firstImport - numToTrim);
-				} while (Character.isWhitespace(prevChar) && (firstImport - numToTrim) > 0);
-				if (firstImport - numToTrim == 0) {
-					// import was the very first line, and we'd like to maintain a one-line gap
-					++numToTrim;
-				} else if (prevChar == ';' || prevChar == '/') {
-					// import came after either license or a package declaration
-					--numToTrim;
-				}
-				if (numToTrim > 0) {
-					return input.substring(0, firstImport - numToTrim + 2) + input.substring(firstImport + 1);
-				}
-			}
-		}
-		return input;
-	}
-}
diff --git a/lib/src/testGoogleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatUtilsTest.java b/lib/src/testGoogleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatUtilsTest.java
deleted file mode 100644
index a6403c18a0..0000000000
--- a/lib/src/testGoogleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatUtilsTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2023 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.glue.java;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-import com.diffplug.common.base.StringPrinter;
-
-public class GoogleJavaFormatUtilsTest {
-
-	@Test
-	void fixWindowsBugForGfj1Point1() {
-		fixWindowsBugTestcase("");
-		fixWindowsBugTestcase(
-				"",
-				"import somepackage;",
-				"");
-		fixWindowsBugTestcase(
-				"import somepackage;",
-				"",
-				"public class SomeClass {}");
-		fixWindowsBugTestcase(
-				"/** Some license */",
-				"import somepackage;",
-				"",
-				"public class SomeClass {}");
-		fixWindowsBugTestcase(
-				"package thispackage;",
-				"",
-				"import somepackage;",
-				"",
-				"public class SomeClass {}");
-		fixWindowsBugTestcase(
-				"/*",
-				" * A License.",
-				" */",
-				"",
-				"package thispackage;",
-				"",
-				"import somepackage;",
-				"",
-				"public class SomeClass {}");
-	}
-
-	private void fixWindowsBugTestcase(String... lines) {
-		String input = StringPrinter.buildStringFromLines(lines);
-		Assertions.assertEquals(input, GoogleJavaFormatUtils.fixWindowsBug(input, "1.1"));
-	}
-}

From c65a0cfc7f5034b5b1cb2d64f968f7dbf6802fcc Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Sat, 18 Mar 2023 09:39:57 +0100
Subject: [PATCH 0942/2068] revert testGlue as it is no longer needed

---
 lib/build.gradle | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 19bc98f710..e712df9850 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -21,21 +21,11 @@ def NEEDS_GLUE = [
 	'cleanthat'
 ]
 for (glue in NEEDS_GLUE) {
-	// main glue
-	def mainGlue = sourceSets.register(glue) {
+	sourceSets.register(glue) {
 		compileClasspath += sourceSets.main.output
 		runtimeClasspath += sourceSets.main.output
 		java {}
 	}
-	// test glue
-	sourceSets.register("test${glue.capitalize()}") {
-		compileClasspath += mainGlue.get().compileClasspath + mainGlue.get().output + sourceSets.test.output
-		runtimeClasspath += mainGlue.get().compileClasspath + mainGlue.get().output + sourceSets.test.output
-		java {}
-	}
-	configurations.named("test${glue.capitalize()}Implementation").configure {
-		extendsFrom(configurations.named("testImplementation").get())
-	}
 }
 
 versionCompatibility {
@@ -82,7 +72,6 @@ dependencies {
 	palantirJavaFormatCompileOnly 'com.palantir.javaformat:palantir-java-format:1.1.0' 	// this version needs to stay compilable against Java 8 for CI Job testNpm
 
 	googleJavaFormatCompileOnly 'com.google.googlejavaformat:google-java-format:1.8' // minimum required version due to api changes before then
-	testGoogleJavaFormatImplementation "com.diffplug.durian:durian-core:$VER_DURIAN"
 
 	// used jackson-based formatters
 	jacksonCompileOnly 'com.fasterxml.jackson.core:jackson-databind:2.14.2'

From 3aea790f1d8ff54854c36ae6e192144ce1626e41 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Mon, 20 Mar 2023 09:38:13 +0100
Subject: [PATCH 0943/2068] formatting cleanup

---
 .../spotless/glue/java/GoogleJavaFormatFormatterFunc.java       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/src/googleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatFormatterFunc.java b/lib/src/googleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatFormatterFunc.java
index 97d31da268..f45394979a 100644
--- a/lib/src/googleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatFormatterFunc.java
+++ b/lib/src/googleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatFormatterFunc.java
@@ -35,8 +35,10 @@ public class GoogleJavaFormatFormatterFunc implements FormatterFunc {
 
 	@Nonnull
 	private final String version;
+
 	@Nonnull
 	private final JavaFormatterOptions.Style formatterStyle;
+
 	private final boolean reflowStrings;
 
 	public GoogleJavaFormatFormatterFunc(@Nonnull String version, @Nonnull String style, boolean reflowStrings) {

From 316006fda17a341cc15dcf4bf7176dcf091d17a8 Mon Sep 17 00:00:00 2001
From: "Honnen, Julian" <julian.honnen@vector.com>
Date: Tue, 21 Mar 2023 09:17:22 +0100
Subject: [PATCH 0944/2068] Support configuration of P2 mirrors

---
 .../spotless/extra/EquoBasedStepBuilder.java  | 31 ++++++++++++++++++-
 plugin-gradle/CHANGES.md                      | 10 ++++++
 .../gradle/spotless/CppExtension.java         |  8 +++++
 .../gradle/spotless/GroovyExtension.java      |  7 +++++
 .../gradle/spotless/JavaExtension.java        |  7 +++++
 5 files changed, 62 insertions(+), 1 deletion(-)

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 5283321cec..ab20d27d88 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
@@ -19,6 +19,7 @@
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Properties;
 
 import com.diffplug.spotless.FileSignature;
@@ -43,6 +44,7 @@ public abstract class EquoBasedStepBuilder {
 	private final ThrowingEx.Function<State, FormatterFunc> stateToFormatter;
 	private String formatterVersion;
 	private Iterable<File> settingsFiles = new ArrayList<>();
+	private Map<String, String> p2Mirrors = Map.of();
 
 	/** Initialize valid default configuration, taking latest version */
 	public EquoBasedStepBuilder(String formatterName, Provisioner mavenProvisioner, ThrowingEx.Function<State, FormatterFunc> stateToFormatter) {
@@ -59,6 +61,10 @@ public void setPreferences(Iterable<File> settingsFiles) {
 		this.settingsFiles = settingsFiles;
 	}
 
+	public void setP2Mirrors(Map<String, String> p2Mirrors) {
+		this.p2Mirrors = Map.copyOf(p2Mirrors);
+	}
+
 	/** Returns the FormatterStep (whose state will be calculated lazily). */
 	public FormatterStep build() {
 		return FormatterStep.createLazy(formatterName, this::get, stateToFormatter);
@@ -85,7 +91,7 @@ protected void addPlatformRepo(P2Model model, String version) {
 
 	/** Creates the state of the configuration. */
 	EquoBasedStepBuilder.State get() throws Exception {
-		var query = model(formatterVersion).query(P2ClientCache.PREFER_OFFLINE, P2QueryCache.ALLOW);
+		var query = createModelWithMirrors().query(P2ClientCache.PREFER_OFFLINE, P2QueryCache.ALLOW);
 		var classpath = new ArrayList<File>();
 		var mavenDeps = new ArrayList<String>();
 		mavenDeps.add("dev.equo.ide:solstice:1.0.0");
@@ -100,6 +106,29 @@ EquoBasedStepBuilder.State get() throws Exception {
 		return new State(formatterVersion, jarState, FileSignature.signAsList(settingsFiles));
 	}
 
+	private P2Model createModelWithMirrors() {
+		P2Model model = model(formatterVersion);
+		if (p2Mirrors.isEmpty()) {
+			return model;
+		}
+
+		ArrayList<String> p2Repos = new ArrayList<>(model.getP2repo());
+		p2Repos.replaceAll(url -> {
+			for (Map.Entry<String, String> mirror : p2Mirrors.entrySet()) {
+				String prefix = mirror.getKey();
+				if (url.startsWith(prefix)) {
+					return mirror.getValue() + url.substring(prefix.length());
+				}
+			}
+
+			throw new IllegalStateException("no mirror configured for P2 repository: " + url);
+		});
+
+		model.getP2repo().clear();
+		model.getP2repo().addAll(p2Repos);
+		return model;
+	}
+
 	/**
 	 * State of Eclipse configuration items, providing functionality to derived information
 	 * based on the state.
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 2c85978621..2bd6e4d39e 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,16 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Added
+* Support configuration of mirrors for P2 repositories:
+  ```
+  spotless {
+    java {
+      eclipse().withP2Mirrors(['https://download.eclipse.org/', 'https://some.internal.mirror/eclipse'])
+    }
+  }
+  ```
+  The same configuration exists for `greclipse` and `eclipseCdt`.
 
 ## [6.17.0] - 2023-03-13
 ### Added
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java
index a08dc07d05..6a08946c48 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java
@@ -17,6 +17,8 @@
 
 import static com.diffplug.gradle.spotless.PluginGradlePreconditions.requireElementsNonNull;
 
+import java.util.Map;
+
 import javax.inject.Inject;
 
 import org.gradle.api.Project;
@@ -56,6 +58,12 @@ public void configFile(Object... configFiles) {
 			builder.setPreferences(project.files(configFiles).getFiles());
 			replaceStep(builder.build());
 		}
+
+		public EclipseConfig withP2Mirrors(Map<String, String> mirrors) {
+			builder.setP2Mirrors(mirrors);
+			replaceStep(builder.build());
+			return this;
+		}
 	}
 
 	@Override
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java
index 2062946b32..d25433293d 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java
@@ -17,6 +17,7 @@
 
 import static com.diffplug.gradle.spotless.PluginGradlePreconditions.requireElementsNonNull;
 
+import java.util.Map;
 import java.util.Objects;
 
 import javax.inject.Inject;
@@ -99,6 +100,12 @@ public void configFile(Object... configFiles) {
 			builder.setPreferences(project.files(configFiles).getFiles());
 			extension.replaceStep(builder.build());
 		}
+
+		public GrEclipseConfig withP2Mirrors(Map<String, String> mirrors) {
+			builder.setP2Mirrors(mirrors);
+			extension.replaceStep(builder.build());
+			return this;
+		}
 	}
 
 	/** If the user hasn't specified the files yet, we'll assume he/she means all of the groovy files. */
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
index 8dd514ab37..e67bb6d076 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
@@ -21,6 +21,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
 import javax.inject.Inject;
@@ -232,6 +233,12 @@ public void configFile(Object... configFiles) {
 			replaceStep(builder.build());
 		}
 
+		public EclipseConfig withP2Mirrors(Map<String, String> mirrors) {
+			builder.setP2Mirrors(mirrors);
+			replaceStep(builder.build());
+			return this;
+		}
+
 	}
 
 	/** Removes newlines between type annotations and types. */

From 377d497eb0547fd51e6645da1a39ee959e20cfa0 Mon Sep 17 00:00:00 2001
From: "Honnen, Julian" <julian.honnen@vector.com>
Date: Tue, 21 Mar 2023 09:27:56 +0100
Subject: [PATCH 0945/2068] changelog improvements

---
 CHANGES.md               | 2 ++
 plugin-gradle/CHANGES.md | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index c0deba72dc..756e86ae4c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* Support configuration of mirrors for P2 repositories in `EquoBasedStepBuilder` ([#1629](https://github.com/diffplug/spotless/issues/1629)).
 
 ## [2.37.0] - 2023-03-13
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 2bd6e4d39e..20668ea85c 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -4,7 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* Support configuration of mirrors for P2 repositories:
+* Support configuration of mirrors for P2 repositories ([#1629](https://github.com/diffplug/spotless/issues/1629)):
   ```
   spotless {
     java {
@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
     }
   }
   ```
+  Mirrors are selected by prefix match, for example `https://download.eclipse.org/eclipse/updates/4.26/` will be redirected to `https://some.internal.mirror/eclipse/eclipse/updates/4.26/`.
   The same configuration exists for `greclipse` and `eclipseCdt`.
 
 ## [6.17.0] - 2023-03-13

From 451854f25e5700929c1d3b0ba979cc6225a694cc Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 22 Mar 2023 04:26:37 +0000
Subject: [PATCH 0946/2068] chore(deps): update plugin com.github.spotbugs to
 v5.0.14

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 51c338b188..715d3ad112 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,7 +12,7 @@ plugins {
 	// https://github.com/gradle-nexus/publish-plugin/releases
 	id 'io.github.gradle-nexus.publish-plugin' version '1.3.0' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
-	id 'com.github.spotbugs' version '5.0.13' apply false
+	id 'com.github.spotbugs' version '5.0.14' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
 	id 'com.diffplug.spotless-changelog' version '3.0.1' apply false
 	// https://github.com/diffplug/goomph/blob/main/CHANGES.md

From f94582da771811f6ff9250b7a9e0b6d1e947d3bb Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 24 Mar 2023 16:00:36 +0000
Subject: [PATCH 0947/2068] chore(deps): update plugin com.gradle.enterprise to
 v3.12.6

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 51c338b188..17d1154699 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -23,7 +23,7 @@ plugins {
 	// https://github.com/davidburstrom/version-compatibility-gradle-plugin/tags
 	id 'io.github.davidburstrom.version-compatibility' version '0.4.0' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.enterprise
-	id 'com.gradle.enterprise' version '3.12.4'
+	id 'com.gradle.enterprise' version '3.12.6'
 	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
 	id 'dev.equo.ide' version '1.0.1' apply false
 }

From ce3c7daec169c567b6a682ca3e813dff788aed24 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sat, 25 Mar 2023 19:42:40 +0800
Subject: [PATCH 0948/2068] Remove unused Jvm args

---
 lib/build.gradle | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 9a6e7913d5..9d50dee71c 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -119,19 +119,10 @@ spotbugs { reportLevel = 'low' } // low|medium|high (low = sensitive to even min
 
 apply from: rootProject.file('gradle/special-tests.gradle')
 tasks.withType(Test).configureEach {
-	def args = []
 	if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_16)) {
 		// https://docs.gradle.org/7.5/userguide/upgrading_version_7.html#removes_implicit_add_opens_for_test_workers
-		args += [
-			"--add-opens=java.base/java.lang=ALL-UNNAMED",
-			"--add-opens=java.base/java.util=ALL-UNNAMED",
-		]
+		jvmArgs "--add-opens=java.base/java.lang=ALL-UNNAMED"
 	}
-	if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_18)) {
-		// https://openjdk.org/jeps/411
-		args += "-Djava.security.manager=allow"
-	}
-	jvmArgs(args)
 }
 
 jar {

From 0c79d980d5fa64f159791a8a5046bf7f79826f51 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 27 Mar 2023 22:40:51 +0000
Subject: [PATCH 0949/2068] fix(deps): update dependency
 com.google.googlejavaformat:google-java-format to v1.16.0

---
 lib/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 5480320889..a8eca18a57 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -71,7 +71,7 @@ dependencies {
 
 	palantirJavaFormatCompileOnly 'com.palantir.javaformat:palantir-java-format:1.1.0' 	// this version needs to stay compilable against Java 8 for CI Job testNpm
 
-	googleJavaFormatCompileOnly 'com.google.googlejavaformat:google-java-format:1.8' // minimum required version due to api changes before then
+	googleJavaFormatCompileOnly 'com.google.googlejavaformat:google-java-format:1.16.0' // minimum required version due to api changes before then
 
 	// used jackson-based formatters
 	jacksonCompileOnly 'com.fasterxml.jackson.core:jackson-databind:2.14.2'

From b636ebeb01d057d9e1c15195f9c9b6ea8460cbb0 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 27 Mar 2023 18:31:18 -0700
Subject: [PATCH 0950/2068] spotlessApply

---
 .../java/com/diffplug/spotless/extra/EquoBasedStepBuilder.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 ab20d27d88..cc12a938ad 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
@@ -94,7 +94,7 @@ EquoBasedStepBuilder.State get() throws Exception {
 		var query = createModelWithMirrors().query(P2ClientCache.PREFER_OFFLINE, P2QueryCache.ALLOW);
 		var classpath = new ArrayList<File>();
 		var mavenDeps = new ArrayList<String>();
-		mavenDeps.add("dev.equo.ide:solstice:1.0.0");
+		mavenDeps.add("dev.equo.ide:solstice:1.0.3");
 		mavenDeps.add("com.diffplug.durian:durian-swt.os:4.1.1");
 		mavenDeps.addAll(query.getJarsOnMavenCentral());
 		classpath.addAll(mavenProvisioner.provisionWithTransitives(false, mavenDeps));

From 939d45f05687448b92d66f10f18dcfe0d49615ad Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 28 Mar 2023 20:33:58 +0000
Subject: [PATCH 0951/2068] fix(deps): update dependency
 org.scalameta:scalafmt-core_2.13 to v3.7.3

---
 lib/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 5480320889..3bd48adb11 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -102,7 +102,7 @@ dependencies {
 	compatKtLint0Dot48Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-ruleset-experimental:0.48.0'
 	compatKtLint0Dot48Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.48.0'
 
-	String VER_SCALAFMT="3.7.1"
+	String VER_SCALAFMT="3.7.3"
 	scalafmtCompileOnly "org.scalameta:scalafmt-core_2.13:$VER_SCALAFMT"
 
 	String VER_DIKTAT = "1.2.4.2"

From 0f65045a35b41dcac39b6c312b117448db64cb05 Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Tue, 28 Mar 2023 22:58:00 +0200
Subject: [PATCH 0952/2068] Make sure the order of formatters is deterministic,
 fixes #1642

---
 .../java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java | 3 ++-
 .../java/com/diffplug/spotless/maven/FormattersHolder.java     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
index 2c0d6e35e6..d68387bb27 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
@@ -25,6 +25,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -211,7 +212,7 @@ public final void execute() throws MojoExecutionException {
 		List<FormatterFactory> formatterFactories = getFormatterFactories();
 		FormatterConfig config = getFormatterConfig();
 
-		Map<FormatterFactory, Supplier<Iterable<File>>> formatterFactoryToFiles = new HashMap<>();
+		Map<FormatterFactory, Supplier<Iterable<File>>> formatterFactoryToFiles = new LinkedHashMap<>();
 		for (FormatterFactory formatterFactory : formatterFactories) {
 			Supplier<Iterable<File>> filesToFormat = () -> collectFiles(formatterFactory, config);
 			formatterFactoryToFiles.put(formatterFactory, filesToFormat);
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormattersHolder.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormattersHolder.java
index 1c226423f6..ff3e1c81fe 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormattersHolder.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormattersHolder.java
@@ -17,6 +17,7 @@
 
 import java.io.File;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -33,7 +34,7 @@ class FormattersHolder implements AutoCloseable {
 	}
 
 	static FormattersHolder create(Map<FormatterFactory, Supplier<Iterable<File>>> formatterFactoryToFiles, FormatterConfig config) {
-		Map<Formatter, Supplier<Iterable<File>>> formatterToFiles = new HashMap<>();
+		Map<Formatter, Supplier<Iterable<File>>> formatterToFiles = new LinkedHashMap<>();
 		try {
 			for (Entry<FormatterFactory, Supplier<Iterable<File>>> entry : formatterFactoryToFiles.entrySet()) {
 				FormatterFactory formatterFactory = entry.getKey();

From a6b9f6ac4cb5c55c18605458c33547e91b34aec4 Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Tue, 28 Mar 2023 23:08:16 +0200
Subject: [PATCH 0953/2068] Add change

---
 plugin-maven/CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 421b5e56e7..589a7a3d91 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -6,6 +6,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changes
 * **POTENTIALLY BREAKING** Drop support for `googleJavaFormat` versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
 * Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
+* Fix non deterministic computation of cache fingerprint when using multiple formatters. ([#1643](https://github.com/diffplug/spotless/pull/1643) fixes [#1642](https://github.com/diffplug/spotless/pull/1642))
 
 ## [2.35.0] - 2023-03-13
 ### Added

From 39e40957bc26e5ac05b60e8678770590c9af61ee Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Sat, 1 Apr 2023 22:23:01 +0400
Subject: [PATCH 0954/2068] Rework based on Gherkin-utils

---
 .editorconfig                                 | 10 ++++
 lib/build.gradle                              |  6 +-
 .../glue/gherkin/GherkinFormatterFunc.java    | 60 +++++++++++++++++++
 .../spotless/gherkin/GherkinSimpleConfig.java | 36 +++++++++++
 .../spotless/gherkin/GherkinSimpleStep.java   | 50 ++++++----------
 plugin-gradle/CHANGES.md                      |  4 +-
 plugin-gradle/README.md                       | 10 ++--
 .../gradle/spotless/GherkinExtension.java     | 15 +++--
 .../gradle/spotless/GherkinExtensionTest.java |  4 +-
 plugin-maven/CHANGES.md                       |  1 +
 plugin-maven/README.md                        | 27 ++++++++-
 .../spotless/maven/AbstractSpotlessMojo.java  |  6 +-
 .../spotless/maven/gherkin/Gherkin.java       | 43 +++++++++++++
 .../spotless/maven/gherkin/SimpleGherkin.java | 42 +++++++++++++
 .../gherkin/descriptionsAfter.feature         | 16 +++--
 .../resources/gherkin/minimalAfter.feature    |  4 +-
 .../gherkin/GherkinSimpleStepTest.java        | 30 ++++++----
 17 files changed, 296 insertions(+), 68 deletions(-)
 create mode 100644 lib/src/gherkin/java/com/diffplug/spotless/glue/gherkin/GherkinFormatterFunc.java
 create mode 100644 lib/src/main/java/com/diffplug/spotless/gherkin/GherkinSimpleConfig.java
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/gherkin/Gherkin.java
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/gherkin/SimpleGherkin.java

diff --git a/.editorconfig b/.editorconfig
index 1c19210c40..4042d549fd 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -25,3 +25,13 @@ indent_style = space
 [*.{yml,yaml}]
 indent_style = space
 indent_size = 2
+
+# Prevent unexpected automatic indentation when crafting test-cases
+[/testlib/src/main/resources/**]
+charset = unset
+end_of_line = unset
+insert_final_newline = unset
+trim_trailing_whitespace = unset
+indent_style = unset
+indent_size = unset
+ij_formatter_enabled = false
diff --git a/lib/build.gradle b/lib/build.gradle
index 5480320889..4d95cfe84f 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -18,7 +18,8 @@ def NEEDS_GLUE = [
 	'scalafmt',
 	'jackson',
 	'gson',
-	'cleanthat'
+	'cleanthat',
+	'gherkin'
 ]
 for (glue in NEEDS_GLUE) {
 	sourceSets.register(glue) {
@@ -115,6 +116,9 @@ dependencies {
 
 	cleanthatCompileOnly 'io.github.solven-eu.cleanthat:java:2.6'
 	compatCleanthat2Dot1CompileAndTestOnly 'io.github.solven-eu.cleanthat:java:2.6'
+
+	gherkinCompileOnly 'io.cucumber:gherkin-utils:8.0.2'
+	gherkinCompileOnly 'org.slf4j:slf4j-api:2.0.0'
 }
 
 // we'll hold the core lib to a high standard
diff --git a/lib/src/gherkin/java/com/diffplug/spotless/glue/gherkin/GherkinFormatterFunc.java b/lib/src/gherkin/java/com/diffplug/spotless/glue/gherkin/GherkinFormatterFunc.java
new file mode 100644
index 0000000000..f46f7da32a
--- /dev/null
+++ b/lib/src/gherkin/java/com/diffplug/spotless/glue/gherkin/GherkinFormatterFunc.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.glue.gherkin;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.gherkin.GherkinSimpleConfig;
+
+import io.cucumber.gherkin.GherkinParser;
+import io.cucumber.gherkin.utils.pretty.Pretty;
+import io.cucumber.gherkin.utils.pretty.Syntax;
+import io.cucumber.messages.types.Envelope;
+import io.cucumber.messages.types.GherkinDocument;
+import io.cucumber.messages.types.Source;
+import io.cucumber.messages.types.SourceMediaType;
+
+public class GherkinFormatterFunc implements FormatterFunc {
+	private static final Logger LOGGER = LoggerFactory.getLogger(GherkinFormatterFunc.class);
+
+	private final GherkinSimpleConfig gherkinSimpleConfig;
+
+	public GherkinFormatterFunc(GherkinSimpleConfig gherkinSimpleConfig) {
+		this.gherkinSimpleConfig = gherkinSimpleConfig;
+	}
+
+	// Follows https://github.com/cucumber/gherkin-utils/blob/main/java/src/test/java/io/cucumber/gherkin/utils/pretty/PrettyTest.java
+	private GherkinDocument parse(String gherkin) {
+		GherkinParser parser = GherkinParser
+				.builder()
+				.includeSource(false)
+				.build();
+		return parser.parse(Envelope.of(new Source("test.feature", gherkin, SourceMediaType.TEXT_X_CUCUMBER_GHERKIN_PLAIN)))
+				.findFirst()
+				.orElseThrow(() -> new IllegalArgumentException("No envelope"))
+				.getGherkinDocument()
+				.orElseThrow(() -> new IllegalArgumentException("No gherkin document"));
+	}
+
+	@Override
+	public String apply(String inputString) {
+		GherkinDocument gherkinDocument = parse(inputString);
+
+		return Pretty.prettyPrint(gherkinDocument, Syntax.gherkin);
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/gherkin/GherkinSimpleConfig.java b/lib/src/main/java/com/diffplug/spotless/gherkin/GherkinSimpleConfig.java
new file mode 100644
index 0000000000..ba0d63763f
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/gherkin/GherkinSimpleConfig.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.gherkin;
+
+import java.io.Serializable;
+
+public class GherkinSimpleConfig implements Serializable {
+	public static int defaultIndentSpaces() {
+		// https://cucumber.io/docs/gherkin/reference/
+		// Recommended indentation is 2 spaces
+		return 2;
+	}
+
+	final int indentSpaces;
+
+	public GherkinSimpleConfig(int indentSpaces) {
+		this.indentSpaces = indentSpaces;
+	}
+
+	public int getIndentSpaces() {
+		return indentSpaces;
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/gherkin/GherkinSimpleStep.java b/lib/src/main/java/com/diffplug/spotless/gherkin/GherkinSimpleStep.java
index 1f41835c04..10954f2bb1 100644
--- a/lib/src/main/java/com/diffplug/spotless/gherkin/GherkinSimpleStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/gherkin/GherkinSimpleStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2021-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.util.Objects;
 
 import com.diffplug.spotless.FormatterFunc;
@@ -28,46 +27,35 @@
 import com.diffplug.spotless.Provisioner;
 
 public class GherkinSimpleStep {
-	private static final String MAVEN_COORDINATE = "me.jvt.cucumber:gherkin-formatter:";
-	private static final String DEFAULT_VERSION = "1.1.0";
+	private static final String MAVEN_COORDINATE = "io.cucumber:gherkin-utils:";
+	private static final String DEFAULT_VERSION = "8.0.2";
 
-	public static FormatterStep create(int indent, Provisioner provisioner) {
+	public static String defaultVersion() {
+		return DEFAULT_VERSION;
+	}
+
+	public static FormatterStep create(GherkinSimpleConfig gherkinSimpleConfig,
+			String formatterVersion, Provisioner provisioner) {
 		Objects.requireNonNull(provisioner, "provisioner cannot be null");
-		return FormatterStep.createLazy("gherkin", () -> new GherkinSimpleStep.State(indent, provisioner), GherkinSimpleStep.State::toFormatter);
+		return FormatterStep.createLazy("gherkin", () -> new GherkinSimpleStep.State(gherkinSimpleConfig, formatterVersion, provisioner), GherkinSimpleStep.State::toFormatter);
 	}
 
 	private static final class State implements Serializable {
 		private static final long serialVersionUID = 1L;
 
-		private final int indentSpaces;
+		private final GherkinSimpleConfig gherkinSimpleConfig;
 		private final JarState jarState;
 
-		private State(int indent, Provisioner provisioner) throws IOException {
-			this.indentSpaces = indent;
-			this.jarState = JarState.from(MAVEN_COORDINATE + DEFAULT_VERSION, provisioner);
+		private State(GherkinSimpleConfig gherkinSimpleConfig, String formatterVersion, Provisioner provisioner) throws IOException {
+			this.gherkinSimpleConfig = gherkinSimpleConfig;
+			this.jarState = JarState.from(MAVEN_COORDINATE + formatterVersion, provisioner);
 		}
 
-		FormatterFunc toFormatter() {
-			Method format;
-			Object formatter;
-			try {
-				ClassLoader classLoader = jarState.getClassLoader();
-				Class<?> prettyFormatter = classLoader.loadClass("me.jvt.cucumber.gherkinformatter.PrettyFormatter");
-				Class<?>[] constructorArguments = new Class[]{int.class};
-				Constructor<?> constructor = prettyFormatter.getConstructor(constructorArguments);
-				format = prettyFormatter.getMethod("format", String.class);
-				formatter = constructor.newInstance(indentSpaces);
-			} catch (ClassNotFoundException | NoSuchMethodException | InstantiationException | IllegalAccessException | InvocationTargetException e) {
-				throw new IllegalStateException(String.format("There was a problem preparing %s dependencies", MAVEN_COORDINATE), e);
-			}
-
-			return s -> {
-				try {
-					return (String) format.invoke(formatter, s);
-				} catch (InvocationTargetException ex) {
-					throw new AssertionError("Unable to format Gherkin", ex.getCause());
-				}
-			};
+		FormatterFunc toFormatter() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException,
+				InstantiationException, IllegalAccessException {
+			Class<?> formatterFunc = jarState.getClassLoader().loadClass("com.diffplug.spotless.glue.gherkin.GherkinFormatterFunc");
+			Constructor<?> constructor = formatterFunc.getConstructor(GherkinSimpleConfig.class);
+			return (FormatterFunc) constructor.newInstance(gherkinSimpleConfig);
 		}
 	}
 
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index de2ca7bdd5..62df3eac83 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -14,6 +14,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
   ```
   Mirrors are selected by prefix match, for example `https://download.eclipse.org/eclipse/updates/4.26/` will be redirected to `https://some.internal.mirror/eclipse/eclipse/updates/4.26/`.
   The same configuration exists for `greclipse` and `eclipseCdt`.
+* Added support for Gherkin feature files (#???(???))
 ### Changes
 * **POTENTIALLY BREAKING** Drop support for `googleJavaFormat` versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
 * Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
@@ -369,9 +370,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Spotless does not [yet](https://github.com/diffplug/spotless/pull/721) support configuration-cache, but now it can never interfere with configuration-cache for other tasks. ([#720](https://github.com/diffplug/spotless/pull/720))
 * Bump minimum required Gradle from `5.4` to `6.1`.
 
-### Added
-* Added Gradle configuration for Gherkin feature files
-
 ## [5.15.0] - 2021-09-04
 ### Added
 * Added support for `google-java-format`'s `skip-reflowing-long-strings` option ([#929](https://github.com/diffplug/spotless/pull/929))
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 6eb5bced6c..fde7c55b8f 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -66,6 +66,7 @@ Spotless supports all of Gradle's built-in performance features (incremental bui
   - [Typescript](#typescript) ([tsfmt](#tsfmt), [prettier](#prettier), [ESLint](#eslint-typescript))
   - [Javascript](#javascript) ([prettier](#prettier), [ESLint](#eslint-javascript))
   - [JSON](#json)
+  - [YAML](#yaml)
   - [Gherkin](#gherkin)
   - Multiple languages
     - [Prettier](#prettier) ([plugins](#prettier-plugins), [npm detection](#npm-detection), [`.npmrc` detection](#npmrc-detection), [caching `npm install` results](#caching-results-of-npm-install))
@@ -853,7 +854,7 @@ spotless {
 
 ## Gherkin
 
-- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/5.15.0/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
+- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
 
 ```gradle
 spotless {
@@ -871,16 +872,13 @@ Uses a Gherkin pretty-printer that optionally allows configuring the number of s
 ```gradle
 spotless {
   gherkin {
-    target 'src/**/*.feature'
+    target 'src/**/*.feature'     // required to be set explicitly
     simple()
-    // optional: specify the number of spaces to use
-    simple().indentWithSpaces(6)
+      .version('8.0.2')           // optional: custom version of 'io.cucumber:gherkin-utils'
   }
 }
 ```
 
-<a name="applying-prettier-to-javascript--flow--typescript--css--scss--less--jsx--graphql--yaml--etc"></a>
-
 ## Prettier
 
 [homepage](https://prettier.io/). [changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md). [official plugins](https://prettier.io/docs/en/plugins.html#official-plugins). [community plugins](https://prettier.io/docs/en/plugins.html#community-plugins). Prettier is a formatter that can format almost every anything - JavaScript, JSX, Angular, Vue, Flow, TypeScript, CSS, Less, SCSS, HTML, JSON, GraphQL, Markdown (including GFM and MDX), and YAML.  It can format even more [using plugins](https://prettier.io/docs/en/plugins.html) (PHP, Ruby, Swift, XML, Apex, Elm, Java (!!), Kotlin, pgSQL, .properties, solidity, svelte, toml, shellscript, ...).
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java
index 59ff16805f..f6f4c5a5c3 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,10 +18,10 @@
 import javax.inject.Inject;
 
 import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.gherkin.GherkinSimpleConfig;
 import com.diffplug.spotless.gherkin.GherkinSimpleStep;
 
 public class GherkinExtension extends FormatExtension {
-	private static final int DEFAULT_INDENTATION = 4;
 	static final String NAME = "gherkin";
 
 	@Inject
@@ -38,12 +38,19 @@ protected void setupTask(SpotlessTask task) {
 	}
 
 	public SimpleConfig simple() {
-		return new SimpleConfig(DEFAULT_INDENTATION);
+		return new SimpleConfig(GherkinSimpleConfig.defaultIndentSpaces());
 	}
 
 	public class SimpleConfig {
+		private String version;
 		private int indent;
 
+		public SimpleConfig() {
+			this.version = GherkinSimpleStep.defaultVersion();
+			this.indent = GherkinSimpleConfig.defaultIndentSpaces();
+			addStep(createStep());
+		}
+
 		public SimpleConfig(int indent) {
 			this.indent = indent;
 			addStep(createStep());
@@ -55,7 +62,7 @@ public void indentWithSpaces(int indent) {
 		}
 
 		private FormatterStep createStep() {
-			return GherkinSimpleStep.create(indent, provisioner());
+			return GherkinSimpleStep.create(new GherkinSimpleConfig(indent), version, provisioner());
 		}
 	}
 
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GherkinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GherkinExtensionTest.java
index 4b1fdc7efe..1be4f1f585 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GherkinExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GherkinExtensionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2021-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 
 import java.io.IOException;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class GherkinExtensionTest extends GradleIntegrationHarness {
 	@Test
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 421b5e56e7..f865ae4ea1 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -6,6 +6,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changes
 * **POTENTIALLY BREAKING** Drop support for `googleJavaFormat` versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
 * Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
+* Added support for Gherkin feature files (#???(???))
 
 ## [2.35.0] - 2023-03-13
 ### Added
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 5971721e24..84ca19f58d 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -53,6 +53,7 @@ user@machine repo % mvn spotless:check
   - [Javascript](#javascript) ([prettier](#prettier), [ESLint](#eslint-javascript))
   - [JSON](#json)
   - [YAML](#yaml)
+  - [Gherkin](#gherkin)
   - Multiple languages
     - [Prettier](#prettier) ([plugins](#prettier-plugins), [npm detection](#npm-detection), [`.npmrc` detection](#npmrc-detection), [caching `npm install` results](#caching-results-of-npm-install))
     - [eclipse web tools platform](#eclipse-web-tools-platform)
@@ -973,7 +974,31 @@ Uses Jackson and YAMLFactory to pretty print objects:
 </jackson>
 ```
 
-<a name="applying-prettier-to-javascript--flow--typescript--css--scss--less--jsx--graphql--yaml--etc"></a>
+## Gherkin
+
+- `com.diffplug.spotless.maven.FormatterFactory.addStepFactory(FormatterStepFactory)` [code](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/gherkin/Gherkin.java)
+
+```gradle
+<configuration>
+  <gherkin>
+    <includes>     <!-- You have to set the target manually -->
+      <include>src/**/*.feature</include>
+    </includes>
+
+    <simple />    <!-- has its own section below -->
+  </gherkin>
+</configuration>
+```
+
+### simple
+
+Uses a Gherkin pretty-printer that optionally allows configuring the number of spaces that are used to pretty print objects:
+
+```xml
+<simple>
+  <version>8.0.2</version>                 <!-- optional: Custom version of 'io.cucumber:gherkin-utils' -->
+</simple>
+```
 
 ## Prettier
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
index 2c0d6e35e6..b864a28f4c 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
@@ -61,6 +61,7 @@
 import com.diffplug.spotless.maven.cpp.Cpp;
 import com.diffplug.spotless.maven.generic.Format;
 import com.diffplug.spotless.maven.generic.LicenseHeader;
+import com.diffplug.spotless.maven.gherkin.Gherkin;
 import com.diffplug.spotless.maven.groovy.Groovy;
 import com.diffplug.spotless.maven.incremental.UpToDateChecker;
 import com.diffplug.spotless.maven.incremental.UpToDateChecking;
@@ -180,6 +181,9 @@ public abstract class AbstractSpotlessMojo extends AbstractMojo {
 	@Parameter
 	private Yaml yaml;
 
+	@Parameter
+	private Gherkin gherkin;
+
 	@Parameter(property = "spotlessFiles")
 	private String filePatterns;
 
@@ -354,7 +358,7 @@ private FileLocator getFileLocator() {
 	}
 
 	private List<FormatterFactory> getFormatterFactories() {
-		return Stream.concat(formats.stream(), Stream.of(groovy, java, scala, kotlin, cpp, typescript, javascript, antlr4, pom, sql, python, markdown, json, yaml))
+		return Stream.concat(formats.stream(), Stream.of(groovy, java, scala, kotlin, cpp, typescript, javascript, antlr4, pom, sql, python, markdown, json, yaml, gherkin))
 				.filter(Objects::nonNull)
 				.collect(toList());
 	}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/gherkin/Gherkin.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/gherkin/Gherkin.java
new file mode 100644
index 0000000000..614e5026a0
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/gherkin/Gherkin.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.gherkin;
+
+import java.util.Collections;
+import java.util.Set;
+
+import org.apache.maven.project.MavenProject;
+
+import com.diffplug.spotless.maven.FormatterFactory;
+
+/**
+ * A {@link FormatterFactory} implementation that corresponds to {@code <gherkin>...</gherkin>} configuration element.
+ */
+public class Gherkin extends FormatterFactory {
+	@Override
+	public Set<String> defaultIncludes(MavenProject project) {
+		return Collections.emptySet();
+	}
+
+	@Override
+	public String licenseHeaderDelimiter() {
+		return null;
+	}
+
+	public void addSimple(SimpleGherkin simple) {
+		addStepFactory(simple);
+	}
+
+}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/gherkin/SimpleGherkin.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/gherkin/SimpleGherkin.java
new file mode 100644
index 0000000000..e74bca929d
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/gherkin/SimpleGherkin.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.gherkin;
+
+import org.apache.maven.plugins.annotations.Parameter;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.gherkin.GherkinSimpleConfig;
+import com.diffplug.spotless.gherkin.GherkinSimpleStep;
+import com.diffplug.spotless.maven.FormatterFactory;
+import com.diffplug.spotless.maven.FormatterStepConfig;
+import com.diffplug.spotless.maven.FormatterStepFactory;
+
+/**
+ * A {@link FormatterFactory} implementation that corresponds to {@code <gherkin><simple>...</simple></gherkin>} configuration element.
+ */
+public class SimpleGherkin implements FormatterStepFactory {
+
+	@Parameter
+	private String version = GherkinSimpleStep.defaultVersion();
+
+	@Parameter
+	private int indentWithSpaces = GherkinSimpleConfig.defaultIndentSpaces();
+
+	@Override
+	public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
+		return GherkinSimpleStep.create(new GherkinSimpleConfig(indentWithSpaces), version, stepConfig.getProvisioner());
+	}
+}
diff --git a/testlib/src/main/resources/gherkin/descriptionsAfter.feature b/testlib/src/main/resources/gherkin/descriptionsAfter.feature
index e7998a203a..9c0eb7e303 100644
--- a/testlib/src/main/resources/gherkin/descriptionsAfter.feature
+++ b/testlib/src/main/resources/gherkin/descriptionsAfter.feature
@@ -4,44 +4,52 @@ Feature: Descriptions everywhere
   Scenario: two lines
   This description
   has two lines and indented with two spaces
+
     Given the minimalism
 
   Scenario: without indentation
-  This is a description without indentation
+This is a description without indentation
+
     Given the minimalism
 
   Scenario: empty lines in the middle
   This description
 
   has an empty line in the middle
+
     Given the minimalism
 
   Scenario: empty lines around
   This description
   has an empty lines around
+
     Given the minimalism
 
   Scenario: comment after description
   This description
   has a comment after
+
     # this is a comment
     Given the minimalism
 
   Scenario: comment right after description
   This description
   has a comment right after
-    #  this is another comment
+
+    # this is another comment
     Given the minimalism
 
   Scenario: description with escaped docstring separator
   This description has an \"\"\" (escaped docstring sparator)
+
     Given the minimalism
 
   Scenario Outline: scenario outline with a description
-  This is a scenario outline description
+This is a scenario outline description
+
     Given the minimalism
 
     Examples: examples with description
-    This is an examples description
+This is an examples description
       | foo |
       | bar |
diff --git a/testlib/src/main/resources/gherkin/minimalAfter.feature b/testlib/src/main/resources/gherkin/minimalAfter.feature
index 44467df367..9a62d86f80 100644
--- a/testlib/src/main/resources/gherkin/minimalAfter.feature
+++ b/testlib/src/main/resources/gherkin/minimalAfter.feature
@@ -1,4 +1,4 @@
 Feature: Minimal
 
-    Scenario: minimalistic
-        Given the minimalism
+  Scenario: minimalistic
+    Given the minimalism
diff --git a/testlib/src/test/java/com/diffplug/spotless/gherkin/GherkinSimpleStepTest.java b/testlib/src/test/java/com/diffplug/spotless/gherkin/GherkinSimpleStepTest.java
index 1210bf21dd..2c85d72069 100644
--- a/testlib/src/test/java/com/diffplug/spotless/gherkin/GherkinSimpleStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/gherkin/GherkinSimpleStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2021-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,8 @@
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.SerializableEqualityTester;
@@ -26,14 +27,15 @@
 
 public class GherkinSimpleStepTest {
 
-	private static final int INDENT = 2;
+	private static final String VERSION = GherkinSimpleStep.defaultVersion();
+	private static final int INDENT = GherkinSimpleConfig.defaultIndentSpaces();
 
-	private final FormatterStep step = GherkinSimpleStep.create(INDENT, TestProvisioner.mavenCentral());
+	private final FormatterStep step = GherkinSimpleStep.create(new GherkinSimpleConfig(INDENT), VERSION, TestProvisioner.mavenCentral());
 	private final StepHarness stepHarness = StepHarness.forStep(step);
 
 	@Test
 	public void cannotProvidedNullProvisioner() {
-		assertThatThrownBy(() -> GherkinSimpleStep.create(INDENT, null)).isInstanceOf(NullPointerException.class).hasMessage("provisioner cannot be null");
+		assertThatThrownBy(() -> GherkinSimpleStep.create(new GherkinSimpleConfig(INDENT), VERSION, null)).isInstanceOf(NullPointerException.class).hasMessage("provisioner cannot be null");
 	}
 
 	@Test
@@ -59,20 +61,21 @@ public void handlesRuleWithTag() throws Exception {
 	@Test
 	public void handlesInvalidGherkin() {
 		assertThatThrownBy(() -> doWithResource(stepHarness, "invalidGherkin"))
-				.isInstanceOf(AssertionError.class)
-				.hasMessage("Unable to format Gherkin");
+				.isInstanceOf(IllegalArgumentException.class)
+				.hasMessage("No gherkin document");
 	}
 
 	@Test
 	public void handlesNotGherkin() {
 		assertThatThrownBy(() -> doWithResource(stepHarness, "notGherkin"))
-				.isInstanceOf(AssertionError.class)
-				.hasMessage("Unable to format Gherkin");
+				.isInstanceOf(IllegalArgumentException.class)
+				.hasMessage("No gherkin document");
 	}
 
+	@Disabled("gherkin-utils does not allow custom indentation")
 	@Test
 	public void canSetCustomIndentationLevel() throws Exception {
-		FormatterStep step = GherkinSimpleStep.create(6, TestProvisioner.mavenCentral());
+		FormatterStep step = GherkinSimpleStep.create(new GherkinSimpleConfig(6), VERSION, TestProvisioner.mavenCentral());
 		StepHarness stepHarness = StepHarness.forStep(step);
 
 		String before = "gherkin/minimalBefore.feature";
@@ -80,9 +83,10 @@ public void canSetCustomIndentationLevel() throws Exception {
 		stepHarness.testResource(before, after);
 	}
 
+	@Disabled("gherkin-utils does not allow custom indentation")
 	@Test
 	public void canSetIndentationLevelTo0() throws Exception {
-		FormatterStep step = GherkinSimpleStep.create(0, TestProvisioner.mavenCentral());
+		FormatterStep step = GherkinSimpleStep.create(new GherkinSimpleConfig(0), VERSION, TestProvisioner.mavenCentral());
 		StepHarness stepHarness = StepHarness.forStep(step);
 
 		String before = "gherkin/minimalBefore.feature";
@@ -107,12 +111,12 @@ protected void setupTest(API api) {
 
 			@Override
 			protected FormatterStep create() {
-				return GherkinSimpleStep.create(spaces, TestProvisioner.mavenCentral());
+				return GherkinSimpleStep.create(new GherkinSimpleConfig(spaces), VERSION, TestProvisioner.mavenCentral());
 			}
 		}.testEquals();
 	}
 
-	private static void doWithResource(StepHarness stepHarness, String name) throws Exception {
+	private static void doWithResource(StepHarness stepHarness, String name) {
 		String before = String.format("gherkin/%sBefore.feature", name);
 		String after = String.format("gherkin/%sAfter.feature", name);
 		stepHarness.testResource(before, after);

From 1023d8cdb92a1c67accdfd13c6937cd5d07233a1 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Sat, 1 Apr 2023 22:29:23 +0400
Subject: [PATCH 0955/2068] Fix MD related files

---
 CHANGES.md               | 5 +----
 plugin-gradle/CHANGES.md | 2 +-
 plugin-maven/CHANGES.md  | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 3911e67cd9..31860d3bde 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Support configuration of mirrors for P2 repositories in `EquoBasedStepBuilder` ([#1629](https://github.com/diffplug/spotless/issues/1629)).
+* Added formatter for Gherkin feature files ([1649](https://github.com/diffplug/spotless/issues/1649)).
 ### Changes
 * **POTENTIALLY BREAKING** Converted `googleJavaFormat` to a compile-only dependency and drop support for versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
 * Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
@@ -321,10 +322,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
   * `eclipse-jdt` from `4.19` to `4.20`
   * `eclipse-wtp` from `4.18` to `4.20`
 
-### Added
-* Added formatter for [Gherkin feature files](https://github.com/diffplug/spotless/issues/928)
-* Added Gradle configuration for Gherkin feature files
-
 ## [2.16.0] - 2021-09-04
 ### Added
 * Added support for `google-java-format`'s `skip-reflowing-long-strings` option ([#929](https://github.com/diffplug/spotless/pull/929))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 62df3eac83..1d95606ab9 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -14,7 +14,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
   ```
   Mirrors are selected by prefix match, for example `https://download.eclipse.org/eclipse/updates/4.26/` will be redirected to `https://some.internal.mirror/eclipse/eclipse/updates/4.26/`.
   The same configuration exists for `greclipse` and `eclipseCdt`.
-* Added support for Gherkin feature files (#???(???))
+* Added support for Gherkin feature files ([1649](https://github.com/diffplug/spotless/issues/1649)).
 ### Changes
 * **POTENTIALLY BREAKING** Drop support for `googleJavaFormat` versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
 * Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index f865ae4ea1..1557fe3966 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -6,7 +6,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changes
 * **POTENTIALLY BREAKING** Drop support for `googleJavaFormat` versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
 * Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
-* Added support for Gherkin feature files (#???(???))
+* Added support for Gherkin feature files ([1649](https://github.com/diffplug/spotless/issues/1649)).
 
 ## [2.35.0] - 2023-03-13
 ### Added

From 3a1652a34a4c136cec5cac48060d71e6d67af5b5 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Sun, 2 Apr 2023 13:03:16 +0400
Subject: [PATCH 0956/2068] Fix tests

---
 .../gradle/spotless/GherkinExtension.java     | 11 ++----
 .../gradle/spotless/GherkinExtensionTest.java | 24 ++-----------
 .../maven/MavenIntegrationHarness.java        |  4 +++
 .../spotless/maven/gherkin/GherkinTest.java   | 34 +++++++++++++++++++
 4 files changed, 44 insertions(+), 29 deletions(-)
 create mode 100644 plugin-maven/src/test/java/com/diffplug/spotless/maven/gherkin/GherkinTest.java

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java
index f6f4c5a5c3..ca2fcfbce6 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java
@@ -38,7 +38,7 @@ protected void setupTask(SpotlessTask task) {
 	}
 
 	public SimpleConfig simple() {
-		return new SimpleConfig(GherkinSimpleConfig.defaultIndentSpaces());
+		return new SimpleConfig();
 	}
 
 	public class SimpleConfig {
@@ -51,13 +51,8 @@ public SimpleConfig() {
 			addStep(createStep());
 		}
 
-		public SimpleConfig(int indent) {
-			this.indent = indent;
-			addStep(createStep());
-		}
-
-		public void indentWithSpaces(int indent) {
-			this.indent = indent;
+		public void version(String version) {
+			this.version = version;
 			replaceStep(createStep());
 		}
 
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GherkinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GherkinExtensionTest.java
index 1be4f1f585..a89d0ae03a 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GherkinExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GherkinExtensionTest.java
@@ -23,16 +23,16 @@ public class GherkinExtensionTest extends GradleIntegrationHarness {
 	@Test
 	public void defaultFormatting() throws IOException {
 		setFile("build.gradle").toLines(
-				"buildscript { repositories { mavenCentral() } }",
 				"plugins {",
 				"    id 'java'",
 				"    id 'com.diffplug.spotless'",
 				"}",
+			"repositories { mavenCentral() }",
 				"spotless {",
-				"    gherkin {",
+				"  gherkin {",
 				"    target 'examples/**/*.feature'",
 				"    simple()",
-				"}",
+				"  }",
 				"}");
 		setFile("src/main/resources/example.feature").toResource("gherkin/minimalBefore.feature");
 		setFile("examples/main/resources/example.feature").toResource("gherkin/minimalBefore.feature");
@@ -41,22 +41,4 @@ public void defaultFormatting() throws IOException {
 		assertFile("examples/main/resources/example.feature").sameAsResource("gherkin/minimalAfter.feature");
 	}
 
-	@Test
-	public void formattingWithCustomNumberOfSpaces() throws IOException {
-		setFile("build.gradle").toLines(
-				"buildscript { repositories { mavenCentral() } }",
-				"plugins {",
-				"    id 'java'",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"spotless {",
-				"    gherkin {",
-				"    target 'src/**/*.feature'",
-				"    simple().indentWithSpaces(6)",
-				"}",
-				"}");
-		setFile("src/main/resources/example.feature").toResource("gherkin/minimalBefore.feature");
-		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("src/main/resources/example.feature").sameAsResource("gherkin/minimalAfter6Spaces.feature");
-	}
 }
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
index 2891ee3b2c..216502bc07 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
@@ -174,6 +174,10 @@ protected void writePomWithYamlSteps(String... steps) throws IOException {
 		writePom(groupWithSteps("yaml", including("**/*.yaml"), steps));
 	}
 
+	protected void writePomWithGherkinSteps(String... steps) throws IOException {
+		writePom(groupWithSteps("gherkin", including("**/*.feature"), steps));
+	}
+
 	protected void writePom(String... configuration) throws IOException {
 		writePom(null, configuration, null, null);
 	}
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/gherkin/GherkinTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/gherkin/GherkinTest.java
new file mode 100644
index 0000000000..314c4a58d9
--- /dev/null
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/gherkin/GherkinTest.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.gherkin;
+
+import com.diffplug.spotless.maven.MavenIntegrationHarness;
+
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class GherkinTest extends MavenIntegrationHarness {
+	@Test
+	public void testFormatJson_WithSimple_defaultConfig_sortByKeys() throws Exception {
+		writePomWithGherkinSteps("<simple/>");
+
+		setFile("examples/main/resources/example.feature").toResource("gherkin/minimalBefore.feature");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("examples/main/resources/example.feature").sameAsResource("gherkin/minimalAfter.feature");
+	}
+
+}

From 7661516567642de7931bd72ef3cd7a7118e6c1a9 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Sun, 2 Apr 2023 13:12:04 +0400
Subject: [PATCH 0957/2068] Fix style

---
 .../com/diffplug/gradle/spotless/GherkinExtensionTest.java  | 2 +-
 .../com/diffplug/spotless/maven/gherkin/GherkinTest.java    | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GherkinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GherkinExtensionTest.java
index a89d0ae03a..915322830b 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GherkinExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GherkinExtensionTest.java
@@ -27,7 +27,7 @@ public void defaultFormatting() throws IOException {
 				"    id 'java'",
 				"    id 'com.diffplug.spotless'",
 				"}",
-			"repositories { mavenCentral() }",
+				"repositories { mavenCentral() }",
 				"spotless {",
 				"  gherkin {",
 				"    target 'examples/**/*.feature'",
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/gherkin/GherkinTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/gherkin/GherkinTest.java
index 314c4a58d9..f4928da3d6 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/gherkin/GherkinTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/gherkin/GherkinTest.java
@@ -15,11 +15,9 @@
  */
 package com.diffplug.spotless.maven.gherkin;
 
-import com.diffplug.spotless.maven.MavenIntegrationHarness;
-
 import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import com.diffplug.spotless.maven.MavenIntegrationHarness;
 
 public class GherkinTest extends MavenIntegrationHarness {
 	@Test

From 9076bfb4271ed2f3aae71cc901b152f01c04f923 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Sun, 2 Apr 2023 18:51:54 +0400
Subject: [PATCH 0958/2068] Fix spotbugs

---
 .../java/com/diffplug/spotless/gherkin/GherkinSimpleConfig.java | 2 ++
 .../src/main/resources/gherkin/complex_backgroundAfter.feature  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/gherkin/GherkinSimpleConfig.java b/lib/src/main/java/com/diffplug/spotless/gherkin/GherkinSimpleConfig.java
index ba0d63763f..6c718e0382 100644
--- a/lib/src/main/java/com/diffplug/spotless/gherkin/GherkinSimpleConfig.java
+++ b/lib/src/main/java/com/diffplug/spotless/gherkin/GherkinSimpleConfig.java
@@ -18,6 +18,8 @@
 import java.io.Serializable;
 
 public class GherkinSimpleConfig implements Serializable {
+	private static final long serialVersionUID = 1L;
+
 	public static int defaultIndentSpaces() {
 		// https://cucumber.io/docs/gherkin/reference/
 		// Recommended indentation is 2 spaces
diff --git a/testlib/src/main/resources/gherkin/complex_backgroundAfter.feature b/testlib/src/main/resources/gherkin/complex_backgroundAfter.feature
index eb4d4de89a..5a9553d98d 100644
--- a/testlib/src/main/resources/gherkin/complex_backgroundAfter.feature
+++ b/testlib/src/main/resources/gherkin/complex_backgroundAfter.feature
@@ -12,7 +12,7 @@ Feature: Complex background
 
   Rule: My Rule
 
-    Background:
+    Background: 
       Given a rule background step
 
     Scenario: with examples

From 504f8c62eccde68a5a5f5b2847ca01899b1b4562 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 2 Apr 2023 08:26:12 -0700
Subject: [PATCH 0959/2068] Create SECURITY.md

---
 SECURITY.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 SECURITY.md

diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 0000000000..56294d0a51
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1 @@
+For security disclosures, please send an email to spotless-security@diffplug.com

From 5fd904e534dd8133cd49d989bc06a0c82a07b3dc Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <sensenmann5@gmail.com>
Date: Sun, 2 Apr 2023 21:01:58 +0100
Subject: [PATCH 0960/2068] POC: Basic support for rome

---
 .../com/diffplug/spotless/Architecture.java   |  39 ++
 .../main/java/com/diffplug/spotless/OS.java   |  21 +
 .../java/com/diffplug/spotless/Platform.java  |  87 ++++
 .../spotless/javascript/RomeStep.java         | 121 ++++++
 .../rome/RomeExecutableDownloader.java        | 398 ++++++++++++++++++
 .../spotless/maven/javascript/Javascript.java |   4 +
 .../spotless/maven/javascript/RomeJs.java     |  61 +++
 .../spotless/maven/typescript/Typescript.java |   5 +
 8 files changed, 736 insertions(+)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/Architecture.java
 create mode 100644 lib/src/main/java/com/diffplug/spotless/OS.java
 create mode 100644 lib/src/main/java/com/diffplug/spotless/Platform.java
 create mode 100644 lib/src/main/java/com/diffplug/spotless/javascript/RomeStep.java
 create mode 100644 lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java

diff --git a/lib/src/main/java/com/diffplug/spotless/Architecture.java b/lib/src/main/java/com/diffplug/spotless/Architecture.java
new file mode 100644
index 0000000000..211a5cb699
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/Architecture.java
@@ -0,0 +1,39 @@
+package com.diffplug.spotless;
+
+/**
+ * Enumeration of possible computer architectures.
+ *
+ */
+public enum Architecture {
+	x86, x64, ppc64le, s390x, arm64, armv7l, ppc, ppc64;
+
+	/**
+	 * Attempts to guess the architecture of the environment running the JVM.
+	 * 
+	 * @return The best guess for the architecture.
+	 */
+	public static Architecture guess() {
+		var arch = System.getProperty("os.arch");
+		var version = System.getProperty("os.version");
+
+		if (arch.equals("ppc64le")) {
+			throw new IllegalArgumentException();
+		} else if (arch.equals("aarch64")) {
+			return arm64;
+		} else if (arch.equals("s390x")) {
+			return s390x;
+		} else if (arch.equals("arm")) {
+			if (version.contains("v7")) {
+				return armv7l;
+			} else {
+				return arm64;
+			}
+		} else if (arch.equals("ppc64")) {
+			return ppc64;
+		} else if (arch.equals("ppc")) {
+			return ppc;
+		} else {
+			return arch.contains("64") ? x64 : x86;
+		}
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/OS.java b/lib/src/main/java/com/diffplug/spotless/OS.java
new file mode 100644
index 0000000000..0e05c948de
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/OS.java
@@ -0,0 +1,21 @@
+package com.diffplug.spotless;
+
+/**
+ * Enumeration of possible computer operation systems.
+ */
+public enum OS {
+	Windows, Mac, Linux, SunOS, AIX;
+
+	/**
+	 * Attempts to guess the OS of the environment running the JVM.
+	 * 
+	 * @return The best guess for the architecture.
+	 */
+	public static OS guess() {
+		var osName = System.getProperty("os.name");
+		return osName.contains("Windows") ? OS.Windows
+				: osName.contains("Mac") ? OS.Mac
+						: osName.contains("SunOS") ? OS.SunOS
+								: osName.toUpperCase().contains("AIX") ? OS.AIX : OS.Linux;
+	}
+}
\ No newline at end of file
diff --git a/lib/src/main/java/com/diffplug/spotless/Platform.java b/lib/src/main/java/com/diffplug/spotless/Platform.java
new file mode 100644
index 0000000000..c57932a7c6
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/Platform.java
@@ -0,0 +1,87 @@
+package com.diffplug.spotless;
+
+/**
+ * Represents a platform where code is run, consisting of an operating system
+ * and an architecture.
+ */
+public class Platform {
+	/**
+	 * Attempts to guess the platform of the hosting environment running the JVM
+	 * machine.
+	 * 
+	 * @return The best guess for the current OS and architecture.
+	 */
+	public static Platform guess() {
+		var os = OS.guess();
+		var architecture = Architecture.guess();
+		return new Platform(os, architecture);
+	}
+
+	private final Architecture architecture;
+
+	private final OS os;
+
+	/**
+	 * Creates a new Platform descriptor for the given OS and architecture.
+	 * @param os Operating system of the platform.
+	 * @param architecture Architecture of the platform.
+	 */
+	public Platform(OS os, Architecture architecture) {
+		this.os = os;
+		this.architecture = architecture;
+	}
+
+	/**
+	 * @return The architecture of this platform.
+	 */
+	public Architecture getArchitecture() {
+		return architecture;
+	}
+
+	/**
+	 * @return The operating system of this platform.
+	 */
+	public OS getOs() {
+		return os;
+	}
+
+	/**
+	 * @return Whether the operating system is Aix.
+	 */
+	public boolean isAix() {
+		return os == OS.AIX;
+	}
+
+	/**
+	 * @return Whether the operating system is Linux.
+	 */
+	public boolean isLinux() {
+		return os == OS.Linux;
+	}
+
+	/**
+	 * @return Whether the operating system is Mac.
+	 */
+	public boolean isMac() {
+		return os == OS.Mac;
+	}
+
+	/**
+	 * @return Whether the operating system is SunOS.
+	 */
+	public boolean isSunos() {
+		return os == OS.SunOS;
+	}
+
+	/**
+	 * @return Whether the operating system is Windows.
+	 */
+	public boolean isWindows() {
+		return os == OS.Windows;
+	}
+
+	@Override
+	public String toString() {
+		return String.format("Platform[os=%s,architecture=%s]", os, architecture);
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/javascript/RomeStep.java b/lib/src/main/java/com/diffplug/spotless/javascript/RomeStep.java
new file mode 100644
index 0000000000..4c8a487456
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/javascript/RomeStep.java
@@ -0,0 +1,121 @@
+package com.diffplug.spotless.javascript;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.attribute.PosixFilePermission;
+import java.util.HashSet;
+
+import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.Platform;
+import com.diffplug.spotless.ProcessRunner;
+import com.diffplug.spotless.rome.RomeExecutableDownloader;
+
+/**
+ * formatter step that formats JavaScript and TypeScript code with Rome:
+ * <a href= "https://github.com/rome/tools">https://github.com/rome/tools</a>.
+ * It delegates to the Rome executable.
+ */
+public class RomeStep {
+	public static String name() {
+		return "rome";
+	}
+
+	private final String version;
+
+	private final String pathToExe;
+
+	private final String pathToExeDownloadDir;
+
+	private RomeStep(String version, String pathToExe, String pathToExeDownloadDir) {
+		this.version = version != null && !version.isBlank() ? version : RomeStep.defaultVersion();
+		this.pathToExe = pathToExe;
+		this.pathToExeDownloadDir = pathToExeDownloadDir;
+	}
+
+	public FormatterStep create() {
+		return FormatterStep.createLazy(name(), this::createState, State::toFunc);
+	}
+
+	private State createState() throws IOException, InterruptedException {
+		var resolvedPathToExe = resolveExe();
+		makeExecutable(resolvedPathToExe);
+		return new State(this, resolvedPathToExe);
+	}
+
+	private String resolveExe() throws IOException, InterruptedException {
+		if (pathToExe != null) {
+			return pathToExe;
+		} else {
+			var downloader = new RomeExecutableDownloader(Paths.get(pathToExeDownloadDir));
+			var platform = Platform.guess();
+			if (!downloader.isSupported(platform)) {
+				throw new IllegalStateException(
+						"Unsupported platform " + platform + ", please specifiy the Rome executable directly");
+			}
+			var downloaded = downloader.ensureDownloaded(version, platform).toString();
+			makeExecutable(downloaded);
+			return downloaded;
+		}
+	}
+
+	public static RomeStep withVersionAndExe(String version, String pathToExe) {
+		return new RomeStep(version, pathToExe, null);
+	}
+
+	public static RomeStep withVersionAndExeDownload(String version, String pathToExeDownloadDir) {
+		return new RomeStep(version, null, pathToExeDownloadDir);
+	}
+
+	private static String defaultVersion() {
+		return "12.0.0";
+	}
+
+	private static void makeExecutable(String exe) {
+		var exePath = Paths.get(exe);
+		addPosixPermission(exePath, PosixFilePermission.GROUP_EXECUTE);
+		addPosixPermission(exePath, PosixFilePermission.OTHERS_EXECUTE);
+		addPosixPermission(exePath, PosixFilePermission.OWNER_EXECUTE);
+	}
+
+	private static boolean addPosixPermission(Path file, PosixFilePermission permission) {
+		try {
+			var newPermissions = new HashSet<>(Files.getPosixFilePermissions(file));
+			newPermissions.add(permission);
+			Files.setPosixFilePermissions(file, newPermissions);
+			return true;
+		} catch (final Exception e) {
+			return false;
+		}
+	}
+
+	static class State implements Serializable {
+		private static final long serialVersionUID = -1825662356883926318L;
+
+		// used for up-to-date checks and caching
+		final String version;
+
+		final String pathToExe;
+
+		State(RomeStep step, String exe) {
+			this.version = step.version;
+			this.pathToExe = exe;
+		}
+
+		String format(ProcessRunner runner, String input, File file) throws IOException, InterruptedException {
+			var stdin = input.getBytes(StandardCharsets.UTF_8);
+			var args = new String[] { pathToExe, "format", "--stdin-file-path", file.getName() };
+			return runner.exec(stdin, args).assertExitZero(StandardCharsets.UTF_8);
+		}
+
+		FormatterFunc.Closeable toFunc() {
+			var runner = new ProcessRunner();
+			return FormatterFunc.Closeable.of(runner, this::format);
+		}
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java b/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java
new file mode 100644
index 0000000000..5df807003d
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java
@@ -0,0 +1,398 @@
+package com.diffplug.spotless.rome;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpClient.Redirect;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.OpenOption;
+import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Objects;
+import java.util.Optional;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.diffplug.spotless.Architecture;
+import com.diffplug.spotless.OS;
+import com.diffplug.spotless.Platform;
+
+/**
+ * Downloader for the Rome executable:
+ * <a href="https://github.com/rome/tools">https://github.com/rome/tools</a>.
+ */
+public class RomeExecutableDownloader {
+	private static final Logger logger = LoggerFactory.getLogger(RomeExecutableDownloader.class);
+
+	/**
+	 * The checksum algorithm to use for checking the integrity of downloaded files.
+	 */
+	private static final String CHECKSUM_ALGORITHM = "MD5";
+
+	/**
+	 * The pattern for {@link String#format(String, Object...) String.format()} for
+	 * the file name of a Rome executable for a certain version and architecure. The
+	 * first parameter is the platform, the second is the OS, the third is the
+	 * architecture.
+	 */
+	private static final String DOWNLOAD_FILE_PATTERN = "rome-%s-%s-%s";
+
+	/**
+	 * The pattern for {@link String#format(String, Object...) String.format()} for
+	 * the platform part of the Rome executable download URL. First parameter is the
+	 * OS, second parameter the architecture, the third the file extension.
+	 */
+	private static final String PLATFORM_PATTERN = "%s-%s%s";
+
+	/**
+	 * {@link OpenOption Open options} for reading an existing file without write
+	 * access.
+	 */
+	private static final OpenOption[] READ_OPTIONS = { StandardOpenOption.READ };
+
+	/**
+	 * The pattern for {@link String#format(String, Object...) String.format()} for
+	 * the URL where the Rome executables can be downloaded. The first parameter is
+	 * the version, the second parameter is the OS / platform.
+	 */
+	private static final String URL_PATTERN = "https://github.com/rome/tools/releases/download/cli%%2Fv%s/rome-%s";
+
+	/**
+	 * {@link OpenOption Open options} for creating a new file, overwriting the
+	 * existing file if present.
+	 */
+	private static final OpenOption[] WRITE_OPTIONS = { StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING,
+			StandardOpenOption.WRITE };
+
+	private Path downloadDir;
+
+	/**
+	 * Creates a new downloader for the Rome executable. The executable files are
+	 * stored in the given download directory.
+	 * 
+	 * @param downloadDir Directory where
+	 */
+	public RomeExecutableDownloader(Path downloadDir) {
+		this.downloadDir = downloadDir;
+	}
+
+	/**
+	 * Downloads the Rome executable for the current platform from the network to
+	 * the download directory. When the executable exists already, it is
+	 * overwritten.
+	 * 
+	 * @param version  Desired Rome version.
+	 * @param platform Desired platform.
+	 * @return The path to the Rome executable.
+	 * @throws IOException          When the executable cannot be downloaded from
+	 *                              the network or the file system could not be
+	 *                              accessed.
+	 * @throws InterruptedException When this thread was interrupted while
+	 *                              downloading the file.
+	 */
+	public Path download(String version, Platform platform) throws IOException, InterruptedException {
+		var url = getDownloadUrl(version, platform);
+		var executablePath = getExecutablePath(version, platform);
+		var checksumPath = getChecksumPath(executablePath);
+		Files.createDirectories(executablePath.getParent());
+		logger.info("Attempting to download Rome from '{}' to '{}'", url, executablePath);
+		var request = HttpRequest.newBuilder(URI.create(url)).GET().build();
+		var handler = BodyHandlers.ofFile(executablePath, WRITE_OPTIONS);
+		var response = HttpClient.newBuilder().followRedirects(Redirect.NORMAL).build().send(request, handler);
+		if (response.statusCode() != 200) {
+			throw new IOException("Failed to download file from " + url + ", server returned " + response.statusCode());
+		}
+		var downloadedFile = response.body();
+		if (!Files.exists(downloadedFile) || Files.size(downloadedFile) == 0) {
+			throw new IOException("Failed to download file from " + url + ", file is empty or does not exist");
+		}
+		writeChecksumFile(downloadedFile, checksumPath);
+		logger.debug("Rome was downloaded successfully to '{}'", downloadedFile);
+		return downloadedFile;
+	}
+
+	/**
+	 * Ensures that the Rome executable for the current platform exists in the
+	 * download directory. When the executable does not exist in the download
+	 * directory, an attempt is made to download the Rome executable from the
+	 * network. When the executable exists already, no attempt to download it again
+	 * is made.
+	 * 
+	 * @param version Desired Rome version.
+	 * @return The path to the Rome executable.
+	 * @throws IOException          When the executable cannot be downloaded from
+	 *                              the network or the file system could not be
+	 *                              accessed.
+	 * @throws InterruptedException When this thread was interrupted while
+	 *                              downloading the file.
+	 */
+	public Path ensureDownloaded(String version, Platform platform) throws IOException, InterruptedException {
+		logger.debug("Ensuring that Rome for platform '{}' is downloaded", platform);
+		var existing = findDownloaded(version, platform);
+		if (existing.isPresent()) {
+			logger.info("Rome was already downloaded, using executable at '{}'", existing.get());
+			return existing.get();
+		} else {
+			logger.debug("Rome was not yet downloaded, attempting to download executable");
+			return download(version, platform);
+		}
+	}
+
+	/**
+	 * Attempts to find the Rome executable for the current platform in the download
+	 * directory. No attempt is made to download the executable from the network.
+	 * 
+	 * @param version  Desired Rome version.
+	 * @param platform Desired platform.
+	 * @return The path to the Rome executable.
+	 * @throws IOException When the executable does not exists in the download
+	 *                     directory, or when the file system could not be accessed.
+	 */
+	public Optional<Path> findDownloaded(String version, Platform platform) throws IOException {
+		var executablePath = getExecutablePath(version, platform);
+		logger.debug("Checking rome executable at {}", executablePath);
+		return checkFileWithChecksum(executablePath) ? Optional.ofNullable(executablePath) : Optional.empty();
+	}
+
+	/**
+	 * @param platform Platform to check.
+	 * @return <code>true</code> if Rome officially supports the given platform,
+	 *         <code>false</code> otherwise.
+	 */
+	public boolean isSupported(Platform platform) {
+		var architecture = platform.getArchitecture();
+		switch (platform.getOs()) {
+		case AIX:
+			return false;
+		case Linux:
+			return architecture == Architecture.x64 || architecture == Architecture.arm64;
+		case Mac:
+			return architecture == Architecture.x64 || architecture == Architecture.arm64;
+		case SunOS:
+			return false;
+		case Windows:
+			return architecture == Architecture.x64 || architecture == Architecture.arm64;
+		default:
+			return false;
+		}
+	}
+
+	/**
+	 * Checks whether the given file exists and matches the checksum. The checksum
+	 * must be contained in a file next to the file to check.
+	 * 
+	 * @param filePath File to check.
+	 * @return <code>true</code> if the file exists and matches the checksum,
+	 *         <code>false</code> otherwise.
+	 */
+	private boolean checkFileWithChecksum(Path filePath) {
+		if (!Files.exists(filePath)) {
+			logger.debug("File '{}' does not exist yet", filePath);
+			return false;
+		}
+		if (Files.isDirectory(filePath)) {
+			logger.debug("File '{}' exists, but is a directory", filePath);
+			return false;
+		}
+		var checksumPath = getChecksumPath(filePath);
+		if (!Files.exists(checksumPath)) {
+			logger.debug("File '{}' exists, but checksum file '{}' does not", filePath, checksumPath);
+			return false;
+		}
+		if (Files.isDirectory(checksumPath)) {
+			logger.debug("Checksum file '{}' exists, but is a directory", checksumPath);
+			return false;
+		}
+		try {
+			var actualChecksum = computeChecksum(filePath, CHECKSUM_ALGORITHM);
+			var expectedChecksum = readTextFile(checksumPath, StandardCharsets.ISO_8859_1);
+			logger.debug("Expected checksum: {}, actual checksum: {}", expectedChecksum, actualChecksum);
+			return Objects.equals(expectedChecksum, actualChecksum);
+		} catch (final IOException ignored) {
+			return false;
+		}
+	}
+
+	/**
+	 * Computes the checksum of the given file.
+	 * 
+	 * @param file      File to process.
+	 * @param algorithm The checksum algorithm to use.
+	 * @return The MD5 checksum of the given file.
+	 * @throws IOException When the file does not exist or could not be read.
+	 */
+	private String computeChecksum(Path file, String algorithm) throws IOException {
+		var buffer = new byte[4192];
+		try (var in = Files.newInputStream(file, READ_OPTIONS)) {
+			var digest = MessageDigest.getInstance(algorithm);
+			int result;
+			while ((result = in.read(buffer, 0, buffer.length)) != -1) {
+				digest.update(buffer, 0, result);
+			}
+			var bytes = digest.digest();
+			return String.format("%0" + (bytes.length * 2) + "X", new BigInteger(1, bytes));
+		} catch (NoSuchAlgorithmException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	/**
+	 * Finds the code name for the given operating system used by the Rome
+	 * executable download URL.
+	 * 
+	 * @param os Desired operating system.
+	 * @return Code name for the Rome download URL.
+	 * @throws IOException When the given OS is not supported by Rome.
+	 */
+	private String getArchitectureCodeName(Architecture architecture) throws IOException {
+		switch (architecture) {
+		case arm64:
+			return "arm64";
+		case armv7l:
+			throw new IOException("Unsupported architecture: " + architecture);
+		case ppc:
+			throw new IOException("Unsupported architecture: " + architecture);
+		case ppc64:
+			throw new IOException("Unsupported architecture: " + architecture);
+		case ppc64le:
+			throw new IOException("Unsupported architecture: " + architecture);
+		case s390x:
+			throw new IOException("Unsupported architecture: " + architecture);
+		case x64:
+			return "x64";
+		case x86:
+			throw new IOException("Unsupported architecture: " + architecture);
+		default:
+			throw new IOException("Unsupported architecture: " + architecture);
+		}
+	}
+
+	/**
+	 * Derives a path for the file which contains the checksum of the given file.
+	 * 
+	 * @param file A file for which to derive the checksum file path.
+	 * @return The path with the checksum for the given file.
+	 */
+	private Path getChecksumPath(Path file) {
+		return file.getParent().resolve(file.getFileName().toString() + ".md5");
+	}
+
+	/**
+	 * Finds the URL from which the Rome executable can be downloaded.
+	 * 
+	 * @param version  Desired Rome version.
+	 * @param platform Desired platform.
+	 * @return The URL for the Rome executable.
+	 * @throws IOException When the platform is not supported by Rome.
+	 */
+	private String getDownloadUrl(String version, Platform platform) throws IOException {
+		if (!isSupported(platform)) {
+			throw new IOException("Unsupported platform: " + platform);
+		}
+		var osCodeName = getOsCodeName(platform.getOs());
+		var architectureCodeName = getArchitectureCodeName(platform.getArchitecture());
+		var extension = getDownloadUrlExtension(platform.getOs());
+		var platformString = String.format(PLATFORM_PATTERN, osCodeName, architectureCodeName, extension);
+		return String.format(URL_PATTERN, version, platformString);
+	}
+
+	/**
+	 * Finds the file extension of the Rome download URL for the given operating
+	 * system.
+	 * 
+	 * @param os Desired operating system.
+	 * @return Extension for the Rome download URL.
+	 * @throws IOException When the given OS is not supported by Rome.
+	 */
+	private String getDownloadUrlExtension(OS os) throws IOException {
+		switch (os) {
+		case AIX:
+			throw new IOException("Unsupported OS: " + os);
+		case Linux:
+			return "";
+		case Mac:
+			return "";
+		case SunOS:
+			throw new IOException("Unsupported OS: " + os);
+		case Windows:
+			return ".exe";
+		default:
+			throw new IOException("Unsupported OS: " + os);
+		}
+	}
+
+	/**
+	 * Finds the path on the file system for the Rome executable with a given
+	 * version and platform.
+	 * 
+	 * @param version  Desired Rome version.
+	 * @param platform Desired platform.
+	 * @return The path for the Rome executable.
+	 */
+	private Path getExecutablePath(String version, Platform platform) {
+		var fileName = String.format(DOWNLOAD_FILE_PATTERN, platform.getOs(), platform.getArchitecture(), version);
+		return downloadDir.resolve(fileName);
+	}
+
+	/**
+	 * Finds the code name for the given operating system used by the Rome
+	 * executable download URL.
+	 * 
+	 * @param os Desired operating system.
+	 * @return Code name for the Rome download URL.
+	 * @throws IOException When the given OS is not supported by Rome.
+	 */
+	private String getOsCodeName(OS os) throws IOException {
+		switch (os) {
+		case AIX:
+			throw new IOException("Unsupported OS: " + os);
+		case Linux:
+			return "linux";
+		case Mac:
+			return "darwin";
+		case SunOS:
+			throw new IOException("Unsupported OS: " + os);
+		case Windows:
+			return "win32";
+		default:
+			throw new IOException("Unsupported OS: " + os);
+		}
+	}
+
+	/**
+	 * Reads a plain text file with the given encoding into a string.
+	 * 
+	 * @param file    File to read.
+	 * @param charset Encoding to use.
+	 * @return The contents of the file as a string.
+	 * @throws IOException When the file could not be read.
+	 */
+	private String readTextFile(Path file, Charset charset) throws IOException {
+		try (var in = Files.newInputStream(file, READ_OPTIONS)) {
+			return new String(in.readAllBytes(), charset);
+		}
+	}
+
+	/**
+	 * Computes the checksum of the given file and writes it to the target checksum
+	 * file, using the {@code ISO_8859_1} encoding.
+	 * 
+	 * @param file
+	 * @param checksumPath
+	 * @throws IOException
+	 */
+	private void writeChecksumFile(Path file, Path checksumPath) throws IOException {
+		var checksum = computeChecksum(file, CHECKSUM_ALGORITHM);
+		try (var out = Files.newOutputStream(checksumPath, WRITE_OPTIONS)) {
+			out.write(checksum.getBytes(StandardCharsets.ISO_8859_1));
+		}
+	}
+}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/Javascript.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/Javascript.java
index 31a5917e06..b254110486 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/Javascript.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/Javascript.java
@@ -41,4 +41,8 @@ public String licenseHeaderDelimiter() {
 	public void addEslint(EslintJs eslint) {
 		addStepFactory(eslint);
 	}
+
+	public void addRome(RomeJs rome) {
+		addStepFactory(rome);
+	}
 }
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java
new file mode 100644
index 0000000000..337b05bebf
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java
@@ -0,0 +1,61 @@
+package com.diffplug.spotless.maven.javascript;
+
+import org.apache.maven.plugins.annotations.Parameter;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.javascript.RomeStep;
+import com.diffplug.spotless.maven.FormatterStepConfig;
+import com.diffplug.spotless.maven.FormatterStepFactory;
+
+/**
+ * Factory for creating the Rome formatter step that formats JavaScript and
+ * TypeScript code with Rome:
+ * <a href= "https://github.com/rome/tools">https://github.com/rome/tools</a>.
+ * It delegates to the Rome executable.
+ */
+public class RomeJs implements FormatterStepFactory {
+	/**
+	 * Optional directory where the downloaded Rome executable is placed. This
+	 * defaults to <code>${project.buildDir}/spotless/rome</code>. You may want to
+	 * change this to a directory outside the build directory to preserve downloaded
+	 * files even when cleaning the project.
+	 */
+	@Parameter
+	private String downloadDir;
+
+	/**
+	 * Optional path to the Rome executable. When not given, an attempt is made to
+	 * download the executable for the given version from the network.
+	 */
+	@Parameter
+	private String pathToExe;
+
+	/**
+	 * Rome version. When not given, a default known version is used. For stable
+	 * builds, it is recommended that you always set the version explicitly. This
+	 * parameter is ignored when you specify a <code>pathToExe</code> explicitly.
+	 */
+	@Parameter
+	private String version;
+
+	@Override
+	public FormatterStep newFormatterStep(FormatterStepConfig config) {
+		RomeStep rome;
+		if (pathToExe != null) {
+			rome = RomeStep.withVersionAndExe(version, pathToExe);
+		} else {
+			var downloadDir = resolveDownloadDir(config);
+			rome = RomeStep.withVersionAndExeDownload(version, downloadDir);
+		}
+		return rome.create();
+	}
+
+	private String resolveDownloadDir(FormatterStepConfig config) {
+		// e.g. /home/user/.m2/repository/com/diffplug/spotless/spotless-maven-plugin/2.35.1-SNAPSHOT/spotless-maven-plugin-2.35.1-SNAPSHOT.jar
+		// var self = config.getProvisioner().provisionWithTransitives(false, "com.diffplug.spotless:spotless-maven-plugin:2.35.1-SNAPSHOT");
+		// e.g. /home/user/.m2/repository/com/diffplug/spotless/spotless-maven-plugin
+		// return self.iterator().next().getParentFile().getParent();
+		var buildDir = config.getFileLocator().getBuildDir().toPath();
+		return buildDir.resolve("spotless").resolve("rome").toAbsolutePath().toString();
+	}
+}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Typescript.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Typescript.java
index 6ba45ab719..929ea334b1 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Typescript.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Typescript.java
@@ -21,6 +21,7 @@
 import org.apache.maven.project.MavenProject;
 
 import com.diffplug.spotless.maven.FormatterFactory;
+import com.diffplug.spotless.maven.javascript.RomeJs;
 
 /**
  * A {@link FormatterFactory} implementation that corresponds to {@code <typescript>...</typescript>} configuration element.
@@ -45,4 +46,8 @@ public void addTsfmt(Tsfmt tsfmt) {
 	public void addEslint(EslintTs eslint) {
 		addStepFactory(eslint);
 	}
+
+	public void addRome(RomeJs rome) {
+		addStepFactory(rome);
+	}
 }

From c4920d92d77266fe5e2f9aa9aace6e4715bce87d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 3 Apr 2023 11:41:09 +0000
Subject: [PATCH 0961/2068] fix(deps): update dependency
 org.cqfn.diktat:diktat-rules to v1.2.5

---
 lib/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 5480320889..7891235c8d 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -105,7 +105,7 @@ dependencies {
 	String VER_SCALAFMT="3.7.1"
 	scalafmtCompileOnly "org.scalameta:scalafmt-core_2.13:$VER_SCALAFMT"
 
-	String VER_DIKTAT = "1.2.4.2"
+	String VER_DIKTAT = "1.2.5"
 	diktatCompileOnly "org.cqfn.diktat:diktat-rules:$VER_DIKTAT"
 
 	// used for markdown formatting

From 58c2737d95fd3c1835b7539e31f25b7e4c32b0a6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 3 Apr 2023 11:46:31 +0000
Subject: [PATCH 0962/2068] fix(deps): update dependency
 com.vladsch.flexmark:flexmark-all to v0.64.0

---
 lib/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 5480320889..5cfa14d907 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -109,7 +109,7 @@ dependencies {
 	diktatCompileOnly "org.cqfn.diktat:diktat-rules:$VER_DIKTAT"
 
 	// used for markdown formatting
-	flexmarkCompileOnly 'com.vladsch.flexmark:flexmark-all:0.62.2'
+	flexmarkCompileOnly 'com.vladsch.flexmark:flexmark-all:0.64.0'
 
 	gsonCompileOnly 'com.google.code.gson:gson:2.10.1'
 

From 4cd9cc1dc50a7c39bfeb9b5ebb5c3872afcf4600 Mon Sep 17 00:00:00 2001
From: Chao-Yue Lai <clai1@linkedin.com>
Date: Mon, 3 Apr 2023 18:07:32 -0400
Subject: [PATCH 0963/2068] Adding back the "style" option in Palantir Java
 Format

---
 .../spotless/java/PalantirJavaFormatStep.java | 26 ++++++++++++++++---
 .../pjf/PalantirJavaFormatFormatterFunc.java  | 11 +++++---
 plugin-gradle/README.md                       |  4 +--
 .../gradle/spotless/JavaExtension.java        | 10 ++++++-
 plugin-maven/README.md                        |  1 +
 .../JavaCodeFormattedGoogle.test              | 11 ++++++++
 .../JavaCodeWithLicenseFormattedGoogle.test   | 16 ++++++++++++
 .../JavaCodeWithPackageFormattedGoogle.test   | 13 ++++++++++
 .../java/PalantirJavaFormatStepTest.java      | 15 ++++++++++-
 9 files changed, 95 insertions(+), 12 deletions(-)
 create mode 100644 testlib/src/main/resources/java/palantirjavaformat/JavaCodeFormattedGoogle.test
 create mode 100644 testlib/src/main/resources/java/palantirjavaformat/JavaCodeWithLicenseFormattedGoogle.test
 create mode 100644 testlib/src/main/resources/java/palantirjavaformat/JavaCodeWithPackageFormattedGoogle.test

diff --git a/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
index 67c55c2e86..f769ad09ec 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@ public class PalantirJavaFormatStep {
 	// prevent direct instantiation
 	private PalantirJavaFormatStep() {}
 
+	private static final String DEFAULT_STYLE = "PALANTIR";
 	private static final String NAME = "palantir-java-format";
 	private static final String MAVEN_COORDINATE = "com.palantir.javaformat:palantir-java-format:";
 	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(8, "1.1.0").add(11, "2.28.0");
@@ -38,11 +39,17 @@ public static FormatterStep create(Provisioner provisioner) {
 
 	/** Creates a step which formats everything - code, import order, and unused imports. */
 	public static FormatterStep create(String version, Provisioner provisioner) {
+		return create(version, defaultStyle(), provisioner);
+	}
+
+	/** Creates a step which formats everything - code, import order, and unused imports. And with the style input. */
+	public static FormatterStep create(String version, String style, Provisioner provisioner) {
 		Objects.requireNonNull(version, "version");
+		Objects.requireNonNull(style, "style");
 		Objects.requireNonNull(provisioner, "provisioner");
 
 		return FormatterStep.createLazy(NAME,
-				() -> new State(JarState.from(MAVEN_COORDINATE + version, provisioner), version),
+				() -> new State(JarState.from(MAVEN_COORDINATE + version, provisioner), version, style),
 				State::createFormat);
 	}
 
@@ -51,6 +58,11 @@ public static String defaultVersion() {
 		return JVM_SUPPORT.getRecommendedFormatterVersion();
 	}
 
+	/** Get default style */
+	public static String defaultStyle() {
+		return DEFAULT_STYLE;
+	}
+
 	private static final class State implements Serializable {
 		private static final long serialVersionUID = 1L;
 
@@ -58,18 +70,24 @@ private static final class State implements Serializable {
 		private final JarState jarState;
 		/** Version of the formatter jar. */
 		private final String formatterVersion;
+		private final String style;
 
 		State(JarState jarState, String formatterVersion) {
+			this(jarState, formatterVersion, DEFAULT_STYLE);
+		}
+
+		State(JarState jarState, String formatterVersion, String style) {
 			ModuleHelper.doOpenInternalPackagesIfRequired();
 			this.jarState = jarState;
 			this.formatterVersion = formatterVersion;
+			this.style = style;
 		}
 
 		FormatterFunc createFormat() throws Exception {
 			final ClassLoader classLoader = jarState.getClassLoader();
 			final Class<?> formatterFunc = classLoader.loadClass("com.diffplug.spotless.glue.pjf.PalantirJavaFormatFormatterFunc");
-			final Constructor<?> constructor = formatterFunc.getConstructor();
-			return JVM_SUPPORT.suggestLaterVersionOnError(formatterVersion, (FormatterFunc) constructor.newInstance());
+			final Constructor<?> constructor = formatterFunc.getConstructor(String.class); // style
+			return JVM_SUPPORT.suggestLaterVersionOnError(formatterVersion, (FormatterFunc) constructor.newInstance(style));
 		}
 	}
 }
diff --git a/lib/src/palantirJavaFormat/java/com/diffplug/spotless/glue/pjf/PalantirJavaFormatFormatterFunc.java b/lib/src/palantirJavaFormat/java/com/diffplug/spotless/glue/pjf/PalantirJavaFormatFormatterFunc.java
index 6824cdbc48..189bbb54be 100644
--- a/lib/src/palantirJavaFormat/java/com/diffplug/spotless/glue/pjf/PalantirJavaFormatFormatterFunc.java
+++ b/lib/src/palantirJavaFormat/java/com/diffplug/spotless/glue/pjf/PalantirJavaFormatFormatterFunc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 DiffPlug
+ * Copyright 2022-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,16 +26,19 @@ public class PalantirJavaFormatFormatterFunc implements FormatterFunc {
 
 	private final Formatter formatter;
 
-	public PalantirJavaFormatFormatterFunc() {
+	private final JavaFormatterOptions.Style formatterStyle;
+
+	public PalantirJavaFormatFormatterFunc(String style) {
+		this.formatterStyle = JavaFormatterOptions.Style.valueOf(style);
 		formatter = Formatter.createFormatter(JavaFormatterOptions.builder()
-				.style(JavaFormatterOptions.Style.PALANTIR)
+				.style(formatterStyle)
 				.build());
 	}
 
 	@Override
 	public String apply(String input) throws Exception {
 		String source = input;
-		source = ImportOrderer.reorderImports(source, JavaFormatterOptions.Style.PALANTIR);
+		source = ImportOrderer.reorderImports(source, formatterStyle);
 		source = RemoveUnusedImports.removeUnusedImports(source);
 		return formatter.formatSource(source);
 	}
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 616aacdb1f..95ca3af5ff 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -200,8 +200,8 @@ spotless {
 spotless {
   java {
     palantirJavaFormat()
-    // optional: you can specify a specific version
-    palantirJavaFormat('2.9.0')
+    // optional: you can specify a specific version and/or switch to AOSP/GOOGLE style
+    palantirJavaFormat('2.9.0').style("GOOGLE")
 ```
 
 ### eclipse jdt
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
index e67bb6d076..d85cb8de5e 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
@@ -198,14 +198,22 @@ public PalantirJavaFormatConfig palantirJavaFormat(String version) {
 
 	public class PalantirJavaFormatConfig {
 		final String version;
+		String style;
 
 		PalantirJavaFormatConfig(String version) {
 			this.version = Objects.requireNonNull(version);
+			this.style = PalantirJavaFormatStep.defaultStyle();
 			addStep(createStep());
 		}
 
+		public PalantirJavaFormatConfig style(String style) {
+			this.style = Objects.requireNonNull(style);
+			replaceStep(createStep());
+			return this;
+		}
+
 		private FormatterStep createStep() {
-			return PalantirJavaFormatStep.create(version, provisioner());
+			return PalantirJavaFormatStep.create(version, style, provisioner());
 		}
 	}
 
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 5971721e24..12ade2ccf5 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -228,6 +228,7 @@ any other maven phase (i.e. compile) then it can be configured as below;
 ```xml
 <palantirJavaFormat>
   <version>2.10.0</version>                     <!-- optional -->
+  <style>PALANTIR</style>                       <!-- or AOSP/GOOGLE (optional) -->
 </palantirJavaFormat>
 ```
 
diff --git a/testlib/src/main/resources/java/palantirjavaformat/JavaCodeFormattedGoogle.test b/testlib/src/main/resources/java/palantirjavaformat/JavaCodeFormattedGoogle.test
new file mode 100644
index 0000000000..7a83a0a12c
--- /dev/null
+++ b/testlib/src/main/resources/java/palantirjavaformat/JavaCodeFormattedGoogle.test
@@ -0,0 +1,11 @@
+import mylib.UsedA;
+import mylib.UsedB;
+
+public class Java {
+  public static void main(String[] args) {
+    System.out.println(
+        "A very very very very very very very very very very very very very very very very very very very very very long string that goes beyond the 100-character line length.");
+    UsedB.someMethod();
+    UsedA.someMethod();
+  }
+}
diff --git a/testlib/src/main/resources/java/palantirjavaformat/JavaCodeWithLicenseFormattedGoogle.test b/testlib/src/main/resources/java/palantirjavaformat/JavaCodeWithLicenseFormattedGoogle.test
new file mode 100644
index 0000000000..9ee9bcbad6
--- /dev/null
+++ b/testlib/src/main/resources/java/palantirjavaformat/JavaCodeWithLicenseFormattedGoogle.test
@@ -0,0 +1,16 @@
+/*
+ * Some license stuff.
+ * Very official.
+ */
+
+import mylib.UsedA;
+import mylib.UsedB;
+
+public class Java {
+  public static void main(String[] args) {
+    System.out.println(
+        "A very very very very very very very very very very very very very very very very very very very very very long string that goes beyond the 100-character line length.");
+    UsedB.someMethod();
+    UsedA.someMethod();
+  }
+}
diff --git a/testlib/src/main/resources/java/palantirjavaformat/JavaCodeWithPackageFormattedGoogle.test b/testlib/src/main/resources/java/palantirjavaformat/JavaCodeWithPackageFormattedGoogle.test
new file mode 100644
index 0000000000..4992ade147
--- /dev/null
+++ b/testlib/src/main/resources/java/palantirjavaformat/JavaCodeWithPackageFormattedGoogle.test
@@ -0,0 +1,13 @@
+package hello.world;
+
+import mylib.UsedA;
+import mylib.UsedB;
+
+public class Java {
+  public static void main(String[] args) {
+    System.out.println(
+        "A very very very very very very very very very very very very very very very very very very very very very long string that goes beyond the 100-character line length.");
+    UsedB.someMethod();
+    UsedA.someMethod();
+  }
+}
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/PalantirJavaFormatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/PalantirJavaFormatStepTest.java
index dfd59c2655..81d03b6c32 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/PalantirJavaFormatStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/PalantirJavaFormatStepTest.java
@@ -54,10 +54,20 @@ void behavior() throws Exception {
 				.testResource("java/palantirjavaformat/JavaCodeWithPackageUnformatted.test", "java/palantirjavaformat/JavaCodeWithPackageFormatted.test");
 	}
 
+	@Test
+	void behaviorWithGoogleStyle() throws Exception {
+		FormatterStep step = PalantirJavaFormatStep.create("1.1.0", "GOOGLE", TestProvisioner.mavenCentral());
+		StepHarness.forStep(step)
+				.testResource("java/palantirjavaformat/JavaCodeUnformatted.test", "java/palantirjavaformat/JavaCodeFormattedGoogle.test")
+				.testResource("java/palantirjavaformat/JavaCodeWithLicenseUnformatted.test", "java/palantirjavaformat/JavaCodeWithLicenseFormattedGoogle.test")
+				.testResource("java/palantirjavaformat/JavaCodeWithPackageUnformatted.test", "java/palantirjavaformat/JavaCodeWithPackageFormattedGoogle.test");
+	}
+
 	@Test
 	void equality() {
 		new SerializableEqualityTester() {
 			String version = "1.1.0";
+			String style = "";
 
 			@Override
 			protected void setupTest(API api) {
@@ -66,12 +76,15 @@ protected void setupTest(API api) {
 				// change the version, and it's different
 				version = "1.0.0";
 				api.areDifferentThan();
+				// change the style, and it's different
+				style = "AOSP";
+				api.areDifferentThan();
 			}
 
 			@Override
 			protected FormatterStep create() {
 				String finalVersion = this.version;
-				return PalantirJavaFormatStep.create(finalVersion, TestProvisioner.mavenCentral());
+				return PalantirJavaFormatStep.create(finalVersion, style, TestProvisioner.mavenCentral());
 			}
 		}.testEquals();
 	}

From e12973a37a648a9e84806dfd94ccbe30073b1d5f Mon Sep 17 00:00:00 2001
From: Chao-Yue Lai <clai1@linkedin.com>
Date: Mon, 3 Apr 2023 18:45:28 -0400
Subject: [PATCH 0964/2068] Adding the commit in CHANGES.md's

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 1 +
 plugin-maven/CHANGES.md  | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 77c49efe2a..89c99b7841 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Support configuration of mirrors for P2 repositories in `EquoBasedStepBuilder` ([#1629](https://github.com/diffplug/spotless/issues/1629)).
+* The `style` option in Palantir Java Format ([#1654](https://github.com/diffplug/spotless/pull/1654)).
 ### Changes
 * **POTENTIALLY BREAKING** Converted `googleJavaFormat` to a compile-only dependency and drop support for versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
 * Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 0a0cabcca0..15ee39e1f8 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -14,6 +14,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
   ```
   Mirrors are selected by prefix match, for example `https://download.eclipse.org/eclipse/updates/4.26/` will be redirected to `https://some.internal.mirror/eclipse/eclipse/updates/4.26/`.
   The same configuration exists for `greclipse` and `eclipseCdt`.
+* The `style` option in Palantir Java Format ([#1654](https://github.com/diffplug/spotless/pull/1654)).
 ### Changes
 * **POTENTIALLY BREAKING** Drop support for `googleJavaFormat` versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
 * Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 421b5e56e7..72d235a38a 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* The `style` option in Palantir Java Format ([#1654](https://github.com/diffplug/spotless/pull/1654)).
 ### Changes
 * **POTENTIALLY BREAKING** Drop support for `googleJavaFormat` versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
 * Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))

From cb9433fe36025accd94a16f5fda1c94326e6c841 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sat, 11 Mar 2023 19:01:09 +0800
Subject: [PATCH 0965/2068] Prefer using plugin extensions over deprecated
 conventions

https://docs.gradle.org/current/userguide/upgrading_version_7.html#all_convention_deprecation
---
 .../gradle/spotless/GroovyExtension.java      | 52 ++++++++++++++-----
 .../gradle/spotless/JavaExtension.java        | 30 ++++++++---
 .../gradle/spotless/KotlinExtension.java      | 39 ++++++++++----
 .../gradle/spotless/ScalaExtension.java       | 41 ++++++++++-----
 4 files changed, 117 insertions(+), 45 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java
index d25433293d..8d20cd3036 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java
@@ -28,8 +28,11 @@
 import org.gradle.api.internal.plugins.DslObject;
 import org.gradle.api.plugins.GroovyBasePlugin;
 import org.gradle.api.plugins.JavaPluginConvention;
+import org.gradle.api.plugins.JavaPluginExtension;
+import org.gradle.api.tasks.GroovySourceDirectorySet;
 import org.gradle.api.tasks.GroovySourceSet;
 import org.gradle.api.tasks.SourceSet;
+import org.gradle.util.GradleVersion;
 
 import com.diffplug.spotless.extra.EquoBasedStepBuilder;
 import com.diffplug.spotless.extra.groovy.GrEclipseFormatterStep;
@@ -112,22 +115,43 @@ public GrEclipseConfig withP2Mirrors(Map<String, String> mirrors) {
 	@Override
 	protected void setupTask(SpotlessTask task) {
 		if (target == null) {
-			JavaPluginConvention convention = getProject().getConvention().getPlugin(JavaPluginConvention.class);
-			if (convention == null || !getProject().getPlugins().hasPlugin(GroovyBasePlugin.class)) {
-				throw new GradleException("You must apply the groovy plugin before the spotless plugin if you are using the groovy extension.");
-			}
-			//Add all Groovy files (may contain Java files as well)
-
-			FileCollection union = getProject().files();
-			for (SourceSet sourceSet : convention.getSourceSets()) {
-				GroovySourceSet groovySourceSet = new DslObject(sourceSet).getConvention().getPlugin(GroovySourceSet.class);
-				if (excludeJava) {
-					union = union.plus(groovySourceSet.getAllGroovy());
-				} else {
-					union = union.plus(groovySourceSet.getGroovy());
+			if (GradleVersion.current().compareTo(GradleVersion.version("7.1")) >= 0) {
+				JavaPluginExtension javaPluginExtension = getProject().getExtensions().findByType(JavaPluginExtension.class);
+				if (javaPluginExtension == null || !getProject().getPlugins().hasPlugin(GroovyBasePlugin.class)) {
+					throw new GradleException("You must apply the groovy plugin before the spotless plugin if you are using the groovy extension.");
+				}
+				//Add all Groovy files (may contain Java files as well)
+
+				FileCollection union = getProject().files();
+				for (SourceSet sourceSet : javaPluginExtension.getSourceSets()) {
+					union = union.plus(sourceSet.getExtensions().getByType(GroovySourceDirectorySet.class).filter(file -> {
+						String name = file.getName();
+						if (excludeJava) {
+							return name.endsWith(".groovy");
+						} else {
+							return name.endsWith(".groovy") || name.endsWith(".java");
+						}
+					}));
+				}
+				target = union;
+			} else {
+				JavaPluginConvention convention = getProject().getConvention().getPlugin(JavaPluginConvention.class);
+				if (convention == null || !getProject().getPlugins().hasPlugin(GroovyBasePlugin.class)) {
+					throw new GradleException("You must apply the groovy plugin before the spotless plugin if you are using the groovy extension.");
+				}
+				//Add all Groovy files (may contain Java files as well)
+
+				FileCollection union = getProject().files();
+				for (SourceSet sourceSet : convention.getSourceSets()) {
+					GroovySourceSet groovySourceSet = new DslObject(sourceSet).getConvention().getPlugin(GroovySourceSet.class);
+					if (excludeJava) {
+						union = union.plus(groovySourceSet.getAllGroovy());
+					} else {
+						union = union.plus(groovySourceSet.getGroovy());
+					}
 				}
+				target = union;
 			}
-			target = union;
 		} else if (excludeJava) {
 			throw new IllegalArgumentException("'excludeJava' is not supported in combination with a custom 'target'.");
 		}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
index e67bb6d076..f511e9cebd 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
@@ -30,7 +30,9 @@
 import org.gradle.api.Project;
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.plugins.JavaPluginConvention;
+import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.tasks.SourceSet;
+import org.gradle.util.GradleVersion;
 
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.extra.EquoBasedStepBuilder;
@@ -366,15 +368,27 @@ private FormatterStep createStep() {
 	@Override
 	protected void setupTask(SpotlessTask task) {
 		if (target == null) {
-			JavaPluginConvention javaPlugin = getProject().getConvention().findPlugin(JavaPluginConvention.class);
-			if (javaPlugin == null) {
-				throw new GradleException("You must either specify 'target' manually or apply the 'java' plugin.");
-			}
-			FileCollection union = getProject().files();
-			for (SourceSet sourceSet : javaPlugin.getSourceSets()) {
-				union = union.plus(sourceSet.getAllJava());
+			if (GradleVersion.current().compareTo(GradleVersion.version("7.1")) >= 0) {
+				JavaPluginExtension javaPluginExtension = getProject().getExtensions().findByType(JavaPluginExtension.class);
+				if (javaPluginExtension == null) {
+					throw new GradleException("You must either specify 'target' manually or apply the 'java' plugin.");
+				}
+				FileCollection union = getProject().files();
+				for (SourceSet sourceSet : javaPluginExtension.getSourceSets()) {
+					union = union.plus(sourceSet.getAllJava());
+				}
+				target = union;
+			} else {
+				JavaPluginConvention javaPlugin = getProject().getConvention().findPlugin(JavaPluginConvention.class);
+				if (javaPlugin == null) {
+					throw new GradleException("You must either specify 'target' manually or apply the 'java' plugin.");
+				}
+				FileCollection union = getProject().files();
+				for (SourceSet sourceSet : javaPlugin.getSourceSets()) {
+					union = union.plus(sourceSet.getAllJava());
+				}
+				target = union;
 			}
-			target = union;
 		}
 
 		steps.replaceAll(step -> {
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
index 5a7419f68d..f6cab3c28b 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
@@ -30,7 +30,9 @@
 import org.gradle.api.GradleException;
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.plugins.JavaPluginConvention;
+import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.tasks.SourceSet;
+import org.gradle.util.GradleVersion;
 
 import com.diffplug.common.collect.ImmutableSortedMap;
 import com.diffplug.spotless.FileSignature;
@@ -230,18 +232,33 @@ private FormatterStep createStep() {
 	@Override
 	protected void setupTask(SpotlessTask task) {
 		if (target == null) {
-			JavaPluginConvention javaPlugin = getProject().getConvention().findPlugin(JavaPluginConvention.class);
-			if (javaPlugin == null) {
-				throw new GradleException("You must either specify 'target' manually or apply a kotlin plugin.");
-			}
-			FileCollection union = getProject().files();
-			for (SourceSet sourceSet : javaPlugin.getSourceSets()) {
-				union = union.plus(sourceSet.getAllSource().filter(file -> {
-					String name = file.getName();
-					return name.endsWith(".kt") || name.endsWith(".kts");
-				}));
+			if (GradleVersion.current().compareTo(GradleVersion.version("7.1")) >= 0) {
+				JavaPluginExtension javaPluginExtension = getProject().getExtensions().findByType(JavaPluginExtension.class);
+				if (javaPluginExtension == null) {
+					throw new GradleException("You must either specify 'target' manually or apply a kotlin plugin.");
+				}
+				FileCollection union = getProject().files();
+				for (SourceSet sourceSet : javaPluginExtension.getSourceSets()) {
+					union = union.plus(sourceSet.getAllSource().filter(file -> {
+						String name = file.getName();
+						return name.endsWith(".kt") || name.endsWith(".kts");
+					}));
+				}
+				target = union;
+			} else {
+				JavaPluginConvention javaPlugin = getProject().getConvention().findPlugin(JavaPluginConvention.class);
+				if (javaPlugin == null) {
+					throw new GradleException("You must either specify 'target' manually or apply a kotlin plugin.");
+				}
+				FileCollection union = getProject().files();
+				for (SourceSet sourceSet : javaPlugin.getSourceSets()) {
+					union = union.plus(sourceSet.getAllSource().filter(file -> {
+						String name = file.getName();
+						return name.endsWith(".kt") || name.endsWith(".kts");
+					}));
+				}
+				target = union;
 			}
-			target = union;
 		}
 		super.setupTask(task);
 	}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java
index 8a8765b539..9d710a1ba9 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,9 @@
 import org.gradle.api.GradleException;
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.plugins.JavaPluginConvention;
+import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.tasks.SourceSet;
+import org.gradle.util.GradleVersion;
 
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.scala.ScalaFmtStep;
@@ -79,18 +81,33 @@ private FormatterStep createStep() {
 	@Override
 	protected void setupTask(SpotlessTask task) {
 		if (target == null) {
-			JavaPluginConvention javaPlugin = getProject().getConvention().findPlugin(JavaPluginConvention.class);
-			if (javaPlugin == null) {
-				throw new GradleException("You must either specify 'target' manually or apply the 'scala' plugin.");
+			if (GradleVersion.current().compareTo(GradleVersion.version("7.1")) >= 0) {
+				JavaPluginExtension javaPluginExtension = getProject().getExtensions().findByType(JavaPluginExtension.class);
+				if (javaPluginExtension == null) {
+					throw new GradleException("You must either specify 'target' manually or apply the 'scala' plugin.");
+				}
+				FileCollection union = getProject().files();
+				for (SourceSet sourceSet : javaPluginExtension.getSourceSets()) {
+					union = union.plus(sourceSet.getAllSource().filter(file -> {
+						String name = file.getName();
+						return name.endsWith(".scala") || name.endsWith(".sc");
+					}));
+				}
+				target = union;
+			} else {
+				JavaPluginConvention javaPlugin = getProject().getConvention().findPlugin(JavaPluginConvention.class);
+				if (javaPlugin == null) {
+					throw new GradleException("You must either specify 'target' manually or apply the 'scala' plugin.");
+				}
+				FileCollection union = getProject().files();
+				for (SourceSet sourceSet : javaPlugin.getSourceSets()) {
+					union = union.plus(sourceSet.getAllSource().filter(file -> {
+						String name = file.getName();
+						return name.endsWith(".scala") || name.endsWith(".sc");
+					}));
+				}
+				target = union;
 			}
-			FileCollection union = getProject().files();
-			for (SourceSet sourceSet : javaPlugin.getSourceSets()) {
-				union = union.plus(sourceSet.getAllSource().filter(file -> {
-					String name = file.getName();
-					return name.endsWith(".scala") || name.endsWith(".sc");
-				}));
-			}
-			target = union;
 		}
 		super.setupTask(task);
 	}

From 4410531a75e26788114b627d804d263afc791de7 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sat, 11 Mar 2023 10:29:23 +0800
Subject: [PATCH 0966/2068] Reuse getSources logic for Jvm languages

---
 .../gradle/spotless/GroovyExtension.java      | 55 ++++++-------------
 .../gradle/spotless/JavaExtension.java        | 32 ++---------
 .../com/diffplug/gradle/spotless/JvmLang.java | 55 +++++++++++++++++++
 .../gradle/spotless/KotlinExtension.java      | 39 +++----------
 .../gradle/spotless/ScalaExtension.java       | 39 +++----------
 5 files changed, 92 insertions(+), 128 deletions(-)
 create mode 100644 plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JvmLang.java

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java
index 8d20cd3036..17a57f6301 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java
@@ -24,14 +24,10 @@
 
 import org.gradle.api.GradleException;
 import org.gradle.api.Project;
-import org.gradle.api.file.FileCollection;
 import org.gradle.api.internal.plugins.DslObject;
 import org.gradle.api.plugins.GroovyBasePlugin;
-import org.gradle.api.plugins.JavaPluginConvention;
-import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.tasks.GroovySourceDirectorySet;
 import org.gradle.api.tasks.GroovySourceSet;
-import org.gradle.api.tasks.SourceSet;
 import org.gradle.util.GradleVersion;
 
 import com.diffplug.spotless.extra.EquoBasedStepBuilder;
@@ -39,7 +35,7 @@
 import com.diffplug.spotless.generic.LicenseHeaderStep;
 import com.diffplug.spotless.java.ImportOrderStep;
 
-public class GroovyExtension extends FormatExtension implements HasBuiltinDelimiterForLicense {
+public class GroovyExtension extends FormatExtension implements HasBuiltinDelimiterForLicense, JvmLang {
 	static final String NAME = "groovy";
 
 	@Inject
@@ -115,43 +111,28 @@ public GrEclipseConfig withP2Mirrors(Map<String, String> mirrors) {
 	@Override
 	protected void setupTask(SpotlessTask task) {
 		if (target == null) {
-			if (GradleVersion.current().compareTo(GradleVersion.version("7.1")) >= 0) {
-				JavaPluginExtension javaPluginExtension = getProject().getExtensions().findByType(JavaPluginExtension.class);
-				if (javaPluginExtension == null || !getProject().getPlugins().hasPlugin(GroovyBasePlugin.class)) {
-					throw new GradleException("You must apply the groovy plugin before the spotless plugin if you are using the groovy extension.");
-				}
-				//Add all Groovy files (may contain Java files as well)
-
-				FileCollection union = getProject().files();
-				for (SourceSet sourceSet : javaPluginExtension.getSourceSets()) {
-					union = union.plus(sourceSet.getExtensions().getByType(GroovySourceDirectorySet.class).filter(file -> {
-						String name = file.getName();
+			final String message = "You must apply the groovy plugin before the spotless plugin if you are using the groovy extension.";
+			if (!getProject().getPlugins().hasPlugin(GroovyBasePlugin.class)) {
+				throw new GradleException(message);
+			}
+			target = getSources(getProject(),
+					message,
+					sourceSet -> {
+						if (GradleVersion.current().compareTo(GradleVersion.version("7.1")) >= 0) {
+							return sourceSet.getExtensions().getByType(GroovySourceDirectorySet.class);
+						} else {
+							final GroovySourceSet groovySourceSet = new DslObject(sourceSet).getConvention().getPlugin(GroovySourceSet.class);
+							return groovySourceSet.getGroovy();
+						}
+					},
+					file -> {
+						final String name = file.getName();
 						if (excludeJava) {
 							return name.endsWith(".groovy");
 						} else {
 							return name.endsWith(".groovy") || name.endsWith(".java");
 						}
-					}));
-				}
-				target = union;
-			} else {
-				JavaPluginConvention convention = getProject().getConvention().getPlugin(JavaPluginConvention.class);
-				if (convention == null || !getProject().getPlugins().hasPlugin(GroovyBasePlugin.class)) {
-					throw new GradleException("You must apply the groovy plugin before the spotless plugin if you are using the groovy extension.");
-				}
-				//Add all Groovy files (may contain Java files as well)
-
-				FileCollection union = getProject().files();
-				for (SourceSet sourceSet : convention.getSourceSets()) {
-					GroovySourceSet groovySourceSet = new DslObject(sourceSet).getConvention().getPlugin(GroovySourceSet.class);
-					if (excludeJava) {
-						union = union.plus(groovySourceSet.getAllGroovy());
-					} else {
-						union = union.plus(groovySourceSet.getGroovy());
-					}
-				}
-				target = union;
-			}
+					});
 		} else if (excludeJava) {
 			throw new IllegalArgumentException("'excludeJava' is not supported in combination with a custom 'target'.");
 		}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
index f511e9cebd..8634e9b6b3 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
@@ -26,13 +26,8 @@
 
 import javax.inject.Inject;
 
-import org.gradle.api.GradleException;
 import org.gradle.api.Project;
-import org.gradle.api.file.FileCollection;
-import org.gradle.api.plugins.JavaPluginConvention;
-import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.tasks.SourceSet;
-import org.gradle.util.GradleVersion;
 
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.extra.EquoBasedStepBuilder;
@@ -45,7 +40,7 @@
 import com.diffplug.spotless.java.PalantirJavaFormatStep;
 import com.diffplug.spotless.java.RemoveUnusedImportsStep;
 
-public class JavaExtension extends FormatExtension implements HasBuiltinDelimiterForLicense {
+public class JavaExtension extends FormatExtension implements HasBuiltinDelimiterForLicense, JvmLang {
 	static final String NAME = "java";
 
 	@Inject
@@ -368,27 +363,10 @@ private FormatterStep createStep() {
 	@Override
 	protected void setupTask(SpotlessTask task) {
 		if (target == null) {
-			if (GradleVersion.current().compareTo(GradleVersion.version("7.1")) >= 0) {
-				JavaPluginExtension javaPluginExtension = getProject().getExtensions().findByType(JavaPluginExtension.class);
-				if (javaPluginExtension == null) {
-					throw new GradleException("You must either specify 'target' manually or apply the 'java' plugin.");
-				}
-				FileCollection union = getProject().files();
-				for (SourceSet sourceSet : javaPluginExtension.getSourceSets()) {
-					union = union.plus(sourceSet.getAllJava());
-				}
-				target = union;
-			} else {
-				JavaPluginConvention javaPlugin = getProject().getConvention().findPlugin(JavaPluginConvention.class);
-				if (javaPlugin == null) {
-					throw new GradleException("You must either specify 'target' manually or apply the 'java' plugin.");
-				}
-				FileCollection union = getProject().files();
-				for (SourceSet sourceSet : javaPlugin.getSourceSets()) {
-					union = union.plus(sourceSet.getAllJava());
-				}
-				target = union;
-			}
+			target = getSources(getProject(),
+					"You must either specify 'target' manually or apply the 'java' plugin.",
+					SourceSet::getAllJava,
+					file -> file.getName().endsWith(".java"));
 		}
 
 		steps.replaceAll(step -> {
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JvmLang.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JvmLang.java
new file mode 100644
index 0000000000..6e30674c6c
--- /dev/null
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JvmLang.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.gradle.spotless;
+
+import java.io.File;
+import java.util.function.Function;
+
+import org.gradle.api.GradleException;
+import org.gradle.api.Project;
+import org.gradle.api.file.FileCollection;
+import org.gradle.api.file.SourceDirectorySet;
+import org.gradle.api.plugins.JavaPluginConvention;
+import org.gradle.api.plugins.JavaPluginExtension;
+import org.gradle.api.specs.Spec;
+import org.gradle.api.tasks.SourceSet;
+import org.gradle.api.tasks.SourceSetContainer;
+import org.gradle.util.GradleVersion;
+
+interface JvmLang {
+
+	default FileCollection getSources(Project project, String message, Function<SourceSet, SourceDirectorySet> sourceSetSourceDirectory, Spec<? super File> filterSpec) {
+		final SourceSetContainer sourceSets;
+		FileCollection union = project.files();
+		if (GradleVersion.current().compareTo(GradleVersion.version("7.1")) >= 0) {
+			final JavaPluginExtension javaPluginExtension = project.getExtensions().findByType(JavaPluginExtension.class);
+			if (javaPluginExtension == null) {
+				throw new GradleException(message);
+			}
+			sourceSets = javaPluginExtension.getSourceSets();
+		} else {
+			final JavaPluginConvention javaPluginConvention = project.getConvention().findPlugin(JavaPluginConvention.class);
+			if (javaPluginConvention == null) {
+				throw new GradleException(message);
+			}
+			sourceSets = javaPluginConvention.getSourceSets();
+		}
+		for (SourceSet sourceSet : sourceSets) {
+			union = union.plus(sourceSetSourceDirectory.apply(sourceSet).filter(filterSpec));
+		}
+		return union;
+	}
+}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
index f6cab3c28b..363a9cac6f 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
@@ -27,12 +27,7 @@
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 
-import org.gradle.api.GradleException;
-import org.gradle.api.file.FileCollection;
-import org.gradle.api.plugins.JavaPluginConvention;
-import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.tasks.SourceSet;
-import org.gradle.util.GradleVersion;
 
 import com.diffplug.common.collect.ImmutableSortedMap;
 import com.diffplug.spotless.FileSignature;
@@ -43,7 +38,7 @@
 import com.diffplug.spotless.kotlin.KtfmtStep.KtfmtFormattingOptions;
 import com.diffplug.spotless.kotlin.KtfmtStep.Style;
 
-public class KotlinExtension extends FormatExtension implements HasBuiltinDelimiterForLicense {
+public class KotlinExtension extends FormatExtension implements HasBuiltinDelimiterForLicense, JvmLang {
 	static final String NAME = "kotlin";
 
 	@Inject
@@ -232,33 +227,13 @@ private FormatterStep createStep() {
 	@Override
 	protected void setupTask(SpotlessTask task) {
 		if (target == null) {
-			if (GradleVersion.current().compareTo(GradleVersion.version("7.1")) >= 0) {
-				JavaPluginExtension javaPluginExtension = getProject().getExtensions().findByType(JavaPluginExtension.class);
-				if (javaPluginExtension == null) {
-					throw new GradleException("You must either specify 'target' manually or apply a kotlin plugin.");
-				}
-				FileCollection union = getProject().files();
-				for (SourceSet sourceSet : javaPluginExtension.getSourceSets()) {
-					union = union.plus(sourceSet.getAllSource().filter(file -> {
-						String name = file.getName();
+			target = getSources(getProject(),
+					"You must either specify 'target' manually or apply a kotlin plugin.",
+					SourceSet::getAllSource,
+					file -> {
+						final String name = file.getName();
 						return name.endsWith(".kt") || name.endsWith(".kts");
-					}));
-				}
-				target = union;
-			} else {
-				JavaPluginConvention javaPlugin = getProject().getConvention().findPlugin(JavaPluginConvention.class);
-				if (javaPlugin == null) {
-					throw new GradleException("You must either specify 'target' manually or apply a kotlin plugin.");
-				}
-				FileCollection union = getProject().files();
-				for (SourceSet sourceSet : javaPlugin.getSourceSets()) {
-					union = union.plus(sourceSet.getAllSource().filter(file -> {
-						String name = file.getName();
-						return name.endsWith(".kt") || name.endsWith(".kts");
-					}));
-				}
-				target = union;
-			}
+					});
 		}
 		super.setupTask(task);
 	}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java
index 9d710a1ba9..1639f3473c 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java
@@ -21,17 +21,12 @@
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 
-import org.gradle.api.GradleException;
-import org.gradle.api.file.FileCollection;
-import org.gradle.api.plugins.JavaPluginConvention;
-import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.tasks.SourceSet;
-import org.gradle.util.GradleVersion;
 
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.scala.ScalaFmtStep;
 
-public class ScalaExtension extends FormatExtension {
+public class ScalaExtension extends FormatExtension implements JvmLang {
 	static final String NAME = "scala";
 
 	@Inject
@@ -81,33 +76,13 @@ private FormatterStep createStep() {
 	@Override
 	protected void setupTask(SpotlessTask task) {
 		if (target == null) {
-			if (GradleVersion.current().compareTo(GradleVersion.version("7.1")) >= 0) {
-				JavaPluginExtension javaPluginExtension = getProject().getExtensions().findByType(JavaPluginExtension.class);
-				if (javaPluginExtension == null) {
-					throw new GradleException("You must either specify 'target' manually or apply the 'scala' plugin.");
-				}
-				FileCollection union = getProject().files();
-				for (SourceSet sourceSet : javaPluginExtension.getSourceSets()) {
-					union = union.plus(sourceSet.getAllSource().filter(file -> {
-						String name = file.getName();
+			target = getSources(getProject(),
+					"You must either specify 'target' manually or apply the 'scala' plugin.",
+					SourceSet::getAllSource,
+					file -> {
+						final String name = file.getName();
 						return name.endsWith(".scala") || name.endsWith(".sc");
-					}));
-				}
-				target = union;
-			} else {
-				JavaPluginConvention javaPlugin = getProject().getConvention().findPlugin(JavaPluginConvention.class);
-				if (javaPlugin == null) {
-					throw new GradleException("You must either specify 'target' manually or apply the 'scala' plugin.");
-				}
-				FileCollection union = getProject().files();
-				for (SourceSet sourceSet : javaPlugin.getSourceSets()) {
-					union = union.plus(sourceSet.getAllSource().filter(file -> {
-						String name = file.getName();
-						return name.endsWith(".scala") || name.endsWith(".sc");
-					}));
-				}
-				target = union;
-			}
+					});
 		}
 		super.setupTask(task);
 	}

From 1c21d12ebc7e1dabdb6d2001df18fff8d84c1fe4 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 27 Mar 2023 18:37:25 -0700
Subject: [PATCH 0967/2068] Centralize gradle versions so we can remove
 version-specific workarounds as soon as possible.

---
 .../src/main/java/com/diffplug/gradle/spotless/JvmLang.java | 2 +-
 .../java/com/diffplug/gradle/spotless/SpotlessPlugin.java   | 5 +++--
 .../diffplug/gradle/spotless/SpotlessPluginRedirect.java    | 6 +++---
 .../diffplug/gradle/spotless/GradleIntegrationHarness.java  | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JvmLang.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JvmLang.java
index 6e30674c6c..1a9a06b986 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JvmLang.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JvmLang.java
@@ -34,7 +34,7 @@ interface JvmLang {
 	default FileCollection getSources(Project project, String message, Function<SourceSet, SourceDirectorySet> sourceSetSourceDirectory, Spec<? super File> filterSpec) {
 		final SourceSetContainer sourceSets;
 		FileCollection union = project.files();
-		if (GradleVersion.current().compareTo(GradleVersion.version("7.1")) >= 0) {
+		if (GradleVersion.current().compareTo(GradleVersion.version(SpotlessPlugin.VER_GRADLE_javaPluginExtension)) >= 0) {
 			final JavaPluginExtension javaPluginExtension = project.getExtensions().findByType(JavaPluginExtension.class);
 			if (javaPluginExtension == null) {
 				throw new GradleException(message);
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPlugin.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPlugin.java
index 91847af0cf..0043e2b274 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPlugin.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPlugin.java
@@ -26,13 +26,14 @@
 
 public class SpotlessPlugin implements Plugin<Project> {
 	static final String SPOTLESS_MODERN = "spotlessModern";
-	static final String MINIMUM_GRADLE = "6.1.1";
+	static final String VER_GRADLE_min = "6.1.1";
+	static final String VER_GRADLE_javaPluginExtension = "7.1";
 	private static final int MINIMUM_JRE = 11;
 
 	@Override
 	public void apply(Project project) {
 		if (SpotlessPluginRedirect.gradleIsTooOld(project)) {
-			throw new GradleException("Spotless requires Gradle " + MINIMUM_GRADLE + " or newer, this was " + project.getGradle().getGradleVersion());
+			throw new GradleException("Spotless requires Gradle " + VER_GRADLE_min + " or newer, this was " + project.getGradle().getGradleVersion());
 		}
 		if (Jvm.version() < MINIMUM_JRE) {
 			throw new GradleException("Spotless requires JRE " + MINIMUM_JRE + " or newer, this was " + JavaVersion.current() + ".\n"
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPluginRedirect.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPluginRedirect.java
index da4d3dcd8b..975ec5576e 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPluginRedirect.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPluginRedirect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 DiffPlug
+ * Copyright 2020-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,7 +46,7 @@ private static int badSemver(int major, int minor) {
 
 	static boolean gradleIsTooOld(Project project) {
 		if (gradleIsTooOld == null) {
-			gradleIsTooOld = badSemver(project.getGradle().getGradleVersion()) < badSemver(SpotlessPlugin.MINIMUM_GRADLE);
+			gradleIsTooOld = badSemver(project.getGradle().getGradleVersion()) < badSemver(SpotlessPlugin.VER_GRADLE_min);
 		}
 		return gradleIsTooOld.booleanValue();
 	}
@@ -73,7 +73,7 @@ public void apply(Project project) {
 				"If you like the idea behind 'ratchetFrom', you should checkout spotless-changelog",
 				"https://github.com/diffplug/spotless-changelog");
 		if (gradleIsTooOld(project)) {
-			errorMsg = errorMsg.replace("To migrate:\n", "To migrate:\n- Upgrade gradle to " + SpotlessPlugin.MINIMUM_GRADLE + " or newer (you're on " + project.getGradle().getGradleVersion() + ")\n");
+			errorMsg = errorMsg.replace("To migrate:\n", "To migrate:\n- Upgrade gradle to " + SpotlessPlugin.VER_GRADLE_min + " or newer (you're on " + project.getGradle().getGradleVersion() + ")\n");
 		}
 		throw new GradleException(errorMsg);
 	}
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
index 1763fd088f..61d191bab1 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
@@ -43,7 +43,7 @@
 
 public class GradleIntegrationHarness extends ResourceHarness {
 	public enum GradleVersionSupport {
-		JRE_11("5.0"), MINIMUM(SpotlessPlugin.MINIMUM_GRADLE),
+		JRE_11("5.0"), MINIMUM(SpotlessPlugin.VER_GRADLE_min),
 		// technically, this API exists in 6.5, but the flags for it change in 6.6, so we build to that
 		CONFIGURATION_CACHE("6.6"),
 		// https://docs.gradle.org/7.5/userguide/configuration_cache.html#config_cache:stable

From 86fc942a75e37c6ad0dea9348bbe858d382a91ae Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Wed, 5 Apr 2023 23:06:05 +0400
Subject: [PATCH 0968/2068] Rename simple to gherkinUtils

---
 plugin-gradle/README.md                                   | 2 +-
 .../com/diffplug/gradle/spotless/GherkinExtension.java    | 8 ++++----
 .../diffplug/gradle/spotless/GherkinExtensionTest.java    | 2 +-
 plugin-maven/README.md                                    | 4 ++--
 .../java/com/diffplug/spotless/maven/gherkin/Gherkin.java | 4 ++--
 .../gherkin/{SimpleGherkin.java => GherkinUtils.java}     | 4 ++--
 .../com/diffplug/spotless/maven/gherkin/GherkinTest.java  | 2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)
 rename plugin-maven/src/main/java/com/diffplug/spotless/maven/gherkin/{SimpleGherkin.java => GherkinUtils.java} (91%)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 2caf22809f..7a4673ccdc 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -873,7 +873,7 @@ Uses a Gherkin pretty-printer that optionally allows configuring the number of s
 spotless {
   gherkin {
     target 'src/**/*.feature'     // required to be set explicitly
-    simple()
+    gherkinUtils()
       .version('8.0.2')           // optional: custom version of 'io.cucumber:gherkin-utils'
   }
 }
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java
index ca2fcfbce6..ab28e2213f 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java
@@ -37,15 +37,15 @@ protected void setupTask(SpotlessTask task) {
 		super.setupTask(task);
 	}
 
-	public SimpleConfig simple() {
-		return new SimpleConfig();
+	public GherkinUtilsConfig gherkinUtils() {
+		return new GherkinUtilsConfig();
 	}
 
-	public class SimpleConfig {
+	public class GherkinUtilsConfig {
 		private String version;
 		private int indent;
 
-		public SimpleConfig() {
+		public GherkinUtilsConfig() {
 			this.version = GherkinSimpleStep.defaultVersion();
 			this.indent = GherkinSimpleConfig.defaultIndentSpaces();
 			addStep(createStep());
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GherkinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GherkinExtensionTest.java
index 915322830b..b78094cf18 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GherkinExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GherkinExtensionTest.java
@@ -31,7 +31,7 @@ public void defaultFormatting() throws IOException {
 				"spotless {",
 				"  gherkin {",
 				"    target 'examples/**/*.feature'",
-				"    simple()",
+				"    gherkinUtils()",
 				"  }",
 				"}");
 		setFile("src/main/resources/example.feature").toResource("gherkin/minimalBefore.feature");
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 2464527426..35caa4771b 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -996,9 +996,9 @@ Uses Jackson and YAMLFactory to pretty print objects:
 Uses a Gherkin pretty-printer that optionally allows configuring the number of spaces that are used to pretty print objects:
 
 ```xml
-<simple>
+<gherkinUtils>
   <version>8.0.2</version>                 <!-- optional: Custom version of 'io.cucumber:gherkin-utils' -->
-</simple>
+</gherkinUtils>
 ```
 
 ## Prettier
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/gherkin/Gherkin.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/gherkin/Gherkin.java
index 614e5026a0..60181d048a 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/gherkin/Gherkin.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/gherkin/Gherkin.java
@@ -36,8 +36,8 @@ public String licenseHeaderDelimiter() {
 		return null;
 	}
 
-	public void addSimple(SimpleGherkin simple) {
-		addStepFactory(simple);
+	public void addGherkinUtils(GherkinUtils gherkinUtils) {
+		addStepFactory(gherkinUtils);
 	}
 
 }
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/gherkin/SimpleGherkin.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/gherkin/GherkinUtils.java
similarity index 91%
rename from plugin-maven/src/main/java/com/diffplug/spotless/maven/gherkin/SimpleGherkin.java
rename to plugin-maven/src/main/java/com/diffplug/spotless/maven/gherkin/GherkinUtils.java
index e74bca929d..885d701874 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/gherkin/SimpleGherkin.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/gherkin/GherkinUtils.java
@@ -25,9 +25,9 @@
 import com.diffplug.spotless.maven.FormatterStepFactory;
 
 /**
- * A {@link FormatterFactory} implementation that corresponds to {@code <gherkin><simple>...</simple></gherkin>} configuration element.
+ * A {@link FormatterFactory} implementation that corresponds to {@code <gherkin><gherkinUtils>...</gherkinUtils></gherkin>} configuration element.
  */
-public class SimpleGherkin implements FormatterStepFactory {
+public class GherkinUtils implements FormatterStepFactory {
 
 	@Parameter
 	private String version = GherkinSimpleStep.defaultVersion();
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/gherkin/GherkinTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/gherkin/GherkinTest.java
index f4928da3d6..95a60097d0 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/gherkin/GherkinTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/gherkin/GherkinTest.java
@@ -22,7 +22,7 @@
 public class GherkinTest extends MavenIntegrationHarness {
 	@Test
 	public void testFormatJson_WithSimple_defaultConfig_sortByKeys() throws Exception {
-		writePomWithGherkinSteps("<simple/>");
+		writePomWithGherkinSteps("<gherkinUtils/>");
 
 		setFile("examples/main/resources/example.feature").toResource("gherkin/minimalBefore.feature");
 		mavenRunner().withArguments("spotless:apply").runNoError();

From 9bc36a0745bd082635f56b700d14699351be395f Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Wed, 5 Apr 2023 23:09:45 +0400
Subject: [PATCH 0969/2068] Add link to homepage and changelog

---
 CHANGES.md               | 2 +-
 plugin-gradle/CHANGES.md | 2 +-
 plugin-gradle/README.md  | 6 ++++--
 plugin-maven/CHANGES.md  | 2 +-
 plugin-maven/README.md   | 4 +++-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 0905c13857..70200b092f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,7 +13,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * Support configuration of mirrors for P2 repositories in `EquoBasedStepBuilder` ([#1629](https://github.com/diffplug/spotless/issues/1629)).
 * The `style` option in Palantir Java Format ([#1654](https://github.com/diffplug/spotless/pull/1654)).
-* Added formatter for Gherkin feature files ([1649](https://github.com/diffplug/spotless/issues/1649)).
+* Added formatter for Gherkin feature files ([#1649](https://github.com/diffplug/spotless/issues/1649)).
 ### Changes
 * **POTENTIALLY BREAKING** Converted `googleJavaFormat` to a compile-only dependency and drop support for versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
 * Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 61dca9cca9..903064e2b1 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -15,7 +15,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
   Mirrors are selected by prefix match, for example `https://download.eclipse.org/eclipse/updates/4.26/` will be redirected to `https://some.internal.mirror/eclipse/eclipse/updates/4.26/`.
   The same configuration exists for `greclipse` and `eclipseCdt`.
 * The `style` option in Palantir Java Format ([#1654](https://github.com/diffplug/spotless/pull/1654)).
-* Added support for Gherkin feature files ([1649](https://github.com/diffplug/spotless/issues/1649)).
+* Added support for Gherkin feature files ([#1649](https://github.com/diffplug/spotless/issues/1649)).
 ### Changes
 * **POTENTIALLY BREAKING** Drop support for `googleJavaFormat` versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
 * Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 7a4673ccdc..5ae9d2bd95 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -860,12 +860,14 @@ spotless {
 spotless {
   gherkin {
     target 'src/**/*.feature' // you have to set the target manually
-    simple() // has its own section below
+    gherkinUtils() // has its own section below
   }
 }
 ```
 
-### simple
+### gherkinUtils
+
+[homepage](https://github.com/cucumber/gherkin-utils). [changelog](https://github.com/cucumber/gherkin-utils/blob/main/CHANGELOG.md).
 
 Uses a Gherkin pretty-printer that optionally allows configuring the number of spaces that are used to pretty print objects:
 
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 8fc3886d99..69877ce03e 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -8,7 +8,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changes
 * **POTENTIALLY BREAKING** Drop support for `googleJavaFormat` versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
 * Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
-* Added support for Gherkin feature files ([1649](https://github.com/diffplug/spotless/issues/1649)).
+* Added support for Gherkin feature files ([#1649](https://github.com/diffplug/spotless/issues/1649)).
 
 ## [2.35.0] - 2023-03-13
 ### Added
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 35caa4771b..da7cc6ad07 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -986,13 +986,15 @@ Uses Jackson and YAMLFactory to pretty print objects:
       <include>src/**/*.feature</include>
     </includes>
 
-    <simple />    <!-- has its own section below -->
+    <gherkinUtils />    <!-- has its own section below -->
   </gherkin>
 </configuration>
 ```
 
 ### simple
 
+[homepage](https://github.com/cucumber/gherkin-utils). [changelog](https://github.com/cucumber/gherkin-utils/blob/main/CHANGELOG.md).
+
 Uses a Gherkin pretty-printer that optionally allows configuring the number of spaces that are used to pretty print objects:
 
 ```xml

From ac4884e3a688d0d0624e42e6b6ea8fc18b314134 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 5 Apr 2023 14:13:17 -0700
Subject: [PATCH 0970/2068] Rename all the GherkinSimple classes to
 GherkinUtils.

---
 ...rFunc.java => GherkinUtilsFormatterFunc.java} | 10 +++++-----
 ...SimpleConfig.java => GherkinUtilsConfig.java} |  4 ++--
 ...rkinSimpleStep.java => GherkinUtilsStep.java} | 16 ++++++++--------
 .../gradle/spotless/GherkinExtension.java        |  9 ++++-----
 .../spotless/maven/gherkin/GherkinUtils.java     | 10 +++++-----
 .../spotless/gherkin/GherkinSimpleStepTest.java  | 14 +++++++-------
 6 files changed, 31 insertions(+), 32 deletions(-)
 rename lib/src/gherkin/java/com/diffplug/spotless/glue/gherkin/{GherkinFormatterFunc.java => GherkinUtilsFormatterFunc.java} (87%)
 rename lib/src/main/java/com/diffplug/spotless/gherkin/{GherkinSimpleConfig.java => GherkinUtilsConfig.java} (90%)
 rename lib/src/main/java/com/diffplug/spotless/gherkin/{GherkinSimpleStep.java => GherkinUtilsStep.java} (77%)

diff --git a/lib/src/gherkin/java/com/diffplug/spotless/glue/gherkin/GherkinFormatterFunc.java b/lib/src/gherkin/java/com/diffplug/spotless/glue/gherkin/GherkinUtilsFormatterFunc.java
similarity index 87%
rename from lib/src/gherkin/java/com/diffplug/spotless/glue/gherkin/GherkinFormatterFunc.java
rename to lib/src/gherkin/java/com/diffplug/spotless/glue/gherkin/GherkinUtilsFormatterFunc.java
index f46f7da32a..4b79347b29 100644
--- a/lib/src/gherkin/java/com/diffplug/spotless/glue/gherkin/GherkinFormatterFunc.java
+++ b/lib/src/gherkin/java/com/diffplug/spotless/glue/gherkin/GherkinUtilsFormatterFunc.java
@@ -19,7 +19,7 @@
 import org.slf4j.LoggerFactory;
 
 import com.diffplug.spotless.FormatterFunc;
-import com.diffplug.spotless.gherkin.GherkinSimpleConfig;
+import com.diffplug.spotless.gherkin.GherkinUtilsConfig;
 
 import io.cucumber.gherkin.GherkinParser;
 import io.cucumber.gherkin.utils.pretty.Pretty;
@@ -29,12 +29,12 @@
 import io.cucumber.messages.types.Source;
 import io.cucumber.messages.types.SourceMediaType;
 
-public class GherkinFormatterFunc implements FormatterFunc {
-	private static final Logger LOGGER = LoggerFactory.getLogger(GherkinFormatterFunc.class);
+public class GherkinUtilsFormatterFunc implements FormatterFunc {
+	private static final Logger LOGGER = LoggerFactory.getLogger(GherkinUtilsFormatterFunc.class);
 
-	private final GherkinSimpleConfig gherkinSimpleConfig;
+	private final GherkinUtilsConfig gherkinSimpleConfig;
 
-	public GherkinFormatterFunc(GherkinSimpleConfig gherkinSimpleConfig) {
+	public GherkinUtilsFormatterFunc(GherkinUtilsConfig gherkinSimpleConfig) {
 		this.gherkinSimpleConfig = gherkinSimpleConfig;
 	}
 
diff --git a/lib/src/main/java/com/diffplug/spotless/gherkin/GherkinSimpleConfig.java b/lib/src/main/java/com/diffplug/spotless/gherkin/GherkinUtilsConfig.java
similarity index 90%
rename from lib/src/main/java/com/diffplug/spotless/gherkin/GherkinSimpleConfig.java
rename to lib/src/main/java/com/diffplug/spotless/gherkin/GherkinUtilsConfig.java
index 6c718e0382..d7962c6543 100644
--- a/lib/src/main/java/com/diffplug/spotless/gherkin/GherkinSimpleConfig.java
+++ b/lib/src/main/java/com/diffplug/spotless/gherkin/GherkinUtilsConfig.java
@@ -17,7 +17,7 @@
 
 import java.io.Serializable;
 
-public class GherkinSimpleConfig implements Serializable {
+public class GherkinUtilsConfig implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	public static int defaultIndentSpaces() {
@@ -28,7 +28,7 @@ public static int defaultIndentSpaces() {
 
 	final int indentSpaces;
 
-	public GherkinSimpleConfig(int indentSpaces) {
+	public GherkinUtilsConfig(int indentSpaces) {
 		this.indentSpaces = indentSpaces;
 	}
 
diff --git a/lib/src/main/java/com/diffplug/spotless/gherkin/GherkinSimpleStep.java b/lib/src/main/java/com/diffplug/spotless/gherkin/GherkinUtilsStep.java
similarity index 77%
rename from lib/src/main/java/com/diffplug/spotless/gherkin/GherkinSimpleStep.java
rename to lib/src/main/java/com/diffplug/spotless/gherkin/GherkinUtilsStep.java
index 10954f2bb1..78f5eacd32 100644
--- a/lib/src/main/java/com/diffplug/spotless/gherkin/GherkinSimpleStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/gherkin/GherkinUtilsStep.java
@@ -26,7 +26,7 @@
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
 
-public class GherkinSimpleStep {
+public class GherkinUtilsStep {
 	private static final String MAVEN_COORDINATE = "io.cucumber:gherkin-utils:";
 	private static final String DEFAULT_VERSION = "8.0.2";
 
@@ -34,32 +34,32 @@ public static String defaultVersion() {
 		return DEFAULT_VERSION;
 	}
 
-	public static FormatterStep create(GherkinSimpleConfig gherkinSimpleConfig,
+	public static FormatterStep create(GherkinUtilsConfig gherkinSimpleConfig,
 			String formatterVersion, Provisioner provisioner) {
 		Objects.requireNonNull(provisioner, "provisioner cannot be null");
-		return FormatterStep.createLazy("gherkin", () -> new GherkinSimpleStep.State(gherkinSimpleConfig, formatterVersion, provisioner), GherkinSimpleStep.State::toFormatter);
+		return FormatterStep.createLazy("gherkin", () -> new GherkinUtilsStep.State(gherkinSimpleConfig, formatterVersion, provisioner), GherkinUtilsStep.State::toFormatter);
 	}
 
 	private static final class State implements Serializable {
 		private static final long serialVersionUID = 1L;
 
-		private final GherkinSimpleConfig gherkinSimpleConfig;
+		private final GherkinUtilsConfig gherkinSimpleConfig;
 		private final JarState jarState;
 
-		private State(GherkinSimpleConfig gherkinSimpleConfig, String formatterVersion, Provisioner provisioner) throws IOException {
+		private State(GherkinUtilsConfig gherkinSimpleConfig, String formatterVersion, Provisioner provisioner) throws IOException {
 			this.gherkinSimpleConfig = gherkinSimpleConfig;
 			this.jarState = JarState.from(MAVEN_COORDINATE + formatterVersion, provisioner);
 		}
 
 		FormatterFunc toFormatter() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException,
 				InstantiationException, IllegalAccessException {
-			Class<?> formatterFunc = jarState.getClassLoader().loadClass("com.diffplug.spotless.glue.gherkin.GherkinFormatterFunc");
-			Constructor<?> constructor = formatterFunc.getConstructor(GherkinSimpleConfig.class);
+			Class<?> formatterFunc = jarState.getClassLoader().loadClass("com.diffplug.spotless.glue.gherkin.GherkinUtilsFormatterFunc");
+			Constructor<?> constructor = formatterFunc.getConstructor(GherkinUtilsConfig.class);
 			return (FormatterFunc) constructor.newInstance(gherkinSimpleConfig);
 		}
 	}
 
-	private GherkinSimpleStep() {
+	private GherkinUtilsStep() {
 		// cannot be directly instantiated
 	}
 }
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java
index ab28e2213f..6305289818 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java
@@ -18,8 +18,7 @@
 import javax.inject.Inject;
 
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.gherkin.GherkinSimpleConfig;
-import com.diffplug.spotless.gherkin.GherkinSimpleStep;
+import com.diffplug.spotless.gherkin.GherkinUtilsStep;
 
 public class GherkinExtension extends FormatExtension {
 	static final String NAME = "gherkin";
@@ -46,8 +45,8 @@ public class GherkinUtilsConfig {
 		private int indent;
 
 		public GherkinUtilsConfig() {
-			this.version = GherkinSimpleStep.defaultVersion();
-			this.indent = GherkinSimpleConfig.defaultIndentSpaces();
+			this.version = GherkinUtilsStep.defaultVersion();
+			this.indent = com.diffplug.spotless.gherkin.GherkinUtilsConfig.defaultIndentSpaces();
 			addStep(createStep());
 		}
 
@@ -57,7 +56,7 @@ public void version(String version) {
 		}
 
 		private FormatterStep createStep() {
-			return GherkinSimpleStep.create(new GherkinSimpleConfig(indent), version, provisioner());
+			return GherkinUtilsStep.create(new com.diffplug.spotless.gherkin.GherkinUtilsConfig(indent), version, provisioner());
 		}
 	}
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/gherkin/GherkinUtils.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/gherkin/GherkinUtils.java
index 885d701874..2eeabb9ab5 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/gherkin/GherkinUtils.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/gherkin/GherkinUtils.java
@@ -18,8 +18,8 @@
 import org.apache.maven.plugins.annotations.Parameter;
 
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.gherkin.GherkinSimpleConfig;
-import com.diffplug.spotless.gherkin.GherkinSimpleStep;
+import com.diffplug.spotless.gherkin.GherkinUtilsConfig;
+import com.diffplug.spotless.gherkin.GherkinUtilsStep;
 import com.diffplug.spotless.maven.FormatterFactory;
 import com.diffplug.spotless.maven.FormatterStepConfig;
 import com.diffplug.spotless.maven.FormatterStepFactory;
@@ -30,13 +30,13 @@
 public class GherkinUtils implements FormatterStepFactory {
 
 	@Parameter
-	private String version = GherkinSimpleStep.defaultVersion();
+	private String version = GherkinUtilsStep.defaultVersion();
 
 	@Parameter
-	private int indentWithSpaces = GherkinSimpleConfig.defaultIndentSpaces();
+	private int indentWithSpaces = GherkinUtilsConfig.defaultIndentSpaces();
 
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
-		return GherkinSimpleStep.create(new GherkinSimpleConfig(indentWithSpaces), version, stepConfig.getProvisioner());
+		return GherkinUtilsStep.create(new GherkinUtilsConfig(indentWithSpaces), version, stepConfig.getProvisioner());
 	}
 }
diff --git a/testlib/src/test/java/com/diffplug/spotless/gherkin/GherkinSimpleStepTest.java b/testlib/src/test/java/com/diffplug/spotless/gherkin/GherkinSimpleStepTest.java
index 2c85d72069..56cad1273a 100644
--- a/testlib/src/test/java/com/diffplug/spotless/gherkin/GherkinSimpleStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/gherkin/GherkinSimpleStepTest.java
@@ -27,15 +27,15 @@
 
 public class GherkinSimpleStepTest {
 
-	private static final String VERSION = GherkinSimpleStep.defaultVersion();
-	private static final int INDENT = GherkinSimpleConfig.defaultIndentSpaces();
+	private static final String VERSION = GherkinUtilsStep.defaultVersion();
+	private static final int INDENT = GherkinUtilsConfig.defaultIndentSpaces();
 
-	private final FormatterStep step = GherkinSimpleStep.create(new GherkinSimpleConfig(INDENT), VERSION, TestProvisioner.mavenCentral());
+	private final FormatterStep step = GherkinUtilsStep.create(new GherkinUtilsConfig(INDENT), VERSION, TestProvisioner.mavenCentral());
 	private final StepHarness stepHarness = StepHarness.forStep(step);
 
 	@Test
 	public void cannotProvidedNullProvisioner() {
-		assertThatThrownBy(() -> GherkinSimpleStep.create(new GherkinSimpleConfig(INDENT), VERSION, null)).isInstanceOf(NullPointerException.class).hasMessage("provisioner cannot be null");
+		assertThatThrownBy(() -> GherkinUtilsStep.create(new GherkinUtilsConfig(INDENT), VERSION, null)).isInstanceOf(NullPointerException.class).hasMessage("provisioner cannot be null");
 	}
 
 	@Test
@@ -75,7 +75,7 @@ public void handlesNotGherkin() {
 	@Disabled("gherkin-utils does not allow custom indentation")
 	@Test
 	public void canSetCustomIndentationLevel() throws Exception {
-		FormatterStep step = GherkinSimpleStep.create(new GherkinSimpleConfig(6), VERSION, TestProvisioner.mavenCentral());
+		FormatterStep step = GherkinUtilsStep.create(new GherkinUtilsConfig(6), VERSION, TestProvisioner.mavenCentral());
 		StepHarness stepHarness = StepHarness.forStep(step);
 
 		String before = "gherkin/minimalBefore.feature";
@@ -86,7 +86,7 @@ public void canSetCustomIndentationLevel() throws Exception {
 	@Disabled("gherkin-utils does not allow custom indentation")
 	@Test
 	public void canSetIndentationLevelTo0() throws Exception {
-		FormatterStep step = GherkinSimpleStep.create(new GherkinSimpleConfig(0), VERSION, TestProvisioner.mavenCentral());
+		FormatterStep step = GherkinUtilsStep.create(new GherkinUtilsConfig(0), VERSION, TestProvisioner.mavenCentral());
 		StepHarness stepHarness = StepHarness.forStep(step);
 
 		String before = "gherkin/minimalBefore.feature";
@@ -111,7 +111,7 @@ protected void setupTest(API api) {
 
 			@Override
 			protected FormatterStep create() {
-				return GherkinSimpleStep.create(new GherkinSimpleConfig(spaces), VERSION, TestProvisioner.mavenCentral());
+				return GherkinUtilsStep.create(new GherkinUtilsConfig(spaces), VERSION, TestProvisioner.mavenCentral());
 			}
 		}.testEquals();
 	}

From aefa8c85be27498b6828f1299862a17ee6393280 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 5 Apr 2023 14:13:35 -0700
Subject: [PATCH 0971/2068] Missing header update in plugin-maven/README.

---
 plugin-maven/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index da7cc6ad07..b12d777b29 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -991,7 +991,7 @@ Uses Jackson and YAMLFactory to pretty print objects:
 </configuration>
 ```
 
-### simple
+### gherkinUtils
 
 [homepage](https://github.com/cucumber/gherkin-utils). [changelog](https://github.com/cucumber/gherkin-utils/blob/main/CHANGELOG.md).
 

From 8a4cee99837bfc92ab96b814bf7609832f03b7c2 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 5 Apr 2023 14:13:42 -0700
Subject: [PATCH 0972/2068] Update the root README table.

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 662c624bdf..52628574d9 100644
--- a/README.md
+++ b/README.md
@@ -77,6 +77,7 @@ lib('generic.TrimTrailingWhitespaceStep')        +'{{yes}}       | {{yes}}
 lib('antlr4.Antlr4FormatterStep')                +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('cpp.ClangFormatStep')                       +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
 extra('cpp.EclipseFormatterStep')                +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
+lib('gherkin.GherkinUtilsStep')                  +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 extra('groovy.GrEclipseFormatterStep')           +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
 lib('java.GoogleJavaFormatStep')                 +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
 lib('java.ImportOrderStep')                      +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
@@ -125,6 +126,7 @@ lib('yaml.JacksonYamlStep')                      +'{{yes}}       | {{yes}}
 | [`antlr4.Antlr4FormatterStep`](lib/src/main/java/com/diffplug/spotless/antlr4/Antlr4FormatterStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`cpp.ClangFormatStep`](lib/src/main/java/com/diffplug/spotless/cpp/ClangFormatStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
 | [`cpp.EclipseFormatterStep`](lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseFormatterStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
+| [`gherkin.GherkinUtilsStep`](lib/src/main/java/com/diffplug/spotless/gherkin/GherkinUtilsStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`groovy.GrEclipseFormatterStep`](lib-extra/src/main/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`java.GoogleJavaFormatStep`](lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`java.ImportOrderStep`](lib/src/main/java/com/diffplug/spotless/java/ImportOrderStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |

From 1470666c83588149ba1e0bc2178099343abc39d9 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 5 Apr 2023 14:21:19 -0700
Subject: [PATCH 0973/2068] More version centralizing.

---
 .../main/java/com/diffplug/gradle/spotless/GroovyExtension.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java
index 17a57f6301..f20137f047 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java
@@ -118,7 +118,7 @@ protected void setupTask(SpotlessTask task) {
 			target = getSources(getProject(),
 					message,
 					sourceSet -> {
-						if (GradleVersion.current().compareTo(GradleVersion.version("7.1")) >= 0) {
+						if (GradleVersion.current().compareTo(GradleVersion.version(SpotlessPlugin.VER_GRADLE_javaPluginExtension)) >= 0) {
 							return sourceSet.getExtensions().getByType(GroovySourceDirectorySet.class);
 						} else {
 							final GroovySourceSet groovySourceSet = new DslObject(sourceSet).getConvention().getPlugin(GroovySourceSet.class);

From 9f490688151ae0d858df59b5c923efbeba8fffe0 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 5 Apr 2023 14:25:02 -0700
Subject: [PATCH 0974/2068] Improve the GroovyExtension error message when
 there is no target and no `groovy` plugin.

---
 .../main/java/com/diffplug/gradle/spotless/GroovyExtension.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java
index f20137f047..a7f3d98ce4 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java
@@ -111,7 +111,7 @@ public GrEclipseConfig withP2Mirrors(Map<String, String> mirrors) {
 	@Override
 	protected void setupTask(SpotlessTask task) {
 		if (target == null) {
-			final String message = "You must apply the groovy plugin before the spotless plugin if you are using the groovy extension.";
+			final String message = "You must either specify 'target' manually or apply the 'groovy' plugin.";
 			if (!getProject().getPlugins().hasPlugin(GroovyBasePlugin.class)) {
 				throw new GradleException(message);
 			}

From 45e078d3540660c97f07319134d524086519a920 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 5 Apr 2023 14:26:34 -0700
Subject: [PATCH 0975/2068] Update changelog.

---
 plugin-gradle/CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 0a0cabcca0..831182d900 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -17,6 +17,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changes
 * **POTENTIALLY BREAKING** Drop support for `googleJavaFormat` versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
 * Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
+### Fixed
+* Stop using deprecated conventions when used in Gradle >= `7.1`. ([#1618](https://github.com/diffplug/spotless/pull/1618))
 
 ## [6.17.0] - 2023-03-13
 ### Added

From aeb6098e4a21f37c10d0146325c00552c8ba265f Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 5 Apr 2023 14:30:26 -0700
Subject: [PATCH 0976/2068] spotlessApply

---
 .../java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java | 1 -
 .../java/com/diffplug/spotless/maven/FormattersHolder.java     | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
index d68387bb27..0c49a32ab2 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
@@ -23,7 +23,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormattersHolder.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormattersHolder.java
index ff3e1c81fe..873321f9df 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormattersHolder.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormattersHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2021-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 package com.diffplug.spotless.maven;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Map.Entry;

From 051454677897ed410bb6287cfda7cba33852844e Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 5 Apr 2023 14:40:01 -0700
Subject: [PATCH 0977/2068] Rename the test to match the rest.

---
 .../{GherkinSimpleStepTest.java => GherkinUtilsStepTest.java}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename testlib/src/test/java/com/diffplug/spotless/gherkin/{GherkinSimpleStepTest.java => GherkinUtilsStepTest.java} (99%)

diff --git a/testlib/src/test/java/com/diffplug/spotless/gherkin/GherkinSimpleStepTest.java b/testlib/src/test/java/com/diffplug/spotless/gherkin/GherkinUtilsStepTest.java
similarity index 99%
rename from testlib/src/test/java/com/diffplug/spotless/gherkin/GherkinSimpleStepTest.java
rename to testlib/src/test/java/com/diffplug/spotless/gherkin/GherkinUtilsStepTest.java
index 56cad1273a..6bc478027b 100644
--- a/testlib/src/test/java/com/diffplug/spotless/gherkin/GherkinSimpleStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/gherkin/GherkinUtilsStepTest.java
@@ -25,7 +25,7 @@
 import com.diffplug.spotless.StepHarness;
 import com.diffplug.spotless.TestProvisioner;
 
-public class GherkinSimpleStepTest {
+public class GherkinUtilsStepTest {
 
 	private static final String VERSION = GherkinUtilsStep.defaultVersion();
 	private static final int INDENT = GherkinUtilsConfig.defaultIndentSpaces();

From 5bf01af2fee1c202868859aca4272e7472f1bc9f Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 5 Apr 2023 14:41:57 -0700
Subject: [PATCH 0978/2068] Terrible trailing space is needed until
 cucumber/gherkin-utils#20 gets merged.

---
 .../src/main/resources/gherkin/complex_backgroundAfter.feature  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testlib/src/main/resources/gherkin/complex_backgroundAfter.feature b/testlib/src/main/resources/gherkin/complex_backgroundAfter.feature
index eb4d4de89a..5a9553d98d 100644
--- a/testlib/src/main/resources/gherkin/complex_backgroundAfter.feature
+++ b/testlib/src/main/resources/gherkin/complex_backgroundAfter.feature
@@ -12,7 +12,7 @@ Feature: Complex background
 
   Rule: My Rule
 
-    Background:
+    Background: 
       Given a rule background step
 
     Scenario: with examples

From d7ca743c187b868d2ba58d93027d3a61ac8950e0 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 5 Apr 2023 14:44:04 -0700
Subject: [PATCH 0979/2068] Fix groovy test for new error message.

---
 .../java/com/diffplug/gradle/spotless/GroovyExtensionTest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GroovyExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GroovyExtensionTest.java
index b9c7d2f66e..8ca432ebf6 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GroovyExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GroovyExtensionTest.java
@@ -103,7 +103,7 @@ void groovyPluginMissingCheck() throws IOException {
 
 		Throwable error = assertThrows(Throwable.class,
 				() -> gradleRunner().withArguments("spotlessApply").build());
-		assertThat(error).hasMessageContaining("must apply the groovy plugin before");
+		assertThat(error).hasMessageContaining("You must either specify 'target' manually or apply the 'groovy' plugin.");
 	}
 
 }

From 350d37ca96cb4d193e3c148a6de1dfed3290a8be Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 5 Apr 2023 14:48:43 -0700
Subject: [PATCH 0980/2068] Update FlexmarkStep version to latest.

---
 .../java/com/diffplug/spotless/markdown/FlexmarkStep.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/markdown/FlexmarkStep.java b/lib/src/main/java/com/diffplug/spotless/markdown/FlexmarkStep.java
index 19550b6e44..263931693e 100644
--- a/lib/src/main/java/com/diffplug/spotless/markdown/FlexmarkStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/markdown/FlexmarkStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@ public class FlexmarkStep {
 	// prevent direct instantiation
 	private FlexmarkStep() {}
 
-	private static final String DEFAULT_VERSION = "0.62.2";
+	private static final String DEFAULT_VERSION = "0.64.0";
 	private static final String NAME = "flexmark-java";
 	private static final String MAVEN_COORDINATE = "com.vladsch.flexmark:flexmark-all:";
 

From 101b435f44e8d40fa9895bd617efb490248492a5 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 5 Apr 2023 14:48:53 -0700
Subject: [PATCH 0981/2068] Add test for earliest and latest versions.

---
 .../spotless/markdown/FlexmarkStepTest.java         | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/testlib/src/test/java/com/diffplug/spotless/markdown/FlexmarkStepTest.java b/testlib/src/test/java/com/diffplug/spotless/markdown/FlexmarkStepTest.java
index 191ffa4cb5..0406c05678 100644
--- a/testlib/src/test/java/com/diffplug/spotless/markdown/FlexmarkStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/markdown/FlexmarkStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,9 +21,18 @@
 import com.diffplug.spotless.TestProvisioner;
 
 class FlexmarkStepTest {
+	private static final String oldestSupported = "0.62.2";
 
 	@Test
-	void behavior() throws Exception {
+	void behaviorOldest() {
+		StepHarness.forStep(FlexmarkStep.create(oldestSupported, TestProvisioner.mavenCentral()))
+				.testResource(
+						"markdown/flexmark/FlexmarkUnformatted.md",
+						"markdown/flexmark/FlexmarkFormatted.md");
+	}
+
+	@Test
+	void behaviorLatest() {
 		StepHarness.forStep(FlexmarkStep.create(TestProvisioner.mavenCentral()))
 				.testResource(
 						"markdown/flexmark/FlexmarkUnformatted.md",

From 91439e5c7300e4ee2253e404a72e92963863f7e2 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 5 Apr 2023 14:50:14 -0700
Subject: [PATCH 0982/2068] spotlessApply

---
 .../java/com/diffplug/gradle/spotless/GroovyExtensionTest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GroovyExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GroovyExtensionTest.java
index 8ca432ebf6..c38df40d54 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GroovyExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GroovyExtensionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 64b8183793497522a58d07ee49ac578f930a5c04 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 5 Apr 2023 15:06:52 -0700
Subject: [PATCH 0983/2068] The equo-based steps ought to be initialized with a
 version.

---
 .../diffplug/spotless/extra/EquoBasedStepBuilder.java    | 9 ++++++++-
 .../spotless/extra/cpp/EclipseCdtFormatterStep.java      | 2 +-
 .../spotless/extra/groovy/GrEclipseFormatterStep.java    | 2 +-
 .../spotless/extra/java/EclipseJdtFormatterStep.java     | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

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 cc12a938ad..66993e2f6c 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
@@ -46,10 +46,17 @@ public abstract class EquoBasedStepBuilder {
 	private Iterable<File> settingsFiles = new ArrayList<>();
 	private Map<String, String> p2Mirrors = Map.of();
 
-	/** Initialize valid default configuration, taking latest version */
+	/** @deprecated if you use this constructor you *must* call {@link #setVersion(String)} before calling {@link #build()} */
+	@Deprecated
 	public EquoBasedStepBuilder(String formatterName, Provisioner mavenProvisioner, ThrowingEx.Function<State, FormatterFunc> stateToFormatter) {
+		this(formatterName, mavenProvisioner, null, stateToFormatter);
+	}
+
+	/** Initialize valid default configuration, taking latest version */
+	public EquoBasedStepBuilder(String formatterName, Provisioner mavenProvisioner, String defaultVersion, ThrowingEx.Function<State, FormatterFunc> stateToFormatter) {
 		this.formatterName = formatterName;
 		this.mavenProvisioner = mavenProvisioner;
+		this.formatterVersion = defaultVersion;
 		this.stateToFormatter = stateToFormatter;
 	}
 
diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java
index 1a83389eaa..9f9d591c3c 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java
@@ -45,7 +45,7 @@ public static String defaultVersion() {
 
 	/** Provides default configuration */
 	public static EquoBasedStepBuilder createBuilder(Provisioner provisioner) {
-		return new EquoBasedStepBuilder(NAME, provisioner, EclipseCdtFormatterStep::apply) {
+		return new EquoBasedStepBuilder(NAME, provisioner, defaultVersion(), EclipseCdtFormatterStep::apply) {
 			@Override
 			protected P2Model model(String version) {
 				var model = new P2Model();
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 08c28889f9..fd3c8b7d8b 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
@@ -39,7 +39,7 @@ public static String defaultVersion() {
 	}
 
 	public static EquoBasedStepBuilder createBuilder(Provisioner provisioner) {
-		return new EquoBasedStepBuilder(NAME, provisioner, GrEclipseFormatterStep::apply) {
+		return new EquoBasedStepBuilder(NAME, provisioner, defaultVersion(), GrEclipseFormatterStep::apply) {
 			@Override
 			protected P2Model model(String version) {
 				if (!version.startsWith("4.")) {
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 cd9314406f..4a90a40832 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
@@ -38,7 +38,7 @@ public static String defaultVersion() {
 	}
 
 	public static EquoBasedStepBuilder createBuilder(Provisioner provisioner) {
-		return new EquoBasedStepBuilder(NAME, provisioner, EclipseJdtFormatterStep::apply) {
+		return new EquoBasedStepBuilder(NAME, provisioner, defaultVersion(), EclipseJdtFormatterStep::apply) {
 			@Override
 			protected P2Model model(String version) {
 				var model = new P2Model();

From c802a1e797ae8f31fdfb927f9e9f7abd06b34b88 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 5 Apr 2023 22:37:35 +0000
Subject: [PATCH 0984/2068] chore(deps): update plugin
 io.github.davidburstrom.version-compatibility to v0.5.0

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index a9ed9373ef..a35dab8e40 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -21,7 +21,7 @@ plugins {
 	// https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md
 	id 'com.adarshr.test-logger' version '3.2.0' apply false
 	// https://github.com/davidburstrom/version-compatibility-gradle-plugin/tags
-	id 'io.github.davidburstrom.version-compatibility' version '0.4.0' apply false
+	id 'io.github.davidburstrom.version-compatibility' version '0.5.0' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.enterprise
 	id 'com.gradle.enterprise' version '3.12.6'
 	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md

From 97b5cc4031eb59134569390ae46644b0bd42820e Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 5 Apr 2023 16:15:16 -0700
Subject: [PATCH 0985/2068] Failed attempt to reproduce #1638 (I think we need
 spotless-format23.xml)

---
 ...clipseJdtFormatterStepSpecialCaseTest.java | 30 +++++++++++
 .../resources/java/eclipse/AbstractType.clean | 38 +++++++++++++
 .../resources/java/eclipse/AbstractType.test  | 54 +++++++++++++++++++
 3 files changed, 122 insertions(+)
 create mode 100644 lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java
 create mode 100644 testlib/src/main/resources/java/eclipse/AbstractType.clean
 create mode 100644 testlib/src/main/resources/java/eclipse/AbstractType.test

diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java
new file mode 100644
index 0000000000..eb93cf1f09
--- /dev/null
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2016-2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.extra.java;
+
+import org.junit.jupiter.api.Test;
+
+import com.diffplug.spotless.StepHarness;
+import com.diffplug.spotless.TestProvisioner;
+
+public class EclipseJdtFormatterStepSpecialCaseTest {
+	/** https://github.com/diffplug/spotless/issues/1638 */
+	@Test
+	public void issue_1638() {
+		StepHarness.forStep(EclipseJdtFormatterStep.createBuilder(TestProvisioner.mavenCentral()).build())
+				.testResource("java/eclipse/AbstractType.test", "java/eclipse/AbstractType.clean");
+	}
+}
diff --git a/testlib/src/main/resources/java/eclipse/AbstractType.clean b/testlib/src/main/resources/java/eclipse/AbstractType.clean
new file mode 100644
index 0000000000..475b1186fd
--- /dev/null
+++ b/testlib/src/main/resources/java/eclipse/AbstractType.clean
@@ -0,0 +1,38 @@
+package test;
+
+public abstract class AbstractType {
+
+	private String _typeName;
+
+	AbstractType(String typeName) {
+		_typeName = typeName;
+	}
+
+	private String _type() {
+		String name = getClass().getSimpleName();
+		return name.endsWith("Type") ? name.substring(0, getClass().getSimpleName().length() - 4) : name;
+	}
+
+	AbstractType argument() {
+		throw new UnsupportedOperationException(getClass().getSimpleName());
+	}
+
+	@Override
+	public boolean equals(Object another) {
+		if (this == another) {
+			return true;
+		}
+		return another instanceof AbstractType t && _typeName.equals(t._typeName);
+	}
+
+	@Override
+	public int hashCode() {
+		return _typeName.hashCode();
+	}
+
+	@Override
+	public String toString() {
+		return getClass().getSimpleName() + "(typeName)";
+	}
+
+}
diff --git a/testlib/src/main/resources/java/eclipse/AbstractType.test b/testlib/src/main/resources/java/eclipse/AbstractType.test
new file mode 100644
index 0000000000..d4753b2cfc
--- /dev/null
+++ b/testlib/src/main/resources/java/eclipse/AbstractType.test
@@ -0,0 +1,54 @@
+package test;
+
+
+
+
+public abstract class AbstractType {
+
+
+    private String _typeName;
+
+    AbstractType(String typeName) {
+        _typeName = typeName;
+    }
+
+
+
+    private String _type() {
+        String name = getClass().getSimpleName();
+        return name.endsWith("Type")
+                ? name.substring(0, getClass().getSimpleName().length() - 4)
+                : name;
+    }
+
+    AbstractType argument() {
+        throw new UnsupportedOperationException(getClass().getSimpleName());
+    }
+
+
+    @Override
+    public boolean equals(Object another) {
+        if (this == another) {
+            return true;
+        }
+        return another instanceof AbstractType t
+                && _typeName.equals(t._typeName);
+    }
+
+
+
+    @Override
+    public int hashCode() {
+        return _typeName.hashCode();
+    }
+
+
+
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + "(typeName)";
+    }
+
+
+}

From fea35e65b6c49fccdbcb917f12688ec476b8430a Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 5 Apr 2023 16:52:11 -0700
Subject: [PATCH 0986/2068] Add a testcase to reproduce #1657.

---
 ...GrEclipseFormatterStepSpecialCaseTest.java | 30 +++++++++++++++++++
 .../groovy/greclipse/format/SomeClass.test    | 12 ++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepSpecialCaseTest.java
 create mode 100644 testlib/src/main/resources/groovy/greclipse/format/SomeClass.test

diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepSpecialCaseTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepSpecialCaseTest.java
new file mode 100644
index 0000000000..768e939dfb
--- /dev/null
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepSpecialCaseTest.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.extra.groovy;
+
+import org.junit.jupiter.api.Test;
+
+import com.diffplug.spotless.StepHarness;
+import com.diffplug.spotless.TestProvisioner;
+
+public class GrEclipseFormatterStepSpecialCaseTest {
+	/** https://github.com/diffplug/spotless/issues/1657 */
+	@Test
+	public void issue_1657() {
+		StepHarness.forStep(GrEclipseFormatterStep.createBuilder(TestProvisioner.mavenCentral()).build())
+				.testResourceUnaffected("groovy/greclipse/format/SomeClass.test");
+	}
+}
diff --git a/testlib/src/main/resources/groovy/greclipse/format/SomeClass.test b/testlib/src/main/resources/groovy/greclipse/format/SomeClass.test
new file mode 100644
index 0000000000..09ea835cca
--- /dev/null
+++ b/testlib/src/main/resources/groovy/greclipse/format/SomeClass.test
@@ -0,0 +1,12 @@
+package com.somepackage
+
+class SomeClass {
+
+    def func(parm) {
+        """<tag>
+            ${parm == null ? "" : "<tag>$parm</tag>"}
+            ${parm == null ? "" : "<tag>$parm</tag>"}
+            </tag>
+        """
+    }
+}

From 4a9e26984368003a4e50b79684d2e4028d0f58be Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 5 Apr 2023 16:57:39 -0700
Subject: [PATCH 0987/2068] Improve error reporting within the GrEclipse step.

---
 .../glue/groovy/GrEclipseFormatterStepImpl.java | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java b/lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java
index 9549847d74..7c29209157 100644
--- a/lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java
+++ b/lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java
@@ -104,14 +104,14 @@ public String format(String raw) throws Exception {
 	 * Eclipse Groovy formatter does not signal problems by its return value, but by logging errors.
 	 */
 	private static final class GroovyErrorListener implements ILogListener, IGroovyLogger {
-		private final List<String> errors;
+		private final List<Throwable> errors;
 
 		public GroovyErrorListener() {
 			/*
 			 * We need a synchronized list here, in case multiple instantiations
 			 * run in parallel.
 			 */
-			errors = Collections.synchronizedList(new ArrayList<String>());
+			errors = Collections.synchronizedList(new ArrayList<>());
 			ILog groovyLogger = GroovyCoreActivator.getDefault().getLog();
 			groovyLogger.addLogListener(this);
 			synchronized (GroovyLogManager.manager) {
@@ -121,7 +121,7 @@ public GroovyErrorListener() {
 
 		@Override
 		public void logging(final IStatus status, final String plugin) {
-			errors.add(status.getMessage());
+			errors.add(status.getException());
 		}
 
 		public boolean errorsDetected() {
@@ -141,9 +141,10 @@ public String toString() {
 			} else if (0 == errors.size()) {
 				string.append("Step sucesfully executed.");
 			}
-			for (String error : errors) {
+			for (Throwable error : errors) {
+				error.printStackTrace();
 				string.append(System.lineSeparator());
-				string.append(error);
+				string.append(error.getMessage());
 			}
 
 			return string.toString();
@@ -162,7 +163,11 @@ public boolean isCategoryEnabled(TraceCategory cat) {
 
 		@Override
 		public void log(TraceCategory arg0, String arg1) {
-			errors.add(arg1);
+			try {
+				throw new RuntimeException(arg1);
+			} catch (RuntimeException e) {
+				errors.add(e);
+			}
 		}
 	}
 

From a8d5db8d3921ff3b9f8863c7f1d48e0c3907ccfc Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 5 Apr 2023 16:57:54 -0700
Subject: [PATCH 0988/2068] Use the new error reporting to figure out exactly
 what was wrong.

---
 .../GrEclipseFormatterStepSpecialCaseTest.java | 18 ++++++++++++++++--
 .../groovy/greclipse/format/SomeClass.fixed    | 12 ++++++++++++
 .../groovy/greclipse/format/SomeClass.test     |  2 +-
 3 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 testlib/src/main/resources/groovy/greclipse/format/SomeClass.fixed

diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepSpecialCaseTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepSpecialCaseTest.java
index 768e939dfb..8f832b89f0 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepSpecialCaseTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepSpecialCaseTest.java
@@ -15,16 +15,30 @@
  */
 package com.diffplug.spotless.extra.groovy;
 
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.StepHarness;
 import com.diffplug.spotless.TestProvisioner;
 
 public class GrEclipseFormatterStepSpecialCaseTest {
-	/** https://github.com/diffplug/spotless/issues/1657 */
+	/**
+	 * https://github.com/diffplug/spotless/issues/1657
+	 *
+	 * broken: ${parm == null ? "" : "<tag>$parm</tag>"}
+	 *  works: ${parm == null ? "" : "<tag>parm</tag>"}
+	 */
 	@Test
 	public void issue_1657() {
+		Assertions.assertThrows(IllegalArgumentException.class, () -> {
+			StepHarness.forStep(GrEclipseFormatterStep.createBuilder(TestProvisioner.mavenCentral()).build())
+					.testResourceUnaffected("groovy/greclipse/format/SomeClass.test");
+		});
+	}
+
+	@Test
+	public void issue_1657_fixed() {
 		StepHarness.forStep(GrEclipseFormatterStep.createBuilder(TestProvisioner.mavenCentral()).build())
-				.testResourceUnaffected("groovy/greclipse/format/SomeClass.test");
+				.testResourceUnaffected("groovy/greclipse/format/SomeClass.fixed");
 	}
 }
diff --git a/testlib/src/main/resources/groovy/greclipse/format/SomeClass.fixed b/testlib/src/main/resources/groovy/greclipse/format/SomeClass.fixed
new file mode 100644
index 0000000000..8c93ca4ad0
--- /dev/null
+++ b/testlib/src/main/resources/groovy/greclipse/format/SomeClass.fixed
@@ -0,0 +1,12 @@
+package com.somepackage
+
+class SomeClass {
+
+	def func(parm) {
+		"""<tag>
+            ${parm == null ? "" : "<tag>parm</tag>"}
+            ${parm == null ? "" : "<tag>parm</tag>"}
+           </tag>
+        """
+	}
+}
diff --git a/testlib/src/main/resources/groovy/greclipse/format/SomeClass.test b/testlib/src/main/resources/groovy/greclipse/format/SomeClass.test
index 09ea835cca..62d4df0fc5 100644
--- a/testlib/src/main/resources/groovy/greclipse/format/SomeClass.test
+++ b/testlib/src/main/resources/groovy/greclipse/format/SomeClass.test
@@ -6,7 +6,7 @@ class SomeClass {
         """<tag>
             ${parm == null ? "" : "<tag>$parm</tag>"}
             ${parm == null ? "" : "<tag>$parm</tag>"}
-            </tag>
+           </tag>
         """
     }
 }

From aea5e4107cb79e83474c85bde9e75457fb75cacc Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 6 Apr 2023 00:08:19 +0000
Subject: [PATCH 0989/2068] fix(deps): update dependency
 io.github.solven-eu.cleanthat:java to v2.13

---
 lib/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 876aa9e4a1..4c04ea42c1 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -114,7 +114,7 @@ dependencies {
 
 	gsonCompileOnly 'com.google.code.gson:gson:2.10.1'
 
-	String VER_CLEANTHAT="2.8"
+	String VER_CLEANTHAT="2.13"
 	cleanthatCompileOnly "io.github.solven-eu.cleanthat:java:$VER_CLEANTHAT"
 	compatCleanthat2Dot1CompileAndTestOnly "io.github.solven-eu.cleanthat:java:$VER_CLEANTHAT"
 

From 1475663ad839af05437e726fd54442ad20505f13 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 5 Apr 2023 17:08:41 -0700
Subject: [PATCH 0990/2068] Update changelogs.

---
 CHANGES.md               |  1 +
 plugin-gradle/CHANGES.md | 11 ++++++-----
 plugin-maven/CHANGES.md  |  3 ++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 70200b092f..a62ee49c3b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,6 +17,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changes
 * **POTENTIALLY BREAKING** Converted `googleJavaFormat` to a compile-only dependency and drop support for versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
 * Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
+* Bump default `flexmark` version `0.62.2` -> `0.64.0`. ([#1302](https://github.com/diffplug/spotless/pull/1302))
 
 ## [2.37.0] - 2023-03-13
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index d4256b15b4..d165e265fb 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,8 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * `removeUnusedImport` can be configured to rely on `cleanthat-javaparser-unnecessaryimport`. Default remains `google-java-format`. ([#1589](https://github.com/diffplug/spotless/pull/1589))
-### Changes
-* Bump default `cleanthat` version to latest `2.6` -> `2.8`. ([#1589](https://github.com/diffplug/spotless/pull/1589)
+* Added formatter for Gherkin feature files ([#1649](https://github.com/diffplug/spotless/issues/1649)).
 * Support configuration of mirrors for P2 repositories ([#1629](https://github.com/diffplug/spotless/issues/1629)):
   ```
   spotless {
@@ -18,12 +17,14 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
   Mirrors are selected by prefix match, for example `https://download.eclipse.org/eclipse/updates/4.26/` will be redirected to `https://some.internal.mirror/eclipse/eclipse/updates/4.26/`.
   The same configuration exists for `greclipse` and `eclipseCdt`.
 * The `style` option in Palantir Java Format ([#1654](https://github.com/diffplug/spotless/pull/1654)).
-* Added support for Gherkin feature files ([#1649](https://github.com/diffplug/spotless/issues/1649)).
+### Fixed
+* Stop using deprecated conventions when used in Gradle >= `7.1`. ([#1618](https://github.com/diffplug/spotless/pull/1618))
 ### Changes
 * **POTENTIALLY BREAKING** Drop support for `googleJavaFormat` versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
+* Bump default `cleanthat` version to latest `2.6` -> `2.8`. ([#1589](https://github.com/diffplug/spotless/pull/1589)
 * Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
-### Fixed
-* Stop using deprecated conventions when used in Gradle >= `7.1`. ([#1618](https://github.com/diffplug/spotless/pull/1618))
+* Bump default `flexmark` version `0.62.2` -> `0.64.0`. ([#1302](https://github.com/diffplug/spotless/pull/1302))
+
 
 ## [6.17.0] - 2023-03-13
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index dfd5677031..1b905dcc77 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -6,13 +6,14 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * `removeUnusedImport` can be configured to rely on `cleanthat-javaparser-unnecessaryimport`. Default remains `google-java-format`. ([#1589](https://github.com/diffplug/spotless/pull/1589))
 * The `style` option in Palantir Java Format ([#1654](https://github.com/diffplug/spotless/pull/1654)).
-* Added support for Gherkin feature files ([#1649](https://github.com/diffplug/spotless/issues/1649)).
+* Added formatter for Gherkin feature files ([#1649](https://github.com/diffplug/spotless/issues/1649)).
 ### Fixed
 * Fix non deterministic computation of cache fingerprint when using multiple formatters. ([#1643](https://github.com/diffplug/spotless/pull/1643) fixes [#1642](https://github.com/diffplug/spotless/pull/1642))
 ### Changes
 * Bump default `cleanthat` version to latest `2.6` -> `2.8`. ([#1589](https://github.com/diffplug/spotless/pull/1589)
 * **POTENTIALLY BREAKING** Drop support for `googleJavaFormat` versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
 * Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
+* Bump default `flexmark` version `0.62.2` -> `0.64.0`. ([#1302](https://github.com/diffplug/spotless/pull/1302))
 
 ## [2.35.0] - 2023-03-13
 ### Added

From f708c53325b92b7b9f7f3d45de42b93328cba145 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 5 Apr 2023 17:11:37 -0700
Subject: [PATCH 0991/2068] Bump default diktat `1.2.4.2` -> `1.2.5`.

---
 .../main/java/com/diffplug/spotless/kotlin/DiktatStep.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
index 9fb5bd634f..fefda39784 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 DiffPlug
+ * Copyright 2021-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@ private DiktatStep() {}
 
 	private static final String MIN_SUPPORTED_VERSION = "1.2.1";
 
-	private static final String DEFAULT_VERSION = "1.2.4.2";
+	private static final String DEFAULT_VERSION = "1.2.5";
 	static final String NAME = "diktat";
 	static final String PACKAGE_DIKTAT = "org.cqfn.diktat";
 	static final String MAVEN_COORDINATE = PACKAGE_DIKTAT + ":diktat-rules:";

From 73d0553497822671c5d6e6da08abd8801069b010 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 5 Apr 2023 17:14:01 -0700
Subject: [PATCH 0992/2068] Bump changelogs.

---
 CHANGES.md               | 2 ++
 plugin-gradle/CHANGES.md | 2 +-
 plugin-maven/CHANGES.md  | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index a62ee49c3b..418320062d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -16,8 +16,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Added formatter for Gherkin feature files ([#1649](https://github.com/diffplug/spotless/issues/1649)).
 ### Changes
 * **POTENTIALLY BREAKING** Converted `googleJavaFormat` to a compile-only dependency and drop support for versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
+* * Bump default `cleanthat` version to latest `2.6` -> `2.8`. ([#1589](https://github.com/diffplug/spotless/pull/1589)
 * Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
 * Bump default `flexmark` version `0.62.2` -> `0.64.0`. ([#1302](https://github.com/diffplug/spotless/pull/1302))
+* Bump default `diktat` version `1.2.4.2` -> `1.2.5`. ([#1631](https://github.com/diffplug/spotless/pull/1631))
 
 ## [2.37.0] - 2023-03-13
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index d165e265fb..be0a426056 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -24,7 +24,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `cleanthat` version to latest `2.6` -> `2.8`. ([#1589](https://github.com/diffplug/spotless/pull/1589)
 * Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
 * Bump default `flexmark` version `0.62.2` -> `0.64.0`. ([#1302](https://github.com/diffplug/spotless/pull/1302))
-
+* Bump default `diktat` version `1.2.4.2` -> `1.2.5`. ([#1631](https://github.com/diffplug/spotless/pull/1631))
 
 ## [6.17.0] - 2023-03-13
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 1b905dcc77..a29cd7b217 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -10,10 +10,11 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Fix non deterministic computation of cache fingerprint when using multiple formatters. ([#1643](https://github.com/diffplug/spotless/pull/1643) fixes [#1642](https://github.com/diffplug/spotless/pull/1642))
 ### Changes
-* Bump default `cleanthat` version to latest `2.6` -> `2.8`. ([#1589](https://github.com/diffplug/spotless/pull/1589)
 * **POTENTIALLY BREAKING** Drop support for `googleJavaFormat` versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
+* Bump default `cleanthat` version to latest `2.6` -> `2.8`. ([#1589](https://github.com/diffplug/spotless/pull/1589)
 * Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
 * Bump default `flexmark` version `0.62.2` -> `0.64.0`. ([#1302](https://github.com/diffplug/spotless/pull/1302))
+* Bump default `diktat` version `1.2.4.2` -> `1.2.5`. ([#1631](https://github.com/diffplug/spotless/pull/1631))
 
 ## [2.35.0] - 2023-03-13
 ### Added

From 9568a97b190f9b378feaf01283b8720d7a848a4f Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 5 Apr 2023 17:15:23 -0700
Subject: [PATCH 0993/2068] Typo double-*

---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 418320062d..17da08f52d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -16,7 +16,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Added formatter for Gherkin feature files ([#1649](https://github.com/diffplug/spotless/issues/1649)).
 ### Changes
 * **POTENTIALLY BREAKING** Converted `googleJavaFormat` to a compile-only dependency and drop support for versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
-* * Bump default `cleanthat` version to latest `2.6` -> `2.8`. ([#1589](https://github.com/diffplug/spotless/pull/1589)
+* Bump default `cleanthat` version to latest `2.6` -> `2.8`. ([#1589](https://github.com/diffplug/spotless/pull/1589)
 * Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
 * Bump default `flexmark` version `0.62.2` -> `0.64.0`. ([#1302](https://github.com/diffplug/spotless/pull/1302))
 * Bump default `diktat` version `1.2.4.2` -> `1.2.5`. ([#1631](https://github.com/diffplug/spotless/pull/1631))

From 1df679a544a2f0d5ca58152201a3bb78bfe51368 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 5 Apr 2023 17:17:52 -0700
Subject: [PATCH 0994/2068] Bump default scalafmt 3.7.1 -> 3.7.3

---
 lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java | 2 +-
 testlib/src/main/resources/scala/scalafmt/scalafmt.conf         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java b/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java
index 264ca679db..114f4a9f1a 100644
--- a/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java
@@ -34,7 +34,7 @@ public class ScalaFmtStep {
 	// prevent direct instantiation
 	private ScalaFmtStep() {}
 
-	static final String DEFAULT_VERSION = "3.7.1";
+	static final String DEFAULT_VERSION = "3.7.3";
 
 	private static final String DEFAULT_SCALA_MAJOR_VERSION = "2.13";
 	static final String NAME = "scalafmt";
diff --git a/testlib/src/main/resources/scala/scalafmt/scalafmt.conf b/testlib/src/main/resources/scala/scalafmt/scalafmt.conf
index f3cfb3a031..edea864af1 100644
--- a/testlib/src/main/resources/scala/scalafmt/scalafmt.conf
+++ b/testlib/src/main/resources/scala/scalafmt/scalafmt.conf
@@ -1,4 +1,4 @@
-version = 3.7.1
+version = 3.7.3
 runner.dialect = scala213
 style = defaultWithAlign # For pretty alignment.
 maxColumn = 20           # For my teensy narrow display

From 25571abe9f17428afdff6fee607458c4368302f3 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 5 Apr 2023 17:20:11 -0700
Subject: [PATCH 0995/2068] Update changelogs.

---
 CHANGES.md               | 5 +++--
 plugin-gradle/CHANGES.md | 5 +++--
 plugin-maven/CHANGES.md  | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 17da08f52d..d316c0a268 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,9 +17,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changes
 * **POTENTIALLY BREAKING** Converted `googleJavaFormat` to a compile-only dependency and drop support for versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
 * Bump default `cleanthat` version to latest `2.6` -> `2.8`. ([#1589](https://github.com/diffplug/spotless/pull/1589)
-* Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
-* Bump default `flexmark` version `0.62.2` -> `0.64.0`. ([#1302](https://github.com/diffplug/spotless/pull/1302))
 * Bump default `diktat` version `1.2.4.2` -> `1.2.5`. ([#1631](https://github.com/diffplug/spotless/pull/1631))
+* Bump default `flexmark` version `0.62.2` -> `0.64.0`. ([#1302](https://github.com/diffplug/spotless/pull/1302))
+* Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
+* Bump default `scalafmt` version `3.7.1` -> `3.7.3`. ([#1584](https://github.com/diffplug/spotless/pull/1584))
 
 ## [2.37.0] - 2023-03-13
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index be0a426056..9ce2dbd752 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -22,9 +22,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changes
 * **POTENTIALLY BREAKING** Drop support for `googleJavaFormat` versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
 * Bump default `cleanthat` version to latest `2.6` -> `2.8`. ([#1589](https://github.com/diffplug/spotless/pull/1589)
-* Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
-* Bump default `flexmark` version `0.62.2` -> `0.64.0`. ([#1302](https://github.com/diffplug/spotless/pull/1302))
 * Bump default `diktat` version `1.2.4.2` -> `1.2.5`. ([#1631](https://github.com/diffplug/spotless/pull/1631))
+* Bump default `flexmark` version `0.62.2` -> `0.64.0`. ([#1302](https://github.com/diffplug/spotless/pull/1302))
+* Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
+* Bump default `scalafmt` version `3.7.1` -> `3.7.3`. ([#1584](https://github.com/diffplug/spotless/pull/1584))
 
 ## [6.17.0] - 2023-03-13
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index a29cd7b217..6239d8a48b 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -12,9 +12,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changes
 * **POTENTIALLY BREAKING** Drop support for `googleJavaFormat` versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
 * Bump default `cleanthat` version to latest `2.6` -> `2.8`. ([#1589](https://github.com/diffplug/spotless/pull/1589)
-* Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
-* Bump default `flexmark` version `0.62.2` -> `0.64.0`. ([#1302](https://github.com/diffplug/spotless/pull/1302))
 * Bump default `diktat` version `1.2.4.2` -> `1.2.5`. ([#1631](https://github.com/diffplug/spotless/pull/1631))
+* Bump default `flexmark` version `0.62.2` -> `0.64.0`. ([#1302](https://github.com/diffplug/spotless/pull/1302))
+* Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
+* Bump default `scalafmt` version `3.7.1` -> `3.7.3`. ([#1584](https://github.com/diffplug/spotless/pull/1584))
 
 ## [2.35.0] - 2023-03-13
 ### Added

From c745519d0c2ae927429044f01b0e99e9b9bfcce1 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 5 Apr 2023 17:25:24 -0700
Subject: [PATCH 0996/2068] Bump default cleanthat `2.8` -> `2.13`.

---
 .../main/java/com/diffplug/spotless/java/CleanthatJavaStep.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
index 0377af8bc5..92b7daa5f6 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
@@ -40,7 +40,7 @@ public final class CleanthatJavaStep {
 	private static final String MAVEN_COORDINATE = "io.github.solven-eu.cleanthat:java";
 
 	// CleanThat changelog is available at https://github.com/solven-eu/cleanthat/blob/master/CHANGES.MD
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "2.8");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "2.13");
 
 	// prevent direct instantiation
 	private CleanthatJavaStep() {}

From 579e9f18c9e96a8d9674b678d6a6aba7e5d9b1ce Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 5 Apr 2023 17:25:31 -0700
Subject: [PATCH 0997/2068] Update changelogs.

---
 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 d316c0a268..cc6b21e399 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -16,7 +16,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Added formatter for Gherkin feature files ([#1649](https://github.com/diffplug/spotless/issues/1649)).
 ### Changes
 * **POTENTIALLY BREAKING** Converted `googleJavaFormat` to a compile-only dependency and drop support for versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
-* Bump default `cleanthat` version to latest `2.6` -> `2.8`. ([#1589](https://github.com/diffplug/spotless/pull/1589)
+* Bump default `cleanthat` version to latest `2.6` -> `2.13`. ([#1589](https://github.com/diffplug/spotless/pull/1589) and [#1661](https://github.com/diffplug/spotless/pull/1661))
 * Bump default `diktat` version `1.2.4.2` -> `1.2.5`. ([#1631](https://github.com/diffplug/spotless/pull/1631))
 * Bump default `flexmark` version `0.62.2` -> `0.64.0`. ([#1302](https://github.com/diffplug/spotless/pull/1302))
 * Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 9ce2dbd752..7ad64c04b2 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -21,7 +21,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Stop using deprecated conventions when used in Gradle >= `7.1`. ([#1618](https://github.com/diffplug/spotless/pull/1618))
 ### Changes
 * **POTENTIALLY BREAKING** Drop support for `googleJavaFormat` versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
-* Bump default `cleanthat` version to latest `2.6` -> `2.8`. ([#1589](https://github.com/diffplug/spotless/pull/1589)
+* Bump default `cleanthat` version to latest `2.6` -> `2.13`. ([#1589](https://github.com/diffplug/spotless/pull/1589) and [#1661](https://github.com/diffplug/spotless/pull/1661))
 * Bump default `diktat` version `1.2.4.2` -> `1.2.5`. ([#1631](https://github.com/diffplug/spotless/pull/1631))
 * Bump default `flexmark` version `0.62.2` -> `0.64.0`. ([#1302](https://github.com/diffplug/spotless/pull/1302))
 * Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 6239d8a48b..2f89316bf2 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -11,7 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Fix non deterministic computation of cache fingerprint when using multiple formatters. ([#1643](https://github.com/diffplug/spotless/pull/1643) fixes [#1642](https://github.com/diffplug/spotless/pull/1642))
 ### Changes
 * **POTENTIALLY BREAKING** Drop support for `googleJavaFormat` versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
-* Bump default `cleanthat` version to latest `2.6` -> `2.8`. ([#1589](https://github.com/diffplug/spotless/pull/1589)
+* Bump default `cleanthat` version to latest `2.6` -> `2.13`. ([#1589](https://github.com/diffplug/spotless/pull/1589) and [#1661](https://github.com/diffplug/spotless/pull/1661))
 * Bump default `diktat` version `1.2.4.2` -> `1.2.5`. ([#1631](https://github.com/diffplug/spotless/pull/1631))
 * Bump default `flexmark` version `0.62.2` -> `0.64.0`. ([#1302](https://github.com/diffplug/spotless/pull/1302))
 * Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))

From c19d3c06f90e8e3ab1572434bf272cf0777d7208 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 5 Apr 2023 17:37:20 -0700
Subject: [PATCH 0998/2068] Fix spotbugs warning.

---
 .../com/diffplug/spotless/extra/EquoBasedStepBuilder.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 66993e2f6c..db2e6674db 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
@@ -22,6 +22,8 @@
 import java.util.Map;
 import java.util.Properties;
 
+import javax.annotation.Nullable;
+
 import com.diffplug.spotless.FileSignature;
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterProperties;
@@ -53,7 +55,7 @@ public EquoBasedStepBuilder(String formatterName, Provisioner mavenProvisioner,
 	}
 
 	/** Initialize valid default configuration, taking latest version */
-	public EquoBasedStepBuilder(String formatterName, Provisioner mavenProvisioner, String defaultVersion, ThrowingEx.Function<State, FormatterFunc> stateToFormatter) {
+	public EquoBasedStepBuilder(String formatterName, Provisioner mavenProvisioner, @Nullable String defaultVersion, ThrowingEx.Function<State, FormatterFunc> stateToFormatter) {
 		this.formatterName = formatterName;
 		this.mavenProvisioner = mavenProvisioner;
 		this.formatterVersion = defaultVersion;

From 7ca11bf0b795c49ab0d7f84f2b61d1557289e99b Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 5 Apr 2023 17:31:17 -0700
Subject: [PATCH 0999/2068] Bump default Eclipse JDT to 4.27 (for java 17).

---
 .../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 4a90a40832..cd766fc8c8 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
@@ -31,7 +31,7 @@ public final class EclipseJdtFormatterStep {
 	private EclipseJdtFormatterStep() {}
 
 	private static final String NAME = "eclipse jdt formatter";
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "4.26");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "4.26").add(17, "4.27");
 
 	public static String defaultVersion() {
 		return JVM_SUPPORT.getRecommendedFormatterVersion();

From 9238bfd7a6ed5e7c7d0a903cbc6d380936d6db1d Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 5 Apr 2023 17:31:27 -0700
Subject: [PATCH 1000/2068] Bump default Eclipse Groovy to 4.27 (for java 17).

---
 .../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 fd3c8b7d8b..3b57df889b 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
@@ -32,7 +32,7 @@ public final class GrEclipseFormatterStep {
 	private GrEclipseFormatterStep() {}
 
 	private static final String NAME = "eclipse groovy formatter";
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "4.26");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "4.26").add(17, "4.27");
 
 	public static String defaultVersion() {
 		return JVM_SUPPORT.getRecommendedFormatterVersion();

From cfe9084169b59cca568c5728a1b9d1afda1b5b63 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 5 Apr 2023 17:31:44 -0700
Subject: [PATCH 1001/2068] Bump default Eclipse CDT to 4.27 (for java 17).

---
 .../diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java
index 9f9d591c3c..bcbb58c0f6 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java
@@ -37,7 +37,7 @@ public final class EclipseCdtFormatterStep {
 	private EclipseCdtFormatterStep() {}
 
 	private static final String NAME = "eclipse cdt formatter";
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "10.7").add(17, "11.0");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "10.7").add(17, "11.1");
 
 	public static String defaultVersion() {
 		return JVM_SUPPORT.getRecommendedFormatterVersion();

From ddc82c17830eb61c93aa10928694d685832360e4 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 5 Apr 2023 18:45:12 -0700
Subject: [PATCH 1002/2068] Update changelogs.

---
 CHANGES.md               | 4 ++++
 plugin-gradle/CHANGES.md | 4 ++++
 plugin-maven/CHANGES.md  | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index cc6b21e399..7e869a2e1b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -21,6 +21,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `flexmark` version `0.62.2` -> `0.64.0`. ([#1302](https://github.com/diffplug/spotless/pull/1302))
 * Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
 * Bump default `scalafmt` version `3.7.1` -> `3.7.3`. ([#1584](https://github.com/diffplug/spotless/pull/1584))
+* Bump default Eclipse formatters for the 2023-03 release. ([#1662](https://github.com/diffplug/spotless/pull/1662))
+  * JDT and GrEclipse `4.26` -> `4.27`
+    * Improve GrEclipse error reporting. ([#1660](https://github.com/diffplug/spotless/pull/1660))
+  * CDT `11.0` -> `11.1`
 
 ## [2.37.0] - 2023-03-13
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 7ad64c04b2..6d96095bab 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -26,6 +26,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `flexmark` version `0.62.2` -> `0.64.0`. ([#1302](https://github.com/diffplug/spotless/pull/1302))
 * Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
 * Bump default `scalafmt` version `3.7.1` -> `3.7.3`. ([#1584](https://github.com/diffplug/spotless/pull/1584))
+* Bump default Eclipse formatters for the 2023-03 release. ([#1662](https://github.com/diffplug/spotless/pull/1662))
+  * JDT and GrEclipse `4.26` -> `4.27`
+    * Improve GrEclipse error reporting. ([#1660](https://github.com/diffplug/spotless/pull/1660))
+  * CDT `11.0` -> `11.1`
 
 ## [6.17.0] - 2023-03-13
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 2f89316bf2..f311a22ccb 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -16,6 +16,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `flexmark` version `0.62.2` -> `0.64.0`. ([#1302](https://github.com/diffplug/spotless/pull/1302))
 * Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
 * Bump default `scalafmt` version `3.7.1` -> `3.7.3`. ([#1584](https://github.com/diffplug/spotless/pull/1584))
+* Bump default Eclipse formatters for the 2023-03 release. ([#1662](https://github.com/diffplug/spotless/pull/1662))
+  * JDT and GrEclipse `4.26` -> `4.27`
+    * Improve GrEclipse error reporting. ([#1660](https://github.com/diffplug/spotless/pull/1660))
+  * CDT `11.0` -> `11.1`
 
 ## [2.35.0] - 2023-03-13
 ### Added

From 7f245a8892408e40ee72d801dc3ad47ab284295c Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 5 Apr 2023 18:48:39 -0700
Subject: [PATCH 1003/2068] Sort all the "glue" adaptors in the build.

---
 lib-extra/build.gradle | 16 ++++---
 lib/build.gradle       | 97 ++++++++++++++++++++----------------------
 2 files changed, 56 insertions(+), 57 deletions(-)

diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index 8ed36bede6..5e491eaf20 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -40,9 +40,10 @@ tasks.withType(Test).configureEach {
 }
 
 def NEEDS_P2_DEPS = [
-	'jdt',
+	// (alphabetic order please)
+	'cdt',
 	'groovy',
-	'cdt'
+	'jdt'
 ]
 for (needsP2 in NEEDS_P2_DEPS) {
 	sourceSets.register(needsP2) {
@@ -68,9 +69,11 @@ tasks.withType(Test).configureEach {
 
 apply plugin: 'dev.equo.p2deps'
 p2deps {
-	into 'jdtCompileOnly', {
+	// (alphabetic order please)
+	into 'cdtCompileOnly', {
 		p2repo 'https://download.eclipse.org/eclipse/updates/4.26/'
-		install 'org.eclipse.jdt.core'
+		p2repo 'https://download.eclipse.org/tools/cdt/releases/10.7/'
+		install 'org.eclipse.cdt.core'
 	}
 	into 'groovyCompileOnly', {
 		p2repo 'https://download.eclipse.org/eclipse/updates/4.26/'
@@ -80,10 +83,9 @@ p2deps {
 		install 'org.eclipse.jdt.groovy.core'
 		install 'org.codehaus.groovy'
 	}
-	into 'cdtCompileOnly', {
+	into 'jdtCompileOnly', {
 		p2repo 'https://download.eclipse.org/eclipse/updates/4.26/'
-		p2repo 'https://download.eclipse.org/tools/cdt/releases/10.7/'
-		install 'org.eclipse.cdt.core'
+		install 'org.eclipse.jdt.core'
 	}
 }
 
diff --git a/lib/build.gradle b/lib/build.gradle
index a0835a09e0..9e31bed698 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -8,18 +8,19 @@ apply from: rootProject.file('gradle/java-setup.gradle')
 apply from: rootProject.file('gradle/java-publish.gradle')
 
 def NEEDS_GLUE = [
-	'sortPom',
-	'palantirJavaFormat',
+	// (alphabetic order please)
+	'cleanthat',
+	'diktat',
+	'flexmark',
+	'gherkin',
 	'googleJavaFormat',
+	'gson',
+	'jackson',
 	'ktfmt',
 	'ktlint',
-	'flexmark',
-	'diktat',
+	'palantirJavaFormat',
 	'scalafmt',
-	'jackson',
-	'gson',
-	'cleanthat',
-	'gherkin'
+	'sortPom'
 ]
 for (glue in NEEDS_GLUE) {
 	sourceSets.register(glue) {
@@ -31,6 +32,13 @@ for (glue in NEEDS_GLUE) {
 
 versionCompatibility {
 	adapters {
+		// (alphabetic order please)
+		namespaces.register('Cleanthat') {
+			versions = [
+				'2.1',
+			]
+			targetSourceSetName = 'cleanthat'
+		}
 		namespaces.register('KtLint') {
 			// as discussed at https://github.com/diffplug/spotless/pull/1475
 			// we will support no more than 2 breaking changes at a time = 3 incompatible versions
@@ -42,12 +50,6 @@ versionCompatibility {
 			]
 			targetSourceSetName = 'ktlint'
 		}
-		namespaces.register('Cleanthat') {
-			versions = [
-				'2.1',
-			]
-			targetSourceSetName = 'cleanthat'
-		}
 	}
 }
 
@@ -66,33 +68,39 @@ dependencies {
 	testCommonImplementation "org.assertj:assertj-core:$VER_ASSERTJ"
 	testCommonImplementation "com.diffplug.durian:durian-testlib:$VER_DURIAN"
 
-	// used for pom sorting
-	sortPomCompileOnly 'com.github.ekryd.sortpom:sortpom-sorter:3.0.0'
-	sortPomCompileOnly 'org.slf4j:slf4j-api:2.0.0'
-
-	palantirJavaFormatCompileOnly 'com.palantir.javaformat:palantir-java-format:1.1.0' 	// this version needs to stay compilable against Java 8 for CI Job testNpm
-
-	googleJavaFormatCompileOnly 'com.google.googlejavaformat:google-java-format:1.16.0' // minimum required version due to api changes before then
-
-	// used jackson-based formatters
-	jacksonCompileOnly 'com.fasterxml.jackson.core:jackson-databind:2.14.2'
-	jacksonCompileOnly 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.14.2'
-
-	String VER_KTFMT = '0.43'
-	ktfmtCompileOnly "com.facebook:ktfmt:$VER_KTFMT"
-	String VER_KTLINT_GOOGLE_JAVA_FORMAT = '1.7' // for JDK 8 compatibility
+	// GLUE CODE (alphabetic order please)
+	// cleanthat
+	String VER_CLEANTHAT='2.13'
+	cleanthatCompileOnly "io.github.solven-eu.cleanthat:java:$VER_CLEANTHAT"
+	compatCleanthat2Dot1CompileAndTestOnly "io.github.solven-eu.cleanthat:java:$VER_CLEANTHAT"
+	// diktat
+	diktatCompileOnly 'org.cqfn.diktat:diktat-rules:1.2.5'
+	// flexmark
+	flexmarkCompileOnly 'com.vladsch.flexmark:flexmark-all:0.64.0'
+	// gherkin
+	gherkinCompileOnly 'io.cucumber:gherkin-utils:8.0.2'
+	gherkinCompileOnly 'org.slf4j:slf4j-api:2.0.0'
+	// googleJavaFormat
+	googleJavaFormatCompileOnly 'com.google.googlejavaformat:google-java-format:1.16.0'
+	// gson
+	gsonCompileOnly 'com.google.code.gson:gson:2.10.1'
+	// jackson
+	String VER_JACKSON='2.14.2'
+	jacksonCompileOnly "com.fasterxml.jackson.core:jackson-databind:$VER_JACKSON"
+	jacksonCompileOnly "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$VER_JACKSON"
+	// ktfmt
+	ktfmtCompileOnly "com.facebook:ktfmt:0.43"
 	ktfmtCompileOnly("com.google.googlejavaformat:google-java-format") {
 		version {
-			strictly VER_KTLINT_GOOGLE_JAVA_FORMAT
+			strictly '1.7' // for JDK 8 compatibility
 		}
 	}
-
+	// ktlint
 	String VER_KTLINT='0.46.1'
 	ktlintCompileOnly "com.pinterest:ktlint:$VER_KTLINT"
 	ktlintCompileOnly "com.pinterest.ktlint:ktlint-core:$VER_KTLINT"
 	ktlintCompileOnly "com.pinterest.ktlint:ktlint-ruleset-experimental:$VER_KTLINT"
 	ktlintCompileOnly "com.pinterest.ktlint:ktlint-ruleset-standard:$VER_KTLINT"
-
 	compatKtLint0Dot46Dot0CompileOnly 'com.pinterest.ktlint:ktlint-core:0.46.0'
 	compatKtLint0Dot46Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-experimental:0.46.0'
 	compatKtLint0Dot46Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.46.0'
@@ -102,24 +110,13 @@ dependencies {
 	compatKtLint0Dot48Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-core:0.48.0'
 	compatKtLint0Dot48Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-ruleset-experimental:0.48.0'
 	compatKtLint0Dot48Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.48.0'
-
-	String VER_SCALAFMT="3.7.3"
-	scalafmtCompileOnly "org.scalameta:scalafmt-core_2.13:$VER_SCALAFMT"
-
-	String VER_DIKTAT = "1.2.5"
-	diktatCompileOnly "org.cqfn.diktat:diktat-rules:$VER_DIKTAT"
-
-	// used for markdown formatting
-	flexmarkCompileOnly 'com.vladsch.flexmark:flexmark-all:0.64.0'
-
-	gsonCompileOnly 'com.google.code.gson:gson:2.10.1'
-
-	String VER_CLEANTHAT="2.13"
-	cleanthatCompileOnly "io.github.solven-eu.cleanthat:java:$VER_CLEANTHAT"
-	compatCleanthat2Dot1CompileAndTestOnly "io.github.solven-eu.cleanthat:java:$VER_CLEANTHAT"
-
-	gherkinCompileOnly 'io.cucumber:gherkin-utils:8.0.2'
-	gherkinCompileOnly 'org.slf4j:slf4j-api:2.0.0'
+	// palantirJavaFormat
+	palantirJavaFormatCompileOnly 'com.palantir.javaformat:palantir-java-format:1.1.0' 	// this version needs to stay compilable against Java 8 for CI Job testNpm
+	// scalafmt
+	scalafmtCompileOnly "org.scalameta:scalafmt-core_2.13:3.7.3"
+	// sortPom
+	sortPomCompileOnly 'com.github.ekryd.sortpom:sortpom-sorter:3.0.0'
+	sortPomCompileOnly 'org.slf4j:slf4j-api:2.0.0'
 }
 
 // we'll hold the core lib to a high standard

From 7e852e30ccb2e285028083f2b17e8717c62f6759 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 5 Apr 2023 20:15:26 -0700
Subject: [PATCH 1004/2068] On JRE 11, users will get alert that they might fix
 the GrEclipse issue by bumping to JRE 17 and using the latest.

---
 .../extra/groovy/GrEclipseFormatterStepSpecialCaseTest.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepSpecialCaseTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepSpecialCaseTest.java
index 8f832b89f0..25a269834c 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepSpecialCaseTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepSpecialCaseTest.java
@@ -30,7 +30,7 @@ public class GrEclipseFormatterStepSpecialCaseTest {
 	 */
 	@Test
 	public void issue_1657() {
-		Assertions.assertThrows(IllegalArgumentException.class, () -> {
+		Assertions.assertThrows(RuntimeException.class, () -> {
 			StepHarness.forStep(GrEclipseFormatterStep.createBuilder(TestProvisioner.mavenCentral()).build())
 					.testResourceUnaffected("groovy/greclipse/format/SomeClass.test");
 		});

From e34d6773f8cc43adea0ad076a07d8241889698fa Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az411-747.3o3m4cib2vcuvgqhi5dgwulx3d.bx.internal.cloudapp.net>
Date: Thu, 6 Apr 2023 03:40:22 +0000
Subject: [PATCH 1005/2068] Published lib/2.38.0

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 7e869a2e1b..50141ece9c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.38.0] - 2023-04-06
 ### Added
 * Support configuration of mirrors for P2 repositories in `EquoBasedStepBuilder` ([#1629](https://github.com/diffplug/spotless/issues/1629)).
 * The `style` option in Palantir Java Format ([#1654](https://github.com/diffplug/spotless/pull/1654)).

From 4895f3a35ee6b8613700eb270eba17bdd4c944ae Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az411-747.3o3m4cib2vcuvgqhi5dgwulx3d.bx.internal.cloudapp.net>
Date: Thu, 6 Apr 2023 03:41:31 +0000
Subject: [PATCH 1006/2068] Published gradle/6.18.0

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 52 ++++++++++++++++++++--------------------
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 6d96095bab..05f497d1e3 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [6.18.0] - 2023-04-06
 ### Added
 * `removeUnusedImport` can be configured to rely on `cleanthat-javaparser-unnecessaryimport`. Default remains `google-java-format`. ([#1589](https://github.com/diffplug/spotless/pull/1589))
 * Added formatter for Gherkin feature files ([#1649](https://github.com/diffplug/spotless/issues/1649)).
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 2bb824b3ee..cea45a049f 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -14,9 +14,9 @@ output = [
   ].join('\n');
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
-[![Changelog](https://img.shields.io/badge/changelog-6.17.0-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-6.18.0-blue.svg)](CHANGES.md)
 [![Maven central](https://img.shields.io/badge/mavencentral-here-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/index.html)
 
 [![VS Code plugin](https://img.shields.io/badge/IDE-VS_Code-blueviolet.svg)](https://marketplace.visualstudio.com/items?itemName=richardwillis.vscode-spotless-gradle)
 [![IntelliJ plugin](https://img.shields.io/badge/IDE-IntelliJ-blueviolet.svg)](https://plugins.jetbrains.com/plugin/18321-spotless-gradle)
@@ -125,10 +125,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -140,7 +140,7 @@ If you're stuck on an older version of Gradle, `id 'com.diffplug.gradle.spotless
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -297,8 +297,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -348,8 +348,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -420,7 +420,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -452,7 +452,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -484,7 +484,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -518,7 +518,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -539,7 +539,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -564,7 +564,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -604,7 +604,7 @@ sql.formatter.indent.size=4
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -697,7 +697,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## Javascript
 
-- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
+- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
 
 ```gradle
 spotless {
@@ -761,7 +761,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -836,7 +836,7 @@ spotless {
 
 ## YAML
 
-- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
+- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
 
 ```gradle
 spotless {
@@ -867,7 +867,7 @@ spotless {
 
 ## Gherkin
 
-- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
+- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
 
 ```gradle
 spotless {
@@ -1090,7 +1090,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -1163,9 +1163,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -1198,11 +1198,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.17.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From aee54d0fd94a09a0bd392893075e8bd7a666030e Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az411-747.3o3m4cib2vcuvgqhi5dgwulx3d.bx.internal.cloudapp.net>
Date: Thu, 6 Apr 2023 03:42:55 +0000
Subject: [PATCH 1007/2068] Published maven/2.36.0

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index f311a22ccb..df994a2b44 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.36.0] - 2023-04-06
 ### Added
 * `removeUnusedImport` can be configured to rely on `cleanthat-javaparser-unnecessaryimport`. Default remains `google-java-format`. ([#1589](https://github.com/diffplug/spotless/pull/1589))
 * The `style` option in Palantir Java Format ([#1654](https://github.com/diffplug/spotless/pull/1654)).
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 9ffd6f10b8..b4d7393e21 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -8,8 +8,8 @@ output = [
   ].join('\n');
 -->
 [![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Changelog](https://img.shields.io/badge/changelog-2.35.0-blue.svg)](CHANGES.md)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.35.0/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.36.0-blue.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.36.0/index.html)
 <!---freshmark /shields -->
 
 <!---freshmark javadoc

From f62050cc3df7446ccb45f54b91086615633588cb Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <sensenmann5@gmail.com>
Date: Thu, 6 Apr 2023 06:52:33 +0100
Subject: [PATCH 1008/2068] Default download directory for Rome binary to the
 local repository

E.g.  ~/.m2/repository/com/diffplug/spotless/spotless-data/rome

This is also done by e.g. the dependency-check-plugin or by the
frontend-maven-plugin

https://github.com/jeremylong/DependencyCheck/blob/21cd89bdc2531632e18d0b0e085c6d85112853d0/core/src/main/java/org/owasp/dependencycheck/agent/DependencyCheckScanAgent.java#L937-L941
---
 .../spotless/javascript/RomeStep.java         | 48 ++++++++++++-----
 .../diffplug/spotless/maven/FileLocator.java  | 46 ++++++++++++++--
 .../spotless/maven/javascript/RomeJs.java     | 53 +++++++++++++------
 3 files changed, 114 insertions(+), 33 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/javascript/RomeStep.java b/lib/src/main/java/com/diffplug/spotless/javascript/RomeStep.java
index 4c8a487456..a79281119c 100644
--- a/lib/src/main/java/com/diffplug/spotless/javascript/RomeStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/javascript/RomeStep.java
@@ -8,8 +8,10 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.attribute.PosixFilePermission;
+import java.util.Collections;
 import java.util.HashSet;
 
+import com.diffplug.spotless.FileSignature;
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.Platform;
@@ -19,7 +21,8 @@
 /**
  * formatter step that formats JavaScript and TypeScript code with Rome:
  * <a href= "https://github.com/rome/tools">https://github.com/rome/tools</a>.
- * It delegates to the Rome executable.
+ * It delegates to the Rome executable. The Rome executable is downloaded from
+ * the network when no executable path is provided explicitly.
  */
 public class RomeStep {
 	public static String name() {
@@ -38,14 +41,21 @@ private RomeStep(String version, String pathToExe, String pathToExeDownloadDir)
 		this.pathToExeDownloadDir = pathToExeDownloadDir;
 	}
 
+	/**
+	 * Creates a formatter step with the current configuration, which formats code
+	 * by passing it to the Rome executable.
+	 * 
+	 * @return A new formatter step for formatting with Rome.
+	 */
 	public FormatterStep create() {
 		return FormatterStep.createLazy(name(), this::createState, State::toFunc);
 	}
 
 	private State createState() throws IOException, InterruptedException {
 		var resolvedPathToExe = resolveExe();
+		var exeSignature = FileSignature.signAsList(Collections.singleton(new File(resolvedPathToExe)));
 		makeExecutable(resolvedPathToExe);
-		return new State(this, resolvedPathToExe);
+		return new State(resolvedPathToExe, exeSignature);
 	}
 
 	private String resolveExe() throws IOException, InterruptedException {
@@ -64,12 +74,25 @@ private String resolveExe() throws IOException, InterruptedException {
 		}
 	}
 
-	public static RomeStep withVersionAndExe(String version, String pathToExe) {
-		return new RomeStep(version, pathToExe, null);
+	/**
+	 * Creates a Rome step that uses an executable from the given path.
+	 * 
+	 * @param pathToExe Path to the Rome executable to use.
+	 * @return A new Rome step that format with the given executable.
+	 */
+	public static RomeStep withExePath(String pathToExe) {
+		return new RomeStep(null, pathToExe, null);
 	}
 
-	public static RomeStep withVersionAndExeDownload(String version, String pathToExeDownloadDir) {
-		return new RomeStep(version, null, pathToExeDownloadDir);
+	/**
+	 * Creates a Rome step that downloads the Rome executable for the given version.
+	 * 
+	 * @param version     Version of the Rome executable to download.
+	 * @param downloadDir Directory where to place the downloaded executable.
+	 * @return A new Rome step that download the executable from the network.
+	 */
+	public static RomeStep withExeDownload(String version, String downloadDir) {
+		return new RomeStep(version, null, downloadDir);
 	}
 
 	private static String defaultVersion() {
@@ -95,16 +118,17 @@ private static boolean addPosixPermission(Path file, PosixFilePermission permiss
 	}
 
 	static class State implements Serializable {
-		private static final long serialVersionUID = -1825662356883926318L;
-
-		// used for up-to-date checks and caching
-		final String version;
+		private static final long serialVersionUID = -5884229077231467806L;
 
+		/** Path to the exe file */
 		final String pathToExe;
 
-		State(RomeStep step, String exe) {
-			this.version = step.version;
+		/** The signature of the exe file, if any, used for caching. */
+		final FileSignature exeSignature;
+
+		State(String exe, FileSignature exeSignature) throws IOException {
 			this.pathToExe = exe;
+			this.exeSignature = exeSignature;
 		}
 
 		String format(ProcessRunner runner, String input, File file) throws IOException, InterruptedException {
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FileLocator.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FileLocator.java
index 7ea998dc95..1450b2873a 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FileLocator.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FileLocator.java
@@ -19,6 +19,7 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import java.io.File;
+import java.nio.file.Paths;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Base64;
@@ -29,22 +30,25 @@
 import org.codehaus.plexus.resource.loader.ResourceNotFoundException;
 import org.codehaus.plexus.util.FileUtils;
 
+import com.diffplug.spotless.maven.javascript.RomeJs;
+
 public class FileLocator {
 
 	static final String TMP_RESOURCE_FILE_PREFIX = "spotless-resource-";
 
 	private final ResourceManager resourceManager;
-	private final File baseDir, buildDir;
+	private final File baseDir, buildDir, dataDir;
 
 	public FileLocator(ResourceManager resourceManager, File baseDir, File buildDir) {
 		this.resourceManager = Objects.requireNonNull(resourceManager);
 		this.baseDir = Objects.requireNonNull(baseDir);
 		this.buildDir = Objects.requireNonNull(buildDir);
+		this.dataDir = findDataDir();
 	}
 
 	/**
-	 * If the given path is a local file returns it as such unchanged,
-	 * otherwise extracts the given resource to a randomly-named file in the build folder.
+	 * If the given path is a local file returns it as such unchanged, otherwise
+	 * extracts the given resource to a randomly-named file in the build folder.
 	 */
 	public File locateFile(String path) {
 		if (isNullOrEmpty(path)) {
@@ -62,18 +66,42 @@ public File locateFile(String path) {
 		} catch (ResourceNotFoundException e) {
 			throw new RuntimeException("Unable to locate file with path: " + path, e);
 		} catch (FileResourceCreationException e) {
-			throw new RuntimeException("Unable to create temporary file '" + outputFile + "' in the output directory", e);
+			throw new RuntimeException("Unable to create temporary file '" + outputFile + "' in the output directory",
+					e);
 		}
 	}
 
+	/**
+	 * Finds the base directory of the Maven or Gradle project on which spotless is
+	 * currently being executed.
+	 * 
+	 * @return The base directory of the current Maven or Gradel project.
+	 */
 	public File getBaseDir() {
 		return baseDir;
 	}
 
+	/**
+	 * Finds the build directory (e.g. <code>/target</code>) of the Maven or Gradle
+	 * project on which spotless is currently being executed.
+	 * 
+	 * @return The project build directory of the current Maven or Gradle project.
+	 */
 	public File getBuildDir() {
 		return buildDir;
 	}
 
+	/**
+	 * Finds the data directory that can be used for storing shared data such as
+	 * downloaded files globally. This is a directory in the local repository, e.g.
+	 * <code>~/.m2/repository/com/diffplus/spotless/spotless-data<code>.
+	 * 
+	 * @return The directory for storing shared data.
+	 */
+	public File getDataDir() {
+		return dataDir;
+	}
+
 	private static String tmpOutputFileName(String path) {
 		String extension = FileUtils.extension(path);
 		byte[] pathHash = hash(path);
@@ -91,4 +119,14 @@ private static byte[] hash(String value) {
 		messageDigest.update(value.getBytes(UTF_8));
 		return messageDigest.digest();
 	}
+
+	private static File findDataDir() {
+		// One of
+		// ~/.m2/repository/com/diffplug/spotless/spotless-plugin-maven/1.2.3/spotless-plugin-maven-1.2.3.jar
+		// ~/.m2/repository/com/diffplug/spotless/spotless-plugin-maven/1.2.3/spotless-plugin-gradle-1.2.3.jar
+		final var jarPath = Paths.get(RomeJs.class.getProtectionDomain().getCodeSource().getLocation().getPath());
+		final var base = jarPath.getParent().getParent().getParent();
+		final var sub = base.resolve("spotless-data");
+		return sub.toAbsolutePath().toFile();
+	}
 }
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java
index 337b05bebf..b68e5fef42 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java
@@ -15,25 +15,35 @@
  */
 public class RomeJs implements FormatterStepFactory {
 	/**
-	 * Optional directory where the downloaded Rome executable is placed. This
-	 * defaults to <code>${project.buildDir}/spotless/rome</code>. You may want to
-	 * change this to a directory outside the build directory to preserve downloaded
-	 * files even when cleaning the project.
+	 * Optional directory where the downloaded Rome executable is placed. If this is
+	 * a relative path, it is resolved against the project's base directory.
+	 * Defaults to
+	 * <code>~/.m2/repository/com/diffplug/spotless/spotless-data/rome</code>.
+	 * <p>
+	 * You can use an expression like <code>${user.home}/rome</code> if you want to
+	 * use the home directory, or <code>${project.build.directory</code> if you want
+	 * to use the ptarget directory of the current project.
 	 */
 	@Parameter
 	private String downloadDir;
 
 	/**
-	 * Optional path to the Rome executable. When not given, an attempt is made to
-	 * download the executable for the given version from the network.
+	 * Optional path to the Rome executable. Either a <code>version</code> or a
+	 * <code>pathToExe</code> should be specified. When not given, an attempt is
+	 * made to download the executable for the given version from the network. When
+	 * given, the executable is used and the <code>version</code> parameter is
+	 * ignored.
 	 */
 	@Parameter
 	private String pathToExe;
 
 	/**
-	 * Rome version. When not given, a default known version is used. For stable
-	 * builds, it is recommended that you always set the version explicitly. This
-	 * parameter is ignored when you specify a <code>pathToExe</code> explicitly.
+	 * Rome version to download, applies only when no <code>pathToExe</code> is
+	 * specified explicitly. Either a <code>version</code> or a
+	 * <code>pathToExe</code> should be specified. When not given, a default known
+	 * version is used. For stable builds, it is recommended that you always set the
+	 * version explicitly. This parameter is ignored when you specify a
+	 * <code>pathToExe</code> explicitly.
 	 */
 	@Parameter
 	private String version;
@@ -42,20 +52,29 @@ public class RomeJs implements FormatterStepFactory {
 	public FormatterStep newFormatterStep(FormatterStepConfig config) {
 		RomeStep rome;
 		if (pathToExe != null) {
-			rome = RomeStep.withVersionAndExe(version, pathToExe);
+			rome = RomeStep.withExePath(pathToExe);
 		} else {
 			var downloadDir = resolveDownloadDir(config);
-			rome = RomeStep.withVersionAndExeDownload(version, downloadDir);
+			rome = RomeStep.withExeDownload(version, downloadDir);
 		}
 		return rome.create();
 	}
 
+	/**
+	 * Resolves the directory to use for storing downloaded Rome executable. When a
+	 * {@link #downloadDir} is given, use that directory, resolved against the
+	 * current project's directory. Otherwise, use the {@code Rome} sub folder in
+	 * the shared data directory.
+	 * 
+	 * @param config Configuration for this step.
+	 * @return The download directory for the Rome executable.
+	 */
 	private String resolveDownloadDir(FormatterStepConfig config) {
-		// e.g. /home/user/.m2/repository/com/diffplug/spotless/spotless-maven-plugin/2.35.1-SNAPSHOT/spotless-maven-plugin-2.35.1-SNAPSHOT.jar
-		// var self = config.getProvisioner().provisionWithTransitives(false, "com.diffplug.spotless:spotless-maven-plugin:2.35.1-SNAPSHOT");
-		// e.g. /home/user/.m2/repository/com/diffplug/spotless/spotless-maven-plugin
-		// return self.iterator().next().getParentFile().getParent();
-		var buildDir = config.getFileLocator().getBuildDir().toPath();
-		return buildDir.resolve("spotless").resolve("rome").toAbsolutePath().toString();
+		final var fileLocator = config.getFileLocator();
+		if (downloadDir != null && !downloadDir.isBlank()) {
+			return fileLocator.getBaseDir().toPath().resolve(downloadDir).toAbsolutePath().toString();
+		} else {
+			return fileLocator.getDataDir().toPath().resolve("rome").toString();
+		}
 	}
 }

From 7705a1453c425fdaeee41ee6892a4d605c3cb22f Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <sensenmann5@gmail.com>
Date: Thu, 6 Apr 2023 07:03:39 +0100
Subject: [PATCH 1009/2068] Add Rome support to unreleased changes

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 1 +
 plugin-maven/CHANGES.md  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 77c49efe2a..e4d2fcb10c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,6 +15,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changes
 * **POTENTIALLY BREAKING** Converted `googleJavaFormat` to a compile-only dependency and drop support for versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
 * Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
+* Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. https://github.com/diffplug/spotless/pull/1663
 
 ## [2.37.0] - 2023-03-13
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 0a0cabcca0..e9cbf115f0 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -17,6 +17,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changes
 * **POTENTIALLY BREAKING** Drop support for `googleJavaFormat` versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
 * Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
+* Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. https://github.com/diffplug/spotless/pull/1663
 
 ## [6.17.0] - 2023-03-13
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 421b5e56e7..f13f989028 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -6,6 +6,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changes
 * **POTENTIALLY BREAKING** Drop support for `googleJavaFormat` versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
 * Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
+* Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. https://github.com/diffplug/spotless/pull/1663
 
 ## [2.35.0] - 2023-03-13
 ### Added

From b0bf102296e1a5375653bb8b74e68f14cdfd3a13 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 6 Apr 2023 07:19:48 +0000
Subject: [PATCH 1010/2068] chore(deps): update plugin
 com.diffplug.spotless-changelog to v3.0.2

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index a35dab8e40..b1aeaf53d3 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -14,7 +14,7 @@ plugins {
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
 	id 'com.github.spotbugs' version '5.0.14' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
-	id 'com.diffplug.spotless-changelog' version '3.0.1' apply false
+	id 'com.diffplug.spotless-changelog' version '3.0.2' apply false
 	// https://github.com/diffplug/goomph/blob/main/CHANGES.md
 	// DO NOT UPDATE, see https://github.com/diffplug/spotless/pull/874
 	id 'com.diffplug.p2.asmaven' version '3.27.0' apply false

From 502c7524b617f3ba2d14b0a75f25628dfe041a04 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 6 Apr 2023 07:22:32 +0000
Subject: [PATCH 1011/2068] chore(deps): update plugin com.diffplug.spotless to
 v6.18.0

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index a35dab8e40..a703e0abb5 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-	id 'com.diffplug.spotless' version '6.17.0' apply false
+	id 'com.diffplug.spotless' version '6.18.0' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
 	id 'com.gradle.plugin-publish' version '1.1.0' apply false
 	// https://github.com/gradle-nexus/publish-plugin/releases

From 99295fcff7cfca8be6fae6d51e3629de76a51b68 Mon Sep 17 00:00:00 2001
From: Simon Taddiken <staddiken@gradle.com>
Date: Thu, 6 Apr 2023 10:56:55 +0200
Subject: [PATCH 1012/2068] Add @DisableCachingByDefault to give a proper hint
 why task outputs are not cached

---
 .../diffplug/gradle/spotless/RegisterDependenciesTask.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RegisterDependenciesTask.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RegisterDependenciesTask.java
index 75bd06406b..114900f689 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RegisterDependenciesTask.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RegisterDependenciesTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@
 import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.TaskAction;
 import org.gradle.build.event.BuildEventsListenerRegistry;
+import org.gradle.work.DisableCachingByDefault;
 
 import com.diffplug.common.base.Preconditions;
 import com.diffplug.common.io.Files;
@@ -46,6 +47,7 @@
  * - When this "registerDependencies" task does its up-to-date check, it queries the task execution graph to see which
  *   SpotlessTasks are at risk of being executed, and causes them all to be evaluated safely in the root buildscript.
  */
+@DisableCachingByDefault(because = "I/O bound task not worth caching")
 public abstract class RegisterDependenciesTask extends DefaultTask {
 	static final String TASK_NAME = "spotlessInternalRegisterDependencies";
 

From 6cf5254a5e1da61b7a1b92df4be95fab341a85d7 Mon Sep 17 00:00:00 2001
From: Simon Taddiken <staddiken@gradle.com>
Date: Thu, 6 Apr 2023 11:35:40 +0200
Subject: [PATCH 1013/2068] Update changelog of plugin-gradle

---
 plugin-gradle/CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 05f497d1e3..84e51fc50d 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -19,6 +19,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
   Mirrors are selected by prefix match, for example `https://download.eclipse.org/eclipse/updates/4.26/` will be redirected to `https://some.internal.mirror/eclipse/eclipse/updates/4.26/`.
   The same configuration exists for `greclipse` and `eclipseCdt`.
 * The `style` option in Palantir Java Format ([#1654](https://github.com/diffplug/spotless/pull/1654)).
+* Added `@DisableCachingByDefault` to `RegisterDependenciesTask`.
+
 ### Fixed
 * Stop using deprecated conventions when used in Gradle >= `7.1`. ([#1618](https://github.com/diffplug/spotless/pull/1618))
 ### Changes

From 2dcd726137a9c1189ef1bd2ade048b3f657c50f2 Mon Sep 17 00:00:00 2001
From: Simon Taddiken <staddiken@gradle.com>
Date: Thu, 6 Apr 2023 11:36:12 +0200
Subject: [PATCH 1014/2068] Remove extra blank line

---
 plugin-gradle/CHANGES.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 84e51fc50d..552586915d 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -20,7 +20,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
   The same configuration exists for `greclipse` and `eclipseCdt`.
 * The `style` option in Palantir Java Format ([#1654](https://github.com/diffplug/spotless/pull/1654)).
 * Added `@DisableCachingByDefault` to `RegisterDependenciesTask`.
-
 ### Fixed
 * Stop using deprecated conventions when used in Gradle >= `7.1`. ([#1618](https://github.com/diffplug/spotless/pull/1618))
 ### Changes

From c3ffe2dd716582cc81f96449148c0a4d653dc159 Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <sensenmann5@gmail.com>
Date: Thu, 6 Apr 2023 19:33:31 +0100
Subject: [PATCH 1015/2068] Allow a command on the path to be specified as the
 name of the Rome executable instead of the path to the executable

---
 .../spotless/javascript/RomeStep.java         | 222 +++++++++++++-----
 .../rome/RomeExecutableDownloader.java        |   2 +-
 .../spotless/maven/javascript/RomeJs.java     |  34 ++-
 3 files changed, 200 insertions(+), 58 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/javascript/RomeStep.java b/lib/src/main/java/com/diffplug/spotless/javascript/RomeStep.java
index a79281119c..8147464f7f 100644
--- a/lib/src/main/java/com/diffplug/spotless/javascript/RomeStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/javascript/RomeStep.java
@@ -3,6 +3,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
+import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -11,7 +12,11 @@
 import java.util.Collections;
 import java.util.HashSet;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.diffplug.spotless.FileSignature;
+import com.diffplug.spotless.ForeignExe;
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.Platform;
@@ -25,9 +30,7 @@
  * the network when no executable path is provided explicitly.
  */
 public class RomeStep {
-	public static String name() {
-		return "rome";
-	}
+	private static final Logger logger = LoggerFactory.getLogger(RomeStep.class);
 
 	private final String version;
 
@@ -35,8 +38,103 @@ public static String name() {
 
 	private final String pathToExeDownloadDir;
 
+	/**
+	 * @return The name of this format step, i.e. {@code rome}.
+	 */
+	public static String name() {
+		return "rome";
+	}
+
+	/**
+	 * Creates a Rome step that format code by downloading to the given Rome
+	 * version. The executable is downloaded from the network.
+	 * 
+	 * @param version     Version of the Rome executable to download.
+	 * @param downloadDir Directory where to place the downloaded executable.
+	 * @return A new Rome step that download the executable from the network.
+	 */
+	public static RomeStep withExeDownload(String version, String downloadDir) {
+		version = version != null && !version.isBlank() ? version : defaultVersion();
+		return new RomeStep(version, null, downloadDir);
+	}
+
+	/**
+	 * Creates a Rome step that formats code by delegating to the Rome executable
+	 * located at the given path.
+	 * 
+	 * @param pathToExe Path to the Rome executable to use.
+	 * @return A new Rome step that format with the given executable.
+	 */
+	public static RomeStep withExePath(String pathToExe) {
+		return new RomeStep(null, pathToExe, null);
+	}
+
+	/**
+	 * Finds the default version for Rome when no version is specified explicitly.
+	 * Over time this will become outdated -- people should always specify the
+	 * version explicitly!
+	 * 
+	 * @return The default version for Rome.
+	 */
+	private static String defaultVersion() {
+		return "12.0.0";
+	}
+
+	/**
+	 * Attempts to add a POSIX permission to the given file, ignoring any errors.
+	 * All existing permissions on the file are preserved and the new permission is
+	 * added, if possible.
+	 * 
+	 * @param file       File or directory to which to add a permission.
+	 * @param permission The POSIX permission to add.
+	 */
+	private static void attemptToAddPosixPermission(Path file, PosixFilePermission permission) {
+		try {
+			var newPermissions = new HashSet<>(Files.getPosixFilePermissions(file));
+			newPermissions.add(permission);
+			Files.setPosixFilePermissions(file, newPermissions);
+		} catch (final Exception ignore) {
+		}
+	}
+
+	/**
+	 * Attempts to make the given file executable. This is a best-effort attempt,
+	 * any errors are swallowed. Depending on the OS, the file might still be
+	 * executable even if this method fails. The user will get a descriptive error
+	 * later when we attempt to execute the Rome executable.
+	 * 
+	 * @param filePath Path to the file to make executable.
+	 */
+	private static void makeExecutable(String filePath) {
+		var exePath = Paths.get(filePath);
+		attemptToAddPosixPermission(exePath, PosixFilePermission.GROUP_EXECUTE);
+		attemptToAddPosixPermission(exePath, PosixFilePermission.OTHERS_EXECUTE);
+		attemptToAddPosixPermission(exePath, PosixFilePermission.OWNER_EXECUTE);
+	}
+
+	/**
+	 * Finds the absolute path of a command on the user's path. Uses {@code which}
+	 * for Linux and {@code where} for Windows.
+	 * 
+	 * @param name Name of the command to resolve.
+	 * @return The absolute path of the command's executable.
+	 * @throws IOException          When the command could not be resolved.
+	 * @throws InterruptedException When this thread was interrupted while waiting
+	 *                              to the which command to finish.
+	 */
+	private static String resolveNameAgainstPath(String name) throws IOException, InterruptedException {
+		try (var runner = new ProcessRunner()) {
+			var cmdWhich = runner.shellWinUnix("where " + name, "which " + name);
+			if (cmdWhich.exitNotZero()) {
+				throw new IOException("Unable to find " + name + " on path via command " + cmdWhich);
+			} else {
+				return cmdWhich.assertExitZero(Charset.defaultCharset()).trim();
+			}
+		}
+	}
+
 	private RomeStep(String version, String pathToExe, String pathToExeDownloadDir) {
-		this.version = version != null && !version.isBlank() ? version : RomeStep.defaultVersion();
+		this.version = version;
 		this.pathToExe = pathToExe;
 		this.pathToExeDownloadDir = pathToExeDownloadDir;
 	}
@@ -51,16 +149,55 @@ public FormatterStep create() {
 		return FormatterStep.createLazy(name(), this::createState, State::toFunc);
 	}
 
+	/**
+	 * Resolves the Rome executable, possibly downloading it from the network, and
+	 * creates a new state instance with the resolved executable that can format
+	 * code via Rome.
+	 * 
+	 * @return The state instance for formatting code via Rome.
+	 * @throws IOException          When any file system or network operations
+	 *                              failed, such as when the Rome executable could
+	 *                              not be downloaded, or when the given executable
+	 *                              does not exist.
+	 * @throws InterruptedException When the Rome executable needs to be downloaded
+	 *                              and this thread was interrupted while waiting
+	 *                              for the download to complete.
+	 */
 	private State createState() throws IOException, InterruptedException {
 		var resolvedPathToExe = resolveExe();
-		var exeSignature = FileSignature.signAsList(Collections.singleton(new File(resolvedPathToExe)));
+		var resolvedExeFile = new File(resolvedPathToExe);
+		if (!resolvedExeFile.isFile()) {
+			throw new IllegalArgumentException("Rome executable does not exist: " + resolvedExeFile);
+		}
+		logger.debug("Using Rome executable located at  '{}'", resolvedPathToExe);
+		var exeSignature = FileSignature.signAsList(Collections.singleton(resolvedExeFile));
 		makeExecutable(resolvedPathToExe);
 		return new State(resolvedPathToExe, exeSignature);
 	}
 
+	/**
+	 * Resolves the path to the Rome executable, given the configuration of this
+	 * step. When the path to the Rome executable is given explicitly, that path is
+	 * used as-is. Otherwise, at attempt is made to download the Rome executable for
+	 * the configured version from the network, unless it was already downloaded and
+	 * is available in the cache.
+	 * 
+	 * @return The path to the resolved Rome executable.
+	 * @throws IOException          When any file system or network operations
+	 *                              failed, such as when the Rome executable could
+	 *                              not be downloaded.
+	 * @throws InterruptedException When the Rome executable needs to be downloaded
+	 *                              and this thread was interrupted while waiting
+	 *                              for the download to complete.
+	 */
 	private String resolveExe() throws IOException, InterruptedException {
+		new ForeignExe();
 		if (pathToExe != null) {
-			return pathToExe;
+			if (Paths.get(pathToExe).getNameCount() == 1) {
+				return resolveNameAgainstPath(pathToExe);
+			} else {
+				return pathToExe;
+			}
 		} else {
 			var downloader = new RomeExecutableDownloader(Paths.get(pathToExeDownloadDir));
 			var platform = Platform.guess();
@@ -74,70 +211,45 @@ private String resolveExe() throws IOException, InterruptedException {
 		}
 	}
 
-	/**
-	 * Creates a Rome step that uses an executable from the given path.
-	 * 
-	 * @param pathToExe Path to the Rome executable to use.
-	 * @return A new Rome step that format with the given executable.
-	 */
-	public static RomeStep withExePath(String pathToExe) {
-		return new RomeStep(null, pathToExe, null);
-	}
-
-	/**
-	 * Creates a Rome step that downloads the Rome executable for the given version.
-	 * 
-	 * @param version     Version of the Rome executable to download.
-	 * @param downloadDir Directory where to place the downloaded executable.
-	 * @return A new Rome step that download the executable from the network.
-	 */
-	public static RomeStep withExeDownload(String version, String downloadDir) {
-		return new RomeStep(version, null, downloadDir);
-	}
-
-	private static String defaultVersion() {
-		return "12.0.0";
-	}
-
-	private static void makeExecutable(String exe) {
-		var exePath = Paths.get(exe);
-		addPosixPermission(exePath, PosixFilePermission.GROUP_EXECUTE);
-		addPosixPermission(exePath, PosixFilePermission.OTHERS_EXECUTE);
-		addPosixPermission(exePath, PosixFilePermission.OWNER_EXECUTE);
-	}
-
-	private static boolean addPosixPermission(Path file, PosixFilePermission permission) {
-		try {
-			var newPermissions = new HashSet<>(Files.getPosixFilePermissions(file));
-			newPermissions.add(permission);
-			Files.setPosixFilePermissions(file, newPermissions);
-			return true;
-		} catch (final Exception e) {
-			return false;
-		}
-	}
-
-	static class State implements Serializable {
+	private static class State implements Serializable {
 		private static final long serialVersionUID = -5884229077231467806L;
 
 		/** Path to the exe file */
-		final String pathToExe;
+		private final String pathToExe;
 
 		/** The signature of the exe file, if any, used for caching. */
-		final FileSignature exeSignature;
+		@SuppressWarnings("unused")
+		private final FileSignature exeSignature;
 
-		State(String exe, FileSignature exeSignature) throws IOException {
+		private State(String exe, FileSignature exeSignature) throws IOException {
 			this.pathToExe = exe;
 			this.exeSignature = exeSignature;
 		}
 
-		String format(ProcessRunner runner, String input, File file) throws IOException, InterruptedException {
+		/**
+		 * Formats the given piece of code by delegating to the Rome executable. The
+		 * code is passed to Rome via stdin, the file name is used by Rome only to
+		 * determine the code syntax (e.g. JavaScript or TypeScript).
+		 * 
+		 * @param runner Process runner for invoking the Rome executable.
+		 * @param input  Code to format.
+		 * @param file   File to format.
+		 * @return The formatted code.
+		 * @throws IOException          When a file system error occurred while
+		 *                              executing Rome.
+		 * @throws InterruptedException When this thread was interrupted while waiting
+		 *                              for Rome to finish formatting.
+		 */
+		private String format(ProcessRunner runner, String input, File file) throws IOException, InterruptedException {
 			var stdin = input.getBytes(StandardCharsets.UTF_8);
 			var args = new String[] { pathToExe, "format", "--stdin-file-path", file.getName() };
+			if (logger.isDebugEnabled()) {
+				logger.debug("Running Rome comand to fomrat code: '{}'", String.join(", ", args));
+			}
 			return runner.exec(stdin, args).assertExitZero(StandardCharsets.UTF_8);
 		}
 
-		FormatterFunc.Closeable toFunc() {
+		private FormatterFunc.Closeable toFunc() {
 			var runner = new ProcessRunner();
 			return FormatterFunc.Closeable.of(runner, this::format);
 		}
diff --git a/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java b/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java
index 5df807003d..dfddb4358a 100644
--- a/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java
+++ b/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java
@@ -138,7 +138,7 @@ public Path ensureDownloaded(String version, Platform platform) throws IOExcepti
 		logger.debug("Ensuring that Rome for platform '{}' is downloaded", platform);
 		var existing = findDownloaded(version, platform);
 		if (existing.isPresent()) {
-			logger.info("Rome was already downloaded, using executable at '{}'", existing.get());
+			logger.debug("Rome was already downloaded, using executable at '{}'", existing.get());
 			return existing.get();
 		} else {
 			logger.debug("Rome was not yet downloaded, attempting to download executable");
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java
index b68e5fef42..0fc37ebdfc 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java
@@ -1,5 +1,7 @@
 package com.diffplug.spotless.maven.javascript;
 
+import java.nio.file.Paths;
+
 import org.apache.maven.plugins.annotations.Parameter;
 
 import com.diffplug.spotless.FormatterStep;
@@ -22,7 +24,7 @@ public class RomeJs implements FormatterStepFactory {
 	 * <p>
 	 * You can use an expression like <code>${user.home}/rome</code> if you want to
 	 * use the home directory, or <code>${project.build.directory</code> if you want
-	 * to use the ptarget directory of the current project.
+	 * to use the target directory of the current project.
 	 */
 	@Parameter
 	private String downloadDir;
@@ -33,6 +35,14 @@ public class RomeJs implements FormatterStepFactory {
 	 * made to download the executable for the given version from the network. When
 	 * given, the executable is used and the <code>version</code> parameter is
 	 * ignored.
+	 * <p>
+	 * When an absolute path is given, that path is used as-is. When a relative path
+	 * is given, it is resolved against the project's base directory. When only a
+	 * file name (i.e. without any slashes or back slash path separators such as
+	 * {@code rome}) is given, this is interpreted as the name of a command with
+	 * executable that is in your {@code path} environment variable. Use
+	 * {@code ./executable-name} if you want to use an executable in the project's
+	 * base directory.
 	 */
 	@Parameter
 	private String pathToExe;
@@ -52,7 +62,8 @@ public class RomeJs implements FormatterStepFactory {
 	public FormatterStep newFormatterStep(FormatterStepConfig config) {
 		RomeStep rome;
 		if (pathToExe != null) {
-			rome = RomeStep.withExePath(pathToExe);
+			var resolvedExePath = resolveExePath(config);
+			rome = RomeStep.withExePath(resolvedExePath);
 		} else {
 			var downloadDir = resolveDownloadDir(config);
 			rome = RomeStep.withExeDownload(version, downloadDir);
@@ -60,6 +71,25 @@ public FormatterStep newFormatterStep(FormatterStepConfig config) {
 		return rome.create();
 	}
 
+	/**
+	 * Resolves the path to the Rome executable. When the path is only a file name,
+	 * do not perform any resolution and interpret it as a command that must be on
+	 * the user's path. Otherwise resolve the executable path against the project's
+	 * base directory.
+	 * 
+	 * @param config Configuration from the Maven Mojo execution with details about
+	 *               the currently executed project.
+	 * @return The resolved path to the Rome executable.
+	 */
+	private String resolveExePath(FormatterStepConfig config) {
+		var path = Paths.get(pathToExe);
+		if (path.getNameCount() == 1) {
+			return path.toString();
+		} else {
+			return config.getFileLocator().getBaseDir().toPath().resolve(path).toAbsolutePath().toString();
+		}
+	}
+
 	/**
 	 * Resolves the directory to use for storing downloaded Rome executable. When a
 	 * {@link #downloadDir} is given, use that directory, resolved against the

From 0d1e9fcf8ba0fdb5d0abbc67a685191992e70769 Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <sensenmann5@gmail.com>
Date: Thu, 6 Apr 2023 20:24:59 +0100
Subject: [PATCH 1016/2068] Add optional configuration for the config path with
 the config file

---
 .../spotless/javascript/RomeStep.java         | 115 ++++++++++++++----
 .../spotless/maven/javascript/RomeJs.java     |  25 ++++
 2 files changed, 116 insertions(+), 24 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/javascript/RomeStep.java b/lib/src/main/java/com/diffplug/spotless/javascript/RomeStep.java
index 8147464f7f..2794b38f44 100644
--- a/lib/src/main/java/com/diffplug/spotless/javascript/RomeStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/javascript/RomeStep.java
@@ -9,6 +9,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.attribute.PosixFilePermission;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
 
@@ -32,12 +33,14 @@
 public class RomeStep {
 	private static final Logger logger = LoggerFactory.getLogger(RomeStep.class);
 
-	private final String version;
+	private final String configPath;
 
 	private final String pathToExe;
 
 	private final String pathToExeDownloadDir;
 
+	private final String version;
+
 	/**
 	 * @return The name of this format step, i.e. {@code rome}.
 	 */
@@ -55,7 +58,7 @@ public static String name() {
 	 */
 	public static RomeStep withExeDownload(String version, String downloadDir) {
 		version = version != null && !version.isBlank() ? version : defaultVersion();
-		return new RomeStep(version, null, downloadDir);
+		return new RomeStep(version, null, downloadDir, null);
 	}
 
 	/**
@@ -66,18 +69,7 @@ public static RomeStep withExeDownload(String version, String downloadDir) {
 	 * @return A new Rome step that format with the given executable.
 	 */
 	public static RomeStep withExePath(String pathToExe) {
-		return new RomeStep(null, pathToExe, null);
-	}
-
-	/**
-	 * Finds the default version for Rome when no version is specified explicitly.
-	 * Over time this will become outdated -- people should always specify the
-	 * version explicitly!
-	 * 
-	 * @return The default version for Rome.
-	 */
-	private static String defaultVersion() {
-		return "12.0.0";
+		return new RomeStep(null, pathToExe, null, null);
 	}
 
 	/**
@@ -97,6 +89,17 @@ private static void attemptToAddPosixPermission(Path file, PosixFilePermission p
 		}
 	}
 
+	/**
+	 * Finds the default version for Rome when no version is specified explicitly.
+	 * Over time this will become outdated -- people should always specify the
+	 * version explicitly!
+	 * 
+	 * @return The default version for Rome.
+	 */
+	private static String defaultVersion() {
+		return "12.0.0";
+	}
+
 	/**
 	 * Attempts to make the given file executable. This is a best-effort attempt,
 	 * any errors are swallowed. Depending on the OS, the file might still be
@@ -133,10 +136,39 @@ private static String resolveNameAgainstPath(String name) throws IOException, In
 		}
 	}
 
-	private RomeStep(String version, String pathToExe, String pathToExeDownloadDir) {
+	/**
+	 * Checks the config path. When the config path does not exist or when it does
+	 * not contain a file named {@code rome.json}, an error is thrown.
+	 */
+	private static void validateRomeConfigPath(String configPath) {
+		if (configPath == null) {
+			return;
+		}
+		var path = Paths.get(configPath);
+		var config = path.resolve("rome.json");
+		if (!Files.exists(path)) {
+			throw new IllegalArgumentException("Rome config directory does not exist: " + path);
+		}
+		if (!Files.exists(config)) {
+			throw new IllegalArgumentException("Rome config does not exist: " + config);
+		}
+	}
+
+	private static void validateRomeExecutable(String resolvedPathToExe) {
+		if (!new File(resolvedPathToExe).isFile()) {
+			throw new IllegalArgumentException("Rome executable does not exist: " + resolvedPathToExe);
+		}
+	}
+
+	/**
+	 * Checks the Rome executable. When the executable path does not exist, an error
+	 * is thrown.
+	 */
+	private RomeStep(String version, String pathToExe, String pathToExeDownloadDir, String configPath) {
 		this.version = version;
 		this.pathToExe = pathToExe;
 		this.pathToExeDownloadDir = pathToExeDownloadDir;
+		this.configPath = configPath;
 	}
 
 	/**
@@ -149,6 +181,19 @@ public FormatterStep create() {
 		return FormatterStep.createLazy(name(), this::createState, State::toFunc);
 	}
 
+	/**
+	 * Derives a new Rome step from this step by replacing the config path with the
+	 * given value.
+	 * 
+	 * @param configPath Config path to use. Must point to a directory which contain
+	 *                   a file named {@code rome.json}.
+	 * @return A new Rome step with the same configuration as this step, but with
+	 *         the given config file instead.
+	 */
+	public RomeStep withConfigPath(String configPath) {
+		return new RomeStep(version, pathToExe, pathToExeDownloadDir, configPath);
+	}
+
 	/**
 	 * Resolves the Rome executable, possibly downloading it from the network, and
 	 * creates a new state instance with the resolved executable that can format
@@ -165,14 +210,12 @@ public FormatterStep create() {
 	 */
 	private State createState() throws IOException, InterruptedException {
 		var resolvedPathToExe = resolveExe();
-		var resolvedExeFile = new File(resolvedPathToExe);
-		if (!resolvedExeFile.isFile()) {
-			throw new IllegalArgumentException("Rome executable does not exist: " + resolvedExeFile);
-		}
+		validateRomeExecutable(resolvedPathToExe);
+		validateRomeConfigPath(configPath);
 		logger.debug("Using Rome executable located at  '{}'", resolvedPathToExe);
-		var exeSignature = FileSignature.signAsList(Collections.singleton(resolvedExeFile));
+		var exeSignature = FileSignature.signAsList(Collections.singleton(new File(resolvedPathToExe)));
 		makeExecutable(resolvedPathToExe);
-		return new State(resolvedPathToExe, exeSignature);
+		return new State(resolvedPathToExe, exeSignature, configPath);
 	}
 
 	/**
@@ -221,9 +264,33 @@ private static class State implements Serializable {
 		@SuppressWarnings("unused")
 		private final FileSignature exeSignature;
 
-		private State(String exe, FileSignature exeSignature) throws IOException {
+		/** The optional configuration file for Rome. */
+		private final String configPath;
+
+		private State(String exe, FileSignature exeSignature, String configPath) throws IOException {
 			this.pathToExe = exe;
 			this.exeSignature = exeSignature;
+			this.configPath = configPath;
+		}
+
+		/**
+		 * Builds the list of arguments for the command that executes Rome to format a
+		 * piece of code passed via stdin.
+		 * 
+		 * @param file File to format.
+		 * @return The Rome command to use for formatting code.
+		 */
+		private String[] buildRomeCommand(File file) {
+			var argList = new ArrayList<String>();
+			argList.add(pathToExe);
+			argList.add("format");
+			argList.add("--stdin-file-path");
+			argList.add(file.getName());
+			if (configPath != null) {
+				argList.add("--config-path");
+				argList.add(configPath);
+			}
+			return argList.toArray(String[]::new);
 		}
 
 		/**
@@ -242,9 +309,9 @@ private State(String exe, FileSignature exeSignature) throws IOException {
 		 */
 		private String format(ProcessRunner runner, String input, File file) throws IOException, InterruptedException {
 			var stdin = input.getBytes(StandardCharsets.UTF_8);
-			var args = new String[] { pathToExe, "format", "--stdin-file-path", file.getName() };
+			var args = buildRomeCommand(file);
 			if (logger.isDebugEnabled()) {
-				logger.debug("Running Rome comand to fomrat code: '{}'", String.join(", ", args));
+				logger.debug("Running Rome comand to format code: '{}'", String.join(", ", args));
 			}
 			return runner.exec(stdin, args).assertExitZero(StandardCharsets.UTF_8);
 		}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java
index 0fc37ebdfc..180fb9274f 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java
@@ -16,6 +16,15 @@
  * It delegates to the Rome executable.
  */
 public class RomeJs implements FormatterStepFactory {
+	/**
+	 * Optional path to the directory with configuration file for Rome. The file
+	 * must be named {@code rome.json}. When none is given, the default
+	 * configuration is used. If this is a relative path, it is resolved against the
+	 * project's base directory.
+	 */
+	@Parameter
+	private String configPath;
+
 	/**
 	 * Optional directory where the downloaded Rome executable is placed. If this is
 	 * a relative path, it is resolved against the project's base directory.
@@ -68,9 +77,25 @@ public FormatterStep newFormatterStep(FormatterStepConfig config) {
 			var downloadDir = resolveDownloadDir(config);
 			rome = RomeStep.withExeDownload(version, downloadDir);
 		}
+		if (configPath != null) {
+			var resolvedConfigFile = resolveConfigFile(config);
+			rome = rome.withConfigPath(resolvedConfigFile);
+		}
 		return rome.create();
 	}
 
+	/**
+	 * Resolves the path to the configuration file for Rome. Relative paths are
+	 * resolved against the project's base directory.
+	 * 
+	 * @param config Configuration from the Maven Mojo execution with details about
+	 *               the currently executed project.
+	 * @return The resolved path to the configuration file.
+	 */
+	private String resolveConfigFile(FormatterStepConfig config) {
+		return config.getFileLocator().getBaseDir().toPath().resolve(configPath).toAbsolutePath().toString();
+	}
+
 	/**
 	 * Resolves the path to the Rome executable. When the path is only a file name,
 	 * do not perform any resolution and interpret it as a command that must be on

From fd41613786b28a5e92a134bc7ec1965faa7e7900 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 6 Apr 2023 14:36:24 -0700
Subject: [PATCH 1017/2068] Update hint.

---
 .../com/diffplug/gradle/spotless/RegisterDependenciesTask.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RegisterDependenciesTask.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RegisterDependenciesTask.java
index 114900f689..bdeb9d7d94 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RegisterDependenciesTask.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RegisterDependenciesTask.java
@@ -47,7 +47,7 @@
  * - When this "registerDependencies" task does its up-to-date check, it queries the task execution graph to see which
  *   SpotlessTasks are at risk of being executed, and causes them all to be evaluated safely in the root buildscript.
  */
-@DisableCachingByDefault(because = "I/O bound task not worth caching")
+@DisableCachingByDefault(because = "This task coordinates the setup and execution of other tasks, and should not be cached")
 public abstract class RegisterDependenciesTask extends DefaultTask {
 	static final String TASK_NAME = "spotlessInternalRegisterDependencies";
 

From 029acd6fc284bb66d1e86f424775cb5a68d9c04f Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 6 Apr 2023 14:37:01 -0700
Subject: [PATCH 1018/2068] Put changelog entry in the correct place.

---
 plugin-gradle/CHANGES.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 552586915d..becf2e5ac7 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Added `@DisableCachingByDefault` to `RegisterDependenciesTask`.
 
 ## [6.18.0] - 2023-04-06
 ### Added
@@ -19,7 +21,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
   Mirrors are selected by prefix match, for example `https://download.eclipse.org/eclipse/updates/4.26/` will be redirected to `https://some.internal.mirror/eclipse/eclipse/updates/4.26/`.
   The same configuration exists for `greclipse` and `eclipseCdt`.
 * The `style` option in Palantir Java Format ([#1654](https://github.com/diffplug/spotless/pull/1654)).
-* Added `@DisableCachingByDefault` to `RegisterDependenciesTask`.
 ### Fixed
 * Stop using deprecated conventions when used in Gradle >= `7.1`. ([#1618](https://github.com/diffplug/spotless/pull/1618))
 ### Changes

From 9b9de806c0e92c8e836f15c9bd020c589100ca42 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 6 Apr 2023 15:11:03 -0700
Subject: [PATCH 1019/2068] CleanthatJavaRefactorerTest had the wrong package.

---
 .../spotless/maven/java/CleanthatJavaRefactorerTest.java    | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java
index 738624cd57..5f6bc2750d 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/CleanthatJavaRefactorerTest.java
@@ -13,18 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.diffplug.spotless.maven.test;
+package com.diffplug.spotless.maven.java;
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
 
 class CleanthatJavaRefactorerTest extends MavenIntegrationHarness {
-	private static final Logger LOGGER = LoggerFactory.getLogger(CleanthatJavaRefactorerTest.class);
-
 	@Test
 	void testEnableDraft() throws Exception {
 		writePomWithJavaSteps(

From c8e5430a1564f3504181e8689a47e5476ebc77a7 Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <sensenmann5@gmail.com>
Date: Fri, 7 Apr 2023 08:06:36 +0100
Subject: [PATCH 1020/2068] Limit visibility of Rome internal logic classes,
 JavaDoc

---
 CHANGES.md                                    |   3 +-
 .../com/diffplug/spotless/Architecture.java   |  39 ------
 .../main/java/com/diffplug/spotless/OS.java   |  21 ---
 .../diffplug/spotless/rome/Architecture.java  |  54 ++++++++
 .../java/com/diffplug/spotless/rome/OS.java   |  41 ++++++
 .../spotless/{ => rome}/Platform.java         |  29 ++--
 .../rome/RomeExecutableDownloader.java        | 126 +++++++-----------
 .../{javascript => rome}/RomeStep.java        |  70 ++++++++--
 plugin-gradle/CHANGES.md                      |   3 +-
 plugin-maven/CHANGES.md                       |   4 +-
 .../diffplug/spotless/maven/FileLocator.java  |   4 +-
 .../spotless/maven/javascript/RomeJs.java     |   2 +-
 12 files changed, 213 insertions(+), 183 deletions(-)
 delete mode 100644 lib/src/main/java/com/diffplug/spotless/Architecture.java
 delete mode 100644 lib/src/main/java/com/diffplug/spotless/OS.java
 create mode 100644 lib/src/main/java/com/diffplug/spotless/rome/Architecture.java
 create mode 100644 lib/src/main/java/com/diffplug/spotless/rome/OS.java
 rename lib/src/main/java/com/diffplug/spotless/{ => rome}/Platform.java (76%)
 rename lib/src/main/java/com/diffplug/spotless/{javascript => rome}/RomeStep.java (82%)

diff --git a/CHANGES.md b/CHANGES.md
index ab49d9d096..57b831b8ad 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -16,13 +16,14 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Support configuration of mirrors for P2 repositories in `EquoBasedStepBuilder` ([#1629](https://github.com/diffplug/spotless/issues/1629)).
 * The `style` option in Palantir Java Format ([#1654](https://github.com/diffplug/spotless/pull/1654)).
 * Added formatter for Gherkin feature files ([#1649](https://github.com/diffplug/spotless/issues/1649)).
+* Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. https://github.com/diffplug/spotless/pull/1663
 ### Changes
 * **POTENTIALLY BREAKING** Converted `googleJavaFormat` to a compile-only dependency and drop support for versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
 * Bump default `cleanthat` version to latest `2.6` -> `2.13`. ([#1589](https://github.com/diffplug/spotless/pull/1589) and [#1661](https://github.com/diffplug/spotless/pull/1661))
 * Bump default `diktat` version `1.2.4.2` -> `1.2.5`. ([#1631](https://github.com/diffplug/spotless/pull/1631))
 * Bump default `flexmark` version `0.62.2` -> `0.64.0`. ([#1302](https://github.com/diffplug/spotless/pull/1302))
 * Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
-* Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. https://github.com/diffplug/spotless/pull/1663
+
 * Bump default `scalafmt` version `3.7.1` -> `3.7.3`. ([#1584](https://github.com/diffplug/spotless/pull/1584))
 * Bump default Eclipse formatters for the 2023-03 release. ([#1662](https://github.com/diffplug/spotless/pull/1662))
   * JDT and GrEclipse `4.26` -> `4.27`
diff --git a/lib/src/main/java/com/diffplug/spotless/Architecture.java b/lib/src/main/java/com/diffplug/spotless/Architecture.java
deleted file mode 100644
index 211a5cb699..0000000000
--- a/lib/src/main/java/com/diffplug/spotless/Architecture.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.diffplug.spotless;
-
-/**
- * Enumeration of possible computer architectures.
- *
- */
-public enum Architecture {
-	x86, x64, ppc64le, s390x, arm64, armv7l, ppc, ppc64;
-
-	/**
-	 * Attempts to guess the architecture of the environment running the JVM.
-	 * 
-	 * @return The best guess for the architecture.
-	 */
-	public static Architecture guess() {
-		var arch = System.getProperty("os.arch");
-		var version = System.getProperty("os.version");
-
-		if (arch.equals("ppc64le")) {
-			throw new IllegalArgumentException();
-		} else if (arch.equals("aarch64")) {
-			return arm64;
-		} else if (arch.equals("s390x")) {
-			return s390x;
-		} else if (arch.equals("arm")) {
-			if (version.contains("v7")) {
-				return armv7l;
-			} else {
-				return arm64;
-			}
-		} else if (arch.equals("ppc64")) {
-			return ppc64;
-		} else if (arch.equals("ppc")) {
-			return ppc;
-		} else {
-			return arch.contains("64") ? x64 : x86;
-		}
-	}
-}
diff --git a/lib/src/main/java/com/diffplug/spotless/OS.java b/lib/src/main/java/com/diffplug/spotless/OS.java
deleted file mode 100644
index 0e05c948de..0000000000
--- a/lib/src/main/java/com/diffplug/spotless/OS.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.diffplug.spotless;
-
-/**
- * Enumeration of possible computer operation systems.
- */
-public enum OS {
-	Windows, Mac, Linux, SunOS, AIX;
-
-	/**
-	 * Attempts to guess the OS of the environment running the JVM.
-	 * 
-	 * @return The best guess for the architecture.
-	 */
-	public static OS guess() {
-		var osName = System.getProperty("os.name");
-		return osName.contains("Windows") ? OS.Windows
-				: osName.contains("Mac") ? OS.Mac
-						: osName.contains("SunOS") ? OS.SunOS
-								: osName.toUpperCase().contains("AIX") ? OS.AIX : OS.Linux;
-	}
-}
\ No newline at end of file
diff --git a/lib/src/main/java/com/diffplug/spotless/rome/Architecture.java b/lib/src/main/java/com/diffplug/spotless/rome/Architecture.java
new file mode 100644
index 0000000000..064bd52b32
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/rome/Architecture.java
@@ -0,0 +1,54 @@
+package com.diffplug.spotless.rome;
+
+/**
+ * Enumeration of possible computer architectures.
+ */
+public enum Architecture {
+	/** The arm64 architecture */
+	ARM64,
+	/** Either x64 or x64_32 architecture */
+	X64;
+
+	/**
+	 * Attempts to guess the architecture of the environment running the JVM.
+	 * 
+	 * @return The best guess for the architecture.
+	 */
+	public static Architecture guess() {
+		var arch = System.getProperty("os.arch");
+		var version = System.getProperty("os.version");
+
+		if (arch == null || arch.isBlank()) {
+			throw new IllegalStateException("No OS information is available, specify the Rome executable manually");
+		}
+
+		var msg = "Unsupported architecture " + arch + "/" + version
+				+ ", specify the path to the Rome executable manually";
+
+		if (arch.equals("ppc64le")) {
+			throw new IllegalStateException(msg);
+		}
+		if (arch.equals("aarch64")) {
+			throw new IllegalStateException(msg);
+		}
+		if (arch.equals("s390x")) {
+			throw new IllegalStateException(msg);
+		}
+		if (arch.equals("ppc64")) {
+			throw new IllegalStateException(msg);
+		}
+		if (arch.equals("ppc")) {
+			throw new IllegalStateException(msg);
+		}
+		if (arch.equals("arm")) {
+			if (version.contains("v7")) {
+				throw new IllegalStateException(msg);
+			}
+			return ARM64;
+		}
+		if (arch.contains("64")) {
+			return X64;
+		}
+		throw new IllegalStateException(msg);
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/rome/OS.java b/lib/src/main/java/com/diffplug/spotless/rome/OS.java
new file mode 100644
index 0000000000..c7b874bb24
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/rome/OS.java
@@ -0,0 +1,41 @@
+package com.diffplug.spotless.rome;
+
+import java.util.Locale;
+
+/**
+ * Enumeration of possible computer operation systems.
+ */
+enum OS {
+	/** Any derivate of a Linux operation system. */
+	LINUX,
+	/** The Macintosh operating system/ */
+	MAC_OS,
+	/** The Microsoft Windows operating system. */
+	WINDOWS,;
+
+	/**
+	 * Attempts to guess the OS of the environment running the JVM.
+	 * 
+	 * @return The best guess for the architecture.
+	 * @throws IllegalStateException When the OS is either unsupported or no
+	 *                               information about the OS could be retrieved.
+	 */
+	public static OS guess() {
+		var osName = System.getProperty("os.name");
+		if (osName == null || osName.isBlank()) {
+			throw new IllegalStateException("No OS information is available, specify the Rome executable manually");
+		}
+		var osNameUpper = osName.toUpperCase(Locale.ROOT);
+		if (osNameUpper.contains("SUNOS") || osName.contains("AIX")) {
+			throw new IllegalStateException(
+					"Unsupported OS " + osName + ", specify the path to the Rome executable manually");
+		}
+		if (osNameUpper.contains("WINDOWS")) {
+			return OS.WINDOWS;
+		} else if (osNameUpper.contains("MAC")) {
+			return OS.MAC_OS;
+		} else {
+			return OS.LINUX;
+		}
+	}
+}
\ No newline at end of file
diff --git a/lib/src/main/java/com/diffplug/spotless/Platform.java b/lib/src/main/java/com/diffplug/spotless/rome/Platform.java
similarity index 76%
rename from lib/src/main/java/com/diffplug/spotless/Platform.java
rename to lib/src/main/java/com/diffplug/spotless/rome/Platform.java
index c57932a7c6..2631cf3131 100644
--- a/lib/src/main/java/com/diffplug/spotless/Platform.java
+++ b/lib/src/main/java/com/diffplug/spotless/rome/Platform.java
@@ -1,15 +1,17 @@
-package com.diffplug.spotless;
+package com.diffplug.spotless.rome;
 
 /**
  * Represents a platform where code is run, consisting of an operating system
  * and an architecture.
  */
-public class Platform {
+class Platform {
 	/**
 	 * Attempts to guess the platform of the hosting environment running the JVM
 	 * machine.
 	 * 
 	 * @return The best guess for the current OS and architecture.
+	 * @throws IllegalStateException When no OS information is available, or when
+	 *                               the OS or architecture is unsupported.
 	 */
 	public static Platform guess() {
 		var os = OS.guess();
@@ -23,7 +25,8 @@ public static Platform guess() {
 
 	/**
 	 * Creates a new Platform descriptor for the given OS and architecture.
-	 * @param os Operating system of the platform.
+	 * 
+	 * @param os           Operating system of the platform.
 	 * @param architecture Architecture of the platform.
 	 */
 	public Platform(OS os, Architecture architecture) {
@@ -45,39 +48,25 @@ public OS getOs() {
 		return os;
 	}
 
-	/**
-	 * @return Whether the operating system is Aix.
-	 */
-	public boolean isAix() {
-		return os == OS.AIX;
-	}
-
 	/**
 	 * @return Whether the operating system is Linux.
 	 */
 	public boolean isLinux() {
-		return os == OS.Linux;
+		return os == OS.LINUX;
 	}
 
 	/**
 	 * @return Whether the operating system is Mac.
 	 */
 	public boolean isMac() {
-		return os == OS.Mac;
-	}
-
-	/**
-	 * @return Whether the operating system is SunOS.
-	 */
-	public boolean isSunos() {
-		return os == OS.SunOS;
+		return os == OS.MAC_OS;
 	}
 
 	/**
 	 * @return Whether the operating system is Windows.
 	 */
 	public boolean isWindows() {
-		return os == OS.Windows;
+		return os == OS.WINDOWS;
 	}
 
 	@Override
diff --git a/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java b/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java
index dfddb4358a..72df92224f 100644
--- a/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java
+++ b/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java
@@ -15,21 +15,18 @@
 import java.nio.file.StandardOpenOption;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.util.Locale;
 import java.util.Objects;
 import java.util.Optional;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.diffplug.spotless.Architecture;
-import com.diffplug.spotless.OS;
-import com.diffplug.spotless.Platform;
-
 /**
  * Downloader for the Rome executable:
  * <a href="https://github.com/rome/tools">https://github.com/rome/tools</a>.
  */
-public class RomeExecutableDownloader {
+final class RomeExecutableDownloader {
 	private static final Logger logger = LoggerFactory.getLogger(RomeExecutableDownloader.class);
 
 	/**
@@ -89,16 +86,19 @@ public RomeExecutableDownloader(Path downloadDir) {
 	 * the download directory. When the executable exists already, it is
 	 * overwritten.
 	 * 
-	 * @param version  Desired Rome version.
-	 * @param platform Desired platform.
+	 * @param version Desired Rome version.
 	 * @return The path to the Rome executable.
-	 * @throws IOException          When the executable cannot be downloaded from
-	 *                              the network or the file system could not be
-	 *                              accessed.
-	 * @throws InterruptedException When this thread was interrupted while
-	 *                              downloading the file.
+	 * @throws IOException           When the executable cannot be downloaded from
+	 *                               the network or the file system could not be
+	 *                               accessed.
+	 * @throws InterruptedException  When this thread was interrupted while
+	 *                               downloading the file.
+	 * @throws IllegalStateException When no information about the current OS and
+	 *                               architecture could be obtained, or when the OS
+	 *                               or architecture is not supported.
 	 */
-	public Path download(String version, Platform platform) throws IOException, InterruptedException {
+	public Path download(String version) throws IOException, InterruptedException {
+		var platform = Platform.guess();
 		var url = getDownloadUrl(version, platform);
 		var executablePath = getExecutablePath(version, platform);
 		var checksumPath = getChecksumPath(executablePath);
@@ -128,21 +128,25 @@ public Path download(String version, Platform platform) throws IOException, Inte
 	 * 
 	 * @param version Desired Rome version.
 	 * @return The path to the Rome executable.
-	 * @throws IOException          When the executable cannot be downloaded from
-	 *                              the network or the file system could not be
-	 *                              accessed.
-	 * @throws InterruptedException When this thread was interrupted while
-	 *                              downloading the file.
+	 * @throws IOException           When the executable cannot be downloaded from
+	 *                               the network or the file system could not be
+	 *                               accessed.
+	 * @throws InterruptedException  When this thread was interrupted while
+	 *                               downloading the file.
+	 * @throws IllegalStateException When no information about the current OS and
+	 *                               architecture could be obtained, or when the OS
+	 *                               or architecture is not supported.
 	 */
-	public Path ensureDownloaded(String version, Platform platform) throws IOException, InterruptedException {
+	public Path ensureDownloaded(String version) throws IOException, InterruptedException {
+		var platform = Platform.guess();
 		logger.debug("Ensuring that Rome for platform '{}' is downloaded", platform);
-		var existing = findDownloaded(version, platform);
+		var existing = findDownloaded(version);
 		if (existing.isPresent()) {
 			logger.debug("Rome was already downloaded, using executable at '{}'", existing.get());
 			return existing.get();
 		} else {
 			logger.debug("Rome was not yet downloaded, attempting to download executable");
-			return download(version, platform);
+			return download(version);
 		}
 	}
 
@@ -150,41 +154,22 @@ public Path ensureDownloaded(String version, Platform platform) throws IOExcepti
 	 * Attempts to find the Rome executable for the current platform in the download
 	 * directory. No attempt is made to download the executable from the network.
 	 * 
-	 * @param version  Desired Rome version.
-	 * @param platform Desired platform.
+	 * @param version Desired Rome version.
 	 * @return The path to the Rome executable.
-	 * @throws IOException When the executable does not exists in the download
-	 *                     directory, or when the file system could not be accessed.
+	 * @throws IOException           When the executable does not exists in the
+	 *                               download directory, or when the file system
+	 *                               could not be accessed.
+	 * @throws IllegalStateException When no information about the current OS and
+	 *                               architecture could be obtained, or when the OS
+	 *                               or architecture is not supported.
 	 */
-	public Optional<Path> findDownloaded(String version, Platform platform) throws IOException {
+	public Optional<Path> findDownloaded(String version) throws IOException {
+		var platform = Platform.guess();
 		var executablePath = getExecutablePath(version, platform);
 		logger.debug("Checking rome executable at {}", executablePath);
 		return checkFileWithChecksum(executablePath) ? Optional.ofNullable(executablePath) : Optional.empty();
 	}
 
-	/**
-	 * @param platform Platform to check.
-	 * @return <code>true</code> if Rome officially supports the given platform,
-	 *         <code>false</code> otherwise.
-	 */
-	public boolean isSupported(Platform platform) {
-		var architecture = platform.getArchitecture();
-		switch (platform.getOs()) {
-		case AIX:
-			return false;
-		case Linux:
-			return architecture == Architecture.x64 || architecture == Architecture.arm64;
-		case Mac:
-			return architecture == Architecture.x64 || architecture == Architecture.arm64;
-		case SunOS:
-			return false;
-		case Windows:
-			return architecture == Architecture.x64 || architecture == Architecture.arm64;
-		default:
-			return false;
-		}
-	}
-
 	/**
 	 * Checks whether the given file exists and matches the checksum. The checksum
 	 * must be contained in a file next to the file to check.
@@ -254,22 +239,10 @@ private String computeChecksum(Path file, String algorithm) throws IOException {
 	 */
 	private String getArchitectureCodeName(Architecture architecture) throws IOException {
 		switch (architecture) {
-		case arm64:
+		case ARM64:
 			return "arm64";
-		case armv7l:
-			throw new IOException("Unsupported architecture: " + architecture);
-		case ppc:
-			throw new IOException("Unsupported architecture: " + architecture);
-		case ppc64:
-			throw new IOException("Unsupported architecture: " + architecture);
-		case ppc64le:
-			throw new IOException("Unsupported architecture: " + architecture);
-		case s390x:
-			throw new IOException("Unsupported architecture: " + architecture);
-		case x64:
+		case X64:
 			return "x64";
-		case x86:
-			throw new IOException("Unsupported architecture: " + architecture);
 		default:
 			throw new IOException("Unsupported architecture: " + architecture);
 		}
@@ -294,9 +267,6 @@ private Path getChecksumPath(Path file) {
 	 * @throws IOException When the platform is not supported by Rome.
 	 */
 	private String getDownloadUrl(String version, Platform platform) throws IOException {
-		if (!isSupported(platform)) {
-			throw new IOException("Unsupported platform: " + platform);
-		}
 		var osCodeName = getOsCodeName(platform.getOs());
 		var architectureCodeName = getArchitectureCodeName(platform.getArchitecture());
 		var extension = getDownloadUrlExtension(platform.getOs());
@@ -314,15 +284,11 @@ private String getDownloadUrl(String version, Platform platform) throws IOExcept
 	 */
 	private String getDownloadUrlExtension(OS os) throws IOException {
 		switch (os) {
-		case AIX:
-			throw new IOException("Unsupported OS: " + os);
-		case Linux:
+		case LINUX:
 			return "";
-		case Mac:
+		case MAC_OS:
 			return "";
-		case SunOS:
-			throw new IOException("Unsupported OS: " + os);
-		case Windows:
+		case WINDOWS:
 			return ".exe";
 		default:
 			throw new IOException("Unsupported OS: " + os);
@@ -338,7 +304,9 @@ private String getDownloadUrlExtension(OS os) throws IOException {
 	 * @return The path for the Rome executable.
 	 */
 	private Path getExecutablePath(String version, Platform platform) {
-		var fileName = String.format(DOWNLOAD_FILE_PATTERN, platform.getOs(), platform.getArchitecture(), version);
+		var os = platform.getOs().name().toLowerCase(Locale.ROOT);
+		var arch = platform.getArchitecture().name().toLowerCase(Locale.ROOT);
+		var fileName = String.format(DOWNLOAD_FILE_PATTERN, os, arch, version);
 		return downloadDir.resolve(fileName);
 	}
 
@@ -352,15 +320,11 @@ private Path getExecutablePath(String version, Platform platform) {
 	 */
 	private String getOsCodeName(OS os) throws IOException {
 		switch (os) {
-		case AIX:
-			throw new IOException("Unsupported OS: " + os);
-		case Linux:
+		case LINUX:
 			return "linux";
-		case Mac:
+		case MAC_OS:
 			return "darwin";
-		case SunOS:
-			throw new IOException("Unsupported OS: " + os);
-		case Windows:
+		case WINDOWS:
 			return "win32";
 		default:
 			throw new IOException("Unsupported OS: " + os);
diff --git a/lib/src/main/java/com/diffplug/spotless/javascript/RomeStep.java b/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java
similarity index 82%
rename from lib/src/main/java/com/diffplug/spotless/javascript/RomeStep.java
rename to lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java
index 2794b38f44..1d67743f41 100644
--- a/lib/src/main/java/com/diffplug/spotless/javascript/RomeStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java
@@ -1,4 +1,4 @@
-package com.diffplug.spotless.javascript;
+package com.diffplug.spotless.rome;
 
 import java.io.File;
 import java.io.IOException;
@@ -20,9 +20,7 @@
 import com.diffplug.spotless.ForeignExe;
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.Platform;
 import com.diffplug.spotless.ProcessRunner;
-import com.diffplug.spotless.rome.RomeExecutableDownloader;
 
 /**
  * formatter step that formats JavaScript and TypeScript code with Rome:
@@ -33,12 +31,29 @@
 public class RomeStep {
 	private static final Logger logger = LoggerFactory.getLogger(RomeStep.class);
 
+	/**
+	 * Path to the directory with the {@code rome.json} config file, can be
+	 * <code>null</code>, in which case the defaults are used.
+	 */
 	private final String configPath;
 
+	/**
+	 * Path to the Rome executable. Can be <code>null</code>, but either a path to
+	 * the executable of a download directory and version must be given.
+	 */
 	private final String pathToExe;
 
+	/**
+	 * Path to the download directory for storing the download Rome executable. Can
+	 * be <code>null</code>, but either a path to the executable of a download
+	 * directory and version must be given.
+	 */
 	private final String pathToExeDownloadDir;
 
+	/**
+	 * Version of Rome to download. Can be <code>null</code>, but either a path to
+	 * the executable of a download directory and version must be given.
+	 */
 	private final String version;
 
 	/**
@@ -137,8 +152,8 @@ private static String resolveNameAgainstPath(String name) throws IOException, In
 	}
 
 	/**
-	 * Checks the config path. When the config path does not exist or when it does
-	 * not contain a file named {@code rome.json}, an error is thrown.
+	 * Checks the Rome config path. When the config path does not exist or when it
+	 * does not contain a file named {@code rome.json}, an error is thrown.
 	 */
 	private static void validateRomeConfigPath(String configPath) {
 		if (configPath == null) {
@@ -154,6 +169,10 @@ private static void validateRomeConfigPath(String configPath) {
 		}
 	}
 
+	/**
+	 * Checks the Rome executable file. When the file does not exist, an error is
+	 * thrown.
+	 */
 	private static void validateRomeExecutable(String resolvedPathToExe) {
 		if (!new File(resolvedPathToExe).isFile()) {
 			throw new IllegalArgumentException("Rome executable does not exist: " + resolvedPathToExe);
@@ -243,19 +262,24 @@ private String resolveExe() throws IOException, InterruptedException {
 			}
 		} else {
 			var downloader = new RomeExecutableDownloader(Paths.get(pathToExeDownloadDir));
-			var platform = Platform.guess();
-			if (!downloader.isSupported(platform)) {
-				throw new IllegalStateException(
-						"Unsupported platform " + platform + ", please specifiy the Rome executable directly");
-			}
-			var downloaded = downloader.ensureDownloaded(version, platform).toString();
+			var downloaded = downloader.ensureDownloaded(version).toString();
 			makeExecutable(downloaded);
 			return downloaded;
 		}
 	}
 
+	/**
+	 * The internal state used by the Rome formatter. A state instance is created
+	 * when the spotless plugin for Maven or Gradle is executed, and reused for all
+	 * formatting requests for different files. The lifetime of the instance ends
+	 * when the Maven or Gradle plugin was successfully executed.
+	 * <p>
+	 * The state encapsulated a particular executable. It is serializable for
+	 * caching purposes. Spotless keeps a cache of which files need to be formatted.
+	 * The cache is busted when the serialized form of a state instance changes.
+	 */
 	private static class State implements Serializable {
-		private static final long serialVersionUID = -5884229077231467806L;
+		private static final long serialVersionUID = 6846790911054484379L;
 
 		/** Path to the exe file */
 		private final String pathToExe;
@@ -264,10 +288,22 @@ private static class State implements Serializable {
 		@SuppressWarnings("unused")
 		private final FileSignature exeSignature;
 
-		/** The optional configuration file for Rome. */
+		/**
+		 * The optional path to the directory with the {@code rome.json} config file.
+		 */
 		private final String configPath;
 
-		private State(String exe, FileSignature exeSignature, String configPath) throws IOException {
+		/**
+		 * Creates a new state for instance which can format code with the given Rome
+		 * executable.
+		 * 
+		 * @param exe          Path to the Rome executable.
+		 * @param exeSignature Signature (e.g. SHA-256 checksum) of the Rome executable.
+		 * @param configPath   Path to the optional directory with the {@code rome.json}
+		 *                     config file, can be <code>null</code>, in which case the
+		 *                     defaults are used.
+		 */
+		private State(String exe, FileSignature exeSignature, String configPath) {
 			this.pathToExe = exe;
 			this.exeSignature = exeSignature;
 			this.configPath = configPath;
@@ -316,6 +352,12 @@ private String format(ProcessRunner runner, String input, File file) throws IOEx
 			return runner.exec(stdin, args).assertExitZero(StandardCharsets.UTF_8);
 		}
 
+		/**
+		 * Creates a new formatter function for formatting a piece of code by delegating
+		 * to the Rome executable.
+		 * 
+		 * @return A formatter function for formatting code.
+		 */
 		private FormatterFunc.Closeable toFunc() {
 			var runner = new ProcessRunner();
 			return FormatterFunc.Closeable.of(runner, this::format);
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index b9f692bd9a..4fb0d57e14 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -19,6 +19,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
   Mirrors are selected by prefix match, for example `https://download.eclipse.org/eclipse/updates/4.26/` will be redirected to `https://some.internal.mirror/eclipse/eclipse/updates/4.26/`.
   The same configuration exists for `greclipse` and `eclipseCdt`.
 * The `style` option in Palantir Java Format ([#1654](https://github.com/diffplug/spotless/pull/1654)).
+* Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. https://github.com/diffplug/spotless/pull/1663
 ### Fixed
 * Stop using deprecated conventions when used in Gradle >= `7.1`. ([#1618](https://github.com/diffplug/spotless/pull/1618))
 ### Changes
@@ -27,7 +28,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `diktat` version `1.2.4.2` -> `1.2.5`. ([#1631](https://github.com/diffplug/spotless/pull/1631))
 * Bump default `flexmark` version `0.62.2` -> `0.64.0`. ([#1302](https://github.com/diffplug/spotless/pull/1302))
 * Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
-* Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. https://github.com/diffplug/spotless/pull/1663
+
 * Bump default `scalafmt` version `3.7.1` -> `3.7.3`. ([#1584](https://github.com/diffplug/spotless/pull/1584))
 * Bump default Eclipse formatters for the 2023-03 release. ([#1662](https://github.com/diffplug/spotless/pull/1662))
   * JDT and GrEclipse `4.26` -> `4.27`
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 46c82361b5..f0134bc2f2 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -9,7 +9,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * `removeUnusedImport` can be configured to rely on `cleanthat-javaparser-unnecessaryimport`. Default remains `google-java-format`. ([#1589](https://github.com/diffplug/spotless/pull/1589))
 * The `style` option in Palantir Java Format ([#1654](https://github.com/diffplug/spotless/pull/1654)).
 * Added formatter for Gherkin feature files ([#1649](https://github.com/diffplug/spotless/issues/1649)).
-### Fixed
+* Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. https://github.com/diffplug/spotless/pull/1663### Fixed
 * Fix non deterministic computation of cache fingerprint when using multiple formatters. ([#1643](https://github.com/diffplug/spotless/pull/1643) fixes [#1642](https://github.com/diffplug/spotless/pull/1642))
 ### Changes
 * **POTENTIALLY BREAKING** Drop support for `googleJavaFormat` versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
@@ -17,7 +17,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `diktat` version `1.2.4.2` -> `1.2.5`. ([#1631](https://github.com/diffplug/spotless/pull/1631))
 * Bump default `flexmark` version `0.62.2` -> `0.64.0`. ([#1302](https://github.com/diffplug/spotless/pull/1302))
 * Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
-* Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. https://github.com/diffplug/spotless/pull/1663
+
 * Bump default `scalafmt` version `3.7.1` -> `3.7.3`. ([#1584](https://github.com/diffplug/spotless/pull/1584))
 * Bump default Eclipse formatters for the 2023-03 release. ([#1662](https://github.com/diffplug/spotless/pull/1662))
   * JDT and GrEclipse `4.26` -> `4.27`
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FileLocator.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FileLocator.java
index 1450b2873a..3e6d4cfeae 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FileLocator.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FileLocator.java
@@ -121,9 +121,7 @@ private static byte[] hash(String value) {
 	}
 
 	private static File findDataDir() {
-		// One of
-		// ~/.m2/repository/com/diffplug/spotless/spotless-plugin-maven/1.2.3/spotless-plugin-maven-1.2.3.jar
-		// ~/.m2/repository/com/diffplug/spotless/spotless-plugin-maven/1.2.3/spotless-plugin-gradle-1.2.3.jar
+		// E.g. ~/.m2/repository/com/diffplug/spotless/spotless-plugin-maven/1.2.3/spotless-plugin-maven-1.2.3.jar
 		final var jarPath = Paths.get(RomeJs.class.getProtectionDomain().getCodeSource().getLocation().getPath());
 		final var base = jarPath.getParent().getParent().getParent();
 		final var sub = base.resolve("spotless-data");
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java
index 180fb9274f..4a4a57c646 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java
@@ -5,9 +5,9 @@
 import org.apache.maven.plugins.annotations.Parameter;
 
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.javascript.RomeStep;
 import com.diffplug.spotless.maven.FormatterStepConfig;
 import com.diffplug.spotless.maven.FormatterStepFactory;
+import com.diffplug.spotless.rome.RomeStep;
 
 /**
  * Factory for creating the Rome formatter step that formats JavaScript and

From 2570e3321f9a18eac6bc2465d7009b9a27c2d3db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20Jourdan-Weil?= <gjourdanweil@gmail.com>
Date: Fri, 7 Apr 2023 09:45:52 +0200
Subject: [PATCH 1021/2068] docs: fix typo in scalafmt configuration

---
 plugin-maven/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index b4d7393e21..ba687a06c9 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -458,7 +458,7 @@ Additionally, `editorConfigOverride` options will override what's supplied in `.
 <scalafmt>
   <version>3.5.9</version>              <!-- optional -->
   <file>${project.basedir}/scalafmt.conf</file> <!-- optional -->
-  <majorScalaVersion>2.13</majorScalaVersion> <!-- optional -->
+  <scalaMajorVersion>2.13</scalaMajorVersion> <!-- optional -->
 </scalafmt>
 ```
 

From c562a976dfb1e1963fe7ad80613dd708867a09c9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 7 Apr 2023 16:22:34 +0000
Subject: [PATCH 1022/2068] chore(deps): update plugin
 com.gradle.plugin-publish to v1.2.0

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 7386b911eb..6d80b0b38a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -8,7 +8,7 @@ pluginManagement {
 plugins {
 	id 'com.diffplug.spotless' version '6.18.0' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
-	id 'com.gradle.plugin-publish' version '1.1.0' apply false
+	id 'com.gradle.plugin-publish' version '1.2.0' apply false
 	// https://github.com/gradle-nexus/publish-plugin/releases
 	id 'io.github.gradle-nexus.publish-plugin' version '1.3.0' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases

From cdb0ec62b99845b360281ae0d9284f1cbb072105 Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <sensenmann5@gmail.com>
Date: Sat, 8 Apr 2023 10:13:00 +0100
Subject: [PATCH 1023/2068] Fix changes.md + Architecture visibility

---
 CHANGES.md                                                    | 3 ++-
 .../main/java/com/diffplug/spotless/rome/Architecture.java    | 2 +-
 plugin-gradle/CHANGES.md                                      | 4 +++-
 plugin-maven/CHANGES.md                                       | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 57b831b8ad..a5d783b64b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,12 +11,13 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 
+* * Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. https://github.com/diffplug/spotless/pull/1663
+
 ## [2.38.0] - 2023-04-06
 ### Added
 * Support configuration of mirrors for P2 repositories in `EquoBasedStepBuilder` ([#1629](https://github.com/diffplug/spotless/issues/1629)).
 * The `style` option in Palantir Java Format ([#1654](https://github.com/diffplug/spotless/pull/1654)).
 * Added formatter for Gherkin feature files ([#1649](https://github.com/diffplug/spotless/issues/1649)).
-* Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. https://github.com/diffplug/spotless/pull/1663
 ### Changes
 * **POTENTIALLY BREAKING** Converted `googleJavaFormat` to a compile-only dependency and drop support for versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
 * Bump default `cleanthat` version to latest `2.6` -> `2.13`. ([#1589](https://github.com/diffplug/spotless/pull/1589) and [#1661](https://github.com/diffplug/spotless/pull/1661))
diff --git a/lib/src/main/java/com/diffplug/spotless/rome/Architecture.java b/lib/src/main/java/com/diffplug/spotless/rome/Architecture.java
index 064bd52b32..1207f2ddc7 100644
--- a/lib/src/main/java/com/diffplug/spotless/rome/Architecture.java
+++ b/lib/src/main/java/com/diffplug/spotless/rome/Architecture.java
@@ -3,7 +3,7 @@
 /**
  * Enumeration of possible computer architectures.
  */
-public enum Architecture {
+enum Architecture {
 	/** The arm64 architecture */
 	ARM64,
 	/** Either x64 or x64_32 architecture */
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 4fb0d57e14..9fa9415dd9 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -4,6 +4,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 
+* Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. https://github.com/diffplug/spotless/pull/1663
+
 ## [6.18.0] - 2023-04-06
 ### Added
 * `removeUnusedImport` can be configured to rely on `cleanthat-javaparser-unnecessaryimport`. Default remains `google-java-format`. ([#1589](https://github.com/diffplug/spotless/pull/1589))
@@ -19,7 +21,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
   Mirrors are selected by prefix match, for example `https://download.eclipse.org/eclipse/updates/4.26/` will be redirected to `https://some.internal.mirror/eclipse/eclipse/updates/4.26/`.
   The same configuration exists for `greclipse` and `eclipseCdt`.
 * The `style` option in Palantir Java Format ([#1654](https://github.com/diffplug/spotless/pull/1654)).
-* Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. https://github.com/diffplug/spotless/pull/1663
+
 ### Fixed
 * Stop using deprecated conventions when used in Gradle >= `7.1`. ([#1618](https://github.com/diffplug/spotless/pull/1618))
 ### Changes
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index f0134bc2f2..7d79f14784 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,13 +3,14 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+* Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. https://github.com/diffplug/spotless/pull/1663### Fixed
 
 ## [2.36.0] - 2023-04-06
 ### Added
 * `removeUnusedImport` can be configured to rely on `cleanthat-javaparser-unnecessaryimport`. Default remains `google-java-format`. ([#1589](https://github.com/diffplug/spotless/pull/1589))
 * The `style` option in Palantir Java Format ([#1654](https://github.com/diffplug/spotless/pull/1654)).
 * Added formatter for Gherkin feature files ([#1649](https://github.com/diffplug/spotless/issues/1649)).
-* Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. https://github.com/diffplug/spotless/pull/1663### Fixed
+
 * Fix non deterministic computation of cache fingerprint when using multiple formatters. ([#1643](https://github.com/diffplug/spotless/pull/1643) fixes [#1642](https://github.com/diffplug/spotless/pull/1642))
 ### Changes
 * **POTENTIALLY BREAKING** Drop support for `googleJavaFormat` versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))

From 404b80efde56dbd6f47ceb30c35e9fafe06b1f87 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Sat, 8 Apr 2023 13:38:33 +0400
Subject: [PATCH 1024/2068] Accept -SNAPSHOT versions

---
 CHANGES.md                                               | 1 +
 lib/src/main/java/com/diffplug/spotless/Jvm.java         | 6 +++++-
 testlib/src/test/java/com/diffplug/spotless/JvmTest.java | 8 ++++----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 8540a44851..ee53a0ac21 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changes
 * We are now opting in to Gradle's new stable configuration cache. ([#1591](https://github.com/diffplug/spotless/pull/1591))
+* `Jvm.Support` now accepts `-SNAPSHOT` versions, treated as the non`-SNAPSHOT`. ([#1583](https://github.com/diffplug/spotless/issues/1583))
 
 ## [2.36.0] - 2023-02-27
 ### Added
diff --git a/lib/src/main/java/com/diffplug/spotless/Jvm.java b/lib/src/main/java/com/diffplug/spotless/Jvm.java
index c9c71b72df..077dbb1366 100644
--- a/lib/src/main/java/com/diffplug/spotless/Jvm.java
+++ b/lib/src/main/java/com/diffplug/spotless/Jvm.java
@@ -243,7 +243,11 @@ public int compare(V version0, V version1) {
 
 			private static <V> int[] convert(V versionObject) {
 				try {
-					return Arrays.asList(versionObject.toString().split("\\.")).stream().mapToInt(Integer::parseInt).toArray();
+					String versionString = versionObject.toString();
+					if (versionString.endsWith("-SNAPSHOT")) {
+						versionString = versionString.substring(0, versionString.length() - "-SNAPSHOT".length());
+					}
+					return Arrays.asList(versionString.split("\\.")).stream().mapToInt(Integer::parseInt).toArray();
 				} catch (Exception e) {
 					throw new IllegalArgumentException(String.format("Not a semantic version: %s", versionObject), e);
 				}
diff --git a/testlib/src/test/java/com/diffplug/spotless/JvmTest.java b/testlib/src/test/java/com/diffplug/spotless/JvmTest.java
index ca7fb71305..1c966c51f4 100644
--- a/testlib/src/test/java/com/diffplug/spotless/JvmTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/JvmTest.java
@@ -93,7 +93,7 @@ void supportListsMinimumJvmIfOnlyHigherJvmSupported() {
 
 		assertNull(testSupport.getRecommendedFormatterVersion(), "No formatter version is supported");
 
-		for (String fmtVersion : Arrays.asList("1.2", "1.2.3")) {
+		for (String fmtVersion : Arrays.asList("1.2", "1.2.3", "1.2-SNAPSHOT", "1.2.3-SNAPSHOT")) {
 			String proposal = assertThrows(Exception.class, () -> {
 				testSupport.assertFormatterSupported(fmtVersion);
 			}).getMessage();
@@ -111,7 +111,7 @@ void supportListsMinimumJvmIfOnlyHigherJvmSupported() {
 			assertThat(proposal).contains(String.format("try %s alternatives", TEST_NAME));
 		}
 
-		for (String fmtVersion : Arrays.asList("1.2.4", "2")) {
+		for (String fmtVersion : Arrays.asList("1.2.4", "2", "1.2.5-SNAPSHOT")) {
 			String proposal = assertThrows(Exception.class, () -> {
 				testSupport.assertFormatterSupported(fmtVersion);
 			}).getMessage();
@@ -132,7 +132,7 @@ void supportProposesFormatterUpgrade() {
 		testSupport.add(Jvm.version() - 2, "1");
 		testSupport.add(requiredJvm, "2");
 		testSupport.add(Jvm.version() + 1, "3");
-		for (String fmtVersion : Arrays.asList("0", "1", "1.9")) {
+		for (String fmtVersion : Arrays.asList("0", "1", "1.9", "1.9-SNAPSHOT")) {
 			testSupport.assertFormatterSupported(fmtVersion);
 
 			String proposal = assertThrows(Exception.class, () -> {
@@ -168,7 +168,7 @@ void supportProposesJvmUpgrade() {
 	@Test
 	void supportAllowsExperimentalVersions() {
 		testSupport.add(Jvm.version(), "1.0");
-		for (String fmtVersion : Arrays.asList("1", "2.0")) {
+		for (String fmtVersion : Arrays.asList("1", "2.0", "1.1-SNAPSHOT", "2.0-SNAPSHOT")) {
 			testSupport.assertFormatterSupported(fmtVersion);
 
 			Exception testException = new Exception("Some test exception");

From a15849312327fdb7947be704b227628041f2eb15 Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <sensenmann5@gmail.com>
Date: Sat, 8 Apr 2023 13:54:12 +0100
Subject: [PATCH 1025/2068] Support formatting JSON files with Rome

---
 README.md                                     |   1 +
 .../com/diffplug/spotless/rome/RomeStep.java  | 207 +++++++++++++++---
 .../diffplug/spotless/maven/FileLocator.java  |   4 +-
 .../spotless/maven/generic/Format.java        |   4 +
 .../diffplug/spotless/maven/generic/Rome.java |  34 +++
 .../spotless/maven/javascript/RomeJs.java     | 132 +----------
 .../diffplug/spotless/maven/json/Json.java    |   3 +
 .../spotless/maven/json/RomeJson.java         |  13 ++
 .../spotless/maven/rome/AbstractRome.java     | 173 +++++++++++++++
 .../spotless/maven/typescript/RomeTs.java     |  13 ++
 .../spotless/maven/typescript/Typescript.java |   3 +-
 11 files changed, 422 insertions(+), 165 deletions(-)
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Rome.java
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/json/RomeJson.java
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/rome/AbstractRome.java
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/RomeTs.java

diff --git a/README.md b/README.md
index 52628574d9..001b00b5e2 100644
--- a/README.md
+++ b/README.md
@@ -99,6 +99,7 @@ lib('npm.PrettierFormatterStep')                 +'{{yes}}       | {{yes}}
 lib('npm.TsFmtFormatterStep')                    +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('pom.SortPomStep')                           +'{{no}}        | {{yes}}      | {{no}}       | {{no}}  |',
 lib('python.BlackStep')                          +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
+lib('rome.RomeStep')                             +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('scala.ScalaFmtStep')                        +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
 lib('sql.DBeaverSQLFormatterStep')               +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
 extra('wtp.EclipseWtpFormatterStep')             +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
diff --git a/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java b/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java
index 1d67743f41..820d1af66e 100644
--- a/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java
@@ -37,18 +37,38 @@ public class RomeStep {
 	 */
 	private final String configPath;
 
+	/**
+	 * The language (syntax) of the input files to format. When <code>null</code> or
+	 * the empty string, the language is detected automatically from the file name.
+	 * Currently the following languages are supported by Rome:
+	 * <ul>
+	 * <li>js (JavaScript)</li>
+	 * <li>jsx (JavaScript + JSX)</li>
+	 * <li>js? (JavaScript or JavaScript + JSX, depending on the file
+	 * extension)</li>
+	 * <li>ts (TypeScript)</li>
+	 * <li>tsx (TypeScript + JSX)</li>
+	 * <li>ts? (TypeScript or TypeScript + JSX, depending on the file
+	 * extension)</li>
+	 * <li>json (JSON)</li>
+	 * </ul>
+	 */
+	private final String language;
+
 	/**
 	 * Path to the Rome executable. Can be <code>null</code>, but either a path to
-	 * the executable of a download directory and version must be given.
+	 * the executable of a download directory and version must be given. The path
+	 * must be either an absolute path, or a file name without path separators. If
+	 * the latter, it is interpreted as a command in the user's path.
 	 */
 	private final String pathToExe;
 
 	/**
-	 * Path to the download directory for storing the download Rome executable. Can
-	 * be <code>null</code>, but either a path to the executable of a download
-	 * directory and version must be given.
+	 * Absolute path to the download directory for storing the download Rome
+	 * executable. Can be <code>null</code>, but either a path to the executable of
+	 * a download directory and version must be given.
 	 */
-	private final String pathToExeDownloadDir;
+	private final String downloadDir;
 
 	/**
 	 * Version of Rome to download. Can be <code>null</code>, but either a path to
@@ -71,9 +91,8 @@ public static String name() {
 	 * @param downloadDir Directory where to place the downloaded executable.
 	 * @return A new Rome step that download the executable from the network.
 	 */
-	public static RomeStep withExeDownload(String version, String downloadDir) {
-		version = version != null && !version.isBlank() ? version : defaultVersion();
-		return new RomeStep(version, null, downloadDir, null);
+	public static RomeStep.Builder withExeDownload(String version, String downloadDir) {
+		return new RomeStep.Builder(version, null, downloadDir);
 	}
 
 	/**
@@ -83,8 +102,8 @@ public static RomeStep withExeDownload(String version, String downloadDir) {
 	 * @param pathToExe Path to the Rome executable to use.
 	 * @return A new Rome step that format with the given executable.
 	 */
-	public static RomeStep withExePath(String pathToExe) {
-		return new RomeStep(null, pathToExe, null, null);
+	public static RomeStep.Builder withExePath(String pathToExe) {
+		return new RomeStep.Builder(null, pathToExe, null);
 	}
 
 	/**
@@ -180,14 +199,16 @@ private static void validateRomeExecutable(String resolvedPathToExe) {
 	}
 
 	/**
-	 * Checks the Rome executable. When the executable path does not exist, an error
-	 * is thrown.
+	 * Creates a new Rome step with the configuration from the given builder.
+	 * 
+	 * @param builder Builder with the configuration to use.
 	 */
-	private RomeStep(String version, String pathToExe, String pathToExeDownloadDir, String configPath) {
-		this.version = version;
-		this.pathToExe = pathToExe;
-		this.pathToExeDownloadDir = pathToExeDownloadDir;
-		this.configPath = configPath;
+	private RomeStep(RomeStep.Builder builder) {
+		this.version = builder.version != null && !builder.version.isBlank() ? builder.version : defaultVersion();
+		this.pathToExe = builder.pathToExe;
+		this.downloadDir = builder.downloadDir;
+		this.configPath = builder.configPath;
+		this.language = builder.language;
 	}
 
 	/**
@@ -200,19 +221,6 @@ public FormatterStep create() {
 		return FormatterStep.createLazy(name(), this::createState, State::toFunc);
 	}
 
-	/**
-	 * Derives a new Rome step from this step by replacing the config path with the
-	 * given value.
-	 * 
-	 * @param configPath Config path to use. Must point to a directory which contain
-	 *                   a file named {@code rome.json}.
-	 * @return A new Rome step with the same configuration as this step, but with
-	 *         the given config file instead.
-	 */
-	public RomeStep withConfigPath(String configPath) {
-		return new RomeStep(version, pathToExe, pathToExeDownloadDir, configPath);
-	}
-
 	/**
 	 * Resolves the Rome executable, possibly downloading it from the network, and
 	 * creates a new state instance with the resolved executable that can format
@@ -234,7 +242,7 @@ private State createState() throws IOException, InterruptedException {
 		logger.debug("Using Rome executable located at  '{}'", resolvedPathToExe);
 		var exeSignature = FileSignature.signAsList(Collections.singleton(new File(resolvedPathToExe)));
 		makeExecutable(resolvedPathToExe);
-		return new State(resolvedPathToExe, exeSignature, configPath);
+		return new State(resolvedPathToExe, exeSignature, configPath, language);
 	}
 
 	/**
@@ -261,13 +269,95 @@ private String resolveExe() throws IOException, InterruptedException {
 				return pathToExe;
 			}
 		} else {
-			var downloader = new RomeExecutableDownloader(Paths.get(pathToExeDownloadDir));
+			var downloader = new RomeExecutableDownloader(Paths.get(downloadDir));
 			var downloaded = downloader.ensureDownloaded(version).toString();
 			makeExecutable(downloaded);
 			return downloaded;
 		}
 	}
 
+	public final static class Builder {
+		/** See {@link RomeStep#configPath} */
+		private String configPath;
+
+		/** See {@link RomeStep#downloadDir} */
+		private final String downloadDir;
+
+		/** See {@link RomeStep#language} */
+		private String language;
+
+		/** See {@link RomeStep#pathToExe} */
+		private final String pathToExe;
+
+		/** See {@link RomeStep#version} */
+		private final String version;
+
+		/**
+		 * Creates a new builder for configuring a Rome step that can format code via
+		 * Rome. Either a version and and downloadDir, or a pathToExe must be given.
+		 * 
+		 * @param version     The version of Rome to download, see
+		 *                    {@link RomeStep#version}.
+		 * @param pathToExe   The path to the Rome executable to use, see
+		 *                    {@link RomeStep#pathToExe}.
+		 * @param downloadDir The path to the download directory when downloading Rome
+		 *                    from the network, {@link RomeStep#downloadDir}.
+		 */
+		private Builder(String version, String pathToExe, String downloadDir) {
+			this.version = version;
+			this.pathToExe = pathToExe;
+			this.downloadDir = downloadDir;
+		}
+
+		/**
+		 * Creates a new Rome step for formatting code with Rome from the current
+		 * configuration of this builder.
+		 * 
+		 * @return A new Rome step with the current configuration.
+		 */
+		public RomeStep build() {
+			return new RomeStep(this);
+		}
+
+		/**
+		 * Sets the path to the directory with the {@code rome.json} config file. When
+		 * no config path is set, the default configuration is used.
+		 * 
+		 * @param configPath Config path to use. Must point to a directory which contain
+		 *                   a file named {@code rome.json}.
+		 * @return This builder instance for chaining method calls.
+		 */
+		public Builder withConfigPath(String configPath) {
+			this.configPath = configPath;
+			return this;
+		}
+
+		/**
+		 * Sets the language of the files to format When no language is set, it is
+		 * determined automatically from the file name. The following languages are
+		 * currently supported by Rome.
+		 * 
+		 * <ul>
+		 * <li>js (JavaScript)</li>
+		 * <li>jsx (JavaScript + JSX)</li>
+		 * <li>js? (JavaScript or JavaScript + JSX, depending on the file
+		 * extension)</li>
+		 * <li>ts (TypeScript)</li>
+		 * <li>tsx (TypeScript + JSX)</li>
+		 * <li>ts? (TypeScript or TypeScript + JSX, depending on the file
+		 * extension)</li>
+		 * <li>json (JSON)</li>
+		 * </ul>
+		 * 
+		 * @param language The language of the files to format.
+		 * @return This builder instance for chaining method calls.
+		 */
+		public Builder withLanguage(String language) {
+			this.language = language;
+			return this;
+		}
+	}
+
 	/**
 	 * The internal state used by the Rome formatter. A state instance is created
 	 * when the spotless plugin for Maven or Gradle is executed, and reused for all
@@ -293,6 +383,12 @@ private static class State implements Serializable {
 		 */
 		private final String configPath;
 
+		/**
+		 * The language of the files to format. When <code>null</code> or the empty
+		 * string, the language is detected from the file name.
+		 */
+		private final String language;
+
 		/**
 		 * Creates a new state for instance which can format code with the given Rome
 		 * executable.
@@ -303,10 +399,11 @@ private static class State implements Serializable {
 		 *                     config file, can be <code>null</code>, in which case the
 		 *                     defaults are used.
 		 */
-		private State(String exe, FileSignature exeSignature, String configPath) {
+		private State(String exe, FileSignature exeSignature, String configPath, String language) {
 			this.pathToExe = exe;
 			this.exeSignature = exeSignature;
 			this.configPath = configPath;
+			this.language = language;
 		}
 
 		/**
@@ -317,11 +414,12 @@ private State(String exe, FileSignature exeSignature, String configPath) {
 		 * @return The Rome command to use for formatting code.
 		 */
 		private String[] buildRomeCommand(File file) {
+			var fileName = resolveFileName(file);
 			var argList = new ArrayList<String>();
 			argList.add(pathToExe);
 			argList.add("format");
 			argList.add("--stdin-file-path");
-			argList.add(file.getName());
+			argList.add(fileName);
 			if (configPath != null) {
 				argList.add("--config-path");
 				argList.add(configPath);
@@ -352,6 +450,47 @@ private String format(ProcessRunner runner, String input, File file) throws IOEx
 			return runner.exec(stdin, args).assertExitZero(StandardCharsets.UTF_8);
 		}
 
+		/**
+		 * The Rome executable currently does not have a parameter to specify the
+		 * expected language / syntax. Rome always determined the language from the file
+		 * extension. This method returns the file name for the desired language when a
+		 * language was requested explicitly, or the file name of the input file for
+		 * auto detection.
+		 * 
+		 * @param file File to be formatted.
+		 * @return The file name to pass to the Rome executable.
+		 */
+		private String resolveFileName(File file) {
+			var name = file.getName();
+			if (language == null || language.isBlank()) {
+				return name;
+			}
+			var dot = name.lastIndexOf(".");
+			var ext = dot >= 0 ? name.substring(dot + 1) : name;
+			switch (language) {
+			case "js?":
+				return "jsx".equals(ext) || "js".equals(ext) || "mjs".equals(ext) || "cjs".equals(ext) ? name
+						: "file.js";
+			case "ts?":
+				return "tsx".equals(ext) || "ts".equals(ext) || "tjs".equals(ext) || "tjs".equals(ext) ? name
+						: "file.js";
+			case "js":
+				return "js".equals(ext) || "mjs".equals(ext) || "cjs".equals(ext) ? name : "file.js";
+			case "jsx":
+				return "jsx".equals(ext) ? name : "file.jsx";
+			case "ts":
+				return "ts".equals(ext) || "mts".equals(ext) || "cts".equals(ext) ? name : "file.ts";
+			case "tsx":
+				return "tsx".equals(ext) ? name : "file.tsx";
+			case "json":
+				return "json".equals(ext) ? name : "file.json";
+			// so that we can support new languages such as css or yaml when Rome adds
+			// support for them without having to change the code
+			default:
+				return "file." + language;
+			}
+		}
+
 		/**
 		 * Creates a new formatter function for formatting a piece of code by delegating
 		 * to the Rome executable.
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FileLocator.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FileLocator.java
index 3e6d4cfeae..7def4423f8 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FileLocator.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FileLocator.java
@@ -30,7 +30,7 @@
 import org.codehaus.plexus.resource.loader.ResourceNotFoundException;
 import org.codehaus.plexus.util.FileUtils;
 
-import com.diffplug.spotless.maven.javascript.RomeJs;
+import com.diffplug.spotless.maven.rome.AbstractRome;
 
 public class FileLocator {
 
@@ -122,7 +122,7 @@ private static byte[] hash(String value) {
 
 	private static File findDataDir() {
 		// E.g. ~/.m2/repository/com/diffplug/spotless/spotless-plugin-maven/1.2.3/spotless-plugin-maven-1.2.3.jar
-		final var jarPath = Paths.get(RomeJs.class.getProtectionDomain().getCodeSource().getLocation().getPath());
+		final var jarPath = Paths.get(AbstractRome.class.getProtectionDomain().getCodeSource().getLocation().getPath());
 		final var base = jarPath.getParent().getParent().getParent();
 		final var sub = base.resolve("spotless-data");
 		return sub.toAbsolutePath().toFile();
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Format.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Format.java
index a696e13ffb..6cf843255a 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Format.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Format.java
@@ -40,4 +40,8 @@ public String licenseHeaderDelimiter() {
 		// do not specify a default delimiter
 		return null;
 	}
+	
+	public void addRome(Rome rome) {
+		addStepFactory(rome);
+	}
 }
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Rome.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Rome.java
new file mode 100644
index 0000000000..b3d645f9e6
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Rome.java
@@ -0,0 +1,34 @@
+package com.diffplug.spotless.maven.generic;
+
+import org.apache.maven.plugins.annotations.Parameter;
+
+import com.diffplug.spotless.maven.rome.AbstractRome;
+
+/**
+ * Generic Rome formatter step that detects the language of the input file from
+ * the file name. It should be specified as a formatter step for a generic
+ * {@code <format>}.
+ */
+public class Rome extends AbstractRome {
+	/**
+	 * Gets the language (syntax) of the input files to format. When
+	 * <code>null</code> or the empty string, the language is detected automatically
+	 * from the file name. Currently the following languages are supported by Rome:
+	 * <ul>
+	 * <li>js (JavaScript)</li>
+	 * <li>jsx (JavaScript + JSX)</li>
+	 * <li>ts (TypeScript)</li>
+	 * <li>tsx (TypeScript + JSX)</li>
+	 * <li>json (JSON)</li>
+	 * </ul>
+	 * 
+	 * @return The language of the input files.
+	 */
+	@Parameter
+	private String language;
+
+	@Override
+	protected String getLanguage() {
+		return language;
+	}
+}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java
index 4a4a57c646..11467a2820 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java
@@ -1,135 +1,13 @@
 package com.diffplug.spotless.maven.javascript;
 
-import java.nio.file.Paths;
-
-import org.apache.maven.plugins.annotations.Parameter;
-
-import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.maven.FormatterStepConfig;
-import com.diffplug.spotless.maven.FormatterStepFactory;
-import com.diffplug.spotless.rome.RomeStep;
+import com.diffplug.spotless.maven.rome.AbstractRome;
 
 /**
- * Factory for creating the Rome formatter step that formats JavaScript and
- * TypeScript code with Rome:
- * <a href= "https://github.com/rome/tools">https://github.com/rome/tools</a>.
- * It delegates to the Rome executable.
+ * Rome formatter step for JavaScript.
  */
-public class RomeJs implements FormatterStepFactory {
-	/**
-	 * Optional path to the directory with configuration file for Rome. The file
-	 * must be named {@code rome.json}. When none is given, the default
-	 * configuration is used. If this is a relative path, it is resolved against the
-	 * project's base directory.
-	 */
-	@Parameter
-	private String configPath;
-
-	/**
-	 * Optional directory where the downloaded Rome executable is placed. If this is
-	 * a relative path, it is resolved against the project's base directory.
-	 * Defaults to
-	 * <code>~/.m2/repository/com/diffplug/spotless/spotless-data/rome</code>.
-	 * <p>
-	 * You can use an expression like <code>${user.home}/rome</code> if you want to
-	 * use the home directory, or <code>${project.build.directory</code> if you want
-	 * to use the target directory of the current project.
-	 */
-	@Parameter
-	private String downloadDir;
-
-	/**
-	 * Optional path to the Rome executable. Either a <code>version</code> or a
-	 * <code>pathToExe</code> should be specified. When not given, an attempt is
-	 * made to download the executable for the given version from the network. When
-	 * given, the executable is used and the <code>version</code> parameter is
-	 * ignored.
-	 * <p>
-	 * When an absolute path is given, that path is used as-is. When a relative path
-	 * is given, it is resolved against the project's base directory. When only a
-	 * file name (i.e. without any slashes or back slash path separators such as
-	 * {@code rome}) is given, this is interpreted as the name of a command with
-	 * executable that is in your {@code path} environment variable. Use
-	 * {@code ./executable-name} if you want to use an executable in the project's
-	 * base directory.
-	 */
-	@Parameter
-	private String pathToExe;
-
-	/**
-	 * Rome version to download, applies only when no <code>pathToExe</code> is
-	 * specified explicitly. Either a <code>version</code> or a
-	 * <code>pathToExe</code> should be specified. When not given, a default known
-	 * version is used. For stable builds, it is recommended that you always set the
-	 * version explicitly. This parameter is ignored when you specify a
-	 * <code>pathToExe</code> explicitly.
-	 */
-	@Parameter
-	private String version;
-
+public class RomeJs extends AbstractRome {
 	@Override
-	public FormatterStep newFormatterStep(FormatterStepConfig config) {
-		RomeStep rome;
-		if (pathToExe != null) {
-			var resolvedExePath = resolveExePath(config);
-			rome = RomeStep.withExePath(resolvedExePath);
-		} else {
-			var downloadDir = resolveDownloadDir(config);
-			rome = RomeStep.withExeDownload(version, downloadDir);
-		}
-		if (configPath != null) {
-			var resolvedConfigFile = resolveConfigFile(config);
-			rome = rome.withConfigPath(resolvedConfigFile);
-		}
-		return rome.create();
-	}
-
-	/**
-	 * Resolves the path to the configuration file for Rome. Relative paths are
-	 * resolved against the project's base directory.
-	 * 
-	 * @param config Configuration from the Maven Mojo execution with details about
-	 *               the currently executed project.
-	 * @return The resolved path to the configuration file.
-	 */
-	private String resolveConfigFile(FormatterStepConfig config) {
-		return config.getFileLocator().getBaseDir().toPath().resolve(configPath).toAbsolutePath().toString();
-	}
-
-	/**
-	 * Resolves the path to the Rome executable. When the path is only a file name,
-	 * do not perform any resolution and interpret it as a command that must be on
-	 * the user's path. Otherwise resolve the executable path against the project's
-	 * base directory.
-	 * 
-	 * @param config Configuration from the Maven Mojo execution with details about
-	 *               the currently executed project.
-	 * @return The resolved path to the Rome executable.
-	 */
-	private String resolveExePath(FormatterStepConfig config) {
-		var path = Paths.get(pathToExe);
-		if (path.getNameCount() == 1) {
-			return path.toString();
-		} else {
-			return config.getFileLocator().getBaseDir().toPath().resolve(path).toAbsolutePath().toString();
-		}
-	}
-
-	/**
-	 * Resolves the directory to use for storing downloaded Rome executable. When a
-	 * {@link #downloadDir} is given, use that directory, resolved against the
-	 * current project's directory. Otherwise, use the {@code Rome} sub folder in
-	 * the shared data directory.
-	 * 
-	 * @param config Configuration for this step.
-	 * @return The download directory for the Rome executable.
-	 */
-	private String resolveDownloadDir(FormatterStepConfig config) {
-		final var fileLocator = config.getFileLocator();
-		if (downloadDir != null && !downloadDir.isBlank()) {
-			return fileLocator.getBaseDir().toPath().resolve(downloadDir).toAbsolutePath().toString();
-		} else {
-			return fileLocator.getDataDir().toPath().resolve("rome").toString();
-		}
+	protected String getLanguage() {
+		return "js?";
 	}
 }
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java
index 5bb7c17b3a..adbb2b7883 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java
@@ -50,4 +50,7 @@ public void addJackson(JacksonJson jackson) {
 		addStepFactory(jackson);
 	}
 
+	public void addRome(RomeJson rome) {
+		addStepFactory(rome);
+	}
 }
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/RomeJson.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/RomeJson.java
new file mode 100644
index 0000000000..df75b7ffbe
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/RomeJson.java
@@ -0,0 +1,13 @@
+package com.diffplug.spotless.maven.json;
+
+import com.diffplug.spotless.maven.rome.AbstractRome;
+
+/**
+ * Rome formatter step for JSON.
+ */
+public class RomeJson extends AbstractRome {
+	@Override
+	protected String getLanguage() {
+		return "json";
+	}
+}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/rome/AbstractRome.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/rome/AbstractRome.java
new file mode 100644
index 0000000000..c9e28ea9b3
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/rome/AbstractRome.java
@@ -0,0 +1,173 @@
+package com.diffplug.spotless.maven.rome;
+
+import java.nio.file.Paths;
+
+import org.apache.maven.plugins.annotations.Parameter;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.maven.FormatterStepConfig;
+import com.diffplug.spotless.maven.FormatterStepFactory;
+import com.diffplug.spotless.rome.RomeStep;
+import com.diffplug.spotless.rome.RomeStep.Builder;
+
+/**
+ * Factory for creating the Rome formatter step that can format format code in
+ * various types of language with Rome. Currently Rome support JavaScript,
+ * TypeScript, JSX, TSX, and JSON. See also
+ * <a href= "https://github.com/rome/tools">https://github.com/rome/tools</a>.
+ * It delegates to the Rome CLI executable.
+ */
+public abstract class AbstractRome implements FormatterStepFactory {
+	/**
+	 * Optional path to the directory with configuration file for Rome. The file
+	 * must be named {@code rome.json}. When none is given, the default
+	 * configuration is used. If this is a relative path, it is resolved against the
+	 * project's base directory.
+	 */
+	@Parameter
+	private String configPath;
+
+	/**
+	 * Optional directory where the downloaded Rome executable is placed. If this is
+	 * a relative path, it is resolved against the project's base directory.
+	 * Defaults to
+	 * <code>~/.m2/repository/com/diffplug/spotless/spotless-data/rome</code>.
+	 * <p>
+	 * You can use an expression like <code>${user.home}/rome</code> if you want to
+	 * use the home directory, or <code>${project.build.directory</code> if you want
+	 * to use the target directory of the current project.
+	 */
+	@Parameter
+	private String downloadDir;
+
+	/**
+	 * Optional path to the Rome executable. Either a <code>version</code> or a
+	 * <code>pathToExe</code> should be specified. When not given, an attempt is
+	 * made to download the executable for the given version from the network. When
+	 * given, the executable is used and the <code>version</code> parameter is
+	 * ignored.
+	 * <p>
+	 * When an absolute path is given, that path is used as-is. When a relative path
+	 * is given, it is resolved against the project's base directory. When only a
+	 * file name (i.e. without any slashes or back slash path separators such as
+	 * {@code rome}) is given, this is interpreted as the name of a command with
+	 * executable that is in your {@code path} environment variable. Use
+	 * {@code ./executable-name} if you want to use an executable in the project's
+	 * base directory.
+	 */
+	@Parameter
+	private String pathToExe;
+
+	/**
+	 * Rome version to download, applies only when no <code>pathToExe</code> is
+	 * specified explicitly. Either a <code>version</code> or a
+	 * <code>pathToExe</code> should be specified. When not given, a default known
+	 * version is used. For stable builds, it is recommended that you always set the
+	 * version explicitly. This parameter is ignored when you specify a
+	 * <code>pathToExe</code> explicitly.
+	 */
+	@Parameter
+	private String version;
+
+	@Override
+	public FormatterStep newFormatterStep(FormatterStepConfig config) {
+		var builder = newBuilder(config);
+		if (configPath != null) {
+			var resolvedConfigFile = resolveConfigFile(config);
+			builder.withConfigPath(resolvedConfigFile);
+		}
+		if (getLanguage() != null) {
+			builder.withLanguage(getLanguage());
+		}
+		var step = builder.build();
+		return step.create();
+	}
+
+	/**
+	 * Gets the language (syntax) of the input files to format. When
+	 * <code>null</code> or the empty string, the language is detected automatically
+	 * from the file name. Currently the following languages are supported by Rome:
+	 * <ul>
+	 * <li>js (JavaScript)</li>
+	 * <li>jsx (JavaScript + JSX)</li>
+	 * <li>js? (JavaScript or JavaScript + JSX, depending on the file
+	 * extension)</li>
+	 * <li>ts (TypeScript)</li>
+	 * <li>tsx (TypeScript + JSX)</li>
+	 * <li>ts? (TypeScript or TypeScript + JSX, depending on the file
+	 * extension)</li>
+	 * <li>json (JSON)</li>
+	 * </ul>
+	 * 
+	 * @return The language of the input files.
+	 */
+	protected abstract String getLanguage();
+
+	/**
+	 * A new builder for configuring a Rome step that either downloads the Rome
+	 * executable with the given version from the network, or uses the executable
+	 * from the given path.
+	 * 
+	 * @param config Configuration from the Maven Mojo execution with details about
+	 *               the currently executed project.
+	 * @return A builder for a Rome step.
+	 */
+	private Builder newBuilder(FormatterStepConfig config) {
+		if (pathToExe != null) {
+			var resolvedExePath = resolveExePath(config);
+			return RomeStep.withExePath(resolvedExePath);
+		} else {
+			var downloadDir = resolveDownloadDir(config);
+			return RomeStep.withExeDownload(version, downloadDir);
+		}
+	}
+
+	/**
+	 * Resolves the path to the configuration file for Rome. Relative paths are
+	 * resolved against the project's base directory.
+	 * 
+	 * @param config Configuration from the Maven Mojo execution with details about
+	 *               the currently executed project.
+	 * @return The resolved path to the configuration file.
+	 */
+	private String resolveConfigFile(FormatterStepConfig config) {
+		return config.getFileLocator().getBaseDir().toPath().resolve(configPath).toAbsolutePath().toString();
+	}
+
+	/**
+	 * Resolves the path to the Rome executable. When the path is only a file name,
+	 * do not perform any resolution and interpret it as a command that must be on
+	 * the user's path. Otherwise resolve the executable path against the project's
+	 * base directory.
+	 * 
+	 * @param config Configuration from the Maven Mojo execution with details about
+	 *               the currently executed project.
+	 * @return The resolved path to the Rome executable.
+	 */
+	private String resolveExePath(FormatterStepConfig config) {
+		var path = Paths.get(pathToExe);
+		if (path.getNameCount() == 1) {
+			return path.toString();
+		} else {
+			return config.getFileLocator().getBaseDir().toPath().resolve(path).toAbsolutePath().toString();
+		}
+	}
+
+	/**
+	 * Resolves the directory to use for storing downloaded Rome executable. When a
+	 * {@link #downloadDir} is given, use that directory, resolved against the
+	 * current project's directory. Otherwise, use the {@code Rome} sub folder in
+	 * the shared data directory.
+	 * 
+	 * @param config Configuration for this step.
+	 * @return The download directory for the Rome executable.
+	 */
+	private String resolveDownloadDir(FormatterStepConfig config) {
+		final var fileLocator = config.getFileLocator();
+		if (downloadDir != null && !downloadDir.isBlank()) {
+			return fileLocator.getBaseDir().toPath().resolve(downloadDir).toAbsolutePath().toString();
+		} else {
+			return fileLocator.getDataDir().toPath().resolve("rome").toString();
+		}
+	}
+}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/RomeTs.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/RomeTs.java
new file mode 100644
index 0000000000..dfc736dc2a
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/RomeTs.java
@@ -0,0 +1,13 @@
+package com.diffplug.spotless.maven.typescript;
+
+import com.diffplug.spotless.maven.rome.AbstractRome;
+
+/**
+ * Rome formatter step for TypeScript.
+ */
+public class RomeTs extends AbstractRome {
+	@Override
+	protected String getLanguage() {
+		return "ts?";
+	}
+}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Typescript.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Typescript.java
index 929ea334b1..ddae74db82 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Typescript.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Typescript.java
@@ -21,7 +21,6 @@
 import org.apache.maven.project.MavenProject;
 
 import com.diffplug.spotless.maven.FormatterFactory;
-import com.diffplug.spotless.maven.javascript.RomeJs;
 
 /**
  * A {@link FormatterFactory} implementation that corresponds to {@code <typescript>...</typescript>} configuration element.
@@ -47,7 +46,7 @@ public void addEslint(EslintTs eslint) {
 		addStepFactory(eslint);
 	}
 
-	public void addRome(RomeJs rome) {
+	public void addRome(RomeTs rome) {
 		addStepFactory(rome);
 	}
 }

From 7461c040fb7d15ecbfdcfc9f8992538b9f8a452b Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <sensenmann5@gmail.com>
Date: Sat, 8 Apr 2023 13:57:09 +0100
Subject: [PATCH 1026/2068] Add rome to feature matrix

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 001b00b5e2..1809fc5d5f 100644
--- a/README.md
+++ b/README.md
@@ -149,6 +149,7 @@ lib('yaml.JacksonYamlStep')                      +'{{yes}}       | {{yes}}
 | [`npm.TsFmtFormatterStep`](lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`pom.SortPomStep`](lib/src/main/java/com/diffplug/spotless/pom/SortPomStep.java) | :white_large_square:        | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`python.BlackStep`](lib/src/main/java/com/diffplug/spotless/python/BlackStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
+| [`rome.RomeStep`](lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java) | :+1:       | :+1:       | :white_large_square:       | :white_large_square:  |
 | [`scala.ScalaFmtStep`](lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`sql.DBeaverSQLFormatterStep`](lib/src/main/java/com/diffplug/spotless/sql/DBeaverSQLFormatterStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`wtp.EclipseWtpFormatterStep`](lib-extra/src/main/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |

From 17b05d70894adfb3953bad7e78f461deab7cb3ea Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <sensenmann5@gmail.com>
Date: Sat, 8 Apr 2023 17:19:57 +0100
Subject: [PATCH 1027/2068] Add rome() step to generic format for Gradle plugin

---
 .../gradle/spotless/FormatExtension.java      | 309 ++++++++++++++++++
 .../diffplug/spotless/maven/generic/Rome.java |   6 +
 2 files changed, 315 insertions(+)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index fd613e82e1..b7c8dc2d2b 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -22,6 +22,7 @@
 import java.io.Serializable;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -37,6 +38,7 @@
 import org.gradle.api.Action;
 import org.gradle.api.GradleException;
 import org.gradle.api.Project;
+import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
 import org.gradle.api.file.ConfigurableFileTree;
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.plugins.BasePlugin;
@@ -63,6 +65,7 @@
 import com.diffplug.spotless.generic.TrimTrailingWhitespaceStep;
 import com.diffplug.spotless.npm.NpmPathResolver;
 import com.diffplug.spotless.npm.PrettierFormatterStep;
+import com.diffplug.spotless.rome.RomeStep;
 
 import groovy.lang.Closure;
 
@@ -648,6 +651,296 @@ protected FormatterStep createStep() {
 							this.prettierConfig));
 		}
 	}
+	
+	public abstract static class RomeStepConfig<Self extends RomeStepConfig<Self>> {
+		/**
+		 * Optional path to the directory with configuration file for Rome. The file
+		 * must be named {@code rome.json}. When none is given, the default
+		 * configuration is used. If this is a relative path, it is resolved against the
+		 * project's base directory.
+		 */
+		@Nullable
+		private Object configPath;
+
+		/**
+		 * Optional directory where the downloaded Rome executable is placed. If this is
+		 * a relative path, it is resolved against the project's base directory.
+		 * Defaults to
+		 * <code>~/.m2/repository/com/diffplug/spotless/spotless-data/rome</code>.
+		 */
+		@Nullable
+		private Object downloadDir;
+
+		/**
+		 * Optional path to the Rome executable. Either a <code>version</code> or a
+		 * <code>pathToExe</code> should be specified. When not given, an attempt is
+		 * made to download the executable for the given version from the network. When
+		 * given, the executable is used and the <code>version</code> parameter is
+		 * ignored.
+		 * <p>
+		 * When an absolute path is given, that path is used as-is. When a relative path
+		 * is given, it is resolved against the project's base directory. When only a
+		 * file name (i.e. without any slashes or back slash path separators such as
+		 * {@code rome}) is given, this is interpreted as the name of a command with
+		 * executable that is in your {@code path} environment variable. Use
+		 * {@code ./executable-name} if you want to use an executable in the project's
+		 * base directory.
+		 */
+		@Nullable
+		private Object pathToExe;
+
+		/** A reference to the Gradle project for which spotless is executed. */
+		private final Project project;
+
+		/** Replaces the current Rome formatter step with the given step. */
+		private final Consumer<FormatterStep> replaceStep;
+
+		/**
+		 * Rome version to download, applies only when no <code>pathToExe</code> is
+		 * specified explicitly. Either a <code>version</code> or a
+		 * <code>pathToExe</code> should be specified. When not given, a default known
+		 * version is used. For stable builds, it is recommended that you always set the
+		 * version explicitly. This parameter is ignored when you specify a
+		 * <code>pathToExe</code> explicitly.
+		 */
+		@Nullable
+		private String version;
+
+		protected RomeStepConfig(Project project, Consumer<FormatterStep> replaceStep, String version) {
+			this.project = requireNonNull(project);
+			this.replaceStep = requireNonNull(replaceStep);
+			this.version = version;
+		}
+
+		/**
+		 * Optional path to the directory with configuration file for Rome. The file
+		 * must be named {@code rome.json}. When none is given, the default
+		 * configuration is used. If this is a relative path, it is resolved against the
+		 * project's base directory.
+		 * @return This step for further configuration.
+		 */
+		public Self configPath(Object configPath) {
+			this.configPath = configPath;
+			replaceStep();
+			return getThis();
+		}
+
+		/**
+		 * Optional directory where the downloaded Rome executable is placed. If this is
+		 * a relative path, it is resolved against the project's base directory.
+		 * Defaults to
+		 * <code>~/.m2/repository/com/diffplug/spotless/spotless-data/rome</code>.
+		 * @return This step for further configuration.
+		 */
+		public Self downloadDir(Object downloadDir) {
+			this.downloadDir = downloadDir;
+			replaceStep();
+			return getThis();
+		}
+
+		/**
+		 * Optional path to the Rome executable. Overwrites the configured version. No
+		 * attempt is made to download the Rome executable from the network.
+		 * <p>
+		 * When an absolute path is given, that path is used as-is. When a relative path
+		 * is given, it is resolved against the project's base directory. When only a
+		 * file name (i.e. without any slashes or back slash path separators such as
+		 * {@code rome}) is given, this is interpreted as the name of a command with
+		 * executable that is in your {@code path} environment variable. Use
+		 * {@code ./executable-name} if you want to use an executable in the project's
+		 * base directory.
+		 * @return This step for further configuration.
+		 */
+		public Self pathToExe(Object pathToExe) {
+			this.pathToExe = pathToExe;
+			replaceStep();
+			return getThis();
+		}
+
+		/**
+		 * Creates a new formatter step that formats code by calling the Rome
+		 * executable, using the current configuration.
+		 * 
+		 * @return A new formatter step for the Rome formatter.
+		 */
+		protected FormatterStep createStep() {
+			var builder = newBuilder();
+			if (configPath != null) {
+				var resolvedConfigPath = project.file(configPath);
+				builder.withConfigPath(resolvedConfigPath.toString());
+			}
+			builder.withLanguage(getLanguage());
+			var rome = builder.build();
+			return rome.create();
+		}
+
+		/**
+		 * Gets the language (syntax) of the input files to format. When
+		 * <code>null</code> or the empty string, the language is detected automatically
+		 * from the file name. Currently the following languages are supported by Rome:
+		 * <ul>
+		 * <li>js (JavaScript)</li>
+		 * <li>jsx (JavaScript + JSX)</li>
+		 * <li>js? (JavaScript or JavaScript + JSX, depending on the file
+		 * extension)</li>
+		 * <li>ts (TypeScript)</li>
+		 * <li>tsx (TypeScript + JSX)</li>
+		 * <li>ts? (TypeScript or TypeScript + JSX, depending on the file
+		 * extension)</li>
+		 * <li>json (JSON)</li>
+		 * </ul>
+		 * 
+		 * @return The language of the input files.
+		 */
+		protected abstract String getLanguage();
+
+		/**
+		 * @return This Rome config instance.
+		 */
+		protected abstract Self getThis();
+
+		/**
+		 * Creates a new Rome step and replaces the existing Rome step in the list of
+		 * format steps.
+		 */
+		protected void replaceStep() {
+			replaceStep.accept(createStep());
+		}
+		
+		/**
+		 * Finds the data directory that can be used for storing shared data such as
+		 * Rome executable globally. This is a directory in the local repository, e.g.
+		 * <code>~/.m2/repository/com/diffplus/spotless/spotless-data<code>.
+		 * 
+		 * @return The directory for storing shared data.
+		 */
+		private File findDataDir() {
+			var currentRepo = project.getRepositories().stream()
+					.filter(r -> r instanceof MavenArtifactRepository)
+					.map(r -> (MavenArtifactRepository) r)
+					.filter(r -> "file".equals(r.getUrl().getScheme()))
+					.findAny().orElse(null);
+			// Temporarily add mavenLocal() repository to get its file URL
+			var localRepo = currentRepo != null ? (MavenArtifactRepository)currentRepo : project.getRepositories().mavenLocal();
+			try {
+				// e.g. ~/.m2/repository/
+				var repoPath = Paths.get(localRepo.getUrl().getPath());
+				var dataPath = repoPath.resolve("com").resolve("diffplus").resolve("spotless").resolve("spotless-data");
+				return dataPath.toAbsolutePath().toFile();
+			}
+			finally {
+				// Remove mavenLocal() repository again if it was not part of the project
+				if (currentRepo == null) {
+					project.getRepositories().remove(localRepo);
+				}
+			}
+		}
+
+		/**
+		 * A new builder for configuring a Rome step that either downloads the Rome
+		 * executable with the given version from the network, or uses the executable
+		 * from the given path.
+		 * 
+		 * @return A builder for a Rome step.
+		 */
+		private RomeStep.Builder newBuilder() {
+			if (pathToExe != null) {
+				var resolvedPathToExe = resolvePathToExe();
+				return RomeStep.withExePath(resolvedPathToExe);
+			} else {
+				var downloadDir = resolveDownloadDir();
+				return RomeStep.withExeDownload(version, downloadDir);
+			}
+		}
+
+		/**
+		 * Resolves the path to the Rome executable. When the path is only a file name,
+		 * do not perform any resolution and interpret it as a command that must be on
+		 * the user's path. Otherwise resolve the executable path against the project's
+		 * base directory.
+		 * 
+		 * @param config Configuration from the Maven Mojo execution with details about
+		 *               the currently executed project.
+		 * @return The resolved path to the Rome executable.
+		 */
+		private String resolvePathToExe() {
+			var fileNameOnly = pathToExe instanceof String && Paths.get(pathToExe.toString()).getNameCount() == 1;
+			if (fileNameOnly) {
+				return pathToExe.toString();
+			} else {
+				return project.file(pathToExe).toString();
+			}
+		}
+
+		/**
+		 * Resolves the directory to use for storing downloaded Rome executable. When a
+		 * {@link #downloadDir} is given, use that directory, resolved against the
+		 * current project's directory. Otherwise, use the {@code Rome} sub folder in
+		 * the shared data directory.
+		 * 
+		 * @param config Configuration for this step.
+		 * @return The download directory for the Rome executable.
+		 */
+		private String resolveDownloadDir() {
+			if (downloadDir != null) {
+				return project.file(downloadDir).toString();
+			} else {
+				return findDataDir().toPath().resolve("rome").toString();
+			}
+		}
+	}
+
+	/**
+	 * Generic Rome formatter step that detects the language of the input file from
+	 * the file name. It should be specified as a formatter step for a generic
+	 * <code>format{ ... }</code>.
+	 */
+	public class RomeGeneric extends RomeStepConfig<RomeGeneric> {
+		@Nullable
+		String language;
+
+		/**
+		 * Creates a new Rome config that downloads the Rome executable for the given version from the network.
+		 * @param version Rome version to use. The default version is used when <code>null</code>.
+		 */
+		public RomeGeneric(String version) {
+			super(getProject(), FormatExtension.this::replaceStep, version);
+		}
+
+		/**
+		 * Sets the language (syntax) of the input files to format. When
+		 * <code>null</code> or the empty string, the language is detected automatically
+		 * from the file name. Currently the following languages are supported by Rome:
+		 * <ul>
+		 * <li>js (JavaScript)</li>
+		 * <li>jsx (JavaScript + JSX)</li>
+		 * <li>js? (JavaScript or JavaScript + JSX, depending on the file
+		 * extension)</li>
+		 * <li>ts (TypeScript)</li>
+		 * <li>tsx (TypeScript + JSX)</li>
+		 * <li>ts? (TypeScript or TypeScript + JSX, depending on the file
+		 * extension)</li>
+		 * <li>json (JSON)</li>
+		 * </ul>
+		 * @param language The language of the files to format.
+		 * @return This step for further configuration.
+		 */
+		public RomeGeneric language(String language) {
+			this.language = language;
+			replaceStep();
+			return this;
+		}
+
+		@Override
+		protected String getLanguage() {
+			return language;
+		}
+
+		@Override
+		protected RomeGeneric getThis() {
+			return this;
+		}
+	}
 
 	/** Uses the default version of prettier. */
 	public PrettierConfig prettier() {
@@ -665,6 +958,22 @@ public PrettierConfig prettier(Map<String, String> devDependencies) {
 		addStep(prettierConfig.createStep());
 		return prettierConfig;
 	}
+	
+	/**
+	 * Defaults to downloading the default Rome version from the network. To work
+	 * offline, you can specify the path to the Rome executable via
+	 * {@code rome().pathToExe(...)}.
+	 */
+	public RomeGeneric rome() {
+		return rome(null);
+	}
+
+	/** Downloads the given Rome version from the network. */
+	public RomeGeneric rome(String version) {
+		var romeConfig = new RomeGeneric(version);
+		addStep(romeConfig.createStep());
+		return romeConfig;
+	}
 
 	/** Uses the default version of clang-format. */
 	public ClangFormatConfig clangFormat() {
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Rome.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Rome.java
index b3d645f9e6..c39bb5df3b 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Rome.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Rome.java
@@ -15,12 +15,18 @@ public class Rome extends AbstractRome {
 	 * <code>null</code> or the empty string, the language is detected automatically
 	 * from the file name. Currently the following languages are supported by Rome:
 	 * <ul>
+	 * <ul>
 	 * <li>js (JavaScript)</li>
 	 * <li>jsx (JavaScript + JSX)</li>
+	 * <li>js? (JavaScript or JavaScript + JSX, depending on the file
+	 * extension)</li>
 	 * <li>ts (TypeScript)</li>
 	 * <li>tsx (TypeScript + JSX)</li>
+	 * <li>ts? (TypeScript or TypeScript + JSX, depending on the file
+	 * extension)</li>
 	 * <li>json (JSON)</li>
 	 * </ul>
+	 * </ul>
 	 * 
 	 * @return The language of the input files.
 	 */

From 7481a9bb86655be6b01f668bdecb524bd051073f Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <sensenmann5@gmail.com>
Date: Sat, 8 Apr 2023 17:27:20 +0100
Subject: [PATCH 1028/2068] Add license header

---
 .../com/diffplug/spotless/rome/Architecture.java  | 15 +++++++++++++++
 .../main/java/com/diffplug/spotless/rome/OS.java  | 15 +++++++++++++++
 .../java/com/diffplug/spotless/rome/Platform.java | 15 +++++++++++++++
 .../spotless/rome/RomeExecutableDownloader.java   | 15 +++++++++++++++
 .../java/com/diffplug/spotless/rome/RomeStep.java | 15 +++++++++++++++
 .../com/diffplug/spotless/maven/generic/Rome.java | 15 +++++++++++++++
 .../spotless/maven/javascript/RomeJs.java         | 15 +++++++++++++++
 .../diffplug/spotless/maven/json/RomeJson.java    | 15 +++++++++++++++
 .../spotless/maven/rome/AbstractRome.java         | 15 +++++++++++++++
 .../spotless/maven/typescript/RomeTs.java         | 15 +++++++++++++++
 10 files changed, 150 insertions(+)

diff --git a/lib/src/main/java/com/diffplug/spotless/rome/Architecture.java b/lib/src/main/java/com/diffplug/spotless/rome/Architecture.java
index 1207f2ddc7..835bf8367a 100644
--- a/lib/src/main/java/com/diffplug/spotless/rome/Architecture.java
+++ b/lib/src/main/java/com/diffplug/spotless/rome/Architecture.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2016-2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.rome;
 
 /**
diff --git a/lib/src/main/java/com/diffplug/spotless/rome/OS.java b/lib/src/main/java/com/diffplug/spotless/rome/OS.java
index c7b874bb24..cc5338ba0e 100644
--- a/lib/src/main/java/com/diffplug/spotless/rome/OS.java
+++ b/lib/src/main/java/com/diffplug/spotless/rome/OS.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2016-2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.rome;
 
 import java.util.Locale;
diff --git a/lib/src/main/java/com/diffplug/spotless/rome/Platform.java b/lib/src/main/java/com/diffplug/spotless/rome/Platform.java
index 2631cf3131..8a551d1810 100644
--- a/lib/src/main/java/com/diffplug/spotless/rome/Platform.java
+++ b/lib/src/main/java/com/diffplug/spotless/rome/Platform.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2016-2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.rome;
 
 /**
diff --git a/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java b/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java
index 72df92224f..35bb4966c3 100644
--- a/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java
+++ b/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2016-2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.rome;
 
 import java.io.IOException;
diff --git a/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java b/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java
index 820d1af66e..8ede197a36 100644
--- a/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2016-2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.rome;
 
 import java.io.File;
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Rome.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Rome.java
index c39bb5df3b..29b290a746 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Rome.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Rome.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2016-2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.maven.generic;
 
 import org.apache.maven.plugins.annotations.Parameter;
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java
index 11467a2820..cf40f53f47 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2016-2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.maven.javascript;
 
 import com.diffplug.spotless.maven.rome.AbstractRome;
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/RomeJson.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/RomeJson.java
index df75b7ffbe..5b2eec6abb 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/RomeJson.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/RomeJson.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2016-2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.maven.json;
 
 import com.diffplug.spotless.maven.rome.AbstractRome;
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/rome/AbstractRome.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/rome/AbstractRome.java
index c9e28ea9b3..ccf253d770 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/rome/AbstractRome.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/rome/AbstractRome.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2016-2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.maven.rome;
 
 import java.nio.file.Paths;
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/RomeTs.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/RomeTs.java
index dfc736dc2a..21f182079b 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/RomeTs.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/RomeTs.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2016-2022 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.maven.typescript;
 
 import com.diffplug.spotless.maven.rome.AbstractRome;

From afd0edb6df7a708c39d6b5baab8d895c662306de Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <sensenmann5@gmail.com>
Date: Sat, 8 Apr 2023 17:30:48 +0100
Subject: [PATCH 1029/2068] Run spotlessApply

---
 README.md                                     |  2 +-
 .../diffplug/spotless/rome/Architecture.java  |  4 +-
 .../java/com/diffplug/spotless/rome/OS.java   |  6 +--
 .../com/diffplug/spotless/rome/Platform.java  |  6 +--
 .../rome/RomeExecutableDownloader.java        | 36 +++++++--------
 .../com/diffplug/spotless/rome/RomeStep.java  | 45 +++++++++----------
 .../gradle/spotless/FormatExtension.java      | 23 +++++-----
 .../diffplug/spotless/maven/FileLocator.java  |  8 ++--
 .../spotless/maven/generic/Format.java        |  2 +-
 .../diffplug/spotless/maven/generic/Rome.java |  4 +-
 .../spotless/maven/javascript/RomeJs.java     |  2 +-
 .../spotless/maven/json/RomeJson.java         |  2 +-
 .../spotless/maven/rome/AbstractRome.java     | 12 ++---
 .../spotless/maven/typescript/RomeTs.java     |  2 +-
 14 files changed, 76 insertions(+), 78 deletions(-)

diff --git a/README.md b/README.md
index 1809fc5d5f..aceb9c22e9 100644
--- a/README.md
+++ b/README.md
@@ -149,7 +149,7 @@ lib('yaml.JacksonYamlStep')                      +'{{yes}}       | {{yes}}
 | [`npm.TsFmtFormatterStep`](lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`pom.SortPomStep`](lib/src/main/java/com/diffplug/spotless/pom/SortPomStep.java) | :white_large_square:        | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`python.BlackStep`](lib/src/main/java/com/diffplug/spotless/python/BlackStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
-| [`rome.RomeStep`](lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java) | :+1:       | :+1:       | :white_large_square:       | :white_large_square:  |
+| [`rome.RomeStep`](lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`scala.ScalaFmtStep`](lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`sql.DBeaverSQLFormatterStep`](lib/src/main/java/com/diffplug/spotless/sql/DBeaverSQLFormatterStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`wtp.EclipseWtpFormatterStep`](lib-extra/src/main/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
diff --git a/lib/src/main/java/com/diffplug/spotless/rome/Architecture.java b/lib/src/main/java/com/diffplug/spotless/rome/Architecture.java
index 835bf8367a..64e0a94640 100644
--- a/lib/src/main/java/com/diffplug/spotless/rome/Architecture.java
+++ b/lib/src/main/java/com/diffplug/spotless/rome/Architecture.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ enum Architecture {
 
 	/**
 	 * Attempts to guess the architecture of the environment running the JVM.
-	 * 
+	 *
 	 * @return The best guess for the architecture.
 	 */
 	public static Architecture guess() {
diff --git a/lib/src/main/java/com/diffplug/spotless/rome/OS.java b/lib/src/main/java/com/diffplug/spotless/rome/OS.java
index cc5338ba0e..44c87d9ece 100644
--- a/lib/src/main/java/com/diffplug/spotless/rome/OS.java
+++ b/lib/src/main/java/com/diffplug/spotless/rome/OS.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ enum OS {
 
 	/**
 	 * Attempts to guess the OS of the environment running the JVM.
-	 * 
+	 *
 	 * @return The best guess for the architecture.
 	 * @throws IllegalStateException When the OS is either unsupported or no
 	 *                               information about the OS could be retrieved.
@@ -53,4 +53,4 @@ public static OS guess() {
 			return OS.LINUX;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/rome/Platform.java b/lib/src/main/java/com/diffplug/spotless/rome/Platform.java
index 8a551d1810..c50608830a 100644
--- a/lib/src/main/java/com/diffplug/spotless/rome/Platform.java
+++ b/lib/src/main/java/com/diffplug/spotless/rome/Platform.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ class Platform {
 	/**
 	 * Attempts to guess the platform of the hosting environment running the JVM
 	 * machine.
-	 * 
+	 *
 	 * @return The best guess for the current OS and architecture.
 	 * @throws IllegalStateException When no OS information is available, or when
 	 *                               the OS or architecture is unsupported.
@@ -40,7 +40,7 @@ public static Platform guess() {
 
 	/**
 	 * Creates a new Platform descriptor for the given OS and architecture.
-	 * 
+	 *
 	 * @param os           Operating system of the platform.
 	 * @param architecture Architecture of the platform.
 	 */
diff --git a/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java b/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java
index 35bb4966c3..c55a18f754 100644
--- a/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java
+++ b/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -68,7 +68,7 @@ final class RomeExecutableDownloader {
 	 * {@link OpenOption Open options} for reading an existing file without write
 	 * access.
 	 */
-	private static final OpenOption[] READ_OPTIONS = { StandardOpenOption.READ };
+	private static final OpenOption[] READ_OPTIONS = {StandardOpenOption.READ};
 
 	/**
 	 * The pattern for {@link String#format(String, Object...) String.format()} for
@@ -81,15 +81,15 @@ final class RomeExecutableDownloader {
 	 * {@link OpenOption Open options} for creating a new file, overwriting the
 	 * existing file if present.
 	 */
-	private static final OpenOption[] WRITE_OPTIONS = { StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING,
-			StandardOpenOption.WRITE };
+	private static final OpenOption[] WRITE_OPTIONS = {StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING,
+			StandardOpenOption.WRITE};
 
 	private Path downloadDir;
 
 	/**
 	 * Creates a new downloader for the Rome executable. The executable files are
 	 * stored in the given download directory.
-	 * 
+	 *
 	 * @param downloadDir Directory where
 	 */
 	public RomeExecutableDownloader(Path downloadDir) {
@@ -100,7 +100,7 @@ public RomeExecutableDownloader(Path downloadDir) {
 	 * Downloads the Rome executable for the current platform from the network to
 	 * the download directory. When the executable exists already, it is
 	 * overwritten.
-	 * 
+	 *
 	 * @param version Desired Rome version.
 	 * @return The path to the Rome executable.
 	 * @throws IOException           When the executable cannot be downloaded from
@@ -140,7 +140,7 @@ public Path download(String version) throws IOException, InterruptedException {
 	 * directory, an attempt is made to download the Rome executable from the
 	 * network. When the executable exists already, no attempt to download it again
 	 * is made.
-	 * 
+	 *
 	 * @param version Desired Rome version.
 	 * @return The path to the Rome executable.
 	 * @throws IOException           When the executable cannot be downloaded from
@@ -168,7 +168,7 @@ public Path ensureDownloaded(String version) throws IOException, InterruptedExce
 	/**
 	 * Attempts to find the Rome executable for the current platform in the download
 	 * directory. No attempt is made to download the executable from the network.
-	 * 
+	 *
 	 * @param version Desired Rome version.
 	 * @return The path to the Rome executable.
 	 * @throws IOException           When the executable does not exists in the
@@ -188,7 +188,7 @@ public Optional<Path> findDownloaded(String version) throws IOException {
 	/**
 	 * Checks whether the given file exists and matches the checksum. The checksum
 	 * must be contained in a file next to the file to check.
-	 * 
+	 *
 	 * @param filePath File to check.
 	 * @return <code>true</code> if the file exists and matches the checksum,
 	 *         <code>false</code> otherwise.
@@ -223,7 +223,7 @@ private boolean checkFileWithChecksum(Path filePath) {
 
 	/**
 	 * Computes the checksum of the given file.
-	 * 
+	 *
 	 * @param file      File to process.
 	 * @param algorithm The checksum algorithm to use.
 	 * @return The MD5 checksum of the given file.
@@ -247,7 +247,7 @@ private String computeChecksum(Path file, String algorithm) throws IOException {
 	/**
 	 * Finds the code name for the given operating system used by the Rome
 	 * executable download URL.
-	 * 
+	 *
 	 * @param os Desired operating system.
 	 * @return Code name for the Rome download URL.
 	 * @throws IOException When the given OS is not supported by Rome.
@@ -265,7 +265,7 @@ private String getArchitectureCodeName(Architecture architecture) throws IOExcep
 
 	/**
 	 * Derives a path for the file which contains the checksum of the given file.
-	 * 
+	 *
 	 * @param file A file for which to derive the checksum file path.
 	 * @return The path with the checksum for the given file.
 	 */
@@ -275,7 +275,7 @@ private Path getChecksumPath(Path file) {
 
 	/**
 	 * Finds the URL from which the Rome executable can be downloaded.
-	 * 
+	 *
 	 * @param version  Desired Rome version.
 	 * @param platform Desired platform.
 	 * @return The URL for the Rome executable.
@@ -292,7 +292,7 @@ private String getDownloadUrl(String version, Platform platform) throws IOExcept
 	/**
 	 * Finds the file extension of the Rome download URL for the given operating
 	 * system.
-	 * 
+	 *
 	 * @param os Desired operating system.
 	 * @return Extension for the Rome download URL.
 	 * @throws IOException When the given OS is not supported by Rome.
@@ -313,7 +313,7 @@ private String getDownloadUrlExtension(OS os) throws IOException {
 	/**
 	 * Finds the path on the file system for the Rome executable with a given
 	 * version and platform.
-	 * 
+	 *
 	 * @param version  Desired Rome version.
 	 * @param platform Desired platform.
 	 * @return The path for the Rome executable.
@@ -328,7 +328,7 @@ private Path getExecutablePath(String version, Platform platform) {
 	/**
 	 * Finds the code name for the given operating system used by the Rome
 	 * executable download URL.
-	 * 
+	 *
 	 * @param os Desired operating system.
 	 * @return Code name for the Rome download URL.
 	 * @throws IOException When the given OS is not supported by Rome.
@@ -348,7 +348,7 @@ private String getOsCodeName(OS os) throws IOException {
 
 	/**
 	 * Reads a plain text file with the given encoding into a string.
-	 * 
+	 *
 	 * @param file    File to read.
 	 * @param charset Encoding to use.
 	 * @return The contents of the file as a string.
@@ -363,7 +363,7 @@ private String readTextFile(Path file, Charset charset) throws IOException {
 	/**
 	 * Computes the checksum of the given file and writes it to the target checksum
 	 * file, using the {@code ISO_8859_1} encoding.
-	 * 
+	 *
 	 * @param file
 	 * @param checksumPath
 	 * @throws IOException
diff --git a/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java b/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java
index 8ede197a36..e48a78c2ba 100644
--- a/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -101,7 +101,7 @@ public static String name() {
 	/**
 	 * Creates a Rome step that format code by downloading to the given Rome
 	 * version. The executable is downloaded from the network.
-	 * 
+	 *
 	 * @param version     Version of the Rome executable to download.
 	 * @param downloadDir Directory where to place the downloaded executable.
 	 * @return A new Rome step that download the executable from the network.
@@ -113,7 +113,7 @@ public static RomeStep.Builder withExeDownload(String version, String downloadDi
 	/**
 	 * Creates a Rome step that formats code by delegating to the Rome executable
 	 * located at the given path.
-	 * 
+	 *
 	 * @param pathToExe Path to the Rome executable to use.
 	 * @return A new Rome step that format with the given executable.
 	 */
@@ -125,7 +125,7 @@ public static RomeStep.Builder withExePath(String pathToExe) {
 	 * Attempts to add a POSIX permission to the given file, ignoring any errors.
 	 * All existing permissions on the file are preserved and the new permission is
 	 * added, if possible.
-	 * 
+	 *
 	 * @param file       File or directory to which to add a permission.
 	 * @param permission The POSIX permission to add.
 	 */
@@ -134,15 +134,14 @@ private static void attemptToAddPosixPermission(Path file, PosixFilePermission p
 			var newPermissions = new HashSet<>(Files.getPosixFilePermissions(file));
 			newPermissions.add(permission);
 			Files.setPosixFilePermissions(file, newPermissions);
-		} catch (final Exception ignore) {
-		}
+		} catch (final Exception ignore) {}
 	}
 
 	/**
 	 * Finds the default version for Rome when no version is specified explicitly.
 	 * Over time this will become outdated -- people should always specify the
 	 * version explicitly!
-	 * 
+	 *
 	 * @return The default version for Rome.
 	 */
 	private static String defaultVersion() {
@@ -154,7 +153,7 @@ private static String defaultVersion() {
 	 * any errors are swallowed. Depending on the OS, the file might still be
 	 * executable even if this method fails. The user will get a descriptive error
 	 * later when we attempt to execute the Rome executable.
-	 * 
+	 *
 	 * @param filePath Path to the file to make executable.
 	 */
 	private static void makeExecutable(String filePath) {
@@ -167,7 +166,7 @@ private static void makeExecutable(String filePath) {
 	/**
 	 * Finds the absolute path of a command on the user's path. Uses {@code which}
 	 * for Linux and {@code where} for Windows.
-	 * 
+	 *
 	 * @param name Name of the command to resolve.
 	 * @return The absolute path of the command's executable.
 	 * @throws IOException          When the command could not be resolved.
@@ -215,7 +214,7 @@ private static void validateRomeExecutable(String resolvedPathToExe) {
 
 	/**
 	 * Creates a new Rome step with the configuration from the given builder.
-	 * 
+	 *
 	 * @param builder Builder with the configuration to use.
 	 */
 	private RomeStep(RomeStep.Builder builder) {
@@ -229,7 +228,7 @@ private RomeStep(RomeStep.Builder builder) {
 	/**
 	 * Creates a formatter step with the current configuration, which formats code
 	 * by passing it to the Rome executable.
-	 * 
+	 *
 	 * @return A new formatter step for formatting with Rome.
 	 */
 	public FormatterStep create() {
@@ -240,7 +239,7 @@ public FormatterStep create() {
 	 * Resolves the Rome executable, possibly downloading it from the network, and
 	 * creates a new state instance with the resolved executable that can format
 	 * code via Rome.
-	 * 
+	 *
 	 * @return The state instance for formatting code via Rome.
 	 * @throws IOException          When any file system or network operations
 	 *                              failed, such as when the Rome executable could
@@ -266,7 +265,7 @@ private State createState() throws IOException, InterruptedException {
 	 * used as-is. Otherwise, at attempt is made to download the Rome executable for
 	 * the configured version from the network, unless it was already downloaded and
 	 * is available in the cache.
-	 * 
+	 *
 	 * @return The path to the resolved Rome executable.
 	 * @throws IOException          When any file system or network operations
 	 *                              failed, such as when the Rome executable could
@@ -310,7 +309,7 @@ public final static class Builder {
 		/**
 		 * Creates a new builder for configuring a Rome step that can format code via
 		 * Rome. Either a version and and downloadDir, or a pathToExe must be given.
-		 * 
+		 *
 		 * @param version     The version of Rome to download, see
 		 *                    {@link RomeStep#version}.
 		 * @param pathToExe   The path to the Rome executable to use, see
@@ -327,7 +326,7 @@ private Builder(String version, String pathToExe, String downloadDir) {
 		/**
 		 * Creates a new Rome step for formatting code with Rome from the current
 		 * configuration of this builder.
-		 * 
+		 *
 		 * @return A new Rome step with the current configuration.
 		 */
 		public RomeStep build() {
@@ -337,7 +336,7 @@ public RomeStep build() {
 		/**
 		 * Sets the path to the directory with the {@code rome.json} config file. When
 		 * no config path is set, the default configuration is used.
-		 * 
+		 *
 		 * @param configPath Config path to use. Must point to a directory which contain
 		 *                   a file named {@code rome.json}.
 		 * @return This builder instance for chaining method calls.
@@ -351,7 +350,7 @@ public Builder withConfigPath(String configPath) {
 		 * Sets the language of the files to format When no language is set, it is
 		 * determined automatically from the file name. The following languages are
 		 * currently supported by Rome.
-		 * 
+		 *
 		 * <ul>
 		 * <li>js (JavaScript)</li>
 		 * <li>jsx (JavaScript + JSX)</li>
@@ -363,7 +362,7 @@ public Builder withConfigPath(String configPath) {
 		 * extension)</li>
 		 * <li>json (JSON)</li>
 		 * </ul>
-		 * 
+		 *
 		 * @param language The language of the files to format.
 		 * @return This builder instance for chaining method calls.
 		 */
@@ -407,7 +406,7 @@ private static class State implements Serializable {
 		/**
 		 * Creates a new state for instance which can format code with the given Rome
 		 * executable.
-		 * 
+		 *
 		 * @param exe          Path to the Rome executable.
 		 * @param exeSignature Signature (e.g. SHA-256 checksum) of the Rome executable.
 		 * @param configPath   Path to the optional directory with the {@code rome.json}
@@ -424,7 +423,7 @@ private State(String exe, FileSignature exeSignature, String configPath, String
 		/**
 		 * Builds the list of arguments for the command that executes Rome to format a
 		 * piece of code passed via stdin.
-		 * 
+		 *
 		 * @param file File to format.
 		 * @return The Rome command to use for formatting code.
 		 */
@@ -446,7 +445,7 @@ private String[] buildRomeCommand(File file) {
 		 * Formats the given piece of code by delegating to the Rome executable. The
 		 * code is passed to Rome via stdin, the file name is used by Rome only to
 		 * determine the code syntax (e.g. JavaScript or TypeScript).
-		 * 
+		 *
 		 * @param runner Process runner for invoking the Rome executable.
 		 * @param input  Code to format.
 		 * @param file   File to format.
@@ -471,7 +470,7 @@ private String format(ProcessRunner runner, String input, File file) throws IOEx
 		 * extension. This method returns the file name for the desired language when a
 		 * language was requested explicitly, or the file name of the input file for
 		 * auto detection.
-		 * 
+		 *
 		 * @param file File to be formatted.
 		 * @return The file name to pass to the Rome executable.
 		 */
@@ -509,7 +508,7 @@ private String resolveFileName(File file) {
 		/**
 		 * Creates a new formatter function for formatting a piece of code by delegating
 		 * to the Rome executable.
-		 * 
+		 *
 		 * @return A formatter function for formatting code.
 		 */
 		private FormatterFunc.Closeable toFunc() {
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index b7c8dc2d2b..c3c366f3ea 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -651,7 +651,7 @@ protected FormatterStep createStep() {
 							this.prettierConfig));
 		}
 	}
-	
+
 	public abstract static class RomeStepConfig<Self extends RomeStepConfig<Self>> {
 		/**
 		 * Optional path to the directory with configuration file for Rome. The file
@@ -760,7 +760,7 @@ public Self pathToExe(Object pathToExe) {
 		/**
 		 * Creates a new formatter step that formats code by calling the Rome
 		 * executable, using the current configuration.
-		 * 
+		 *
 		 * @return A new formatter step for the Rome formatter.
 		 */
 		protected FormatterStep createStep() {
@@ -789,7 +789,7 @@ protected FormatterStep createStep() {
 		 * extension)</li>
 		 * <li>json (JSON)</li>
 		 * </ul>
-		 * 
+		 *
 		 * @return The language of the input files.
 		 */
 		protected abstract String getLanguage();
@@ -806,12 +806,12 @@ protected FormatterStep createStep() {
 		protected void replaceStep() {
 			replaceStep.accept(createStep());
 		}
-		
+
 		/**
 		 * Finds the data directory that can be used for storing shared data such as
 		 * Rome executable globally. This is a directory in the local repository, e.g.
 		 * <code>~/.m2/repository/com/diffplus/spotless/spotless-data<code>.
-		 * 
+		 *
 		 * @return The directory for storing shared data.
 		 */
 		private File findDataDir() {
@@ -821,14 +821,13 @@ private File findDataDir() {
 					.filter(r -> "file".equals(r.getUrl().getScheme()))
 					.findAny().orElse(null);
 			// Temporarily add mavenLocal() repository to get its file URL
-			var localRepo = currentRepo != null ? (MavenArtifactRepository)currentRepo : project.getRepositories().mavenLocal();
+			var localRepo = currentRepo != null ? (MavenArtifactRepository) currentRepo : project.getRepositories().mavenLocal();
 			try {
 				// e.g. ~/.m2/repository/
 				var repoPath = Paths.get(localRepo.getUrl().getPath());
 				var dataPath = repoPath.resolve("com").resolve("diffplus").resolve("spotless").resolve("spotless-data");
 				return dataPath.toAbsolutePath().toFile();
-			}
-			finally {
+			} finally {
 				// Remove mavenLocal() repository again if it was not part of the project
 				if (currentRepo == null) {
 					project.getRepositories().remove(localRepo);
@@ -840,7 +839,7 @@ private File findDataDir() {
 		 * A new builder for configuring a Rome step that either downloads the Rome
 		 * executable with the given version from the network, or uses the executable
 		 * from the given path.
-		 * 
+		 *
 		 * @return A builder for a Rome step.
 		 */
 		private RomeStep.Builder newBuilder() {
@@ -858,7 +857,7 @@ private RomeStep.Builder newBuilder() {
 		 * do not perform any resolution and interpret it as a command that must be on
 		 * the user's path. Otherwise resolve the executable path against the project's
 		 * base directory.
-		 * 
+		 *
 		 * @param config Configuration from the Maven Mojo execution with details about
 		 *               the currently executed project.
 		 * @return The resolved path to the Rome executable.
@@ -877,7 +876,7 @@ private String resolvePathToExe() {
 		 * {@link #downloadDir} is given, use that directory, resolved against the
 		 * current project's directory. Otherwise, use the {@code Rome} sub folder in
 		 * the shared data directory.
-		 * 
+		 *
 		 * @param config Configuration for this step.
 		 * @return The download directory for the Rome executable.
 		 */
@@ -958,7 +957,7 @@ public PrettierConfig prettier(Map<String, String> devDependencies) {
 		addStep(prettierConfig.createStep());
 		return prettierConfig;
 	}
-	
+
 	/**
 	 * Defaults to downloading the default Rome version from the network. To work
 	 * offline, you can specify the path to the Rome executable via
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FileLocator.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FileLocator.java
index 7def4423f8..a8c3973dd3 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FileLocator.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FileLocator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -74,7 +74,7 @@ public File locateFile(String path) {
 	/**
 	 * Finds the base directory of the Maven or Gradle project on which spotless is
 	 * currently being executed.
-	 * 
+	 *
 	 * @return The base directory of the current Maven or Gradel project.
 	 */
 	public File getBaseDir() {
@@ -84,7 +84,7 @@ public File getBaseDir() {
 	/**
 	 * Finds the build directory (e.g. <code>/target</code>) of the Maven or Gradle
 	 * project on which spotless is currently being executed.
-	 * 
+	 *
 	 * @return The project build directory of the current Maven or Gradle project.
 	 */
 	public File getBuildDir() {
@@ -95,7 +95,7 @@ public File getBuildDir() {
 	 * Finds the data directory that can be used for storing shared data such as
 	 * downloaded files globally. This is a directory in the local repository, e.g.
 	 * <code>~/.m2/repository/com/diffplus/spotless/spotless-data<code>.
-	 * 
+	 *
 	 * @return The directory for storing shared data.
 	 */
 	public File getDataDir() {
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Format.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Format.java
index 6cf843255a..ed08718c65 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Format.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Format.java
@@ -40,7 +40,7 @@ public String licenseHeaderDelimiter() {
 		// do not specify a default delimiter
 		return null;
 	}
-	
+
 	public void addRome(Rome rome) {
 		addStepFactory(rome);
 	}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Rome.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Rome.java
index 29b290a746..62d9d3fdec 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Rome.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Rome.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@ public class Rome extends AbstractRome {
 	 * <li>json (JSON)</li>
 	 * </ul>
 	 * </ul>
-	 * 
+	 *
 	 * @return The language of the input files.
 	 */
 	@Parameter
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java
index cf40f53f47..60fb7077df 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/RomeJson.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/RomeJson.java
index 5b2eec6abb..1cd044b759 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/RomeJson.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/RomeJson.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/rome/AbstractRome.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/rome/AbstractRome.java
index ccf253d770..8af56c5a00 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/rome/AbstractRome.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/rome/AbstractRome.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -113,7 +113,7 @@ public FormatterStep newFormatterStep(FormatterStepConfig config) {
 	 * extension)</li>
 	 * <li>json (JSON)</li>
 	 * </ul>
-	 * 
+	 *
 	 * @return The language of the input files.
 	 */
 	protected abstract String getLanguage();
@@ -122,7 +122,7 @@ public FormatterStep newFormatterStep(FormatterStepConfig config) {
 	 * A new builder for configuring a Rome step that either downloads the Rome
 	 * executable with the given version from the network, or uses the executable
 	 * from the given path.
-	 * 
+	 *
 	 * @param config Configuration from the Maven Mojo execution with details about
 	 *               the currently executed project.
 	 * @return A builder for a Rome step.
@@ -140,7 +140,7 @@ private Builder newBuilder(FormatterStepConfig config) {
 	/**
 	 * Resolves the path to the configuration file for Rome. Relative paths are
 	 * resolved against the project's base directory.
-	 * 
+	 *
 	 * @param config Configuration from the Maven Mojo execution with details about
 	 *               the currently executed project.
 	 * @return The resolved path to the configuration file.
@@ -154,7 +154,7 @@ private String resolveConfigFile(FormatterStepConfig config) {
 	 * do not perform any resolution and interpret it as a command that must be on
 	 * the user's path. Otherwise resolve the executable path against the project's
 	 * base directory.
-	 * 
+	 *
 	 * @param config Configuration from the Maven Mojo execution with details about
 	 *               the currently executed project.
 	 * @return The resolved path to the Rome executable.
@@ -173,7 +173,7 @@ private String resolveExePath(FormatterStepConfig config) {
 	 * {@link #downloadDir} is given, use that directory, resolved against the
 	 * current project's directory. Otherwise, use the {@code Rome} sub folder in
 	 * the shared data directory.
-	 * 
+	 *
 	 * @param config Configuration for this step.
 	 * @return The download directory for the Rome executable.
 	 */
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/RomeTs.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/RomeTs.java
index 21f182079b..ccee83744a 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/RomeTs.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/RomeTs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 0afd327dd543cc343d8228877cc738a7d854e26f Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <sensenmann5@gmail.com>
Date: Sat, 8 Apr 2023 17:51:11 +0100
Subject: [PATCH 1030/2068] Add rome format step to json/javascript/typescript
 languages

---
 .../gradle/spotless/FormatExtension.java      |  6 +--
 .../gradle/spotless/JavascriptExtension.java  | 42 +++++++++++++++++++
 .../gradle/spotless/JsonExtension.java        | 41 ++++++++++++++++++
 .../gradle/spotless/TypescriptExtension.java  | 41 ++++++++++++++++++
 4 files changed, 127 insertions(+), 3 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index c3c366f3ea..dbf45e87f1 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -232,7 +232,7 @@ protected final FileCollection parseTarget(Object target) {
 
 	private final FileCollection parseTargetIsExclude(Object target, boolean isExclude) {
 		if (target instanceof Collection) {
-			return parseTargetsIsExclude(((Collection) target).toArray(), isExclude);
+			return parseTargetsIsExclude(((Collection<?>) target).toArray(), isExclude);
 		} else if (target instanceof FileCollection) {
 			return (FileCollection) target;
 		} else if (target instanceof String) {
@@ -963,12 +963,12 @@ public PrettierConfig prettier(Map<String, String> devDependencies) {
 	 * offline, you can specify the path to the Rome executable via
 	 * {@code rome().pathToExe(...)}.
 	 */
-	public RomeGeneric rome() {
+	public RomeStepConfig<?> rome() {
 		return rome(null);
 	}
 
 	/** Downloads the given Rome version from the network. */
-	public RomeGeneric rome(String version) {
+	public RomeStepConfig<?> rome(String version) {
 		var romeConfig = new RomeGeneric(version);
 		addStep(romeConfig.createStep());
 		return romeConfig;
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
index e8a76166bc..76ad5650ca 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
@@ -138,9 +138,51 @@ public PrettierConfig prettier(Map<String, String> devDependencies) {
 		return prettierConfig;
 	}
 
+	/**
+	 * Defaults to downloading the default Rome version from the network. To work
+	 * offline, you can specify the path to the Rome executable via
+	 * {@code rome().pathToExe(...)}.
+	 */
+	public RomeJs rome() {
+		return rome(null);
+	}
+
+	/** Downloads the given Rome version from the network. */
+	public RomeJs rome(String version) {
+		var romeConfig = new RomeJs(version);
+		addStep(romeConfig.createStep());
+		return romeConfig;
+	}
+
 	private static final String DEFAULT_PRETTIER_JS_PARSER = "babel";
 	private static final ImmutableList<String> PRETTIER_JS_PARSERS = ImmutableList.of(DEFAULT_PRETTIER_JS_PARSER, "babel-flow", "flow");
 
+	/**
+	 * Rome formatter step for JavaScript.
+	 */
+	public class RomeJs extends RomeStepConfig<RomeJs> {
+
+		/**
+		 * Creates a new Rome formatter step config for formatting JavaScript files. Unless
+		 * overwritten, the given Rome version is downloaded from the network.
+		 *
+		 * @param version Rome version to use.
+		 */
+		public RomeJs(String version) {
+			super(getProject(), JavascriptExtension.this::replaceStep, version);
+		}
+
+		@Override
+		protected String getLanguage() {
+			return "js?";
+		}
+
+		@Override
+		protected RomeJs getThis() {
+			return this;
+		}
+	}
+
 	/**
 	 * Overrides the parser to be set to a js parser.
 	 */
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
index 39b158ce1e..510ac529e8 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
@@ -55,6 +55,22 @@ public JacksonJsonGradleConfig jackson() {
 		return new JacksonJsonGradleConfig(this);
 	}
 
+	/**
+	 * Defaults to downloading the default Rome version from the network. To work
+	 * offline, you can specify the path to the Rome executable via
+	 * {@code rome().pathToExe(...)}.
+	 */
+	public RomeJson rome() {
+		return rome(null);
+	}
+
+	/** Downloads the given Rome version from the network. */
+	public RomeJson rome(String version) {
+		var romeConfig = new RomeJson(version);
+		addStep(romeConfig.createStep());
+		return romeConfig;
+	}
+
 	public class SimpleConfig {
 		private int indent;
 
@@ -145,4 +161,29 @@ protected final FormatterStep createStep() {
 			return JacksonJsonStep.create(jacksonConfig, version, formatExtension.provisioner());
 		}
 	}
+
+	/**
+	 * Rome formatter step for JSON.
+	 */
+	public class RomeJson extends RomeStepConfig<RomeJson> {
+		/**
+		 * Creates a new Rome formatter step config for formatting JSON files. Unless
+		 * overwritten, the given Rome version is downloaded from the network.
+		 *
+		 * @param version Rome version to use.
+		 */
+		public RomeJson(String version) {
+			super(getProject(), JsonExtension.this::replaceStep, version);
+		}
+
+		@Override
+		protected String getLanguage() {
+			return "json";
+		}
+
+		@Override
+		protected RomeJson getThis() {
+			return this;
+		}
+	}
 }
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
index 9f1d04abfd..ddb7fbfc10 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
@@ -229,6 +229,47 @@ protected EslintConfig eslintConfig() {
 		}
 	}
 
+	/**
+	 * Defaults to downloading the default Rome version from the network. To work
+	 * offline, you can specify the path to the Rome executable via
+	 * {@code rome().pathToExe(...)}.
+	 */
+	public RomeTs rome() {
+		return rome(null);
+	}
+
+	/** Downloads the given Rome version from the network. */
+	public RomeTs rome(String version) {
+		var romeConfig = new RomeTs(version);
+		addStep(romeConfig.createStep());
+		return romeConfig;
+	}
+
+	/**
+	 * Rome formatter step for TypeScript.
+	 */
+	public class RomeTs extends RomeStepConfig<RomeTs> {
+		/**
+		 * Creates a new Rome formatter step config for formatting TypeScript files. Unless
+		 * overwritten, the given Rome version is downloaded from the network.
+		 *
+		 * @param version Rome version to use.
+		 */
+		public RomeTs(String version) {
+			super(getProject(), TypescriptExtension.this::replaceStep, version);
+		}
+
+		@Override
+		protected String getLanguage() {
+			return "ts?";
+		}
+
+		@Override
+		protected RomeTs getThis() {
+			return this;
+		}
+	}
+
 	@Override
 	protected void setupTask(SpotlessTask task) {
 		if (target == null) {

From 8c71500b00aa0658ff92ca8b66601ea64649d31d Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <sensenmann5@gmail.com>
Date: Sat, 8 Apr 2023 19:06:27 +0100
Subject: [PATCH 1031/2068] Add docs for Maven plugin

---
 plugin-maven/README.md | 151 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 151 insertions(+)

diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index b4d7393e21..b4c15f7fc2 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -57,6 +57,7 @@ user@machine repo % mvn spotless:check
   - Multiple languages
     - [Prettier](#prettier) ([plugins](#prettier-plugins), [npm detection](#npm-detection), [`.npmrc` detection](#npmrc-detection), [caching `npm install` results](#caching-results-of-npm-install))
     - [eclipse web tools platform](#eclipse-web-tools-platform)
+    - [Rome](#rome) ([binary detection](#rome-binary), [config file](#rome-configuration-file), [input language](#rome-input-language))
 - **Language independent**
   - [Generic steps](#generic-steps)
   - [License header](#license-header) ([slurp year from git](#retroactively-slurp-years-from-git-history))
@@ -704,6 +705,7 @@ Currently, none of the available options can be configured yet. It uses only the
     <tsfmt/>    <!-- has its own section below -->
     <prettier/> <!-- has its own section below -->
     <eslint/>   <!-- has its own section below -->
+    <rome/>     <!-- has its own section below -->
 
     <licenseHeader>
       <content>/* (C)$YEAR */</content>  <!-- or <file>${project.basedir}/license-header</file> -->
@@ -814,6 +816,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
     <prettier/> <!-- has its own section below -->
     <eslint/>   <!-- has its own section below -->
+    <rome/>     <!-- has its own section below -->
 
     <licenseHeader>
       <content>/* (C)$YEAR */</content>  <!-- or <file>${project.basedir}/license-header</file> -->
@@ -890,6 +893,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
     <simple />    <!-- has its own section below -->
     <gson />      <!-- has its own section below -->
     <jackson />   <!-- has its own section below -->
+    <rome />      <!-- has its own section below -->
   </json>
 </configuration>
 ```
@@ -1220,6 +1224,153 @@ to true.
 <a name="format"></a>
 <a name="custom rules"></a>
 
+## Rome
+
+[homepage](https://rome.tools/). [changelog](https://github.com/rome/tools/blob/main/CHANGELOG.md). Rome is a formatter that for the Frontend written in Rust, which has a native binary,
+does not require Node.js and as such, is pretty fast. It can currently format
+JavaScript, TypeScript, JSX, and JSON, and may support
+[more frontend languages](https://docs.rome.tools/internals/language_support/)
+such as CSS in the future.
+
+You can use rome in any language-specific format for supported languages, but
+usually you will be creating a generic format.
+
+```xml
+<configuration>
+  <formats>
+    <format>
+      <includes>
+        <include>src/**/typescript/**/*.ts</include>
+      </includes>
+
+      <rome>
+        <!-- Download Rome from the network if not already downloaded, see below for more info  -->
+        <version>12.0.0</version>
+
+        <!-- (optional) Path to the directory with the rome.json conig file -->
+        <configPath>${project.basedir}/path/to/config/dir</configPath>
+
+        <!-- Optional, Rome will auto detect the language based on the file extension. -->
+        <!-- See below for possible values. -->
+        <language>ts</language>
+      </prettier>
+    </rome>
+
+  </formats>
+</configuration>
+```
+
+**Limitations:**
+- The auto-discovery of config files (up the file tree) will not work when using
+  Rome within spotless.
+
+To apply Rome to more kinds of files, just add more formats
+
+```xml
+<configuration>
+  <formats>
+    <format><includes>src/**/*.ts</includes><rome/></format>
+    <format><includes>src/**/*.js</includes><rome/></format>
+```
+
+### Rome binary
+
+To format with Rome, spotless needs to find the Rome binary. By default,
+spotless downloads the binary for the given version from the network. This
+should be fine in most cases, but may not work e.g. when there is not connection
+to the internet.
+
+To download the Rome binary from the network, just specify a version:
+
+```xml
+<rome>
+  <version>12.0.0</version>
+</rome>
+```
+
+Spotless uses a default version when you do not specfiy a version, but this
+may change at any time, so we recommend that you always set the Rome version
+you want to use. Optionally, you can also specify a directory for the downloaded
+Rome binaries (defaults to `~/.m2/repository/com/diffplug/spotless/spotless-data/rome`):
+
+```xml
+<rome>
+  <version>12.0.0</version>
+  <!-- Relative paths are resolved against the project's base directory -->
+  <downloadDir>${user.home}/rome</downloadDir>
+</rome>
+```
+
+To use a fixed binary, omit the `version` and specify a `pathToExe`:
+
+```xml
+<rome>
+  <pathToExe>${project.basedir}/bin/rome</pathToExe>
+</rome>
+```
+
+Absolute paths are used as-is. Relative paths are resolved against the project's
+base directory. To use a pre-installed Rome binary on the user's path, specify
+just a name without any slashes / backslashes:
+
+
+```xml
+<rome>
+  <!-- Uses the "rome" command, which must be on the user's path. -->
+  <pathToExe>rome</pathToExe>
+</rome>
+```
+
+### Rome configuration file
+
+Rome is a biased formatter and linter without many options, but there are a few
+basic options. Rome uses a file named [rome.json](https://docs.rome.tools/configuration/)
+for its configuration. When none is specified, the default configuration from
+Rome is used. To use a custom configuration:
+
+```xml
+<rome>
+  <!-- Must point to the directory with the "rome.json" config file -->
+  <!-- Relative paths are resolved against the project's base directory -->
+  <configPath>${project.basedir}</configPath>
+</rome>
+```
+
+### Rome input Language
+
+By default, Rome detects the language / syntax of the files to format
+automatically from the file extension. This may fail if your source code files
+have unusual extensions for some reason. If you are using the generic format,
+you can force a certain language like this:
+
+```xml
+<configuration>
+  <formats>
+    <format>
+      <includes>
+        <include>src/**/typescript/**/*.mjson</include>
+      </includes>
+
+      <rome>
+        <version>12.0.0</version>
+        <language>json</language>
+      </prettier>
+    </rome>
+
+  </formats>
+</configuration>
+```
+
+The following languages are currently recognized:
+
+* `js` -- JavaScript
+* `jsx` -- JavaScript + JSX (React)
+* `js?` -- JavaScript, with or without JSX, depending on the file extension
+* `ts` -- TypeScript
+* `tsx` -- TypeScript + JSX (React)
+* `ts?` -- TypeScript, with or without JSX, depending on the file extension
+* `json` -- JSON
+
 ## Generic steps
 
 [Prettier](#prettier), [eclipse wtp](#eclipse-web-tools-platform), and [license header](#license-header) are available in every format, and they each have their own section. As mentioned in the [quickstart](#quickstart), there are a variety of simple generic steps which are also available in every format, here are examples of these:

From 8fa9cdadfaf487ebba83d88fc522b6822433c2f0 Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <sensenmann5@gmail.com>
Date: Sat, 8 Apr 2023 19:30:16 +0100
Subject: [PATCH 1032/2068] Add docs for Gradle plugin

---
 plugin-gradle/README.md | 173 +++++++++++++++++++++++++++++++++++++++-
 plugin-maven/README.md  |   8 +-
 2 files changed, 176 insertions(+), 5 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index cea45a049f..f47c7a543f 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -75,6 +75,7 @@ Spotless supports all of Gradle's built-in performance features (incremental bui
       - c, c++, c#, objective-c, protobuf, javascript, java
     - [eclipse web tools platform](#eclipse-web-tools-platform)
       - css, html, js, json, xml
+    - [Rome](#rome) ([binary detection](#rome-binary), [config file](#rome-configuration-file), [input language](#rome-input-language))
 - **Language independent**
   - [Generic steps](#generic-steps)
   - [License header](#license-header) ([slurp year from git](#retroactively-slurp-years-from-git-history))
@@ -613,7 +614,8 @@ spotless {
 
     tsfmt()    // has its own section below
     prettier() // has its own section below
-    eslint() // has its own section below
+    eslint()   // has its own section below
+    rome()     // has its own section below
 
     licenseHeader '/* (C) $YEAR */', '(import|const|declare|export|var) ' // or licenseHeaderFile
     // note the '(import|const|...' argument - this is a regex which identifies the top
@@ -705,7 +707,8 @@ spotless {
     target 'src/**/*.js' // you have to set the target manually
 
     prettier() // has its own section below
-    eslint() // has its own section below
+    eslint()   // has its own section below
+    rome()     // has its own section below
 
     licenseHeader '/* (C) $YEAR */', 'REGEX_TO_DEFINE_TOP_OF_FILE' // or licenseHeaderFile
   }
@@ -772,6 +775,7 @@ spotless {
     eclipseWtp('json')                    // see Eclipse web tools platform section
     gson()                                // has its own section below
     jackson()                             // has its own section below
+    rome()                                // has its own section below
   }
 }
 ```
@@ -1064,6 +1068,171 @@ Unlike Eclipse, Spotless WTP ignores per default external URIs in schema locatio
 external entities. To allow the access of external URIs, set the property `resolveExternalURI`
 to true.
 
+## Rome
+
+[homepage](https://rome.tools/). [changelog](https://github.com/rome/tools/blob/main/CHANGELOG.md). Rome is a formatter that for the Frontend written in Rust, which has a native binary,
+does not require Node.js and as such, is pretty fast. It can currently format
+JavaScript, TypeScript, JSX, and JSON, and may support
+[more frontend languages](https://docs.rome.tools/internals/language_support/)
+such as CSS in the future.
+
+You can use rome in any language-specific format for supported languages, but
+usually you will be creating a generic format.
+
+```gradle
+spotless {
+  format 'styling', {
+    // you have to set the target manually
+    target 'src/*/webapp/**/*.js'
+
+    // Download Rome from the network if not already downloaded, see below for more info
+    rome('12.0.0')
+
+    // (optional) Path to the directory with the rome.json conig file
+    rome('12.0.0').configPath("path/config/dir")
+
+    // (optional) Rome will auto detect the language based on the file extension.
+    // See below for possible values.
+    rome('12.0.0').language("js")
+  }
+}
+```
+
+**Limitations:**
+- The auto-discovery of config files (up the file tree) will not work when using
+  Rome within spotless.
+
+To apply Rome to more kinds of files with a different configuration, just add
+more formats:
+
+```gradle
+spotless {
+  format 'rome-js', {
+    target '**/*.js'
+    rome('12.0.0')
+  }
+  format 'rome-ts', {
+    target '**/*.ts'
+    rome('12.0.0')
+  }
+  format 'rome-json', {
+    target '**/*.json'
+    rome('12.0.0')
+  }
+}
+```
+
+### Rome binary
+
+To format with Rome, spotless needs to find the Rome binary. By default,
+spotless downloads the binary for the given version from the network. This
+should be fine in most cases, but may not work e.g. when there is not connection
+to the internet.
+
+To download the Rome binary from the network, just specify a version:
+
+```gradle
+spotless {
+  format 'rome', {
+    target '**/*.js','**/*.ts','**/*.json'
+    rome('12.0.0')
+  }
+}
+```
+
+Spotless uses a default version when you do not specfiy a version, but this
+may change at any time, so we recommend that you always set the Rome version
+you want to use. Optionally, you can also specify a directory for the downloaded
+Rome binaries (defaults to `~/.m2/repository/com/diffplug/spotless/spotless-data/rome`):
+
+```gradle
+spotless {
+  format 'rome', {
+    target '**/*.js','**/*.ts','**/*.json'
+     // Relative paths are resolved against the project's base directory
+    rome('12.0.0').downloadDir("${project.gradle.gradleUserHomeDir}/rome")
+  }
+}
+```
+
+To use a fixed binary, omit the `version` and specify a `pathToExe`:
+
+```gradle
+spotless {
+  format 'rome', {
+    target '**/*.js','**/*.ts','**/*.json'
+    rome('12.0.0').pathToExe("${project.buildDir.absolutePath}/bin/rome")
+  }
+}
+```
+
+Absolute paths are used as-is. Relative paths are resolved against the project's
+base directory. To use a pre-installed Rome binary on the user's path, specify
+just a name without any slashes / backslashes:
+
+```gradle
+spotless {
+  format 'rome', {
+    target '**/*.js','**/*.ts','**/*.json'
+    // Uses the "rome" command, which must be on the user's path. -->
+    rome('12.0.0').pathToExe('rome')
+  }
+}
+```
+
+### Rome configuration file
+
+Rome is a biased formatter and linter without many options, but there are a few
+basic options. Rome uses a file named [rome.json](https://docs.rome.tools/configuration/)
+for its configuration. When none is specified, the default configuration from
+Rome is used. To use a custom configuration:
+
+```gradle
+spotless {
+  format 'rome', {
+    target '**/*.js','**/*.ts','**/*.json'
+    // Must point to the directory with the "rome.json" config file -->
+    // Relative paths are resolved against the project's base directory -->
+    rome('12.0.0').configPath('./config')
+  }
+}
+```
+
+### Rome input language
+
+By default, Rome detects the language / syntax of the files to format
+automatically from the file extension. This may fail if your source code files
+have unusual extensions for some reason. If you are using the generic format,
+you can force a certain language like this:
+
+```xml
+<configuration>
+  <formats>
+    <format>
+      <includes>
+        <include>src/**/typescript/**/*.mjson</include>
+      </includes>
+
+      <rome>
+        <version>12.0.0</version>
+        <language>json</language>
+      </prettier>
+    </rome>
+
+  </formats>
+</configuration>
+```
+
+The following languages are currently recognized:
+
+* `js` -- JavaScript
+* `jsx` -- JavaScript + JSX (React)
+* `js?` -- JavaScript, with or without JSX, depending on the file extension
+* `ts` -- TypeScript
+* `tsx` -- TypeScript + JSX (React)
+* `ts?` -- TypeScript, with or without JSX, depending on the file extension
+* `json` -- JSON
+
 ## Generic steps
 
 [Prettier](#prettier), [eclipse wtp](#eclipse-web-tools-platform), and [license header](#license-header) are available in every format, and they each have their own section. As mentioned in the [quickstart](#quickstart), there are a variety of simple generic steps which are also available in every format, here are examples of these:
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index b4c15f7fc2..03638278f5 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -1250,7 +1250,7 @@ usually you will be creating a generic format.
         <!-- (optional) Path to the directory with the rome.json conig file -->
         <configPath>${project.basedir}/path/to/config/dir</configPath>
 
-        <!-- Optional, Rome will auto detect the language based on the file extension. -->
+        <!-- (optional) Rome will auto detect the language based on the file extension. -->
         <!-- See below for possible values. -->
         <language>ts</language>
       </prettier>
@@ -1264,13 +1264,15 @@ usually you will be creating a generic format.
 - The auto-discovery of config files (up the file tree) will not work when using
   Rome within spotless.
 
-To apply Rome to more kinds of files, just add more formats
+To apply Rome to more kinds of files with a different configuration, just add
+more formats
 
 ```xml
 <configuration>
   <formats>
     <format><includes>src/**/*.ts</includes><rome/></format>
     <format><includes>src/**/*.js</includes><rome/></format>
+</configuration>
 ```
 
 ### Rome binary
@@ -1336,7 +1338,7 @@ Rome is used. To use a custom configuration:
 </rome>
 ```
 
-### Rome input Language
+### Rome input language
 
 By default, Rome detects the language / syntax of the files to format
 automatically from the file extension. This may fail if your source code files

From 23308740d17e28c03fa1e5902ff25a3810e7831b Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <sensenmann5@gmail.com>
Date: Sat, 8 Apr 2023 19:32:51 +0100
Subject: [PATCH 1033/2068] Readme: Mention Rome in TOC for JS/TS

---
 plugin-gradle/README.md | 4 ++--
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index f47c7a543f..de0f9e5f31 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -63,8 +63,8 @@ Spotless supports all of Gradle's built-in performance features (incremental bui
   - [FreshMark](#freshmark) aka markdown
   - [Antlr4](#antlr4) ([antlr4formatter](#antlr4formatter))
   - [SQL](#sql) ([dbeaver](#dbeaver), [prettier](#prettier))
-  - [Typescript](#typescript) ([tsfmt](#tsfmt), [prettier](#prettier), [ESLint](#eslint-typescript))
-  - [Javascript](#javascript) ([prettier](#prettier), [ESLint](#eslint-javascript))
+  - [Typescript](#typescript) ([tsfmt](#tsfmt), [prettier](#prettier), [ESLint](#eslint-typescript), [Rome](#rome))
+  - [Javascript](#javascript) ([prettier](#prettier), [ESLint](#eslint-javascript), [Rome](#rome))
   - [JSON](#json)
   - [YAML](#yaml)
   - [Gherkin](#gherkin)
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 03638278f5..0d7ddeaf4f 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -49,8 +49,8 @@ user@machine repo % mvn spotless:check
   - [Sql](#sql) ([dbeaver](#dbeaver))
   - [Maven Pom](#maven-pom) ([sortPom](#sortpom))
   - [Markdown](#markdown) ([flexmark](#flexmark))
-  - [Typescript](#typescript) ([tsfmt](#tsfmt), [prettier](#prettier), [ESLint](#eslint-typescript))
-  - [Javascript](#javascript) ([prettier](#prettier), [ESLint](#eslint-javascript))
+  - [Typescript](#typescript) ([tsfmt](#tsfmt), [prettier](#prettier), [ESLint](#eslint-typescript), [Rome](#rome))
+  - [Javascript](#javascript) ([prettier](#prettier), [ESLint](#eslint-javascript), [Rome](#rome))
   - [JSON](#json)
   - [YAML](#yaml)
   - [Gherkin](#gherkin)

From 850b2877342930354035ce1f4cbb5d103ceb274d Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <sensenmann5@gmail.com>
Date: Sat, 8 Apr 2023 19:35:59 +0100
Subject: [PATCH 1034/2068] Fix readme for Gradle plugin with custom binary

---
 plugin-gradle/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index de0f9e5f31..3e409677a2 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -1161,7 +1161,7 @@ To use a fixed binary, omit the `version` and specify a `pathToExe`:
 spotless {
   format 'rome', {
     target '**/*.js','**/*.ts','**/*.json'
-    rome('12.0.0').pathToExe("${project.buildDir.absolutePath}/bin/rome")
+    rome().pathToExe("${project.buildDir.absolutePath}/bin/rome")
   }
 }
 ```
@@ -1175,7 +1175,7 @@ spotless {
   format 'rome', {
     target '**/*.js','**/*.ts','**/*.json'
     // Uses the "rome" command, which must be on the user's path. -->
-    rome('12.0.0').pathToExe('rome')
+    rome().pathToExe('rome')
   }
 }
 ```

From 7afe75b999002efed6e245ced92c02cc7326a130 Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <sensenmann5@gmail.com>
Date: Sat, 8 Apr 2023 19:58:17 +0100
Subject: [PATCH 1035/2068] Minor refactor, remove useless extra builder class

---
 .../com/diffplug/spotless/rome/RomeStep.java  | 142 ++++++------------
 .../gradle/spotless/FormatExtension.java      |   5 +-
 .../spotless/maven/rome/AbstractRome.java     |   6 +-
 3 files changed, 52 insertions(+), 101 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java b/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java
index e48a78c2ba..b0f17fafd6 100644
--- a/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java
@@ -50,7 +50,7 @@ public class RomeStep {
 	 * Path to the directory with the {@code rome.json} config file, can be
 	 * <code>null</code>, in which case the defaults are used.
 	 */
-	private final String configPath;
+	private String configPath;
 
 	/**
 	 * The language (syntax) of the input files to format. When <code>null</code> or
@@ -68,7 +68,7 @@ public class RomeStep {
 	 * <li>json (JSON)</li>
 	 * </ul>
 	 */
-	private final String language;
+	private String language;
 
 	/**
 	 * Path to the Rome executable. Can be <code>null</code>, but either a path to
@@ -106,8 +106,8 @@ public static String name() {
 	 * @param downloadDir Directory where to place the downloaded executable.
 	 * @return A new Rome step that download the executable from the network.
 	 */
-	public static RomeStep.Builder withExeDownload(String version, String downloadDir) {
-		return new RomeStep.Builder(version, null, downloadDir);
+	public static RomeStep withExeDownload(String version, String downloadDir) {
+		return new RomeStep(version, null, downloadDir);
 	}
 
 	/**
@@ -117,8 +117,8 @@ public static RomeStep.Builder withExeDownload(String version, String downloadDi
 	 * @param pathToExe Path to the Rome executable to use.
 	 * @return A new Rome step that format with the given executable.
 	 */
-	public static RomeStep.Builder withExePath(String pathToExe) {
-		return new RomeStep.Builder(null, pathToExe, null);
+	public static RomeStep withExePath(String pathToExe) {
+		return new RomeStep(null, pathToExe, null);
 	}
 
 	/**
@@ -217,12 +217,10 @@ private static void validateRomeExecutable(String resolvedPathToExe) {
 	 *
 	 * @param builder Builder with the configuration to use.
 	 */
-	private RomeStep(RomeStep.Builder builder) {
-		this.version = builder.version != null && !builder.version.isBlank() ? builder.version : defaultVersion();
-		this.pathToExe = builder.pathToExe;
-		this.downloadDir = builder.downloadDir;
-		this.configPath = builder.configPath;
-		this.language = builder.language;
+	private RomeStep(String version, String pathToExe, String downloadDir) {
+		this.version = version != null && !version.isBlank() ? version : defaultVersion();
+		this.pathToExe = pathToExe;
+		this.downloadDir = downloadDir;
 	}
 
 	/**
@@ -235,6 +233,44 @@ public FormatterStep create() {
 		return FormatterStep.createLazy(name(), this::createState, State::toFunc);
 	}
 
+	/**
+	 * Sets the path to the directory with the {@code rome.json} config file. When
+	 * no config path is set, the default configuration is used.
+	 *
+	 * @param configPath Config path to use. Must point to a directory which contain
+	 *                   a file named {@code rome.json}.
+	 * @return This builder instance for chaining method calls.
+	 */
+	public RomeStep withConfigPath(String configPath) {
+		this.configPath = configPath;
+		return this;
+	}
+
+	/**
+	 * Sets the language of the files to format When no language is set, it is
+	 * determined automatically from the file name. The following languages are
+	 * currently supported by Rome.
+	 *
+	 * <ul>
+	 * <li>js (JavaScript)</li>
+	 * <li>jsx (JavaScript + JSX)</li>
+	 * <li>js? (JavaScript or JavaScript + JSX, depending on the file
+	 * extension)</li>
+	 * <li>ts (TypeScript)</li>
+	 * <li>tsx (TypeScript + JSX)</li>
+	 * <li>ts? (TypeScript or TypeScript + JSX, depending on the file
+	 * extension)</li>
+	 * <li>json (JSON)</li>
+	 * </ul>
+	 *
+	 * @param language The language of the files to format.
+	 * @return This builder instance for chaining method calls.
+	 */
+	public RomeStep withLanguage(String language) {
+		this.language = language;
+		return this;
+	}
+
 	/**
 	 * Resolves the Rome executable, possibly downloading it from the network, and
 	 * creates a new state instance with the resolved executable that can format
@@ -290,88 +326,6 @@ private String resolveExe() throws IOException, InterruptedException {
 		}
 	}
 
-	public final static class Builder {
-		/** See {@link RomeStep#configPath} */
-		private String configPath;
-
-		/** See {@link RomeStep#downloadDir} */
-		private final String downloadDir;
-
-		/** See {@link RomeStep#language} */
-		private String language;
-
-		/** See {@link RomeStep#pathToExe} */
-		private final String pathToExe;
-
-		/** See {@link RomeStep#version} */
-		private final String version;
-
-		/**
-		 * Creates a new builder for configuring a Rome step that can format code via
-		 * Rome. Either a version and and downloadDir, or a pathToExe must be given.
-		 *
-		 * @param version     The version of Rome to download, see
-		 *                    {@link RomeStep#version}.
-		 * @param pathToExe   The path to the Rome executable to use, see
-		 *                    {@link RomeStep#pathToExe}.
-		 * @param downloadDir The path to the download directory when downloading Rome
-		 *                    from the network, {@link RomeStep#downloadDir}.
-		 */
-		private Builder(String version, String pathToExe, String downloadDir) {
-			this.version = version;
-			this.pathToExe = pathToExe;
-			this.downloadDir = downloadDir;
-		}
-
-		/**
-		 * Creates a new Rome step for formatting code with Rome from the current
-		 * configuration of this builder.
-		 *
-		 * @return A new Rome step with the current configuration.
-		 */
-		public RomeStep build() {
-			return new RomeStep(this);
-		}
-
-		/**
-		 * Sets the path to the directory with the {@code rome.json} config file. When
-		 * no config path is set, the default configuration is used.
-		 *
-		 * @param configPath Config path to use. Must point to a directory which contain
-		 *                   a file named {@code rome.json}.
-		 * @return This builder instance for chaining method calls.
-		 */
-		public Builder withConfigPath(String configPath) {
-			this.configPath = configPath;
-			return this;
-		}
-
-		/**
-		 * Sets the language of the files to format When no language is set, it is
-		 * determined automatically from the file name. The following languages are
-		 * currently supported by Rome.
-		 *
-		 * <ul>
-		 * <li>js (JavaScript)</li>
-		 * <li>jsx (JavaScript + JSX)</li>
-		 * <li>js? (JavaScript or JavaScript + JSX, depending on the file
-		 * extension)</li>
-		 * <li>ts (TypeScript)</li>
-		 * <li>tsx (TypeScript + JSX)</li>
-		 * <li>ts? (TypeScript or TypeScript + JSX, depending on the file
-		 * extension)</li>
-		 * <li>json (JSON)</li>
-		 * </ul>
-		 *
-		 * @param language The language of the files to format.
-		 * @return This builder instance for chaining method calls.
-		 */
-		public Builder withLanguage(String language) {
-			this.language = language;
-			return this;
-		}
-	}
-
 	/**
 	 * The internal state used by the Rome formatter. A state instance is created
 	 * when the spotless plugin for Maven or Gradle is executed, and reused for all
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index dbf45e87f1..ae7e792e9b 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -770,8 +770,7 @@ protected FormatterStep createStep() {
 				builder.withConfigPath(resolvedConfigPath.toString());
 			}
 			builder.withLanguage(getLanguage());
-			var rome = builder.build();
-			return rome.create();
+			return builder.create();
 		}
 
 		/**
@@ -842,7 +841,7 @@ private File findDataDir() {
 		 *
 		 * @return A builder for a Rome step.
 		 */
-		private RomeStep.Builder newBuilder() {
+		private RomeStep newBuilder() {
 			if (pathToExe != null) {
 				var resolvedPathToExe = resolvePathToExe();
 				return RomeStep.withExePath(resolvedPathToExe);
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/rome/AbstractRome.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/rome/AbstractRome.java
index 8af56c5a00..33567b0a20 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/rome/AbstractRome.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/rome/AbstractRome.java
@@ -23,7 +23,6 @@
 import com.diffplug.spotless.maven.FormatterStepConfig;
 import com.diffplug.spotless.maven.FormatterStepFactory;
 import com.diffplug.spotless.rome.RomeStep;
-import com.diffplug.spotless.rome.RomeStep.Builder;
 
 /**
  * Factory for creating the Rome formatter step that can format format code in
@@ -94,8 +93,7 @@ public FormatterStep newFormatterStep(FormatterStepConfig config) {
 		if (getLanguage() != null) {
 			builder.withLanguage(getLanguage());
 		}
-		var step = builder.build();
-		return step.create();
+		return builder.create();
 	}
 
 	/**
@@ -127,7 +125,7 @@ public FormatterStep newFormatterStep(FormatterStepConfig config) {
 	 *               the currently executed project.
 	 * @return A builder for a Rome step.
 	 */
-	private Builder newBuilder(FormatterStepConfig config) {
+	private RomeStep newBuilder(FormatterStepConfig config) {
 		if (pathToExe != null) {
 			var resolvedExePath = resolveExePath(config);
 			return RomeStep.withExePath(resolvedExePath);

From 57d36b4a4d7a2dce664b1f7c518c2d53d3e1697e Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <sensenmann5@gmail.com>
Date: Sat, 8 Apr 2023 19:58:39 +0100
Subject: [PATCH 1036/2068] Fix default download dir path for Gradle plugin

---
 .../main/java/com/diffplug/gradle/spotless/FormatExtension.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index ae7e792e9b..c429c469d2 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -824,7 +824,7 @@ private File findDataDir() {
 			try {
 				// e.g. ~/.m2/repository/
 				var repoPath = Paths.get(localRepo.getUrl().getPath());
-				var dataPath = repoPath.resolve("com").resolve("diffplus").resolve("spotless").resolve("spotless-data");
+				var dataPath = repoPath.resolve("com").resolve("diffplug").resolve("spotless").resolve("spotless-data");
 				return dataPath.toAbsolutePath().toFile();
 			} finally {
 				// Remove mavenLocal() repository again if it was not part of the project

From c483ed37e2e8bfdfe26c084a79801570600595cd Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <sensenmann5@gmail.com>
Date: Sat, 8 Apr 2023 21:24:29 +0100
Subject: [PATCH 1037/2068] Add tests for RomeStep

---
 .../resources/rome/config/line-width-120.json |  11 +
 .../resources/rome/config/line-width-80.json  |  11 +
 .../src/main/resources/rome/js/fileAfter.cjs  |   3 +
 .../src/main/resources/rome/js/fileAfter.js   |   3 +
 .../src/main/resources/rome/js/fileAfter.jsx  |   3 +
 .../src/main/resources/rome/js/fileAfter.mjs  |   3 +
 .../src/main/resources/rome/js/fileBefore.cjs |   3 +
 .../src/main/resources/rome/js/fileBefore.js  |   3 +
 .../src/main/resources/rome/js/fileBefore.jsx |   4 +
 .../src/main/resources/rome/js/fileBefore.mjs |   3 +
 .../resources/rome/js/longLineAfter120.js     |   1 +
 .../main/resources/rome/js/longLineAfter80.js |  13 +
 .../main/resources/rome/js/longLineBefore.js  |   1 +
 .../main/resources/rome/json/fileAfter.json   |   5 +
 .../main/resources/rome/json/fileBefore.json  |   7 +
 .../src/main/resources/rome/ts/fileAfter.cts  |   4 +
 .../src/main/resources/rome/ts/fileAfter.mts  |   4 +
 .../src/main/resources/rome/ts/fileAfter.ts   |   4 +
 .../src/main/resources/rome/ts/fileAfter.tsx  |   7 +
 .../src/main/resources/rome/ts/fileBefore.cts |   4 +
 .../src/main/resources/rome/ts/fileBefore.mts |   5 +
 .../src/main/resources/rome/ts/fileBefore.ts  |   5 +
 .../src/main/resources/rome/ts/fileBefore.tsx |   8 +
 .../diffplug/spotless/rome/RomeStepTest.java  | 284 ++++++++++++++++++
 24 files changed, 399 insertions(+)
 create mode 100644 testlib/src/main/resources/rome/config/line-width-120.json
 create mode 100644 testlib/src/main/resources/rome/config/line-width-80.json
 create mode 100644 testlib/src/main/resources/rome/js/fileAfter.cjs
 create mode 100644 testlib/src/main/resources/rome/js/fileAfter.js
 create mode 100644 testlib/src/main/resources/rome/js/fileAfter.jsx
 create mode 100644 testlib/src/main/resources/rome/js/fileAfter.mjs
 create mode 100644 testlib/src/main/resources/rome/js/fileBefore.cjs
 create mode 100644 testlib/src/main/resources/rome/js/fileBefore.js
 create mode 100644 testlib/src/main/resources/rome/js/fileBefore.jsx
 create mode 100644 testlib/src/main/resources/rome/js/fileBefore.mjs
 create mode 100644 testlib/src/main/resources/rome/js/longLineAfter120.js
 create mode 100644 testlib/src/main/resources/rome/js/longLineAfter80.js
 create mode 100644 testlib/src/main/resources/rome/js/longLineBefore.js
 create mode 100644 testlib/src/main/resources/rome/json/fileAfter.json
 create mode 100644 testlib/src/main/resources/rome/json/fileBefore.json
 create mode 100644 testlib/src/main/resources/rome/ts/fileAfter.cts
 create mode 100644 testlib/src/main/resources/rome/ts/fileAfter.mts
 create mode 100644 testlib/src/main/resources/rome/ts/fileAfter.ts
 create mode 100644 testlib/src/main/resources/rome/ts/fileAfter.tsx
 create mode 100644 testlib/src/main/resources/rome/ts/fileBefore.cts
 create mode 100644 testlib/src/main/resources/rome/ts/fileBefore.mts
 create mode 100644 testlib/src/main/resources/rome/ts/fileBefore.ts
 create mode 100644 testlib/src/main/resources/rome/ts/fileBefore.tsx
 create mode 100644 testlib/src/test/java/com/diffplug/spotless/rome/RomeStepTest.java

diff --git a/testlib/src/main/resources/rome/config/line-width-120.json b/testlib/src/main/resources/rome/config/line-width-120.json
new file mode 100644
index 0000000000..8f14afa3f8
--- /dev/null
+++ b/testlib/src/main/resources/rome/config/line-width-120.json
@@ -0,0 +1,11 @@
+{
+    "formatter": {
+      "enabled": true,
+      "indentStyle": "tab",
+      "lineWidth": 120,
+      "formatWithErrors": false
+    },
+    "linter": {
+      "enabled": false
+    }
+  }
\ No newline at end of file
diff --git a/testlib/src/main/resources/rome/config/line-width-80.json b/testlib/src/main/resources/rome/config/line-width-80.json
new file mode 100644
index 0000000000..5ec998bd97
--- /dev/null
+++ b/testlib/src/main/resources/rome/config/line-width-80.json
@@ -0,0 +1,11 @@
+{
+    "formatter": {
+      "enabled": true,
+      "indentStyle": "tab",
+      "lineWidth": 80,
+      "formatWithErrors": false
+    },
+    "linter": {
+      "enabled": false
+    }
+  }
\ No newline at end of file
diff --git a/testlib/src/main/resources/rome/js/fileAfter.cjs b/testlib/src/main/resources/rome/js/fileAfter.cjs
new file mode 100644
index 0000000000..defc9c85eb
--- /dev/null
+++ b/testlib/src/main/resources/rome/js/fileAfter.cjs
@@ -0,0 +1,3 @@
+function foo(name = "World") {
+	return "Hello " + name;
+}
diff --git a/testlib/src/main/resources/rome/js/fileAfter.js b/testlib/src/main/resources/rome/js/fileAfter.js
new file mode 100644
index 0000000000..defc9c85eb
--- /dev/null
+++ b/testlib/src/main/resources/rome/js/fileAfter.js
@@ -0,0 +1,3 @@
+function foo(name = "World") {
+	return "Hello " + name;
+}
diff --git a/testlib/src/main/resources/rome/js/fileAfter.jsx b/testlib/src/main/resources/rome/js/fileAfter.jsx
new file mode 100644
index 0000000000..313aceb6ed
--- /dev/null
+++ b/testlib/src/main/resources/rome/js/fileAfter.jsx
@@ -0,0 +1,3 @@
+export function Panel(cfg = {}) {
+	return <div className={cfg.classname}>{1 + 2}</div>;
+}
diff --git a/testlib/src/main/resources/rome/js/fileAfter.mjs b/testlib/src/main/resources/rome/js/fileAfter.mjs
new file mode 100644
index 0000000000..defc9c85eb
--- /dev/null
+++ b/testlib/src/main/resources/rome/js/fileAfter.mjs
@@ -0,0 +1,3 @@
+function foo(name = "World") {
+	return "Hello " + name;
+}
diff --git a/testlib/src/main/resources/rome/js/fileBefore.cjs b/testlib/src/main/resources/rome/js/fileBefore.cjs
new file mode 100644
index 0000000000..92539ba751
--- /dev/null
+++ b/testlib/src/main/resources/rome/js/fileBefore.cjs
@@ -0,0 +1,3 @@
+function foo ( name="World"){
+                  return "Hello "+name  ;
+    }
\ No newline at end of file
diff --git a/testlib/src/main/resources/rome/js/fileBefore.js b/testlib/src/main/resources/rome/js/fileBefore.js
new file mode 100644
index 0000000000..92539ba751
--- /dev/null
+++ b/testlib/src/main/resources/rome/js/fileBefore.js
@@ -0,0 +1,3 @@
+function foo ( name="World"){
+                  return "Hello "+name  ;
+    }
\ No newline at end of file
diff --git a/testlib/src/main/resources/rome/js/fileBefore.jsx b/testlib/src/main/resources/rome/js/fileBefore.jsx
new file mode 100644
index 0000000000..8e5d9834bc
--- /dev/null
+++ b/testlib/src/main/resources/rome/js/fileBefore.jsx
@@ -0,0 +1,4 @@
+export function Panel ( cfg={}){
+                  return (<div className={cfg.classname}>{1+2}</div>
+                  )  ;
+    }
\ No newline at end of file
diff --git a/testlib/src/main/resources/rome/js/fileBefore.mjs b/testlib/src/main/resources/rome/js/fileBefore.mjs
new file mode 100644
index 0000000000..92539ba751
--- /dev/null
+++ b/testlib/src/main/resources/rome/js/fileBefore.mjs
@@ -0,0 +1,3 @@
+function foo ( name="World"){
+                  return "Hello "+name  ;
+    }
\ No newline at end of file
diff --git a/testlib/src/main/resources/rome/js/longLineAfter120.js b/testlib/src/main/resources/rome/js/longLineAfter120.js
new file mode 100644
index 0000000000..68addc4b65
--- /dev/null
+++ b/testlib/src/main/resources/rome/js/longLineAfter120.js
@@ -0,0 +1 @@
+const x = ["Hello", "World", "How", "Are", "You", "Doing", "Today", "Such", "A", "Wondrous", "Sunshine"];
diff --git a/testlib/src/main/resources/rome/js/longLineAfter80.js b/testlib/src/main/resources/rome/js/longLineAfter80.js
new file mode 100644
index 0000000000..dbdbd157e9
--- /dev/null
+++ b/testlib/src/main/resources/rome/js/longLineAfter80.js
@@ -0,0 +1,13 @@
+const x = [
+	"Hello",
+	"World",
+	"How",
+	"Are",
+	"You",
+	"Doing",
+	"Today",
+	"Such",
+	"A",
+	"Wondrous",
+	"Sunshine",
+];
diff --git a/testlib/src/main/resources/rome/js/longLineBefore.js b/testlib/src/main/resources/rome/js/longLineBefore.js
new file mode 100644
index 0000000000..fd59e429c2
--- /dev/null
+++ b/testlib/src/main/resources/rome/js/longLineBefore.js
@@ -0,0 +1 @@
+const x = ["Hello", "World", "How", "Are", "You", "Doing", "Today", "Such", "A", "Wondrous", "Sunshine"];
\ No newline at end of file
diff --git a/testlib/src/main/resources/rome/json/fileAfter.json b/testlib/src/main/resources/rome/json/fileAfter.json
new file mode 100644
index 0000000000..468dac3297
--- /dev/null
+++ b/testlib/src/main/resources/rome/json/fileAfter.json
@@ -0,0 +1,5 @@
+{
+	"a": [1, 2, 3],
+	"b": 9,
+	"c": null
+}
diff --git a/testlib/src/main/resources/rome/json/fileBefore.json b/testlib/src/main/resources/rome/json/fileBefore.json
new file mode 100644
index 0000000000..77182284c7
--- /dev/null
+++ b/testlib/src/main/resources/rome/json/fileBefore.json
@@ -0,0 +1,7 @@
+   {
+    "a":[1,2,3
+
+],
+      "b":9,
+    "c"   : null
+   }
\ No newline at end of file
diff --git a/testlib/src/main/resources/rome/ts/fileAfter.cts b/testlib/src/main/resources/rome/ts/fileAfter.cts
new file mode 100644
index 0000000000..f854953234
--- /dev/null
+++ b/testlib/src/main/resources/rome/ts/fileAfter.cts
@@ -0,0 +1,4 @@
+type Name = "World" | "Maven" | "Gradle";
+const foo = <T>(name: Name = "World", v: T): string => {
+	return "Hello " + name;
+};
diff --git a/testlib/src/main/resources/rome/ts/fileAfter.mts b/testlib/src/main/resources/rome/ts/fileAfter.mts
new file mode 100644
index 0000000000..e6563e3030
--- /dev/null
+++ b/testlib/src/main/resources/rome/ts/fileAfter.mts
@@ -0,0 +1,4 @@
+export type Name = "World" | "Maven" | "Gradle";
+export const foo = <T>(name: Name = "World", v: T): string => {
+	return "Hello " + name;
+};
diff --git a/testlib/src/main/resources/rome/ts/fileAfter.ts b/testlib/src/main/resources/rome/ts/fileAfter.ts
new file mode 100644
index 0000000000..e6563e3030
--- /dev/null
+++ b/testlib/src/main/resources/rome/ts/fileAfter.ts
@@ -0,0 +1,4 @@
+export type Name = "World" | "Maven" | "Gradle";
+export const foo = <T>(name: Name = "World", v: T): string => {
+	return "Hello " + name;
+};
diff --git a/testlib/src/main/resources/rome/ts/fileAfter.tsx b/testlib/src/main/resources/rome/ts/fileAfter.tsx
new file mode 100644
index 0000000000..15ef316142
--- /dev/null
+++ b/testlib/src/main/resources/rome/ts/fileAfter.tsx
@@ -0,0 +1,7 @@
+export interface Cfg<T> {
+	classname: string;
+	message: T;
+}
+const Panel = <T,>(cfg: Cfg<T>): JSX.Element => {
+	return <div className={cfg.classname}>{String(cfg.message)}</div>;
+};
diff --git a/testlib/src/main/resources/rome/ts/fileBefore.cts b/testlib/src/main/resources/rome/ts/fileBefore.cts
new file mode 100644
index 0000000000..d4304287c0
--- /dev/null
+++ b/testlib/src/main/resources/rome/ts/fileBefore.cts
@@ -0,0 +1,4 @@
+type Name = "World"   | "Maven"|"Gradle";
+const    foo = <T>(   name:   Name="World", v: T): string => {
+                        return "Hello " + name;
+  }
\ No newline at end of file
diff --git a/testlib/src/main/resources/rome/ts/fileBefore.mts b/testlib/src/main/resources/rome/ts/fileBefore.mts
new file mode 100644
index 0000000000..96837762a3
--- /dev/null
+++ b/testlib/src/main/resources/rome/ts/fileBefore.mts
@@ -0,0 +1,5 @@
+export
+ type Name = "World"   | "Maven"|"Gradle";
+export const    foo = <T>(   name:   Name="World", v: T): string => {
+                        return "Hello " + name;
+  }
\ No newline at end of file
diff --git a/testlib/src/main/resources/rome/ts/fileBefore.ts b/testlib/src/main/resources/rome/ts/fileBefore.ts
new file mode 100644
index 0000000000..96837762a3
--- /dev/null
+++ b/testlib/src/main/resources/rome/ts/fileBefore.ts
@@ -0,0 +1,5 @@
+export
+ type Name = "World"   | "Maven"|"Gradle";
+export const    foo = <T>(   name:   Name="World", v: T): string => {
+                        return "Hello " + name;
+  }
\ No newline at end of file
diff --git a/testlib/src/main/resources/rome/ts/fileBefore.tsx b/testlib/src/main/resources/rome/ts/fileBefore.tsx
new file mode 100644
index 0000000000..38f24f8440
--- /dev/null
+++ b/testlib/src/main/resources/rome/ts/fileBefore.tsx
@@ -0,0 +1,8 @@
+export interface Cfg<T >{
+classname:string,
+message:T,
+}
+const Panel = <T,> ( cfg:Cfg<T>):JSX.Element  =>{
+                  return (<div className={cfg.classname}>{String(cfg.message)}</div>
+                  )  ;
+    }
\ No newline at end of file
diff --git a/testlib/src/test/java/com/diffplug/spotless/rome/RomeStepTest.java b/testlib/src/test/java/com/diffplug/spotless/rome/RomeStepTest.java
new file mode 100644
index 0000000000..5c4801d50a
--- /dev/null
+++ b/testlib/src/test/java/com/diffplug/spotless/rome/RomeStepTest.java
@@ -0,0 +1,284 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.rome;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+import com.diffplug.common.base.StandardSystemProperty;
+import com.diffplug.spotless.ResourceHarness;
+import com.diffplug.spotless.StepHarnessWithFile;
+import com.diffplug.spotless.ThrowingEx;
+
+class RomeStepTest extends ResourceHarness {
+	private static String downloadDir;
+
+	@BeforeAll
+	static void createDownloadDir() throws IOException {
+		// We do not want to download Rome each time we execute a test
+		var userHome = Paths.get(StandardSystemProperty.USER_HOME.value());
+		downloadDir = userHome.resolve(".gradle").resolve("rome-dl-test").toAbsolutePath().normalize().toString();
+	}
+
+	/**
+	 * Tests that files can be formatted without setting the input language
+	 * explicitly.
+	 */
+	@Nested
+	class AutoDetectLanguage {
+		/**
+		 * Tests that a *.cjs file can be formatted without setting the input language
+		 * explicitly.
+		 */
+		@Test
+		void testAutoDetectCjs() {
+			var step = RomeStep.withExeDownload("12.0.0", downloadDir.toString()).create();
+			var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+			stepHarness.testResource("rome/js/fileBefore.cjs", "rome/js/fileAfter.cjs");
+		}
+
+		/**
+		 * Tests that a *.cts file can be formatted without setting the input language
+		 * explicitly.
+		 */
+		@Test
+		void testAutoDetectCts() {
+			var step = RomeStep.withExeDownload("12.0.0", downloadDir.toString()).create();
+			var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+			stepHarness.testResource("rome/ts/fileBefore.cts", "rome/ts/fileAfter.cts");
+		}
+
+		/**
+		 * Tests that a *.js file can be formatted without setting the input language
+		 * explicitly.
+		 */
+		@Test
+		void testAutoDetectJs() {
+			var step = RomeStep.withExeDownload("12.0.0", downloadDir.toString()).create();
+			var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+			stepHarness.testResource("rome/js/fileBefore.js", "rome/js/fileAfter.js");
+		}
+
+		/**
+		 * Tests that a *.js file can be formatted without setting the input language
+		 * explicitly.
+		 */
+		@Test
+		void testAutoDetectJson() {
+			var step = RomeStep.withExeDownload("12.0.0", downloadDir.toString()).create();
+			var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+			stepHarness.testResource("rome/json/fileBefore.json", "rome/json/fileAfter.json");
+		}
+
+		/**
+		 * Tests that a *.jsx file can be formatted without setting the input language
+		 * explicitly.
+		 */
+		@Test
+		void testAutoDetectJsx() {
+			var step = RomeStep.withExeDownload("12.0.0", downloadDir.toString()).create();
+			var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+			stepHarness.testResource("rome/js/fileBefore.jsx", "rome/js/fileAfter.jsx");
+		}
+
+		/**
+		 * Tests that a *.mjs file can be formatted without setting the input language
+		 * explicitly.
+		 */
+		@Test
+		void testAutoDetectMjs() {
+			var step = RomeStep.withExeDownload("12.0.0", downloadDir.toString()).create();
+			var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+			stepHarness.testResource("rome/js/fileBefore.mjs", "rome/js/fileAfter.mjs");
+		}
+
+		/**
+		 * Tests that a *.mts file can be formatted without setting the input language
+		 * explicitly.
+		 */
+		@Test
+		void testAutoDetectMts() {
+			var step = RomeStep.withExeDownload("12.0.0", downloadDir.toString()).create();
+			var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+			stepHarness.testResource("rome/ts/fileBefore.mts", "rome/ts/fileAfter.mts");
+		}
+
+		/**
+		 * Tests that a *.ts file can be formatted without setting the input language
+		 * explicitly.
+		 */
+		@Test
+		void testAutoDetectTs() {
+			var step = RomeStep.withExeDownload("12.0.0", downloadDir.toString()).create();
+			var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+			stepHarness.testResource("rome/ts/fileBefore.ts", "rome/ts/fileAfter.ts");
+		}
+
+		/**
+		 * Tests that a *.tsx file can be formatted without setting the input language
+		 * explicitly.
+		 */
+		@Test
+		void testAutoDetectTsx() {
+			var step = RomeStep.withExeDownload("12.0.0", downloadDir.toString()).create();
+			var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+			stepHarness.testResource("rome/ts/fileBefore.tsx", "rome/ts/fileAfter.tsx");
+		}
+	}
+
+	@Nested
+	class ConfigFile {
+		/**
+		 * Test formatting with the line width in the config file set to 120.
+		 */
+		@Test
+		void testLineWidth120() {
+			var path = createRomeConfig("rome/config/line-width-120.json");
+			var step = RomeStep.withExeDownload("12.0.0", downloadDir.toString()).withConfigPath(path).create();
+			var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+			stepHarness.testResource("rome/js/longLineBefore.js", "rome/js/longLineAfter120.js");
+		}
+
+		/**
+		 * Test formatting with the line width in the config file set to 120.
+		 */
+		@Test
+		void testLineWidth80() {
+			var path = createRomeConfig("rome/config/line-width-80.json");
+			var step = RomeStep.withExeDownload("12.0.0", downloadDir.toString()).withConfigPath(path).create();
+			var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+			stepHarness.testResource("rome/js/longLineBefore.js", "rome/js/longLineAfter80.js");
+		}
+
+		private String createRomeConfig(String name) {
+			var config = createTestFile(name).toPath();
+			var dir = config.getParent();
+			var rome = dir.resolve("rome.json");
+			ThrowingEx.run(() -> Files.copy(config, rome));
+			return dir.toString();
+		}
+	}
+
+	/**
+	 * Tests that files can be formatted when setting the input language explicitly.
+	 */
+	@Nested
+	class ExplicitLanguage {
+		/**
+		 * Tests that a *.cjs file can be formatted when setting the input language
+		 * explicitly.
+		 */
+		@Test
+		void testAutoDetectCjs() {
+			var step = RomeStep.withExeDownload("12.0.0", downloadDir.toString()).withLanguage("js").create();
+			var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+			stepHarness.testResource("rome/js/fileBefore.cjs", "rome/js/fileAfter.cjs");
+		}
+
+		/**
+		 * Tests that a *.cts file can be formatted when setting the input language
+		 * explicitly.
+		 */
+		@Test
+		void testAutoDetectCts() {
+			var step = RomeStep.withExeDownload("12.0.0", downloadDir.toString()).withLanguage("ts").create();
+			var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+			stepHarness.testResource("rome/ts/fileBefore.cts", "rome/ts/fileAfter.cts");
+		}
+
+		/**
+		 * Tests that a *.js file can be formatted when setting the input language
+		 * explicitly.
+		 */
+		@Test
+		void testAutoDetectJs() {
+			var step = RomeStep.withExeDownload("12.0.0", downloadDir.toString()).withLanguage("js").create();
+			var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+			stepHarness.testResource("rome/js/fileBefore.js", "rome/js/fileAfter.js");
+		}
+
+		/**
+		 * Tests that a *.json file can be formatted when setting the input language
+		 * explicitly.
+		 */
+		@Test
+		void testAutoDetectJson() {
+			var step = RomeStep.withExeDownload("12.0.0", downloadDir.toString()).withLanguage("json").create();
+			var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+			stepHarness.testResource("rome/json/fileBefore.json", "rome/json/fileAfter.json");
+		}
+
+		/**
+		 * Tests that a *.jsx file can be formatted when setting the input language
+		 * explicitly.
+		 */
+		@Test
+		void testAutoDetectJsx() {
+			var step = RomeStep.withExeDownload("12.0.0", downloadDir.toString()).withLanguage("jsx").create();
+			var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+			stepHarness.testResource("rome/js/fileBefore.jsx", "rome/js/fileAfter.jsx");
+		}
+
+		/**
+		 * Tests that a *.mjs file can be formatted without setting the input language
+		 * explicitly.
+		 */
+		@Test
+		void testAutoDetectMjs() {
+			var step = RomeStep.withExeDownload("12.0.0", downloadDir.toString()).withLanguage("js").create();
+			var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+			stepHarness.testResource("rome/js/fileBefore.mjs", "rome/js/fileAfter.mjs");
+		}
+
+		/**
+		 * Tests that a *.mts file can be formatted when setting the input language
+		 * explicitly.
+		 */
+		@Test
+		void testAutoDetectMts() {
+			var step = RomeStep.withExeDownload("12.0.0", downloadDir.toString()).withLanguage("ts").create();
+			var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+			stepHarness.testResource("rome/ts/fileBefore.mts", "rome/ts/fileAfter.mts");
+		}
+
+		/**
+		 * Tests that a *.ts file can be formatted when setting the input language
+		 * explicitly.
+		 */
+		@Test
+		void testAutoDetectTs() {
+			var step = RomeStep.withExeDownload("12.0.0", downloadDir.toString()).withLanguage("ts").create();
+			var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+			stepHarness.testResource("rome/ts/fileBefore.ts", "rome/ts/fileAfter.ts");
+		}
+
+		/**
+		 * Tests that a *.tsx file can be formatted when setting the input language
+		 * explicitly.
+		 */
+		@Test
+		void testAutoDetectTsx() {
+			var step = RomeStep.withExeDownload("12.0.0", downloadDir.toString()).withLanguage("tsx").create();
+			var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+			stepHarness.testResource("rome/ts/fileBefore.tsx", "rome/ts/fileAfter.tsx");
+		}
+	}
+}

From 97198cb239589e8bc3688146ba7efd44170ac085 Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <sensenmann5@gmail.com>
Date: Sat, 8 Apr 2023 22:18:24 +0100
Subject: [PATCH 1038/2068] Add tests for Maven plugin

---
 plugin-maven/build.gradle                     |   1 +
 .../maven/MavenIntegrationHarness.java        |   4 +
 .../spotless/maven/rome/RomeMavenTest.java    | 187 ++++++++++++++++++
 3 files changed, 192 insertions(+)
 create mode 100644 plugin-maven/src/test/java/com/diffplug/spotless/maven/rome/RomeMavenTest.java

diff --git a/plugin-maven/build.gradle b/plugin-maven/build.gradle
index a8604c6ed9..dda98ad79a 100644
--- a/plugin-maven/build.gradle
+++ b/plugin-maven/build.gradle
@@ -50,6 +50,7 @@ dependencies {
 	testImplementation "org.mockito:mockito-core:${VER_MOCKITO}"
 	testImplementation "com.diffplug.durian:durian-io:${VER_DURIAN}"
 	testImplementation 'com.github.spullara.mustache.java:compiler:0.9.10'
+	testImplementation 'org.owasp.encoder:encoder:1.2.3'
 	testImplementation "org.apache.maven:maven-plugin-api:${VER_MAVEN_API}"
 	testImplementation "org.eclipse.aether:aether-api:${VER_ECLIPSE_AETHER}"
 	testImplementation "org.codehaus.plexus:plexus-resources:${VER_PLEXUS_RESOURCES}"
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
index 216502bc07..398932dd19 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
@@ -154,6 +154,10 @@ protected void writePomWithPrettierSteps(String includes, String... steps) throw
 		writePom(formats(groupWithSteps("format", including(includes), steps)));
 	}
 
+	protected void writePomWithRomeSteps(String includes, String... steps) throws IOException {
+		writePom(formats(groupWithSteps("format", including(includes), steps)));
+	}
+
 	protected void writePomWithPrettierSteps(String[] plugins, String includes, String... steps) throws IOException {
 		writePom(null, formats(groupWithSteps("format", including(includes), steps)), null, plugins);
 	}
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/rome/RomeMavenTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/rome/RomeMavenTest.java
new file mode 100644
index 0000000000..76e297e704
--- /dev/null
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/rome/RomeMavenTest.java
@@ -0,0 +1,187 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.rome;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.owasp.encoder.Encode.forXml;
+
+import org.junit.jupiter.api.Test;
+
+import com.diffplug.spotless.maven.MavenIntegrationHarness;
+
+class RomeMavenTest extends MavenIntegrationHarness {
+	/**
+	 * Tests that rome can be used as a generic formatting step.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	public void testAsGenericStep() throws Exception {
+		writePomWithRomeSteps("**/*.js", "<rome><version>12.0.0</version></rome>");
+		setFile("rome_test.js").toResource("rome/js/fileBefore.js");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("rome_test.js").sameAsResource("rome/js/fileAfter.js");
+	}
+
+	/**
+	 * Tests that rome can be used as a JavaScript formatting step.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	public void testAsJavaScriptStep() throws Exception {
+		writePomWithJavascriptSteps("**/*.js", "<rome><version>12.0.0</version></rome>");
+		setFile("rome_test.js").toResource("rome/js/fileBefore.js");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("rome_test.js").sameAsResource("rome/js/fileAfter.js");
+	}
+
+	/**
+	 * Tests that rome can be used as a JSON formatting step.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	public void testAsJsonStep() throws Exception {
+		writePomWithJsonSteps("**/*.json", "<rome><version>12.0.0</version></rome>");
+		setFile("rome_test.json").toResource("rome/json/fileBefore.json");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("rome_test.json").sameAsResource("rome/json/fileAfter.json");
+	}
+
+	/**
+	 * Tests that rome can be used as a TypeScript formatting step.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	public void testAsTypeScriptStep() throws Exception {
+		writePomWithTypescriptSteps("**/*.ts", "<rome><version>12.0.0</version></rome>");
+		setFile("rome_test.ts").toResource("rome/ts/fileBefore.ts");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("rome_test.ts").sameAsResource("rome/ts/fileAfter.ts");
+	}
+
+	/**
+	 * Tests that the language can be specified for the generic format step.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	public void testCanSetLanguageForGenericStep() throws Exception {
+		writePomWithRomeSteps("**/*.nosj", "<rome><version>12.0.0</version><language>json</language></rome>");
+		setFile("rome_test.nosj").toResource("rome/json/fileBefore.json");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("rome_test.nosj").sameAsResource("rome/json/fileAfter.json");
+	}
+
+	/**
+	 * Tests that an absolute config path can be specified.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	public void testConfigPathAbsolute() throws Exception {
+		var path = newFile("configs").getAbsolutePath();
+		writePomWithRomeSteps("**/*.js",
+				"<rome><version>12.0.0</version><configPath>" + forXml(path) + "</configPath></rome>");
+		setFile("rome_test.js").toResource("rome/js/longLineBefore.js");
+		setFile("configs/rome.json").toResource("rome/config/line-width-120.json");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("rome_test.js").sameAsResource("rome/js/longLineAfter120.js");
+	}
+
+	/**
+	 * Tests that a path to the directory with the rome.json config file can be
+	 * specified. Uses a config file with a line width of 120.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	public void testConfigPathLineWidth120() throws Exception {
+		writePomWithRomeSteps("**/*.js", "<rome><version>12.0.0</version><configPath>configs</configPath></rome>");
+		setFile("rome_test.js").toResource("rome/js/longLineBefore.js");
+		setFile("configs/rome.json").toResource("rome/config/line-width-120.json");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("rome_test.js").sameAsResource("rome/js/longLineAfter120.js");
+	}
+
+	/**
+	 * Tests that a path to the directory with the rome.json config file can be
+	 * specified. Uses a config file with a line width of 80.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	public void testConfigPathLineWidth80() throws Exception {
+		writePomWithRomeSteps("**/*.js", "<rome><version>12.0.0</version><configPath>configs</configPath></rome>");
+		setFile("rome_test.js").toResource("rome/js/longLineBefore.js");
+		setFile("configs/rome.json").toResource("rome/config/line-width-80.json");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("rome_test.js").sameAsResource("rome/js/longLineAfter80.js");
+	}
+
+	/**
+	 * Tests that the download directory can be an absolute path.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	public void testDownloadDirAbsolute() throws Exception {
+		var path = newFile("target/bin/rome").getAbsoluteFile().toString();
+		writePomWithRomeSteps("**/*.js",
+				"<rome><version>12.0.0</version><downloadDir>" + forXml(path) + "</downloadDir></rome>");
+		setFile("rome_test.js").toResource("rome/js/fileBefore.js");
+		assertTrue(!newFile("target/bin/rome").exists() || newFile("target/bin/rome").list().length == 0);
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("rome_test.js").sameAsResource("rome/js/fileAfter.js");
+		assertEquals(2, newFile("target/bin/rome").list().length);
+	}
+
+	/**
+	 * Tests that the download directory can be changed to a path relative to the
+	 * project's base directory.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	public void testDownloadDirRelative() throws Exception {
+		writePomWithRomeSteps("**/*.js",
+				"<rome><version>12.0.0</version><downloadDir>target/bin/rome</downloadDir></rome>");
+		setFile("rome_test.js").toResource("rome/js/fileBefore.js");
+		assertTrue(!newFile("target/bin/rome").exists() || newFile("target/bin/rome").list().length == 0);
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("rome_test.js").sameAsResource("rome/js/fileAfter.js");
+		assertEquals(2, newFile("target/bin/rome").list().length);
+	}
+
+	/**
+	 * Tests that the build fails when the input file could not be parsed.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	public void testFailureWhenNotParseable() throws Exception {
+		writePomWithRomeSteps("**/*.js", "<rome><version>12.0.0</version><language>json</language></rome>");
+		setFile("rome_test.js").toResource("rome/js/fileBefore.js");
+		var result = mavenRunner().withArguments("spotless:apply").runHasError();
+		assertFile("rome_test.js").sameAsResource("rome/js/fileBefore.js");
+		assertTrue(result.stdOutUtf8().contains("Format with errors is disabled."));
+		assertTrue(result.stdOutUtf8().contains("Unable to format file"));
+		assertTrue(result.stdOutUtf8().contains("Step 'rome' found problem in 'rome_test.js'"));
+	}
+}

From 77d302e60106f90dec7cf2252e4b3bedf21c8580 Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <sensenmann5@gmail.com>
Date: Sat, 8 Apr 2023 22:56:57 +0100
Subject: [PATCH 1039/2068] Add tests for Gradle plugin

---
 plugin-gradle/build.gradle                    |   1 +
 .../gradle/spotless/RomeIntegrationTest.java  | 343 ++++++++++++++++++
 .../spotless/maven/rome/RomeMavenTest.java    |  43 ++-
 3 files changed, 373 insertions(+), 14 deletions(-)
 create mode 100644 plugin-gradle/src/test/java/com/diffplug/gradle/spotless/RomeIntegrationTest.java

diff --git a/plugin-gradle/build.gradle b/plugin-gradle/build.gradle
index 9a725dbf5d..021155abfe 100644
--- a/plugin-gradle/build.gradle
+++ b/plugin-gradle/build.gradle
@@ -25,6 +25,7 @@ dependencies {
 	testImplementation "org.junit.jupiter:junit-jupiter:${VER_JUNIT}"
 	testImplementation "org.assertj:assertj-core:${VER_ASSERTJ}"
 	testImplementation "com.diffplug.durian:durian-testlib:${VER_DURIAN}"
+	testImplementation 'org.owasp.encoder:encoder:1.2.3'
 }
 
 apply from: rootProject.file('gradle/special-tests.gradle')
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/RomeIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/RomeIntegrationTest.java
new file mode 100644
index 0000000000..4464b1cec7
--- /dev/null
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/RomeIntegrationTest.java
@@ -0,0 +1,343 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.gradle.spotless;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.IOException;
+
+import org.junit.jupiter.api.Test;
+import org.owasp.encoder.Encode;
+
+class RomeIntegrationTest extends GradleIntegrationHarness {
+	/**
+	 * Tests that rome can be used as a generic formatting step.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void asGenericStep() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    format 'myrome', {",
+				"        target '**/*.js'",
+				"        rome('12.0.0')",
+				"    }",
+				"}");
+		setFile("rome_test.js").toResource("rome/js/fileBefore.js");
+
+		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		assertFile("rome_test.js").sameAsResource("rome/js/fileAfter.js");
+	}
+
+	/**
+	 * Tests that rome can be used as a JavaScript formatting step.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void asJavaScriptStep() throws Exception {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    javascript {",
+				"        target '**/*.js'",
+				"        rome('12.0.0')",
+				"    }",
+				"}");
+		setFile("rome_test.js").toResource("rome/js/fileBefore.js");
+
+		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		assertFile("rome_test.js").sameAsResource("rome/js/fileAfter.js");
+	}
+
+	/**
+	 * Tests that rome can be used as a JSON formatting step.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void asJsonStep() throws Exception {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    json {",
+				"        target '**/*.json'",
+				"        rome('12.0.0')",
+				"    }",
+				"}");
+		setFile("rome_test.json").toResource("rome/json/fileBefore.json");
+
+		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		assertFile("rome_test.json").sameAsResource("rome/json/fileAfter.json");
+	}
+
+	/**
+	 * Tests that rome can be used as a TypeScript formatting step.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void asTypeScriptStep() throws Exception {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    typescript {",
+				"        target '**/*.ts'",
+				"        rome('12.0.0')",
+				"    }",
+				"}");
+		setFile("rome_test.ts").toResource("rome/ts/fileBefore.ts");
+
+		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		assertFile("rome_test.ts").sameAsResource("rome/ts/fileAfter.ts");
+	}
+
+	/**
+	 * Tests that the language can be specified for the generic format step.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void canSetLanguageForGenericStep() throws Exception {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    format 'myrome', {",
+				"        target '**/*.nosj'",
+				"        rome('12.0.0').language('json')",
+				"    }",
+				"}");
+		setFile("rome_test.nosj").toResource("rome/json/fileBefore.json");
+
+		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		assertFile("rome_test.nosj").sameAsResource("rome/json/fileAfter.json");
+	}
+
+	/**
+	 * Tests that an absolute config path can be specified.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void configPathAbsolute() throws Exception {
+		var path = newFile("configs").getAbsolutePath();
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    format 'myrome', {",
+				"        target '**/*.js'",
+				"        rome('12.0.0').configPath('" + Encode.forJava(path) + "')",
+				"    }",
+				"}");
+		setFile("rome_test.js").toResource("rome/js/longLineBefore.js");
+		setFile("configs/rome.json").toResource("rome/config/line-width-120.json");
+
+		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		assertFile("rome_test.js").sameAsResource("rome/js/longLineAfter120.js");
+	}
+
+	/**
+	 * Tests that a path to the directory with the rome.json config file can be
+	 * specified. Uses a config file with a line width of 120.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void configPathLineWidth120() throws Exception {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    format 'myrome', {",
+				"        target '**/*.js'",
+				"        rome('12.0.0').configPath('configs')",
+				"    }",
+				"}");
+		setFile("rome_test.js").toResource("rome/js/longLineBefore.js");
+		setFile("configs/rome.json").toResource("rome/config/line-width-120.json");
+
+		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		assertFile("rome_test.js").sameAsResource("rome/js/longLineAfter120.js");
+	}
+
+	/**
+	 * Tests that a path to the directory with the rome.json config file can be
+	 * specified. Uses a config file with a line width of 80.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void configPathLineWidth80() throws Exception {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    format 'myrome', {",
+				"        target '**/*.js'",
+				"        rome('12.0.0').configPath('configs')",
+				"    }",
+				"}");
+		setFile("rome_test.js").toResource("rome/js/longLineBefore.js");
+		setFile("configs/rome.json").toResource("rome/config/line-width-80.json");
+
+		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		assertFile("rome_test.js").sameAsResource("rome/js/longLineAfter80.js");
+	}
+
+	/**
+	 * Tests that the download directory can be an absolute path.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void downloadDirAbsolute() throws Exception {
+		var path = newFile("target/bin/rome").getAbsoluteFile().toString();
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    format 'myrome', {",
+				"        target '**/*.js'",
+				"        rome('12.0.0').downloadDir('" + Encode.forJava(path) + "')",
+				"    }",
+				"}");
+		setFile("rome_test.js").toResource("rome/js/fileBefore.js");
+		assertTrue(!newFile("target/bin/rome").exists() || newFile("target/bin/rome").list().length == 0);
+
+		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		assertFile("rome_test.js").sameAsResource("rome/js/fileAfter.js");
+		assertEquals(2, newFile("target/bin/rome").list().length);
+	}
+
+	/**
+	 * Tests that the download directory can be changed to a path relative to the
+	 * project's base directory.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void downloadDirRelative() throws Exception {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    format 'myrome', {",
+				"        target '**/*.js'",
+				"        rome('12.0.0').downloadDir('target/bin/rome')",
+				"    }",
+				"}");
+		setFile("rome_test.js").toResource("rome/js/fileBefore.js");
+		assertTrue(!newFile("target/bin/rome").exists() || newFile("target/bin/rome").list().length == 0);
+
+		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		assertFile("rome_test.js").sameAsResource("rome/js/fileAfter.js");
+		assertEquals(2, newFile("target/bin/rome").list().length);
+	}
+
+	/**
+	 * Tests that the build fails when given Rome executable does not exist.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void failureWhenExeNotFound() throws Exception {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    format 'myrome', {",
+				"        target '**/*.js'",
+				"        rome('12.0.0').pathToExe('rome/is/missing')",
+				"    }",
+				"}");
+		setFile("rome_test.js").toResource("rome/js/fileBefore.js");
+
+		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").buildAndFail();
+		assertThat(spotlessApply.getOutput()).contains("Build failed with an exception");
+		assertFile("rome_test.js").sameAsResource("rome/js/fileBefore.js");
+		assertThat(spotlessApply.getOutput()).contains("Could not create task ':spotlessMyromeApply'");
+		assertThat(spotlessApply.getOutput()).contains("Rome executable does not exist");
+	}
+
+	/**
+	 * Tests that the build fails when the input file could not be parsed.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void failureWhenNotParseable() throws Exception {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    format 'myrome', {",
+				"        target '**/*.js'",
+				"        rome('12.0.0').language('json')",
+				"    }",
+				"}");
+		setFile("rome_test.js").toResource("rome/js/fileBefore.js");
+
+		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").buildAndFail();
+		assertThat(spotlessApply.getOutput()).contains("spotlessMyrome FAILED");
+		assertFile("rome_test.js").sameAsResource("rome/js/fileBefore.js");
+		assertThat(spotlessApply.getOutput()).contains("Format with errors is disabled.");
+		assertThat(spotlessApply.getOutput()).contains("Step 'rome' found problem in 'rome_test.js'");
+	}
+}
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/rome/RomeMavenTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/rome/RomeMavenTest.java
index 76e297e704..7ca3f7d981 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/rome/RomeMavenTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/rome/RomeMavenTest.java
@@ -15,6 +15,7 @@
  */
 package com.diffplug.spotless.maven.rome;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.owasp.encoder.Encode.forXml;
@@ -30,7 +31,7 @@ class RomeMavenTest extends MavenIntegrationHarness {
 	 * @throws Exception When a test failure occurs.
 	 */
 	@Test
-	public void testAsGenericStep() throws Exception {
+	void asGenericStep() throws Exception {
 		writePomWithRomeSteps("**/*.js", "<rome><version>12.0.0</version></rome>");
 		setFile("rome_test.js").toResource("rome/js/fileBefore.js");
 		mavenRunner().withArguments("spotless:apply").runNoError();
@@ -43,7 +44,7 @@ public void testAsGenericStep() throws Exception {
 	 * @throws Exception When a test failure occurs.
 	 */
 	@Test
-	public void testAsJavaScriptStep() throws Exception {
+	void asJavaScriptStep() throws Exception {
 		writePomWithJavascriptSteps("**/*.js", "<rome><version>12.0.0</version></rome>");
 		setFile("rome_test.js").toResource("rome/js/fileBefore.js");
 		mavenRunner().withArguments("spotless:apply").runNoError();
@@ -56,7 +57,7 @@ public void testAsJavaScriptStep() throws Exception {
 	 * @throws Exception When a test failure occurs.
 	 */
 	@Test
-	public void testAsJsonStep() throws Exception {
+	void asJsonStep() throws Exception {
 		writePomWithJsonSteps("**/*.json", "<rome><version>12.0.0</version></rome>");
 		setFile("rome_test.json").toResource("rome/json/fileBefore.json");
 		mavenRunner().withArguments("spotless:apply").runNoError();
@@ -69,7 +70,7 @@ public void testAsJsonStep() throws Exception {
 	 * @throws Exception When a test failure occurs.
 	 */
 	@Test
-	public void testAsTypeScriptStep() throws Exception {
+	void asTypeScriptStep() throws Exception {
 		writePomWithTypescriptSteps("**/*.ts", "<rome><version>12.0.0</version></rome>");
 		setFile("rome_test.ts").toResource("rome/ts/fileBefore.ts");
 		mavenRunner().withArguments("spotless:apply").runNoError();
@@ -82,7 +83,7 @@ public void testAsTypeScriptStep() throws Exception {
 	 * @throws Exception When a test failure occurs.
 	 */
 	@Test
-	public void testCanSetLanguageForGenericStep() throws Exception {
+	void canSetLanguageForGenericStep() throws Exception {
 		writePomWithRomeSteps("**/*.nosj", "<rome><version>12.0.0</version><language>json</language></rome>");
 		setFile("rome_test.nosj").toResource("rome/json/fileBefore.json");
 		mavenRunner().withArguments("spotless:apply").runNoError();
@@ -95,7 +96,7 @@ public void testCanSetLanguageForGenericStep() throws Exception {
 	 * @throws Exception When a test failure occurs.
 	 */
 	@Test
-	public void testConfigPathAbsolute() throws Exception {
+	void configPathAbsolute() throws Exception {
 		var path = newFile("configs").getAbsolutePath();
 		writePomWithRomeSteps("**/*.js",
 				"<rome><version>12.0.0</version><configPath>" + forXml(path) + "</configPath></rome>");
@@ -112,7 +113,7 @@ public void testConfigPathAbsolute() throws Exception {
 	 * @throws Exception When a test failure occurs.
 	 */
 	@Test
-	public void testConfigPathLineWidth120() throws Exception {
+	void configPathLineWidth120() throws Exception {
 		writePomWithRomeSteps("**/*.js", "<rome><version>12.0.0</version><configPath>configs</configPath></rome>");
 		setFile("rome_test.js").toResource("rome/js/longLineBefore.js");
 		setFile("configs/rome.json").toResource("rome/config/line-width-120.json");
@@ -127,7 +128,7 @@ public void testConfigPathLineWidth120() throws Exception {
 	 * @throws Exception When a test failure occurs.
 	 */
 	@Test
-	public void testConfigPathLineWidth80() throws Exception {
+	void configPathLineWidth80() throws Exception {
 		writePomWithRomeSteps("**/*.js", "<rome><version>12.0.0</version><configPath>configs</configPath></rome>");
 		setFile("rome_test.js").toResource("rome/js/longLineBefore.js");
 		setFile("configs/rome.json").toResource("rome/config/line-width-80.json");
@@ -141,7 +142,7 @@ public void testConfigPathLineWidth80() throws Exception {
 	 * @throws Exception When a test failure occurs.
 	 */
 	@Test
-	public void testDownloadDirAbsolute() throws Exception {
+	void downloadDirAbsolute() throws Exception {
 		var path = newFile("target/bin/rome").getAbsoluteFile().toString();
 		writePomWithRomeSteps("**/*.js",
 				"<rome><version>12.0.0</version><downloadDir>" + forXml(path) + "</downloadDir></rome>");
@@ -159,7 +160,7 @@ public void testDownloadDirAbsolute() throws Exception {
 	 * @throws Exception When a test failure occurs.
 	 */
 	@Test
-	public void testDownloadDirRelative() throws Exception {
+	void downloadDirRelative() throws Exception {
 		writePomWithRomeSteps("**/*.js",
 				"<rome><version>12.0.0</version><downloadDir>target/bin/rome</downloadDir></rome>");
 		setFile("rome_test.js").toResource("rome/js/fileBefore.js");
@@ -175,13 +176,27 @@ public void testDownloadDirRelative() throws Exception {
 	 * @throws Exception When a test failure occurs.
 	 */
 	@Test
-	public void testFailureWhenNotParseable() throws Exception {
+	void failureWhenExeNotFound() throws Exception {
+		writePomWithRomeSteps("**/*.js", "<rome><version>12.0.0</version><pathToExe>rome/is/missing</pathToExe></rome>");
+		setFile("rome_test.js").toResource("rome/js/fileBefore.js");
+		var result = mavenRunner().withArguments("spotless:apply").runHasError();
+		assertFile("rome_test.js").sameAsResource("rome/js/fileBefore.js");
+		assertThat(result.stdOutUtf8()).contains("Rome executable does not exist");
+	}
+
+	/**
+	 * Tests that the build fails when the input file could not be parsed.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void failureWhenNotParseable() throws Exception {
 		writePomWithRomeSteps("**/*.js", "<rome><version>12.0.0</version><language>json</language></rome>");
 		setFile("rome_test.js").toResource("rome/js/fileBefore.js");
 		var result = mavenRunner().withArguments("spotless:apply").runHasError();
 		assertFile("rome_test.js").sameAsResource("rome/js/fileBefore.js");
-		assertTrue(result.stdOutUtf8().contains("Format with errors is disabled."));
-		assertTrue(result.stdOutUtf8().contains("Unable to format file"));
-		assertTrue(result.stdOutUtf8().contains("Step 'rome' found problem in 'rome_test.js'"));
+		assertThat(result.stdOutUtf8()).contains("Format with errors is disabled.");
+		assertThat(result.stdOutUtf8()).contains("Unable to format file");
+		assertThat(result.stdOutUtf8()).contains("Step 'rome' found problem in 'rome_test.js'");
 	}
 }

From 99fa04935f93913cb28866a194826b09c15ce861 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 11 Apr 2023 20:44:40 +0000
Subject: [PATCH 1040/2068] fix(deps): update dependency
 org.mockito:mockito-core to v5.3.0

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 1a72150dd6..c235d2ac5a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -32,4 +32,4 @@ VER_DURIAN=1.2.0
 VER_JGIT=6.5.0.202303070854-r
 VER_JUNIT=5.9.2
 VER_ASSERTJ=3.24.2
-VER_MOCKITO=5.2.0
+VER_MOCKITO=5.3.0

From 979fe80f7aea90ffd67960238e787dfb907b264e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 12 Apr 2023 16:37:30 +0000
Subject: [PATCH 1041/2068] chore(deps): update plugin com.gradle.enterprise to
 v3.13

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 6d80b0b38a..41c2a123e0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -23,7 +23,7 @@ plugins {
 	// https://github.com/davidburstrom/version-compatibility-gradle-plugin/tags
 	id 'io.github.davidburstrom.version-compatibility' version '0.5.0' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.enterprise
-	id 'com.gradle.enterprise' version '3.12.6'
+	id 'com.gradle.enterprise' version '3.13'
 	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
 	id 'dev.equo.ide' version '1.0.1' apply false
 }

From 971824d7677254bff75bcdf00a198da4b50040c3 Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <sensenmann5@gmail.com>
Date: Thu, 13 Apr 2023 07:09:50 +0100
Subject: [PATCH 1042/2068] Fix spotbugs issues

---
 .../rome/RomeExecutableDownloader.java        | 11 +++++++--
 .../com/diffplug/spotless/rome/RomeStep.java  |  6 +++--
 .../diffplug/spotless/maven/FileLocator.java  | 23 +++++++++++++++----
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java b/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java
index c55a18f754..5f389f0342 100644
--- a/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java
+++ b/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java
@@ -117,7 +117,10 @@ public Path download(String version) throws IOException, InterruptedException {
 		var url = getDownloadUrl(version, platform);
 		var executablePath = getExecutablePath(version, platform);
 		var checksumPath = getChecksumPath(executablePath);
-		Files.createDirectories(executablePath.getParent());
+		var executableDir = executablePath.getParent();
+		if (executableDir != null) {
+			Files.createDirectories(executableDir);
+		}
 		logger.info("Attempting to download Rome from '{}' to '{}'", url, executablePath);
 		var request = HttpRequest.newBuilder(URI.create(url)).GET().build();
 		var handler = BodyHandlers.ofFile(executablePath, WRITE_OPTIONS);
@@ -270,7 +273,11 @@ private String getArchitectureCodeName(Architecture architecture) throws IOExcep
 	 * @return The path with the checksum for the given file.
 	 */
 	private Path getChecksumPath(Path file) {
-		return file.getParent().resolve(file.getFileName().toString() + ".md5");
+		var parent = file.getParent();
+		var base = parent != null ? parent : file;
+		var fileName = file.getFileName();
+		var checksumName = fileName != null ? fileName.toString() + ".md5" : "checksum.md5";
+		return base.resolve(checksumName);
 	}
 
 	/**
diff --git a/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java b/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java
index b0f17fafd6..d6a3e62669 100644
--- a/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java
@@ -134,7 +134,9 @@ private static void attemptToAddPosixPermission(Path file, PosixFilePermission p
 			var newPermissions = new HashSet<>(Files.getPosixFilePermissions(file));
 			newPermissions.add(permission);
 			Files.setPosixFilePermissions(file, newPermissions);
-		} catch (final Exception ignore) {}
+		} catch (final Exception ignore) {
+			logger.debug("Unable to add POSIX permission '{}' to file '{}'", permission, file);
+		}
 	}
 
 	/**
@@ -440,7 +442,7 @@ private String resolveFileName(File file) {
 				return "jsx".equals(ext) || "js".equals(ext) || "mjs".equals(ext) || "cjs".equals(ext) ? name
 						: "file.js";
 			case "ts?":
-				return "tsx".equals(ext) || "ts".equals(ext) || "tjs".equals(ext) || "tjs".equals(ext) ? name
+				return "tsx".equals(ext) || "ts".equals(ext) || "mts".equals(ext) || "cts".equals(ext) ? name
 						: "file.js";
 			case "js":
 				return "js".equals(ext) || "mjs".equals(ext) || "cjs".equals(ext) ? name : "file.js";
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FileLocator.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FileLocator.java
index a8c3973dd3..0c66fe29cb 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FileLocator.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FileLocator.java
@@ -24,6 +24,7 @@
 import java.security.NoSuchAlgorithmException;
 import java.util.Base64;
 import java.util.Objects;
+import java.util.Optional;
 
 import org.codehaus.plexus.resource.ResourceManager;
 import org.codehaus.plexus.resource.loader.FileResourceCreationException;
@@ -121,10 +122,22 @@ private static byte[] hash(String value) {
 	}
 
 	private static File findDataDir() {
-		// E.g. ~/.m2/repository/com/diffplug/spotless/spotless-plugin-maven/1.2.3/spotless-plugin-maven-1.2.3.jar
-		final var jarPath = Paths.get(AbstractRome.class.getProtectionDomain().getCodeSource().getLocation().getPath());
-		final var base = jarPath.getParent().getParent().getParent();
-		final var sub = base.resolve("spotless-data");
-		return sub.toAbsolutePath().toFile();
+		// JAR path is e.g.
+		// ~/.m2/repository/com/diffplug/spotless/spotless-plugin-maven/1.2.3/spotless-plugin-maven-1.2.3.jar
+		var codeSource = FileLocator.class.getProtectionDomain().getCodeSource();
+		var location = codeSource != null ? codeSource.getLocation() : null;
+		var path = location != null ? location.getPath() : null;
+		var jarPath = path != null && !path.isBlank() ? Paths.get(path) : null;
+		var parent1 = jarPath != null ? jarPath.getParent() : null;
+		var parent2 = parent1 != null ? parent1.getParent() : null;
+		var base = parent2 != null ? parent2.getParent() : null;
+		var sub = base != null ? base.resolve("spotless-data") : null;
+		if (sub != null) {
+			return sub.toAbsolutePath().toFile();
+		}
+		else {
+			var home = Paths.get(System.getenv("user.home"));
+			return home.resolve(".rome").toAbsolutePath().toFile();
+		}
 	}
 }

From 071df538360ea93fdaf3898de86f8d6d5008b63e Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <sensenmann5@gmail.com>
Date: Thu, 13 Apr 2023 07:16:43 +0100
Subject: [PATCH 1043/2068] Run spotlessApply again

---
 .../main/java/com/diffplug/spotless/maven/FileLocator.java  | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FileLocator.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FileLocator.java
index 0c66fe29cb..fdf91ef68f 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FileLocator.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FileLocator.java
@@ -24,15 +24,12 @@
 import java.security.NoSuchAlgorithmException;
 import java.util.Base64;
 import java.util.Objects;
-import java.util.Optional;
 
 import org.codehaus.plexus.resource.ResourceManager;
 import org.codehaus.plexus.resource.loader.FileResourceCreationException;
 import org.codehaus.plexus.resource.loader.ResourceNotFoundException;
 import org.codehaus.plexus.util.FileUtils;
 
-import com.diffplug.spotless.maven.rome.AbstractRome;
-
 public class FileLocator {
 
 	static final String TMP_RESOURCE_FILE_PREFIX = "spotless-resource-";
@@ -134,8 +131,7 @@ private static File findDataDir() {
 		var sub = base != null ? base.resolve("spotless-data") : null;
 		if (sub != null) {
 			return sub.toAbsolutePath().toFile();
-		}
-		else {
+		} else {
 			var home = Paths.get(System.getenv("user.home"));
 			return home.resolve(".rome").toAbsolutePath().toFile();
 		}

From c40afe736c23c7ff55e0090784cf1663c02baff9 Mon Sep 17 00:00:00 2001
From: "Tyler B. Thrailkill" <tylerbthrailkill@gmail.com>
Date: Tue, 18 Apr 2023 16:09:07 -0600
Subject: [PATCH 1044/2068] Update sortpom plugin to newest version

Update the sortpom plugin to add sortDependencyManagement
element.

Remove dependency on IOUtils
---
 lib/build.gradle                              |  2 +-
 .../com/diffplug/spotless/pom/SortPomCfg.java |  4 +++-
 .../diffplug/spotless/pom/SortPomStep.java    |  4 ++--
 .../glue/pom/SortPomFormatterFunc.java        | 22 ++++++++++---------
 .../diffplug/spotless/maven/pom/SortPom.java  |  6 ++++-
 5 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 9e31bed698..8db911e33e 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -115,7 +115,7 @@ dependencies {
 	// scalafmt
 	scalafmtCompileOnly "org.scalameta:scalafmt-core_2.13:3.7.3"
 	// sortPom
-	sortPomCompileOnly 'com.github.ekryd.sortpom:sortpom-sorter:3.0.0'
+	sortPomCompileOnly 'com.github.ekryd.sortpom:sortpom-sorter:3.2.1'
 	sortPomCompileOnly 'org.slf4j:slf4j-api:2.0.0'
 }
 
diff --git a/lib/src/main/java/com/diffplug/spotless/pom/SortPomCfg.java b/lib/src/main/java/com/diffplug/spotless/pom/SortPomCfg.java
index 93c11e1e31..7c9f0f09a9 100644
--- a/lib/src/main/java/com/diffplug/spotless/pom/SortPomCfg.java
+++ b/lib/src/main/java/com/diffplug/spotless/pom/SortPomCfg.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2021-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,6 +43,8 @@ public class SortPomCfg implements Serializable {
 
 	public String sortDependencies = null;
 
+	public String sortDependencyManagement = null;
+
 	public String sortDependencyExclusions = null;
 
 	public String sortPlugins = null;
diff --git a/lib/src/main/java/com/diffplug/spotless/pom/SortPomStep.java b/lib/src/main/java/com/diffplug/spotless/pom/SortPomStep.java
index 69d833f8e7..7f672d5c05 100644
--- a/lib/src/main/java/com/diffplug/spotless/pom/SortPomStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/pom/SortPomStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2021-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@ static class State implements Serializable {
 
 		public State(SortPomCfg cfg, Provisioner provisioner) throws IOException {
 			this.cfg = cfg;
-			this.jarState = JarState.from("com.github.ekryd.sortpom:sortpom-sorter:3.0.0", provisioner);
+			this.jarState = JarState.from("com.github.ekryd.sortpom:sortpom-sorter:3.2.1", provisioner);
 		}
 
 		FormatterFunc createFormat() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException {
diff --git a/lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java b/lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java
index 22a0249634..4dcde62bae 100644
--- a/lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java
+++ b/lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 DiffPlug
+ * Copyright 2021-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,11 +15,10 @@
  */
 package com.diffplug.spotless.glue.pom;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
+import java.io.*;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
 
-import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -40,10 +39,12 @@ public SortPomFormatterFunc(SortPomCfg cfg) {
 
 	@Override
 	public String apply(String input) throws Exception {
-		// SortPom expects a file to sort, so we write the inpout into a temporary file
+		// SortPom expects a file to sort, so we write the input into a temporary file
 		File pom = File.createTempFile("pom", ".xml");
 		pom.deleteOnExit();
-		IOUtils.write(input, new FileOutputStream(pom), cfg.encoding);
+		try (BufferedWriter writer = new BufferedWriter(new FileWriter(pom, Charset.forName(cfg.encoding)))) {
+			writer.write(input);
+		}
 		SortPomImpl sortPom = new SortPomImpl();
 		sortPom.setup(new MySortPomLogger(), PluginParameters.builder()
 				.setPomFile(pom)
@@ -52,11 +53,12 @@ public String apply(String input) throws Exception {
 				.setFormatting(cfg.lineSeparator, cfg.expandEmptyElements, cfg.spaceBeforeCloseEmptyElement, cfg.keepBlankLines)
 				.setIndent(cfg.nrOfIndentSpace, cfg.indentBlankLines, cfg.indentSchemaLocation)
 				.setSortOrder(cfg.sortOrderFile, cfg.predefinedSortOrder)
-				.setSortEntities(cfg.sortDependencies, cfg.sortDependencyExclusions, cfg.sortPlugins, cfg.sortProperties, cfg.sortModules, cfg.sortExecutions)
-				.setTriggers(false)
+				.setSortEntities(cfg.sortDependencies, cfg.sortDependencyExclusions, cfg.sortDependencyManagement,
+						cfg.sortPlugins, cfg.sortProperties, cfg.sortModules, cfg.sortExecutions)
+				.setIgnoreLineSeparators(false)
 				.build());
 		sortPom.sortPom();
-		return IOUtils.toString(new FileInputStream(pom), cfg.encoding);
+		return Files.readString(pom.toPath(), Charset.forName(cfg.encoding));
 	}
 
 	private static class MySortPomLogger implements SortPomLogger {
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/pom/SortPom.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/pom/SortPom.java
index f4fe8cb96b..a1706ee381 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/pom/SortPom.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/pom/SortPom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2021-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -59,6 +59,9 @@ public class SortPom implements FormatterStepFactory {
 	@Parameter
 	String sortDependencies = defaultValues.sortDependencies;
 
+	@Parameter
+	String sortDependencyManagement = defaultValues.sortDependencyManagement;
+
 	@Parameter
 	String sortDependencyExclusions = defaultValues.sortDependencyExclusions;
 
@@ -88,6 +91,7 @@ public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 		cfg.predefinedSortOrder = predefinedSortOrder;
 		cfg.sortOrderFile = sortOrderFile;
 		cfg.sortDependencies = sortDependencies;
+		cfg.sortDependencyManagement = sortDependencyManagement;
 		cfg.sortDependencyExclusions = sortDependencyExclusions;
 		cfg.sortPlugins = sortPlugins;
 		cfg.sortProperties = sortProperties;

From a4ddf9d85bf867b10037fa5c84fcafc0e4e92dd2 Mon Sep 17 00:00:00 2001
From: "Tyler B. Thrailkill" <tylerbthrailkill@gmail.com>
Date: Tue, 18 Apr 2023 16:09:12 -0600
Subject: [PATCH 1045/2068] Add sortpom change to changelog

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 1 +
 plugin-maven/CHANGES.md  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 50141ece9c..323912888b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,7 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+* Update sortpom plugin to the newest version
 
 ## [2.38.0] - 2023-04-06
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index becf2e5ac7..f64b54b65d 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Fixed
 * Added `@DisableCachingByDefault` to `RegisterDependenciesTask`.
+* Update sortpom plugin to the newest version
 
 ## [6.18.0] - 2023-04-06
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index df994a2b44..96a7b5189f 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,7 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+* Update sortpom plugin to the newest version
 
 ## [2.36.0] - 2023-04-06
 ### Added

From 1028dd1689aa8cda1ac957d3d40c47153fe4b683 Mon Sep 17 00:00:00 2001
From: "Tyler B. Thrailkill" <tylerbthrailkill@gmail.com>
Date: Tue, 18 Apr 2023 16:09:15 -0600
Subject: [PATCH 1046/2068] Update changelog with pr reference

---
 CHANGES.md               | 3 ++-
 plugin-gradle/CHANGES.md | 3 ++-
 plugin-maven/CHANGES.md  | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 323912888b..6d5b4d9ead 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,7 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
-* Update sortpom plugin to the newest version
+### Changes
+* Bump default sortpom version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675))
 
 ## [2.38.0] - 2023-04-06
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index f64b54b65d..1e875dff9c 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,7 +5,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Fixed
 * Added `@DisableCachingByDefault` to `RegisterDependenciesTask`.
-* Update sortpom plugin to the newest version
+### Changes
+* Bump default sortpom version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675))
 
 ## [6.18.0] - 2023-04-06
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 96a7b5189f..911ffc306c 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,7 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
-* Update sortpom plugin to the newest version
+### Changes
+* Bump default sortpom version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675))
 
 ## [2.36.0] - 2023-04-06
 ### Added

From e686e4f58263b6a046c62b124404a032ebce9a35 Mon Sep 17 00:00:00 2001
From: "Tyler B. Thrailkill" <tylerbthrailkill@gmail.com>
Date: Tue, 18 Apr 2023 16:09:18 -0600
Subject: [PATCH 1047/2068] Make sortpom version configurable

Add test for version config
Update SortPomTest to use ResourceHarness
---
 .../com/diffplug/spotless/pom/SortPomCfg.java |  2 ++
 .../diffplug/spotless/pom/SortPomStep.java    |  4 +++-
 .../diffplug/spotless/maven/pom/SortPom.java  |  4 ++++
 .../diffplug/spotless/pom/SortPomTest.java    | 21 ++++++++++++-------
 4 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/pom/SortPomCfg.java b/lib/src/main/java/com/diffplug/spotless/pom/SortPomCfg.java
index 7c9f0f09a9..8315035dc7 100644
--- a/lib/src/main/java/com/diffplug/spotless/pom/SortPomCfg.java
+++ b/lib/src/main/java/com/diffplug/spotless/pom/SortPomCfg.java
@@ -21,6 +21,8 @@
 public class SortPomCfg implements Serializable {
 	private static final long serialVersionUID = 1L;
 
+	public String version = "3.2.1";
+
 	public String encoding = "UTF-8";
 
 	public String lineSeparator = System.getProperty("line.separator");
diff --git a/lib/src/main/java/com/diffplug/spotless/pom/SortPomStep.java b/lib/src/main/java/com/diffplug/spotless/pom/SortPomStep.java
index 7f672d5c05..4325d16516 100644
--- a/lib/src/main/java/com/diffplug/spotless/pom/SortPomStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/pom/SortPomStep.java
@@ -27,6 +27,8 @@
 
 public class SortPomStep {
 	public static final String NAME = "sortPom";
+	static final String PACKAGE = "com.github.ekryd.sortpom";
+	static final String MAVEN_COORDINATE = PACKAGE + ":sortpom-sorter:";
 
 	private SortPomStep() {}
 
@@ -42,7 +44,7 @@ static class State implements Serializable {
 
 		public State(SortPomCfg cfg, Provisioner provisioner) throws IOException {
 			this.cfg = cfg;
-			this.jarState = JarState.from("com.github.ekryd.sortpom:sortpom-sorter:3.2.1", provisioner);
+			this.jarState = JarState.from(MAVEN_COORDINATE + cfg.version, provisioner);
 		}
 
 		FormatterFunc createFormat() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException {
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/pom/SortPom.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/pom/SortPom.java
index a1706ee381..8620427f79 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/pom/SortPom.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/pom/SortPom.java
@@ -26,6 +26,9 @@
 public class SortPom implements FormatterStepFactory {
 	private final SortPomCfg defaultValues = new SortPomCfg();
 
+	@Parameter
+	String version = defaultValues.version;
+
 	@Parameter
 	String encoding = defaultValues.encoding;
 
@@ -80,6 +83,7 @@ public class SortPom implements FormatterStepFactory {
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 		SortPomCfg cfg = new SortPomCfg();
+		cfg.version = version;
 		cfg.encoding = encoding;
 		cfg.lineSeparator = lineSeparator;
 		cfg.expandEmptyElements = expandEmptyElements;
diff --git a/testlib/src/test/java/com/diffplug/spotless/pom/SortPomTest.java b/testlib/src/test/java/com/diffplug/spotless/pom/SortPomTest.java
index f397962086..c88918f505 100644
--- a/testlib/src/test/java/com/diffplug/spotless/pom/SortPomTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/pom/SortPomTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2021-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,16 +17,21 @@
 
 import org.junit.jupiter.api.Test;
 
-import com.diffplug.spotless.Provisioner;
-import com.diffplug.spotless.StepHarness;
-import com.diffplug.spotless.TestProvisioner;
+import com.diffplug.spotless.*;
 
-public class SortPomTest {
+public class SortPomTest extends ResourceHarness {
 	@Test
 	public void testSortPomWithDefaultConfig() throws Exception {
 		SortPomCfg cfg = new SortPomCfg();
-		Provisioner provisioner = TestProvisioner.mavenCentral();
-		StepHarness harness = StepHarness.forStep(SortPomStep.create(cfg, provisioner));
-		harness.testResource("pom/pom_dirty.xml", "pom/pom_clean_default.xml");
+		FormatterStep step = SortPomStep.create(cfg, TestProvisioner.mavenCentral());
+		StepHarness.forStep(step).testResource("pom/pom_dirty.xml", "pom/pom_clean_default.xml");
+	}
+
+	@Test
+	public void testSortPomWithVersion() throws Exception {
+		SortPomCfg cfg = new SortPomCfg();
+		cfg.version = "3.2.1";
+		FormatterStep step = SortPomStep.create(cfg, TestProvisioner.mavenCentral());
+		StepHarness.forStep(step).testResource("pom/pom_dirty.xml", "pom/pom_clean_default.xml");
 	}
 }

From e0c01205759d19dc1861c4a850305f7fbbf8b53f Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Wed, 19 Apr 2023 08:45:26 +0200
Subject: [PATCH 1048/2068] reproducer for issue #1679

---
 .../main/resources/combined/issue1679.clean   | 106 ++++++++++++++++++
 .../main/resources/combined/issue1679.dirty   | 104 +++++++++++++++++
 .../combined/CombinedJavaFormatStepTest.java  |  56 +++++++++
 3 files changed, 266 insertions(+)
 create mode 100644 testlib/src/main/resources/combined/issue1679.clean
 create mode 100644 testlib/src/main/resources/combined/issue1679.dirty
 create mode 100644 testlib/src/test/java/com/diffplug/spotless/combined/CombinedJavaFormatStepTest.java

diff --git a/testlib/src/main/resources/combined/issue1679.clean b/testlib/src/main/resources/combined/issue1679.clean
new file mode 100644
index 0000000000..af86db275e
--- /dev/null
+++ b/testlib/src/main/resources/combined/issue1679.clean
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2021-2022 Creek Contributors (https://github.com/creek-service)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.github.creek.service.basic.kafka.streams.demo.services;
+
+// formatting:off
+// begin-snippet: includes-1
+import static io.github.creek.service.basic.kafka.streams.demo.internal.TopicConfigBuilder.withPartitions;
+import static io.github.creek.service.basic.kafka.streams.demo.internal.TopicDescriptors.inputTopic;
+import static io.github.creek.service.basic.kafka.streams.demo.internal.TopicDescriptors.outputTopic;
+// end-snippet
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+// begin-snippet: includes-2
+import org.creekservice.api.kafka.metadata.OwnedKafkaTopicInput;
+import org.creekservice.api.kafka.metadata.OwnedKafkaTopicOutput;
+// end-snippet
+import org.creekservice.api.platform.metadata.ComponentInput;
+import org.creekservice.api.platform.metadata.ComponentInternal;
+import org.creekservice.api.platform.metadata.ComponentOutput;
+import org.creekservice.api.platform.metadata.ServiceDescriptor;
+// formatting:on
+
+// begin-snippet: class-name
+public final class HandleOccurrenceServiceDescriptor implements ServiceDescriptor {
+    // end-snippet
+    private static final List<ComponentInput> INPUTS = new ArrayList<>();
+    private static final List<ComponentInternal> INTERNALS = new ArrayList<>();
+    private static final List<ComponentOutput> OUTPUTS = new ArrayList<>();
+
+    // formatting:off
+// begin-snippet: topic-resources
+    // Define the tweet-text input topic, conceptually owned by this service:
+    public static final OwnedKafkaTopicInput<Long, String> TweetTextStream =
+            register(
+                    inputTopic(
+                            "twitter.tweet.text", // Topic name
+                            Long.class, // Topic key: Tweet id
+                            String.class, // Topic value: Tweet text
+                            withPartitions(5))); // Topic config
+
+    // Define the output topic, again conceptually owned by this service:
+    public static final OwnedKafkaTopicOutput<String, Integer> TweetHandleUsageStream =
+            register(outputTopic(
+                    "twitter.handle.usage",
+                    String.class, // Twitter handle
+                    Integer.class,  // Usage count
+                    withPartitions(6)
+                        .withRetentionTime(Duration.ofHours(12))
+            ));
+// end-snippet
+// formatting:on
+
+    public HandleOccurrenceServiceDescriptor() {}
+
+    @Override
+    public String dockerImage() {
+        return "ghcr.io/creek-service/basic-kafka-streams-demo-handle-occurrence-service";
+    }
+
+    @Override
+    public Collection<ComponentInput> inputs() {
+        return List.copyOf(INPUTS);
+    }
+
+    @Override
+    public Collection<ComponentInternal> internals() {
+        return List.copyOf(INTERNALS);
+    }
+
+    @Override
+    public Collection<ComponentOutput> outputs() {
+        return List.copyOf(OUTPUTS);
+    }
+
+    private static <T extends ComponentInput> T register(final T input) {
+        INPUTS.add(input);
+        return input;
+    }
+
+    // Uncomment if needed:
+    // private static <T extends ComponentInternal> T register(final T internal) {
+    //     INTERNALS.add(internal);
+    //     return internal;
+    // }
+
+    private static <T extends ComponentOutput> T register(final T output) {
+        OUTPUTS.add(output);
+        return output;
+    }
+}
diff --git a/testlib/src/main/resources/combined/issue1679.dirty b/testlib/src/main/resources/combined/issue1679.dirty
new file mode 100644
index 0000000000..70754cef6c
--- /dev/null
+++ b/testlib/src/main/resources/combined/issue1679.dirty
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2021-2022 Creek Contributors (https://github.com/creek-service)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.github.creek.service.basic.kafka.streams.demo.services;
+
+// formatting:off
+// begin-snippet: includes-1
+import static io.github.creek.service.basic.kafka.streams.demo.internal.TopicConfigBuilder.withPartitions;
+import static io.github.creek.service.basic.kafka.streams.demo.internal.TopicDescriptors.inputTopic;
+import static io.github.creek.service.basic.kafka.streams.demo.internal.TopicDescriptors.outputTopic;
+// end-snippet
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+// begin-snippet: includes-2
+import org.creekservice.api.kafka.metadata.OwnedKafkaTopicInput;
+import org.creekservice.api.kafka.metadata.OwnedKafkaTopicOutput;
+// end-snippet
+import org.creekservice.api.platform.metadata.ComponentInput;
+import org.creekservice.api.platform.metadata.ComponentInternal;
+import org.creekservice.api.platform.metadata.ComponentOutput;
+import org.creekservice.api.platform.metadata.ServiceDescriptor;
+// formatting:on
+
+// begin-snippet: class-name
+public final class HandleOccurrenceServiceDescriptor implements ServiceDescriptor {
+    // end-snippet
+    private static final List<ComponentInput> INPUTS = new ArrayList<>();
+    private static final List<ComponentInternal> INTERNALS = new ArrayList<>();
+    private static final List<ComponentOutput> OUTPUTS = new ArrayList<>();
+
+    // formatting:off
+// begin-snippet: topic-resources
+    // Define the tweet-text input topic, conceptually owned by this service:
+    public static final OwnedKafkaTopicInput<Long, String> TweetTextStream =
+            register(
+                    inputTopic(
+                            "twitter.tweet.text", // Topic name
+                            Long.class, // Topic key: Tweet id
+                            String.class, // Topic value: Tweet text
+                            withPartitions(5))); // Topic config
+
+    // Define the output topic, again conceptually owned by this service:
+    public static final OwnedKafkaTopicOutput<String, Integer> TweetHandleUsageStream =
+            register(outputTopic(
+                    "twitter.handle.usage",
+                    String.class, // Twitter handle
+                    Integer.class,  // Usage count
+                    withPartitions(6)
+                        .withRetentionTime(Duration.ofHours(12))
+            ));
+// end-snippet
+// formatting:on
+
+    public HandleOccurrenceServiceDescriptor() {}
+
+    @Override
+    public String dockerImage() {
+        return "ghcr.io/creek-service/basic-kafka-streams-demo-handle-occurrence-service";
+    }
+
+    @Override
+    public Collection<ComponentInput> inputs() { return List.copyOf(INPUTS); }
+
+    @Override
+    public Collection<ComponentInternal> internals() {
+        return List.copyOf(INTERNALS);
+    }
+
+    @Override
+    public Collection<ComponentOutput> outputs() {
+        return List.copyOf(OUTPUTS);
+    }
+
+    private static <T extends ComponentInput> T register(final T input) {
+        INPUTS.add(input);
+        return input;
+    }
+
+    // Uncomment if needed:
+    // private static <T extends ComponentInternal> T register(final T internal) {
+    //     INTERNALS.add(internal);
+    //     return internal;
+    // }
+
+    private static <T extends ComponentOutput> T register(final T output) {
+        OUTPUTS.add(output);
+        return output;
+    }
+}
\ No newline at end of file
diff --git a/testlib/src/test/java/com/diffplug/spotless/combined/CombinedJavaFormatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/combined/CombinedJavaFormatStepTest.java
new file mode 100644
index 0000000000..cc32281771
--- /dev/null
+++ b/testlib/src/test/java/com/diffplug/spotless/combined/CombinedJavaFormatStepTest.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.combined;
+
+import static com.diffplug.spotless.TestProvisioner.mavenCentral;
+
+import org.junit.jupiter.api.Test;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.ResourceHarness;
+import com.diffplug.spotless.StepHarness;
+import com.diffplug.spotless.generic.EndWithNewlineStep;
+import com.diffplug.spotless.generic.IndentStep;
+import com.diffplug.spotless.generic.PipeStepPair;
+import com.diffplug.spotless.generic.TrimTrailingWhitespaceStep;
+import com.diffplug.spotless.java.GoogleJavaFormatStep;
+import com.diffplug.spotless.java.ImportOrderStep;
+import com.diffplug.spotless.java.RemoveUnusedImportsStep;
+
+public class CombinedJavaFormatStepTest extends ResourceHarness {
+
+	@Test
+	void checkIssue1679() {
+		FormatterStep gjf = GoogleJavaFormatStep.create("1.15.0", "AOSP", mavenCentral());
+		FormatterStep indentWithSpaces = IndentStep.Type.SPACE.create();
+		FormatterStep importOrder = ImportOrderStep.forJava().createFrom();
+		FormatterStep removeUnused = RemoveUnusedImportsStep.create(mavenCentral());
+		FormatterStep trimTrailing = TrimTrailingWhitespaceStep.create();
+		FormatterStep endWithNewLine = EndWithNewlineStep.create();
+		PipeStepPair toggleOffOnPair = PipeStepPair.named(PipeStepPair.defaultToggleName()).openClose("formatting:off", "formatting:on").buildPair();
+		try (StepHarness formatter = StepHarness.forSteps(
+				toggleOffOnPair.in(),
+				gjf,
+				indentWithSpaces,
+				importOrder,
+				removeUnused,
+				trimTrailing,
+				endWithNewLine,
+				toggleOffOnPair.out())) {
+			formatter.testResource("combined/issue1679.dirty", "combined/issue1679.clean");
+		}
+	}
+}

From 0183cc20385361775fac3eacc0b11f8a443f4c0f Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Wed, 19 Apr 2023 10:20:53 +0200
Subject: [PATCH 1049/2068] fix #1679

---
 .../glue/java/GoogleJavaFormatFormatterFunc.java       | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/src/googleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatFormatterFunc.java b/lib/src/googleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatFormatterFunc.java
index f45394979a..87e086b440 100644
--- a/lib/src/googleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatFormatterFunc.java
+++ b/lib/src/googleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatFormatterFunc.java
@@ -23,6 +23,7 @@
 import com.google.googlejavaformat.java.FormatterException;
 import com.google.googlejavaformat.java.ImportOrderer;
 import com.google.googlejavaformat.java.JavaFormatterOptions;
+import com.google.googlejavaformat.java.JavaFormatterOptions.Style;
 import com.google.googlejavaformat.java.RemoveUnusedImports;
 import com.google.googlejavaformat.java.StringWrapper;
 
@@ -37,13 +38,13 @@ public class GoogleJavaFormatFormatterFunc implements FormatterFunc {
 	private final String version;
 
 	@Nonnull
-	private final JavaFormatterOptions.Style formatterStyle;
+	private final Style formatterStyle;
 
 	private final boolean reflowStrings;
 
 	public GoogleJavaFormatFormatterFunc(@Nonnull String version, @Nonnull String style, boolean reflowStrings) {
 		this.version = Objects.requireNonNull(version);
-		this.formatterStyle = JavaFormatterOptions.Style.valueOf(Objects.requireNonNull(style));
+		this.formatterStyle = Style.valueOf(Objects.requireNonNull(style));
 		this.reflowStrings = reflowStrings;
 
 		this.formatter = new Formatter(JavaFormatterOptions.builder()
@@ -56,7 +57,10 @@ public GoogleJavaFormatFormatterFunc(@Nonnull String version, @Nonnull String st
 	public String apply(@Nonnull String input) throws Exception {
 		String formatted = formatter.formatSource(input);
 		String removedUnused = RemoveUnusedImports.removeUnusedImports(formatted);
-		String sortedImports = ImportOrderer.reorderImports(removedUnused, formatterStyle);
+		// Issue #1679: we used to call ImportOrderer.reorderImports(String) here, but that is deprecated.
+		// Replacing the call with (the correct) reorderImports(String, Style) causes issues for Style.AOSP,
+		// so we force the style to GOOGLE for now (which is what the deprecated method did)
+		String sortedImports = ImportOrderer.reorderImports(removedUnused, Style.GOOGLE);
 		return reflowLongStrings(sortedImports);
 	}
 

From a4c53cf29e58d05ee52ba86b45ba3ee632ad9a9f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 21 Apr 2023 20:59:25 +0000
Subject: [PATCH 1050/2068] fix(deps): update dependency
 org.mockito:mockito-core to v5.3.1

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index c235d2ac5a..a22e891679 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -32,4 +32,4 @@ VER_DURIAN=1.2.0
 VER_JGIT=6.5.0.202303070854-r
 VER_JUNIT=5.9.2
 VER_ASSERTJ=3.24.2
-VER_MOCKITO=5.3.0
+VER_MOCKITO=5.3.1

From 20729b8272c211f21f241037c307090356044135 Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <sensenmann5@gmail.com>
Date: Sat, 22 Apr 2023 10:59:18 +0100
Subject: [PATCH 1051/2068] Fix conversion of file URL to Path, improve
 exception handling

---
 .../diffplug/spotless/maven/FileLocator.java  | 43 ++++++++++++-------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FileLocator.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FileLocator.java
index fdf91ef68f..91aae3a055 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FileLocator.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FileLocator.java
@@ -19,6 +19,9 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import java.io.File;
+import java.net.URISyntaxException;
+import java.nio.file.FileSystemNotFoundException;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -119,21 +122,31 @@ private static byte[] hash(String value) {
 	}
 
 	private static File findDataDir() {
-		// JAR path is e.g.
-		// ~/.m2/repository/com/diffplug/spotless/spotless-plugin-maven/1.2.3/spotless-plugin-maven-1.2.3.jar
-		var codeSource = FileLocator.class.getProtectionDomain().getCodeSource();
-		var location = codeSource != null ? codeSource.getLocation() : null;
-		var path = location != null ? location.getPath() : null;
-		var jarPath = path != null && !path.isBlank() ? Paths.get(path) : null;
-		var parent1 = jarPath != null ? jarPath.getParent() : null;
-		var parent2 = parent1 != null ? parent1.getParent() : null;
-		var base = parent2 != null ? parent2.getParent() : null;
-		var sub = base != null ? base.resolve("spotless-data") : null;
-		if (sub != null) {
-			return sub.toAbsolutePath().toFile();
-		} else {
-			var home = Paths.get(System.getenv("user.home"));
-			return home.resolve(".rome").toAbsolutePath().toFile();
+		try {
+			// JAR path is e.g.
+			// ~/.m2/repository/com/diffplug/spotless/spotless-plugin-maven/1.2.3/spotless-plugin-maven-1.2.3.jar
+			var codeSource = FileLocator.class.getProtectionDomain().getCodeSource();
+			var location = codeSource != null ? codeSource.getLocation() : null;
+			var locationUri = location != null ? location.toURI() : null;
+			var jarPath = locationUri != null && "file".equals(locationUri.getScheme()) ? Path.of(locationUri) : null;
+			var parent1 = jarPath != null ? jarPath.getParent() : null;
+			var parent2 = parent1 != null ? parent1.getParent() : null;
+			var base = parent2 != null ? parent2.getParent() : null;
+			var sub = base != null ? base.resolve("spotless-data") : null;
+			if (sub != null) {
+				return sub.toAbsolutePath().toFile();
+			} else {
+				return findUserHome();
+			}
+		} catch (final SecurityException e) {
+			return findUserHome();
+		} catch (final URISyntaxException | FileSystemNotFoundException | IllegalArgumentException e) {
+			throw new RuntimeException("Unable to determine data directory in local Maven repository", e);
 		}
 	}
+	
+	private static File findUserHome() {
+		var home = Paths.get(System.getenv("user.home"));
+		return home.resolve(".rome").toAbsolutePath().toFile();
+	}
 }

From bc3261ba30de82db7f81adc79da684837fdc8f3a Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <sensenmann5@gmail.com>
Date: Sat, 22 Apr 2023 11:13:22 +0100
Subject: [PATCH 1052/2068] use sha-256 for downloaded rome binary checksum

---
 .../diffplug/spotless/rome/RomeExecutableDownloader.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java b/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java
index 5f389f0342..1307655e63 100644
--- a/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java
+++ b/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java
@@ -47,7 +47,7 @@ final class RomeExecutableDownloader {
 	/**
 	 * The checksum algorithm to use for checking the integrity of downloaded files.
 	 */
-	private static final String CHECKSUM_ALGORITHM = "MD5";
+	private static final String CHECKSUM_ALGORITHM = "SHA256";
 
 	/**
 	 * The pattern for {@link String#format(String, Object...) String.format()} for
@@ -229,7 +229,7 @@ private boolean checkFileWithChecksum(Path filePath) {
 	 *
 	 * @param file      File to process.
 	 * @param algorithm The checksum algorithm to use.
-	 * @return The MD5 checksum of the given file.
+	 * @return The checksum of the given file.
 	 * @throws IOException When the file does not exist or could not be read.
 	 */
 	private String computeChecksum(Path file, String algorithm) throws IOException {
@@ -276,7 +276,7 @@ private Path getChecksumPath(Path file) {
 		var parent = file.getParent();
 		var base = parent != null ? parent : file;
 		var fileName = file.getFileName();
-		var checksumName = fileName != null ? fileName.toString() + ".md5" : "checksum.md5";
+		var checksumName = fileName != null ? fileName.toString() + ".sha256" : "checksum.sha256";
 		return base.resolve(checksumName);
 	}
 

From 3456be2d5325d793a708b9c7bd31ccefea263d94 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 26 Apr 2023 09:15:48 +0000
Subject: [PATCH 1053/2068] fix(deps): update dependency
 org.junit.jupiter:junit-jupiter to v5.9.3

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index a22e891679..31bed9971d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -30,6 +30,6 @@ VER_SLF4J=[1.6,2.0[
 # Used in multiple places
 VER_DURIAN=1.2.0
 VER_JGIT=6.5.0.202303070854-r
-VER_JUNIT=5.9.2
+VER_JUNIT=5.9.3
 VER_ASSERTJ=3.24.2
 VER_MOCKITO=5.3.1

From 82390aed00ff8491f55edc62ef7dc809ab0242e8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 28 Apr 2023 18:48:51 +0000
Subject: [PATCH 1054/2068] fix(deps): update dependency com.facebook:ktfmt to
 v0.44

---
 lib/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 9e31bed698..2df76a2864 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -89,7 +89,7 @@ dependencies {
 	jacksonCompileOnly "com.fasterxml.jackson.core:jackson-databind:$VER_JACKSON"
 	jacksonCompileOnly "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$VER_JACKSON"
 	// ktfmt
-	ktfmtCompileOnly "com.facebook:ktfmt:0.43"
+	ktfmtCompileOnly "com.facebook:ktfmt:0.44"
 	ktfmtCompileOnly("com.google.googlejavaformat:google-java-format") {
 		version {
 			strictly '1.7' // for JDK 8 compatibility

From 5e75cb166ed97abc32d2337099465828e5797602 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sat, 29 Apr 2023 12:03:50 -0700
Subject: [PATCH 1055/2068] Update README to reflect that we require Java 11
 (fixes #1690).

---
 plugin-gradle/README.md | 5 +++--
 plugin-maven/README.md  | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index cea45a049f..d84645e51d 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -132,9 +132,10 @@ All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.dif
 
 ### Requirements
 
-Spotless requires JRE 8+, and Gradle 6.1.1+.  Some steps require JRE 11+, `Unsupported major.minor version` means you're using a step that needs a newer JRE.
+Spotless requires JRE 11+ and Gradle 6.1.1 or newer.
 
-If you're stuck on an older version of Gradle, `id 'com.diffplug.gradle.spotless' version '4.5.1'` supports all the way back to Gradle 2.x.
+- If you're stuck on JRE 8, use [`id 'com.diffplug.spotless' version '6.13.0'` or older](https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md#6130---2023-01-14).
+- If you're stuck on an older version of Gradle, [`id 'com.diffplug.gradle.spotless' version '4.5.1'` supports all the way back to Gradle 2.x](https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md#451---2020-07-04).
 
 <a name="applying-to-java-source"></a>
 
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index ba687a06c9..505eafeedd 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -137,7 +137,7 @@ Spotless consists of a list of formats (in the example above, `misc` and `java`)
 
 ### Requirements
 
-Spotless requires Maven to be running on JRE 8+.
+Spotless requires Maven to be running on JRE 11+. To use JRE 8, go back to [`2.30.0` or older](https://github.com/diffplug/spotless/blob/main/plugin-maven/CHANGES.md#2300---2023-01-13).
 
 <a name="applying-to-java-source"></a>
 

From 8b2afb90b502d3134f6c75ff7ec252a05e2d753f Mon Sep 17 00:00:00 2001
From: tison <wander4096@gmail.com>
Date: Sat, 6 May 2023 23:31:01 +0800
Subject: [PATCH 1056/2068] PalantirJavaFormat in plugin-maven should take
 style parameter

It's on the document, but we don't actually have such a parameter.
---
 .../diffplug/spotless/maven/java/PalantirJavaFormat.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/PalantirJavaFormat.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/PalantirJavaFormat.java
index df58764c1d..c8962aa07a 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/PalantirJavaFormat.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/PalantirJavaFormat.java
@@ -27,9 +27,13 @@ public class PalantirJavaFormat implements FormatterStepFactory {
 	@Parameter
 	private String version;
 
+	@Parameter
+	private String style;
+
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig config) {
 		String version = this.version != null ? this.version : PalantirJavaFormatStep.defaultVersion();
-		return PalantirJavaFormatStep.create(version, config.getProvisioner());
+		String style = this.style != null ? this.style : PalantirJavaFormatStep.defaultStyle();
+		return PalantirJavaFormatStep.create(version, style, config.getProvisioner());
 	}
 }

From 0f6b1c1de6d6d6a0db6d2a959b363b4e50a927f8 Mon Sep 17 00:00:00 2001
From: tison <wander4096@gmail.com>
Date: Sat, 6 May 2023 23:33:07 +0800
Subject: [PATCH 1057/2068] Update PalantirJavaFormat.java

---
 .../com/diffplug/spotless/maven/java/PalantirJavaFormat.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/PalantirJavaFormat.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/PalantirJavaFormat.java
index c8962aa07a..192588d85d 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/PalantirJavaFormat.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/PalantirJavaFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 22ad0b6414cdbd1da5705bd796e7560968f2cc77 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 10 May 2023 00:26:03 -0700
Subject: [PATCH 1058/2068] Update changelog.

---
 plugin-maven/CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index df994a2b44..c00aeda138 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* `palantir` step now accepts a `style` parameter, which is documentation had already claimed to do. ([#1694](https://github.com/diffplug/spotless/pull/1694))
 
 ## [2.36.0] - 2023-04-06
 ### Added

From 0e9355773af3245cbb6142fe94eaf253e85460ee Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Wed, 10 May 2023 08:03:05 -0400
Subject: [PATCH 1059/2068] If `EquoBasedStepBuilder.get` fails, indicate the
 formatter

---
 .../diffplug/spotless/extra/EquoBasedStepBuilder.java    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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 db2e6674db..7f0e181837 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
@@ -16,6 +16,7 @@
 package com.diffplug.spotless.extra;
 
 import java.io.File;
+import java.io.IOException;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
@@ -36,6 +37,7 @@
 import dev.equo.solstice.p2.P2ClientCache;
 import dev.equo.solstice.p2.P2Model;
 import dev.equo.solstice.p2.P2QueryCache;
+import dev.equo.solstice.p2.P2QueryResult;
 
 /**
  * Generic Eclipse based formatter step {@link State} builder.
@@ -100,7 +102,12 @@ protected void addPlatformRepo(P2Model model, String version) {
 
 	/** Creates the state of the configuration. */
 	EquoBasedStepBuilder.State get() throws Exception {
-		var query = createModelWithMirrors().query(P2ClientCache.PREFER_OFFLINE, P2QueryCache.ALLOW);
+		P2QueryResult query;
+		try {
+			query = createModelWithMirrors().query(P2ClientCache.PREFER_OFFLINE, P2QueryCache.ALLOW);
+		} catch (Exception x) {
+			throw new IOException("Failed to load " + formatterName + ": " + x, x);
+		}
 		var classpath = new ArrayList<File>();
 		var mavenDeps = new ArrayList<String>();
 		mavenDeps.add("dev.equo.ide:solstice:1.0.3");

From fab850fd469674f963ebe6fa63dc9708573501aa Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Wed, 10 May 2023 08:08:45 -0400
Subject: [PATCH 1060/2068] changelog

---
 CHANGES.md               | 2 ++
 plugin-gradle/CHANGES.md | 1 +
 plugin-maven/CHANGES.md  | 1 +
 3 files changed, 4 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 5ec89d7173..0ddf4511b0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,6 +13,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ### Added
 * `Jvm.Support` now accepts `-SNAPSHOT` versions, treated as the non`-SNAPSHOT`. ([#1583](https://github.com/diffplug/spotless/issues/1583))
+### Fixed
+* When P2 download fails, indicate the responsible formatter. ([#1698](https://github.com/diffplug/spotless/issues/1698))
 
 ## [2.38.0] - 2023-04-06
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index becf2e5ac7..56afb7c34f 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Fixed
 * Added `@DisableCachingByDefault` to `RegisterDependenciesTask`.
+* When P2 download fails, indicate the responsible formatter. ([#1698](https://github.com/diffplug/spotless/issues/1698))
 
 ## [6.18.0] - 2023-04-06
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index c00aeda138..06bf3c86bf 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Fixed
 * `palantir` step now accepts a `style` parameter, which is documentation had already claimed to do. ([#1694](https://github.com/diffplug/spotless/pull/1694))
+* When P2 download fails, indicate the responsible formatter. ([#1698](https://github.com/diffplug/spotless/issues/1698))
 
 ## [2.36.0] - 2023-04-06
 ### Added

From b516c65d267afa387a53d06c48f11a1d8603c70f Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <awa@xima.de>
Date: Tue, 16 May 2023 06:32:17 +0100
Subject: [PATCH 1061/2068] Remove whitespace on  empty line

---
 .../src/main/java/com/diffplug/spotless/maven/FileLocator.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FileLocator.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FileLocator.java
index 91aae3a055..088c35a3d0 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FileLocator.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FileLocator.java
@@ -144,7 +144,7 @@ private static File findDataDir() {
 			throw new RuntimeException("Unable to determine data directory in local Maven repository", e);
 		}
 	}
-	
+
 	private static File findUserHome() {
 		var home = Paths.get(System.getenv("user.home"));
 		return home.resolve(".rome").toAbsolutePath().toFile();

From 39d61bc1bee17d937ea390880aa2a048684f8858 Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <awa@xima.de>
Date: Tue, 16 May 2023 06:56:40 +0100
Subject: [PATCH 1062/2068] SHA256 -> SHA-256

---
 .../com/diffplug/spotless/rome/RomeExecutableDownloader.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java b/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java
index 1307655e63..578916a54b 100644
--- a/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java
+++ b/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java
@@ -47,7 +47,7 @@ final class RomeExecutableDownloader {
 	/**
 	 * The checksum algorithm to use for checking the integrity of downloaded files.
 	 */
-	private static final String CHECKSUM_ALGORITHM = "SHA256";
+	private static final String CHECKSUM_ALGORITHM = "SHA-256";
 
 	/**
 	 * The pattern for {@link String#format(String, Object...) String.format()} for

From 49ee3e2188aad00eaefee6dd36ecd8d1c7bf329d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 16 May 2023 06:35:43 +0000
Subject: [PATCH 1063/2068] chore(deps): update plugin com.gradle.enterprise to
 v3.13.2

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 41c2a123e0..c609e09116 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -23,7 +23,7 @@ plugins {
 	// https://github.com/davidburstrom/version-compatibility-gradle-plugin/tags
 	id 'io.github.davidburstrom.version-compatibility' version '0.5.0' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.enterprise
-	id 'com.gradle.enterprise' version '3.13'
+	id 'com.gradle.enterprise' version '3.13.2'
 	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
 	id 'dev.equo.ide' version '1.0.1' apply false
 }

From 6c8bff185e91e3115eda160b20255b1d25f23ac9 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 16 May 2023 23:10:56 -0700
Subject: [PATCH 1064/2068] Update changelogs.

---
 CHANGES.md               | 3 +--
 plugin-gradle/CHANGES.md | 7 ++-----
 plugin-maven/CHANGES.md  | 4 +---
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 9096e9735f..faf42c0cee 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,7 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * `Jvm.Support` now accepts `-SNAPSHOT` versions, treated as the non`-SNAPSHOT`. ([#1583](https://github.com/diffplug/spotless/issues/1583))
-* Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. https://github.com/diffplug/spotless/pull/1663
+* Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. ([#1663](https://github.com/diffplug/spotless/pull/1663))
 ### Fixed
 * When P2 download fails, indicate the responsible formatter. ([#1698](https://github.com/diffplug/spotless/issues/1698))
 ### Changes
@@ -29,7 +29,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `diktat` version `1.2.4.2` -> `1.2.5`. ([#1631](https://github.com/diffplug/spotless/pull/1631))
 * Bump default `flexmark` version `0.62.2` -> `0.64.0`. ([#1302](https://github.com/diffplug/spotless/pull/1302))
 * Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
-
 * Bump default `scalafmt` version `3.7.1` -> `3.7.3`. ([#1584](https://github.com/diffplug/spotless/pull/1584))
 * Bump default Eclipse formatters for the 2023-03 release. ([#1662](https://github.com/diffplug/spotless/pull/1662))
   * JDT and GrEclipse `4.26` -> `4.27`
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index e10542f364..5d68193da9 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -4,10 +4,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. https://github.com/diffplug/spotless/pull/1663
-
+* Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. ([#1663](https://github.com/diffplug/spotless/pull/1663))
 ### Fixed
-* Added `@DisableCachingByDefault` to `RegisterDependenciesTask`.
+* Added `@DisableCachingByDefault` to `RegisterDependenciesTask`. ([#1666](https://github.com/diffplug/spotless/pull/1666))
 * When P2 download fails, indicate the responsible formatter. ([#1698](https://github.com/diffplug/spotless/issues/1698))
 ### Changes
 * Bump default sortpom version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675))
@@ -27,7 +26,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
   Mirrors are selected by prefix match, for example `https://download.eclipse.org/eclipse/updates/4.26/` will be redirected to `https://some.internal.mirror/eclipse/eclipse/updates/4.26/`.
   The same configuration exists for `greclipse` and `eclipseCdt`.
 * The `style` option in Palantir Java Format ([#1654](https://github.com/diffplug/spotless/pull/1654)).
-
 ### Fixed
 * Stop using deprecated conventions when used in Gradle >= `7.1`. ([#1618](https://github.com/diffplug/spotless/pull/1618))
 ### Changes
@@ -36,7 +34,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `diktat` version `1.2.4.2` -> `1.2.5`. ([#1631](https://github.com/diffplug/spotless/pull/1631))
 * Bump default `flexmark` version `0.62.2` -> `0.64.0`. ([#1302](https://github.com/diffplug/spotless/pull/1302))
 * Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
-
 * Bump default `scalafmt` version `3.7.1` -> `3.7.3`. ([#1584](https://github.com/diffplug/spotless/pull/1584))
 * Bump default Eclipse formatters for the 2023-03 release. ([#1662](https://github.com/diffplug/spotless/pull/1662))
   * JDT and GrEclipse `4.26` -> `4.27`
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index fca3c4263e..d5744acb77 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -4,7 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. https://github.com/diffplug/spotless/pull/1663### Fixed
+* Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. ([#1663](https://github.com/diffplug/spotless/pull/1663))
 ### Fixed
 * `palantir` step now accepts a `style` parameter, which is documentation had already claimed to do. ([#1694](https://github.com/diffplug/spotless/pull/1694))
 * When P2 download fails, indicate the responsible formatter. ([#1698](https://github.com/diffplug/spotless/issues/1698))
@@ -16,7 +16,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * `removeUnusedImport` can be configured to rely on `cleanthat-javaparser-unnecessaryimport`. Default remains `google-java-format`. ([#1589](https://github.com/diffplug/spotless/pull/1589))
 * The `style` option in Palantir Java Format ([#1654](https://github.com/diffplug/spotless/pull/1654)).
 * Added formatter for Gherkin feature files ([#1649](https://github.com/diffplug/spotless/issues/1649)).
-
 * Fix non deterministic computation of cache fingerprint when using multiple formatters. ([#1643](https://github.com/diffplug/spotless/pull/1643) fixes [#1642](https://github.com/diffplug/spotless/pull/1642))
 ### Changes
 * **POTENTIALLY BREAKING** Drop support for `googleJavaFormat` versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
@@ -24,7 +23,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `diktat` version `1.2.4.2` -> `1.2.5`. ([#1631](https://github.com/diffplug/spotless/pull/1631))
 * Bump default `flexmark` version `0.62.2` -> `0.64.0`. ([#1302](https://github.com/diffplug/spotless/pull/1302))
 * Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
-
 * Bump default `scalafmt` version `3.7.1` -> `3.7.3`. ([#1584](https://github.com/diffplug/spotless/pull/1584))
 * Bump default Eclipse formatters for the 2023-03 release. ([#1662](https://github.com/diffplug/spotless/pull/1662))
   * JDT and GrEclipse `4.26` -> `4.27`

From ed4e5c237507665dc0ea918206ff3dced3d8c181 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 16 May 2023 23:14:13 -0700
Subject: [PATCH 1065/2068] Move RomeStepConfig into its own file since it's so
 big.

---
 .../gradle/spotless/FormatExtension.java      | 239 ---------------
 .../gradle/spotless/RomeStepConfig.java       | 273 ++++++++++++++++++
 2 files changed, 273 insertions(+), 239 deletions(-)
 create mode 100644 plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RomeStepConfig.java

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index c429c469d2..4fa74bc2ea 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -22,7 +22,6 @@
 import java.io.Serializable;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -38,7 +37,6 @@
 import org.gradle.api.Action;
 import org.gradle.api.GradleException;
 import org.gradle.api.Project;
-import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
 import org.gradle.api.file.ConfigurableFileTree;
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.plugins.BasePlugin;
@@ -65,7 +63,6 @@
 import com.diffplug.spotless.generic.TrimTrailingWhitespaceStep;
 import com.diffplug.spotless.npm.NpmPathResolver;
 import com.diffplug.spotless.npm.PrettierFormatterStep;
-import com.diffplug.spotless.rome.RomeStep;
 
 import groovy.lang.Closure;
 
@@ -652,242 +649,6 @@ protected FormatterStep createStep() {
 		}
 	}
 
-	public abstract static class RomeStepConfig<Self extends RomeStepConfig<Self>> {
-		/**
-		 * Optional path to the directory with configuration file for Rome. The file
-		 * must be named {@code rome.json}. When none is given, the default
-		 * configuration is used. If this is a relative path, it is resolved against the
-		 * project's base directory.
-		 */
-		@Nullable
-		private Object configPath;
-
-		/**
-		 * Optional directory where the downloaded Rome executable is placed. If this is
-		 * a relative path, it is resolved against the project's base directory.
-		 * Defaults to
-		 * <code>~/.m2/repository/com/diffplug/spotless/spotless-data/rome</code>.
-		 */
-		@Nullable
-		private Object downloadDir;
-
-		/**
-		 * Optional path to the Rome executable. Either a <code>version</code> or a
-		 * <code>pathToExe</code> should be specified. When not given, an attempt is
-		 * made to download the executable for the given version from the network. When
-		 * given, the executable is used and the <code>version</code> parameter is
-		 * ignored.
-		 * <p>
-		 * When an absolute path is given, that path is used as-is. When a relative path
-		 * is given, it is resolved against the project's base directory. When only a
-		 * file name (i.e. without any slashes or back slash path separators such as
-		 * {@code rome}) is given, this is interpreted as the name of a command with
-		 * executable that is in your {@code path} environment variable. Use
-		 * {@code ./executable-name} if you want to use an executable in the project's
-		 * base directory.
-		 */
-		@Nullable
-		private Object pathToExe;
-
-		/** A reference to the Gradle project for which spotless is executed. */
-		private final Project project;
-
-		/** Replaces the current Rome formatter step with the given step. */
-		private final Consumer<FormatterStep> replaceStep;
-
-		/**
-		 * Rome version to download, applies only when no <code>pathToExe</code> is
-		 * specified explicitly. Either a <code>version</code> or a
-		 * <code>pathToExe</code> should be specified. When not given, a default known
-		 * version is used. For stable builds, it is recommended that you always set the
-		 * version explicitly. This parameter is ignored when you specify a
-		 * <code>pathToExe</code> explicitly.
-		 */
-		@Nullable
-		private String version;
-
-		protected RomeStepConfig(Project project, Consumer<FormatterStep> replaceStep, String version) {
-			this.project = requireNonNull(project);
-			this.replaceStep = requireNonNull(replaceStep);
-			this.version = version;
-		}
-
-		/**
-		 * Optional path to the directory with configuration file for Rome. The file
-		 * must be named {@code rome.json}. When none is given, the default
-		 * configuration is used. If this is a relative path, it is resolved against the
-		 * project's base directory.
-		 * @return This step for further configuration.
-		 */
-		public Self configPath(Object configPath) {
-			this.configPath = configPath;
-			replaceStep();
-			return getThis();
-		}
-
-		/**
-		 * Optional directory where the downloaded Rome executable is placed. If this is
-		 * a relative path, it is resolved against the project's base directory.
-		 * Defaults to
-		 * <code>~/.m2/repository/com/diffplug/spotless/spotless-data/rome</code>.
-		 * @return This step for further configuration.
-		 */
-		public Self downloadDir(Object downloadDir) {
-			this.downloadDir = downloadDir;
-			replaceStep();
-			return getThis();
-		}
-
-		/**
-		 * Optional path to the Rome executable. Overwrites the configured version. No
-		 * attempt is made to download the Rome executable from the network.
-		 * <p>
-		 * When an absolute path is given, that path is used as-is. When a relative path
-		 * is given, it is resolved against the project's base directory. When only a
-		 * file name (i.e. without any slashes or back slash path separators such as
-		 * {@code rome}) is given, this is interpreted as the name of a command with
-		 * executable that is in your {@code path} environment variable. Use
-		 * {@code ./executable-name} if you want to use an executable in the project's
-		 * base directory.
-		 * @return This step for further configuration.
-		 */
-		public Self pathToExe(Object pathToExe) {
-			this.pathToExe = pathToExe;
-			replaceStep();
-			return getThis();
-		}
-
-		/**
-		 * Creates a new formatter step that formats code by calling the Rome
-		 * executable, using the current configuration.
-		 *
-		 * @return A new formatter step for the Rome formatter.
-		 */
-		protected FormatterStep createStep() {
-			var builder = newBuilder();
-			if (configPath != null) {
-				var resolvedConfigPath = project.file(configPath);
-				builder.withConfigPath(resolvedConfigPath.toString());
-			}
-			builder.withLanguage(getLanguage());
-			return builder.create();
-		}
-
-		/**
-		 * Gets the language (syntax) of the input files to format. When
-		 * <code>null</code> or the empty string, the language is detected automatically
-		 * from the file name. Currently the following languages are supported by Rome:
-		 * <ul>
-		 * <li>js (JavaScript)</li>
-		 * <li>jsx (JavaScript + JSX)</li>
-		 * <li>js? (JavaScript or JavaScript + JSX, depending on the file
-		 * extension)</li>
-		 * <li>ts (TypeScript)</li>
-		 * <li>tsx (TypeScript + JSX)</li>
-		 * <li>ts? (TypeScript or TypeScript + JSX, depending on the file
-		 * extension)</li>
-		 * <li>json (JSON)</li>
-		 * </ul>
-		 *
-		 * @return The language of the input files.
-		 */
-		protected abstract String getLanguage();
-
-		/**
-		 * @return This Rome config instance.
-		 */
-		protected abstract Self getThis();
-
-		/**
-		 * Creates a new Rome step and replaces the existing Rome step in the list of
-		 * format steps.
-		 */
-		protected void replaceStep() {
-			replaceStep.accept(createStep());
-		}
-
-		/**
-		 * Finds the data directory that can be used for storing shared data such as
-		 * Rome executable globally. This is a directory in the local repository, e.g.
-		 * <code>~/.m2/repository/com/diffplus/spotless/spotless-data<code>.
-		 *
-		 * @return The directory for storing shared data.
-		 */
-		private File findDataDir() {
-			var currentRepo = project.getRepositories().stream()
-					.filter(r -> r instanceof MavenArtifactRepository)
-					.map(r -> (MavenArtifactRepository) r)
-					.filter(r -> "file".equals(r.getUrl().getScheme()))
-					.findAny().orElse(null);
-			// Temporarily add mavenLocal() repository to get its file URL
-			var localRepo = currentRepo != null ? (MavenArtifactRepository) currentRepo : project.getRepositories().mavenLocal();
-			try {
-				// e.g. ~/.m2/repository/
-				var repoPath = Paths.get(localRepo.getUrl().getPath());
-				var dataPath = repoPath.resolve("com").resolve("diffplug").resolve("spotless").resolve("spotless-data");
-				return dataPath.toAbsolutePath().toFile();
-			} finally {
-				// Remove mavenLocal() repository again if it was not part of the project
-				if (currentRepo == null) {
-					project.getRepositories().remove(localRepo);
-				}
-			}
-		}
-
-		/**
-		 * A new builder for configuring a Rome step that either downloads the Rome
-		 * executable with the given version from the network, or uses the executable
-		 * from the given path.
-		 *
-		 * @return A builder for a Rome step.
-		 */
-		private RomeStep newBuilder() {
-			if (pathToExe != null) {
-				var resolvedPathToExe = resolvePathToExe();
-				return RomeStep.withExePath(resolvedPathToExe);
-			} else {
-				var downloadDir = resolveDownloadDir();
-				return RomeStep.withExeDownload(version, downloadDir);
-			}
-		}
-
-		/**
-		 * Resolves the path to the Rome executable. When the path is only a file name,
-		 * do not perform any resolution and interpret it as a command that must be on
-		 * the user's path. Otherwise resolve the executable path against the project's
-		 * base directory.
-		 *
-		 * @param config Configuration from the Maven Mojo execution with details about
-		 *               the currently executed project.
-		 * @return The resolved path to the Rome executable.
-		 */
-		private String resolvePathToExe() {
-			var fileNameOnly = pathToExe instanceof String && Paths.get(pathToExe.toString()).getNameCount() == 1;
-			if (fileNameOnly) {
-				return pathToExe.toString();
-			} else {
-				return project.file(pathToExe).toString();
-			}
-		}
-
-		/**
-		 * Resolves the directory to use for storing downloaded Rome executable. When a
-		 * {@link #downloadDir} is given, use that directory, resolved against the
-		 * current project's directory. Otherwise, use the {@code Rome} sub folder in
-		 * the shared data directory.
-		 *
-		 * @param config Configuration for this step.
-		 * @return The download directory for the Rome executable.
-		 */
-		private String resolveDownloadDir() {
-			if (downloadDir != null) {
-				return project.file(downloadDir).toString();
-			} else {
-				return findDataDir().toPath().resolve("rome").toString();
-			}
-		}
-	}
-
 	/**
 	 * Generic Rome formatter step that detects the language of the input file from
 	 * the file name. It should be specified as a formatter step for a generic
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RomeStepConfig.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RomeStepConfig.java
new file mode 100644
index 0000000000..99519f1766
--- /dev/null
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RomeStepConfig.java
@@ -0,0 +1,273 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.gradle.spotless;
+
+import static java.util.Objects.requireNonNull;
+
+import java.io.File;
+import java.nio.file.Paths;
+import java.util.function.Consumer;
+
+import javax.annotation.Nullable;
+
+import org.gradle.api.Project;
+import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.rome.RomeStep;
+
+public abstract class RomeStepConfig<Self extends RomeStepConfig<Self>> {
+	/**
+	 * Optional path to the directory with configuration file for Rome. The file
+	 * must be named {@code rome.json}. When none is given, the default
+	 * configuration is used. If this is a relative path, it is resolved against the
+	 * project's base directory.
+	 */
+	@Nullable
+	private Object configPath;
+
+	/**
+	 * Optional directory where the downloaded Rome executable is placed. If this is
+	 * a relative path, it is resolved against the project's base directory.
+	 * Defaults to
+	 * <code>~/.m2/repository/com/diffplug/spotless/spotless-data/rome</code>.
+	 */
+	@Nullable
+	private Object downloadDir;
+
+	/**
+	 * Optional path to the Rome executable. Either a <code>version</code> or a
+	 * <code>pathToExe</code> should be specified. When not given, an attempt is
+	 * made to download the executable for the given version from the network. When
+	 * given, the executable is used and the <code>version</code> parameter is
+	 * ignored.
+	 * <p>
+	 * When an absolute path is given, that path is used as-is. When a relative path
+	 * is given, it is resolved against the project's base directory. When only a
+	 * file name (i.e. without any slashes or back slash path separators such as
+	 * {@code rome}) is given, this is interpreted as the name of a command with
+	 * executable that is in your {@code path} environment variable. Use
+	 * {@code ./executable-name} if you want to use an executable in the project's
+	 * base directory.
+	 */
+	@Nullable
+	private Object pathToExe;
+
+	/**
+	 * A reference to the Gradle project for which spotless is executed.
+	 */
+	private final Project project;
+
+	/**
+	 * Replaces the current Rome formatter step with the given step.
+	 */
+	private final Consumer<FormatterStep> replaceStep;
+
+	/**
+	 * Rome version to download, applies only when no <code>pathToExe</code> is
+	 * specified explicitly. Either a <code>version</code> or a
+	 * <code>pathToExe</code> should be specified. When not given, a default known
+	 * version is used. For stable builds, it is recommended that you always set the
+	 * version explicitly. This parameter is ignored when you specify a
+	 * <code>pathToExe</code> explicitly.
+	 */
+	@Nullable
+	private String version;
+
+	protected RomeStepConfig(Project project, Consumer<FormatterStep> replaceStep, String version) {
+		this.project = requireNonNull(project);
+		this.replaceStep = requireNonNull(replaceStep);
+		this.version = version;
+	}
+
+	/**
+	 * Optional path to the directory with configuration file for Rome. The file
+	 * must be named {@code rome.json}. When none is given, the default
+	 * configuration is used. If this is a relative path, it is resolved against the
+	 * project's base directory.
+	 *
+	 * @return This step for further configuration.
+	 */
+	public Self configPath(Object configPath) {
+		this.configPath = configPath;
+		replaceStep();
+		return getThis();
+	}
+
+	/**
+	 * Optional directory where the downloaded Rome executable is placed. If this is
+	 * a relative path, it is resolved against the project's base directory.
+	 * Defaults to
+	 * <code>~/.m2/repository/com/diffplug/spotless/spotless-data/rome</code>.
+	 *
+	 * @return This step for further configuration.
+	 */
+	public Self downloadDir(Object downloadDir) {
+		this.downloadDir = downloadDir;
+		replaceStep();
+		return getThis();
+	}
+
+	/**
+	 * Optional path to the Rome executable. Overwrites the configured version. No
+	 * attempt is made to download the Rome executable from the network.
+	 * <p>
+	 * When an absolute path is given, that path is used as-is. When a relative path
+	 * is given, it is resolved against the project's base directory. When only a
+	 * file name (i.e. without any slashes or back slash path separators such as
+	 * {@code rome}) is given, this is interpreted as the name of a command with
+	 * executable that is in your {@code path} environment variable. Use
+	 * {@code ./executable-name} if you want to use an executable in the project's
+	 * base directory.
+	 *
+	 * @return This step for further configuration.
+	 */
+	public Self pathToExe(Object pathToExe) {
+		this.pathToExe = pathToExe;
+		replaceStep();
+		return getThis();
+	}
+
+	/**
+	 * Creates a new formatter step that formats code by calling the Rome
+	 * executable, using the current configuration.
+	 *
+	 * @return A new formatter step for the Rome formatter.
+	 */
+	protected FormatterStep createStep() {
+		var builder = newBuilder();
+		if (configPath != null) {
+			var resolvedConfigPath = project.file(configPath);
+			builder.withConfigPath(resolvedConfigPath.toString());
+		}
+		builder.withLanguage(getLanguage());
+		return builder.create();
+	}
+
+	/**
+	 * Gets the language (syntax) of the input files to format. When
+	 * <code>null</code> or the empty string, the language is detected automatically
+	 * from the file name. Currently the following languages are supported by Rome:
+	 * <ul>
+	 * <li>js (JavaScript)</li>
+	 * <li>jsx (JavaScript + JSX)</li>
+	 * <li>js? (JavaScript or JavaScript + JSX, depending on the file
+	 * extension)</li>
+	 * <li>ts (TypeScript)</li>
+	 * <li>tsx (TypeScript + JSX)</li>
+	 * <li>ts? (TypeScript or TypeScript + JSX, depending on the file
+	 * extension)</li>
+	 * <li>json (JSON)</li>
+	 * </ul>
+	 *
+	 * @return The language of the input files.
+	 */
+	protected abstract String getLanguage();
+
+	/**
+	 * @return This Rome config instance.
+	 */
+	protected abstract Self getThis();
+
+	/**
+	 * Creates a new Rome step and replaces the existing Rome step in the list of
+	 * format steps.
+	 */
+	protected void replaceStep() {
+		replaceStep.accept(createStep());
+	}
+
+	/**
+	 * Finds the data directory that can be used for storing shared data such as
+	 * Rome executable globally. This is a directory in the local repository, e.g.
+	 * <code>~/.m2/repository/com/diffplus/spotless/spotless-data<code>.
+	 *
+	 * @return The directory for storing shared data.
+	 */
+	private File findDataDir() {
+		var currentRepo = project.getRepositories().stream()
+				.filter(r -> r instanceof MavenArtifactRepository)
+				.map(r -> (MavenArtifactRepository) r)
+				.filter(r -> "file".equals(r.getUrl().getScheme()))
+				.findAny().orElse(null);
+		// Temporarily add mavenLocal() repository to get its file URL
+		var localRepo = currentRepo != null ? (MavenArtifactRepository) currentRepo : project.getRepositories().mavenLocal();
+		try {
+			// e.g. ~/.m2/repository/
+			var repoPath = Paths.get(localRepo.getUrl().getPath());
+			var dataPath = repoPath.resolve("com").resolve("diffplug").resolve("spotless").resolve("spotless-data");
+			return dataPath.toAbsolutePath().toFile();
+		} finally {
+			// Remove mavenLocal() repository again if it was not part of the project
+			if (currentRepo == null) {
+				project.getRepositories().remove(localRepo);
+			}
+		}
+	}
+
+	/**
+	 * A new builder for configuring a Rome step that either downloads the Rome
+	 * executable with the given version from the network, or uses the executable
+	 * from the given path.
+	 *
+	 * @return A builder for a Rome step.
+	 */
+	private RomeStep newBuilder() {
+		if (pathToExe != null) {
+			var resolvedPathToExe = resolvePathToExe();
+			return RomeStep.withExePath(resolvedPathToExe);
+		} else {
+			var downloadDir = resolveDownloadDir();
+			return RomeStep.withExeDownload(version, downloadDir);
+		}
+	}
+
+	/**
+	 * Resolves the path to the Rome executable. When the path is only a file name,
+	 * do not perform any resolution and interpret it as a command that must be on
+	 * the user's path. Otherwise resolve the executable path against the project's
+	 * base directory.
+	 *
+	 * @param config Configuration from the Maven Mojo execution with details about
+	 *               the currently executed project.
+	 * @return The resolved path to the Rome executable.
+	 */
+	private String resolvePathToExe() {
+		var fileNameOnly = pathToExe instanceof String && Paths.get(pathToExe.toString()).getNameCount() == 1;
+		if (fileNameOnly) {
+			return pathToExe.toString();
+		} else {
+			return project.file(pathToExe).toString();
+		}
+	}
+
+	/**
+	 * Resolves the directory to use for storing downloaded Rome executable. When a
+	 * {@link #downloadDir} is given, use that directory, resolved against the
+	 * current project's directory. Otherwise, use the {@code Rome} sub folder in
+	 * the shared data directory.
+	 *
+	 * @param config Configuration for this step.
+	 * @return The download directory for the Rome executable.
+	 */
+	private String resolveDownloadDir() {
+		if (downloadDir != null) {
+			return project.file(downloadDir).toString();
+		} else {
+			return findDataDir().toPath().resolve("rome").toString();
+		}
+	}
+}

From 09d8498fc3763934018af35c659cf6831f1cc1bc Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 16 May 2023 23:18:41 -0700
Subject: [PATCH 1066/2068] Fix root path issue in the Rome formatter.

---
 .../java/com/diffplug/gradle/spotless/RomeStepConfig.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RomeStepConfig.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RomeStepConfig.java
index 99519f1766..ab55152015 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RomeStepConfig.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RomeStepConfig.java
@@ -26,6 +26,7 @@
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
 
+import com.diffplug.spotless.FileSignature;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.rome.RomeStep;
 
@@ -207,7 +208,11 @@ private File findDataDir() {
 		var localRepo = currentRepo != null ? (MavenArtifactRepository) currentRepo : project.getRepositories().mavenLocal();
 		try {
 			// e.g. ~/.m2/repository/
-			var repoPath = Paths.get(localRepo.getUrl().getPath());
+			var path = localRepo.getUrl().getPath();
+			if (FileSignature.machineIsWin() && path.startsWith("/")) {
+				path = path.substring(1);
+			}
+			var repoPath = Paths.get(path);
 			var dataPath = repoPath.resolve("com").resolve("diffplug").resolve("spotless").resolve("spotless-data");
 			return dataPath.toAbsolutePath().toFile();
 		} finally {

From d8913c4fc92e58c3a738c58729df20488e0aff5e Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 16 May 2023 23:20:24 -0700
Subject: [PATCH 1067/2068] Another changelog fix.

---
 plugin-maven/CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index d5744acb77..993404f1fe 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -16,6 +16,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * `removeUnusedImport` can be configured to rely on `cleanthat-javaparser-unnecessaryimport`. Default remains `google-java-format`. ([#1589](https://github.com/diffplug/spotless/pull/1589))
 * The `style` option in Palantir Java Format ([#1654](https://github.com/diffplug/spotless/pull/1654)).
 * Added formatter for Gherkin feature files ([#1649](https://github.com/diffplug/spotless/issues/1649)).
+### Fixed
 * Fix non deterministic computation of cache fingerprint when using multiple formatters. ([#1643](https://github.com/diffplug/spotless/pull/1643) fixes [#1642](https://github.com/diffplug/spotless/pull/1642))
 ### Changes
 * **POTENTIALLY BREAKING** Drop support for `googleJavaFormat` versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))

From a56e7e603aeccf123c5d8a15fd3ad33129c640f6 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 17 May 2023 00:18:12 -0700
Subject: [PATCH 1068/2068] Use Path.of(URI) instead of manual string
 wrangling.

---
 .../com/diffplug/gradle/spotless/RomeStepConfig.java  | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RomeStepConfig.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RomeStepConfig.java
index ab55152015..f739e922d2 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RomeStepConfig.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RomeStepConfig.java
@@ -18,6 +18,7 @@
 import static java.util.Objects.requireNonNull;
 
 import java.io.File;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.function.Consumer;
 
@@ -26,7 +27,6 @@
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
 
-import com.diffplug.spotless.FileSignature;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.rome.RomeStep;
 
@@ -208,11 +208,7 @@ private File findDataDir() {
 		var localRepo = currentRepo != null ? (MavenArtifactRepository) currentRepo : project.getRepositories().mavenLocal();
 		try {
 			// e.g. ~/.m2/repository/
-			var path = localRepo.getUrl().getPath();
-			if (FileSignature.machineIsWin() && path.startsWith("/")) {
-				path = path.substring(1);
-			}
-			var repoPath = Paths.get(path);
+			var repoPath = Path.of(localRepo.getUrl());
 			var dataPath = repoPath.resolve("com").resolve("diffplug").resolve("spotless").resolve("spotless-data");
 			return dataPath.toAbsolutePath().toFile();
 		} finally {
@@ -246,8 +242,6 @@ private RomeStep newBuilder() {
 	 * the user's path. Otherwise resolve the executable path against the project's
 	 * base directory.
 	 *
-	 * @param config Configuration from the Maven Mojo execution with details about
-	 *               the currently executed project.
 	 * @return The resolved path to the Rome executable.
 	 */
 	private String resolvePathToExe() {
@@ -265,7 +259,6 @@ private String resolvePathToExe() {
 	 * current project's directory. Otherwise, use the {@code Rome} sub folder in
 	 * the shared data directory.
 	 *
-	 * @param config Configuration for this step.
 	 * @return The download directory for the Rome executable.
 	 */
 	private String resolveDownloadDir() {

From 64ab3140d45d9a6336f5c3dd7c9f9cd54bba8185 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 17 May 2023 12:15:13 -0700
Subject: [PATCH 1069/2068] Update changelogs.

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 1 +
 plugin-maven/CHANGES.md  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index faf42c0cee..9d65dfd9b5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,6 +15,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. ([#1663](https://github.com/diffplug/spotless/pull/1663))
 ### Fixed
 * When P2 download fails, indicate the responsible formatter. ([#1698](https://github.com/diffplug/spotless/issues/1698))
+* Fixed a regression which changed the import sorting order in `googleJavaFormat` introduced in `2.38.0`. ([#1680](https://github.com/diffplug/spotless/pull/1680))
 ### Changes
 * Bump default sortpom version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675))
 
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 5d68193da9..d064173af6 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -8,6 +8,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Added `@DisableCachingByDefault` to `RegisterDependenciesTask`. ([#1666](https://github.com/diffplug/spotless/pull/1666))
 * When P2 download fails, indicate the responsible formatter. ([#1698](https://github.com/diffplug/spotless/issues/1698))
+* Fixed a regression which changed the import sorting order in `googleJavaFormat` introduced in `6.18.0`. ([#1680](https://github.com/diffplug/spotless/pull/1680))
 ### Changes
 * Bump default sortpom version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675))
 
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 993404f1fe..5777493c41 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -8,6 +8,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * `palantir` step now accepts a `style` parameter, which is documentation had already claimed to do. ([#1694](https://github.com/diffplug/spotless/pull/1694))
 * When P2 download fails, indicate the responsible formatter. ([#1698](https://github.com/diffplug/spotless/issues/1698))
+* Fixed a regression which changed the import sorting order in `googleJavaFormat` introduced in `2.36.0`. ([#1680](https://github.com/diffplug/spotless/pull/1680))
 ### Changes
 * Bump default sortpom version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675))
 

From 5cf7a7e5a6f57795a20d9da012a89135c173f07e Mon Sep 17 00:00:00 2001
From: Mitchell Skaggs <skaggsm333@gmail.com>
Date: Thu, 18 May 2023 12:16:52 -0500
Subject: [PATCH 1070/2068] Support KtLint 0.49.0, drop KtLint 0.46.0

Currently, we work around name-mangling issues with special Kotlin classes. The root issue is tracked here: https://github.com/pinterest/ktlint/issues/2041

Also fixes the IntelliJ .editorconfig import order property to better match Eclipse formatting
---
 .editorconfig                                 |   2 +-
 lib/build.gradle                              |  10 +-
 .../compat/KtLintCompat0Dot46Dot0Adapter.java | 119 ----------
 .../compat/KtLintCompat0Dot49Dot0Adapter.java | 210 ++++++++++++++++++
 .../glue/ktlint/KtlintFormatterFunc.java      |  12 +-
 .../diffplug/spotless/kotlin/KtLintStep.java  |   2 +-
 .../KtLintCompat0Dot49Dot0AdapterTest.java    |  70 ++++++
 .../resources/EmptyClassBody.kt               |   3 +
 .../resources/FailsNoSemicolons.kt            |   3 +
 .../spotless/kotlin/KtLintStepTest.java       |  32 ++-
 10 files changed, 321 insertions(+), 142 deletions(-)
 delete mode 100644 lib/src/compatKtLint0Dot46Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot46Dot0Adapter.java
 create mode 100644 lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
 create mode 100644 lib/src/testCompatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java
 create mode 100644 lib/src/testCompatKtLint0Dot49Dot0/resources/EmptyClassBody.kt
 create mode 100644 lib/src/testCompatKtLint0Dot49Dot0/resources/FailsNoSemicolons.kt

diff --git a/.editorconfig b/.editorconfig
index 4042d549fd..5d0704bd2b 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -14,7 +14,7 @@ indent_size = 2
 
 [*.java]
 # Doc: https://youtrack.jetbrains.com/issue/IDEA-170643#focus=streamItem-27-3708697.0-0
-ij_java_imports_layout = java.**,|,javax.**,|,org.**,|,com.**,|,com.diffplug.**,|,*
+ij_java_imports_layout = $*,|,java.**,|,javax.**,|,org.**,|,com.**,|,com.diffplug.**,|,*
 ij_java_use_single_class_imports = true
 ij_java_class_count_to_use_import_on_demand = 999
 ij_java_names_count_to_use_import_on_demand = 999
diff --git a/lib/build.gradle b/lib/build.gradle
index 8db911e33e..c0564e5c12 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -44,9 +44,9 @@ versionCompatibility {
 			// we will support no more than 2 breaking changes at a time = 3 incompatible versions
 			// we will try to drop down to only one version if a stable API can be maintained for a full year
 			versions = [
-				'0.46.0',
 				'0.47.0',
 				'0.48.0',
+				'0.49.0',
 			]
 			targetSourceSetName = 'ktlint'
 		}
@@ -96,20 +96,20 @@ dependencies {
 		}
 	}
 	// ktlint
-	String VER_KTLINT='0.46.1'
+	String VER_KTLINT='0.47.1'
 	ktlintCompileOnly "com.pinterest:ktlint:$VER_KTLINT"
 	ktlintCompileOnly "com.pinterest.ktlint:ktlint-core:$VER_KTLINT"
 	ktlintCompileOnly "com.pinterest.ktlint:ktlint-ruleset-experimental:$VER_KTLINT"
 	ktlintCompileOnly "com.pinterest.ktlint:ktlint-ruleset-standard:$VER_KTLINT"
-	compatKtLint0Dot46Dot0CompileOnly 'com.pinterest.ktlint:ktlint-core:0.46.0'
-	compatKtLint0Dot46Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-experimental:0.46.0'
-	compatKtLint0Dot46Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.46.0'
 	compatKtLint0Dot47Dot0CompileOnly 'com.pinterest.ktlint:ktlint-core:0.47.0'
 	compatKtLint0Dot47Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-experimental:0.47.0'
 	compatKtLint0Dot47Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.47.0'
 	compatKtLint0Dot48Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-core:0.48.0'
 	compatKtLint0Dot48Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-ruleset-experimental:0.48.0'
 	compatKtLint0Dot48Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.48.0'
+	compatKtLint0Dot49Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-rule-engine:0.49.0'
+	compatKtLint0Dot49Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.49.0'
+	compatKtLint0Dot49Dot0CompileAndTestOnly 'org.slf4j:slf4j-api:2.0.0'
 	// palantirJavaFormat
 	palantirJavaFormatCompileOnly 'com.palantir.javaformat:palantir-java-format:1.1.0' 	// this version needs to stay compilable against Java 8 for CI Job testNpm
 	// scalafmt
diff --git a/lib/src/compatKtLint0Dot46Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot46Dot0Adapter.java b/lib/src/compatKtLint0Dot46Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot46Dot0Adapter.java
deleted file mode 100644
index afaf2ad19f..0000000000
--- a/lib/src/compatKtLint0Dot46Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot46Dot0Adapter.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright 2022-2023 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.glue.ktlint.compat;
-
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import com.pinterest.ktlint.core.KtLint;
-import com.pinterest.ktlint.core.LintError;
-import com.pinterest.ktlint.core.RuleSet;
-import com.pinterest.ktlint.core.api.DefaultEditorConfigProperties;
-import com.pinterest.ktlint.core.api.EditorConfigOverride;
-import com.pinterest.ktlint.core.api.UsesEditorConfigProperties;
-import com.pinterest.ktlint.ruleset.experimental.ExperimentalRuleSetProvider;
-import com.pinterest.ktlint.ruleset.standard.StandardRuleSetProvider;
-
-import kotlin.Pair;
-import kotlin.Unit;
-import kotlin.jvm.functions.Function2;
-
-public class KtLintCompat0Dot46Dot0Adapter implements KtLintCompatAdapter {
-
-	static class FormatterCallback implements Function2<LintError, Boolean, Unit> {
-		@Override
-		public Unit invoke(LintError lint, Boolean corrected) {
-			if (!corrected) {
-				KtLintCompatReporting.report(lint.getLine(), lint.getCol(), lint.getRuleId(), lint.getDetail());
-			}
-			return null;
-		}
-	}
-
-	@Override
-	public String format(final String text, Path path, final boolean isScript,
-			final boolean useExperimental,
-			Path editorConfigPath, final Map<String, String> userData,
-			final Map<String, Object> editorConfigOverrideMap) {
-		final FormatterCallback formatterCallback = new FormatterCallback();
-
-		final List<RuleSet> rulesets = new ArrayList<>();
-		rulesets.add(new StandardRuleSetProvider().get());
-
-		if (useExperimental) {
-			rulesets.add(new ExperimentalRuleSetProvider().get());
-		}
-
-		EditorConfigOverride editorConfigOverride;
-		if (editorConfigOverrideMap.isEmpty()) {
-			editorConfigOverride = EditorConfigOverride.Companion.getEmptyEditorConfigOverride();
-		} else {
-			editorConfigOverride = createEditorConfigOverride(rulesets, editorConfigOverrideMap);
-		}
-
-		return KtLint.INSTANCE.format(new KtLint.ExperimentalParams(
-				path.toFile().getAbsolutePath(),
-				text,
-				rulesets,
-				userData,
-				formatterCallback,
-				isScript,
-				editorConfigPath == null ? null : editorConfigPath.toFile().getAbsolutePath(),
-				false,
-				editorConfigOverride,
-				false));
-	}
-
-	/**
-	 * Create EditorConfigOverride from user provided parameters.
-	 * Calling this method requires KtLint 0.45.2.
-	 */
-	private static EditorConfigOverride createEditorConfigOverride(final List<RuleSet> rulesets, Map<String, Object> editorConfigOverrideMap) {
-		// Get properties from rules in the rule sets
-		Stream<UsesEditorConfigProperties.EditorConfigProperty<?>> ruleProperties = rulesets.stream()
-				.flatMap(ruleSet -> Arrays.stream(ruleSet.getRules()))
-				.filter(rule -> rule instanceof UsesEditorConfigProperties)
-				.flatMap(rule -> ((UsesEditorConfigProperties) rule).getEditorConfigProperties().stream());
-
-		// Create a mapping of properties to their names based on rule properties and default properties
-		Map<String, UsesEditorConfigProperties.EditorConfigProperty<?>> supportedProperties = Stream
-				.concat(ruleProperties, DefaultEditorConfigProperties.INSTANCE.getEditorConfigProperties().stream())
-				.distinct()
-				.collect(Collectors.toMap(property -> property.getType().getName(), property -> property));
-
-		// Create config properties based on provided property names and values
-		@SuppressWarnings("unchecked")
-		Pair<UsesEditorConfigProperties.EditorConfigProperty<?>, ?>[] properties = editorConfigOverrideMap.entrySet().stream()
-				.map(entry -> {
-					UsesEditorConfigProperties.EditorConfigProperty<?> property = supportedProperties.get(entry.getKey());
-					if (property != null) {
-						return new Pair<>(property, entry.getValue());
-					} else {
-						return null;
-					}
-				})
-				.filter(Objects::nonNull)
-				.toArray(Pair[]::new);
-
-		return EditorConfigOverride.Companion.from(properties);
-	}
-}
diff --git a/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java b/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
new file mode 100644
index 0000000000..86ca69c352
--- /dev/null
+++ b/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
@@ -0,0 +1,210 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.glue.ktlint.compat;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.pinterest.ktlint.rule.engine.api.Code;
+import com.pinterest.ktlint.rule.engine.api.EditorConfigDefaults;
+import com.pinterest.ktlint.rule.engine.api.EditorConfigOverride;
+import com.pinterest.ktlint.rule.engine.api.KtLintRuleEngine;
+import com.pinterest.ktlint.rule.engine.api.LintError;
+import com.pinterest.ktlint.rule.engine.core.api.Rule;
+import com.pinterest.ktlint.rule.engine.core.api.RuleProvider;
+import com.pinterest.ktlint.rule.engine.core.api.editorconfig.CodeStyleEditorConfigPropertyKt;
+import com.pinterest.ktlint.rule.engine.core.api.editorconfig.EditorConfigProperty;
+import com.pinterest.ktlint.rule.engine.core.api.editorconfig.EndOfLinePropertyKt;
+import com.pinterest.ktlint.rule.engine.core.api.editorconfig.IndentSizeEditorConfigPropertyKt;
+import com.pinterest.ktlint.rule.engine.core.api.editorconfig.IndentStyleEditorConfigPropertyKt;
+import com.pinterest.ktlint.rule.engine.core.api.editorconfig.InsertFinalNewLineEditorConfigPropertyKt;
+import com.pinterest.ktlint.rule.engine.core.api.editorconfig.MaxLineLengthEditorConfigPropertyKt;
+import com.pinterest.ktlint.rule.engine.core.api.editorconfig.RuleExecution;
+import com.pinterest.ktlint.rule.engine.core.api.editorconfig.RuleExecutionEditorConfigPropertyKt;
+import com.pinterest.ktlint.ruleset.standard.StandardRuleSetProvider;
+
+import kotlin.Pair;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function2;
+
+public class KtLintCompat0Dot49Dot0Adapter implements KtLintCompatAdapter {
+
+	private static final Logger logger = LoggerFactory.getLogger(KtLintCompat0Dot49Dot0Adapter.class);
+
+	private static final List<EditorConfigProperty<?>> DEFAULT_EDITOR_CONFIG_PROPERTIES;
+
+	static {
+		List<EditorConfigProperty<?>> list = new ArrayList<>();
+		list.add(CodeStyleEditorConfigPropertyKt.getCODE_STYLE_PROPERTY());
+		list.add(EndOfLinePropertyKt.getEND_OF_LINE_PROPERTY());
+		list.add(IndentSizeEditorConfigPropertyKt.getINDENT_SIZE_PROPERTY());
+		list.add(IndentStyleEditorConfigPropertyKt.getINDENT_STYLE_PROPERTY());
+		list.add(InsertFinalNewLineEditorConfigPropertyKt.getINSERT_FINAL_NEWLINE_PROPERTY());
+		list.add(MaxLineLengthEditorConfigPropertyKt.getMAX_LINE_LENGTH_PROPERTY());
+		list.add(RuleExecutionEditorConfigPropertyKt.getEXPERIMENTAL_RULES_EXECUTION_PROPERTY());
+		DEFAULT_EDITOR_CONFIG_PROPERTIES = Collections.unmodifiableList(list);
+	}
+
+	private static final Method RULEID_METHOD;
+	private static final Method CREATE_RULESET_EXECUTION_METHOD;
+	private static final Method CREATE_RULE_EXECUTION_METHOD;
+
+	static {
+		try {
+			RULEID_METHOD = LintError.class.getMethod("getRuleId-6XN97os");
+			CREATE_RULESET_EXECUTION_METHOD = RuleExecutionEditorConfigPropertyKt.class.getMethod("createRuleSetExecutionEditorConfigProperty-fqiwTpU", String.class, RuleExecution.class);
+			CREATE_RULE_EXECUTION_METHOD = RuleExecutionEditorConfigPropertyKt.class.getMethod("createRuleExecutionEditorConfigProperty-U7AdEiY", String.class, RuleExecution.class);
+		} catch (NoSuchMethodException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	private static String getRuleId(LintError lint) {
+		try {
+			return (String) RULEID_METHOD.invoke(lint);
+		} catch (IllegalAccessException | InvocationTargetException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	private static EditorConfigProperty<?> createRuleSetExecution(String id, RuleExecution execution) {
+		try {
+			return (EditorConfigProperty<?>) CREATE_RULESET_EXECUTION_METHOD.invoke(null, id, execution);
+		} catch (IllegalAccessException | InvocationTargetException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	private static EditorConfigProperty<?> createRuleExecution(String id, RuleExecution execution) {
+		try {
+			return (EditorConfigProperty<?>) CREATE_RULE_EXECUTION_METHOD.invoke(null, id, execution);
+		} catch (IllegalAccessException | InvocationTargetException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	static class FormatterCallback implements Function2<LintError, Boolean, Unit> {
+
+		@Override
+		public Unit invoke(LintError lint, Boolean corrected) {
+			if (!corrected) {
+				KtLintCompatReporting.report(lint.getLine(), lint.getCol(), getRuleId(lint), lint.getDetail());
+			}
+			return Unit.INSTANCE;
+		}
+	}
+
+	@Override
+	public String format(final String text, Path path, final boolean isScript,
+			final boolean useExperimental,
+			Path editorConfigPath, final Map<String, String> userData,
+			final Map<String, Object> editorConfigOverrideMap) {
+		final FormatterCallback formatterCallback = new FormatterCallback();
+
+		Set<RuleProvider> allRuleProviders = new LinkedHashSet<>(
+				new StandardRuleSetProvider().getRuleProviders());
+
+		// TODO: Should we keep `useExperimental` now that ktlint uses an EditorConfig property for this purpose?
+		if (useExperimental) {
+			String experimentalRulesPropertyName = RuleExecutionEditorConfigPropertyKt.getEXPERIMENTAL_RULES_EXECUTION_PROPERTY().getName();
+			Object experimentalOverride = editorConfigOverrideMap.get(experimentalRulesPropertyName);
+			if (experimentalOverride != null) {
+				logger.warn("`useExperimental` parameter is `true` and `ktlint_experimental` property is set, `useExperimental` will take priority!");
+				editorConfigOverrideMap.put(experimentalRulesPropertyName, "enabled");
+			}
+		}
+
+		EditorConfigOverride editorConfigOverride;
+		if (editorConfigOverrideMap.isEmpty()) {
+			editorConfigOverride = EditorConfigOverride.Companion.getEMPTY_EDITOR_CONFIG_OVERRIDE();
+		} else {
+			editorConfigOverride = createEditorConfigOverride(allRuleProviders.stream().map(
+					RuleProvider::createNewRuleInstance).collect(Collectors.toList()),
+					editorConfigOverrideMap);
+		}
+		EditorConfigDefaults editorConfig;
+		if (editorConfigPath == null || !Files.exists(editorConfigPath)) {
+			editorConfig = EditorConfigDefaults.Companion.getEMPTY_EDITOR_CONFIG_DEFAULTS();
+		} else {
+			editorConfig = EditorConfigDefaults.Companion.load(editorConfigPath);
+		}
+
+		return new KtLintRuleEngine(
+				allRuleProviders,
+				editorConfig,
+				editorConfigOverride,
+				false,
+				path.getFileSystem())
+				.format(Code.Companion.fromPath(path), formatterCallback);
+	}
+
+	/**
+	 * Create EditorConfigOverride from user provided parameters.
+	 */
+	private static EditorConfigOverride createEditorConfigOverride(final List<Rule> rules, Map<String, Object> editorConfigOverrideMap) {
+		// Get properties from rules in the rule sets
+		Stream<EditorConfigProperty<?>> ruleProperties = rules.stream()
+				.flatMap(rule -> rule.getUsesEditorConfigProperties().stream());
+
+		// Create a mapping of properties to their names based on rule properties and default properties
+		Map<String, EditorConfigProperty<?>> supportedProperties = Stream
+				.concat(ruleProperties, DEFAULT_EDITOR_CONFIG_PROPERTIES.stream())
+				.distinct()
+				.collect(Collectors.toMap(EditorConfigProperty::getName, property -> property));
+
+		// Create config properties based on provided property names and values
+		@SuppressWarnings("unchecked")
+		Pair<EditorConfigProperty<?>, ?>[] properties = editorConfigOverrideMap.entrySet().stream()
+				.map(entry -> {
+					EditorConfigProperty<?> property = supportedProperties.get(entry.getKey());
+					if (property != null) {
+						return new Pair<>(property, entry.getValue());
+					} else if (entry.getKey().startsWith("ktlint_")) {
+						String[] parts = entry.getKey().substring(7).split("_", 2);
+						if (parts.length == 1) {
+							// convert ktlint_{ruleset} to {ruleset}
+							String qualifiedRuleId = parts[0] + ":";
+							property = createRuleSetExecution(qualifiedRuleId, RuleExecution.disabled);
+						} else {
+							// convert ktlint_{ruleset}_{rulename} to {ruleset}:{rulename}
+							String qualifiedRuleId = parts[0] + ":" + parts[1];
+							property = createRuleExecution(qualifiedRuleId, RuleExecution.disabled);
+						}
+						return new Pair<>(property, entry.getValue());
+					} else {
+						return null;
+					}
+				})
+				.filter(Objects::nonNull)
+				.toArray(Pair[]::new);
+
+		return EditorConfigOverride.Companion.from(properties);
+	}
+}
diff --git a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
index 02ff5355e3..f6f4203fef 100644
--- a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
+++ b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
@@ -38,15 +38,17 @@ public class KtlintFormatterFunc implements FormatterFunc.NeedsFile {
 	public KtlintFormatterFunc(String version, boolean isScript, boolean useExperimental, FileSignature editorConfigPath, Map<String, String> userData,
 			Map<String, Object> editorConfigOverrideMap) {
 		int minorVersion = Integer.parseInt(version.split("\\.")[1]);
-		if (minorVersion >= 48) {
+		if (minorVersion >= 49) {
+			// Packages and modules moved around (`ktlint-core` -> `ktlint-rule-engine`)
+			// Experimental ruleset was replaced by implementing `Rule.Experimental` and checking the `ktlint_experimental` `.editorconfig` property
+			// `RuleId` and `RuleSetId` became inline classes (mangled to be unrepresentable in Java source code, so reflection is needed), tracked here: https://github.com/pinterest/ktlint/issues/2041
+			this.adapter = new KtLintCompat0Dot49Dot0Adapter();
+		} else if (minorVersion == 48) {
 			// ExperimentalParams lost two constructor arguments, EditorConfigProperty moved to its own class
 			this.adapter = new KtLintCompat0Dot48Dot0Adapter();
-		} else if (minorVersion == 47) {
+		} else {
 			// rename RuleSet to RuleProvider
 			this.adapter = new KtLintCompat0Dot47Dot0Adapter();
-		} else {
-			// DefaultEditorConfigProperties.INSTANCE.getDefaultEditorConfigProperties() renamed to .getEditorConfigProperties()
-			this.adapter = new KtLintCompat0Dot46Dot0Adapter();
 		}
 		this.editorConfigPath = editorConfigPath;
 		this.useExperimental = useExperimental;
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index 0d75460902..6e82538b04 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -36,7 +36,7 @@ public class KtLintStep {
 	// prevent direct instantiation
 	private KtLintStep() {}
 
-	private static final String DEFAULT_VERSION = "0.48.2";
+	private static final String DEFAULT_VERSION = "0.49.1";
 	static final String NAME = "ktlint";
 	static final String PACKAGE = "com.pinterest";
 	static final String MAVEN_COORDINATE = PACKAGE + ":ktlint:";
diff --git a/lib/src/testCompatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java b/lib/src/testCompatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java
new file mode 100644
index 0000000000..ede67e0174
--- /dev/null
+++ b/lib/src/testCompatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.glue.ktlint.compat;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+public class KtLintCompat0Dot49Dot0AdapterTest {
+	@Test
+	public void testDefaults(@TempDir Path path) throws IOException {
+		KtLintCompat0Dot49Dot0Adapter ktLintCompat0Dot49Dot0Adapter = new KtLintCompat0Dot49Dot0Adapter();
+		String text = loadAndWriteText(path, "EmptyClassBody.kt");
+		final Path filePath = Paths.get(path.toString(), "EmptyClassBody.kt");
+
+		Map<String, String> userData = new HashMap<>();
+
+		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
+
+		String formatted = ktLintCompat0Dot49Dot0Adapter.format(text, filePath, false, false, null, userData, editorConfigOverrideMap);
+		assertEquals("class EmptyClassBody\n", formatted);
+	}
+
+	@Test
+	public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
+		KtLintCompat0Dot49Dot0Adapter ktLintCompat0Dot49Dot0Adapter = new KtLintCompat0Dot49Dot0Adapter();
+		String text = loadAndWriteText(path, "FailsNoSemicolons.kt");
+		final Path filePath = Paths.get(path.toString(), "FailsNoSemicolons.kt");
+
+		Map<String, String> userData = new HashMap<>();
+
+		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
+		editorConfigOverrideMap.put("indent_style", "tab");
+		editorConfigOverrideMap.put("ktlint_standard_no-semi", "disabled");
+
+		String formatted = ktLintCompat0Dot49Dot0Adapter.format(text, filePath, false, false, null, userData, editorConfigOverrideMap);
+		assertEquals("class FailsNoSemicolons {\n\tval i = 0;\n}\n", formatted);
+	}
+
+	private static String loadAndWriteText(Path path, String name) throws IOException {
+		try (InputStream is = KtLintCompat0Dot49Dot0AdapterTest.class.getResourceAsStream("/" + name)) {
+			Files.copy(is, path.resolve(name));
+		}
+		return new String(Files.readAllBytes(path.resolve(name)), StandardCharsets.UTF_8);
+	}
+
+}
diff --git a/lib/src/testCompatKtLint0Dot49Dot0/resources/EmptyClassBody.kt b/lib/src/testCompatKtLint0Dot49Dot0/resources/EmptyClassBody.kt
new file mode 100644
index 0000000000..7da53fb78d
--- /dev/null
+++ b/lib/src/testCompatKtLint0Dot49Dot0/resources/EmptyClassBody.kt
@@ -0,0 +1,3 @@
+class EmptyClassBody {
+
+}
diff --git a/lib/src/testCompatKtLint0Dot49Dot0/resources/FailsNoSemicolons.kt b/lib/src/testCompatKtLint0Dot49Dot0/resources/FailsNoSemicolons.kt
new file mode 100644
index 0000000000..4cf05ceacf
--- /dev/null
+++ b/lib/src/testCompatKtLint0Dot49Dot0/resources/FailsNoSemicolons.kt
@@ -0,0 +1,3 @@
+class FailsNoSemicolons {
+	val i = 0;
+}
diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
index 6700be168d..9af6685906 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
@@ -31,20 +31,10 @@ void behavior() {
 				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean")
 				.testResourceExceptionMsg("kotlin/ktlint/unsolvable.dirty").isEqualTo(
 						"Error on line: 1, column: 1\n" +
-								"rule: no-wildcard-imports\n" +
+								"rule: standard:no-wildcard-imports\n" +
 								"Wildcard import");
 	}
 
-	@Test
-	void works0_46_0() {
-		FormatterStep step = KtLintStep.create("0.46.0", TestProvisioner.mavenCentral());
-		StepHarnessWithFile.forStep(this, step)
-				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean")
-				.testResourceExceptionMsg("kotlin/ktlint/unsolvable.dirty").isEqualTo("Error on line: 1, column: 1\n" +
-						"rule: no-wildcard-imports\n" +
-						"Wildcard import");
-	}
-
 	@Test
 	void works0_47_0() {
 		FormatterStep step = KtLintStep.create("0.47.0", TestProvisioner.mavenCentral());
@@ -85,6 +75,26 @@ void works0_48_1() {
 						"Wildcard import");
 	}
 
+	@Test
+	void works0_49_0() {
+		FormatterStep step = KtLintStep.create("0.49.0", TestProvisioner.mavenCentral());
+		StepHarnessWithFile.forStep(this, step)
+				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean")
+				.testResourceExceptionMsg("kotlin/ktlint/unsolvable.dirty").isEqualTo("Error on line: 1, column: 1\n" +
+						"rule: standard:no-wildcard-imports\n" +
+						"Wildcard import");
+	}
+
+	@Test
+	void works0_49_1() {
+		FormatterStep step = KtLintStep.create("0.49.1", TestProvisioner.mavenCentral());
+		StepHarnessWithFile.forStep(this, step)
+				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean")
+				.testResourceExceptionMsg("kotlin/ktlint/unsolvable.dirty").isEqualTo("Error on line: 1, column: 1\n" +
+						"rule: standard:no-wildcard-imports\n" +
+						"Wildcard import");
+	}
+
 	@Test
 	void equality() {
 		new SerializableEqualityTester() {

From a66ef3db9cc9b7b41e481394a84f2e7f8e32a39a Mon Sep 17 00:00:00 2001
From: Mitchell Skaggs <skaggsm333@gmail.com>
Date: Thu, 18 May 2023 12:35:50 -0500
Subject: [PATCH 1071/2068] Add ktlint 0.49.1 update to changelog

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 1 +
 plugin-maven/CHANGES.md  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 9d65dfd9b5..3ab7fc3745 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -18,6 +18,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Fixed a regression which changed the import sorting order in `googleJavaFormat` introduced in `2.38.0`. ([#1680](https://github.com/diffplug/spotless/pull/1680))
 ### Changes
 * Bump default sortpom version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675))
+* Bump default `ktlint` version to latest `0.48.2` -> `0.49.1`.([#1696](https://github.com/diffplug/spotless/issues/1696))
 
 ## [2.38.0] - 2023-04-06
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index d064173af6..a5f9d8c6c6 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -11,6 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Fixed a regression which changed the import sorting order in `googleJavaFormat` introduced in `6.18.0`. ([#1680](https://github.com/diffplug/spotless/pull/1680))
 ### Changes
 * Bump default sortpom version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675))
+* Bump default `ktlint` version to latest `0.48.2` -> `0.49.1`.([#1696](https://github.com/diffplug/spotless/issues/1696))
 
 ## [6.18.0] - 2023-04-06
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 5777493c41..e006f3462d 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -11,6 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Fixed a regression which changed the import sorting order in `googleJavaFormat` introduced in `2.36.0`. ([#1680](https://github.com/diffplug/spotless/pull/1680))
 ### Changes
 * Bump default sortpom version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675))
+* Bump default `ktlint` version to latest `0.48.2` -> `0.49.1`.([#1696](https://github.com/diffplug/spotless/issues/1696))
 
 ## [2.36.0] - 2023-04-06
 ### Added

From 88845df2179c3ea457e67eff39f7b3541908363c Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 19 May 2023 09:35:04 -0700
Subject: [PATCH 1072/2068] Tweak changelogs.

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 1 +
 plugin-maven/CHANGES.md  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 3ab7fc3745..094f5b43f0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -19,6 +19,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changes
 * Bump default sortpom version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675))
 * Bump default `ktlint` version to latest `0.48.2` -> `0.49.1`.([#1696](https://github.com/diffplug/spotless/issues/1696))
+  * Dropped support for `ktlint 0.46.x` following our policy of supporting two breaking changes at a time.
 
 ## [2.38.0] - 2023-04-06
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index a5f9d8c6c6..f140151867 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changes
 * Bump default sortpom version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675))
 * Bump default `ktlint` version to latest `0.48.2` -> `0.49.1`.([#1696](https://github.com/diffplug/spotless/issues/1696))
+  * Dropped support for `ktlint 0.46.x` following our policy of supporting two breaking changes at a time.
 
 ## [6.18.0] - 2023-04-06
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index e006f3462d..154b2becaa 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changes
 * Bump default sortpom version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675))
 * Bump default `ktlint` version to latest `0.48.2` -> `0.49.1`.([#1696](https://github.com/diffplug/spotless/issues/1696))
+  * Dropped support for `ktlint 0.46.x` following our policy of supporting two breaking changes at a time.
 
 ## [2.36.0] - 2023-04-06
 ### Added

From 87efad89426314c4969807fcc3b5725dddd8c642 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sat, 20 May 2023 16:07:56 -0700
Subject: [PATCH 1073/2068] Simplify ktlint build.

---
 lib/build.gradle                                             | 5 -----
 .../diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java   | 3 ---
 2 files changed, 8 deletions(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index c0564e5c12..058e5f4132 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -96,11 +96,6 @@ dependencies {
 		}
 	}
 	// ktlint
-	String VER_KTLINT='0.47.1'
-	ktlintCompileOnly "com.pinterest:ktlint:$VER_KTLINT"
-	ktlintCompileOnly "com.pinterest.ktlint:ktlint-core:$VER_KTLINT"
-	ktlintCompileOnly "com.pinterest.ktlint:ktlint-ruleset-experimental:$VER_KTLINT"
-	ktlintCompileOnly "com.pinterest.ktlint:ktlint-ruleset-standard:$VER_KTLINT"
 	compatKtLint0Dot47Dot0CompileOnly 'com.pinterest.ktlint:ktlint-core:0.47.0'
 	compatKtLint0Dot47Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-experimental:0.47.0'
 	compatKtLint0Dot47Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.47.0'
diff --git a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
index f6f4203fef..fba855bb9a 100644
--- a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
+++ b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
@@ -19,8 +19,6 @@
 import java.nio.file.Path;
 import java.util.Map;
 
-import org.jetbrains.annotations.NotNull;
-
 import com.diffplug.spotless.FileSignature;
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.glue.ktlint.compat.*;
@@ -29,7 +27,6 @@ public class KtlintFormatterFunc implements FormatterFunc.NeedsFile {
 
 	private final Map<String, String> userData;
 	private final boolean isScript;
-	@NotNull
 	private final KtLintCompatAdapter adapter;
 	private final boolean useExperimental;
 	private final FileSignature editorConfigPath;

From a10f2344c9bf6c60c737754f88cc8224a11c7858 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sat, 20 May 2023 16:09:09 -0700
Subject: [PATCH 1074/2068] Fix rome formatter on Apple Silicon.

---
 .../main/java/com/diffplug/spotless/rome/Architecture.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/rome/Architecture.java b/lib/src/main/java/com/diffplug/spotless/rome/Architecture.java
index 64e0a94640..9ceaeb8632 100644
--- a/lib/src/main/java/com/diffplug/spotless/rome/Architecture.java
+++ b/lib/src/main/java/com/diffplug/spotless/rome/Architecture.java
@@ -43,9 +43,6 @@ public static Architecture guess() {
 		if (arch.equals("ppc64le")) {
 			throw new IllegalStateException(msg);
 		}
-		if (arch.equals("aarch64")) {
-			throw new IllegalStateException(msg);
-		}
 		if (arch.equals("s390x")) {
 			throw new IllegalStateException(msg);
 		}
@@ -55,6 +52,9 @@ public static Architecture guess() {
 		if (arch.equals("ppc")) {
 			throw new IllegalStateException(msg);
 		}
+		if (arch.equals("aarch64")) {
+			return ARM64;
+		}
 		if (arch.equals("arm")) {
 			if (version.contains("v7")) {
 				throw new IllegalStateException(msg);

From e1c06a8ef55ef1ceb98b566459c298c0521cecf9 Mon Sep 17 00:00:00 2001
From: Patrick Schmidt <patrick@codecamp.de>
Date: Mon, 22 May 2023 19:44:09 +0200
Subject: [PATCH 1075/2068] Introduce semantics-aware Java import ordering.
 (fixes #522)

---
 .../spotless/java/ImportOrderStep.java        |  39 +++-
 .../diffplug/spotless/java/ImportSorter.java  |  13 +-
 .../spotless/java/ImportSorterImpl.java       | 203 ++++++++++++++++--
 .../gradle/spotless/JavaExtension.java        |  40 +++-
 .../spotless/maven/java/ImportOrder.java      |  34 ++-
 .../JavaCodeSortedLexicographic.test          |  13 ++
 .../JavaCodeSortedSemanticSort.test           |  13 ++
 .../JavaCodeUnsortedSemanticSort.test         |  15 ++
 .../spotless/java/ImportOrderStepTest.java    |  16 +-
 9 files changed, 351 insertions(+), 35 deletions(-)
 create mode 100644 testlib/src/main/resources/java/importsorter/JavaCodeSortedLexicographic.test
 create mode 100644 testlib/src/main/resources/java/importsorter/JavaCodeSortedSemanticSort.test
 create mode 100644 testlib/src/main/resources/java/importsorter/JavaCodeUnsortedSemanticSort.test

diff --git a/lib/src/main/java/com/diffplug/spotless/java/ImportOrderStep.java b/lib/src/main/java/com/diffplug/spotless/java/ImportOrderStep.java
index 686c9cfcaf..7f100e0adc 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/ImportOrderStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/ImportOrderStep.java
@@ -28,6 +28,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -39,6 +40,9 @@
 
 public final class ImportOrderStep {
 	private static final boolean WILDCARDS_LAST_DEFAULT = false;
+	private static final boolean SEMANTIC_SORT_DEFAULT = true;
+	private static final Set<String> TREAT_AS_PACKAGE_DEFAULT = null;
+	private static final Set<String> TREAT_AS_CLASS_DEFAULT = null;
 
 	private final String lineFormat;
 
@@ -55,27 +59,34 @@ private ImportOrderStep(String lineFormat) {
 	}
 
 	public FormatterStep createFrom(String... importOrder) {
-		return createFrom(WILDCARDS_LAST_DEFAULT, importOrder);
+		return createFrom(WILDCARDS_LAST_DEFAULT, SEMANTIC_SORT_DEFAULT, TREAT_AS_PACKAGE_DEFAULT,
+				TREAT_AS_CLASS_DEFAULT, importOrder);
 	}
 
-	public FormatterStep createFrom(boolean wildcardsLast, String... importOrder) {
+	public FormatterStep createFrom(boolean wildcardsLast, boolean semanticSort, Set<String> treatAsPackage,
+			Set<String> treatAsClass, String... importOrder) {
 		// defensive copying and null checking
 		List<String> importOrderList = requireElementsNonNull(Arrays.asList(importOrder));
-		return createFrom(wildcardsLast, () -> importOrderList);
+		return createFrom(wildcardsLast, semanticSort, treatAsPackage, treatAsClass, () -> importOrderList);
 	}
 
 	public FormatterStep createFrom(File importsFile) {
-		return createFrom(WILDCARDS_LAST_DEFAULT, importsFile);
+		return createFrom(WILDCARDS_LAST_DEFAULT, SEMANTIC_SORT_DEFAULT, TREAT_AS_PACKAGE_DEFAULT,
+				TREAT_AS_CLASS_DEFAULT, importsFile);
 	}
 
-	public FormatterStep createFrom(boolean wildcardsLast, File importsFile) {
+	public FormatterStep createFrom(boolean wildcardsLast, boolean semanticSort, Set<String> treatAsPackage,
+			Set<String> treatAsClass, File importsFile) {
 		Objects.requireNonNull(importsFile);
-		return createFrom(wildcardsLast, () -> getImportOrder(importsFile));
+		return createFrom(wildcardsLast, semanticSort, treatAsPackage, treatAsClass, () -> getImportOrder(importsFile));
 	}
 
-	private FormatterStep createFrom(boolean wildcardsLast, Supplier<List<String>> importOrder) {
+	private FormatterStep createFrom(boolean wildcardsLast, boolean semanticSort, Set<String> treatAsPackage,
+			Set<String> treatAsClass, Supplier<List<String>> importOrder) {
 		return FormatterStep.createLazy("importOrder",
-				() -> new State(importOrder.get(), lineFormat, wildcardsLast),
+				() -> new State(importOrder.get(), lineFormat, wildcardsLast, semanticSort,
+						treatAsPackage == null ? Set.of() : treatAsPackage,
+						treatAsClass == null ? Set.of() : treatAsClass),
 				State::toFormatter);
 	}
 
@@ -106,15 +117,23 @@ private static final class State implements Serializable {
 		private final List<String> importOrder;
 		private final String lineFormat;
 		private final boolean wildcardsLast;
+		private final boolean semanticSort;
+		private final Set<String> treatAsPackage;
+		private final Set<String> treatAsClass;
 
-		State(List<String> importOrder, String lineFormat, boolean wildcardsLast) {
+		State(List<String> importOrder, String lineFormat, boolean wildcardsLast, boolean semanticSort,
+				Set<String> treatAsPackage, Set<String> treatAsClass) {
 			this.importOrder = importOrder;
 			this.lineFormat = lineFormat;
 			this.wildcardsLast = wildcardsLast;
+			this.semanticSort = semanticSort;
+			this.treatAsPackage = treatAsPackage;
+			this.treatAsClass = treatAsClass;
 		}
 
 		FormatterFunc toFormatter() {
-			return raw -> new ImportSorter(importOrder, wildcardsLast).format(raw, lineFormat);
+			return raw -> new ImportSorter(importOrder, wildcardsLast, semanticSort, treatAsPackage, treatAsClass)
+					.format(raw, lineFormat);
 		}
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/java/ImportSorter.java b/lib/src/main/java/com/diffplug/spotless/java/ImportSorter.java
index edfc948487..d6da23f254 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/ImportSorter.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/ImportSorter.java
@@ -18,6 +18,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Scanner;
+import java.util.Set;
 
 /**
  * @author Vojtech Krasa
@@ -30,10 +31,17 @@ final class ImportSorter {
 
 	private final List<String> importsOrder;
 	private final boolean wildcardsLast;
+	private final boolean semanticSort;
+	private final Set<String> treatAsPackage;
+	private final Set<String> treatAsClass;
 
-	ImportSorter(List<String> importsOrder, boolean wildcardsLast) {
+	ImportSorter(List<String> importsOrder, boolean wildcardsLast, boolean semanticSort, Set<String> treatAsPackage,
+			Set<String> treatAsClass) {
 		this.importsOrder = new ArrayList<>(importsOrder);
 		this.wildcardsLast = wildcardsLast;
+		this.semanticSort = semanticSort;
+		this.treatAsPackage = treatAsPackage;
+		this.treatAsClass = treatAsClass;
 	}
 
 	String format(String raw, String lineFormat) {
@@ -81,7 +89,8 @@ String format(String raw, String lineFormat) {
 		}
 		scanner.close();
 
-		List<String> sortedImports = ImportSorterImpl.sort(imports, importsOrder, wildcardsLast, lineFormat);
+		List<String> sortedImports = ImportSorterImpl.sort(imports, importsOrder, wildcardsLast, semanticSort,
+				treatAsPackage, treatAsClass, lineFormat);
 		return applyImportsToDocument(raw, firstImportLine, lastImportLine, sortedImports);
 	}
 
diff --git a/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java b/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java
index 1f014ba95e..828b5ef8f0 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java
@@ -62,8 +62,10 @@ public List<String> getSubGroups() {
 		}
 	}
 
-	static List<String> sort(List<String> imports, List<String> importsOrder, boolean wildcardsLast, String lineFormat) {
-		ImportSorterImpl importsSorter = new ImportSorterImpl(importsOrder, wildcardsLast);
+	static List<String> sort(List<String> imports, List<String> importsOrder, boolean wildcardsLast,
+			boolean semanticSort, Set<String> treatAsPackage, Set<String> treatAsClass, String lineFormat) {
+		ImportSorterImpl importsSorter = new ImportSorterImpl(importsOrder, wildcardsLast, semanticSort, treatAsPackage,
+				treatAsClass);
 		return importsSorter.sort(imports, lineFormat);
 	}
 
@@ -76,12 +78,17 @@ private List<String> sort(List<String> imports, String lineFormat) {
 		return getResult(sortedImported, lineFormat);
 	}
 
-	private ImportSorterImpl(List<String> importOrder, boolean wildcardsLast) {
+	private ImportSorterImpl(List<String> importOrder, boolean wildcardsLast, boolean semanticSort,
+			Set<String> treatAsPackage, Set<String> treatAsClass) {
 		importsGroups = importOrder.stream().filter(Objects::nonNull).map(ImportsGroup::new).collect(Collectors.toList());
 		putStaticItemIfNotExists(importsGroups);
 		putCatchAllGroupIfNotExists(importsGroups);
 
-		ordering = new OrderingComparator(wildcardsLast);
+		if (semanticSort) {
+			ordering = new SemanticOrderingComparator(wildcardsLast, treatAsPackage, treatAsClass);
+		} else {
+			ordering = new LexicographicalOrderingComparator(wildcardsLast);
+		}
 
 		List<String> subgroups = importsGroups.stream().map(ImportsGroup::getSubGroups).flatMap(Collection::stream).collect(Collectors.toList());
 		this.allImportOrderItems.addAll(subgroups);
@@ -233,30 +240,192 @@ private List<String> getResult(List<String> sortedImported, String lineFormat) {
 		return null;
 	}
 
-	private static class OrderingComparator implements Comparator<String>, Serializable {
+	private static int compareWithWildcare(String string1, String string2, boolean wildcardsLast) {
+		int string1WildcardIndex = string1.indexOf('*');
+		int string2WildcardIndex = string2.indexOf('*');
+		boolean string1IsWildcard = string1WildcardIndex >= 0;
+		boolean string2IsWildcard = string2WildcardIndex >= 0;
+		if (string1IsWildcard == string2IsWildcard) {
+			return string1.compareTo(string2);
+		}
+		int prefixLength = string1IsWildcard ? string1WildcardIndex : string2WildcardIndex;
+		boolean samePrefix = string1.regionMatches(0, string2, 0, prefixLength);
+		if (!samePrefix) {
+			return string1.compareTo(string2);
+		}
+		return (string1IsWildcard == wildcardsLast) ? 1 : -1;
+	}
+
+	private static class LexicographicalOrderingComparator implements Comparator<String>, Serializable {
 		private static final long serialVersionUID = 1;
 
 		private final boolean wildcardsLast;
 
-		private OrderingComparator(boolean wildcardsLast) {
+		private LexicographicalOrderingComparator(boolean wildcardsLast) {
 			this.wildcardsLast = wildcardsLast;
 		}
 
 		@Override
 		public int compare(String string1, String string2) {
-			int string1WildcardIndex = string1.indexOf('*');
-			int string2WildcardIndex = string2.indexOf('*');
-			boolean string1IsWildcard = string1WildcardIndex >= 0;
-			boolean string2IsWildcard = string2WildcardIndex >= 0;
-			if (string1IsWildcard == string2IsWildcard) {
-				return string1.compareTo(string2);
+			return compareWithWildcare(string1, string2, wildcardsLast);
+		}
+	}
+
+	private static class SemanticOrderingComparator implements Comparator<String>, Serializable {
+		private static final long serialVersionUID = 1;
+
+		private final boolean wildcardsLast;
+		private final Set<String> treatAsPackage;
+		private final Set<String> treatAsClass;
+
+		private SemanticOrderingComparator(boolean wildcardsLast, Set<String> treatAsPackage,
+				Set<String> treatAsClass) {
+			this.wildcardsLast = wildcardsLast;
+			this.treatAsPackage = treatAsPackage;
+			this.treatAsClass = treatAsClass;
+		}
+
+		@Override
+		public int compare(String string1, String string2) {
+			/*
+			 * Ordering uses semantics of the import string by splitting it into package,
+			 * class name(s) and static member (for static imports) and then comparing by
+			 * each of those three substrings in sequence.
+			 * 
+			 * When comparing static imports, the last segment in the dot-separated string
+			 * is considered to be the member (field, method, type) name.
+			 * 
+			 * The first segment starting with an upper case letter is considered to be the
+			 * (first) class name. Since this comparator has no actual type information,
+			 * this auto-detection will fail for upper case package names and lower case
+			 * class names. treatAsPackage and treatAsClass can be used respectively to
+			 * provide hints to the auto-detection.
+			 */
+			if (string1.startsWith(STATIC_KEYWORD)) {
+				String[] split = splitFqcnAndMember(string1);
+				String fqcn1 = split[0];
+				String member1 = split[1];
+
+				split = splitFqcnAndMember(string2);
+				String fqcn2 = split[0];
+				String member2 = split[1];
+
+				int result = compareFullyQualifiedClassName(fqcn1, fqcn2);
+				if (result != 0)
+					return result;
+
+				return compareWithWildcare(member1, member2, wildcardsLast);
+			} else {
+				return compareFullyQualifiedClassName(string1, string2);
+			}
+		}
+
+		/**
+		 * Compares two fully qualified class names by splitting them into package and
+		 * (nested) class names.
+		 */
+		private int compareFullyQualifiedClassName(String fqcn1, String fqcn2) {
+			String[] split = splitPackageAndClasses(fqcn1);
+			String p1 = split[0];
+			String c1 = split[1];
+
+			split = splitPackageAndClasses(fqcn2);
+			String p2 = split[0];
+			String c2 = split[1];
+
+			int result = p1.compareTo(p2);
+			if (result != 0)
+				return result;
+
+			return compareWithWildcare(c1, c2, wildcardsLast);
+		}
+
+		/**
+		 * Splits the provided static import string into fully qualified class name and
+		 * the imported static member (field, method or type).
+		 */
+		private String[] splitFqcnAndMember(String importString) {
+			String s = importString.substring(STATIC_KEYWORD.length()).trim();
+
+			String fqcn;
+			String member;
+
+			int dot = s.lastIndexOf(".");
+			if (!Character.isUpperCase(s.charAt(dot + 1))) {
+				fqcn = s.substring(0, dot);
+				member = s.substring(dot + 1);
+			} else {
+				fqcn = s;
+				member = null;
 			}
-			int prefixLength = string1IsWildcard ? string1WildcardIndex : string2WildcardIndex;
-			boolean samePrefix = string1.regionMatches(0, string2, 0, prefixLength);
-			if (!samePrefix) {
-				return string1.compareTo(string2);
+
+			return new String[] { fqcn, member };
+		}
+
+		/**
+		 * Splits the fully qualified class name into package and class name(s).
+		 */
+		private String[] splitPackageAndClasses(String fqcn) {
+			String packageNames = null;
+			String classNames = null;
+
+			/*
+			 * The first segment that starts with an upper case letter starts the class
+			 * name(s), unless it matches treatAsPackage (then it's explicitly declared as
+			 * package via configuration). If no segment starts with an upper case letter
+			 * then the last segment must be a class name (unless the method input is
+			 * garbage).
+			 */
+			int dot = fqcn.indexOf('.');
+			while (dot > -1) {
+				int nextDot = fqcn.indexOf('.', dot + 1);
+				if (nextDot > -1) {
+					if (Character.isUpperCase(fqcn.charAt(dot + 1))) {
+						// if upper case, check if should be treated as package nonetheless
+						if (!treatAsPackage(fqcn.substring(0, nextDot))) {
+							packageNames = fqcn.substring(0, dot);
+							classNames = fqcn.substring(dot + 1);
+							break;
+						}
+					} else {
+						// if lower case, check if should be treated as class nonetheless
+						if (treatAsClass(fqcn.substring(0, nextDot))) {
+							packageNames = fqcn.substring(0, dot);
+							classNames = fqcn.substring(dot + 1);
+							break;
+						}
+					}
+				}
+
+				dot = nextDot;
 			}
-			return (string1IsWildcard == wildcardsLast) ? 1 : -1;
+
+			if (packageNames == null) {
+				int i = fqcn.lastIndexOf(".");
+				packageNames = fqcn.substring(0, i);
+				classNames = fqcn.substring(i + 1);
+			}
+
+			return new String[] { packageNames, classNames };
 		}
+
+		/**
+		 * Returns whether the provided prefix matches any entry of
+		 * {@code treatAsPackage}.
+		 */
+		private boolean treatAsPackage(String prefix) {
+			// This would be the place to introduce wild cards or even regex matching.
+			return treatAsPackage.contains(prefix);
+		}
+
+		/**
+		 * Returns whether the provided prefix name matches any entry of
+		 * {@code treatAsClass}.
+		 */
+		private boolean treatAsClass(String prefix) {
+			// This would be the place to introduce wild cards or even regex matching.
+			return treatAsClass.contains(prefix);
+		}
+
 	}
 }
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
index d8dd77a09c..3016a94413 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
@@ -19,10 +19,13 @@
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 
 import javax.inject.Inject;
 
@@ -74,6 +77,9 @@ public class ImportOrderConfig {
 		final File importOrderFile;
 
 		boolean wildcardsLast = false;
+		boolean semanticSort = true;
+		Set<String> treatAsPackage = Set.of();
+		Set<String> treatAsClass = Set.of();
 
 		ImportOrderConfig(String[] importOrder) {
 			this.importOrder = importOrder;
@@ -98,12 +104,42 @@ public ImportOrderConfig wildcardsLast(boolean wildcardsLast) {
 			return this;
 		}
 
+		public ImportOrderConfig semanticSort() {
+			return semanticSort(true);
+		}
+
+		public ImportOrderConfig semanticSort(boolean semanticSort) {
+			this.semanticSort = semanticSort;
+			replaceStep(createStep());
+			return this;
+		}
+
+		public ImportOrderConfig treatAsPackage(String... treatAsPackage) {
+			return treatAsPackage(Arrays.asList(treatAsPackage));
+		}
+
+		public ImportOrderConfig treatAsPackage(Collection<String> treatAsPackage) {
+			this.treatAsPackage = new HashSet<>(treatAsPackage);
+			replaceStep(createStep());
+			return this;
+		}
+
+		public ImportOrderConfig treatAsClass(String... treatAsClass) {
+			return treatAsClass(Arrays.asList(treatAsClass));
+		}
+		
+		public ImportOrderConfig treatAsClass(Collection<String> treatAsClass) {
+			this.treatAsClass = new HashSet<>(treatAsClass);
+			replaceStep(createStep());
+			return this;
+		}
+		
 		private FormatterStep createStep() {
 			ImportOrderStep importOrderStep = ImportOrderStep.forJava();
 
 			return importOrderFile != null
-					? importOrderStep.createFrom(wildcardsLast, getProject().file(importOrderFile))
-					: importOrderStep.createFrom(wildcardsLast, importOrder);
+					? importOrderStep.createFrom(wildcardsLast, semanticSort, treatAsPackage, treatAsClass, getProject().file(importOrderFile))
+					: importOrderStep.createFrom(wildcardsLast, semanticSort, treatAsPackage, treatAsClass, importOrder);
 		}
 	}
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/ImportOrder.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/ImportOrder.java
index 8476b83733..94a89478bb 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/ImportOrder.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/ImportOrder.java
@@ -16,6 +16,8 @@
 package com.diffplug.spotless.maven.java;
 
 import java.io.File;
+import java.util.HashSet;
+import java.util.Set;
 
 import org.apache.maven.plugins.annotations.Parameter;
 
@@ -34,17 +36,43 @@ public class ImportOrder implements FormatterStepFactory {
 	@Parameter
 	private boolean wildcardsLast = false;
 
+	/**
+	 * Whether imports should be sorted based on semantics (i.e. sorted by package,
+	 * class and then static member). This considers <code>treatAsPackage</code> and
+	 * <code>treatAsClass</code>, and assumes default upper and lower case
+	 * conventions otherwise. When turned off, imports are sorted purely
+	 * lexicographically.
+	 */
+	@Parameter
+	private boolean semanticSort = true;
+
+	/**
+	 * The prefixes that should be treated as packages for
+	 * <code>semanticSort</code>. Useful for upper case package names.
+	 */
+	@Parameter
+	private Set<String> treatAsPackage = new HashSet<>();
+
+	/**
+	 * The prefixes that should be treated as classes for
+	 * <code>semanticSort</code>. Useful for lower case class names.
+	 */
+	@Parameter
+	private Set<String> treatAsClass = new HashSet<>();
+
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig config) {
 		if (file != null ^ order != null) {
 			if (file != null) {
 				File importsFile = config.getFileLocator().locateFile(file);
-				return ImportOrderStep.forJava().createFrom(wildcardsLast, importsFile);
+				return ImportOrderStep.forJava().createFrom(wildcardsLast, semanticSort, treatAsPackage, treatAsClass,
+						importsFile);
 			} else {
-				return ImportOrderStep.forJava().createFrom(wildcardsLast, order.split(",", -1));
+				return ImportOrderStep.forJava().createFrom(wildcardsLast, semanticSort, treatAsPackage, treatAsClass,
+						order.split(",", -1));
 			}
 		} else if (file == null && order == null) {
-			return ImportOrderStep.forJava().createFrom(wildcardsLast);
+			return ImportOrderStep.forJava().createFrom(wildcardsLast, semanticSort, treatAsPackage, treatAsClass);
 		} else {
 			throw new IllegalArgumentException("Must specify exactly one of 'file' or 'order'.");
 		}
diff --git a/testlib/src/main/resources/java/importsorter/JavaCodeSortedLexicographic.test b/testlib/src/main/resources/java/importsorter/JavaCodeSortedLexicographic.test
new file mode 100644
index 0000000000..731cbb5878
--- /dev/null
+++ b/testlib/src/main/resources/java/importsorter/JavaCodeSortedLexicographic.test
@@ -0,0 +1,13 @@
+import static com.example.Test.*;
+import static com.example.Test.A_CONST;
+import static com.example.Test.Nested.B_CONST;
+import static com.example.Test.Z_CONST;
+
+import com.example.Test;
+import com.example.Test.*;
+import com.example.Test.Nested;
+import com.example.a.A;
+import com.example.b;
+import com.example.c.C;
+import com.sun.jna.platform.win32.COM.Unknown;
+import com.sun.jna.platform.win32.Guid.CLSID;
diff --git a/testlib/src/main/resources/java/importsorter/JavaCodeSortedSemanticSort.test b/testlib/src/main/resources/java/importsorter/JavaCodeSortedSemanticSort.test
new file mode 100644
index 0000000000..aaab4c1b86
--- /dev/null
+++ b/testlib/src/main/resources/java/importsorter/JavaCodeSortedSemanticSort.test
@@ -0,0 +1,13 @@
+import static com.example.Test.*;
+import static com.example.Test.A_CONST;
+import static com.example.Test.Nested.B_CONST;
+import static com.example.Test.Z_CONST;
+
+import com.example.Test;
+import com.example.Test.*;
+import com.example.Test.Nested;
+import com.example.b;
+import com.example.a.A;
+import com.example.c.C;
+import com.sun.jna.platform.win32.Guid.CLSID;
+import com.sun.jna.platform.win32.COM.Unknown;
diff --git a/testlib/src/main/resources/java/importsorter/JavaCodeUnsortedSemanticSort.test b/testlib/src/main/resources/java/importsorter/JavaCodeUnsortedSemanticSort.test
new file mode 100644
index 0000000000..766322936d
--- /dev/null
+++ b/testlib/src/main/resources/java/importsorter/JavaCodeUnsortedSemanticSort.test
@@ -0,0 +1,15 @@
+import static com.example.Test.*;
+import static com.example.Test.A_CONST;
+import static com.example.Test.Z_CONST;
+import static com.example.Test.Nested.B_CONST;
+
+import com.example.Test.Nested;
+import com.example.Test;
+import com.example.Test.*;
+
+import com.sun.jna.platform.win32.COM.Unknown;
+import com.sun.jna.platform.win32.Guid.CLSID;
+
+import com.example.a.A;
+import com.example.b;
+import com.example.c.C;
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/ImportOrderStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/ImportOrderStepTest.java
index ca6bd39825..57b1401554 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/ImportOrderStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/ImportOrderStepTest.java
@@ -21,6 +21,7 @@
 import com.diffplug.spotless.ResourceHarness;
 import com.diffplug.spotless.SerializableEqualityTester;
 import com.diffplug.spotless.StepHarness;
+import java.util.Set;
 
 class ImportOrderStepTest extends ResourceHarness {
 	@Test
@@ -61,7 +62,7 @@ void sortImportsUnmatched() {
 
 	@Test
 	void sortImportsWildcardsLast() {
-		FormatterStep step = ImportOrderStep.forJava().createFrom(true);
+		FormatterStep step = ImportOrderStep.forJava().createFrom(true, true, null, null);
 		StepHarness.forStep(step).testResource("java/importsorter/JavaCodeUnsortedImports.test", "java/importsorter/JavaCodeSortedImportsWildcardsLast.test");
 	}
 
@@ -89,6 +90,19 @@ void empty() {
 		StepHarness.forStep(step).testResource("java/importsorter/JavaCodeEmptyFile.test", "java/importsorter/JavaCodeEmptyFile.test");
 	}
 
+	@Test
+	void lexicographicSort() {
+		FormatterStep step = ImportOrderStep.forJava().createFrom(false, false, null, null, createTestFile("java/importsorter/import.properties"));
+		StepHarness.forStep(step).testResource("java/importsorter/JavaCodeUnsortedSemanticSort.test", "java/importsorter/JavaCodeSortedLexicographic.test");
+	}
+
+	@Test
+	void semanticSort() {
+		FormatterStep step = ImportOrderStep.forJava().createFrom(false, true, Set.of("com.sun.jna.platform.win32.COM"),
+				Set.of("com.example.b"), createTestFile("java/importsorter/import.properties"));
+		StepHarness.forStep(step).testResource("java/importsorter/JavaCodeUnsortedSemanticSort.test", "java/importsorter/JavaCodeSortedSemanticSort.test");
+	}
+
 	@Test
 	void groovyImports() {
 		FormatterStep step = ImportOrderStep.forGroovy().createFrom(createTestFile("java/importsorter/import.properties"));

From 7deb02e52e6a45f888658028f0a1003c3f3eb19e Mon Sep 17 00:00:00 2001
From: Patrick Schmidt <patrick@codecamp.de>
Date: Mon, 22 May 2023 19:46:10 +0200
Subject: [PATCH 1076/2068] Update changelog and readme.

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 1 +
 plugin-maven/CHANGES.md  | 1 +
 plugin-maven/README.md   | 7 +++++++
 4 files changed, 10 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 9d65dfd9b5..873bbbe84e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,6 +13,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * `Jvm.Support` now accepts `-SNAPSHOT` versions, treated as the non`-SNAPSHOT`. ([#1583](https://github.com/diffplug/spotless/issues/1583))
 * Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. ([#1663](https://github.com/diffplug/spotless/pull/1663))
+* Add semantics-aware Java import ordering (i.e. sort by package, then class, then member). ([#522](https://github.com/diffplug/spotless/issues/522))
 ### Fixed
 * When P2 download fails, indicate the responsible formatter. ([#1698](https://github.com/diffplug/spotless/issues/1698))
 * Fixed a regression which changed the import sorting order in `googleJavaFormat` introduced in `2.38.0`. ([#1680](https://github.com/diffplug/spotless/pull/1680))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index d064173af6..7b1b401f14 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. ([#1663](https://github.com/diffplug/spotless/pull/1663))
+* Add semantics-aware Java import ordering (i.e. sort by package, then class, then member). ([#522](https://github.com/diffplug/spotless/issues/522))
 ### Fixed
 * Added `@DisableCachingByDefault` to `RegisterDependenciesTask`. ([#1666](https://github.com/diffplug/spotless/pull/1666))
 * When P2 download fails, indicate the responsible formatter. ([#1698](https://github.com/diffplug/spotless/issues/1698))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 5777493c41..139b0fa265 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. ([#1663](https://github.com/diffplug/spotless/pull/1663))
+* Add semantics-aware Java import ordering (i.e. sort by package, then class, then member). ([#522](https://github.com/diffplug/spotless/issues/522))
 ### Fixed
 * `palantir` step now accepts a `style` parameter, which is documentation had already claimed to do. ([#1694](https://github.com/diffplug/spotless/pull/1694))
 * When P2 download fails, indicate the responsible formatter. ([#1698](https://github.com/diffplug/spotless/issues/1698))
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index b11e2c164d..7facd99a0d 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -196,6 +196,13 @@ any other maven phase (i.e. compile) then it can be configured as below;
       <wildcardsLast>false</wildcardsLast> <!-- Optional, default false. Sort wildcard import after specific imports -->
       <order>java|javax,org,com,com.diffplug,,\#com.diffplug,\#</order>  <!-- or use <file>${project.basedir}/eclipse.importorder</file> -->
       <!-- you can use an empty string for all the imports you didn't specify explicitly, '|' to join group without blank line, and '\#` prefix for static imports. -->
+      <semanticSort>false</semanticSort> <!-- Optional, default true. Sort by package, then class, then member (for static imports). Splitting is based on common conventions (packages are lower case, classes start with upper case). Use <treatAsPackage> and <treatAsClass> for exceptions. -->
+      <treatAsPackage> <!-- Packages starting with upper case letters. -->
+        <package>com.example.MyPackage</package>
+      </treatAsPackage>
+      <treatAsClass> <!-- Classes starting with lower case letters. -->
+        <class>com.example.myClass</class>
+      </treatAsClass>
     </importOrder>
 
     <removeUnusedImports /> <!-- self-explanatory -->

From 5494c80f014f048717786a949cfbb49d605968f4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 22 May 2023 18:47:43 +0000
Subject: [PATCH 1077/2068] fix(deps): update dependency
 com.google.googlejavaformat:google-java-format to v1.17.0

---
 lib/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 8db911e33e..00df2648de 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -81,7 +81,7 @@ dependencies {
 	gherkinCompileOnly 'io.cucumber:gherkin-utils:8.0.2'
 	gherkinCompileOnly 'org.slf4j:slf4j-api:2.0.0'
 	// googleJavaFormat
-	googleJavaFormatCompileOnly 'com.google.googlejavaformat:google-java-format:1.16.0'
+	googleJavaFormatCompileOnly 'com.google.googlejavaformat:google-java-format:1.17.0'
 	// gson
 	gsonCompileOnly 'com.google.code.gson:gson:2.10.1'
 	// jackson

From 10610f8a8d12bfdc8303645daafc4d68c17c9165 Mon Sep 17 00:00:00 2001
From: Patrick Schmidt <patrick@codecamp.de>
Date: Mon, 22 May 2023 21:03:16 +0200
Subject: [PATCH 1078/2068] fixup! Introduce semantics-aware Java import
 ordering. (fixes #522)

---
 .../diffplug/spotless/java/ImportOrderStep.java  | 16 ++++++++--------
 .../diffplug/spotless/java/ImportSorterImpl.java |  4 ++--
 .../diffplug/gradle/spotless/JavaExtension.java  |  2 +-
 .../spotless/maven/java/ImportOrder.java         |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/ImportOrderStep.java b/lib/src/main/java/com/diffplug/spotless/java/ImportOrderStep.java
index 7f100e0adc..e986875a48 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/ImportOrderStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/ImportOrderStep.java
@@ -29,6 +29,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.TreeSet;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -40,7 +41,7 @@
 
 public final class ImportOrderStep {
 	private static final boolean WILDCARDS_LAST_DEFAULT = false;
-	private static final boolean SEMANTIC_SORT_DEFAULT = true;
+	private static final boolean SEMANTIC_SORT_DEFAULT = false;
 	private static final Set<String> TREAT_AS_PACKAGE_DEFAULT = null;
 	private static final Set<String> TREAT_AS_CLASS_DEFAULT = null;
 
@@ -84,9 +85,8 @@ public FormatterStep createFrom(boolean wildcardsLast, boolean semanticSort, Set
 	private FormatterStep createFrom(boolean wildcardsLast, boolean semanticSort, Set<String> treatAsPackage,
 			Set<String> treatAsClass, Supplier<List<String>> importOrder) {
 		return FormatterStep.createLazy("importOrder",
-				() -> new State(importOrder.get(), lineFormat, wildcardsLast, semanticSort,
-						treatAsPackage == null ? Set.of() : treatAsPackage,
-						treatAsClass == null ? Set.of() : treatAsClass),
+				() -> new State(importOrder.get(), lineFormat, wildcardsLast, semanticSort, treatAsPackage,
+						treatAsClass),
 				State::toFormatter);
 	}
 
@@ -118,8 +118,8 @@ private static final class State implements Serializable {
 		private final String lineFormat;
 		private final boolean wildcardsLast;
 		private final boolean semanticSort;
-		private final Set<String> treatAsPackage;
-		private final Set<String> treatAsClass;
+		private final TreeSet<String> treatAsPackage;
+		private final TreeSet<String> treatAsClass;
 
 		State(List<String> importOrder, String lineFormat, boolean wildcardsLast, boolean semanticSort,
 				Set<String> treatAsPackage, Set<String> treatAsClass) {
@@ -127,8 +127,8 @@ private static final class State implements Serializable {
 			this.lineFormat = lineFormat;
 			this.wildcardsLast = wildcardsLast;
 			this.semanticSort = semanticSort;
-			this.treatAsPackage = treatAsPackage;
-			this.treatAsClass = treatAsClass;
+			this.treatAsPackage = treatAsPackage == null ? null : new TreeSet<>(treatAsPackage);
+			this.treatAsClass = treatAsClass == null ? null : new TreeSet<>(treatAsClass);
 		}
 
 		FormatterFunc toFormatter() {
diff --git a/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java b/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java
index 828b5ef8f0..a6d5af675c 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java
@@ -415,7 +415,7 @@ private String[] splitPackageAndClasses(String fqcn) {
 		 */
 		private boolean treatAsPackage(String prefix) {
 			// This would be the place to introduce wild cards or even regex matching.
-			return treatAsPackage.contains(prefix);
+			return treatAsPackage != null && treatAsPackage.contains(prefix);
 		}
 
 		/**
@@ -424,7 +424,7 @@ private boolean treatAsPackage(String prefix) {
 		 */
 		private boolean treatAsClass(String prefix) {
 			// This would be the place to introduce wild cards or even regex matching.
-			return treatAsClass.contains(prefix);
+			return treatAsClass != null && treatAsClass.contains(prefix);
 		}
 
 	}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
index 3016a94413..ecb519bd6e 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
@@ -77,7 +77,7 @@ public class ImportOrderConfig {
 		final File importOrderFile;
 
 		boolean wildcardsLast = false;
-		boolean semanticSort = true;
+		boolean semanticSort = false;
 		Set<String> treatAsPackage = Set.of();
 		Set<String> treatAsClass = Set.of();
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/ImportOrder.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/ImportOrder.java
index 94a89478bb..fe6dc10fc8 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/ImportOrder.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/ImportOrder.java
@@ -44,7 +44,7 @@ public class ImportOrder implements FormatterStepFactory {
 	 * lexicographically.
 	 */
 	@Parameter
-	private boolean semanticSort = true;
+	private boolean semanticSort = false;
 
 	/**
 	 * The prefixes that should be treated as packages for

From ff38088bc57fd2a9b15d5b33abfecec6f7de25a0 Mon Sep 17 00:00:00 2001
From: Patrick Schmidt <patrick@codecamp.de>
Date: Mon, 22 May 2023 21:29:55 +0200
Subject: [PATCH 1079/2068] fixup! Introduce semantics-aware Java import
 ordering. (fixes #522)

---
 .../java/com/diffplug/spotless/java/ImportOrderStep.java  | 2 +-
 .../java/com/diffplug/spotless/java/ImportSorter.java     | 2 +-
 .../java/com/diffplug/spotless/java/ImportSorterImpl.java | 8 ++++----
 .../java/com/diffplug/gradle/spotless/JavaExtension.java  | 4 ++--
 .../com/diffplug/spotless/maven/java/ImportOrder.java     | 2 +-
 .../com/diffplug/spotless/java/ImportOrderStepTest.java   | 3 ++-
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/ImportOrderStep.java b/lib/src/main/java/com/diffplug/spotless/java/ImportOrderStep.java
index e986875a48..6f0f2a0e8f 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/ImportOrderStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/ImportOrderStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/main/java/com/diffplug/spotless/java/ImportSorter.java b/lib/src/main/java/com/diffplug/spotless/java/ImportSorter.java
index d6da23f254..6cd7dd4978 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/ImportSorter.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/ImportSorter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java b/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java
index a6d5af675c..a3fe621e13 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java
@@ -291,10 +291,10 @@ public int compare(String string1, String string2) {
 			 * Ordering uses semantics of the import string by splitting it into package,
 			 * class name(s) and static member (for static imports) and then comparing by
 			 * each of those three substrings in sequence.
-			 * 
+			 *
 			 * When comparing static imports, the last segment in the dot-separated string
 			 * is considered to be the member (field, method, type) name.
-			 * 
+			 *
 			 * The first segment starting with an upper case letter is considered to be the
 			 * (first) class name. Since this comparator has no actual type information,
 			 * this auto-detection will fail for upper case package names and lower case
@@ -359,7 +359,7 @@ private String[] splitFqcnAndMember(String importString) {
 				member = null;
 			}
 
-			return new String[] { fqcn, member };
+			return new String[]{fqcn, member};
 		}
 
 		/**
@@ -406,7 +406,7 @@ private String[] splitPackageAndClasses(String fqcn) {
 				classNames = fqcn.substring(i + 1);
 			}
 
-			return new String[] { packageNames, classNames };
+			return new String[]{packageNames, classNames};
 		}
 
 		/**
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
index ecb519bd6e..13fe674168 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
@@ -127,13 +127,13 @@ public ImportOrderConfig treatAsPackage(Collection<String> treatAsPackage) {
 		public ImportOrderConfig treatAsClass(String... treatAsClass) {
 			return treatAsClass(Arrays.asList(treatAsClass));
 		}
-		
+
 		public ImportOrderConfig treatAsClass(Collection<String> treatAsClass) {
 			this.treatAsClass = new HashSet<>(treatAsClass);
 			replaceStep(createStep());
 			return this;
 		}
-		
+
 		private FormatterStep createStep() {
 			ImportOrderStep importOrderStep = ImportOrderStep.forJava();
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/ImportOrder.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/ImportOrder.java
index fe6dc10fc8..88f47a2a64 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/ImportOrder.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/ImportOrder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/ImportOrderStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/ImportOrderStepTest.java
index 57b1401554..75cd984f08 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/ImportOrderStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/ImportOrderStepTest.java
@@ -15,13 +15,14 @@
  */
 package com.diffplug.spotless.java;
 
+import java.util.Set;
+
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.ResourceHarness;
 import com.diffplug.spotless.SerializableEqualityTester;
 import com.diffplug.spotless.StepHarness;
-import java.util.Set;
 
 class ImportOrderStepTest extends ResourceHarness {
 	@Test

From d72a11ce0305b45a8b4a54afdde861280434595c Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 22 May 2023 14:58:11 -0700
Subject: [PATCH 1080/2068] Fix spotbugs.

---
 .../main/java/com/diffplug/spotless/java/ImportOrderStep.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/ImportOrderStep.java b/lib/src/main/java/com/diffplug/spotless/java/ImportOrderStep.java
index 6f0f2a0e8f..e1e63458d9 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/ImportOrderStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/ImportOrderStep.java
@@ -42,8 +42,8 @@
 public final class ImportOrderStep {
 	private static final boolean WILDCARDS_LAST_DEFAULT = false;
 	private static final boolean SEMANTIC_SORT_DEFAULT = false;
-	private static final Set<String> TREAT_AS_PACKAGE_DEFAULT = null;
-	private static final Set<String> TREAT_AS_CLASS_DEFAULT = null;
+	private static final Set<String> TREAT_AS_PACKAGE_DEFAULT = Set.of();
+	private static final Set<String> TREAT_AS_CLASS_DEFAULT = Set.of();
 
 	private final String lineFormat;
 

From a8a94c06f1e050dc6937707acb2ef804d921755c Mon Sep 17 00:00:00 2001
From: Patrick Schmidt <patrick@codecamp.de>
Date: Tue, 23 May 2023 20:45:25 +0200
Subject: [PATCH 1081/2068] Fix semantics-aware sorting of static imports
 (fixes #522)

---
 .../spotless/java/ImportSorterImpl.java         | 17 ++++++-----------
 .../JavaCodeSortedLexicographic.test            |  4 ++++
 .../JavaCodeSortedSemanticSort.test             |  6 +++++-
 .../JavaCodeUnsortedSemanticSort.test           |  4 ++++
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java b/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java
index a3fe621e13..4d343d41d8 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java
@@ -347,18 +347,13 @@ private int compareFullyQualifiedClassName(String fqcn1, String fqcn2) {
 		private String[] splitFqcnAndMember(String importString) {
 			String s = importString.substring(STATIC_KEYWORD.length()).trim();
 
-			String fqcn;
-			String member;
-
+			/*
+			 * Static imports always contain a member or wildcard and it's always the last
+			 * segment.
+			 */
 			int dot = s.lastIndexOf(".");
-			if (!Character.isUpperCase(s.charAt(dot + 1))) {
-				fqcn = s.substring(0, dot);
-				member = s.substring(dot + 1);
-			} else {
-				fqcn = s;
-				member = null;
-			}
-
+			String fqcn = s.substring(0, dot);
+			String member = s.substring(dot + 1);
 			return new String[]{fqcn, member};
 		}
 
diff --git a/testlib/src/main/resources/java/importsorter/JavaCodeSortedLexicographic.test b/testlib/src/main/resources/java/importsorter/JavaCodeSortedLexicographic.test
index 731cbb5878..2b59d52e58 100644
--- a/testlib/src/main/resources/java/importsorter/JavaCodeSortedLexicographic.test
+++ b/testlib/src/main/resources/java/importsorter/JavaCodeSortedLexicographic.test
@@ -1,3 +1,7 @@
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 import static com.example.Test.*;
 import static com.example.Test.A_CONST;
 import static com.example.Test.Nested.B_CONST;
diff --git a/testlib/src/main/resources/java/importsorter/JavaCodeSortedSemanticSort.test b/testlib/src/main/resources/java/importsorter/JavaCodeSortedSemanticSort.test
index aaab4c1b86..3ab813b227 100644
--- a/testlib/src/main/resources/java/importsorter/JavaCodeSortedSemanticSort.test
+++ b/testlib/src/main/resources/java/importsorter/JavaCodeSortedSemanticSort.test
@@ -1,7 +1,11 @@
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 import static com.example.Test.*;
 import static com.example.Test.A_CONST;
-import static com.example.Test.Nested.B_CONST;
 import static com.example.Test.Z_CONST;
+import static com.example.Test.Nested.B_CONST;
 
 import com.example.Test;
 import com.example.Test.*;
diff --git a/testlib/src/main/resources/java/importsorter/JavaCodeUnsortedSemanticSort.test b/testlib/src/main/resources/java/importsorter/JavaCodeUnsortedSemanticSort.test
index 766322936d..7bfcfc6f7a 100644
--- a/testlib/src/main/resources/java/importsorter/JavaCodeUnsortedSemanticSort.test
+++ b/testlib/src/main/resources/java/importsorter/JavaCodeUnsortedSemanticSort.test
@@ -13,3 +13,7 @@ import com.sun.jna.platform.win32.Guid.CLSID;
 import com.example.a.A;
 import com.example.b;
 import com.example.c.C;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.when;

From 655bc7ba0c68d3d505fc670c174f6a2a0fc4b835 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 23 May 2023 14:44:49 -0700
Subject: [PATCH 1082/2068] Bump solstice and durian-swt to latest.

---
 lib-extra/build.gradle                                        | 2 +-
 .../com/diffplug/spotless/extra/EquoBasedStepBuilder.java     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index 5e491eaf20..1158ca0893 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -7,7 +7,7 @@ version = rootProject.spotlessChangelog.versionNext
 apply from: rootProject.file('gradle/java-setup.gradle')
 apply from: rootProject.file('gradle/java-publish.gradle')
 
-String VER_SOLSTICE = '1.0.3'
+String VER_SOLSTICE = '1.3.1'
 dependencies {
 	api project(':lib')
 	// misc useful utilities
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 7f0e181837..586deeb5bf 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
@@ -110,8 +110,8 @@ EquoBasedStepBuilder.State get() throws Exception {
 		}
 		var classpath = new ArrayList<File>();
 		var mavenDeps = new ArrayList<String>();
-		mavenDeps.add("dev.equo.ide:solstice:1.0.3");
-		mavenDeps.add("com.diffplug.durian:durian-swt.os:4.1.1");
+		mavenDeps.add("dev.equo.ide:solstice:1.3.1");
+		mavenDeps.add("com.diffplug.durian:durian-swt.os:4.2.0");
 		mavenDeps.addAll(query.getJarsOnMavenCentral());
 		classpath.addAll(mavenProvisioner.provisionWithTransitives(false, mavenDeps));
 		classpath.addAll(query.getJarsNotOnMavenCentral());

From aa8d02922a27ea9bd4114c3fb226e0558fd16e66 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 23 May 2023 14:51:27 -0700
Subject: [PATCH 1083/2068] Bump ktfmt default version to 0.44.

---
 lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
index d6a20bc5b3..098f68d5bd 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
@@ -39,7 +39,7 @@ public class KtfmtStep {
 	// prevent direct instantiation
 	private KtfmtStep() {}
 
-	private static final String DEFAULT_VERSION = "0.43";
+	private static final String DEFAULT_VERSION = "0.44";
 	static final String NAME = "ktfmt";
 	static final String PACKAGE = "com.facebook";
 	static final String MAVEN_COORDINATE = PACKAGE + ":ktfmt:";

From 7d0d409abca37e537ae53d7ec160bcd62049dda5 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 23 May 2023 14:52:01 -0700
Subject: [PATCH 1084/2068] Bump gjf default to 1.17.0 and mark it as the
 minimum required for Java 21.

---
 .../java/com/diffplug/spotless/java/GoogleJavaFormatStep.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
index d7ba26f384..321d05420f 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
@@ -72,7 +72,8 @@ public static FormatterStep create(String groupArtifact, String version, String
 	static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME)
 			.addMin(11, "1.8") // we only support google-java-format >= 1.8 due to api changes
 			.addMin(16, "1.10.0") // java 16 requires at least 1.10.0 due to jdk api changes in JavaTokenizer
-			.add(11, "1.16.0"); // default version
+			.addMin(21, "1.17.0") // java 21 requires at least 1.17.0 due to https://github.com/google/google-java-format/issues/898
+			.add(11, "1.17.0"); // default version
 
 	public static String defaultGroupArtifact() {
 		return MAVEN_COORDINATE;

From 187b7fe48eb9a31f1689e1923423763ad5fd812c Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 23 May 2023 15:00:11 -0700
Subject: [PATCH 1085/2068] Fix compile error.

---
 .../spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java b/lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java
index 7c29209157..163816c1a4 100644
--- a/lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java
+++ b/lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java
@@ -52,7 +52,7 @@
 public class GrEclipseFormatterStepImpl {
 	static {
 		NestedJars.setToWarnOnly();
-		NestedJars.onClassPath().confirmAllNestedJarsArePresentOnClasspath(CacheLocations.nestedJars());
+		NestedJars.onClassPath().confirmAllNestedJarsArePresentOnClasspath(CacheLocations.p2nestedJars());
 		try {
 			var solstice = Solstice.findBundlesOnClasspath();
 			solstice.warnAndModifyManifestsToFix();

From 34fb099d422c6a4b36b00d2693ec8442093c8617 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 23 May 2023 15:51:41 -0700
Subject: [PATCH 1086/2068] Bump changelogs.

---
 CHANGES.md               | 3 ++-
 plugin-gradle/CHANGES.md | 3 ++-
 plugin-maven/CHANGES.md  | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 40e4b651df..026f66bf43 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -18,9 +18,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * When P2 download fails, indicate the responsible formatter. ([#1698](https://github.com/diffplug/spotless/issues/1698))
 * Fixed a regression which changed the import sorting order in `googleJavaFormat` introduced in `2.38.0`. ([#1680](https://github.com/diffplug/spotless/pull/1680))
 ### Changes
-* Bump default sortpom version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675))
+* Bump default `googleJavaFormat` version to latest `1.16.0` -> `1.17.0`. ([#1710](https://github.com/diffplug/spotless/pull/1710))
 * Bump default `ktlint` version to latest `0.48.2` -> `0.49.1`.([#1696](https://github.com/diffplug/spotless/issues/1696))
   * Dropped support for `ktlint 0.46.x` following our policy of supporting two breaking changes at a time.
+* Bump default `sortpom` version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675))
 
 ## [2.38.0] - 2023-04-06
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index c85a3ac3a2..8694784fd8 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -11,9 +11,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * When P2 download fails, indicate the responsible formatter. ([#1698](https://github.com/diffplug/spotless/issues/1698))
 * Fixed a regression which changed the import sorting order in `googleJavaFormat` introduced in `6.18.0`. ([#1680](https://github.com/diffplug/spotless/pull/1680))
 ### Changes
-* Bump default sortpom version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675))
+* Bump default `googleJavaFormat` version to latest `1.16.0` -> `1.17.0`. ([#1710](https://github.com/diffplug/spotless/pull/1710))
 * Bump default `ktlint` version to latest `0.48.2` -> `0.49.1`.([#1696](https://github.com/diffplug/spotless/issues/1696))
   * Dropped support for `ktlint 0.46.x` following our policy of supporting two breaking changes at a time.
+* Bump default `sortpom` version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675))
 
 ## [6.18.0] - 2023-04-06
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 33168309ae..3ab9a3f92c 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -11,9 +11,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * When P2 download fails, indicate the responsible formatter. ([#1698](https://github.com/diffplug/spotless/issues/1698))
 * Fixed a regression which changed the import sorting order in `googleJavaFormat` introduced in `2.36.0`. ([#1680](https://github.com/diffplug/spotless/pull/1680))
 ### Changes
-* Bump default sortpom version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675))
+* Bump default `googleJavaFormat` version to latest `1.16.0` -> `1.17.0`. ([#1710](https://github.com/diffplug/spotless/pull/1710))
 * Bump default `ktlint` version to latest `0.48.2` -> `0.49.1`.([#1696](https://github.com/diffplug/spotless/issues/1696))
   * Dropped support for `ktlint 0.46.x` following our policy of supporting two breaking changes at a time.
+* Bump default `sortpom` version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675))
 
 ## [2.36.0] - 2023-04-06
 ### Added

From d88928a9386562cb7864dc7f65d4900e96a825fd Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 23 May 2023 15:53:56 -0700
Subject: [PATCH 1087/2068] Update changelogs.

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 1 +
 plugin-maven/CHANGES.md  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 026f66bf43..c75da2ca95 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -19,6 +19,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Fixed a regression which changed the import sorting order in `googleJavaFormat` introduced in `2.38.0`. ([#1680](https://github.com/diffplug/spotless/pull/1680))
 ### Changes
 * Bump default `googleJavaFormat` version to latest `1.16.0` -> `1.17.0`. ([#1710](https://github.com/diffplug/spotless/pull/1710))
+* Bump default `ktfmt` version to latest `0.43` -> `0.44`.([#1691](https://github.com/diffplug/spotless/pull/1691))
 * Bump default `ktlint` version to latest `0.48.2` -> `0.49.1`.([#1696](https://github.com/diffplug/spotless/issues/1696))
   * Dropped support for `ktlint 0.46.x` following our policy of supporting two breaking changes at a time.
 * Bump default `sortpom` version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 8694784fd8..72889452ff 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Fixed a regression which changed the import sorting order in `googleJavaFormat` introduced in `6.18.0`. ([#1680](https://github.com/diffplug/spotless/pull/1680))
 ### Changes
 * Bump default `googleJavaFormat` version to latest `1.16.0` -> `1.17.0`. ([#1710](https://github.com/diffplug/spotless/pull/1710))
+* Bump default `ktfmt` version to latest `0.43` -> `0.44`.([#1691](https://github.com/diffplug/spotless/pull/1691))
 * Bump default `ktlint` version to latest `0.48.2` -> `0.49.1`.([#1696](https://github.com/diffplug/spotless/issues/1696))
   * Dropped support for `ktlint 0.46.x` following our policy of supporting two breaking changes at a time.
 * Bump default `sortpom` version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 3ab9a3f92c..1f7412104a 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Fixed a regression which changed the import sorting order in `googleJavaFormat` introduced in `2.36.0`. ([#1680](https://github.com/diffplug/spotless/pull/1680))
 ### Changes
 * Bump default `googleJavaFormat` version to latest `1.16.0` -> `1.17.0`. ([#1710](https://github.com/diffplug/spotless/pull/1710))
+* Bump default `ktfmt` version to latest `0.43` -> `0.44`.([#1691](https://github.com/diffplug/spotless/pull/1691))
 * Bump default `ktlint` version to latest `0.48.2` -> `0.49.1`.([#1696](https://github.com/diffplug/spotless/issues/1696))
   * Dropped support for `ktlint 0.46.x` following our policy of supporting two breaking changes at a time.
 * Bump default `sortpom` version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675))

From 973f285218b7a35eb0d124f046265a3ad2cc8988 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 23 May 2023 15:54:28 -0700
Subject: [PATCH 1088/2068] Why is KtfmtStepTest disabled?

---
 .../test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java
index bfa971fc40..0bbfcabe05 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java
@@ -15,12 +15,10 @@
  */
 package com.diffplug.spotless.kotlin;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.*;
 
-@Disabled
 class KtfmtStepTest extends ResourceHarness {
 	@Test
 	void behavior() throws Exception {

From a9fde3e4ec8b7a7162e88564f2cc926f809c318a Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 23 May 2023 15:57:20 -0700
Subject: [PATCH 1089/2068] Fix the broken parts of the test.

---
 .../com/diffplug/spotless/kotlin/KtfmtStepTest.java    | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java
index 0bbfcabe05..72e0adb4e2 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java
@@ -32,23 +32,17 @@ void dropboxStyle_0_18() throws Exception {
 		StepHarness.forStep(step).testResource("kotlin/ktfmt/basic.dirty", "kotlin/ktfmt/basic-dropboxstyle.clean");
 	}
 
-	@Test
-	void dropboxStyle_0_19() throws Exception {
-		FormatterStep step = KtfmtStep.create("0.19", TestProvisioner.mavenCentral(), KtfmtStep.Style.DROPBOX, null);
-		StepHarness.forStep(step).testResource("kotlin/ktfmt/basic.dirty", "kotlin/ktfmt/basic-dropboxstyle.clean");
-	}
-
 	@Test
 	void equality() throws Exception {
 		new SerializableEqualityTester() {
-			String version = "0.13";
+			String version = "0.18";
 
 			@Override
 			protected void setupTest(API api) {
 				// same version == same
 				api.areDifferentThan();
 				// change the version, and it's different
-				version = "0.12";
+				version = KtfmtStep.defaultVersion();
 				api.areDifferentThan();
 			}
 

From d4c55ac470139c255a8daa213717e5737e06a920 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 23 May 2023 17:17:01 -0700
Subject: [PATCH 1090/2068] Bump changelogs.

---
 CHANGES.md               | 8 +++++---
 plugin-gradle/CHANGES.md | 8 +++++---
 plugin-maven/CHANGES.md  | 8 +++++---
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index c75da2ca95..ccc6f8480b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,12 +15,14 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. ([#1663](https://github.com/diffplug/spotless/pull/1663))
 * Add semantics-aware Java import ordering (i.e. sort by package, then class, then member). ([#522](https://github.com/diffplug/spotless/issues/522))
 ### Fixed
-* When P2 download fails, indicate the responsible formatter. ([#1698](https://github.com/diffplug/spotless/issues/1698))
 * Fixed a regression which changed the import sorting order in `googleJavaFormat` introduced in `2.38.0`. ([#1680](https://github.com/diffplug/spotless/pull/1680))
+* Equo-based formatters now work on platforms unsupported by Eclipse such as PowerPC (fixes [durian-swt#20](https://github.com/diffplug/durian-swt/issues/20))
+* When P2 download fails, indicate the responsible formatter. ([#1698](https://github.com/diffplug/spotless/issues/1698))
 ### Changes
+* Equo-based formatters now download metadata to `~/.m2/repository/dev/equo/p2-data` rather than `~/.equo`, and for CI machines without a home directory the p2 data goes to `$GRADLE_USER_HOME/caches/p2-data`. ([#1714](https://github.com/diffplug/spotless/pull/1714))
 * Bump default `googleJavaFormat` version to latest `1.16.0` -> `1.17.0`. ([#1710](https://github.com/diffplug/spotless/pull/1710))
-* Bump default `ktfmt` version to latest `0.43` -> `0.44`.([#1691](https://github.com/diffplug/spotless/pull/1691))
-* Bump default `ktlint` version to latest `0.48.2` -> `0.49.1`.([#1696](https://github.com/diffplug/spotless/issues/1696))
+* Bump default `ktfmt` version to latest `0.43` -> `0.44`. ([#1691](https://github.com/diffplug/spotless/pull/1691))
+* Bump default `ktlint` version to latest `0.48.2` -> `0.49.1`. ([#1696](https://github.com/diffplug/spotless/issues/1696))
   * Dropped support for `ktlint 0.46.x` following our policy of supporting two breaking changes at a time.
 * Bump default `sortpom` version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675))
 
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 72889452ff..2c0b8aed4e 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -8,12 +8,14 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Add semantics-aware Java import ordering (i.e. sort by package, then class, then member). ([#522](https://github.com/diffplug/spotless/issues/522))
 ### Fixed
 * Added `@DisableCachingByDefault` to `RegisterDependenciesTask`. ([#1666](https://github.com/diffplug/spotless/pull/1666))
-* When P2 download fails, indicate the responsible formatter. ([#1698](https://github.com/diffplug/spotless/issues/1698))
 * Fixed a regression which changed the import sorting order in `googleJavaFormat` introduced in `6.18.0`. ([#1680](https://github.com/diffplug/spotless/pull/1680))
+* Equo-based formatters now work on platforms unsupported by Eclipse such as PowerPC (fixes [durian-swt#20](https://github.com/diffplug/durian-swt/issues/20))
+* When P2 download fails, indicate the responsible formatter. ([#1698](https://github.com/diffplug/spotless/issues/1698))
 ### Changes
+* Equo-based formatters now download metadata to `~/.m2/repository/dev/equo/p2-data` rather than `~/.equo`, and for CI machines without a home directory the p2 data goes to `$GRADLE_USER_HOME/caches/p2-data`. ([#1714](https://github.com/diffplug/spotless/pull/1714))
 * Bump default `googleJavaFormat` version to latest `1.16.0` -> `1.17.0`. ([#1710](https://github.com/diffplug/spotless/pull/1710))
-* Bump default `ktfmt` version to latest `0.43` -> `0.44`.([#1691](https://github.com/diffplug/spotless/pull/1691))
-* Bump default `ktlint` version to latest `0.48.2` -> `0.49.1`.([#1696](https://github.com/diffplug/spotless/issues/1696))
+* Bump default `ktfmt` version to latest `0.43` -> `0.44`. ([#1691](https://github.com/diffplug/spotless/pull/1691))
+* Bump default `ktlint` version to latest `0.48.2` -> `0.49.1`. ([#1696](https://github.com/diffplug/spotless/issues/1696))
   * Dropped support for `ktlint 0.46.x` following our policy of supporting two breaking changes at a time.
 * Bump default `sortpom` version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675))
 
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 1f7412104a..92cfc66ed6 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -8,12 +8,14 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Add semantics-aware Java import ordering (i.e. sort by package, then class, then member). ([#522](https://github.com/diffplug/spotless/issues/522))
 ### Fixed
 * `palantir` step now accepts a `style` parameter, which is documentation had already claimed to do. ([#1694](https://github.com/diffplug/spotless/pull/1694))
-* When P2 download fails, indicate the responsible formatter. ([#1698](https://github.com/diffplug/spotless/issues/1698))
 * Fixed a regression which changed the import sorting order in `googleJavaFormat` introduced in `2.36.0`. ([#1680](https://github.com/diffplug/spotless/pull/1680))
+* Equo-based formatters now work on platforms unsupported by Eclipse such as PowerPC (fixes [durian-swt#20](https://github.com/diffplug/durian-swt/issues/20))
+* When P2 download fails, indicate the responsible formatter. ([#1698](https://github.com/diffplug/spotless/issues/1698))
 ### Changes
+* Equo-based formatters now download metadata to `~/.m2/repository/dev/equo/p2-data` rather than `~/.equo`, and for CI machines without a home directory the p2 data goes to `$GRADLE_USER_HOME/caches/p2-data`. ([#1714](https://github.com/diffplug/spotless/pull/1714))
 * Bump default `googleJavaFormat` version to latest `1.16.0` -> `1.17.0`. ([#1710](https://github.com/diffplug/spotless/pull/1710))
-* Bump default `ktfmt` version to latest `0.43` -> `0.44`.([#1691](https://github.com/diffplug/spotless/pull/1691))
-* Bump default `ktlint` version to latest `0.48.2` -> `0.49.1`.([#1696](https://github.com/diffplug/spotless/issues/1696))
+* Bump default `ktfmt` version to latest `0.43` -> `0.44`. ([#1691](https://github.com/diffplug/spotless/pull/1691))
+* Bump default `ktlint` version to latest `0.48.2` -> `0.49.1`. ([#1696](https://github.com/diffplug/spotless/issues/1696))
   * Dropped support for `ktlint 0.46.x` following our policy of supporting two breaking changes at a time.
 * Bump default `sortpom` version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675))
 

From 0d19de79c77da9b9cb316101d194a44ab527e4f7 Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az268-845.mpig5ahpd55ubhib3uxuklvcac.dx.internal.cloudapp.net>
Date: Wed, 24 May 2023 02:38:06 +0000
Subject: [PATCH 1091/2068] Published lib/2.39.0

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index ccc6f8480b..e545f20dcb 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.39.0] - 2023-05-24
 ### Added
 * `Jvm.Support` now accepts `-SNAPSHOT` versions, treated as the non`-SNAPSHOT`. ([#1583](https://github.com/diffplug/spotless/issues/1583))
 * Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. ([#1663](https://github.com/diffplug/spotless/pull/1663))

From 04c37147c2444546802d8c0964ba64a87450f8a4 Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az268-845.mpig5ahpd55ubhib3uxuklvcac.dx.internal.cloudapp.net>
Date: Wed, 24 May 2023 02:39:35 +0000
Subject: [PATCH 1092/2068] Published gradle/6.19.0

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 52 ++++++++++++++++++++--------------------
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 2c0b8aed4e..51cdb016a8 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [6.19.0] - 2023-05-24
 ### Added
 * Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. ([#1663](https://github.com/diffplug/spotless/pull/1663))
 * Add semantics-aware Java import ordering (i.e. sort by package, then class, then member). ([#522](https://github.com/diffplug/spotless/issues/522))
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index c853f82a3f..0390c64323 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -14,9 +14,9 @@ output = [
   ].join('\n');
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
-[![Changelog](https://img.shields.io/badge/changelog-6.18.0-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-6.19.0-blue.svg)](CHANGES.md)
 [![Maven central](https://img.shields.io/badge/mavencentral-here-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/index.html)
 
 [![VS Code plugin](https://img.shields.io/badge/IDE-VS_Code-blueviolet.svg)](https://marketplace.visualstudio.com/items?itemName=richardwillis.vscode-spotless-gradle)
 [![IntelliJ plugin](https://img.shields.io/badge/IDE-IntelliJ-blueviolet.svg)](https://plugins.jetbrains.com/plugin/18321-spotless-gradle)
@@ -126,10 +126,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -142,7 +142,7 @@ Spotless requires JRE 11+ and Gradle 6.1.1 or newer.
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -299,8 +299,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -350,8 +350,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -422,7 +422,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -454,7 +454,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -486,7 +486,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -520,7 +520,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -541,7 +541,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -566,7 +566,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -606,7 +606,7 @@ sql.formatter.indent.size=4
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -700,7 +700,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## Javascript
 
-- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
+- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
 
 ```gradle
 spotless {
@@ -765,7 +765,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -841,7 +841,7 @@ spotless {
 
 ## YAML
 
-- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
+- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
 
 ```gradle
 spotless {
@@ -872,7 +872,7 @@ spotless {
 
 ## Gherkin
 
-- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
+- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
 
 ```gradle
 spotless {
@@ -1260,7 +1260,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -1333,9 +1333,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -1368,11 +1368,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.18.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From 609ac5fb36b296973792f54d8c80d521df620db5 Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az268-845.mpig5ahpd55ubhib3uxuklvcac.dx.internal.cloudapp.net>
Date: Wed, 24 May 2023 02:41:23 +0000
Subject: [PATCH 1093/2068] Published maven/2.37.0

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 92cfc66ed6..00f577b41e 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.37.0] - 2023-05-24
 ### Added
 * Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. ([#1663](https://github.com/diffplug/spotless/pull/1663))
 * Add semantics-aware Java import ordering (i.e. sort by package, then class, then member). ([#522](https://github.com/diffplug/spotless/issues/522))
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 7facd99a0d..519250c5ac 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -8,8 +8,8 @@ output = [
   ].join('\n');
 -->
 [![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Changelog](https://img.shields.io/badge/changelog-2.36.0-blue.svg)](CHANGES.md)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.36.0/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.37.0-blue.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.37.0/index.html)
 <!---freshmark /shields -->
 
 <!---freshmark javadoc

From 05420c370018faf57af4beee30529693bfca4d28 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Thu, 25 May 2023 18:01:07 +0400
Subject: [PATCH 1094/2068] Upgrade to CleanThat 2.16. Include management of
 JDK17 Sealed classes for Unnecessaryimports

---
 lib/build.gradle                                               | 2 +-
 .../java/com/diffplug/spotless/java/CleanthatJavaStep.java     | 2 +-
 .../java/removeunusedimports/SealedClassTestsFormatted.test    | 1 -
 .../RemoveUnusedImportsStep_withCleanthatJavaparserTest.java   | 3 +--
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 6a611252a6..a9d5181569 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -70,7 +70,7 @@ dependencies {
 
 	// GLUE CODE (alphabetic order please)
 	// cleanthat
-	String VER_CLEANTHAT='2.13'
+	String VER_CLEANTHAT='2.16'
 	cleanthatCompileOnly "io.github.solven-eu.cleanthat:java:$VER_CLEANTHAT"
 	compatCleanthat2Dot1CompileAndTestOnly "io.github.solven-eu.cleanthat:java:$VER_CLEANTHAT"
 	// diktat
diff --git a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
index 92b7daa5f6..91439a1767 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
@@ -40,7 +40,7 @@ public final class CleanthatJavaStep {
 	private static final String MAVEN_COORDINATE = "io.github.solven-eu.cleanthat:java";
 
 	// CleanThat changelog is available at https://github.com/solven-eu/cleanthat/blob/master/CHANGES.MD
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "2.13");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "2.16");
 
 	// prevent direct instantiation
 	private CleanthatJavaStep() {}
diff --git a/testlib/src/main/resources/java/removeunusedimports/SealedClassTestsFormatted.test b/testlib/src/main/resources/java/removeunusedimports/SealedClassTestsFormatted.test
index 2ef96e6c72..f0a0459883 100644
--- a/testlib/src/main/resources/java/removeunusedimports/SealedClassTestsFormatted.test
+++ b/testlib/src/main/resources/java/removeunusedimports/SealedClassTestsFormatted.test
@@ -14,7 +14,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
 import org.junit.jupiter.api.Test;
-
 class SealedClassTests extends AbstractJupiterTestEngineTests {
 
 	@Test
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStep_withCleanthatJavaparserTest.java b/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStep_withCleanthatJavaparserTest.java
index 11e31aeae2..69b472554f 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStep_withCleanthatJavaparserTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStep_withCleanthatJavaparserTest.java
@@ -33,8 +33,7 @@ void behavior() throws Exception {
 				.testResource("java/removeunusedimports/JavaCodeWithPackageUnformatted.test", "java/removeunusedimports/JavaCodeWithPackageFormatted.test")
 				.testResource("java/removeunusedimports/Jdk17TextBlockUnformatted.test", "java/removeunusedimports/Jdk17TextBlockFormatted.test")
 				.testResource("java/removeunusedimports/RevelcUnformatted.test", "java/removeunusedimports/RevelcFormatted.test")
-				// Sealed classes are introduced with JDK15: This syntax is not supported by javaParser: such files are not trimmed from unused imports (for now)
-				.testResource("java/removeunusedimports/SealedClassTestsUnformatted.test", "java/removeunusedimports/SealedClassTestsUnformatted.test");
+				.testResource("java/removeunusedimports/SealedClassTestsUnformatted.test", "java/removeunusedimports/SealedClassTestsFormatted.test");
 	}
 
 	@Test

From e6ea2ad0f159f8548d2ad4ff516e792a97d4c855 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 25 May 2023 15:17:37 +0000
Subject: [PATCH 1095/2068] Update plugin com.gradle.enterprise to v3.13.3

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index c609e09116..b6d227dab8 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -23,7 +23,7 @@ plugins {
 	// https://github.com/davidburstrom/version-compatibility-gradle-plugin/tags
 	id 'io.github.davidburstrom.version-compatibility' version '0.5.0' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.enterprise
-	id 'com.gradle.enterprise' version '3.13.2'
+	id 'com.gradle.enterprise' version '3.13.3'
 	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
 	id 'dev.equo.ide' version '1.0.1' apply false
 }

From 615ca6c9b1f06ff2a8994e224d24ae3a1eaff597 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Thu, 25 May 2023 21:28:57 +0400
Subject: [PATCH 1096/2068] Add changelog entry

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index e545f20dcb..08c785dae9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Changes
+* Bump default `cleanthat` version to latest `2.13` -> `2.16`. ([#1725](https://github.com/diffplug/spotless/pull/1725))
 
 ## [2.39.0] - 2023-05-24
 ### Added

From e8b214e7a273233bfb424a00714877521e030b18 Mon Sep 17 00:00:00 2001
From: Frederick Zhang <frederick888@tsundere.moe>
Date: Fri, 26 May 2023 15:32:34 +1000
Subject: [PATCH 1097/2068] Update documented default semanticSort to false

The default value was updated to false [1] per suggestion [2].

[1] https://github.com/diffplug/spotless/pull/1709/commits/10610f8a8d12bfdc8303645daafc4d68c17c9165
[2] https://github.com/diffplug/spotless/pull/1709#pullrequestreview-1437212887
---
 CHANGES.md              | 2 ++
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index e545f20dcb..065ba785f6 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Update documented default `semanticSort` to `false`. ([#1728](https://github.com/diffplug/spotless/pull/1728))
 
 ## [2.39.0] - 2023-05-24
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 00f577b41e..f23888abe6 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Update documented default `semanticSort` to `false`. ([#1728](https://github.com/diffplug/spotless/pull/1728))
 
 ## [2.37.0] - 2023-05-24
 ### Added
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 519250c5ac..dc450d7ddd 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -196,7 +196,7 @@ any other maven phase (i.e. compile) then it can be configured as below;
       <wildcardsLast>false</wildcardsLast> <!-- Optional, default false. Sort wildcard import after specific imports -->
       <order>java|javax,org,com,com.diffplug,,\#com.diffplug,\#</order>  <!-- or use <file>${project.basedir}/eclipse.importorder</file> -->
       <!-- you can use an empty string for all the imports you didn't specify explicitly, '|' to join group without blank line, and '\#` prefix for static imports. -->
-      <semanticSort>false</semanticSort> <!-- Optional, default true. Sort by package, then class, then member (for static imports). Splitting is based on common conventions (packages are lower case, classes start with upper case). Use <treatAsPackage> and <treatAsClass> for exceptions. -->
+      <semanticSort>false</semanticSort> <!-- Optional, default false. Sort by package, then class, then member (for static imports). Splitting is based on common conventions (packages are lower case, classes start with upper case). Use <treatAsPackage> and <treatAsClass> for exceptions. -->
       <treatAsPackage> <!-- Packages starting with upper case letters. -->
         <package>com.example.MyPackage</package>
       </treatAsPackage>

From f9f1f307d7e21a237f9c256ad39e25dec6be773b Mon Sep 17 00:00:00 2001
From: tison <wander4096@gmail.com>
Date: Mon, 29 May 2023 12:01:32 +0800
Subject: [PATCH 1098/2068] feat: support pass skip from command-line for
 maven-plugin

---
 .../java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
index 0b019ea844..2c295cef27 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
@@ -100,7 +100,7 @@ public abstract class AbstractSpotlessMojo extends AbstractMojo {
 	@Parameter(defaultValue = "${mojoExecution.goal}", required = true, readonly = true)
 	private String goal;
 
-	@Parameter(defaultValue = "false")
+	@Parameter(property = "spotless.skip", defaultValue = "false")
 	private boolean skip;
 
 	@Parameter(property = "spotless.apply.skip", defaultValue = "false")

From 9be7e5f514841c794e633d7002f7097b39c2ec02 Mon Sep 17 00:00:00 2001
From: Vincent Galloy <galloy.v@gmail.com>
Date: Thu, 1 Jun 2023 11:42:51 +0200
Subject: [PATCH 1099/2068] Kotlin dsl for yaml formatter in can't use the
 syntax jackson().yamlFeature(String, boolean)

Motivation
In gradle, kotlin DSL is compiled. Since YamlExtension#jackson return a AJacksonGradleConfig class, we can't use the method #yamlFeature(String, boolean) without casting the object
---
 .../gradle/spotless/AJacksonGradleConfig.java        | 12 +++++++-----
 .../com/diffplug/gradle/spotless/JsonExtension.java  |  9 +++++++--
 .../com/diffplug/gradle/spotless/YamlExtension.java  | 11 ++++++++---
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/AJacksonGradleConfig.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/AJacksonGradleConfig.java
index c017d41d04..2185f3693a 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/AJacksonGradleConfig.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/AJacksonGradleConfig.java
@@ -21,7 +21,7 @@
 import com.diffplug.spotless.json.JacksonConfig;
 import com.diffplug.spotless.json.JacksonJsonStep;
 
-public abstract class AJacksonGradleConfig {
+public abstract class AJacksonGradleConfig<T extends AJacksonGradleConfig> {
 	protected final FormatExtension formatExtension;
 
 	protected JacksonConfig jacksonConfig;
@@ -35,17 +35,19 @@ public AJacksonGradleConfig(JacksonConfig jacksonConfig, FormatExtension formatE
 		this.jacksonConfig = jacksonConfig;
 	}
 
-	public AJacksonGradleConfig feature(String feature, boolean toggle) {
+	public T feature(String feature, boolean toggle) {
 		this.jacksonConfig.appendFeatureToToggle(Collections.singletonMap(feature, toggle));
 		formatExtension.replaceStep(createStep());
-		return this;
+		return self();
 	}
 
-	public AJacksonGradleConfig version(String version) {
+	public T version(String version) {
 		this.version = version;
 		formatExtension.replaceStep(createStep());
-		return this;
+		return self();
 	}
 
+	public abstract T self();
+
 	protected abstract FormatterStep createStep();
 }
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
index 510ac529e8..2fa567472f 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
@@ -132,7 +132,7 @@ private FormatterStep createStep() {
 		}
 	}
 
-	public static class JacksonJsonGradleConfig extends AJacksonGradleConfig {
+	public static class JacksonJsonGradleConfig extends AJacksonGradleConfig<JacksonJsonGradleConfig> {
 		protected JacksonJsonConfig jacksonConfig;
 
 		public JacksonJsonGradleConfig(JacksonJsonConfig jacksonConfig, FormatExtension formatExtension) {
@@ -149,12 +149,17 @@ public JacksonJsonGradleConfig(FormatExtension formatExtension) {
 		/**
 		 * Refers to com.fasterxml.jackson.core.JsonGenerator.Feature
 		 */
-		public AJacksonGradleConfig jsonFeature(String feature, boolean toggle) {
+		public JacksonJsonGradleConfig jsonFeature(String feature, boolean toggle) {
 			this.jacksonConfig.appendJsonFeatureToToggle(Collections.singletonMap(feature, toggle));
 			formatExtension.replaceStep(createStep());
 			return this;
 		}
 
+		@Override
+		public JacksonJsonGradleConfig self() {
+			return this;
+		}
+
 		// 'final' as it is called in the constructor
 		@Override
 		protected final FormatterStep createStep() {
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java
index abc2dce359..c0872e8fb9 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java
@@ -39,11 +39,11 @@ protected void setupTask(SpotlessTask task) {
 		super.setupTask(task);
 	}
 
-	public AJacksonGradleConfig jackson() {
+	public JacksonYamlGradleConfig jackson() {
 		return new JacksonYamlGradleConfig(this);
 	}
 
-	public class JacksonYamlGradleConfig extends AJacksonGradleConfig {
+	public class JacksonYamlGradleConfig extends AJacksonGradleConfig<JacksonYamlGradleConfig> {
 		protected JacksonYamlConfig jacksonConfig;
 
 		public JacksonYamlGradleConfig(JacksonYamlConfig jacksonConfig, FormatExtension formatExtension) {
@@ -61,12 +61,17 @@ public JacksonYamlGradleConfig(FormatExtension formatExtension) {
 		/**
 		 * Refers to com.fasterxml.jackson.dataformat.yaml.YAMLGenerator.Feature
 		 */
-		public AJacksonGradleConfig yamlFeature(String feature, boolean toggle) {
+		public JacksonYamlGradleConfig yamlFeature(String feature, boolean toggle) {
 			this.jacksonConfig.appendYamlFeatureToToggle(Collections.singletonMap(feature, toggle));
 			formatExtension.replaceStep(createStep());
 			return this;
 		}
 
+		@Override
+		public JacksonYamlGradleConfig self() {
+			return this;
+		}
+
 		// 'final' as it is called in the constructor
 		@Override
 		protected final FormatterStep createStep() {

From 3ae8940b391384c031a4fcb2e92d709aed9d54bd Mon Sep 17 00:00:00 2001
From: Vincent Galloy <galloy.v@gmail.com>
Date: Thu, 1 Jun 2023 11:55:05 +0200
Subject: [PATCH 1100/2068] Update CHANGES.md

---
 plugin-gradle/CHANGES.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 51cdb016a8..744c6efce7 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -4,6 +4,16 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 
+### Fixed
+* Correctly support the syntax
+  ```
+  spotless {
+    yaml {
+      jackson().yamlFeature("MINIMIZE_QUOTES", true)
+    }
+  }
+  ```
+
 ## [6.19.0] - 2023-05-24
 ### Added
 * Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. ([#1663](https://github.com/diffplug/spotless/pull/1663))

From 6a1eb5f00e13d06de4017571eef6255728c16ba0 Mon Sep 17 00:00:00 2001
From: tison <wander4096@gmail.com>
Date: Mon, 5 Jun 2023 16:33:58 +0800
Subject: [PATCH 1101/2068] update changelog

Signed-off-by: tison <wander4096@gmail.com>
---
 plugin-maven/CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 00f577b41e..f86e1d62b4 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* Support pass skip (`-Dspotless.skip=true`) from command-line. ([#1729](https://github.com/diffplug/spotless/pull/1729))
 
 ## [2.37.0] - 2023-05-24
 ### Added

From 4330ee28ab42876cfcc296770c7c1009148ff7fd Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 5 Jun 2023 23:37:04 +0000
Subject: [PATCH 1102/2068] Update plugin
 de.benediktritter.maven-plugin-development to v0.4.2

---
 plugin-maven/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-maven/build.gradle b/plugin-maven/build.gradle
index dda98ad79a..7cfb38c2e9 100644
--- a/plugin-maven/build.gradle
+++ b/plugin-maven/build.gradle
@@ -3,7 +3,7 @@ import de.benediktritter.maven.plugin.development.task.GenerateMavenPluginDescri
 
 plugins {
 	// https://www.benediktritter.de/maven-plugin-development/#release-history
-	id 'de.benediktritter.maven-plugin-development' version '0.4.1'
+	id 'de.benediktritter.maven-plugin-development' version '0.4.2'
 }
 
 apply from: rootProject.file('gradle/changelog.gradle')

From 56e1e113527347e5dd8bc9ad40832def1ad6d68a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 14 Jun 2023 12:33:41 +0000
Subject: [PATCH 1103/2068] fix(deps): update dependency
 org.eclipse.jgit:org.eclipse.jgit to v6.6.0.202305301015-r

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 31bed9971d..ce29bbfaeb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -29,7 +29,7 @@ VER_SLF4J=[1.6,2.0[
 
 # Used in multiple places
 VER_DURIAN=1.2.0
-VER_JGIT=6.5.0.202303070854-r
+VER_JGIT=6.6.0.202305301015-r
 VER_JUNIT=5.9.3
 VER_ASSERTJ=3.24.2
 VER_MOCKITO=5.3.1

From b5c1a5417c98e0782d9a63cad3ac72934800a8d4 Mon Sep 17 00:00:00 2001
From: Edu <edo.leon.g@gmail.com>
Date: Wed, 21 Jun 2023 13:01:35 -0400
Subject: [PATCH 1104/2068] Update README.md

Fix removeUnusedImports docs
---
 plugin-gradle/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 0390c64323..ef93e31d45 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -192,7 +192,7 @@ spotless {
   removeUnusedImports()
   // optional: you may switch for `google-java-format` as underlying engine to `cleanthat-javaparser-unnecessaryimport`
   // which enables processing any language level source file with a JDK8+ Runtime
-  removeUnusedImports().engine('cleanthat-javaparser-unnecessaryimport')
+  removeUnusedImports('cleanthat-javaparser-unnecessaryimport')
 ```
 
 ### google-java-format

From 21a4eecca204a80b75afca9e3160a75c04e8dfb8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 30 Jun 2023 16:58:51 +0000
Subject: [PATCH 1105/2068] chore(deps): update dependency gradle to v7.6.2

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 61574 -> 61624 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 943f0cbfa754578e88a3dae77fce6e3dea56edbf..afba109285af78dbd2a1d187e33ac4f87c76e392 100755
GIT binary patch
delta 6679
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
Cn(^uY

delta 6711
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
N0Rn>h&;K*$e*kC({~`bY

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 508322917b..4e86b92707 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 460f5162cc3ce625d8d60e17a14dfa77908f5f3f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 30 Jun 2023 19:56:32 +0000
Subject: [PATCH 1106/2068] fix(deps): update dependency
 io.github.solven-eu.cleanthat:java to v2.17

---
 lib/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index a9d5181569..8a2b82d196 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -70,7 +70,7 @@ dependencies {
 
 	// GLUE CODE (alphabetic order please)
 	// cleanthat
-	String VER_CLEANTHAT='2.16'
+	String VER_CLEANTHAT='2.17'
 	cleanthatCompileOnly "io.github.solven-eu.cleanthat:java:$VER_CLEANTHAT"
 	compatCleanthat2Dot1CompileAndTestOnly "io.github.solven-eu.cleanthat:java:$VER_CLEANTHAT"
 	// diktat

From 3bafa6a28e4c3f1f982f06f652b793758f443169 Mon Sep 17 00:00:00 2001
From: Mitchell Skaggs <skaggsm333@gmail.com>
Date: Fri, 7 Jul 2023 21:38:25 -0500
Subject: [PATCH 1107/2068] Support ktlint `0.50.0` and drop support for
 `0.47.0`

Closes https://github.com/diffplug/spotless/issues/1741
---
 CHANGES.md                                    |   3 +
 lib/build.gradle                              |  12 +-
 .../compat/KtLintCompat0Dot47Dot0Adapter.java | 139 --------------
 .../compat/KtLintCompat0Dot50Dot0Adapter.java | 173 ++++++++++++++++++
 .../glue/ktlint/KtlintFormatterFunc.java      |  12 +-
 .../diffplug/spotless/kotlin/KtLintStep.java  |   2 +-
 .../KtLintCompat0Dot50Dot0AdapterTest.java    |  70 +++++++
 .../resources/EmptyClassBody.kt               |   3 +
 .../resources/FailsNoSemicolons.kt            |   3 +
 plugin-gradle/CHANGES.md                      |   4 +-
 plugin-maven/CHANGES.md                       |   2 +
 .../resources/kotlin/ktlint/basic-old.clean   |   5 +
 .../main/resources/kotlin/ktlint/basic.clean  |   5 +-
 .../spotless/kotlin/KtLintStepTest.java       |  47 ++---
 14 files changed, 299 insertions(+), 181 deletions(-)
 delete mode 100644 lib/src/compatKtLint0Dot47Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java
 create mode 100644 lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
 create mode 100644 lib/src/testCompatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java
 create mode 100644 lib/src/testCompatKtLint0Dot50Dot0/resources/EmptyClassBody.kt
 create mode 100644 lib/src/testCompatKtLint0Dot50Dot0/resources/FailsNoSemicolons.kt
 create mode 100644 testlib/src/main/resources/kotlin/ktlint/basic-old.clean

diff --git a/CHANGES.md b/CHANGES.md
index ab72dc3ab0..a0a6b309ee 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,9 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* Bump default `ktlint` version to latest `0.49.1` -> `0.50.0`.([#1741](https://github.com/diffplug/spotless/issues/1741))
+  * Dropped support for `ktlint 0.47.x` following our policy of supporting two breaking changes at a time.
 ### Changes
 * Bump default `cleanthat` version to latest `2.13` -> `2.16`. ([#1725](https://github.com/diffplug/spotless/pull/1725))
 ### Fixed
diff --git a/lib/build.gradle b/lib/build.gradle
index a9d5181569..36921698f0 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -44,9 +44,9 @@ versionCompatibility {
 			// we will support no more than 2 breaking changes at a time = 3 incompatible versions
 			// we will try to drop down to only one version if a stable API can be maintained for a full year
 			versions = [
-				'0.47.0',
 				'0.48.0',
 				'0.49.0',
+				'0.50.0',
 			]
 			targetSourceSetName = 'ktlint'
 		}
@@ -95,16 +95,18 @@ dependencies {
 			strictly '1.7' // for JDK 8 compatibility
 		}
 	}
-	// ktlint
-	compatKtLint0Dot47Dot0CompileOnly 'com.pinterest.ktlint:ktlint-core:0.47.0'
-	compatKtLint0Dot47Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-experimental:0.47.0'
-	compatKtLint0Dot47Dot0CompileOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.47.0'
+	// ktlint oldest supported version
 	compatKtLint0Dot48Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-core:0.48.0'
 	compatKtLint0Dot48Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-ruleset-experimental:0.48.0'
 	compatKtLint0Dot48Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.48.0'
+	// ktlint previous supported version
 	compatKtLint0Dot49Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-rule-engine:0.49.0'
 	compatKtLint0Dot49Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.49.0'
 	compatKtLint0Dot49Dot0CompileAndTestOnly 'org.slf4j:slf4j-api:2.0.0'
+	// ktlint latest supported version
+	compatKtLint0Dot50Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-rule-engine:0.50.0'
+	compatKtLint0Dot50Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.50.0'
+	compatKtLint0Dot50Dot0CompileAndTestOnly 'org.slf4j:slf4j-api:2.0.0'
 	// palantirJavaFormat
 	palantirJavaFormatCompileOnly 'com.palantir.javaformat:palantir-java-format:1.1.0' 	// this version needs to stay compilable against Java 8 for CI Job testNpm
 	// scalafmt
diff --git a/lib/src/compatKtLint0Dot47Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java b/lib/src/compatKtLint0Dot47Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java
deleted file mode 100644
index 0a38730b6a..0000000000
--- a/lib/src/compatKtLint0Dot47Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright 2022-2023 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.glue.ktlint.compat;
-
-import static java.util.Collections.emptySet;
-
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import com.pinterest.ktlint.core.KtLint;
-import com.pinterest.ktlint.core.LintError;
-import com.pinterest.ktlint.core.Rule;
-import com.pinterest.ktlint.core.RuleProvider;
-import com.pinterest.ktlint.core.api.DefaultEditorConfigProperties;
-import com.pinterest.ktlint.core.api.EditorConfigDefaults;
-import com.pinterest.ktlint.core.api.EditorConfigOverride;
-import com.pinterest.ktlint.core.api.UsesEditorConfigProperties;
-import com.pinterest.ktlint.ruleset.experimental.ExperimentalRuleSetProvider;
-import com.pinterest.ktlint.ruleset.standard.StandardRuleSetProvider;
-
-import kotlin.Pair;
-import kotlin.Unit;
-import kotlin.jvm.functions.Function2;
-
-public class KtLintCompat0Dot47Dot0Adapter implements KtLintCompatAdapter {
-
-	static class FormatterCallback implements Function2<LintError, Boolean, Unit> {
-		@Override
-		public Unit invoke(LintError lint, Boolean corrected) {
-			if (!corrected) {
-				KtLintCompatReporting.report(lint.getLine(), lint.getCol(), lint.getRuleId(), lint.getDetail());
-			}
-			return null;
-		}
-	}
-
-	@Override
-	public String format(final String text, Path path, final boolean isScript,
-			final boolean useExperimental,
-			Path editorConfigPath, final Map<String, String> userData,
-			final Map<String, Object> editorConfigOverrideMap) {
-		final FormatterCallback formatterCallback = new FormatterCallback();
-
-		Set<RuleProvider> allRuleProviders = new LinkedHashSet<>(
-				new StandardRuleSetProvider().getRuleProviders());
-		if (useExperimental) {
-			allRuleProviders.addAll(new ExperimentalRuleSetProvider().getRuleProviders());
-		}
-
-		EditorConfigOverride editorConfigOverride;
-		if (editorConfigOverrideMap.isEmpty()) {
-			editorConfigOverride = new EditorConfigOverride();
-		} else {
-			editorConfigOverride = createEditorConfigOverride(allRuleProviders.stream().map(
-					RuleProvider::createNewRuleInstance).collect(
-							Collectors.toList()),
-					editorConfigOverrideMap);
-		}
-
-		EditorConfigDefaults editorConfig;
-		if (editorConfigPath == null || !Files.exists(editorConfigPath)) {
-			editorConfig = EditorConfigDefaults.Companion.getEmptyEditorConfigDefaults();
-		} else {
-			editorConfig = EditorConfigDefaults.Companion.load(editorConfigPath);
-		}
-
-		return KtLint.INSTANCE.format(new KtLint.ExperimentalParams(
-				path.toFile().getAbsolutePath(),
-				text,
-				emptySet(),
-				allRuleProviders,
-				userData,
-				formatterCallback,
-				isScript,
-				null,
-				false,
-				editorConfig,
-				editorConfigOverride,
-				false));
-	}
-
-	/**
-	 * Create EditorConfigOverride from user provided parameters.
-	 * Calling this method requires KtLint 0.45.2.
-	 */
-	private static EditorConfigOverride createEditorConfigOverride(final List<Rule> rules, Map<String, Object> editorConfigOverrideMap) {
-		// Get properties from rules in the rule sets
-		Stream<UsesEditorConfigProperties.EditorConfigProperty<?>> ruleProperties = rules.stream()
-				.filter(rule -> rule instanceof UsesEditorConfigProperties)
-				.flatMap(rule -> ((UsesEditorConfigProperties) rule).getEditorConfigProperties().stream());
-
-		// get complete list of supported properties in DefaultEditorConfigProperties.INSTANCE
-		List<UsesEditorConfigProperties.EditorConfigProperty<?>> editorConfigProperties = new ArrayList<>(DefaultEditorConfigProperties.INSTANCE.getEditorConfigProperties());
-		editorConfigProperties.add(DefaultEditorConfigProperties.INSTANCE.getKtlintDisabledRulesProperty());
-
-		// Create a mapping of properties to their names based on rule properties and default properties
-		Map<String, UsesEditorConfigProperties.EditorConfigProperty<?>> supportedProperties = Stream
-				.concat(ruleProperties, editorConfigProperties.stream())
-				.distinct()
-				.collect(Collectors.toMap(property -> property.getType().getName(), property -> property));
-
-		// Create config properties based on provided property names and values
-		@SuppressWarnings("unchecked")
-		Pair<UsesEditorConfigProperties.EditorConfigProperty<?>, ?>[] properties = editorConfigOverrideMap.entrySet().stream()
-				.map(entry -> {
-					UsesEditorConfigProperties.EditorConfigProperty<?> property = supportedProperties.get(entry.getKey());
-					if (property != null) {
-						return new Pair<>(property, entry.getValue());
-					} else {
-						return null;
-					}
-				})
-				.filter(Objects::nonNull)
-				.toArray(Pair[]::new);
-
-		return EditorConfigOverride.Companion.from(properties);
-	}
-}
diff --git a/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java b/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
new file mode 100644
index 0000000000..642e15adc2
--- /dev/null
+++ b/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.glue.ktlint.compat;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.pinterest.ktlint.rule.engine.api.Code;
+import com.pinterest.ktlint.rule.engine.api.EditorConfigDefaults;
+import com.pinterest.ktlint.rule.engine.api.EditorConfigOverride;
+import com.pinterest.ktlint.rule.engine.api.KtLintRuleEngine;
+import com.pinterest.ktlint.rule.engine.api.LintError;
+import com.pinterest.ktlint.rule.engine.core.api.Rule;
+import com.pinterest.ktlint.rule.engine.core.api.RuleId;
+import com.pinterest.ktlint.rule.engine.core.api.RuleProvider;
+import com.pinterest.ktlint.rule.engine.core.api.RuleSetId;
+import com.pinterest.ktlint.rule.engine.core.api.editorconfig.CodeStyleEditorConfigPropertyKt;
+import com.pinterest.ktlint.rule.engine.core.api.editorconfig.EditorConfigProperty;
+import com.pinterest.ktlint.rule.engine.core.api.editorconfig.EndOfLinePropertyKt;
+import com.pinterest.ktlint.rule.engine.core.api.editorconfig.IndentSizeEditorConfigPropertyKt;
+import com.pinterest.ktlint.rule.engine.core.api.editorconfig.IndentStyleEditorConfigPropertyKt;
+import com.pinterest.ktlint.rule.engine.core.api.editorconfig.InsertFinalNewLineEditorConfigPropertyKt;
+import com.pinterest.ktlint.rule.engine.core.api.editorconfig.MaxLineLengthEditorConfigPropertyKt;
+import com.pinterest.ktlint.rule.engine.core.api.editorconfig.RuleExecution;
+import com.pinterest.ktlint.rule.engine.core.api.editorconfig.RuleExecutionEditorConfigPropertyKt;
+import com.pinterest.ktlint.ruleset.standard.StandardRuleSetProvider;
+
+import kotlin.Pair;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function2;
+
+public class KtLintCompat0Dot50Dot0Adapter implements KtLintCompatAdapter {
+
+	private static final Logger logger = LoggerFactory.getLogger(KtLintCompat0Dot50Dot0Adapter.class);
+
+	private static final List<EditorConfigProperty<?>> DEFAULT_EDITOR_CONFIG_PROPERTIES;
+
+	static {
+		List<EditorConfigProperty<?>> list = new ArrayList<>();
+		list.add(CodeStyleEditorConfigPropertyKt.getCODE_STYLE_PROPERTY());
+		list.add(EndOfLinePropertyKt.getEND_OF_LINE_PROPERTY());
+		list.add(IndentSizeEditorConfigPropertyKt.getINDENT_SIZE_PROPERTY());
+		list.add(IndentStyleEditorConfigPropertyKt.getINDENT_STYLE_PROPERTY());
+		list.add(InsertFinalNewLineEditorConfigPropertyKt.getINSERT_FINAL_NEWLINE_PROPERTY());
+		list.add(MaxLineLengthEditorConfigPropertyKt.getMAX_LINE_LENGTH_PROPERTY());
+		list.add(RuleExecutionEditorConfigPropertyKt.getEXPERIMENTAL_RULES_EXECUTION_PROPERTY());
+		DEFAULT_EDITOR_CONFIG_PROPERTIES = Collections.unmodifiableList(list);
+	}
+
+	static class FormatterCallback implements Function2<LintError, Boolean, Unit> {
+
+		@Override
+		public Unit invoke(LintError lint, Boolean corrected) {
+			if (!corrected) {
+				KtLintCompatReporting.report(lint.getLine(), lint.getCol(), lint.getRuleId().getValue(), lint.getDetail());
+			}
+			return Unit.INSTANCE;
+		}
+	}
+
+	@Override
+	public String format(final String text, Path path, final boolean isScript,
+			final boolean useExperimental,
+			Path editorConfigPath, final Map<String, String> userData,
+			final Map<String, Object> editorConfigOverrideMap) {
+		final FormatterCallback formatterCallback = new FormatterCallback();
+
+		Set<RuleProvider> allRuleProviders = new LinkedHashSet<>(
+				new StandardRuleSetProvider().getRuleProviders());
+
+		// TODO: Should we keep `useExperimental` now that ktlint uses an EditorConfig property for this purpose?
+		if (useExperimental) {
+			String experimentalRulesPropertyName = RuleExecutionEditorConfigPropertyKt.getEXPERIMENTAL_RULES_EXECUTION_PROPERTY().getName();
+			Object experimentalOverride = editorConfigOverrideMap.get(experimentalRulesPropertyName);
+			if (experimentalOverride != null) {
+				logger.warn("`useExperimental` parameter is `true` and `ktlint_experimental` property is set, `useExperimental` will take priority!");
+				editorConfigOverrideMap.put(experimentalRulesPropertyName, "enabled");
+			}
+		}
+
+		EditorConfigOverride editorConfigOverride;
+		if (editorConfigOverrideMap.isEmpty()) {
+			editorConfigOverride = EditorConfigOverride.Companion.getEMPTY_EDITOR_CONFIG_OVERRIDE();
+		} else {
+			editorConfigOverride = createEditorConfigOverride(allRuleProviders.stream().map(
+					RuleProvider::createNewRuleInstance).collect(Collectors.toList()),
+					editorConfigOverrideMap);
+		}
+		EditorConfigDefaults editorConfig;
+		if (editorConfigPath == null || !Files.exists(editorConfigPath)) {
+			editorConfig = EditorConfigDefaults.Companion.getEMPTY_EDITOR_CONFIG_DEFAULTS();
+		} else {
+			editorConfig = EditorConfigDefaults.Companion.load(editorConfigPath, Collections.emptySet());
+		}
+
+		return new KtLintRuleEngine(
+				allRuleProviders,
+				editorConfig,
+				editorConfigOverride,
+				true,
+				false,
+				path.getFileSystem())
+				.format(Code.Companion.fromPath(path), formatterCallback);
+	}
+
+	/**
+	 * Create EditorConfigOverride from user provided parameters.
+	 */
+	private static EditorConfigOverride createEditorConfigOverride(final List<Rule> rules, Map<String, Object> editorConfigOverrideMap) {
+		// Get properties from rules in the rule sets
+		Stream<EditorConfigProperty<?>> ruleProperties = rules.stream()
+				.flatMap(rule -> rule.getUsesEditorConfigProperties().stream());
+
+		// Create a mapping of properties to their names based on rule properties and default properties
+		Map<String, EditorConfigProperty<?>> supportedProperties = Stream
+				.concat(ruleProperties, DEFAULT_EDITOR_CONFIG_PROPERTIES.stream())
+				.distinct()
+				.collect(Collectors.toMap(EditorConfigProperty::getName, property -> property));
+
+		// Create config properties based on provided property names and values
+		@SuppressWarnings("unchecked")
+		Pair<EditorConfigProperty<?>, ?>[] properties = editorConfigOverrideMap.entrySet().stream()
+				.map(entry -> {
+					EditorConfigProperty<?> property = supportedProperties.get(entry.getKey());
+					if (property != null) {
+						return new Pair<>(property, entry.getValue());
+					} else if (entry.getKey().startsWith("ktlint_")) {
+						String[] parts = entry.getKey().substring(7).split("_", 2);
+						if (parts.length == 1) {
+							// convert ktlint_{ruleset} to RuleSetId
+							RuleSetId id = new RuleSetId(parts[0]);
+							property = RuleExecutionEditorConfigPropertyKt.createRuleSetExecutionEditorConfigProperty(id, RuleExecution.disabled);
+						} else {
+							// convert ktlint_{ruleset}_{rulename} to RuleId
+							RuleId id = new RuleId(parts[0] + ":" + parts[1]);
+							property = RuleExecutionEditorConfigPropertyKt.createRuleExecutionEditorConfigProperty(id, RuleExecution.disabled);
+						}
+						return new Pair<>(property, entry.getValue());
+					} else {
+						return null;
+					}
+				})
+				.filter(Objects::nonNull)
+				.toArray(Pair[]::new);
+
+		return EditorConfigOverride.Companion.from(properties);
+	}
+}
diff --git a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
index fba855bb9a..9f773d4016 100644
--- a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
+++ b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
@@ -35,17 +35,19 @@ public class KtlintFormatterFunc implements FormatterFunc.NeedsFile {
 	public KtlintFormatterFunc(String version, boolean isScript, boolean useExperimental, FileSignature editorConfigPath, Map<String, String> userData,
 			Map<String, Object> editorConfigOverrideMap) {
 		int minorVersion = Integer.parseInt(version.split("\\.")[1]);
-		if (minorVersion >= 49) {
+		if (minorVersion >= 50) {
+			// Fixed `RuleId` and `RuleSetId` issues
+			// New argument to `EditorConfigDefaults.Companion.load(...)` for custom property type parsing
+			// New argument to `new KtLintRuleEngine(...)` to fail on usage of `treeCopyHandler` extension point
+			this.adapter = new KtLintCompat0Dot50Dot0Adapter();
+		} else if (minorVersion == 49) {
 			// Packages and modules moved around (`ktlint-core` -> `ktlint-rule-engine`)
 			// Experimental ruleset was replaced by implementing `Rule.Experimental` and checking the `ktlint_experimental` `.editorconfig` property
 			// `RuleId` and `RuleSetId` became inline classes (mangled to be unrepresentable in Java source code, so reflection is needed), tracked here: https://github.com/pinterest/ktlint/issues/2041
 			this.adapter = new KtLintCompat0Dot49Dot0Adapter();
-		} else if (minorVersion == 48) {
+		} else {
 			// ExperimentalParams lost two constructor arguments, EditorConfigProperty moved to its own class
 			this.adapter = new KtLintCompat0Dot48Dot0Adapter();
-		} else {
-			// rename RuleSet to RuleProvider
-			this.adapter = new KtLintCompat0Dot47Dot0Adapter();
 		}
 		this.editorConfigPath = editorConfigPath;
 		this.useExperimental = useExperimental;
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index 6e82538b04..a844a93bff 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -36,7 +36,7 @@ public class KtLintStep {
 	// prevent direct instantiation
 	private KtLintStep() {}
 
-	private static final String DEFAULT_VERSION = "0.49.1";
+	private static final String DEFAULT_VERSION = "0.50.0";
 	static final String NAME = "ktlint";
 	static final String PACKAGE = "com.pinterest";
 	static final String MAVEN_COORDINATE = PACKAGE + ":ktlint:";
diff --git a/lib/src/testCompatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java b/lib/src/testCompatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java
new file mode 100644
index 0000000000..575515a66e
--- /dev/null
+++ b/lib/src/testCompatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.glue.ktlint.compat;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+public class KtLintCompat0Dot50Dot0AdapterTest {
+	@Test
+	public void testDefaults(@TempDir Path path) throws IOException {
+		KtLintCompat0Dot50Dot0Adapter KtLintCompat0Dot50Dot0Adapter = new KtLintCompat0Dot50Dot0Adapter();
+		String text = loadAndWriteText(path, "EmptyClassBody.kt");
+		final Path filePath = Paths.get(path.toString(), "EmptyClassBody.kt");
+
+		Map<String, String> userData = new HashMap<>();
+
+		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
+
+		String formatted = KtLintCompat0Dot50Dot0Adapter.format(text, filePath, false, false, null, userData, editorConfigOverrideMap);
+		assertEquals("class EmptyClassBody\n", formatted);
+	}
+
+	@Test
+	public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
+		KtLintCompat0Dot50Dot0Adapter KtLintCompat0Dot50Dot0Adapter = new KtLintCompat0Dot50Dot0Adapter();
+		String text = loadAndWriteText(path, "FailsNoSemicolons.kt");
+		final Path filePath = Paths.get(path.toString(), "FailsNoSemicolons.kt");
+
+		Map<String, String> userData = new HashMap<>();
+
+		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
+		editorConfigOverrideMap.put("indent_style", "tab");
+		editorConfigOverrideMap.put("ktlint_standard_no-semi", "disabled");
+
+		String formatted = KtLintCompat0Dot50Dot0Adapter.format(text, filePath, false, false, null, userData, editorConfigOverrideMap);
+		assertEquals("class FailsNoSemicolons {\n\tval i = 0;\n}\n", formatted);
+	}
+
+	private static String loadAndWriteText(Path path, String name) throws IOException {
+		try (InputStream is = KtLintCompat0Dot50Dot0AdapterTest.class.getResourceAsStream("/" + name)) {
+			Files.copy(is, path.resolve(name));
+		}
+		return new String(Files.readAllBytes(path.resolve(name)), StandardCharsets.UTF_8);
+	}
+
+}
diff --git a/lib/src/testCompatKtLint0Dot50Dot0/resources/EmptyClassBody.kt b/lib/src/testCompatKtLint0Dot50Dot0/resources/EmptyClassBody.kt
new file mode 100644
index 0000000000..7da53fb78d
--- /dev/null
+++ b/lib/src/testCompatKtLint0Dot50Dot0/resources/EmptyClassBody.kt
@@ -0,0 +1,3 @@
+class EmptyClassBody {
+
+}
diff --git a/lib/src/testCompatKtLint0Dot50Dot0/resources/FailsNoSemicolons.kt b/lib/src/testCompatKtLint0Dot50Dot0/resources/FailsNoSemicolons.kt
new file mode 100644
index 0000000000..4cf05ceacf
--- /dev/null
+++ b/lib/src/testCompatKtLint0Dot50Dot0/resources/FailsNoSemicolons.kt
@@ -0,0 +1,3 @@
+class FailsNoSemicolons {
+	val i = 0;
+}
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 744c6efce7..af7d966755 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,7 +3,9 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
-
+### Added
+* Bump default `ktlint` version to latest `0.49.1` -> `0.50.0`.([#1741](https://github.com/diffplug/spotless/issues/1741))
+  * Dropped support for `ktlint 0.47.x` following our policy of supporting two breaking changes at a time.
 ### Fixed
 * Correctly support the syntax
   ```
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index c19cc804af..db7fff9851 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,6 +5,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Support pass skip (`-Dspotless.skip=true`) from command-line. ([#1729](https://github.com/diffplug/spotless/pull/1729))
+* Bump default `ktlint` version to latest `0.49.1` -> `0.50.0`.([#1741](https://github.com/diffplug/spotless/issues/1741))
+  * Dropped support for `ktlint 0.47.x` following our policy of supporting two breaking changes at a time.
 ### Fixed
 * Update documented default `semanticSort` to `false`. ([#1728](https://github.com/diffplug/spotless/pull/1728))
 
diff --git a/testlib/src/main/resources/kotlin/ktlint/basic-old.clean b/testlib/src/main/resources/kotlin/ktlint/basic-old.clean
new file mode 100644
index 0000000000..fd5371bed2
--- /dev/null
+++ b/testlib/src/main/resources/kotlin/ktlint/basic-old.clean
@@ -0,0 +1,5 @@
+fun main() {
+    fun name() { a(); return b }
+    println(";")
+    println()
+}
diff --git a/testlib/src/main/resources/kotlin/ktlint/basic.clean b/testlib/src/main/resources/kotlin/ktlint/basic.clean
index fd5371bed2..b727a7d016 100644
--- a/testlib/src/main/resources/kotlin/ktlint/basic.clean
+++ b/testlib/src/main/resources/kotlin/ktlint/basic.clean
@@ -1,5 +1,8 @@
 fun main() {
-    fun name() { a(); return b }
+    fun name() {
+        a()
+        return b
+    }
     println(";")
     println()
 }
diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
index 9af6685906..5b62eeed48 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
@@ -25,59 +25,48 @@
 
 class KtLintStepTest extends ResourceHarness {
 	@Test
-	void behavior() {
-		FormatterStep step = KtLintStep.create(TestProvisioner.mavenCentral());
-		StepHarnessWithFile.forStep(this, step)
-				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean")
-				.testResourceExceptionMsg("kotlin/ktlint/unsolvable.dirty").isEqualTo(
-						"Error on line: 1, column: 1\n" +
-								"rule: standard:no-wildcard-imports\n" +
-								"Wildcard import");
-	}
-
-	@Test
-	void works0_47_0() {
-		FormatterStep step = KtLintStep.create("0.47.0", TestProvisioner.mavenCentral());
+	void works0_48_0() {
+		FormatterStep step = KtLintStep.create("0.48.0", TestProvisioner.mavenCentral());
 		StepHarnessWithFile.forStep(this, step)
-				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean")
+				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic-old.clean")
 				.testResourceExceptionMsg("kotlin/ktlint/unsolvable.dirty").isEqualTo("Error on line: 1, column: 1\n" +
 						"rule: no-wildcard-imports\n" +
 						"Wildcard import");
 	}
 
 	@Test
-	void works0_47_1() {
-		FormatterStep step = KtLintStep.create("0.47.1", TestProvisioner.mavenCentral());
+	void works0_48_1() {
+		FormatterStep step = KtLintStep.create("0.48.1", TestProvisioner.mavenCentral());
 		StepHarnessWithFile.forStep(this, step)
-				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean")
+				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic-old.clean")
 				.testResourceExceptionMsg("kotlin/ktlint/unsolvable.dirty").isEqualTo("Error on line: 1, column: 1\n" +
 						"rule: no-wildcard-imports\n" +
 						"Wildcard import");
 	}
 
 	@Test
-	void works0_48_0() {
-		FormatterStep step = KtLintStep.create("0.48.0", TestProvisioner.mavenCentral());
+	void works0_49_0() {
+		FormatterStep step = KtLintStep.create("0.49.0", TestProvisioner.mavenCentral());
 		StepHarnessWithFile.forStep(this, step)
-				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean")
+				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic-old.clean")
 				.testResourceExceptionMsg("kotlin/ktlint/unsolvable.dirty").isEqualTo("Error on line: 1, column: 1\n" +
-						"rule: no-wildcard-imports\n" +
+						"rule: standard:no-wildcard-imports\n" +
 						"Wildcard import");
 	}
 
 	@Test
-	void works0_48_1() {
-		FormatterStep step = KtLintStep.create("0.48.1", TestProvisioner.mavenCentral());
+	void works0_49_1() {
+		FormatterStep step = KtLintStep.create("0.49.1", TestProvisioner.mavenCentral());
 		StepHarnessWithFile.forStep(this, step)
-				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean")
+				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic-old.clean")
 				.testResourceExceptionMsg("kotlin/ktlint/unsolvable.dirty").isEqualTo("Error on line: 1, column: 1\n" +
-						"rule: no-wildcard-imports\n" +
+						"rule: standard:no-wildcard-imports\n" +
 						"Wildcard import");
 	}
 
 	@Test
-	void works0_49_0() {
-		FormatterStep step = KtLintStep.create("0.49.0", TestProvisioner.mavenCentral());
+	void works0_50_0() {
+		FormatterStep step = KtLintStep.create("0.50.0", TestProvisioner.mavenCentral());
 		StepHarnessWithFile.forStep(this, step)
 				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean")
 				.testResourceExceptionMsg("kotlin/ktlint/unsolvable.dirty").isEqualTo("Error on line: 1, column: 1\n" +
@@ -86,8 +75,8 @@ void works0_49_0() {
 	}
 
 	@Test
-	void works0_49_1() {
-		FormatterStep step = KtLintStep.create("0.49.1", TestProvisioner.mavenCentral());
+	void behavior() {
+		FormatterStep step = KtLintStep.create(TestProvisioner.mavenCentral());
 		StepHarnessWithFile.forStep(this, step)
 				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean")
 				.testResourceExceptionMsg("kotlin/ktlint/unsolvable.dirty").isEqualTo("Error on line: 1, column: 1\n" +

From f9dd7bec434bc49ed3b68d8583bdffe4460be94d Mon Sep 17 00:00:00 2001
From: David Gregory <2992938+DavidGregory084@users.noreply.github.com>
Date: Wed, 12 Jul 2023 15:12:20 +0100
Subject: [PATCH 1108/2068] Enable Gradle users to create steps that require a
 provisioner

---
 .../com/diffplug/gradle/spotless/FormatExtension.java     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index 4fa74bc2ea..735f5bfabd 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -30,6 +30,7 @@
 import java.util.Random;
 import java.util.TreeMap;
 import java.util.function.Consumer;
+import java.util.function.Function;
 
 import javax.annotation.Nullable;
 import javax.inject.Inject;
@@ -300,6 +301,13 @@ public void addStep(FormatterStep newStep) {
 		steps.add(newStep);
 	}
 
+	/** Adds a new step that requires a Provisioner. */
+	public void addStep(Function<Provisioner, FormatterStep> createStepFn) {
+		requireNonNull(createStepFn);
+		FormatterStep newStep = createStepFn.apply(provisioner());
+		addStep(newStep);
+	}
+
 	/** Returns the index of the existing step with the given name, or -1 if no such step exists. */
 	protected int getExistingStepIdx(String stepName) {
 		for (int i = 0; i < steps.size(); ++i) {

From 9fc857e14401187a08cfaa3daa38c861dd420e24 Mon Sep 17 00:00:00 2001
From: David Gregory <2992938+DavidGregory084@users.noreply.github.com>
Date: Wed, 12 Jul 2023 19:48:41 +0100
Subject: [PATCH 1109/2068] Update CHANGES.md

---
 plugin-gradle/CHANGES.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 744c6efce7..4ea854b86a 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -4,6 +4,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 
+### Added
+
+* Add an overload for `FormatExtension.addStep` which provides access to the `FormatExtension`'s `Provisioner`, enabling custom steps to make use of third-party dependencies.
+
 ### Fixed
 * Correctly support the syntax
   ```

From 55c2a6bd1a5a49af0c289376e0b79da4b6dedc1f Mon Sep 17 00:00:00 2001
From: Benoit Quenaudon <benoit@quenaudon.com>
Date: Wed, 12 Jul 2023 22:05:26 +0200
Subject: [PATCH 1110/2068] Add targetExcludeIfContentContains API to the
 Gradle plugin

---
 plugin-gradle/CHANGES.md                      |   2 +
 .../gradle/spotless/FormatExtension.java      |  11 ++
 .../TargetExcludeIfContentContainsTest.java   | 110 ++++++++++++++++++
 3 files changed, 123 insertions(+)
 create mode 100644 plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TargetExcludeIfContentContainsTest.java

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 744c6efce7..f351495462 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -4,6 +4,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 
+### Added
+* Add target option `targetExcludeIfContentContains` to exclude files by text they contain.
 ### Fixed
 * Correctly support the syntax
   ```
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index 4fa74bc2ea..7e2e755f5d 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -161,6 +161,12 @@ public void encoding(String charset) {
 	/** The files to be formatted = (target - targetExclude). */
 	protected FileCollection target, targetExclude;
 
+	/**
+	 * The values from which files will be excluded if their content contain at least one of the
+	 * `targetExcludeIfContentContains`.
+	 */
+	protected List<String> targetExcludeIfContentContains = new ArrayList<>();
+
 	protected boolean isLicenseHeaderStep(FormatterStep formatterStep) {
 		String formatterStepName = formatterStep.getName();
 
@@ -202,6 +208,11 @@ public void targetExclude(Object... targets) {
 		this.targetExclude = parseTargetsIsExclude(targets, true);
 	}
 
+	/** Excludes all files whose content contains at least one of the `values`. */
+	public void targetExcludeIfContentContains(String... values) {
+		this.targetExcludeIfContentContains.addAll(List.of(values));
+	}
+
 	private FileCollection parseTargetsIsExclude(Object[] targets, boolean isExclude) {
 		requireElementsNonNull(targets);
 		if (targets.length == 0) {
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TargetExcludeIfContentContainsTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TargetExcludeIfContentContainsTest.java
new file mode 100644
index 0000000000..66dfc60f4c
--- /dev/null
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TargetExcludeIfContentContainsTest.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2020-2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.gradle.spotless;
+
+import java.io.IOException;
+
+import org.junit.jupiter.api.Test;
+
+class TargetExcludeIfContentContainsTest extends GradleIntegrationHarness {
+	@Test
+	void targetExcludeIfContentContainsWithOneValue() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins { id 'com.diffplug.spotless' }",
+				"spotless {",
+				"  format 'toLower', {",
+				"    target '**/*.md'",
+				"    targetExcludeIfContentContains '// Generated by Mr. Roboto'",
+				"    custom 'lowercase', { str -> str.toLowerCase() }",
+				"    toggleOffOn()",
+				"  }",
+				"}");
+		String content = "// Generated by Mr. Roboto, do not edit.\n" +
+				"A B C\n" +
+				"D E F\n" +
+				"G H I";
+		setFile("test_generated.md").toContent(content);
+		setFile("test_manual.md").toLines(
+				"A B C",
+				"D E F",
+				"G H I");
+		gradleRunner().withArguments("spotlessApply").build();
+		// `test_generated` contains the excluding text so didn't change.
+		assertFile("test_generated.md").hasContent(content);
+		// `test_manual` does not so it changed.
+		assertFile("test_manual.md").hasLines(
+				"a b c",
+				"d e f",
+				"g h i");
+	}
+
+	@Test
+	void targetExcludeIfContentContainsWithMultipleValues() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins { id 'com.diffplug.spotless' }",
+				"spotless {",
+				"  format 'toLower', {",
+				"    target '**/*.md'",
+				"    targetExcludeIfContentContains '// Generated by Mr. Roboto', '// Generated by Mrs. Call'",
+				"    custom 'lowercase', { str -> str.toLowerCase() }",
+				"    toggleOffOn()",
+				"  }",
+				"}");
+		String robotoContent = "A B C\n" +
+				"// Generated by Mr. Roboto, do not edit.\n" +
+				"D E F\n" +
+				"G H I";
+		setFile("test_generated_roboto.md").toContent(robotoContent);
+		String callContent = "A B C\n" +
+				"D E F\n" +
+				"// Generated by Mrs. Call, do not edit.\n" +
+				"G H I";
+		setFile("test_generated_call.md").toContent(callContent);
+		String collaborationContent = "A B C\n" +
+				"// Generated by Mr. Roboto, do not edit.\n" +
+				"D E F\n" +
+				"// Generated by Mrs. Call, do not edit.\n" +
+				"G H I";
+		setFile("test_generated_collaboration.md").toContent(collaborationContent);
+		String intruderContent = "A B C\n" +
+				"// Generated by K2000, do not edit.\n" +
+				"D E F\n" +
+				"G H I";
+		setFile("test_generated_intruder.md").toContent(intruderContent);
+		setFile("test_manual.md").toLines(
+				"A B C",
+				"D E F",
+				"G H I");
+		gradleRunner().withArguments("spotlessApply").build();
+		// Part of the excluding values so has not changed.
+		assertFile("test_generated_roboto.md").hasContent(robotoContent);
+		// Part of the excluding values so has not changed.
+		assertFile("test_generated_call.md").hasContent(callContent);
+		// Part of the excluding values so has not changed.
+		assertFile("test_generated_collaboration.md").hasContent(collaborationContent);
+		// Not part of the excluding values so has changed.
+		assertFile("test_generated_intruder.md").hasContent(
+				"a b c\n" +
+						"// generated by k2000, do not edit.\n" +
+						"d e f\n" +
+						"g h i");
+		// `test_manual` does not so it changed.
+		assertFile("test_manual.md").hasLines(
+				"a b c",
+				"d e f",
+				"g h i");
+	}
+}

From 13a36fc7362864929ce57a6373d3250ba7a3f323 Mon Sep 17 00:00:00 2001
From: Mitchell Skaggs <skaggsm333@gmail.com>
Date: Wed, 12 Jul 2023 19:40:34 -0500
Subject: [PATCH 1111/2068] Remove deprecated `useExperimental` parameter in
 favor of `ktlint_${RuleSetId}` properties and loading all current
 `RuleSetProvider`s

---
 CHANGES.md                                    |  1 +
 .../compat/KtLintCompat0Dot48Dot0Adapter.java | 17 ++++++--------
 .../compat/KtLintCompat0Dot49Dot0Adapter.java | 23 ++++++-------------
 .../compat/KtLintCompat0Dot50Dot0Adapter.java | 23 ++++++-------------
 .../ktlint/compat/KtLintCompatAdapter.java    |  4 ++--
 .../glue/ktlint/KtlintFormatterFunc.java      |  6 ++---
 .../diffplug/spotless/kotlin/KtLintStep.java  | 22 +++++++-----------
 .../KtLintCompat0Dot48Dot0AdapterTest.java    |  4 ++--
 .../KtLintCompat0Dot49Dot0AdapterTest.java    |  4 ++--
 .../KtLintCompat0Dot50Dot0AdapterTest.java    |  4 ++--
 plugin-gradle/CHANGES.md                      |  3 ++-
 plugin-gradle/README.md                       |  5 ++--
 .../gradle/spotless/KotlinExtension.java      | 16 ++++---------
 .../spotless/KotlinGradleExtension.java       | 13 ++---------
 .../gradle/spotless/KotlinExtensionTest.java  | 10 ++++----
 .../spotless/KotlinGradleExtensionTest.java   | 10 ++++----
 .../spotless/maven/kotlin/Ktlint.java         |  2 +-
 17 files changed, 61 insertions(+), 106 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index a0a6b309ee..2c9a855114 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,6 +13,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * Bump default `ktlint` version to latest `0.49.1` -> `0.50.0`.([#1741](https://github.com/diffplug/spotless/issues/1741))
   * Dropped support for `ktlint 0.47.x` following our policy of supporting two breaking changes at a time.
+  * Dropped support for deprecated `useExperimental` parameter in favor of the `ktlint_experimental` property.
 ### Changes
 * Bump default `cleanthat` version to latest `2.13` -> `2.16`. ([#1725](https://github.com/diffplug/spotless/pull/1725))
 ### Fixed
diff --git a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
index 1e54a80859..3b01470c8e 100644
--- a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
@@ -19,10 +19,10 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.ServiceLoader;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -31,6 +31,7 @@
 import com.pinterest.ktlint.core.LintError;
 import com.pinterest.ktlint.core.Rule;
 import com.pinterest.ktlint.core.RuleProvider;
+import com.pinterest.ktlint.core.RuleSetProviderV2;
 import com.pinterest.ktlint.core.api.EditorConfigDefaults;
 import com.pinterest.ktlint.core.api.EditorConfigOverride;
 import com.pinterest.ktlint.core.api.UsesEditorConfigProperties;
@@ -42,8 +43,6 @@
 import com.pinterest.ktlint.core.api.editorconfig.InsertFinalNewLineEditorConfigPropertyKt;
 import com.pinterest.ktlint.core.api.editorconfig.MaxLineLengthEditorConfigPropertyKt;
 import com.pinterest.ktlint.core.api.editorconfig.RuleExecutionEditorConfigPropertyKt;
-import com.pinterest.ktlint.ruleset.experimental.ExperimentalRuleSetProvider;
-import com.pinterest.ktlint.ruleset.standard.StandardRuleSetProvider;
 
 import kotlin.Pair;
 import kotlin.Unit;
@@ -79,16 +78,14 @@ public Unit invoke(LintError lint, Boolean corrected) {
 
 	@Override
 	public String format(final String text, Path path, final boolean isScript,
-			final boolean useExperimental,
-			Path editorConfigPath, final Map<String, String> userData,
+						 Path editorConfigPath, final Map<String, String> userData,
 			final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
-		Set<RuleProvider> allRuleProviders = new LinkedHashSet<>(
-				new StandardRuleSetProvider().getRuleProviders());
-		if (useExperimental) {
-			allRuleProviders.addAll(new ExperimentalRuleSetProvider().getRuleProviders());
-		}
+		Set<RuleProvider> allRuleProviders = ServiceLoader.load(RuleSetProviderV2.class, RuleSetProviderV2.class.getClassLoader())
+			.stream()
+			.flatMap(loader -> loader.get().getRuleProviders().stream())
+			.collect(Collectors.toUnmodifiableSet());
 
 		EditorConfigOverride editorConfigOverride;
 		if (editorConfigOverrideMap.isEmpty()) {
diff --git a/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java b/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
index 86ca69c352..ccff718b01 100644
--- a/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
@@ -21,10 +21,10 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.ServiceLoader;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -32,6 +32,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.pinterest.ktlint.cli.ruleset.core.api.RuleSetProviderV3;
 import com.pinterest.ktlint.rule.engine.api.Code;
 import com.pinterest.ktlint.rule.engine.api.EditorConfigDefaults;
 import com.pinterest.ktlint.rule.engine.api.EditorConfigOverride;
@@ -48,7 +49,6 @@
 import com.pinterest.ktlint.rule.engine.core.api.editorconfig.MaxLineLengthEditorConfigPropertyKt;
 import com.pinterest.ktlint.rule.engine.core.api.editorconfig.RuleExecution;
 import com.pinterest.ktlint.rule.engine.core.api.editorconfig.RuleExecutionEditorConfigPropertyKt;
-import com.pinterest.ktlint.ruleset.standard.StandardRuleSetProvider;
 
 import kotlin.Pair;
 import kotlin.Unit;
@@ -123,23 +123,14 @@ public Unit invoke(LintError lint, Boolean corrected) {
 
 	@Override
 	public String format(final String text, Path path, final boolean isScript,
-			final boolean useExperimental,
-			Path editorConfigPath, final Map<String, String> userData,
+                         Path editorConfigPath, final Map<String, String> userData,
 			final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
-		Set<RuleProvider> allRuleProviders = new LinkedHashSet<>(
-				new StandardRuleSetProvider().getRuleProviders());
-
-		// TODO: Should we keep `useExperimental` now that ktlint uses an EditorConfig property for this purpose?
-		if (useExperimental) {
-			String experimentalRulesPropertyName = RuleExecutionEditorConfigPropertyKt.getEXPERIMENTAL_RULES_EXECUTION_PROPERTY().getName();
-			Object experimentalOverride = editorConfigOverrideMap.get(experimentalRulesPropertyName);
-			if (experimentalOverride != null) {
-				logger.warn("`useExperimental` parameter is `true` and `ktlint_experimental` property is set, `useExperimental` will take priority!");
-				editorConfigOverrideMap.put(experimentalRulesPropertyName, "enabled");
-			}
-		}
+		Set<RuleProvider> allRuleProviders = ServiceLoader.load(RuleSetProviderV3.class, RuleSetProviderV3.class.getClassLoader())
+			.stream()
+			.flatMap(loader -> loader.get().getRuleProviders().stream())
+			.collect(Collectors.toUnmodifiableSet());
 
 		EditorConfigOverride editorConfigOverride;
 		if (editorConfigOverrideMap.isEmpty()) {
diff --git a/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java b/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
index 642e15adc2..009392b9e1 100644
--- a/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
@@ -19,10 +19,10 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.ServiceLoader;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -30,6 +30,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.pinterest.ktlint.cli.ruleset.core.api.RuleSetProviderV3;
 import com.pinterest.ktlint.rule.engine.api.Code;
 import com.pinterest.ktlint.rule.engine.api.EditorConfigDefaults;
 import com.pinterest.ktlint.rule.engine.api.EditorConfigOverride;
@@ -48,7 +49,6 @@
 import com.pinterest.ktlint.rule.engine.core.api.editorconfig.MaxLineLengthEditorConfigPropertyKt;
 import com.pinterest.ktlint.rule.engine.core.api.editorconfig.RuleExecution;
 import com.pinterest.ktlint.rule.engine.core.api.editorconfig.RuleExecutionEditorConfigPropertyKt;
-import com.pinterest.ktlint.ruleset.standard.StandardRuleSetProvider;
 
 import kotlin.Pair;
 import kotlin.Unit;
@@ -85,23 +85,14 @@ public Unit invoke(LintError lint, Boolean corrected) {
 
 	@Override
 	public String format(final String text, Path path, final boolean isScript,
-			final boolean useExperimental,
-			Path editorConfigPath, final Map<String, String> userData,
+                         Path editorConfigPath, final Map<String, String> userData,
 			final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
-		Set<RuleProvider> allRuleProviders = new LinkedHashSet<>(
-				new StandardRuleSetProvider().getRuleProviders());
-
-		// TODO: Should we keep `useExperimental` now that ktlint uses an EditorConfig property for this purpose?
-		if (useExperimental) {
-			String experimentalRulesPropertyName = RuleExecutionEditorConfigPropertyKt.getEXPERIMENTAL_RULES_EXECUTION_PROPERTY().getName();
-			Object experimentalOverride = editorConfigOverrideMap.get(experimentalRulesPropertyName);
-			if (experimentalOverride != null) {
-				logger.warn("`useExperimental` parameter is `true` and `ktlint_experimental` property is set, `useExperimental` will take priority!");
-				editorConfigOverrideMap.put(experimentalRulesPropertyName, "enabled");
-			}
-		}
+		Set<RuleProvider> allRuleProviders = ServiceLoader.load(RuleSetProviderV3.class, RuleSetProviderV3.class.getClassLoader())
+			.stream()
+			.flatMap(loader -> loader.get().getRuleProviders().stream())
+			.collect(Collectors.toUnmodifiableSet());
 
 		EditorConfigOverride editorConfigOverride;
 		if (editorConfigOverrideMap.isEmpty()) {
diff --git a/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java b/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
index 68a65eb6c8..64576d7e19 100644
--- a/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
+++ b/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
@@ -20,6 +20,6 @@
 
 public interface KtLintCompatAdapter {
 
-	String format(String text, Path path, boolean isScript, boolean useExperimental, Path editorConfigPath, Map<String, String> userData,
-			Map<String, Object> editorConfigOverrideMap);
+	String format(String text, Path path, boolean isScript, Path editorConfigPath, Map<String, String> userData,
+				  Map<String, Object> editorConfigOverrideMap);
 }
diff --git a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
index 9f773d4016..2f9f67bd72 100644
--- a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
+++ b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
@@ -28,11 +28,10 @@ public class KtlintFormatterFunc implements FormatterFunc.NeedsFile {
 	private final Map<String, String> userData;
 	private final boolean isScript;
 	private final KtLintCompatAdapter adapter;
-	private final boolean useExperimental;
 	private final FileSignature editorConfigPath;
 	private final Map<String, Object> editorConfigOverrideMap;
 
-	public KtlintFormatterFunc(String version, boolean isScript, boolean useExperimental, FileSignature editorConfigPath, Map<String, String> userData,
+	public KtlintFormatterFunc(String version, boolean isScript, FileSignature editorConfigPath, Map<String, String> userData,
 			Map<String, Object> editorConfigOverrideMap) {
 		int minorVersion = Integer.parseInt(version.split("\\.")[1]);
 		if (minorVersion >= 50) {
@@ -50,7 +49,6 @@ public KtlintFormatterFunc(String version, boolean isScript, boolean useExperime
 			this.adapter = new KtLintCompat0Dot48Dot0Adapter();
 		}
 		this.editorConfigPath = editorConfigPath;
-		this.useExperimental = useExperimental;
 		this.editorConfigOverrideMap = editorConfigOverrideMap;
 		this.userData = userData;
 		this.isScript = isScript;
@@ -63,6 +61,6 @@ public String applyWithFile(String unix, File file) {
 		if (editorConfigPath != null) {
 			absoluteEditorConfigPath = editorConfigPath.getOnlyFile().toPath();
 		}
-		return adapter.format(unix, file.toPath(), isScript, useExperimental, absoluteEditorConfigPath, userData, editorConfigOverrideMap);
+		return adapter.format(unix, file.toPath(), isScript, absoluteEditorConfigPath, userData, editorConfigOverrideMap);
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index a844a93bff..36bf5d42f4 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -46,28 +46,26 @@ public static FormatterStep create(Provisioner provisioner) {
 	}
 
 	public static FormatterStep create(String version, Provisioner provisioner) {
-		return create(version, provisioner, false, Collections.emptyMap(), Collections.emptyMap());
+		return create(version, provisioner, Collections.emptyMap(), Collections.emptyMap());
 	}
 
-	public static FormatterStep create(String version, Provisioner provisioner, boolean useExperimental,
-			Map<String, String> userData, Map<String, Object> editorConfigOverride) {
-		return create(version, provisioner, false, useExperimental, null, userData, editorConfigOverride);
+	public static FormatterStep create(String version, Provisioner provisioner,
+									   Map<String, String> userData, Map<String, Object> editorConfigOverride) {
+		return create(version, provisioner, false, null, userData, editorConfigOverride);
 	}
 
 	public static FormatterStep createForScript(String version, Provisioner provisioner) {
-		return create(version, provisioner, true, false, null, Collections.emptyMap(), Collections.emptyMap());
+		return create(version, provisioner, true, null, Collections.emptyMap(), Collections.emptyMap());
 	}
 
 	public static FormatterStep createForScript(String version,
 			Provisioner provisioner,
-			boolean useExperimental,
 			@Nullable FileSignature editorConfigPath,
 			Map<String, String> userData,
 			Map<String, Object> editorConfigOverride) {
 		return create(version,
 				provisioner,
 				true,
-				useExperimental,
 				editorConfigPath,
 				userData,
 				editorConfigOverride);
@@ -76,14 +74,13 @@ public static FormatterStep createForScript(String version,
 	public static FormatterStep create(String version,
 			Provisioner provisioner,
 			boolean isScript,
-			boolean useExperimental,
 			@Nullable FileSignature editorConfig,
 			Map<String, String> userData,
 			Map<String, Object> editorConfigOverride) {
 		Objects.requireNonNull(version, "version");
 		Objects.requireNonNull(provisioner, "provisioner");
 		return FormatterStep.createLazy(NAME,
-				() -> new State(version, provisioner, isScript, useExperimental, editorConfig, userData, editorConfigOverride),
+				() -> new State(version, provisioner, isScript, editorConfig, userData, editorConfigOverride),
 				State::createFormat);
 	}
 
@@ -98,7 +95,6 @@ static final class State implements Serializable {
 		private final boolean isScript;
 		/** The jar that contains the formatter. */
 		final JarState jarState;
-		private final boolean useExperimental;
 		private final TreeMap<String, String> userData;
 		private final TreeMap<String, Object> editorConfigOverride;
 		private final String version;
@@ -108,7 +104,6 @@ static final class State implements Serializable {
 		State(String version,
 				Provisioner provisioner,
 				boolean isScript,
-				boolean useExperimental,
 				@Nullable FileSignature editorConfigPath,
 				Map<String, String> userData,
 				Map<String, Object> editorConfigOverride) throws IOException {
@@ -116,7 +111,6 @@ static final class State implements Serializable {
 				throw new IllegalStateException("KtLint versions < 0.46.0 not supported!");
 			}
 			this.version = version;
-			this.useExperimental = useExperimental;
 			this.userData = new TreeMap<>(userData);
 			this.editorConfigOverride = new TreeMap<>(editorConfigOverride);
 			this.jarState = JarState.from(MAVEN_COORDINATE + version, provisioner);
@@ -128,8 +122,8 @@ FormatterFunc createFormat() throws Exception {
 			final ClassLoader classLoader = jarState.getClassLoader();
 			Class<?> formatterFunc = classLoader.loadClass("com.diffplug.spotless.glue.ktlint.KtlintFormatterFunc");
 			Constructor<?> constructor = formatterFunc.getConstructor(
-					String.class, boolean.class, boolean.class, FileSignature.class, Map.class, Map.class);
-			return (FormatterFunc.NeedsFile) constructor.newInstance(version, isScript, useExperimental, editorConfigPath, userData, editorConfigOverride);
+					String.class, boolean.class, FileSignature.class, Map.class, Map.class);
+			return (FormatterFunc.NeedsFile) constructor.newInstance(version, isScript, editorConfigPath, userData, editorConfigOverride);
 		}
 	}
 }
diff --git a/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java b/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java
index c811b51233..7fc9d1d9a4 100644
--- a/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java
+++ b/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java
@@ -40,7 +40,7 @@ public void testDefaults(@TempDir Path path) throws IOException {
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 
-		String formatted = ktLintCompat0Dot48Dot0Adapter.format(text, filePath, false, false, null, userData, editorConfigOverrideMap);
+		String formatted = ktLintCompat0Dot48Dot0Adapter.format(text, filePath, false, null, userData, editorConfigOverrideMap);
 		assertEquals("class empty_class_body\n", formatted);
 	}
 
@@ -58,7 +58,7 @@ public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		// ktlint_filename is an invalid rule in ktlint 0.48.0
 		editorConfigOverrideMap.put("ktlint_filename", "disabled");
 
-		String formatted = ktLintCompat0Dot48Dot0Adapter.format(text, filePath, false, false, null, userData, editorConfigOverrideMap);
+		String formatted = ktLintCompat0Dot48Dot0Adapter.format(text, filePath, false, null, userData, editorConfigOverrideMap);
 		assertEquals("class fails_no_semicolons {\n\tval i = 0;\n}\n", formatted);
 	}
 
diff --git a/lib/src/testCompatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java b/lib/src/testCompatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java
index ede67e0174..a0db6ecddc 100644
--- a/lib/src/testCompatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java
+++ b/lib/src/testCompatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java
@@ -40,7 +40,7 @@ public void testDefaults(@TempDir Path path) throws IOException {
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 
-		String formatted = ktLintCompat0Dot49Dot0Adapter.format(text, filePath, false, false, null, userData, editorConfigOverrideMap);
+		String formatted = ktLintCompat0Dot49Dot0Adapter.format(text, filePath, false, null, userData, editorConfigOverrideMap);
 		assertEquals("class EmptyClassBody\n", formatted);
 	}
 
@@ -56,7 +56,7 @@ public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		editorConfigOverrideMap.put("indent_style", "tab");
 		editorConfigOverrideMap.put("ktlint_standard_no-semi", "disabled");
 
-		String formatted = ktLintCompat0Dot49Dot0Adapter.format(text, filePath, false, false, null, userData, editorConfigOverrideMap);
+		String formatted = ktLintCompat0Dot49Dot0Adapter.format(text, filePath, false, null, userData, editorConfigOverrideMap);
 		assertEquals("class FailsNoSemicolons {\n\tval i = 0;\n}\n", formatted);
 	}
 
diff --git a/lib/src/testCompatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java b/lib/src/testCompatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java
index 575515a66e..f5b76ccae0 100644
--- a/lib/src/testCompatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java
+++ b/lib/src/testCompatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java
@@ -40,7 +40,7 @@ public void testDefaults(@TempDir Path path) throws IOException {
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 
-		String formatted = KtLintCompat0Dot50Dot0Adapter.format(text, filePath, false, false, null, userData, editorConfigOverrideMap);
+		String formatted = KtLintCompat0Dot50Dot0Adapter.format(text, filePath, false, null, userData, editorConfigOverrideMap);
 		assertEquals("class EmptyClassBody\n", formatted);
 	}
 
@@ -56,7 +56,7 @@ public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		editorConfigOverrideMap.put("indent_style", "tab");
 		editorConfigOverrideMap.put("ktlint_standard_no-semi", "disabled");
 
-		String formatted = KtLintCompat0Dot50Dot0Adapter.format(text, filePath, false, false, null, userData, editorConfigOverrideMap);
+		String formatted = KtLintCompat0Dot50Dot0Adapter.format(text, filePath, false, null, userData, editorConfigOverrideMap);
 		assertEquals("class FailsNoSemicolons {\n\tval i = 0;\n}\n", formatted);
 	}
 
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index af7d966755..9f366e5f80 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -4,8 +4,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* Bump default `ktlint` version to latest `0.49.1` -> `0.50.0`.([#1741](https://github.com/diffplug/spotless/issues/1741))
+* Bump default `ktlint` version to latest `0.49.1` -> `0.50.0`. ([#1741](https://github.com/diffplug/spotless/issues/1741))
   * Dropped support for `ktlint 0.47.x` following our policy of supporting two breaking changes at a time.
+  * Dropped support for deprecated `useExperimental` parameter in favor of the `ktlint_experimental` property.
 ### Fixed
 * Correctly support the syntax
   ```
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index ef93e31d45..704e3b694a 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -397,9 +397,8 @@ Additionally, `editorConfigOverride` options will override what's supplied in `.
 ```kotlin
 spotless {
   kotlin {
-    // version, setUseExperimental, userData and editorConfigOverride are all optional
-    ktlint("0.45.2")
-      .setUseExperimental(true)
+    // version, userData and editorConfigOverride are all optional
+    ktlint("0.50.0")
       .userData(mapOf("android" to "true"))
       .setEditorConfigPath("$projectDir/config/.editorconfig")  // sample unusual placement
       .editorConfigOverride(mapOf("indent_size" to 2))
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
index 363a9cac6f..997fe3b9d6 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
@@ -61,7 +61,7 @@ public KotlinFormatExtension ktlint(String version) throws IOException {
 		Objects.requireNonNull(version);
 		File defaultEditorConfig = getProject().getRootProject().file(".editorconfig");
 		FileSignature editorConfigPath = defaultEditorConfig.exists() ? FileSignature.signAsList(defaultEditorConfig) : null;
-		return new KotlinFormatExtension(version, false, editorConfigPath, Collections.emptyMap(), Collections.emptyMap());
+		return new KotlinFormatExtension(version, editorConfigPath, Collections.emptyMap(), Collections.emptyMap());
 	}
 
 	public KotlinFormatExtension ktlint() throws IOException {
@@ -71,28 +71,20 @@ public KotlinFormatExtension ktlint() throws IOException {
 	public class KotlinFormatExtension {
 
 		private final String version;
-		private boolean useExperimental;
 		@Nullable
 		private FileSignature editorConfigPath;
 		private Map<String, String> userData;
 		private Map<String, Object> editorConfigOverride;
 
-		KotlinFormatExtension(String version, boolean useExperimental, @Nullable FileSignature editorConfigPath, Map<String, String> config,
-				Map<String, Object> editorConfigOverride) {
+		KotlinFormatExtension(String version, @Nullable FileSignature editorConfigPath, Map<String, String> config,
+							  Map<String, Object> editorConfigOverride) {
 			this.version = version;
-			this.useExperimental = useExperimental;
 			this.editorConfigPath = editorConfigPath;
 			this.userData = config;
 			this.editorConfigOverride = editorConfigOverride;
 			addStep(createStep());
 		}
 
-		public KotlinFormatExtension setUseExperimental(boolean useExperimental) {
-			this.useExperimental = useExperimental;
-			replaceStep(createStep());
-			return this;
-		}
-
 		public KotlinFormatExtension setEditorConfigPath(Object editorConfigFile) throws IOException {
 			if (editorConfigFile == null) {
 				this.editorConfigPath = null;
@@ -120,7 +112,7 @@ public KotlinFormatExtension editorConfigOverride(Map<String, Object> editorConf
 		}
 
 		private FormatterStep createStep() {
-			return KtLintStep.create(version, provisioner(), useExperimental, false, editorConfigPath, userData, editorConfigOverride);
+			return KtLintStep.create(version, provisioner(), false, editorConfigPath, userData, editorConfigOverride);
 		}
 	}
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
index a0657e99d9..b3351194ba 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
@@ -49,7 +49,7 @@ public KotlinFormatExtension ktlint(String version) throws IOException {
 		Objects.requireNonNull(version, "version");
 		File defaultEditorConfig = getProject().getRootProject().file(".editorconfig");
 		FileSignature editorConfigPath = defaultEditorConfig.exists() ? FileSignature.signAsList(defaultEditorConfig) : null;
-		return new KotlinFormatExtension(version, false, editorConfigPath, Collections.emptyMap(), Collections.emptyMap());
+		return new KotlinFormatExtension(version, editorConfigPath, Collections.emptyMap(), Collections.emptyMap());
 	}
 
 	public KotlinFormatExtension ktlint() throws IOException {
@@ -59,16 +59,14 @@ public KotlinFormatExtension ktlint() throws IOException {
 	public class KotlinFormatExtension {
 
 		private final String version;
-		private boolean useExperimental;
 		@Nullable
 		private FileSignature editorConfigPath;
 		private Map<String, String> userData;
 		private Map<String, Object> editorConfigOverride;
 
-		KotlinFormatExtension(String version, boolean useExperimental, FileSignature editorConfigPath, Map<String, String> config,
+		KotlinFormatExtension(String version, FileSignature editorConfigPath, Map<String, String> config,
 				Map<String, Object> editorConfigOverride) {
 			this.version = version;
-			this.useExperimental = useExperimental;
 			this.editorConfigPath = editorConfigPath;
 			this.userData = config;
 			this.editorConfigOverride = editorConfigOverride;
@@ -86,12 +84,6 @@ public KotlinFormatExtension setEditorConfigPath(Object editorConfigPath) throws
 			return this;
 		}
 
-		public KotlinFormatExtension setUseExperimental(boolean useExperimental) {
-			this.useExperimental = useExperimental;
-			replaceStep(createStep());
-			return this;
-		}
-
 		public KotlinFormatExtension userData(Map<String, String> userData) {
 			// Copy the map to a sorted map because up-to-date checking is based on binary-equals of the serialized
 			// representation.
@@ -112,7 +104,6 @@ private FormatterStep createStep() {
 			return KtLintStep.createForScript(
 					version,
 					provisioner(),
-					useExperimental,
 					editorConfigPath,
 					userData,
 					editorConfigOverride);
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
index 947b5bd728..10fbe5bd90 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
@@ -69,11 +69,11 @@ void withExperimentalEditorConfigOverride() throws IOException {
 				"repositories { mavenCentral() }",
 				"spotless {",
 				"    kotlin {",
-				"        ktlint().setUseExperimental(true)",
-				"            .editorConfigOverride([",
-				"        	    ij_kotlin_allow_trailing_comma: true,",
-				"        	    ij_kotlin_allow_trailing_comma_on_call_site: true",
-				"            ])",
+				"        ktlint().editorConfigOverride([",
+				"            ktlint_experimental: \"enabled\",",
+				"            ij_kotlin_allow_trailing_comma: true,",
+				"            ij_kotlin_allow_trailing_comma_on_call_site: true",
+				"        ])",
 				"    }",
 				"}");
 		setFile("src/main/kotlin/Main.kt").toResource("kotlin/ktlint/experimentalEditorConfigOverride.dirty");
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
index 13a7cd8472..7dade5f2ff 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
@@ -51,11 +51,11 @@ void withExperimentalEditorConfigOverride() throws IOException {
 				"repositories { mavenCentral() }",
 				"spotless {",
 				"    kotlinGradle {",
-				"        ktlint().setUseExperimental(true)",
-				"            .editorConfigOverride([",
-				"        	    ij_kotlin_allow_trailing_comma: true,",
-				"        	    ij_kotlin_allow_trailing_comma_on_call_site: true",
-				"            ])",
+				"        ktlint().editorConfigOverride([",
+				"            ktlint_experimental: \"enabled\",",
+				"            ij_kotlin_allow_trailing_comma: true,",
+				"            ij_kotlin_allow_trailing_comma_on_call_site: true",
+				"        ])",
 				"    }",
 				"}");
 		setFile("configuration.gradle.kts").toResource("kotlin/ktlint/experimentalEditorConfigOverride.dirty");
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
index 2825980733..fd59d8ba9d 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
@@ -48,6 +48,6 @@ public FormatterStep newFormatterStep(final FormatterStepConfig stepConfig) {
 			editorConfigOverride = new HashMap<>();
 		}
 
-		return KtLintStep.create(ktlintVersion, stepConfig.getProvisioner(), false, false, configPath, Collections.emptyMap(), editorConfigOverride);
+		return KtLintStep.create(ktlintVersion, stepConfig.getProvisioner(), false, configPath, Collections.emptyMap(), editorConfigOverride);
 	}
 }

From e5a31679260d17ff133a1e77c14aa4c4e2578c17 Mon Sep 17 00:00:00 2001
From: Mitchell Skaggs <skaggsm333@gmail.com>
Date: Wed, 12 Jul 2023 19:42:35 -0500
Subject: [PATCH 1112/2068] Move ktlint version check closer to actual version
 use

---
 .../diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java    | 4 +++-
 .../main/java/com/diffplug/spotless/kotlin/KtLintStep.java    | 3 ---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
index 2f9f67bd72..1a11e8bcce 100644
--- a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
+++ b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
@@ -44,9 +44,11 @@ public KtlintFormatterFunc(String version, boolean isScript, FileSignature edito
 			// Experimental ruleset was replaced by implementing `Rule.Experimental` and checking the `ktlint_experimental` `.editorconfig` property
 			// `RuleId` and `RuleSetId` became inline classes (mangled to be unrepresentable in Java source code, so reflection is needed), tracked here: https://github.com/pinterest/ktlint/issues/2041
 			this.adapter = new KtLintCompat0Dot49Dot0Adapter();
-		} else {
+		} else if (minorVersion == 48) {
 			// ExperimentalParams lost two constructor arguments, EditorConfigProperty moved to its own class
 			this.adapter = new KtLintCompat0Dot48Dot0Adapter();
+		} else {
+			throw new IllegalStateException("Ktlint versions < 0.48.0 not supported!");
 		}
 		this.editorConfigPath = editorConfigPath;
 		this.editorConfigOverrideMap = editorConfigOverrideMap;
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index 36bf5d42f4..32f9f4ef1f 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -107,9 +107,6 @@ static final class State implements Serializable {
 				@Nullable FileSignature editorConfigPath,
 				Map<String, String> userData,
 				Map<String, Object> editorConfigOverride) throws IOException {
-			if (BadSemver.version(version) < BadSemver.version(0, 46, 0)) {
-				throw new IllegalStateException("KtLint versions < 0.46.0 not supported!");
-			}
 			this.version = version;
 			this.userData = new TreeMap<>(userData);
 			this.editorConfigOverride = new TreeMap<>(editorConfigOverride);

From 135372388430e3b3f8824ca294005b6d663f6529 Mon Sep 17 00:00:00 2001
From: Mitchell Skaggs <skaggsm333@gmail.com>
Date: Wed, 12 Jul 2023 20:13:17 -0500
Subject: [PATCH 1113/2068] Clarify ktlint property-matching control flow for
 ruleset properties

---
 .../compat/KtLintCompat0Dot48Dot0Adapter.java | 12 ++++++-----
 .../compat/KtLintCompat0Dot49Dot0Adapter.java | 20 ++++++++++---------
 .../compat/KtLintCompat0Dot50Dot0Adapter.java | 16 ++++++++-------
 3 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
index 3b01470c8e..3efddcf55f 100644
--- a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
@@ -131,9 +131,8 @@ private static EditorConfigOverride createEditorConfigOverride(final List<Rule>
 		Pair<EditorConfigProperty<?>, ?>[] properties = editorConfigOverrideMap.entrySet().stream()
 				.map(entry -> {
 					EditorConfigProperty<?> property = supportedProperties.get(entry.getKey());
-					if (property != null) {
-						return new Pair<>(property, entry.getValue());
-					} else if (entry.getKey().startsWith("ktlint_")) {
+
+					if (property == null && entry.getKey().startsWith("ktlint_")) {
 						String[] parts = entry.getKey().substring(7).split("_", 2);
 						if (parts.length == 1) {
 							// convert ktlint_{ruleset} to {ruleset}
@@ -144,9 +143,12 @@ private static EditorConfigOverride createEditorConfigOverride(final List<Rule>
 							String qualifiedRuleId = parts[0] + ":" + parts[1];
 							property = RuleExecutionEditorConfigPropertyKt.createRuleExecutionEditorConfigProperty(qualifiedRuleId);
 						}
-						return new Pair<>(property, entry.getValue());
-					} else {
+					}
+
+					if (property == null) {
 						return null;
+					} else {
+						return new Pair<>(property, entry.getValue());
 					}
 				})
 				.filter(Objects::nonNull)
diff --git a/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java b/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
index ccff718b01..1fee28778d 100644
--- a/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
@@ -175,22 +175,24 @@ private static EditorConfigOverride createEditorConfigOverride(final List<Rule>
 		Pair<EditorConfigProperty<?>, ?>[] properties = editorConfigOverrideMap.entrySet().stream()
 				.map(entry -> {
 					EditorConfigProperty<?> property = supportedProperties.get(entry.getKey());
-					if (property != null) {
-						return new Pair<>(property, entry.getValue());
-					} else if (entry.getKey().startsWith("ktlint_")) {
+
+					if (property == null && entry.getKey().startsWith("ktlint_")) {
 						String[] parts = entry.getKey().substring(7).split("_", 2);
 						if (parts.length == 1) {
 							// convert ktlint_{ruleset} to {ruleset}
-							String qualifiedRuleId = parts[0] + ":";
-							property = createRuleSetExecution(qualifiedRuleId, RuleExecution.disabled);
+							String id = parts[0];
+							property = createRuleSetExecution(id, RuleExecution.enabled);
 						} else {
 							// convert ktlint_{ruleset}_{rulename} to {ruleset}:{rulename}
-							String qualifiedRuleId = parts[0] + ":" + parts[1];
-							property = createRuleExecution(qualifiedRuleId, RuleExecution.disabled);
+							String id = parts[0] + ":" + parts[1];
+							property = createRuleExecution(id, RuleExecution.enabled);
 						}
-						return new Pair<>(property, entry.getValue());
-					} else {
+					}
+
+					if (property == null) {
 						return null;
+					} else {
+						return new Pair<>(property, entry.getValue());
 					}
 				})
 				.filter(Objects::nonNull)
diff --git a/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java b/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
index 009392b9e1..18057ba1d3 100644
--- a/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
@@ -138,22 +138,24 @@ private static EditorConfigOverride createEditorConfigOverride(final List<Rule>
 		Pair<EditorConfigProperty<?>, ?>[] properties = editorConfigOverrideMap.entrySet().stream()
 				.map(entry -> {
 					EditorConfigProperty<?> property = supportedProperties.get(entry.getKey());
-					if (property != null) {
-						return new Pair<>(property, entry.getValue());
-					} else if (entry.getKey().startsWith("ktlint_")) {
+
+					if (property == null && entry.getKey().startsWith("ktlint_")) {
 						String[] parts = entry.getKey().substring(7).split("_", 2);
 						if (parts.length == 1) {
 							// convert ktlint_{ruleset} to RuleSetId
 							RuleSetId id = new RuleSetId(parts[0]);
-							property = RuleExecutionEditorConfigPropertyKt.createRuleSetExecutionEditorConfigProperty(id, RuleExecution.disabled);
+							property = RuleExecutionEditorConfigPropertyKt.createRuleSetExecutionEditorConfigProperty(id, RuleExecution.enabled);
 						} else {
 							// convert ktlint_{ruleset}_{rulename} to RuleId
 							RuleId id = new RuleId(parts[0] + ":" + parts[1]);
-							property = RuleExecutionEditorConfigPropertyKt.createRuleExecutionEditorConfigProperty(id, RuleExecution.disabled);
+							property = RuleExecutionEditorConfigPropertyKt.createRuleExecutionEditorConfigProperty(id, RuleExecution.enabled);
 						}
-						return new Pair<>(property, entry.getValue());
-					} else {
+					}
+
+					if (property == null) {
 						return null;
+					} else {
+						return new Pair<>(property, entry.getValue());
 					}
 				})
 				.filter(Objects::nonNull)

From c0bee92fb9b752349a83a5d6726f121e38505725 Mon Sep 17 00:00:00 2001
From: Mitchell Skaggs <skaggsm333@gmail.com>
Date: Wed, 12 Jul 2023 21:14:04 -0500
Subject: [PATCH 1114/2068] Fix formatting

---
 .../ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java   | 10 +++++-----
 .../ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java   |  8 ++++----
 .../ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java   |  8 ++++----
 .../glue/ktlint/compat/KtLintCompatAdapter.java        |  2 +-
 .../java/com/diffplug/spotless/kotlin/KtLintStep.java  |  2 +-
 .../com/diffplug/gradle/spotless/KotlinExtension.java  |  2 +-
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
index 3efddcf55f..4ee70c6c88 100644
--- a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
@@ -78,14 +78,14 @@ public Unit invoke(LintError lint, Boolean corrected) {
 
 	@Override
 	public String format(final String text, Path path, final boolean isScript,
-						 Path editorConfigPath, final Map<String, String> userData,
+			Path editorConfigPath, final Map<String, String> userData,
 			final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		Set<RuleProvider> allRuleProviders = ServiceLoader.load(RuleSetProviderV2.class, RuleSetProviderV2.class.getClassLoader())
-			.stream()
-			.flatMap(loader -> loader.get().getRuleProviders().stream())
-			.collect(Collectors.toUnmodifiableSet());
+				.stream()
+				.flatMap(loader -> loader.get().getRuleProviders().stream())
+				.collect(Collectors.toUnmodifiableSet());
 
 		EditorConfigOverride editorConfigOverride;
 		if (editorConfigOverrideMap.isEmpty()) {
@@ -108,7 +108,7 @@ public String format(final String text, Path path, final boolean isScript,
 				editorConfig,
 				editorConfigOverride,
 				false)
-						.format(path, formatterCallback);
+				.format(path, formatterCallback);
 	}
 
 	/**
diff --git a/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java b/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
index 1fee28778d..b391c7b740 100644
--- a/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
@@ -123,14 +123,14 @@ public Unit invoke(LintError lint, Boolean corrected) {
 
 	@Override
 	public String format(final String text, Path path, final boolean isScript,
-                         Path editorConfigPath, final Map<String, String> userData,
+			Path editorConfigPath, final Map<String, String> userData,
 			final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		Set<RuleProvider> allRuleProviders = ServiceLoader.load(RuleSetProviderV3.class, RuleSetProviderV3.class.getClassLoader())
-			.stream()
-			.flatMap(loader -> loader.get().getRuleProviders().stream())
-			.collect(Collectors.toUnmodifiableSet());
+				.stream()
+				.flatMap(loader -> loader.get().getRuleProviders().stream())
+				.collect(Collectors.toUnmodifiableSet());
 
 		EditorConfigOverride editorConfigOverride;
 		if (editorConfigOverrideMap.isEmpty()) {
diff --git a/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java b/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
index 18057ba1d3..22333392c1 100644
--- a/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
@@ -85,14 +85,14 @@ public Unit invoke(LintError lint, Boolean corrected) {
 
 	@Override
 	public String format(final String text, Path path, final boolean isScript,
-                         Path editorConfigPath, final Map<String, String> userData,
+			Path editorConfigPath, final Map<String, String> userData,
 			final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		Set<RuleProvider> allRuleProviders = ServiceLoader.load(RuleSetProviderV3.class, RuleSetProviderV3.class.getClassLoader())
-			.stream()
-			.flatMap(loader -> loader.get().getRuleProviders().stream())
-			.collect(Collectors.toUnmodifiableSet());
+				.stream()
+				.flatMap(loader -> loader.get().getRuleProviders().stream())
+				.collect(Collectors.toUnmodifiableSet());
 
 		EditorConfigOverride editorConfigOverride;
 		if (editorConfigOverrideMap.isEmpty()) {
diff --git a/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java b/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
index 64576d7e19..5e5e5fb445 100644
--- a/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
+++ b/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
@@ -21,5 +21,5 @@
 public interface KtLintCompatAdapter {
 
 	String format(String text, Path path, boolean isScript, Path editorConfigPath, Map<String, String> userData,
-				  Map<String, Object> editorConfigOverrideMap);
+			Map<String, Object> editorConfigOverrideMap);
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index 32f9f4ef1f..8f3fde5731 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -50,7 +50,7 @@ public static FormatterStep create(String version, Provisioner provisioner) {
 	}
 
 	public static FormatterStep create(String version, Provisioner provisioner,
-									   Map<String, String> userData, Map<String, Object> editorConfigOverride) {
+			Map<String, String> userData, Map<String, Object> editorConfigOverride) {
 		return create(version, provisioner, false, null, userData, editorConfigOverride);
 	}
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
index 997fe3b9d6..f2c3a29d75 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
@@ -77,7 +77,7 @@ public class KotlinFormatExtension {
 		private Map<String, Object> editorConfigOverride;
 
 		KotlinFormatExtension(String version, @Nullable FileSignature editorConfigPath, Map<String, String> config,
-							  Map<String, Object> editorConfigOverride) {
+				Map<String, Object> editorConfigOverride) {
 			this.version = version;
 			this.editorConfigPath = editorConfigPath;
 			this.userData = config;

From 6459aa89344d4de9111ee67f1670d504cb218548 Mon Sep 17 00:00:00 2001
From: Benoit Quenaudon <benoit@quenaudon.com>
Date: Thu, 13 Jul 2023 10:23:23 +0200
Subject: [PATCH 1115/2068] Implement excludingByContent for Gradle extensions

---
 .../FilterByContentPatternFormatterStep.java  | 10 +++--
 .../com/diffplug/spotless/FormatterStep.java  | 16 +++++++-
 .../gradle/spotless/FormatExtension.java      | 17 ++++----
 .../TargetExcludeIfContentContainsTest.java   | 39 +++++++++++++++++--
 4 files changed, 66 insertions(+), 16 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/FilterByContentPatternFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/FilterByContentPatternFormatterStep.java
index d9a6fe4093..51935b07bd 100644
--- a/lib/src/main/java/com/diffplug/spotless/FilterByContentPatternFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/FilterByContentPatternFormatterStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,10 +24,13 @@
 
 final class FilterByContentPatternFormatterStep extends DelegateFormatterStep {
 	final Pattern contentPattern;
+	final boolean formatIfMatches;
 
-	FilterByContentPatternFormatterStep(FormatterStep delegateStep, String contentPattern) {
+	FilterByContentPatternFormatterStep(FormatterStep delegateStep, String contentPattern,
+			boolean formatIfMatches) {
 		super(delegateStep);
 		this.contentPattern = Pattern.compile(Objects.requireNonNull(contentPattern));
+		this.formatIfMatches = formatIfMatches;
 	}
 
 	@Override
@@ -35,7 +38,8 @@ final class FilterByContentPatternFormatterStep extends DelegateFormatterStep {
 		Objects.requireNonNull(raw, "raw");
 		Objects.requireNonNull(file, "file");
 		Matcher matcher = contentPattern.matcher(raw);
-		if (matcher.find()) {
+		boolean found = matcher.find();
+		if (formatIfMatches == found) {
 			return delegateStep.format(raw, file);
 		} else {
 			return raw;
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
index ce09f68450..85fbeaf953 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
@@ -54,7 +54,21 @@ public interface FormatterStep extends Serializable {
 	 * @return FormatterStep
 	 */
 	public default FormatterStep filterByContentPattern(String contentPattern) {
-		return new FilterByContentPatternFormatterStep(this, contentPattern);
+		return filterByContentPattern(contentPattern, true);
+	}
+
+	/**
+	 * Returns a new {@code FormatterStep} which, observing the value of {@code formatIfMatches},
+	 * will only apply, or not, its changes to files which pass the given filter.
+	 *
+	 * @param contentPattern
+	 *            java regular expression used to filter in or out files which content contain pattern
+	 * @param formatIfMatches
+	 *            True to format only when {@code contentPattern} is found; false to format only when {@code contentPattern} is not found
+	 * @return FormatterStep
+	 */
+	public default FormatterStep filterByContentPattern(String contentPattern, boolean formatIfMatches) {
+		return new FilterByContentPatternFormatterStep(this, contentPattern, formatIfMatches);
 	}
 
 	/**
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index 7e2e755f5d..1a2daa1cb9 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -161,11 +161,9 @@ public void encoding(String charset) {
 	/** The files to be formatted = (target - targetExclude). */
 	protected FileCollection target, targetExclude;
 
-	/**
-	 * The values from which files will be excluded if their content contain at least one of the
-	 * `targetExcludeIfContentContains`.
-	 */
-	protected List<String> targetExcludeIfContentContains = new ArrayList<>();
+	/** The value from which files will be excluded if their content contain it. */
+	@Nullable
+	protected String targetExcludeIfContentContains = null;
 
 	protected boolean isLicenseHeaderStep(FormatterStep formatterStep) {
 		String formatterStepName = formatterStep.getName();
@@ -208,9 +206,9 @@ public void targetExclude(Object... targets) {
 		this.targetExclude = parseTargetsIsExclude(targets, true);
 	}
 
-	/** Excludes all files whose content contains at least one of the `values`. */
-	public void targetExcludeIfContentContains(String... values) {
-		this.targetExcludeIfContentContains.addAll(List.of(values));
+	/** Excludes all files whose content contains {@code value}. */
+	public void targetExcludeIfContentContains(String value) {
+		this.targetExcludeIfContentContains = value;
 	}
 
 	private FileCollection parseTargetsIsExclude(Object[] targets, boolean isExclude) {
@@ -900,6 +898,9 @@ protected void setupTask(SpotlessTask task) {
 		} else {
 			steps = this.steps;
 		}
+		if (targetExcludeIfContentContains != null) {
+			steps.replaceAll(formatterStep -> formatterStep.filterByContentPattern(targetExcludeIfContentContains, false));
+		}
 		task.setSteps(steps);
 		task.setLineEndingsPolicy(getLineEndings().createPolicy(getProject().getProjectDir(), () -> totalTarget));
 		spotless.getRegisterDependenciesTask().hookSubprojectTask(task);
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TargetExcludeIfContentContainsTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TargetExcludeIfContentContainsTest.java
index 66dfc60f4c..76ef341ab9 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TargetExcludeIfContentContainsTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TargetExcludeIfContentContainsTest.java
@@ -29,7 +29,6 @@ void targetExcludeIfContentContainsWithOneValue() throws IOException {
 				"    target '**/*.md'",
 				"    targetExcludeIfContentContains '// Generated by Mr. Roboto'",
 				"    custom 'lowercase', { str -> str.toLowerCase() }",
-				"    toggleOffOn()",
 				"  }",
 				"}");
 		String content = "// Generated by Mr. Roboto, do not edit.\n" +
@@ -51,6 +50,39 @@ void targetExcludeIfContentContainsWithOneValue() throws IOException {
 				"g h i");
 	}
 
+	@Test
+	void targetExcludeIfContentContainsWithMultipleSteps() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins { id 'com.diffplug.spotless' }",
+				"spotless {",
+				"  format 'toLower', {",
+				"    target '**/*.md'",
+				"    targetExcludeIfContentContains '// Generated by Mr. Roboto'",
+				"    custom 'lowercase', { str -> str.toLowerCase() }",
+				"    licenseHeader('" + "// My CopyRights header" + "', '--')",
+				"  }",
+				"}");
+		String generatedContent = "// Generated by Mr. Roboto, do not edit.\n" +
+				"--\n" +
+				"public final   class MyMessage {}\n";
+		setFile("test_generated.md").toContent(generatedContent);
+		String manualContent = "// Typo in License\n" +
+				"--\n" +
+				"public final class MyMessage {\n" +
+				"}";
+		setFile("test_manual.md").toContent(manualContent);
+		gradleRunner().withArguments("spotlessApply").build();
+
+		// `test_generated` contains the excluding text so didn't change, including the header.
+		assertFile("test_generated.md").hasContent(generatedContent);
+		// `test_manual` does not, it changed.
+		assertFile("test_manual.md").hasContent(
+				"// My CopyRights header\n" +
+						"--\n" +
+						"public final class mymessage {\n" +
+						"}");
+	}
+
 	@Test
 	void targetExcludeIfContentContainsWithMultipleValues() throws IOException {
 		setFile("build.gradle").toLines(
@@ -58,9 +90,8 @@ void targetExcludeIfContentContainsWithMultipleValues() throws IOException {
 				"spotless {",
 				"  format 'toLower', {",
 				"    target '**/*.md'",
-				"    targetExcludeIfContentContains '// Generated by Mr. Roboto', '// Generated by Mrs. Call'",
+				"    targetExcludeIfContentContains '// Generated by Mr. Roboto|// Generated by Mrs. Call'",
 				"    custom 'lowercase', { str -> str.toLowerCase() }",
-				"    toggleOffOn()",
 				"  }",
 				"}");
 		String robotoContent = "A B C\n" +
@@ -101,7 +132,7 @@ void targetExcludeIfContentContainsWithMultipleValues() throws IOException {
 						"// generated by k2000, do not edit.\n" +
 						"d e f\n" +
 						"g h i");
-		// `test_manual` does not so it changed.
+		// `test_manual` does not, it changed.
 		assertFile("test_manual.md").hasLines(
 				"a b c",
 				"d e f",

From a12b7caf62a8c004cd380ecd4f445a1512c248cb Mon Sep 17 00:00:00 2001
From: David Gregory <2992938+DavidGregory084@users.noreply.github.com>
Date: Thu, 13 Jul 2023 11:31:53 +0100
Subject: [PATCH 1116/2068] Add ApplyJsonPatchStep

---
 .gitignore                                    |  3 +
 lib/build.gradle                              |  5 +-
 .../spotless/json/ApplyJsonPatchStep.java     | 90 +++++++++++++++++++
 .../json/ApplyJsonPatchFormatterFunc.java     | 58 ++++++++++++
 .../gradle/spotless/JsonExtension.java        | 37 ++++++++
 .../gradle/spotless/JsonExtensionTest.java    | 40 +++++++++
 .../spotless/maven/json/ApplyJsonPatch.java   | 41 +++++++++
 .../diffplug/spotless/maven/json/Json.java    |  4 +
 .../spotless/maven/json/JsonTest.java         | 19 ++++
 .../json/patchObjectAfterReplaceString.json   | 11 +++
 .../patchObjectAfterReplaceWithObject.json    | 13 +++
 .../resources/json/patchObjectBefore.json     | 11 +++
 12 files changed, 331 insertions(+), 1 deletion(-)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/json/ApplyJsonPatchStep.java
 create mode 100644 lib/src/zjsonPatch/java/com/diffplug/spotless/glue/json/ApplyJsonPatchFormatterFunc.java
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/json/ApplyJsonPatch.java
 create mode 100644 testlib/src/main/resources/json/patchObjectAfterReplaceString.json
 create mode 100644 testlib/src/main/resources/json/patchObjectAfterReplaceWithObject.json
 create mode 100644 testlib/src/main/resources/json/patchObjectBefore.json

diff --git a/.gitignore b/.gitignore
index 138bb77159..8a0bc11e97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -124,3 +124,6 @@ nb-configuration.xml
 
 # MacOS jenv
 .java-version
+
+# VS Code
+.vscode/
diff --git a/lib/build.gradle b/lib/build.gradle
index a9d5181569..3f1ba0bb25 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -20,7 +20,8 @@ def NEEDS_GLUE = [
 	'ktlint',
 	'palantirJavaFormat',
 	'scalafmt',
-	'sortPom'
+	'sortPom',
+	'zjsonPatch',
 ]
 for (glue in NEEDS_GLUE) {
 	sourceSets.register(glue) {
@@ -112,6 +113,8 @@ dependencies {
 	// sortPom
 	sortPomCompileOnly 'com.github.ekryd.sortpom:sortpom-sorter:3.2.1'
 	sortPomCompileOnly 'org.slf4j:slf4j-api:2.0.0'
+	// zjsonPatch
+	zjsonPatchCompileOnly 'com.flipkart.zjsonpatch:zjsonpatch:0.4.14'
 }
 
 // we'll hold the core lib to a high standard
diff --git a/lib/src/main/java/com/diffplug/spotless/json/ApplyJsonPatchStep.java b/lib/src/main/java/com/diffplug/spotless/json/ApplyJsonPatchStep.java
new file mode 100644
index 0000000000..84f39f5b23
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/json/ApplyJsonPatchStep.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.json;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.JarState;
+import com.diffplug.spotless.Provisioner;
+
+public class ApplyJsonPatchStep {
+	// https://mvnrepository.com/artifact/com.flipkart.zjsonpatch/zjsonpatch
+	static final String MAVEN_COORDINATE = "com.flipkart.zjsonpatch:zjsonpatch";
+	static final String DEFAULT_VERSION = "0.4.14";
+
+	private ApplyJsonPatchStep() {}
+
+	public static FormatterStep create(String patchString, Provisioner provisioner) {
+		return create(DEFAULT_VERSION, patchString, provisioner);
+	}
+
+	public static FormatterStep create(String zjsonPatchVersion, String patchString, Provisioner provisioner) {
+		Objects.requireNonNull(zjsonPatchVersion, "zjsonPatchVersion cannot be null");
+		Objects.requireNonNull(patchString, "patchString cannot be null");
+		Objects.requireNonNull(provisioner, "provisioner cannot be null");
+		return FormatterStep.createLazy("apply-json-patch", () -> new State(zjsonPatchVersion, patchString, provisioner), State::toFormatter);
+	}
+
+	public static FormatterStep create(List<Map<String, Object>> patch, Provisioner provisioner) {
+		return create(DEFAULT_VERSION, patch, provisioner);
+	}
+
+	public static FormatterStep create(String zjsonPatchVersion, List<Map<String, Object>> patch, Provisioner provisioner) {
+		Objects.requireNonNull(zjsonPatchVersion, "zjsonPatchVersion cannot be null");
+		Objects.requireNonNull(patch, "patch cannot be null");
+		Objects.requireNonNull(provisioner, "provisioner cannot be null");
+		return FormatterStep.createLazy("apply-json-patch", () -> new State(zjsonPatchVersion, patch, provisioner), State::toFormatter);
+	}
+
+	static final class State implements Serializable {
+		private static final long serialVersionUID = 1L;
+
+		private final JarState jarState;
+		private final List<Map<String, Object>> patch;
+		private final String patchString;
+
+		private State(String zjsonPatchVersion, List<Map<String, Object>> patch, Provisioner provisioner) throws IOException {
+			this.jarState = JarState.from(MAVEN_COORDINATE + ":" + zjsonPatchVersion, provisioner);
+			this.patch = patch;
+			this.patchString = null;
+		}
+
+		private State(String zjsonPatchVersion, String patchString, Provisioner provisioner) throws IOException {
+			this.jarState = JarState.from(MAVEN_COORDINATE + ":" + zjsonPatchVersion, provisioner);
+			this.patch = null;
+			this.patchString = patchString;
+		}
+
+		FormatterFunc toFormatter() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException {
+			Class<?> formatterFunc = jarState.getClassLoader().loadClass("com.diffplug.spotless.glue.json.ApplyJsonPatchFormatterFunc");
+			if (this.patch != null) {
+				Constructor<?> constructor = formatterFunc.getConstructor(List.class);
+				return (FormatterFunc) constructor.newInstance(patch);
+			} else {
+				Constructor<?> constructor = formatterFunc.getConstructor(String.class);
+				return (FormatterFunc) constructor.newInstance(patchString);
+			}
+		}
+	}
+}
diff --git a/lib/src/zjsonPatch/java/com/diffplug/spotless/glue/json/ApplyJsonPatchFormatterFunc.java b/lib/src/zjsonPatch/java/com/diffplug/spotless/glue/json/ApplyJsonPatchFormatterFunc.java
new file mode 100644
index 0000000000..42c14c9e2b
--- /dev/null
+++ b/lib/src/zjsonPatch/java/com/diffplug/spotless/glue/json/ApplyJsonPatchFormatterFunc.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.glue.json;
+
+import java.util.List;
+import java.util.Map;
+
+import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.flipkart.zjsonpatch.JsonPatch;
+
+import com.diffplug.spotless.FormatterFunc;
+
+public class ApplyJsonPatchFormatterFunc implements FormatterFunc {
+	private final ObjectMapper objectMapper;
+	private final List<Map<String, Object>> patch;
+	private final String patchString;
+
+	public ApplyJsonPatchFormatterFunc(String patchString) {
+		this.objectMapper = new ObjectMapper();
+		this.objectMapper.setDefaultPrettyPrinter(new DefaultPrettyPrinter());
+		this.patch = null;
+		this.patchString = patchString;
+	}
+
+	public ApplyJsonPatchFormatterFunc(List<Map<String, Object>> patch) {
+		this.objectMapper = new ObjectMapper();
+		this.objectMapper.setDefaultPrettyPrinter(new DefaultPrettyPrinter());
+		this.patch = patch;
+		this.patchString = null;
+	}
+
+	@Override
+	public String apply(String input) throws Exception {
+		var patchNode = this.patch == null
+				? objectMapper.readTree(patchString)
+				: objectMapper.valueToTree(patch);
+
+		var inputNode = objectMapper.readTree(input);
+
+		var patchedNode = JsonPatch.apply(patchNode, inputNode);
+
+		return objectMapper.writeValueAsString(patchedNode);
+	}
+}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
index 2fa567472f..5e587dbd9f 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
@@ -16,10 +16,13 @@
 package com.diffplug.gradle.spotless;
 
 import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 
 import javax.inject.Inject;
 
 import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.json.ApplyJsonPatchStep;
 import com.diffplug.spotless.json.JacksonJsonConfig;
 import com.diffplug.spotless.json.JacksonJsonStep;
 import com.diffplug.spotless.json.JsonSimpleStep;
@@ -28,6 +31,7 @@
 public class JsonExtension extends FormatExtension {
 	private static final int DEFAULT_INDENTATION = 4;
 	private static final String DEFAULT_GSON_VERSION = "2.10.1";
+	private static final String DEFAULT_ZJSONPATCH_VERSION = "0.4.14";
 	static final String NAME = "json";
 
 	@Inject
@@ -71,6 +75,14 @@ public RomeJson rome(String version) {
 		return romeConfig;
 	}
 
+	public ApplyJsonPatchConfig applyJsonPatch(List<Map<String, Object>> patch) {
+		return new ApplyJsonPatchConfig(patch);
+	}
+
+	public ApplyJsonPatchConfig applyJsonPatch(String zjsonPatchVersion, List<Map<String, Object>> patch) {
+		return new ApplyJsonPatchConfig(zjsonPatchVersion, patch);
+	}
+
 	public class SimpleConfig {
 		private int indent;
 
@@ -191,4 +203,29 @@ protected RomeJson getThis() {
 			return this;
 		}
 	}
+
+	public class ApplyJsonPatchConfig {
+		private String zjsonPatchVersion;
+		private List<Map<String, Object>> patch;
+
+		public ApplyJsonPatchConfig(List<Map<String, Object>> patch) {
+			this(DEFAULT_ZJSONPATCH_VERSION, patch);
+		}
+
+		public ApplyJsonPatchConfig(String zjsonPatchVersion, List<Map<String, Object>> patch) {
+			this.zjsonPatchVersion = zjsonPatchVersion;
+			this.patch = patch;
+			addStep(createStep());
+		}
+
+		public ApplyJsonPatchConfig version(String zjsonPatchVersion) {
+			this.zjsonPatchVersion = zjsonPatchVersion;
+			replaceStep(createStep());
+			return this;
+		}
+
+		private FormatterStep createStep() {
+			return ApplyJsonPatchStep.create(zjsonPatchVersion, patch, provisioner());
+		}
+	}
 }
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JsonExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JsonExtensionTest.java
index a878615eaa..ea1358ccee 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JsonExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JsonExtensionTest.java
@@ -156,4 +156,44 @@ void jacksonFormattingWithSortingByKeys() throws IOException {
 		gradleRunner().withArguments("spotlessApply").build();
 		assertFile("src/main/resources/example.json").sameAsResource("json/sortByKeysAfter_Jackson.json");
 	}
+
+	@Test
+	void applyJsonPatchReplaceString() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'java'",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    json {",
+				"        target 'src/**/*.json'",
+				"        applyJsonPatch([[op: 'replace', path: '/abc', value: 'ghi']])",
+				"        gson()",
+				"    }",
+				"}");
+		setFile("src/main/resources/example.json").toResource("json/patchObjectBefore.json");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("src/main/resources/example.json").sameAsResource("json/patchObjectAfterReplaceString.json");
+	}
+
+	@Test
+	void applyJsonPatchReplaceWithObject() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'java'",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    json {",
+				"        target 'src/**/*.json'",
+				"        applyJsonPatch([[op: 'replace', path: '/abc', value: [def: 'ghi']]])",
+				"        gson()",
+				"    }",
+				"}");
+		setFile("src/main/resources/example.json").toResource("json/patchObjectBefore.json");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("src/main/resources/example.json").sameAsResource("json/patchObjectAfterReplaceWithObject.json");
+	}
 }
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/ApplyJsonPatch.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/ApplyJsonPatch.java
new file mode 100644
index 0000000000..6e18ea9388
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/ApplyJsonPatch.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.json;
+
+import org.apache.maven.plugins.annotations.Parameter;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.json.ApplyJsonPatchStep;
+import com.diffplug.spotless.maven.FormatterStepConfig;
+import com.diffplug.spotless.maven.FormatterStepFactory;
+
+/**
+ * A {@link FormatterStepFactory} implementation that corresponds to {@code <applyJsonPatch>...</applyJsonPatch>} configuration element.
+ */
+public class ApplyJsonPatch implements FormatterStepFactory {
+	private static final String DEFAULT_ZJSONPATCH_VERSION = "0.4.14";
+
+	@Parameter
+	String zjsonPatchVersion = DEFAULT_ZJSONPATCH_VERSION;
+
+	@Parameter
+	String patch;
+
+	@Override
+	public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
+		return ApplyJsonPatchStep.create(zjsonPatchVersion, patch, stepConfig.getProvisioner());
+	}
+}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java
index adbb2b7883..76a5c43221 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java
@@ -53,4 +53,8 @@ public void addJackson(JacksonJson jackson) {
 	public void addRome(RomeJson rome) {
 		addStepFactory(rome);
 	}
+
+	public void addApplyJsonPatch(ApplyJsonPatch applyJsonPatch) {
+		addStepFactory(applyJsonPatch);
+	}
 }
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java
index 1897cc764a..49becde33a 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java
@@ -90,4 +90,23 @@ public void testFormatJson_WithJackson_sortByKeys_spaceAfterKeySeparator() throw
 		assertFile("json_test.json").sameAsResource("json/sortByKeysAfter_Jackson_spaceAfterKeySeparator.json");
 	}
 
+	@Test
+	public void testFormatJson_ApplyJsonPatch_replaceString() throws Exception {
+		writePomWithJsonSteps("<applyJsonPatch><patch>[{\"op\":\"replace\",\"path\":\"/abc\",\"value\":\"ghi\"}]</patch></applyJsonPatch><gson/>");
+
+		setFile("json_test.json").toResource("json/patchObjectBefore.json");
+
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("json_test.json").sameAsResource("json/patchObjectAfterReplaceString.json");
+	}
+
+	@Test
+	public void testFormatJson_ApplyJsonPatch_replaceWithObject() throws Exception {
+		writePomWithJsonSteps("<applyJsonPatch><patch>[{\"op\":\"replace\",\"path\":\"/abc\",\"value\":{\"def\":\"ghi\"}}]</patch></applyJsonPatch><gson/>");
+
+		setFile("json_test.json").toResource("json/patchObjectBefore.json");
+
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("json_test.json").sameAsResource("json/patchObjectAfterReplaceWithObject.json");
+	}
 }
diff --git a/testlib/src/main/resources/json/patchObjectAfterReplaceString.json b/testlib/src/main/resources/json/patchObjectAfterReplaceString.json
new file mode 100644
index 0000000000..1da41d5ac2
--- /dev/null
+++ b/testlib/src/main/resources/json/patchObjectAfterReplaceString.json
@@ -0,0 +1,11 @@
+{
+    "abc": "ghi",
+    "obj": {
+        "arr": [
+            1,
+            2,
+            3
+        ],
+        "val": 5
+    }
+}
diff --git a/testlib/src/main/resources/json/patchObjectAfterReplaceWithObject.json b/testlib/src/main/resources/json/patchObjectAfterReplaceWithObject.json
new file mode 100644
index 0000000000..533691261c
--- /dev/null
+++ b/testlib/src/main/resources/json/patchObjectAfterReplaceWithObject.json
@@ -0,0 +1,13 @@
+{
+    "abc": {
+        "def": "ghi"
+    },
+    "obj": {
+        "arr": [
+            1,
+            2,
+            3
+        ],
+        "val": 5
+    }
+}
diff --git a/testlib/src/main/resources/json/patchObjectBefore.json b/testlib/src/main/resources/json/patchObjectBefore.json
new file mode 100644
index 0000000000..070dfc481e
--- /dev/null
+++ b/testlib/src/main/resources/json/patchObjectBefore.json
@@ -0,0 +1,11 @@
+{
+    "abc": "def",
+    "obj": {
+        "arr": [
+            1,
+            2,
+            3
+        ],
+        "val": 5
+    }
+}

From 7f9ed128d3ef15ed700f91db34b01f2effc78a55 Mon Sep 17 00:00:00 2001
From: David Gregory <2992938+DavidGregory084@users.noreply.github.com>
Date: Thu, 13 Jul 2023 12:05:23 +0100
Subject: [PATCH 1117/2068] Remove unnecessary configuration of ObjectMapper's
 pretty printer in ApplyJsonPatchFormatterFunc

---
 .../spotless/glue/json/ApplyJsonPatchFormatterFunc.java        | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/src/zjsonPatch/java/com/diffplug/spotless/glue/json/ApplyJsonPatchFormatterFunc.java b/lib/src/zjsonPatch/java/com/diffplug/spotless/glue/json/ApplyJsonPatchFormatterFunc.java
index 42c14c9e2b..1ba6084a67 100644
--- a/lib/src/zjsonPatch/java/com/diffplug/spotless/glue/json/ApplyJsonPatchFormatterFunc.java
+++ b/lib/src/zjsonPatch/java/com/diffplug/spotless/glue/json/ApplyJsonPatchFormatterFunc.java
@@ -18,7 +18,6 @@
 import java.util.List;
 import java.util.Map;
 
-import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.flipkart.zjsonpatch.JsonPatch;
 
@@ -31,14 +30,12 @@ public class ApplyJsonPatchFormatterFunc implements FormatterFunc {
 
 	public ApplyJsonPatchFormatterFunc(String patchString) {
 		this.objectMapper = new ObjectMapper();
-		this.objectMapper.setDefaultPrettyPrinter(new DefaultPrettyPrinter());
 		this.patch = null;
 		this.patchString = patchString;
 	}
 
 	public ApplyJsonPatchFormatterFunc(List<Map<String, Object>> patch) {
 		this.objectMapper = new ObjectMapper();
-		this.objectMapper.setDefaultPrettyPrinter(new DefaultPrettyPrinter());
 		this.patch = patch;
 		this.patchString = null;
 	}

From 85445a9315b6a33ab1afe23328ace82844160c4c Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 14 Jul 2023 09:37:43 -0700
Subject: [PATCH 1118/2068] Add regex method, and escape string for the
 standard method.

---
 .../gradle/spotless/FormatExtension.java      | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index d7f4d605dc..a4b3d17ad8 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -31,6 +31,7 @@
 import java.util.TreeMap;
 import java.util.function.Consumer;
 import java.util.function.Function;
+import java.util.regex.Pattern;
 
 import javax.annotation.Nullable;
 import javax.inject.Inject;
@@ -207,9 +208,22 @@ public void targetExclude(Object... targets) {
 		this.targetExclude = parseTargetsIsExclude(targets, true);
 	}
 
-	/** Excludes all files whose content contains {@code value}. */
-	public void targetExcludeIfContentContains(String value) {
-		this.targetExcludeIfContentContains = value;
+	/**
+	 * Excludes all files whose content contains {@code value}.
+	 *
+	 * When this method is called multiple times, only the last call has any effect.
+	 */
+	public void targetExcludeIfContentContains(String string) {
+		targetExcludeIfContentContainsRegex(Pattern.quote(string));
+	}
+
+	/**
+	 * Excludes all files whose content can find the given regex.
+	 *
+	 * When this method is called multiple times, only the last call has any effect.
+	 */
+	public void targetExcludeIfContentContainsRegex(String regex) {
+		this.targetExcludeIfContentContains = regex;
 	}
 
 	private FileCollection parseTargetsIsExclude(Object[] targets, boolean isExclude) {

From 050fff41b9b708e3f950ef542966a7fb4498ddef Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 14 Jul 2023 09:56:14 -0700
Subject: [PATCH 1119/2068] Make boolean logic more readable.

---
 .../java/com/diffplug/spotless/Filter.java    | 21 +++++++++++++++++++
 .../FilterByContentPatternFormatterStep.java  |  9 ++++----
 .../com/diffplug/spotless/FormatterStep.java  | 11 +++++-----
 .../spotless/generic/LicenseHeaderStep.java   |  3 ++-
 .../gradle/spotless/FormatExtension.java      |  3 ++-
 5 files changed, 35 insertions(+), 12 deletions(-)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/Filter.java

diff --git a/lib/src/main/java/com/diffplug/spotless/Filter.java b/lib/src/main/java/com/diffplug/spotless/Filter.java
new file mode 100644
index 0000000000..c5367766c6
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/Filter.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless;
+
+/** Enum to make boolean logic more readable. */
+public enum Filter {
+	INCLUDE, EXCLUDE
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/FilterByContentPatternFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/FilterByContentPatternFormatterStep.java
index 51935b07bd..d6f3ac377c 100644
--- a/lib/src/main/java/com/diffplug/spotless/FilterByContentPatternFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/FilterByContentPatternFormatterStep.java
@@ -24,13 +24,13 @@
 
 final class FilterByContentPatternFormatterStep extends DelegateFormatterStep {
 	final Pattern contentPattern;
-	final boolean formatIfMatches;
+	final Filter includeOrExclude;
 
 	FilterByContentPatternFormatterStep(FormatterStep delegateStep, String contentPattern,
-			boolean formatIfMatches) {
+			Filter includeOrExclude) {
 		super(delegateStep);
 		this.contentPattern = Pattern.compile(Objects.requireNonNull(contentPattern));
-		this.formatIfMatches = formatIfMatches;
+		this.includeOrExclude = includeOrExclude;
 	}
 
 	@Override
@@ -38,8 +38,7 @@ final class FilterByContentPatternFormatterStep extends DelegateFormatterStep {
 		Objects.requireNonNull(raw, "raw");
 		Objects.requireNonNull(file, "file");
 		Matcher matcher = contentPattern.matcher(raw);
-		boolean found = matcher.find();
-		if (formatIfMatches == found) {
+		if (matcher.find() == (includeOrExclude == Filter.INCLUDE)) {
 			return delegateStep.format(raw, file);
 		} else {
 			return raw;
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
index 85fbeaf953..38f5872ef6 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
@@ -53,8 +53,9 @@ public interface FormatterStep extends Serializable {
 	 *            java regular expression used to filter out files which content doesn't contain pattern
 	 * @return FormatterStep
 	 */
+	@Deprecated
 	public default FormatterStep filterByContentPattern(String contentPattern) {
-		return filterByContentPattern(contentPattern, true);
+		return filterByContent(contentPattern, Filter.INCLUDE);
 	}
 
 	/**
@@ -63,12 +64,12 @@ public default FormatterStep filterByContentPattern(String contentPattern) {
 	 *
 	 * @param contentPattern
 	 *            java regular expression used to filter in or out files which content contain pattern
-	 * @param formatIfMatches
-	 *            True to format only when {@code contentPattern} is found; false to format only when {@code contentPattern} is not found
+	 * @param includeOrExclude
+	 *            determines if matches are included or excluded
 	 * @return FormatterStep
 	 */
-	public default FormatterStep filterByContentPattern(String contentPattern, boolean formatIfMatches) {
-		return new FilterByContentPatternFormatterStep(this, contentPattern, formatIfMatches);
+	public default FormatterStep filterByContent(String contentPattern, Filter includeOrExclude) {
+		return new FilterByContentPatternFormatterStep(this, contentPattern, includeOrExclude);
 	}
 
 	/**
diff --git a/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java b/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
index 073af855d3..72cc166965 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
@@ -35,6 +35,7 @@
 import org.slf4j.LoggerFactory;
 
 import com.diffplug.spotless.FileSignature;
+import com.diffplug.spotless.Filter;
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.LineEnding;
@@ -150,7 +151,7 @@ public FormatterStep build() {
 			return formatterStep;
 		}
 
-		return formatterStep.filterByContentPattern(contentPattern);
+		return formatterStep.filterByContent(contentPattern, Filter.INCLUDE);
 	}
 
 	private String sanitizeName(@Nullable String name) {
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index a4b3d17ad8..b873829577 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -45,6 +45,7 @@
 import org.gradle.api.tasks.TaskProvider;
 
 import com.diffplug.common.base.Preconditions;
+import com.diffplug.spotless.Filter;
 import com.diffplug.spotless.FormatExceptionPolicyStrict;
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
@@ -921,7 +922,7 @@ protected void setupTask(SpotlessTask task) {
 			steps = this.steps;
 		}
 		if (targetExcludeIfContentContains != null) {
-			steps.replaceAll(formatterStep -> formatterStep.filterByContentPattern(targetExcludeIfContentContains, false));
+			steps.replaceAll(formatterStep -> formatterStep.filterByContent(targetExcludeIfContentContains, Filter.EXCLUDE));
 		}
 		task.setSteps(steps);
 		task.setLineEndingsPolicy(getLineEndings().createPolicy(getProject().getProjectDir(), () -> totalTarget));

From 4763002f2ddb67c47c026b2dfbcc06f606787924 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 14 Jul 2023 10:00:23 -0700
Subject: [PATCH 1120/2068] Add `include/exclude` as part of the equality logic
 of `FilterByContentPatternFormatterStep`.

---
 .../FilterByContentPatternFormatterStep.java         | 12 ++++++------
 .../java/com/diffplug/spotless/FormatterStep.java    |  6 +++---
 .../diffplug/spotless/generic/LicenseHeaderStep.java |  2 +-
 .../diffplug/gradle/spotless/FormatExtension.java    | 12 ++++++------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/FilterByContentPatternFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/FilterByContentPatternFormatterStep.java
index d6f3ac377c..d858e9102f 100644
--- a/lib/src/main/java/com/diffplug/spotless/FilterByContentPatternFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/FilterByContentPatternFormatterStep.java
@@ -23,14 +23,13 @@
 import javax.annotation.Nullable;
 
 final class FilterByContentPatternFormatterStep extends DelegateFormatterStep {
-	final Pattern contentPattern;
 	final Filter includeOrExclude;
+	final Pattern contentPattern;
 
-	FilterByContentPatternFormatterStep(FormatterStep delegateStep, String contentPattern,
-			Filter includeOrExclude) {
+	FilterByContentPatternFormatterStep(FormatterStep delegateStep, Filter includeOrExclude, String contentPattern) {
 		super(delegateStep);
-		this.contentPattern = Pattern.compile(Objects.requireNonNull(contentPattern));
 		this.includeOrExclude = includeOrExclude;
+		this.contentPattern = Pattern.compile(Objects.requireNonNull(contentPattern));
 	}
 
 	@Override
@@ -55,13 +54,14 @@ public boolean equals(Object o) {
 		}
 		FilterByContentPatternFormatterStep that = (FilterByContentPatternFormatterStep) o;
 		return Objects.equals(delegateStep, that.delegateStep) &&
+				Objects.equals(includeOrExclude, that.includeOrExclude) &&
 				Objects.equals(contentPattern.pattern(), that.contentPattern.pattern());
 	}
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(delegateStep, contentPattern.pattern());
+		return Objects.hash(delegateStep, includeOrExclude, contentPattern.pattern());
 	}
 
-	private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 2L;
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
index 38f5872ef6..cc35bddb76 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
@@ -55,7 +55,7 @@ public interface FormatterStep extends Serializable {
 	 */
 	@Deprecated
 	public default FormatterStep filterByContentPattern(String contentPattern) {
-		return filterByContent(contentPattern, Filter.INCLUDE);
+		return filterByContent(Filter.INCLUDE, contentPattern);
 	}
 
 	/**
@@ -68,8 +68,8 @@ public default FormatterStep filterByContentPattern(String contentPattern) {
 	 *            determines if matches are included or excluded
 	 * @return FormatterStep
 	 */
-	public default FormatterStep filterByContent(String contentPattern, Filter includeOrExclude) {
-		return new FilterByContentPatternFormatterStep(this, contentPattern, includeOrExclude);
+	public default FormatterStep filterByContent(Filter includeOrExclude, String contentPattern) {
+		return new FilterByContentPatternFormatterStep(this, includeOrExclude, contentPattern);
 	}
 
 	/**
diff --git a/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java b/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
index 72cc166965..b41768f2ba 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
@@ -151,7 +151,7 @@ public FormatterStep build() {
 			return formatterStep;
 		}
 
-		return formatterStep.filterByContent(contentPattern, Filter.INCLUDE);
+		return formatterStep.filterByContent(Filter.INCLUDE, contentPattern);
 	}
 
 	private String sanitizeName(@Nullable String name) {
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index b873829577..44d08e685d 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -166,7 +166,7 @@ public void encoding(String charset) {
 
 	/** The value from which files will be excluded if their content contain it. */
 	@Nullable
-	protected String targetExcludeIfContentContains = null;
+	protected String targetExcludeContentPattern = null;
 
 	protected boolean isLicenseHeaderStep(FormatterStep formatterStep) {
 		String formatterStepName = formatterStep.getName();
@@ -210,7 +210,7 @@ public void targetExclude(Object... targets) {
 	}
 
 	/**
-	 * Excludes all files whose content contains {@code value}.
+	 * Excludes all files whose content contains {@code string}.
 	 *
 	 * When this method is called multiple times, only the last call has any effect.
 	 */
@@ -219,12 +219,12 @@ public void targetExcludeIfContentContains(String string) {
 	}
 
 	/**
-	 * Excludes all files whose content can find the given regex.
+	 * Excludes all files whose content contains the given regex.
 	 *
 	 * When this method is called multiple times, only the last call has any effect.
 	 */
 	public void targetExcludeIfContentContainsRegex(String regex) {
-		this.targetExcludeIfContentContains = regex;
+		this.targetExcludeContentPattern = regex;
 	}
 
 	private FileCollection parseTargetsIsExclude(Object[] targets, boolean isExclude) {
@@ -921,8 +921,8 @@ protected void setupTask(SpotlessTask task) {
 		} else {
 			steps = this.steps;
 		}
-		if (targetExcludeIfContentContains != null) {
-			steps.replaceAll(formatterStep -> formatterStep.filterByContent(targetExcludeIfContentContains, Filter.EXCLUDE));
+		if (targetExcludeContentPattern != null) {
+			steps.replaceAll(formatterStep -> formatterStep.filterByContent(Filter.EXCLUDE, targetExcludeContentPattern));
 		}
 		task.setSteps(steps);
 		task.setLineEndingsPolicy(getLineEndings().createPolicy(getProject().getProjectDir(), () -> totalTarget));

From 1d8fda9e8bae449ac157aff90f1cf6948e6eab12 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 14 Jul 2023 10:07:08 -0700
Subject: [PATCH 1121/2068] Update changelogs.

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 2c9a855114..47edb7c365 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,6 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
+* `enum Filter { INCLUDE, EXCLUDE }` so that `FormatterStep.filterByContent` can not only include based on the pattern but also exclude. ([#1749](https://github.com/diffplug/spotless/pull/1749))
 * Bump default `ktlint` version to latest `0.49.1` -> `0.50.0`.([#1741](https://github.com/diffplug/spotless/issues/1741))
   * Dropped support for `ktlint 0.47.x` following our policy of supporting two breaking changes at a time.
   * Dropped support for deprecated `useExperimental` parameter in favor of the `ktlint_experimental` property.
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index cfdf688927..31c307d529 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -4,7 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* Add target option `targetExcludeIfContentContains` to exclude files by text they contain.
+* Add target option `targetExcludeIfContentContains` and `targetExcludeIfContentContainsRegex` to exclude files based on their text content. ([#1749](https://github.com/diffplug/spotless/pull/1749))
 * Bump default `ktlint` version to latest `0.49.1` -> `0.50.0`. ([#1741](https://github.com/diffplug/spotless/issues/1741))
   * Dropped support for `ktlint 0.47.x` following our policy of supporting two breaking changes at a time.
   * Dropped support for deprecated `useExperimental` parameter in favor of the `ktlint_experimental` property.

From 196b9a6cfd5c026bbf539344abbb2ae82500b34b Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 14 Jul 2023 10:14:02 -0700
Subject: [PATCH 1122/2068] Fix javadoc param order.

---
 lib/src/main/java/com/diffplug/spotless/FormatterStep.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
index cc35bddb76..d33ab7dde2 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
@@ -62,10 +62,10 @@ public default FormatterStep filterByContentPattern(String contentPattern) {
 	 * Returns a new {@code FormatterStep} which, observing the value of {@code formatIfMatches},
 	 * will only apply, or not, its changes to files which pass the given filter.
 	 *
-	 * @param contentPattern
-	 *            java regular expression used to filter in or out files which content contain pattern
 	 * @param includeOrExclude
 	 *            determines if matches are included or excluded
+	 * @param contentPattern
+	 *            java regular expression used to filter in or out files which content contain pattern
 	 * @return FormatterStep
 	 */
 	public default FormatterStep filterByContent(Filter includeOrExclude, String contentPattern) {

From 306491883fe3c11511756e95e91b08cb431ca7d2 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 14 Jul 2023 10:16:09 -0700
Subject: [PATCH 1123/2068] Rename `Filter` to `OnMatch`.

---
 CHANGES.md                                           |  2 +-
 .../FilterByContentPatternFormatterStep.java         | 12 ++++++------
 .../java/com/diffplug/spotless/FormatterStep.java    |  8 ++++----
 .../diffplug/spotless/{Filter.java => OnMatch.java}  |  2 +-
 .../diffplug/spotless/generic/LicenseHeaderStep.java |  4 ++--
 .../diffplug/gradle/spotless/FormatExtension.java    |  4 ++--
 6 files changed, 16 insertions(+), 16 deletions(-)
 rename lib/src/main/java/com/diffplug/spotless/{Filter.java => OnMatch.java} (96%)

diff --git a/CHANGES.md b/CHANGES.md
index 47edb7c365..0faf333268 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,7 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* `enum Filter { INCLUDE, EXCLUDE }` so that `FormatterStep.filterByContent` can not only include based on the pattern but also exclude. ([#1749](https://github.com/diffplug/spotless/pull/1749))
+* `enum OnMatch { INCLUDE, EXCLUDE }` so that `FormatterStep.filterByContent` can not only include based on the pattern but also exclude. ([#1749](https://github.com/diffplug/spotless/pull/1749))
 * Bump default `ktlint` version to latest `0.49.1` -> `0.50.0`.([#1741](https://github.com/diffplug/spotless/issues/1741))
   * Dropped support for `ktlint 0.47.x` following our policy of supporting two breaking changes at a time.
   * Dropped support for deprecated `useExperimental` parameter in favor of the `ktlint_experimental` property.
diff --git a/lib/src/main/java/com/diffplug/spotless/FilterByContentPatternFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/FilterByContentPatternFormatterStep.java
index d858e9102f..4cc336e101 100644
--- a/lib/src/main/java/com/diffplug/spotless/FilterByContentPatternFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/FilterByContentPatternFormatterStep.java
@@ -23,12 +23,12 @@
 import javax.annotation.Nullable;
 
 final class FilterByContentPatternFormatterStep extends DelegateFormatterStep {
-	final Filter includeOrExclude;
+	final OnMatch onMatch;
 	final Pattern contentPattern;
 
-	FilterByContentPatternFormatterStep(FormatterStep delegateStep, Filter includeOrExclude, String contentPattern) {
+	FilterByContentPatternFormatterStep(FormatterStep delegateStep, OnMatch onMatch, String contentPattern) {
 		super(delegateStep);
-		this.includeOrExclude = includeOrExclude;
+		this.onMatch = onMatch;
 		this.contentPattern = Pattern.compile(Objects.requireNonNull(contentPattern));
 	}
 
@@ -37,7 +37,7 @@ final class FilterByContentPatternFormatterStep extends DelegateFormatterStep {
 		Objects.requireNonNull(raw, "raw");
 		Objects.requireNonNull(file, "file");
 		Matcher matcher = contentPattern.matcher(raw);
-		if (matcher.find() == (includeOrExclude == Filter.INCLUDE)) {
+		if (matcher.find() == (onMatch == OnMatch.INCLUDE)) {
 			return delegateStep.format(raw, file);
 		} else {
 			return raw;
@@ -54,13 +54,13 @@ public boolean equals(Object o) {
 		}
 		FilterByContentPatternFormatterStep that = (FilterByContentPatternFormatterStep) o;
 		return Objects.equals(delegateStep, that.delegateStep) &&
-				Objects.equals(includeOrExclude, that.includeOrExclude) &&
+				Objects.equals(onMatch, that.onMatch) &&
 				Objects.equals(contentPattern.pattern(), that.contentPattern.pattern());
 	}
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(delegateStep, includeOrExclude, contentPattern.pattern());
+		return Objects.hash(delegateStep, onMatch, contentPattern.pattern());
 	}
 
 	private static final long serialVersionUID = 2L;
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
index d33ab7dde2..5f6ec168d4 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
@@ -55,21 +55,21 @@ public interface FormatterStep extends Serializable {
 	 */
 	@Deprecated
 	public default FormatterStep filterByContentPattern(String contentPattern) {
-		return filterByContent(Filter.INCLUDE, contentPattern);
+		return filterByContent(OnMatch.INCLUDE, contentPattern);
 	}
 
 	/**
 	 * Returns a new {@code FormatterStep} which, observing the value of {@code formatIfMatches},
 	 * will only apply, or not, its changes to files which pass the given filter.
 	 *
-	 * @param includeOrExclude
+	 * @param onMatch
 	 *            determines if matches are included or excluded
 	 * @param contentPattern
 	 *            java regular expression used to filter in or out files which content contain pattern
 	 * @return FormatterStep
 	 */
-	public default FormatterStep filterByContent(Filter includeOrExclude, String contentPattern) {
-		return new FilterByContentPatternFormatterStep(this, includeOrExclude, contentPattern);
+	public default FormatterStep filterByContent(OnMatch onMatch, String contentPattern) {
+		return new FilterByContentPatternFormatterStep(this, onMatch, contentPattern);
 	}
 
 	/**
diff --git a/lib/src/main/java/com/diffplug/spotless/Filter.java b/lib/src/main/java/com/diffplug/spotless/OnMatch.java
similarity index 96%
rename from lib/src/main/java/com/diffplug/spotless/Filter.java
rename to lib/src/main/java/com/diffplug/spotless/OnMatch.java
index c5367766c6..098fb28f13 100644
--- a/lib/src/main/java/com/diffplug/spotless/Filter.java
+++ b/lib/src/main/java/com/diffplug/spotless/OnMatch.java
@@ -16,6 +16,6 @@
 package com.diffplug.spotless;
 
 /** Enum to make boolean logic more readable. */
-public enum Filter {
+public enum OnMatch {
 	INCLUDE, EXCLUDE
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java b/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
index b41768f2ba..cd6b9a6525 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
@@ -35,7 +35,7 @@
 import org.slf4j.LoggerFactory;
 
 import com.diffplug.spotless.FileSignature;
-import com.diffplug.spotless.Filter;
+import com.diffplug.spotless.OnMatch;
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.LineEnding;
@@ -151,7 +151,7 @@ public FormatterStep build() {
 			return formatterStep;
 		}
 
-		return formatterStep.filterByContent(Filter.INCLUDE, contentPattern);
+		return formatterStep.filterByContent(OnMatch.INCLUDE, contentPattern);
 	}
 
 	private String sanitizeName(@Nullable String name) {
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index 44d08e685d..3275ee91e8 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -45,7 +45,7 @@
 import org.gradle.api.tasks.TaskProvider;
 
 import com.diffplug.common.base.Preconditions;
-import com.diffplug.spotless.Filter;
+import com.diffplug.spotless.OnMatch;
 import com.diffplug.spotless.FormatExceptionPolicyStrict;
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
@@ -922,7 +922,7 @@ protected void setupTask(SpotlessTask task) {
 			steps = this.steps;
 		}
 		if (targetExcludeContentPattern != null) {
-			steps.replaceAll(formatterStep -> formatterStep.filterByContent(Filter.EXCLUDE, targetExcludeContentPattern));
+			steps.replaceAll(formatterStep -> formatterStep.filterByContent(OnMatch.EXCLUDE, targetExcludeContentPattern));
 		}
 		task.setSteps(steps);
 		task.setLineEndingsPolicy(getLineEndings().createPolicy(getProject().getProjectDir(), () -> totalTarget));

From b24e435cc405b6a109844bf2ab5fbb625e63b965 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 14 Jul 2023 10:40:09 -0700
Subject: [PATCH 1124/2068] spotlessApply

---
 .../java/com/diffplug/spotless/generic/LicenseHeaderStep.java   | 2 +-
 .../main/java/com/diffplug/gradle/spotless/FormatExtension.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java b/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
index cd6b9a6525..6d04c25962 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
@@ -35,10 +35,10 @@
 import org.slf4j.LoggerFactory;
 
 import com.diffplug.spotless.FileSignature;
-import com.diffplug.spotless.OnMatch;
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.LineEnding;
+import com.diffplug.spotless.OnMatch;
 import com.diffplug.spotless.SerializableFileFilter;
 import com.diffplug.spotless.ThrowingEx;
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index 3275ee91e8..e28ec13dcd 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -45,12 +45,12 @@
 import org.gradle.api.tasks.TaskProvider;
 
 import com.diffplug.common.base.Preconditions;
-import com.diffplug.spotless.OnMatch;
 import com.diffplug.spotless.FormatExceptionPolicyStrict;
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.LazyForwardingEquality;
 import com.diffplug.spotless.LineEnding;
+import com.diffplug.spotless.OnMatch;
 import com.diffplug.spotless.Provisioner;
 import com.diffplug.spotless.cpp.ClangFormatStep;
 import com.diffplug.spotless.extra.EclipseBasedStepBuilder;

From c63eec46bcb28dc37220af6d03aaaf84132ee4a6 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 14 Jul 2023 10:54:46 -0700
Subject: [PATCH 1125/2068] Add regex test.

---
 .../gradle/spotless/TargetExcludeIfContentContainsTest.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TargetExcludeIfContentContainsTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TargetExcludeIfContentContainsTest.java
index 76ef341ab9..f1a2cf4298 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TargetExcludeIfContentContainsTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TargetExcludeIfContentContainsTest.java
@@ -84,13 +84,13 @@ void targetExcludeIfContentContainsWithMultipleSteps() throws IOException {
 	}
 
 	@Test
-	void targetExcludeIfContentContainsWithMultipleValues() throws IOException {
+	void targetExcludeIfContentContainsRegex() throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins { id 'com.diffplug.spotless' }",
 				"spotless {",
 				"  format 'toLower', {",
 				"    target '**/*.md'",
-				"    targetExcludeIfContentContains '// Generated by Mr. Roboto|// Generated by Mrs. Call'",
+				"    targetExcludeIfContentContainsRegex '// Generated by Mr. Roboto|// Generated by Mrs. Call'",
 				"    custom 'lowercase', { str -> str.toLowerCase() }",
 				"  }",
 				"}");

From 9b6da79f762fbd86ff8332c7d266d4f70d3934c9 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 14 Jul 2023 11:21:47 -0700
Subject: [PATCH 1126/2068] Bump changelogs.

---
 CHANGES.md               | 10 +++++-----
 plugin-gradle/CHANGES.md |  8 +++++---
 plugin-maven/CHANGES.md  |  7 +++++--
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 0faf333268..6484eadf77 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,13 +12,13 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * `enum OnMatch { INCLUDE, EXCLUDE }` so that `FormatterStep.filterByContent` can not only include based on the pattern but also exclude. ([#1749](https://github.com/diffplug/spotless/pull/1749))
-* Bump default `ktlint` version to latest `0.49.1` -> `0.50.0`.([#1741](https://github.com/diffplug/spotless/issues/1741))
-  * Dropped support for `ktlint 0.47.x` following our policy of supporting two breaking changes at a time.
-  * Dropped support for deprecated `useExperimental` parameter in favor of the `ktlint_experimental` property.
-### Changes
-* Bump default `cleanthat` version to latest `2.13` -> `2.16`. ([#1725](https://github.com/diffplug/spotless/pull/1725))
 ### Fixed
 * Update documented default `semanticSort` to `false`. ([#1728](https://github.com/diffplug/spotless/pull/1728))
+### Changes
+* Bump default `cleanthat` version to latest `2.13` -> `2.17`. ([#1734](https://github.com/diffplug/spotless/pull/1734))
+* Bump default `ktlint` version to latest `0.49.1` -> `0.50.0`. ([#1741](https://github.com/diffplug/spotless/issues/1741))
+  * Dropped support for `ktlint 0.47.x` following our policy of supporting two breaking changes at a time.
+  * Dropped support for deprecated `useExperimental` parameter in favor of the `ktlint_experimental` property.
 
 ## [2.39.0] - 2023-05-24
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 31c307d529..b3b700691a 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,9 +5,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Add target option `targetExcludeIfContentContains` and `targetExcludeIfContentContainsRegex` to exclude files based on their text content. ([#1749](https://github.com/diffplug/spotless/pull/1749))
-* Bump default `ktlint` version to latest `0.49.1` -> `0.50.0`. ([#1741](https://github.com/diffplug/spotless/issues/1741))
-  * Dropped support for `ktlint 0.47.x` following our policy of supporting two breaking changes at a time.
-  * Dropped support for deprecated `useExperimental` parameter in favor of the `ktlint_experimental` property.
 * Add an overload for `FormatExtension.addStep` which provides access to the `FormatExtension`'s `Provisioner`, enabling custom steps to make use of third-party dependencies.
 ### Fixed
 * Correctly support the syntax
@@ -18,6 +15,11 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
     }
   }
   ```
+### Changes
+* Bump default `cleanthat` version to latest `2.13` -> `2.17`. ([#1734](https://github.com/diffplug/spotless/pull/1734))
+* Bump default `ktlint` version to latest `0.49.1` -> `0.50.0`. ([#1741](https://github.com/diffplug/spotless/issues/1741))
+  * Dropped support for `ktlint 0.47.x` following our policy of supporting two breaking changes at a time.
+  * Dropped support for deprecated `useExperimental` parameter in favor of the `ktlint_experimental` property.
 
 ## [6.19.0] - 2023-05-24
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index db7fff9851..231cee0edb 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,10 +5,13 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Support pass skip (`-Dspotless.skip=true`) from command-line. ([#1729](https://github.com/diffplug/spotless/pull/1729))
-* Bump default `ktlint` version to latest `0.49.1` -> `0.50.0`.([#1741](https://github.com/diffplug/spotless/issues/1741))
-  * Dropped support for `ktlint 0.47.x` following our policy of supporting two breaking changes at a time.
 ### Fixed
 * Update documented default `semanticSort` to `false`. ([#1728](https://github.com/diffplug/spotless/pull/1728))
+### Changes
+* Bump default `cleanthat` version to latest `2.13` -> `2.17`. ([#1734](https://github.com/diffplug/spotless/pull/1734))
+* Bump default `ktlint` version to latest `0.49.1` -> `0.50.0`. ([#1741](https://github.com/diffplug/spotless/issues/1741))
+  * Dropped support for `ktlint 0.47.x` following our policy of supporting two breaking changes at a time.
+  * Dropped support for deprecated `useExperimental` parameter in favor of the `ktlint_experimental` property.
 
 ## [2.37.0] - 2023-05-24
 ### Added

From d832ca94a56da4445f3b278bfb18b61b785e5d20 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 14 Jul 2023 11:57:37 -0700
Subject: [PATCH 1127/2068] Disable failing test (maven & gradle)
 `useEslintXoStandardRules` (#1756)

---
 .../com/diffplug/gradle/spotless/TypescriptExtensionTest.java   | 2 ++
 .../spotless/maven/typescript/TypescriptFormatStepTest.java     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TypescriptExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TypescriptExtensionTest.java
index 9b4ec8372e..eaf2729296 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TypescriptExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TypescriptExtensionTest.java
@@ -17,6 +17,7 @@
 
 import java.io.IOException;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.npm.EslintFormatterStep;
@@ -169,6 +170,7 @@ void useEslint() throws IOException {
 	}
 
 	@Test
+	@Disabled("https://github.com/diffplug/spotless/issues/1756")
 	void useEslintXoStandardRules() throws IOException {
 		setFile(".eslintrc.js").toResource("npm/eslint/typescript/styleguide/xo/.eslintrc.js");
 		setFile("tsconfig.json").toResource("npm/eslint/typescript/styleguide/xo/tsconfig.json");
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/typescript/TypescriptFormatStepTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/typescript/TypescriptFormatStepTest.java
index a09111d30d..911cfad201 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/typescript/TypescriptFormatStepTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/typescript/TypescriptFormatStepTest.java
@@ -19,6 +19,7 @@
 
 import java.io.IOException;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.ProcessRunner;
@@ -210,6 +211,7 @@ void eslintStyleguideStandardWithTypescript() throws Exception {
 	}
 
 	@Test
+	@Disabled("https://github.com/diffplug/spotless/issues/1756")
 	void eslintStyleguideXo() throws Exception {
 		writePomWithTypescriptSteps(
 				TEST_FILE_PATH,

From 0e3be7dc7eec2f967adc709f1834955296df6be8 Mon Sep 17 00:00:00 2001
From: Andrew Parmet <andrewparmet@users.noreply.github.com>
Date: Fri, 14 Jul 2023 20:37:10 -0400
Subject: [PATCH 1128/2068] update link

---
 plugin-gradle/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index ec97352749..afbb91ef4f 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -475,7 +475,7 @@ spotless {
 }
 ```
 
-When used in conjunction with the [buf-gradle-plugin](https://github.com/andrewparmet/buf-gradle-plugin), the `buf` executable can be resolved from its `bufTool` configuration:
+When used in conjunction with the [buf-gradle-plugin](https://github.com/bufbuild/buf-gradle-plugin), the `buf` executable can be resolved from its `bufTool` configuration:
 
 ```gradle
 spotless {

From 3c1bb4c186021ba9a35dc893622cf93a9f76ab65 Mon Sep 17 00:00:00 2001
From: Andrew Parmet <andrewparmet@users.noreply.github.com>
Date: Fri, 14 Jul 2023 20:37:31 -0400
Subject: [PATCH 1129/2068] update link

---
 .../java/com/diffplug/gradle/spotless/ProtobufExtension.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java
index 283fe21c58..f0d5a0245c 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java
@@ -70,7 +70,7 @@ public class BufFormatExtension {
 		}
 
 		/**
-		 * When used in conjunction with the <a href=https://github.com/andrewparmet/buf-gradle-plugin>{@code buf-gradle-plugin}</a>,
+		 * When used in conjunction with the <a href=https://github.com/bufbuild/buf-gradle-plugin>{@code buf-gradle-plugin}</a>,
 		 * the {@code buf} executable can be resolved from its {@code bufTool} configuration:
 		 *
 		 * <pre>

From 3d2d2b86adee71213521d8953b7e4b0e05ed6fce Mon Sep 17 00:00:00 2001
From: Andrew Parmet <andrewparmet@users.noreply.github.com>
Date: Sat, 15 Jul 2023 12:34:53 -0400
Subject: [PATCH 1130/2068] update default version

---
 lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java b/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java
index 601a47f193..28058ffd4f 100644
--- a/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java
@@ -38,7 +38,7 @@ public static String name() {
 	}
 
 	public static String defaultVersion() {
-		return "1.4.0";
+		return "1.24.0";
 	}
 
 	private final String version;

From 6e7556f527e8c4bedaa82367c6f24164d91722d5 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sat, 15 Jul 2023 19:32:31 -0700
Subject: [PATCH 1131/2068] spotlessApply

---
 lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java   | 2 +-
 .../java/com/diffplug/spotless/protobuf/ProtobufConstants.java  | 2 +-
 plugin-gradle/README.md                                         | 2 +-
 .../java/com/diffplug/gradle/spotless/ProtobufExtension.java    | 2 +-
 .../java/com/diffplug/gradle/spotless/SpotlessExtension.java    | 2 +-
 .../java/com/diffplug/gradle/spotless/BufIntegrationTest.java   | 2 +-
 testlib/src/main/java/com/diffplug/spotless/tag/BufTest.java    | 2 +-
 .../test/java/com/diffplug/spotless/protobuf/BufStepTest.java   | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java b/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java
index 28058ffd4f..c9b9efa543 100644
--- a/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 DiffPlug
+ * Copyright 2022-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/main/java/com/diffplug/spotless/protobuf/ProtobufConstants.java b/lib/src/main/java/com/diffplug/spotless/protobuf/ProtobufConstants.java
index b24df7cc38..cd91e2671c 100644
--- a/lib/src/main/java/com/diffplug/spotless/protobuf/ProtobufConstants.java
+++ b/lib/src/main/java/com/diffplug/spotless/protobuf/ProtobufConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 DiffPlug
+ * Copyright 2022-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 716de842aa..efec76a048 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -522,7 +522,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ### buf
 
-`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.6.0/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
+`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
 
 ```gradle
 spotless {
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java
index f0d5a0245c..77e4fbc7c7 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 DiffPlug
+ * Copyright 2022-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
index 2e6bf0e9b7..c3cf5123c0 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
@@ -197,7 +197,7 @@ public void json(Action<JsonExtension> closure) {
 	public void protobuf(Action<ProtobufExtension> closure) {
 		requireNonNull(closure);
 		format(ProtobufExtension.NAME, ProtobufExtension.class, closure);
-  }
+	}
 
 	/** Configures the special YAML-specific extension. */
 	public void yaml(Action<YamlExtension> closure) {
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BufIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BufIntegrationTest.java
index ba08c51838..b91512c7ed 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BufIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BufIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 DiffPlug
+ * Copyright 2022-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/testlib/src/main/java/com/diffplug/spotless/tag/BufTest.java b/testlib/src/main/java/com/diffplug/spotless/tag/BufTest.java
index 490218ef7b..90f32ec6c3 100644
--- a/testlib/src/main/java/com/diffplug/spotless/tag/BufTest.java
+++ b/testlib/src/main/java/com/diffplug/spotless/tag/BufTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 DiffPlug
+ * Copyright 2022-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/testlib/src/test/java/com/diffplug/spotless/protobuf/BufStepTest.java b/testlib/src/test/java/com/diffplug/spotless/protobuf/BufStepTest.java
index 0cd72129c6..9b5fa2fcf5 100644
--- a/testlib/src/test/java/com/diffplug/spotless/protobuf/BufStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/protobuf/BufStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 DiffPlug
+ * Copyright 2022-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 0943a81bec7b3327b9b3e706d928af00cf49b4ed Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sat, 15 Jul 2023 19:47:21 -0700
Subject: [PATCH 1132/2068] Fix BufStepTest for the changes we've had in test
 infrastructure.

---
 .../java/com/diffplug/spotless/protobuf/BufStepTest.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/testlib/src/test/java/com/diffplug/spotless/protobuf/BufStepTest.java b/testlib/src/test/java/com/diffplug/spotless/protobuf/BufStepTest.java
index 9b5fa2fcf5..ce22eb5ed2 100644
--- a/testlib/src/test/java/com/diffplug/spotless/protobuf/BufStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/protobuf/BufStepTest.java
@@ -15,19 +15,18 @@
  */
 package com.diffplug.spotless.protobuf;
 
-import java.io.File;
-
 import org.junit.jupiter.api.Test;
 
+import com.diffplug.spotless.ResourceHarness;
 import com.diffplug.spotless.StepHarnessWithFile;
 import com.diffplug.spotless.tag.BufTest;
 
 @BufTest
-class BufStepTest {
+class BufStepTest extends ResourceHarness {
 	@Test
 	void test() throws Exception {
-		try (StepHarnessWithFile harness = StepHarnessWithFile.forStep(BufStep.withVersion(BufStep.defaultVersion()).create())) {
-			harness.testResource(new File("src/main/resources/protobuf/buf/buf.proto"), "protobuf/buf/buf.proto", "protobuf/buf/buf.proto.clean");
+		try (StepHarnessWithFile harness = StepHarnessWithFile.forStep(this, BufStep.withVersion(BufStep.defaultVersion()).create())) {
+			harness.testResource("protobuf/buf/buf.proto", "protobuf/buf/buf.proto.clean");
 		}
 	}
 }

From 0fc9036455f1b5090e484c3f7b34e69bdb86c80d Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sat, 15 Jul 2023 23:26:40 -0700
Subject: [PATCH 1133/2068] Add warnings that buf must be the first step.

---
 plugin-gradle/README.md                                        | 2 ++
 .../java/com/diffplug/gradle/spotless/ProtobufExtension.java   | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index efec76a048..55b6e98a30 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -524,6 +524,8 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 `com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
 
+**WARNING** this step **must** be the first step in the chain, steps before it will be ignored. Thumbs up [this issue](https://github.com/bufbuild/buf/issues/1035) for a resolution, see [here](https://github.com/diffplug/spotless/pull/1208#discussion_r1264439669) for more details on the problem.
+
 ```gradle
 spotless {
   protobuf {
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java
index 77e4fbc7c7..7b0a6bb30a 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java
@@ -66,6 +66,9 @@ public class BufFormatExtension {
 
 		BufFormatExtension(String version) {
 			this.step = BufStep.withVersion(version);
+			if (!steps.isEmpty()) {
+				throw new IllegalArgumentException("buf() must be the first step, move other steps after it. Thumbs up [this issue](https://github.com/bufbuild/buf/issues/1035) for a resolution, see [here](https://github.com/diffplug/spotless/pull/1208#discussion_r1264439669) for more details on the problem.");
+			}
 			addStep(createStep());
 		}
 

From 7be3ce04ad22517ad741c17cc02ba68a2fb5df9b Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az448-40.gd0zyr0xj03ufix5kzlzvjjcld.gx.internal.cloudapp.net>
Date: Mon, 17 Jul 2023 22:07:27 +0000
Subject: [PATCH 1134/2068] Published lib/2.40.0

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 9c37d36604..cc6dcd7331 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.40.0] - 2023-07-17
 ### Added
 * Added support for Protobuf formatting based on [Buf](https://buf.build/). (#1208)
 * `enum OnMatch { INCLUDE, EXCLUDE }` so that `FormatterStep.filterByContent` can not only include based on the pattern but also exclude. ([#1749](https://github.com/diffplug/spotless/pull/1749))

From 654b093663701ef7dc7f28c93567e4d943683d39 Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az448-40.gd0zyr0xj03ufix5kzlzvjjcld.gx.internal.cloudapp.net>
Date: Mon, 17 Jul 2023 22:08:40 +0000
Subject: [PATCH 1135/2068] Published gradle/6.20.0

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 54 ++++++++++++++++++++--------------------
 2 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 33bd1ede30..6d8bee7169 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [6.20.0] - 2023-07-17
 ### Added
 * Add target option `targetExcludeIfContentContains` and `targetExcludeIfContentContainsRegex` to exclude files based on their text content. ([#1749](https://github.com/diffplug/spotless/pull/1749))
 * Add support for Protobuf formatting based on [Buf](https://buf.build/) ([#1208](https://github.com/diffplug/spotless/pull/1208)).
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 55b6e98a30..e04697766a 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -14,9 +14,9 @@ output = [
   ].join('\n');
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
-[![Changelog](https://img.shields.io/badge/changelog-6.19.0-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-6.20.0-blue.svg)](CHANGES.md)
 [![Maven central](https://img.shields.io/badge/mavencentral-here-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/index.html)
 
 [![VS Code plugin](https://img.shields.io/badge/IDE-VS_Code-blueviolet.svg)](https://marketplace.visualstudio.com/items?itemName=richardwillis.vscode-spotless-gradle)
 [![IntelliJ plugin](https://img.shields.io/badge/IDE-IntelliJ-blueviolet.svg)](https://plugins.jetbrains.com/plugin/18321-spotless-gradle)
@@ -127,10 +127,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -143,7 +143,7 @@ Spotless requires JRE 11+ and Gradle 6.1.1 or newer.
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -300,8 +300,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -351,8 +351,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -422,7 +422,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -454,7 +454,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -486,7 +486,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -522,7 +522,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ### buf
 
-`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
+`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
 
 **WARNING** this step **must** be the first step in the chain, steps before it will be ignored. Thumbs up [this issue](https://github.com/bufbuild/buf/issues/1035) for a resolution, see [here](https://github.com/diffplug/spotless/pull/1208#discussion_r1264439669) for more details on the problem.
 
@@ -554,7 +554,7 @@ buf {
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -575,7 +575,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -600,7 +600,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -640,7 +640,7 @@ sql.formatter.indent.size=4
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -734,7 +734,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## Javascript
 
-- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
+- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
 
 ```gradle
 spotless {
@@ -799,7 +799,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -875,7 +875,7 @@ spotless {
 
 ## YAML
 
-- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
+- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
 
 ```gradle
 spotless {
@@ -906,7 +906,7 @@ spotless {
 
 ## Gherkin
 
-- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
+- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
 
 ```gradle
 spotless {
@@ -1294,7 +1294,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -1367,9 +1367,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -1402,11 +1402,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.19.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From 0c0be38a31eafff3060faed169841256fabc652f Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az448-40.gd0zyr0xj03ufix5kzlzvjjcld.gx.internal.cloudapp.net>
Date: Mon, 17 Jul 2023 22:10:19 +0000
Subject: [PATCH 1136/2068] Published maven/2.38.0

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 231cee0edb..72d40dfe10 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.38.0] - 2023-07-17
 ### Added
 * Support pass skip (`-Dspotless.skip=true`) from command-line. ([#1729](https://github.com/diffplug/spotless/pull/1729))
 ### Fixed
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index dc450d7ddd..c1ffd31e40 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -8,8 +8,8 @@ output = [
   ].join('\n');
 -->
 [![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Changelog](https://img.shields.io/badge/changelog-2.37.0-blue.svg)](CHANGES.md)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.37.0/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.38.0-blue.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.38.0/index.html)
 <!---freshmark /shields -->
 
 <!---freshmark javadoc

From 1dd92dae300aa59af0f640467cf6757898df9acf Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 18 Jul 2023 14:31:04 +0200
Subject: [PATCH 1137/2068] chore: bump default eslint version

---
 .../com/diffplug/spotless/npm/EslintFormatterStep.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
index a4480fe7fc..cee51b8518 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
@@ -47,7 +47,7 @@ public class EslintFormatterStep {
 
 	public static final String NAME = "eslint-format";
 
-	public static final String DEFAULT_ESLINT_VERSION = "^8.31.0";
+	public static final String DEFAULT_ESLINT_VERSION = "^8.45.0";
 
 	public static Map<String, String> defaultDevDependenciesForTypescript() {
 		return defaultDevDependenciesTypescriptWithEslint(DEFAULT_ESLINT_VERSION);
@@ -55,9 +55,9 @@ public static Map<String, String> defaultDevDependenciesForTypescript() {
 
 	public static Map<String, String> defaultDevDependenciesTypescriptWithEslint(String eslintVersion) {
 		Map<String, String> dependencies = new LinkedHashMap<>();
-		dependencies.put("@typescript-eslint/eslint-plugin", "^5.47.0");
-		dependencies.put("@typescript-eslint/parser", "^5.47.0");
-		dependencies.put("typescript", "^4.9.4");
+		dependencies.put("@typescript-eslint/eslint-plugin", "^6.1.0");
+		dependencies.put("@typescript-eslint/parser", "^6.1.0");
+		dependencies.put("typescript", "^5.1.6");
 		dependencies.put("eslint", Objects.requireNonNull(eslintVersion));
 		return dependencies;
 	}

From e4c9bc8ea3bb4741e3e96b0256b2318097853c9e Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 18 Jul 2023 14:32:46 +0200
Subject: [PATCH 1138/2068] chore: bump eslint styleguide versions

This fixes #1756
---
 .../gradle/spotless/TypescriptExtensionTest.java |  2 --
 .../diffplug/spotless/npm/EslintStyleGuide.java  | 16 ++++++++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TypescriptExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TypescriptExtensionTest.java
index eaf2729296..9b4ec8372e 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TypescriptExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TypescriptExtensionTest.java
@@ -17,7 +17,6 @@
 
 import java.io.IOException;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.npm.EslintFormatterStep;
@@ -170,7 +169,6 @@ void useEslint() throws IOException {
 	}
 
 	@Test
-	@Disabled("https://github.com/diffplug/spotless/issues/1756")
 	void useEslintXoStandardRules() throws IOException {
 		setFile(".eslintrc.js").toResource("npm/eslint/typescript/styleguide/xo/.eslintrc.js");
 		setFile("tsconfig.json").toResource("npm/eslint/typescript/styleguide/xo/tsconfig.json");
diff --git a/testlib/src/main/java/com/diffplug/spotless/npm/EslintStyleGuide.java b/testlib/src/main/java/com/diffplug/spotless/npm/EslintStyleGuide.java
index 62d0b0aa00..ad5cb2ba2e 100644
--- a/testlib/src/main/java/com/diffplug/spotless/npm/EslintStyleGuide.java
+++ b/testlib/src/main/java/com/diffplug/spotless/npm/EslintStyleGuide.java
@@ -29,9 +29,9 @@ public enum EslintStyleGuide {
 		@Override
 		public @Nonnull Map<String, String> devDependencies() {
 			Map<String, String> dependencies = new LinkedHashMap<>();
-			dependencies.put("eslint-config-standard-with-typescript", "^24.0.0");
-			dependencies.put("eslint-plugin-import", "^2.26.0");
-			dependencies.put("eslint-plugin-n", "^15.6.0");
+			dependencies.put("eslint-config-standard-with-typescript", "^36.1.0");
+			dependencies.put("eslint-plugin-import", "^2.27.5");
+			dependencies.put("eslint-plugin-n", "^16.0.1");
 			dependencies.put("eslint-plugin-promise", "^6.1.1");
 			return dependencies;
 		}
@@ -41,7 +41,7 @@ public enum EslintStyleGuide {
 		public @Nonnull Map<String, String> devDependencies() {
 			Map<String, String> dependencies = new LinkedHashMap<>();
 			dependencies.put("eslint-config-xo", "^0.43.1");
-			dependencies.put("eslint-config-xo-typescript", "^0.55.1");
+			dependencies.put("eslint-config-xo-typescript", "^1.0.0");
 			return dependencies;
 		}
 	},
@@ -50,7 +50,7 @@ public enum EslintStyleGuide {
 		public @Nonnull Map<String, String> devDependencies() {
 			Map<String, String> dependencies = new LinkedHashMap<>();
 			dependencies.put("eslint-config-airbnb-base", "^15.0.0");
-			dependencies.put("eslint-plugin-import", "^2.26.0");
+			dependencies.put("eslint-plugin-import", "^2.27.5");
 			return dependencies;
 		}
 	},
@@ -66,9 +66,9 @@ public enum EslintStyleGuide {
 		@Override
 		public @Nonnull Map<String, String> devDependencies() {
 			Map<String, String> dependencies = new LinkedHashMap<>();
-			dependencies.put("eslint-config-standard", "^17.0.0");
-			dependencies.put("eslint-plugin-import", "^2.26.0");
-			dependencies.put("eslint-plugin-n", "^15.6.0");
+			dependencies.put("eslint-config-standard", "^17.1.0");
+			dependencies.put("eslint-plugin-import", "^2.27.5");
+			dependencies.put("eslint-plugin-n", "^16.0.1");
 			dependencies.put("eslint-plugin-promise", "^6.1.1");
 			return dependencies;
 		}

From ccbbd4c3224b224cb254e5fa42f490675601b09e Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 18 Jul 2023 14:39:05 +0200
Subject: [PATCH 1139/2068] docs: add changed eslint version info

---
 CHANGES.md               | 4 ++++
 plugin-gradle/CHANGES.md | 3 ++-
 plugin-maven/CHANGES.md  | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index cc6dcd7331..7da7e20ef3 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,10 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Use latest versions of popular style guides for `eslint` tests to fix failing `useEslintXoStandardRules` test. ([#9999](https://github.com/diffplug/spotless/pull/9999), [#1756](https://github.com/diffplug/spotless/issues/1756))
+### Changes
+* Bump default `eslint` version to latest `8.31.0` -> `8.45.0` ([#9999](https://github.com/diffplug/spotless/pull/9999))
 
 ## [2.40.0] - 2023-07-17
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 6d8bee7169..dfaaab678f 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,7 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
-
+### Changes
+* Bump default `eslint` version to latest `8.31.0` -> `8.45.0` ([#9999](https://github.com/diffplug/spotless/pull/9999))
 ## [6.20.0] - 2023-07-17
 ### Added
 * Add target option `targetExcludeIfContentContains` and `targetExcludeIfContentContainsRegex` to exclude files based on their text content. ([#1749](https://github.com/diffplug/spotless/pull/1749))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 72d40dfe10..06f47866e6 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Changes
+* Bump default `eslint` version to latest `8.31.0` -> `8.45.0` ([#9999](https://github.com/diffplug/spotless/pull/9999))
 
 ## [2.38.0] - 2023-07-17
 ### Added

From 6afb6110257124933e8653e8eb4f32c09e302a01 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 18 Jul 2023 14:40:37 +0200
Subject: [PATCH 1140/2068] docs: adapt for actual pr number

---
 CHANGES.md               | 4 ++--
 plugin-gradle/CHANGES.md | 2 +-
 plugin-maven/CHANGES.md  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 7da7e20ef3..4ac5063b70 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,9 +11,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Fixed
-* Use latest versions of popular style guides for `eslint` tests to fix failing `useEslintXoStandardRules` test. ([#9999](https://github.com/diffplug/spotless/pull/9999), [#1756](https://github.com/diffplug/spotless/issues/1756))
+* Use latest versions of popular style guides for `eslint` tests to fix failing `useEslintXoStandardRules` test. ([#1761](https://github.com/diffplug/spotless/pull/1761), [#1756](https://github.com/diffplug/spotless/issues/1756))
 ### Changes
-* Bump default `eslint` version to latest `8.31.0` -> `8.45.0` ([#9999](https://github.com/diffplug/spotless/pull/9999))
+* Bump default `eslint` version to latest `8.31.0` -> `8.45.0` ([#1761](https://github.com/diffplug/spotless/pull/1761))
 
 ## [2.40.0] - 2023-07-17
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index dfaaab678f..6057fe94ab 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -4,7 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Changes
-* Bump default `eslint` version to latest `8.31.0` -> `8.45.0` ([#9999](https://github.com/diffplug/spotless/pull/9999))
+* Bump default `eslint` version to latest `8.31.0` -> `8.45.0` ([#1761](https://github.com/diffplug/spotless/pull/1761))
 ## [6.20.0] - 2023-07-17
 ### Added
 * Add target option `targetExcludeIfContentContains` and `targetExcludeIfContentContainsRegex` to exclude files based on their text content. ([#1749](https://github.com/diffplug/spotless/pull/1749))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 06f47866e6..75ee7a5b27 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -4,7 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Changes
-* Bump default `eslint` version to latest `8.31.0` -> `8.45.0` ([#9999](https://github.com/diffplug/spotless/pull/9999))
+* Bump default `eslint` version to latest `8.31.0` -> `8.45.0` ([#1761](https://github.com/diffplug/spotless/pull/1761))
 
 ## [2.38.0] - 2023-07-17
 ### Added

From 354a5828120b33db7380aea4c13a97695869fd84 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 18 Jul 2023 09:42:25 +0200
Subject: [PATCH 1141/2068] chore: bump default prettier version to latest 2.x

---
 .../java/com/diffplug/spotless/npm/PrettierFormatterStep.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
index 11a6230e4c..7dcf38c314 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
@@ -42,7 +42,7 @@ public class PrettierFormatterStep {
 	public static final String NAME = "prettier-format";
 
 	public static final Map<String, String> defaultDevDependencies() {
-		return defaultDevDependenciesWithPrettier("2.8.1");
+		return defaultDevDependenciesWithPrettier("2.8.8");
 	}
 
 	public static final Map<String, String> defaultDevDependenciesWithPrettier(String version) {

From ca4136e421a5e01b2029cd173ad17793741962d8 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 18 Jul 2023 09:48:23 +0200
Subject: [PATCH 1142/2068] feat: add support for prettier 3.x

This fixes #1751
---
 .../diffplug/spotless/npm/prettier-serve.js   | 46 ++++++++++++-------
 .../npm/PrettierFormatterStepTest.java        | 17 +++++--
 2 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/lib/src/main/resources/com/diffplug/spotless/npm/prettier-serve.js b/lib/src/main/resources/com/diffplug/spotless/npm/prettier-serve.js
index b60daaaa77..ac1f26790d 100644
--- a/lib/src/main/resources/com/diffplug/spotless/npm/prettier-serve.js
+++ b/lib/src/main/resources/com/diffplug/spotless/npm/prettier-serve.js
@@ -1,15 +1,15 @@
 const prettier = require("prettier");
 
 app.post("/prettier/config-options", (req, res) => {
-	var config_data = req.body;
-	var prettier_config_path = config_data.prettier_config_path;
-	var prettier_config_options = config_data.prettier_config_options || {};
+	const config_data = req.body;
+	const prettier_config_path = config_data.prettier_config_path;
+	const prettier_config_options = config_data.prettier_config_options || {};
 
 	if (prettier_config_path) {
 		prettier
 			.resolveConfig(undefined, { config: prettier_config_path })
 			.then(options => {
-				var mergedConfigOptions = mergeConfigOptions(options, prettier_config_options);
+				const mergedConfigOptions = mergeConfigOptions(options, prettier_config_options);
 				res.set("Content-Type", "application/json")
 				res.json(mergedConfigOptions);
 			})
@@ -20,12 +20,12 @@ app.post("/prettier/config-options", (req, res) => {
 	res.json(prettier_config_options);
 });
 
-app.post("/prettier/format", (req, res) => {
-	var format_data = req.body;
+app.post("/prettier/format", async (req, res) => {
+	const format_data = req.body;
 
-	var formatted_file_content = "";
+	let formatted_file_content = "";
 	try {
-		formatted_file_content = prettier.format(format_data.file_content, format_data.config_options);
+		formatted_file_content = await prettierFormat(format_data.file_content, format_data.config_options);
 	} catch(err) {
 		res.status(500).send("Error while formatting: " + err);
 		return;
@@ -34,7 +34,20 @@ app.post("/prettier/format", (req, res) => {
 	res.send(formatted_file_content);
 });
 
-var mergeConfigOptions = function(resolved_config_options, config_options) {
+const prettierFormat = async function(file_content, config_options) {
+	const result = prettier.format(file_content, config_options);
+
+	// Check if result is a Promise (version 3.0.0 and above)
+	if (typeof result.then === 'function') {
+		return result;
+	}
+
+	// If it's not a Promise (meaning it's a string), wrap it in a Promise (< 3.0.0)
+	return Promise.resolve(result);
+}
+
+
+const mergeConfigOptions = function(resolved_config_options, config_options) {
 	if (resolved_config_options !== undefined && config_options !== undefined) {
 		return extend(resolved_config_options, config_options);
 	}
@@ -46,15 +59,15 @@ var mergeConfigOptions = function(resolved_config_options, config_options) {
 	}
 };
 
-var extend = function() {
+const extend = function() {
 	// Variables
-	var extended = {};
-	var i = 0;
-	var length = arguments.length;
+	const extended = {};
+	let i = 0;
+	const length = arguments.length;
 
 	// Merge the object into the extended object
-	var merge = function(obj) {
-		for (var prop in obj) {
+	const merge = function (obj) {
+		for (const prop in obj) {
 			if (Object.prototype.hasOwnProperty.call(obj, prop)) {
 				extended[prop] = obj[prop];
 			}
@@ -63,9 +76,8 @@ var extend = function() {
 
 	// Loop through each object and conduct a merge
 	for (; i < length; i++) {
-		var obj = arguments[i];
+		const obj = arguments[i];
 		merge(obj);
 	}
-
 	return extended;
 };
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
index c0e587aa98..a312e975d3 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
@@ -17,6 +17,7 @@
 
 import java.io.File;
 import java.util.Collections;
+import java.util.Map;
 
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
@@ -38,9 +39,19 @@ class PrettierFormatterStepTest extends ResourceHarness {
 	@Nested
 	class PrettierFormattingOfFileTypesIsWorking extends NpmFormatterStepCommonTests {
 
-		@ParameterizedTest(name = "{index}: prettier can be applied to {0}")
+		@ParameterizedTest(name = "{index}: prettier 2.x can be applied to {0}")
 		@ValueSource(strings = {"html", "typescript", "json", "javascript-es5", "javascript-es6", "css", "scss", "markdown", "yaml"})
-		void formattingUsingConfigFile(String fileType) throws Exception {
+		void formattingUsingPrettier2WithConfigFile(String fileType) throws Exception {
+			runTestUsingPrettier(fileType, PrettierFormatterStep.defaultDevDependencies());
+		}
+
+		@ParameterizedTest(name = "{index}: prettier 3.x can be applied to {0}")
+		@ValueSource(strings = {"html", "typescript", "json", "javascript-es5", "javascript-es6", "css", "scss", "markdown", "yaml"})
+		void formattingUsingPrettier3WithConfigFile(String fileType) throws Exception {
+			runTestUsingPrettier(fileType, ImmutableMap.of("prettier", "3.0.0"));
+		}
+
+		private void runTestUsingPrettier(String fileType, Map<String, String> dependencies) throws Exception {
 			String filedir = "npm/prettier/filetypes/" + fileType + "/";
 
 			final File prettierRc = createTestFile(filedir + ".prettierrc.yml");
@@ -48,7 +59,7 @@ void formattingUsingConfigFile(String fileType) throws Exception {
 			final String cleanFile = filedir + fileType + ".clean";
 
 			final FormatterStep formatterStep = PrettierFormatterStep.create(
-					PrettierFormatterStep.defaultDevDependencies(),
+					dependencies,
 					TestProvisioner.mavenCentral(),
 					projectDir(),
 					buildDir(),

From 8187042d19a1a7593f42f28160be8515c3016227 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 18 Jul 2023 11:49:32 +0200
Subject: [PATCH 1143/2068] fix: allow online-npm-install if prefer-offline
 fails

This resolves #1750
---
 .../com/diffplug/spotless/npm/NodeApp.java    | 29 ++++++++++++++++++-
 .../NodeModulesCachingNpmProcessFactory.java  |  4 +--
 .../spotless/npm/NpmProcessException.java     | 14 ++++++++-
 .../spotless/npm/NpmProcessFactory.java       | 17 ++++++++++-
 .../npm/StandardNpmProcessFactory.java        | 13 +++++----
 5 files changed, 67 insertions(+), 10 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NodeApp.java b/lib/src/main/java/com/diffplug/spotless/npm/NodeApp.java
index edac59bbfd..932a148626 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NodeApp.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NodeApp.java
@@ -15,6 +15,9 @@
  */
 package com.diffplug.spotless.npm;
 
+import static com.diffplug.spotless.npm.NpmProcessFactory.OnlinePreferrence.PREFER_OFFLINE;
+import static com.diffplug.spotless.npm.NpmProcessFactory.OnlinePreferrence.PREFER_ONLINE;
+
 import java.util.Objects;
 
 import javax.annotation.Nonnull;
@@ -22,6 +25,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.diffplug.spotless.ProcessRunner;
+
 public class NodeApp {
 
 	private static final Logger logger = LoggerFactory.getLogger(NodeApp.class);
@@ -83,6 +88,28 @@ void prepareNodeAppLayout() {
 
 	void npmInstall() {
 		timedLogger.withInfo("Installing npm dependencies for {} with {}.", this.nodeServerLayout, this.npmProcessFactory.describe())
-				.run(() -> npmProcessFactory.createNpmInstallProcess(nodeServerLayout, formatterStepLocations).waitFor());
+				.run(this::optimizedNpmInstall);
+	}
+
+	private void optimizedNpmInstall() {
+		try {
+			npmProcessFactory.createNpmInstallProcess(nodeServerLayout, formatterStepLocations, PREFER_OFFLINE).waitFor();
+		} catch (NpmProcessException e) {
+			if (!offlineInstallFailed(e.getResult())) {
+				throw e; // pass through
+			}
+			// if the npm install fails with message "No matching version found for <package>@<version>", we try again without the offline flag
+			npmProcessFactory.createNpmInstallProcess(nodeServerLayout, formatterStepLocations, PREFER_ONLINE).waitFor();
+		}
+	}
+
+	private boolean offlineInstallFailed(ProcessRunner.Result result) {
+		if (result == null) {
+			return false; // no result, something else must have happened
+		}
+		if (result.exitCode() == 0) {
+			return false; // all is well
+		}
+		return result.stdOutUtf8().contains("code ETARGET") && result.stdOutUtf8().contains("No matching version found for"); // offline install failed, needs online install
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NodeModulesCachingNpmProcessFactory.java b/lib/src/main/java/com/diffplug/spotless/npm/NodeModulesCachingNpmProcessFactory.java
index 0086064194..8a3af5fdf2 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NodeModulesCachingNpmProcessFactory.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NodeModulesCachingNpmProcessFactory.java
@@ -58,8 +58,8 @@ public static NodeModulesCachingNpmProcessFactory create(@Nonnull File cacheDir)
 	}
 
 	@Override
-	public NpmProcess createNpmInstallProcess(NodeServerLayout nodeServerLayout, NpmFormatterStepLocations formatterStepLocations) {
-		NpmProcess actualNpmInstallProcess = StandardNpmProcessFactory.INSTANCE.createNpmInstallProcess(nodeServerLayout, formatterStepLocations);
+	public NpmProcess createNpmInstallProcess(NodeServerLayout nodeServerLayout, NpmFormatterStepLocations formatterStepLocations, OnlinePreferrence onlinePreferrence) {
+		NpmProcess actualNpmInstallProcess = StandardNpmProcessFactory.INSTANCE.createNpmInstallProcess(nodeServerLayout, formatterStepLocations, onlinePreferrence);
 		return new CachingNmpInstall(actualNpmInstallProcess, nodeServerLayout);
 	}
 
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmProcessException.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmProcessException.java
index bff621df07..33c6fb8d28 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmProcessException.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmProcessException.java
@@ -15,14 +15,26 @@
  */
 package com.diffplug.spotless.npm;
 
+import javax.annotation.CheckForNull;
+
+import com.diffplug.spotless.ProcessRunner;
+
 public class NpmProcessException extends RuntimeException {
 	private static final long serialVersionUID = 6424331316676759525L;
+	private final ProcessRunner.Result result;
 
-	public NpmProcessException(String message) {
+	public NpmProcessException(String message, ProcessRunner.Result result) {
 		super(message);
+		this.result = result;
 	}
 
 	public NpmProcessException(String message, Throwable cause) {
 		super(message, cause);
+		this.result = null;
+	}
+
+	@CheckForNull
+	public ProcessRunner.Result getResult() {
+		return result;
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmProcessFactory.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmProcessFactory.java
index 41543a2099..dbc9a807d5 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmProcessFactory.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmProcessFactory.java
@@ -16,7 +16,22 @@
 package com.diffplug.spotless.npm;
 
 public interface NpmProcessFactory {
-	NpmProcess createNpmInstallProcess(NodeServerLayout nodeServerLayout, NpmFormatterStepLocations formatterStepLocations);
+
+	enum OnlinePreferrence {
+		PREFER_OFFLINE("--prefer-offline"), PREFER_ONLINE("--prefer-online");
+
+		private final String option;
+
+		OnlinePreferrence(String option) {
+			this.option = option;
+		}
+
+		public String option() {
+			return option;
+		}
+	}
+
+	NpmProcess createNpmInstallProcess(NodeServerLayout nodeServerLayout, NpmFormatterStepLocations formatterStepLocations, OnlinePreferrence onlinePreferrence);
 
 	NpmLongRunningProcess createNpmServeProcess(NodeServerLayout nodeServerLayout, NpmFormatterStepLocations formatterStepLocations);
 
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/StandardNpmProcessFactory.java b/lib/src/main/java/com/diffplug/spotless/npm/StandardNpmProcessFactory.java
index 2c82768da2..91cf80ad69 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/StandardNpmProcessFactory.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/StandardNpmProcessFactory.java
@@ -32,8 +32,8 @@ private StandardNpmProcessFactory() {
 	}
 
 	@Override
-	public NpmProcess createNpmInstallProcess(NodeServerLayout nodeServerLayout, NpmFormatterStepLocations formatterStepLocations) {
-		return new NpmInstall(nodeServerLayout.nodeModulesDir(), formatterStepLocations);
+	public NpmProcess createNpmInstallProcess(NodeServerLayout nodeServerLayout, NpmFormatterStepLocations formatterStepLocations, OnlinePreferrence onlinePreferrence) {
+		return new NpmInstall(nodeServerLayout.nodeModulesDir(), formatterStepLocations, onlinePreferrence);
 	}
 
 	@Override
@@ -80,8 +80,11 @@ public String doDescribe() {
 
 	private static class NpmInstall extends AbstractStandardNpmProcess implements NpmProcess {
 
-		public NpmInstall(File workingDir, NpmFormatterStepLocations formatterStepLocations) {
+		private final OnlinePreferrence onlinePreferrence;
+
+		public NpmInstall(File workingDir, NpmFormatterStepLocations formatterStepLocations, OnlinePreferrence onlinePreferrence) {
 			super(workingDir, formatterStepLocations);
+			this.onlinePreferrence = onlinePreferrence;
 		}
 
 		@Override
@@ -91,7 +94,7 @@ protected List<String> commandLine() {
 					"install",
 					"--no-audit",
 					"--no-fund",
-					"--prefer-offline");
+					onlinePreferrence.option());
 		}
 
 		@Override
@@ -103,7 +106,7 @@ public String describe() {
 		public ProcessRunner.Result waitFor() {
 			try (ProcessRunner.LongRunningProcess npmProcess = doStart()) {
 				if (npmProcess.waitFor() != 0) {
-					throw new NpmProcessException("Running npm command '" + describe() + "' failed with exit code: " + npmProcess.exitValue() + "\n\n" + npmProcess.result());
+					throw new NpmProcessException("Running npm command '" + describe() + "' failed with exit code: " + npmProcess.exitValue() + "\n\n" + npmProcess.result(), npmProcess.result());
 				}
 				return npmProcess.result();
 			} catch (InterruptedException e) {

From bd0918318703b9a51995fd2c893e19eefb2a494b Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 18 Jul 2023 11:56:24 +0200
Subject: [PATCH 1144/2068] fix: adaptions for prettier 3 formatter-changes in
 html

---
 .../filetypes/html_prettier3/.prettierrc.yml    |  1 +
 .../html_prettier3/html_prettier3.clean         | 13 +++++++++++++
 .../html_prettier3/html_prettier3.dirty         | 17 +++++++++++++++++
 .../spotless/npm/PrettierFormatterStepTest.java |  2 +-
 4 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 testlib/src/main/resources/npm/prettier/filetypes/html_prettier3/.prettierrc.yml
 create mode 100644 testlib/src/main/resources/npm/prettier/filetypes/html_prettier3/html_prettier3.clean
 create mode 100644 testlib/src/main/resources/npm/prettier/filetypes/html_prettier3/html_prettier3.dirty

diff --git a/testlib/src/main/resources/npm/prettier/filetypes/html_prettier3/.prettierrc.yml b/testlib/src/main/resources/npm/prettier/filetypes/html_prettier3/.prettierrc.yml
new file mode 100644
index 0000000000..f1185441f8
--- /dev/null
+++ b/testlib/src/main/resources/npm/prettier/filetypes/html_prettier3/.prettierrc.yml
@@ -0,0 +1 @@
+parser: html
diff --git a/testlib/src/main/resources/npm/prettier/filetypes/html_prettier3/html_prettier3.clean b/testlib/src/main/resources/npm/prettier/filetypes/html_prettier3/html_prettier3.clean
new file mode 100644
index 0000000000..385e636b7b
--- /dev/null
+++ b/testlib/src/main/resources/npm/prettier/filetypes/html_prettier3/html_prettier3.clean
@@ -0,0 +1,13 @@
+<!doctype html>
+<html dir="ltr" lang="en">
+  <head>
+    <meta charset="viewport" content="with=device-width" />
+    <title>Test</title>
+    <script type="module" src="module.js"></script>
+    <script type="module2" src="module2.js"></script>
+
+    <link rel="stylesheet" type="text/css" href="style.css" />
+  </head>
+
+  <body></body>
+</html>
diff --git a/testlib/src/main/resources/npm/prettier/filetypes/html_prettier3/html_prettier3.dirty b/testlib/src/main/resources/npm/prettier/filetypes/html_prettier3/html_prettier3.dirty
new file mode 100644
index 0000000000..35ed1e9d3b
--- /dev/null
+++ b/testlib/src/main/resources/npm/prettier/filetypes/html_prettier3/html_prettier3.dirty
@@ -0,0 +1,17 @@
+<!doctype html>
+<html dir="ltr" lang="en">
+
+	<head>
+	<meta
+	charset="viewport"
+	 content="with=device-width">
+	 <title>Test</title><script type="module" src="module.js"></script>
+	 <script type="module2" src="module2.js"></script>
+
+	 <link rel="stylesheet" type ="text/css" href="style.css">
+	 </head>
+
+	 <body>
+
+	 </body></html>
+
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
index a312e975d3..f359a1f463 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
@@ -46,7 +46,7 @@ void formattingUsingPrettier2WithConfigFile(String fileType) throws Exception {
 		}
 
 		@ParameterizedTest(name = "{index}: prettier 3.x can be applied to {0}")
-		@ValueSource(strings = {"html", "typescript", "json", "javascript-es5", "javascript-es6", "css", "scss", "markdown", "yaml"})
+		@ValueSource(strings = {"html_prettier3", "typescript", "json", "javascript-es5", "javascript-es6", "css", "scss", "markdown", "yaml"})
 		void formattingUsingPrettier3WithConfigFile(String fileType) throws Exception {
 			runTestUsingPrettier(fileType, ImmutableMap.of("prettier", "3.0.0"));
 		}

From e6b2268501727c7932eae0e450acf4287fb17ddc Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 18 Jul 2023 13:27:03 +0200
Subject: [PATCH 1145/2068] chore: make sure to test prettier 3 also on
 configuration parts

---
 .../spotless/npm/PrettierFormatterStep.java   |  4 +-
 .../npm/prettier/config/.prettierrc.yml       |  2 +-
 .../typescript.configfile_prettier_2.clean    | 18 ++++++++
 .../typescript.configfile_prettier_3.clean    | 18 ++++++++
 ...n => typescript.defaults_prettier_2.clean} |  0
 ...n => typescript.defaults_prettier_3.clean} |  2 +-
 ...n => typescript.override_prettier_2.clean} |  0
 .../typescript.override_prettier_3.clean      | 13 ++++++
 .../npm/PrettierFormatterStepTest.java        | 46 ++++++++++++-------
 9 files changed, 83 insertions(+), 20 deletions(-)
 create mode 100644 testlib/src/main/resources/npm/prettier/config/typescript.configfile_prettier_2.clean
 create mode 100644 testlib/src/main/resources/npm/prettier/config/typescript.configfile_prettier_3.clean
 rename testlib/src/main/resources/npm/prettier/config/{typescript.defaults.clean => typescript.defaults_prettier_2.clean} (100%)
 rename testlib/src/main/resources/npm/prettier/config/{typescript.configfile.clean => typescript.defaults_prettier_3.clean} (92%)
 rename testlib/src/main/resources/npm/prettier/config/{typescript.override.clean => typescript.override_prettier_2.clean} (100%)
 create mode 100644 testlib/src/main/resources/npm/prettier/config/typescript.override_prettier_3.clean

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
index 7dcf38c314..72fecded1f 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
@@ -41,8 +41,10 @@ public class PrettierFormatterStep {
 
 	public static final String NAME = "prettier-format";
 
+	public static final String DEFAULT_VERSION = "2.8.8";
+
 	public static final Map<String, String> defaultDevDependencies() {
-		return defaultDevDependenciesWithPrettier("2.8.8");
+		return defaultDevDependenciesWithPrettier(DEFAULT_VERSION);
 	}
 
 	public static final Map<String, String> defaultDevDependenciesWithPrettier(String version) {
diff --git a/testlib/src/main/resources/npm/prettier/config/.prettierrc.yml b/testlib/src/main/resources/npm/prettier/config/.prettierrc.yml
index f078267520..828586c801 100644
--- a/testlib/src/main/resources/npm/prettier/config/.prettierrc.yml
+++ b/testlib/src/main/resources/npm/prettier/config/.prettierrc.yml
@@ -1,2 +1,2 @@
 parser: typescript
-printWidth: 50
+printWidth: 20
diff --git a/testlib/src/main/resources/npm/prettier/config/typescript.configfile_prettier_2.clean b/testlib/src/main/resources/npm/prettier/config/typescript.configfile_prettier_2.clean
new file mode 100644
index 0000000000..451b5466a0
--- /dev/null
+++ b/testlib/src/main/resources/npm/prettier/config/typescript.configfile_prettier_2.clean
@@ -0,0 +1,18 @@
+export class MyVeryOwnControllerWithARatherLongNameThatIsNotReallyNecessary
+  extends AbstractController
+  implements
+    DisposeAware,
+    CallbackAware
+{
+  public myValue: string[];
+
+  constructor(
+    private myService: Service,
+    name: string,
+    private field: any
+  ) {
+    super(name);
+  }
+
+  //...
+}
diff --git a/testlib/src/main/resources/npm/prettier/config/typescript.configfile_prettier_3.clean b/testlib/src/main/resources/npm/prettier/config/typescript.configfile_prettier_3.clean
new file mode 100644
index 0000000000..30d30f8595
--- /dev/null
+++ b/testlib/src/main/resources/npm/prettier/config/typescript.configfile_prettier_3.clean
@@ -0,0 +1,18 @@
+export class MyVeryOwnControllerWithARatherLongNameThatIsNotReallyNecessary
+  extends AbstractController
+  implements
+    DisposeAware,
+    CallbackAware
+{
+  public myValue: string[];
+
+  constructor(
+    private myService: Service,
+    name: string,
+    private field: any,
+  ) {
+    super(name);
+  }
+
+  //...
+}
diff --git a/testlib/src/main/resources/npm/prettier/config/typescript.defaults.clean b/testlib/src/main/resources/npm/prettier/config/typescript.defaults_prettier_2.clean
similarity index 100%
rename from testlib/src/main/resources/npm/prettier/config/typescript.defaults.clean
rename to testlib/src/main/resources/npm/prettier/config/typescript.defaults_prettier_2.clean
diff --git a/testlib/src/main/resources/npm/prettier/config/typescript.configfile.clean b/testlib/src/main/resources/npm/prettier/config/typescript.defaults_prettier_3.clean
similarity index 92%
rename from testlib/src/main/resources/npm/prettier/config/typescript.configfile.clean
rename to testlib/src/main/resources/npm/prettier/config/typescript.defaults_prettier_3.clean
index dfe71bf0a9..9fa0eed3cc 100644
--- a/testlib/src/main/resources/npm/prettier/config/typescript.configfile.clean
+++ b/testlib/src/main/resources/npm/prettier/config/typescript.defaults_prettier_3.clean
@@ -7,7 +7,7 @@ export class MyVeryOwnControllerWithARatherLongNameThatIsNotReallyNecessary
   constructor(
     private myService: Service,
     name: string,
-    private field: any
+    private field: any,
   ) {
     super(name);
   }
diff --git a/testlib/src/main/resources/npm/prettier/config/typescript.override.clean b/testlib/src/main/resources/npm/prettier/config/typescript.override_prettier_2.clean
similarity index 100%
rename from testlib/src/main/resources/npm/prettier/config/typescript.override.clean
rename to testlib/src/main/resources/npm/prettier/config/typescript.override_prettier_2.clean
diff --git a/testlib/src/main/resources/npm/prettier/config/typescript.override_prettier_3.clean b/testlib/src/main/resources/npm/prettier/config/typescript.override_prettier_3.clean
new file mode 100644
index 0000000000..c49cd544df
--- /dev/null
+++ b/testlib/src/main/resources/npm/prettier/config/typescript.override_prettier_3.clean
@@ -0,0 +1,13 @@
+export class MyVeryOwnControllerWithARatherLongNameThatIsNotReallyNecessary extends AbstractController implements DisposeAware, CallbackAware {
+  public myValue: string[];
+
+  constructor(
+    private myService: Service,
+    name: string,
+    private field: any,
+  ) {
+    super(name);
+  }
+
+  //...
+}
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
index f359a1f463..672aec740b 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
@@ -35,6 +35,10 @@
 @NpmTest
 class PrettierFormatterStepTest extends ResourceHarness {
 
+	private static final String PRETTIER_VERSION_2 = PrettierFormatterStep.DEFAULT_VERSION;
+
+	private static final String PRETTIER_VERSION_3 = "3.0.0";
+
 	@NpmTest
 	@Nested
 	class PrettierFormattingOfFileTypesIsWorking extends NpmFormatterStepCommonTests {
@@ -77,15 +81,16 @@ private void runTestUsingPrettier(String fileType, Map<String, String> dependenc
 	@Nested
 	class SpecificPrettierFormatterStepTests extends NpmFormatterStepCommonTests {
 
-		@Test
-		void parserInferenceBasedOnExplicitFilepathIsWorking() throws Exception {
+		@ParameterizedTest(name = "{index}: parser inference based on explicit filepath is working with prettier {0}")
+		@ValueSource(strings = {PRETTIER_VERSION_2, PRETTIER_VERSION_3})
+		void parserInferenceBasedOnExplicitFilepathIsWorking(String prettierVersion) throws Exception {
 			String filedir = "npm/prettier/filetypes/json/";
 
 			final String dirtyFile = filedir + "json.dirty";
 			final String cleanFile = filedir + "json.clean";
 
 			final FormatterStep formatterStep = PrettierFormatterStep.create(
-					PrettierFormatterStep.defaultDevDependencies(),
+					ImmutableMap.of("prettier", prettierVersion),
 					TestProvisioner.mavenCentral(),
 					projectDir(),
 					buildDir(),
@@ -98,15 +103,16 @@ void parserInferenceBasedOnExplicitFilepathIsWorking() throws Exception {
 			}
 		}
 
-		@Test
-		void parserInferenceBasedOnFilenameIsWorking() throws Exception {
+		@ParameterizedTest(name = "{index}: parser inference based on filename is working with prettier {0}")
+		@ValueSource(strings = {PRETTIER_VERSION_2, PRETTIER_VERSION_3})
+		void parserInferenceBasedOnFilenameIsWorking(String prettierVersion) throws Exception {
 			String filedir = "npm/prettier/filename/";
 
 			final String dirtyFile = filedir + "dirty.json";
 			final String cleanFile = filedir + "clean.json";
 
 			final FormatterStep formatterStep = PrettierFormatterStep.create(
-					PrettierFormatterStep.defaultDevDependencies(),
+					ImmutableMap.of("prettier", prettierVersion),
 					TestProvisioner.mavenCentral(),
 					projectDir(),
 					buildDir(),
@@ -142,13 +148,13 @@ class PrettierFormattingOptionsAreWorking extends NpmFormatterStepCommonTests {
 
 		private static final String FILEDIR = "npm/prettier/config/";
 
-		void runFormatTest(PrettierConfig config, String cleanFileNameSuffix) throws Exception {
+		void runFormatTest(String prettierVersion, PrettierConfig config, String cleanFileNameSuffix) throws Exception {
 
 			final String dirtyFile = FILEDIR + "typescript.dirty";
 			final String cleanFile = FILEDIR + "typescript." + cleanFileNameSuffix + ".clean";
 
 			final FormatterStep formatterStep = PrettierFormatterStep.create(
-					PrettierFormatterStep.defaultDevDependencies(),
+					ImmutableMap.of("prettier", prettierVersion),
 					TestProvisioner.mavenCentral(),
 					projectDir(),
 					buildDir(),
@@ -161,20 +167,26 @@ void runFormatTest(PrettierConfig config, String cleanFileNameSuffix) throws Exc
 			}
 		}
 
-		@Test
-		void defaultsAreApplied() throws Exception {
-			runFormatTest(new PrettierConfig(null, ImmutableMap.of("parser", "typescript")), "defaults");
+		@ParameterizedTest(name = "{index}: defaults are applied with prettier {0}")
+		@ValueSource(strings = {PRETTIER_VERSION_2, PRETTIER_VERSION_3})
+		void defaultsAreApplied(String prettierVersion) throws Exception {
+			runFormatTest(prettierVersion, new PrettierConfig(null, ImmutableMap.of("parser", "typescript")), "defaults_prettier_" + major(prettierVersion));
 		}
 
-		@Test
-		void configFileOptionsAreApplied() throws Exception {
-			runFormatTest(new PrettierConfig(createTestFile(FILEDIR + ".prettierrc.yml"), null), "configfile");
+		@ParameterizedTest(name = "{index}: config file options are applied with prettier {0}")
+		@ValueSource(strings = {PRETTIER_VERSION_2, PRETTIER_VERSION_3})
+		void configFileOptionsAreApplied(String prettierVersion) throws Exception {
+			runFormatTest(prettierVersion, new PrettierConfig(createTestFile(FILEDIR + ".prettierrc.yml"), null), "configfile_prettier_" + major(prettierVersion));
 		}
 
-		@Test
-		void configFileOptionsCanBeOverriden() throws Exception {
-			runFormatTest(new PrettierConfig(createTestFile(FILEDIR + ".prettierrc.yml"), ImmutableMap.of("printWidth", 300)), "override");
+		@ParameterizedTest(name = "{index}: config file options can be overriden with prettier {0}")
+		@ValueSource(strings = {PRETTIER_VERSION_2, PRETTIER_VERSION_3})
+		void configFileOptionsCanBeOverriden(String prettierVersion) throws Exception {
+			runFormatTest(prettierVersion, new PrettierConfig(createTestFile(FILEDIR + ".prettierrc.yml"), ImmutableMap.of("printWidth", 300)), "override_prettier_" + major(prettierVersion));
 		}
 
+		private String major(String semVer) {
+			return semVer.split("\\.")[0];
+		}
 	}
 }

From 4fac1e7e144d03a84fd7d53d53c328a5f076b8e9 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 18 Jul 2023 13:56:24 +0200
Subject: [PATCH 1146/2068] docs: adding changes and doc related to prettier

---
 CHANGES.md               | 4 ++++
 plugin-gradle/CHANGES.md | 3 +++
 plugin-gradle/README.md  | 1 +
 plugin-maven/CHANGES.md  | 3 +++
 plugin-maven/README.md   | 1 +
 5 files changed, 12 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index cc6dcd7331..67cc01a40c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,11 +17,15 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * `enum OnMatch { INCLUDE, EXCLUDE }` so that `FormatterStep.filterByContent` can not only include based on the pattern but also exclude. ([#1749](https://github.com/diffplug/spotless/pull/1749))
 ### Fixed
 * Update documented default `semanticSort` to `false`. ([#1728](https://github.com/diffplug/spotless/pull/1728))
+* Add support for `prettier` version `3.0.0` and newer. ([#9999]https://github.com/diffplug/spotless/pull/9999), [#1751](https://github.com/diffplug/spotless/issues/1751))
+* Fix npm install calls when npm cache is not up-to-date. ([#9999]https://github.com/diffplug/spotless/pull/9999), [#1750](https://github.com/diffplug/spotless/issues/1750))
+
 ### Changes
 * Bump default `cleanthat` version to latest `2.13` -> `2.17`. ([#1734](https://github.com/diffplug/spotless/pull/1734))
 * Bump default `ktlint` version to latest `0.49.1` -> `0.50.0`. ([#1741](https://github.com/diffplug/spotless/issues/1741))
   * Dropped support for `ktlint 0.47.x` following our policy of supporting two breaking changes at a time.
   * Dropped support for deprecated `useExperimental` parameter in favor of the `ktlint_experimental` property.
+* Bump default `prettier` version to latest (v2) `2.8.1` -> `2.8.8`. ([#9999](https://github.com/diffplug/spotless/pull/9999))
 
 ## [2.39.0] - 2023-05-24
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 6d8bee7169..658f65f420 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -18,11 +18,14 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
     }
   }
   ```
+* Add support for `prettier` version `3.0.0` and newer. ([#9999]https://github.com/diffplug/spotless/pull/9999), [#1751](https://github.com/diffplug/spotless/issues/1751))
+* Fix npm install calls when npm cache is not up-to-date. ([#9999]https://github.com/diffplug/spotless/pull/9999), [#1750](https://github.com/diffplug/spotless/issues/1750))
 ### Changes
 * Bump default `cleanthat` version to latest `2.13` -> `2.17`. ([#1734](https://github.com/diffplug/spotless/pull/1734))
 * Bump default `ktlint` version to latest `0.49.1` -> `0.50.0`. ([#1741](https://github.com/diffplug/spotless/issues/1741))
   * Dropped support for `ktlint 0.47.x` following our policy of supporting two breaking changes at a time.
   * Dropped support for deprecated `useExperimental` parameter in favor of the `ktlint_experimental` property.
+* Bump default `prettier` version to latest (v2) `2.8.1` -> `2.8.8`. ([#9999](https://github.com/diffplug/spotless/pull/9999))
 
 ## [6.19.0] - 2023-05-24
 ### Added
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index e04697766a..2334c3ff71 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -882,6 +882,7 @@ spotless {
   yaml {
     target 'src/**/*.yaml'                // you have to set the target manually
     jackson()                             // has its own section below
+    prettier()                            // has its own section below
   }
 }
 ```
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 72d40dfe10..98655ba3fe 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -9,11 +9,14 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Support pass skip (`-Dspotless.skip=true`) from command-line. ([#1729](https://github.com/diffplug/spotless/pull/1729))
 ### Fixed
 * Update documented default `semanticSort` to `false`. ([#1728](https://github.com/diffplug/spotless/pull/1728))
+* Add support for `prettier` version `3.0.0` and newer. ([#9999]https://github.com/diffplug/spotless/pull/9999), [#1751](https://github.com/diffplug/spotless/issues/1751))
+* Fix npm install calls when npm cache is not up-to-date. ([#9999]https://github.com/diffplug/spotless/pull/9999), [#1750](https://github.com/diffplug/spotless/issues/1750))
 ### Changes
 * Bump default `cleanthat` version to latest `2.13` -> `2.17`. ([#1734](https://github.com/diffplug/spotless/pull/1734))
 * Bump default `ktlint` version to latest `0.49.1` -> `0.50.0`. ([#1741](https://github.com/diffplug/spotless/issues/1741))
   * Dropped support for `ktlint 0.47.x` following our policy of supporting two breaking changes at a time.
   * Dropped support for deprecated `useExperimental` parameter in favor of the `ktlint_experimental` property.
+* Bump default `prettier` version to latest (v2) `2.8.1` -> `2.8.8`. ([#9999](https://github.com/diffplug/spotless/pull/9999))
 
 ## [2.37.0] - 2023-05-24
 ### Added
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index c1ffd31e40..af32c092fd 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -970,6 +970,7 @@ Uses Jackson for formatting.
     </includes>
 
     <jackson />    <!-- has its own section below -->
+    <prettier />   <!-- has its own section below -->
   </yaml>
 </configuration>
 ```

From 41138c92343f823973b0c07ec4712a181138bc42 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 18 Jul 2023 13:59:51 +0200
Subject: [PATCH 1147/2068] docs: adapt for actual PR number

---
 CHANGES.md               | 6 +++---
 plugin-gradle/CHANGES.md | 6 +++---
 plugin-maven/CHANGES.md  | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 67cc01a40c..00241182b0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,15 +17,15 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * `enum OnMatch { INCLUDE, EXCLUDE }` so that `FormatterStep.filterByContent` can not only include based on the pattern but also exclude. ([#1749](https://github.com/diffplug/spotless/pull/1749))
 ### Fixed
 * Update documented default `semanticSort` to `false`. ([#1728](https://github.com/diffplug/spotless/pull/1728))
-* Add support for `prettier` version `3.0.0` and newer. ([#9999]https://github.com/diffplug/spotless/pull/9999), [#1751](https://github.com/diffplug/spotless/issues/1751))
-* Fix npm install calls when npm cache is not up-to-date. ([#9999]https://github.com/diffplug/spotless/pull/9999), [#1750](https://github.com/diffplug/spotless/issues/1750))
+* Add support for `prettier` version `3.0.0` and newer. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
+* Fix npm install calls when npm cache is not up-to-date. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))
 
 ### Changes
 * Bump default `cleanthat` version to latest `2.13` -> `2.17`. ([#1734](https://github.com/diffplug/spotless/pull/1734))
 * Bump default `ktlint` version to latest `0.49.1` -> `0.50.0`. ([#1741](https://github.com/diffplug/spotless/issues/1741))
   * Dropped support for `ktlint 0.47.x` following our policy of supporting two breaking changes at a time.
   * Dropped support for deprecated `useExperimental` parameter in favor of the `ktlint_experimental` property.
-* Bump default `prettier` version to latest (v2) `2.8.1` -> `2.8.8`. ([#9999](https://github.com/diffplug/spotless/pull/9999))
+* Bump default `prettier` version to latest (v2) `2.8.1` -> `2.8.8`. ([#1760](https://github.com/diffplug/spotless/pull/1760))
 
 ## [2.39.0] - 2023-05-24
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 658f65f420..4358e9f26c 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -18,14 +18,14 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
     }
   }
   ```
-* Add support for `prettier` version `3.0.0` and newer. ([#9999]https://github.com/diffplug/spotless/pull/9999), [#1751](https://github.com/diffplug/spotless/issues/1751))
-* Fix npm install calls when npm cache is not up-to-date. ([#9999]https://github.com/diffplug/spotless/pull/9999), [#1750](https://github.com/diffplug/spotless/issues/1750))
+* Add support for `prettier` version `3.0.0` and newer. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
+* Fix npm install calls when npm cache is not up-to-date. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))
 ### Changes
 * Bump default `cleanthat` version to latest `2.13` -> `2.17`. ([#1734](https://github.com/diffplug/spotless/pull/1734))
 * Bump default `ktlint` version to latest `0.49.1` -> `0.50.0`. ([#1741](https://github.com/diffplug/spotless/issues/1741))
   * Dropped support for `ktlint 0.47.x` following our policy of supporting two breaking changes at a time.
   * Dropped support for deprecated `useExperimental` parameter in favor of the `ktlint_experimental` property.
-* Bump default `prettier` version to latest (v2) `2.8.1` -> `2.8.8`. ([#9999](https://github.com/diffplug/spotless/pull/9999))
+* Bump default `prettier` version to latest (v2) `2.8.1` -> `2.8.8`. ([#1760](https://github.com/diffplug/spotless/pull/1760))
 
 ## [6.19.0] - 2023-05-24
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 98655ba3fe..823841a328 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -9,14 +9,14 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Support pass skip (`-Dspotless.skip=true`) from command-line. ([#1729](https://github.com/diffplug/spotless/pull/1729))
 ### Fixed
 * Update documented default `semanticSort` to `false`. ([#1728](https://github.com/diffplug/spotless/pull/1728))
-* Add support for `prettier` version `3.0.0` and newer. ([#9999]https://github.com/diffplug/spotless/pull/9999), [#1751](https://github.com/diffplug/spotless/issues/1751))
-* Fix npm install calls when npm cache is not up-to-date. ([#9999]https://github.com/diffplug/spotless/pull/9999), [#1750](https://github.com/diffplug/spotless/issues/1750))
+* Add support for `prettier` version `3.0.0` and newer. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
+* Fix npm install calls when npm cache is not up-to-date. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))
 ### Changes
 * Bump default `cleanthat` version to latest `2.13` -> `2.17`. ([#1734](https://github.com/diffplug/spotless/pull/1734))
 * Bump default `ktlint` version to latest `0.49.1` -> `0.50.0`. ([#1741](https://github.com/diffplug/spotless/issues/1741))
   * Dropped support for `ktlint 0.47.x` following our policy of supporting two breaking changes at a time.
   * Dropped support for deprecated `useExperimental` parameter in favor of the `ktlint_experimental` property.
-* Bump default `prettier` version to latest (v2) `2.8.1` -> `2.8.8`. ([#9999](https://github.com/diffplug/spotless/pull/9999))
+* Bump default `prettier` version to latest (v2) `2.8.1` -> `2.8.8`. ([#1760](https://github.com/diffplug/spotless/pull/1760))
 
 ## [2.37.0] - 2023-05-24
 ### Added

From 7a4268b7e6768c072527432b160e00d071c36c57 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 18 Jul 2023 14:50:25 +0200
Subject: [PATCH 1148/2068] fix: resolves spotbugs issue (serializability of
 exception)

---
 .../java/com/diffplug/spotless/npm/NpmProcessException.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmProcessException.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmProcessException.java
index 33c6fb8d28..c2e8444bcc 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmProcessException.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmProcessException.java
@@ -21,7 +21,7 @@
 
 public class NpmProcessException extends RuntimeException {
 	private static final long serialVersionUID = 6424331316676759525L;
-	private final ProcessRunner.Result result;
+	private final transient ProcessRunner.Result result;
 
 	public NpmProcessException(String message, ProcessRunner.Result result) {
 		super(message);

From a24908528cb3c7c35f3eee576814ce067bc60e7a Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 18 Jul 2023 15:01:42 +0200
Subject: [PATCH 1149/2068] docs: move to Unreleased

---
 CHANGES.md               | 9 +++++----
 plugin-gradle/CHANGES.md | 9 +++++----
 plugin-maven/CHANGES.md  | 8 +++++---
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 00241182b0..e54f6f6108 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,11 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Add support for `prettier` version `3.0.0` and newer. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
+* Fix npm install calls when npm cache is not up-to-date. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))
+### Changes
+* Bump default `prettier` version to latest (v2) `2.8.1` -> `2.8.8`. ([#1760](https://github.com/diffplug/spotless/pull/1760))
 
 ## [2.40.0] - 2023-07-17
 ### Added
@@ -17,15 +22,11 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * `enum OnMatch { INCLUDE, EXCLUDE }` so that `FormatterStep.filterByContent` can not only include based on the pattern but also exclude. ([#1749](https://github.com/diffplug/spotless/pull/1749))
 ### Fixed
 * Update documented default `semanticSort` to `false`. ([#1728](https://github.com/diffplug/spotless/pull/1728))
-* Add support for `prettier` version `3.0.0` and newer. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
-* Fix npm install calls when npm cache is not up-to-date. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))
-
 ### Changes
 * Bump default `cleanthat` version to latest `2.13` -> `2.17`. ([#1734](https://github.com/diffplug/spotless/pull/1734))
 * Bump default `ktlint` version to latest `0.49.1` -> `0.50.0`. ([#1741](https://github.com/diffplug/spotless/issues/1741))
   * Dropped support for `ktlint 0.47.x` following our policy of supporting two breaking changes at a time.
   * Dropped support for deprecated `useExperimental` parameter in favor of the `ktlint_experimental` property.
-* Bump default `prettier` version to latest (v2) `2.8.1` -> `2.8.8`. ([#1760](https://github.com/diffplug/spotless/pull/1760))
 
 ## [2.39.0] - 2023-05-24
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 4358e9f26c..b2e3972bba 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,11 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Add support for `prettier` version `3.0.0` and newer. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
+* Fix npm install calls when npm cache is not up-to-date. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))
+### Changes
+* Bump default `prettier` version to latest (v2) `2.8.1` -> `2.8.8`. ([#1760](https://github.com/diffplug/spotless/pull/1760))
 
 ## [6.20.0] - 2023-07-17
 ### Added
@@ -18,15 +23,11 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
     }
   }
   ```
-* Add support for `prettier` version `3.0.0` and newer. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
-* Fix npm install calls when npm cache is not up-to-date. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))
 ### Changes
 * Bump default `cleanthat` version to latest `2.13` -> `2.17`. ([#1734](https://github.com/diffplug/spotless/pull/1734))
 * Bump default `ktlint` version to latest `0.49.1` -> `0.50.0`. ([#1741](https://github.com/diffplug/spotless/issues/1741))
   * Dropped support for `ktlint 0.47.x` following our policy of supporting two breaking changes at a time.
   * Dropped support for deprecated `useExperimental` parameter in favor of the `ktlint_experimental` property.
-* Bump default `prettier` version to latest (v2) `2.8.1` -> `2.8.8`. ([#1760](https://github.com/diffplug/spotless/pull/1760))
-
 ## [6.19.0] - 2023-05-24
 ### Added
 * Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. ([#1663](https://github.com/diffplug/spotless/pull/1663))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 823841a328..dcccd5d2ba 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,20 +3,22 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Add support for `prettier` version `3.0.0` and newer. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
+* Fix npm install calls when npm cache is not up-to-date. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))
+### Changes
+* Bump default `prettier` version to latest (v2) `2.8.1` -> `2.8.8`. ([#1760](https://github.com/diffplug/spotless/pull/1760))
 
 ## [2.38.0] - 2023-07-17
 ### Added
 * Support pass skip (`-Dspotless.skip=true`) from command-line. ([#1729](https://github.com/diffplug/spotless/pull/1729))
 ### Fixed
 * Update documented default `semanticSort` to `false`. ([#1728](https://github.com/diffplug/spotless/pull/1728))
-* Add support for `prettier` version `3.0.0` and newer. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
-* Fix npm install calls when npm cache is not up-to-date. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))
 ### Changes
 * Bump default `cleanthat` version to latest `2.13` -> `2.17`. ([#1734](https://github.com/diffplug/spotless/pull/1734))
 * Bump default `ktlint` version to latest `0.49.1` -> `0.50.0`. ([#1741](https://github.com/diffplug/spotless/issues/1741))
   * Dropped support for `ktlint 0.47.x` following our policy of supporting two breaking changes at a time.
   * Dropped support for deprecated `useExperimental` parameter in favor of the `ktlint_experimental` property.
-* Bump default `prettier` version to latest (v2) `2.8.1` -> `2.8.8`. ([#1760](https://github.com/diffplug/spotless/pull/1760))
 
 ## [2.37.0] - 2023-05-24
 ### Added

From 3577f4e2d4d42b7bf055067827e36194a984afef Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 18 Jul 2023 15:27:13 +0200
Subject: [PATCH 1150/2068] fix: provide "lower" default versions for
 ts_standard

as the upstream package has incompatible version restrictions otherwise
---
 .../main/java/com/diffplug/spotless/npm/EslintStyleGuide.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/testlib/src/main/java/com/diffplug/spotless/npm/EslintStyleGuide.java b/testlib/src/main/java/com/diffplug/spotless/npm/EslintStyleGuide.java
index ad5cb2ba2e..cb6f1325df 100644
--- a/testlib/src/main/java/com/diffplug/spotless/npm/EslintStyleGuide.java
+++ b/testlib/src/main/java/com/diffplug/spotless/npm/EslintStyleGuide.java
@@ -29,7 +29,9 @@ public enum EslintStyleGuide {
 		@Override
 		public @Nonnull Map<String, String> devDependencies() {
 			Map<String, String> dependencies = new LinkedHashMap<>();
-			dependencies.put("eslint-config-standard-with-typescript", "^36.1.0");
+			dependencies.put("@typescript-eslint/eslint-plugin", "^5.62.0");
+			dependencies.put("@typescript-eslint/parser", "^5.62.0");
+			dependencies.put("eslint-config-standard-with-typescript", "^36.0.1");
 			dependencies.put("eslint-plugin-import", "^2.27.5");
 			dependencies.put("eslint-plugin-n", "^16.0.1");
 			dependencies.put("eslint-plugin-promise", "^6.1.1");

From 7be049efc08def31b0a3f98d75a9253e959da960 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 18 Jul 2023 15:35:18 +0200
Subject: [PATCH 1151/2068] fix: adapt tests to work with newer prettier
 versions

---
 .../NpmTestsWithoutNpmInstallationTest.java      | 16 ++++++++--------
 ...ationTest_gradle_node_plugin_example_1.gradle |  2 +-
 ...ationTest_gradle_node_plugin_example_2.gradle |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
index 03d14292e9..363d88c0c0 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
@@ -40,7 +40,7 @@ void useNodeAndNpmFromNodeGradlePlugin() throws Exception {
 					"    npmWorkDir = file(\"${buildDir}/npm\")",
 					"}",
 					"def prettierConfig = [:]",
-					"prettierConfig['printWidth'] = 50",
+					"prettierConfig['printWidth'] = 20",
 					"prettierConfig['parser'] = 'typescript'",
 					"def npmExec = System.getProperty('os.name').toLowerCase().contains('windows') ? '/npm.cmd' : '/bin/npm'",
 					"def nodeExec = System.getProperty('os.name').toLowerCase().contains('windows') ? '/node.exe' : '/bin/node'",
@@ -59,7 +59,7 @@ void useNodeAndNpmFromNodeGradlePlugin() throws Exception {
 			// then run spotless using that node installation
 			final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
 			Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
-			assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile.clean");
+			assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile_prettier_2.clean");
 		} catch (Exception e) {
 			printContents();
 			throw e;
@@ -79,7 +79,7 @@ void useNodeAndNpmFromNodeGradlePlugin_example1() throws Exception {
 			setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
 			final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
 			Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
-			assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile.clean");
+			assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile_prettier_2.clean");
 		} catch (Exception e) {
 			printContents();
 			throw e;
@@ -93,7 +93,7 @@ void useNpmFromNodeGradlePlugin_example2() throws Exception {
 			setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
 			final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
 			Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
-			assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile.clean");
+			assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile_prettier_2.clean");
 		} catch (Exception e) {
 			printContents();
 			throw e;
@@ -115,7 +115,7 @@ void useNpmFromNodeGradlePlugin() throws Exception {
 					"    workDir = file(\"${buildDir}/nodejs\")",
 					"}",
 					"def prettierConfig = [:]",
-					"prettierConfig['printWidth'] = 50",
+					"prettierConfig['printWidth'] = 20",
 					"prettierConfig['parser'] = 'typescript'",
 					"def npmExec = System.getProperty('os.name').toLowerCase().contains('windows') ? '/npm.cmd' : '/bin/npm'",
 					"spotless {",
@@ -132,7 +132,7 @@ void useNpmFromNodeGradlePlugin() throws Exception {
 			// then run spotless using that node installation
 			final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
 			Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
-			assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile.clean");
+			assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile_prettier_2.clean");
 		} catch (Exception e) {
 			printContents();
 			throw e;
@@ -154,7 +154,7 @@ void useNpmNextToConfiguredNodePluginFromNodeGradlePlugin() throws Exception {
 					"    workDir = file(\"${buildDir}/nodejs\")",
 					"}",
 					"def prettierConfig = [:]",
-					"prettierConfig['printWidth'] = 50",
+					"prettierConfig['printWidth'] = 20",
 					"prettierConfig['parser'] = 'typescript'",
 					"def nodeExec = System.getProperty('os.name').toLowerCase().contains('windows') ? '/node.exe' : '/bin/node'",
 					"spotless {",
@@ -171,7 +171,7 @@ void useNpmNextToConfiguredNodePluginFromNodeGradlePlugin() throws Exception {
 			// then run spotless using that node installation
 			final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
 			Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
-			assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile.clean");
+			assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile_prettier_2.clean");
 		} catch (Exception e) {
 			printContents();
 			throw e;
diff --git a/plugin-gradle/src/test/resources/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest_gradle_node_plugin_example_1.gradle b/plugin-gradle/src/test/resources/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest_gradle_node_plugin_example_1.gradle
index 7ec7a2c592..c5acf5bbc5 100644
--- a/plugin-gradle/src/test/resources/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest_gradle_node_plugin_example_1.gradle
+++ b/plugin-gradle/src/test/resources/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest_gradle_node_plugin_example_1.gradle
@@ -16,7 +16,7 @@ node {
     npmWorkDir = file("${buildDir}/npm")
 }
 def prettierConfig = [:]
-prettierConfig['printWidth'] = 50
+prettierConfig['printWidth'] = 20
 prettierConfig['parser'] = 'typescript'
 
 // the executable names
diff --git a/plugin-gradle/src/test/resources/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest_gradle_node_plugin_example_2.gradle b/plugin-gradle/src/test/resources/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest_gradle_node_plugin_example_2.gradle
index eb59b85cf0..ef843a8475 100644
--- a/plugin-gradle/src/test/resources/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest_gradle_node_plugin_example_2.gradle
+++ b/plugin-gradle/src/test/resources/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest_gradle_node_plugin_example_2.gradle
@@ -14,7 +14,7 @@ node {
     workDir = file("${buildDir}/nodejs")
 }
 def prettierConfig = [:]
-prettierConfig['printWidth'] = 50
+prettierConfig['printWidth'] = 20
 prettierConfig['parser'] = 'typescript'
 
 // the executable name

From aa4893b1942778c3d7b69dae89977cb0aba2b13c Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 18 Jul 2023 15:55:50 +0200
Subject: [PATCH 1152/2068] fix: create valid poms when using eslint
 styleguides

(and enable the missed and disabled xo test in maven part)
---
 .../spotless/maven/typescript/TypescriptFormatStepTest.java   | 2 --
 .../main/java/com/diffplug/spotless/npm/EslintStyleGuide.java | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/typescript/TypescriptFormatStepTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/typescript/TypescriptFormatStepTest.java
index 911cfad201..a09111d30d 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/typescript/TypescriptFormatStepTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/typescript/TypescriptFormatStepTest.java
@@ -19,7 +19,6 @@
 
 import java.io.IOException;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.ProcessRunner;
@@ -211,7 +210,6 @@ void eslintStyleguideStandardWithTypescript() throws Exception {
 	}
 
 	@Test
-	@Disabled("https://github.com/diffplug/spotless/issues/1756")
 	void eslintStyleguideXo() throws Exception {
 		writePomWithTypescriptSteps(
 				TEST_FILE_PATH,
diff --git a/testlib/src/main/java/com/diffplug/spotless/npm/EslintStyleGuide.java b/testlib/src/main/java/com/diffplug/spotless/npm/EslintStyleGuide.java
index cb6f1325df..874ae1905d 100644
--- a/testlib/src/main/java/com/diffplug/spotless/npm/EslintStyleGuide.java
+++ b/testlib/src/main/java/com/diffplug/spotless/npm/EslintStyleGuide.java
@@ -115,8 +115,8 @@ public String asGradleMapStringMergedWith(Map<String, String> devDependencies) {
 
 	public String asMavenXmlStringMergedWith(Map<String, String> devDependencies) {
 		return mergedWith(devDependencies).entrySet().stream()
-				.map(entry -> "<" + entry.getKey() + ">" + entry.getValue() + "</" + entry.getKey() + ">")
-				.collect(Collectors.joining("", "<devDependencies>", "</devDependencies>"));
+				.map(entry -> String.format("<property><name>%s</name><value>%s</value></property>", entry.getKey(), entry.getValue()))
+				.collect(Collectors.joining("", "<devDependencyProperties>", "</devDependencyProperties>"));
 	}
 
 }

From 98943c33a41db287054569cbf3cfcfb01ee9a0ba Mon Sep 17 00:00:00 2001
From: David Gregory <2992938+DavidGregory084@users.noreply.github.com>
Date: Tue, 18 Jul 2023 15:05:10 +0100
Subject: [PATCH 1153/2068] Update changelogs and documentation

---
 CHANGES.md               |  2 ++
 README.md                |  2 ++
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 44 ++++++++++++++++++++++++++++++++++++++++
 plugin-maven/CHANGES.md  |  2 ++
 plugin-maven/README.md   | 24 ++++++++++++++++++----
 6 files changed, 72 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index cc6dcd7331..c026b4a099 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* Add an `applyJsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
 
 ## [2.40.0] - 2023-07-17
 ### Added
diff --git a/README.md b/README.md
index 3e0c4e17e1..255dbe6813 100644
--- a/README.md
+++ b/README.md
@@ -89,6 +89,7 @@ lib('java.CleanthatJavaStep')                    +'{{yes}}       | {{yes}}
 lib('json.gson.GsonStep')                        +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('json.JacksonJsonStep')                      +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('json.JsonSimpleStep')                       +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
+lib('json.ApplyJsonPatchStep')                   +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('kotlin.KtLintStep')                         +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
 lib('kotlin.KtfmtStep')                          +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('kotlin.DiktatStep')                         +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
@@ -140,6 +141,7 @@ lib('yaml.JacksonYamlStep')                      +'{{yes}}       | {{yes}}
 | [`json.gson.GsonStep`](lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`json.JacksonJsonStep`](lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`json.JsonSimpleStep`](lib/src/main/java/com/diffplug/spotless/json/JsonSimpleStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
+| [`json.ApplyJsonPatchStep`](lib/src/main/java/com/diffplug/spotless/json/ApplyJsonPatchStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`kotlin.KtLintStep`](lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`kotlin.KtfmtStep`](lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`kotlin.DiktatStep`](lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 6d8bee7169..27541bc568 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Added
+* Add an `applyJsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
 
 ## [6.20.0] - 2023-07-17
 ### Added
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index e04697766a..a8ebf45cbe 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -811,6 +811,7 @@ spotless {
     gson()                                // has its own section below
     jackson()                             // has its own section below
     rome()                                // has its own section below
+    applyJsonPatch([])                    // has its own section below
   }
 }
 ```
@@ -872,6 +873,49 @@ spotless {
 }
 ```
 
+### applyJsonPatch
+
+Uses [zjsonpatch](https://github.com/flipkart-incubator/zjsonpatch) to apply [JSON Patches](https://jsonpatch.com/) as per [RFC 6902](https://datatracker.ietf.org/doc/html/rfc6902/) to JSON documents.
+
+This enables you to add, replace or remove properties at locations in the JSON document that you specify using [JSON Pointers](https://datatracker.ietf.org/doc/html/rfc6901/).
+
+In Spotless Gradle, these JSON patches are represented as a `List<Map<String, Object>>`, or a list of patch operations.
+
+Each patch operation must be a map with the following properties:
+
+* `"op"` - the operation to apply, one of `"replace"`, `"add"` or `"remove"`.
+* `"path"` - a JSON Pointer string, for example `"/foo"`
+* `"value"` - the value to `"add"` or `"replace"` at the specified path. Not needed for `"remove"` operations.
+
+For example, to apply the patch from the [JSON Patch homepage](https://jsonpatch.com/#the-patch):
+
+```gradle
+spotless {
+  json {
+    target 'src/**/*.json'
+    applyJsonPatch([
+      [op: 'replace', path: '/baz', value: 'boo'],
+      [op: 'add', path: '/hello', value: ['world']],
+      [op: 'remove', path: '/foo']
+    ])
+  }
+}
+```
+
+Or using the Kotlin DSL:
+
+```kotlin
+spotless {
+  json {
+    target("src/**/*.json")
+    applyJsonPatch(listOf(
+      mapOf("op" to "replace", "path" to "/baz", "value" to "boo"),
+      mapOf("op" to "add", "path" to "/hello", "value" to listOf("world")),
+      mapOf("op" to "remove", "path" to "/foo")
+    ))
+  }
+}
+```
 
 ## YAML
 
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 72d40dfe10..fd471afdcc 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* Add an `applyJsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
 
 ## [2.38.0] - 2023-07-17
 ### Added
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index c1ffd31e40..1332829dc2 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -897,10 +897,11 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
       <include>src/**/*.json</include>
     </includes>
 
-    <simple />    <!-- has its own section below -->
-    <gson />      <!-- has its own section below -->
-    <jackson />   <!-- has its own section below -->
-    <rome />      <!-- has its own section below -->
+    <simple />         <!-- has its own section below -->
+    <gson />           <!-- has its own section below -->
+    <jackson />        <!-- has its own section below -->
+    <rome />           <!-- has its own section below -->
+    <applyJsonPatch /> <!-- has its own section below -->
   </json>
 </configuration>
 ```
@@ -957,6 +958,21 @@ Uses Jackson for formatting.
 
 <a name="applying-prettier-to-javascript--flow--typescript--css--scss--less--jsx--graphql--yaml--etc"></a>
 
+### applyJsonPatch
+
+Uses [zjsonpatch](https://github.com/flipkart-incubator/zjsonpatch) to apply [JSON Patches](https://jsonpatch.com/) as per [RFC 6902](https://datatracker.ietf.org/doc/html/rfc6902/) to JSON documents.
+
+This enables you to add, replace or remove properties at locations in the JSON document that you specify using [JSON Pointers](https://datatracker.ietf.org/doc/html/rfc6901/).
+
+For example, to apply the patch from the [JSON Patch homepage](https://jsonpatch.com/#the-patch):
+
+```xml
+<applyJsonPatch>[
+  { "op": "replace", "path": "/baz", "value": "boo" },
+  { "op": "add", "path": "/hello", "value": ["world"] },
+  { "op": "remove", "path": "/foo" }
+]</applyJsonPatch>
+```
 
 ## YAML
 

From 217c56198d0997a62a56a38f6dfa6509085bed93 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 18 Jul 2023 16:16:15 +0200
Subject: [PATCH 1154/2068] fix: adapt for prettier upgrades

---
 .../NpmInstallCacheIntegrationTests.java      |  4 +-
 .../spotless/PrettierIntegrationTest.java     | 24 +++++-----
 .../prettier/PrettierFormatStepTest.java      | 12 ++---
 .../npm/prettier/plugins/java-test.clean      |  5 ++-
 .../resources/npm/prettier/plugins/php.clean  | 44 +++++++++----------
 .../npm/PrettierFormatterStepTest.java        |  2 +-
 6 files changed, 46 insertions(+), 45 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmInstallCacheIntegrationTests.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmInstallCacheIntegrationTests.java
index 3a690fbc55..e7ad5f1654 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmInstallCacheIntegrationTests.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmInstallCacheIntegrationTests.java
@@ -112,8 +112,8 @@ private BuildResult runPhpPrettierOnDir(File projDir, File cacheDir) throws IOEx
 				"prettierConfig['tabWidth'] = 3",
 				"prettierConfig['parser'] = 'php'",
 				"def prettierPackages = [:]",
-				"prettierPackages['prettier'] = '2.0.5'",
-				"prettierPackages['@prettier/plugin-php'] = '0.14.2'",
+				"prettierPackages['prettier'] = '2.8.8'",
+				"prettierPackages['@prettier/plugin-php'] = '0.19.6'",
 				"spotless {",
 				"    format 'php', {",
 				"        target 'php-example.php'",
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java
index a6b2ea9dc8..4d5069c1b5 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java
@@ -33,7 +33,7 @@ void useInlineConfig() throws IOException {
 				"}",
 				"repositories { mavenCentral() }",
 				"def prettierConfig = [:]",
-				"prettierConfig['printWidth'] = 50",
+				"prettierConfig['printWidth'] = 20",
 				"prettierConfig['parser'] = 'typescript'",
 				"spotless {",
 				"    format 'mytypescript', {",
@@ -44,7 +44,7 @@ void useInlineConfig() throws IOException {
 		setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
 		final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
 		Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
-		assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile.clean");
+		assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile_prettier_2.clean");
 	}
 
 	@Test
@@ -88,7 +88,7 @@ void useFileConfig() throws IOException {
 		setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
 		final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
 		Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
-		assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile.clean");
+		assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile_prettier_2.clean");
 	}
 
 	@Test
@@ -121,8 +121,8 @@ void useJavaCommunityPlugin() throws IOException {
 				"prettierConfig['tabWidth'] = 4",
 				"prettierConfig['parser'] = 'java'",
 				"def prettierPackages = [:]",
-				"prettierPackages['prettier'] = '2.0.5'",
-				"prettierPackages['prettier-plugin-java'] = '0.8.0'",
+				"prettierPackages['prettier'] = '2.8.8'",
+				"prettierPackages['prettier-plugin-java'] = '2.2.0'",
 				"spotless {",
 				"    format 'java', {",
 				"        target 'JavaTest.java'",
@@ -145,7 +145,7 @@ void suggestsMissingJavaCommunityPlugin() throws IOException {
 				"def prettierConfig = [:]",
 				"prettierConfig['tabWidth'] = 4",
 				"def prettierPackages = [:]",
-				"prettierPackages['prettier'] = '2.0.5'",
+				"prettierPackages['prettier'] = '2.8.8'",
 				"spotless {",
 				"    format 'java', {",
 				"        target 'JavaTest.java'",
@@ -169,8 +169,8 @@ void usePhpCommunityPlugin() throws IOException {
 				"prettierConfig['tabWidth'] = 3",
 				"prettierConfig['parser'] = 'php'",
 				"def prettierPackages = [:]",
-				"prettierPackages['prettier'] = '2.0.5'",
-				"prettierPackages['@prettier/plugin-php'] = '0.14.2'",
+				"prettierPackages['prettier'] = '2.8.8'",
+				"prettierPackages['@prettier/plugin-php'] = '0.19.6'",
 				"spotless {",
 				"    format 'php', {",
 				"        target 'php-example.php'",
@@ -199,14 +199,14 @@ void usePhpAndJavaCommunityPlugin() throws IOException {
 				"prettierConfigPhp['tabWidth'] = 3",
 				"prettierConfigPhp['parser'] = 'php'",
 				"def prettierPackagesPhp = [:]",
-				"prettierPackagesPhp['prettier'] = '2.0.5'",
-				"prettierPackagesPhp['@prettier/plugin-php'] = '0.14.2'",
+				"prettierPackagesPhp['prettier'] = '2.8.8'",
+				"prettierPackagesPhp['@prettier/plugin-php'] = '0.19.6'",
 				"def prettierConfigJava = [:]",
 				"prettierConfigJava['tabWidth'] = 4",
 				"prettierConfigJava['parser'] = 'java'",
 				"def prettierPackagesJava = [:]",
-				"prettierPackagesJava['prettier'] = '2.0.5'",
-				"prettierPackagesJava['prettier-plugin-java'] = '0.8.0'",
+				"prettierPackagesJava['prettier'] = '2.8.8'",
+				"prettierPackagesJava['prettier-plugin-java'] = '2.2.0'",
 				"spotless {",
 				"    format 'php', {",
 				"        target 'php-example.php'",
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/prettier/PrettierFormatStepTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/prettier/PrettierFormatStepTest.java
index 78a0fc30ff..9cd1a313eb 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/prettier/PrettierFormatStepTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/prettier/PrettierFormatStepTest.java
@@ -120,11 +120,11 @@ void multiple_prettier_configs() throws Exception {
 								"  <devDependencyProperties>",
 								"    <property>",
 								"      <name>prettier</name>",
-								"      <value>2.0.5</value>",
+								"      <value>2.8.8</value>",
 								"    </property>",
 								"    <property>",
 								"      <name>@prettier/plugin-php</name>",
-								"      <value>0.14.2</value>",
+								"      <value>0.19.6</value>",
 								"    </property>",
 								"  </devDependencyProperties>",
 								"  <config>",
@@ -137,11 +137,11 @@ void multiple_prettier_configs() throws Exception {
 								"  <devDependencyProperties>",
 								"    <property>",
 								"      <name>prettier</name>",
-								"      <value>2.0.5</value>",
+								"      <value>2.8.8</value>",
 								"    </property>",
 								"    <property>",
 								"      <name>prettier-plugin-java</name>",
-								"      <value>0.8.0</value>",
+								"      <value>2.2.0</value>",
 								"    </property>",
 								"  </devDependencyProperties>",
 								"  <config>",
@@ -166,11 +166,11 @@ void custom_plugin() throws Exception {
 				"  <devDependencyProperties>",
 				"    <property>",
 				"      <name>prettier</name>",
-				"      <value>2.0.5</value>",
+				"      <value>2.8.8</value>",
 				"    </property>",
 				"    <property>",
 				"      <name>@prettier/plugin-php</name>",
-				"      <value>0.14.2</value>",
+				"      <value>0.19.6</value>",
 				"    </property>",
 				"  </devDependencyProperties>",
 				"  <config>",
diff --git a/testlib/src/main/resources/npm/prettier/plugins/java-test.clean b/testlib/src/main/resources/npm/prettier/plugins/java-test.clean
index c45ffe5183..93cf43955f 100644
--- a/testlib/src/main/resources/npm/prettier/plugins/java-test.clean
+++ b/testlib/src/main/resources/npm/prettier/plugins/java-test.clean
@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.function.Consumer;
 
 public class JavaTest {
+
     private static final String NAME = "JavaTest";
 
     private List<String> strings = new ArrayList<>();
@@ -30,8 +31,8 @@ public class JavaTest {
         JavaTest javaTest = new JavaTest("1", "2", "3");
         System.out.println("joined: " + javaTest.join(','));
         StringBuilder builder = new StringBuilder();
-        javaTest.operateOn(
-            strings -> builder.append(String.join("---", strings))
+        javaTest.operateOn(strings ->
+            builder.append(String.join("---", strings))
         );
     }
 }
diff --git a/testlib/src/main/resources/npm/prettier/plugins/php.clean b/testlib/src/main/resources/npm/prettier/plugins/php.clean
index 4c8710bbee..067647a029 100644
--- a/testlib/src/main/resources/npm/prettier/plugins/php.clean
+++ b/testlib/src/main/resources/npm/prettier/plugins/php.clean
@@ -27,17 +27,17 @@ abstract class ReallyReallyReallyLongClassName
    // variable doc
    public $test;
    public $other = 1;
-   public static $staticTest = ['hi'];
+   public static $staticTest = ["hi"];
    static $cache;
    protected static $_instance;
-   protected $fillable = ['title', 'requester_id', 'type', 'summary', 'proof'];
+   protected $fillable = ["title", "requester_id", "type", "summary", "proof"];
    protected $fillable2 = [
-      'title',
-      'description',
-      'requester_id',
-      'type',
-      'summary',
-      'proof',
+      "title",
+      "description",
+      "requester_id",
+      "type",
+      "summary",
+      "proof",
    ];
    protected $test = [
       //test
@@ -52,7 +52,7 @@ abstract class ReallyReallyReallyLongClassName
     *
     * @return \Some\Test
     */
-   public function __construct($test, $test_int = null, $test_string = 'hi')
+   public function __construct($test, $test_int = null, $test_string = "hi")
    {
       parent::__construct($test_int ?: 1);
       $this->other = $test_string;
@@ -108,7 +108,7 @@ abstract class ReallyReallyReallyLongClassName
 
    public function returnTypeTest(): string
    {
-      return 'hi';
+      return "hi";
    }
 
    final public static function bar()
@@ -125,17 +125,17 @@ abstract class ReallyReallyReallyLongClassName
 
    public function method1()
    {
-      return 'hi';
+      return "hi";
    }
 
    public function method2()
    {
-      return 'hi';
+      return "hi";
    }
 
    public function method3()
    {
-      return 'hi';
+      return "hi";
    }
 
    public function testReturn(?string $name): ?string
@@ -164,7 +164,7 @@ abstract class ReallyReallyReallyLongClassName
       string $bar,
       int $baz
    ): string {
-      return 'foo';
+      return "foo";
    }
 
    public function longLongAnotherFunctionOther(
@@ -172,7 +172,7 @@ abstract class ReallyReallyReallyLongClassName
       string $bar,
       int $baz
    ) {
-      return 'foo';
+      return "foo";
    }
 
    public function testReturnTypeDeclaration(): object
@@ -297,13 +297,13 @@ class field extends \models\base
 {
    protected function pre_save($input, $fields)
    {
-      $input['configs'] = json_encode(
+      $input["configs"] = json_encode(
          array_merge(
             $configs,
-            $field_type->process_field_config_from_user($input['definition'])
+            $field_type->process_field_config_from_user($input["definition"])
          )
       );
-      unset($input['definition']);
+      unset($input["definition"]);
    }
 }
 
@@ -311,8 +311,8 @@ class test
 {
    public function test_method()
    {
-      $customer = (object) ['name' => 'Bob'];
-      $job = (object) ['customer' => $customer];
+      $customer = (object) ["name" => "Bob"];
+      $job = (object) ["customer" => $customer];
 
       return "The customer for that job, {$job->customer->name} has an error that shows up after the line gets waaaaay toooo long.";
    }
@@ -488,9 +488,9 @@ class User
 {
    public int $id;
    public string $name;
-   public ?string $b = 'foo';
+   public ?string $b = "foo";
    private Foo $prop;
-   protected static string $static = 'default';
+   protected static string $static = "default";
 
    public function __construct(int $id, string $name)
    {
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
index 672aec740b..769d91bc01 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
@@ -128,7 +128,7 @@ void parserInferenceBasedOnFilenameIsWorking(String prettierVersion) throws Exce
 		@Test
 		void verifyPrettierErrorMessageIsRelayed() throws Exception {
 			FormatterStep formatterStep = PrettierFormatterStep.create(
-					PrettierFormatterStep.defaultDevDependenciesWithPrettier("2.0.5"),
+					PrettierFormatterStep.defaultDevDependenciesWithPrettier("2.8.8"),
 					TestProvisioner.mavenCentral(),
 					projectDir(),
 					buildDir(),

From 6188a820f5ca18dd375164ccbcadc8a5a2f9e621 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 18 Jul 2023 16:16:28 +0200
Subject: [PATCH 1155/2068] docs: adapt for newer base versions

---
 plugin-gradle/README.md |  4 ++--
 plugin-maven/README.md  | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 2334c3ff71..3484e3cd59 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -979,11 +979,11 @@ Since spotless uses the actual npm prettier package behind the scenes, it is pos
 ```gradle
 spotless {
   java {
-    prettier(['prettier': '2.0.5', 'prettier-plugin-java': '0.8.0']).config(['parser': 'java', 'tabWidth': 4])
+    prettier(['prettier': '2.8.8', 'prettier-plugin-java': '2.2.0']).config(['parser': 'java', 'tabWidth': 4])
   }
   format 'php', {
     target 'src/**/*.php'
-    prettier(['prettier': '2.0.5', '@prettier/plugin-php': '0.14.2']).config(['parser': 'php', 'tabWidth': 3])
+    prettier(['prettier': '2.8.8', '@prettier/plugin-php': '0.19.6']).config(['parser': 'php', 'tabWidth': 3])
   }
 }
 ```
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index af32c092fd..62f2a4ea57 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -1047,11 +1047,11 @@ You can use prettier in any language-specific format, but usually you will be cr
         <devDependencyProperties>
           <property>
             <name>prettier</name>
-            <value>2.0.5</value>
+            <value>2.8.8</value>
           </property>
           <property>
             <name>@prettier/plugin-php</name> <!-- this could not be written in the simpler to write 'devDependencies' element. -->
-            <value>0.14.2</value>
+            <value>0.19.6</value>
           </property>
         </devDependencyProperties>
         <!-- Specify config file and/or inline config, the inline always trumps file -->
@@ -1097,8 +1097,8 @@ Since spotless uses the actual npm prettier package behind the scenes, it is pos
 
       <prettier>
         <devDependencies>
-            <prettier>2.0.5</prettier>
-            <prettier-plugin-java>0.8.0</prettier-plugin-java>
+            <prettier>2.8.8</prettier>
+            <prettier-plugin-java>2.2.0</prettier-plugin-java>
         </devDependencies>
         <config>
             <tabWidth>4</tabWidth>
@@ -1118,11 +1118,11 @@ Since spotless uses the actual npm prettier package behind the scenes, it is pos
         <devDependencyProperties>
           <property>
             <name>prettier</name>
-            <value>2.0.5</value>
+            <value>2.8.8</value>
           </property>
           <property>
             <name>@prettier/plugin-php</name>
-            <value>0.14.2</value>
+            <value>0.19.6</value>
           </property>
         </devDependencyProperties>
         <config>

From b4a118a41e8d0244d80c249bdcb74c9557c0f57c Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 18 Jul 2023 17:21:48 +0200
Subject: [PATCH 1156/2068] fix: upgrade to newer npm version for maybe fixing
 windows build

---
 .../gradle/spotless/NpmTestsWithoutNpmInstallationTest.java | 6 +++---
 ...tNpmInstallationTest_gradle_node_plugin_example_1.gradle | 4 ++--
 ...tNpmInstallationTest_gradle_node_plugin_example_2.gradle | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
index 363d88c0c0..d01d1ab006 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
@@ -34,8 +34,8 @@ void useNodeAndNpmFromNodeGradlePlugin() throws Exception {
 					"repositories { mavenCentral() }",
 					"node {",
 					"    download = true",
-					"    version = '18.13.0'",
-					"    npmVersion = '8.19.2'",
+					"    version = '18.16.1'",
+					"    npmVersion = '9.5.1'",
 					"    workDir = file(\"${buildDir}/nodejs\")",
 					"    npmWorkDir = file(\"${buildDir}/npm\")",
 					"}",
@@ -111,7 +111,7 @@ void useNpmFromNodeGradlePlugin() throws Exception {
 					"repositories { mavenCentral() }",
 					"node {",
 					"    download = true",
-					"    version = '18.13.0'",
+					"    version = '18.16.1'",
 					"    workDir = file(\"${buildDir}/nodejs\")",
 					"}",
 					"def prettierConfig = [:]",
diff --git a/plugin-gradle/src/test/resources/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest_gradle_node_plugin_example_1.gradle b/plugin-gradle/src/test/resources/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest_gradle_node_plugin_example_1.gradle
index c5acf5bbc5..c0fa255bcc 100644
--- a/plugin-gradle/src/test/resources/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest_gradle_node_plugin_example_1.gradle
+++ b/plugin-gradle/src/test/resources/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest_gradle_node_plugin_example_1.gradle
@@ -9,8 +9,8 @@ plugins {
 repositories { mavenCentral() }
 node {
     download = true
-    version = '18.13.0'
-    npmVersion = '8.19.2'
+    version = '18.16.1'
+    npmVersion = '9.5.1'
 	// when setting both these directories, npm and node will be in separate directories
     workDir = file("${buildDir}/nodejs")
     npmWorkDir = file("${buildDir}/npm")
diff --git a/plugin-gradle/src/test/resources/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest_gradle_node_plugin_example_2.gradle b/plugin-gradle/src/test/resources/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest_gradle_node_plugin_example_2.gradle
index ef843a8475..6d77bc3d69 100644
--- a/plugin-gradle/src/test/resources/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest_gradle_node_plugin_example_2.gradle
+++ b/plugin-gradle/src/test/resources/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest_gradle_node_plugin_example_2.gradle
@@ -9,7 +9,7 @@ plugins {
 repositories { mavenCentral() }
 node {
     download = true
-    version = '18.13.0'
+    version = '18.16.1'
 	// when not setting an explicit `npmWorkDir`, the npm binary will be installed next to the node binary
     workDir = file("${buildDir}/nodejs")
 }

From 0abd5c353d773c4118e29014b49a07e01c0c8a8c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 26 Jul 2023 16:42:22 +0000
Subject: [PATCH 1157/2068] chore(deps): update plugin com.gradle.enterprise to
 v3.14.1

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index b6d227dab8..57c670b977 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -23,7 +23,7 @@ plugins {
 	// https://github.com/davidburstrom/version-compatibility-gradle-plugin/tags
 	id 'io.github.davidburstrom.version-compatibility' version '0.5.0' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.enterprise
-	id 'com.gradle.enterprise' version '3.13.3'
+	id 'com.gradle.enterprise' version '3.14.1'
 	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
 	id 'dev.equo.ide' version '1.0.1' apply false
 }

From e3e8cdb0928df14d3f93e2a69739af24133f363c Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <mag@icus.se>
Date: Fri, 28 Jul 2023 15:04:57 +0200
Subject: [PATCH 1158/2068] Add information about using ratchetFrom on CI
 systems

Add the important TL;DR from #710 to the documentation where it is pertinent.
---
 plugin-gradle/README.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 3484e3cd59..33d3ede9d6 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -1326,6 +1326,15 @@ However, we strongly recommend that you use a non-local branch, such as a tag or
 
 This is especially helpful for injecting accurate copyright dates using the [license step](#license-header).
 
+### Using ratchetFrom on CI systems
+
+If you are running Spotless on a CI system, make sure you do not have a shallow clone, or `ratchetFrom` will fail with `No such reference`. Many CI systems use a shallow clone by default for performance reasons. Here is how you turn off shallow clones for some common CI systems:
+
+* **GitHub Actions**: Ad `fetch-depth: 0` to `<action>.yml`
+* **GitLab CI**: Add `GIT_DEPTH: 0` under the `variables:` section of `.gitlab-ci.yml`
+* **BitBucket Pipelines**: Add `clone: depth: full` to the build step
+* **Travis**: Add `git: depth: false` in `travis.yml`
+
 ## `spotless:off` and `spotless:on`
 
 Sometimes there is a chunk of code  which you have carefully handcrafted, and you would like to exclude just this one little part from getting clobbered by the autoformat. Some formatters have a way to do this, many don't, but who cares.  If you setup your spotless like this:

From 16f41e7d25a86913e5d0e97bc2265779466c59bb Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 28 Jul 2023 13:58:45 -0700
Subject: [PATCH 1159/2068] Condense the `ratchetFrom` CI info.

---
 plugin-gradle/README.md | 10 ++++------
 plugin-maven/README.md  |  7 +++++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 33d3ede9d6..fc0aa45a3f 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -1326,14 +1326,12 @@ However, we strongly recommend that you use a non-local branch, such as a tag or
 
 This is especially helpful for injecting accurate copyright dates using the [license step](#license-header).
 
-### Using ratchetFrom on CI systems
+### Using `ratchetFrom` on CI systems
 
-If you are running Spotless on a CI system, make sure you do not have a shallow clone, or `ratchetFrom` will fail with `No such reference`. Many CI systems use a shallow clone by default for performance reasons. Here is how you turn off shallow clones for some common CI systems:
+Many popular CI systems (GitHub, GitLab, BitBucket, and Travis) use a "shallow clone". This means that `ratchetFrom 'origin/main'` will fail with `No such reference`. You can fix this by:
 
-* **GitHub Actions**: Ad `fetch-depth: 0` to `<action>.yml`
-* **GitLab CI**: Add `GIT_DEPTH: 0` under the `variables:` section of `.gitlab-ci.yml`
-* **BitBucket Pipelines**: Add `clone: depth: full` to the build step
-* **Travis**: Add `git: depth: false` in `travis.yml`
+- calling `git fetch origin main` before you call Spotless
+- disabling the shallow clone [like so](https://github.com/diffplug/spotless/issues/710)
 
 ## `spotless:off` and `spotless:on`
 
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 62f2a4ea57..2d14c6edc7 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -1526,6 +1526,13 @@ You can explicitly disable ratchet functionality by providing the value 'NONE':
 ```
 This is useful for disabling the ratchet functionality in child projects where the parent defines a ratchetFrom value.
 
+### Using `ratchetFrom` on CI systems
+
+Many popular CI systems (GitHub, GitLab, BitBucket, and Travis) use a "shallow clone". This means that `<ratchetFrom>origin/main</ratchetFrom>` will fail with `No such reference`. You can fix this by:
+
+- calling `git fetch origin main` before you call Spotless
+- disabling the shallow clone [like so](https://github.com/diffplug/spotless/issues/710)
+
 ## `spotless:off` and `spotless:on`
 
 Sometimes there is a chunk of code  which you have carefully handcrafted, and you would like to exclude just this one little part from getting clobbered by the autoformat. Some formatters have a way to do this, many don't, but who cares. If you setup your spotless like this:

From 1eb2a4f59ff3e9cd8a551cc79b312a2243a84b6d Mon Sep 17 00:00:00 2001
From: David Gregory <2992938+DavidGregory084@users.noreply.github.com>
Date: Mon, 31 Jul 2023 16:02:32 +0100
Subject: [PATCH 1160/2068] Rename `applyJsonPatch` functionality to
 `jsonPatch`

---
 CHANGES.md                                    |  2 +-
 README.md                                     |  4 ++--
 ...yJsonPatchStep.java => JsonPatchStep.java} |  6 +++---
 ...rFunc.java => JsonPatchFormatterFunc.java} |  6 +++---
 plugin-gradle/CHANGES.md                      |  2 +-
 plugin-gradle/README.md                       |  8 ++++----
 .../gradle/spotless/JsonExtension.java        | 20 +++++++++----------
 .../gradle/spotless/JsonExtensionTest.java    |  8 ++++----
 plugin-maven/CHANGES.md                       |  2 +-
 plugin-maven/README.md                        |  8 ++++----
 .../diffplug/spotless/maven/json/Json.java    |  4 ++--
 .../{ApplyJsonPatch.java => JsonPatch.java}   |  8 ++++----
 .../spotless/maven/json/JsonTest.java         |  8 ++++----
 13 files changed, 43 insertions(+), 43 deletions(-)
 rename lib/src/main/java/com/diffplug/spotless/json/{ApplyJsonPatchStep.java => JsonPatchStep.java} (96%)
 rename lib/src/zjsonPatch/java/com/diffplug/spotless/glue/json/{ApplyJsonPatchFormatterFunc.java => JsonPatchFormatterFunc.java} (88%)
 rename plugin-maven/src/main/java/com/diffplug/spotless/maven/json/{ApplyJsonPatch.java => JsonPatch.java} (80%)

diff --git a/CHANGES.md b/CHANGES.md
index f65f4f23fc..2b60913d67 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,7 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* Add an `applyJsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
+* Add a `jsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
 ### Fixed
 * Use latest versions of popular style guides for `eslint` tests to fix failing `useEslintXoStandardRules` test. ([#1761](https://github.com/diffplug/spotless/pull/1761), [#1756](https://github.com/diffplug/spotless/issues/1756))
 * Add support for `prettier` version `3.0.0` and newer. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
diff --git a/README.md b/README.md
index 255dbe6813..cd1e736014 100644
--- a/README.md
+++ b/README.md
@@ -89,7 +89,7 @@ lib('java.CleanthatJavaStep')                    +'{{yes}}       | {{yes}}
 lib('json.gson.GsonStep')                        +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('json.JacksonJsonStep')                      +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('json.JsonSimpleStep')                       +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
-lib('json.ApplyJsonPatchStep')                   +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
+lib('json.JsonPatchStep')                        +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('kotlin.KtLintStep')                         +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
 lib('kotlin.KtfmtStep')                          +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('kotlin.DiktatStep')                         +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
@@ -141,7 +141,7 @@ lib('yaml.JacksonYamlStep')                      +'{{yes}}       | {{yes}}
 | [`json.gson.GsonStep`](lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`json.JacksonJsonStep`](lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`json.JsonSimpleStep`](lib/src/main/java/com/diffplug/spotless/json/JsonSimpleStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
-| [`json.ApplyJsonPatchStep`](lib/src/main/java/com/diffplug/spotless/json/ApplyJsonPatchStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
+| [`json.JsonPatchStep`](lib/src/main/java/com/diffplug/spotless/json/JsonPatchStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`kotlin.KtLintStep`](lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`kotlin.KtfmtStep`](lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`kotlin.DiktatStep`](lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
diff --git a/lib/src/main/java/com/diffplug/spotless/json/ApplyJsonPatchStep.java b/lib/src/main/java/com/diffplug/spotless/json/JsonPatchStep.java
similarity index 96%
rename from lib/src/main/java/com/diffplug/spotless/json/ApplyJsonPatchStep.java
rename to lib/src/main/java/com/diffplug/spotless/json/JsonPatchStep.java
index 84f39f5b23..71f4380264 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/ApplyJsonPatchStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/JsonPatchStep.java
@@ -28,12 +28,12 @@
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
 
-public class ApplyJsonPatchStep {
+public class JsonPatchStep {
 	// https://mvnrepository.com/artifact/com.flipkart.zjsonpatch/zjsonpatch
 	static final String MAVEN_COORDINATE = "com.flipkart.zjsonpatch:zjsonpatch";
 	static final String DEFAULT_VERSION = "0.4.14";
 
-	private ApplyJsonPatchStep() {}
+	private JsonPatchStep() {}
 
 	public static FormatterStep create(String patchString, Provisioner provisioner) {
 		return create(DEFAULT_VERSION, patchString, provisioner);
@@ -77,7 +77,7 @@ private State(String zjsonPatchVersion, String patchString, Provisioner provisio
 		}
 
 		FormatterFunc toFormatter() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException {
-			Class<?> formatterFunc = jarState.getClassLoader().loadClass("com.diffplug.spotless.glue.json.ApplyJsonPatchFormatterFunc");
+			Class<?> formatterFunc = jarState.getClassLoader().loadClass("com.diffplug.spotless.glue.json.JsonPatchFormatterFunc");
 			if (this.patch != null) {
 				Constructor<?> constructor = formatterFunc.getConstructor(List.class);
 				return (FormatterFunc) constructor.newInstance(patch);
diff --git a/lib/src/zjsonPatch/java/com/diffplug/spotless/glue/json/ApplyJsonPatchFormatterFunc.java b/lib/src/zjsonPatch/java/com/diffplug/spotless/glue/json/JsonPatchFormatterFunc.java
similarity index 88%
rename from lib/src/zjsonPatch/java/com/diffplug/spotless/glue/json/ApplyJsonPatchFormatterFunc.java
rename to lib/src/zjsonPatch/java/com/diffplug/spotless/glue/json/JsonPatchFormatterFunc.java
index 1ba6084a67..dd2f053791 100644
--- a/lib/src/zjsonPatch/java/com/diffplug/spotless/glue/json/ApplyJsonPatchFormatterFunc.java
+++ b/lib/src/zjsonPatch/java/com/diffplug/spotless/glue/json/JsonPatchFormatterFunc.java
@@ -23,18 +23,18 @@
 
 import com.diffplug.spotless.FormatterFunc;
 
-public class ApplyJsonPatchFormatterFunc implements FormatterFunc {
+public class JsonPatchFormatterFunc implements FormatterFunc {
 	private final ObjectMapper objectMapper;
 	private final List<Map<String, Object>> patch;
 	private final String patchString;
 
-	public ApplyJsonPatchFormatterFunc(String patchString) {
+	public JsonPatchFormatterFunc(String patchString) {
 		this.objectMapper = new ObjectMapper();
 		this.patch = null;
 		this.patchString = patchString;
 	}
 
-	public ApplyJsonPatchFormatterFunc(List<Map<String, Object>> patch) {
+	public JsonPatchFormatterFunc(List<Map<String, Object>> patch) {
 		this.objectMapper = new ObjectMapper();
 		this.patch = patch;
 		this.patchString = null;
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index ee7ea85658..b21debb36f 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -4,7 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* Add an `applyJsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
+* Add a `jsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
 ### Fixed
 * Add support for `prettier` version `3.0.0` and newer. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
 * Fix npm install calls when npm cache is not up-to-date. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 0edd2a893a..b08c8b85bc 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -811,7 +811,7 @@ spotless {
     gson()                                // has its own section below
     jackson()                             // has its own section below
     rome()                                // has its own section below
-    applyJsonPatch([])                    // has its own section below
+    jsonPatch([])                         // has its own section below
   }
 }
 ```
@@ -873,7 +873,7 @@ spotless {
 }
 ```
 
-### applyJsonPatch
+### jsonPatch
 
 Uses [zjsonpatch](https://github.com/flipkart-incubator/zjsonpatch) to apply [JSON Patches](https://jsonpatch.com/) as per [RFC 6902](https://datatracker.ietf.org/doc/html/rfc6902/) to JSON documents.
 
@@ -893,7 +893,7 @@ For example, to apply the patch from the [JSON Patch homepage](https://jsonpatch
 spotless {
   json {
     target 'src/**/*.json'
-    applyJsonPatch([
+    jsonPatch([
       [op: 'replace', path: '/baz', value: 'boo'],
       [op: 'add', path: '/hello', value: ['world']],
       [op: 'remove', path: '/foo']
@@ -908,7 +908,7 @@ Or using the Kotlin DSL:
 spotless {
   json {
     target("src/**/*.json")
-    applyJsonPatch(listOf(
+    jsonPatch(listOf(
       mapOf("op" to "replace", "path" to "/baz", "value" to "boo"),
       mapOf("op" to "add", "path" to "/hello", "value" to listOf("world")),
       mapOf("op" to "remove", "path" to "/foo")
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
index 5e587dbd9f..8648cacea9 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
@@ -22,9 +22,9 @@
 import javax.inject.Inject;
 
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.json.ApplyJsonPatchStep;
 import com.diffplug.spotless.json.JacksonJsonConfig;
 import com.diffplug.spotless.json.JacksonJsonStep;
+import com.diffplug.spotless.json.JsonPatchStep;
 import com.diffplug.spotless.json.JsonSimpleStep;
 import com.diffplug.spotless.json.gson.GsonStep;
 
@@ -75,12 +75,12 @@ public RomeJson rome(String version) {
 		return romeConfig;
 	}
 
-	public ApplyJsonPatchConfig applyJsonPatch(List<Map<String, Object>> patch) {
-		return new ApplyJsonPatchConfig(patch);
+	public JsonPatchConfig jsonPatch(List<Map<String, Object>> patch) {
+		return new JsonPatchConfig(patch);
 	}
 
-	public ApplyJsonPatchConfig applyJsonPatch(String zjsonPatchVersion, List<Map<String, Object>> patch) {
-		return new ApplyJsonPatchConfig(zjsonPatchVersion, patch);
+	public JsonPatchConfig jsonPatch(String zjsonPatchVersion, List<Map<String, Object>> patch) {
+		return new JsonPatchConfig(zjsonPatchVersion, patch);
 	}
 
 	public class SimpleConfig {
@@ -204,28 +204,28 @@ protected RomeJson getThis() {
 		}
 	}
 
-	public class ApplyJsonPatchConfig {
+	public class JsonPatchConfig {
 		private String zjsonPatchVersion;
 		private List<Map<String, Object>> patch;
 
-		public ApplyJsonPatchConfig(List<Map<String, Object>> patch) {
+		public JsonPatchConfig(List<Map<String, Object>> patch) {
 			this(DEFAULT_ZJSONPATCH_VERSION, patch);
 		}
 
-		public ApplyJsonPatchConfig(String zjsonPatchVersion, List<Map<String, Object>> patch) {
+		public JsonPatchConfig(String zjsonPatchVersion, List<Map<String, Object>> patch) {
 			this.zjsonPatchVersion = zjsonPatchVersion;
 			this.patch = patch;
 			addStep(createStep());
 		}
 
-		public ApplyJsonPatchConfig version(String zjsonPatchVersion) {
+		public JsonPatchConfig version(String zjsonPatchVersion) {
 			this.zjsonPatchVersion = zjsonPatchVersion;
 			replaceStep(createStep());
 			return this;
 		}
 
 		private FormatterStep createStep() {
-			return ApplyJsonPatchStep.create(zjsonPatchVersion, patch, provisioner());
+			return JsonPatchStep.create(zjsonPatchVersion, patch, provisioner());
 		}
 	}
 }
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JsonExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JsonExtensionTest.java
index ea1358ccee..73e443b915 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JsonExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JsonExtensionTest.java
@@ -158,7 +158,7 @@ void jacksonFormattingWithSortingByKeys() throws IOException {
 	}
 
 	@Test
-	void applyJsonPatchReplaceString() throws IOException {
+	void jsonPatchReplaceString() throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
 				"    id 'java'",
@@ -168,7 +168,7 @@ void applyJsonPatchReplaceString() throws IOException {
 				"spotless {",
 				"    json {",
 				"        target 'src/**/*.json'",
-				"        applyJsonPatch([[op: 'replace', path: '/abc', value: 'ghi']])",
+				"        jsonPatch([[op: 'replace', path: '/abc', value: 'ghi']])",
 				"        gson()",
 				"    }",
 				"}");
@@ -178,7 +178,7 @@ void applyJsonPatchReplaceString() throws IOException {
 	}
 
 	@Test
-	void applyJsonPatchReplaceWithObject() throws IOException {
+	void jsonPatchReplaceWithObject() throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
 				"    id 'java'",
@@ -188,7 +188,7 @@ void applyJsonPatchReplaceWithObject() throws IOException {
 				"spotless {",
 				"    json {",
 				"        target 'src/**/*.json'",
-				"        applyJsonPatch([[op: 'replace', path: '/abc', value: [def: 'ghi']]])",
+				"        jsonPatch([[op: 'replace', path: '/abc', value: [def: 'ghi']]])",
 				"        gson()",
 				"    }",
 				"}");
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 06f8cc1e46..bab8fca7b3 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -4,7 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* Add an `applyJsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
+* Add a `jsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
 ### Fixed
 * Add support for `prettier` version `3.0.0` and newer. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
 * Fix npm install calls when npm cache is not up-to-date. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 5892a401c9..8c56aaefa1 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -901,7 +901,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
     <gson />           <!-- has its own section below -->
     <jackson />        <!-- has its own section below -->
     <rome />           <!-- has its own section below -->
-    <applyJsonPatch /> <!-- has its own section below -->
+    <jsonPatch />      <!-- has its own section below -->
   </json>
 </configuration>
 ```
@@ -958,7 +958,7 @@ Uses Jackson for formatting.
 
 <a name="applying-prettier-to-javascript--flow--typescript--css--scss--less--jsx--graphql--yaml--etc"></a>
 
-### applyJsonPatch
+### jsonPatch
 
 Uses [zjsonpatch](https://github.com/flipkart-incubator/zjsonpatch) to apply [JSON Patches](https://jsonpatch.com/) as per [RFC 6902](https://datatracker.ietf.org/doc/html/rfc6902/) to JSON documents.
 
@@ -967,11 +967,11 @@ This enables you to add, replace or remove properties at locations in the JSON d
 For example, to apply the patch from the [JSON Patch homepage](https://jsonpatch.com/#the-patch):
 
 ```xml
-<applyJsonPatch>[
+<jsonPatch>[
   { "op": "replace", "path": "/baz", "value": "boo" },
   { "op": "add", "path": "/hello", "value": ["world"] },
   { "op": "remove", "path": "/foo" }
-]</applyJsonPatch>
+]</jsonPatch>
 ```
 
 ## YAML
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java
index 76a5c43221..be5782b651 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java
@@ -54,7 +54,7 @@ public void addRome(RomeJson rome) {
 		addStepFactory(rome);
 	}
 
-	public void addApplyJsonPatch(ApplyJsonPatch applyJsonPatch) {
-		addStepFactory(applyJsonPatch);
+	public void addJsonPatch(JsonPatch jsonPatch) {
+		addStepFactory(jsonPatch);
 	}
 }
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/ApplyJsonPatch.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/JsonPatch.java
similarity index 80%
rename from plugin-maven/src/main/java/com/diffplug/spotless/maven/json/ApplyJsonPatch.java
rename to plugin-maven/src/main/java/com/diffplug/spotless/maven/json/JsonPatch.java
index 6e18ea9388..a822ad09e2 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/ApplyJsonPatch.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/JsonPatch.java
@@ -18,14 +18,14 @@
 import org.apache.maven.plugins.annotations.Parameter;
 
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.json.ApplyJsonPatchStep;
+import com.diffplug.spotless.json.JsonPatchStep;
 import com.diffplug.spotless.maven.FormatterStepConfig;
 import com.diffplug.spotless.maven.FormatterStepFactory;
 
 /**
- * A {@link FormatterStepFactory} implementation that corresponds to {@code <applyJsonPatch>...</applyJsonPatch>} configuration element.
+ * A {@link FormatterStepFactory} implementation that corresponds to {@code <jsonPatch>...</jsonPatch>} configuration element.
  */
-public class ApplyJsonPatch implements FormatterStepFactory {
+public class JsonPatch implements FormatterStepFactory {
 	private static final String DEFAULT_ZJSONPATCH_VERSION = "0.4.14";
 
 	@Parameter
@@ -36,6 +36,6 @@ public class ApplyJsonPatch implements FormatterStepFactory {
 
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
-		return ApplyJsonPatchStep.create(zjsonPatchVersion, patch, stepConfig.getProvisioner());
+		return JsonPatchStep.create(zjsonPatchVersion, patch, stepConfig.getProvisioner());
 	}
 }
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java
index 49becde33a..4c2f05532c 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java
@@ -91,8 +91,8 @@ public void testFormatJson_WithJackson_sortByKeys_spaceAfterKeySeparator() throw
 	}
 
 	@Test
-	public void testFormatJson_ApplyJsonPatch_replaceString() throws Exception {
-		writePomWithJsonSteps("<applyJsonPatch><patch>[{\"op\":\"replace\",\"path\":\"/abc\",\"value\":\"ghi\"}]</patch></applyJsonPatch><gson/>");
+	public void testFormatJson_JsonPatch_replaceString() throws Exception {
+		writePomWithJsonSteps("<jsonPatch><patch>[{\"op\":\"replace\",\"path\":\"/abc\",\"value\":\"ghi\"}]</patch></jsonPatch><gson/>");
 
 		setFile("json_test.json").toResource("json/patchObjectBefore.json");
 
@@ -101,8 +101,8 @@ public void testFormatJson_ApplyJsonPatch_replaceString() throws Exception {
 	}
 
 	@Test
-	public void testFormatJson_ApplyJsonPatch_replaceWithObject() throws Exception {
-		writePomWithJsonSteps("<applyJsonPatch><patch>[{\"op\":\"replace\",\"path\":\"/abc\",\"value\":{\"def\":\"ghi\"}}]</patch></applyJsonPatch><gson/>");
+	public void testFormatJson_JsonPatch_replaceWithObject() throws Exception {
+		writePomWithJsonSteps("<jsonPatch><patch>[{\"op\":\"replace\",\"path\":\"/abc\",\"value\":{\"def\":\"ghi\"}}]</patch></jsonPatch><gson/>");
 
 		setFile("json_test.json").toResource("json/patchObjectBefore.json");
 

From 8b1713d88bf575730da921c910da72718b5da4e0 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 31 Jul 2023 12:35:10 -0700
Subject: [PATCH 1161/2068] Update README index at plugin-gradle and
 plugin-maven.

---
 plugin-gradle/README.md | 2 +-
 plugin-maven/README.md  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 852aed2bc7..325093796e 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -66,7 +66,7 @@ Spotless supports all of Gradle's built-in performance features (incremental bui
   - [SQL](#sql) ([dbeaver](#dbeaver), [prettier](#prettier))
   - [Typescript](#typescript) ([tsfmt](#tsfmt), [prettier](#prettier), [ESLint](#eslint-typescript), [Rome](#rome))
   - [Javascript](#javascript) ([prettier](#prettier), [ESLint](#eslint-javascript), [Rome](#rome))
-  - [JSON](#json)
+  - [JSON](#json) ([simple](#simple), [gson](#gson), [jackson](#jackson), [rome](#rome), [jsonPatch](#jsonPatch))
   - [YAML](#yaml)
   - [Gherkin](#gherkin)
   - Multiple languages
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index eb9bc35c1f..cb770099ac 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -51,7 +51,7 @@ user@machine repo % mvn spotless:check
   - [Markdown](#markdown) ([flexmark](#flexmark))
   - [Typescript](#typescript) ([tsfmt](#tsfmt), [prettier](#prettier), [ESLint](#eslint-typescript), [Rome](#rome))
   - [Javascript](#javascript) ([prettier](#prettier), [ESLint](#eslint-javascript), [Rome](#rome))
-  - [JSON](#json)
+  - [JSON](#json) ([simple](#simple), [gson](#gson), [jackson](#jackson), [rome](#rome), [jsonPatch](#jsonPatch))
   - [YAML](#yaml)
   - [Gherkin](#gherkin)
   - Multiple languages

From b2db0f55af0d5e20435355f2232c6f54ad7458ae Mon Sep 17 00:00:00 2001
From: jochenberger <fooberger@gmail.com>
Date: Wed, 2 Aug 2023 15:42:51 +0200
Subject: [PATCH 1162/2068] Add support for Eclipse 4.28

---
 .../spotless/extra/groovy/GrEclipseFormatterStep.java         | 4 +++-
 1 file changed, 3 insertions(+), 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 3b57df889b..0d6287caea 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
@@ -50,7 +50,9 @@ protected P2Model model(String version) {
 					throw new IllegalArgumentException("4.8 is the oldest version we support, this was " + version);
 				}
 				String greclipseVersion;
-				if (eVersion >= 18) {
+				if (eVersion >= 28) {
+					greclipseVersion = "5." + (eVersion - 28) + ".0";
+				} else if (eVersion >= 18) {
 					greclipseVersion = "4." + (eVersion - 18) + ".0";
 				} else {
 					greclipseVersion = "3." + (eVersion - 8) + ".0";

From 74d840dc06f8e10cc622cf6b0bd1799e7aa91860 Mon Sep 17 00:00:00 2001
From: jochenberger <fooberger@gmail.com>
Date: Thu, 3 Aug 2023 08:08:51 +0200
Subject: [PATCH 1163/2068] Update CHANGES.md

---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index 2b60913d67..c64220d445 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Add a `jsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
+* Add support for Eclipse 4.28 to the Groovy formatter. ([#1775](https://github.com/diffplug/spotless/pull/1775))  
 ### Fixed
 * Use latest versions of popular style guides for `eslint` tests to fix failing `useEslintXoStandardRules` test. ([#1761](https://github.com/diffplug/spotless/pull/1761), [#1756](https://github.com/diffplug/spotless/issues/1756))
 * Add support for `prettier` version `3.0.0` and newer. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))

From effba12acd62aebb8ed66eaed3067289aa556893 Mon Sep 17 00:00:00 2001
From: jochenberger <fooberger@gmail.com>
Date: Thu, 3 Aug 2023 08:09:11 +0200
Subject: [PATCH 1164/2068] Update CHANGES.md

---
 plugin-gradle/CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index b21debb36f..4fef72db7e 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Add a `jsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
+* Add support for Eclipse 4.28 to the Groovy formatter. ([#1775](https://github.com/diffplug/spotless/pull/1775))  
 ### Fixed
 * Add support for `prettier` version `3.0.0` and newer. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
 * Fix npm install calls when npm cache is not up-to-date. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))

From 4c568b4f1da656771e5b95d6d77e74d3eedb5d0d Mon Sep 17 00:00:00 2001
From: jochenberger <fooberger@gmail.com>
Date: Thu, 3 Aug 2023 08:09:45 +0200
Subject: [PATCH 1165/2068] Update CHANGES.md

---
 plugin-maven/CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index bab8fca7b3..e4f3441357 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Add a `jsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
+* Add support for Eclipse 4.28 to the Groovy formatter. ([#1775](https://github.com/diffplug/spotless/pull/1775))  
 ### Fixed
 * Add support for `prettier` version `3.0.0` and newer. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
 * Fix npm install calls when npm cache is not up-to-date. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))

From d1c663a7ad83e1c9b6a2df0e5bf10f2f8053035d Mon Sep 17 00:00:00 2001
From: jochenberger <fooberger@gmail.com>
Date: Thu, 3 Aug 2023 08:18:12 +0200
Subject: [PATCH 1166/2068] Fix formatting

---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index c64220d445..566d13cf94 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,7 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Add a `jsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
-* Add support for Eclipse 4.28 to the Groovy formatter. ([#1775](https://github.com/diffplug/spotless/pull/1775))  
+* Add support for Eclipse 4.28 to the Groovy formatter. ([#1775](https://github.com/diffplug/spotless/pull/1775))
 ### Fixed
 * Use latest versions of popular style guides for `eslint` tests to fix failing `useEslintXoStandardRules` test. ([#1761](https://github.com/diffplug/spotless/pull/1761), [#1756](https://github.com/diffplug/spotless/issues/1756))
 * Add support for `prettier` version `3.0.0` and newer. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))

From 4c48360ef0b02af8494ea06ac47d382d259fd10e Mon Sep 17 00:00:00 2001
From: jochenberger <fooberger@gmail.com>
Date: Thu, 3 Aug 2023 08:18:31 +0200
Subject: [PATCH 1167/2068] Fix formatting

---
 plugin-gradle/CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 4fef72db7e..bef3d961f8 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,7 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Add a `jsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
-* Add support for Eclipse 4.28 to the Groovy formatter. ([#1775](https://github.com/diffplug/spotless/pull/1775))  
+* Add support for Eclipse 4.28 to the Groovy formatter. ([#1775](https://github.com/diffplug/spotless/pull/1775))
 ### Fixed
 * Add support for `prettier` version `3.0.0` and newer. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
 * Fix npm install calls when npm cache is not up-to-date. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))

From 413cac88aa17a435ed55d1de89739fcfc6968e65 Mon Sep 17 00:00:00 2001
From: jochenberger <fooberger@gmail.com>
Date: Thu, 3 Aug 2023 08:18:49 +0200
Subject: [PATCH 1168/2068] Fix formatting

---
 plugin-maven/CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index e4f3441357..d0977c05bf 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,7 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Add a `jsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
-* Add support for Eclipse 4.28 to the Groovy formatter. ([#1775](https://github.com/diffplug/spotless/pull/1775))  
+* Add support for Eclipse 4.28 to the Groovy formatter. ([#1775](https://github.com/diffplug/spotless/pull/1775))
 ### Fixed
 * Add support for `prettier` version `3.0.0` and newer. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
 * Fix npm install calls when npm cache is not up-to-date. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))

From 595cecdb97437e3b7440ac1ec9cab2c7567c1c12 Mon Sep 17 00:00:00 2001
From: Tyler Bertrand <tbertrand@gradle.com>
Date: Tue, 1 Aug 2023 19:54:44 -0500
Subject: [PATCH 1169/2068] Utilize providers for line endings

This way the external git processes are launched at execution time and not during configuration
---
 .../com/diffplug/gradle/spotless/FormatExtension.java    | 4 +++-
 .../java/com/diffplug/gradle/spotless/SpotlessTask.java  | 9 +++++----
 .../gradle/spotless/DiffMessageFormatterTest.java        | 4 ++--
 .../com/diffplug/gradle/spotless/FormatTaskTest.java     | 2 +-
 .../com/diffplug/gradle/spotless/PaddedCellTaskTest.java | 2 +-
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index e28ec13dcd..7a62f8cabf 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -40,6 +40,7 @@
 import org.gradle.api.GradleException;
 import org.gradle.api.Project;
 import org.gradle.api.file.ConfigurableFileTree;
+import org.gradle.api.file.Directory;
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.plugins.BasePlugin;
 import org.gradle.api.tasks.TaskProvider;
@@ -925,7 +926,8 @@ protected void setupTask(SpotlessTask task) {
 			steps.replaceAll(formatterStep -> formatterStep.filterByContent(OnMatch.EXCLUDE, targetExcludeContentPattern));
 		}
 		task.setSteps(steps);
-		task.setLineEndingsPolicy(getLineEndings().createPolicy(getProject().getProjectDir(), () -> totalTarget));
+		Directory projectDir = getProject().getLayout().getProjectDirectory();
+		task.setLineEndingsPolicy(getProject().provider(() -> getLineEndings().createPolicy(projectDir.getAsFile(), () -> totalTarget)));
 		spotless.getRegisterDependenciesTask().hookSubprojectTask(task);
 		task.setupRatchet(getRatchetFrom() != null ? getRatchetFrom() : "");
 	}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
index c23cea0845..2af9a80b7a 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
@@ -28,6 +28,7 @@
 import org.gradle.api.file.DirectoryProperty;
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.provider.Property;
+import org.gradle.api.provider.Provider;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.InputFiles;
 import org.gradle.api.tasks.Internal;
@@ -64,14 +65,14 @@ public void setEncoding(String encoding) {
 		this.encoding = Objects.requireNonNull(encoding);
 	}
 
-	protected final LiveCache<LineEnding.Policy> lineEndingsPolicy = createLive("lineEndingsPolicy");
+	protected final LiveCache<Provider<LineEnding.Policy>> lineEndingsPolicy = createLive("lineEndingsPolicy");
 
 	@Input
-	public LineEnding.Policy getLineEndingsPolicy() {
+	public Provider<LineEnding.Policy> getLineEndingsPolicy() {
 		return lineEndingsPolicy.get();
 	}
 
-	public void setLineEndingsPolicy(LineEnding.Policy lineEndingsPolicy) {
+	public void setLineEndingsPolicy(Provider<LineEnding.Policy> lineEndingsPolicy) {
 		this.lineEndingsPolicy.set(lineEndingsPolicy);
 	}
 
@@ -185,7 +186,7 @@ String formatName() {
 	Formatter buildFormatter() {
 		return Formatter.builder()
 				.name(formatName())
-				.lineEndingsPolicy(lineEndingsPolicy.get())
+				.lineEndingsPolicy(lineEndingsPolicy.get().get())
 				.encoding(Charset.forName(encoding))
 				.rootDir(getProjectDir().get().getAsFile().toPath())
 				.steps(steps.get())
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/DiffMessageFormatterTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/DiffMessageFormatterTest.java
index ef72043a47..c564664f10 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/DiffMessageFormatterTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/DiffMessageFormatterTest.java
@@ -62,7 +62,7 @@ public BuildServiceParameters.None getParameters() {
 		private SpotlessTaskImpl createFormatTask(String name) {
 			SpotlessTaskImpl task = project.getTasks().create("spotless" + SpotlessPlugin.capitalize(name), SpotlessTaskImpl.class);
 			task.init(taskService);
-			task.setLineEndingsPolicy(LineEnding.UNIX.createPolicy());
+			task.setLineEndingsPolicy(project.provider(LineEnding.UNIX::createPolicy));
 			task.setTarget(Collections.singletonList(file));
 			return task;
 		}
@@ -100,7 +100,7 @@ private Bundle create(File... files) throws IOException {
 
 	private Bundle create(List<File> files) throws IOException {
 		Bundle bundle = new Bundle("underTest");
-		bundle.task.setLineEndingsPolicy(LineEnding.UNIX.createPolicy());
+		bundle.task.setLineEndingsPolicy(bundle.project.provider(LineEnding.UNIX::createPolicy));
 		bundle.task.setTarget(files);
 		return bundle;
 	}
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/FormatTaskTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/FormatTaskTest.java
index 8985cd7a14..c4c055c799 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/FormatTaskTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/FormatTaskTest.java
@@ -35,7 +35,7 @@ class FormatTaskTest extends ResourceHarness {
 	void createTask() {
 		Project project = TestProvisioner.gradleProject(rootFolder());
 		spotlessTask = project.getTasks().create("spotlessTaskUnderTest", SpotlessTaskImpl.class);
-		spotlessTask.setLineEndingsPolicy(LineEnding.UNIX.createPolicy());
+		spotlessTask.setLineEndingsPolicy(project.provider(LineEnding.UNIX::createPolicy));
 		spotlessTask.init(GradleIntegrationHarness.providerOf(new SpotlessTaskService() {
 			@Override
 			public BuildServiceParameters.None getParameters() {
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PaddedCellTaskTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PaddedCellTaskTest.java
index bc7a2fdc96..db55077d00 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PaddedCellTaskTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PaddedCellTaskTest.java
@@ -66,7 +66,7 @@ private SpotlessTaskImpl createFormatTask(String name, FormatterStep step) {
 			SpotlessTaskImpl task = project.getTasks().create("spotless" + SpotlessPlugin.capitalize(name), SpotlessTaskImpl.class);
 			task.init(taskService);
 			task.addStep(step);
-			task.setLineEndingsPolicy(LineEnding.UNIX.createPolicy());
+			task.setLineEndingsPolicy(project.provider(LineEnding.UNIX::createPolicy));
 			task.setTarget(Collections.singletonList(file));
 			return task;
 		}

From 2c33cd319b73f1aa5b86cef2414ebd6656f8f6f1 Mon Sep 17 00:00:00 2001
From: Tyler Bertrand <tbertrand@gradle.com>
Date: Wed, 2 Aug 2023 15:29:22 -0500
Subject: [PATCH 1170/2068] Update plugin-gradle changelog

---
 plugin-gradle/CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index b21debb36f..5ffc7912ba 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -8,6 +8,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Add support for `prettier` version `3.0.0` and newer. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
 * Fix npm install calls when npm cache is not up-to-date. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))
+* Fix configuration cache failure when using LineEnding.GIT_ATTRIBUTES ([#1644](https://github.com/diffplug/spotless/issues/1644))
 ### Changes
 * Bump default `eslint` version to latest `8.31.0` -> `8.45.0` ([#1761](https://github.com/diffplug/spotless/pull/1761))
 * Bump default `prettier` version to latest (v2) `2.8.1` -> `2.8.8`. ([#1760](https://github.com/diffplug/spotless/pull/1760))

From 35be272b300d9a3a4a939b706728050cbf1b9c69 Mon Sep 17 00:00:00 2001
From: Tyler Bertrand <tbertrand@gradle.com>
Date: Thu, 3 Aug 2023 20:17:56 -0500
Subject: [PATCH 1171/2068] spotlessApply

---
 .../com/diffplug/gradle/spotless/DiffMessageFormatterTest.java  | 2 +-
 .../test/java/com/diffplug/gradle/spotless/FormatTaskTest.java  | 2 +-
 .../java/com/diffplug/gradle/spotless/PaddedCellTaskTest.java   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/DiffMessageFormatterTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/DiffMessageFormatterTest.java
index c564664f10..bc556ac06e 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/DiffMessageFormatterTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/DiffMessageFormatterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/FormatTaskTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/FormatTaskTest.java
index c4c055c799..ddd813468d 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/FormatTaskTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/FormatTaskTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PaddedCellTaskTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PaddedCellTaskTest.java
index db55077d00..4fe78d884d 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PaddedCellTaskTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PaddedCellTaskTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 14e4e62aa76768e8d9110478731668fe73dec843 Mon Sep 17 00:00:00 2001
From: jochenberger <fooberger@gmail.com>
Date: Fri, 4 Aug 2023 07:12:36 +0200
Subject: [PATCH 1172/2068] Update default to 4.28

---
 .../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 0d6287caea..b79918d555 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
@@ -32,7 +32,7 @@ public final class GrEclipseFormatterStep {
 	private GrEclipseFormatterStep() {}
 
 	private static final String NAME = "eclipse groovy formatter";
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "4.26").add(17, "4.27");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "4.26").add(17, "4.28");
 
 	public static String defaultVersion() {
 		return JVM_SUPPORT.getRecommendedFormatterVersion();

From 696a3c628117aca1608ebbf111768ba0411a4b0f Mon Sep 17 00:00:00 2001
From: Simon Le Bras <lebras.simon@gmail.com>
Date: Tue, 8 Aug 2023 12:09:53 +0200
Subject: [PATCH 1173/2068] Fix configuration cache issue with BufStep

---
 .../diffplug/spotless/protobuf/BufStep.java   | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java b/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java
index c9b9efa543..acddff85cf 100644
--- a/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java
@@ -21,6 +21,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.regex.Pattern;
 
 import javax.annotation.Nullable;
@@ -61,13 +62,12 @@ public FormatterStep create() {
 		return FormatterStep.createLazy(name(), this::createState, State::toFunc);
 	}
 
-	private State createState() throws IOException, InterruptedException {
+	private State createState() {
 		String instructions = "https://docs.buf.build/installation";
-		String exeAbsPath = ForeignExe.nameAndVersion("buf", version)
-				.pathToExe(pathToExe)
-				.versionRegex(Pattern.compile("(\\S*)"))
-				.fixCantFind("Try following the instructions at " + instructions + ", or else tell Spotless where it is with {@code buf().pathToExe('path/to/executable')}")
-				.confirmVersionAndGetAbsolutePath();
+		ForeignExe exeAbsPath = ForeignExe.nameAndVersion("buf", version)
+			.pathToExe(pathToExe)
+			.versionRegex(Pattern.compile("(\\S*)"))
+			.fixCantFind("Try following the instructions at " + instructions + ", or else tell Spotless where it is with {@code buf().pathToExe('path/to/executable')}");
 		return new State(this, exeAbsPath);
 	}
 
@@ -76,19 +76,23 @@ static class State implements Serializable {
 		private static final long serialVersionUID = -1825662356883926318L;
 		// used for up-to-date checks and caching
 		final String version;
+		final transient ForeignExe exe;
 		// used for executing
-		final transient List<String> args;
+		private transient @Nullable List<String> args;
 
-		State(BufStep step, String exeAbsPath) {
+		State(BufStep step, ForeignExe exeAbsPath) {
 			this.version = step.version;
-			this.args = Arrays.asList(exeAbsPath, "format");
+			this.exe = Objects.requireNonNull(exeAbsPath);
 		}
 
 		String format(ProcessRunner runner, String input, File file) throws IOException, InterruptedException {
-			String[] processArgs = args.toArray(new String[args.size() + 1]);
-			// add an argument to the end
-			processArgs[args.size()] = file.getAbsolutePath();
-			return runner.exec(input.getBytes(StandardCharsets.UTF_8), processArgs).assertExitZero(StandardCharsets.UTF_8);
+			if (args == null) {
+				args = Arrays.asList(
+					exe.confirmVersionAndGetAbsolutePath(),
+					"format",
+					file.getAbsolutePath());
+			}
+			return runner.exec(input.getBytes(StandardCharsets.UTF_8), args).assertExitZero(StandardCharsets.UTF_8);
 		}
 
 		FormatterFunc.Closeable toFunc() {

From 7878351838617e58959df3b47528a77f17efd4fa Mon Sep 17 00:00:00 2001
From: Simon Le Bras <lebras.simon@gmail.com>
Date: Tue, 8 Aug 2023 12:20:17 +0200
Subject: [PATCH 1174/2068] Update CHANGES.md

---
 plugin-gradle/CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 5ffc7912ba..907f1a1cb0 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -9,6 +9,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Add support for `prettier` version `3.0.0` and newer. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
 * Fix npm install calls when npm cache is not up-to-date. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))
 * Fix configuration cache failure when using LineEnding.GIT_ATTRIBUTES ([#1644](https://github.com/diffplug/spotless/issues/1644))
+* Fix configuration cache failure when formatting proto files with Buf. ([#1779]https://github.com/diffplug/spotless/pull/1779))
 ### Changes
 * Bump default `eslint` version to latest `8.31.0` -> `8.45.0` ([#1761](https://github.com/diffplug/spotless/pull/1761))
 * Bump default `prettier` version to latest (v2) `2.8.1` -> `2.8.8`. ([#1760](https://github.com/diffplug/spotless/pull/1760))

From 19f68d6763969e289591a82c353b3638f1c40210 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 8 Aug 2023 09:11:17 -0700
Subject: [PATCH 1175/2068] spotlessApply

---
 .../java/com/diffplug/spotless/protobuf/BufStep.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java b/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java
index acddff85cf..a5a6a6cdef 100644
--- a/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java
@@ -65,9 +65,9 @@ public FormatterStep create() {
 	private State createState() {
 		String instructions = "https://docs.buf.build/installation";
 		ForeignExe exeAbsPath = ForeignExe.nameAndVersion("buf", version)
-			.pathToExe(pathToExe)
-			.versionRegex(Pattern.compile("(\\S*)"))
-			.fixCantFind("Try following the instructions at " + instructions + ", or else tell Spotless where it is with {@code buf().pathToExe('path/to/executable')}");
+				.pathToExe(pathToExe)
+				.versionRegex(Pattern.compile("(\\S*)"))
+				.fixCantFind("Try following the instructions at " + instructions + ", or else tell Spotless where it is with {@code buf().pathToExe('path/to/executable')}");
 		return new State(this, exeAbsPath);
 	}
 
@@ -88,9 +88,9 @@ static class State implements Serializable {
 		String format(ProcessRunner runner, String input, File file) throws IOException, InterruptedException {
 			if (args == null) {
 				args = Arrays.asList(
-					exe.confirmVersionAndGetAbsolutePath(),
-					"format",
-					file.getAbsolutePath());
+						exe.confirmVersionAndGetAbsolutePath(),
+						"format",
+						file.getAbsolutePath());
 			}
 			return runner.exec(input.getBytes(StandardCharsets.UTF_8), args).assertExitZero(StandardCharsets.UTF_8);
 		}

From 012c13569c101086137cee96ac2ec4e5c5398749 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Wed, 9 Aug 2023 09:22:34 +0800
Subject: [PATCH 1176/2068] Support GJF own import order

---
 CHANGES.md                                    |  1 +
 .../java/GoogleJavaFormatFormatterFunc.java   | 12 ++++++----
 .../spotless/java/GoogleJavaFormatStep.java   | 23 ++++++++++++++-----
 plugin-gradle/CHANGES.md                      |  1 +
 plugin-gradle/README.md                       |  2 +-
 .../gradle/spotless/JavaExtension.java        |  9 +++++++-
 plugin-maven/CHANGES.md                       |  1 +
 .../spotless/maven/java/GoogleJavaFormat.java |  8 +++++--
 8 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 2b60913d67..81af46a526 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Add a `jsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
+* Support GJF own import order. ([#1780](https://github.com/diffplug/spotless/pull/1780))
 ### Fixed
 * Use latest versions of popular style guides for `eslint` tests to fix failing `useEslintXoStandardRules` test. ([#1761](https://github.com/diffplug/spotless/pull/1761), [#1756](https://github.com/diffplug/spotless/issues/1756))
 * Add support for `prettier` version `3.0.0` and newer. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
diff --git a/lib/src/googleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatFormatterFunc.java b/lib/src/googleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatFormatterFunc.java
index 87e086b440..8c6aa42575 100644
--- a/lib/src/googleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatFormatterFunc.java
+++ b/lib/src/googleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatFormatterFunc.java
@@ -29,6 +29,8 @@
 
 import com.diffplug.spotless.FormatterFunc;
 
+// Used via reflection by the Gradle plugin.
+@SuppressWarnings("unused")
 public class GoogleJavaFormatFormatterFunc implements FormatterFunc {
 
 	@Nonnull
@@ -42,10 +44,13 @@ public class GoogleJavaFormatFormatterFunc implements FormatterFunc {
 
 	private final boolean reflowStrings;
 
-	public GoogleJavaFormatFormatterFunc(@Nonnull String version, @Nonnull String style, boolean reflowStrings) {
+	private final boolean reorderImports;
+
+	public GoogleJavaFormatFormatterFunc(@Nonnull String version, @Nonnull String style, boolean reflowStrings, boolean reorderImports) {
 		this.version = Objects.requireNonNull(version);
 		this.formatterStyle = Style.valueOf(Objects.requireNonNull(style));
 		this.reflowStrings = reflowStrings;
+		this.reorderImports = reorderImports;
 
 		this.formatter = new Formatter(JavaFormatterOptions.builder()
 				.style(formatterStyle)
@@ -57,10 +62,7 @@ public GoogleJavaFormatFormatterFunc(@Nonnull String version, @Nonnull String st
 	public String apply(@Nonnull String input) throws Exception {
 		String formatted = formatter.formatSource(input);
 		String removedUnused = RemoveUnusedImports.removeUnusedImports(formatted);
-		// Issue #1679: we used to call ImportOrderer.reorderImports(String) here, but that is deprecated.
-		// Replacing the call with (the correct) reorderImports(String, Style) causes issues for Style.AOSP,
-		// so we force the style to GOOGLE for now (which is what the deprecated method did)
-		String sortedImports = ImportOrderer.reorderImports(removedUnused, Style.GOOGLE);
+		String sortedImports = ImportOrderer.reorderImports(removedUnused, reorderImports ? formatterStyle : Style.GOOGLE);
 		return reflowLongStrings(sortedImports);
 	}
 
diff --git a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
index 321d05420f..a0f796af4d 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
@@ -32,6 +32,7 @@ private GoogleJavaFormatStep() {}
 
 	private static final String DEFAULT_STYLE = "GOOGLE";
 	private static final boolean DEFAULT_REFLOW_LONG_STRINGS = false;
+	private static final boolean DEFAULT_REORDER_IMPORTS = false;
 	static final String NAME = "google-java-format";
 	static final String MAVEN_COORDINATE = "com.google.googlejavaformat:google-java-format";
 
@@ -55,8 +56,12 @@ public static FormatterStep create(String version, String style, Provisioner pro
 		return create(MAVEN_COORDINATE, version, style, provisioner, reflowLongStrings);
 	}
 
-	/** Creates a step which formats everything - groupArtifact, code, import order, and unused imports - and optionally reflows long strings. */
 	public static FormatterStep create(String groupArtifact, String version, String style, Provisioner provisioner, boolean reflowLongStrings) {
+		return create(groupArtifact, version, style, provisioner, reflowLongStrings, false);
+	}
+
+	/** Creates a step which formats everything - groupArtifact, code, import order, and unused imports - and optionally reflows long strings. */
+	public static FormatterStep create(String groupArtifact, String version, String style, Provisioner provisioner, boolean reflowLongStrings, boolean reorderImports) {
 		Objects.requireNonNull(groupArtifact, "groupArtifact");
 		if (groupArtifact.chars().filter(ch -> ch == ':').count() != 1) {
 			throw new IllegalArgumentException("groupArtifact must be in the form 'groupId:artifactId'");
@@ -65,7 +70,7 @@ public static FormatterStep create(String groupArtifact, String version, String
 		Objects.requireNonNull(style, "style");
 		Objects.requireNonNull(provisioner, "provisioner");
 		return FormatterStep.createLazy(NAME,
-				() -> new State(NAME, groupArtifact, version, style, provisioner, reflowLongStrings),
+				() -> new State(NAME, groupArtifact, version, style, provisioner, reflowLongStrings, reorderImports),
 				State::createFormat);
 	}
 
@@ -92,6 +97,10 @@ public static boolean defaultReflowLongStrings() {
 		return DEFAULT_REFLOW_LONG_STRINGS;
 	}
 
+	public static boolean defaultReorderImports() {
+		return DEFAULT_REORDER_IMPORTS;
+	}
+
 	static final class State implements Serializable {
 		private static final long serialVersionUID = 1L;
 
@@ -101,6 +110,7 @@ static final class State implements Serializable {
 		final String version;
 		final String style;
 		final boolean reflowLongStrings;
+		final boolean reorderImports;
 
 		State(String stepName, String version, Provisioner provisioner) throws Exception {
 			this(stepName, version, DEFAULT_STYLE, provisioner);
@@ -111,10 +121,10 @@ static final class State implements Serializable {
 		}
 
 		State(String stepName, String version, String style, Provisioner provisioner, boolean reflowLongStrings) throws Exception {
-			this(stepName, MAVEN_COORDINATE, version, style, provisioner, reflowLongStrings);
+			this(stepName, MAVEN_COORDINATE, version, style, provisioner, reflowLongStrings, DEFAULT_REORDER_IMPORTS);
 		}
 
-		State(String stepName, String groupArtifact, String version, String style, Provisioner provisioner, boolean reflowLongStrings) throws Exception {
+		State(String stepName, String groupArtifact, String version, String style, Provisioner provisioner, boolean reflowLongStrings, boolean reorderImports) throws Exception {
 			JVM_SUPPORT.assertFormatterSupported(version);
 			ModuleHelper.doOpenInternalPackagesIfRequired();
 			this.jarState = JarState.from(groupArtifact + ":" + version, provisioner);
@@ -122,13 +132,14 @@ static final class State implements Serializable {
 			this.version = version;
 			this.style = style;
 			this.reflowLongStrings = reflowLongStrings;
+			this.reorderImports = reorderImports;
 		}
 
 		FormatterFunc createFormat() throws Exception {
 			final ClassLoader classLoader = jarState.getClassLoader();
 			Class<?> formatterFunc = classLoader.loadClass("com.diffplug.spotless.glue.java.GoogleJavaFormatFormatterFunc");
-			Constructor<?> constructor = formatterFunc.getConstructor(String.class, String.class, boolean.class);
-			FormatterFunc googleJavaFormatFormatterFunc = (FormatterFunc) constructor.newInstance(version, style, reflowLongStrings);
+			Constructor<?> constructor = formatterFunc.getConstructor(String.class, String.class, boolean.class, boolean.class);
+			FormatterFunc googleJavaFormatFormatterFunc = (FormatterFunc) constructor.newInstance(version, style, reflowLongStrings, reorderImports);
 
 			return JVM_SUPPORT.suggestLaterVersionOnError(version, googleJavaFormatFormatterFunc);
 		}
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 907f1a1cb0..1ce2f06a42 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Add a `jsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
+* Support GJF own import order. ([#1780](https://github.com/diffplug/spotless/pull/1780))
 ### Fixed
 * Add support for `prettier` version `3.0.0` and newer. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
 * Fix npm install calls when npm cache is not up-to-date. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 325093796e..dbc61207e5 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -206,7 +206,7 @@ spotless {
     // optional: you can specify a specific version (>= 1.8) and/or switch to AOSP style
     //   and/or reflow long strings
     //   and/or use custom group artifact (you probably don't need this)
-    googleJavaFormat('1.8').aosp().reflowLongStrings().groupArtifact('com.google.googlejavaformat:google-java-format')
+    googleJavaFormat('1.8').aosp().reflowLongStrings().reorderImports(false).groupArtifact('com.google.googlejavaformat:google-java-format')
 ```
 
 ### palantir-java-format
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
index 13fe674168..fcd1a0d105 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
@@ -173,6 +173,7 @@ public class GoogleJavaFormatConfig {
 		String groupArtifact;
 		String style;
 		boolean reflowLongStrings;
+		boolean reorderImports;
 
 		GoogleJavaFormatConfig(String version) {
 			this.version = Objects.requireNonNull(version);
@@ -207,13 +208,19 @@ public GoogleJavaFormatConfig reflowLongStrings(boolean reflowLongStrings) {
 			return this;
 		}
 
+		public GoogleJavaFormatConfig reorderImports(boolean reorderImports) {
+			this.reorderImports = reorderImports;
+			return this;
+		}
+
 		private FormatterStep createStep() {
 			return GoogleJavaFormatStep.create(
 					groupArtifact,
 					version,
 					style,
 					provisioner(),
-					reflowLongStrings);
+					reflowLongStrings,
+					reorderImports);
 		}
 	}
 
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index bab8fca7b3..65a557b14f 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Add a `jsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
+* Support GJF own import order. ([#1780](https://github.com/diffplug/spotless/pull/1780))
 ### Fixed
 * Add support for `prettier` version `3.0.0` and newer. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
 * Fix npm install calls when npm cache is not up-to-date. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/GoogleJavaFormat.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/GoogleJavaFormat.java
index 3597e84e25..98296beb5f 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/GoogleJavaFormat.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/GoogleJavaFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,12 +35,16 @@ public class GoogleJavaFormat implements FormatterStepFactory {
 	@Parameter
 	private Boolean reflowLongStrings;
 
+	@Parameter
+	private Boolean reorderImports;
+
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig config) {
 		String groupArtifact = this.groupArtifact != null ? this.groupArtifact : GoogleJavaFormatStep.defaultGroupArtifact();
 		String version = this.version != null ? this.version : GoogleJavaFormatStep.defaultVersion();
 		String style = this.style != null ? this.style : GoogleJavaFormatStep.defaultStyle();
 		boolean reflowLongStrings = this.reflowLongStrings != null ? this.reflowLongStrings : GoogleJavaFormatStep.defaultReflowLongStrings();
-		return GoogleJavaFormatStep.create(groupArtifact, version, style, config.getProvisioner(), reflowLongStrings);
+		boolean reorderImports = this.reorderImports != null ? this.reorderImports : GoogleJavaFormatStep.defaultReorderImports();
+		return GoogleJavaFormatStep.create(groupArtifact, version, style, config.getProvisioner(), reflowLongStrings, reorderImports);
 	}
 }

From 4dd5b5fb616e82cb09c329458edaee019219b092 Mon Sep 17 00:00:00 2001
From: Dimitrii Lipiridi <dimitrii.lipiridi@delasport.com>
Date: Wed, 16 Aug 2023 23:10:53 +0300
Subject: [PATCH 1177/2068] feat: Introduce "spotlessIdeHook" argument for
 maven plugin

---
 plugin-maven/CHANGES.md                          |  1 +
 plugin-maven/README.md                           | 15 ++++++++++++---
 .../spotless/maven/AbstractSpotlessMojo.java     | 16 ++++++++++++++++
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 65a557b14f..62d0f8c500 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -6,6 +6,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * Add a `jsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
 * Support GJF own import order. ([#1780](https://github.com/diffplug/spotless/pull/1780))
+* `-DspotlessIdeHook` provides the ability to apply Spotless exclusively to a specified file. It accepts the absolute path of the file.
 ### Fixed
 * Add support for `prettier` version `3.0.0` and newer. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
 * Fix npm install calls when npm cache is not up-to-date. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index cb770099ac..aa324627f9 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -1601,14 +1601,23 @@ By default, `spotless:check` is bound to the `verify` phase.  You might want to
 
 ## Can I apply Spotless to specific files?
 
-You can target specific files by setting the `spotlessFiles` project property to a comma-separated list of file patterns:
+There are two options:
 
+### Pattern
+You can target specific files by setting the `spotlessFiles` project property to a comma-separated list of file patterns:
 ```
-cmd> mvn spotless:apply -DspotlessFiles=my/file/pattern.java,more/generic/.*-pattern.java
+cmd> mvn spotless:apply -DspotlessFiles="my/file/pattern\.java, more/generic/.*-pattern\.java"
 ```
-
 The patterns are matched using `String#matches(String)` against the absolute file path.
 
+### IDE Hook
+You can specify a single file by providing the `spotlessIdeHook` argument, which accepts the absolute path of the file.
+```
+cmd> mvn spotless:apply -DspotlessIdeHook="C:\my-project\src\main\java\com\example\Application.java"
+
+```
+This option ignores the ratchetFrom property.
+
 <a name="examples"></a>
 
 ## Example configurations (from real-world projects)
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
index 2c295cef27..ea66e921e5 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
@@ -187,6 +187,9 @@ public abstract class AbstractSpotlessMojo extends AbstractMojo {
 	@Parameter(property = "spotlessFiles")
 	private String filePatterns;
 
+	@Parameter(property = "spotlessIdeHook")
+	private String spotlessIdeHook;
+
 	@Parameter(property = LicenseHeaderStep.spotlessSetLicenseHeaderYearsFromGitHistory)
 	private String setLicenseHeaderYearsFromGitHistory;
 
@@ -251,6 +254,10 @@ private boolean shouldSkip() {
 	}
 
 	private List<File> collectFiles(FormatterFactory formatterFactory, FormatterConfig config) {
+		if (!(spotlessIdeHook == null || spotlessIdeHook.isEmpty())) {
+			return fetchFileFromIdeHook();
+		}
+
 		Optional<String> ratchetFrom = formatterFactory.ratchetFrom(config);
 		try {
 			final List<File> files;
@@ -279,6 +286,15 @@ private List<File> collectFiles(FormatterFactory formatterFactory, FormatterConf
 		}
 	}
 
+	private List<File> fetchFileFromIdeHook() {
+		File file = new File(spotlessIdeHook);
+		if (!file.isAbsolute()) {
+			throw new PluginException("Argument passed to spotlessIdeHook must be an absolute path");
+		}
+
+		return List.of(file);
+	}
+
 	private List<File> collectFilesFromGit(FormatterFactory formatterFactory, String ratchetFrom) {
 		MatchPatterns includePatterns = MatchPatterns.from(
 				withNormalizedFileSeparators(getIncludes(formatterFactory)));

From a76401b9ce82340498a20bb36065fcc7f691046b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 17 Aug 2023 07:43:38 +0000
Subject: [PATCH 1178/2068] chore(deps): update dependency gradle to v8

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 61624 -> 63721 bytes
 gradle/wrapper/gradle-wrapper.properties |   3 ++-
 gradlew                                  |  19 ++++++++++++-------
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index afba109285af78dbd2a1d187e33ac4f87c76e392..7f93135c49b765f8051ef9d0a6055ff8e46073d8 100755
GIT binary patch
delta 41204
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

delta 39055
zcmZ6yV{~O<vo4x+Y#SZhwr$(Ctre$Ztk||~+jctc*iHwx_daLreZTYTtyyo)G3Jk_
zFzcy0y8~<A2ZK<O1p|i#g2H1Y;-Z1VCNemK{`V6SI0y)cql+aY7|8!xY+(GKOCUHX
z0Vr$}38(|?KSd&(<A1BA{_mwBJkCEU{{*Kg3Eug~Kk@sYNPv_E{_m9*v=q>Phb)HS
zzXM2kh6Ci(M*<>p!vPJ?;G51dAtC>%@9@tNVL?Ekq5pk?Fv#hvbszAIKnbABRZp)}
zN%R|qR)jG*7+OmS^jL=qI%%)3ME^o$gM3Te4<c_+vtKMk#^j^yE+fWy)*)zBr4<|X
zJ9}z6+p(9Mm(@4m>+2pv=w~V!8;ORZXk949Fxl|JiMZgkGrZF_RwgkF{t!MAmjs#D
zol<b9Bz`>iD7MXvrj5Y*)I1<@Io6KOc03~+RrX|gJ+!xl+%}`Qk~+FEQ8NZyJH9;A
zM!+on+=b(NYY^2k>JoLQ3O*NxzlezqW?*o3wbP_}{DM0PJjq9Awq`P%<{6?ua^Ae1
z>v>TvMtWsDYl`;*LJD#>rj&YAOkwr}qY>Bb2%8Tk;^46~o?fv%^By3Djq7H=k&M9F
zVqe)g$~-V{S7)zT%m#BIuIVBgKtJZvm>Nr;6<%qMcAVs3`Nw>Hcz_;H+u7ON>+#ra
zDpv|4ER|+l;qP;6EObJ5G3Uv#{e`L%pYb|h8l6)dyMuYug?t_Mfyt>Uw1#V(u+FMy
zOfySG)T1?h(;15Au_yop%kQ=*<FEn=n0}D{Yz)~1f2E)~#B?cj)X`dT*0l-qHm@Ol
zJfyCNHvES=k$_-YJ<zeH_?Je8k;e~ZYYaz-8VKfMY{;*Q(aOk)XRcOSJQ-`b6m)+}
zM%+pN6FMGt7(3EQR_+{)`?ozMMssTbM%aRV+F4x19}_k8!a;xxxZ14th}kLKHFm`l
z0=Ye5E<L6*oysl^%+-~2&ma8BhW0Zx-ELR)ryiSy0Ipp}>91T!Ju9d03lkDcVR7Ei
z`K;5mxsQN_TC3x5SvSUc#YB&#X3wQdxG=#%3|PtM{QyN@EFCL5bRLdqTn;Ek*}@dF
znqpF4y+MqA9c92SG0u?ty+u)P5mso#pM`m-c7Xx3w-{Wk-U1KecY+|W+ZHD4a}m3r
zPrgtItB8C0aFSLR(S$U(&vcE!5<-Cu;%rUi&GnYhjTq4~;~p+z=ICwn!sx^295s6A
zPT<1Z#Muf-t3jV42}P@nOkJ>Ms>K*w+flg$l7_VT>vB4Yv;jv^MOpnBEwI{m(dy~j
zk$+=#u=(5N9=JN}i!C+qq#fq{mPq$&18>(BBDo-me``9E5fSP-7cv-FILG+vr5ACZ
zC4T)MfBql$YIirv1I7{y1MC&igptR-ed&8#=v&K)1T?{eXq^J1NJhnOiODeJ=OvU4
z>8_L&Yke(zsRF?Jq8Z7QrP=PlUJGKH)|#@LkNVRox>%c<`Z6|hw!S`|uAl;Owwdxx
zhlOy9cF1DSsBooB2K&kA2vm7Waab_w3{DDlTta7<wC>GjDy0qF0rph~JgcM(cpmP~
zYnHjh?n@|ffM{bcw%`8M(+PTymEd#KL-!W`GpX@!nX;)x<aL8PENO9zqNa<0V>ax@
zwl#lU0l!1uT&43Q<W@a5?;>NM%~dRZBn}yIMB!iR3%{H`!zN8XhR@Q(0>|dZ%)aB)
zDe)PdyAo2H2h%Ee01SgIO-HMEIH95#GLHqePnHWS4gI^?kPVbegw~ySbHmD;ukja-
zBAxGnB6~(3i`J={u3xtm89^FODx%Za-TGNRQgaP8yV4p0ff-y#!-4%|l>eNv|HAGc
z)(V<wl8|cLTC)WN(J}S#4y|{z2I6kd!l4y}%eG>Z>GSqfz=-=avmAaUD9$L7>oYuS
zgd@Vc-=SiPaq*SJOIMvp_RpaRh1jp3xD=Za-<b}&dhdSTEk2%8Y2DL1^1gXk`7uBE
z)2w|&&rp>3#Z|D_RxHiVh_3{!ac6LVS3<1Oh6(Ew>O&~F@kGMBc}3AZfdd94lC58*
zy!Tv?;7NllfcJkmgU%_@_O_0Ur`L$GGvXVZ*MX0vqx>-nq7V@S)f`et`a&>aDgMBU
zN;6ce=o@$eT0ie*59&&+ByB0RC?yd6K<q<Yy`i*xpjkYvUs<5B4!JlTTWr%jE&<He
z3^RoG_8gZSQOp=2sK4UJ5r{QQw{cd%hL4k%#$rb2G-JcR>=xsMNOx1@iS0RZPx_-O
z{d8k_fIkBPF<y3tG(XH0v-{t<=zp*aMcYRP3?wrF^sk44LwBG<mAQ-9E@si8YYwEc
zHf|qbyhHm(yOk0ovGjb{mfg%tT9^5fL0zsBEltS%OA5LCUAqCBO`C$>Z)aE_u3lt^
zbc<zHTFK0zY?2z`q2xF?dI%;sYh1O_Gq7WoN?pXFqda3XAP&yksm@S8C$ak>B^4yF
zv+%tEalY`M&ubF=JVQ*WRocgD8!DbOJ~CC<6)id~m6^QUL(4Z68v1RG#XV-};XTt%
zwu`!-?g*0IOND7Un<fdXHoQDTIK=CAYO<Z~hV<%EsIx0<EsZ5Q;p?1XNr6*L&6R?c
z+VAp1m0MvF71luE4%5ue77gVK_nhU$T%sa?K7w+w@Rd>v9CuCw6a4aYaE*?~SET*2
zTwFX3<W9>)G@^ZD3x9@hbwE)mO{KO1hTRm?)P}-DGUp@WR_H*Tj=8XY1pm7SyJVh}
z3)VHL{e%6MT3s9xJW{JtisL&MLzW(aFm}PJ$4#YTcKnpG(YimW_c6g>HPE-$lGOx|
zjxmHU+MMPK?^3W@&o+sZm@q`ZvlQ$Lal%|^gnhzw%}S;?T+#j^G=M3v|Eea8vIURA
zD1gB?YzZHon@gD9WpP!pLC!k&)4h1_$0&FuBhG;&uU5lkY^B5I#T;8t1{78%1?ddF
zw1yPp0fmv7Nw)y=3^I@0s^3{d?FK%;kXlI@m5@CgVlIIr4%({yZ&1DLh{;zUMuY)K
z2ZLsAW$JIl)AEoGV4sJN+3zzSyMuNacszdfVuPP4)i#+1b&^Z0kL?Ukx4C6{h6r2b
z#pT$)2IndAD>YW_!=r1McI3R>+tl5D87UKC-#`p-K;7ZknZ9f}RCfn0F6q<*e2>{4
zc~EIik~7s)th6tKANKF$2$HW07(B!J1iPhezu~;n{(eVy4og>)i1aKWx9HKKqmE>0
z1iXsTLk(>;cggz-&dAVxk@_`wnIL`LSl<lsvgKl0+7bHOfeNRNc9G$gvM!EMZG<-!
z>d3H!BRMr#KQTHzE>vHO(u|@3?2!Dk8h-Bi27L|7I{gd~B_fTL>N8!%$a_cJ_a7hO
zvJYWi)Xcpx&Bqp?|BPW32Q=RPDBy?x>Wp_{<|gS`^ttFjO9*@?>;Ts#N!MhaOl2Oe
zB_60HozkeF*YnIb^bjTx(qs;j4yMykZN4X#60E>RHFHJhOc-WkFQKLcNbT;9yGY>&
zH4!5RHO(kJ6w@wD6I`zodwvcwbsccUb<jY?akuoJ;E&;_;Xe<bv($1KTK;Zm2z;?N
z5D)A%3LktRmU(C=dq09dSVo+KRxJP#%j<?*fUtDJD$JYRBb|ttv;GoE`u;!V>i-0Q
zTl-s7*&iT~AUFTYRSBRm1_3Zo1`-HH%?S9^D%Y)ms4Rpgk?AulU>t3>UZ$XsKbKS)
z{M$@$zSp=l?GOnV`JTrzWV#!8y>uiw&DoJhz^sWx%HefA*>=6*&iM?uJEjf9wZTbW
zpEVL@q~=?mB1Pln(PvZUP-a#(m*Om@4WSS%)Z#IdYV8g((mI#Y>?X{64CUG5j{vZ|
z#jTyp5^JjD9h$LtQTm6+V!nuPJ%wFN3FSsP<QMbWc~g?sdhJm|R$X<9wBTR=4Td#v
z<701*h(f|Qej%_%dk*aa+j*kb>{Z%wrMiH(5ae6H<{g=37Cdep+9@C)zG%u&$+GEI
zCgS%ryvP8RtFtY(BZ`m1#$GY&0tMXk0Y)SnPGxs~KgNj*md{zp*rUaZ-s)BSb-(Jq
zGmba@Yd8-dt<UY|&9r)e2gtO*mm2#z)-u&_0+zGrJ669Rlq@g8vR-+(Cx*e-YOjac
z8zXUuUVGBOO=&R;_X_;o1w5nrlKnD1rV)qNeb_P4irbwCS|jYtMeP(EItO4lO7ta+
zP-hyu67qK#FJeikKhBUFTjiaaEliY-Q<YBU8T%E+2GP}6=a`+eEBMm>FoN-plGDY;
zq7|W}{zJRMN|t%?Gf^k+)Zay9Lu@>G4ca4!?Qc+wuw6JxV`|Z4y84ZVGBoe8GtdKa
z#%LeY0c}o)ZGoFE)mP#3X4v2}Z(cvxq*d=NTrDNQQcCfQgaof;DhOXIUOHEW%>-(F
z1reR3-)$BB+BoDIZ5{sZr2%6UsvTw4F=2=NyfM5BH&^!+=0Ed|Zjmq65+n!+1qyIq
zm=f52fe)C`I`c$RNB{2Om?>TYl})4(cNRNMatjLP)vy&WZx*k?q-B7gNI)!Rb+=dy
z{@cq~{%aLM30zrCNw>N^r-+b~?+YXMaCdLN{AE^dkvyo`?|#bH@w)5pdy?Vz+dUr0
z%&VFNy+fLE1TWb(brCk6EKK2DV`Lf^BaDHY#14Rt7)Lk{Ty&JgE>StW#!p6k-VhQE
zlN4dRd{qC#TGq*2&4ekK7>C&o*g)X<FvHK{(BBi|WeEPldKAR6{R_(5TWWB~?-SZk
zP$zusHZXK7;}Hf%QN~L~r~y)Mh^0$^iwTIDOFZ5QgZysCDZk?&YaLg_`$L`}HOEe7
zQwKm&!a1TUp_;X_TbB`uIJ8{1W+&N(rC8jjM|3HRtmOu)k{4b-b#U0vN0$3*7+i#e
z+F5UAg`7`zxfgZ^9@&bn`U2cf!(B<XWMlF^j(#(LHQ6IpO*LY_-A!}To=kp5erwq4
zF8Lzm%TtCGC?B*#KkZOrjO!5H-@A$9Qv;|kgXOib7+rgU4&AH<*Y<=gax3}EdG;*7
zS&A-9!&BX!dcI&6(g$WVe#JVjo?<I+JO0>`dGsj@N1KqB%txtfQI#Y2a#2d_<ZfT<
zdtrgQ`78BUGjU462$OiU&BF#P$i0ahGxN&hY)el?+{pSW#(Y-c{Q6&2)mGfzdJWK+
z<0{0LI=d`EWjv;GrEgPgTZ1Smg!kH?_WM(;sL&izop75SdP3e!bo=lvcmiw6_;BB7
zwWVT^dbc<|<zk@WM4%7?#@)Rov*rA$69T525wbLXmcQpxePkZdzkPS^&|+`To5p3>
zQ@&@SS4b2k0U@tdX@rxBK{qB2TMHP{30j|6nIIdew0GwJb$-9sNi6<Sxl6v1Nv;r^
zS??yvPOs_SQqx(PVMF1KSHT`jdDAJc`^aVejA~%<<U!*F(FLy2npyc<aL-{bsX{cf
z2yuNiKXD%I++s@OkP>BwYF{0q&R9zrY7?V7t_AjYzYdHete)EZR!;b#5(D7vO@sof
z#>l{c>*52``KnPtQW?V0v@Mh$_W6JS;>IK`*xyTWARtam){^HKSIty=HIAov>%BSS
zXa8SV#KxzedqdI&FH_<J#2&AbuUdnYKWqvPl%238!5IW*a;fI|W^8iB*eH>zjV0`b
z^8+Z@>6Q3<G{o(_x+gdFcUA#<Q>8(M?fDQkr3;%Mv%&~zt4t%EhDBe#*16J+1*SH_
z3r-WPM1PL6M5g&lvZUMQfGZ08fcvSyejO6#Fdouy3t@=ZU#n`9xRVMnxD`qJ)d%nV
z<~na4uy*Mld4f5sx}_tBoriP=ttQk@d#xF>$=$ixHfjpt^QO_+sS^O;zxuiNwt5n0
zl@c%GF~K>eOPeCBkkad0eR=h`7o@7OVUjHkhB+F01HU#~EPKM<gy_i{v5!)!_{`pN
zb@jLuf|oxL8^A_I=Fwtb0=0^lZQ)Ace6yNiv`Pk&xbD-(o?g>TUIwc>YRIp2h9ybx
znNBSX5zob=ew+N@feUc^t<W^PWsMko9yu%C4sWbu?T2~<8+@7nQ;@t_Q*uNZT|B;^
z{e?<|lqzym0y%CqUMPwqh6puBv44@2FdkC}OXSC}E)|MnzFv2%w+UzEFkv?3vq_{E
zlqTvdY#wXv;7XvUiF}x+iGFl9nyv0-j@B;nPTPK_P!~U0SOcK5uqeTBEZCIlqDD!?
z&{V_G`O!7BtFQmEi0g1`oobSG&DEvuOb-=LR2*d$t*9d+(zL-+9K##TM3BrmkWKKH
z%^j%DFmZEqJRcm5|Cu&iXFcp%l0(%QzQ}?%+*vo|RZuG)|5Xq<nIi5;#!&iP(%3jR
z_Gq<f`K38yo;$#+5w&T<?~a;g#8PSG7p2x64n(k~Z@UON5x@Qq>zQU&6|w{mD!eSF
zp^-E+Z1Eow!9QUIdgjO5h=U0%cM*#$f-8GT=VmXYFtNS{n_`MJ++WS$PWjoRT)T%x
z=X+z|W@o_7jlc3^64w^A1tmOy>)vi$hI_np=TYo22f+Za@2}$~Z9WNZ_Bc-u$hyvG
z43g!{e@f}GMdvaO;4$*9N$o2l^BuqV6Vx_!z;MDV4DZMsHfG;E?HQ*ZdE6n?9d7_C
z!0Rh2Nzp^)w}(o0^c{wGZ8S^D!-Ln}5GG%|d%M7RFa-3N!Y%M39E~c)>2SB42Xurt
zTNjb08ITq1WKU6=Y?n~f@E-nFP=qX53T~HHCKMf?BF~M(2_;TiL`j8<a}iRQ=p3!d
z=660)LskTh$Jg6dFyJbR&CFF^_7|hs5c{By2ETdHle392UMY!JD&!l%`PNP93+X=-
zU==^;LGcd|kjH;Xkng`5gur(eet^E>k`emYw<X@rDh3YCuR1xg4Y<Z2XlR?lSJXo>
zG<XWHr~XXsC4O>y%cD^|$Hy)&;z*H$u%G=%=6s5}e*(!v%%weNms|r*TCVc?`U1ex
z2a@8@VR;s*O0{XI-BlzZIafB4lP0C*D49j)v*~wT%uw5)Lm0u{Qk?jg^Z`#{j;Jw~
zDw)@f^n7!V&`s)NHE9>M<r@~>ORbYr3Pr?bH8#?$k9dMVv=68}>8;;hU>@EKK*HEX
zOg1W<1;8eqN;cM+cGgUW{s5QMEmhZT2V0T}2`D~1G0S)#2k-f0S4EG&+6dKK=J})J
za`j|diCa14R`mqC$CU3^UH}InR9hmeQ&qiF4zgkHB6{uaDZ7bTp#hSFLe-u^Zh_CM
zpE0DG_#HoKT#b5>c#nVcPY-}-OSWe4rLx!Z8*0g#q~5lcMS8wuAhwb`Hxx1~h29;u
zBR{H_ojGJG(zTEeN!pdFvBJX>RWY<7oN}2PA(BG=X)xL&VZdn*Spbk>!npR(qZr?l
zeUeXScL#+wTwf8%;hS<97pbPU^$GbfUD0o;8PmL>IYtvU7j7_>D2}_kO2q9NSO?VI
z0gFoqlETw7k@MgipOag#zb&JhBeWVG(e4N|OzjXk;+x7M1nvt|(JWu>xY)+DQ<0@$
zWj}Z$5}`Y>g<DLlu>g^d^tq!i!dv$EH6sg7gjhci9i@l8XYaVd9<cyKz0tjkM-0t3
z5l(qO^cdLe_TNdfliX5G=nO}#z<aUC(>07{nZ2>!JLt#U;4&SK(}z}|*?*p*M7jDs
z^!azXlrc&ztbtgDh7&Wu<qoz$-~XaNG#+{u;*Ch!u&Ju=G3GuLK1^{V;0%tU_%X+~
z1|LH_FjUbmRnDjdA*!@n2U}Y&PztiKEcl;LjxhLP47_I7g)T`h#wxR46ap%92mz#Q
z=MxjVm}3bKaVeN8281+5k|8lzX<Tqk($$rfoO6f`+%x4J)}m7FSz<5=l;>6;>e#3C
zT8xi#UG_6uRs_?@!+*Ujx-7jBo+9e~%}+QrpK9&qg-4<c-XFLJnnRkeR46yXoUL22
z)0TRT(jwf$qvy~#CU?{qU-4pOFaSi)Ct5AJpC=KqdUYla2}hpXw>U;@Lb__D+r#?l
zmU=Qy^?~wVttLt2-Tv@H^I~@xfEiZ=hc#DnMJ*41>w9j|^yp5xc3LTV=Sze!0is_&
zrJn;BJNIJZOE(m=&R0!)uQa7-x#^YJ*XXQ^I~C@n#0g-?+_Ois;{vi5odIY=G=JQ;
z2ZN);31qb_(&47fj>9aY*k#)dD%9_W;6r-0RjxRO9`CqbF2oU*dF3aBn>Yc3xh!&@
zvi9oR=GaKN507@faYd=V^T&z#17)>$I#&aDinlC|&C`8y8XZ}cvN^c3Rq9LbORnCX
zBN?XKvfK^2-^X8sZ5$W+HUP>KT!c|-(#MYFGf~{Z{A@>}jAS&$TqbnfLQtk`;wq_M
zOf}M^U2qolb<jAfUC@C0x!_rqZ1emEX0mmz@bR=l?3{upzWLwMvB=H_{q=L*Qmta*
zF_&0WKM~(Z(4nS0Zp9G2N!owOqFc7dpyXLX`P-`vyv8soKP^o55<A`_R`8c+EheE%
z^1TyA@(*+PtNvXN(5<MDhD?=Ap7A)vM0AJiy;k3>f;K0tQ0qpP*pfCJ;?_ZsAyt@b
zlKEu<Sxa^QZEBQ>%&hZ3=2D~|ed_q1xPxy58g%^&p_TtaDChtDvHs-72B_I9E-9f0
zT(2%D^WfLP_6EZ5z=p60AxA+oEYNB9n}rX@o3k|)+e&Yt0Kx@B83RB`Blny7#>(?z
zPFfKZIH(!)=cfE;U9b619s@p~-rxeolgZ7PNDK1%-kE4k6oNt22Y<+rV2aa8OS$sK
zQj%zJ`Kb@9qS%tG;`ngL0k$4Fagrd+<Atesp&*B9Dy{K&YyR}^_b$B9-@|L<bUIv}
z)lOWEQ@`HG#S?e=9%aSpdt^#>R{f2eBGR<ma+*rL_J$-*t&H1J!mAB1!m-(5Q6J=R
z{~K85UDK7juV8pQk3H;Tq+F;OW(z$iMNe3u_G<~|5p_t-ub<p65iq;S=Dlq6q$Iei
zF58A@Gvg`WRS;$iK7qA~>G^^b+ga!ClN<$24>Gn|Tzr>H_M4GOZWnxJUY8ZG^}5Y#
zq4IlEeu|U+NwI|U0IorLS!Kq$!~L*if>&@eF(6lUYTQI<6f!q5KSQU-cx_0eb#Bh;
z1!6W2?M`nLv(@^x7VsQwOv_=e{Sp&(h0|*J{-<Ff!<Ph-*c6@-o8qu?)cFv;<eTub
z4-wNN&bVFo!Yb-;ELdla>4OQzKN<|8#2(%zyiVUYH6hHnn7_|_Ay=f6Y(^lZN9n5d
zxBnhni7QK;AOAwx%9%2aTZ8#&XOV0agAgc;fQuPIQc02-89<fQQp%5vJc!um#fkE7
zxbfmKav;h!@q|}&;U1D$DoF>6Z`2WYXxk-xh2m*PV7uz2Qw`jSlxvr#gB(|wn@dK`
zPic~`IO1n8?`PKWPJ9+g?G6vDm*AZ0JppSzmI$cy{B=G8yCgQ^F8MBB>??;9jbB(9
z85?kq7-s<3H=UzQQj0+|?XM$}B=)4pa)D}Je+kk4V+GapQBobn1LwfGB4jCuHfaUr
z85Sy)Wv;WwsnQA6VZIIPq$%ugg#Uzj23_A_87K%y5f}&v*Z;sAiC+o~*&nA#hu;en
z>3=CcZaT`#3gEtg5a3(k9|`gG>~ocJXl09nEG|yBNJuY<0tmLMW@aWy&&U37v}QcM
z^;z2{koY-5d21*Ijw<g5@^g}_iypdJx<J~}(!#R$&B9_!5CHgsWQwr##}2FjrmrT7
zD5sZ@S-5QnmKbY9gcl;46aPtSr!_fY-(I^7Bpwan5%uuS0s#J`PW5!QU_!)c8X8Hx
z&Wzvjt6&n$MW$kx-sd>y<PP$L=-k<Ii27{YU8dxWmJ)OyX4TTuys2N;KJ=q_Y*k3;
zDvTRdPX^Otvlx2k5~%4BhI8!bOa&;lorBhOw5q!kR2^{QZdXO3I(j2-3SXNEuqRY*
zEx=LQb$(pH0vwfcrrt!_B%oGF3_c&jImrnSkZ_U`cRN>af9*eYykF1M(ODMxWndK2
z4daVm^LfL6cI&hZF=^)Jl|0IP1uva$w)g(I0ayQ9LYm679mGVc0<R}BDufv#!pD&y
z5uTnV1BqEb&g6pm@)mcvdfDHPMu*cL$qXqmu*Oun51<x36Y0ib`M%TSY`d~?n{-EK
zU+@ioTzxS4@WH+#f)(Uiz#LLao52)V1fI;4UakCcXbVKt?6Sl?^I{~yF3U5F3h0E5
z1zJe!XvCz?wm%{S6VhnonT?#vWkvkTSo*6pb0DyuD@TxIP1CPdP8TPTDimdnP4VqT
zi$K~A3y_jeHda9kLtnJUyJ9J54ibNWTDJQDiFCyN3t@kVEN%Rpn77~z^2sX^&+x9O
zf2k56=OP15S1L;=0oOKj$m7pW1-xN@H#IrXZ-&uwi|TLp1~GkU@4{4h2UqD1OGe4r
zwV|w2(N`zRS{f0h^0izfUYgMuzY}7UYlbS^7i`7<HSdxxMh6@wkaK4$QkY{IqP9Ro
z)e$zB{2_51fUfhzuNS1iTcAks_WzW|q2J2RDZp)E8Nl2>A`Sh^!egss3X?`ey*XH`
zpk!P{2%4HW;a>-`GJQGW)SfD<vHdb>hyKnm2*}CU;}s-^R;2k&Vd~eUt4ybJSnv=q
z&3WU0b1@z8_WVT}C|-RkWh@cFfQ0~o(8QxQJ#kzR?%g53x?G=M@Q)m8)92kbQi2^J
zfNVLx0%*ezxo@@Pwjz1be|N0AQ?aVNWDahi^wJ+Xs35#t1rm4pqi^PJLHlpntM?3%
z?nlo*;KXEJ=me~w2pgd|)Lg&OHyuawkFjLM*`q!ywfi=1u<k>p=Jj=|gbCY9ps?pq
zFCz^%FcIvxPGf7I&7j-5jYe0dkpCs@A9*H;1R!7f21s!|-%AQ@xRIjIXetgXdv40c
zws|5|TWI~4IW8ut)2{Ip1~oUJr$6Bvi%qoBxJ?hGwFL13V6ud0KlVZW+vnyIPff<r
z%f8Q=zxCK^BiG~MJ^>WW8cbH}pDP$QF^*M2S7+jBIT%GeH>~)QQoIwHjY)%<j<W#F
z0#0V?-}A6eRT{MD!WXKRP14W573ayF>Dn-^CFjB&HqH82wemg7LW~m(DqtDHO00g7
z0O?4x()pnPl89sfDvXRHX|r)o6OdZtWIEuz8xkN~#M`LK4N}}6Ox_<(eIxxZyN<Fe
z<^0&PDw!9hC(RBT+43w@IpaDvDmg%el2=VE5_h*`4)PTw+zXbw)-)5Tuz!i_ftc=2
zPRxqiVUwJ!2d^C`aeI*do-0vzkjp`J2LHZYG*^c3)NOIy%+R>rYlT&pZFc9Ht147;
zywp-QFMnp?1|BS@&nhX7+RTh^gT7HB)f2*86D~6r6zc=6J%V~u(@Ajf<c^l8aj9Lw
zBm15jomu2}Xs9KmRVIlH_BY~x2Iy+|QG5vCjF=3-uU-CR4B0uPL3t-<z=~vHIMhy-
zscU@)j;&hO+xEAI#5a)hx79(IVE<2ZKF28vJTfWZv)?24ocFBv)-E96>xWZdYAjnN
z2TQrd-LM3LBK@USIT{Ni|Cx9lbcN4hsF6o-fvnb*&mw;}_KW_L@T321a_4~1E2W4x
zPc9i?=5!hkro*&AMDvLR#hK;XKt|Ku4<($T&(0l;-9<tM-hU0}HFpVS)RZ`)Q&dGW
zi^dTR*7UCA#-+HhC_WKOYEY-gmq7q#49n%{k>q$nxyxB*+-IMhjC@(DDtiD$;|KSM
zMS(CC#TWZdnQP{>b(dE*j>BpK+>tR6<47+cgL7`t7xoDKs0LqWo&0hc>w(YlqKHF4
zkaYPAO1|EAAPl$thR^@}f;BxgmjVe+J6Ih+!11gr4>!a2tkhhuxUOr#L3p+65%+#_
zO+<oE*XJSPe&@87NiI3S8Y9lewPfgMjuN81Z%7N~ug&xbE7U%cIF!0x>Ivw79gPEk
zX651J6tlQoo}htjsrQ?aQ;mv|x57wgRl&>e(3SKKefWe}kd|sI62Zt{rZ__lhuXH|
zq3sS)oWQ))Ewdk{-(*d;mL@BUXwN4jQHC+D;{qEjqNY@R7Bzhqy+Ui+t5FYs9&&8S
z7r)MMXvk&Jwl)kr2Zdub0zm%@692zZo2``ZARv)sC`=8WAsnZ}_9<3Vjbz>r^#9G&
zh3~!BhNvJQXVgGueT;vDJ177KQ#)f<*BotcBej)|Z~uwu?THx(5u$#osd18x5Gs^G
zTugSEAGqK{BnnAcX5&m~78D}e<-zV1BdayR?$kA<tu_$sfy(E$7b><@tpYW@8irdh
zezKZ1_88jly#Ko57D>^OpQhK`FWEPKC%S+WUQYvouSa7L*5eBN=0kwu`JLs{Yjm8C
zU;e%*frDTEVco0L$?Y!NhyIYD%N>QlYQZ5I0XJ9SzAC|xGaJ^J6Cc)Jr(mQYibB%}
zGjDR;F)C;4gH>h?K7)njE=_(H^sw3@S(hG@@<iivX1&;$TNy(0#6*LMHM8V6>(@Zu
zDJywcH}nIrx)@_x(-nYew$8q4yefK#D#q^JIkWJDbxl@!^bkuV68_q7U6G2yl38Qi
z28%ebB2#XOSyN$6nS2SuynsTS2XhftrMgIGMolJ?qJ$@vCfsp?tS)(hMy1w*rkh3d
z$|YRWqVicze>O?GQnO-WqeF|jsfR@pNVAet<&kre@+R{LVF1uB|BYp>Qe#T*J!OJ#
zshBzsC)3ozq5v#0&@NTul^ip7sXhN^jBB3%;NBsWdZ9w=ZlEn}e2S`FF%{;LsCm9}
zL?h3DiOs%WkE4$YJ8WVh$7CTc$%hTIHdZv?bdfavCr*eBIbMuin?Ajn44Kt-keL-9
zZZsq<>oXGE8}NMo=xz&s$bi@uL8?3Sd^9P<W+8EL7}Q=dLB4$#44h_%mf(S}!$4n#
zG-Y<MpVN@kt)V_w*+JzjdbW}Sx(6?;j&l!K(HZP+NOf>P4bGU=uiHh6%>*1~Rx9G<
z``8lMSX_1qCuA`@QFF?*r5Y_qrBvByEZbLC)#|r81I(W))u$LL(Oy&k^`!~RPh+4&
zF_fEDwlx}9kjvEeJAzSAbk|4pr3pzF%Wc63iYF?NTEoHaW~tcqQn`8O0uUeuYcM!M
zI;Kb$R-;y}^1014*usJ_V0KcWhDzx#w;_(WS&(7HTUR05GG<_0VUo=ywGVN=4yMa1
zXm|=&0b7ekbo1CO)?#zrMqJp2MB@x}CT{JiVwv*ff}WKZ+uK$Wn$#k~U-wd~M9n<N
z2$e6x`Lw?=$xbHnh->ZbU@xwf_y;z^E+Ef!m-9kes<~s4xQ{rVdQ=FYIDYtVv{JC*
z@Zdo-!7Y{BoHCNX&bPAC1)-&4WV4qisX`5N13J8>omfq?;wp@h#gY<B;m?VB!C`7S
z7I5_Nq%U&_l<*~ZD+Z}fPZ_&IB(u?%Yr-O{X@BbV$c>DeL5gWgvQTByT_YdR1V$uk
ztMaP$>r_sd2Oo<X2#`@KoXet!h>--EtnBxOX6SGQCaS)kV-{gd_oWt$)}v)5%73!H
z0h*R56R#@D^ZVbxw1!zg%YMhW4rFAIK7{|E#=Tx3%O?rJ9bt@v&^c2y?3AqJ<-wl!
zKt*AQk%DxKixbP5v0|~jR3_JxT()b_OTeFyMRV|GDm|KU;OzQ^ng%73v%PE|eyIG^
zJM93+LhM?}UacX{b4Y_pKyEg87r1V>4{)Q1c1;>8#>pjS3v-RILTlZ~0^0&tecxJO
zPAYp=JtZ@9%~^ID1dOdTK?-u>uUapbO9Lsueb-8*5<ofYm|_=_q^Qg|v_bdKmk^1L
zDb8sf%ShLwM&->4Z)Y=OO8gc9Nbh78r7{SLrk1kNF0<{Rc=W9n%O3RSfpdI8fWO$Y
zv>K_}r`3s>_=PHYyd|m`6;PR((^_`t)i|u+OR!LqK_r9=+FKTnHQ6;9x!lPqV3Sc~
z(cDpCo`h)|WgP}T&tf<lI8=V|S%8$ejEwcytefvqY}@TkRlcZiON5?p9drv-$8K4f
z;4YHXKwgjf|M)hl=M98f8cpDU0k}YI6cb(rPYTE5jh!phAX+zWB-D$+pC!<Ti-{A<
z08VgF(-d$!{|!-1nOEi8%@ZuaDYl?A8Pd|~dY*kCkcYcTml11@r-bW~YvQ@Y+EKcp
zGsIw!Q~gQ9!n=p)&_L0*97o)c_G<pK(wsS>Ss$$~XHsn^>dky8fY6?_0@!G@Vnby=
z@*#g*53)vqXRnGuIe!xG7)Zc7rVw?|2!Bno<2=HAYb5S6D<f_@;1KO4F=RjD7^&>r
zg&b}qZkr;YtHw7{85woO3DC!2mw#7x8bzKe?7awOxym_rP9ru1b^&E5>RGoPI4FO_
zYjcbJ`DA1czf9%FsZ^6J0t7LHO~Xg3^aU9n*o$5#W`Q#uUAWZcuT;*9G6TA29v`6Z
zBy~Pwn?1Veu%9Uvc3r+ZQkep(+@ju0b7GlYWhs$p*-_W+7B!dwM1SH#MfJbDh*oDE
zmd}f|uwC*l7mfnJ>L$R#{fhGPD@+FxdT8qPmrRxhaqjF*YlwG~0qMlMNl+CFY_!;f
zCf%bS0WJLr4k^>7*~;obN80xYZQo)HU9p)}p<g35Cl)lxG{xFt8xqfod6-$(NGg3w
z%kXTTZ&}`z5i@^W$VWVrMf+^WNome1Q^5!KrM7=sIVhCd*OeImkk)<Avdh%sLyrC1
z26<@zb!NUag|Hon2VnPJP8d7#&E%^^b&NLJLFV2JcZ>=>1ofduKDUAktx#ZFKXSAw
zipZpcS|Hz^vf)r*{GMK}ACd$5hhJ(2$1v*k-BvykXlg`^znr^Q7;KCpjEINx5i2g1
zhe*&z{}m5GMetG1W2K4)?rcOPY0q-{3{1}fkZ@tQ^Nwu$0o4Ts&w=q^qT+F1dC=e`
zc_$=n$)@BF4<Zv2X9OyYeMs2VQwhf}#yA+%Qx0Y4oFUUcmi9BqZBSL;_Y$oRVTLa|
ztZ|-{3cG1>wOW0vgL7!dFfenf4<2%gf2(o+YM8}xn{7raAj18C<$7&-hPQ3|2vVuf
zhb^@epb+gT1~4v<RMR6@v9^uWFj7@t>KR{{yBQ~{dS|zB&##nUZ!dV=ziTR;DtXna
z8zQ#4-E*BwCOm?}*g#^R8fqFIa_=seexw)8Hj7nbqOWpcP7SGXl~vTQ3WouXgD+np
z%)Lxl&CM=kCu4}W*Z=xg&j;^YxMp>Bc9pBdx>&|G0c<)U1T=7AF?l=wJY45wamAWo
zmBZCi8kti$4<)`xPx3e3jgnT_dK46$4(ZNt(Uu9^xp$qzX26#55wmXNIyMa^LypIW
zUXbh;gFVnq7UNDO`)$;~>L_?d@t5__{+XEGvyPSE;avq^5qLY(uIrU9=gJcBQlTVi
z{Aop|2;jG!9h#{WEtnI+ER9frQ1N_E#5uDC5Gz0H*o<Zt4jfswB0e!2w}woLvIUpz
zTs9(md+nOp3*ija9K>3@=<Kr7;WD-v+5@g`>un_?K6?spqH?eIg+aJKvqrtjhOeT@
zJ!Q*TS5x`8-f`k7_mD+dorUurI?QHbv?Xtg01@t0bTJ!=$sU5^uaCLGHRbO9*QU*(
zB?dj}X`C529F1vfo6&!GoNDFo@e)VnKWjwBtvE~v$~Uq*%PPQcjzU+5Pn#Jw^AeX3
z0r-1t%|(QPcxC04X+3oAcoBQD8sC^-Ud(OpZIv93*`1>I{@B)Dx+f1Fz4SsHzS#@{
z01!=Q#%%<sJ#Sd;ztt(8w-rqg76V}$?Lhva(lPy4+$~%0hFy8s5nBOW@hnw67i1lz
z?)b8FuWIorI!IHyLU6E^tq@<XZ}(??yPM-1hi%D$akjsfYRqYNdOhRTr(wU9KFAso
zi8Y--MnU1Lu10Rd4^+4VQQXNR62|aC0aGVDp^3pe_fhA^aJfU}G@coAJ0S~Q$I5xU
zefdzP9;9_xrg+PX&h9%dj1m6)T;`k##3gg`2dchIy_1Izk48UWYDosfqVu;;X0vuf
zq*Dm98UxV-#H-%ee(vg}Y1=9u7P@v=HMX3xMXw$!BqY_$T}dy<Z^l#mDhZue0E&Ny
zY#YcG(JFikq$QM37A-$}BO3c)UhzxZ-IIAV7Z2gV{8rBtuOO$YqrVU*#=$toddU|<
zNqfv!YdNgy7H~wG^dQ|mk*}0hc51?9sB_i)gMLH>RKFatvl-zmN$ZoDGpnG~I;T!O
zcIS01{yQAs*^tmE)!82T<{*bB2Vf8{)@8_2Ui0^p&_<f2^52d^#!&pLJb4m^9TCkG
z7O51g&h-=Pp#vAR+So-en1RiRca;TWmHB%0P}r^?*pB`k9_xjWwy#<2hZOq?mFe_j
zh6TPfMm$<hsOoirLVTUfvPl0NCCPoAE(<vk(QSNXorIH=28oy={`QmF4v=CwPtLdp
z>y5ECe$${Y(2w{Ay*5?WE*y7QT1{748ucm3l;q;=BuKdTpddHMS)bMe#XN|+M3rGY
zr-GTKaOeQMllOz`9Ij7j_DvM6z^&0{e3_AcjJic7B*~G$xok18c_!}U{v+JN7wgz`
zqOp-YE%5xjXKb;}^#;}(0=Qw}EE{*EIw_j&8%sKKQ1*}KKMwL9=Z!-};Kuc^TK7b6
zVvD)YWB0#QMsM_lXZN!?<&lYuGa5jVIHcsFzkueuEH&>yQ2V<92o7l2x5AV}SFswY
zElbe<@DfDd6yJB07bT`I2zOfkH;85A%&Wb<-+!RP7e<&B)?U#y3TSwObwo6>u$R`~
z*q71tDCz3g-`kv0V{n?QzE7rby`QGTAJo>?YFe6U2edsRTfm%8+940FH-bZ|)0oj*
z4Q%XC{${+6KAw0)wZdYwXGv`546!Ho_artoMey%Q?bW=`6`!Ca5!|1Fd*clZITGep
z)#}U*rlNadLCck31h6Z-&l7rwliHk6JLMQr`LH$HdT9(93xxf7#a4~4T=17<%8l+-
zte^*)3C>+X58Zn(T5u-g_v0TpVBC2*fbF~f2A!^>l?DCR9?7ToX-H_*RXe6>npPIS
zmBl{7SdrBlHf^fVu)_q#LKK8XkxNs^PMF~k3paHfy}F?40W_)%er&mi31HMhF>Rc<
z|0omXikR+Xu5j!$+Ix(Q@caGYigdttErMc$zJ--wd-ofR{@V|+-H%(~6PaOL<B`>`
z_9OV?_?fmyG>4-_20&gRDIQLKCbl9gRf*A#F|Lj;reBiPP?%bc-Cj)EVph^PPON7|
z-v-Xz!uCzF252gG9M?dr0)OIfPoJEjmOpRJw822;UOO^0p*@`?a&#i++JsZw9!$4e
zPm3C}{Urli;qnVqU{n!>6+lsBLH>-w{6aeIw=?P16^-L6==z7L=$2q~wGK!B=1}`1
zkyH|!XY3Aa;ZF46{NZ3InuU;Yg5*Oh_0U{9C=Yqc0FX%VTCp9XdF<ZJ;J9~kFZ(eV
z^`wuj@Fg3$BF2CH&J@sZwc37j^-3HtY!&cR^^VWdwS5=7+i0Pt7=0&sbjTkbj+y=1
zh1y^^UR_{nYl6@C#{46+AcwSWALAogdmngm%X*y{o3R+H8M($F^Fep##rSaDAojJ9
z)Sa7j1UMPy@{KTbn*MVq7d3|0Tt3-~$NT|aiMsK8gKMD+^Fpx%KYU_752avL-u&*U
zEhfpFm+k{zhAJFy+#Oa|)TlTwbsZoJIvbtRKYe73Dd2iFNt#|Vuc`U74()hT(vIJ5
z?q)<Me5O-pEjS5le?k!8eMelaSXabEuPmwF0ie7TR-hKO8Ol^~=P<1F*?{X*>>k11
zT#v9mhNYv5#d36>Yok8p4b3uqSPn>geI~rS;?xS=HDL~r{QRa3b1bPw+#LXvvqqh~
z)wTc7xY2)CF<v*R{Zy2V7eA_}{fucm1x#s3Gb7fTVpkZ~;D=e@1W8nVhq|nn&EEWa
z0qktAjs7L_FQapAFK&Ij4Zf7o46+?Gu%oAUnyGftCAv{aR_!&=TTS>WRh-xLMTCo#
zA1R(0ob~6Zdjk+4sFU2H<2&C<DU5ch*t9g#bXaPj#!-I$2EwtDs>75XkSs?h3mQ3<
zG^L(7T=-IbPPNq-KpyS4r-&UZ_~7;i2Y`D)vhL_>q<F{Ex%Jc=>A1Lsx$+G4{-Rzu
zp(=XTnuIG_u*hL?m_=;5m&##@P%WF@AEs`K?p1qB<x_1wyw!o4P*!6Sq9hndj^7su
z|3RCHlcajz{pwg+>#w3&uO6pLF&j|4t8c8aiE}mjU7pkN3b+FxMmN11vSnj^1NshU
zSweGgy!#aOGcdJT0~z~zpoj_KYaQAf^ZJuNW}r|4e$a#6D0sU~9Ab9SnI<~jB4JMa
zTo`zUT@64PNg&Z^a@iTA)lasMxzcNOZq2b{r0lA(YiqbN@ePw5OR=jv_^Z{b+0+w$
z<>5j&`wVASXYQLr3&*>DP4@X@hty|9e4OPq0en#W?*?ZRp*}qHza_Hn8=NLFb6Bu{
z+h&SZOaHZP7I2Hx#Anm-U*f-YHz1rH?*El|?MTu7x5b5P=)WERkF^p7I@|F9WPP{9
z(D~6e676XH%R?!wVMzSRG$NNVRmMY-4oa1rmI8sv&Bn~mrL8*JETr7Tv>YFiuSoT0
zKeXE4_Q0M$s06OZ9nLYEgrdE-eNS>-4c{+r48K8~2zHMW!_vmM^;Vo``rQd`j_(Bi
z+|N6S<_Iv|7Hpm%&{1`XgUOx)z7jjP*=`$x%-#FU_t3z|!P*e2kDQ_M{@mhR)2y68
z_RcF?U>n?v3U*B7&!BVSu#{M7GG){KEzq)O_XyQH;RThhc2PSXph)ZOd<o4cz8-@&
z;7($%qj+;5>ee`b%Kb?p63%zK>ZM|s=BGHG4pq`wE`Z^ZI1uw@THsa%=oSuOm`l#P
z<-dmDtM*P2dpEXkcy&Yp4X@~7m*P~B_If(w|9zRrdpw4>U&U1v;zY=jT_s^W_{r3J
zC95n?;$1)a@`0=PL1i}nb_XW79s7L9CTo^gCq}Q0;prE~DnKQnxu4Dz-zGPmKhE@o
z`s#rE3m3^@LZ^y&(CoMiP-*3nxP2yj*L*eRflbcQhT)wxWwW!3#-Tk4#+&2;+_Ou8
zN;C00d-|G1E37@tja1*(oVTUu9qxjkX1z-}=x>$hIx`*+gSeomrTR>e&26?{V{a&E
z&b)9~IxjI<d%}LC^1vvJlSe~xQXX5QXuX{uCQYd5{U+gW`mRC&80_!TL$MznN^y7%
zG708u#ZT5j@wF>LVrFjYz8t1VuyW_4j>4qDU~p8hVl$pA*35r5s+}~F^x8+((=19b
zi?wh0E-8KzDTsv>D4|Vc#$<}ngw_gYhPio^tA}&YjLmG75e<fs(MbLkN%h+1MEc|a
zI~e9=yU{LZge%Pi#I8zrdN;F@yXS^{%0&=&%U?Lr;D^XpZLkwzsWzWDfnxc_x8;|0
zN}oWBMqvL%*i22C_=vkq{i7Dg^nw4LH>+q?P-37skEmCwxg=Jwe&UasCWV+ptLu?#
zWQFO&w2MY<&UWHv)a*Rc;6iY;mF`k4;)6};*Mu<DAi={0aQ>A@n#~uQ`-XyZwZZ%j
zE)FqGf`nyBbqk|cqE)-V=+GKJq4yJLY-4Yq!6P&y5<iVJW>&2VzAB;N`$wycw|+Aj
z>OzhN&%K&cCGt$Gh`MBLLQVx0T?>&@sh@AwBuI)5bvo%?{~L;!AY(9$fi!cBu!w|N
zW!L&*hBW(=5yF%pMi(u#a$d`jJIy*rUiR_}>_3T&6!N9gj(<!u&Oe`J1S+Rv0%z~h
zfl{uRfJbrfWFbRoYuf>iUl8hvLJV{&?m_Evm&6&9IFg4jALw`-L=AgjuT;YgXfV+F
zZp^MfU1wK1US{VEcL5+?Q9U3J?M=VBK(F_E<K=%M`LRJ@=2{o+xCZG|`7`VhoK&E;
z<JcDcj)~wmpEF}LEk!wroSrRNG3S%_ama@Y0^FuBPZC--QlSrxIXnDS-koGqU7)0u
zBsDL>^1g;0+f%bya$n>zZ_9I|5~7I2<qoRR@FNzSlsZ|E&8e6rn=C$))VFLo^W40l
zVqMWNIy0n7!RD@3`;tV3?tELPs1$>>)1x>lH*2^+1DbgYuU5E(@IBoz4U^i1-8N9w
z0|czkn1H50_+);*O@LzQQv-nsRM(FyT22O~@1jTh8xivC{>@$a6ods-`g+fiPP_dO
z4r@M)R~?onZr0W3%hU5FQncHM#Rd@1j?GRx1gpVAz`^}%#~&}QpAu`Q;?2Px0pEDT
zY3JN~Jxb(APC1@jpz{n1Dy-+K_b>}B;*HzFrq{GKd6uWj;*JVLsy=5sB1Jwg4KXQ|
z!!{#&Lp(JRTkHJ@KA_45BLn}>n2a?jUDZzr5D+pTu{#G~OBGEM`<uXZqn_>;GfiZ0
zgNQT;8e@w_y+$n6JOn+cee)*61aY;4$C*XZyv<Eb58q2r+ZW6;`8rF>Qkq980C@Pw
z+a)b+(%nD3(X{*YqR;s)@cGFcSoA6_0fNS2Fa!aEC7PbhL~e?EGkGhV!bEDUApxIe
zrZ?)#@+Sd+G1eV}jA^DfpzhrLQ$#_jHq1$X5DHa=g`}O>6rYpaZ#~k$k4zZOSb2Ri
zx`+so!B~1U0F)@aF!bNZ*Cbm<4s)|hMjB3VnVYJo0_!X41TFkmjQSq@mio?7Q_3Pq
z+ewRf2$k{5r0poi%<715?5Ss}dt;&+eOEferp^Fh@2sn}wQ=z3k$cKz60v96sx!l#
zZEOFTOEjOZ79K3};+*~}E|r6=DSeiw)d6#iKgywm@f7l>=iR^X$#-c-I!)xuKv{!o
zeCD8GaeCXnlqrAuka~8jK8B#%()@$cWO<3H189)0il-&gAy%%BIur-F%OKs3`GIpy
zrwaiH*9r-oNrTVzTqKMq^W>y-urJB&ma5uN9V(OVjdn@t<1eadH$ioC;b_P_p^bCM
zFo$U?=aKEyR%(gLF#OYsX9y@HcdwaHilKLgwf_5L3Gq1c&?!Gp?;ERUQ4^JO5-c5Q
zqdAq#ly3wQ0;_OHFgd8f<%+SiAo~GWhere8RGFY3lpYTwOhyd-D>vc|-DuJ4OrsU^
za-uIRa`fgW%6hd>Fb_mSjtkI5=Td>P(QVK*p<A%<$>6B>O()#sB_Md*uyoZ@uUbI}
zlNCkz!Mw27QKleOsH^CH!HO8$L;jNtEuNDXrD_DWlVH@Sg?p@i3N<u3!75uS>JR|K
zJy{6DecSV5pGDSi^*@EZu)PCD1bQ{NY|(1)phvn8yZb@GH+O-hmlzRtd%uEz-jWW@
z)6y_K3e*9t?_0GHjxViqBy`ARQ}q|E8WkyWb5=(0p3XHK7yd;4UXjqO4hl4-pO#PD
z6>D_1DjUtZ;86#v<t3_x-K9=0^O6Eojubp<E^k#He5A;9Dcx-O6DG}P{!ol$RXa9z
zmYrBda^c={^x3(_qHd?utq&@F@-H5(7Qx<{Uz=^xHE10`T=T$puC=ZkbuG7U*pW2*
z+|6|tC+8~Mi(fF7XL(j{b(hfF@ZTo2mM4~%dowe_L+P&S{k4F(SKq`pe*pqKVhdCm
zIq6yvL%c+^{n|2TGIXTr`0jFKS}!H>^O3wj4(6aJQVDbFmUJ_7V{(J`5$X-k8WBX@
zAoWeqVR$eUL8RfAfX3iOWa5*T;AHPm*YN^_tsA1>`JQOKdh0jeU_sfAY=5B#5TpPO
zB*~;IlCz%WupLnfCRFNf_W1zc>2K(*qAwbs!mrynnnBYbE23^-F)6p9mu73!j_H6^
zf;Xn*ssG$c`8VTZt!UgkKr~r6@VP5r^|aWPQFtc;@v$H;fGdVH4qm)Y<%821nLMgT
zWMP*S0cE=wONgG!nODps-B<RI2?DpDCT@O4vUPR=snGODo_rFIO99ZGb#y47ogdnx
zE}JsOE8WdpC{}+3^G-gTdk`L)5c*5ZL!l!b=XYtI*#F1XIWT7uciTS6B$?Q@ZQHhO
z+txG5#I|kQwr$(CapygC>fUp1RreR@e^>X~d$0A|k5^?&`{wy?r=C8@b(;<zH{j1@
z#Hx=~#((g>E>5x62ERAK_f>IHF~6{N3u3-{1hAfPeMj-yi%=~?5it}vvQ)|_maJk0
zN+6#ZL8yeH6E+Fj9cjSLDS4buz@g&ti-F*gF@SkMpFu|;IL1siyE){~ewpmwxGM+!
z{5PrL<{mS_$7>Az|4CYc36vzJe+jwO-~WIL|9+8p30~ezfDBm)VWGTP5G^Z+#9TF$
z`Q>H-7M4UQicqyI(l*&<T{p)D|8H2|+cJ9JIr0+vZkK<f2$_#!<}d5dr+j8No);uP
z7bp(ggt0dEmrdvHn~syqE%O<G56CX9PabjDi`Hx~qv3GS*qO<6h@;?$XeYiPRLbDE
zDXuyLVjoE{faQ?YCzm)JUN|M0fS(I0745h@7!!7dWs)h-rbX)rPgs5KseG;6T+Jq1
z_hoWP_1ZLIKFt_Hy>+Uhcm{JCuhDT{*WG5NQs-r}eB|OOU-hMpSU9G}%V)|7`)P}J
zliGR2+yJbf-<~rW5VvRb4gpdF%30fskm*1@*wkbJ;QZ7wHcj(>IIfqa4$IeOy8>Hi
z82mXlnyt}v4bGPIo3L5^HcZ2e3=lpDv|YZ)1fjzjx_AVb6ck9Rrgz8Nzel}`Ou3YI
z_Rl8MZL_URRt|h!Mzsmqd1+b9PfCfB7=(76nuR9ohQz;%UaNdzWnHrT?M~1!i9`~5
zn~rP)tgB=q>11UorK;*VJ&-}FENp089R;7nogAfy?b>=wOre>TTqnPk+qc2ho#rOc
zvfG@;r}UfXQMnJg`z~zfVeS;PHWa38f)5?i_A#|5m}>xGoesPHy5g|Q{gnkSmpjp`
z34>f=2#b%IDm*5@KaKIY*;!?{-3v=&p@EVOh&j`M&z*7*s$O?_Tx$zH(5CiTp+rbw
z@iE#}{#SEg+F8A3629=4%jLh^nx)u3Fl9~eQa7^yjYmU0=Xtcu3$f~GhasL4i?>+R
z(+dNv?aHN{fIoB6O>E^eI?>Nkzhxh(l-(`Mbo80qD;_Nbefe)-Q&4y+Fzu&ibD)#}
zjQN}1(od?TLt@c3oF`NBDHBm2s!#KT1RrDTjTG0~qdAx#=WSC#?}7pXPchoRk@77q
zU_!g|7$v^#GD*C{ziAiRg^ZaRAd@jS1qhfMfk_K&2wo+`o?>l7q@LBozhG%!aTz}a
zB>+fxr{o87Aq)5IvQj!^<{+E`&gWAAvh5a#IdqI0+qNIpXw&YHd+0|Qdv6D1s<jVz
zgrXq<qQ_s2qI=(%j*Kwz4~+eU5NhEju25KOJ*V|Q8MWVpt}}Bp7{MAq#xxXbrlHJv
zSM}H<*b>ri2N(qQ0@L6}-Gu2C3h{SrTE!<7l5d&`PJGqoUhiykNGn(CrRhol{9PDE
z=;B3t2PFr&GVR$gx6U6%B48RbC914_;l}6+e!}*}GCQK@$2d^@A&ki4$Q1-|4GhNR
z0J~!2Kv9NqElD91PP74(2x-cbP@Tw8bIH<hoURqI+hQ6SKXpC5a3d!&5lST$jPX-c
zSg}BtIoP>HR`GHX7bZQ$_v<IYP3HuQu7@SGXj{U&ExR*eB5Z5!!o`zx3&~F6Igmmb
zk?x3<ql^?fd=$yNZ~Ff&y2Y#%NAnYQ0spWO&dQ=Fe$Ql&WG&cOMnx)>Dq*RGw(&&W
zvqTC?3Jkt=_6l15S5tCccV70LZFP_EZ<x5Uie@<cXE1<2n7<W9;J<<SU&Hn;ZPz8|
z<-)UEUNW~%GI>up&0qMuz87YI<O)o7DZ~m`GTCNB+>^Y>!e4H?<NsC3gwt3U1Fe8)
zXYhO|gduUnO!bE#JDtJ6XlX<gqSQslH39f)42fOiqbp=wbypqZ)BBYwE2bF+1(z<T
z>dUZrT4(I+QkBA#3>S8s4b&n>kn9GW3H}*|)bmgodd5I#J4vQT6k2h)m2RDc?EsAi
zOHxG_Swnir86_`c#!8{wF3p*)7EXZT!%ESCcJZxljK97s&KatWVwF_?AvbQ;=Ea}=
zYkFxw@+7-X&0?c@8{EK{O1p=;53N)5qw~k#QQ^w`&ug0s5)f={j-$=a8%?=10Ys3u
z>a%s2IiMbmBou(nHu^ETaz4^w`GImUbk^HN>Yjx_jT?PUuwpRs?_A7C&lbRO+I@IY
zYV?(jsVX>5%^t@H<0Ez1C}R*NZUat^VYD$GG#46YvV-mjY_#d7$*J|sr_xlt^!$NF
z9~Ex$mTcC6v#CeK0oygh;07!vocV?a*pagUD+lPZN+a2bBnf8yPYpgs^mX=ZGvjQW
zWUzviB7TWodV>CvNm3*l8#N$&k&Sn0Q-wB!L_1a`^KfDp18!=1YE#3E<Eh>+BcG%k
z{Up3`5eKyjA)NgJX6rovlFji3uDfX}#@!(7oL)v*tzvABht=ZwU(9U7cdF$QXAAzR
zpCVA$PE5%=W*b|!;AwH|VJoXRyosZzTv16xr(qzisbl_88;319^cP@<wi4RD|6!1f
zSElSy%0JyN$3YG1j1*>`dsEz=HDY9mmWUEmR+sAha7B_^I9;qE4)YyY%M3ctUUGp!
zz!=@|&xprgF}zW5xn0`yf$|1yyl+xk8E0B$@mFq~cW^XGUDwm0$(LC?f_sFyBU%h$
zR~K>)Sl2<nK||P{Tyucct9s<suZWiZVsSrV_5IODVUpw!@pBJT=&l#aRrQ<SkYxt)
zbLe2NSwcQS_^~CAuwKCpufHl@k=<|6Wj>>zz9Hks6nZO8hc--5i5_V?g^`Fe91A6s
z0vEB$iqC!^8c!HpA8mfVf5rUez_DUrkOU_jQa7`Jw)y98Zb1}+Es?@1wyG7t5@ahC
zqN|-ekfpdGEZ@XfvqYi$8X`u~!!M?P?)m?qFCn!m?_2+DTz@EmfC&F12>#o}HKhgV
z^B)&i_oS0O89N~+0YfMQmGm<NkpYMz5)y<-p9~1NN+${XSg#4$^roR>6||jd#nN(B
z_0s%uk%cLU*brTQQ`P>wtoFxq_sX;8&iA{X?K}U;_F6pS{LA}C)8}N{iO&i5$wo@T
z>-tTOcU)-l{mgw?Ai(b=FXr?GZ*rKCA<Q3j`XM$07tbp^3+&R!9hi449784O0b0U1
zCL}<Iz)TC6w=W0^9WwNn`#lRIN<^NBVNHmXXS>EE!hnomuF8?-{-RBiFVxK4EDzt<
zfb*LPJno67Q7ZlHrxC}Hu&qyde+gx0uW*ECUI^M95q#G`1YpQ54P#uj`gT@ZhccLo
zQ6(Zz45kUsD?|R}7D<mPm>ET{_&yC!YkESL<Qo+k^%hF+ERX$-Ch3AlXQpB>ZwaJc
zYY#kV=2?N5TZK>DXC*XG@rdkBx5BC66)hB78%2+NRhK?kjnM{SK#Z|5EKe5(7s{Qg
zQ}W1}cX5DL2=Iq4=@%Z>v0ak4%68>F8ZfWCMdOO_SEuTcE#5n6PR%_Sls<*PhHAHj
zscv2h%J$wK-?jQ0f;$WaPw8#!xL}fdd8hPI?D#;yNNp~jqNm7Fglcp-j`ErcXZ5|E
zqeD!;H|q9CVN>vcSR-ZOh>=*N<+qlxKupMFQylM}0zl+u2PFzdEJ~x27K0g<fXNeh
zy~AF16NjnatX7_#7)b8oY;|?6t;qP}__$iY+WhzIy4!ij(|Rl(UL|bmoPkGec3CYY
zQgoWv>Skrge(-n-1Fgo!W_@u<mAALJ^Got{b<{?O_C^M`cY8}qOLJ2bczVXap*DDG
z>ylt&D<HKjx2~k9sLk3t*VUR?z;sZhv8=*bSKXPQw#$<D)d7N<xlK5(Pq6P+(l+kY
z;L1Sd1|GA?JO6z&6tT)SA;UnjuU#0Q4FNXQmMy=|fMimIhe`7GT<66nGuy%0(FXr`
zU==tY6J<TijFQw2T)64#9U}JrS6^SP-Ee`yE@1L<OErO&19SclcX)qr8#&U}5-tuK
zkt1?`4OH-7vtP=_Ybf<OqfbW}X_>Nde!{nSFxa?vd$?ka+B=9$fnmhHUKR~_u;ERx
zF6qL85?=Qz;~+D#Kl;;JVAc)qM0;Bbb_Vgq=qaWY%w3B5d}APVt&S-EyH?HJ%ngia
z5&(u<9%9Uul;dvP@(^SKA5gJmr{^dVRF#~IZy9a(>s8Cgw5J5Z{^cNG<(rKl=X<sw
zdev8^AbN8venx-!)w1f;c>#b7NhZV)q#9zg@8is9FQk=Zt>;mWvOE(6-p7P`;-NEL
zfGYt<s0w>sz-Z(J1+s)y&lHYS+|}Hu9iWL<x9WMQPr_E3!9-$<+6&Nw07S`vjcS^|
z6Pngn>+7!gtO@G;u+3*IVzcky7;k31%93x$8~E!k6;YSjVl@fMv5T0GfuLMqyIBkY
zZX~1wrq9G5lkrI*0}+oUgvpNSJ%M2R&te)4nQUAufj<qT?w^{qG@F(@j$p(S0{|2b
zQ)qVlHk`=28)k9Vp7P|c8A4`1OR3)JR!$`LJWpZ#VK+U7OexD%TUc{DDn{Sl)39K&
z)0!&1J!+J0r9F8{pQL_uY9CoB&QTWo0K;)|s-Hs|0R#Qj#TT<X9Q2jMey=DmnpO5W
z<Z)*#zxwz<XpeU#YmS&&Eo%>g06?=@2p)4Xy*1p+*nU$fjkxW^QXUFCR<SF^x?QR;
zVycH6xZWZLguhl*({G=t*ilKHAuX|n4}5Nb@DzxfnR%mTOmF~*wHdftaWKh#IE+Zk
zBbAJqX=bdhcE;wPv1(H)!LhT55SN8hNz47k&E;`4Z7VvO4FXrtl>DqeEP(CG3lk28
zDT)ctzv8`Y*n56+aA+FP9Vt|j_C*HQ5|iic_r!HFyXh7?u@*z`?+A3z$(ep!%Cgg+
z$>*eG>W`gW97m8M`*VE4gWTn2NF8FkRxaeea(iD``XejWj|{x|bG$AJFf*&0S}Rp6
z#=@;iHaPRI;N6OQ87$u{JAleNTAzyHoV|_I;uDG!texo=%TLXBg#+%vOSx|xtU1cT
z*;BRmNU@f=Caf(v2GcK;QE0wA$=?H?o>6?#?iMcWTe))$E)aaICh5ei#6&Mp&Q?C?
zJ5ie?xpgcU@7dw^hsXK|9pZc5tlcp^xp!Zme}>_OxF12HtR98m;{e0(cLNeXV>pWx
z%w=;qX=Slc%*-yw$*uYrp*^K{1)r&6H}l?DU%`BVQD6g0^YpCWNcgj_6Q8J2JygLX
zZ;(+rhb1iESokWhmQgu-HP)XrJLxQG5+PY-xyJXTL60|c#^1RTi*v7`mX9kC=OHL^
z7Chr2tbF}5jB)+OSOESRhe-55w-bO+x!9pxWcsiN1Br1vi6o}Lj{pnP<;trlA60M)
zLeMubF4tMjL&kE}H&fjM?BU#=M%(UH#;9-_WA$B2;EAs`3_Ua|4swI~;4Kw+<||yM
zV>nJ!VTxHZG%Iu<Gh0cEMDVBCAb-BNaj^buq5fRWoT#+>Jm8h}n{MHo*1DZbi+lOa
z+eoPXX=^Lvlj-22LAjehfNZ-aB=0eGE(E+UXZk!qqQ3myakNLytGEZh8xQt66gm^@
zr#RN%hdz2JK%tC3n+T&+@D<uA&f*rSqqmiojKwR*ulnxg^#iMC+MeJII?q~!VufY=
zKJU)a57{r74gdv_3i+mf(DG`#0brh?lgOf|4;OMDWa^M5Z(yPLj2`CS#TNqbZqY7L
zvwkD~a6r?0x_Cu<^&O(mcCmVg2(xkr?0u&<wU=dhII(EX5T6+nxArz_Sc@2wWOJdL
zyz9bs4S#wE9M7V-K@WfKg`UL>iHi{tEZqFI!N0Et00xfTPPeR0<FL3RG|q}xuv^Ef
z+4_qB`F9;e)uwNyYqsdfQ+jKnM(IsBa>9ucmBZz_c$4+L?KI@%w2@16k#7@d!{<kU
zBTVI}or4@A?js4WDr@Dg(=p|vLDJJ@1xKg`DBwc*8f`<63v^OuC*Jw^J!|tGlI1`<
zxblfD0E8)7qXW2?nViLhQ`U8!g-Og4PF7k&*61_uTYK;yh`%z$<|(Gj+m+_ERQOB4
zzrKVd(a;2*G|S^TtQd-N=V=}b_eC1G3P-piyNZ1%ZA77QlOrzONR}+y`YyzN@l~gn
z)hYuwY<P}@o~ElO%kpty#y@;V0qVt5PK|K?0)(I=oN5yiUe}b}MU-vnG>9OJc`f_t
z?|B#p8ato|WyLO1gUD}UuXDwL8#9|ZEW;j|CwMz6_%VViS|>vv`%vWWiwHlB?+2z+
zf=#>32lWs)X)@0~oyj)So+9ssvgr=?IrRQE|Gk#}aXL)^yr>2oJo}dIRC7)oIyXyf
z11euic135!)jp@j6(pVqq&t}$XmNUFx{>!5t6I6K^pmRVZKI4dGg0fEDiEF&PkGv=
zp8?QRL^K%IvhEBJ4?6G!5{hr)tyFfBYWqOv(mcy7fg6KY3*?=QY&Hn)9nT_&E1^0P
z3skPhAFHYUAVP?Pr4{rjVPP-Lt1t)WfOBN8wzVpiFVIgML6(1^f=bRIx1q)Ac&S3A
zv^NIpT>DXkB8fg9UlKE|23d-jXBqTmw6fF9R>E)x;9^=uUk8ouYB9M{R_9Ny#~(Kt
zhbu9U)4Wwse93aVilNF%*#6nH@%Ub^iHC;p5PPQdFPWhDz@OC>+E35}GDwIa09nrJ
z$stFB?R?s#HW}}_Ibahn5fSDl`ZC~adOR=ER=GosiXS?N^_uyJKHOQ7!Y_!WrP7kB
z2U#!9Z=mBh(VXE{X0IyT9{=**#Tg1!9s#4SAm05Ps|)S%M;Jv+^}xGVJ7H6I-0`d|
z=7qemuk-Lb+I{#6)v?~4LDJ3!;EH}b^F9Kd?UtYZ?xr7WMqx4ns3YWh$OB((V^mho
zr$kl7N%hHaoLeSZ(TR^1-WRyww|+jegAL|ZjAl@f9Q^Fx`x?&$5^NgtfH)pb<Vp^b
zybv3qzlE`{ANrEud1=#%PO>CT0pXTKBu$fCu|%rz|8*H9ATbl>AOl)>WMT~9Mb`Xr
z`>u-_onE5j=hfl}o*<5xo78a$V|ML1$-rdj<CYaQeFLG=kW>Q4Sc=teyLklCn}8l6
zP`NE8{O{DM;P>T94%<}jHRP$P@`D=F*_3{{&aTA+_)F;vMIS}IWSm;Vx<!89s#@~;
zYOWts-v{$xUsUwgKLf7&w+~jWiB7~1RZk&<vT;hBoTwfXo0KF9csOzKM)EFULz?`5
z{33WKfV;`69A}kabiu4!X&cm4KQj5$$M%gj(4t|qS^6%mi)dicyyP070Ta@ke~6EO
zk_#Z{T_h!0v47-7PwLmawCbNCr<Se%Q19Cxp%xrgmGX!zPy@>0=OUqU9uTG~Z`<Gy
z)gu)x?M;^`rnp2JsLk5p<KRb~=QHW^eIjXdyWtw1Vsn$sX2Az%#I$5=Rb;OkLD`U$
zs#;2m3boSXtt_R=izv&Iiwm`^q)E;CFE%mnX{X|EE?zy8;noBVb{l&sYdn%yz2_0r
zGk()k$5kX8odYmru?sxAP<f;t;1l?1)#6O{bke1PsS5DMx<zX@&3+uu5<Q)vB|I)l
ztLE{XG|0-NW+@@LT&05)wk^*}8|e7pqvs>umJ?6Rv_BYd>#AOGqV^6S;xUvl9?;_l
zalG>&??QH*TmN3@B!yTC2B0msjaVq&V9;KJ?bRz%-2iUekW~~<DoY;;fmQl_R9(Yo
z&Z?d%A<OSL^WgLYtP&Cye5XNa%bb%E=N_!GsMMrWyzkXf4r?eL+kC77rcZUVb6yB^
z9a57?Pba-g9U_xoywoG-#|w(Um>*s)sG+2wk6LQ~ePOd$GXW=Gg@zLiKhxfp(SexM
zP=a=DqyU2=F!9oD*(JUuMrMA&3b@FfkgBuoB}l8=w&=KXXVTNlbK}M;F2NI=+-ojT
z1e^k~!&I`Hbx>AlNbSxGh6WRj8`~isL2RFK3R@m6cG{Pq@YY%OtJ8&903vP)yhYUO
zy^qDmFFsK}TK86TKRFk|M?XX#+23mTQw6{#@c_bdp(sr$?zkj3LNDRl7sK=5qUJe>
ztK5jaAVq^A3-&Y@(ji6b=l+HlLOA*&@-rrni=#)|ca+nclAK(ou9)%1mfm+Ts`=k8
ztiBQ}e-gfQ1Xmns{{`|-#q=cE@2J|-X2eX9@Lbq=L<g55LNUM+4_r_<)xeIR&#*&N
zeE<$f#r8(W!2BJj+PNA))xoExlTd^s?g-E|y(4^uT3)EsqOYp+#EcERNX!$&53Rs&
z2OWn%@HRQFj=a7x-SDuecS>Ga+kXJz44iUc2L!663SmOFP`K)+vO(KQr?x@cacRz>
zt6>uO;uJDLLr52m^NtKPhl9d|cp;IR82}UeIw5N@l=nUkBo#+G&<}hChDhPjn1VRO
znDSTOnk;*|kZe)73cP}5y~S>~;aUG2xlfz^nYPz6tfJn&X2$cgC%bB#B3g0N+>g0R
z7xSa+4xqLSxuA?q`;;nW!l#Ny<1l?#bxtF5LiVs9`C@F0e|pXh&kIQmp{yYf1i&(V
zQ5x)-{rs#JPy%Y(mBNCFuz`S}y8Vz4=i(olbFSDv8;(m7;=-3nuKe;V_laQf1A)Uc
z&@3<XUC~CpV7AyhDOd%|TB4{9{GAeq1inOle#XQL-A7onrvOC5O-w3h!vB%)Yjd7F
z<g(rqda;>T5WPv=^9l6o_L);J7w`>=iL1H|T!-gkv~_U{2L@E>tj7HO7jj+m1gQxv
zqfbw~$Xz`^NMQ912^N2FER=&Y-go}wP-oRu&ayf}^gFQY-r!NT6xQ%u$l8;%J2{#v
z7gOj>Q4!vZSaL<+yCK)#8IegB!4abDLn`o86+$kr<{{62t@oAs-Fj0&7*H~|V{i;=
z!iLnl(-$B-TL;zwwRCcGhR<*zl>Y{1)-P@+dG?N0rvA7mLG&Z>1Bw?EOigKzbBH@1
zg(%R2!iazu^1`7^07QZ!?kC#Q%=-pe8OWGnQWZI_1u5G&VM^0>S;{5$5GO8Q&kMm?
z)7DBSXx4Nj_<PU(?k^>NJs`a$C9XWWFGo*M$~Q>_N%BKZSt^_CYzJo3^l_&CEi;7V
zNpRd<!IeKByyBw&*gm#}CWo@lJDr=Pq9dWQdF&|LM)0{9G;YFo%rr~6nqIO>*U8t?
z>griftx`(7Z#Yt*rZ)%kG^hj2Yl}}kSN*Q-SC^G(Zp*4}kYE`c4xo4fzBnC-I$bZs
z#ooXV=h*{U@exgGWWxm*Nv2)1ePDT%MdF)&zW*V1^GDUH5DV;dr%+67!R+0Aji#vp
z^#guVr`4SEi`?wmDCs-mdxOn}wws8kNW?OD6RDM<V9IgMo^+4r9iQ`?o(hE!jB~I5
zHAGta4!jkLjvs!f0?t3L&l=D5<mbO4kx&T+kC+K6smuQiVm*)ld}L`?|KXAoJYhCS
z=a&BmY3}`mnE+of`#)xEwBVI`y8npf@&DRtME_+&seS&P0P_q1$Wr(8K~cy3>Aqx~
zFafco$iue4rfilb&=hJzf`f(}vVdR#7RnVR>liSLUrTd!OBUcQZMM?3zermC=%=C@
zGD8k$+y1R};Ty4BVAXYj|ExUp{xNk)){#L<di*fv{jmM9)pK+6vYq{LBMkpbBM2}p
z2u*{h#M7DjJ0pYz03RKxW<r7!huB{mSiodr;^7$CV+XrO%F~nRt~Wd|;mI*QV9ONm
z5fo|H86UE7vJ2N4-lIo*z}lK1c^&V_u7}-!k^1;V*y(TDr8t~%YqsqvO?us@opx*6
z>Elgm<RMPF??DbvOt?9*@iOLtzD-+@Qzfy_%hRde{~_c706^eF?ENM5kq|@XoBWM$
zXh}}uqcW_uNuLmcpK$94Nlxk`l=~iPMZ;Q|YIV7y%zhqB#?a!dz?(1TN<Dr73z8&*
zys{wIVFx`qQ)AP`e{h=IHo``hCNmXweRfSyJdsLcmKO3PGOU&+XP{YPN}dm?9fhss
zvZ|&`ITig3@N(8Bq`V7}UV4Nntyr$S8Y2O-;xP@jBFpC$F(3;iJcT(uE20KNOIesV
zEXG}8NVO}lJD)c5=O$uCMEjk$Np*8U%FViUZt4y8X{(l*&sU?&-c&79uixNa@s$~p
zE+;pkx3uh;wei@H0wNV+8Sf!1Tf(ZP$NHCCI%CWdz%Q9kqbi=9M5aE+Ti*;!%SN)7
zP<>gJ6+uEv-w~S_I3~x$8b++2xkq$r-B&mtowX4?+^9k~;-u6R!m>eJ!^BFPZPyYk
zJD_wh*qT$DtOjp=RivSeL%mdnI|tMMZwh`TS>jB*F4;)Z+RWiHqV#sVlrn2a12<x}
zUv=&XSX`ZjV?C;ucufpcM#3YoCYP0$=Ad=(<V&>^bAN`nVqE4e5tmObPpFgJN<ISx
z16ObzWNNNTlWU9$7(E|fC4SMs<SzCU96u=z8-rlkm`pV+f|TNBG4BnRer*i+%~)=L
zZKqO;n1Nz*yyw{}*oS7LIveZ;wh>3F8B~q}h%`*;?N<u5n>rQKX+VuUhztmENWNb;
zfu($fscAWAfWjLN44ApQ_1yjd=`P)seytCv*{wk8F5bQ1DA~n+Ee;e%@qvz^dSxRc
z@e%KHzvJ~6P?l=K1=|^cA1&npl5ppx{>%%+r+j5}{sQGsx@89AAE8Id9HB@3go>g3
zS6cfO?6y??xJw|It+NU{r)J%XBeq-`lbkw!>h<HJd?LzIydr;B?$W<fBc=e85tdJl
zW88TyIGr;eS9z6ZLzQmVSs=-R<k`u}YMW6@eqnQex_=7yC8Q#hW`ygx54$`TvQZ`)
zi_%>l63}OtX-Ilgnt@hlBC>$2=o*CqjuW!2br+i>Cj8T<7sWyf6c6ezeG+vdpz>AR
z9g70jQ>)6NwL3s)O}TB?@HngZ--tFzDv;6}q)ltOxMD4~ipZMgsWRJPHJT-D3mKJ)
zujDqy`!X?vqmOJMb&x4no~1wBi?Z!zeoe8aysIh5d%H~&bGJN}&=Mb5bf}mE{(uw=
z8)>D}l_$BVlA8H~p>{AvOlK-@Oj@Z=7B;6Qbd5b!8*SgW(adP4Pk@-b;7D_0=^pV-
zHAB;f>K>*Ee_LAB_nu#9J``(O(*+NHGI2pjQtDv_o`4<23PHjRx8*4?p(iQwyXs5&
zs9)8&wnq^U!3UZa*%x$bSLCn)a*v!hElH8+G$MMlIt<J}++XwiDUgGcQkiUFGnyTr
zi(L<Y)$bAc+EE$gy&j${ks?xq!;uq;G|4}8Z{(+#N@}7Bxm-15==Sq`-671AW9!=%
z-tz1qgo$A(Ea<K)p4<8@WZi>T8vnvFH}3tuzv|F&e|(qR^Df<$WXIJ5T&yK$(Dfw?
z4eCoxOi)`Gf?<E(m^V^~<E#tTFM^_K9H}Iv+oHTh-&SYR*`~HA$oIHt2|g2Q=uXKK
z{yCm%OT!bnma!*tFE)?kUg!w(BYr;xaA(VJ;yyOvqsCfvHygfDhzx`)s<5y`_pcy4
z$Mo+Yz(o?xBEUrxtulZE&VchPd!a30koYAQpe-wlc;o-bxd30ITj&1<<A*$re0&W?
zFyKXHHAg(R_CP?@oaBUVvxiCAmKw`1H=~2qoWw40r@wlyZ?yrvNHJGr4lr9s=sd%n
z#2-20R*N+5gAig_%I1m+V$qKiO+CHv;>}}y5xUR$v(pl`{Ow2sIM?C{$itM?;IR~{
z;J=&+Lpo?>64!D@MPxB^WJNSpyusxQ84CF_uN@4j-AQnhwcp-%q_K6C&!L{hg7`hX
ztL2YqvtM%o%1bX?)rUlisDuO;pOMYVDZ01Ik^GeHVMavG87nG`Hld0CwXheyDHv4J
zd<P2G1TG~aE?H;}AcU^bJfrn(Gj)#Z2WeKdL8R>TizmPt-PkMepeYHgb+(gAZe5;t
zzv56+=373zS6sQU%jSw`^8Iuj!dR9S2>nY$sq|Q|ePeWCN0a9WO%%9;CS*^(*Al|e
z6r->qZy_~1&EU4nv3KDnv?{q7xNtgLAo7Iawt(D<E^n9v&<N$L!}}Og!$H_^h~Nkn
zCW4G&DeD*OX~k!Bgmb)u;H{c57T|%?<p~qKqlXDIH&6jJXnW;@Nn@cSqV0g3B8PnP
zE}j1*0dPLgtH&1N5@dZq90cC#;ED_)pB5<l8#>}ItpV@z(p~pWsbul-ke)k0!^I~)
zXk1Cb?TQWpiV(Wo-9q#8=H-|Vp;yTXN%B4{C#%{8b^Z{OJnHv?Kr%w!mCUhG<elxb
zzVT~_tIUQ@$p^rx+vg#Wb|Q%^(n>1un%8}+tVyZy1Z4hBFtWgLICF(*e?WkFp@B@e
z2U?ufgYN9HTfg%E{Qn?#{+Rraklz1jW0?PFW3>NQmFPSp1CkPT|HG*X-mz@aZQl~A
z+IdwilF)|IhDt{m!jKFl6Q#FG-`%Q(F*URtv#a<fwr`yk$)6jPrvFqNW^UMkmx5)H
zota$Adf~iTOWXQKTlxf1=rjK1h+>*5uRt+YORyk{YsyK7DUq9RoYrUI;WL6tuN@L#
zSl>Rg<2+#r(8P|W&Ylg@y>7*ow}IL@fz^tGRBP>AtF^M7v1GGI!mBo7&}aQ(bKiR6
zHN-D%r0jG}`RKmIT)sD73bLB8*6@eC_&X949cUhuxJeLoZgEkCOU0z>n!fLP;-Kwe
z|JGcg(`0kK+;%d`(^-n|CVSyG(oAWnF_m-eka>OwD3M#R<Tp;m42ZNSmowY&hEv5U
z3D|pe-Q(<tUNsCohQ7g2YGP}FXM0mzP3%)8Z!2<2%S-HG(5WZFpYRnB1yLITg29iX
zv(OA!9tO|i6CAVCF0aummceRL8)*ol+2A*bKr-6Ls?JCqBt<4uB7-53-5kcnrG{}v
zcQM%qfZL7Vh7xYQJezszui6Hm{TMHjEyWeFQwh@RfnuKhF~hVB83sK%gmV$1)b<x+
z?tKk=MWgon`>k0<ryM!KZG)z6VFzB}pvnldc1R%<7e#;~hX}%sxMm=+nolEjfRdC$
zF`Xkooh*m&H9ufd3aSB#r7aLZYZR{ul?H19NFAmXm?Ft6OS54U;`h2YOhacG_b%I4
zx9G{U&dC*xITLc}wKnawrUKn50>H!_IwxoM@|I)WR>q<eZ`2*+WjFlF#JHA*3&S@!
zj!d0|;jf+B$1xKREkH-+zr6C$|HO@Z7^Ec4zOa4HP0b>Qd*-Y$0=8`WcpM{wuwCTG
z{@;EQE~9b%9TXs-P+A}$g8zO`VF6W|kUl!9OZ?;wonw!#(izRd=-?LXm9j6UO5v92
z^NB39vgixtxAC1MzZwGB?bidTtVF>C71vA@5r(LUlyW7d{{#?lhqnIxLzGXHL7gkm
z^V4Q;#w4j{d2wT%@Uh)7q51O<^=^;n`>z=hYQfioT&T;Vm~LcACdsUsP6-II5Sqs!
z&r$xXGQ7Z&eNFiN)+Gpa4};0Am+lZNzl&VNNjb{gMk1m9Kx1iUt%Fq<rbG5H!CDRB
zU>a+8LKSradd5)=H;>Ds?sYu2;p3^Dd)H48<f#>lez#Asbcgh&Lp8-@NmOu3umbAQ
zHcUQo8&2SxDIYft57w%dO%3>~Gg1MfLr+{G`mSucpH3iq91K*GbYh9c4sHoqv(QQ@
zG0_W`by2iNFm)zmUO;0DcT0A*R(XdO)dK!H0Bjc*Z7ZlXwo&vZ5u1GwWA(`xH50qS
z{MQ8wTTpAF3abUovP(gK;tH7Us6aS9bT~_JeNq=o{I3sM4y`PWgf^gv9Ix<-hqf2e
zldLEVv@K%>vKI9aWg{r_7&m`@8t7%TK^>G!{Xkdn9I3+XZbW=e`xDY~df_!eF#Mq;
z;L~!O*1lxoa>l}^dpHMHNeWHllT-7_bM7^Opo_NqH2&DOTj7A-!Ur*7J62*%j7Dw6
zv^lGa54l(somq*Jc?f`_rP|Z(=6q1htj5Y>zrI@Q^iUl9Bx`O{y44t5R(eNc9HNNJ
zjFh!B)r>0Zvdj=wEe+Kb*fkVdGzFwTc^E^=%`F>YX=OZrUU}UZ`JAfRwZPQgAzRU|
z2y0}T%iG3`D2;U`!@NnxRyiIConkj|T^<yAx16fLH)q=y{0ZRHaLHU-K$9-X=bl`e
zOV!+1HY--Thz!g#sc<V$0IY%$oap1pid><};8TAAb@6E=5J%`X2aRc`*s!M!vxy;_
zDRXUGX=T8`g#V7W6|;#j6g}czIBV+2zuja}pN_5}^sSv@g5A(Tm0gpW&|zIY=h>T$
zwlH63y0l<YR0bS#@TOOyWrR|%-;bn?N2jB(SpD{<UQbWHnNo|ij1=ZGTwlsyXETs;
z{7yWkGycvWnmXfHcug(srn3L{Wb->5J=hoeiM2eBLsfSxAx~5lsmT{}r`wIXY1e6Y
zYDpc8+$QQ1hxG%r8CH{{`#L>Aax}OSrP8z?83vEQ4FDCaTXTf9G^^e5V+*Fwx%^N&
zZWO^_j-X>MAp+wz(%On0Enc{@kQUY9Zt0ZRjXby@fA?`#f<@fd!O0gwr5l@``#*wh
z8BhZ{iGddq5tXV`;zJ8EYzwX~UBz1Z(}q(lK24*ZEk03;CAnp&*XJ_q`=Z83VqMo6
zs>G?T!T~8Ta^}Y;WT6b4_%IcdDjBF(Za$Z`F<P^3nZo!7b?3vSOv1B-U1XRcdt|V%
zsoU2!vw<PBI(#aZsH|83SA{8=SE@Rt{Y}v#VpQ(@{ZJd)YYtdBhV{!vL}dj^8PWx{
zj4}|T#I*(6<~6epEXY9|8KI?G?(BQj7f3AzSHR_So-(T!s7!i67UY1OwgKM@M5CC-
zF9FFkH(&T#^9W$}R5hM-DM?TQ@DSy{`CtJ<lx=>$Rm?ub7A)N3EywNTi?49>P%oAw
zsqI#q(|4l?-~8p=sgXRh8QC=?B`2sC=2C?rxv69^I0eNf3HNIG(3@B}e=1O6A!{4w
zw*U-Y--&Z@vFGu3t#JaMXQ_#eOo}CUMGTfKO|0p?Y~Z@QMW!3MYD`Ne5VuepQ>m0^
z%T9IhWL9O3>v{yF-5|EQ3L{LwmyjD<_kq71R!;w|8_VKghl+}Ek81FNf1M1peLBv}
zg^4U$8Z~-i%6Bs`fg>+Ea}cA`mDn^ns{+hiq>xam6oAx^dAeL6pS7k<+~bkvsfQZ(
zwXIchdKMC-J#y`2E#8L@gwgGJ{yWcK=eA?l+nq8aEatOJZ<w>XgulxfI>i0wkde_r
zVUN<&oKL1r&t0~t8a~c{%<HL7)2OF-ERW%(>J$ncc4`}xTAjw0G&O}H0%z}y$pMM_
zA*PnJd`wluW)(D5q(T+v8Wy(LI-M$LIesV+F|5kyk2DyE^)juCILt`*1CA=ei=AyF
zm2_&qGnU}u!j>jGIhkZj$WJA+zJ+Q|UFf$;7H-Z&v+xQ-T;6GX<w|B|-?*L@{Iclw
zse4~j%k?x}isaDe(OuqobaU@kTmaqSHOp^U-D(Fl6C>;{-O)8GZy7$kR<rN|A3TI^
zf2Vi$?S+GUVB<*AR~FUs9OmD|zTucezb*6-{(`t1@qX%N^^CBeefo9_on*ZIme9C1
zjT~+{{S@w2J?Zkvm~MH%oxfaYi>X;^%h5C7dQc&?=jd64n4y!Lf@>k4QUP$pH4c<|
z*b=8hV2A0+G}Q8vlm4EDTrqz>ug!vSHz0?|;9Xrd?%MNg^Xzg~D1w1%>3*Vdx#-M+
zKlLI1ccbqNKh6z6#qDK*M3``V_ekbGZ280t|90(8xiQxAHi;T?4JH+FZV%B_^S_UI
z^~<u$wLkj=`q4P~ZK!m;4j?jBZj?2>bEqG%wQL>u<GdkHA(=>`1!T9v=~%$NX?n>p
zP*t1;u_4x}9Ugi+UAo0uLXszkuEt~Ij>(3_%(L-y$-up7OIkO34J#a@w|6AaNcC%u
zGtCi$g$7lHBRya}Sp%NVK84h9AiyGx2f~HYE$wIzjv6z>*M>R^2_Vlgw27lglc`S-
zqPQd4Pg)i)!j>0Y#Fa!?!hJH)ER%()s0W<pP(_6%4s-g6pdayWfuN7Q0LhKT?(7-~
zy7iC70N!9<Ws2DqAK>a2s5kqj=qGbBa&!gB5u2To3ehZvoW_9$BA*}5p##PSy0xYp
zR8vKrEi!hfS#J?H4d557^dDE|`bo@LelrJomAp<OR30^ba2s~{=KK+Y_)<#OhgGCf
z=RE(kt_xMaq*Q#)xNOWr&7GbZZN$Xa0k!(9obEX~aq-i0IysEvBr^`UZ#Usut|t0z
z%4Ec#O&-$m8~VsWd_Fvo^rtiT?#AW2i$hGh_?Se2(dsjQ8UWZ$VfikYrhmwB`DXqB
z8{p1*S2|IDt>Nk!ugNQPr7dvrO3+_<gLOR2_-v^R5?_?#`q6cI;dl8a?<suf8QfY3
z<~II{HFA*h<C?}t;{Vj%yib<9nFYA`W!QsY!S_HiO!19-K^(ceX#`+B9e*10FPi(-
z=p;W-EiA%w03=QhNP8+L3mVHNq^@0}<BWsVSWBP82geXXj#OJ@khi3iT;pT!yBhNZ
zv+cm0J9GspH!atNoAA}O*gm~X$7>}$(b15lb!#a4#p}5jFh`uS9{IPXP+*a@vnrg<
zVf7Y48R^|+oxgu{YGIq!6{%13B;TVZC2N+SCW{^X0lH`ggTS-Z)qfp8stM7><ko<|
z#03S51oL6Brk&e@DY*Mt<IpLr(S2<7HObiJ&#v7DlCfZL;SPOl>r9|{zn^79JftTM
zwX8m8ZOW<@#n;AI|F%dD6~R_x+#l#HS-Ml&K+D%<;gppmFGpqObo?pj>2$MO_~ph#
z9fBsi1Q_YC&Gh@iwK7*AFGU<|j%lo|cx_wv&0f4F?+AB&JmImY@}jG}@Fy47pgA#b
zsnt)DS%&~F@WzFzH`}PSx$D)S{J@HG0U7ddS{9grdD+P7qZm75=67z!Vf#9Dy~{Ys
zrHjK+KR1$YLvXwn%)C_DNS7L(Z>GHCvyt@c1f=rH4bvx1)GSRWEqe$!1Y*rCmfJ)@
zdt+S*EJ})Z13)7j5sIfJNRUevjiXr-q;%=@R9FfJ=ZWmP3&8Eu8neU}#lHNf1cuD?
z$Z|4Ma)Y;r<s5qo5&V$BLzr4j=doi;ZB^8bCSoARi0PI|M5`yZg^ri(R+m(aFtQ{?
z0BbjS8vzU2#P0fQ0g_o}F;of->TY=hdg`O7GWE_DvTG6LT-PSuuxUcsmdlEDm19ay
zZWe1AhjNb2&et)Tp1)YBGFZvniK?*Uf9iSePg?IGOyDi!=kCcCT`|>|i3UaL)#i4i
z%82qfejn$#2o=4_VSAOaHBU%XNo$$;0wyB|xD8mT44+riX7=pHj}T$iob5;+<iEqa
zoecUz%dXrLf{c@sm@-HIrGF?3ghk66Hu3p4+MM8F_nik-wOqT0f;U%j=@5Ll>m<`$
zK(6wci0&0b`6P3QiscU~{<tZ}Z5r%$NmMg0K0LVid+AB&_d0_d>xrNjd=Yi?0l=X2
zc+8Vulnvj2z_i1~qDn$OBzMFMCa9m|)b!e7K95vCEGG4a_M|Ohi22t&H8f?BE%{6|
z1eh%dvqU0Jks=ehS<WUNQHh?&nCiTc%b*rBMvnw<)X$V2Ls>p3C9txosopIvxmXU;
z$8T~OJuva_f;)XxQ0~Tzg$8530ds^uK(aQJ@NdH1<Kg9gRM!QPFY|}mA!BVQTy(#V
zutwW6i|5B&h_dnzbq*XR#@Yht3ML5SCVK*^L6Zm?-?1tW`_`S>!>fbLl=Dtj&ahKm
ziDU~dZjVbY>eeHYb_TI<u5o=|-5$XhoIK|ezfiQ;1xA`w9v2qLW{hrL0gf)}1pCy_
zXgcBx<wD(j>CLO!mtVtq?9{@1@{Ea@-6ylss=h47@MnlUoq?afsXtC%L*4)M(|)-K
z4W4LT(m#iEzHACOk1XWHwygH-c7C}Si9lQWy2QVDVWHkfWo(Euw*>pltJXjH@ZWGg
z7S?9CQU~HdA7p|6%jao50UjwDZ1ap7xpSB0CQrd!rh_8f=k6XI(`9pVrMTcP+y+u}
z`pUOdVotC)njx#Vpjw*y>$d)A(*wO&3S0?2>gInVyY?1}vP5*tviEZk&VIsO`BQe>
zed}Uq71#pJy)aN!ckrB~Pn?lqU>Sl@?UZCBUFH<v&(g-Wg~=7+0|LU)|E0;R8qpu^
z2GWBHaX~bD#5!2gE9b7Tw)(KHh;h2jDwj*?Z~3A|TEq<fQp_w>Uf`ne_Q(AM<{=Y>
zbI*|9CiVpNm6w3ir+Nnl^ObJ4RF?P4Y_{c(KFaphB2|bSbwl#X_k^>5v6TD)QWSjf
zEBAv)IEKq0`SoC@3SbJQH&Y~Bm(F`JoqctJ`jve2#{^dQS5-~X)1Un`pgmG4eNw||
zGhC?R%5AvbX0Ti*vMtG9wQFUypSl=N^II4zNv5Wkc#&aO!|^A&P}VNDt?rg&mEuG%
zzG)o3D3OD_uBz}#ww|W^Q!ySDBn;>}vJZdeg0v&hETyW#j{#`(TxjequjT35e^eEj
z_px(HX$kfDX?a`OL%75j>;?0&Em0I05%ExECIk4<ciR%}N|F{!SagA(rTq)>%Rt$}
zlV`s?5(<@57P_PH6v7m@NhF{bH)2#7c8ZnAf6zf6w!R2>6X$LbvXR=Xe_LQ0(Grc7
z9#d&WkKB`4bOCaubUbE^$U!4~*=He<{2sDqx!<VfsfE{pwG;*9MtSu)H;aA?{K%zZ
zQo=;1g0N5iy-S%B9CcyuKl9I&KAH0X^MhqZpC5RHK>1_BDY{~|iPJ0PXeT&bBsar*
ziWo#a>I_jPJrO)07=<?kKOn*kx}CiVM8;nne|qrh8vw|5F#-aAq@KGOF>@SOJ>23J
zNYJJV=UbF-x@fihqt^U-Q{0XwKS$-!Rf@+Ka-q)tvQQ@XtoQdaYI4B=wF)n{iT0O^
zR)i1x^Fq6yRX9OLO-L1cZ}2xCR~IRgM=V)LV}6ueU?9kp?_wvarlL$|nI*ie^Qc`P
z^>fJA;~s#|>R$!FpU2<^Vf&}~@4k3A-?}(HGRFR#xcTEhIDMWhqtY^1qb4uC=(&SI
zYZO_YFUGPT=(9J>$I(IR9SOlJa`>!r?WsKDizVp9%$dzQnA?uN;nzd%BX(hj`EJsQ
z;FV_Jxjkb346r&q&}`2y6@3-FD{!5bc^n0AsUUz3<S8$#oi0n3AGiZ}uO+d?4~RwB
ztmUKh?2CVWjvp+X-t5xdb0o;e7bnbSO#tQ)!~9MI)a8&wRL_)uS2l>h@Gkb~I|jci
zR@LGuXVkKl1o0!?lt2zpUj~1e$-J4&8W$H#{fsa!IdOI{eOMW!=&+wvSJe7@X;)qT
z=p~>aI>VXUK|%J7*u+oMl7CDyK2AGiyGL12ivSQjhR}`PE=5#PrVz)1A2aQm1h154
zKJ+Mc=}MkRy{Rgf1Hb!}p#D5nF?Q1S<^xZ31tz2K@lacN4~6lCdZ}0B_=pv7<%%M2
z-wSC!uj4~s+~U-y7MupiO)=OeN~EZV_XN~d<4|>0iqwpybq0SI%FrF-%4WZmN)+%v
zJh}@M3Ve4amH}T6xFaaj;pNh;eHF;APRt-3;^j7&LNgxG4l8ieg*iG&7lDcz@ssB1
z4btOpjgliFp8$Quz{Lj5N;U<4ewn-|bLA&hyc>#3T$E%XVe@)hxRB&-3;F-`h6CtA
zMt3QRp^QtHB1o=4XSyqZIFbI5@I*8EyAyR{r()IN+-61W1UCm@e8+P_byFsZK%&bf
zz06Zym43P`V8zL`#VLea&YQE4+D#j72pO5B!xPUrylcdsfxhhwjYuqG2RR{KgemES
z`k)bfyGt)GXwHlF!L6R_r3HWalm+a4?q|-?7x$PqH%6S{L!AUs@O?}E1Z31}&S<{b
zSE8&e#)Hox>SJ|1;n6Np!0F(FJbWs|3Yv=)v_P^7?QE#L;!`Pz3fV=h!nplYolM$;
zD|6%ww3s)dlq)L08*<i~mtDcbDr#jQ*PFZ{dcQEt3GN<Y?3~NVj*RXfPykpngz3Wz
z3Vt#rX*|UC$n;~DIv^K2`7CsT|6+h_jwKfNvly2XH)TTSY(?IE9ZHv%-YMap3a5_1
zUijJ0MiqD!CNHz&)U~$1!KF=mj1;RyAh?xh_d;_GBOD^D`<_aPhrw0{wqeHp&4VY&
zAy=|;uVow{jOt>(=pw$vTL2orHZzCfWWet$(kFeJ5*$7`bw8u&a+M)Q+h^~#eIi}N
zfUn_**m`$CR)8WS4noaqs7X&8P(~G@{=_SnfEwtQ$UzeLkhq#>y~^HV4j4201asB(
zW=;L(R$M(K3>+b3(~a!AZiF|6p%QR0=9BLQ7L2{_^EX6?gAq&;J%rm?;z8~(+WT))
zLW9w8#ecj9h%cB8<YVK&|HFKcyVuMO`Y+r|4fk(3;eWMH@g~p!0PH1HUSnF~i36}9
z$=W*PA;>zKF*HfYM2<p{<}g$m?kBM<plJ!Li3AB|qvXLeIY?`0+7BhEm*neWQl)Tc
zpPQY<`-?7S<1scTe|r0CZ|5D}lWg~s>5rEZd_S074nC*@3^gr8@wkvB1{EE+1lOPt
zBzRLqEcy$cvQQ5IPb6FAZFpZYX26g<cO*jf{XHw*vWO0R0rn2ef%dB##*SeKM>lr=
zOaCihHpBsvU+;1Pk=^Y>8N>S>3;ax|huWYsArJmAkRL{W%<3B$p5CDVzu5&jksj2Z
zDVsjz-V%Zy^q%W8KzJ|%#4cn0!O2pGl~#CaExFtpq%acjZ<V@+B%ACIO6||(W!ha?
z*ileh*xJ!p+U4N==BJI>d*z?eMbo$POsX+0M%I7E+Wpc$&y2dvw3-cQNAXn<ryTs;
z&UQvN-Q5)h7NbG&^#)YKg?eW2?2+Xqcq-CRL8s*y@1~^oQ5E1(?T)$vw~6It%a*{u
zjW@blW`fZGV6P*OAfi{9O01^qbSEgrdeccL#S?9G<H6(3_H*`C<%x&AiFPQ;bPbEF
z!qqA$#IAbHYBRAAruQtN>gI}d&C*Rc*3CDDFOou)rJ@_LYwj+m&WO=I$21z#pUV^=
z>A{vz6a<M0vZh*QQNmzQ7wNXa)eVi;GKc6a50%gWE74w=%ZA?{r1v&TDEYRDWTwtZ
zH1o4f(QJa2?QLC^sl_@f!%O)_S|IPb<jP|k!B)ERrY+rMKLXe7LqQu(jI;u|I4^c#
zTy@FnRM~uj3;qOwoYK?!W8<hb6kM=HmHMh=%QT|QxNBeO1<3;E5Sa6`6`<+^!1Tzn
zbxP2HhBRFg15flwrLJxEE=rG}ae+Z?kbV?)*^pzL(cWti)^1e(97fyB1zX~pTO!o=
z=6b9>TqLo(=D?bLK1g!MoX{L8i340n^t;f&5Jp-<B>1_O9@fsloIPDgCZ|O(Hzmmp
ztFl}SB)@6Co?d#%w8TLDI~$aq<Xh}!zX*2#7|zdq(hQ?q*lSkc&H*nXAU1ZW5lG+d
zGcc52>fgklW{>{0BCy9$SD<B}T82^CvMF_rrf76=+dM?^Gt2TzxHp^3lpwdIj?3CQ
zSxc?C^AdaEN{O)iOwA>!oUPmnbtAmpmASu;KeutLHLN@k%TDr@yhPWy_4K4jHp>oR
zZl82Z$X2S+SuDvqe&oO;MT)LERa&Jx_h=o>^^?B^d(6yfm%5RB+`0ce)JhHK*LRa5
zG#KoLcAAYFMSr!Z<6dc*cjI!LNC_W24+Rq3Gi!dMiq6g`y)${}u&~`jJDdLjtBCE)
z>4ls!fGf*_LCz`NE;A^itfz<uquLAbKi+W`hPS-P-2cw;JA4k0e2|_*&NJ>P>9H1u
zc2sxpPUmME)TOmhhpHFd1F4I!l;hI4oeijq?5Jl?w)En;Gn?wFW9qRwU1^2p(rTU~
z{WFT5*p!9}w-(5KwDW(;x(=u&nyyW6g7iR;5(vF_kS0}1M5=TY=~Y02bOT6HDT0fD
zf&r-(nl$NMq$ov@D$<L9K%@)8zwrC|lJ8B<*`3^Zp1X5*W>5Ca+_~3vtooBljYzUf
ze0SWW0O7p1rSMbvnQD3kIpj@-bPeV#R8YTIP27I}y;^TPytNnR=V&Aw{knr0sc#|e
zHLHgEjdJ`3^_=T691(M~*-lP%MC|CQ2g&|Fxr5i`)AZ!W4<%VMF)#~i4Pq5koJrQ2
zv_hyvsGV5slo|P;>K!IK){prlRH9yR^vjkTYOo7>LsaSUlsv9fdcS0-EM`m#QBn~y
zeU--d)XR4G<v5;8Ztc0e%z6_wew9c%1U??T>%Qq*U~gySg+GB%3`5&c1P!lLZ*yqP
z!shAWLuw;>S@DSxZd!5|uhyimT>RD~%gvi@QiE2~;&|65e8H*nXa6_x{S4Ui_6~V9
zG6LTC2p@aGPT+_a4dMP|Hqb0fjoO-QY2e=(_Bueq8B&f)5RED_SM;WY@e~*OVrp+L
zZxONZhueu6<oU_xF$W4A_HK~WX&(45YUM0K0?P>eKOi6X{gUo$oZ~Shc9k9R&3U*K
zcn2RJk=Tkf(Nyy0V9Of+$^LLSVI7yLx6fKBPFN=-G=Y*<db2i-lO&5$0wt@r=fT-O
zEQSc81QeqKc+wK(4yXlXR~b6bt9Cqy7-&J+J=%5{>*N}Ke*dfa`~HK2Zz{02=#A}b
zVjWETl}RfX<*K4d9LRo@HyRX8_?F)aZdIY}v?FC8>1_Q?IrhD>%@mh%mvpRCEJ!=w
zOuAFkXA5~LjAt15eT2A1E`{pbHE7Rd#!t#nhu$%`O5OFs+oIl=sNSFM5%p!9ptq}Z
zfI1t459Xqk1^XcbHFZkrd24wExn3hi$eJ;SYQ$qtcDiF6p_K<6ULgyXi$<GWeB!DO
zbA!gNn?6-5084}j%?O;}h?k|`4r!CZ+;U)*E;nt|F-&=17Fj-U5Kd>5PS!A!#Pgeo
z@6)XFZ?@AFN1%K6#IujK%=hyw!I^(hhOiWK2pB<1A9UgS|Aq2~Jz^ksm>y+qG@wiu
z)vM|<MziF%Pe)BRmZ`3yj~mkmDKzo2Xo7mCCbiSJ({gJ&v`@}O_KbM9pF@RS>cY6w
zWKP_2s=Me^wph2WG&-==J9(oK*M@LMl`4t{Pl2MT3>MoGg_DLmlGVK^Y40)unIilo
zFS+_TffgpB92ROeAUHnwS_ow+fyB$s^_ef@Sa~hP_9P~afaCeL^?O6owy)@@tl@dG
zp)I-b-K%eVNjT--@jG>OjRod@;e-YE3tREj+z!&jv>{p#kuRmLWjoNqH1Ljubca_3
z!<vx`si7iHgZgyBE;Tiit|r$u^<POd!)A?Lm<94KXVmLvgyfkMh;yM@3%Y%cUP&46
ze>N5tHa5DuzL5R`HMlHf^dfZc{B(`$Vr>!paZd>YP31_Qb4_h@X**P4H-y&o&V(Ps
zJO59eNKcX8v3lj9)(IA;K>0k;TiZgB`rFg4m)YNJHWyYcTz?;O-_{}HDSJFcK4V3o
zKm#(dLFc7y`9~vPy=?q6)ReBn)9Ya*fT)H|vV?ZvUcAFA-Sp}Qn}O!vI#bAaG@q#M
z&wXhg4<`}3Pn$ZY6;tCN5Jwc2_=e?IP=&gdvQ-2fg`Khd`~HPEMEy-(DeCr{su3jW
z8d{$h-X9-UurGh|qI|u${EEVFqn3PDQ>Y2Yx9tl~uHWsJZf%kLItA2%Lt7Iwk!ms7
ztfbO4?+lv;f!_oi?}^5z0NW#Jk{-FKf_sKYvCmP{>+#(}vB1=aR2()mwdyg6T)vkd
zQ;1UuM-AHRf}<F14tlc(5E~dv*urn~9FDr{<ddhSfD}S&!cEiPui=gf300`nHIrVf
z^?CW!kJ<26%A&IA)@#&K^R7)8{*0XpqzV?3un@LqMnx)x2vJ@tSZam}-){;R^iknd
z0?!4Rjun(zE%@d$;jtyK6|01U-~?)jJ-$?0i1K6B4t!y)P{PjJD#`mWT!=k`RJ9U}
zk5YXhoWMLmQMf}*Nh^UcAnut=h;q9^f~IWK^@QnS@(v{iDSLX>-Oww(A#K81P^l+M
zur11ataS^{Lx0{%|K?(UXO<o?PKtw5K#zmNd-@LAut$%2Vj5sWH&1`8TbedX4%kR@
zQjyfyCOP=AKQy4CnkR9PGA$#Ov`M=v4cOb4mG$)8b}oEx;zs#hTWF`Ua1dhY&i*1#
zhw@=z{rW+}`axdBdWgho&n+Uv@yLGsZo_2l<n9mPIAF^gM*!mq6-mT=rn;V&NhXrw
zT^tTO&zpeSAo~`O8*3W5;R-D_@M5_BCKEzT|FIbtT5KfBK<xTpQ|YJ<eJOfx>i1y)
zzR@IOOPYVM#Clz%lPATrhk{a5#=Gc^^Q@DdbHo96WF!1AdsL`zEG<F)3N0DYYW^aR
z*6qG!D+H;xAE@o&yg|mwJQ6UA<TD9;=EUQ_(@e#Ra=7Q1I;|$oI_n+PN$j9dWJ7UP
ze7}|K&NQ6-mjNMLD<2`-2N&r*Qo@WT9yNbM)$Rp**UU@R-d?cLaS4TyNiaRx<oNLD
zB~ecHufAoKmTtYyqnMo}59lbSf@WFz>1bV{!w(OOyiA0d8BvM1+UtRP`d3%SMN7V@
zS?OQCg7TOUt^4`<4Y)ixL9?)~wL_6l6nG#nK&_ahQ-$sc`%(W}<~${5t$YwMu>vQT
z)6<I+r4))HFGk;jPMuG88fKKtO>WGL+1huM2SyKwjtA&6OSwqMJH~=(m>eu-f6OLJ
zKkFagHM5BCsqpk`*A36NajCrN_+5WC)g>`KZ5vfyKU%WnW^urYRPS!iIRDnC7%ki<
zhIh_gTvNNO+WNA|I^UJ}rJ+#imYS&AkLAgudFDjL6S|e-PY_4!idIbxWNIshmC4_}
z6wZJ3ky?o@xLKT1Qm%?X4GWEPt7O^fqJzJGO&jtlBF5W^P>J`HzeJk`x~dEahLk1d
zr(ZzviFRZ<XjQ>#K2j%q`LWY{#7WHQ2`NDG8FM`}G=_=H8rf&%x@F^iW-b>;!t7kL
zL(t_UQ1dQt>ombJmCHP3)!{$fi=SXzpc#o6^V`Q&w}QUFC!F&IH)v-1k9iRG*8ZVa
zMxhfIYu64F9$Q5}jTQ08b{WgbNM0El5&ncK^+mMtWtz|0dt^T%H*E2Oag{4QS0>%O
z9K6wM0BLxwAIe-=xWGB85dC$L=$`9r>5}_=^8WWXHT1Q`ns!NFloop!T#VTU$exzz
z7LF40RSRmnTy1pgL3})a<03nvF<05zCMold7Rj1pfVh&Twx+qK#hrJFy|iwfP#v8d
zRF%=oP5v$i!kC1TITQor=~AIRX+POrr|PfPMZDXp^zxVhnjfaWt{mW@ZW&@Uf*&y5
z?OZrg9g^nWwq?=Ls*=;tnMxEh<SyO%eE7NJrFM6Li{@6nv4z0PJRP%o_}6yhVCapT
zE;n*}km%gpnWsyp{c)`H^-D%#%{8u!1}KbF@bie+z-9mJ<l$?<_>;!o0=G;tLdnMM
z{rRJ`{0*O&CvVyUDXGu;mWUAa+}DDKn@5Ugf<ESbbDcA!Bb-Rw2+0GpFHhkdCy-vU
zRaLAgRm`h!3$=2FbZoKB^2GW_Kg^hMGHy~TOjfAt6tuq_$xz*>v9l-pRh%cX)f832
zgDSF355b&+93l>N-WLb#T!__AxgfOC1cji|9@ct~kJ{fJ7n<n$_VuTvE(Bvq-`Ki-
z?J!J&D~1}1GRE*6nz!FDKBPw(VL+eX_Dk0e&pC0rFNwjk_&I{egE&eNlZ!c;O8NP5
zVrp!0jOI6Ld$?&FdN_*jyb3Y597nBq8)obIiTErvML4W^-)f=pEGC`~@9IkSda$l*
zKIHfEz(jN35-zSFk~~P@x@3zUbU$vN`7v;neov-^yAe!czOW!r{5r~c-@4N(j-G)j
zpYKWVpsBIlw@1}9;k1F$#bvdb;qT03)w?o)oW55qmwTx5=jzWz&xF>}IrXEIlhCC)
zG}rT!JUV*w2(q+yF0X#S5G<w`vEr(&%CGohlhF9XFr%V%Y2|=jj7ail+R|4Y=-V`M
zy2M(@K4}duDdUE7`#lR5+{5Z2lUyIEuQ*+~)7IiMIX0Ini5Z`<=DPhOn2o2*ePgBm
z?mLC=Pu@lPdNg=GGmq-Z+6ej}i+T<;R1fQqAsjtI(jz05DpK={>@u>+9#^Fvv3`1S
zDT>UZ1p2&uO!W;vvhNoZy&Y`fxn01}FZbR2hStgjg%z&yhW@gKq#<jxFWt?C0B6>P
zZp~OEOTU>OYTb|#)}vzKp-S;7G#RR;Ch?N#VdR^9>QogkXC|qEghymm9;hu}#uQum
zkZX%nXs%2*F=GPeXhG)(BXp{}cFp9j(JeYtVjrQe<8!YnKfgQyZs`?BF%YsJ93W{U
zg@>6GY;@>UIj&OG846G!cjZ-cnOR8sdR~o4E|dBT<KFOMrg+=t9bt!=b&dt3qc?06
zyzw?|Kin6O%j1)baq(B8G(wq)#wGI!B6lDcg9>du-<J8kDD$HZ;1!RIdH#v3XMrpH
z?WfV&!O_|)t3tjzSv}uMT@svTqTiNiRykJBK9j9=+?O;-4~}quIK|G)4zT3AtKf$e
z!_JK_QEuyeY<)8K>-<d3vzZ366g#Q;At}08snj-$)emyaZ50vTiZ2RKA6l#8kM4QW
z^~6$lwK}(#VVI|vjTqZ~aK-G15w`75jkv5P!08N<oM++u**bZRJCfYaDQx0f^9hy_
z<{EYvE>_gXD1_|Ort2jkKJ>{(3OGA)%@5KQDKLpd$_a7|Y2UZxZL{Rd_M~ExmNzT9
zu3{A-d0AUzh@0R$d2)w6s_g0;oFDPjyZ#11S{tjnbIWu*pVc-&l3A4<lc^`Te8Vng
ztr+LVFHw|Yyrc%F*W#NMzH`k>qNpEkH2p4JU{i^slq<%m#PPmDNu@kGwMFiibr7Qt
z<)dy5eK&0rBZIZbq|!`tp~ynCeFWe0G-oR<JAtq=R_YhywlbRmsP?d%IRT<xWislz
z%pCELVy&68uIL&}X#eV;{ZQEZM6%SEorh)EbZGbf2YmKne3~nBUpIfO?ZYyP72N&L
z6URh*z99Dwe!_k)ocSOE{<}shY#syYid|vj<G6_Xl#|VgZ(TQRWICOH!Id#!L{*28
za1{cjZD(E0EhBqX{|Lnl;gy4_AOkPe5Eb~8NrAz-aQWwSE(q#Dq8`$y`J<PLV!^oY
z<&g=mS#l!SKHt)#a)M)4_a)!Zr218*%FxJc4!@r%<S7Yb>L7JjFvJahLtIrvVr5ED
z1fOE4YC5o<B6g;y)6mIPp%3`-Oc^mH>1u(eNt;i7h1oioqyqI;_F9+0D`OUfmNwNh
zRk9wgkD_aw!*x{Wycit5PpCJ3pv|nz686xr9<zc6+~IjXha=P$<17LzHC5S$MmT(>
zFW@Swjk&p;{cFmoFbi>utj78_Z<Fr)s-od^N|53UH=*Uv%gY?o@57JL$9Vb(Ts%7b
ze*+KV0O!ch0Y>xexMYdKP#}Ju7o5L53BLVtp7~GdXdeEjB(op@mh2Wx!DHe%C@{Dn
zb6NuhxE2-vVEh+(z*6Sob?|t+=nNj6mrlwEdMGfpbb@02ZUi1N%upcayTX~=c1wFM
zjlh@hmS;p&zBU<v(z4MR5wSocCy=phbw;$|u|Wfnt~j0v5pJ0s#4rGQRC5F2D`wpP
zn)^l(cP0n)w%!8k6mb6i<b-931Jk^4fJx#4ptMSKhH{dI{542v11XCCGH`OjGNl0A
zH9i1XWj+JP${vjc&y_ueAFV>pz_GIMV!<oqPvH<nY9Mp%Y=cg7@q!Ji1cUENU{OjH
zL5c{_`-A+<6;9Khf^dHjj@|wOWe~1$26~!t5`<QPktoHnG^eYb-knEl3}@gc$p|Mv
zxEnaHeF+PW(Kv;#uW_D%|C^Z*>=!J!fHnx{04&$ZPlkszl>DFCoUk5CV0xVcC_b&K
zTZiL~+kpZ}5U1x11w=N;@Qxh;`3+T2aCZZaH{cA&xyl2gKTmc8o($t(8|N?Nx#Hk>
z-gXjkx_#5$-9f|`>EaFs%R7AzPBF5W^LRt9zy{`m;Qu}ze?!fKosWI5Dcw#8z-tWb
zjEPv0uKzItJm-Y1-vVqt)1L&smgE%s|AdVHd#%3#mBHZ(I$8hy<b-W|{UO6ZtJZ(Q
z@owBX6+8;0`cI3oB8mRhanb};zds~WASj6IKg833f#CegU9dMLv4{gfe~HAQjQ=5G
zg(|}$en9;pl2Blo3~t_p<IO()rxNf?g%JPKA&p?w0B~Bhzr_vO3)_a{jXgURT+d|s
ziwgq9=;uJ@HvgIXkF~`Ut10)<zy=odWaGu(eHU0zu6#gwN9v4LEZ27|=*lZlEA#&t
z*R})4BWXNs@X-zpXaV&u9Iw3jRKVIz0hsNwo>7jqFodN%we=5$_OH?1pr)xVU}IPI
yj0UWUF)R%my@1!S$bUKvYaRfLU@!o{#`z)o2tshY<KW1EUr|~doZAy8zy1#aw(3m)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4e86b92707..ac72c34e8a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 65dcd68d65..0adc8e1a53 100755
--- a/gradlew
+++ b/gradlew
@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,10 +131,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,6 +198,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

From b83d1de4dd231eba868919d2c9662ddbdad51f06 Mon Sep 17 00:00:00 2001
From: Dimitrii Lipiridi <dimitrii.lipiridi@delasport.com>
Date: Thu, 17 Aug 2023 19:12:08 +0300
Subject: [PATCH 1179/2068] fix: Update example of spotlessFiles argument

---
 plugin-maven/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index aa324627f9..956dbf385e 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -1606,7 +1606,7 @@ There are two options:
 ### Pattern
 You can target specific files by setting the `spotlessFiles` project property to a comma-separated list of file patterns:
 ```
-cmd> mvn spotless:apply -DspotlessFiles="my/file/pattern\.java, more/generic/.*-pattern\.java"
+cmd> mvn spotless:apply -DspotlessFiles="src.main.java.com.example.*, .+Config.*\.java"
 ```
 The patterns are matched using `String#matches(String)` against the absolute file path.
 

From cb5cb6adc6306d3673a64370f4f1920d6626cde6 Mon Sep 17 00:00:00 2001
From: Dimitrii Lipiridi <dimitrii.lipiridi@delasport.com>
Date: Thu, 17 Aug 2023 21:28:23 +0300
Subject: [PATCH 1180/2068] feat: Add issue link to CHANGES.md

---
 plugin-maven/CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 62d0f8c500..972e0bf6e2 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -6,7 +6,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * Add a `jsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
 * Support GJF own import order. ([#1780](https://github.com/diffplug/spotless/pull/1780))
-* `-DspotlessIdeHook` provides the ability to apply Spotless exclusively to a specified file. It accepts the absolute path of the file.
+* Add `-DspotlessIdeHook` that provides the ability to apply Spotless exclusively to a specified file. It accepts the absolute path of the file. ([#200](https://github.com/diffplug/spotless/issues/200))
 ### Fixed
 * Add support for `prettier` version `3.0.0` and newer. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
 * Fix npm install calls when npm cache is not up-to-date. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))

From 1d6b717c44f8d25e3b33936e280a06428c143a55 Mon Sep 17 00:00:00 2001
From: Dimitrii Lipiridi <dimitrii.lipiridi@delasport.com>
Date: Sun, 20 Aug 2023 21:31:08 +0300
Subject: [PATCH 1181/2068] feat: Prepare Maven's IDE hook

---
 .../gradle/spotless/FormatExtension.java      |  2 +-
 plugin-maven/build.gradle                     |  1 +
 .../spotless/maven/AbstractSpotlessMojo.java  | 36 +++-----
 .../com/diffplug/spotless/maven/IdeHook.java  | 87 +++++++++++++++++++
 .../spotless/maven/SpotlessApplyMojo.java     | 31 +++++++
 5 files changed, 132 insertions(+), 25 deletions(-)
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/IdeHook.java

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index 7a62f8cabf..0e4e4395c3 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -124,7 +124,7 @@ public void setEncoding(String name) {
 
 	/** @see #setRatchetFrom(String) */
 	public String getRatchetFrom() {
-		return ratchetFrom == RATCHETFROM_NOT_SET_AT_FORMAT_LEVEL ? spotless.getRatchetFrom() : ratchetFrom;
+		return ratchetFrom.equals(RATCHETFROM_NOT_SET_AT_FORMAT_LEVEL) ? spotless.getRatchetFrom() : ratchetFrom;
 	}
 
 	/**
diff --git a/plugin-maven/build.gradle b/plugin-maven/build.gradle
index 7cfb38c2e9..74a76ddcb1 100644
--- a/plugin-maven/build.gradle
+++ b/plugin-maven/build.gradle
@@ -39,6 +39,7 @@ dependencies {
 	compileOnly "org.eclipse.aether:aether-api:${VER_ECLIPSE_AETHER}"
 
 	implementation "com.diffplug.durian:durian-core:${VER_DURIAN}"
+	implementation "com.diffplug.durian:durian-io:${VER_DURIAN}"
 	implementation "com.diffplug.durian:durian-collect:${VER_DURIAN}"
 	implementation("org.codehaus.plexus:plexus-resources:${VER_PLEXUS_RESOURCES}")
 	implementation "org.eclipse.jgit:org.eclipse.jgit:${VER_JGIT}"
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
index ea66e921e5..825859716f 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
@@ -187,9 +187,6 @@ public abstract class AbstractSpotlessMojo extends AbstractMojo {
 	@Parameter(property = "spotlessFiles")
 	private String filePatterns;
 
-	@Parameter(property = "spotlessIdeHook")
-	private String spotlessIdeHook;
-
 	@Parameter(property = LicenseHeaderStep.spotlessSetLicenseHeaderYearsFromGitHistory)
 	private String setLicenseHeaderYearsFromGitHistory;
 
@@ -254,10 +251,6 @@ private boolean shouldSkip() {
 	}
 
 	private List<File> collectFiles(FormatterFactory formatterFactory, FormatterConfig config) {
-		if (!(spotlessIdeHook == null || spotlessIdeHook.isEmpty())) {
-			return fetchFileFromIdeHook();
-		}
-
 		Optional<String> ratchetFrom = formatterFactory.ratchetFrom(config);
 		try {
 			final List<File> files;
@@ -271,30 +264,21 @@ private List<File> collectFiles(FormatterFactory formatterFactory, FormatterConf
 			}
 			final String[] includePatterns = this.filePatterns.split(",");
 			final List<Pattern> compiledIncludePatterns = Arrays.stream(includePatterns)
-					.map(Pattern::compile)
-					.collect(Collectors.toList());
+				.map(Pattern::compile)
+				.collect(Collectors.toList());
 			final Predicate<File> shouldInclude = file -> compiledIncludePatterns
-					.stream()
-					.anyMatch(filePattern -> filePattern.matcher(file.getAbsolutePath())
-							.matches());
+				.stream()
+				.anyMatch(filePattern -> filePattern.matcher(file.getAbsolutePath())
+					.matches());
 			return files
-					.stream()
-					.filter(shouldInclude)
-					.collect(toList());
+				.stream()
+				.filter(shouldInclude)
+				.collect(toList());
 		} catch (IOException e) {
 			throw new PluginException("Unable to scan file tree rooted at " + baseDir, e);
 		}
 	}
 
-	private List<File> fetchFileFromIdeHook() {
-		File file = new File(spotlessIdeHook);
-		if (!file.isAbsolute()) {
-			throw new PluginException("Argument passed to spotlessIdeHook must be an absolute path");
-		}
-
-		return List.of(file);
-	}
-
 	private List<File> collectFilesFromGit(FormatterFactory formatterFactory, String ratchetFrom) {
 		MatchPatterns includePatterns = MatchPatterns.from(
 				withNormalizedFileSeparators(getIncludes(formatterFactory)));
@@ -400,4 +384,8 @@ private UpToDateChecker createUpToDateChecker(Iterable<Formatter> formatters) {
 		}
 		return UpToDateChecker.wrapWithBuildContext(checker, buildContext);
 	}
+
+	protected File getBaseDir() {
+		return baseDir;
+	}
 }
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/IdeHook.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/IdeHook.java
new file mode 100644
index 0000000000..dba9bcc547
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/IdeHook.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2016-2021 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven;
+
+import com.diffplug.common.base.Errors;
+import com.diffplug.common.io.ByteStreams;
+import com.diffplug.spotless.Formatter;
+import com.diffplug.spotless.PaddedCell;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.List;
+
+class IdeHook {
+
+	private static void dumpIsClean() {
+		System.err.println("IS CLEAN");
+	}
+
+	static void performHook(Iterable<File> projectFiles, String path, Formatter formatter, File projectDir, String ratchetFrom, boolean spotlessIdeHookUseStdIn, boolean spotlessIdeHookUseStdOut) {
+		File file = new File(path);
+		if (!file.isAbsolute()) {
+			System.err.println("Argument passed to spotlessIdeHook must be an absolute path");
+			return;
+		}
+		if (projectContainsFile(projectFiles, file)) {
+			try {
+				if (ratchetFrom != null) {
+					GitRatchetMaven ratchet = GitRatchetMaven.instance();
+					if (ratchet.isClean(projectDir, ratchet.rootTreeShaOf(projectDir, ratchetFrom), file)) {
+						dumpIsClean();
+						return;
+					}
+				}
+				byte[] bytes;
+				if (spotlessIdeHookUseStdIn) {
+					bytes = ByteStreams.toByteArray(System.in);
+				} else {
+					bytes = Files.readAllBytes(file.toPath());
+				}
+				PaddedCell.DirtyState dirty = PaddedCell.calculateDirtyState(formatter, file, bytes);
+				if (dirty.isClean()) {
+					dumpIsClean();
+				} else if (dirty.didNotConverge()) {
+					System.err.println("DID NOT CONVERGE");
+					System.err.println("Run 'spotlessDiagnose' for details https://github.com/diffplug/spotless/blob/main/PADDEDCELL.md");
+				} else {
+					System.err.println("IS DIRTY");
+					if (spotlessIdeHookUseStdOut) {
+						dirty.writeCanonicalTo(System.out);
+					} else {
+						dirty.writeCanonicalTo(file);
+					}
+				}
+			} catch (IOException e) {
+				e.printStackTrace(System.err);
+				throw Errors.asRuntime(e);
+			} finally {
+				System.err.close();
+				System.out.close();
+			}
+		}
+	}
+
+	private static boolean projectContainsFile(Iterable<File> projectFiles, File file) {
+		for (File projectFile : projectFiles) {
+			if (projectFile.equals(file)) {
+				return true;
+			}
+		}
+		return false;
+	}
+}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
index 5ebe2885c9..9d5e3f9b14 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
@@ -18,6 +18,8 @@
 import java.io.File;
 import java.io.IOException;
 
+import java.util.List;
+
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.annotations.Mojo;
 
@@ -25,14 +27,30 @@
 import com.diffplug.spotless.PaddedCell;
 import com.diffplug.spotless.maven.incremental.UpToDateChecker;
 
+import org.apache.maven.plugins.annotations.Parameter;
+
 /**
  * Performs formatting of all source files according to configured formatters.
  */
 @Mojo(name = AbstractSpotlessMojo.GOAL_APPLY, threadSafe = true)
 public class SpotlessApplyMojo extends AbstractSpotlessMojo {
 
+	@Parameter(property = "spotlessIdeHook")
+	private String spotlessIdeHook;
+
+	@Parameter(property = "spotlessIdeHookUseStdIn")
+	private boolean spotlessIdeHookUseStdIn;
+
+	@Parameter(property = "spotlessIdeHookUseStdOut")
+	private boolean spotlessIdeHookUseStdOut;
+
 	@Override
 	protected void process(Iterable<File> files, Formatter formatter, UpToDateChecker upToDateChecker) throws MojoExecutionException {
+		if(isIdeHook()) {
+			IdeHook.performHook(files, spotlessIdeHook, formatter, getBaseDir(), null, spotlessIdeHookUseStdIn, spotlessIdeHookUseStdOut);
+			return;
+		}
+
 		ImpactedFilesTracker counter = new ImpactedFilesTracker();
 
 		for (File file : files) {
@@ -69,4 +87,17 @@ protected void process(Iterable<File> files, Formatter formatter, UpToDateChecke
 			getLog().debug(String.format("Spotless.%s has no target files. Examine your `<includes>`: https://github.com/diffplug/spotless/tree/main/plugin-maven#quickstart", formatter.getName()));
 		}
 	}
+
+	private boolean isIdeHook() {
+		return !(spotlessIdeHook == null || spotlessIdeHook.isEmpty());
+	}
+
+	private List<File> fetchFileFromIdeHook() {
+		File file = new File(spotlessIdeHook);
+		if (!file.isAbsolute()) {
+			throw new PluginException("Argument passed to spotlessIdeHook must be an absolute path");
+		}
+
+		return List.of(file);
+	}
 }

From 959fd854c36080caa13123de2089ebcb7396adb4 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Thu, 24 Aug 2023 09:42:44 +0800
Subject: [PATCH 1182/2068] Check if EditorConfig file exist for Ktlint

---
 plugin-gradle/CHANGES.md                      |  1 +
 .../gradle/spotless/KotlinExtension.java      | 10 +++++---
 .../gradle/spotless/KotlinExtensionTest.java  | 24 +++++++++++++++++++
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 1ce2f06a42..27d60e7270 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -6,6 +6,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * Add a `jsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
 * Support GJF own import order. ([#1780](https://github.com/diffplug/spotless/pull/1780))
+* Check if EditorConfig file exist for Ktlint. ([#1788](https://github.com/diffplug/spotless/pull/1788)
 ### Fixed
 * Add support for `prettier` version `3.0.0` and newer. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
 * Fix npm install calls when npm cache is not up-to-date. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
index f2c3a29d75..27d93717f4 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
@@ -85,11 +85,15 @@ public class KotlinFormatExtension {
 			addStep(createStep());
 		}
 
-		public KotlinFormatExtension setEditorConfigPath(Object editorConfigFile) throws IOException {
-			if (editorConfigFile == null) {
+		public KotlinFormatExtension setEditorConfigPath(Object editorConfigPath) throws IOException {
+			if (editorConfigPath == null) {
 				this.editorConfigPath = null;
 			} else {
-				this.editorConfigPath = FileSignature.signAsList(getProject().file(editorConfigFile));
+				File editorConfigFile = getProject().file(editorConfigPath);
+				if (!editorConfigFile.exists()) {
+					throw new IllegalArgumentException("EditorConfig file does not exist: " + editorConfigFile);
+				}
+				this.editorConfigPath = FileSignature.signAsList(editorConfigFile);
 			}
 			replaceStep(createStep());
 			return this;
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
index 10fbe5bd90..98e2259be4 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
@@ -15,6 +15,9 @@
  */
 package com.diffplug.gradle.spotless;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.File;
 import java.io.IOException;
 
 import org.junit.jupiter.api.Test;
@@ -81,6 +84,27 @@ void withExperimentalEditorConfigOverride() throws IOException {
 		assertFile("src/main/kotlin/Main.kt").sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.clean");
 	}
 
+	@Test
+	void testWithInvalidEditorConfigFile() throws IOException {
+		String invalidPath = "invalid/path/to/.editorconfig".replace('/', File.separatorChar);
+
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    kotlin {",
+				"        ktlint().setEditorConfigPath('" + invalidPath + "')",
+				"    }",
+				"}");
+		setFile("src/main/kotlin/Main.kt").toResource("kotlin/ktlint/experimentalEditorConfigOverride.dirty");
+		String buildOutput = gradleRunner().withArguments("spotlessApply").buildAndFail().getOutput();
+		assertTrue(buildOutput.contains("EditorConfig file does not exist: "));
+		assertTrue(buildOutput.contains(invalidPath));
+	}
+
 	@Test
 	void testWithHeader() throws IOException {
 		setFile("build.gradle").toLines(

From ca026b868bce06f942f5f984aea279ae012437b2 Mon Sep 17 00:00:00 2001
From: Dimitrii Lipiridi <dimitrii.lipiridi@delasport.com>
Date: Thu, 24 Aug 2023 09:52:42 +0300
Subject: [PATCH 1183/2068] feat: Remove checking ratchetFrom from IDE hook

---
 .../gradle/spotless/FormatExtension.java      |  2 +-
 .../spotless/maven/AbstractSpotlessMojo.java  | 20 ++---
 .../com/diffplug/spotless/maven/IdeHook.java  | 76 +++++++++----------
 .../spotless/maven/SpotlessApplyMojo.java     | 18 +----
 4 files changed, 48 insertions(+), 68 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index 0e4e4395c3..7a62f8cabf 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -124,7 +124,7 @@ public void setEncoding(String name) {
 
 	/** @see #setRatchetFrom(String) */
 	public String getRatchetFrom() {
-		return ratchetFrom.equals(RATCHETFROM_NOT_SET_AT_FORMAT_LEVEL) ? spotless.getRatchetFrom() : ratchetFrom;
+		return ratchetFrom == RATCHETFROM_NOT_SET_AT_FORMAT_LEVEL ? spotless.getRatchetFrom() : ratchetFrom;
 	}
 
 	/**
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
index 825859716f..2c295cef27 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
@@ -264,16 +264,16 @@ private List<File> collectFiles(FormatterFactory formatterFactory, FormatterConf
 			}
 			final String[] includePatterns = this.filePatterns.split(",");
 			final List<Pattern> compiledIncludePatterns = Arrays.stream(includePatterns)
-				.map(Pattern::compile)
-				.collect(Collectors.toList());
+					.map(Pattern::compile)
+					.collect(Collectors.toList());
 			final Predicate<File> shouldInclude = file -> compiledIncludePatterns
-				.stream()
-				.anyMatch(filePattern -> filePattern.matcher(file.getAbsolutePath())
-					.matches());
+					.stream()
+					.anyMatch(filePattern -> filePattern.matcher(file.getAbsolutePath())
+							.matches());
 			return files
-				.stream()
-				.filter(shouldInclude)
-				.collect(toList());
+					.stream()
+					.filter(shouldInclude)
+					.collect(toList());
 		} catch (IOException e) {
 			throw new PluginException("Unable to scan file tree rooted at " + baseDir, e);
 		}
@@ -384,8 +384,4 @@ private UpToDateChecker createUpToDateChecker(Iterable<Formatter> formatters) {
 		}
 		return UpToDateChecker.wrapWithBuildContext(checker, buildContext);
 	}
-
-	protected File getBaseDir() {
-		return baseDir;
-	}
 }
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/IdeHook.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/IdeHook.java
index dba9bcc547..0001046871 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/IdeHook.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/IdeHook.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,64 +15,60 @@
  */
 package com.diffplug.spotless.maven;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+
 import com.diffplug.common.base.Errors;
 import com.diffplug.common.io.ByteStreams;
 import com.diffplug.spotless.Formatter;
 import com.diffplug.spotless.PaddedCell;
 
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.util.List;
-
 class IdeHook {
 
 	private static void dumpIsClean() {
 		System.err.println("IS CLEAN");
 	}
 
-	static void performHook(Iterable<File> projectFiles, String path, Formatter formatter, File projectDir, String ratchetFrom, boolean spotlessIdeHookUseStdIn, boolean spotlessIdeHookUseStdOut) {
+	//No need to check ratchet (using isClean()) as it is performed in Gradle's IDE hook, since we have already gathered the available git files from ratchet.
+	static void performHook(Iterable<File> projectFiles, Formatter formatter, String path, boolean spotlessIdeHookUseStdIn, boolean spotlessIdeHookUseStdOut) {
 		File file = new File(path);
 		if (!file.isAbsolute()) {
 			System.err.println("Argument passed to spotlessIdeHook must be an absolute path");
 			return;
 		}
-		if (projectContainsFile(projectFiles, file)) {
-			try {
-				if (ratchetFrom != null) {
-					GitRatchetMaven ratchet = GitRatchetMaven.instance();
-					if (ratchet.isClean(projectDir, ratchet.rootTreeShaOf(projectDir, ratchetFrom), file)) {
-						dumpIsClean();
-						return;
-					}
-				}
-				byte[] bytes;
-				if (spotlessIdeHookUseStdIn) {
-					bytes = ByteStreams.toByteArray(System.in);
-				} else {
-					bytes = Files.readAllBytes(file.toPath());
-				}
-				PaddedCell.DirtyState dirty = PaddedCell.calculateDirtyState(formatter, file, bytes);
-				if (dirty.isClean()) {
-					dumpIsClean();
-				} else if (dirty.didNotConverge()) {
-					System.err.println("DID NOT CONVERGE");
-					System.err.println("Run 'spotlessDiagnose' for details https://github.com/diffplug/spotless/blob/main/PADDEDCELL.md");
+
+		if (!projectContainsFile(projectFiles, file)) {
+			return;
+		}
+
+		try {
+			byte[] bytes;
+			if (spotlessIdeHookUseStdIn) {
+				bytes = ByteStreams.toByteArray(System.in);
+			} else {
+				bytes = Files.readAllBytes(file.toPath());
+			}
+			PaddedCell.DirtyState dirty = PaddedCell.calculateDirtyState(formatter, file, bytes);
+			if (dirty.isClean()) {
+				dumpIsClean();
+			} else if (dirty.didNotConverge()) {
+				System.err.println("DID NOT CONVERGE");
+				System.err.println("See details https://github.com/diffplug/spotless/blob/main/PADDEDCELL.md");
+			} else {
+				System.err.println("IS DIRTY");
+				if (spotlessIdeHookUseStdOut) {
+					dirty.writeCanonicalTo(System.out);
 				} else {
-					System.err.println("IS DIRTY");
-					if (spotlessIdeHookUseStdOut) {
-						dirty.writeCanonicalTo(System.out);
-					} else {
-						dirty.writeCanonicalTo(file);
-					}
+					dirty.writeCanonicalTo(file);
 				}
-			} catch (IOException e) {
-				e.printStackTrace(System.err);
-				throw Errors.asRuntime(e);
-			} finally {
-				System.err.close();
-				System.out.close();
 			}
+		} catch (IOException e) {
+			e.printStackTrace(System.err);
+			throw Errors.asRuntime(e);
+		} finally {
+			System.err.close();
+			System.out.close();
 		}
 	}
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
index 9d5e3f9b14..07cc2cbc85 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
@@ -18,17 +18,14 @@
 import java.io.File;
 import java.io.IOException;
 
-import java.util.List;
-
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
 
 import com.diffplug.spotless.Formatter;
 import com.diffplug.spotless.PaddedCell;
 import com.diffplug.spotless.maven.incremental.UpToDateChecker;
 
-import org.apache.maven.plugins.annotations.Parameter;
-
 /**
  * Performs formatting of all source files according to configured formatters.
  */
@@ -46,8 +43,8 @@ public class SpotlessApplyMojo extends AbstractSpotlessMojo {
 
 	@Override
 	protected void process(Iterable<File> files, Formatter formatter, UpToDateChecker upToDateChecker) throws MojoExecutionException {
-		if(isIdeHook()) {
-			IdeHook.performHook(files, spotlessIdeHook, formatter, getBaseDir(), null, spotlessIdeHookUseStdIn, spotlessIdeHookUseStdOut);
+		if (isIdeHook()) {
+			IdeHook.performHook(files, formatter, spotlessIdeHook, spotlessIdeHookUseStdIn, spotlessIdeHookUseStdOut);
 			return;
 		}
 
@@ -91,13 +88,4 @@ protected void process(Iterable<File> files, Formatter formatter, UpToDateChecke
 	private boolean isIdeHook() {
 		return !(spotlessIdeHook == null || spotlessIdeHook.isEmpty());
 	}
-
-	private List<File> fetchFileFromIdeHook() {
-		File file = new File(spotlessIdeHook);
-		if (!file.isAbsolute()) {
-			throw new PluginException("Argument passed to spotlessIdeHook must be an absolute path");
-		}
-
-		return List.of(file);
-	}
 }

From 39c24abaa543e46f549409f16605052fca68a83f Mon Sep 17 00:00:00 2001
From: Dimitrii Lipiridi <dimitrii.lipiridi@delasport.com>
Date: Thu, 24 Aug 2023 09:52:51 +0300
Subject: [PATCH 1184/2068] feat: Add IDE hook tests

---
 .../diffplug/spotless/maven/IdeHookTest.java  | 85 +++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100644 plugin-maven/src/test/java/com/diffplug/spotless/maven/IdeHookTest.java

diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/IdeHookTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/IdeHookTest.java
new file mode 100644
index 0000000000..3c9a1a17d6
--- /dev/null
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/IdeHookTest.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2016-2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import com.diffplug.spotless.ProcessRunner;
+
+class IdeHookTest extends MavenIntegrationHarness {
+	private String output, error;
+	private File dirty, clean, diverge, outofbounds;
+
+	@BeforeEach
+	void before() throws IOException {
+		writePomWithFormatSteps("<includes>\n" +
+				"                                <include>DIRTY.md</include>\n" +
+				"                                <include>CLEAN.md</include>\n" +
+				"                            </includes>\n" +
+				"                            <replace>\n" +
+				"                                <name>Greetings to Mars</name>\n" +
+				"                                <search>World</search>\n" +
+				"                                <replacement>Mars</replacement>\n" +
+				"                            </replace>");
+
+		dirty = setFile("DIRTY.md").toContent("World");
+		clean = setFile("CLEAN.md").toContent("Mars");
+		outofbounds = setFile("OUTOFBOUNDS.md").toContent("Mars");
+		;
+	}
+
+	private void runWith(String... arguments) throws IOException, InterruptedException {
+		ProcessRunner.Result result = mavenRunner()
+				.withArguments(arguments)
+				.runNoError();
+
+		this.output = result.stdOutUtf8();
+		this.error = result.stdErrUtf8();
+	}
+
+	@Test
+	void dirty() throws IOException, InterruptedException {
+		runWith("spotless:apply", "--quiet", "-DspotlessIdeHook=\"" + dirty.getAbsolutePath() + "\"", "-DspotlessIdeHookUseStdOut=true");
+		Assertions.assertThat(output).isEqualTo("Mars");
+		Assertions.assertThat(error).startsWith("IS DIRTY");
+	}
+
+	@Test
+	void clean() throws IOException, InterruptedException {
+		runWith("spotless:apply", "--quiet", "-DspotlessIdeHook=" + clean.getAbsolutePath(), "-DspotlessIdeHookUseStdOut=true");
+		Assertions.assertThat(output).isEmpty();
+		Assertions.assertThat(error).startsWith("IS CLEAN");
+	}
+
+	@Test
+	void outofbounds() throws IOException, InterruptedException {
+		runWith("spotless:apply", "--quiet", "-DspotlessIdeHook=" + outofbounds.getAbsolutePath(), "-DspotlessIdeHookUseStdOut=true");
+		Assertions.assertThat(output).isEmpty();
+		Assertions.assertThat(error).isEmpty();
+	}
+
+	@Test
+	void notAbsolute() throws IOException, InterruptedException {
+		runWith("spotless:apply", "--quiet", "-DspotlessIdeHook=\"pom.xml\"", "-DspotlessIdeHookUseStdOut=true");
+		Assertions.assertThat(output).isEmpty();
+		Assertions.assertThat(error).contains("Argument passed to spotlessIdeHook must be an absolute path");
+	}
+}

From c6e55bd4fe07fc1668c4d3727bbb83054c15ed08 Mon Sep 17 00:00:00 2001
From: Dimitrii Lipiridi <dimitrii.lipiridi@delasport.com>
Date: Thu, 24 Aug 2023 09:57:31 +0300
Subject: [PATCH 1185/2068] feat: Revert README.md

---
 plugin-maven/README.md | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 956dbf385e..cb770099ac 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -1601,22 +1601,13 @@ By default, `spotless:check` is bound to the `verify` phase.  You might want to
 
 ## Can I apply Spotless to specific files?
 
-There are two options:
-
-### Pattern
 You can target specific files by setting the `spotlessFiles` project property to a comma-separated list of file patterns:
-```
-cmd> mvn spotless:apply -DspotlessFiles="src.main.java.com.example.*, .+Config.*\.java"
-```
-The patterns are matched using `String#matches(String)` against the absolute file path.
 
-### IDE Hook
-You can specify a single file by providing the `spotlessIdeHook` argument, which accepts the absolute path of the file.
 ```
-cmd> mvn spotless:apply -DspotlessIdeHook="C:\my-project\src\main\java\com\example\Application.java"
-
+cmd> mvn spotless:apply -DspotlessFiles=my/file/pattern.java,more/generic/.*-pattern.java
 ```
-This option ignores the ratchetFrom property.
+
+The patterns are matched using `String#matches(String)` against the absolute file path.
 
 <a name="examples"></a>
 

From b3c59f7d4b9e214c3f4c14d9333b816e3a90a34b Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 24 Aug 2023 12:31:36 -0700
Subject: [PATCH 1186/2068] Fix on windows.

---
 .../com/diffplug/gradle/spotless/KotlinExtensionTest.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
index 98e2259be4..1c23728244 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
@@ -15,7 +15,7 @@
  */
 package com.diffplug.gradle.spotless;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.File;
 import java.io.IOException;
@@ -96,13 +96,13 @@ void testWithInvalidEditorConfigFile() throws IOException {
 				"repositories { mavenCentral() }",
 				"spotless {",
 				"    kotlin {",
-				"        ktlint().setEditorConfigPath('" + invalidPath + "')",
+				"        ktlint().setEditorConfigPath('" + invalidPath.replace("\\", "\\\\") + "')",
 				"    }",
 				"}");
 		setFile("src/main/kotlin/Main.kt").toResource("kotlin/ktlint/experimentalEditorConfigOverride.dirty");
 		String buildOutput = gradleRunner().withArguments("spotlessApply").buildAndFail().getOutput();
-		assertTrue(buildOutput.contains("EditorConfig file does not exist: "));
-		assertTrue(buildOutput.contains(invalidPath));
+		assertThat(buildOutput).contains("EditorConfig file does not exist: ");
+		assertThat(buildOutput).contains(invalidPath);
 	}
 
 	@Test

From 62a957e51b723b3572bbe4beef9255e910d9c036 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 24 Aug 2023 12:31:48 -0700
Subject: [PATCH 1187/2068] Categorize as fix rather than new feature.

---
 plugin-gradle/CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 27d60e7270..2a5bd5db46 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -6,12 +6,12 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * Add a `jsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
 * Support GJF own import order. ([#1780](https://github.com/diffplug/spotless/pull/1780))
-* Check if EditorConfig file exist for Ktlint. ([#1788](https://github.com/diffplug/spotless/pull/1788)
 ### Fixed
 * Add support for `prettier` version `3.0.0` and newer. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
 * Fix npm install calls when npm cache is not up-to-date. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))
 * Fix configuration cache failure when using LineEnding.GIT_ATTRIBUTES ([#1644](https://github.com/diffplug/spotless/issues/1644))
 * Fix configuration cache failure when formatting proto files with Buf. ([#1779]https://github.com/diffplug/spotless/pull/1779))
+* Check if EditorConfig file exist for Ktlint. ([#1788](https://github.com/diffplug/spotless/pull/1788)
 ### Changes
 * Bump default `eslint` version to latest `8.31.0` -> `8.45.0` ([#1761](https://github.com/diffplug/spotless/pull/1761))
 * Bump default `prettier` version to latest (v2) `2.8.1` -> `2.8.8`. ([#1760](https://github.com/diffplug/spotless/pull/1760))

From 83aace9d39b7037a430945e152b72580797c2a8a Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Fri, 25 Aug 2023 09:35:35 +0800
Subject: [PATCH 1188/2068] Fix changelog link formats

---
 CHANGES.md               | 4 ++--
 plugin-gradle/CHANGES.md | 8 ++++----
 plugin-maven/CHANGES.md  | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 81af46a526..905a78b8e6 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,8 +15,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Support GJF own import order. ([#1780](https://github.com/diffplug/spotless/pull/1780))
 ### Fixed
 * Use latest versions of popular style guides for `eslint` tests to fix failing `useEslintXoStandardRules` test. ([#1761](https://github.com/diffplug/spotless/pull/1761), [#1756](https://github.com/diffplug/spotless/issues/1756))
-* Add support for `prettier` version `3.0.0` and newer. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
-* Fix npm install calls when npm cache is not up-to-date. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))
+* Add support for `prettier` version `3.0.0` and newer. ([#1760](https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
+* Fix npm install calls when npm cache is not up-to-date. ([#1760](https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))
 ### Changes
 * Bump default `eslint` version to latest `8.31.0` -> `8.45.0` ([#1761](https://github.com/diffplug/spotless/pull/1761))
 * Bump default `prettier` version to latest (v2) `2.8.1` -> `2.8.8`. ([#1760](https://github.com/diffplug/spotless/pull/1760))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 2a5bd5db46..4e7f0d21be 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -7,11 +7,11 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Add a `jsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
 * Support GJF own import order. ([#1780](https://github.com/diffplug/spotless/pull/1780))
 ### Fixed
-* Add support for `prettier` version `3.0.0` and newer. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
-* Fix npm install calls when npm cache is not up-to-date. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))
+* Add support for `prettier` version `3.0.0` and newer. ([#1760](https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
+* Fix npm install calls when npm cache is not up-to-date. ([#1760](https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))
 * Fix configuration cache failure when using LineEnding.GIT_ATTRIBUTES ([#1644](https://github.com/diffplug/spotless/issues/1644))
-* Fix configuration cache failure when formatting proto files with Buf. ([#1779]https://github.com/diffplug/spotless/pull/1779))
-* Check if EditorConfig file exist for Ktlint. ([#1788](https://github.com/diffplug/spotless/pull/1788)
+* Fix configuration cache failure when formatting proto files with Buf. ([#1779](https://github.com/diffplug/spotless/pull/1779))
+* Check if EditorConfig file exist for Ktlint. ([#1788](https://github.com/diffplug/spotless/pull/1788))
 ### Changes
 * Bump default `eslint` version to latest `8.31.0` -> `8.45.0` ([#1761](https://github.com/diffplug/spotless/pull/1761))
 * Bump default `prettier` version to latest (v2) `2.8.1` -> `2.8.8`. ([#1760](https://github.com/diffplug/spotless/pull/1760))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 65a557b14f..d5526dd3c6 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -7,8 +7,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Add a `jsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
 * Support GJF own import order. ([#1780](https://github.com/diffplug/spotless/pull/1780))
 ### Fixed
-* Add support for `prettier` version `3.0.0` and newer. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
-* Fix npm install calls when npm cache is not up-to-date. ([#1760]https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))
+* Add support for `prettier` version `3.0.0` and newer. ([#1760](https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
+* Fix npm install calls when npm cache is not up-to-date. ([#1760](https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))
 ### Changes
 * Bump default `eslint` version to latest `8.31.0` -> `8.45.0` ([#1761](https://github.com/diffplug/spotless/pull/1761))
 * Bump default `prettier` version to latest (v2) `2.8.1` -> `2.8.8`. ([#1760](https://github.com/diffplug/spotless/pull/1760))

From c23f89b5f01c2f8366ef127665351bc83bf10bd7 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 28 Aug 2023 23:16:54 -0700
Subject: [PATCH 1189/2068] Update changelogs.

---
 CHANGES.md               | 2 +-
 plugin-gradle/CHANGES.md | 2 +-
 plugin-maven/CHANGES.md  | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index fd8bbb4875..12b8609f82 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -20,7 +20,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changes
 * Bump default `eslint` version to latest `8.31.0` -> `8.45.0` ([#1761](https://github.com/diffplug/spotless/pull/1761))
 * Bump default `prettier` version to latest (v2) `2.8.1` -> `2.8.8`. ([#1760](https://github.com/diffplug/spotless/pull/1760))
-* Add support for Eclipse 4.28 to the Groovy formatter. ([#1775](https://github.com/diffplug/spotless/pull/1775))
+* Bump default `greclipse` version to latest `4.27` -> `4.28`. ([#1775](https://github.com/diffplug/spotless/pull/1775))
 
 ## [2.40.0] - 2023-07-17
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index a04bf7987b..4d9832ebf5 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -15,7 +15,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changes
 * Bump default `eslint` version to latest `8.31.0` -> `8.45.0` ([#1761](https://github.com/diffplug/spotless/pull/1761))
 * Bump default `prettier` version to latest (v2) `2.8.1` -> `2.8.8`. ([#1760](https://github.com/diffplug/spotless/pull/1760))
-* Add support for Eclipse 4.28 to the Groovy formatter. ([#1775](https://github.com/diffplug/spotless/pull/1775))
+* Bump default `greclipse` version to latest `4.27` -> `4.28`. ([#1775](https://github.com/diffplug/spotless/pull/1775))
 
 ## [6.20.0] - 2023-07-17
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 5da66951fd..8278e16792 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,12 +5,14 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Add a `jsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
+* Support GJF own import order. ([#1780](https://github.com/diffplug/spotless/pull/1780))
 ### Fixed
 * Add support for `prettier` version `3.0.0` and newer. ([#1760](https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
 * Fix npm install calls when npm cache is not up-to-date. ([#1760](https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))
 ### Changes
 * Bump default `eslint` version to latest `8.31.0` -> `8.45.0` ([#1761](https://github.com/diffplug/spotless/pull/1761))
 * Bump default `prettier` version to latest (v2) `2.8.1` -> `2.8.8`. ([#1760](https://github.com/diffplug/spotless/pull/1760))
+* Bump default `greclipse` version to latest `4.27` -> `4.28`. ([#1775](https://github.com/diffplug/spotless/pull/1775))
 
 ## [2.38.0] - 2023-07-17
 ### Added
@@ -22,7 +24,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktlint` version to latest `0.49.1` -> `0.50.0`. ([#1741](https://github.com/diffplug/spotless/issues/1741))
   * Dropped support for `ktlint 0.47.x` following our policy of supporting two breaking changes at a time.
   * Dropped support for deprecated `useExperimental` parameter in favor of the `ktlint_experimental` property.
-* Support GJF own import order. ([#1780](https://github.com/diffplug/spotless/pull/1780))
 
 ## [2.37.0] - 2023-05-24
 ### Added

From 7e574c6159954115ced357f0e5e1f0adcf9e3e24 Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az621-295.hgz2n3xr2b2uteg1gmg5rpevog.jx.internal.cloudapp.net>
Date: Tue, 29 Aug 2023 06:44:20 +0000
Subject: [PATCH 1190/2068] Published lib/2.41.0

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 12b8609f82..1d78e8d932 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.41.0] - 2023-08-29
 ### Added
 * Add a `jsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
 * Support GJF own import order. ([#1780](https://github.com/diffplug/spotless/pull/1780))

From f19cc96927fb50364cbc384ce5e8e2832f0f9ff8 Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az621-295.hgz2n3xr2b2uteg1gmg5rpevog.jx.internal.cloudapp.net>
Date: Tue, 29 Aug 2023 06:47:16 +0000
Subject: [PATCH 1191/2068] Published gradle/6.21.0

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 54 ++++++++++++++++++++--------------------
 2 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 4d9832ebf5..eab7e32b2d 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [6.21.0] - 2023-08-29
 ### Added
 * Add a `jsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
 * Support GJF own import order. ([#1780](https://github.com/diffplug/spotless/pull/1780))
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index dbc61207e5..944c07bb6e 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -14,9 +14,9 @@ output = [
   ].join('\n');
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
-[![Changelog](https://img.shields.io/badge/changelog-6.20.0-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-6.21.0-blue.svg)](CHANGES.md)
 [![Maven central](https://img.shields.io/badge/mavencentral-here-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/index.html)
 
 [![VS Code plugin](https://img.shields.io/badge/IDE-VS_Code-blueviolet.svg)](https://marketplace.visualstudio.com/items?itemName=richardwillis.vscode-spotless-gradle)
 [![IntelliJ plugin](https://img.shields.io/badge/IDE-IntelliJ-blueviolet.svg)](https://plugins.jetbrains.com/plugin/18321-spotless-gradle)
@@ -127,10 +127,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -143,7 +143,7 @@ Spotless requires JRE 11+ and Gradle 6.1.1 or newer.
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -300,8 +300,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -351,8 +351,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -422,7 +422,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -454,7 +454,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -486,7 +486,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -522,7 +522,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ### buf
 
-`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
+`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
 
 **WARNING** this step **must** be the first step in the chain, steps before it will be ignored. Thumbs up [this issue](https://github.com/bufbuild/buf/issues/1035) for a resolution, see [here](https://github.com/diffplug/spotless/pull/1208#discussion_r1264439669) for more details on the problem.
 
@@ -554,7 +554,7 @@ buf {
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -575,7 +575,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -600,7 +600,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -640,7 +640,7 @@ sql.formatter.indent.size=4
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -734,7 +734,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## Javascript
 
-- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
+- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
 
 ```gradle
 spotless {
@@ -799,7 +799,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -919,7 +919,7 @@ spotless {
 
 ## YAML
 
-- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
+- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
 
 ```gradle
 spotless {
@@ -951,7 +951,7 @@ spotless {
 
 ## Gherkin
 
-- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
+- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
 
 ```gradle
 spotless {
@@ -1339,7 +1339,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -1419,9 +1419,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -1454,11 +1454,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.20.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From c360e81278d909cbe86630df29cfb9d253f38e41 Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az621-295.hgz2n3xr2b2uteg1gmg5rpevog.jx.internal.cloudapp.net>
Date: Tue, 29 Aug 2023 06:49:30 +0000
Subject: [PATCH 1192/2068] Published maven/2.39.0

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 8278e16792..f932806fcc 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.39.0] - 2023-08-29
 ### Added
 * Add a `jsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
 * Support GJF own import order. ([#1780](https://github.com/diffplug/spotless/pull/1780))
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index cb770099ac..74872ef61f 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -8,8 +8,8 @@ output = [
   ].join('\n');
 -->
 [![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Changelog](https://img.shields.io/badge/changelog-2.38.0-blue.svg)](CHANGES.md)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.38.0/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.39.0-blue.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.39.0/index.html)
 <!---freshmark /shields -->
 
 <!---freshmark javadoc

From 1bb669936b65f499b1c6dc05b058843aa45942dc Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 29 Aug 2023 11:48:51 +0000
Subject: [PATCH 1193/2068] Update dependency dev.equo.ide:solstice to v1.7.3

---
 lib-extra/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index 1158ca0893..4849e0ae35 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -7,7 +7,7 @@ version = rootProject.spotlessChangelog.versionNext
 apply from: rootProject.file('gradle/java-setup.gradle')
 apply from: rootProject.file('gradle/java-publish.gradle')
 
-String VER_SOLSTICE = '1.3.1'
+String VER_SOLSTICE = '1.7.3'
 dependencies {
 	api project(':lib')
 	// misc useful utilities

From 0a14296ce036326c4c606717f637643e065fc784 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 29 Aug 2023 11:50:15 +0000
Subject: [PATCH 1194/2068] Update plugin com.diffplug.spotless to v6.21.0

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index b6d227dab8..78da4efc5f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-	id 'com.diffplug.spotless' version '6.18.0' apply false
+	id 'com.diffplug.spotless' version '6.21.0' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
 	id 'com.gradle.plugin-publish' version '1.2.0' apply false
 	// https://github.com/gradle-nexus/publish-plugin/releases

From b70b6ee67ce7772be6729bce8d51143bdceb8c54 Mon Sep 17 00:00:00 2001
From: mokamoto12 <mokamoto1208@gmail.com>
Date: Wed, 30 Aug 2023 14:05:02 +0900
Subject: [PATCH 1195/2068] Support google-java-format's
 skip-javadoc-formatting option

Add configuration option to switch the option of the googleJavaFormat step.
Default to format javadoc for backwards compatibility.

Fixes https://github.com/diffplug/spotless/issues/1287
---
 .../java/GoogleJavaFormatFormatterFunc.java   | 10 ++++---
 .../spotless/java/GoogleJavaFormatStep.java   | 21 ++++++++++-----
 .../gradle/spotless/JavaExtension.java        | 14 +++++++++-
 .../GoogleJavaFormatIntegrationTest.java      | 26 +++++++++++++++++++
 .../spotless/maven/java/GoogleJavaFormat.java |  6 ++++-
 .../maven/java/GoogleJavaFormatTest.java      | 11 ++++++++
 .../googlejavaformat/JavaCodeFormatted.test   |  1 +
 .../googlejavaformat/JavaCodeFormatted18.test |  1 +
 .../JavaCodeFormattedAOSP.test                |  1 +
 .../JavaCodeFormattedReflowLongStrings.test   |  1 +
 ...avaCodeFormattedSkipJavadocFormatting.test | 14 ++++++++++
 .../googlejavaformat/JavaCodeUnformatted.test |  3 +++
 .../java/GoogleJavaFormatStepTest.java        | 10 +++++++
 13 files changed, 106 insertions(+), 13 deletions(-)
 create mode 100644 testlib/src/main/resources/java/googlejavaformat/JavaCodeFormattedSkipJavadocFormatting.test

diff --git a/lib/src/googleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatFormatterFunc.java b/lib/src/googleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatFormatterFunc.java
index 8c6aa42575..d13f8d9d40 100644
--- a/lib/src/googleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatFormatterFunc.java
+++ b/lib/src/googleJavaFormat/java/com/diffplug/spotless/glue/java/GoogleJavaFormatFormatterFunc.java
@@ -46,15 +46,17 @@ public class GoogleJavaFormatFormatterFunc implements FormatterFunc {
 
 	private final boolean reorderImports;
 
-	public GoogleJavaFormatFormatterFunc(@Nonnull String version, @Nonnull String style, boolean reflowStrings, boolean reorderImports) {
+	public GoogleJavaFormatFormatterFunc(@Nonnull String version, @Nonnull String style, boolean reflowStrings, boolean reorderImports, boolean formatJavadoc) {
 		this.version = Objects.requireNonNull(version);
 		this.formatterStyle = Style.valueOf(Objects.requireNonNull(style));
 		this.reflowStrings = reflowStrings;
 		this.reorderImports = reorderImports;
 
-		this.formatter = new Formatter(JavaFormatterOptions.builder()
-				.style(formatterStyle)
-				.build());
+		JavaFormatterOptions.Builder builder = JavaFormatterOptions.builder().style(formatterStyle);
+		if (!formatJavadoc) {
+			builder = builder.formatJavadoc(false);
+		}
+		this.formatter = new Formatter(builder.build());
 	}
 
 	@Override
diff --git a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
index a0f796af4d..b2424cbe2a 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
@@ -33,6 +33,7 @@ private GoogleJavaFormatStep() {}
 	private static final String DEFAULT_STYLE = "GOOGLE";
 	private static final boolean DEFAULT_REFLOW_LONG_STRINGS = false;
 	private static final boolean DEFAULT_REORDER_IMPORTS = false;
+	private static final boolean DEFAULT_FORMAT_JAVADOC = true;
 	static final String NAME = "google-java-format";
 	static final String MAVEN_COORDINATE = "com.google.googlejavaformat:google-java-format";
 
@@ -57,11 +58,11 @@ public static FormatterStep create(String version, String style, Provisioner pro
 	}
 
 	public static FormatterStep create(String groupArtifact, String version, String style, Provisioner provisioner, boolean reflowLongStrings) {
-		return create(groupArtifact, version, style, provisioner, reflowLongStrings, false);
+		return create(groupArtifact, version, style, provisioner, reflowLongStrings, false, DEFAULT_FORMAT_JAVADOC);
 	}
 
 	/** Creates a step which formats everything - groupArtifact, code, import order, and unused imports - and optionally reflows long strings. */
-	public static FormatterStep create(String groupArtifact, String version, String style, Provisioner provisioner, boolean reflowLongStrings, boolean reorderImports) {
+	public static FormatterStep create(String groupArtifact, String version, String style, Provisioner provisioner, boolean reflowLongStrings, boolean reorderImports, boolean formatJavadoc) {
 		Objects.requireNonNull(groupArtifact, "groupArtifact");
 		if (groupArtifact.chars().filter(ch -> ch == ':').count() != 1) {
 			throw new IllegalArgumentException("groupArtifact must be in the form 'groupId:artifactId'");
@@ -70,7 +71,7 @@ public static FormatterStep create(String groupArtifact, String version, String
 		Objects.requireNonNull(style, "style");
 		Objects.requireNonNull(provisioner, "provisioner");
 		return FormatterStep.createLazy(NAME,
-				() -> new State(NAME, groupArtifact, version, style, provisioner, reflowLongStrings, reorderImports),
+				() -> new State(NAME, groupArtifact, version, style, provisioner, reflowLongStrings, reorderImports, formatJavadoc),
 				State::createFormat);
 	}
 
@@ -101,6 +102,10 @@ public static boolean defaultReorderImports() {
 		return DEFAULT_REORDER_IMPORTS;
 	}
 
+	public static boolean defaultFormatJavadoc() {
+		return DEFAULT_FORMAT_JAVADOC;
+	}
+
 	static final class State implements Serializable {
 		private static final long serialVersionUID = 1L;
 
@@ -111,6 +116,7 @@ static final class State implements Serializable {
 		final String style;
 		final boolean reflowLongStrings;
 		final boolean reorderImports;
+		final boolean formatJavadoc;
 
 		State(String stepName, String version, Provisioner provisioner) throws Exception {
 			this(stepName, version, DEFAULT_STYLE, provisioner);
@@ -121,10 +127,10 @@ static final class State implements Serializable {
 		}
 
 		State(String stepName, String version, String style, Provisioner provisioner, boolean reflowLongStrings) throws Exception {
-			this(stepName, MAVEN_COORDINATE, version, style, provisioner, reflowLongStrings, DEFAULT_REORDER_IMPORTS);
+			this(stepName, MAVEN_COORDINATE, version, style, provisioner, reflowLongStrings, DEFAULT_REORDER_IMPORTS, DEFAULT_FORMAT_JAVADOC);
 		}
 
-		State(String stepName, String groupArtifact, String version, String style, Provisioner provisioner, boolean reflowLongStrings, boolean reorderImports) throws Exception {
+		State(String stepName, String groupArtifact, String version, String style, Provisioner provisioner, boolean reflowLongStrings, boolean reorderImports, boolean formatJavadoc) throws Exception {
 			JVM_SUPPORT.assertFormatterSupported(version);
 			ModuleHelper.doOpenInternalPackagesIfRequired();
 			this.jarState = JarState.from(groupArtifact + ":" + version, provisioner);
@@ -133,13 +139,14 @@ static final class State implements Serializable {
 			this.style = style;
 			this.reflowLongStrings = reflowLongStrings;
 			this.reorderImports = reorderImports;
+			this.formatJavadoc = formatJavadoc;
 		}
 
 		FormatterFunc createFormat() throws Exception {
 			final ClassLoader classLoader = jarState.getClassLoader();
 			Class<?> formatterFunc = classLoader.loadClass("com.diffplug.spotless.glue.java.GoogleJavaFormatFormatterFunc");
-			Constructor<?> constructor = formatterFunc.getConstructor(String.class, String.class, boolean.class, boolean.class);
-			FormatterFunc googleJavaFormatFormatterFunc = (FormatterFunc) constructor.newInstance(version, style, reflowLongStrings, reorderImports);
+			Constructor<?> constructor = formatterFunc.getConstructor(String.class, String.class, boolean.class, boolean.class, boolean.class);
+			FormatterFunc googleJavaFormatFormatterFunc = (FormatterFunc) constructor.newInstance(version, style, reflowLongStrings, reorderImports, formatJavadoc);
 
 			return JVM_SUPPORT.suggestLaterVersionOnError(version, googleJavaFormatFormatterFunc);
 		}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
index fcd1a0d105..c576eb7da8 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
@@ -174,6 +174,7 @@ public class GoogleJavaFormatConfig {
 		String style;
 		boolean reflowLongStrings;
 		boolean reorderImports;
+		boolean formatJavadoc = true;
 
 		GoogleJavaFormatConfig(String version) {
 			this.version = Objects.requireNonNull(version);
@@ -213,6 +214,16 @@ public GoogleJavaFormatConfig reorderImports(boolean reorderImports) {
 			return this;
 		}
 
+		public GoogleJavaFormatConfig skipJavadocFormatting() {
+			return formatJavadoc(false);
+		}
+
+		public GoogleJavaFormatConfig formatJavadoc(boolean formatJavadoc) {
+			this.formatJavadoc = formatJavadoc;
+			replaceStep(createStep());
+			return this;
+		}
+
 		private FormatterStep createStep() {
 			return GoogleJavaFormatStep.create(
 					groupArtifact,
@@ -220,7 +231,8 @@ private FormatterStep createStep() {
 					style,
 					provisioner(),
 					reflowLongStrings,
-					reorderImports);
+					reorderImports,
+					formatJavadoc);
 		}
 	}
 
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GoogleJavaFormatIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GoogleJavaFormatIntegrationTest.java
index 5c7fe54f59..42d9f4314a 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GoogleJavaFormatIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GoogleJavaFormatIntegrationTest.java
@@ -45,4 +45,30 @@ void integration() throws IOException {
 				"googleJavaFormat()");
 		checkRunsThenUpToDate();
 	}
+
+	@Test
+	void integrationWithSkipJavadocFormatting() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"",
+				"spotless {",
+				"    java {",
+				"        target file('test.java')",
+				"        googleJavaFormat('1.12.0').skipJavadocFormatting()",
+				"    }",
+				"}");
+
+		setFile("test.java").toResource("java/googlejavaformat/JavaCodeUnformatted.test");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("test.java").sameAsResource("java/googlejavaformat/JavaCodeFormattedSkipJavadocFormatting.test");
+
+		checkRunsThenUpToDate();
+		replace("build.gradle",
+				"googleJavaFormat('1.12.0')",
+				"googleJavaFormat()");
+		checkRunsThenUpToDate();
+	}
 }
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/GoogleJavaFormat.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/GoogleJavaFormat.java
index 98296beb5f..d0a2b24954 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/GoogleJavaFormat.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/GoogleJavaFormat.java
@@ -38,6 +38,9 @@ public class GoogleJavaFormat implements FormatterStepFactory {
 	@Parameter
 	private Boolean reorderImports;
 
+	@Parameter
+	private Boolean formatJavadoc;
+
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig config) {
 		String groupArtifact = this.groupArtifact != null ? this.groupArtifact : GoogleJavaFormatStep.defaultGroupArtifact();
@@ -45,6 +48,7 @@ public FormatterStep newFormatterStep(FormatterStepConfig config) {
 		String style = this.style != null ? this.style : GoogleJavaFormatStep.defaultStyle();
 		boolean reflowLongStrings = this.reflowLongStrings != null ? this.reflowLongStrings : GoogleJavaFormatStep.defaultReflowLongStrings();
 		boolean reorderImports = this.reorderImports != null ? this.reorderImports : GoogleJavaFormatStep.defaultReorderImports();
-		return GoogleJavaFormatStep.create(groupArtifact, version, style, config.getProvisioner(), reflowLongStrings, reorderImports);
+		boolean formatJavadoc = this.formatJavadoc != null ? this.formatJavadoc : GoogleJavaFormatStep.defaultFormatJavadoc();
+		return GoogleJavaFormatStep.create(groupArtifact, version, style, config.getProvisioner(), reflowLongStrings, reorderImports, formatJavadoc);
 	}
 }
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/GoogleJavaFormatTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/GoogleJavaFormatTest.java
index 407d089999..76b2c40fd3 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/GoogleJavaFormatTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/GoogleJavaFormatTest.java
@@ -52,6 +52,17 @@ void specificVersionReflowLongStrings() throws Exception {
 		runTest("java/googlejavaformat/JavaCodeFormattedReflowLongStrings.test");
 	}
 
+	@Test
+	void specificVersionSkipJavadocFormatting() throws Exception {
+		writePomWithJavaSteps(
+				"<googleJavaFormat>",
+				"  <version>1.12.0</version>",
+				"  <formatJavadoc>false</formatJavadoc>",
+				"</googleJavaFormat>");
+
+		runTest("java/googlejavaformat/JavaCodeFormattedSkipJavadocFormatting.test");
+	}
+
 	private void runTest(String targetResource) throws Exception {
 		String path = "src/main/java/test.java";
 		setFile(path).toResource("java/googlejavaformat/JavaCodeUnformatted.test");
diff --git a/testlib/src/main/resources/java/googlejavaformat/JavaCodeFormatted.test b/testlib/src/main/resources/java/googlejavaformat/JavaCodeFormatted.test
index 7a83a0a12c..a0aeb21d0e 100644
--- a/testlib/src/main/resources/java/googlejavaformat/JavaCodeFormatted.test
+++ b/testlib/src/main/resources/java/googlejavaformat/JavaCodeFormatted.test
@@ -2,6 +2,7 @@ import mylib.UsedA;
 import mylib.UsedB;
 
 public class Java {
+  /** Some javadoc. */
   public static void main(String[] args) {
     System.out.println(
         "A very very very very very very very very very very very very very very very very very very very very very long string that goes beyond the 100-character line length.");
diff --git a/testlib/src/main/resources/java/googlejavaformat/JavaCodeFormatted18.test b/testlib/src/main/resources/java/googlejavaformat/JavaCodeFormatted18.test
index 7a83a0a12c..a0aeb21d0e 100644
--- a/testlib/src/main/resources/java/googlejavaformat/JavaCodeFormatted18.test
+++ b/testlib/src/main/resources/java/googlejavaformat/JavaCodeFormatted18.test
@@ -2,6 +2,7 @@ import mylib.UsedA;
 import mylib.UsedB;
 
 public class Java {
+  /** Some javadoc. */
   public static void main(String[] args) {
     System.out.println(
         "A very very very very very very very very very very very very very very very very very very very very very long string that goes beyond the 100-character line length.");
diff --git a/testlib/src/main/resources/java/googlejavaformat/JavaCodeFormattedAOSP.test b/testlib/src/main/resources/java/googlejavaformat/JavaCodeFormattedAOSP.test
index 25ccbc25f5..6b65d1f897 100644
--- a/testlib/src/main/resources/java/googlejavaformat/JavaCodeFormattedAOSP.test
+++ b/testlib/src/main/resources/java/googlejavaformat/JavaCodeFormattedAOSP.test
@@ -2,6 +2,7 @@ import mylib.UsedA;
 import mylib.UsedB;
 
 public class Java {
+    /** Some javadoc. */
     public static void main(String[] args) {
         System.out.println(
                 "A very very very very very very very very very very very very very very very very very very very very very long string that goes beyond the 100-character line length.");
diff --git a/testlib/src/main/resources/java/googlejavaformat/JavaCodeFormattedReflowLongStrings.test b/testlib/src/main/resources/java/googlejavaformat/JavaCodeFormattedReflowLongStrings.test
index 24e91a2ac8..8751e7e2d9 100644
--- a/testlib/src/main/resources/java/googlejavaformat/JavaCodeFormattedReflowLongStrings.test
+++ b/testlib/src/main/resources/java/googlejavaformat/JavaCodeFormattedReflowLongStrings.test
@@ -2,6 +2,7 @@ import mylib.UsedA;
 import mylib.UsedB;
 
 public class Java {
+  /** Some javadoc. */
   public static void main(String[] args) {
     System.out.println(
         "A very very very very very very very very very very very very very very very very very"
diff --git a/testlib/src/main/resources/java/googlejavaformat/JavaCodeFormattedSkipJavadocFormatting.test b/testlib/src/main/resources/java/googlejavaformat/JavaCodeFormattedSkipJavadocFormatting.test
new file mode 100644
index 0000000000..b3d1793729
--- /dev/null
+++ b/testlib/src/main/resources/java/googlejavaformat/JavaCodeFormattedSkipJavadocFormatting.test
@@ -0,0 +1,14 @@
+import mylib.UsedA;
+import mylib.UsedB;
+
+public class Java {
+  /**
+   * Some javadoc.
+   */
+  public static void main(String[] args) {
+    System.out.println(
+        "A very very very very very very very very very very very very very very very very very very very very very long string that goes beyond the 100-character line length.");
+    UsedB.someMethod();
+    UsedA.someMethod();
+  }
+}
diff --git a/testlib/src/main/resources/java/googlejavaformat/JavaCodeUnformatted.test b/testlib/src/main/resources/java/googlejavaformat/JavaCodeUnformatted.test
index 18f2aca0e2..8e66776be8 100644
--- a/testlib/src/main/resources/java/googlejavaformat/JavaCodeUnformatted.test
+++ b/testlib/src/main/resources/java/googlejavaformat/JavaCodeUnformatted.test
@@ -4,6 +4,9 @@ import mylib.UsedB;
 import mylib.UsedA;
 
 public class Java {
+/**
+ * Some javadoc.
+ */
 public static void main(String[] args) {
 System.out.println("A very very very very very very very very very very very very very very very very very very very very very long string that goes beyond the 100-character line length.");
 UsedB.someMethod();
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java
index 694e390727..df08c483df 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java
@@ -99,6 +99,16 @@ void behaviorWithReflowLongStrings() throws Exception {
 		}
 	}
 
+	@Test
+	void behaviorWithSkipFormatJavadoc() throws Exception {
+		try (StepHarness step = StepHarness.forStep(GoogleJavaFormatStep.create(GoogleJavaFormatStep.defaultGroupArtifact(), GoogleJavaFormatStep.defaultVersion(), GoogleJavaFormatStep.defaultStyle(), TestProvisioner.mavenCentral(), GoogleJavaFormatStep.defaultReflowLongStrings(), GoogleJavaFormatStep.defaultReorderImports(), false))) {
+			step.testResource("java/googlejavaformat/JavaCodeUnformatted.test", "java/googlejavaformat/JavaCodeFormattedSkipJavadocFormatting.test")
+					.testResource("java/googlejavaformat/JavaCodeWithLicenseUnformatted.test", "java/googlejavaformat/JavaCodeWithLicenseFormatted.test")
+					.testResource("java/googlejavaformat/JavaCodeWithLicensePackageUnformatted.test", "java/googlejavaformat/JavaCodeWithLicensePackageFormatted.test")
+					.testResource("java/googlejavaformat/JavaCodeWithPackageUnformatted.test", "java/googlejavaformat/JavaCodeWithPackageFormatted.test");
+		}
+	}
+
 	@Test
 	void behaviorWithCustomGroupArtifact() throws Exception {
 		FormatterStep step = GoogleJavaFormatStep.create(GoogleJavaFormatStep.defaultGroupArtifact(), "1.10.0", GoogleJavaFormatStep.defaultStyle(), TestProvisioner.mavenCentral(), false);

From a045b46c617418db780b719d70450bce3a817393 Mon Sep 17 00:00:00 2001
From: mokamoto12 <mokamoto1208@gmail.com>
Date: Wed, 30 Aug 2023 14:22:51 +0900
Subject: [PATCH 1196/2068] Update CHANGES.md

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 1 +
 plugin-maven/CHANGES.md  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 12b8609f82..caa8398cc5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,6 +13,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * Add a `jsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
 * Support GJF own import order. ([#1780](https://github.com/diffplug/spotless/pull/1780))
+* Added support for `google-java-format`'s `skip-javadoc-formatting` option ([#1793](https://github.com/diffplug/spotless/pull/1793))
 ### Fixed
 * Use latest versions of popular style guides for `eslint` tests to fix failing `useEslintXoStandardRules` test. ([#1761](https://github.com/diffplug/spotless/pull/1761), [#1756](https://github.com/diffplug/spotless/issues/1756))
 * Add support for `prettier` version `3.0.0` and newer. ([#1760](https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 4d9832ebf5..8c08195359 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -6,6 +6,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * Add a `jsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
 * Support GJF own import order. ([#1780](https://github.com/diffplug/spotless/pull/1780))
+* Added support for `google-java-format`'s `skip-javadoc-formatting` option ([#1793](https://github.com/diffplug/spotless/pull/1793))
 ### Fixed
 * Add support for `prettier` version `3.0.0` and newer. ([#1760](https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
 * Fix npm install calls when npm cache is not up-to-date. ([#1760](https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 8278e16792..354c287b34 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -6,6 +6,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * Add a `jsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
 * Support GJF own import order. ([#1780](https://github.com/diffplug/spotless/pull/1780))
+* Added support for `google-java-format`'s `skip-javadoc-formatting` option ([#1793](https://github.com/diffplug/spotless/pull/1793))
 ### Fixed
 * Add support for `prettier` version `3.0.0` and newer. ([#1760](https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
 * Fix npm install calls when npm cache is not up-to-date. ([#1760](https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))

From d74264b425272a8fb037f3ae2cbc137f0a339c31 Mon Sep 17 00:00:00 2001
From: mokamoto12 <mokamoto1208@gmail.com>
Date: Wed, 30 Aug 2023 14:52:20 +0900
Subject: [PATCH 1197/2068] Update README.md

---
 plugin-gradle/README.md | 4 ++--
 plugin-maven/README.md  | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index dbc61207e5..be3df8be98 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -115,7 +115,7 @@ spotless {
     // don't need to set target, it is inferred from java
 
     // apply a specific flavor of google-java-format
-    googleJavaFormat('1.8').aosp().reflowLongStrings()
+    googleJavaFormat('1.8').aosp().reflowLongStrings().skipJavadocFormatting()
     // fix formatting of type annotations
     formatAnnotations()
     // make sure every file has the following copyright header.
@@ -206,7 +206,7 @@ spotless {
     // optional: you can specify a specific version (>= 1.8) and/or switch to AOSP style
     //   and/or reflow long strings
     //   and/or use custom group artifact (you probably don't need this)
-    googleJavaFormat('1.8').aosp().reflowLongStrings().reorderImports(false).groupArtifact('com.google.googlejavaformat:google-java-format')
+    googleJavaFormat('1.8').aosp().reflowLongStrings().formatJavadoc(false).reorderImports(false).groupArtifact('com.google.googlejavaformat:google-java-format')
 ```
 
 ### palantir-java-format
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index cb770099ac..097bfe9eb5 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -109,6 +109,7 @@ To use it in your pom, just [add the Spotless dependency](https://search.maven.o
         <version>1.8</version>
         <style>AOSP</style>
         <reflowLongStrings>true</reflowLongStrings>
+        <formatJavadoc>false</formatJavadoc>
       </googleJavaFormat>
 
       <!-- make sure every file has the following copyright header.
@@ -233,6 +234,7 @@ any other maven phase (i.e. compile) then it can be configured as below;
   <version>1.8</version>                      <!-- optional, 1.8 is minimum supported version -->
   <style>GOOGLE</style>                       <!-- or AOSP (optional) -->
   <reflowLongStrings>true</reflowLongStrings> <!-- optional -->
+  <formatJavadoc>false</formatJavadoc>        <!-- optional -->
   <!-- optional: custom group artifact (you probably don't need this) -->
   <groupArtifact>com.google.googlejavaformat:google-java-format</groupArtifact>
 </googleJavaFormat>

From 493a3b6097773167751c711d8efaade9651a4bc9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 13:52:03 +0000
Subject: [PATCH 1198/2068] Update plugin com.gradle.plugin-publish to v1.2.1

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 57c670b977..a24c6d24d5 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -8,7 +8,7 @@ pluginManagement {
 plugins {
 	id 'com.diffplug.spotless' version '6.18.0' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
-	id 'com.gradle.plugin-publish' version '1.2.0' apply false
+	id 'com.gradle.plugin-publish' version '1.2.1' apply false
 	// https://github.com/gradle-nexus/publish-plugin/releases
 	id 'io.github.gradle-nexus.publish-plugin' version '1.3.0' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases

From ef8829e4d13d7f335d5178209ca85410376432ce Mon Sep 17 00:00:00 2001
From: samypr100 <3933065+samypr100@users.noreply.github.com>
Date: Sat, 2 Sep 2023 15:32:54 -0400
Subject: [PATCH 1199/2068] feat: add flexmark gradle support

---
 CHANGES.md                                    |  3 +
 README.md                                     |  4 +-
 .../spotless/markdown/FlexmarkStep.java       |  2 +-
 plugin-gradle/CHANGES.md                      |  3 +
 plugin-gradle/README.md                       | 20 +++++
 .../gradle/spotless/FlexmarkExtension.java    | 74 +++++++++++++++++++
 .../gradle/spotless/SpotlessExtension.java    |  6 ++
 .../spotless/FlexmarkExtensionTest.java       | 41 ++++++++++
 8 files changed, 150 insertions(+), 3 deletions(-)
 create mode 100644 plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java
 create mode 100644 plugin-gradle/src/test/java/com/diffplug/gradle/spotless/FlexmarkExtensionTest.java

diff --git a/CHANGES.md b/CHANGES.md
index 1d78e8d932..8150fefcbb 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 `flexmark` version to latest `0.64.0` -> `0.64.6`.
+
 ## [2.41.0] - 2023-08-29
 ### Added
 * Add a `jsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
diff --git a/README.md b/README.md
index cd1e736014..5c3221b1b4 100644
--- a/README.md
+++ b/README.md
@@ -94,7 +94,7 @@ lib('kotlin.KtLintStep')                         +'{{yes}}       | {{yes}}
 lib('kotlin.KtfmtStep')                          +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('kotlin.DiktatStep')                         +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('markdown.FreshMarkStep')                    +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
-lib('markdown.FlexmarkStep')                     +'{{no}}        | {{yes}}      | {{no}}       | {{no}}  |',
+lib('markdown.FlexmarkStep')                     +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('npm.EslintFormatterStep')                   +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('npm.PrettierFormatterStep')                 +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('npm.TsFmtFormatterStep')                    +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
@@ -146,7 +146,7 @@ lib('yaml.JacksonYamlStep')                      +'{{yes}}       | {{yes}}
 | [`kotlin.KtfmtStep`](lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`kotlin.DiktatStep`](lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`markdown.FreshMarkStep`](lib/src/main/java/com/diffplug/spotless/markdown/FreshMarkStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
-| [`markdown.FlexmarkStep`](lib/src/main/java/com/diffplug/spotless/markdown/FlexmarkStep.java) | :white_large_square:        | :+1:      | :white_large_square:       | :white_large_square:  |
+| [`markdown.FlexmarkStep`](lib/src/main/java/com/diffplug/spotless/markdown/FlexmarkStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`npm.EslintFormatterStep`](lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`npm.PrettierFormatterStep`](lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`npm.TsFmtFormatterStep`](lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
diff --git a/lib/src/main/java/com/diffplug/spotless/markdown/FlexmarkStep.java b/lib/src/main/java/com/diffplug/spotless/markdown/FlexmarkStep.java
index 263931693e..b4159830e7 100644
--- a/lib/src/main/java/com/diffplug/spotless/markdown/FlexmarkStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/markdown/FlexmarkStep.java
@@ -29,7 +29,7 @@ public class FlexmarkStep {
 	// prevent direct instantiation
 	private FlexmarkStep() {}
 
-	private static final String DEFAULT_VERSION = "0.64.0";
+	private static final String DEFAULT_VERSION = "0.64.6";
 	private static final String NAME = "flexmark-java";
 	private static final String MAVEN_COORDINATE = "com.vladsch.flexmark:flexmark-all:";
 
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index eab7e32b2d..791b27dafe 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]
 
+### Added
+* Support `flexmark` in gradle. Previously only Maven was supported.
+
 ## [6.21.0] - 2023-08-29
 ### Added
 * Add a `jsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 944c07bb6e..367634e63e 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -62,6 +62,7 @@ Spotless supports all of Gradle's built-in performance features (incremental bui
   - [Protobuf](#protobuf) ([buf](#buf), [clang-format](#clang-format))
   - [Python](#python) ([black](#black))
   - [FreshMark](#freshmark) aka markdown
+  - [FlexMark](#flexmark) aka markdown
   - [Antlr4](#antlr4) ([antlr4formatter](#antlr4formatter))
   - [SQL](#sql) ([dbeaver](#dbeaver), [prettier](#prettier))
   - [Typescript](#typescript) ([tsfmt](#tsfmt), [prettier](#prettier), [ESLint](#eslint-typescript), [Rome](#rome))
@@ -573,6 +574,25 @@ spotless {
 }
 ```
 
+## Flexmark
+
+`com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java)
+
+[homepage](https://github.com/vsch/flexmark-java). [code](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/markdown/Flexmark.java). Flexmark is a flexible Commonmark/Markdown parser that can be used to format Markdown files. It supports different [flavors of Markdown](https://github.com/vsch/flexmark-java#markdown-processor-emulation) and [many formatting options](https://github.com/vsch/flexmark-java/wiki/Markdown-Formatter#options).
+
+Currently, none of the available options can be configured yet. It uses only the default options together with `COMMONMARK` as `FORMATTER_EMULATION_PROFILE`.
+
+To apply flexmark to all of the `.md` files in your project, use this snippet:
+
+```gradle
+spotless {
+  flexmark {
+    target '**/*.md' // you have to set the target manually
+    flexmarkFormatter() // or flexmarkFormatter('0.64.6') // version is optional
+  }
+}
+```
+
 ## Antlr4
 
 `com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java
new file mode 100644
index 0000000000..feee2c4801
--- /dev/null
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.gradle.spotless;
+
+import java.util.Objects;
+
+import javax.inject.Inject;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.markdown.FlexmarkStep;
+
+public class FlexmarkExtension extends FormatExtension implements HasBuiltinDelimiterForLicense {
+	static final String NAME = "flexmark";
+
+	@Inject
+	public FlexmarkExtension(SpotlessExtension spotless) {
+		super(spotless);
+	}
+
+	@Override
+	public LicenseHeaderConfig licenseHeader(String licenseHeader) {
+		return licenseHeader(licenseHeader, null);
+	}
+
+	@Override
+	public LicenseHeaderConfig licenseHeaderFile(Object licenseHeaderFile) {
+		return licenseHeaderFile(licenseHeaderFile, null);
+	}
+
+	public FlexmarkFormatterConfig flexmarkFormatter() {
+		return flexmarkFormatter(FlexmarkStep.defaultVersion());
+	}
+
+	public FlexmarkFormatterConfig flexmarkFormatter(String version) {
+		return new FlexmarkFormatterConfig(version);
+	}
+
+	@Override
+	protected void setupTask(SpotlessTask task) {
+		// defaults to all markdown files
+		if (target == null) {
+			throw noDefaultTargetException();
+		}
+		super.setupTask(task);
+	}
+
+	public class FlexmarkFormatterConfig {
+
+		private final String version;
+
+		FlexmarkFormatterConfig(String version) {
+			this.version = Objects.requireNonNull(version);
+			addStep(createStep());
+		}
+
+		private FormatterStep createStep() {
+			return FlexmarkStep.create(this.version, provisioner());
+		}
+	}
+
+}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
index c3cf5123c0..838231c9f8 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
@@ -147,6 +147,12 @@ public void freshmark(Action<FreshMarkExtension> closure) {
 		format(FreshMarkExtension.NAME, FreshMarkExtension.class, closure);
 	}
 
+	/** Configures the special flexmark-specific extension. */
+	public void flexmark(Action<FlexmarkExtension> closure) {
+		requireNonNull(closure);
+		format(FlexmarkExtension.NAME, FlexmarkExtension.class, closure);
+	}
+
 	/** Configures the special groovy-specific extension. */
 	public void groovy(Action<GroovyExtension> closure) {
 		format(GroovyExtension.NAME, GroovyExtension.class, closure);
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/FlexmarkExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/FlexmarkExtensionTest.java
new file mode 100644
index 0000000000..873baba744
--- /dev/null
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/FlexmarkExtensionTest.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.gradle.spotless;
+
+import java.io.IOException;
+
+import org.junit.jupiter.api.Test;
+
+class FlexmarkExtensionTest extends GradleIntegrationHarness {
+	@Test
+	void integration() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'java'",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    flexmark {",
+				"        target '*.md'",
+				"        flexmarkFormatter()",
+				"    }",
+				"}");
+		setFile("markdown_test.md").toResource("markdown/flexmark/FlexmarkUnformatted.md");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("markdown_test.md").sameAsResource("markdown/flexmark/FlexmarkFormatted.md");
+	}
+}

From ad04a62362ccec2cd8d5975f0326bb57b0bbbf5b Mon Sep 17 00:00:00 2001
From: samypr100 <3933065+samypr100@users.noreply.github.com>
Date: Sat, 2 Sep 2023 15:37:32 -0400
Subject: [PATCH 1200/2068] docs: update docs/changes

---
 CHANGES.md               | 2 +-
 plugin-gradle/CHANGES.md | 2 +-
 plugin-gradle/README.md  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 8150fefcbb..711bcf819c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,7 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 
 ### Changes
-* Bump default `flexmark` version to latest `0.64.0` -> `0.64.6`.
+* Bump default `flexmark` version to latest `0.64.0` -> `0.64.6`. ([#1801](https://github.com/diffplug/spotless/pull/1801))
 
 ## [2.41.0] - 2023-08-29
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 791b27dafe..736909025e 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,7 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 
 ### Added
-* Support `flexmark` in gradle. Previously only Maven was supported.
+* Support `flexmark` in gradle. Previously only Maven was supported. ([#1801](https://github.com/diffplug/spotless/pull/1801))
 
 ## [6.21.0] - 2023-08-29
 ### Added
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 367634e63e..f2781561a0 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -576,7 +576,7 @@ spotless {
 
 ## Flexmark
 
-`com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java)
+`com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FlexmarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java)
 
 [homepage](https://github.com/vsch/flexmark-java). [code](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/markdown/Flexmark.java). Flexmark is a flexible Commonmark/Markdown parser that can be used to format Markdown files. It supports different [flavors of Markdown](https://github.com/vsch/flexmark-java#markdown-processor-emulation) and [many formatting options](https://github.com/vsch/flexmark-java/wiki/Markdown-Formatter#options).
 

From 9be41217c90032ecb2960e35fd9bef8c189b10d8 Mon Sep 17 00:00:00 2001
From: samypr100 <3933065+samypr100@users.noreply.github.com>
Date: Sat, 2 Sep 2023 15:43:27 -0400
Subject: [PATCH 1201/2068] docs: remove copy/paste reference

---
 plugin-gradle/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index f2781561a0..91def5ad5f 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -578,7 +578,7 @@ spotless {
 
 `com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FlexmarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java)
 
-[homepage](https://github.com/vsch/flexmark-java). [code](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/markdown/Flexmark.java). Flexmark is a flexible Commonmark/Markdown parser that can be used to format Markdown files. It supports different [flavors of Markdown](https://github.com/vsch/flexmark-java#markdown-processor-emulation) and [many formatting options](https://github.com/vsch/flexmark-java/wiki/Markdown-Formatter#options).
+[homepage](https://github.com/vsch/flexmark-java). Flexmark is a flexible Commonmark/Markdown parser that can be used to format Markdown files. It supports different [flavors of Markdown](https://github.com/vsch/flexmark-java#markdown-processor-emulation) and [many formatting options](https://github.com/vsch/flexmark-java/wiki/Markdown-Formatter#options).
 
 Currently, none of the available options can be configured yet. It uses only the default options together with `COMMONMARK` as `FORMATTER_EMULATION_PROFILE`.
 

From d469a3548b6e85dda82d15e466d48f4e0c12fade Mon Sep 17 00:00:00 2001
From: samypr100 <3933065+samypr100@users.noreply.github.com>
Date: Sat, 2 Sep 2023 23:19:04 -0400
Subject: [PATCH 1202/2068] feat: add support for prettier v3 plugin changes

---
 CHANGES.md                                    |   3 +
 .../spotless/npm/PrettierRestService.java     |  12 ++
 plugin-gradle/CHANGES.md                      |   3 +
 plugin-gradle/README.md                       |   2 +
 .../spotless/PrettierIntegrationTest.java     | 184 ++++++++++++++----
 plugin-maven/CHANGES.md                       |   3 +
 plugin-maven/README.md                        |   2 +
 .../spotless/maven/generic/Prettier.java      |   5 +
 .../prettier/PrettierFormatStepTest.java      |  50 +++++
 .../config/.prettierrc_java_plugin.yml        |   3 +
 10 files changed, 228 insertions(+), 39 deletions(-)
 create mode 100644 testlib/src/main/resources/npm/prettier/config/.prettierrc_java_plugin.yml

diff --git a/CHANGES.md b/CHANGES.md
index 1d78e8d932..652e4ce38c 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]
 
+### Fixed
+* Added support for plugins when using Prettier version `3.0.0` and newer. ([#1802](https://github.com/diffplug/spotless/pull/1802))
+
 ## [2.41.0] - 2023-08-29
 ### Added
 * Add a `jsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/PrettierRestService.java b/lib/src/main/java/com/diffplug/spotless/npm/PrettierRestService.java
index ccdc189d27..a517a7219b 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/PrettierRestService.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/PrettierRestService.java
@@ -17,7 +17,9 @@
 
 import java.io.File;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 public class PrettierRestService extends BaseNpmRestService {
 
@@ -31,6 +33,16 @@ public String resolveConfig(File prettierConfigPath, Map<String, Object> prettie
 			jsonProperties.put("prettier_config_path", prettierConfigPath.getAbsolutePath());
 		}
 		if (prettierConfigOptions != null) {
+			// Prettier 3.x plugins support
+			if (prettierConfigOptions.get("plugins") instanceof List) {
+				try {
+					var pluginArray = (List<String>) prettierConfigOptions.get("plugins");
+					var pluginsJson = pluginArray.stream().map(e -> '"' + e + '"').collect(Collectors.joining(",", "[", "]"));
+					prettierConfigOptions.put("plugins", JsonRawValue.wrap(pluginsJson));
+				} catch (ClassCastException e) {
+					throw new IllegalArgumentException("Only values of type 'List<String>' are supported for plugins.");
+				}
+			}
 			jsonProperties.put("prettier_config_options", SimpleJsonWriter.of(prettierConfigOptions).toJsonRawValue());
 
 		}
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index eab7e32b2d..989b4ece12 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]
 
+### Fixed
+* Added support for plugins when using Prettier version `3.0.0` and newer. ([#1802](https://github.com/diffplug/spotless/pull/1802))
+
 ## [6.21.0] - 2023-08-29
 ### Added
 * Add a `jsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 944c07bb6e..2253557f3a 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -1024,10 +1024,12 @@ Since spotless uses the actual npm prettier package behind the scenes, it is pos
 spotless {
   java {
     prettier(['prettier': '2.8.8', 'prettier-plugin-java': '2.2.0']).config(['parser': 'java', 'tabWidth': 4])
+    // prettier(['prettier': '3.0.3', 'prettier-plugin-java': '2.3.0']).config(['parser': 'java', 'tabWidth': 4, 'plugins': ['prettier-plugin-java']]) // Prettier v3
   }
   format 'php', {
     target 'src/**/*.php'
     prettier(['prettier': '2.8.8', '@prettier/plugin-php': '0.19.6']).config(['parser': 'php', 'tabWidth': 3])
+    // prettier(['prettier': '3.0.3', '@prettier/plugin-php': '0.20.1']).config(['parser': 'php', 'tabWidth': 3, 'plugins': ['@prettier/plugin-php']]) // Prettier v3
   }
 }
 ```
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java
index 4d5069c1b5..ed32900db0 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java
@@ -19,14 +19,22 @@
 
 import org.assertj.core.api.Assertions;
 import org.gradle.testkit.runner.BuildResult;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
+import com.diffplug.spotless.npm.PrettierFormatterStep;
 import com.diffplug.spotless.tag.NpmTest;
 
 @NpmTest
 class PrettierIntegrationTest extends GradleIntegrationHarness {
-	@Test
-	void useInlineConfig() throws IOException {
+
+	private static final String PRETTIER_VERSION_2 = PrettierFormatterStep.DEFAULT_VERSION;
+
+	private static final String PRETTIER_VERSION_3 = "3.0.3";
+
+	@ParameterizedTest(name = "{index}: useInlineConfig with prettier {0}")
+	@ValueSource(strings = {PRETTIER_VERSION_2, PRETTIER_VERSION_3})
+	void useInlineConfig(String prettierVersion) throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
 				"    id 'com.diffplug.spotless'",
@@ -38,17 +46,25 @@ void useInlineConfig() throws IOException {
 				"spotless {",
 				"    format 'mytypescript', {",
 				"        target 'test.ts'",
-				"        prettier().config(prettierConfig)",
+				"        prettier('" + prettierVersion + "').config(prettierConfig)",
 				"    }",
 				"}");
 		setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
-		final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+		BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
 		Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
-		assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile_prettier_2.clean");
+		switch (prettierVersion) {
+		case PRETTIER_VERSION_2:
+			assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile_prettier_2.clean");
+			break;
+		case PRETTIER_VERSION_3:
+			assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile_prettier_3.clean");
+			break;
+		}
 	}
 
-	@Test
-	void verifyCleanSpotlessCheckWorks() throws IOException {
+	@ParameterizedTest(name = "{index}: verifyCleanSpotlessCheckWorks with prettier {0}")
+	@ValueSource(strings = {PRETTIER_VERSION_2, PRETTIER_VERSION_3})
+	void verifyCleanSpotlessCheckWorks(String prettierVersion) throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
 				"    id 'com.diffplug.spotless'",
@@ -60,7 +76,7 @@ void verifyCleanSpotlessCheckWorks() throws IOException {
 				"spotless {",
 				"    format 'mytypescript', {",
 				"        target 'test.ts'",
-				"        prettier().config(prettierConfig)",
+				"        prettier('" + prettierVersion + "').config(prettierConfig)",
 				"    }",
 				"}");
 		setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
@@ -71,8 +87,9 @@ void verifyCleanSpotlessCheckWorks() throws IOException {
 		gradleRunner().withArguments("--stacktrace", "spotlessCheck").build();
 	}
 
-	@Test
-	void useFileConfig() throws IOException {
+	@ParameterizedTest(name = "{index}: useFileConfig with prettier {0}")
+	@ValueSource(strings = {PRETTIER_VERSION_2, PRETTIER_VERSION_3})
+	void useFileConfig(String prettierVersion) throws IOException {
 		setFile(".prettierrc.yml").toResource("npm/prettier/config/.prettierrc.yml");
 		setFile("build.gradle").toLines(
 				"plugins {",
@@ -82,17 +99,25 @@ void useFileConfig() throws IOException {
 				"spotless {",
 				"    format 'mytypescript', {",
 				"        target 'test.ts'",
-				"        prettier().configFile('.prettierrc.yml')",
+				"        prettier('" + prettierVersion + "').configFile('.prettierrc.yml')",
 				"    }",
 				"}");
 		setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
 		final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
 		Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
-		assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile_prettier_2.clean");
+		switch (prettierVersion) {
+		case PRETTIER_VERSION_2:
+			assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile_prettier_2.clean");
+			break;
+		case PRETTIER_VERSION_3:
+			assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile_prettier_3.clean");
+			break;
+		}
 	}
 
-	@Test
-	void chooseParserBasedOnFilename() throws IOException {
+	@ParameterizedTest(name = "{index}: chooseParserBasedOnFilename with prettier {0}")
+	@ValueSource(strings = {PRETTIER_VERSION_2, PRETTIER_VERSION_3})
+	void chooseParserBasedOnFilename(String prettierVersion) throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
 				"    id 'com.diffplug.spotless'",
@@ -101,7 +126,7 @@ void chooseParserBasedOnFilename() throws IOException {
 				"spotless {",
 				"    format 'webResources', {",
 				"        target 'dirty.*'",
-				"        prettier()",
+				"        prettier('" + prettierVersion + "')",
 				"    }",
 				"}");
 		setFile("dirty.json").toResource("npm/prettier/filename/dirty.json");
@@ -110,8 +135,20 @@ void chooseParserBasedOnFilename() throws IOException {
 		assertFile("dirty.json").sameAsResource("npm/prettier/filename/clean.json");
 	}
 
-	@Test
-	void useJavaCommunityPlugin() throws IOException {
+	@ParameterizedTest(name = "{index}: useJavaCommunityPlugin with prettier {0}")
+	@ValueSource(strings = {PRETTIER_VERSION_2, PRETTIER_VERSION_3})
+	void useJavaCommunityPlugin(String prettierVersion) throws IOException {
+		var prettierPluginJava = "";
+		var prettierConfigPluginsStr = "";
+		switch (prettierVersion) {
+		case PRETTIER_VERSION_2:
+			prettierPluginJava = "2.1.0"; // last version to support v2
+			break;
+		case PRETTIER_VERSION_3:
+			prettierPluginJava = "2.3.0"; // latest to support v3
+			prettierConfigPluginsStr = "prettierConfig['plugins'] = ['prettier-plugin-java']";
+			break;
+		}
 		setFile("build.gradle").toLines(
 				"plugins {",
 				"    id 'com.diffplug.spotless'",
@@ -120,9 +157,10 @@ void useJavaCommunityPlugin() throws IOException {
 				"def prettierConfig = [:]",
 				"prettierConfig['tabWidth'] = 4",
 				"prettierConfig['parser'] = 'java'",
+				prettierConfigPluginsStr,
 				"def prettierPackages = [:]",
-				"prettierPackages['prettier'] = '2.8.8'",
-				"prettierPackages['prettier-plugin-java'] = '2.2.0'",
+				"prettierPackages['prettier'] = '" + prettierVersion + "'",
+				"prettierPackages['prettier-plugin-java'] = '" + prettierPluginJava + "'",
 				"spotless {",
 				"    format 'java', {",
 				"        target 'JavaTest.java'",
@@ -135,8 +173,42 @@ void useJavaCommunityPlugin() throws IOException {
 		assertFile("JavaTest.java").sameAsResource("npm/prettier/plugins/java-test.clean");
 	}
 
-	@Test
-	void suggestsMissingJavaCommunityPlugin() throws IOException {
+	@ParameterizedTest(name = "{index}: useJavaCommunityPluginFileConfig with prettier {0}")
+	@ValueSource(strings = {PRETTIER_VERSION_2, PRETTIER_VERSION_3})
+	void useJavaCommunityPluginFileConfig(String prettierVersion) throws IOException {
+		var prettierPluginJava = "";
+		switch (prettierVersion) {
+		case PRETTIER_VERSION_2:
+			prettierPluginJava = "2.1.0"; // last version to support v2
+			break;
+		case PRETTIER_VERSION_3:
+			prettierPluginJava = "2.3.0"; // latest to support v3
+			break;
+		}
+		setFile(".prettierrc.yml").toResource("npm/prettier/config/.prettierrc_java_plugin.yml");
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"def prettierPackages = [:]",
+				"prettierPackages['prettier'] = '" + prettierVersion + "'",
+				"prettierPackages['prettier-plugin-java'] = '" + prettierPluginJava + "'",
+				"spotless {",
+				"    format 'java', {",
+				"        target 'JavaTest.java'",
+				"        prettier(prettierPackages).configFile('.prettierrc.yml')",
+				"    }",
+				"}");
+		setFile("JavaTest.java").toResource("npm/prettier/plugins/java-test.dirty");
+		final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+		Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		assertFile("JavaTest.java").sameAsResource("npm/prettier/plugins/java-test.clean");
+	}
+
+	@ParameterizedTest(name = "{index}: suggestsMissingJavaCommunityPlugin with prettier {0}")
+	@ValueSource(strings = {PRETTIER_VERSION_2, PRETTIER_VERSION_3})
+	void suggestsMissingJavaCommunityPlugin(String prettierVersion) throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
 				"    id 'com.diffplug.spotless'",
@@ -145,7 +217,7 @@ void suggestsMissingJavaCommunityPlugin() throws IOException {
 				"def prettierConfig = [:]",
 				"prettierConfig['tabWidth'] = 4",
 				"def prettierPackages = [:]",
-				"prettierPackages['prettier'] = '2.8.8'",
+				"prettierPackages['prettier'] = '" + prettierVersion + "'",
 				"spotless {",
 				"    format 'java', {",
 				"        target 'JavaTest.java'",
@@ -158,8 +230,20 @@ void suggestsMissingJavaCommunityPlugin() throws IOException {
 		Assertions.assertThat(spotlessApply.getOutput()).contains("prettier-plugin-java");
 	}
 
-	@Test
-	void usePhpCommunityPlugin() throws IOException {
+	@ParameterizedTest(name = "{index}: usePhpCommunityPlugin with prettier {0}")
+	@ValueSource(strings = {PRETTIER_VERSION_2, PRETTIER_VERSION_3})
+	void usePhpCommunityPlugin(String prettierVersion) throws IOException {
+		var prettierPluginPhp = "";
+		var prettierConfigPluginsStr = "";
+		switch (prettierVersion) {
+		case PRETTIER_VERSION_2:
+			prettierPluginPhp = "0.19.7"; // last version to support v2
+			break;
+		case PRETTIER_VERSION_3:
+			prettierPluginPhp = "0.20.1"; // latest to support v3
+			prettierConfigPluginsStr = "prettierConfig['plugins'] = ['@prettier/plugin-php']";
+			break;
+		}
 		setFile("build.gradle").toLines(
 				"plugins {",
 				"    id 'com.diffplug.spotless'",
@@ -168,9 +252,10 @@ void usePhpCommunityPlugin() throws IOException {
 				"def prettierConfig = [:]",
 				"prettierConfig['tabWidth'] = 3",
 				"prettierConfig['parser'] = 'php'",
+				prettierConfigPluginsStr,
 				"def prettierPackages = [:]",
-				"prettierPackages['prettier'] = '2.8.8'",
-				"prettierPackages['@prettier/plugin-php'] = '0.19.6'",
+				"prettierPackages['prettier'] = '" + prettierVersion + "'",
+				"prettierPackages['@prettier/plugin-php'] = '" + prettierPluginPhp + "'",
 				"spotless {",
 				"    format 'php', {",
 				"        target 'php-example.php'",
@@ -188,8 +273,25 @@ void usePhpCommunityPlugin() throws IOException {
 	 *
 	 * @see <a href="https://github.com/diffplug/spotless/issues/1162">Issue #1162 on github</a>
 	 */
-	@Test
-	void usePhpAndJavaCommunityPlugin() throws IOException {
+	@ParameterizedTest(name = "{index}: usePhpAndJavaCommunityPlugin with prettier {0}")
+	@ValueSource(strings = {PRETTIER_VERSION_2, PRETTIER_VERSION_3})
+	void usePhpAndJavaCommunityPlugin(String prettierVersion) throws IOException {
+		var prettierPluginJava = "";
+		var prettierPluginPhp = "";
+		var prettierConfigPluginsJavaStr = "";
+		var prettierConfigPluginsPhpStr = "";
+		switch (prettierVersion) {
+		case PRETTIER_VERSION_2:
+			prettierPluginJava = "2.1.0"; // last version to support v2
+			prettierPluginPhp = "0.19.7"; // last version to support v2
+			break;
+		case PRETTIER_VERSION_3:
+			prettierPluginJava = "2.3.0"; // latest to support v3
+			prettierPluginPhp = "0.20.1"; // latest to support v3
+			prettierConfigPluginsJavaStr = "prettierConfigJava['plugins'] = ['prettier-plugin-java']";
+			prettierConfigPluginsPhpStr = "prettierConfigPhp['plugins'] = ['@prettier/plugin-php']";
+			break;
+		}
 		setFile("build.gradle").toLines(
 				"plugins {",
 				"    id 'com.diffplug.spotless'",
@@ -198,15 +300,17 @@ void usePhpAndJavaCommunityPlugin() throws IOException {
 				"def prettierConfigPhp = [:]",
 				"prettierConfigPhp['tabWidth'] = 3",
 				"prettierConfigPhp['parser'] = 'php'",
+				prettierConfigPluginsPhpStr,
 				"def prettierPackagesPhp = [:]",
-				"prettierPackagesPhp['prettier'] = '2.8.8'",
-				"prettierPackagesPhp['@prettier/plugin-php'] = '0.19.6'",
+				"prettierPackagesPhp['prettier'] = '" + prettierVersion + "'",
+				"prettierPackagesPhp['@prettier/plugin-php'] = '" + prettierPluginPhp + "'",
 				"def prettierConfigJava = [:]",
 				"prettierConfigJava['tabWidth'] = 4",
 				"prettierConfigJava['parser'] = 'java'",
+				prettierConfigPluginsJavaStr,
 				"def prettierPackagesJava = [:]",
-				"prettierPackagesJava['prettier'] = '2.8.8'",
-				"prettierPackagesJava['prettier-plugin-java'] = '2.2.0'",
+				"prettierPackagesJava['prettier'] = '" + prettierVersion + "'",
+				"prettierPackagesJava['prettier-plugin-java'] = '" + prettierPluginJava + "'",
 				"spotless {",
 				"    format 'php', {",
 				"        target 'php-example.php'",
@@ -227,8 +331,9 @@ void usePhpAndJavaCommunityPlugin() throws IOException {
 		assertFile("JavaTest.java").sameAsResource("npm/prettier/plugins/java-test.clean");
 	}
 
-	@Test
-	void autodetectNpmrcFileConfig() throws IOException {
+	@ParameterizedTest(name = "{index}: autodetectNpmrcFileConfig with prettier {0}")
+	@ValueSource(strings = {PRETTIER_VERSION_2, PRETTIER_VERSION_3})
+	void autodetectNpmrcFileConfig(String prettierVersion) throws IOException {
 		setFile(".npmrc").toLines(
 				"registry=https://i.do.not.exist.com",
 				"fetch-timeout=250",
@@ -245,7 +350,7 @@ void autodetectNpmrcFileConfig() throws IOException {
 				"spotless {",
 				"    format 'mytypescript', {",
 				"        target 'test.ts'",
-				"        prettier().config(prettierConfig)",
+				"        prettier('" + prettierVersion + "').config(prettierConfig)",
 				"    }",
 				"}");
 		setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
@@ -253,8 +358,9 @@ void autodetectNpmrcFileConfig() throws IOException {
 		Assertions.assertThat(spotlessApply.getOutput()).containsPattern("Running npm command.*npm install.* failed with exit code: 1");
 	}
 
-	@Test
-	void pickupNpmrcFileConfig() throws IOException {
+	@ParameterizedTest(name = "{index}: autodetectNpmrcFileConfig with prettier {0}")
+	@ValueSource(strings = {PRETTIER_VERSION_2, PRETTIER_VERSION_3})
+	void pickupNpmrcFileConfig(String prettierVersion) throws IOException {
 		setFile(".custom_npmrc").toLines(
 				"registry=https://i.do.not.exist.com",
 				"fetch-timeout=250",
@@ -271,7 +377,7 @@ void pickupNpmrcFileConfig() throws IOException {
 				"spotless {",
 				"    format 'mytypescript', {",
 				"        target 'test.ts'",
-				"        prettier().npmrc('.custom_npmrc').config(prettierConfig)",
+				"        prettier('" + prettierVersion + "').npmrc('.custom_npmrc').config(prettierConfig)",
 				"    }",
 				"}");
 		setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index f932806fcc..b624299e71 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]
 
+### Fixed
+* Added support for plugins when using Prettier version `3.0.0` and newer. ([#1802](https://github.com/diffplug/spotless/pull/1802))
+
 ## [2.39.0] - 2023-08-29
 ### Added
 * Add a `jsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 74872ef61f..1dc78a5667 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -1074,6 +1074,8 @@ You can use prettier in any language-specific format, but usually you will be cr
         <configFile>${project.basedir}/path/to/configfile</configFile>
         <config>
             <useTabs>true</useTabs>
+            <!-- Prettier v3 Only - Comma Delimited -->
+            <plugins>@prettier/plugin-php</plugins>
         </config>
       </prettier>
     </format>
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Prettier.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Prettier.java
index e92b2814bd..c6b3e46e3c 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Prettier.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Prettier.java
@@ -85,6 +85,11 @@ public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 						if (Boolean.TRUE.toString().equalsIgnoreCase(entry.getValue()) || Boolean.FALSE.toString().equalsIgnoreCase(entry.getValue())) {
 							return new AbstractMap.SimpleEntry<>(entry.getKey(), Boolean.parseBoolean(entry.getValue()));
 						}
+						// Prettier v3 - plugins config will be a comma delimited list of plugins
+						if (entry.getKey().equals("plugins")) {
+							List<String> values = entry.getValue().isEmpty() ? List.of() : Arrays.asList(entry.getValue().split(","));
+							return new AbstractMap.SimpleEntry<>(entry.getKey(), values);
+						}
 						return entry;
 					})
 					.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (a, b) -> a, LinkedHashMap::new));
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/prettier/PrettierFormatStepTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/prettier/PrettierFormatStepTest.java
index 9cd1a313eb..abba35e72c 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/prettier/PrettierFormatStepTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/prettier/PrettierFormatStepTest.java
@@ -184,6 +184,56 @@ void custom_plugin() throws Exception {
 		assertFile("php-example.php").sameAsResource("npm/prettier/plugins/php.clean");
 	}
 
+	@Test
+	void custom_plugin_prettier3() throws Exception {
+		writePomWithFormatSteps(
+				"<includes><include>php-example.php</include></includes>",
+				"<prettier>",
+				"  <devDependencyProperties>",
+				"    <property>",
+				"      <name>prettier</name>",
+				"      <value>3.0.3</value>",
+				"    </property>",
+				"    <property>",
+				"      <name>@prettier/plugin-php</name>",
+				"      <value>0.20.1</value>",
+				"    </property>",
+				"  </devDependencyProperties>",
+				"  <config>",
+				"    <tabWidth>3</tabWidth>",
+				"    <parser>php</parser>",
+				"    <plugins>@prettier/plugin-php</plugins>",
+				"  </config>",
+				"</prettier>");
+
+		setFile("php-example.php").toResource("npm/prettier/plugins/php.dirty");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("php-example.php").sameAsResource("npm/prettier/plugins/php.clean");
+	}
+
+	@Test
+	void custom_plugin_prettier3_file_config() throws Exception {
+		writePomWithFormatSteps(
+				"<includes><include>JavaTest.java</include></includes>",
+				"<prettier>",
+				"  <devDependencyProperties>",
+				"    <property>",
+				"      <name>prettier</name>",
+				"      <value>3.0.3</value>",
+				"    </property>",
+				"    <property>",
+				"      <name>prettier-plugin-java</name>",
+				"      <value>2.3.0</value>",
+				"    </property>",
+				"  </devDependencyProperties>",
+				"  <configFile>.prettierrc.yml</configFile>",
+				"</prettier>");
+		setFile(".prettierrc.yml").toResource("npm/prettier/config/.prettierrc_java_plugin.yml");
+		setFile("JavaTest.java").toResource("npm/prettier/plugins/java-test.dirty");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("JavaTest.java").sameAsResource("npm/prettier/plugins/java-test.clean");
+	}
+
 	@Test
 	void autodetect_parser_based_on_filename() throws Exception {
 		writePomWithFormatSteps(
diff --git a/testlib/src/main/resources/npm/prettier/config/.prettierrc_java_plugin.yml b/testlib/src/main/resources/npm/prettier/config/.prettierrc_java_plugin.yml
new file mode 100644
index 0000000000..3f7a801335
--- /dev/null
+++ b/testlib/src/main/resources/npm/prettier/config/.prettierrc_java_plugin.yml
@@ -0,0 +1,3 @@
+parser: java
+tabWidth: 4
+plugins: ['prettier-plugin-java']

From d5db9148e47a61e4f814af58b90228414cd2b833 Mon Sep 17 00:00:00 2001
From: samypr100 <3933065+samypr100@users.noreply.github.com>
Date: Sat, 2 Sep 2023 23:27:21 -0400
Subject: [PATCH 1203/2068] fix: add final back to BuildResult

---
 .../com/diffplug/gradle/spotless/PrettierIntegrationTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java
index ed32900db0..74b6db9167 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java
@@ -50,7 +50,7 @@ void useInlineConfig(String prettierVersion) throws IOException {
 				"    }",
 				"}");
 		setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
-		BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+		final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
 		Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
 		switch (prettierVersion) {
 		case PRETTIER_VERSION_2:
@@ -80,7 +80,7 @@ void verifyCleanSpotlessCheckWorks(String prettierVersion) throws IOException {
 				"    }",
 				"}");
 		setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
-		BuildResult spotlessCheckFailsGracefully = gradleRunner().withArguments("--stacktrace", "spotlessCheck").buildAndFail();
+		final BuildResult spotlessCheckFailsGracefully = gradleRunner().withArguments("--stacktrace", "spotlessCheck").buildAndFail();
 		Assertions.assertThat(spotlessCheckFailsGracefully.getOutput()).contains("> The following files had format violations:");
 
 		gradleRunner().withArguments("--stacktrace", "spotlessApply").build();

From 3226165b74c32c00dcdce8deeecbf7c23283fe3c Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Sun, 3 Sep 2023 20:22:00 +0200
Subject: [PATCH 1204/2068] feat: add support for nested lists in json writer

opt for supporting lists/arrays as first level citizen in json serialization for configs in npm-based formatters.
---
 .../diffplug/spotless/npm/JsonEscaper.java    | 18 +++++-
 ...{SimpleJsonWriter.java => JsonWriter.java} | 33 +++++++----
 .../spotless/npm/ListableAdapter.java         | 58 +++++++++++++++++++
 .../spotless/npm/PrettierRestService.java     | 15 +----
 .../spotless/npm/SimpleRestClient.java        |  4 +-
 .../spotless/npm/TsFmtFormatterStep.java      |  2 +-
 .../spotless/npm/TsFmtRestService.java        |  2 +-
 ...sonWriterTest.java => JsonWriterTest.java} |  6 +-
 8 files changed, 106 insertions(+), 32 deletions(-)
 rename lib/src/main/java/com/diffplug/spotless/npm/{SimpleJsonWriter.java => JsonWriter.java} (77%)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/npm/ListableAdapter.java
 rename testlib/src/test/java/com/diffplug/spotless/npm/{SimpleJsonWriterTest.java => JsonWriterTest.java} (93%)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/JsonEscaper.java b/lib/src/main/java/com/diffplug/spotless/npm/JsonEscaper.java
index 163818d0e7..3ac20d892b 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/JsonEscaper.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/JsonEscaper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,6 +34,22 @@ public static String jsonEscape(Object val) {
 		if (val instanceof String) {
 			return jsonEscape((String) val);
 		}
+		if (ListableAdapter.canAdapt(val)) {
+			// create an array
+			StringBuilder sb = new StringBuilder();
+			sb.append('[');
+			boolean first = true;
+			for (Object o : ListableAdapter.adapt(val)) {
+				if (first) {
+					first = false;
+				} else {
+					sb.append(", ");
+				}
+				sb.append(jsonEscape(o));
+			}
+			sb.append(']');
+			return sb.toString();
+		}
 		return val.toString();
 	}
 
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/SimpleJsonWriter.java b/lib/src/main/java/com/diffplug/spotless/npm/JsonWriter.java
similarity index 77%
rename from lib/src/main/java/com/diffplug/spotless/npm/SimpleJsonWriter.java
rename to lib/src/main/java/com/diffplug/spotless/npm/JsonWriter.java
index 846f7f1cf3..bbdf9b63d4 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/SimpleJsonWriter.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/JsonWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,33 +28,46 @@
 
 import com.diffplug.spotless.ThrowingEx;
 
-public class SimpleJsonWriter {
+class JsonWriter {
 
 	private final LinkedHashMap<String, Object> valueMap = new LinkedHashMap<>();
 
-	public static SimpleJsonWriter of(Map<String, ?> values) {
-		SimpleJsonWriter writer = new SimpleJsonWriter();
+	public static JsonWriter of(Map<String, ?> values) {
+		JsonWriter writer = new JsonWriter();
 		writer.putAll(values);
 		return writer;
 	}
 
-	SimpleJsonWriter putAll(Map<String, ?> values) {
+	JsonWriter putAll(Map<String, ?> values) {
 		verifyValues(values);
 		this.valueMap.putAll(values);
 		return this;
 	}
 
-	SimpleJsonWriter put(String name, Object value) {
+	JsonWriter put(String name, Object value) {
 		verifyValues(Collections.singletonMap(name, value));
 		this.valueMap.put(name, value);
 		return this;
 	}
 
 	private void verifyValues(Map<String, ?> values) {
-		if (values.values()
-				.stream()
-				.anyMatch(val -> !(val instanceof String || val instanceof JsonRawValue || val instanceof Number || val instanceof Boolean))) {
-			throw new IllegalArgumentException("Only values of type 'String', 'JsonRawValue', 'Number' and 'Boolean' are supported. You provided: " + values.values());
+		for (Object value : values.values()) {
+			verifyValue(value);
+		}
+	}
+
+	private void verifyValue(Object val) {
+		if (val == null) {
+			return;
+		}
+		if (ListableAdapter.canAdapt(val)) {
+			for (Object o : ListableAdapter.adapt(val)) {
+				verifyValue(o);
+			}
+			return;
+		}
+		if (!(val instanceof String || val instanceof JsonRawValue || val instanceof Number || val instanceof Boolean)) {
+			throw new IllegalArgumentException("Only values of type 'String', 'JsonRawValue', 'Number' and 'Boolean' are supported. You provided: " + val);
 		}
 	}
 
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/ListableAdapter.java b/lib/src/main/java/com/diffplug/spotless/npm/ListableAdapter.java
new file mode 100644
index 0000000000..3e05e8e51c
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/npm/ListableAdapter.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.npm;
+
+import javax.annotation.Nonnull;
+
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Objects;
+
+class ListableAdapter<T> implements Iterable<T> {
+
+	private final List<T> delegate;
+
+	@SuppressWarnings("unchecked")
+	private ListableAdapter(Object delegate) {
+		Objects.requireNonNull(delegate);
+		if (!canAdapt(delegate)) {
+			throw new IllegalArgumentException("Cannot create ListableAdapter from " + delegate.getClass() + ". Use canAdapt() to check first.");
+		}
+		if (delegate instanceof List) {
+			this.delegate = (List<T>) delegate;
+		} else if (delegate.getClass().isArray()) {
+			this.delegate = Arrays.asList((T[]) delegate);
+		} else {
+			throw new IllegalArgumentException("Cannot create IterableAdapter from " + delegate.getClass());
+		}
+	}
+
+	static <T> Iterable<T> adapt(Object delegate) {
+		return new ListableAdapter<>(delegate);
+	}
+
+	@Override
+	@Nonnull
+	public Iterator<T> iterator() {
+		return delegate.iterator();
+	}
+
+	static boolean canAdapt(Object delegate) {
+		Objects.requireNonNull(delegate);
+		return delegate instanceof List || delegate.getClass().isArray();
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/PrettierRestService.java b/lib/src/main/java/com/diffplug/spotless/npm/PrettierRestService.java
index a517a7219b..11fd29c68a 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/PrettierRestService.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/PrettierRestService.java
@@ -17,9 +17,7 @@
 
 import java.io.File;
 import java.util.LinkedHashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 public class PrettierRestService extends BaseNpmRestService {
 
@@ -33,18 +31,7 @@ public String resolveConfig(File prettierConfigPath, Map<String, Object> prettie
 			jsonProperties.put("prettier_config_path", prettierConfigPath.getAbsolutePath());
 		}
 		if (prettierConfigOptions != null) {
-			// Prettier 3.x plugins support
-			if (prettierConfigOptions.get("plugins") instanceof List) {
-				try {
-					var pluginArray = (List<String>) prettierConfigOptions.get("plugins");
-					var pluginsJson = pluginArray.stream().map(e -> '"' + e + '"').collect(Collectors.joining(",", "[", "]"));
-					prettierConfigOptions.put("plugins", JsonRawValue.wrap(pluginsJson));
-				} catch (ClassCastException e) {
-					throw new IllegalArgumentException("Only values of type 'List<String>' are supported for plugins.");
-				}
-			}
-			jsonProperties.put("prettier_config_options", SimpleJsonWriter.of(prettierConfigOptions).toJsonRawValue());
-
+			jsonProperties.put("prettier_config_options", JsonWriter.of(prettierConfigOptions).toJsonRawValue());
 		}
 		return restClient.postJson("/prettier/config-options", jsonProperties);
 	}
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/SimpleRestClient.java b/lib/src/main/java/com/diffplug/spotless/npm/SimpleRestClient.java
index 561839c757..2f413e4b3a 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/SimpleRestClient.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/SimpleRestClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@ static SimpleRestClient forBaseUrl(String baseUrl) {
 	}
 
 	String postJson(String endpoint, Map<String, Object> jsonParams) throws SimpleRestException {
-		final SimpleJsonWriter jsonWriter = SimpleJsonWriter.of(jsonParams);
+		final JsonWriter jsonWriter = JsonWriter.of(jsonParams);
 		final String jsonString = jsonWriter.toJsonString();
 
 		return postJson(endpoint, jsonString);
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java
index a83c3e202a..6b55610be0 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java
@@ -107,7 +107,7 @@ private Map<String, Object> unifyOptions() {
 			Map<String, Object> unified = new HashMap<>();
 			if (!this.inlineTsFmtSettings.isEmpty()) {
 				File targetFile = new File(this.buildDir, "inline-tsfmt.json");
-				SimpleJsonWriter.of(this.inlineTsFmtSettings).toJsonFile(targetFile);
+				JsonWriter.of(this.inlineTsFmtSettings).toJsonFile(targetFile);
 				unified.put("tsfmt", true);
 				unified.put("tsfmtFile", targetFile.getAbsolutePath());
 			} else if (this.configFile != null) {
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/TsFmtRestService.java b/lib/src/main/java/com/diffplug/spotless/npm/TsFmtRestService.java
index 704d2b47af..61a53b4637 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/TsFmtRestService.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/TsFmtRestService.java
@@ -28,7 +28,7 @@ public String format(String fileContent, Map<String, Object> configOptions) {
 		Map<String, Object> jsonProperties = new LinkedHashMap<>();
 		jsonProperties.put("file_content", fileContent);
 		if (configOptions != null && !configOptions.isEmpty()) {
-			jsonProperties.put("config_options", SimpleJsonWriter.of(configOptions).toJsonRawValue());
+			jsonProperties.put("config_options", JsonWriter.of(configOptions).toJsonRawValue());
 		}
 
 		return restClient.postJson("/tsfmt/format", jsonProperties);
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/SimpleJsonWriterTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/JsonWriterTest.java
similarity index 93%
rename from testlib/src/test/java/com/diffplug/spotless/npm/SimpleJsonWriterTest.java
rename to testlib/src/test/java/com/diffplug/spotless/npm/JsonWriterTest.java
index 34d7966709..cb1719c0f3 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/SimpleJsonWriterTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/JsonWriterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,9 +26,9 @@
 import com.diffplug.common.collect.ImmutableMap;
 import com.diffplug.spotless.ResourceHarness;
 
-class SimpleJsonWriterTest extends ResourceHarness {
+class JsonWriterTest extends ResourceHarness {
 
-	private SimpleJsonWriter jsonWriter = new SimpleJsonWriter();
+	private JsonWriter jsonWriter = new JsonWriter();
 
 	@Test
 	void itWritesAValidEmptyObject() {

From 6fbb6505790be5103a96a4385eb33095046e1163 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Sun, 3 Sep 2023 20:32:58 +0200
Subject: [PATCH 1205/2068] docs: make explicit and add maven doc

---
 plugin-gradle/README.md | 4 ++--
 plugin-maven/README.md  | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 2253557f3a..fcdcfc213a 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -1024,12 +1024,12 @@ Since spotless uses the actual npm prettier package behind the scenes, it is pos
 spotless {
   java {
     prettier(['prettier': '2.8.8', 'prettier-plugin-java': '2.2.0']).config(['parser': 'java', 'tabWidth': 4])
-    // prettier(['prettier': '3.0.3', 'prettier-plugin-java': '2.3.0']).config(['parser': 'java', 'tabWidth': 4, 'plugins': ['prettier-plugin-java']]) // Prettier v3
+    // prettier(['prettier': '3.0.3', 'prettier-plugin-java': '2.3.0']).config(['parser': 'java', 'tabWidth': 4, 'plugins': ['prettier-plugin-java']]) // Prettier v3 requires additional 'plugins' config
   }
   format 'php', {
     target 'src/**/*.php'
     prettier(['prettier': '2.8.8', '@prettier/plugin-php': '0.19.6']).config(['parser': 'php', 'tabWidth': 3])
-    // prettier(['prettier': '3.0.3', '@prettier/plugin-php': '0.20.1']).config(['parser': 'php', 'tabWidth': 3, 'plugins': ['@prettier/plugin-php']]) // Prettier v3
+    // prettier(['prettier': '3.0.3', '@prettier/plugin-php': '0.20.1']).config(['parser': 'php', 'tabWidth': 3, 'plugins': ['@prettier/plugin-php']]) // Prettier v3 requires additional 'plugins' config
   }
 }
 ```
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 1dc78a5667..8f91d8b08b 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -1121,6 +1121,7 @@ Since spotless uses the actual npm prettier package behind the scenes, it is pos
         <config>
             <tabWidth>4</tabWidth>
             <parser>java</parser>
+            <plugins>prettier-plugin-java</plugins><!-- this is only for prettier 3.0.0 and above: an additional 'plugins' config element is required -->
         </config>
       </prettier>
     </format>
@@ -1146,6 +1147,7 @@ Since spotless uses the actual npm prettier package behind the scenes, it is pos
         <config>
             <tabWidth>3</tabWidth>
             <parser>php</parser>
+            <plugins>@prettier/plugin-php</plugins><!-- this is only for prettier 3.0.0 and above: an additional 'plugins' config element is required -->
         </config>
       </prettier>
     </format>

From 3754eb12d3da00be2da0cdadd3123e11ae63af9b Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Mon, 4 Sep 2023 15:02:11 +0200
Subject: [PATCH 1206/2068] style: fix import order

---
 .../main/java/com/diffplug/spotless/npm/ListableAdapter.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/ListableAdapter.java b/lib/src/main/java/com/diffplug/spotless/npm/ListableAdapter.java
index 3e05e8e51c..24ae62fde6 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/ListableAdapter.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/ListableAdapter.java
@@ -15,13 +15,13 @@
  */
 package com.diffplug.spotless.npm;
 
-import javax.annotation.Nonnull;
-
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
 
+import javax.annotation.Nonnull;
+
 class ListableAdapter<T> implements Iterable<T> {
 
 	private final List<T> delegate;

From 7da08c7fbc5b8b908edd6bd36a2fd7272a7c4998 Mon Sep 17 00:00:00 2001
From: samypr100 <3933065+samypr100@users.noreply.github.com>
Date: Mon, 4 Sep 2023 17:25:08 -0400
Subject: [PATCH 1207/2068] fix: remove HasBuiltinDelimiterForLicense as it's
 not quite applicable

---
 plugin-gradle/README.md                              |  2 +-
 .../diffplug/gradle/spotless/FlexmarkExtension.java  | 12 +-----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 91def5ad5f..a2a3ac948e 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -62,7 +62,7 @@ Spotless supports all of Gradle's built-in performance features (incremental bui
   - [Protobuf](#protobuf) ([buf](#buf), [clang-format](#clang-format))
   - [Python](#python) ([black](#black))
   - [FreshMark](#freshmark) aka markdown
-  - [FlexMark](#flexmark) aka markdown
+  - [Flexmark](#flexmark) aka markdown
   - [Antlr4](#antlr4) ([antlr4formatter](#antlr4formatter))
   - [SQL](#sql) ([dbeaver](#dbeaver), [prettier](#prettier))
   - [Typescript](#typescript) ([tsfmt](#tsfmt), [prettier](#prettier), [ESLint](#eslint-typescript), [Rome](#rome))
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java
index feee2c4801..047b0eda73 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java
@@ -22,7 +22,7 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.markdown.FlexmarkStep;
 
-public class FlexmarkExtension extends FormatExtension implements HasBuiltinDelimiterForLicense {
+public class FlexmarkExtension extends FormatExtension {
 	static final String NAME = "flexmark";
 
 	@Inject
@@ -30,16 +30,6 @@ public FlexmarkExtension(SpotlessExtension spotless) {
 		super(spotless);
 	}
 
-	@Override
-	public LicenseHeaderConfig licenseHeader(String licenseHeader) {
-		return licenseHeader(licenseHeader, null);
-	}
-
-	@Override
-	public LicenseHeaderConfig licenseHeaderFile(Object licenseHeaderFile) {
-		return licenseHeaderFile(licenseHeaderFile, null);
-	}
-
 	public FlexmarkFormatterConfig flexmarkFormatter() {
 		return flexmarkFormatter(FlexmarkStep.defaultVersion());
 	}

From 0948c3e2323895efc7d6574d5e20f9ce358d8708 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Fri, 8 Sep 2023 16:12:10 +0800
Subject: [PATCH 1208/2068] Support ktlint 1.0.0

https://github.com/pinterest/ktlint/releases/tag/1.0.0
---
 lib/build.gradle                              |   7 +-
 .../compat/KtLintCompat1Dot0Dot0Adapter.java  | 165 ++++++++++++++++++
 .../glue/ktlint/KtlintFormatterFunc.java      |  36 ++--
 .../diffplug/spotless/kotlin/KtLintStep.java  |   9 +-
 .../KtLintCompat1Dot0Dot0AdapterTest.java     |  71 ++++++++
 .../resources/EmptyClassBody.kt               |   3 +
 .../resources/FailsNoSemicolons.kt            |   3 +
 plugin-gradle/README.md                       |   2 +-
 .../spotless/maven/kotlin/KtlintTest.java     |  10 +-
 .../spotless/kotlin/KtLintStepTest.java       |  10 ++
 10 files changed, 293 insertions(+), 23 deletions(-)
 create mode 100644 lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
 create mode 100644 lib/src/testCompatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java
 create mode 100644 lib/src/testCompatKtLint1Dot0Dot0/resources/EmptyClassBody.kt
 create mode 100644 lib/src/testCompatKtLint1Dot0Dot0/resources/FailsNoSemicolons.kt

diff --git a/lib/build.gradle b/lib/build.gradle
index 01591e557d..0288277c78 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -48,6 +48,7 @@ versionCompatibility {
 				'0.48.0',
 				'0.49.0',
 				'0.50.0',
+				'1.0.0',
 			]
 			targetSourceSetName = 'ktlint'
 		}
@@ -104,10 +105,14 @@ dependencies {
 	compatKtLint0Dot49Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-rule-engine:0.49.0'
 	compatKtLint0Dot49Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.49.0'
 	compatKtLint0Dot49Dot0CompileAndTestOnly 'org.slf4j:slf4j-api:2.0.0'
-	// ktlint latest supported version
+	// ktlint previous supported version
 	compatKtLint0Dot50Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-rule-engine:0.50.0'
 	compatKtLint0Dot50Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.50.0'
 	compatKtLint0Dot50Dot0CompileAndTestOnly 'org.slf4j:slf4j-api:2.0.0'
+	// ktlint latest supported version
+	compatKtLint1Dot0Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-rule-engine:1.0.0'
+	compatKtLint1Dot0Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:1.0.0'
+	compatKtLint1Dot0Dot0CompileAndTestOnly 'org.slf4j:slf4j-api:2.0.0'
 	// palantirJavaFormat
 	palantirJavaFormatCompileOnly 'com.palantir.javaformat:palantir-java-format:1.1.0' 	// this version needs to stay compilable against Java 8 for CI Job testNpm
 	// scalafmt
diff --git a/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java b/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
new file mode 100644
index 0000000000..7b12169400
--- /dev/null
+++ b/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.glue.ktlint.compat;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.ServiceLoader;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.pinterest.ktlint.cli.ruleset.core.api.RuleSetProviderV3;
+import com.pinterest.ktlint.rule.engine.api.Code;
+import com.pinterest.ktlint.rule.engine.api.EditorConfigDefaults;
+import com.pinterest.ktlint.rule.engine.api.EditorConfigOverride;
+import com.pinterest.ktlint.rule.engine.api.KtLintRuleEngine;
+import com.pinterest.ktlint.rule.engine.api.LintError;
+import com.pinterest.ktlint.rule.engine.core.api.Rule;
+import com.pinterest.ktlint.rule.engine.core.api.RuleId;
+import com.pinterest.ktlint.rule.engine.core.api.RuleProvider;
+import com.pinterest.ktlint.rule.engine.core.api.RuleSetId;
+import com.pinterest.ktlint.rule.engine.core.api.editorconfig.CodeStyleEditorConfigPropertyKt;
+import com.pinterest.ktlint.rule.engine.core.api.editorconfig.EditorConfigProperty;
+import com.pinterest.ktlint.rule.engine.core.api.editorconfig.EndOfLinePropertyKt;
+import com.pinterest.ktlint.rule.engine.core.api.editorconfig.IndentSizeEditorConfigPropertyKt;
+import com.pinterest.ktlint.rule.engine.core.api.editorconfig.IndentStyleEditorConfigPropertyKt;
+import com.pinterest.ktlint.rule.engine.core.api.editorconfig.InsertFinalNewLineEditorConfigPropertyKt;
+import com.pinterest.ktlint.rule.engine.core.api.editorconfig.MaxLineLengthEditorConfigPropertyKt;
+import com.pinterest.ktlint.rule.engine.core.api.editorconfig.RuleExecution;
+import com.pinterest.ktlint.rule.engine.core.api.editorconfig.RuleExecutionEditorConfigPropertyKt;
+
+import kotlin.Pair;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function2;
+
+public class KtLintCompat1Dot0Dot0Adapter implements KtLintCompatAdapter {
+
+	private static final Logger logger = LoggerFactory.getLogger(KtLintCompat1Dot0Dot0Adapter.class);
+
+	private static final List<EditorConfigProperty<?>> DEFAULT_EDITOR_CONFIG_PROPERTIES;
+
+	static {
+		List<EditorConfigProperty<?>> list = new ArrayList<>();
+		list.add(CodeStyleEditorConfigPropertyKt.getCODE_STYLE_PROPERTY());
+		list.add(EndOfLinePropertyKt.getEND_OF_LINE_PROPERTY());
+		list.add(IndentSizeEditorConfigPropertyKt.getINDENT_SIZE_PROPERTY());
+		list.add(IndentStyleEditorConfigPropertyKt.getINDENT_STYLE_PROPERTY());
+		list.add(InsertFinalNewLineEditorConfigPropertyKt.getINSERT_FINAL_NEWLINE_PROPERTY());
+		list.add(MaxLineLengthEditorConfigPropertyKt.getMAX_LINE_LENGTH_PROPERTY());
+		list.add(RuleExecutionEditorConfigPropertyKt.getEXPERIMENTAL_RULES_EXECUTION_PROPERTY());
+		DEFAULT_EDITOR_CONFIG_PROPERTIES = Collections.unmodifiableList(list);
+	}
+
+	static class FormatterCallback implements Function2<LintError, Boolean, Unit> {
+
+		@Override
+		public Unit invoke(LintError lint, Boolean corrected) {
+			if (!corrected) {
+				KtLintCompatReporting.report(lint.getLine(), lint.getCol(), lint.getRuleId().getValue(), lint.getDetail());
+			}
+			return Unit.INSTANCE;
+		}
+	}
+
+	@Override
+	public String format(final String text, Path path, final boolean isScript,
+			Path editorConfigPath, final Map<String, String> userData,
+			final Map<String, Object> editorConfigOverrideMap) {
+		final FormatterCallback formatterCallback = new FormatterCallback();
+
+		Set<RuleProvider> allRuleProviders = ServiceLoader.load(RuleSetProviderV3.class, RuleSetProviderV3.class.getClassLoader())
+				.stream()
+				.flatMap(loader -> loader.get().getRuleProviders().stream())
+				.collect(Collectors.toUnmodifiableSet());
+
+		EditorConfigOverride editorConfigOverride;
+		if (editorConfigOverrideMap.isEmpty()) {
+			editorConfigOverride = EditorConfigOverride.Companion.getEMPTY_EDITOR_CONFIG_OVERRIDE();
+		} else {
+			editorConfigOverride = createEditorConfigOverride(allRuleProviders.stream().map(
+					RuleProvider::createNewRuleInstance).collect(Collectors.toList()),
+					editorConfigOverrideMap);
+		}
+		EditorConfigDefaults editorConfig;
+		if (editorConfigPath == null || !Files.exists(editorConfigPath)) {
+			editorConfig = EditorConfigDefaults.Companion.getEMPTY_EDITOR_CONFIG_DEFAULTS();
+		} else {
+			editorConfig = EditorConfigDefaults.Companion.load(editorConfigPath, Collections.emptySet());
+		}
+
+		return new KtLintRuleEngine(
+				allRuleProviders,
+				editorConfig,
+				editorConfigOverride,
+				false,
+				path.getFileSystem())
+				.format(Code.Companion.fromPath(path), formatterCallback);
+	}
+
+	/**
+	 * Create EditorConfigOverride from user provided parameters.
+	 */
+	private static EditorConfigOverride createEditorConfigOverride(final List<Rule> rules, Map<String, Object> editorConfigOverrideMap) {
+		// Get properties from rules in the rule sets
+		Stream<EditorConfigProperty<?>> ruleProperties = rules.stream()
+				.flatMap(rule -> rule.getUsesEditorConfigProperties().stream());
+
+		// Create a mapping of properties to their names based on rule properties and default properties
+		Map<String, EditorConfigProperty<?>> supportedProperties = Stream
+				.concat(ruleProperties, DEFAULT_EDITOR_CONFIG_PROPERTIES.stream())
+				.distinct()
+				.collect(Collectors.toMap(EditorConfigProperty::getName, property -> property));
+
+		// Create config properties based on provided property names and values
+		@SuppressWarnings("unchecked")
+		Pair<EditorConfigProperty<?>, ?>[] properties = editorConfigOverrideMap.entrySet().stream()
+				.map(entry -> {
+					EditorConfigProperty<?> property = supportedProperties.get(entry.getKey());
+
+					if (property == null && entry.getKey().startsWith("ktlint_")) {
+						String[] parts = entry.getKey().substring(7).split("_", 2);
+						if (parts.length == 1) {
+							// convert ktlint_{ruleset} to RuleSetId
+							RuleSetId id = new RuleSetId(parts[0]);
+							property = RuleExecutionEditorConfigPropertyKt.createRuleSetExecutionEditorConfigProperty(id, RuleExecution.enabled);
+						} else {
+							// convert ktlint_{ruleset}_{rulename} to RuleId
+							RuleId id = new RuleId(parts[0] + ":" + parts[1]);
+							property = RuleExecutionEditorConfigPropertyKt.createRuleExecutionEditorConfigProperty(id, RuleExecution.enabled);
+						}
+					}
+
+					if (property == null) {
+						return null;
+					} else {
+						return new Pair<>(property, entry.getValue());
+					}
+				})
+				.filter(Objects::nonNull)
+				.toArray(Pair[]::new);
+
+		return EditorConfigOverride.Companion.from(properties);
+	}
+}
diff --git a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
index 1a11e8bcce..7ae0222566 100644
--- a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
+++ b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
@@ -33,22 +33,28 @@ public class KtlintFormatterFunc implements FormatterFunc.NeedsFile {
 
 	public KtlintFormatterFunc(String version, boolean isScript, FileSignature editorConfigPath, Map<String, String> userData,
 			Map<String, Object> editorConfigOverrideMap) {
-		int minorVersion = Integer.parseInt(version.split("\\.")[1]);
-		if (minorVersion >= 50) {
-			// Fixed `RuleId` and `RuleSetId` issues
-			// New argument to `EditorConfigDefaults.Companion.load(...)` for custom property type parsing
-			// New argument to `new KtLintRuleEngine(...)` to fail on usage of `treeCopyHandler` extension point
-			this.adapter = new KtLintCompat0Dot50Dot0Adapter();
-		} else if (minorVersion == 49) {
-			// Packages and modules moved around (`ktlint-core` -> `ktlint-rule-engine`)
-			// Experimental ruleset was replaced by implementing `Rule.Experimental` and checking the `ktlint_experimental` `.editorconfig` property
-			// `RuleId` and `RuleSetId` became inline classes (mangled to be unrepresentable in Java source code, so reflection is needed), tracked here: https://github.com/pinterest/ktlint/issues/2041
-			this.adapter = new KtLintCompat0Dot49Dot0Adapter();
-		} else if (minorVersion == 48) {
-			// ExperimentalParams lost two constructor arguments, EditorConfigProperty moved to its own class
-			this.adapter = new KtLintCompat0Dot48Dot0Adapter();
+		String[] versions = version.split("\\.");
+		int majorVersion = Integer.parseInt(versions[0]);
+		int minorVersion = Integer.parseInt(versions[1]);
+		if (majorVersion == 1) {
+			this.adapter = new KtLintCompat1Dot0Dot0Adapter();
 		} else {
-			throw new IllegalStateException("Ktlint versions < 0.48.0 not supported!");
+			if (minorVersion >= 50) {
+				// Fixed `RuleId` and `RuleSetId` issues
+				// New argument to `EditorConfigDefaults.Companion.load(...)` for custom property type parsing
+				// New argument to `new KtLintRuleEngine(...)` to fail on usage of `treeCopyHandler` extension point
+				this.adapter = new KtLintCompat0Dot50Dot0Adapter();
+			} else if (minorVersion == 49) {
+				// Packages and modules moved around (`ktlint-core` -> `ktlint-rule-engine`)
+				// Experimental ruleset was replaced by implementing `Rule.Experimental` and checking the `ktlint_experimental` `.editorconfig` property
+				// `RuleId` and `RuleSetId` became inline classes (mangled to be unrepresentable in Java source code, so reflection is needed), tracked here: https://github.com/pinterest/ktlint/issues/2041
+				this.adapter = new KtLintCompat0Dot49Dot0Adapter();
+			} else if (minorVersion == 48) {
+				// ExperimentalParams lost two constructor arguments, EditorConfigProperty moved to its own class
+				this.adapter = new KtLintCompat0Dot48Dot0Adapter();
+			} else {
+				throw new IllegalStateException("Ktlint versions < 0.48.0 not supported!");
+			}
 		}
 		this.editorConfigPath = editorConfigPath;
 		this.editorConfigOverrideMap = editorConfigOverrideMap;
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index 8f3fde5731..d08c59b839 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -36,10 +36,10 @@ public class KtLintStep {
 	// prevent direct instantiation
 	private KtLintStep() {}
 
-	private static final String DEFAULT_VERSION = "0.50.0";
+	private static final String DEFAULT_VERSION = "1.0.0";
 	static final String NAME = "ktlint";
-	static final String PACKAGE = "com.pinterest";
-	static final String MAVEN_COORDINATE = PACKAGE + ":ktlint:";
+	static final String MAVEN_COORDINATE_0_DOT = "com.pinterest:ktlint:";
+	static final String MAVEN_COORDINATE_1_DOT = "com.pinterest.ktlint:ktlint-cli:";
 
 	public static FormatterStep create(Provisioner provisioner) {
 		return create(defaultVersion(), provisioner);
@@ -110,7 +110,8 @@ static final class State implements Serializable {
 			this.version = version;
 			this.userData = new TreeMap<>(userData);
 			this.editorConfigOverride = new TreeMap<>(editorConfigOverride);
-			this.jarState = JarState.from(MAVEN_COORDINATE + version, provisioner);
+			this.jarState = JarState.from((version.startsWith("0.") ? MAVEN_COORDINATE_0_DOT : MAVEN_COORDINATE_1_DOT) + version,
+					provisioner);
 			this.editorConfigPath = editorConfigPath;
 			this.isScript = isScript;
 		}
diff --git a/lib/src/testCompatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java b/lib/src/testCompatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java
new file mode 100644
index 0000000000..5ed2517c6f
--- /dev/null
+++ b/lib/src/testCompatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.glue.ktlint.compat;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+public class KtLintCompat1Dot0Dot0AdapterTest {
+	@Test
+	public void testDefaults(@TempDir Path path) throws IOException {
+		KtLintCompat1Dot0Dot0Adapter KtLintCompat1Dot0Dot0Adapter = new KtLintCompat1Dot0Dot0Adapter();
+		String text = loadAndWriteText(path, "EmptyClassBody.kt");
+		final Path filePath = Paths.get(path.toString(), "EmptyClassBody.kt");
+
+		Map<String, String> userData = new HashMap<>();
+
+		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
+
+		String formatted = KtLintCompat1Dot0Dot0Adapter.format(text, filePath, false, null, userData, editorConfigOverrideMap);
+		assertEquals("class EmptyClassBody\n", formatted);
+	}
+
+	@Test
+	public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
+		KtLintCompat1Dot0Dot0Adapter KtLintCompat1Dot0Dot0Adapter = new KtLintCompat1Dot0Dot0Adapter();
+		String text = loadAndWriteText(path, "FailsNoSemicolons.kt");
+		final Path filePath = Paths.get(path.toString(), "FailsNoSemicolons.kt");
+
+		Map<String, String> userData = new HashMap<>();
+
+		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
+		editorConfigOverrideMap.put("indent_style", "tab");
+		editorConfigOverrideMap.put("ktlint_code_style", "intellij_idea");
+		editorConfigOverrideMap.put("ktlint_standard_no-semi", "disabled");
+
+		String formatted = KtLintCompat1Dot0Dot0Adapter.format(text, filePath, false, null, userData, editorConfigOverrideMap);
+		assertEquals("class FailsNoSemicolons {\n\tval i = 0;\n}\n", formatted);
+	}
+
+	private static String loadAndWriteText(Path path, String name) throws IOException {
+		try (InputStream is = KtLintCompat1Dot0Dot0AdapterTest.class.getResourceAsStream("/" + name)) {
+			Files.copy(is, path.resolve(name));
+		}
+		return new String(Files.readAllBytes(path.resolve(name)), StandardCharsets.UTF_8);
+	}
+
+}
diff --git a/lib/src/testCompatKtLint1Dot0Dot0/resources/EmptyClassBody.kt b/lib/src/testCompatKtLint1Dot0Dot0/resources/EmptyClassBody.kt
new file mode 100644
index 0000000000..7da53fb78d
--- /dev/null
+++ b/lib/src/testCompatKtLint1Dot0Dot0/resources/EmptyClassBody.kt
@@ -0,0 +1,3 @@
+class EmptyClassBody {
+
+}
diff --git a/lib/src/testCompatKtLint1Dot0Dot0/resources/FailsNoSemicolons.kt b/lib/src/testCompatKtLint1Dot0Dot0/resources/FailsNoSemicolons.kt
new file mode 100644
index 0000000000..4cf05ceacf
--- /dev/null
+++ b/lib/src/testCompatKtLint1Dot0Dot0/resources/FailsNoSemicolons.kt
@@ -0,0 +1,3 @@
+class FailsNoSemicolons {
+	val i = 0;
+}
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 944c07bb6e..9cc5019f57 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -399,7 +399,7 @@ Additionally, `editorConfigOverride` options will override what's supplied in `.
 spotless {
   kotlin {
     // version, userData and editorConfigOverride are all optional
-    ktlint("0.50.0")
+    ktlint("1.0.0")
       .userData(mapOf("android" to "true"))
       .setEditorConfigPath("$projectDir/config/.editorconfig")  // sample unusual placement
       .editorConfigOverride(mapOf("indent_size" to 2))
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
index ba6f1d8e2c..f3f360dc5d 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,13 @@ void testKtlint() throws Exception {
 
 	@Test
 	void testKtlintEditorConfigOverride() throws Exception {
-		writePomWithKotlinSteps("<ktlint><editorConfigOverride><ij_kotlin_allow_trailing_comma>true</ij_kotlin_allow_trailing_comma><ij_kotlin_allow_trailing_comma_on_call_site>true</ij_kotlin_allow_trailing_comma_on_call_site></editorConfigOverride></ktlint>");
+		writePomWithKotlinSteps("<ktlint>\n" +
+				"  <editorConfigOverride>\n" +
+				"    <ij_kotlin_allow_trailing_comma>true</ij_kotlin_allow_trailing_comma>\n" +
+				"    <ij_kotlin_allow_trailing_comma_on_call_site>true</ij_kotlin_allow_trailing_comma_on_call_site>\n" +
+				"    <ktlint_code_style>intellij_idea</ktlint_code_style>\n" +
+				"  </editorConfigOverride>\n" +
+				"</ktlint>");
 
 		String path = "src/main/kotlin/Main.kt";
 		setFile(path).toResource("kotlin/ktlint/experimentalEditorConfigOverride.dirty");
diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
index 5b62eeed48..0ccb47d1ed 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
@@ -74,6 +74,16 @@ void works0_50_0() {
 						"Wildcard import");
 	}
 
+	@Test
+	void works1_0_0() {
+		FormatterStep step = KtLintStep.create("1.0.0", TestProvisioner.mavenCentral());
+		StepHarnessWithFile.forStep(this, step)
+				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean")
+				.testResourceExceptionMsg("kotlin/ktlint/unsolvable.dirty").isEqualTo("Error on line: 1, column: 1\n" +
+						"rule: standard:no-wildcard-imports\n" +
+						"Wildcard import");
+	}
+
 	@Test
 	void behavior() {
 		FormatterStep step = KtLintStep.create(TestProvisioner.mavenCentral());

From 0224d3575f35e537f2cbc93e0903b984df389f44 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sun, 10 Sep 2023 02:00:45 +0800
Subject: [PATCH 1209/2068] Update changelogs

---
 CHANGES.md               | 2 ++
 plugin-gradle/CHANGES.md | 3 +++
 plugin-gradle/README.md  | 7 ++++++-
 plugin-maven/CHANGES.md  | 3 +++
 plugin-maven/README.md   | 3 ++-
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 1d78e8d932..c2d379a874 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* **POTENTIALLY BREAKING** Support Ktlint 1.0.0 ([#1808](https://github.com/diffplug/spotless/pull/1808)).
 
 ## [2.41.0] - 2023-08-29
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index eab7e32b2d..b66fcbc262 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,9 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Added
+* **POTENTIALLY BREAKING** Support Ktlint 1.0.0 ([#1808](https://github.com/diffplug/spotless/pull/1808)).
+  The default code style had been changed to `ktlint_official`, if you are upgrading from the old versions, may need to override the style in `editorConfigOverride`.
 
 ## [6.21.0] - 2023-08-29
 ### Added
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 9cc5019f57..9a4b84c4dd 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -402,7 +402,12 @@ spotless {
     ktlint("1.0.0")
       .userData(mapOf("android" to "true"))
       .setEditorConfigPath("$projectDir/config/.editorconfig")  // sample unusual placement
-      .editorConfigOverride(mapOf("indent_size" to 2))
+      .editorConfigOverride(
+        mapOf(
+          "indent_size" to 2,
+          "ktlint_code_style" to "intellij_idea",
+        )
+      )
   }
 }
 ```
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index f932806fcc..54f92898a1 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,9 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* **POTENTIALLY BREAKING** Support Ktlint 1.0.0 ([#1808](https://github.com/diffplug/spotless/pull/1808)).
+The default code style had been changed to `ktlint_official`, if you are upgrading from the old versions, may need to override the style in `editorConfigOverride`.
 
 ## [2.39.0] - 2023-08-29
 ### Added
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 74872ef61f..9419490d3e 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -409,10 +409,11 @@ Additionally, `editorConfigOverride` options will override what's supplied in `.
 
 ```xml
 <ktlint>
-  <version>0.43.2</version> <!-- optional -->
+  <version>1.0.0</version> <!-- optional -->
   <editorConfigOverride> <!-- optional -->
     <ij_kotlin_allow_trailing_comma>true</ij_kotlin_allow_trailing_comma>
     <ij_kotlin_allow_trailing_comma_on_call_site>true</ij_kotlin_allow_trailing_comma_on_call_site>
+    <ktlint_code_style>intellij_idea</ktlint_code_style>
   </editorConfigOverride>
 </ktlint>
 ```

From f32701212bf8d327c67d10c35316cb80dcdf577b Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sun, 10 Sep 2023 19:58:18 +0800
Subject: [PATCH 1210/2068] Migrate deprecated buildDir usages

https://docs.gradle.org/8.3/userguide/upgrading_version_8.html#project_builddir
---
 plugin-gradle/README.md                                   | 2 +-
 .../com/diffplug/gradle/spotless/FormatExtension.java     | 8 ++++----
 .../com/diffplug/gradle/spotless/JavascriptExtension.java | 2 +-
 .../gradle/spotless/RegisterDependenciesTask.java         | 2 +-
 .../diffplug/gradle/spotless/SpotlessDiagnoseTask.java    | 5 +++--
 .../java/com/diffplug/gradle/spotless/SpotlessTask.java   | 2 +-
 .../com/diffplug/gradle/spotless/TypescriptExtension.java | 4 ++--
 7 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index fcdcfc213a..f81b897a4a 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -1243,7 +1243,7 @@ To use a fixed binary, omit the `version` and specify a `pathToExe`:
 spotless {
   format 'rome', {
     target '**/*.js','**/*.ts','**/*.json'
-    rome().pathToExe("${project.buildDir.absolutePath}/bin/rome")
+    rome().pathToExe("${project.layout.buildDirectory.asFile.get().absolutePath}/bin/rome")
   }
 }
 ```
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index 7a62f8cabf..1f8b0c95b2 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -280,9 +280,9 @@ private final FileCollection parseTargetIsExclude(Object target, boolean isExclu
 					excludes.add(".gradle");
 				}
 				// no build folders (flatInclude means that subproject might not be subfolders, see https://github.com/diffplug/spotless/issues/121)
-				relativizeIfSubdir(excludes, dir, getProject().getBuildDir());
+				relativizeIfSubdir(excludes, dir, getProject().getLayout().getBuildDirectory().getAsFile().get());
 				for (Project subproject : getProject().getSubprojects()) {
-					relativizeIfSubdir(excludes, dir, subproject.getBuildDir());
+					relativizeIfSubdir(excludes, dir, subproject.getLayout().getBuildDirectory().getAsFile().get());
 				}
 				matchedFiles.exclude(excludes);
 			}
@@ -606,7 +606,7 @@ public T npmInstallCache(final Object npmInstallCache) {
 		}
 
 		public T npmInstallCache() {
-			this.npmInstallCache = new File(project.getBuildDir(), SPOTLESS_NPM_INSTALL_CACHE_DEFAULT_NAME);
+			this.npmInstallCache = new File(project.getLayout().getBuildDirectory().getAsFile().get(), SPOTLESS_NPM_INSTALL_CACHE_DEFAULT_NAME);
 			replaceStep();
 			return (T) this;
 		}
@@ -673,7 +673,7 @@ protected FormatterStep createStep() {
 					devDependencies,
 					provisioner(),
 					project.getProjectDir(),
-					project.getBuildDir(),
+					project.getLayout().getBuildDirectory().getAsFile().get(),
 					npmModulesCacheOrNull(),
 					new NpmPathResolver(npmFileOrNull(), nodeFileOrNull(), npmrcFileOrNull(), Arrays.asList(project.getProjectDir(), project.getRootDir())),
 					new com.diffplug.spotless.npm.PrettierConfig(
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
index 76ad5650ca..cd2682e971 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
@@ -107,7 +107,7 @@ public FormatterStep createStep() {
 					devDependencies,
 					provisioner(),
 					project.getProjectDir(),
-					project.getBuildDir(),
+					project.getLayout().getBuildDirectory().getAsFile().get(),
 					npmModulesCacheOrNull(),
 					new NpmPathResolver(npmFileOrNull(), nodeFileOrNull(), npmrcFileOrNull(), Arrays.asList(project.getProjectDir(), project.getRootDir())),
 					eslintConfig());
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RegisterDependenciesTask.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RegisterDependenciesTask.java
index bdeb9d7d94..b7ffd0a295 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RegisterDependenciesTask.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RegisterDependenciesTask.java
@@ -68,7 +68,7 @@ void setup() {
 		taskService = buildServices.registerIfAbsent("SpotlessTaskService" + compositeBuildSuffix, SpotlessTaskService.class, spec -> {});
 		usesService(taskService);
 		getBuildEventsListenerRegistry().onTaskCompletion(taskService);
-		unitOutput = new File(getProject().getBuildDir(), "tmp/spotless-register-dependencies");
+		unitOutput = new File(getProject().getLayout().getBuildDirectory().getAsFile().get(), "tmp/spotless-register-dependencies");
 	}
 
 	List<FormatterStep> steps = new ArrayList<>();
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessDiagnoseTask.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessDiagnoseTask.java
index f20957e650..6dcba72864 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessDiagnoseTask.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessDiagnoseTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,7 +43,8 @@ public SpotlessTask getSource() {
 	@SuppressFBWarnings("NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE")
 	public void performAction() throws IOException {
 		Path srcRoot = getProject().getProjectDir().toPath();
-		Path diagnoseRoot = getProject().getBuildDir().toPath().resolve("spotless-diagnose-" + source.formatName());
+		Path diagnoseRoot = getProject().getLayout().getBuildDirectory().getAsFile().get()
+				.toPath().resolve("spotless-diagnose-" + source.formatName());
 		getProject().delete(diagnoseRoot.toFile());
 		try (Formatter formatter = source.buildFormatter()) {
 			for (File file : source.target) {
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
index 2af9a80b7a..7b225eacd0 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
@@ -148,7 +148,7 @@ public void setTarget(Iterable<File> target) {
 		}
 	}
 
-	protected File outputDirectory = new File(getProject().getBuildDir(), "spotless/" + getName());
+	protected File outputDirectory = new File(getProject().getLayout().getBuildDirectory().getAsFile().get(), "spotless/" + getName());
 
 	@OutputDirectory
 	public File getOutputDirectory() {
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
index ddb7fbfc10..929ea4423b 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
@@ -118,7 +118,7 @@ public FormatterStep createStep() {
 					devDependencies,
 					provisioner(),
 					project.getProjectDir(),
-					project.getBuildDir(),
+					project.getLayout().getBuildDirectory().getAsFile().get(),
 					npmModulesCacheOrNull(),
 					new NpmPathResolver(npmFileOrNull(), nodeFileOrNull(), npmrcFileOrNull(), Arrays.asList(project.getProjectDir(), project.getRootDir())),
 					typedConfigFile(),
@@ -215,7 +215,7 @@ public FormatterStep createStep() {
 					devDependencies,
 					provisioner(),
 					project.getProjectDir(),
-					project.getBuildDir(),
+					project.getLayout().getBuildDirectory().getAsFile().get(),
 					npmModulesCacheOrNull(),
 					new NpmPathResolver(npmFileOrNull(), nodeFileOrNull(), npmrcFileOrNull(), Arrays.asList(project.getProjectDir(), project.getRootDir())),
 					eslintConfig());

From 49a64c43601f047c817f3d85ad132948d9bd799a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 10 Sep 2023 17:33:25 +0000
Subject: [PATCH 1211/2068] chore(deps): update plugin com.github.spotbugs to
 v5.1.3

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index a24c6d24d5..11ac98ec93 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,7 +12,7 @@ plugins {
 	// https://github.com/gradle-nexus/publish-plugin/releases
 	id 'io.github.gradle-nexus.publish-plugin' version '1.3.0' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
-	id 'com.github.spotbugs' version '5.0.14' apply false
+	id 'com.github.spotbugs' version '5.1.3' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
 	id 'com.diffplug.spotless-changelog' version '3.0.2' apply false
 	// https://github.com/diffplug/goomph/blob/main/CHANGES.md

From c3f286224947ae53a94d6618a877c564866852e6 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 13 Sep 2023 22:31:29 -0700
Subject: [PATCH 1212/2068] Move the changelog entries to the right place.

---
 CHANGES.md               | 4 ++--
 plugin-gradle/CHANGES.md | 4 ++--
 plugin-maven/CHANGES.md  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 52db59e7bd..2112f3aa2c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,7 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
-
+### Added
+* Added support for `google-java-format`'s `skip-javadoc-formatting` option. ([#1793](https://github.com/diffplug/spotless/pull/1793))
 ### Fixed
 * Added support for plugins when using Prettier version `3.0.0` and newer. ([#1802](https://github.com/diffplug/spotless/pull/1802))
 
@@ -18,7 +19,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * Add a `jsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
 * Support GJF own import order. ([#1780](https://github.com/diffplug/spotless/pull/1780))
-* Added support for `google-java-format`'s `skip-javadoc-formatting` option ([#1793](https://github.com/diffplug/spotless/pull/1793))
 ### Fixed
 * Use latest versions of popular style guides for `eslint` tests to fix failing `useEslintXoStandardRules` test. ([#1761](https://github.com/diffplug/spotless/pull/1761), [#1756](https://github.com/diffplug/spotless/issues/1756))
 * Add support for `prettier` version `3.0.0` and newer. ([#1760](https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 7ca1fd168e..e4360b02bb 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,7 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
-
+### Added
+* Added support for `google-java-format`'s `skip-javadoc-formatting` option ([#1793](https://github.com/diffplug/spotless/pull/1793))
 ### Fixed
 * Added support for plugins when using Prettier version `3.0.0` and newer. ([#1802](https://github.com/diffplug/spotless/pull/1802))
 
@@ -11,7 +12,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * Add a `jsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
 * Support GJF own import order. ([#1780](https://github.com/diffplug/spotless/pull/1780))
-* Added support for `google-java-format`'s `skip-javadoc-formatting` option ([#1793](https://github.com/diffplug/spotless/pull/1793))
 ### Fixed
 * Add support for `prettier` version `3.0.0` and newer. ([#1760](https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
 * Fix npm install calls when npm cache is not up-to-date. ([#1760](https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index e8e4081019..3bcc396f8d 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,7 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
-
+### Added
+* Added support for `google-java-format`'s `skip-javadoc-formatting` option ([#1793](https://github.com/diffplug/spotless/pull/1793))
 ### Fixed
 * Added support for plugins when using Prettier version `3.0.0` and newer. ([#1802](https://github.com/diffplug/spotless/pull/1802))
 
@@ -11,7 +12,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * Add a `jsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
 * Support GJF own import order. ([#1780](https://github.com/diffplug/spotless/pull/1780))
-* Added support for `google-java-format`'s `skip-javadoc-formatting` option ([#1793](https://github.com/diffplug/spotless/pull/1793))
 ### Fixed
 * Add support for `prettier` version `3.0.0` and newer. ([#1760](https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
 * Fix npm install calls when npm cache is not up-to-date. ([#1760](https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))

From 919b4811448e1ec11ceadfebc8bcfc8f48137ad4 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Fri, 15 Sep 2023 13:41:57 +0800
Subject: [PATCH 1213/2068] Fix ktlint tests

---
 .../com/diffplug/spotless/kotlin/KtLintStep.java     |  2 +-
 .../diffplug/gradle/spotless/GradleProvisioner.java  | 10 +++++++++-
 .../gradle/spotless/KotlinExtensionTest.java         |  1 +
 .../gradle/spotless/KotlinGradleExtensionTest.java   |  1 +
 .../java/com/diffplug/spotless/TestProvisioner.java  | 12 ++++++++++--
 .../com/diffplug/spotless/kotlin/KtLintStepTest.java |  8 ++++----
 6 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index d08c59b839..bedbb4a071 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -39,7 +39,7 @@ private KtLintStep() {}
 	private static final String DEFAULT_VERSION = "1.0.0";
 	static final String NAME = "ktlint";
 	static final String MAVEN_COORDINATE_0_DOT = "com.pinterest:ktlint:";
-	static final String MAVEN_COORDINATE_1_DOT = "com.pinterest.ktlint:ktlint-cli:";
+	public static final String MAVEN_COORDINATE_1_DOT = "com.pinterest.ktlint:ktlint-cli:";
 
 	public static FormatterStep create(Provisioner provisioner) {
 		return create(defaultVersion(), provisioner);
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
index e1129b3b0b..a92d583596 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
@@ -34,6 +34,7 @@
 import com.diffplug.common.base.Unhandled;
 import com.diffplug.common.collect.ImmutableList;
 import com.diffplug.spotless.Provisioner;
+import com.diffplug.spotless.kotlin.KtLintStep;
 
 /** Should be package-private. */
 class GradleProvisioner {
@@ -121,7 +122,14 @@ private static Provisioner forConfigurationContainer(Project project, Configurat
 				config.setCanBeConsumed(false);
 				config.setVisible(false);
 				config.attributes(attr -> {
-					attr.attribute(Bundling.BUNDLING_ATTRIBUTE, project.getObjects().named(Bundling.class, Bundling.EXTERNAL));
+					final String type;
+					// See https://github.com/diffplug/spotless/pull/1808#discussion_r1321682984.
+					if (mavenCoords.stream().anyMatch(it -> it.startsWith(KtLintStep.MAVEN_COORDINATE_1_DOT))) {
+						type = Bundling.SHADOWED;
+					} else {
+						type = Bundling.EXTERNAL;
+					}
+					attr.attribute(Bundling.BUNDLING_ATTRIBUTE, project.getObjects().named(Bundling.class, type));
 				});
 				return config.resolve();
 			} catch (Exception e) {
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
index 1c23728244..a2fa7c16e7 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
@@ -73,6 +73,7 @@ void withExperimentalEditorConfigOverride() throws IOException {
 				"spotless {",
 				"    kotlin {",
 				"        ktlint().editorConfigOverride([",
+				"            ktlint_code_style: \"intellij_idea\",",
 				"            ktlint_experimental: \"enabled\",",
 				"            ij_kotlin_allow_trailing_comma: true,",
 				"            ij_kotlin_allow_trailing_comma_on_call_site: true",
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
index 7dade5f2ff..6d7bdf351a 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
@@ -52,6 +52,7 @@ void withExperimentalEditorConfigOverride() throws IOException {
 				"spotless {",
 				"    kotlinGradle {",
 				"        ktlint().editorConfigOverride([",
+				"            ktlint_code_style: \"intellij_idea\",",
 				"            ktlint_experimental: \"enabled\",",
 				"            ij_kotlin_allow_trailing_comma: true,",
 				"            ij_kotlin_allow_trailing_comma_on_call_site: true",
diff --git a/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java b/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java
index 0d9ced4c9e..6a942d8ca3 100644
--- a/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java
+++ b/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,6 +39,7 @@
 import com.diffplug.common.base.Suppliers;
 import com.diffplug.common.collect.ImmutableSet;
 import com.diffplug.common.io.Files;
+import com.diffplug.spotless.kotlin.KtLintStep;
 
 public class TestProvisioner {
 	public static Project gradleProject(File dir) {
@@ -70,7 +71,14 @@ private static Provisioner createWithRepositories(Consumer<RepositoryHandler> re
 			config.setTransitive(withTransitives);
 			config.setDescription(mavenCoords.toString());
 			config.attributes(attr -> {
-				attr.attribute(Bundling.BUNDLING_ATTRIBUTE, project.getObjects().named(Bundling.class, Bundling.EXTERNAL));
+				final String type;
+				// See https://github.com/diffplug/spotless/pull/1808#discussion_r1321682984.
+				if (mavenCoords.stream().anyMatch(it -> it.startsWith(KtLintStep.MAVEN_COORDINATE_1_DOT))) {
+					type = Bundling.SHADOWED;
+				} else {
+					type = Bundling.EXTERNAL;
+				}
+				attr.attribute(Bundling.BUNDLING_ATTRIBUTE, project.getObjects().named(Bundling.class, type));
 			});
 			try {
 				return config.resolve();
diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
index 0ccb47d1ed..02526b46e6 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
@@ -80,8 +80,8 @@ void works1_0_0() {
 		StepHarnessWithFile.forStep(this, step)
 				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean")
 				.testResourceExceptionMsg("kotlin/ktlint/unsolvable.dirty").isEqualTo("Error on line: 1, column: 1\n" +
-						"rule: standard:no-wildcard-imports\n" +
-						"Wildcard import");
+						"rule: standard:no-empty-file\n" +
+						"File 'unsolvable.dirty' should not be empty");
 	}
 
 	@Test
@@ -90,8 +90,8 @@ void behavior() {
 		StepHarnessWithFile.forStep(this, step)
 				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean")
 				.testResourceExceptionMsg("kotlin/ktlint/unsolvable.dirty").isEqualTo("Error on line: 1, column: 1\n" +
-						"rule: standard:no-wildcard-imports\n" +
-						"Wildcard import");
+						"rule: standard:no-empty-file\n" +
+						"File 'unsolvable.dirty' should not be empty");
 	}
 
 	@Test

From a333813a787b38a604683a92e566a54c1051d34e Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <awa@xima.de>
Date: Fri, 15 Sep 2023 19:45:54 +0100
Subject: [PATCH 1214/2068] Add support for biome, #1804

---
 .../diffplug/spotless/rome/EBiomeFlavor.java  |  80 +++
 .../rome/RomeExecutableDownloader.java        | 101 ++-
 .../com/diffplug/spotless/rome/RomeStep.java  | 174 ++---
 .../gradle/spotless/FormatExtension.java      | 368 +++++++---
 .../gradle/spotless/JavascriptExtension.java  |  86 ++-
 .../gradle/spotless/JsonExtension.java        |  61 +-
 .../gradle/spotless/RomeStepConfig.java       | 100 +--
 .../gradle/spotless/TypescriptExtension.java  | 104 ++-
 .../gradle/spotless/BiomeIntegrationTest.java | 343 +++++++++
 .../gradle/spotless/RomeIntegrationTest.java  |   4 +-
 .../spotless/maven/generic/Biome.java         |  60 ++
 .../spotless/maven/generic/Format.java        |  14 +
 .../diffplug/spotless/maven/generic/Rome.java |  10 +-
 .../spotless/maven/javascript/BiomeJs.java    |  33 +
 .../spotless/maven/javascript/Javascript.java |   5 +
 .../spotless/maven/javascript/RomeJs.java     |   7 +
 .../spotless/maven/json/BiomeJson.java        |  33 +
 .../diffplug/spotless/maven/json/Json.java    |   5 +
 .../spotless/maven/json/RomeJson.java         |   7 +
 .../spotless/maven/rome/AbstractRome.java     |  68 +-
 .../spotless/maven/typescript/BiomeTs.java    |  33 +
 .../spotless/maven/typescript/RomeTs.java     |   7 +
 .../spotless/maven/typescript/Typescript.java |   5 +
 .../maven/MavenIntegrationHarness.java        |   5 +
 .../spotless/maven/biome/BiomeMavenTest.java  | 202 ++++++
 .../spotless/maven/rome/RomeMavenTest.java    |   3 +-
 .../biome/config/line-width-120.json          |  11 +
 .../resources/biome/config/line-width-80.json |  11 +
 .../src/main/resources/biome/js/fileAfter.cjs |   3 +
 .../src/main/resources/biome/js/fileAfter.js  |   3 +
 .../src/main/resources/biome/js/fileAfter.jsx |   3 +
 .../src/main/resources/biome/js/fileAfter.mjs |   3 +
 .../main/resources/biome/js/fileBefore.cjs    |   3 +
 .../src/main/resources/biome/js/fileBefore.js |   3 +
 .../main/resources/biome/js/fileBefore.jsx    |   4 +
 .../main/resources/biome/js/fileBefore.mjs    |   3 +
 .../resources/biome/js/longLineAfter120.js    |   1 +
 .../resources/biome/js/longLineAfter80.js     |  13 +
 .../main/resources/biome/js/longLineBefore.js |   1 +
 .../main/resources/biome/json/fileAfter.json  |   5 +
 .../main/resources/biome/json/fileBefore.json |   7 +
 .../src/main/resources/biome/ts/fileAfter.cts |   4 +
 .../src/main/resources/biome/ts/fileAfter.mts |   4 +
 .../src/main/resources/biome/ts/fileAfter.ts  |   4 +
 .../src/main/resources/biome/ts/fileAfter.tsx |   7 +
 .../main/resources/biome/ts/fileBefore.cts    |   4 +
 .../main/resources/biome/ts/fileBefore.mts    |   5 +
 .../src/main/resources/biome/ts/fileBefore.ts |   5 +
 .../main/resources/biome/ts/fileBefore.tsx    |   8 +
 .../diffplug/spotless/rome/RomeStepTest.java  | 657 ++++++++++++------
 50 files changed, 2114 insertions(+), 576 deletions(-)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/rome/EBiomeFlavor.java
 create mode 100644 plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Biome.java
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/BiomeJs.java
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/json/BiomeJson.java
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/BiomeTs.java
 create mode 100644 plugin-maven/src/test/java/com/diffplug/spotless/maven/biome/BiomeMavenTest.java
 create mode 100644 testlib/src/main/resources/biome/config/line-width-120.json
 create mode 100644 testlib/src/main/resources/biome/config/line-width-80.json
 create mode 100644 testlib/src/main/resources/biome/js/fileAfter.cjs
 create mode 100644 testlib/src/main/resources/biome/js/fileAfter.js
 create mode 100644 testlib/src/main/resources/biome/js/fileAfter.jsx
 create mode 100644 testlib/src/main/resources/biome/js/fileAfter.mjs
 create mode 100644 testlib/src/main/resources/biome/js/fileBefore.cjs
 create mode 100644 testlib/src/main/resources/biome/js/fileBefore.js
 create mode 100644 testlib/src/main/resources/biome/js/fileBefore.jsx
 create mode 100644 testlib/src/main/resources/biome/js/fileBefore.mjs
 create mode 100644 testlib/src/main/resources/biome/js/longLineAfter120.js
 create mode 100644 testlib/src/main/resources/biome/js/longLineAfter80.js
 create mode 100644 testlib/src/main/resources/biome/js/longLineBefore.js
 create mode 100644 testlib/src/main/resources/biome/json/fileAfter.json
 create mode 100644 testlib/src/main/resources/biome/json/fileBefore.json
 create mode 100644 testlib/src/main/resources/biome/ts/fileAfter.cts
 create mode 100644 testlib/src/main/resources/biome/ts/fileAfter.mts
 create mode 100644 testlib/src/main/resources/biome/ts/fileAfter.ts
 create mode 100644 testlib/src/main/resources/biome/ts/fileAfter.tsx
 create mode 100644 testlib/src/main/resources/biome/ts/fileBefore.cts
 create mode 100644 testlib/src/main/resources/biome/ts/fileBefore.mts
 create mode 100644 testlib/src/main/resources/biome/ts/fileBefore.ts
 create mode 100644 testlib/src/main/resources/biome/ts/fileBefore.tsx

diff --git a/lib/src/main/java/com/diffplug/spotless/rome/EBiomeFlavor.java b/lib/src/main/java/com/diffplug/spotless/rome/EBiomeFlavor.java
new file mode 100644
index 0000000000..e47662f154
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/rome/EBiomeFlavor.java
@@ -0,0 +1,80 @@
+package com.diffplug.spotless.rome;
+
+/**
+ * The flavor of Biome to use. Exists for compatibility reason, may be removed
+ * shortly.
+ * <p>
+ * Will be removed once the old Rome project is not supported anymore.
+ */
+public enum EBiomeFlavor {
+	/** The new forked Biome project. */
+	BIOME("biome", "1.2.0", "biome.json", "biome-%s-%s-%s",
+			"https://github.com/biomejs/biome/releases/download/cli%%2Fv%s/biome-%s"),
+
+	/**
+	 * The old deprecated Rome project.
+	 * 
+	 * @deprecated Will be removed once the old Rome project is not supported
+	 *             anymore.
+	 */
+	@Deprecated
+	ROME("rome", "12.0.0", "rome.json", "rome-%s-%s-%s",
+			"https://github.com/rome/tools/releases/download/cli%%2Fv%s/rome-%s");
+
+	private final String configName;
+	private final String defaultVersion;
+	private final String downloadFilePattern;
+	private final String shortName;
+	private final String urlPattern;
+
+	EBiomeFlavor(String shortName, String defaultVersion, String configName, String downloadFilePattern,
+			String urlPattern) {
+		this.shortName = shortName;
+		this.defaultVersion = defaultVersion;
+		this.configName = configName;
+		this.downloadFilePattern = downloadFilePattern;
+		this.urlPattern = urlPattern;
+	}
+
+	/**
+	 * @return The name of the default config file.
+	 */
+	public String configName() {
+		return configName;
+	}
+
+	/**
+	 * @return Default version to use when no version was set explicitly.
+	 */
+	public String defaultVersion() {
+		return defaultVersion;
+	}
+
+	/**
+	 * @return The pattern for {@link String#format(String, Object...)
+	 *         String.format()} for the file name of a Biome executable for a
+	 *         certain version and architecure. The first parameter is the platform,
+	 *         the second is the OS, the third is the architecture.
+	 */
+	public String getDownloadFilePattern() {
+		return downloadFilePattern;
+	}
+
+	/**
+	 * @return The pattern for {@link String#format(String, Object...)
+	 *         String.format()} for the URL where the executables can be downloaded.
+	 *         The first parameter is the version, the second parameter is the OS /
+	 *         platform.
+	 */
+	public String getUrlPattern() {
+		return urlPattern;
+	}
+
+	/**
+	 * @return The short name of this flavor, i.e. <code>rome</code> or
+	 *         <code>biome</code>.
+	 */
+	public String shortName() {
+		return shortName;
+	}
+}
\ No newline at end of file
diff --git a/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java b/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java
index 578916a54b..7ff0bdb622 100644
--- a/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java
+++ b/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java
@@ -38,8 +38,8 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * Downloader for the Rome executable:
- * <a href="https://github.com/rome/tools">https://github.com/rome/tools</a>.
+ * Downloader for the Biome executable:
+ * <a href="https://github.com/biomejs/biome">https://github.com/biomejs/biome</a>.
  */
 final class RomeExecutableDownloader {
 	private static final Logger logger = LoggerFactory.getLogger(RomeExecutableDownloader.class);
@@ -51,15 +51,7 @@ final class RomeExecutableDownloader {
 
 	/**
 	 * The pattern for {@link String#format(String, Object...) String.format()} for
-	 * the file name of a Rome executable for a certain version and architecure. The
-	 * first parameter is the platform, the second is the OS, the third is the
-	 * architecture.
-	 */
-	private static final String DOWNLOAD_FILE_PATTERN = "rome-%s-%s-%s";
-
-	/**
-	 * The pattern for {@link String#format(String, Object...) String.format()} for
-	 * the platform part of the Rome executable download URL. First parameter is the
+	 * the platform part of the Biome executable download URL. First parameter is the
 	 * OS, second parameter the architecture, the third the file extension.
 	 */
 	private static final String PLATFORM_PATTERN = "%s-%s%s";
@@ -70,13 +62,6 @@ final class RomeExecutableDownloader {
 	 */
 	private static final OpenOption[] READ_OPTIONS = {StandardOpenOption.READ};
 
-	/**
-	 * The pattern for {@link String#format(String, Object...) String.format()} for
-	 * the URL where the Rome executables can be downloaded. The first parameter is
-	 * the version, the second parameter is the OS / platform.
-	 */
-	private static final String URL_PATTERN = "https://github.com/rome/tools/releases/download/cli%%2Fv%s/rome-%s";
-
 	/**
 	 * {@link OpenOption Open options} for creating a new file, overwriting the
 	 * existing file if present.
@@ -84,25 +69,29 @@ final class RomeExecutableDownloader {
 	private static final OpenOption[] WRITE_OPTIONS = {StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING,
 			StandardOpenOption.WRITE};
 
-	private Path downloadDir;
+	private final Path downloadDir;
+
+	private final EBiomeFlavor flavor;
 
 	/**
-	 * Creates a new downloader for the Rome executable. The executable files are
+	 * Creates a new downloader for the Biome executable. The executable files are
 	 * stored in the given download directory.
 	 *
-	 * @param downloadDir Directory where
+	 * @param flavor Flavor of Biome to use.
+	 * @param downloadDir Directory where to store the downloaded executable.
 	 */
-	public RomeExecutableDownloader(Path downloadDir) {
+	public RomeExecutableDownloader(EBiomeFlavor flavor, Path downloadDir) {
+		this.flavor = flavor;
 		this.downloadDir = downloadDir;
 	}
 
 	/**
-	 * Downloads the Rome executable for the current platform from the network to
+	 * Downloads the Biome executable for the current platform from the network to
 	 * the download directory. When the executable exists already, it is
 	 * overwritten.
 	 *
-	 * @param version Desired Rome version.
-	 * @return The path to the Rome executable.
+	 * @param version Desired Biome version.
+	 * @return The path to the Biome executable.
 	 * @throws IOException           When the executable cannot be downloaded from
 	 *                               the network or the file system could not be
 	 *                               accessed.
@@ -121,7 +110,7 @@ public Path download(String version) throws IOException, InterruptedException {
 		if (executableDir != null) {
 			Files.createDirectories(executableDir);
 		}
-		logger.info("Attempting to download Rome from '{}' to '{}'", url, executablePath);
+		logger.info("Attempting to download Biome from '{}' to '{}'", url, executablePath);
 		var request = HttpRequest.newBuilder(URI.create(url)).GET().build();
 		var handler = BodyHandlers.ofFile(executablePath, WRITE_OPTIONS);
 		var response = HttpClient.newBuilder().followRedirects(Redirect.NORMAL).build().send(request, handler);
@@ -133,19 +122,19 @@ public Path download(String version) throws IOException, InterruptedException {
 			throw new IOException("Failed to download file from " + url + ", file is empty or does not exist");
 		}
 		writeChecksumFile(downloadedFile, checksumPath);
-		logger.debug("Rome was downloaded successfully to '{}'", downloadedFile);
+		logger.debug("Biome was downloaded successfully to '{}'", downloadedFile);
 		return downloadedFile;
 	}
 
 	/**
-	 * Ensures that the Rome executable for the current platform exists in the
+	 * Ensures that the Biome executable for the current platform exists in the
 	 * download directory. When the executable does not exist in the download
-	 * directory, an attempt is made to download the Rome executable from the
+	 * directory, an attempt is made to download the Biome executable from the
 	 * network. When the executable exists already, no attempt to download it again
 	 * is made.
 	 *
-	 * @param version Desired Rome version.
-	 * @return The path to the Rome executable.
+	 * @param version Desired Biome version.
+	 * @return The path to the Biome executable.
 	 * @throws IOException           When the executable cannot be downloaded from
 	 *                               the network or the file system could not be
 	 *                               accessed.
@@ -157,23 +146,23 @@ public Path download(String version) throws IOException, InterruptedException {
 	 */
 	public Path ensureDownloaded(String version) throws IOException, InterruptedException {
 		var platform = Platform.guess();
-		logger.debug("Ensuring that Rome for platform '{}' is downloaded", platform);
+		logger.debug("Ensuring that Biome for platform '{}' is downloaded", platform);
 		var existing = findDownloaded(version);
 		if (existing.isPresent()) {
-			logger.debug("Rome was already downloaded, using executable at '{}'", existing.get());
+			logger.debug("Biome was already downloaded, using executable at '{}'", existing.get());
 			return existing.get();
 		} else {
-			logger.debug("Rome was not yet downloaded, attempting to download executable");
+			logger.debug("Biome was not yet downloaded, attempting to download executable");
 			return download(version);
 		}
 	}
 
 	/**
-	 * Attempts to find the Rome executable for the current platform in the download
+	 * Attempts to find the Biome executable for the current platform in the download
 	 * directory. No attempt is made to download the executable from the network.
 	 *
-	 * @param version Desired Rome version.
-	 * @return The path to the Rome executable.
+	 * @param version Desired Biome version.
+	 * @return The path to the Biome executable.
 	 * @throws IOException           When the executable does not exists in the
 	 *                               download directory, or when the file system
 	 *                               could not be accessed.
@@ -184,7 +173,7 @@ public Path ensureDownloaded(String version) throws IOException, InterruptedExce
 	public Optional<Path> findDownloaded(String version) throws IOException {
 		var platform = Platform.guess();
 		var executablePath = getExecutablePath(version, platform);
-		logger.debug("Checking rome executable at {}", executablePath);
+		logger.debug("Checking Biome executable at {}", executablePath);
 		return checkFileWithChecksum(executablePath) ? Optional.ofNullable(executablePath) : Optional.empty();
 	}
 
@@ -248,12 +237,12 @@ private String computeChecksum(Path file, String algorithm) throws IOException {
 	}
 
 	/**
-	 * Finds the code name for the given operating system used by the Rome
+	 * Finds the code name for the given operating system used by the Biome
 	 * executable download URL.
 	 *
 	 * @param os Desired operating system.
-	 * @return Code name for the Rome download URL.
-	 * @throws IOException When the given OS is not supported by Rome.
+	 * @return Code name for the Biome download URL.
+	 * @throws IOException When the given OS is not supported by Biome.
 	 */
 	private String getArchitectureCodeName(Architecture architecture) throws IOException {
 		switch (architecture) {
@@ -281,28 +270,28 @@ private Path getChecksumPath(Path file) {
 	}
 
 	/**
-	 * Finds the URL from which the Rome executable can be downloaded.
+	 * Finds the URL from which the Biome executable can be downloaded.
 	 *
-	 * @param version  Desired Rome version.
+	 * @param version  Desired Biome version.
 	 * @param platform Desired platform.
-	 * @return The URL for the Rome executable.
-	 * @throws IOException When the platform is not supported by Rome.
+	 * @return The URL for the Biome executable.
+	 * @throws IOException When the platform is not supported by Biome.
 	 */
 	private String getDownloadUrl(String version, Platform platform) throws IOException {
 		var osCodeName = getOsCodeName(platform.getOs());
 		var architectureCodeName = getArchitectureCodeName(platform.getArchitecture());
 		var extension = getDownloadUrlExtension(platform.getOs());
 		var platformString = String.format(PLATFORM_PATTERN, osCodeName, architectureCodeName, extension);
-		return String.format(URL_PATTERN, version, platformString);
+		return String.format(flavor.getUrlPattern(), version, platformString);
 	}
 
 	/**
-	 * Finds the file extension of the Rome download URL for the given operating
+	 * Finds the file extension of the Biome download URL for the given operating
 	 * system.
 	 *
 	 * @param os Desired operating system.
-	 * @return Extension for the Rome download URL.
-	 * @throws IOException When the given OS is not supported by Rome.
+	 * @return Extension for the Biome download URL.
+	 * @throws IOException When the given OS is not supported by Biome.
 	 */
 	private String getDownloadUrlExtension(OS os) throws IOException {
 		switch (os) {
@@ -318,27 +307,27 @@ private String getDownloadUrlExtension(OS os) throws IOException {
 	}
 
 	/**
-	 * Finds the path on the file system for the Rome executable with a given
+	 * Finds the path on the file system for the Biome executable with a given
 	 * version and platform.
 	 *
-	 * @param version  Desired Rome version.
+	 * @param version  Desired Biome version.
 	 * @param platform Desired platform.
-	 * @return The path for the Rome executable.
+	 * @return The path for the Biome executable.
 	 */
 	private Path getExecutablePath(String version, Platform platform) {
 		var os = platform.getOs().name().toLowerCase(Locale.ROOT);
 		var arch = platform.getArchitecture().name().toLowerCase(Locale.ROOT);
-		var fileName = String.format(DOWNLOAD_FILE_PATTERN, os, arch, version);
+		var fileName = String.format(flavor.getDownloadFilePattern(), os, arch, version);
 		return downloadDir.resolve(fileName);
 	}
 
 	/**
-	 * Finds the code name for the given operating system used by the Rome
+	 * Finds the code name for the given operating system used by the Biome
 	 * executable download URL.
 	 *
 	 * @param os Desired operating system.
-	 * @return Code name for the Rome download URL.
-	 * @throws IOException When the given OS is not supported by Rome.
+	 * @return Code name for the Biome download URL.
+	 * @throws IOException When the given OS is not supported by Biome.
 	 */
 	private String getOsCodeName(OS os) throws IOException {
 		switch (os) {
diff --git a/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java b/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java
index d6a3e62669..88c35c8662 100644
--- a/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java
@@ -38,16 +38,16 @@
 import com.diffplug.spotless.ProcessRunner;
 
 /**
- * formatter step that formats JavaScript and TypeScript code with Rome:
- * <a href= "https://github.com/rome/tools">https://github.com/rome/tools</a>.
- * It delegates to the Rome executable. The Rome executable is downloaded from
+ * formatter step that formats JavaScript and TypeScript code with Biome:
+ * <a href= "https://github.com/biomejs/biome">https://github.com/biomejs/biome</a>.
+ * It delegates to the Biome executable. The Rome executable is downloaded from
  * the network when no executable path is provided explicitly.
  */
 public class RomeStep {
 	private static final Logger logger = LoggerFactory.getLogger(RomeStep.class);
 
 	/**
-	 * Path to the directory with the {@code rome.json} config file, can be
+	 * Path to the directory with the {@code biome.json} config file, can be
 	 * <code>null</code>, in which case the defaults are used.
 	 */
 	private String configPath;
@@ -55,7 +55,7 @@ public class RomeStep {
 	/**
 	 * The language (syntax) of the input files to format. When <code>null</code> or
 	 * the empty string, the language is detected automatically from the file name.
-	 * Currently the following languages are supported by Rome:
+	 * Currently the following languages are supported by Biome:
 	 * <ul>
 	 * <li>js (JavaScript)</li>
 	 * <li>jsx (JavaScript + JSX)</li>
@@ -71,7 +71,13 @@ public class RomeStep {
 	private String language;
 
 	/**
-	 * Path to the Rome executable. Can be <code>null</code>, but either a path to
+	 * Biome flavor to use. Will be removed once we stop supporting the deprecated Rome project.
+	 */
+	@Deprecated
+	private final EBiomeFlavor flavor;
+
+	/**
+	 * Path to the Biome executable. Can be <code>null</code>, but either a path to
 	 * the executable of a download directory and version must be given. The path
 	 * must be either an absolute path, or a file name without path separators. If
 	 * the latter, it is interpreted as a command in the user's path.
@@ -79,46 +85,48 @@ public class RomeStep {
 	private final String pathToExe;
 
 	/**
-	 * Absolute path to the download directory for storing the download Rome
+	 * Absolute path to the download directory for storing the download Biome
 	 * executable. Can be <code>null</code>, but either a path to the executable of
 	 * a download directory and version must be given.
 	 */
 	private final String downloadDir;
 
 	/**
-	 * Version of Rome to download. Can be <code>null</code>, but either a path to
+	 * Version of Biome to download. Can be <code>null</code>, but either a path to
 	 * the executable of a download directory and version must be given.
 	 */
 	private final String version;
 
 	/**
-	 * @return The name of this format step, i.e. {@code rome}.
+	 * @return The name of this format step, i.e. <code>biome</code> or <code>rome</code>.
 	 */
-	public static String name() {
-		return "rome";
+	public String name() {
+		return flavor.shortName();
 	}
 
 	/**
-	 * Creates a Rome step that format code by downloading to the given Rome
+	 * Creates a Biome step that format code by downloading to the given Biome
 	 * version. The executable is downloaded from the network.
 	 *
-	 * @param version     Version of the Rome executable to download.
+	 * @param flavor Flavor of Biome to use.
+	 * @param version     Version of the Biome executable to download.
 	 * @param downloadDir Directory where to place the downloaded executable.
-	 * @return A new Rome step that download the executable from the network.
+	 * @return A new Biome step that download the executable from the network.
 	 */
-	public static RomeStep withExeDownload(String version, String downloadDir) {
-		return new RomeStep(version, null, downloadDir);
+	public static RomeStep withExeDownload(EBiomeFlavor flavor, String version, String downloadDir) {
+		return new RomeStep(flavor, version, null, downloadDir);
 	}
 
 	/**
-	 * Creates a Rome step that formats code by delegating to the Rome executable
+	 * Creates a Biome step that formats code by delegating to the Biome executable
 	 * located at the given path.
 	 *
-	 * @param pathToExe Path to the Rome executable to use.
-	 * @return A new Rome step that format with the given executable.
+	 * @param flavor Flavor of Biome to use.
+	 * @param pathToExe Path to the Biome executable to use.
+	 * @return A new Biome step that format with the given executable.
 	 */
-	public static RomeStep withExePath(String pathToExe) {
-		return new RomeStep(null, pathToExe, null);
+	public static RomeStep withExePath(EBiomeFlavor flavor, String pathToExe) {
+		return new RomeStep(flavor, null, pathToExe, null);
 	}
 
 	/**
@@ -140,21 +148,21 @@ private static void attemptToAddPosixPermission(Path file, PosixFilePermission p
 	}
 
 	/**
-	 * Finds the default version for Rome when no version is specified explicitly.
+	 * Finds the default version for Biome when no version is specified explicitly.
 	 * Over time this will become outdated -- people should always specify the
 	 * version explicitly!
 	 *
-	 * @return The default version for Rome.
+	 * @return The default version for Biome.
 	 */
-	private static String defaultVersion() {
-		return "12.0.0";
+	private static String defaultVersion(EBiomeFlavor flavor) {
+		return flavor.defaultVersion();
 	}
 
 	/**
 	 * Attempts to make the given file executable. This is a best-effort attempt,
 	 * any errors are swallowed. Depending on the OS, the file might still be
 	 * executable even if this method fails. The user will get a descriptive error
-	 * later when we attempt to execute the Rome executable.
+	 * later when we attempt to execute the Biome executable.
 	 *
 	 * @param filePath Path to the file to make executable.
 	 */
@@ -187,60 +195,64 @@ private static String resolveNameAgainstPath(String name) throws IOException, In
 	}
 
 	/**
-	 * Checks the Rome config path. When the config path does not exist or when it
-	 * does not contain a file named {@code rome.json}, an error is thrown.
+	 * Checks the Biome config path. When the config path does not exist or when it
+	 * does not contain a file named {@code biome.json}, an error is thrown.
 	 */
-	private static void validateRomeConfigPath(String configPath) {
+	private static void validateBiomeConfigPath(EBiomeFlavor flavor, String configPath) {
 		if (configPath == null) {
 			return;
 		}
 		var path = Paths.get(configPath);
-		var config = path.resolve("rome.json");
+		var config = path.resolve(flavor.configName());
 		if (!Files.exists(path)) {
-			throw new IllegalArgumentException("Rome config directory does not exist: " + path);
+			throw new IllegalArgumentException("Biome config directory does not exist: " + path);
 		}
 		if (!Files.exists(config)) {
-			throw new IllegalArgumentException("Rome config does not exist: " + config);
+			throw new IllegalArgumentException("Biome config does not exist: " + config);
 		}
 	}
 
 	/**
-	 * Checks the Rome executable file. When the file does not exist, an error is
+	 * Checks the Biome executable file. When the file does not exist, an error is
 	 * thrown.
 	 */
-	private static void validateRomeExecutable(String resolvedPathToExe) {
+	private static void validateBiomeExecutable(String resolvedPathToExe) {
 		if (!new File(resolvedPathToExe).isFile()) {
-			throw new IllegalArgumentException("Rome executable does not exist: " + resolvedPathToExe);
+			throw new IllegalArgumentException("Biome executable does not exist: " + resolvedPathToExe);
 		}
 	}
 
 	/**
-	 * Creates a new Rome step with the configuration from the given builder.
+	 * Creates a new Biome step with the configuration from the given builder.
 	 *
-	 * @param builder Builder with the configuration to use.
+	 * @param flavor Flavor of Biome to use.
+	 * @param version     Version of the Biome executable to download.
+	 * @param pathToExe Path to the Biome executable to use.
+	 * @param downloadDir Directory where to place the downloaded executable.
 	 */
-	private RomeStep(String version, String pathToExe, String downloadDir) {
-		this.version = version != null && !version.isBlank() ? version : defaultVersion();
+	private RomeStep(EBiomeFlavor flavor, String version, String pathToExe, String downloadDir) {
+		this.flavor = flavor;
+		this.version = version != null && !version.isBlank() ? version : defaultVersion(flavor);
 		this.pathToExe = pathToExe;
 		this.downloadDir = downloadDir;
 	}
 
 	/**
 	 * Creates a formatter step with the current configuration, which formats code
-	 * by passing it to the Rome executable.
+	 * by passing it to the Biome executable.
 	 *
-	 * @return A new formatter step for formatting with Rome.
+	 * @return A new formatter step for formatting with Biome.
 	 */
 	public FormatterStep create() {
 		return FormatterStep.createLazy(name(), this::createState, State::toFunc);
 	}
 
 	/**
-	 * Sets the path to the directory with the {@code rome.json} config file. When
+	 * Sets the path to the directory with the {@code biome.json} config file. When
 	 * no config path is set, the default configuration is used.
 	 *
-	 * @param configPath Config path to use. Must point to a directory which contain
-	 *                   a file named {@code rome.json}.
+	 * @param configPath Config path to use. Must point to a directory which contains
+	 *                   a file named {@code biome.json}.
 	 * @return This builder instance for chaining method calls.
 	 */
 	public RomeStep withConfigPath(String configPath) {
@@ -251,7 +263,7 @@ public RomeStep withConfigPath(String configPath) {
 	/**
 	 * Sets the language of the files to format When no language is set, it is
 	 * determined automatically from the file name. The following languages are
-	 * currently supported by Rome.
+	 * currently supported by Biome.
 	 *
 	 * <ul>
 	 * <li>js (JavaScript)</li>
@@ -274,41 +286,41 @@ public RomeStep withLanguage(String language) {
 	}
 
 	/**
-	 * Resolves the Rome executable, possibly downloading it from the network, and
+	 * Resolves the Biome executable, possibly downloading it from the network, and
 	 * creates a new state instance with the resolved executable that can format
-	 * code via Rome.
+	 * code via Biome.
 	 *
-	 * @return The state instance for formatting code via Rome.
+	 * @return The state instance for formatting code via Biome.
 	 * @throws IOException          When any file system or network operations
-	 *                              failed, such as when the Rome executable could
+	 *                              failed, such as when the Biome executable could
 	 *                              not be downloaded, or when the given executable
 	 *                              does not exist.
-	 * @throws InterruptedException When the Rome executable needs to be downloaded
+	 * @throws InterruptedException When the Biome executable needs to be downloaded
 	 *                              and this thread was interrupted while waiting
 	 *                              for the download to complete.
 	 */
 	private State createState() throws IOException, InterruptedException {
 		var resolvedPathToExe = resolveExe();
-		validateRomeExecutable(resolvedPathToExe);
-		validateRomeConfigPath(configPath);
-		logger.debug("Using Rome executable located at  '{}'", resolvedPathToExe);
+		validateBiomeExecutable(resolvedPathToExe);
+		validateBiomeConfigPath(flavor, configPath);
+		logger.debug("Using Biome executable located at  '{}'", resolvedPathToExe);
 		var exeSignature = FileSignature.signAsList(Collections.singleton(new File(resolvedPathToExe)));
 		makeExecutable(resolvedPathToExe);
 		return new State(resolvedPathToExe, exeSignature, configPath, language);
 	}
 
 	/**
-	 * Resolves the path to the Rome executable, given the configuration of this
-	 * step. When the path to the Rome executable is given explicitly, that path is
-	 * used as-is. Otherwise, at attempt is made to download the Rome executable for
+	 * Resolves the path to the Biome executable, given the configuration of this
+	 * step. When the path to the Biome executable is given explicitly, that path is
+	 * used as-is. Otherwise, at attempt is made to download the Biome executable for
 	 * the configured version from the network, unless it was already downloaded and
 	 * is available in the cache.
 	 *
-	 * @return The path to the resolved Rome executable.
+	 * @return The path to the resolved Biome executable.
 	 * @throws IOException          When any file system or network operations
-	 *                              failed, such as when the Rome executable could
+	 *                              failed, such as when the Biome executable could
 	 *                              not be downloaded.
-	 * @throws InterruptedException When the Rome executable needs to be downloaded
+	 * @throws InterruptedException When the Biome executable needs to be downloaded
 	 *                              and this thread was interrupted while waiting
 	 *                              for the download to complete.
 	 */
@@ -321,7 +333,7 @@ private String resolveExe() throws IOException, InterruptedException {
 				return pathToExe;
 			}
 		} else {
-			var downloader = new RomeExecutableDownloader(Paths.get(downloadDir));
+			var downloader = new RomeExecutableDownloader(flavor, Paths.get(downloadDir));
 			var downloaded = downloader.ensureDownloaded(version).toString();
 			makeExecutable(downloaded);
 			return downloaded;
@@ -329,7 +341,7 @@ private String resolveExe() throws IOException, InterruptedException {
 	}
 
 	/**
-	 * The internal state used by the Rome formatter. A state instance is created
+	 * The internal state used by the Biome formatter. A state instance is created
 	 * when the spotless plugin for Maven or Gradle is executed, and reused for all
 	 * formatting requests for different files. The lifetime of the instance ends
 	 * when the Maven or Gradle plugin was successfully executed.
@@ -349,7 +361,7 @@ private static class State implements Serializable {
 		private final FileSignature exeSignature;
 
 		/**
-		 * The optional path to the directory with the {@code rome.json} config file.
+		 * The optional path to the directory with the {@code biome.json} config file.
 		 */
 		private final String configPath;
 
@@ -360,12 +372,12 @@ private static class State implements Serializable {
 		private final String language;
 
 		/**
-		 * Creates a new state for instance which can format code with the given Rome
+		 * Creates a new state for instance which can format code with the given Biome
 		 * executable.
 		 *
-		 * @param exe          Path to the Rome executable.
-		 * @param exeSignature Signature (e.g. SHA-256 checksum) of the Rome executable.
-		 * @param configPath   Path to the optional directory with the {@code rome.json}
+		 * @param exe          Path to the Biome executable.
+		 * @param exeSignature Signature (e.g. SHA-256 checksum) of the Biome executable.
+		 * @param configPath   Path to the optional directory with the {@code biome.json}
 		 *                     config file, can be <code>null</code>, in which case the
 		 *                     defaults are used.
 		 */
@@ -377,13 +389,13 @@ private State(String exe, FileSignature exeSignature, String configPath, String
 		}
 
 		/**
-		 * Builds the list of arguments for the command that executes Rome to format a
+		 * Builds the list of arguments for the command that executes Biome to format a
 		 * piece of code passed via stdin.
 		 *
 		 * @param file File to format.
-		 * @return The Rome command to use for formatting code.
+		 * @return The Biome command to use for formatting code.
 		 */
-		private String[] buildRomeCommand(File file) {
+		private String[] buildBiomeCommand(File file) {
 			var fileName = resolveFileName(file);
 			var argList = new ArrayList<String>();
 			argList.add(pathToExe);
@@ -398,37 +410,37 @@ private String[] buildRomeCommand(File file) {
 		}
 
 		/**
-		 * Formats the given piece of code by delegating to the Rome executable. The
-		 * code is passed to Rome via stdin, the file name is used by Rome only to
+		 * Formats the given piece of code by delegating to the Biome executable. The
+		 * code is passed to Biome via stdin, the file name is used by Biome only to
 		 * determine the code syntax (e.g. JavaScript or TypeScript).
 		 *
-		 * @param runner Process runner for invoking the Rome executable.
+		 * @param runner Process runner for invoking the Biome executable.
 		 * @param input  Code to format.
 		 * @param file   File to format.
 		 * @return The formatted code.
 		 * @throws IOException          When a file system error occurred while
-		 *                              executing Rome.
+		 *                              executing Biome.
 		 * @throws InterruptedException When this thread was interrupted while waiting
-		 *                              for Rome to finish formatting.
+		 *                              for Biome to finish formatting.
 		 */
 		private String format(ProcessRunner runner, String input, File file) throws IOException, InterruptedException {
 			var stdin = input.getBytes(StandardCharsets.UTF_8);
-			var args = buildRomeCommand(file);
+			var args = buildBiomeCommand(file);
 			if (logger.isDebugEnabled()) {
-				logger.debug("Running Rome comand to format code: '{}'", String.join(", ", args));
+				logger.debug("Running Biome comand to format code: '{}'", String.join(", ", args));
 			}
 			return runner.exec(stdin, args).assertExitZero(StandardCharsets.UTF_8);
 		}
 
 		/**
-		 * The Rome executable currently does not have a parameter to specify the
-		 * expected language / syntax. Rome always determined the language from the file
+		 * The Biome executable currently does not have a parameter to specify the
+		 * expected language / syntax. Biome always determined the language from the file
 		 * extension. This method returns the file name for the desired language when a
 		 * language was requested explicitly, or the file name of the input file for
 		 * auto detection.
 		 *
 		 * @param file File to be formatted.
-		 * @return The file name to pass to the Rome executable.
+		 * @return The file name to pass to the Biome executable.
 		 */
 		private String resolveFileName(File file) {
 			var name = file.getName();
@@ -454,7 +466,7 @@ private String resolveFileName(File file) {
 				return "tsx".equals(ext) ? name : "file.tsx";
 			case "json":
 				return "json".equals(ext) ? name : "file.json";
-			// so that we can support new languages such as css or yaml when Rome adds
+			// so that we can support new languages such as css or yaml when Biome adds
 			// support for them without having to change the code
 			default:
 				return "file." + language;
@@ -463,7 +475,7 @@ private String resolveFileName(File file) {
 
 		/**
 		 * Creates a new formatter function for formatting a piece of code by delegating
-		 * to the Rome executable.
+		 * to the Biome executable.
 		 *
 		 * @return A formatter function for formatting code.
 		 */
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index 1f8b0c95b2..61fb0a6e5b 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -67,6 +67,7 @@
 import com.diffplug.spotless.generic.TrimTrailingWhitespaceStep;
 import com.diffplug.spotless.npm.NpmPathResolver;
 import com.diffplug.spotless.npm.PrettierFormatterStep;
+import com.diffplug.spotless.rome.EBiomeFlavor;
 
 import groovy.lang.Closure;
 
@@ -95,29 +96,44 @@ private String formatName() {
 
 	LineEnding lineEndings;
 
-	/** Returns the line endings to use (defaults to {@link SpotlessExtensionImpl#getLineEndings()}. */
+	/**
+	 * Returns the line endings to use (defaults to
+	 * {@link SpotlessExtensionImpl#getLineEndings()}.
+	 */
 	public LineEnding getLineEndings() {
 		return lineEndings == null ? spotless.getLineEndings() : lineEndings;
 	}
 
-	/** Sets the line endings to use (defaults to {@link SpotlessExtensionImpl#getLineEndings()}. */
+	/**
+	 * Sets the line endings to use (defaults to
+	 * {@link SpotlessExtensionImpl#getLineEndings()}.
+	 */
 	public void setLineEndings(LineEnding lineEndings) {
 		this.lineEndings = requireNonNull(lineEndings);
 	}
 
 	Charset encoding;
 
-	/** Returns the encoding to use (defaults to {@link SpotlessExtensionImpl#getEncoding()}. */
+	/**
+	 * Returns the encoding to use (defaults to
+	 * {@link SpotlessExtensionImpl#getEncoding()}.
+	 */
 	public Charset getEncoding() {
 		return encoding == null ? spotless.getEncoding() : encoding;
 	}
 
-	/** Sets the encoding to use (defaults to {@link SpotlessExtensionImpl#getEncoding()}. */
+	/**
+	 * Sets the encoding to use (defaults to
+	 * {@link SpotlessExtensionImpl#getEncoding()}.
+	 */
 	public void setEncoding(String name) {
 		setEncoding(Charset.forName(requireNonNull(name)));
 	}
 
-	/** Sentinel to distinguish between "don't ratchet this format" and "use spotless parent format". */
+	/**
+	 * Sentinel to distinguish between "don't ratchet this format" and "use spotless
+	 * parent format".
+	 */
 	private static final String RATCHETFROM_NOT_SET_AT_FORMAT_LEVEL = " not set at format level ";
 
 	private String ratchetFrom = RATCHETFROM_NOT_SET_AT_FORMAT_LEVEL;
@@ -128,8 +144,8 @@ public String getRatchetFrom() {
 	}
 
 	/**
-	 * Allows you to override the value from the parent {@link SpotlessExtension#setRatchetFrom(String)}
-	 * for this specific format.
+	 * Allows you to override the value from the parent
+	 * {@link SpotlessExtension#setRatchetFrom(String)} for this specific format.
 	 */
 	public void setRatchetFrom(String ratchetFrom) {
 		this.ratchetFrom = ratchetFrom;
@@ -140,7 +156,10 @@ public void ratchetFrom(String ratchetFrom) {
 		setRatchetFrom(ratchetFrom);
 	}
 
-	/** Sets the encoding to use (defaults to {@link SpotlessExtensionImpl#getEncoding()}. */
+	/**
+	 * Sets the encoding to use (defaults to
+	 * {@link SpotlessExtensionImpl#getEncoding()}.
+	 */
 	public void setEncoding(Charset charset) {
 		encoding = requireNonNull(charset);
 	}
@@ -157,7 +176,10 @@ public void ignoreErrorForPath(String relativePath) {
 		exceptionPolicy.excludePath(requireNonNull(relativePath));
 	}
 
-	/** Sets encoding to use (defaults to {@link SpotlessExtensionImpl#getEncoding()}). */
+	/**
+	 * Sets encoding to use (defaults to
+	 * {@link SpotlessExtensionImpl#getEncoding()}).
+	 */
 	public void encoding(String charset) {
 		setEncoding(charset);
 	}
@@ -180,31 +202,33 @@ protected boolean isLicenseHeaderStep(FormatterStep formatterStep) {
 	}
 
 	/**
-	 * Sets which files should be formatted.  Files to be formatted = (target - targetExclude).
+	 * Sets which files should be formatted. Files to be formatted = (target -
+	 * targetExclude).
 	 *
 	 * When this method is called multiple times, only the last call has any effect.
 	 *
-	 * FileCollections pass through raw.
-	 * Strings are treated as the 'include' arg to fileTree, with project.rootDir as the dir.
-	 * List<String> are treated as the 'includes' arg to fileTree, with project.rootDir as the dir.
-	 * Anything else gets passed to getProject().files().
+	 * FileCollections pass through raw. Strings are treated as the 'include' arg to
+	 * fileTree, with project.rootDir as the dir. List<String> are treated as the
+	 * 'includes' arg to fileTree, with project.rootDir as the dir. Anything else
+	 * gets passed to getProject().files().
 	 *
-	 * If you pass any strings that start with "**\/*", this method will automatically filter out
-	 * "build", ".gradle", and ".git" folders.
+	 * If you pass any strings that start with "**\/*", this method will
+	 * automatically filter out "build", ".gradle", and ".git" folders.
 	 */
 	public void target(Object... targets) {
 		this.target = parseTargetsIsExclude(targets, false);
 	}
 
 	/**
-	 * Sets which files will be excluded from formatting.  Files to be formatted = (target - targetExclude).
+	 * Sets which files will be excluded from formatting. Files to be formatted =
+	 * (target - targetExclude).
 	 *
 	 * When this method is called multiple times, only the last call has any effect.
 	 *
-	 * FileCollections pass through raw.
-	 * Strings are treated as the 'include' arg to fileTree, with project.rootDir as the dir.
-	 * List<String> are treated as the 'includes' arg to fileTree, with project.rootDir as the dir.
-	 * Anything else gets passed to getProject().files().
+	 * FileCollections pass through raw. Strings are treated as the 'include' arg to
+	 * fileTree, with project.rootDir as the dir. List<String> are treated as the
+	 * 'includes' arg to fileTree, with project.rootDir as the dir. Anything else
+	 * gets passed to getProject().files().
 	 */
 	public void targetExclude(Object... targets) {
 		this.targetExclude = parseTargetsIsExclude(targets, true);
@@ -244,10 +268,10 @@ private FileCollection parseTargetsIsExclude(Object[] targets, boolean isExclude
 	}
 
 	/**
-	 * FileCollections pass through raw.
-	 * Strings are treated as the 'include' arg to fileTree, with project.rootDir as the dir.
-	 * List<String> are treated as the 'includes' arg to fileTree, with project.rootDir as the dir.
-	 * Anything else gets passed to getProject().files().
+	 * FileCollections pass through raw. Strings are treated as the 'include' arg to
+	 * fileTree, with project.rootDir as the dir. List<String> are treated as the
+	 * 'includes' arg to fileTree, with project.rootDir as the dir. Anything else
+	 * gets passed to getProject().files().
 	 */
 	protected final FileCollection parseTarget(Object target) {
 		return parseTargetIsExclude(target, false);
@@ -264,7 +288,8 @@ private final FileCollection parseTargetIsExclude(Object target, boolean isExclu
 			String targetString = (String) target;
 			matchedFiles.include(targetString);
 
-			// since people are likely to do '**/*.md', we want to make sure to exclude folders
+			// since people are likely to do '**/*.md', we want to make sure to exclude
+			// folders
 			// they don't want to format which will slow down the operation greatly
 			// but we only want to do that if they are *including* - if they are specifying
 			// what they want to exclude, we shouldn't filter at all
@@ -279,7 +304,8 @@ private final FileCollection parseTargetIsExclude(Object target, boolean isExclu
 				if (getProject() == getProject().getRootProject()) {
 					excludes.add(".gradle");
 				}
-				// no build folders (flatInclude means that subproject might not be subfolders, see https://github.com/diffplug/spotless/issues/121)
+				// no build folders (flatInclude means that subproject might not be subfolders,
+				// see https://github.com/diffplug/spotless/issues/121)
 				relativizeIfSubdir(excludes, dir, getProject().getLayout().getBuildDirectory().getAsFile().get());
 				for (Project subproject : getProject().getSubprojects()) {
 					relativizeIfSubdir(excludes, dir, subproject.getLayout().getBuildDirectory().getAsFile().get());
@@ -300,8 +326,8 @@ private static void relativizeIfSubdir(List<String> relativePaths, File root, Fi
 	}
 
 	/**
-	 * Returns the relative path between root and dest,
-	 * or null if dest is not a child of root.
+	 * Returns the relative path between root and dest, or null if dest is not a
+	 * child of root.
 	 */
 	static @Nullable String relativize(File root, File dest) {
 		String rootPath = root.getAbsolutePath();
@@ -321,7 +347,8 @@ public void addStep(FormatterStep newStep) {
 		requireNonNull(newStep);
 		int existingIdx = getExistingStepIdx(newStep.getName());
 		if (existingIdx != -1) {
-			throw new GradleException("Multiple steps with name '" + newStep.getName() + "' for spotless format '" + formatName() + "'");
+			throw new GradleException(
+					"Multiple steps with name '" + newStep.getName() + "' for spotless format '" + formatName() + "'");
 		}
 		steps.add(newStep);
 	}
@@ -333,7 +360,10 @@ public void addStep(Function<Provisioner, FormatterStep> createStepFn) {
 		addStep(newStep);
 	}
 
-	/** Returns the index of the existing step with the given name, or -1 if no such step exists. */
+	/**
+	 * Returns the index of the existing step with the given name, or -1 if no such
+	 * step exists.
+	 */
 	protected int getExistingStepIdx(String stepName) {
 		for (int i = 0; i < steps.size(); ++i) {
 			if (steps.get(i).getName().equals(stepName)) {
@@ -347,7 +377,8 @@ protected int getExistingStepIdx(String stepName) {
 	protected void replaceStep(FormatterStep replacementStep) {
 		int existingIdx = getExistingStepIdx(replacementStep.getName());
 		if (existingIdx == -1) {
-			throw new GradleException("Cannot replace step '" + replacementStep.getName() + "' for spotless format '" + formatName() + "' because it hasn't been added yet.");
+			throw new GradleException("Cannot replace step '" + replacementStep.getName() + "' for spotless format '"
+					+ formatName() + "' because it hasn't been added yet.");
 		}
 		steps.set(existingIdx, replacementStep);
 	}
@@ -358,20 +389,21 @@ public void clearSteps() {
 	}
 
 	/**
-	 * An optional performance optimization if you are using any of the {@code custom}
-	 * methods.  If you aren't explicitly calling {@code custom}, then this method
-	 * has no effect.
+	 * An optional performance optimization if you are using any of the
+	 * {@code custom} methods. If you aren't explicitly calling {@code custom}, then
+	 * this method has no effect.
 	 *
-	 * Spotless tracks what files have changed from run to run, so that it can run faster
-	 * by only checking files which have changed, or whose formatting steps have changed.
-	 * If you use the {@code custom} methods, then gradle can never mark
-	 * your files as {@code up-to-date}, because it can't know if perhaps the behavior of your
-	 * custom function has changed.
+	 * Spotless tracks what files have changed from run to run, so that it can run
+	 * faster by only checking files which have changed, or whose formatting steps
+	 * have changed. If you use the {@code custom} methods, then gradle can never
+	 * mark your files as {@code up-to-date}, because it can't know if perhaps the
+	 * behavior of your custom function has changed.
 	 *
-	 * If you set {@code bumpThisNumberIfACustomStepChanges( <some number> )}, then spotless will
-	 * assume that the custom rules have not changed if the number has not changed.  If a
-	 * custom rule does change, then you must bump the number so that spotless will know
-	 * that it must recheck the files it has already checked.
+	 * If you set {@code bumpThisNumberIfACustomStepChanges( <some number> )}, then
+	 * spotless will assume that the custom rules have not changed if the number has
+	 * not changed. If a custom rule does change, then you must bump the number so
+	 * that spotless will know that it must recheck the files it has already
+	 * checked.
 	 */
 	public void bumpThisNumberIfACustomStepChanges(int number) {
 		globalState = number;
@@ -389,13 +421,19 @@ protected Integer calculateState() throws Exception {
 		}
 	}
 
-	/** Adds a custom step. Receives a string with unix-newlines, must return a string with unix newlines. */
+	/**
+	 * Adds a custom step. Receives a string with unix-newlines, must return a
+	 * string with unix newlines.
+	 */
 	public void custom(String name, Closure<String> formatter) {
 		requireNonNull(formatter, "formatter");
 		custom(name, formatter::call);
 	}
 
-	/** Adds a custom step. Receives a string with unix-newlines, must return a string with unix newlines. */
+	/**
+	 * Adds a custom step. Receives a string with unix-newlines, must return a
+	 * string with unix newlines.
+	 */
 	public void custom(String name, FormatterFunc formatter) {
 		requireNonNull(formatter, "formatter");
 		addStep(FormatterStep.createLazy(name, () -> globalState, unusedState -> formatter));
@@ -447,9 +485,11 @@ public void nativeCmd(String name, String pathToExe, List<String> arguments) {
 	}
 
 	/**
-	 * Created by {@link FormatExtension#licenseHeader(String, String)} or {@link FormatExtension#licenseHeaderFile(Object, String)}.
-	 * For most language-specific formats (e.g. java, scala, etc.) you can omit the second {@code delimiter} argument, because it is supplied
-	 * automatically ({@link HasBuiltinDelimiterForLicense}).
+	 * Created by {@link FormatExtension#licenseHeader(String, String)} or
+	 * {@link FormatExtension#licenseHeaderFile(Object, String)}. For most
+	 * language-specific formats (e.g. java, scala, etc.) you can omit the second
+	 * {@code delimiter} argument, because it is supplied automatically
+	 * ({@link HasBuiltinDelimiterForLicense}).
 	 */
 	public class LicenseHeaderConfig {
 		LicenseHeaderStep builder;
@@ -478,8 +518,8 @@ public LicenseHeaderConfig(LicenseHeaderStep builder) {
 		}
 
 		/**
-		 * @param delimiter
-		 *            Spotless will look for a line that starts with this regular expression pattern to know what the "top" is.
+		 * @param delimiter Spotless will look for a line that starts with this regular
+		 *                  expression pattern to know what the "top" is.
 		 */
 		public LicenseHeaderConfig delimiter(String delimiter) {
 			builder = builder.withDelimiter(delimiter);
@@ -488,8 +528,8 @@ public LicenseHeaderConfig delimiter(String delimiter) {
 		}
 
 		/**
-		 * @param yearSeparator
-		 *           The characters used to separate the first and last years in multi years patterns.
+		 * @param yearSeparator The characters used to separate the first and last years
+		 *                      in multi years patterns.
 		 */
 		public LicenseHeaderConfig yearSeparator(String yearSeparator) {
 			builder = builder.withYearSeparator(yearSeparator);
@@ -504,9 +544,11 @@ public LicenseHeaderConfig skipLinesMatching(String skipLinesMatching) {
 		}
 
 		/**
-		 * @param updateYearWithLatest
-		 *           Will turn {@code 2004} into {@code 2004-2020}, and {@code 2004-2019} into {@code 2004-2020}
-		 *           Default value is false, unless {@link SpotlessExtensionImpl#ratchetFrom(String)} is used, in which case default value is true.
+		 * @param updateYearWithLatest Will turn {@code 2004} into {@code 2004-2020},
+		 *                             and {@code 2004-2019} into {@code 2004-2020}
+		 *                             Default value is false, unless
+		 *                             {@link SpotlessExtensionImpl#ratchetFrom(String)}
+		 *                             is used, in which case default value is true.
 		 */
 		public LicenseHeaderConfig updateYearWithLatest(boolean updateYearWithLatest) {
 			this.updateYearWithLatest = updateYearWithLatest;
@@ -516,7 +558,8 @@ public LicenseHeaderConfig updateYearWithLatest(boolean updateYearWithLatest) {
 
 		FormatterStep createStep() {
 			return builder.withYearModeLazy(() -> {
-				if ("true".equals(spotless.project.findProperty(LicenseHeaderStep.FLAG_SET_LICENSE_HEADER_YEARS_FROM_GIT_HISTORY()))) {
+				if ("true".equals(spotless.project
+						.findProperty(LicenseHeaderStep.FLAG_SET_LICENSE_HEADER_YEARS_FROM_GIT_HISTORY()))) {
 					return YearMode.SET_FROM_GIT;
 				} else {
 					boolean updateYear = updateYearWithLatest == null ? getRatchetFrom() != null : updateYearWithLatest;
@@ -527,22 +570,22 @@ FormatterStep createStep() {
 	}
 
 	/**
-	 * @param licenseHeader
-	 *            Content that should be at the top of every file.
-	 * @param delimiter
-	 *            Spotless will look for a line that starts with this regular expression pattern to know what the "top" is.
+	 * @param licenseHeader Content that should be at the top of every file.
+	 * @param delimiter     Spotless will look for a line that starts with this
+	 *                      regular expression pattern to know what the "top" is.
 	 */
 	public LicenseHeaderConfig licenseHeader(String licenseHeader, String delimiter) {
-		LicenseHeaderConfig config = new LicenseHeaderConfig(LicenseHeaderStep.headerDelimiter(licenseHeader, delimiter));
+		LicenseHeaderConfig config = new LicenseHeaderConfig(
+				LicenseHeaderStep.headerDelimiter(licenseHeader, delimiter));
 		addStep(config.createStep());
 		return config;
 	}
 
 	/**
-	 * @param licenseHeaderFile
-	 *            Content that should be at the top of every file.
-	 * @param delimiter
-	 *            Spotless will look for a line that starts with this regular expression pattern to know what the "top" is.
+	 * @param licenseHeaderFile Content that should be at the top of every file.
+	 * @param delimiter         Spotless will look for a line that starts with this
+	 *                          regular expression pattern to know what the "top"
+	 *                          is.
 	 */
 	public LicenseHeaderConfig licenseHeaderFile(Object licenseHeaderFile, String delimiter) {
 		LicenseHeaderConfig config = new LicenseHeaderConfig(LicenseHeaderStep.headerDelimiter(() -> {
@@ -606,7 +649,8 @@ public T npmInstallCache(final Object npmInstallCache) {
 		}
 
 		public T npmInstallCache() {
-			this.npmInstallCache = new File(project.getLayout().getBuildDirectory().getAsFile().get(), SPOTLESS_NPM_INSTALL_CACHE_DEFAULT_NAME);
+			this.npmInstallCache = new File(project.getLayout().getBuildDirectory().getAsFile().get(),
+					SPOTLESS_NPM_INSTALL_CACHE_DEFAULT_NAME);
 			replaceStep();
 			return (T) this;
 		}
@@ -669,34 +713,93 @@ public PrettierConfig config(final Map<String, Object> prettierConfig) {
 		@Override
 		protected FormatterStep createStep() {
 			final Project project = getProject();
-			return PrettierFormatterStep.create(
-					devDependencies,
-					provisioner(),
-					project.getProjectDir(),
-					project.getLayout().getBuildDirectory().getAsFile().get(),
-					npmModulesCacheOrNull(),
-					new NpmPathResolver(npmFileOrNull(), nodeFileOrNull(), npmrcFileOrNull(), Arrays.asList(project.getProjectDir(), project.getRootDir())),
+			return PrettierFormatterStep.create(devDependencies, provisioner(), project.getProjectDir(),
+					project.getLayout().getBuildDirectory().getAsFile().get(), npmModulesCacheOrNull(),
+					new NpmPathResolver(npmFileOrNull(), nodeFileOrNull(), npmrcFileOrNull(),
+							Arrays.asList(project.getProjectDir(), project.getRootDir())),
 					new com.diffplug.spotless.npm.PrettierConfig(
 							this.prettierConfigFile != null ? project.file(this.prettierConfigFile) : null,
 							this.prettierConfig));
 		}
 	}
 
+	/**
+	 * Generic Biome formatter step that detects the language of the input file from
+	 * the file name. It should be specified as a formatter step for a generic
+	 * <code>format{ ... }</code>.
+	 */
+	public class BiomeGeneric extends RomeStepConfig<BiomeGeneric> {
+		@Nullable
+		String language;
+
+		/**
+		 * Creates a new Rome config that downloads the Rome executable for the given
+		 * version from the network.
+		 * 
+		 * @param version Rome version to use. The default version is used when
+		 *                <code>null</code>.
+		 */
+		public BiomeGeneric(String version) {
+			super(getProject(), FormatExtension.this::replaceStep, EBiomeFlavor.BIOME, version);
+		}
+
+		/**
+		 * Sets the language (syntax) of the input files to format. When
+		 * <code>null</code> or the empty string, the language is detected automatically
+		 * from the file name. Currently the following languages are supported by Biome:
+		 * <ul>
+		 * <li>js (JavaScript)</li>
+		 * <li>jsx (JavaScript + JSX)</li>
+		 * <li>js? (JavaScript or JavaScript + JSX, depending on the file
+		 * extension)</li>
+		 * <li>ts (TypeScript)</li>
+		 * <li>tsx (TypeScript + JSX)</li>
+		 * <li>ts? (TypeScript or TypeScript + JSX, depending on the file
+		 * extension)</li>
+		 * <li>json (JSON)</li>
+		 * </ul>
+		 * 
+		 * @param language The language of the files to format.
+		 * @return This step for further configuration.
+		 */
+		public BiomeGeneric language(String language) {
+			this.language = language;
+			replaceStep();
+			return this;
+		}
+
+		@Override
+		protected String getLanguage() {
+			return language;
+		}
+
+		@Override
+		protected BiomeGeneric getThis() {
+			return this;
+		}
+	}
+
 	/**
 	 * Generic Rome formatter step that detects the language of the input file from
 	 * the file name. It should be specified as a formatter step for a generic
 	 * <code>format{ ... }</code>.
+	 * 
+	 * @deprecated Rome has transitioned to Biome. This will be removed shortly.
 	 */
+	@Deprecated
 	public class RomeGeneric extends RomeStepConfig<RomeGeneric> {
 		@Nullable
 		String language;
 
 		/**
-		 * Creates a new Rome config that downloads the Rome executable for the given version from the network.
-		 * @param version Rome version to use. The default version is used when <code>null</code>.
+		 * Creates a new Rome config that downloads the Rome executable for the given
+		 * version from the network.
+		 * 
+		 * @param version Rome version to use. The default version is used when
+		 *                <code>null</code>.
 		 */
 		public RomeGeneric(String version) {
-			super(getProject(), FormatExtension.this::replaceStep, version);
+			super(getProject(), FormatExtension.this::replaceStep, EBiomeFlavor.ROME, version);
 		}
 
 		/**
@@ -714,6 +817,7 @@ public RomeGeneric(String version) {
 		 * extension)</li>
 		 * <li>json (JSON)</li>
 		 * </ul>
+		 * 
 		 * @param language The language of the files to format.
 		 * @return This step for further configuration.
 		 */
@@ -751,16 +855,40 @@ public PrettierConfig prettier(Map<String, String> devDependencies) {
 		return prettierConfig;
 	}
 
+	/**
+	 * Defaults to downloading the default Biome version from the network. To work
+	 * offline, you can specify the path to the Biome executable via
+	 * {@code biome().pathToExe(...)}.
+	 */
+	public RomeStepConfig<?> biome() {
+		return biome(null);
+	}
+
+	/** Downloads the given Biome version from the network. */
+	public RomeStepConfig<?> biome(String version) {
+		var biomeConfig = new BiomeGeneric(version);
+		addStep(biomeConfig.createStep());
+		return biomeConfig;
+	}
+
 	/**
 	 * Defaults to downloading the default Rome version from the network. To work
 	 * offline, you can specify the path to the Rome executable via
 	 * {@code rome().pathToExe(...)}.
+	 * 
+	 * @deprecated Use {@link #biome(String)}.
 	 */
+	@Deprecated
 	public RomeStepConfig<?> rome() {
 		return rome(null);
 	}
 
-	/** Downloads the given Rome version from the network. */
+	/**
+	 * Downloads the given Rome version from the network.
+	 * 
+	 * @deprecated Use {@link #biome(String)}.
+	 */
+	@Deprecated
 	public RomeStepConfig<?> rome(String version) {
 		var romeConfig = new RomeGeneric(version);
 		addStep(romeConfig.createStep());
@@ -844,8 +972,9 @@ public void withinBlocks(String name, String open, String close, Action<FormatEx
 	}
 
 	/**
-	 * Same as {@link #withinBlocks(String, String, String, Action)}, except you can specify
-	 * any language-specific subclass of {@link FormatExtension} to get language-specific steps.
+	 * Same as {@link #withinBlocks(String, String, String, Action)}, except you can
+	 * specify any language-specific subclass of {@link FormatExtension} to get
+	 * language-specific steps.
 	 *
 	 * <pre>
 	 * spotless {
@@ -858,33 +987,44 @@ public void withinBlocks(String name, String open, String close, Action<FormatEx
 	 *     ...
 	 * </pre>
 	 */
-	public <T extends FormatExtension> void withinBlocks(String name, String open, String close, Class<T> clazz, Action<T> configure) {
+	public <T extends FormatExtension> void withinBlocks(String name, String open, String close, Class<T> clazz,
+			Action<T> configure) {
 		withinBlocksHelper(PipeStepPair.named(name).openClose(open, close), clazz, configure);
 	}
 
-	/** Same as {@link #withinBlocks(String, String, String, Action)}, except instead of an open/close pair, you specify a regex with exactly one capturing group. */
+	/**
+	 * Same as {@link #withinBlocks(String, String, String, Action)}, except instead
+	 * of an open/close pair, you specify a regex with exactly one capturing group.
+	 */
 	public void withinBlocksRegex(String name, String regex, Action<FormatExtension> configure) {
 		withinBlocksRegex(name, regex, FormatExtension.class, configure);
 	}
 
-	/** Same as {@link #withinBlocksRegex(String, String, Action)}, except you can specify any language-specific subclass of {@link FormatExtension} to get language-specific steps. */
-	public <T extends FormatExtension> void withinBlocksRegex(String name, String regex, Class<T> clazz, Action<T> configure) {
+	/**
+	 * Same as {@link #withinBlocksRegex(String, String, Action)}, except you can
+	 * specify any language-specific subclass of {@link FormatExtension} to get
+	 * language-specific steps.
+	 */
+	public <T extends FormatExtension> void withinBlocksRegex(String name, String regex, Class<T> clazz,
+			Action<T> configure) {
 		withinBlocksHelper(PipeStepPair.named(name).regex(regex), clazz, configure);
 	}
 
-	private <T extends FormatExtension> void withinBlocksHelper(PipeStepPair.Builder builder, Class<T> clazz, Action<T> configure) {
+	private <T extends FormatExtension> void withinBlocksHelper(PipeStepPair.Builder builder, Class<T> clazz,
+			Action<T> configure) {
 		// create the sub-extension
 		T formatExtension = spotless.instantiateFormatExtension(clazz);
 		// configure it
 		configure.execute(formatExtension);
 		// create a step which applies all of those steps as sub-steps
-		FormatterStep step = builder.buildStepWhichAppliesSubSteps(spotless.project.getRootDir().toPath(), formatExtension.steps);
+		FormatterStep step = builder.buildStepWhichAppliesSubSteps(spotless.project.getRootDir().toPath(),
+				formatExtension.steps);
 		addStep(step);
 	}
 
 	/**
-	 * Given a regex with *exactly one capturing group*, disables formatting
-	 * inside that captured group.
+	 * Given a regex with *exactly one capturing group*, disables formatting inside
+	 * that captured group.
 	 */
 	public void toggleOffOnRegex(String regex) {
 		this.togglePair = PipeStepPair.named(PipeStepPair.defaultToggleName()).regex(regex).buildPair();
@@ -900,7 +1040,10 @@ public void toggleOffOn() {
 		toggleOffOn(PipeStepPair.defaultToggleOff(), PipeStepPair.defaultToggleOn());
 	}
 
-	/** Undoes all previous calls to {@link #toggleOffOn()} and {@link #toggleOffOn(String, String)}. */
+	/**
+	 * Undoes all previous calls to {@link #toggleOffOn()} and
+	 * {@link #toggleOffOn(String, String)}.
+	 */
 	public void toggleOffOnDisable() {
 		this.togglePair = null;
 	}
@@ -923,11 +1066,13 @@ protected void setupTask(SpotlessTask task) {
 			steps = this.steps;
 		}
 		if (targetExcludeContentPattern != null) {
-			steps.replaceAll(formatterStep -> formatterStep.filterByContent(OnMatch.EXCLUDE, targetExcludeContentPattern));
+			steps.replaceAll(
+					formatterStep -> formatterStep.filterByContent(OnMatch.EXCLUDE, targetExcludeContentPattern));
 		}
 		task.setSteps(steps);
 		Directory projectDir = getProject().getLayout().getProjectDirectory();
-		task.setLineEndingsPolicy(getProject().provider(() -> getLineEndings().createPolicy(projectDir.getAsFile(), () -> totalTarget)));
+		task.setLineEndingsPolicy(
+				getProject().provider(() -> getLineEndings().createPolicy(projectDir.getAsFile(), () -> totalTarget)));
 		spotless.getRegisterDependenciesTask().hookSubprojectTask(task);
 		task.setupRatchet(getRatchetFrom() != null ? getRatchetFrom() : "");
 	}
@@ -943,31 +1088,38 @@ public SpotlessApply createIndependentApplyTask(String taskName) {
 	}
 
 	/**
-	 * Creates an independent {@link SpotlessApply} for (very) unusual circumstances.
+	 * Creates an independent {@link SpotlessApply} for (very) unusual
+	 * circumstances.
 	 *
-	 * Most users will not want this method.  In the rare case that you want to create
-	 * a {@code SpotlessApply} which is independent of the normal Spotless machinery, this will
-	 * let you do that.
+	 * Most users will not want this method. In the rare case that you want to
+	 * create a {@code SpotlessApply} which is independent of the normal Spotless
+	 * machinery, this will let you do that.
 	 *
-	 * The returned task will not be hooked up to the global {@code spotlessApply}, and there will be no corresponding {@code check} task.
+	 * The returned task will not be hooked up to the global {@code spotlessApply},
+	 * and there will be no corresponding {@code check} task.
 	 *
 	 * The task name must not end with `Apply`.
 	 *
-	 * NOTE: does not respect the rarely-used <a href="https://github.com/diffplug/spotless/blob/b7f8c551a97dcb92cc4b0ee665448da5013b30a3/plugin-gradle/README.md#can-i-apply-spotless-to-specific-files">{@code spotlessFiles} property</a>.
+	 * NOTE: does not respect the rarely-used <a href=
+	 * "https://github.com/diffplug/spotless/blob/b7f8c551a97dcb92cc4b0ee665448da5013b30a3/plugin-gradle/README.md#can-i-apply-spotless-to-specific-files">{@code spotlessFiles}
+	 * property</a>.
 	 */
 	public TaskProvider<SpotlessApply> createIndependentApplyTaskLazy(String taskName) {
-		Preconditions.checkArgument(!taskName.endsWith(SpotlessExtension.APPLY), "Task name must not end with " + SpotlessExtension.APPLY);
-		TaskProvider<SpotlessTaskImpl> spotlessTask = spotless.project.getTasks().register(taskName + SpotlessTaskService.INDEPENDENT_HELPER, SpotlessTaskImpl.class, task -> {
-			task.init(spotless.getRegisterDependenciesTask().getTaskService());
-			setupTask(task);
-			// clean removes the SpotlessCache, so we have to run after clean
-			task.mustRunAfter(BasePlugin.CLEAN_TASK_NAME);
-		});
+		Preconditions.checkArgument(!taskName.endsWith(SpotlessExtension.APPLY),
+				"Task name must not end with " + SpotlessExtension.APPLY);
+		TaskProvider<SpotlessTaskImpl> spotlessTask = spotless.project.getTasks()
+				.register(taskName + SpotlessTaskService.INDEPENDENT_HELPER, SpotlessTaskImpl.class, task -> {
+					task.init(spotless.getRegisterDependenciesTask().getTaskService());
+					setupTask(task);
+					// clean removes the SpotlessCache, so we have to run after clean
+					task.mustRunAfter(BasePlugin.CLEAN_TASK_NAME);
+				});
 		// create the apply task
-		TaskProvider<SpotlessApply> applyTask = spotless.project.getTasks().register(taskName, SpotlessApply.class, task -> {
-			task.dependsOn(spotlessTask);
-			task.init(spotlessTask.get());
-		});
+		TaskProvider<SpotlessApply> applyTask = spotless.project.getTasks().register(taskName, SpotlessApply.class,
+				task -> {
+					task.dependsOn(spotlessTask);
+					task.init(spotlessTask.get());
+				});
 		return applyTask;
 	}
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
index cd2682e971..c776004da3 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
@@ -34,6 +34,7 @@
 import com.diffplug.spotless.npm.EslintFormatterStep;
 import com.diffplug.spotless.npm.NpmPathResolver;
 import com.diffplug.spotless.npm.PrettierFormatterStep;
+import com.diffplug.spotless.rome.EBiomeFlavor;
 
 public class JavascriptExtension extends FormatExtension {
 
@@ -58,7 +59,8 @@ public JavascriptEslintConfig eslint(Map<String, String> devDependencies) {
 		return eslint;
 	}
 
-	public static abstract class EslintBaseConfig<T extends EslintBaseConfig<?>> extends NpmStepConfig<EslintBaseConfig<T>> {
+	public static abstract class EslintBaseConfig<T extends EslintBaseConfig<?>>
+			extends NpmStepConfig<EslintBaseConfig<T>> {
 		Map<String, String> devDependencies = new LinkedHashMap<>();
 
 		@Nullable
@@ -67,7 +69,8 @@ public static abstract class EslintBaseConfig<T extends EslintBaseConfig<?>> ext
 		@Nullable
 		String configJs = null;
 
-		public EslintBaseConfig(Project project, Consumer<FormatterStep> replaceStep, Map<String, String> devDependencies) {
+		public EslintBaseConfig(Project project, Consumer<FormatterStep> replaceStep,
+				Map<String, String> devDependencies) {
 			super(project, replaceStep);
 			this.devDependencies.putAll(requireNonNull(devDependencies));
 		}
@@ -103,13 +106,10 @@ public JavascriptEslintConfig(Map<String, String> devDependencies) {
 		public FormatterStep createStep() {
 			final Project project = getProject();
 
-			return EslintFormatterStep.create(
-					devDependencies,
-					provisioner(),
-					project.getProjectDir(),
-					project.getLayout().getBuildDirectory().getAsFile().get(),
-					npmModulesCacheOrNull(),
-					new NpmPathResolver(npmFileOrNull(), nodeFileOrNull(), npmrcFileOrNull(), Arrays.asList(project.getProjectDir(), project.getRootDir())),
+			return EslintFormatterStep.create(devDependencies, provisioner(), project.getProjectDir(),
+					project.getLayout().getBuildDirectory().getAsFile().get(), npmModulesCacheOrNull(),
+					new NpmPathResolver(npmFileOrNull(), nodeFileOrNull(), npmrcFileOrNull(),
+							Arrays.asList(project.getProjectDir(), project.getRootDir())),
 					eslintConfig());
 		}
 
@@ -138,16 +138,40 @@ public PrettierConfig prettier(Map<String, String> devDependencies) {
 		return prettierConfig;
 	}
 
+	/**
+	 * Defaults to downloading the default Biome version from the network. To work
+	 * offline, you can specify the path to the Biome executable via
+	 * {@code biome().pathToExe(...)}.
+	 */
+	public BiomeJs biome() {
+		return biome(null);
+	}
+
+	/** Downloads the given Biome version from the network. */
+	public BiomeJs biome(String version) {
+		var biomeConfig = new BiomeJs(version);
+		addStep(biomeConfig.createStep());
+		return biomeConfig;
+	}
+
 	/**
 	 * Defaults to downloading the default Rome version from the network. To work
 	 * offline, you can specify the path to the Rome executable via
 	 * {@code rome().pathToExe(...)}.
+	 * 
+	 * @deprecated Use {@link #biome()}.
 	 */
+	@Deprecated
 	public RomeJs rome() {
 		return rome(null);
 	}
 
-	/** Downloads the given Rome version from the network. */
+	/**
+	 * Downloads the given Rome version from the network.
+	 * 
+	 * @deprecated Use {@link #biome(String)}.
+	 */
+	@Deprecated
 	public RomeJs rome(String version) {
 		var romeConfig = new RomeJs(version);
 		addStep(romeConfig.createStep());
@@ -155,21 +179,49 @@ public RomeJs rome(String version) {
 	}
 
 	private static final String DEFAULT_PRETTIER_JS_PARSER = "babel";
-	private static final ImmutableList<String> PRETTIER_JS_PARSERS = ImmutableList.of(DEFAULT_PRETTIER_JS_PARSER, "babel-flow", "flow");
+	private static final ImmutableList<String> PRETTIER_JS_PARSERS = ImmutableList.of(DEFAULT_PRETTIER_JS_PARSER,
+			"babel-flow", "flow");
+
+	/**
+	 * Biome formatter step for JavaScript.
+	 */
+	public class BiomeJs extends RomeStepConfig<BiomeJs> {
+		/**
+		 * Creates a new Biome formatter step config for formatting JavaScript files.
+		 * Unless overwritten, the given Biome version is downloaded from the network.
+		 *
+		 * @param version Biome version to use.
+		 */
+		public BiomeJs(String version) {
+			super(getProject(), JavascriptExtension.this::replaceStep, EBiomeFlavor.BIOME, version);
+		}
+
+		@Override
+		protected String getLanguage() {
+			return "js?";
+		}
+
+		@Override
+		protected BiomeJs getThis() {
+			return this;
+		}
+	}
 
 	/**
 	 * Rome formatter step for JavaScript.
+	 * 
+	 * @deprecated Rome has transitioned to Biome. This will be removed shortly.
 	 */
+	@Deprecated
 	public class RomeJs extends RomeStepConfig<RomeJs> {
-
 		/**
-		 * Creates a new Rome formatter step config for formatting JavaScript files. Unless
-		 * overwritten, the given Rome version is downloaded from the network.
+		 * Creates a new Rome formatter step config for formatting JavaScript files.
+		 * Unless overwritten, the given Rome version is downloaded from the network.
 		 *
 		 * @param version Rome version to use.
 		 */
 		public RomeJs(String version) {
-			super(getProject(), JavascriptExtension.this::replaceStep, version);
+			super(getProject(), JavascriptExtension.this::replaceStep, EBiomeFlavor.ROME, version);
 		}
 
 		@Override
@@ -208,7 +260,9 @@ private void fixParserToJavascript() {
 				} else {
 					this.prettierConfig.put("parser", DEFAULT_PRETTIER_JS_PARSER);
 					if (currentParser != null) {
-						getProject().getLogger().warn("Overriding parser option to '{}'. (Was set to '{}'.) Set it to another js parser if you have problems with '{}'.", DEFAULT_PRETTIER_JS_PARSER, currentParser, DEFAULT_PRETTIER_JS_PARSER);
+						getProject().getLogger().warn(
+								"Overriding parser option to '{}'. (Was set to '{}'.) Set it to another js parser if you have problems with '{}'.",
+								DEFAULT_PRETTIER_JS_PARSER, currentParser, DEFAULT_PRETTIER_JS_PARSER);
 					}
 				}
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
index 8648cacea9..cc16b7ed35 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
@@ -27,6 +27,7 @@
 import com.diffplug.spotless.json.JsonPatchStep;
 import com.diffplug.spotless.json.JsonSimpleStep;
 import com.diffplug.spotless.json.gson.GsonStep;
+import com.diffplug.spotless.rome.EBiomeFlavor;
 
 public class JsonExtension extends FormatExtension {
 	private static final int DEFAULT_INDENTATION = 4;
@@ -59,16 +60,40 @@ public JacksonJsonGradleConfig jackson() {
 		return new JacksonJsonGradleConfig(this);
 	}
 
+	/**
+	 * Defaults to downloading the default Biome version from the network. To work
+	 * offline, you can specify the path to the Biome executable via
+	 * {@code biome().pathToExe(...)}.
+	 */
+	public BiomeJson biome() {
+		return biome(null);
+	}
+
+	/** Downloads the given Biome version from the network. */
+	public BiomeJson biome(String version) {
+		var biomeConfig = new BiomeJson(version);
+		addStep(biomeConfig.createStep());
+		return biomeConfig;
+	}
+
 	/**
 	 * Defaults to downloading the default Rome version from the network. To work
 	 * offline, you can specify the path to the Rome executable via
 	 * {@code rome().pathToExe(...)}.
+	 * 
+	 * @deprecated Use {@link #biome()}.
 	 */
+	@Deprecated
 	public RomeJson rome() {
 		return rome(null);
 	}
 
-	/** Downloads the given Rome version from the network. */
+	/**
+	 * Downloads the given Rome version from the network.
+	 * 
+	 * @deprecated Use {@link #biome(String)}.
+	 */
+	@Deprecated
 	public RomeJson rome(String version) {
 		var romeConfig = new RomeJson(version);
 		addStep(romeConfig.createStep());
@@ -140,7 +165,9 @@ public GsonConfig version(String version) {
 		}
 
 		private FormatterStep createStep() {
-			return GsonStep.create(new com.diffplug.spotless.json.gson.GsonConfig(sortByKeys, escapeHtml, indentSpaces, version), provisioner());
+			return GsonStep.create(
+					new com.diffplug.spotless.json.gson.GsonConfig(sortByKeys, escapeHtml, indentSpaces, version),
+					provisioner());
 		}
 	}
 
@@ -179,9 +206,37 @@ protected final FormatterStep createStep() {
 		}
 	}
 
+	/**
+	 * Biome formatter step for JSON.
+	 */
+	public class BiomeJson extends RomeStepConfig<BiomeJson> {
+		/**
+		 * Creates a new Biome formatter step config for formatting JSON files. Unless
+		 * overwritten, the given Biome version is downloaded from the network.
+		 *
+		 * @param version Biome version to use.
+		 */
+		public BiomeJson(String version) {
+			super(getProject(), JsonExtension.this::replaceStep, EBiomeFlavor.BIOME, version);
+		}
+
+		@Override
+		protected String getLanguage() {
+			return "json";
+		}
+
+		@Override
+		protected BiomeJson getThis() {
+			return this;
+		}
+	}
+
 	/**
 	 * Rome formatter step for JSON.
+	 * 
+	 * @deprecated Rome has transitioned to Biome. This will be removed shortly.
 	 */
+	@Deprecated
 	public class RomeJson extends RomeStepConfig<RomeJson> {
 		/**
 		 * Creates a new Rome formatter step config for formatting JSON files. Unless
@@ -190,7 +245,7 @@ public class RomeJson extends RomeStepConfig<RomeJson> {
 		 * @param version Rome version to use.
 		 */
 		public RomeJson(String version) {
-			super(getProject(), JsonExtension.this::replaceStep, version);
+			super(getProject(), JsonExtension.this::replaceStep, EBiomeFlavor.ROME, version);
 		}
 
 		@Override
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RomeStepConfig.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RomeStepConfig.java
index f739e922d2..6b0ae893ac 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RomeStepConfig.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RomeStepConfig.java
@@ -28,12 +28,13 @@
 import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
 
 import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.rome.EBiomeFlavor;
 import com.diffplug.spotless.rome.RomeStep;
 
 public abstract class RomeStepConfig<Self extends RomeStepConfig<Self>> {
 	/**
-	 * Optional path to the directory with configuration file for Rome. The file
-	 * must be named {@code rome.json}. When none is given, the default
+	 * Optional path to the directory with configuration file for Biome. The file
+	 * must be named {@code biome.json}. When none is given, the default
 	 * configuration is used. If this is a relative path, it is resolved against the
 	 * project's base directory.
 	 */
@@ -41,16 +42,22 @@ public abstract class RomeStepConfig<Self extends RomeStepConfig<Self>> {
 	private Object configPath;
 
 	/**
-	 * Optional directory where the downloaded Rome executable is placed. If this is
-	 * a relative path, it is resolved against the project's base directory.
+	 * Optional directory where the downloaded Biome executable is placed. If this
+	 * is a relative path, it is resolved against the project's base directory.
 	 * Defaults to
-	 * <code>~/.m2/repository/com/diffplug/spotless/spotless-data/rome</code>.
+	 * <code>~/.m2/repository/com/diffplug/spotless/spotless-data/biome</code>.
 	 */
 	@Nullable
 	private Object downloadDir;
 
 	/**
-	 * Optional path to the Rome executable. Either a <code>version</code> or a
+	 * The flavor of Biome to use. Will be removed when we stop support the
+	 * deprecated Rome project.
+	 */
+	private final EBiomeFlavor flavor;
+
+	/**
+	 * Optional path to the Biome executable. Either a <code>version</code> or a
 	 * <code>pathToExe</code> should be specified. When not given, an attempt is
 	 * made to download the executable for the given version from the network. When
 	 * given, the executable is used and the <code>version</code> parameter is
@@ -59,10 +66,10 @@ public abstract class RomeStepConfig<Self extends RomeStepConfig<Self>> {
 	 * When an absolute path is given, that path is used as-is. When a relative path
 	 * is given, it is resolved against the project's base directory. When only a
 	 * file name (i.e. without any slashes or back slash path separators such as
-	 * {@code rome}) is given, this is interpreted as the name of a command with
-	 * executable that is in your {@code path} environment variable. Use
-	 * {@code ./executable-name} if you want to use an executable in the project's
-	 * base directory.
+	 * <code>biome</code>) is given, this is interpreted as the name of a command
+	 * with executable that is in your <code>path</code> environment variable. Use
+	 * <code>./executable-name</code> if you want to use an executable in the
+	 * project's base directory.
 	 */
 	@Nullable
 	private Object pathToExe;
@@ -73,12 +80,12 @@ public abstract class RomeStepConfig<Self extends RomeStepConfig<Self>> {
 	private final Project project;
 
 	/**
-	 * Replaces the current Rome formatter step with the given step.
+	 * Replaces the current Biome formatter step with the given step.
 	 */
 	private final Consumer<FormatterStep> replaceStep;
 
 	/**
-	 * Rome version to download, applies only when no <code>pathToExe</code> is
+	 * Biome version to download, applies only when no <code>pathToExe</code> is
 	 * specified explicitly. Either a <code>version</code> or a
 	 * <code>pathToExe</code> should be specified. When not given, a default known
 	 * version is used. For stable builds, it is recommended that you always set the
@@ -88,15 +95,17 @@ public abstract class RomeStepConfig<Self extends RomeStepConfig<Self>> {
 	@Nullable
 	private String version;
 
-	protected RomeStepConfig(Project project, Consumer<FormatterStep> replaceStep, String version) {
+	protected RomeStepConfig(Project project, Consumer<FormatterStep> replaceStep, EBiomeFlavor flavor,
+			String version) {
 		this.project = requireNonNull(project);
 		this.replaceStep = requireNonNull(replaceStep);
+		this.flavor = flavor;
 		this.version = version;
 	}
 
 	/**
-	 * Optional path to the directory with configuration file for Rome. The file
-	 * must be named {@code rome.json}. When none is given, the default
+	 * Optional path to the directory with configuration file for Biome. The file
+	 * must be named {@code biome.json}. When none is given, the default
 	 * configuration is used. If this is a relative path, it is resolved against the
 	 * project's base directory.
 	 *
@@ -109,10 +118,10 @@ public Self configPath(Object configPath) {
 	}
 
 	/**
-	 * Optional directory where the downloaded Rome executable is placed. If this is
-	 * a relative path, it is resolved against the project's base directory.
+	 * Optional directory where the downloaded Biome executable is placed. If this
+	 * is a relative path, it is resolved against the project's base directory.
 	 * Defaults to
-	 * <code>~/.m2/repository/com/diffplug/spotless/spotless-data/rome</code>.
+	 * <code>~/.m2/repository/com/diffplug/spotless/spotless-data/biome</code>.
 	 *
 	 * @return This step for further configuration.
 	 */
@@ -123,16 +132,16 @@ public Self downloadDir(Object downloadDir) {
 	}
 
 	/**
-	 * Optional path to the Rome executable. Overwrites the configured version. No
-	 * attempt is made to download the Rome executable from the network.
+	 * Optional path to the Biome executable. Overwrites the configured version. No
+	 * attempt is made to download the Biome executable from the network.
 	 * <p>
 	 * When an absolute path is given, that path is used as-is. When a relative path
 	 * is given, it is resolved against the project's base directory. When only a
 	 * file name (i.e. without any slashes or back slash path separators such as
-	 * {@code rome}) is given, this is interpreted as the name of a command with
-	 * executable that is in your {@code path} environment variable. Use
-	 * {@code ./executable-name} if you want to use an executable in the project's
-	 * base directory.
+	 * <code>biome</code>) is given, this is interpreted as the name of a command
+	 * with executable that is in your <code>path</code> environment variable. Use
+	 * <code>./executable-name</code> if you want to use an executable in the
+	 * project's base directory.
 	 *
 	 * @return This step for further configuration.
 	 */
@@ -143,10 +152,10 @@ public Self pathToExe(Object pathToExe) {
 	}
 
 	/**
-	 * Creates a new formatter step that formats code by calling the Rome
+	 * Creates a new formatter step that formats code by calling the Biome
 	 * executable, using the current configuration.
 	 *
-	 * @return A new formatter step for the Rome formatter.
+	 * @return A new formatter step for the Biome formatter.
 	 */
 	protected FormatterStep createStep() {
 		var builder = newBuilder();
@@ -161,7 +170,7 @@ protected FormatterStep createStep() {
 	/**
 	 * Gets the language (syntax) of the input files to format. When
 	 * <code>null</code> or the empty string, the language is detected automatically
-	 * from the file name. Currently the following languages are supported by Rome:
+	 * from the file name. Currently the following languages are supported by Biome:
 	 * <ul>
 	 * <li>js (JavaScript)</li>
 	 * <li>jsx (JavaScript + JSX)</li>
@@ -179,12 +188,12 @@ protected FormatterStep createStep() {
 	protected abstract String getLanguage();
 
 	/**
-	 * @return This Rome config instance.
+	 * @return This Biome config instance.
 	 */
 	protected abstract Self getThis();
 
 	/**
-	 * Creates a new Rome step and replaces the existing Rome step in the list of
+	 * Creates a new Biome step and replaces the existing Biome step in the list of
 	 * format steps.
 	 */
 	protected void replaceStep() {
@@ -193,19 +202,18 @@ protected void replaceStep() {
 
 	/**
 	 * Finds the data directory that can be used for storing shared data such as
-	 * Rome executable globally. This is a directory in the local repository, e.g.
+	 * Biome executable globally. This is a directory in the local repository, e.g.
 	 * <code>~/.m2/repository/com/diffplus/spotless/spotless-data<code>.
 	 *
 	 * @return The directory for storing shared data.
 	 */
 	private File findDataDir() {
-		var currentRepo = project.getRepositories().stream()
-				.filter(r -> r instanceof MavenArtifactRepository)
-				.map(r -> (MavenArtifactRepository) r)
-				.filter(r -> "file".equals(r.getUrl().getScheme()))
-				.findAny().orElse(null);
+		var currentRepo = project.getRepositories().stream().filter(r -> r instanceof MavenArtifactRepository)
+				.map(r -> (MavenArtifactRepository) r).filter(r -> "file".equals(r.getUrl().getScheme())).findAny()
+				.orElse(null);
 		// Temporarily add mavenLocal() repository to get its file URL
-		var localRepo = currentRepo != null ? (MavenArtifactRepository) currentRepo : project.getRepositories().mavenLocal();
+		var localRepo = currentRepo != null ? (MavenArtifactRepository) currentRepo
+				: project.getRepositories().mavenLocal();
 		try {
 			// e.g. ~/.m2/repository/
 			var repoPath = Path.of(localRepo.getUrl());
@@ -220,29 +228,29 @@ private File findDataDir() {
 	}
 
 	/**
-	 * A new builder for configuring a Rome step that either downloads the Rome
+	 * A new builder for configuring a Biome step that either downloads the Biome
 	 * executable with the given version from the network, or uses the executable
 	 * from the given path.
 	 *
-	 * @return A builder for a Rome step.
+	 * @return A builder for a Biome step.
 	 */
 	private RomeStep newBuilder() {
 		if (pathToExe != null) {
 			var resolvedPathToExe = resolvePathToExe();
-			return RomeStep.withExePath(resolvedPathToExe);
+			return RomeStep.withExePath(flavor, resolvedPathToExe);
 		} else {
 			var downloadDir = resolveDownloadDir();
-			return RomeStep.withExeDownload(version, downloadDir);
+			return RomeStep.withExeDownload(flavor, version, downloadDir);
 		}
 	}
 
 	/**
-	 * Resolves the path to the Rome executable. When the path is only a file name,
+	 * Resolves the path to the Biome executable. When the path is only a file name,
 	 * do not perform any resolution and interpret it as a command that must be on
 	 * the user's path. Otherwise resolve the executable path against the project's
 	 * base directory.
 	 *
-	 * @return The resolved path to the Rome executable.
+	 * @return The resolved path to the Biome executable.
 	 */
 	private String resolvePathToExe() {
 		var fileNameOnly = pathToExe instanceof String && Paths.get(pathToExe.toString()).getNameCount() == 1;
@@ -254,18 +262,18 @@ private String resolvePathToExe() {
 	}
 
 	/**
-	 * Resolves the directory to use for storing downloaded Rome executable. When a
+	 * Resolves the directory to use for storing downloaded Biome executable. When a
 	 * {@link #downloadDir} is given, use that directory, resolved against the
-	 * current project's directory. Otherwise, use the {@code Rome} sub folder in
+	 * current project's directory. Otherwise, use the {@code biome} sub folder in
 	 * the shared data directory.
 	 *
-	 * @return The download directory for the Rome executable.
+	 * @return The download directory for the Biome executable.
 	 */
 	private String resolveDownloadDir() {
 		if (downloadDir != null) {
 			return project.file(downloadDir).toString();
 		} else {
-			return findDataDir().toPath().resolve("rome").toString();
+			return findDataDir().toPath().resolve(flavor.shortName()).toString();
 		}
 	}
 }
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
index 929ea4423b..ad9bcc832b 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
@@ -38,6 +38,7 @@
 import com.diffplug.spotless.npm.TsConfigFileType;
 import com.diffplug.spotless.npm.TsFmtFormatterStep;
 import com.diffplug.spotless.npm.TypedTsFmtConfigFile;
+import com.diffplug.spotless.rome.EBiomeFlavor;
 
 public class TypescriptExtension extends FormatExtension {
 
@@ -58,7 +59,10 @@ public TypescriptFormatExtension tsfmt(String version) {
 		return tsfmt(TsFmtFormatterStep.defaultDevDependenciesWithTsFmt(version));
 	}
 
-	/** Creates a {@code TypescriptFormatExtension} using exactly the specified npm packages. */
+	/**
+	 * Creates a {@code TypescriptFormatExtension} using exactly the specified npm
+	 * packages.
+	 */
 	public TypescriptFormatExtension tsfmt(Map<String, String> devDependencies) {
 		TypescriptFormatExtension tsfmt = new TypescriptFormatExtension(devDependencies);
 		addStep(tsfmt.createStep());
@@ -114,15 +118,12 @@ private TypescriptFormatExtension configFile(TsConfigFileType filetype, Object p
 		public FormatterStep createStep() {
 			final Project project = getProject();
 
-			return TsFmtFormatterStep.create(
-					devDependencies,
-					provisioner(),
-					project.getProjectDir(),
-					project.getLayout().getBuildDirectory().getAsFile().get(),
-					npmModulesCacheOrNull(),
-					new NpmPathResolver(npmFileOrNull(), nodeFileOrNull(), npmrcFileOrNull(), Arrays.asList(project.getProjectDir(), project.getRootDir())),
-					typedConfigFile(),
-					config);
+			return TsFmtFormatterStep
+					.create(devDependencies, provisioner(), project.getProjectDir(),
+							project.getLayout().getBuildDirectory().getAsFile().get(), npmModulesCacheOrNull(),
+							new NpmPathResolver(npmFileOrNull(), nodeFileOrNull(), npmrcFileOrNull(),
+									Arrays.asList(project.getProjectDir(), project.getRootDir())),
+							typedConfigFile(), config);
 		}
 
 		private TypedTsFmtConfigFile typedConfigFile() {
@@ -154,7 +155,8 @@ public PrettierConfig prettier(Map<String, String> devDependencies) {
 	}
 
 	/**
-	 * Overrides the parser to be set to typescript, no matter what the user's config says.
+	 * Overrides the parser to be set to typescript, no matter what the user's
+	 * config says.
 	 */
 	public class TypescriptPrettierConfig extends PrettierConfig {
 		TypescriptPrettierConfig(Map<String, String> devDependencies) {
@@ -173,7 +175,8 @@ private void fixParserToTypescript() {
 			} else {
 				final Object replaced = this.prettierConfig.put("parser", "typescript");
 				if (replaced != null) {
-					getProject().getLogger().warn("overriding parser option to 'typescript'. Was set to '{}'", replaced);
+					getProject().getLogger().warn("overriding parser option to 'typescript'. Was set to '{}'",
+							replaced);
 				}
 			}
 		}
@@ -211,52 +214,99 @@ public TypescriptEslintConfig tsconfigFile(Object path) {
 		public FormatterStep createStep() {
 			final Project project = getProject();
 
-			return EslintFormatterStep.create(
-					devDependencies,
-					provisioner(),
-					project.getProjectDir(),
-					project.getLayout().getBuildDirectory().getAsFile().get(),
-					npmModulesCacheOrNull(),
-					new NpmPathResolver(npmFileOrNull(), nodeFileOrNull(), npmrcFileOrNull(), Arrays.asList(project.getProjectDir(), project.getRootDir())),
+			return EslintFormatterStep.create(devDependencies, provisioner(), project.getProjectDir(),
+					project.getLayout().getBuildDirectory().getAsFile().get(), npmModulesCacheOrNull(),
+					new NpmPathResolver(npmFileOrNull(), nodeFileOrNull(), npmrcFileOrNull(),
+							Arrays.asList(project.getProjectDir(), project.getRootDir())),
 					eslintConfig());
 		}
 
 		protected EslintConfig eslintConfig() {
-			return new EslintTypescriptConfig(
-					configFilePath != null ? getProject().file(configFilePath) : null,
-					configJs,
-					typescriptConfigFilePath != null ? getProject().file(typescriptConfigFilePath) : null);
+			return new EslintTypescriptConfig(configFilePath != null ? getProject().file(configFilePath) : null,
+					configJs, typescriptConfigFilePath != null ? getProject().file(typescriptConfigFilePath) : null);
 		}
 	}
 
+	/**
+	 * Defaults to downloading the default Biome version from the network. To work
+	 * offline, you can specify the path to the Biome executable via
+	 * {@code biome().pathToExe(...)}.
+	 */
+	public BiomeTs biome() {
+		return biome(null);
+	}
+
+	/** Downloads the given Biome version from the network. */
+	public BiomeTs biome(String version) {
+		var biomeConfig = new BiomeTs(version);
+		addStep(biomeConfig.createStep());
+		return biomeConfig;
+	}
+
 	/**
 	 * Defaults to downloading the default Rome version from the network. To work
 	 * offline, you can specify the path to the Rome executable via
 	 * {@code rome().pathToExe(...)}.
+	 * 
+	 * @deprecated Use {@link #biome()}.
 	 */
+	@Deprecated
 	public RomeTs rome() {
 		return rome(null);
 	}
 
-	/** Downloads the given Rome version from the network. */
+	/**
+	 * Downloads the given Rome version from the network.
+	 * 
+	 * @deprecated Use {@link #biome(String)}.
+	 */
+	@Deprecated
 	public RomeTs rome(String version) {
 		var romeConfig = new RomeTs(version);
 		addStep(romeConfig.createStep());
 		return romeConfig;
 	}
 
+	/**
+	 * Biome formatter step for TypeScript.
+	 */
+	public class BiomeTs extends RomeStepConfig<BiomeTs> {
+		/**
+		 * Creates a new Biome formatter step config for formatting TypeScript files.
+		 * Unless overwritten, the given Biome version is downloaded from the network.
+		 *
+		 * @param version Biome version to use.
+		 */
+		public BiomeTs(String version) {
+			super(getProject(), TypescriptExtension.this::replaceStep, EBiomeFlavor.BIOME, version);
+		}
+
+		@Override
+		protected String getLanguage() {
+			return "ts?";
+		}
+
+		@Override
+		protected BiomeTs getThis() {
+			return this;
+		}
+	}
+
 	/**
 	 * Rome formatter step for TypeScript.
+	 * 
+	 * @deprecated Rome has transitioned to Biome. This will be removed shortly.
 	 */
+	@Deprecated
 	public class RomeTs extends RomeStepConfig<RomeTs> {
 		/**
-		 * Creates a new Rome formatter step config for formatting TypeScript files. Unless
-		 * overwritten, the given Rome version is downloaded from the network.
+		 * Creates a new Rome formatter step config for formatting TypeScript files.
+		 * Unless overwritten, the given Rome version is downloaded from the network.
 		 *
 		 * @param version Rome version to use.
 		 */
 		public RomeTs(String version) {
-			super(getProject(), TypescriptExtension.this::replaceStep, version);
+			super(getProject(), TypescriptExtension.this::replaceStep, EBiomeFlavor.ROME, version);
 		}
 
 		@Override
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java
new file mode 100644
index 0000000000..a2665a3bf1
--- /dev/null
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java
@@ -0,0 +1,343 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.gradle.spotless;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.IOException;
+
+import org.junit.jupiter.api.Test;
+import org.owasp.encoder.Encode;
+
+class BiomeIntegrationTest extends GradleIntegrationHarness {
+	/**
+	 * Tests that biome can be used as a generic formatting step.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void asGenericStep() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    format 'mybiome', {",
+				"        target '**/*.js'",
+				"        biome('1.2.0')",
+				"    }",
+				"}");
+		setFile("biome_test.js").toResource("biome/js/fileBefore.js");
+
+		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		assertFile("biome_test.js").sameAsResource("biome/js/fileAfter.js");
+	}
+
+	/**
+	 * Tests that biome can be used as a JavaScript formatting step.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void asJavaScriptStep() throws Exception {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    javascript {",
+				"        target '**/*.js'",
+				"        biome('1.2.0')",
+				"    }",
+				"}");
+		setFile("biome_test.js").toResource("biome/js/fileBefore.js");
+
+		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		assertFile("biome_test.js").sameAsResource("biome/js/fileAfter.js");
+	}
+
+	/**
+	 * Tests that biome can be used as a JSON formatting step.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void asJsonStep() throws Exception {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    json {",
+				"        target '**/*.json'",
+				"        biome('1.2.0')",
+				"    }",
+				"}");
+		setFile("biome_test.json").toResource("biome/json/fileBefore.json");
+
+		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		assertFile("biome_test.json").sameAsResource("biome/json/fileAfter.json");
+	}
+
+	/**
+	 * Tests that biome can be used as a TypeScript formatting step.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void asTypeScriptStep() throws Exception {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    typescript {",
+				"        target '**/*.ts'",
+				"        biome('1.2.0')",
+				"    }",
+				"}");
+		setFile("biome_test.ts").toResource("biome/ts/fileBefore.ts");
+
+		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		assertFile("biome_test.ts").sameAsResource("biome/ts/fileAfter.ts");
+	}
+
+	/**
+	 * Tests that the language can be specified for the generic format step.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void canSetLanguageForGenericStep() throws Exception {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    format 'mybiome', {",
+				"        target '**/*.nosj'",
+				"        biome('1.2.0').language('json')",
+				"    }",
+				"}");
+		setFile("biome_test.nosj").toResource("biome/json/fileBefore.json");
+
+		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		assertFile("biome_test.nosj").sameAsResource("biome/json/fileAfter.json");
+	}
+
+	/**
+	 * Tests that an absolute config path can be specified.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void configPathAbsolute() throws Exception {
+		var path = newFile("configs").getAbsolutePath();
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    format 'mybiome', {",
+				"        target '**/*.js'",
+				"        biome('1.2.0').configPath('" + Encode.forJava(path) + "')",
+				"    }",
+				"}");
+		setFile("biome_test.js").toResource("biome/js/longLineBefore.js");
+		setFile("configs/biome.json").toResource("biome/config/line-width-120.json");
+
+		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		assertFile("biome_test.js").sameAsResource("biome/js/longLineAfter120.js");
+	}
+
+	/**
+	 * Tests that a path to the directory with the biome.json config file can be
+	 * specified. Uses a config file with a line width of 120.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void configPathLineWidth120() throws Exception {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    format 'mybiome', {",
+				"        target '**/*.js'",
+				"        biome('1.2.0').configPath('configs')",
+				"    }",
+				"}");
+		setFile("biome_test.js").toResource("biome/js/longLineBefore.js");
+		setFile("configs/biome.json").toResource("biome/config/line-width-120.json");
+
+		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		assertFile("biome_test.js").sameAsResource("biome/js/longLineAfter120.js");
+	}
+
+	/**
+	 * Tests that a path to the directory with the biome.json config file can be
+	 * specified. Uses a config file with a line width of 80.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void configPathLineWidth80() throws Exception {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    format 'mybiome', {",
+				"        target '**/*.js'",
+				"        biome('1.2.0').configPath('configs')",
+				"    }",
+				"}");
+		setFile("biome_test.js").toResource("biome/js/longLineBefore.js");
+		setFile("configs/biome.json").toResource("biome/config/line-width-80.json");
+
+		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		assertFile("biome_test.js").sameAsResource("biome/js/longLineAfter80.js");
+	}
+
+	/**
+	 * Tests that the download directory can be an absolute path.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void downloadDirAbsolute() throws Exception {
+		var path = newFile("target/bin/biome").getAbsoluteFile().toString();
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    format 'mybiome', {",
+				"        target '**/*.js'",
+				"        biome('1.2.0').downloadDir('" + Encode.forJava(path) + "')",
+				"    }",
+				"}");
+		setFile("biome_test.js").toResource("biome/js/fileBefore.js");
+		assertTrue(!newFile("target/bin/biome").exists() || newFile("target/bin/biome").list().length == 0);
+
+		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		assertFile("biome_test.js").sameAsResource("biome/js/fileAfter.js");
+		assertEquals(2, newFile("target/bin/biome").list().length);
+	}
+
+	/**
+	 * Tests that the download directory can be changed to a path relative to the
+	 * project's base directory.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void downloadDirRelative() throws Exception {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    format 'mybiome', {",
+				"        target '**/*.js'",
+				"        biome('1.2.0').downloadDir('target/bin/biome')",
+				"    }",
+				"}");
+		setFile("biome_test.js").toResource("biome/js/fileBefore.js");
+		assertTrue(!newFile("target/bin/biome").exists() || newFile("target/bin/biome").list().length == 0);
+
+		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		assertFile("biome_test.js").sameAsResource("biome/js/fileAfter.js");
+		assertEquals(2, newFile("target/bin/biome").list().length);
+	}
+
+	/**
+	 * Tests that the build fails when given Biome executable does not exist.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void failureWhenExeNotFound() throws Exception {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    format 'mybiome', {",
+				"        target '**/*.js'",
+				"        biome('1.2.0').pathToExe('biome/is/missing')",
+				"    }",
+				"}");
+		setFile("biome_test.js").toResource("biome/js/fileBefore.js");
+
+		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").buildAndFail();
+		assertThat(spotlessApply.getOutput()).contains("Build failed with an exception");
+		assertFile("biome_test.js").sameAsResource("biome/js/fileBefore.js");
+		assertThat(spotlessApply.getOutput()).contains("Could not create task ':spotlessMybiomeApply'");
+		assertThat(spotlessApply.getOutput()).contains("Biome executable does not exist");
+	}
+
+	/**
+	 * Tests that the build fails when the input file could not be parsed.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void failureWhenNotParseable() throws Exception {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    format 'mybiome', {",
+				"        target '**/*.js'",
+				"        biome('1.2.0').language('json')",
+				"    }",
+				"}");
+		setFile("biome_test.js").toResource("biome/js/fileBefore.js");
+
+		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").buildAndFail();
+		assertThat(spotlessApply.getOutput()).contains("spotlessMybiome FAILED");
+		assertFile("biome_test.js").sameAsResource("biome/js/fileBefore.js");
+		assertThat(spotlessApply.getOutput()).contains("Format with errors is disabled.");
+		assertThat(spotlessApply.getOutput()).contains("Step 'biome' found problem in 'biome_test.js'");
+	}
+}
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/RomeIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/RomeIntegrationTest.java
index 4464b1cec7..0c12f9f500 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/RomeIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/RomeIntegrationTest.java
@@ -288,7 +288,7 @@ void downloadDirRelative() throws Exception {
 	}
 
 	/**
-	 * Tests that the build fails when given Rome executable does not exist.
+	 * Tests that the build fails when given Biome executable does not exist.
 	 *
 	 * @throws Exception When a test failure occurs.
 	 */
@@ -311,7 +311,7 @@ void failureWhenExeNotFound() throws Exception {
 		assertThat(spotlessApply.getOutput()).contains("Build failed with an exception");
 		assertFile("rome_test.js").sameAsResource("rome/js/fileBefore.js");
 		assertThat(spotlessApply.getOutput()).contains("Could not create task ':spotlessMyromeApply'");
-		assertThat(spotlessApply.getOutput()).contains("Rome executable does not exist");
+		assertThat(spotlessApply.getOutput()).contains("Biome executable does not exist");
 	}
 
 	/**
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Biome.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Biome.java
new file mode 100644
index 0000000000..23b6637519
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Biome.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2016-2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.generic;
+
+import org.apache.maven.plugins.annotations.Parameter;
+
+import com.diffplug.spotless.maven.rome.AbstractRome;
+import com.diffplug.spotless.rome.EBiomeFlavor;
+
+/**
+ * Generic Biome formatter step that detects the language of the input file from
+ * the file name. It should be specified as a formatter step for a generic
+ * {@code <format>}.
+ */
+public class Biome extends AbstractRome {
+	public Biome() {
+		super(EBiomeFlavor.BIOME);
+	}
+
+	/**
+	 * Gets the language (syntax) of the input files to format. When
+	 * <code>null</code> or the empty string, the language is detected automatically
+	 * from the file name. Currently the following languages are supported by Biome:
+	 * <ul>
+	 * <ul>
+	 * <li>js (JavaScript)</li>
+	 * <li>jsx (JavaScript + JSX)</li>
+	 * <li>js? (JavaScript or JavaScript + JSX, depending on the file
+	 * extension)</li>
+	 * <li>ts (TypeScript)</li>
+	 * <li>tsx (TypeScript + JSX)</li>
+	 * <li>ts? (TypeScript or TypeScript + JSX, depending on the file
+	 * extension)</li>
+	 * <li>json (JSON)</li>
+	 * </ul>
+	 * </ul>
+	 *
+	 * @return The language of the input files.
+	 */
+	@Parameter
+	private String language;
+
+	@Override
+	protected String getLanguage() {
+		return language;
+	}
+}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Format.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Format.java
index ed08718c65..ce7db9b926 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Format.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Format.java
@@ -41,6 +41,20 @@ public String licenseHeaderDelimiter() {
 		return null;
 	}
 
+	/**
+	 * Adds a step to this format that format code with the Biome formatter.
+	 * @param biome Biome configuration to use.
+	 */
+	public void addBiome(Biome biome) {
+		addStepFactory(biome);
+	}
+
+	/**
+	 * Adds a step to this format that format code with the Rome formatter.
+	 * @param rome Rome configuration to use.
+	 * @deprecated Rome has transitioned to Biome. Use {@link #addBiome(Biome)}.
+	 */
+	@Deprecated
 	public void addRome(Rome rome) {
 		addStepFactory(rome);
 	}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Rome.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Rome.java
index 62d9d3fdec..628c051699 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Rome.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Rome.java
@@ -18,13 +18,17 @@
 import org.apache.maven.plugins.annotations.Parameter;
 
 import com.diffplug.spotless.maven.rome.AbstractRome;
+import com.diffplug.spotless.rome.EBiomeFlavor;
 
 /**
- * Generic Rome formatter step that detects the language of the input file from
- * the file name. It should be specified as a formatter step for a generic
- * {@code <format>}.
+ * See {@link Biome}.
+ * @deprecated Rome has transitioned to Biome. This will be removed shortly.
  */
 public class Rome extends AbstractRome {
+	public Rome() {
+		super(EBiomeFlavor.ROME);
+	}
+
 	/**
 	 * Gets the language (syntax) of the input files to format. When
 	 * <code>null</code> or the empty string, the language is detected automatically
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/BiomeJs.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/BiomeJs.java
new file mode 100644
index 0000000000..07a341eee5
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/BiomeJs.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2016-2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.javascript;
+
+import com.diffplug.spotless.maven.rome.AbstractRome;
+import com.diffplug.spotless.rome.EBiomeFlavor;
+
+/**
+ * Biome formatter step for JavaScript.
+ */
+public class BiomeJs extends AbstractRome {
+	public BiomeJs() {
+		super(EBiomeFlavor.BIOME);
+	}
+
+	@Override
+	protected String getLanguage() {
+		return "js?";
+	}
+}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/Javascript.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/Javascript.java
index b254110486..3f0a3f959c 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/Javascript.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/Javascript.java
@@ -42,6 +42,11 @@ public void addEslint(EslintJs eslint) {
 		addStepFactory(eslint);
 	}
 
+	public void addBiome(BiomeJs biome) {
+		addStepFactory(biome);
+	}
+
+	@Deprecated
 	public void addRome(RomeJs rome) {
 		addStepFactory(rome);
 	}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java
index 60fb7077df..b5754f2b65 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java
@@ -16,11 +16,18 @@
 package com.diffplug.spotless.maven.javascript;
 
 import com.diffplug.spotless.maven.rome.AbstractRome;
+import com.diffplug.spotless.rome.EBiomeFlavor;
 
 /**
  * Rome formatter step for JavaScript.
+ * @deprecated Rome has transitioned to Biome. This will be removed shortly.
  */
+@Deprecated
 public class RomeJs extends AbstractRome {
+	public RomeJs() {
+		super(EBiomeFlavor.ROME);
+	}
+
 	@Override
 	protected String getLanguage() {
 		return "js?";
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/BiomeJson.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/BiomeJson.java
new file mode 100644
index 0000000000..13c2ab92f2
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/BiomeJson.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2016-2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.json;
+
+import com.diffplug.spotless.maven.rome.AbstractRome;
+import com.diffplug.spotless.rome.EBiomeFlavor;
+
+/**
+ * Biome formatter step for JSON.
+ */
+public class BiomeJson extends AbstractRome {
+	public BiomeJson() {
+		super(EBiomeFlavor.BIOME);
+	}
+
+	@Override
+	protected String getLanguage() {
+		return "json";
+	}
+}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java
index be5782b651..8baf379a5e 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java
@@ -50,6 +50,11 @@ public void addJackson(JacksonJson jackson) {
 		addStepFactory(jackson);
 	}
 
+	public void addBiome(BiomeJson biome) {
+		addStepFactory(biome);
+	}
+
+	@Deprecated
 	public void addRome(RomeJson rome) {
 		addStepFactory(rome);
 	}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/RomeJson.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/RomeJson.java
index 1cd044b759..7daab94afb 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/RomeJson.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/RomeJson.java
@@ -16,11 +16,18 @@
 package com.diffplug.spotless.maven.json;
 
 import com.diffplug.spotless.maven.rome.AbstractRome;
+import com.diffplug.spotless.rome.EBiomeFlavor;
 
 /**
  * Rome formatter step for JSON.
+ * @deprecated Rome has transitioned to Biome. This will be removed shortly.
  */
+@Deprecated
 public class RomeJson extends AbstractRome {
+	public RomeJson() {
+		super(EBiomeFlavor.ROME);
+	}
+
 	@Override
 	protected String getLanguage() {
 		return "json";
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/rome/AbstractRome.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/rome/AbstractRome.java
index 33567b0a20..8b140ea381 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/rome/AbstractRome.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/rome/AbstractRome.java
@@ -22,19 +22,27 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.maven.FormatterStepConfig;
 import com.diffplug.spotless.maven.FormatterStepFactory;
+import com.diffplug.spotless.rome.EBiomeFlavor;
 import com.diffplug.spotless.rome.RomeStep;
 
 /**
- * Factory for creating the Rome formatter step that can format format code in
- * various types of language with Rome. Currently Rome support JavaScript,
- * TypeScript, JSX, TSX, and JSON. See also
- * <a href= "https://github.com/rome/tools">https://github.com/rome/tools</a>.
- * It delegates to the Rome CLI executable.
+ * Factory for creating the Biome formatter step that can format format code in
+ * various types of language with Biome. Currently Biome supports JavaScript,
+ * TypeScript, JSX, TSX, and JSON. See also <a href=
+ * "https://github.com/biomejs/biome">https://github.com/biomejs/biome</a>. It
+ * delegates to the Biome CLI executable.
  */
 public abstract class AbstractRome implements FormatterStepFactory {
+	/** Biome flavor to use. */
+	private EBiomeFlavor flavor;
+
+	protected AbstractRome(EBiomeFlavor flavor) {
+		this.flavor = flavor;
+	}
+
 	/**
-	 * Optional path to the directory with configuration file for Rome. The file
-	 * must be named {@code rome.json}. When none is given, the default
+	 * Optional path to the directory with configuration file for Biome. The file
+	 * must be named {@code biome.json}. When none is given, the default
 	 * configuration is used. If this is a relative path, it is resolved against the
 	 * project's base directory.
 	 */
@@ -42,12 +50,12 @@ public abstract class AbstractRome implements FormatterStepFactory {
 	private String configPath;
 
 	/**
-	 * Optional directory where the downloaded Rome executable is placed. If this is
-	 * a relative path, it is resolved against the project's base directory.
+	 * Optional directory where the downloaded Biome executable is placed. If this
+	 * is a relative path, it is resolved against the project's base directory.
 	 * Defaults to
-	 * <code>~/.m2/repository/com/diffplug/spotless/spotless-data/rome</code>.
+	 * <code>~/.m2/repository/com/diffplug/spotless/spotless-data/biome</code>.
 	 * <p>
-	 * You can use an expression like <code>${user.home}/rome</code> if you want to
+	 * You can use an expression like <code>${user.home}/biome</code> if you want to
 	 * use the home directory, or <code>${project.build.directory</code> if you want
 	 * to use the target directory of the current project.
 	 */
@@ -55,7 +63,7 @@ public abstract class AbstractRome implements FormatterStepFactory {
 	private String downloadDir;
 
 	/**
-	 * Optional path to the Rome executable. Either a <code>version</code> or a
+	 * Optional path to the Biome executable. Either a <code>version</code> or a
 	 * <code>pathToExe</code> should be specified. When not given, an attempt is
 	 * made to download the executable for the given version from the network. When
 	 * given, the executable is used and the <code>version</code> parameter is
@@ -64,16 +72,16 @@ public abstract class AbstractRome implements FormatterStepFactory {
 	 * When an absolute path is given, that path is used as-is. When a relative path
 	 * is given, it is resolved against the project's base directory. When only a
 	 * file name (i.e. without any slashes or back slash path separators such as
-	 * {@code rome}) is given, this is interpreted as the name of a command with
-	 * executable that is in your {@code path} environment variable. Use
-	 * {@code ./executable-name} if you want to use an executable in the project's
-	 * base directory.
+	 * <code>biome</code>) is given, this is interpreted as the name of a command
+	 * with executable that is in your <code>path</code> environment variable. Use
+	 * <code>./executable-name</code> if you want to use an executable in the
+	 * project's base directory.
 	 */
 	@Parameter
 	private String pathToExe;
 
 	/**
-	 * Rome version to download, applies only when no <code>pathToExe</code> is
+	 * Biome version to download, applies only when no <code>pathToExe</code> is
 	 * specified explicitly. Either a <code>version</code> or a
 	 * <code>pathToExe</code> should be specified. When not given, a default known
 	 * version is used. For stable builds, it is recommended that you always set the
@@ -99,7 +107,7 @@ public FormatterStep newFormatterStep(FormatterStepConfig config) {
 	/**
 	 * Gets the language (syntax) of the input files to format. When
 	 * <code>null</code> or the empty string, the language is detected automatically
-	 * from the file name. Currently the following languages are supported by Rome:
+	 * from the file name. Currently the following languages are supported by Biome:
 	 * <ul>
 	 * <li>js (JavaScript)</li>
 	 * <li>jsx (JavaScript + JSX)</li>
@@ -117,26 +125,26 @@ public FormatterStep newFormatterStep(FormatterStepConfig config) {
 	protected abstract String getLanguage();
 
 	/**
-	 * A new builder for configuring a Rome step that either downloads the Rome
+	 * A new builder for configuring a Biome step that either downloads the Biome
 	 * executable with the given version from the network, or uses the executable
 	 * from the given path.
 	 *
 	 * @param config Configuration from the Maven Mojo execution with details about
 	 *               the currently executed project.
-	 * @return A builder for a Rome step.
+	 * @return A builder for a Biome step.
 	 */
 	private RomeStep newBuilder(FormatterStepConfig config) {
 		if (pathToExe != null) {
 			var resolvedExePath = resolveExePath(config);
-			return RomeStep.withExePath(resolvedExePath);
+			return RomeStep.withExePath(flavor, resolvedExePath);
 		} else {
 			var downloadDir = resolveDownloadDir(config);
-			return RomeStep.withExeDownload(version, downloadDir);
+			return RomeStep.withExeDownload(flavor, version, downloadDir);
 		}
 	}
 
 	/**
-	 * Resolves the path to the configuration file for Rome. Relative paths are
+	 * Resolves the path to the configuration file for Biome. Relative paths are
 	 * resolved against the project's base directory.
 	 *
 	 * @param config Configuration from the Maven Mojo execution with details about
@@ -148,14 +156,14 @@ private String resolveConfigFile(FormatterStepConfig config) {
 	}
 
 	/**
-	 * Resolves the path to the Rome executable. When the path is only a file name,
+	 * Resolves the path to the Biome executable. When the path is only a file name,
 	 * do not perform any resolution and interpret it as a command that must be on
 	 * the user's path. Otherwise resolve the executable path against the project's
 	 * base directory.
 	 *
 	 * @param config Configuration from the Maven Mojo execution with details about
 	 *               the currently executed project.
-	 * @return The resolved path to the Rome executable.
+	 * @return The resolved path to the Biome executable.
 	 */
 	private String resolveExePath(FormatterStepConfig config) {
 		var path = Paths.get(pathToExe);
@@ -167,20 +175,20 @@ private String resolveExePath(FormatterStepConfig config) {
 	}
 
 	/**
-	 * Resolves the directory to use for storing downloaded Rome executable. When a
+	 * Resolves the directory to use for storing downloaded Biome executable. When a
 	 * {@link #downloadDir} is given, use that directory, resolved against the
-	 * current project's directory. Otherwise, use the {@code Rome} sub folder in
-	 * the shared data directory.
+	 * current project's directory. Otherwise, use the <code>biome</code> sub folder
+	 * in the shared data directory.
 	 *
 	 * @param config Configuration for this step.
-	 * @return The download directory for the Rome executable.
+	 * @return The download directory for the Biome executable.
 	 */
 	private String resolveDownloadDir(FormatterStepConfig config) {
 		final var fileLocator = config.getFileLocator();
 		if (downloadDir != null && !downloadDir.isBlank()) {
 			return fileLocator.getBaseDir().toPath().resolve(downloadDir).toAbsolutePath().toString();
 		} else {
-			return fileLocator.getDataDir().toPath().resolve("rome").toString();
+			return fileLocator.getDataDir().toPath().resolve(flavor.shortName()).toString();
 		}
 	}
 }
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/BiomeTs.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/BiomeTs.java
new file mode 100644
index 0000000000..6fbcb31ee2
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/BiomeTs.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2016-2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.typescript;
+
+import com.diffplug.spotless.maven.rome.AbstractRome;
+import com.diffplug.spotless.rome.EBiomeFlavor;
+
+/**
+ * Biome formatter step for TypeScript.
+ */
+public class BiomeTs extends AbstractRome {
+	public BiomeTs() {
+		super(EBiomeFlavor.BIOME);
+	}
+
+	@Override
+	protected String getLanguage() {
+		return "ts?";
+	}
+}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/RomeTs.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/RomeTs.java
index ccee83744a..149d4208e3 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/RomeTs.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/RomeTs.java
@@ -16,11 +16,18 @@
 package com.diffplug.spotless.maven.typescript;
 
 import com.diffplug.spotless.maven.rome.AbstractRome;
+import com.diffplug.spotless.rome.EBiomeFlavor;
 
 /**
  * Rome formatter step for TypeScript.
+ * @deprecated Rome has transitioned to Biome. This will be removed shortly.
  */
+@Deprecated
 public class RomeTs extends AbstractRome {
+	public RomeTs() {
+		super(EBiomeFlavor.ROME);
+	}
+
 	@Override
 	protected String getLanguage() {
 		return "ts?";
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Typescript.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Typescript.java
index ddae74db82..af25b8c773 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Typescript.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Typescript.java
@@ -46,6 +46,11 @@ public void addEslint(EslintTs eslint) {
 		addStepFactory(eslint);
 	}
 
+	public void addBiome(BiomeTs biome) {
+		addStepFactory(biome);
+	}
+
+	@Deprecated
 	public void addRome(RomeTs rome) {
 		addStepFactory(rome);
 	}
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
index 398932dd19..5fd59752e6 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
@@ -154,6 +154,11 @@ protected void writePomWithPrettierSteps(String includes, String... steps) throw
 		writePom(formats(groupWithSteps("format", including(includes), steps)));
 	}
 
+	protected void writePomWithBiomeSteps(String includes, String... steps) throws IOException {
+		writePom(formats(groupWithSteps("format", including(includes), steps)));
+	}
+
+	@Deprecated
 	protected void writePomWithRomeSteps(String includes, String... steps) throws IOException {
 		writePom(formats(groupWithSteps("format", including(includes), steps)));
 	}
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/biome/BiomeMavenTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/biome/BiomeMavenTest.java
new file mode 100644
index 0000000000..e015b934f5
--- /dev/null
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/biome/BiomeMavenTest.java
@@ -0,0 +1,202 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.biome;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.owasp.encoder.Encode.forXml;
+
+import org.junit.jupiter.api.Test;
+
+import com.diffplug.spotless.maven.MavenIntegrationHarness;
+
+class BiomeMavenTest extends MavenIntegrationHarness {
+	/**
+	 * Tests that Biome can be used as a generic formatting step.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void asGenericStep() throws Exception {
+		writePomWithBiomeSteps("**/*.js", "<biome><version>1.2.0</version></biome>");
+		setFile("biome_test.js").toResource("biome/js/fileBefore.js");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("biome_test.js").sameAsResource("biome/js/fileAfter.js");
+	}
+
+	/**
+	 * Tests that Biome can be used as a JavaScript formatting step.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void asJavaScriptStep() throws Exception {
+		writePomWithJavascriptSteps("**/*.js", "<biome><version>1.2.0</version></biome>");
+		setFile("biome_test.js").toResource("biome/js/fileBefore.js");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("biome_test.js").sameAsResource("biome/js/fileAfter.js");
+	}
+
+	/**
+	 * Tests that biome can be used as a JSON formatting step.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void asJsonStep() throws Exception {
+		writePomWithJsonSteps("**/*.json", "<biome><version>1.2.0</version></biome>");
+		setFile("biome_test.json").toResource("biome/json/fileBefore.json");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("biome_test.json").sameAsResource("biome/json/fileAfter.json");
+	}
+
+	/**
+	 * Tests that biome can be used as a TypeScript formatting step.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void asTypeScriptStep() throws Exception {
+		writePomWithTypescriptSteps("**/*.ts", "<biome><version>1.2.0</version></biome>");
+		setFile("biome_test.ts").toResource("biome/ts/fileBefore.ts");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("biome_test.ts").sameAsResource("biome/ts/fileAfter.ts");
+	}
+
+	/**
+	 * Tests that the language can be specified for the generic format step.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void canSetLanguageForGenericStep() throws Exception {
+		writePomWithBiomeSteps("**/*.nosj", "<biome><version>1.2.0</version><language>json</language></biome>");
+		setFile("biome_test.nosj").toResource("biome/json/fileBefore.json");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("biome_test.nosj").sameAsResource("biome/json/fileAfter.json");
+	}
+
+	/**
+	 * Tests that an absolute config path can be specified.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void configPathAbsolute() throws Exception {
+		var path = newFile("configs").getAbsolutePath();
+		writePomWithBiomeSteps("**/*.js",
+				"<biome><version>1.2.0</version><configPath>" + forXml(path) + "</configPath></biome>");
+		setFile("biome_test.js").toResource("biome/js/longLineBefore.js");
+		setFile("configs/biome.json").toResource("biome/config/line-width-120.json");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("biome_test.js").sameAsResource("biome/js/longLineAfter120.js");
+	}
+
+	/**
+	 * Tests that a path to the directory with the biome.json config file can be
+	 * specified. Uses a config file with a line width of 120.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void configPathLineWidth120() throws Exception {
+		writePomWithBiomeSteps("**/*.js", "<biome><version>1.2.0</version><configPath>configs</configPath></biome>");
+		setFile("biome_test.js").toResource("biome/js/longLineBefore.js");
+		setFile("configs/biome.json").toResource("biome/config/line-width-120.json");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("biome_test.js").sameAsResource("biome/js/longLineAfter120.js");
+	}
+
+	/**
+	 * Tests that a path to the directory with the biome.json config file can be
+	 * specified. Uses a config file with a line width of 80.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void configPathLineWidth80() throws Exception {
+		writePomWithBiomeSteps("**/*.js", "<biome><version>1.2.0</version><configPath>configs</configPath></biome>");
+		setFile("biome_test.js").toResource("biome/js/longLineBefore.js");
+		setFile("configs/biome.json").toResource("biome/config/line-width-80.json");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("biome_test.js").sameAsResource("biome/js/longLineAfter80.js");
+	}
+
+	/**
+	 * Tests that the download directory can be an absolute path.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void downloadDirAbsolute() throws Exception {
+		var path = newFile("target/bin/biome").getAbsoluteFile().toString();
+		writePomWithBiomeSteps("**/*.js",
+				"<biome><version>1.2.0</version><downloadDir>" + forXml(path) + "</downloadDir></biome>");
+		setFile("biome_test.js").toResource("biome/js/fileBefore.js");
+		assertTrue(!newFile("target/bin/biome").exists() || newFile("target/bin/biome").list().length == 0);
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("biome_test.js").sameAsResource("biome/js/fileAfter.js");
+		assertEquals(2, newFile("target/bin/biome").list().length);
+	}
+
+	/**
+	 * Tests that the download directory can be changed to a path relative to the
+	 * project's base directory.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void downloadDirRelative() throws Exception {
+		writePomWithBiomeSteps("**/*.js",
+				"<biome><version>1.2.0</version><downloadDir>target/bin/biome</downloadDir></biome>");
+		setFile("biome_test.js").toResource("biome/js/fileBefore.js");
+		assertTrue(!newFile("target/bin/biome").exists() || newFile("target/bin/biome").list().length == 0);
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("biome_test.js").sameAsResource("biome/js/fileAfter.js");
+		assertEquals(2, newFile("target/bin/biome").list().length);
+	}
+
+	/**
+	 * Tests that the build fails when the input file could not be parsed.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void failureWhenExeNotFound() throws Exception {
+		writePomWithBiomeSteps("**/*.js", "<biome><version>1.2.0</version><pathToExe>biome/is/missing</pathToExe></biome>");
+		setFile("biome_test.js").toResource("biome/js/fileBefore.js");
+		var result = mavenRunner().withArguments("spotless:apply").runHasError();
+		assertFile("biome_test.js").sameAsResource("biome/js/fileBefore.js");
+		assertThat(result.stdOutUtf8()).contains("Biome executable does not exist");
+	}
+
+	/**
+	 * Tests that the build fails when the input file could not be parsed.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void failureWhenNotParseable() throws Exception {
+		writePomWithBiomeSteps("**/*.js", "<biome><version>1.2.0</version><language>json</language></biome>");
+		setFile("biome_test.js").toResource("biome/js/fileBefore.js");
+		var result = mavenRunner().withArguments("spotless:apply").runHasError();
+		assertFile("biome_test.js").sameAsResource("biome/js/fileBefore.js");
+		assertThat(result.stdOutUtf8()).contains("Format with errors is disabled.");
+		assertThat(result.stdOutUtf8()).contains("Unable to format file");
+		assertThat(result.stdOutUtf8()).contains("Step 'biome' found problem in 'biome_test.js'");
+	}
+}
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/rome/RomeMavenTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/rome/RomeMavenTest.java
index 7ca3f7d981..f6a8107be1 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/rome/RomeMavenTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/rome/RomeMavenTest.java
@@ -24,6 +24,7 @@
 
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
 
+@Deprecated
 class RomeMavenTest extends MavenIntegrationHarness {
 	/**
 	 * Tests that rome can be used as a generic formatting step.
@@ -181,7 +182,7 @@ void failureWhenExeNotFound() throws Exception {
 		setFile("rome_test.js").toResource("rome/js/fileBefore.js");
 		var result = mavenRunner().withArguments("spotless:apply").runHasError();
 		assertFile("rome_test.js").sameAsResource("rome/js/fileBefore.js");
-		assertThat(result.stdOutUtf8()).contains("Rome executable does not exist");
+		assertThat(result.stdOutUtf8()).contains("Biome executable does not exist");
 	}
 
 	/**
diff --git a/testlib/src/main/resources/biome/config/line-width-120.json b/testlib/src/main/resources/biome/config/line-width-120.json
new file mode 100644
index 0000000000..8f14afa3f8
--- /dev/null
+++ b/testlib/src/main/resources/biome/config/line-width-120.json
@@ -0,0 +1,11 @@
+{
+    "formatter": {
+      "enabled": true,
+      "indentStyle": "tab",
+      "lineWidth": 120,
+      "formatWithErrors": false
+    },
+    "linter": {
+      "enabled": false
+    }
+  }
\ No newline at end of file
diff --git a/testlib/src/main/resources/biome/config/line-width-80.json b/testlib/src/main/resources/biome/config/line-width-80.json
new file mode 100644
index 0000000000..5ec998bd97
--- /dev/null
+++ b/testlib/src/main/resources/biome/config/line-width-80.json
@@ -0,0 +1,11 @@
+{
+    "formatter": {
+      "enabled": true,
+      "indentStyle": "tab",
+      "lineWidth": 80,
+      "formatWithErrors": false
+    },
+    "linter": {
+      "enabled": false
+    }
+  }
\ No newline at end of file
diff --git a/testlib/src/main/resources/biome/js/fileAfter.cjs b/testlib/src/main/resources/biome/js/fileAfter.cjs
new file mode 100644
index 0000000000..defc9c85eb
--- /dev/null
+++ b/testlib/src/main/resources/biome/js/fileAfter.cjs
@@ -0,0 +1,3 @@
+function foo(name = "World") {
+	return "Hello " + name;
+}
diff --git a/testlib/src/main/resources/biome/js/fileAfter.js b/testlib/src/main/resources/biome/js/fileAfter.js
new file mode 100644
index 0000000000..defc9c85eb
--- /dev/null
+++ b/testlib/src/main/resources/biome/js/fileAfter.js
@@ -0,0 +1,3 @@
+function foo(name = "World") {
+	return "Hello " + name;
+}
diff --git a/testlib/src/main/resources/biome/js/fileAfter.jsx b/testlib/src/main/resources/biome/js/fileAfter.jsx
new file mode 100644
index 0000000000..313aceb6ed
--- /dev/null
+++ b/testlib/src/main/resources/biome/js/fileAfter.jsx
@@ -0,0 +1,3 @@
+export function Panel(cfg = {}) {
+	return <div className={cfg.classname}>{1 + 2}</div>;
+}
diff --git a/testlib/src/main/resources/biome/js/fileAfter.mjs b/testlib/src/main/resources/biome/js/fileAfter.mjs
new file mode 100644
index 0000000000..defc9c85eb
--- /dev/null
+++ b/testlib/src/main/resources/biome/js/fileAfter.mjs
@@ -0,0 +1,3 @@
+function foo(name = "World") {
+	return "Hello " + name;
+}
diff --git a/testlib/src/main/resources/biome/js/fileBefore.cjs b/testlib/src/main/resources/biome/js/fileBefore.cjs
new file mode 100644
index 0000000000..92539ba751
--- /dev/null
+++ b/testlib/src/main/resources/biome/js/fileBefore.cjs
@@ -0,0 +1,3 @@
+function foo ( name="World"){
+                  return "Hello "+name  ;
+    }
\ No newline at end of file
diff --git a/testlib/src/main/resources/biome/js/fileBefore.js b/testlib/src/main/resources/biome/js/fileBefore.js
new file mode 100644
index 0000000000..92539ba751
--- /dev/null
+++ b/testlib/src/main/resources/biome/js/fileBefore.js
@@ -0,0 +1,3 @@
+function foo ( name="World"){
+                  return "Hello "+name  ;
+    }
\ No newline at end of file
diff --git a/testlib/src/main/resources/biome/js/fileBefore.jsx b/testlib/src/main/resources/biome/js/fileBefore.jsx
new file mode 100644
index 0000000000..8e5d9834bc
--- /dev/null
+++ b/testlib/src/main/resources/biome/js/fileBefore.jsx
@@ -0,0 +1,4 @@
+export function Panel ( cfg={}){
+                  return (<div className={cfg.classname}>{1+2}</div>
+                  )  ;
+    }
\ No newline at end of file
diff --git a/testlib/src/main/resources/biome/js/fileBefore.mjs b/testlib/src/main/resources/biome/js/fileBefore.mjs
new file mode 100644
index 0000000000..92539ba751
--- /dev/null
+++ b/testlib/src/main/resources/biome/js/fileBefore.mjs
@@ -0,0 +1,3 @@
+function foo ( name="World"){
+                  return "Hello "+name  ;
+    }
\ No newline at end of file
diff --git a/testlib/src/main/resources/biome/js/longLineAfter120.js b/testlib/src/main/resources/biome/js/longLineAfter120.js
new file mode 100644
index 0000000000..68addc4b65
--- /dev/null
+++ b/testlib/src/main/resources/biome/js/longLineAfter120.js
@@ -0,0 +1 @@
+const x = ["Hello", "World", "How", "Are", "You", "Doing", "Today", "Such", "A", "Wondrous", "Sunshine"];
diff --git a/testlib/src/main/resources/biome/js/longLineAfter80.js b/testlib/src/main/resources/biome/js/longLineAfter80.js
new file mode 100644
index 0000000000..dbdbd157e9
--- /dev/null
+++ b/testlib/src/main/resources/biome/js/longLineAfter80.js
@@ -0,0 +1,13 @@
+const x = [
+	"Hello",
+	"World",
+	"How",
+	"Are",
+	"You",
+	"Doing",
+	"Today",
+	"Such",
+	"A",
+	"Wondrous",
+	"Sunshine",
+];
diff --git a/testlib/src/main/resources/biome/js/longLineBefore.js b/testlib/src/main/resources/biome/js/longLineBefore.js
new file mode 100644
index 0000000000..fd59e429c2
--- /dev/null
+++ b/testlib/src/main/resources/biome/js/longLineBefore.js
@@ -0,0 +1 @@
+const x = ["Hello", "World", "How", "Are", "You", "Doing", "Today", "Such", "A", "Wondrous", "Sunshine"];
\ No newline at end of file
diff --git a/testlib/src/main/resources/biome/json/fileAfter.json b/testlib/src/main/resources/biome/json/fileAfter.json
new file mode 100644
index 0000000000..468dac3297
--- /dev/null
+++ b/testlib/src/main/resources/biome/json/fileAfter.json
@@ -0,0 +1,5 @@
+{
+	"a": [1, 2, 3],
+	"b": 9,
+	"c": null
+}
diff --git a/testlib/src/main/resources/biome/json/fileBefore.json b/testlib/src/main/resources/biome/json/fileBefore.json
new file mode 100644
index 0000000000..77182284c7
--- /dev/null
+++ b/testlib/src/main/resources/biome/json/fileBefore.json
@@ -0,0 +1,7 @@
+   {
+    "a":[1,2,3
+
+],
+      "b":9,
+    "c"   : null
+   }
\ No newline at end of file
diff --git a/testlib/src/main/resources/biome/ts/fileAfter.cts b/testlib/src/main/resources/biome/ts/fileAfter.cts
new file mode 100644
index 0000000000..f854953234
--- /dev/null
+++ b/testlib/src/main/resources/biome/ts/fileAfter.cts
@@ -0,0 +1,4 @@
+type Name = "World" | "Maven" | "Gradle";
+const foo = <T>(name: Name = "World", v: T): string => {
+	return "Hello " + name;
+};
diff --git a/testlib/src/main/resources/biome/ts/fileAfter.mts b/testlib/src/main/resources/biome/ts/fileAfter.mts
new file mode 100644
index 0000000000..e6563e3030
--- /dev/null
+++ b/testlib/src/main/resources/biome/ts/fileAfter.mts
@@ -0,0 +1,4 @@
+export type Name = "World" | "Maven" | "Gradle";
+export const foo = <T>(name: Name = "World", v: T): string => {
+	return "Hello " + name;
+};
diff --git a/testlib/src/main/resources/biome/ts/fileAfter.ts b/testlib/src/main/resources/biome/ts/fileAfter.ts
new file mode 100644
index 0000000000..e6563e3030
--- /dev/null
+++ b/testlib/src/main/resources/biome/ts/fileAfter.ts
@@ -0,0 +1,4 @@
+export type Name = "World" | "Maven" | "Gradle";
+export const foo = <T>(name: Name = "World", v: T): string => {
+	return "Hello " + name;
+};
diff --git a/testlib/src/main/resources/biome/ts/fileAfter.tsx b/testlib/src/main/resources/biome/ts/fileAfter.tsx
new file mode 100644
index 0000000000..15ef316142
--- /dev/null
+++ b/testlib/src/main/resources/biome/ts/fileAfter.tsx
@@ -0,0 +1,7 @@
+export interface Cfg<T> {
+	classname: string;
+	message: T;
+}
+const Panel = <T,>(cfg: Cfg<T>): JSX.Element => {
+	return <div className={cfg.classname}>{String(cfg.message)}</div>;
+};
diff --git a/testlib/src/main/resources/biome/ts/fileBefore.cts b/testlib/src/main/resources/biome/ts/fileBefore.cts
new file mode 100644
index 0000000000..d4304287c0
--- /dev/null
+++ b/testlib/src/main/resources/biome/ts/fileBefore.cts
@@ -0,0 +1,4 @@
+type Name = "World"   | "Maven"|"Gradle";
+const    foo = <T>(   name:   Name="World", v: T): string => {
+                        return "Hello " + name;
+  }
\ No newline at end of file
diff --git a/testlib/src/main/resources/biome/ts/fileBefore.mts b/testlib/src/main/resources/biome/ts/fileBefore.mts
new file mode 100644
index 0000000000..96837762a3
--- /dev/null
+++ b/testlib/src/main/resources/biome/ts/fileBefore.mts
@@ -0,0 +1,5 @@
+export
+ type Name = "World"   | "Maven"|"Gradle";
+export const    foo = <T>(   name:   Name="World", v: T): string => {
+                        return "Hello " + name;
+  }
\ No newline at end of file
diff --git a/testlib/src/main/resources/biome/ts/fileBefore.ts b/testlib/src/main/resources/biome/ts/fileBefore.ts
new file mode 100644
index 0000000000..96837762a3
--- /dev/null
+++ b/testlib/src/main/resources/biome/ts/fileBefore.ts
@@ -0,0 +1,5 @@
+export
+ type Name = "World"   | "Maven"|"Gradle";
+export const    foo = <T>(   name:   Name="World", v: T): string => {
+                        return "Hello " + name;
+  }
\ No newline at end of file
diff --git a/testlib/src/main/resources/biome/ts/fileBefore.tsx b/testlib/src/main/resources/biome/ts/fileBefore.tsx
new file mode 100644
index 0000000000..38f24f8440
--- /dev/null
+++ b/testlib/src/main/resources/biome/ts/fileBefore.tsx
@@ -0,0 +1,8 @@
+export interface Cfg<T >{
+classname:string,
+message:T,
+}
+const Panel = <T,> ( cfg:Cfg<T>):JSX.Element  =>{
+                  return (<div className={cfg.classname}>{String(cfg.message)}</div>
+                  )  ;
+    }
\ No newline at end of file
diff --git a/testlib/src/test/java/com/diffplug/spotless/rome/RomeStepTest.java b/testlib/src/test/java/com/diffplug/spotless/rome/RomeStepTest.java
index 5c4801d50a..f1761498c3 100644
--- a/testlib/src/test/java/com/diffplug/spotless/rome/RomeStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/rome/RomeStepTest.java
@@ -38,247 +38,498 @@ static void createDownloadDir() throws IOException {
 		downloadDir = userHome.resolve(".gradle").resolve("rome-dl-test").toAbsolutePath().normalize().toString();
 	}
 
-	/**
-	 * Tests that files can be formatted without setting the input language
-	 * explicitly.
-	 */
 	@Nested
-	class AutoDetectLanguage {
+	@Deprecated
+	class Rome {
 		/**
-		 * Tests that a *.cjs file can be formatted without setting the input language
+		 * Tests that files can be formatted without setting the input language
 		 * explicitly.
 		 */
-		@Test
-		void testAutoDetectCjs() {
-			var step = RomeStep.withExeDownload("12.0.0", downloadDir.toString()).create();
-			var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
-			stepHarness.testResource("rome/js/fileBefore.cjs", "rome/js/fileAfter.cjs");
-		}
+		@Nested
+		class AutoDetectLanguage {
+			/**
+			 * Tests that a *.cjs file can be formatted without setting the input language
+			 * explicitly.
+			 */
+			@Test
+			void testAutoDetectCjs() {
+				var step = RomeStep.withExeDownload(EBiomeFlavor.ROME, "12.0.0", downloadDir.toString()).create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("rome/js/fileBefore.cjs", "rome/js/fileAfter.cjs");
+			}
 
-		/**
-		 * Tests that a *.cts file can be formatted without setting the input language
-		 * explicitly.
-		 */
-		@Test
-		void testAutoDetectCts() {
-			var step = RomeStep.withExeDownload("12.0.0", downloadDir.toString()).create();
-			var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
-			stepHarness.testResource("rome/ts/fileBefore.cts", "rome/ts/fileAfter.cts");
-		}
+			/**
+			 * Tests that a *.cts file can be formatted without setting the input language
+			 * explicitly.
+			 */
+			@Test
+			void testAutoDetectCts() {
+				var step = RomeStep.withExeDownload(EBiomeFlavor.ROME, "12.0.0", downloadDir.toString()).create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("rome/ts/fileBefore.cts", "rome/ts/fileAfter.cts");
+			}
 
-		/**
-		 * Tests that a *.js file can be formatted without setting the input language
-		 * explicitly.
-		 */
-		@Test
-		void testAutoDetectJs() {
-			var step = RomeStep.withExeDownload("12.0.0", downloadDir.toString()).create();
-			var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
-			stepHarness.testResource("rome/js/fileBefore.js", "rome/js/fileAfter.js");
-		}
+			/**
+			 * Tests that a *.js file can be formatted without setting the input language
+			 * explicitly.
+			 */
+			@Test
+			void testAutoDetectJs() {
+				var step = RomeStep.withExeDownload(EBiomeFlavor.ROME, "12.0.0", downloadDir.toString()).create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("rome/js/fileBefore.js", "rome/js/fileAfter.js");
+			}
 
-		/**
-		 * Tests that a *.js file can be formatted without setting the input language
-		 * explicitly.
-		 */
-		@Test
-		void testAutoDetectJson() {
-			var step = RomeStep.withExeDownload("12.0.0", downloadDir.toString()).create();
-			var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
-			stepHarness.testResource("rome/json/fileBefore.json", "rome/json/fileAfter.json");
-		}
+			/**
+			 * Tests that a *.js file can be formatted without setting the input language
+			 * explicitly.
+			 */
+			@Test
+			void testAutoDetectJson() {
+				var step = RomeStep.withExeDownload(EBiomeFlavor.ROME, "12.0.0", downloadDir.toString()).create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("rome/json/fileBefore.json", "rome/json/fileAfter.json");
+			}
 
-		/**
-		 * Tests that a *.jsx file can be formatted without setting the input language
-		 * explicitly.
-		 */
-		@Test
-		void testAutoDetectJsx() {
-			var step = RomeStep.withExeDownload("12.0.0", downloadDir.toString()).create();
-			var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
-			stepHarness.testResource("rome/js/fileBefore.jsx", "rome/js/fileAfter.jsx");
-		}
+			/**
+			 * Tests that a *.jsx file can be formatted without setting the input language
+			 * explicitly.
+			 */
+			@Test
+			void testAutoDetectJsx() {
+				var step = RomeStep.withExeDownload(EBiomeFlavor.ROME, "12.0.0", downloadDir.toString()).create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("rome/js/fileBefore.jsx", "rome/js/fileAfter.jsx");
+			}
 
-		/**
-		 * Tests that a *.mjs file can be formatted without setting the input language
-		 * explicitly.
-		 */
-		@Test
-		void testAutoDetectMjs() {
-			var step = RomeStep.withExeDownload("12.0.0", downloadDir.toString()).create();
-			var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
-			stepHarness.testResource("rome/js/fileBefore.mjs", "rome/js/fileAfter.mjs");
-		}
+			/**
+			 * Tests that a *.mjs file can be formatted without setting the input language
+			 * explicitly.
+			 */
+			@Test
+			void testAutoDetectMjs() {
+				var step = RomeStep.withExeDownload(EBiomeFlavor.ROME, "12.0.0", downloadDir.toString()).create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("rome/js/fileBefore.mjs", "rome/js/fileAfter.mjs");
+			}
 
-		/**
-		 * Tests that a *.mts file can be formatted without setting the input language
-		 * explicitly.
-		 */
-		@Test
-		void testAutoDetectMts() {
-			var step = RomeStep.withExeDownload("12.0.0", downloadDir.toString()).create();
-			var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
-			stepHarness.testResource("rome/ts/fileBefore.mts", "rome/ts/fileAfter.mts");
-		}
+			/**
+			 * Tests that a *.mts file can be formatted without setting the input language
+			 * explicitly.
+			 */
+			@Test
+			void testAutoDetectMts() {
+				var step = RomeStep.withExeDownload(EBiomeFlavor.ROME, "12.0.0", downloadDir.toString()).create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("rome/ts/fileBefore.mts", "rome/ts/fileAfter.mts");
+			}
 
-		/**
-		 * Tests that a *.ts file can be formatted without setting the input language
-		 * explicitly.
-		 */
-		@Test
-		void testAutoDetectTs() {
-			var step = RomeStep.withExeDownload("12.0.0", downloadDir.toString()).create();
-			var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
-			stepHarness.testResource("rome/ts/fileBefore.ts", "rome/ts/fileAfter.ts");
-		}
+			/**
+			 * Tests that a *.ts file can be formatted without setting the input language
+			 * explicitly.
+			 */
+			@Test
+			void testAutoDetectTs() {
+				var step = RomeStep.withExeDownload(EBiomeFlavor.ROME, "12.0.0", downloadDir.toString()).create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("rome/ts/fileBefore.ts", "rome/ts/fileAfter.ts");
+			}
 
-		/**
-		 * Tests that a *.tsx file can be formatted without setting the input language
-		 * explicitly.
-		 */
-		@Test
-		void testAutoDetectTsx() {
-			var step = RomeStep.withExeDownload("12.0.0", downloadDir.toString()).create();
-			var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
-			stepHarness.testResource("rome/ts/fileBefore.tsx", "rome/ts/fileAfter.tsx");
+			/**
+			 * Tests that a *.tsx file can be formatted without setting the input language
+			 * explicitly.
+			 */
+			@Test
+			void testAutoDetectTsx() {
+				var step = RomeStep.withExeDownload(EBiomeFlavor.ROME, "12.0.0", downloadDir.toString()).create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("rome/ts/fileBefore.tsx", "rome/ts/fileAfter.tsx");
+			}
 		}
-	}
 
-	@Nested
-	class ConfigFile {
-		/**
-		 * Test formatting with the line width in the config file set to 120.
-		 */
-		@Test
-		void testLineWidth120() {
-			var path = createRomeConfig("rome/config/line-width-120.json");
-			var step = RomeStep.withExeDownload("12.0.0", downloadDir.toString()).withConfigPath(path).create();
-			var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
-			stepHarness.testResource("rome/js/longLineBefore.js", "rome/js/longLineAfter120.js");
+		@Nested
+		class ConfigFile {
+			/**
+			 * Test formatting with the line width in the config file set to 120.
+			 */
+			@Test
+			void testLineWidth120() {
+				var path = createRomeConfig("rome/config/line-width-120.json");
+				var step = RomeStep.withExeDownload(EBiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withConfigPath(path).create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("rome/js/longLineBefore.js", "rome/js/longLineAfter120.js");
+			}
+
+			/**
+			 * Test formatting with the line width in the config file set to 120.
+			 */
+			@Test
+			void testLineWidth80() {
+				var path = createRomeConfig("rome/config/line-width-80.json");
+				var step = RomeStep.withExeDownload(EBiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withConfigPath(path).create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("rome/js/longLineBefore.js", "rome/js/longLineAfter80.js");
+			}
+
+			private String createRomeConfig(String name) {
+				var config = createTestFile(name).toPath();
+				var dir = config.getParent();
+				var rome = dir.resolve("rome.json");
+				ThrowingEx.run(() -> Files.copy(config, rome));
+				return dir.toString();
+			}
 		}
 
 		/**
-		 * Test formatting with the line width in the config file set to 120.
+		 * Tests that files can be formatted when setting the input language explicitly.
 		 */
-		@Test
-		void testLineWidth80() {
-			var path = createRomeConfig("rome/config/line-width-80.json");
-			var step = RomeStep.withExeDownload("12.0.0", downloadDir.toString()).withConfigPath(path).create();
-			var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
-			stepHarness.testResource("rome/js/longLineBefore.js", "rome/js/longLineAfter80.js");
-		}
+		@Nested
+		class ExplicitLanguage {
+			/**
+			 * Tests that a *.cjs file can be formatted when setting the input language
+			 * explicitly.
+			 */
+			@Test
+			void testAutoDetectCjs() {
+				var step = RomeStep.withExeDownload(EBiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withLanguage("js").create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("rome/js/fileBefore.cjs", "rome/js/fileAfter.cjs");
+			}
+
+			/**
+			 * Tests that a *.cts file can be formatted when setting the input language
+			 * explicitly.
+			 */
+			@Test
+			void testAutoDetectCts() {
+				var step = RomeStep.withExeDownload(EBiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withLanguage("ts").create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("rome/ts/fileBefore.cts", "rome/ts/fileAfter.cts");
+			}
+
+			/**
+			 * Tests that a *.js file can be formatted when setting the input language
+			 * explicitly.
+			 */
+			@Test
+			void testAutoDetectJs() {
+				var step = RomeStep.withExeDownload(EBiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withLanguage("js").create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("rome/js/fileBefore.js", "rome/js/fileAfter.js");
+			}
+
+			/**
+			 * Tests that a *.json file can be formatted when setting the input language
+			 * explicitly.
+			 */
+			@Test
+			void testAutoDetectJson() {
+				var step = RomeStep.withExeDownload(EBiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withLanguage("json").create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("rome/json/fileBefore.json", "rome/json/fileAfter.json");
+			}
+
+			/**
+			 * Tests that a *.jsx file can be formatted when setting the input language
+			 * explicitly.
+			 */
+			@Test
+			void testAutoDetectJsx() {
+				var step = RomeStep.withExeDownload(EBiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withLanguage("jsx").create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("rome/js/fileBefore.jsx", "rome/js/fileAfter.jsx");
+			}
 
-		private String createRomeConfig(String name) {
-			var config = createTestFile(name).toPath();
-			var dir = config.getParent();
-			var rome = dir.resolve("rome.json");
-			ThrowingEx.run(() -> Files.copy(config, rome));
-			return dir.toString();
+			/**
+			 * Tests that a *.mjs file can be formatted without setting the input language
+			 * explicitly.
+			 */
+			@Test
+			void testAutoDetectMjs() {
+				var step = RomeStep.withExeDownload(EBiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withLanguage("js").create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("rome/js/fileBefore.mjs", "rome/js/fileAfter.mjs");
+			}
+
+			/**
+			 * Tests that a *.mts file can be formatted when setting the input language
+			 * explicitly.
+			 */
+			@Test
+			void testAutoDetectMts() {
+				var step = RomeStep.withExeDownload(EBiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withLanguage("ts").create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("rome/ts/fileBefore.mts", "rome/ts/fileAfter.mts");
+			}
+
+			/**
+			 * Tests that a *.ts file can be formatted when setting the input language
+			 * explicitly.
+			 */
+			@Test
+			void testAutoDetectTs() {
+				var step = RomeStep.withExeDownload(EBiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withLanguage("ts").create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("rome/ts/fileBefore.ts", "rome/ts/fileAfter.ts");
+			}
+
+			/**
+			 * Tests that a *.tsx file can be formatted when setting the input language
+			 * explicitly.
+			 */
+			@Test
+			void testAutoDetectTsx() {
+				var step = RomeStep.withExeDownload(EBiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withLanguage("tsx").create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("rome/ts/fileBefore.tsx", "rome/ts/fileAfter.tsx");
+			}
 		}
 	}
 
-	/**
-	 * Tests that files can be formatted when setting the input language explicitly.
-	 */
 	@Nested
-	class ExplicitLanguage {
+	class Biome {
 		/**
-		 * Tests that a *.cjs file can be formatted when setting the input language
+		 * Tests that files can be formatted without setting the input language
 		 * explicitly.
 		 */
-		@Test
-		void testAutoDetectCjs() {
-			var step = RomeStep.withExeDownload("12.0.0", downloadDir.toString()).withLanguage("js").create();
-			var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
-			stepHarness.testResource("rome/js/fileBefore.cjs", "rome/js/fileAfter.cjs");
-		}
+		@Nested
+		class AutoDetectLanguage {
+			/**
+			 * Tests that a *.cjs file can be formatted without setting the input language
+			 * explicitly.
+			 */
+			@Test
+			void testAutoDetectCjs() {
+				var step = RomeStep.withExeDownload(EBiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("biome/js/fileBefore.cjs", "biome/js/fileAfter.cjs");
+			}
 
-		/**
-		 * Tests that a *.cts file can be formatted when setting the input language
-		 * explicitly.
-		 */
-		@Test
-		void testAutoDetectCts() {
-			var step = RomeStep.withExeDownload("12.0.0", downloadDir.toString()).withLanguage("ts").create();
-			var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
-			stepHarness.testResource("rome/ts/fileBefore.cts", "rome/ts/fileAfter.cts");
-		}
+			/**
+			 * Tests that a *.cts file can be formatted without setting the input language
+			 * explicitly.
+			 */
+			@Test
+			void testAutoDetectCts() {
+				var step = RomeStep.withExeDownload(EBiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("biome/ts/fileBefore.cts", "biome/ts/fileAfter.cts");
+			}
 
-		/**
-		 * Tests that a *.js file can be formatted when setting the input language
-		 * explicitly.
-		 */
-		@Test
-		void testAutoDetectJs() {
-			var step = RomeStep.withExeDownload("12.0.0", downloadDir.toString()).withLanguage("js").create();
-			var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
-			stepHarness.testResource("rome/js/fileBefore.js", "rome/js/fileAfter.js");
-		}
+			/**
+			 * Tests that a *.js file can be formatted without setting the input language
+			 * explicitly.
+			 */
+			@Test
+			void testAutoDetectJs() {
+				var step = RomeStep.withExeDownload(EBiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("biome/js/fileBefore.js", "biome/js/fileAfter.js");
+			}
 
-		/**
-		 * Tests that a *.json file can be formatted when setting the input language
-		 * explicitly.
-		 */
-		@Test
-		void testAutoDetectJson() {
-			var step = RomeStep.withExeDownload("12.0.0", downloadDir.toString()).withLanguage("json").create();
-			var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
-			stepHarness.testResource("rome/json/fileBefore.json", "rome/json/fileAfter.json");
-		}
+			/**
+			 * Tests that a *.js file can be formatted without setting the input language
+			 * explicitly.
+			 */
+			@Test
+			void testAutoDetectJson() {
+				var step = RomeStep.withExeDownload(EBiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("biome/json/fileBefore.json", "biome/json/fileAfter.json");
+			}
 
-		/**
-		 * Tests that a *.jsx file can be formatted when setting the input language
-		 * explicitly.
-		 */
-		@Test
-		void testAutoDetectJsx() {
-			var step = RomeStep.withExeDownload("12.0.0", downloadDir.toString()).withLanguage("jsx").create();
-			var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
-			stepHarness.testResource("rome/js/fileBefore.jsx", "rome/js/fileAfter.jsx");
-		}
+			/**
+			 * Tests that a *.jsx file can be formatted without setting the input language
+			 * explicitly.
+			 */
+			@Test
+			void testAutoDetectJsx() {
+				var step = RomeStep.withExeDownload(EBiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("biome/js/fileBefore.jsx", "biome/js/fileAfter.jsx");
+			}
 
-		/**
-		 * Tests that a *.mjs file can be formatted without setting the input language
-		 * explicitly.
-		 */
-		@Test
-		void testAutoDetectMjs() {
-			var step = RomeStep.withExeDownload("12.0.0", downloadDir.toString()).withLanguage("js").create();
-			var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
-			stepHarness.testResource("rome/js/fileBefore.mjs", "rome/js/fileAfter.mjs");
-		}
+			/**
+			 * Tests that a *.mjs file can be formatted without setting the input language
+			 * explicitly.
+			 */
+			@Test
+			void testAutoDetectMjs() {
+				var step = RomeStep.withExeDownload(EBiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("biome/js/fileBefore.mjs", "biome/js/fileAfter.mjs");
+			}
 
-		/**
-		 * Tests that a *.mts file can be formatted when setting the input language
-		 * explicitly.
-		 */
-		@Test
-		void testAutoDetectMts() {
-			var step = RomeStep.withExeDownload("12.0.0", downloadDir.toString()).withLanguage("ts").create();
-			var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
-			stepHarness.testResource("rome/ts/fileBefore.mts", "rome/ts/fileAfter.mts");
+			/**
+			 * Tests that a *.mts file can be formatted without setting the input language
+			 * explicitly.
+			 */
+			@Test
+			void testAutoDetectMts() {
+				var step = RomeStep.withExeDownload(EBiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("biome/ts/fileBefore.mts", "biome/ts/fileAfter.mts");
+			}
+
+			/**
+			 * Tests that a *.ts file can be formatted without setting the input language
+			 * explicitly.
+			 */
+			@Test
+			void testAutoDetectTs() {
+				var step = RomeStep.withExeDownload(EBiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("biome/ts/fileBefore.ts", "biome/ts/fileAfter.ts");
+			}
+
+			/**
+			 * Tests that a *.tsx file can be formatted without setting the input language
+			 * explicitly.
+			 */
+			@Test
+			void testAutoDetectTsx() {
+				var step = RomeStep.withExeDownload(EBiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("biome/ts/fileBefore.tsx", "biome/ts/fileAfter.tsx");
+			}
 		}
 
-		/**
-		 * Tests that a *.ts file can be formatted when setting the input language
-		 * explicitly.
-		 */
-		@Test
-		void testAutoDetectTs() {
-			var step = RomeStep.withExeDownload("12.0.0", downloadDir.toString()).withLanguage("ts").create();
-			var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
-			stepHarness.testResource("rome/ts/fileBefore.ts", "rome/ts/fileAfter.ts");
+		@Nested
+		class ConfigFile {
+			/**
+			 * Test formatting with the line width in the config file set to 120.
+			 */
+			@Test
+			void testLineWidth120() {
+				var path = createBiomeConfig("biome/config/line-width-120.json");
+				var step = RomeStep.withExeDownload(EBiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withConfigPath(path).create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("biome/js/longLineBefore.js", "biome/js/longLineAfter120.js");
+			}
+
+			/**
+			 * Test formatting with the line width in the config file set to 120.
+			 */
+			@Test
+			void testLineWidth80() {
+				var path = createBiomeConfig("biome/config/line-width-80.json");
+				var step = RomeStep.withExeDownload(EBiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withConfigPath(path).create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("biome/js/longLineBefore.js", "biome/js/longLineAfter80.js");
+			}
+
+			private String createBiomeConfig(String name) {
+				var config = createTestFile(name).toPath();
+				var dir = config.getParent();
+				var rome = dir.resolve("biome.json");
+				ThrowingEx.run(() -> Files.copy(config, rome));
+				return dir.toString();
+			}
 		}
 
 		/**
-		 * Tests that a *.tsx file can be formatted when setting the input language
-		 * explicitly.
+		 * Tests that files can be formatted when setting the input language explicitly.
 		 */
-		@Test
-		void testAutoDetectTsx() {
-			var step = RomeStep.withExeDownload("12.0.0", downloadDir.toString()).withLanguage("tsx").create();
-			var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
-			stepHarness.testResource("rome/ts/fileBefore.tsx", "rome/ts/fileAfter.tsx");
+		@Nested
+		class ExplicitLanguage {
+			/**
+			 * Tests that a *.cjs file can be formatted when setting the input language
+			 * explicitly.
+			 */
+			@Test
+			void testAutoDetectCjs() {
+				var step = RomeStep.withExeDownload(EBiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("js").create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("biome/js/fileBefore.cjs", "biome/js/fileAfter.cjs");
+			}
+
+			/**
+			 * Tests that a *.cts file can be formatted when setting the input language
+			 * explicitly.
+			 */
+			@Test
+			void testAutoDetectCts() {
+				var step = RomeStep.withExeDownload(EBiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("ts").create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("biome/ts/fileBefore.cts", "biome/ts/fileAfter.cts");
+			}
+
+			/**
+			 * Tests that a *.js file can be formatted when setting the input language
+			 * explicitly.
+			 */
+			@Test
+			void testAutoDetectJs() {
+				var step = RomeStep.withExeDownload(EBiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("js").create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("biome/js/fileBefore.js", "biome/js/fileAfter.js");
+			}
+
+			/**
+			 * Tests that a *.json file can be formatted when setting the input language
+			 * explicitly.
+			 */
+			@Test
+			void testAutoDetectJson() {
+				var step = RomeStep.withExeDownload(EBiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("json").create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("biome/json/fileBefore.json", "biome/json/fileAfter.json");
+			}
+
+			/**
+			 * Tests that a *.jsx file can be formatted when setting the input language
+			 * explicitly.
+			 */
+			@Test
+			void testAutoDetectJsx() {
+				var step = RomeStep.withExeDownload(EBiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("jsx").create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("biome/js/fileBefore.jsx", "biome/js/fileAfter.jsx");
+			}
+
+			/**
+			 * Tests that a *.mjs file can be formatted without setting the input language
+			 * explicitly.
+			 */
+			@Test
+			void testAutoDetectMjs() {
+				var step = RomeStep.withExeDownload(EBiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("js").create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("biome/js/fileBefore.mjs", "biome/js/fileAfter.mjs");
+			}
+
+			/**
+			 * Tests that a *.mts file can be formatted when setting the input language
+			 * explicitly.
+			 */
+			@Test
+			void testAutoDetectMts() {
+				var step = RomeStep.withExeDownload(EBiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("ts").create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("biome/ts/fileBefore.mts", "biome/ts/fileAfter.mts");
+			}
+
+			/**
+			 * Tests that a *.ts file can be formatted when setting the input language
+			 * explicitly.
+			 */
+			@Test
+			void testAutoDetectTs() {
+				var step = RomeStep.withExeDownload(EBiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("ts").create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("biome/ts/fileBefore.ts", "biome/ts/fileAfter.ts");
+			}
+
+			/**
+			 * Tests that a *.tsx file can be formatted when setting the input language
+			 * explicitly.
+			 */
+			@Test
+			void testAutoDetectTsx() {
+				var step = RomeStep.withExeDownload(EBiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("tsx").create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("biome/ts/fileBefore.tsx", "biome/ts/fileAfter.tsx");
+			}
 		}
 	}
 }

From 967825f76ea6d3f3541c63b457ba758fca2eb654 Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <awa@xima.de>
Date: Fri, 15 Sep 2023 19:46:13 +0100
Subject: [PATCH 1215/2068] Update readme and changes for biome, #1804

---
 CHANGES.md               |   4 ++
 README.md                |   4 +-
 plugin-gradle/CHANGES.md |   4 ++
 plugin-gradle/README.md  | 133 +++++++++++++++++++--------------------
 plugin-maven/CHANGES.md  |   4 ++
 plugin-maven/README.md   | 124 ++++++++++++++++++------------------
 6 files changed, 143 insertions(+), 130 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 652e4ce38c..36ca61af71 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,6 +11,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 
+* Add support for biome. The Rome project [was renamed to Biome](https://biomejs.dev/blog/annoucing-biome/).
+  The configuration is still the same, but you should switch to the new `biome` tag / function and adjust
+  the version accordingly. ([#1804](https://github.com/diffplug/spotless/issues/1804)).
+
 ### Fixed
 * Added support for plugins when using Prettier version `3.0.0` and newer. ([#1802](https://github.com/diffplug/spotless/pull/1802))
 
diff --git a/README.md b/README.md
index cd1e736014..0bfa395a23 100644
--- a/README.md
+++ b/README.md
@@ -101,7 +101,7 @@ lib('npm.TsFmtFormatterStep')                    +'{{yes}}       | {{yes}}
 lib('pom.SortPomStepStep')                       +'{{no}}        | {{yes}}      | {{no}}       | {{no}}  |',
 lib('protobuf.BufStep')                          +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
 lib('python.BlackStep')                          +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
-lib('rome.RomeStep')                             +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
+lib('biome.BiomeStep')                           +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('scala.ScalaFmtStep')                        +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
 lib('sql.DBeaverSQLFormatterStep')               +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
 extra('wtp.EclipseWtpFormatterStep')             +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
@@ -153,7 +153,7 @@ lib('yaml.JacksonYamlStep')                      +'{{yes}}       | {{yes}}
 | [`pom.SortPomStepStep`](lib/src/main/java/com/diffplug/spotless/pom/SortPomStepStep.java) | :white_large_square:        | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`protobuf.BufStep`](lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
 | [`python.BlackStep`](lib/src/main/java/com/diffplug/spotless/python/BlackStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
-| [`rome.RomeStep`](lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
+| [`biome.BiomeStep`](lib/src/main/java/com/diffplug/spotless/biome/BiomeStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`scala.ScalaFmtStep`](lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`sql.DBeaverSQLFormatterStep`](lib/src/main/java/com/diffplug/spotless/sql/DBeaverSQLFormatterStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`wtp.EclipseWtpFormatterStep`](lib-extra/src/main/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 989b4ece12..d7907f0b87 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -4,6 +4,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 
+* Add support for biome. The Rome project [was renamed to Biome](https://biomejs.dev/blog/annoucing-biome/).
+  The configuration is still the same, but you should switch to the new `biome(...)` function and adjust
+  the version accordingly. ([#1804](https://github.com/diffplug/spotless/issues/1804)).
+
 ### Fixed
 * Added support for plugins when using Prettier version `3.0.0` and newer. ([#1802](https://github.com/diffplug/spotless/pull/1802))
 
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index f81b897a4a..9c37f16902 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -64,9 +64,9 @@ Spotless supports all of Gradle's built-in performance features (incremental bui
   - [FreshMark](#freshmark) aka markdown
   - [Antlr4](#antlr4) ([antlr4formatter](#antlr4formatter))
   - [SQL](#sql) ([dbeaver](#dbeaver), [prettier](#prettier))
-  - [Typescript](#typescript) ([tsfmt](#tsfmt), [prettier](#prettier), [ESLint](#eslint-typescript), [Rome](#rome))
-  - [Javascript](#javascript) ([prettier](#prettier), [ESLint](#eslint-javascript), [Rome](#rome))
-  - [JSON](#json) ([simple](#simple), [gson](#gson), [jackson](#jackson), [rome](#rome), [jsonPatch](#jsonPatch))
+  - [Typescript](#typescript) ([tsfmt](#tsfmt), [prettier](#prettier), [ESLint](#eslint-typescript), [Biome](#biome))
+  - [Javascript](#javascript) ([prettier](#prettier), [ESLint](#eslint-javascript), [Biome](#biome))
+  - [JSON](#json) ([simple](#simple), [gson](#gson), [jackson](#jackson), [Biome](#biome), [jsonPatch](#jsonPatch))
   - [YAML](#yaml)
   - [Gherkin](#gherkin)
   - Multiple languages
@@ -76,7 +76,7 @@ Spotless supports all of Gradle's built-in performance features (incremental bui
       - c, c++, c#, objective-c, protobuf, javascript, java
     - [eclipse web tools platform](#eclipse-web-tools-platform)
       - css, html, js, json, xml
-    - [Rome](#rome) ([binary detection](#rome-binary), [config file](#rome-configuration-file), [input language](#rome-input-language))
+    - [Biome](#biome) ([binary detection](#biome-binary), [config file](#biome-configuration-file), [input language](#biome-input-language))
 - **Language independent**
   - [Generic steps](#generic-steps)
   - [License header](#license-header) ([slurp year from git](#retroactively-slurp-years-from-git-history))
@@ -650,7 +650,7 @@ spotless {
     tsfmt()    // has its own section below
     prettier() // has its own section below
     eslint()   // has its own section below
-    rome()     // has its own section below
+    biome()    // has its own section below
 
     licenseHeader '/* (C) $YEAR */', '(import|const|declare|export|var) ' // or licenseHeaderFile
     // note the '(import|const|...' argument - this is a regex which identifies the top
@@ -743,7 +743,7 @@ spotless {
 
     prettier() // has its own section below
     eslint()   // has its own section below
-    rome()     // has its own section below
+    biome()    // has its own section below
 
     licenseHeader '/* (C) $YEAR */', 'REGEX_TO_DEFINE_TOP_OF_FILE' // or licenseHeaderFile
   }
@@ -810,7 +810,7 @@ spotless {
     eclipseWtp('json')                    // see Eclipse web tools platform section
     gson()                                // has its own section below
     jackson()                             // has its own section below
-    rome()                                // has its own section below
+    biome()                               // has its own section below
     jsonPatch([])                         // has its own section below
   }
 }
@@ -1150,15 +1150,20 @@ Unlike Eclipse, Spotless WTP ignores per default external URIs in schema locatio
 external entities. To allow the access of external URIs, set the property `resolveExternalURI`
 to true.
 
-## Rome
+## Biome
 
-[homepage](https://rome.tools/). [changelog](https://github.com/rome/tools/blob/main/CHANGELOG.md). Rome is a formatter that for the Frontend written in Rust, which has a native binary,
-does not require Node.js and as such, is pretty fast. It can currently format
-JavaScript, TypeScript, JSX, and JSON, and may support
-[more frontend languages](https://docs.rome.tools/internals/language_support/)
-such as CSS in the future.
+[homepage](https://biomejs.dev/). [changelog](https://github.com/biomejs/biome/blob/main/CHANGELOG.md). Biome is
+a formatter that for the frontend written in Rust, which has a native binary, does not require Node.js and as such,
+is pretty fast. It can currently format JavaScript, TypeScript, JSX, and JSON, and may support
+[more frontend languages](https://biomejs.dev/internals/language-support/) such as CSS in the future.
 
-You can use rome in any language-specific format for supported languages, but
+Note: Biome [was formerly called Rome](https://biomejs.dev/blog/annoucing-biome/). Configurations with
+the old `<rome>` tag and `rome(...)` function are still supported for the time being. This will be removed
+in a future version, you should migrate to the new `<biome>` tag or `biome(...)` function. The configuration
+remains the same, you only need to update the version. If you are using a custom `rome.json` configuration file,
+you need to rename it to `biome.json`.
+
+You can use Biome in any language-specific format for supported languages, but
 usually you will be creating a generic format.
 
 ```gradle
@@ -1167,72 +1172,73 @@ spotless {
     // you have to set the target manually
     target 'src/*/webapp/**/*.js'
 
-    // Download Rome from the network if not already downloaded, see below for more info
-    rome('12.0.0')
+    // Download Biome from the network if not already downloaded, see below for more info
+    biome('1.2.0')
 
-    // (optional) Path to the directory with the rome.json conig file
-    rome('12.0.0').configPath("path/config/dir")
+    // (optional) Path to the directory with the biome.json conig file
+    biome('1.2.0').configPath("path/config/dir")
 
-    // (optional) Rome will auto detect the language based on the file extension.
+    // (optional) Biome will auto detect the language based on the file extension.
     // See below for possible values.
-    rome('12.0.0').language("js")
+    biome('1.2.0').language("js")
   }
 }
 ```
 
 **Limitations:**
+
 - The auto-discovery of config files (up the file tree) will not work when using
-  Rome within spotless.
+  Biome within spotless.
 
-To apply Rome to more kinds of files with a different configuration, just add
+To apply Biome to more kinds of files with a different configuration, just add
 more formats:
 
 ```gradle
 spotless {
-  format 'rome-js', {
+  format 'biome-js', {
     target '**/*.js'
-    rome('12.0.0')
+    biome('1.2.0')
   }
-  format 'rome-ts', {
+  format 'biome-ts', {
     target '**/*.ts'
-    rome('12.0.0')
+    biome('1.2.0')
   }
-  format 'rome-json', {
+  format 'biome-json', {
     target '**/*.json'
-    rome('12.0.0')
+    biome('1.2.0')
   }
 }
 ```
 
-### Rome binary
+### Biome binary
 
-To format with Rome, spotless needs to find the Rome binary. By default,
+To format with Biome, spotless needs to find the Biome binary. By default,
 spotless downloads the binary for the given version from the network. This
 should be fine in most cases, but may not work e.g. when there is not connection
 to the internet.
 
-To download the Rome binary from the network, just specify a version:
+To download the Biome binary from the network, just specify a version:
 
 ```gradle
 spotless {
-  format 'rome', {
+  format 'biome', {
     target '**/*.js','**/*.ts','**/*.json'
-    rome('12.0.0')
+    biome('1.2.0')
   }
 }
 ```
 
-Spotless uses a default version when you do not specfiy a version, but this
-may change at any time, so we recommend that you always set the Rome version
+Spotless uses a default version when you do not specify a version, but this
+may change at any time, so we recommend that you always set the Biome version
 you want to use. Optionally, you can also specify a directory for the downloaded
-Rome binaries (defaults to `~/.m2/repository/com/diffplug/spotless/spotless-data/rome`):
+Biome binaries (defaults to `~/.m2/repository/com/diffplug/spotless/spotless-data/biome`):
 
 ```gradle
 spotless {
-  format 'rome', {
+  format 'biome', {
     target '**/*.js','**/*.ts','**/*.json'
      // Relative paths are resolved against the project's base directory
-    rome('12.0.0').downloadDir("${project.gradle.gradleUserHomeDir}/rome")
+    biome('1.2.0').downloadDir("${project.gradle.gradleUserHomeDir}/biome")
   }
 }
 ```
@@ -1241,68 +1247,59 @@ To use a fixed binary, omit the `version` and specify a `pathToExe`:
 
 ```gradle
 spotless {
-  format 'rome', {
+  format 'biome', {
     target '**/*.js','**/*.ts','**/*.json'
-    rome().pathToExe("${project.layout.buildDirectory.asFile.get().absolutePath}/bin/rome")
+    biome().pathToExe("${project.layout.buildDirectory.asFile.get().absolutePath}/bin/biome")
   }
 }
 ```
 
 Absolute paths are used as-is. Relative paths are resolved against the project's
-base directory. To use a pre-installed Rome binary on the user's path, specify
+base directory. To use a pre-installed Biome binary on the user's path, specify
 just a name without any slashes / backslashes:
 
 ```gradle
 spotless {
-  format 'rome', {
+  format 'biome', {
     target '**/*.js','**/*.ts','**/*.json'
-    // Uses the "rome" command, which must be on the user's path. -->
-    rome().pathToExe('rome')
+    // Uses the "biome" command, which must be on the user's path. -->
+    biome().pathToExe('biome')
   }
 }
 ```
 
-### Rome configuration file
+### Biome configuration file
 
-Rome is a biased formatter and linter without many options, but there are a few
-basic options. Rome uses a file named [rome.json](https://docs.rome.tools/configuration/)
+Biome is a biased formatter and linter without many options, but there are a few
+basic options. Biome uses a file named [biome.json](https://biomejs.dev/reference/configuration/)
 for its configuration. When none is specified, the default configuration from
-Rome is used. To use a custom configuration:
+Biome is used. To use a custom configuration:
 
 ```gradle
 spotless {
-  format 'rome', {
+  format 'biome', {
     target '**/*.js','**/*.ts','**/*.json'
-    // Must point to the directory with the "rome.json" config file -->
+    // Must point to the directory with the "biome.json" config file -->
     // Relative paths are resolved against the project's base directory -->
-    rome('12.0.0').configPath('./config')
+    biome('1.2.0').configPath('./config')
   }
 }
 ```
 
-### Rome input language
+### Biome input language
 
-By default, Rome detects the language / syntax of the files to format
+By default, Biome detects the language / syntax of the files to format
 automatically from the file extension. This may fail if your source code files
 have unusual extensions for some reason. If you are using the generic format,
 you can force a certain language like this:
 
 ```xml
-<configuration>
-  <formats>
-    <format>
-      <includes>
-        <include>src/**/typescript/**/*.mjson</include>
-      </includes>
-
-      <rome>
-        <version>12.0.0</version>
-        <language>json</language>
-      </prettier>
-    </rome>
-
-  </formats>
-</configuration>
+spotless {
+  format 'biome', {
+    target 'src/**/typescript/**/*.mjson'
+    biome('1.2.0').language('json')
+  }
+}
 ```
 
 The following languages are currently recognized:
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index b624299e71..22b77e4a7b 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -4,6 +4,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 
+* Add support for biome. The Rome project [was renamed to Biome](https://biomejs.dev/blog/annoucing-biome/).
+  The configuration is still the same, but you should switch to the new `<biome>` tag and adjust
+  the version accordingly. ([#1804](https://github.com/diffplug/spotless/issues/1804)).
+
 ### Fixed
 * Added support for plugins when using Prettier version `3.0.0` and newer. ([#1802](https://github.com/diffplug/spotless/pull/1802))
 
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 8f91d8b08b..b6673b0221 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -49,15 +49,15 @@ user@machine repo % mvn spotless:check
   - [Sql](#sql) ([dbeaver](#dbeaver))
   - [Maven Pom](#maven-pom) ([sortPom](#sortpom))
   - [Markdown](#markdown) ([flexmark](#flexmark))
-  - [Typescript](#typescript) ([tsfmt](#tsfmt), [prettier](#prettier), [ESLint](#eslint-typescript), [Rome](#rome))
-  - [Javascript](#javascript) ([prettier](#prettier), [ESLint](#eslint-javascript), [Rome](#rome))
-  - [JSON](#json) ([simple](#simple), [gson](#gson), [jackson](#jackson), [rome](#rome), [jsonPatch](#jsonPatch))
+  - [Typescript](#typescript) ([tsfmt](#tsfmt), [prettier](#prettier), [ESLint](#eslint-typescript), [Biome](#biome))
+  - [Javascript](#javascript) ([prettier](#prettier), [ESLint](#eslint-javascript), [Biome](#biome))
+  - [JSON](#json) ([simple](#simple), [gson](#gson), [jackson](#jackson), [Biome](#biome), [jsonPatch](#jsonPatch))
   - [YAML](#yaml)
   - [Gherkin](#gherkin)
   - Multiple languages
     - [Prettier](#prettier) ([plugins](#prettier-plugins), [npm detection](#npm-detection), [`.npmrc` detection](#npmrc-detection), [caching `npm install` results](#caching-results-of-npm-install))
     - [eclipse web tools platform](#eclipse-web-tools-platform)
-    - [Rome](#rome) ([binary detection](#rome-binary), [config file](#rome-configuration-file), [input language](#rome-input-language))
+    - [Biome](#biome) ([binary detection](#biome-binary), [config file](#biome-configuration-file), [input language](#biome-input-language))
 - **Language independent**
   - [Generic steps](#generic-steps)
   - [License header](#license-header) ([slurp year from git](#retroactively-slurp-years-from-git-history))
@@ -712,7 +712,7 @@ Currently, none of the available options can be configured yet. It uses only the
     <tsfmt/>    <!-- has its own section below -->
     <prettier/> <!-- has its own section below -->
     <eslint/>   <!-- has its own section below -->
-    <rome/>     <!-- has its own section below -->
+    <biome/>    <!-- has its own section below -->
 
     <licenseHeader>
       <content>/* (C)$YEAR */</content>  <!-- or <file>${project.basedir}/license-header</file> -->
@@ -823,7 +823,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
     <prettier/> <!-- has its own section below -->
     <eslint/>   <!-- has its own section below -->
-    <rome/>     <!-- has its own section below -->
+    <biome/>    <!-- has its own section below -->
 
     <licenseHeader>
       <content>/* (C)$YEAR */</content>  <!-- or <file>${project.basedir}/license-header</file> -->
@@ -900,7 +900,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
     <simple />         <!-- has its own section below -->
     <gson />           <!-- has its own section below -->
     <jackson />        <!-- has its own section below -->
-    <rome />           <!-- has its own section below -->
+    <biome />          <!-- has its own section below -->
     <jsonPatch />      <!-- has its own section below -->
   </json>
 </configuration>
@@ -1252,15 +1252,20 @@ to true.
 <a name="format"></a>
 <a name="custom rules"></a>
 
-## Rome
+## Biome
 
-[homepage](https://rome.tools/). [changelog](https://github.com/rome/tools/blob/main/CHANGELOG.md). Rome is a formatter that for the Frontend written in Rust, which has a native binary,
-does not require Node.js and as such, is pretty fast. It can currently format
-JavaScript, TypeScript, JSX, and JSON, and may support
-[more frontend languages](https://docs.rome.tools/internals/language_support/)
-such as CSS in the future.
+[homepage](https://biomejs.dev/). [changelog](https://github.com/biomejs/biome/blob/main/CHANGELOG.md). Biome is
+a formatter that for the frontend written in Rust, which has a native binary, does not require Node.js and as such,
+is pretty fast. It can currently format JavaScript, TypeScript, JSX, and JSON, and may support
+[more frontend languages](https://biomejs.dev/internals/language-support/) such as CSS in the future.
 
-You can use rome in any language-specific format for supported languages, but
+Note: Biome [was formerly called Rome](https://biomejs.dev/blog/annoucing-biome/). Configurations with
+the old `<rome>` tag and `rome(...)` function are still supported for the time being. This will be removed
+in a future version, you should migrate to the new `<biome>` tag or `biome(...)` function. The configuration
+remains the same, you only need to update the version. If you are using a custom `rome.json` configuration file,
+you need to rename it to `biome.json`.
+
+You can use Biome in any language-specific format for supported languages, but
 usually you will be creating a generic format.
 
 ```xml
@@ -1271,18 +1276,18 @@ usually you will be creating a generic format.
         <include>src/**/typescript/**/*.ts</include>
       </includes>
 
-      <rome>
-        <!-- Download Rome from the network if not already downloaded, see below for more info  -->
-        <version>12.0.0</version>
+      <biome>
+        <!-- Download Biome from the network if not already downloaded, see below for more info  -->
+        <version>1.2.0</version>
 
-        <!-- (optional) Path to the directory with the rome.json conig file -->
+        <!-- (optional) Path to the directory with the biome.json conig file -->
         <configPath>${project.basedir}/path/to/config/dir</configPath>
 
-        <!-- (optional) Rome will auto detect the language based on the file extension. -->
+        <!-- (optional) Biome will auto detect the language based on the file extension. -->
         <!-- See below for possible values. -->
         <language>ts</language>
       </prettier>
-    </rome>
+    </biome>
 
   </formats>
 </configuration>
@@ -1290,85 +1295,85 @@ usually you will be creating a generic format.
 
 **Limitations:**
 - The auto-discovery of config files (up the file tree) will not work when using
-  Rome within spotless.
+  Biome within spotless.
 
-To apply Rome to more kinds of files with a different configuration, just add
-more formats
+To apply Biome to more kinds of files with a different configuration, just add
+more formats:
 
 ```xml
 <configuration>
   <formats>
-    <format><includes>src/**/*.ts</includes><rome/></format>
-    <format><includes>src/**/*.js</includes><rome/></format>
+    <format><includes>src/**/*.ts</includes><biome/></format>
+    <format><includes>src/**/*.js</includes><biome/></format>
 </configuration>
 ```
 
-### Rome binary
+### Biome binary
 
-To format with Rome, spotless needs to find the Rome binary. By default,
+To format with Biome, spotless needs to find the Biome binary. By default,
 spotless downloads the binary for the given version from the network. This
 should be fine in most cases, but may not work e.g. when there is not connection
 to the internet.
 
-To download the Rome binary from the network, just specify a version:
+To download the Biome binary from the network, just specify a version:
 
 ```xml
-<rome>
-  <version>12.0.0</version>
-</rome>
+<biome>
+  <version>1.2.0</version>
+</biome>
 ```
 
-Spotless uses a default version when you do not specfiy a version, but this
-may change at any time, so we recommend that you always set the Rome version
+Spotless uses a default version when you do not specify a version, but this
+may change at any time, so we recommend that you always set the Biome version
 you want to use. Optionally, you can also specify a directory for the downloaded
-Rome binaries (defaults to `~/.m2/repository/com/diffplug/spotless/spotless-data/rome`):
+Biome binaries (defaults to `~/.m2/repository/com/diffplug/spotless/spotless-data/biome`):
 
 ```xml
-<rome>
-  <version>12.0.0</version>
+<biome>
+  <version>1.2.0</version>
   <!-- Relative paths are resolved against the project's base directory -->
-  <downloadDir>${user.home}/rome</downloadDir>
-</rome>
+  <downloadDir>${user.home}/biome</downloadDir>
+</biome>
 ```
 
 To use a fixed binary, omit the `version` and specify a `pathToExe`:
 
 ```xml
-<rome>
-  <pathToExe>${project.basedir}/bin/rome</pathToExe>
-</rome>
+<biome>
+  <pathToExe>${project.basedir}/bin/biome</pathToExe>
+</biome>
 ```
 
 Absolute paths are used as-is. Relative paths are resolved against the project's
-base directory. To use a pre-installed Rome binary on the user's path, specify
+base directory. To use a pre-installed Biome binary on the user's path, specify
 just a name without any slashes / backslashes:
 
 
 ```xml
-<rome>
-  <!-- Uses the "rome" command, which must be on the user's path. -->
-  <pathToExe>rome</pathToExe>
-</rome>
+<biome>
+  <!-- Uses the "biome" command, which must be on the user's path. -->
+  <pathToExe>biome</pathToExe>
+</biome>
 ```
 
-### Rome configuration file
+### Biome configuration file
 
-Rome is a biased formatter and linter without many options, but there are a few
-basic options. Rome uses a file named [rome.json](https://docs.rome.tools/configuration/)
+Biome is a biased formatter and linter without many options, but there are a few
+basic options. Biome uses a file named [biome.json](https://biomejs.dev/reference/configuration/)
 for its configuration. When none is specified, the default configuration from
-Rome is used. To use a custom configuration:
+Biome is used. To use a custom configuration:
 
 ```xml
-<rome>
-  <!-- Must point to the directory with the "rome.json" config file -->
+<biome>
+  <!-- Must point to the directory with the "biome.json" config file -->
   <!-- Relative paths are resolved against the project's base directory -->
   <configPath>${project.basedir}</configPath>
-</rome>
+</biome>
 ```
 
-### Rome input language
+### Biome input language
 
-By default, Rome detects the language / syntax of the files to format
+By default, Biome detects the language / syntax of the files to format
 automatically from the file extension. This may fail if your source code files
 have unusual extensions for some reason. If you are using the generic format,
 you can force a certain language like this:
@@ -1381,12 +1386,11 @@ you can force a certain language like this:
         <include>src/**/typescript/**/*.mjson</include>
       </includes>
 
-      <rome>
-        <version>12.0.0</version>
+      <biome>
+        <version>1.2.0</version>
         <language>json</language>
-      </prettier>
-    </rome>
-
+      </biome>
+    </format>
   </formats>
 </configuration>
 ```

From 4a9e443bae171637e915a1b5bf11d90a21e74fa1 Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <awa@xima.de>
Date: Fri, 15 Sep 2023 20:37:56 +0100
Subject: [PATCH 1216/2068] Apply spotless

---
 .../diffplug/spotless/rome/EBiomeFlavor.java  | 19 +++++++++++++++++--
 .../gradle/spotless/FormatExtension.java      | 14 +++++++-------
 .../gradle/spotless/JavascriptExtension.java  |  6 +++---
 .../gradle/spotless/JsonExtension.java        |  6 +++---
 .../gradle/spotless/TypescriptExtension.java  |  6 +++---
 5 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/rome/EBiomeFlavor.java b/lib/src/main/java/com/diffplug/spotless/rome/EBiomeFlavor.java
index e47662f154..efe9a74807 100644
--- a/lib/src/main/java/com/diffplug/spotless/rome/EBiomeFlavor.java
+++ b/lib/src/main/java/com/diffplug/spotless/rome/EBiomeFlavor.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.rome;
 
 /**
@@ -13,7 +28,7 @@ public enum EBiomeFlavor {
 
 	/**
 	 * The old deprecated Rome project.
-	 * 
+	 *
 	 * @deprecated Will be removed once the old Rome project is not supported
 	 *             anymore.
 	 */
@@ -77,4 +92,4 @@ public String getUrlPattern() {
 	public String shortName() {
 		return shortName;
 	}
-}
\ No newline at end of file
+}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index 61fb0a6e5b..6c62469b04 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -735,7 +735,7 @@ public class BiomeGeneric extends RomeStepConfig<BiomeGeneric> {
 		/**
 		 * Creates a new Rome config that downloads the Rome executable for the given
 		 * version from the network.
-		 * 
+		 *
 		 * @param version Rome version to use. The default version is used when
 		 *                <code>null</code>.
 		 */
@@ -758,7 +758,7 @@ public BiomeGeneric(String version) {
 		 * extension)</li>
 		 * <li>json (JSON)</li>
 		 * </ul>
-		 * 
+		 *
 		 * @param language The language of the files to format.
 		 * @return This step for further configuration.
 		 */
@@ -783,7 +783,7 @@ protected BiomeGeneric getThis() {
 	 * Generic Rome formatter step that detects the language of the input file from
 	 * the file name. It should be specified as a formatter step for a generic
 	 * <code>format{ ... }</code>.
-	 * 
+	 *
 	 * @deprecated Rome has transitioned to Biome. This will be removed shortly.
 	 */
 	@Deprecated
@@ -794,7 +794,7 @@ public class RomeGeneric extends RomeStepConfig<RomeGeneric> {
 		/**
 		 * Creates a new Rome config that downloads the Rome executable for the given
 		 * version from the network.
-		 * 
+		 *
 		 * @param version Rome version to use. The default version is used when
 		 *                <code>null</code>.
 		 */
@@ -817,7 +817,7 @@ public RomeGeneric(String version) {
 		 * extension)</li>
 		 * <li>json (JSON)</li>
 		 * </ul>
-		 * 
+		 *
 		 * @param language The language of the files to format.
 		 * @return This step for further configuration.
 		 */
@@ -875,7 +875,7 @@ public RomeStepConfig<?> biome(String version) {
 	 * Defaults to downloading the default Rome version from the network. To work
 	 * offline, you can specify the path to the Rome executable via
 	 * {@code rome().pathToExe(...)}.
-	 * 
+	 *
 	 * @deprecated Use {@link #biome(String)}.
 	 */
 	@Deprecated
@@ -885,7 +885,7 @@ public RomeStepConfig<?> rome() {
 
 	/**
 	 * Downloads the given Rome version from the network.
-	 * 
+	 *
 	 * @deprecated Use {@link #biome(String)}.
 	 */
 	@Deprecated
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
index c776004da3..4dc810ce6b 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
@@ -158,7 +158,7 @@ public BiomeJs biome(String version) {
 	 * Defaults to downloading the default Rome version from the network. To work
 	 * offline, you can specify the path to the Rome executable via
 	 * {@code rome().pathToExe(...)}.
-	 * 
+	 *
 	 * @deprecated Use {@link #biome()}.
 	 */
 	@Deprecated
@@ -168,7 +168,7 @@ public RomeJs rome() {
 
 	/**
 	 * Downloads the given Rome version from the network.
-	 * 
+	 *
 	 * @deprecated Use {@link #biome(String)}.
 	 */
 	@Deprecated
@@ -209,7 +209,7 @@ protected BiomeJs getThis() {
 
 	/**
 	 * Rome formatter step for JavaScript.
-	 * 
+	 *
 	 * @deprecated Rome has transitioned to Biome. This will be removed shortly.
 	 */
 	@Deprecated
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
index cc16b7ed35..8273d81e79 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
@@ -80,7 +80,7 @@ public BiomeJson biome(String version) {
 	 * Defaults to downloading the default Rome version from the network. To work
 	 * offline, you can specify the path to the Rome executable via
 	 * {@code rome().pathToExe(...)}.
-	 * 
+	 *
 	 * @deprecated Use {@link #biome()}.
 	 */
 	@Deprecated
@@ -90,7 +90,7 @@ public RomeJson rome() {
 
 	/**
 	 * Downloads the given Rome version from the network.
-	 * 
+	 *
 	 * @deprecated Use {@link #biome(String)}.
 	 */
 	@Deprecated
@@ -233,7 +233,7 @@ protected BiomeJson getThis() {
 
 	/**
 	 * Rome formatter step for JSON.
-	 * 
+	 *
 	 * @deprecated Rome has transitioned to Biome. This will be removed shortly.
 	 */
 	@Deprecated
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
index ad9bcc832b..f21bd9ed39 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
@@ -247,7 +247,7 @@ public BiomeTs biome(String version) {
 	 * Defaults to downloading the default Rome version from the network. To work
 	 * offline, you can specify the path to the Rome executable via
 	 * {@code rome().pathToExe(...)}.
-	 * 
+	 *
 	 * @deprecated Use {@link #biome()}.
 	 */
 	@Deprecated
@@ -257,7 +257,7 @@ public RomeTs rome() {
 
 	/**
 	 * Downloads the given Rome version from the network.
-	 * 
+	 *
 	 * @deprecated Use {@link #biome(String)}.
 	 */
 	@Deprecated
@@ -294,7 +294,7 @@ protected BiomeTs getThis() {
 
 	/**
 	 * Rome formatter step for TypeScript.
-	 * 
+	 *
 	 * @deprecated Rome has transitioned to Biome. This will be removed shortly.
 	 */
 	@Deprecated

From ddaf8d47b044adb87580bdeb096ac15771d4fcf8 Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <awa@xima.de>
Date: Sat, 16 Sep 2023 09:31:41 +0100
Subject: [PATCH 1217/2068] Enum naming convention, EBiomeFlavor -> BiomeFlavor

---
 .../rome/{EBiomeFlavor.java => BiomeFlavor.java}     |  4 ++--
 .../spotless/rome/RomeExecutableDownloader.java      |  4 ++--
 .../java/com/diffplug/spotless/rome/RomeStep.java    | 12 ++++++------
 .../diffplug/gradle/spotless/FormatExtension.java    |  6 +++---
 .../gradle/spotless/JavascriptExtension.java         |  6 +++---
 .../com/diffplug/gradle/spotless/JsonExtension.java  |  6 +++---
 .../com/diffplug/gradle/spotless/RomeStepConfig.java |  6 +++---
 .../gradle/spotless/TypescriptExtension.java         |  6 +++---
 .../com/diffplug/spotless/maven/generic/Biome.java   |  4 ++--
 .../com/diffplug/spotless/maven/generic/Rome.java    |  4 ++--
 .../diffplug/spotless/maven/javascript/BiomeJs.java  |  4 ++--
 .../diffplug/spotless/maven/javascript/RomeJs.java   |  4 ++--
 .../com/diffplug/spotless/maven/json/BiomeJson.java  |  4 ++--
 .../com/diffplug/spotless/maven/json/RomeJson.java   |  4 ++--
 .../diffplug/spotless/maven/rome/AbstractRome.java   |  6 +++---
 .../diffplug/spotless/maven/typescript/BiomeTs.java  |  4 ++--
 .../diffplug/spotless/maven/typescript/RomeTs.java   |  4 ++--
 17 files changed, 44 insertions(+), 44 deletions(-)
 rename lib/src/main/java/com/diffplug/spotless/rome/{EBiomeFlavor.java => BiomeFlavor.java} (95%)

diff --git a/lib/src/main/java/com/diffplug/spotless/rome/EBiomeFlavor.java b/lib/src/main/java/com/diffplug/spotless/rome/BiomeFlavor.java
similarity index 95%
rename from lib/src/main/java/com/diffplug/spotless/rome/EBiomeFlavor.java
rename to lib/src/main/java/com/diffplug/spotless/rome/BiomeFlavor.java
index efe9a74807..dbfd43eee9 100644
--- a/lib/src/main/java/com/diffplug/spotless/rome/EBiomeFlavor.java
+++ b/lib/src/main/java/com/diffplug/spotless/rome/BiomeFlavor.java
@@ -21,7 +21,7 @@
  * <p>
  * Will be removed once the old Rome project is not supported anymore.
  */
-public enum EBiomeFlavor {
+public enum BiomeFlavor {
 	/** The new forked Biome project. */
 	BIOME("biome", "1.2.0", "biome.json", "biome-%s-%s-%s",
 			"https://github.com/biomejs/biome/releases/download/cli%%2Fv%s/biome-%s"),
@@ -42,7 +42,7 @@ public enum EBiomeFlavor {
 	private final String shortName;
 	private final String urlPattern;
 
-	EBiomeFlavor(String shortName, String defaultVersion, String configName, String downloadFilePattern,
+	BiomeFlavor(String shortName, String defaultVersion, String configName, String downloadFilePattern,
 			String urlPattern) {
 		this.shortName = shortName;
 		this.defaultVersion = defaultVersion;
diff --git a/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java b/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java
index 7ff0bdb622..052f72def4 100644
--- a/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java
+++ b/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java
@@ -71,7 +71,7 @@ final class RomeExecutableDownloader {
 
 	private final Path downloadDir;
 
-	private final EBiomeFlavor flavor;
+	private final BiomeFlavor flavor;
 
 	/**
 	 * Creates a new downloader for the Biome executable. The executable files are
@@ -80,7 +80,7 @@ final class RomeExecutableDownloader {
 	 * @param flavor Flavor of Biome to use.
 	 * @param downloadDir Directory where to store the downloaded executable.
 	 */
-	public RomeExecutableDownloader(EBiomeFlavor flavor, Path downloadDir) {
+	public RomeExecutableDownloader(BiomeFlavor flavor, Path downloadDir) {
 		this.flavor = flavor;
 		this.downloadDir = downloadDir;
 	}
diff --git a/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java b/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java
index 88c35c8662..5ba33d593d 100644
--- a/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java
@@ -74,7 +74,7 @@ public class RomeStep {
 	 * Biome flavor to use. Will be removed once we stop supporting the deprecated Rome project.
 	 */
 	@Deprecated
-	private final EBiomeFlavor flavor;
+	private final BiomeFlavor flavor;
 
 	/**
 	 * Path to the Biome executable. Can be <code>null</code>, but either a path to
@@ -113,7 +113,7 @@ public String name() {
 	 * @param downloadDir Directory where to place the downloaded executable.
 	 * @return A new Biome step that download the executable from the network.
 	 */
-	public static RomeStep withExeDownload(EBiomeFlavor flavor, String version, String downloadDir) {
+	public static RomeStep withExeDownload(BiomeFlavor flavor, String version, String downloadDir) {
 		return new RomeStep(flavor, version, null, downloadDir);
 	}
 
@@ -125,7 +125,7 @@ public static RomeStep withExeDownload(EBiomeFlavor flavor, String version, Stri
 	 * @param pathToExe Path to the Biome executable to use.
 	 * @return A new Biome step that format with the given executable.
 	 */
-	public static RomeStep withExePath(EBiomeFlavor flavor, String pathToExe) {
+	public static RomeStep withExePath(BiomeFlavor flavor, String pathToExe) {
 		return new RomeStep(flavor, null, pathToExe, null);
 	}
 
@@ -154,7 +154,7 @@ private static void attemptToAddPosixPermission(Path file, PosixFilePermission p
 	 *
 	 * @return The default version for Biome.
 	 */
-	private static String defaultVersion(EBiomeFlavor flavor) {
+	private static String defaultVersion(BiomeFlavor flavor) {
 		return flavor.defaultVersion();
 	}
 
@@ -198,7 +198,7 @@ private static String resolveNameAgainstPath(String name) throws IOException, In
 	 * Checks the Biome config path. When the config path does not exist or when it
 	 * does not contain a file named {@code biome.json}, an error is thrown.
 	 */
-	private static void validateBiomeConfigPath(EBiomeFlavor flavor, String configPath) {
+	private static void validateBiomeConfigPath(BiomeFlavor flavor, String configPath) {
 		if (configPath == null) {
 			return;
 		}
@@ -230,7 +230,7 @@ private static void validateBiomeExecutable(String resolvedPathToExe) {
 	 * @param pathToExe Path to the Biome executable to use.
 	 * @param downloadDir Directory where to place the downloaded executable.
 	 */
-	private RomeStep(EBiomeFlavor flavor, String version, String pathToExe, String downloadDir) {
+	private RomeStep(BiomeFlavor flavor, String version, String pathToExe, String downloadDir) {
 		this.flavor = flavor;
 		this.version = version != null && !version.isBlank() ? version : defaultVersion(flavor);
 		this.pathToExe = pathToExe;
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index 6c62469b04..30fded9d5f 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -67,7 +67,7 @@
 import com.diffplug.spotless.generic.TrimTrailingWhitespaceStep;
 import com.diffplug.spotless.npm.NpmPathResolver;
 import com.diffplug.spotless.npm.PrettierFormatterStep;
-import com.diffplug.spotless.rome.EBiomeFlavor;
+import com.diffplug.spotless.rome.BiomeFlavor;
 
 import groovy.lang.Closure;
 
@@ -740,7 +740,7 @@ public class BiomeGeneric extends RomeStepConfig<BiomeGeneric> {
 		 *                <code>null</code>.
 		 */
 		public BiomeGeneric(String version) {
-			super(getProject(), FormatExtension.this::replaceStep, EBiomeFlavor.BIOME, version);
+			super(getProject(), FormatExtension.this::replaceStep, BiomeFlavor.BIOME, version);
 		}
 
 		/**
@@ -799,7 +799,7 @@ public class RomeGeneric extends RomeStepConfig<RomeGeneric> {
 		 *                <code>null</code>.
 		 */
 		public RomeGeneric(String version) {
-			super(getProject(), FormatExtension.this::replaceStep, EBiomeFlavor.ROME, version);
+			super(getProject(), FormatExtension.this::replaceStep, BiomeFlavor.ROME, version);
 		}
 
 		/**
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
index 4dc810ce6b..b14bd29ab8 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
@@ -34,7 +34,7 @@
 import com.diffplug.spotless.npm.EslintFormatterStep;
 import com.diffplug.spotless.npm.NpmPathResolver;
 import com.diffplug.spotless.npm.PrettierFormatterStep;
-import com.diffplug.spotless.rome.EBiomeFlavor;
+import com.diffplug.spotless.rome.BiomeFlavor;
 
 public class JavascriptExtension extends FormatExtension {
 
@@ -193,7 +193,7 @@ public class BiomeJs extends RomeStepConfig<BiomeJs> {
 		 * @param version Biome version to use.
 		 */
 		public BiomeJs(String version) {
-			super(getProject(), JavascriptExtension.this::replaceStep, EBiomeFlavor.BIOME, version);
+			super(getProject(), JavascriptExtension.this::replaceStep, BiomeFlavor.BIOME, version);
 		}
 
 		@Override
@@ -221,7 +221,7 @@ public class RomeJs extends RomeStepConfig<RomeJs> {
 		 * @param version Rome version to use.
 		 */
 		public RomeJs(String version) {
-			super(getProject(), JavascriptExtension.this::replaceStep, EBiomeFlavor.ROME, version);
+			super(getProject(), JavascriptExtension.this::replaceStep, BiomeFlavor.ROME, version);
 		}
 
 		@Override
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
index 8273d81e79..441e25b93d 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
@@ -27,7 +27,7 @@
 import com.diffplug.spotless.json.JsonPatchStep;
 import com.diffplug.spotless.json.JsonSimpleStep;
 import com.diffplug.spotless.json.gson.GsonStep;
-import com.diffplug.spotless.rome.EBiomeFlavor;
+import com.diffplug.spotless.rome.BiomeFlavor;
 
 public class JsonExtension extends FormatExtension {
 	private static final int DEFAULT_INDENTATION = 4;
@@ -217,7 +217,7 @@ public class BiomeJson extends RomeStepConfig<BiomeJson> {
 		 * @param version Biome version to use.
 		 */
 		public BiomeJson(String version) {
-			super(getProject(), JsonExtension.this::replaceStep, EBiomeFlavor.BIOME, version);
+			super(getProject(), JsonExtension.this::replaceStep, BiomeFlavor.BIOME, version);
 		}
 
 		@Override
@@ -245,7 +245,7 @@ public class RomeJson extends RomeStepConfig<RomeJson> {
 		 * @param version Rome version to use.
 		 */
 		public RomeJson(String version) {
-			super(getProject(), JsonExtension.this::replaceStep, EBiomeFlavor.ROME, version);
+			super(getProject(), JsonExtension.this::replaceStep, BiomeFlavor.ROME, version);
 		}
 
 		@Override
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RomeStepConfig.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RomeStepConfig.java
index 6b0ae893ac..98c4000a8b 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RomeStepConfig.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RomeStepConfig.java
@@ -28,7 +28,7 @@
 import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
 
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.rome.EBiomeFlavor;
+import com.diffplug.spotless.rome.BiomeFlavor;
 import com.diffplug.spotless.rome.RomeStep;
 
 public abstract class RomeStepConfig<Self extends RomeStepConfig<Self>> {
@@ -54,7 +54,7 @@ public abstract class RomeStepConfig<Self extends RomeStepConfig<Self>> {
 	 * The flavor of Biome to use. Will be removed when we stop support the
 	 * deprecated Rome project.
 	 */
-	private final EBiomeFlavor flavor;
+	private final BiomeFlavor flavor;
 
 	/**
 	 * Optional path to the Biome executable. Either a <code>version</code> or a
@@ -95,7 +95,7 @@ public abstract class RomeStepConfig<Self extends RomeStepConfig<Self>> {
 	@Nullable
 	private String version;
 
-	protected RomeStepConfig(Project project, Consumer<FormatterStep> replaceStep, EBiomeFlavor flavor,
+	protected RomeStepConfig(Project project, Consumer<FormatterStep> replaceStep, BiomeFlavor flavor,
 			String version) {
 		this.project = requireNonNull(project);
 		this.replaceStep = requireNonNull(replaceStep);
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
index f21bd9ed39..190a2f8e20 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
@@ -38,7 +38,7 @@
 import com.diffplug.spotless.npm.TsConfigFileType;
 import com.diffplug.spotless.npm.TsFmtFormatterStep;
 import com.diffplug.spotless.npm.TypedTsFmtConfigFile;
-import com.diffplug.spotless.rome.EBiomeFlavor;
+import com.diffplug.spotless.rome.BiomeFlavor;
 
 public class TypescriptExtension extends FormatExtension {
 
@@ -278,7 +278,7 @@ public class BiomeTs extends RomeStepConfig<BiomeTs> {
 		 * @param version Biome version to use.
 		 */
 		public BiomeTs(String version) {
-			super(getProject(), TypescriptExtension.this::replaceStep, EBiomeFlavor.BIOME, version);
+			super(getProject(), TypescriptExtension.this::replaceStep, BiomeFlavor.BIOME, version);
 		}
 
 		@Override
@@ -306,7 +306,7 @@ public class RomeTs extends RomeStepConfig<RomeTs> {
 		 * @param version Rome version to use.
 		 */
 		public RomeTs(String version) {
-			super(getProject(), TypescriptExtension.this::replaceStep, EBiomeFlavor.ROME, version);
+			super(getProject(), TypescriptExtension.this::replaceStep, BiomeFlavor.ROME, version);
 		}
 
 		@Override
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Biome.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Biome.java
index 23b6637519..e096a14734 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Biome.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Biome.java
@@ -18,7 +18,7 @@
 import org.apache.maven.plugins.annotations.Parameter;
 
 import com.diffplug.spotless.maven.rome.AbstractRome;
-import com.diffplug.spotless.rome.EBiomeFlavor;
+import com.diffplug.spotless.rome.BiomeFlavor;
 
 /**
  * Generic Biome formatter step that detects the language of the input file from
@@ -27,7 +27,7 @@
  */
 public class Biome extends AbstractRome {
 	public Biome() {
-		super(EBiomeFlavor.BIOME);
+		super(BiomeFlavor.BIOME);
 	}
 
 	/**
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Rome.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Rome.java
index 628c051699..53080fe546 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Rome.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Rome.java
@@ -18,7 +18,7 @@
 import org.apache.maven.plugins.annotations.Parameter;
 
 import com.diffplug.spotless.maven.rome.AbstractRome;
-import com.diffplug.spotless.rome.EBiomeFlavor;
+import com.diffplug.spotless.rome.BiomeFlavor;
 
 /**
  * See {@link Biome}.
@@ -26,7 +26,7 @@
  */
 public class Rome extends AbstractRome {
 	public Rome() {
-		super(EBiomeFlavor.ROME);
+		super(BiomeFlavor.ROME);
 	}
 
 	/**
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/BiomeJs.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/BiomeJs.java
index 07a341eee5..4d52f4cc80 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/BiomeJs.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/BiomeJs.java
@@ -16,14 +16,14 @@
 package com.diffplug.spotless.maven.javascript;
 
 import com.diffplug.spotless.maven.rome.AbstractRome;
-import com.diffplug.spotless.rome.EBiomeFlavor;
+import com.diffplug.spotless.rome.BiomeFlavor;
 
 /**
  * Biome formatter step for JavaScript.
  */
 public class BiomeJs extends AbstractRome {
 	public BiomeJs() {
-		super(EBiomeFlavor.BIOME);
+		super(BiomeFlavor.BIOME);
 	}
 
 	@Override
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java
index b5754f2b65..405809c7a7 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java
@@ -16,7 +16,7 @@
 package com.diffplug.spotless.maven.javascript;
 
 import com.diffplug.spotless.maven.rome.AbstractRome;
-import com.diffplug.spotless.rome.EBiomeFlavor;
+import com.diffplug.spotless.rome.BiomeFlavor;
 
 /**
  * Rome formatter step for JavaScript.
@@ -25,7 +25,7 @@
 @Deprecated
 public class RomeJs extends AbstractRome {
 	public RomeJs() {
-		super(EBiomeFlavor.ROME);
+		super(BiomeFlavor.ROME);
 	}
 
 	@Override
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/BiomeJson.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/BiomeJson.java
index 13c2ab92f2..a8d329d725 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/BiomeJson.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/BiomeJson.java
@@ -16,14 +16,14 @@
 package com.diffplug.spotless.maven.json;
 
 import com.diffplug.spotless.maven.rome.AbstractRome;
-import com.diffplug.spotless.rome.EBiomeFlavor;
+import com.diffplug.spotless.rome.BiomeFlavor;
 
 /**
  * Biome formatter step for JSON.
  */
 public class BiomeJson extends AbstractRome {
 	public BiomeJson() {
-		super(EBiomeFlavor.BIOME);
+		super(BiomeFlavor.BIOME);
 	}
 
 	@Override
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/RomeJson.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/RomeJson.java
index 7daab94afb..2959d5a055 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/RomeJson.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/RomeJson.java
@@ -16,7 +16,7 @@
 package com.diffplug.spotless.maven.json;
 
 import com.diffplug.spotless.maven.rome.AbstractRome;
-import com.diffplug.spotless.rome.EBiomeFlavor;
+import com.diffplug.spotless.rome.BiomeFlavor;
 
 /**
  * Rome formatter step for JSON.
@@ -25,7 +25,7 @@
 @Deprecated
 public class RomeJson extends AbstractRome {
 	public RomeJson() {
-		super(EBiomeFlavor.ROME);
+		super(BiomeFlavor.ROME);
 	}
 
 	@Override
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/rome/AbstractRome.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/rome/AbstractRome.java
index 8b140ea381..da66bf37a0 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/rome/AbstractRome.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/rome/AbstractRome.java
@@ -22,7 +22,7 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.maven.FormatterStepConfig;
 import com.diffplug.spotless.maven.FormatterStepFactory;
-import com.diffplug.spotless.rome.EBiomeFlavor;
+import com.diffplug.spotless.rome.BiomeFlavor;
 import com.diffplug.spotless.rome.RomeStep;
 
 /**
@@ -34,9 +34,9 @@
  */
 public abstract class AbstractRome implements FormatterStepFactory {
 	/** Biome flavor to use. */
-	private EBiomeFlavor flavor;
+	private BiomeFlavor flavor;
 
-	protected AbstractRome(EBiomeFlavor flavor) {
+	protected AbstractRome(BiomeFlavor flavor) {
 		this.flavor = flavor;
 	}
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/BiomeTs.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/BiomeTs.java
index 6fbcb31ee2..a99e633a42 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/BiomeTs.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/BiomeTs.java
@@ -16,14 +16,14 @@
 package com.diffplug.spotless.maven.typescript;
 
 import com.diffplug.spotless.maven.rome.AbstractRome;
-import com.diffplug.spotless.rome.EBiomeFlavor;
+import com.diffplug.spotless.rome.BiomeFlavor;
 
 /**
  * Biome formatter step for TypeScript.
  */
 public class BiomeTs extends AbstractRome {
 	public BiomeTs() {
-		super(EBiomeFlavor.BIOME);
+		super(BiomeFlavor.BIOME);
 	}
 
 	@Override
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/RomeTs.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/RomeTs.java
index 149d4208e3..f6ea80581d 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/RomeTs.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/RomeTs.java
@@ -16,7 +16,7 @@
 package com.diffplug.spotless.maven.typescript;
 
 import com.diffplug.spotless.maven.rome.AbstractRome;
-import com.diffplug.spotless.rome.EBiomeFlavor;
+import com.diffplug.spotless.rome.BiomeFlavor;
 
 /**
  * Rome formatter step for TypeScript.
@@ -25,7 +25,7 @@
 @Deprecated
 public class RomeTs extends AbstractRome {
 	public RomeTs() {
-		super(EBiomeFlavor.ROME);
+		super(BiomeFlavor.ROME);
 	}
 
 	@Override

From a1b2e82f5cb23d8d52ef51450358c8fea198ceb8 Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <awa@xima.de>
Date: Sat, 16 Sep 2023 10:38:44 +0100
Subject: [PATCH 1218/2068] Fix test compilation

---
 .../diffplug/spotless/rome/RomeStepTest.java  | 80 +++++++++----------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/testlib/src/test/java/com/diffplug/spotless/rome/RomeStepTest.java b/testlib/src/test/java/com/diffplug/spotless/rome/RomeStepTest.java
index f1761498c3..f723a561c2 100644
--- a/testlib/src/test/java/com/diffplug/spotless/rome/RomeStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/rome/RomeStepTest.java
@@ -53,7 +53,7 @@ class AutoDetectLanguage {
 			 */
 			@Test
 			void testAutoDetectCjs() {
-				var step = RomeStep.withExeDownload(EBiomeFlavor.ROME, "12.0.0", downloadDir.toString()).create();
+				var step = RomeStep.withExeDownload(BiomeFlavor.ROME, "12.0.0", downloadDir.toString()).create();
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("rome/js/fileBefore.cjs", "rome/js/fileAfter.cjs");
 			}
@@ -64,7 +64,7 @@ void testAutoDetectCjs() {
 			 */
 			@Test
 			void testAutoDetectCts() {
-				var step = RomeStep.withExeDownload(EBiomeFlavor.ROME, "12.0.0", downloadDir.toString()).create();
+				var step = RomeStep.withExeDownload(BiomeFlavor.ROME, "12.0.0", downloadDir.toString()).create();
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("rome/ts/fileBefore.cts", "rome/ts/fileAfter.cts");
 			}
@@ -75,7 +75,7 @@ void testAutoDetectCts() {
 			 */
 			@Test
 			void testAutoDetectJs() {
-				var step = RomeStep.withExeDownload(EBiomeFlavor.ROME, "12.0.0", downloadDir.toString()).create();
+				var step = RomeStep.withExeDownload(BiomeFlavor.ROME, "12.0.0", downloadDir.toString()).create();
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("rome/js/fileBefore.js", "rome/js/fileAfter.js");
 			}
@@ -86,7 +86,7 @@ void testAutoDetectJs() {
 			 */
 			@Test
 			void testAutoDetectJson() {
-				var step = RomeStep.withExeDownload(EBiomeFlavor.ROME, "12.0.0", downloadDir.toString()).create();
+				var step = RomeStep.withExeDownload(BiomeFlavor.ROME, "12.0.0", downloadDir.toString()).create();
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("rome/json/fileBefore.json", "rome/json/fileAfter.json");
 			}
@@ -97,7 +97,7 @@ void testAutoDetectJson() {
 			 */
 			@Test
 			void testAutoDetectJsx() {
-				var step = RomeStep.withExeDownload(EBiomeFlavor.ROME, "12.0.0", downloadDir.toString()).create();
+				var step = RomeStep.withExeDownload(BiomeFlavor.ROME, "12.0.0", downloadDir.toString()).create();
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("rome/js/fileBefore.jsx", "rome/js/fileAfter.jsx");
 			}
@@ -108,7 +108,7 @@ void testAutoDetectJsx() {
 			 */
 			@Test
 			void testAutoDetectMjs() {
-				var step = RomeStep.withExeDownload(EBiomeFlavor.ROME, "12.0.0", downloadDir.toString()).create();
+				var step = RomeStep.withExeDownload(BiomeFlavor.ROME, "12.0.0", downloadDir.toString()).create();
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("rome/js/fileBefore.mjs", "rome/js/fileAfter.mjs");
 			}
@@ -119,7 +119,7 @@ void testAutoDetectMjs() {
 			 */
 			@Test
 			void testAutoDetectMts() {
-				var step = RomeStep.withExeDownload(EBiomeFlavor.ROME, "12.0.0", downloadDir.toString()).create();
+				var step = RomeStep.withExeDownload(BiomeFlavor.ROME, "12.0.0", downloadDir.toString()).create();
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("rome/ts/fileBefore.mts", "rome/ts/fileAfter.mts");
 			}
@@ -130,7 +130,7 @@ void testAutoDetectMts() {
 			 */
 			@Test
 			void testAutoDetectTs() {
-				var step = RomeStep.withExeDownload(EBiomeFlavor.ROME, "12.0.0", downloadDir.toString()).create();
+				var step = RomeStep.withExeDownload(BiomeFlavor.ROME, "12.0.0", downloadDir.toString()).create();
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("rome/ts/fileBefore.ts", "rome/ts/fileAfter.ts");
 			}
@@ -141,7 +141,7 @@ void testAutoDetectTs() {
 			 */
 			@Test
 			void testAutoDetectTsx() {
-				var step = RomeStep.withExeDownload(EBiomeFlavor.ROME, "12.0.0", downloadDir.toString()).create();
+				var step = RomeStep.withExeDownload(BiomeFlavor.ROME, "12.0.0", downloadDir.toString()).create();
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("rome/ts/fileBefore.tsx", "rome/ts/fileAfter.tsx");
 			}
@@ -155,7 +155,7 @@ class ConfigFile {
 			@Test
 			void testLineWidth120() {
 				var path = createRomeConfig("rome/config/line-width-120.json");
-				var step = RomeStep.withExeDownload(EBiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withConfigPath(path).create();
+				var step = RomeStep.withExeDownload(BiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withConfigPath(path).create();
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("rome/js/longLineBefore.js", "rome/js/longLineAfter120.js");
 			}
@@ -166,7 +166,7 @@ void testLineWidth120() {
 			@Test
 			void testLineWidth80() {
 				var path = createRomeConfig("rome/config/line-width-80.json");
-				var step = RomeStep.withExeDownload(EBiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withConfigPath(path).create();
+				var step = RomeStep.withExeDownload(BiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withConfigPath(path).create();
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("rome/js/longLineBefore.js", "rome/js/longLineAfter80.js");
 			}
@@ -191,7 +191,7 @@ class ExplicitLanguage {
 			 */
 			@Test
 			void testAutoDetectCjs() {
-				var step = RomeStep.withExeDownload(EBiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withLanguage("js").create();
+				var step = RomeStep.withExeDownload(BiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withLanguage("js").create();
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("rome/js/fileBefore.cjs", "rome/js/fileAfter.cjs");
 			}
@@ -202,7 +202,7 @@ void testAutoDetectCjs() {
 			 */
 			@Test
 			void testAutoDetectCts() {
-				var step = RomeStep.withExeDownload(EBiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withLanguage("ts").create();
+				var step = RomeStep.withExeDownload(BiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withLanguage("ts").create();
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("rome/ts/fileBefore.cts", "rome/ts/fileAfter.cts");
 			}
@@ -213,7 +213,7 @@ void testAutoDetectCts() {
 			 */
 			@Test
 			void testAutoDetectJs() {
-				var step = RomeStep.withExeDownload(EBiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withLanguage("js").create();
+				var step = RomeStep.withExeDownload(BiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withLanguage("js").create();
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("rome/js/fileBefore.js", "rome/js/fileAfter.js");
 			}
@@ -224,7 +224,7 @@ void testAutoDetectJs() {
 			 */
 			@Test
 			void testAutoDetectJson() {
-				var step = RomeStep.withExeDownload(EBiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withLanguage("json").create();
+				var step = RomeStep.withExeDownload(BiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withLanguage("json").create();
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("rome/json/fileBefore.json", "rome/json/fileAfter.json");
 			}
@@ -235,7 +235,7 @@ void testAutoDetectJson() {
 			 */
 			@Test
 			void testAutoDetectJsx() {
-				var step = RomeStep.withExeDownload(EBiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withLanguage("jsx").create();
+				var step = RomeStep.withExeDownload(BiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withLanguage("jsx").create();
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("rome/js/fileBefore.jsx", "rome/js/fileAfter.jsx");
 			}
@@ -246,7 +246,7 @@ void testAutoDetectJsx() {
 			 */
 			@Test
 			void testAutoDetectMjs() {
-				var step = RomeStep.withExeDownload(EBiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withLanguage("js").create();
+				var step = RomeStep.withExeDownload(BiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withLanguage("js").create();
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("rome/js/fileBefore.mjs", "rome/js/fileAfter.mjs");
 			}
@@ -257,7 +257,7 @@ void testAutoDetectMjs() {
 			 */
 			@Test
 			void testAutoDetectMts() {
-				var step = RomeStep.withExeDownload(EBiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withLanguage("ts").create();
+				var step = RomeStep.withExeDownload(BiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withLanguage("ts").create();
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("rome/ts/fileBefore.mts", "rome/ts/fileAfter.mts");
 			}
@@ -268,7 +268,7 @@ void testAutoDetectMts() {
 			 */
 			@Test
 			void testAutoDetectTs() {
-				var step = RomeStep.withExeDownload(EBiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withLanguage("ts").create();
+				var step = RomeStep.withExeDownload(BiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withLanguage("ts").create();
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("rome/ts/fileBefore.ts", "rome/ts/fileAfter.ts");
 			}
@@ -279,7 +279,7 @@ void testAutoDetectTs() {
 			 */
 			@Test
 			void testAutoDetectTsx() {
-				var step = RomeStep.withExeDownload(EBiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withLanguage("tsx").create();
+				var step = RomeStep.withExeDownload(BiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withLanguage("tsx").create();
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("rome/ts/fileBefore.tsx", "rome/ts/fileAfter.tsx");
 			}
@@ -300,7 +300,7 @@ class AutoDetectLanguage {
 			 */
 			@Test
 			void testAutoDetectCjs() {
-				var step = RomeStep.withExeDownload(EBiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("biome/js/fileBefore.cjs", "biome/js/fileAfter.cjs");
 			}
@@ -311,7 +311,7 @@ void testAutoDetectCjs() {
 			 */
 			@Test
 			void testAutoDetectCts() {
-				var step = RomeStep.withExeDownload(EBiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("biome/ts/fileBefore.cts", "biome/ts/fileAfter.cts");
 			}
@@ -322,7 +322,7 @@ void testAutoDetectCts() {
 			 */
 			@Test
 			void testAutoDetectJs() {
-				var step = RomeStep.withExeDownload(EBiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("biome/js/fileBefore.js", "biome/js/fileAfter.js");
 			}
@@ -333,7 +333,7 @@ void testAutoDetectJs() {
 			 */
 			@Test
 			void testAutoDetectJson() {
-				var step = RomeStep.withExeDownload(EBiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("biome/json/fileBefore.json", "biome/json/fileAfter.json");
 			}
@@ -344,7 +344,7 @@ void testAutoDetectJson() {
 			 */
 			@Test
 			void testAutoDetectJsx() {
-				var step = RomeStep.withExeDownload(EBiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("biome/js/fileBefore.jsx", "biome/js/fileAfter.jsx");
 			}
@@ -355,7 +355,7 @@ void testAutoDetectJsx() {
 			 */
 			@Test
 			void testAutoDetectMjs() {
-				var step = RomeStep.withExeDownload(EBiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("biome/js/fileBefore.mjs", "biome/js/fileAfter.mjs");
 			}
@@ -366,7 +366,7 @@ void testAutoDetectMjs() {
 			 */
 			@Test
 			void testAutoDetectMts() {
-				var step = RomeStep.withExeDownload(EBiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("biome/ts/fileBefore.mts", "biome/ts/fileAfter.mts");
 			}
@@ -377,7 +377,7 @@ void testAutoDetectMts() {
 			 */
 			@Test
 			void testAutoDetectTs() {
-				var step = RomeStep.withExeDownload(EBiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("biome/ts/fileBefore.ts", "biome/ts/fileAfter.ts");
 			}
@@ -388,7 +388,7 @@ void testAutoDetectTs() {
 			 */
 			@Test
 			void testAutoDetectTsx() {
-				var step = RomeStep.withExeDownload(EBiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("biome/ts/fileBefore.tsx", "biome/ts/fileAfter.tsx");
 			}
@@ -402,7 +402,7 @@ class ConfigFile {
 			@Test
 			void testLineWidth120() {
 				var path = createBiomeConfig("biome/config/line-width-120.json");
-				var step = RomeStep.withExeDownload(EBiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withConfigPath(path).create();
+				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withConfigPath(path).create();
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("biome/js/longLineBefore.js", "biome/js/longLineAfter120.js");
 			}
@@ -413,7 +413,7 @@ void testLineWidth120() {
 			@Test
 			void testLineWidth80() {
 				var path = createBiomeConfig("biome/config/line-width-80.json");
-				var step = RomeStep.withExeDownload(EBiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withConfigPath(path).create();
+				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withConfigPath(path).create();
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("biome/js/longLineBefore.js", "biome/js/longLineAfter80.js");
 			}
@@ -438,7 +438,7 @@ class ExplicitLanguage {
 			 */
 			@Test
 			void testAutoDetectCjs() {
-				var step = RomeStep.withExeDownload(EBiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("js").create();
+				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("js").create();
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("biome/js/fileBefore.cjs", "biome/js/fileAfter.cjs");
 			}
@@ -449,7 +449,7 @@ void testAutoDetectCjs() {
 			 */
 			@Test
 			void testAutoDetectCts() {
-				var step = RomeStep.withExeDownload(EBiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("ts").create();
+				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("ts").create();
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("biome/ts/fileBefore.cts", "biome/ts/fileAfter.cts");
 			}
@@ -460,7 +460,7 @@ void testAutoDetectCts() {
 			 */
 			@Test
 			void testAutoDetectJs() {
-				var step = RomeStep.withExeDownload(EBiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("js").create();
+				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("js").create();
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("biome/js/fileBefore.js", "biome/js/fileAfter.js");
 			}
@@ -471,7 +471,7 @@ void testAutoDetectJs() {
 			 */
 			@Test
 			void testAutoDetectJson() {
-				var step = RomeStep.withExeDownload(EBiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("json").create();
+				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("json").create();
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("biome/json/fileBefore.json", "biome/json/fileAfter.json");
 			}
@@ -482,7 +482,7 @@ void testAutoDetectJson() {
 			 */
 			@Test
 			void testAutoDetectJsx() {
-				var step = RomeStep.withExeDownload(EBiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("jsx").create();
+				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("jsx").create();
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("biome/js/fileBefore.jsx", "biome/js/fileAfter.jsx");
 			}
@@ -493,7 +493,7 @@ void testAutoDetectJsx() {
 			 */
 			@Test
 			void testAutoDetectMjs() {
-				var step = RomeStep.withExeDownload(EBiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("js").create();
+				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("js").create();
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("biome/js/fileBefore.mjs", "biome/js/fileAfter.mjs");
 			}
@@ -504,7 +504,7 @@ void testAutoDetectMjs() {
 			 */
 			@Test
 			void testAutoDetectMts() {
-				var step = RomeStep.withExeDownload(EBiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("ts").create();
+				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("ts").create();
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("biome/ts/fileBefore.mts", "biome/ts/fileAfter.mts");
 			}
@@ -515,7 +515,7 @@ void testAutoDetectMts() {
 			 */
 			@Test
 			void testAutoDetectTs() {
-				var step = RomeStep.withExeDownload(EBiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("ts").create();
+				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("ts").create();
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("biome/ts/fileBefore.ts", "biome/ts/fileAfter.ts");
 			}
@@ -526,7 +526,7 @@ void testAutoDetectTs() {
 			 */
 			@Test
 			void testAutoDetectTsx() {
-				var step = RomeStep.withExeDownload(EBiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("tsx").create();
+				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("tsx").create();
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("biome/ts/fileBefore.tsx", "biome/ts/fileAfter.tsx");
 			}

From 7de7991d86f867ed7c528d915eec493c2699be25 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 19 Sep 2023 08:41:39 +0800
Subject: [PATCH 1219/2068] Compat old ktlint users

---
 CHANGES.md                                                   | 2 +-
 .../glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java     | 5 +++++
 .../glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java | 1 -
 plugin-gradle/CHANGES.md                                     | 3 +--
 plugin-gradle/README.md                                      | 1 -
 .../com/diffplug/gradle/spotless/KotlinExtensionTest.java    | 1 -
 .../diffplug/gradle/spotless/KotlinGradleExtensionTest.java  | 1 -
 plugin-maven/CHANGES.md                                      | 3 +--
 plugin-maven/README.md                                       | 1 -
 .../java/com/diffplug/spotless/maven/kotlin/KtlintTest.java  | 1 -
 10 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index c2d379a874..4a831e9d0b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,7 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* **POTENTIALLY BREAKING** Support Ktlint 1.0.0 ([#1808](https://github.com/diffplug/spotless/pull/1808)).
+* Support Ktlint 1.0.0 ([#1808](https://github.com/diffplug/spotless/pull/1808)).
 
 ## [2.41.0] - 2023-08-29
 ### Added
diff --git a/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java b/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
index 7b12169400..9c2792f769 100644
--- a/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
+++ b/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
@@ -132,6 +132,11 @@ private static EditorConfigOverride createEditorConfigOverride(final List<Rule>
 				.distinct()
 				.collect(Collectors.toMap(EditorConfigProperty::getName, property -> property));
 
+		// The default style had been changed from intellij_idea to ktlint_official in version 1.0.0
+		if (!editorConfigOverrideMap.containsKey("ktlint_code_style")) {
+			editorConfigOverrideMap.put("ktlint_code_style", "intellij_idea");
+		}
+
 		// Create config properties based on provided property names and values
 		@SuppressWarnings("unchecked")
 		Pair<EditorConfigProperty<?>, ?>[] properties = editorConfigOverrideMap.entrySet().stream()
diff --git a/lib/src/testCompatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java b/lib/src/testCompatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java
index 5ed2517c6f..1f8e6023b4 100644
--- a/lib/src/testCompatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java
+++ b/lib/src/testCompatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java
@@ -54,7 +54,6 @@ public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 		editorConfigOverrideMap.put("indent_style", "tab");
-		editorConfigOverrideMap.put("ktlint_code_style", "intellij_idea");
 		editorConfigOverrideMap.put("ktlint_standard_no-semi", "disabled");
 
 		String formatted = KtLintCompat1Dot0Dot0Adapter.format(text, filePath, false, null, userData, editorConfigOverrideMap);
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index b66fcbc262..feb5c67844 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -4,8 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* **POTENTIALLY BREAKING** Support Ktlint 1.0.0 ([#1808](https://github.com/diffplug/spotless/pull/1808)).
-  The default code style had been changed to `ktlint_official`, if you are upgrading from the old versions, may need to override the style in `editorConfigOverride`.
+* Support Ktlint 1.0.0 ([#1808](https://github.com/diffplug/spotless/pull/1808)).
 
 ## [6.21.0] - 2023-08-29
 ### Added
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 9a4b84c4dd..03a94e5004 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -405,7 +405,6 @@ spotless {
       .editorConfigOverride(
         mapOf(
           "indent_size" to 2,
-          "ktlint_code_style" to "intellij_idea",
         )
       )
   }
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
index a2fa7c16e7..1c23728244 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
@@ -73,7 +73,6 @@ void withExperimentalEditorConfigOverride() throws IOException {
 				"spotless {",
 				"    kotlin {",
 				"        ktlint().editorConfigOverride([",
-				"            ktlint_code_style: \"intellij_idea\",",
 				"            ktlint_experimental: \"enabled\",",
 				"            ij_kotlin_allow_trailing_comma: true,",
 				"            ij_kotlin_allow_trailing_comma_on_call_site: true",
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
index 6d7bdf351a..7dade5f2ff 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
@@ -52,7 +52,6 @@ void withExperimentalEditorConfigOverride() throws IOException {
 				"spotless {",
 				"    kotlinGradle {",
 				"        ktlint().editorConfigOverride([",
-				"            ktlint_code_style: \"intellij_idea\",",
 				"            ktlint_experimental: \"enabled\",",
 				"            ij_kotlin_allow_trailing_comma: true,",
 				"            ij_kotlin_allow_trailing_comma_on_call_site: true",
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 54f92898a1..ef310b3ea2 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -4,8 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* **POTENTIALLY BREAKING** Support Ktlint 1.0.0 ([#1808](https://github.com/diffplug/spotless/pull/1808)).
-The default code style had been changed to `ktlint_official`, if you are upgrading from the old versions, may need to override the style in `editorConfigOverride`.
+* Support Ktlint 1.0.0 ([#1808](https://github.com/diffplug/spotless/pull/1808)).
 
 ## [2.39.0] - 2023-08-29
 ### Added
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 9419490d3e..f63d7faed9 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -413,7 +413,6 @@ Additionally, `editorConfigOverride` options will override what's supplied in `.
   <editorConfigOverride> <!-- optional -->
     <ij_kotlin_allow_trailing_comma>true</ij_kotlin_allow_trailing_comma>
     <ij_kotlin_allow_trailing_comma_on_call_site>true</ij_kotlin_allow_trailing_comma_on_call_site>
-    <ktlint_code_style>intellij_idea</ktlint_code_style>
   </editorConfigOverride>
 </ktlint>
 ```
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
index f3f360dc5d..060e0de84f 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
@@ -36,7 +36,6 @@ void testKtlintEditorConfigOverride() throws Exception {
 				"  <editorConfigOverride>\n" +
 				"    <ij_kotlin_allow_trailing_comma>true</ij_kotlin_allow_trailing_comma>\n" +
 				"    <ij_kotlin_allow_trailing_comma_on_call_site>true</ij_kotlin_allow_trailing_comma_on_call_site>\n" +
-				"    <ktlint_code_style>intellij_idea</ktlint_code_style>\n" +
 				"  </editorConfigOverride>\n" +
 				"</ktlint>");
 

From 80a83a8be5d5f585809da9cb5665e1dd529a0c64 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 19 Sep 2023 11:09:16 +0000
Subject: [PATCH 1220/2068] chore(deps): update plugin dev.equo.ide to v1.7.3

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 11ac98ec93..1a9f631f20 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -25,7 +25,7 @@ plugins {
 	// https://plugins.gradle.org/plugin/com.gradle.enterprise
 	id 'com.gradle.enterprise' version '3.14.1'
 	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
-	id 'dev.equo.ide' version '1.0.1' apply false
+	id 'dev.equo.ide' version '1.7.3' apply false
 }
 
 dependencyResolutionManagement {

From 4047ae01329491b1f3d79f4f792f842d9b526ea8 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 19 Sep 2023 22:41:20 +0800
Subject: [PATCH 1221/2068] Add Category.LIBRARY attr to resolve ktlint deps

---
 .../com/diffplug/spotless/kotlin/KtLintStep.java     |  2 +-
 .../diffplug/gradle/spotless/GradleProvisioner.java  | 12 +++---------
 .../java/com/diffplug/spotless/TestProvisioner.java  | 12 +++---------
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index bedbb4a071..d08c59b839 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -39,7 +39,7 @@ private KtLintStep() {}
 	private static final String DEFAULT_VERSION = "1.0.0";
 	static final String NAME = "ktlint";
 	static final String MAVEN_COORDINATE_0_DOT = "com.pinterest:ktlint:";
-	public static final String MAVEN_COORDINATE_1_DOT = "com.pinterest.ktlint:ktlint-cli:";
+	static final String MAVEN_COORDINATE_1_DOT = "com.pinterest.ktlint:ktlint-cli:";
 
 	public static FormatterStep create(Provisioner provisioner) {
 		return create(defaultVersion(), provisioner);
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
index a92d583596..288cc10c72 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
@@ -27,6 +27,7 @@
 import org.gradle.api.artifacts.ConfigurationContainer;
 import org.gradle.api.artifacts.dsl.DependencyHandler;
 import org.gradle.api.attributes.Bundling;
+import org.gradle.api.attributes.Category;
 import org.gradle.api.initialization.dsl.ScriptHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -34,7 +35,6 @@
 import com.diffplug.common.base.Unhandled;
 import com.diffplug.common.collect.ImmutableList;
 import com.diffplug.spotless.Provisioner;
-import com.diffplug.spotless.kotlin.KtLintStep;
 
 /** Should be package-private. */
 class GradleProvisioner {
@@ -122,14 +122,8 @@ private static Provisioner forConfigurationContainer(Project project, Configurat
 				config.setCanBeConsumed(false);
 				config.setVisible(false);
 				config.attributes(attr -> {
-					final String type;
-					// See https://github.com/diffplug/spotless/pull/1808#discussion_r1321682984.
-					if (mavenCoords.stream().anyMatch(it -> it.startsWith(KtLintStep.MAVEN_COORDINATE_1_DOT))) {
-						type = Bundling.SHADOWED;
-					} else {
-						type = Bundling.EXTERNAL;
-					}
-					attr.attribute(Bundling.BUNDLING_ATTRIBUTE, project.getObjects().named(Bundling.class, type));
+					attr.attribute(Category.CATEGORY_ATTRIBUTE, project.getObjects().named(Category.class, Category.LIBRARY));
+					attr.attribute(Bundling.BUNDLING_ATTRIBUTE, project.getObjects().named(Bundling.class, Bundling.EXTERNAL));
 				});
 				return config.resolve();
 			} catch (Exception e) {
diff --git a/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java b/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java
index 6a942d8ca3..e06640ccfd 100644
--- a/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java
+++ b/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java
@@ -32,6 +32,7 @@
 import org.gradle.api.artifacts.ResolveException;
 import org.gradle.api.artifacts.dsl.RepositoryHandler;
 import org.gradle.api.attributes.Bundling;
+import org.gradle.api.attributes.Category;
 import org.gradle.testfixtures.ProjectBuilder;
 
 import com.diffplug.common.base.Errors;
@@ -39,7 +40,6 @@
 import com.diffplug.common.base.Suppliers;
 import com.diffplug.common.collect.ImmutableSet;
 import com.diffplug.common.io.Files;
-import com.diffplug.spotless.kotlin.KtLintStep;
 
 public class TestProvisioner {
 	public static Project gradleProject(File dir) {
@@ -71,14 +71,8 @@ private static Provisioner createWithRepositories(Consumer<RepositoryHandler> re
 			config.setTransitive(withTransitives);
 			config.setDescription(mavenCoords.toString());
 			config.attributes(attr -> {
-				final String type;
-				// See https://github.com/diffplug/spotless/pull/1808#discussion_r1321682984.
-				if (mavenCoords.stream().anyMatch(it -> it.startsWith(KtLintStep.MAVEN_COORDINATE_1_DOT))) {
-					type = Bundling.SHADOWED;
-				} else {
-					type = Bundling.EXTERNAL;
-				}
-				attr.attribute(Bundling.BUNDLING_ATTRIBUTE, project.getObjects().named(Bundling.class, type));
+				attr.attribute(Category.CATEGORY_ATTRIBUTE, project.getObjects().named(Category.class, Category.LIBRARY));
+				attr.attribute(Bundling.BUNDLING_ATTRIBUTE, project.getObjects().named(Bundling.class, Bundling.EXTERNAL));
 			});
 			try {
 				return config.resolve();

From 196afc0f1be5f1171bed1eb8617554f59200db95 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 26 Sep 2023 12:36:59 +0800
Subject: [PATCH 1222/2068] Enable type-safe project accessors

https://docs.gradle.org/7.6/userguide/declaring_dependencies.html#sec:type-safe-project-accessors
---
 _ext/gradle/java-setup.gradle | 2 +-
 lib-extra/build.gradle        | 4 ++--
 plugin-gradle/build.gradle    | 6 +++---
 plugin-maven/build.gradle     | 4 ++--
 settings.gradle               | 1 +
 testlib/build.gradle          | 4 ++--
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/_ext/gradle/java-setup.gradle b/_ext/gradle/java-setup.gradle
index 0d620a6519..d1a1075d84 100644
--- a/_ext/gradle/java-setup.gradle
+++ b/_ext/gradle/java-setup.gradle
@@ -19,7 +19,7 @@ tasks.withType(JavaCompile).configureEach {
 dependencies {
 	testImplementation "org.junit.jupiter:junit-jupiter:${VER_JUNIT}"
 	testImplementation "org.assertj:assertj-core:${VER_ASSERTJ}"
-	testImplementation project(':testlib')
+	testImplementation projects.testlib
 }
 
 tasks.withType(Test).configureEach {
diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index 1158ca0893..35381f08a4 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -9,7 +9,7 @@ apply from: rootProject.file('gradle/java-publish.gradle')
 
 String VER_SOLSTICE = '1.3.1'
 dependencies {
-	api project(':lib')
+	api projects.lib
 	// misc useful utilities
 	implementation "com.diffplug.durian:durian-core:${VER_DURIAN}"
 	implementation "com.diffplug.durian:durian-collect:${VER_DURIAN}"
@@ -20,7 +20,7 @@ dependencies {
 	implementation "dev.equo.ide:solstice:${VER_SOLSTICE}"
 
 	// testing
-	testImplementation project(':testlib')
+	testImplementation projects.testlib
 	testImplementation "org.junit.jupiter:junit-jupiter:${VER_JUNIT}"
 	testImplementation "org.assertj:assertj-core:${VER_ASSERTJ}"
 	testImplementation "com.diffplug.durian:durian-testlib:${VER_DURIAN}"
diff --git a/plugin-gradle/build.gradle b/plugin-gradle/build.gradle
index 021155abfe..ba800173a2 100644
--- a/plugin-gradle/build.gradle
+++ b/plugin-gradle/build.gradle
@@ -10,8 +10,8 @@ apply from: rootProject.file('gradle/spotless-freshmark.gradle')
 
 dependencies {
 	if (version.endsWith('-SNAPSHOT') || (rootProject.spotlessChangelog.versionNext == rootProject.spotlessChangelog.versionLast)) {
-		api project(':lib')
-		api project(':lib-extra')
+		api projects.lib
+		api projects.libExtra
 	} else {
 		api "com.diffplug.spotless:spotless-lib:${rootProject.spotlessChangelog.versionLast}"
 		api "com.diffplug.spotless:spotless-lib-extra:${rootProject.spotlessChangelog.versionLast}"
@@ -21,7 +21,7 @@ dependencies {
 	implementation "com.diffplug.durian:durian-collect:${VER_DURIAN}"
 	implementation "org.eclipse.jgit:org.eclipse.jgit:${VER_JGIT}"
 
-	testImplementation project(':testlib')
+	testImplementation projects.testlib
 	testImplementation "org.junit.jupiter:junit-jupiter:${VER_JUNIT}"
 	testImplementation "org.assertj:assertj-core:${VER_ASSERTJ}"
 	testImplementation "com.diffplug.durian:durian-testlib:${VER_DURIAN}"
diff --git a/plugin-maven/build.gradle b/plugin-maven/build.gradle
index 7cfb38c2e9..3f46e6eba7 100644
--- a/plugin-maven/build.gradle
+++ b/plugin-maven/build.gradle
@@ -30,8 +30,8 @@ String VER_MAVEN_API = '3.0'
 String VER_ECLIPSE_AETHER = '1.1.0'
 String VER_PLEXUS_RESOURCES = '1.2.0'
 dependencies {
-	implementation project(':lib')
-	implementation project(':lib-extra')
+	implementation projects.lib
+	implementation projects.libExtra
 
 	compileOnly "org.apache.maven:maven-plugin-api:${VER_MAVEN_API}"
 	compileOnly "org.apache.maven.plugin-tools:maven-plugin-annotations:${VER_MAVEN_API}"
diff --git a/settings.gradle b/settings.gradle
index 11ac98ec93..3ef45ca2f0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -71,6 +71,7 @@ gradleEnterprise {
 }
 
 enableFeaturePreview("STABLE_CONFIGURATION_CACHE")
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 rootProject.name = 'spotless'
 
diff --git a/testlib/build.gradle b/testlib/build.gradle
index afa6a67a91..12b3bcd135 100644
--- a/testlib/build.gradle
+++ b/testlib/build.gradle
@@ -6,8 +6,8 @@ version = rootProject.spotlessChangelog.versionNext
 apply from: rootProject.file('gradle/java-setup.gradle')
 
 dependencies {
-	api project(':lib')
-	api files(project(':lib').sourceSets.sortPom.output.classesDirs)
+	api projects.lib
+	api files(projects.lib.dependencyProject.sourceSets.sortPom.output.classesDirs)
 	api "com.diffplug.durian:durian-core:${VER_DURIAN}"
 	api "com.diffplug.durian:durian-testlib:${VER_DURIAN}"
 	api "org.junit.jupiter:junit-jupiter:${VER_JUNIT}"

From 68c78405aba32f3d7f1bff6e121e6877ce8d1f13 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 27 Sep 2023 23:55:48 -0700
Subject: [PATCH 1223/2068] Fixup changelog.

---
 plugin-gradle/README.md | 2 +-
 plugin-maven/CHANGES.md | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index e0d6371236..d58d698303 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -592,7 +592,7 @@ To apply flexmark to all of the `.md` files in your project, use this snippet:
 spotless {
   flexmark {
     target '**/*.md' // you have to set the target manually
-    flexmarkFormatter() // or flexmarkFormatter('0.64.6') // version is optional
+    flexmark() // or flexmark('0.64.6') // version is optional
   }
 }
 ```
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 9d413397e2..bc31c30e4b 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,9 +5,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Support Ktlint 1.0.0 ([#1808](https://github.com/diffplug/spotless/pull/1808)).
-
 ### Fixed
 * Added support for plugins when using Prettier version `3.0.0` and newer. ([#1802](https://github.com/diffplug/spotless/pull/1802))
+### Changes
+* Bump default `flexmark` version to latest `0.64.0` -> `0.64.6`. ([#1801](https://github.com/diffplug/spotless/pull/1801))
 
 ## [2.39.0] - 2023-08-29
 ### Added

From beed923037ffebd2a857a2e6dde1e6ee1837b99e Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 27 Sep 2023 23:56:29 -0700
Subject: [PATCH 1224/2068] `flexmarkFormatter` -> `flexmark`

---
 .../com/diffplug/gradle/spotless/FlexmarkExtension.java     | 6 +++---
 .../com/diffplug/gradle/spotless/FlexmarkExtensionTest.java | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java
index 047b0eda73..d1f941613b 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java
@@ -30,11 +30,11 @@ public FlexmarkExtension(SpotlessExtension spotless) {
 		super(spotless);
 	}
 
-	public FlexmarkFormatterConfig flexmarkFormatter() {
-		return flexmarkFormatter(FlexmarkStep.defaultVersion());
+	public FlexmarkFormatterConfig flexmark() {
+		return flexmark(FlexmarkStep.defaultVersion());
 	}
 
-	public FlexmarkFormatterConfig flexmarkFormatter(String version) {
+	public FlexmarkFormatterConfig flexmark(String version) {
 		return new FlexmarkFormatterConfig(version);
 	}
 
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/FlexmarkExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/FlexmarkExtensionTest.java
index 873baba744..6264c0c230 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/FlexmarkExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/FlexmarkExtensionTest.java
@@ -31,7 +31,7 @@ void integration() throws IOException {
 				"spotless {",
 				"    flexmark {",
 				"        target '*.md'",
-				"        flexmarkFormatter()",
+				"        flexmark()",
 				"    }",
 				"}");
 		setFile("markdown_test.md").toResource("markdown/flexmark/FlexmarkUnformatted.md");

From 9ac3edca3fe802321fa68924a52ed3c595ecbd48 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 28 Sep 2023 00:06:45 -0700
Subject: [PATCH 1225/2068] Bump 64.6 -> 64.8.

---
 CHANGES.md                                                      | 2 +-
 .../main/java/com/diffplug/spotless/markdown/FlexmarkStep.java  | 2 +-
 plugin-gradle/README.md                                         | 2 +-
 plugin-maven/CHANGES.md                                         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 4ae2a3aafe..71cde3f643 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,7 +17,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Added support for plugins when using Prettier version `3.0.0` and newer. ([#1802](https://github.com/diffplug/spotless/pull/1802))
 ### Changes
-* Bump default `flexmark` version to latest `0.64.0` -> `0.64.6`. ([#1801](https://github.com/diffplug/spotless/pull/1801))
+* Bump default `flexmark` version to latest `0.64.0` -> `0.64.8`. ([#1801](https://github.com/diffplug/spotless/pull/1801))
 * Bump default `ktlint` version to latest `0.50.0` -> `1.0.0`. ([#1808](https://github.com/diffplug/spotless/pull/1808))
 
 ## [2.41.0] - 2023-08-29
diff --git a/lib/src/main/java/com/diffplug/spotless/markdown/FlexmarkStep.java b/lib/src/main/java/com/diffplug/spotless/markdown/FlexmarkStep.java
index b4159830e7..65d903cba3 100644
--- a/lib/src/main/java/com/diffplug/spotless/markdown/FlexmarkStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/markdown/FlexmarkStep.java
@@ -29,7 +29,7 @@ public class FlexmarkStep {
 	// prevent direct instantiation
 	private FlexmarkStep() {}
 
-	private static final String DEFAULT_VERSION = "0.64.6";
+	private static final String DEFAULT_VERSION = "0.64.8";
 	private static final String NAME = "flexmark-java";
 	private static final String MAVEN_COORDINATE = "com.vladsch.flexmark:flexmark-all:";
 
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index c7303bbc9e..8aef3ac234 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -592,7 +592,7 @@ To apply flexmark to all of the `.md` files in your project, use this snippet:
 spotless {
   flexmark {
     target '**/*.md' // you have to set the target manually
-    flexmark() // or flexmark('0.64.6') // version is optional
+    flexmark() // or flexmark('0.64.8') // version is optional
   }
 }
 ```
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index e04a360e26..72d1e502a1 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -10,7 +10,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Added support for plugins when using Prettier version `3.0.0` and newer. ([#1802](https://github.com/diffplug/spotless/pull/1802))
 ### Changes
-* Bump default `flexmark` version to latest `0.64.0` -> `0.64.6`. ([#1801](https://github.com/diffplug/spotless/pull/1801))
+* Bump default `flexmark` version to latest `0.64.0` -> `0.64.8`. ([#1801](https://github.com/diffplug/spotless/pull/1801))
 * Bump default `ktlint` version to latest `0.50.0` -> `1.0.0`. ([#1808](https://github.com/diffplug/spotless/pull/1808))
 
 ## [2.39.0] - 2023-08-29

From 7faf344c98ac99b515a75515028a9060fba5f1dd Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 28 Sep 2023 07:10:44 +0000
Subject: [PATCH 1226/2068] chore(deps): update plugin com.gradle.enterprise to
 v3.15

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 3ef45ca2f0..6387e3b2c2 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -23,7 +23,7 @@ plugins {
 	// https://github.com/davidburstrom/version-compatibility-gradle-plugin/tags
 	id 'io.github.davidburstrom.version-compatibility' version '0.5.0' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.enterprise
-	id 'com.gradle.enterprise' version '3.14.1'
+	id 'com.gradle.enterprise' version '3.15'
 	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
 	id 'dev.equo.ide' version '1.0.1' apply false
 }

From a35af334cec87aa26c7f4b9b8cfa91b0e5dd9fa1 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Mille <jean-baptiste.mille@aselta.com>
Date: Thu, 21 Sep 2023 13:44:26 +0200
Subject: [PATCH 1227/2068] Support configuration of P2 mirrors in maven plugin
 (fixes #1697)

---
 .../spotless/extra/EquoBasedStepBuilder.java  |  7 +++++
 .../com/diffplug/spotless/extra/P2Mirror.java | 30 +++++++++++++++++++
 .../spotless/maven/cpp/EclipseCdt.java        |  7 +++++
 .../spotless/maven/groovy/GrEclipse.java      |  7 +++++
 .../diffplug/spotless/maven/java/Eclipse.java |  7 +++++
 5 files changed, 58 insertions(+)
 create mode 100644 lib-extra/src/main/java/com/diffplug/spotless/extra/P2Mirror.java

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 586deeb5bf..22ba268426 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
@@ -15,10 +15,13 @@
  */
 package com.diffplug.spotless.extra;
 
+import static java.util.stream.Collectors.toMap;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -76,6 +79,10 @@ public void setP2Mirrors(Map<String, String> p2Mirrors) {
 		this.p2Mirrors = Map.copyOf(p2Mirrors);
 	}
 
+	public void setP2Mirrors(Collection<P2Mirror> p2Mirrors) {
+		this.p2Mirrors = p2Mirrors.stream().collect(toMap(P2Mirror::getPrefix, P2Mirror::getUrl));
+	}
+
 	/** Returns the FormatterStep (whose state will be calculated lazily). */
 	public FormatterStep build() {
 		return FormatterStep.createLazy(formatterName, this::get, stateToFormatter);
diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/P2Mirror.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/P2Mirror.java
new file mode 100644
index 0000000000..f6ce6727b2
--- /dev/null
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/P2Mirror.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.extra;
+
+public class P2Mirror {
+
+	private String prefix;
+	private String url;
+
+	public String getPrefix() {
+		return prefix;
+	}
+
+	public String getUrl() {
+		return url;
+	}
+}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/cpp/EclipseCdt.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/cpp/EclipseCdt.java
index a92e7b2423..92f4229ed3 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/cpp/EclipseCdt.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/cpp/EclipseCdt.java
@@ -16,12 +16,15 @@
 package com.diffplug.spotless.maven.cpp;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 
 import org.apache.maven.plugins.annotations.Parameter;
 
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.extra.EquoBasedStepBuilder;
+import com.diffplug.spotless.extra.P2Mirror;
 import com.diffplug.spotless.extra.cpp.EclipseCdtFormatterStep;
 import com.diffplug.spotless.maven.FormatterStepConfig;
 import com.diffplug.spotless.maven.FormatterStepFactory;
@@ -34,6 +37,9 @@ public class EclipseCdt implements FormatterStepFactory {
 	@Parameter
 	private String version;
 
+	@Parameter
+	private List<P2Mirror> p2Mirrors = new ArrayList<>();
+
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 		EquoBasedStepBuilder eclipseConfig = EclipseCdtFormatterStep.createBuilder(stepConfig.getProvisioner());
@@ -42,6 +48,7 @@ public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 			File settingsFile = stepConfig.getFileLocator().locateFile(file);
 			eclipseConfig.setPreferences(Arrays.asList(settingsFile));
 		}
+		eclipseConfig.setP2Mirrors(p2Mirrors);
 		return eclipseConfig.build();
 	}
 }
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy/GrEclipse.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy/GrEclipse.java
index 8836993cce..67ab40fbf2 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy/GrEclipse.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy/GrEclipse.java
@@ -16,12 +16,15 @@
 package com.diffplug.spotless.maven.groovy;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 
 import org.apache.maven.plugins.annotations.Parameter;
 
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.extra.EquoBasedStepBuilder;
+import com.diffplug.spotless.extra.P2Mirror;
 import com.diffplug.spotless.extra.groovy.GrEclipseFormatterStep;
 import com.diffplug.spotless.maven.FormatterStepConfig;
 import com.diffplug.spotless.maven.FormatterStepFactory;
@@ -34,6 +37,9 @@ public class GrEclipse implements FormatterStepFactory {
 	@Parameter
 	private String version;
 
+	@Parameter
+	private List<P2Mirror> p2Mirrors = new ArrayList<>();
+
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 		EquoBasedStepBuilder grEclipseConfig = GrEclipseFormatterStep.createBuilder(stepConfig.getProvisioner());
@@ -42,6 +48,7 @@ public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 			File settingsFile = stepConfig.getFileLocator().locateFile(file);
 			grEclipseConfig.setPreferences(Arrays.asList(settingsFile));
 		}
+		grEclipseConfig.setP2Mirrors(p2Mirrors);
 		return grEclipseConfig.build();
 	}
 }
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Eclipse.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Eclipse.java
index e30a4faad9..8d5869cc8e 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Eclipse.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Eclipse.java
@@ -16,12 +16,15 @@
 package com.diffplug.spotless.maven.java;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 
 import org.apache.maven.plugins.annotations.Parameter;
 
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.extra.EquoBasedStepBuilder;
+import com.diffplug.spotless.extra.P2Mirror;
 import com.diffplug.spotless.extra.java.EclipseJdtFormatterStep;
 import com.diffplug.spotless.maven.FormatterStepConfig;
 import com.diffplug.spotless.maven.FormatterStepFactory;
@@ -34,6 +37,9 @@ public class Eclipse implements FormatterStepFactory {
 	@Parameter
 	private String version;
 
+	@Parameter
+	private List<P2Mirror> p2Mirrors = new ArrayList<>();
+
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 		EquoBasedStepBuilder eclipseConfig = EclipseJdtFormatterStep.createBuilder(stepConfig.getProvisioner());
@@ -42,6 +48,7 @@ public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 			File settingsFile = stepConfig.getFileLocator().locateFile(file);
 			eclipseConfig.setPreferences(Arrays.asList(settingsFile));
 		}
+		eclipseConfig.setP2Mirrors(p2Mirrors);
 		return eclipseConfig.build();
 	}
 }

From d0fca7a14d8513883c53f2f1a845fb6becc29267 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Mille <jean-baptiste.mille@aselta.com>
Date: Thu, 21 Sep 2023 13:54:23 +0200
Subject: [PATCH 1228/2068] Update changelog

---
 CHANGES.md              |  1 +
 plugin-maven/CHANGES.md | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 71cde3f643..24dfc66c39 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -14,6 +14,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Add support for biome. The Rome project [was renamed to Biome](https://biomejs.dev/blog/annoucing-biome/).
   The configuration is still the same, but you should switch to the new `biome` tag / function and adjust
   the version accordingly. ([#1804](https://github.com/diffplug/spotless/issues/1804)).
+* Support configuration of mirrors for P2 repositories in maven DSL ([#1697](https://github.com/diffplug/spotless/issues/1697)).
 ### Fixed
 * Added support for plugins when using Prettier version `3.0.0` and newer. ([#1802](https://github.com/diffplug/spotless/pull/1802))
 ### Changes
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 72d1e502a1..5a75a717a0 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -7,6 +7,19 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Add support for biome. The Rome project [was renamed to Biome](https://biomejs.dev/blog/annoucing-biome/).
   The configuration is still the same, but you should switch to the new `<biome>` tag and adjust
   the version accordingly. ([#1804](https://github.com/diffplug/spotless/issues/1804)).
+* Support configuration of mirrors for P2 repositories ([#1697](https://github.com/diffplug/spotless/issues/1697)):
+  ```
+  <eclipse>
+    <p2Mirrors>
+      <p2Mirror>
+        <prefix>https://download.eclipse.org/</prefix>
+        <url>https://some.internal.mirror/eclipse</url>
+      </p2Mirror>
+    </p2Mirrors>
+  </eclipse>
+  ```
+  Mirrors are selected by prefix match, for example `https://download.eclipse.org/eclipse/updates/4.26/` will be redirected to `https://some.internal.mirror/eclipse/eclipse/updates/4.26/`.
+  The same configuration exists for `<greclipse>` and `<eclipseCdt>`.
 ### Fixed
 * Added support for plugins when using Prettier version `3.0.0` and newer. ([#1802](https://github.com/diffplug/spotless/pull/1802))
 ### Changes

From 34d92f2c892c942463d70fbdb30ca5651be8ff3d Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Thu, 28 Sep 2023 17:11:23 +0800
Subject: [PATCH 1229/2068] Ignore Ktlint updates by Renovate

https://docs.renovatebot.com/configuration-options/#ignoredeps
---
 renovate.json | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/renovate.json b/renovate.json
index 7bd954555f..2b278dfe17 100644
--- a/renovate.json
+++ b/renovate.json
@@ -2,5 +2,14 @@
 	"$schema": "https://docs.renovatebot.com/renovate-schema.json",
 	"extends": [
 		"config:base"
+	],
+	"packageRules": [
+		{
+			"groupName": "Ktlint",
+			"enabled": false,
+			"matchPackagePatterns": [
+				"com.pinterest.ktlint:*"
+			]
+		}
 	]
 }

From 56cea6d8bb12bd90a749e00cb7d4670a67604d1b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 28 Sep 2023 14:52:12 +0000
Subject: [PATCH 1230/2068] fix(deps): update dependency
 org.eclipse.jgit:org.eclipse.jgit to v6.7.0.202309050840-r

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index ce29bbfaeb..8312afaed3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -29,7 +29,7 @@ VER_SLF4J=[1.6,2.0[
 
 # Used in multiple places
 VER_DURIAN=1.2.0
-VER_JGIT=6.6.0.202305301015-r
+VER_JGIT=6.7.0.202309050840-r
 VER_JUNIT=5.9.3
 VER_ASSERTJ=3.24.2
 VER_MOCKITO=5.3.1

From c86699083424701a3582d35c8f4e9adf0b889980 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 28 Sep 2023 15:13:06 +0000
Subject: [PATCH 1231/2068] fix(deps): update dependency
 org.mockito:mockito-core to v5.5.0

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index ce29bbfaeb..af3c2fd9c1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -32,4 +32,4 @@ VER_DURIAN=1.2.0
 VER_JGIT=6.6.0.202305301015-r
 VER_JUNIT=5.9.3
 VER_ASSERTJ=3.24.2
-VER_MOCKITO=5.3.1
+VER_MOCKITO=5.5.0

From 479248d566a0fd8a072ff383fa531a0b2ed4ebd9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 28 Sep 2023 15:16:24 +0000
Subject: [PATCH 1232/2068] fix(deps): update dependency
 org.junit.jupiter:junit-jupiter to v5.10.0

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 8312afaed3..6d11931de2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -30,6 +30,6 @@ VER_SLF4J=[1.6,2.0[
 # Used in multiple places
 VER_DURIAN=1.2.0
 VER_JGIT=6.7.0.202309050840-r
-VER_JUNIT=5.9.3
+VER_JUNIT=5.10.0
 VER_ASSERTJ=3.24.2
 VER_MOCKITO=5.3.1

From 59fce9599d67ce21cc710e100ca1a8010d3220c7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 28 Sep 2023 16:14:33 +0000
Subject: [PATCH 1233/2068] chore(deps): update actions/checkout action to v4

---
 .github/workflows/changelog-print.yml           | 2 +-
 .github/workflows/ci.yml                        | 4 ++--
 .github/workflows/codeql-analysis.yml           | 2 +-
 .github/workflows/deploy.yml                    | 2 +-
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/changelog-print.yml b/.github/workflows/changelog-print.yml
index a3009e3a39..31b6c9aabc 100644
--- a/.github/workflows/changelog-print.yml
+++ b/.github/workflows/changelog-print.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     name: changelogPrint
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: jdk 11
         uses: actions/setup-java@v3
         with:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2a8078339d..b6a2e612aa 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,7 +20,7 @@ jobs:
       buildcachepass: ${{ secrets.BUILDCACHE_PASS }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Install JDK 11
@@ -59,7 +59,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install JDK ${{ matrix.distribution }} ${{ matrix.java_version }}
         uses: actions/setup-java@v3
         with:
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index b2f2a259c3..7fb9daff0d 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -37,7 +37,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index f139032cf6..0e36087855 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -36,7 +36,7 @@ jobs:
       ORG_GRADLE_PROJECT_gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
       ORG_GRADLE_PROJECT_gpg_key64: ${{ secrets.GPG_KEY64 }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: jdk 11
         uses: actions/setup-java@v3
         with:
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 2c02ce0fc4..d8be29afda 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -19,5 +19,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: gradle/wrapper-validation-action@v1

From c48a180905566fd444ce03279863a5e5dffc6b6e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 28 Sep 2023 16:14:38 +0000
Subject: [PATCH 1234/2068] chore(deps): update mikepenz/action-junit-report
 action to v4

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2a8078339d..01379f3a91 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -79,7 +79,7 @@ jobs:
         if: matrix.kind == 'npm'
         run: ./gradlew testNpm
       - name: junit result
-        uses: mikepenz/action-junit-report@v3
+        uses: mikepenz/action-junit-report@v4
         if: always() # always run even if the previous step fails
         with:
           check_name: JUnit ${{ matrix.kind }} ${{ matrix.jre }} ${{ matrix.os }}

From 3562e49ef862e53678fdc02fd3280d5a4f249fb9 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 28 Sep 2023 09:19:51 -0700
Subject: [PATCH 1235/2068] Bump solstice to latest.

---
 .../java/com/diffplug/spotless/extra/EquoBasedStepBuilder.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 22ba268426..2d62e25355 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
@@ -117,7 +117,7 @@ EquoBasedStepBuilder.State get() throws Exception {
 		}
 		var classpath = new ArrayList<File>();
 		var mavenDeps = new ArrayList<String>();
-		mavenDeps.add("dev.equo.ide:solstice:1.3.1");
+		mavenDeps.add("dev.equo.ide:solstice:1.7.3");
 		mavenDeps.add("com.diffplug.durian:durian-swt.os:4.2.0");
 		mavenDeps.addAll(query.getJarsOnMavenCentral());
 		classpath.addAll(mavenProvisioner.provisionWithTransitives(false, mavenDeps));

From 5404e027529dbdc9a50b264c3d2e8d7891bbfee5 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 28 Sep 2023 09:39:25 -0700
Subject: [PATCH 1236/2068] Bump gradle to 8.4-rc-2 for Java 21

---
 build.gradle                             |   2 +-
 gradle/wrapper/gradle-wrapper.jar        | Bin
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 mode change 100755 => 100644 gradle/wrapper/gradle-wrapper.jar

diff --git a/build.gradle b/build.gradle
index 0ae84bd9c4..dcef3b68b9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'dev.equo.ide'
 equoIde {
 	branding().title('Spotless').icon(file('_images/spotless_logo.png'))
 	welcome().openUrl('https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md')
-	gradleBuildship().autoImport('.')
+	//gradleBuildship().autoImport('.')
 }
 
 repositories {
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
old mode 100755
new mode 100644
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ac72c34e8a..98ea390909 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-rc-2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

From deba3401369eb6e11ed720732b5a3701b36157ff Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 28 Sep 2023 09:40:49 -0700
Subject: [PATCH 1237/2068] Revert accidental commit.

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index dcef3b68b9..0ae84bd9c4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'dev.equo.ide'
 equoIde {
 	branding().title('Spotless').icon(file('_images/spotless_logo.png'))
 	welcome().openUrl('https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md')
-	//gradleBuildship().autoImport('.')
+	gradleBuildship().autoImport('.')
 }
 
 repositories {

From 6271c51fd85f4450e0cc0a0c7faa2a0f4e976ca6 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 28 Sep 2023 10:22:05 -0700
Subject: [PATCH 1238/2068] Fix findbugs warnings.

---
 .../src/main/java/com/diffplug/spotless/extra/P2Mirror.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/P2Mirror.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/P2Mirror.java
index f6ce6727b2..172857422b 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/P2Mirror.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/P2Mirror.java
@@ -15,6 +15,9 @@
  */
 package com.diffplug.spotless.extra;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+@SuppressFBWarnings("UWF_UNWRITTEN_FIELD")
 public class P2Mirror {
 
 	private String prefix;

From c320ffeab856dc4d335aabf7c3ffe4e7ab8b10dd Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 28 Sep 2023 14:25:00 -0700
Subject: [PATCH 1239/2068] Attempt a fix for #1806 by preventing JGit from
 finding the native git executable.

---
 CHANGES.md                                    |  1 +
 .../gradle/spotless/GitRatchetGradle.java     | 73 ++++++++++++++++++-
 2 files changed, 73 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 3d14044c7c..87eacf12a5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -18,6 +18,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Support configuration of mirrors for P2 repositories in maven DSL ([#1697](https://github.com/diffplug/spotless/issues/1697)).
 ### Fixed
 * Fix support for plugins when using Prettier version `3.0.0` and newer. ([#1802](https://github.com/diffplug/spotless/pull/1802))
+* Fix configuration cache issue around `external process started '/usr/bin/git --version'`. ([#1806](https://github.com/diffplug/spotless/issues/1806))
 ### Changes
 * Bump default `flexmark` version to latest `0.64.0` -> `0.64.8`. ([#1801](https://github.com/diffplug/spotless/pull/1801))
 * Bump default `ktlint` version to latest `0.50.0` -> `1.0.0`. ([#1808](https://github.com/diffplug/spotless/pull/1808))
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GitRatchetGradle.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GitRatchetGradle.java
index 8c4f88e7da..b2c3adc459 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GitRatchetGradle.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GitRatchetGradle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 DiffPlug
+ * Copyright 2020-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,10 +19,33 @@
 
 import javax.annotation.Nullable;
 
+import org.eclipse.jgit.lib.Config;
+import org.eclipse.jgit.storage.file.FileBasedConfig;
+import org.eclipse.jgit.util.FS;
+import org.eclipse.jgit.util.SystemReader;
+
 import com.diffplug.spotless.extra.GitRatchet;
 
 /** Gradle implementation of GitRatchet. */
 public class GitRatchetGradle extends GitRatchet<File> {
+	static {
+		preventJGitFromCallingExecutables();
+	}
+
+	static void preventJGitFromCallingExecutables() {
+		SystemReader reader = SystemReader.getInstance();
+		SystemReader.setInstance(new DelegatingSystemReader(reader) {
+			@Override
+			public String getenv(String variable) {
+				if ("PATH".equals(variable)) {
+					return "";
+				} else {
+					return super.getenv(variable);
+				}
+			}
+		});
+	}
+
 	@Override
 	protected File getDir(File project) {
 		return project;
@@ -32,4 +55,52 @@ protected File getDir(File project) {
 	protected @Nullable File getParent(File project) {
 		return project.getParentFile();
 	}
+
+	static class DelegatingSystemReader extends SystemReader {
+		final SystemReader reader;
+
+		DelegatingSystemReader(SystemReader reader) {
+			this.reader = reader;
+		}
+
+		@Override
+		public String getHostname() {
+			return reader.getHostname();
+		}
+
+		@Override
+		public String getenv(String variable) {
+			return reader.getProperty(variable);
+		}
+
+		@Override
+		public String getProperty(String key) {
+			return reader.getProperty(key);
+		}
+
+		@Override
+		public FileBasedConfig openUserConfig(Config parent, FS fs) {
+			return reader.openUserConfig(parent, fs);
+		}
+
+		@Override
+		public FileBasedConfig openSystemConfig(Config parent, FS fs) {
+			return reader.openSystemConfig(parent, fs);
+		}
+
+		@Override
+		public FileBasedConfig openJGitConfig(Config parent, FS fs) {
+			return reader.openJGitConfig(parent, fs);
+		}
+
+		@Override
+		public long getCurrentTime() {
+			return reader.getCurrentTime();
+		}
+
+		@Override
+		public int getTimezone(long when) {
+			return reader.getTimezone(when);
+		}
+	}
 }

From 5ddf6e075323c53934a4f8c3ca98a346ec144f3c Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 28 Sep 2023 14:34:56 -0700
Subject: [PATCH 1240/2068] Update changelog.

---
 plugin-maven/CHANGES.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index ed6ce8fe49..1338d42ddb 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -4,6 +4,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
+* Add `-DspotlessIdeHook` that provides the ability to apply Spotless exclusively to a specified file. It accepts the absolute path of the file. ([#1782](https://github.com/diffplug/spotless/pull/1782))
+  * BETA, subject to change until we have proven compatibility with some IDE plugins.
 * Added support for `google-java-format`'s `skip-javadoc-formatting` option ([#1793](https://github.com/diffplug/spotless/pull/1793))
 * Added support for biome. The Rome project [was renamed to Biome](https://biomejs.dev/blog/annoucing-biome/).
   The configuration is still the same, but you should switch to the new `<biome>` tag and adjust
@@ -31,7 +33,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * Add a `jsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
 * Support GJF own import order. ([#1780](https://github.com/diffplug/spotless/pull/1780))
-* Add `-DspotlessIdeHook` that provides the ability to apply Spotless exclusively to a specified file. It accepts the absolute path of the file. ([#200](https://github.com/diffplug/spotless/issues/200))
 ### Fixed
 * Add support for `prettier` version `3.0.0` and newer. ([#1760](https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
 * Fix npm install calls when npm cache is not up-to-date. ([#1760](https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))

From 9c27d39f642fcee2afbd032d0179a30074ea96f9 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 28 Sep 2023 15:09:11 -0700
Subject: [PATCH 1241/2068] Create new GIT_ATTRIBUTES_FAST_ALLSAME which is the
 same as GIT_ATTRIBUTES, except that:

- it is much faster
- it assumes that every file in a given format has the same line endings
---
 .../com/diffplug/spotless/LineEnding.java     | 46 +++++++++++++++++--
 1 file changed, 43 insertions(+), 3 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/LineEnding.java b/lib/src/main/java/com/diffplug/spotless/LineEnding.java
index 72b2532f2a..fa487a03b7 100644
--- a/lib/src/main/java/com/diffplug/spotless/LineEnding.java
+++ b/lib/src/main/java/com/diffplug/spotless/LineEnding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,6 +37,14 @@ public Policy createPolicy() {
 			return super.createPolicy();
 		}
 	},
+	/** Uses the same line endings as Git, and assumes that every single file being formatted will have the same line ending. */
+	GIT_ATTRIBUTES_FAST_ALLSAME {
+		/** .gitattributes is path-specific, so you must use {@link LineEnding#createPolicy(File, Supplier)}. */
+		@Override @Deprecated
+		public Policy createPolicy() {
+			return super.createPolicy();
+		}
+	},
 	/** {@code \n} on unix systems, {@code \r\n} on windows systems. */
 	PLATFORM_NATIVE,
 	/** {@code \r\n} */
@@ -51,7 +59,7 @@ public Policy createPolicy() {
 	public Policy createPolicy(File projectDir, Supplier<Iterable<File>> toFormat) {
 		Objects.requireNonNull(projectDir, "projectDir");
 		Objects.requireNonNull(toFormat, "toFormat");
-		if (this != GIT_ATTRIBUTES) {
+		if (this != GIT_ATTRIBUTES && this != GIT_ATTRIBUTES_FAST_ALLSAME) {
 			return createPolicy();
 		} else {
 			if (gitAttributesPolicyCreator == null) {
@@ -64,7 +72,39 @@ public Policy createPolicy(File projectDir, Supplier<Iterable<File>> toFormat) {
 				}
 			}
 			// gitAttributesPolicyCreator will always be nonnull at this point
-			return gitAttributesPolicyCreator.apply(projectDir, toFormat);
+			Policy policy = gitAttributesPolicyCreator.apply(projectDir, toFormat);
+			if (this == GIT_ATTRIBUTES) {
+				return policy;
+			} else if (this == GIT_ATTRIBUTES_FAST_ALLSAME) {
+				return new LazyAllTheSame(policy, toFormat);
+			} else {
+				throw new IllegalArgumentException("Unknown " + this);
+			}
+		}
+	}
+
+	static class LazyAllTheSame extends LazyForwardingEquality<String> implements Policy {
+		private transient Policy policy;
+		private transient Supplier<Iterable<File>> toFormat;
+
+		public LazyAllTheSame(Policy policy, Supplier<Iterable<File>> toFormat) {
+			this.policy = policy;
+			this.toFormat = toFormat;
+		}
+
+		@Override
+		protected String calculateState() throws Exception {
+			var files = toFormat.get().iterator();
+			if (files.hasNext()) {
+				return policy.getEndingFor(files.next());
+			} else {
+				return LineEnding.UNIX.str();
+			}
+		}
+
+		@Override
+		public String getEndingFor(File file) {
+			return state();
 		}
 	}
 

From 54c0af2bb701fc1b0756b8ff1bfd568d0c43bf65 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 28 Sep 2023 15:13:52 -0700
Subject: [PATCH 1242/2068] Set the default line endings to be
 GIT_ATTRIBUTES_FAST_ALLSAME.

---
 .../java/com/diffplug/gradle/spotless/SpotlessExtension.java    | 2 +-
 .../java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
index 838231c9f8..514945f22d 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
@@ -57,7 +57,7 @@ RegisterDependenciesTask getRegisterDependenciesTask() {
 	}
 
 	/** Line endings (if any). */
-	LineEnding lineEndings = LineEnding.GIT_ATTRIBUTES;
+	LineEnding lineEndings = LineEnding.GIT_ATTRIBUTES_FAST_ALLSAME;
 
 	public LineEnding getLineEndings() {
 		return lineEndings;
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
index 2c295cef27..97a61ddaea 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
@@ -80,7 +80,7 @@
 public abstract class AbstractSpotlessMojo extends AbstractMojo {
 	private static final String DEFAULT_INDEX_FILE_NAME = "spotless-index";
 	private static final String DEFAULT_ENCODING = "UTF-8";
-	private static final String DEFAULT_LINE_ENDINGS = "GIT_ATTRIBUTES";
+	private static final String DEFAULT_LINE_ENDINGS = "GIT_ATTRIBUTES_FAST_ALLSAME";
 
 	/** Value to allow unsetting the ratchet inherited from parent pom configuration. */
 	static final String RATCHETFROM_NONE = "NONE";

From 809fb4b0785803d96b2acde585db747f86e89c04 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 28 Sep 2023 15:28:26 -0700
Subject: [PATCH 1243/2068] Make GIT_ATTRIBUTES_FAST_ALLSAME faster.

---
 .../extra/GitAttributesLineEndings.java       | 35 ++++++++++++
 .../com/diffplug/spotless/LineEnding.java     | 56 ++++---------------
 2 files changed, 47 insertions(+), 44 deletions(-)

diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
index fb54be4ba0..c53e9a3e92 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
@@ -68,6 +68,41 @@ public final class GitAttributesLineEndings {
 	// prevent direct instantiation
 	private GitAttributesLineEndings() {}
 
+	/**
+	 * Creates a line-endings policy which matches {@link #create(File, Supplier)},
+	 * which is much faster at the cost that every file under the policy
+	 * is assumed to have the same line endings as the first file.
+	 */
+	public static LineEnding.Policy createFastAllSame(File projectDir, Supplier<Iterable<File>> toFormat) {
+		return new LazyAllTheSame(projectDir, toFormat);
+	}
+
+	static class LazyAllTheSame extends LazyForwardingEquality<String> implements LineEnding.Policy {
+		transient File projectDir;
+		transient Supplier<Iterable<File>> toFormat;
+
+		public LazyAllTheSame(File projectDir, Supplier<Iterable<File>> toFormat) {
+			this.projectDir = projectDir;
+			this.toFormat = toFormat;
+		}
+
+		@Override
+		protected String calculateState() throws Exception {
+			var files = toFormat.get().iterator();
+			if (files.hasNext()) {
+				Runtime runtime = new RuntimeInit(projectDir).atRuntime();
+				return runtime.getEndingFor(files.next());
+			} else {
+				return LineEnding.UNIX.str();
+			}
+		}
+
+		@Override
+		public String getEndingFor(File file) {
+			return state();
+		}
+	}
+
 	/**
 	 * Creates a line-endings policy whose serialized state is relativized against projectDir,
 	 * at the cost of eagerly evaluating the line-ending state of every target file when the
diff --git a/lib/src/main/java/com/diffplug/spotless/LineEnding.java b/lib/src/main/java/com/diffplug/spotless/LineEnding.java
index fa487a03b7..708699904c 100644
--- a/lib/src/main/java/com/diffplug/spotless/LineEnding.java
+++ b/lib/src/main/java/com/diffplug/spotless/LineEnding.java
@@ -59,52 +59,20 @@ public Policy createPolicy() {
 	public Policy createPolicy(File projectDir, Supplier<Iterable<File>> toFormat) {
 		Objects.requireNonNull(projectDir, "projectDir");
 		Objects.requireNonNull(toFormat, "toFormat");
-		if (this != GIT_ATTRIBUTES && this != GIT_ATTRIBUTES_FAST_ALLSAME) {
-			return createPolicy();
+		String gitAttributesMethod;
+		if (this == GIT_ATTRIBUTES) {
+			gitAttributesMethod = "create";
+		} else if (this == GIT_ATTRIBUTES_FAST_ALLSAME) {
+			gitAttributesMethod = "createFastAllSame";
 		} else {
-			if (gitAttributesPolicyCreator == null) {
-				try {
-					Class<?> clazz = Class.forName("com.diffplug.spotless.extra.GitAttributesLineEndings");
-					Method method = clazz.getMethod("create", File.class, Supplier.class);
-					gitAttributesPolicyCreator = (proj, target) -> ThrowingEx.get(() -> (Policy) method.invoke(null, proj, target));
-				} catch (ClassNotFoundException | NoSuchMethodException | SecurityException e) {
-					throw new IllegalStateException("LineEnding.GIT_ATTRIBUTES requires the spotless-lib-extra library, but it is not on the classpath", e);
-				}
-			}
-			// gitAttributesPolicyCreator will always be nonnull at this point
-			Policy policy = gitAttributesPolicyCreator.apply(projectDir, toFormat);
-			if (this == GIT_ATTRIBUTES) {
-				return policy;
-			} else if (this == GIT_ATTRIBUTES_FAST_ALLSAME) {
-				return new LazyAllTheSame(policy, toFormat);
-			} else {
-				throw new IllegalArgumentException("Unknown " + this);
-			}
-		}
-	}
-
-	static class LazyAllTheSame extends LazyForwardingEquality<String> implements Policy {
-		private transient Policy policy;
-		private transient Supplier<Iterable<File>> toFormat;
-
-		public LazyAllTheSame(Policy policy, Supplier<Iterable<File>> toFormat) {
-			this.policy = policy;
-			this.toFormat = toFormat;
-		}
-
-		@Override
-		protected String calculateState() throws Exception {
-			var files = toFormat.get().iterator();
-			if (files.hasNext()) {
-				return policy.getEndingFor(files.next());
-			} else {
-				return LineEnding.UNIX.str();
-			}
+			return createPolicy();
 		}
-
-		@Override
-		public String getEndingFor(File file) {
-			return state();
+		try {
+			Class<?> clazz = Class.forName("com.diffplug.spotless.extra.GitAttributesLineEndings");
+			Method method = clazz.getMethod(gitAttributesMethod, File.class, Supplier.class);
+			return ThrowingEx.get(() -> (Policy) method.invoke(null, projectDir, toFormat));
+		} catch (ClassNotFoundException | NoSuchMethodException | SecurityException e) {
+			throw new IllegalStateException("LineEnding.GIT_ATTRIBUTES requires the spotless-lib-extra library, but it is not on the classpath", e);
 		}
 	}
 

From d56acd51206381d68cc9112c16376d502478edd5 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 28 Sep 2023 15:47:24 -0700
Subject: [PATCH 1244/2068] Fix spotbugs.

---
 .../com/diffplug/spotless/extra/GitAttributesLineEndings.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
index c53e9a3e92..3be75637be 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
@@ -78,6 +78,7 @@ public static LineEnding.Policy createFastAllSame(File projectDir, Supplier<Iter
 	}
 
 	static class LazyAllTheSame extends LazyForwardingEquality<String> implements LineEnding.Policy {
+		private static final long serialVersionUID = 727912266173243664L;
 		transient File projectDir;
 		transient Supplier<Iterable<File>> toFormat;
 

From 0cfe58f1e9b7693cbddd177de95d8d1812d94cc0 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 28 Sep 2023 15:47:32 -0700
Subject: [PATCH 1245/2068] Update docs.

---
 plugin-gradle/README.md | 4 ++--
 plugin-maven/README.md  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 6543d21b79..d4537d4b11 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -1425,12 +1425,12 @@ spotless {
     encoding 'Cp1252' // except java, which will be Cp1252
 ```
 
-Line endings can also be set globally or per-format using the `lineEndings` property.  Spotless supports four line ending modes: `UNIX`, `WINDOWS`, `MAC_CLASSIC`, `PLATFORM_NATIVE`, and `GIT_ATTRIBUTES`.  The default value is `GIT_ATTRIBUTES`, and *we highly recommend that you* ***do not change*** *this value*.  Git has opinions about line endings, and if Spotless and git disagree, then you're going to have a bad time.
+Line endings can also be set globally or per-format using the `lineEndings` property.  Spotless supports four line ending modes: `UNIX`, `WINDOWS`, `MAC_CLASSIC`, `PLATFORM_NATIVE`, `GIT_ATTRIBUTES`, and `GIT_ATTRIBUTES_FAST_ALLSAME`.  The default value is `GIT_ATTRIBUTES_FAST_ALLSAME`, and *we highly recommend that you* ***do not change*** *this value*.  Git has opinions about line endings, and if Spotless and git disagree, then you're going to have a bad time. `FAST_ALLSAME` just means that Spotless can assume that every file being formatted has the same line endings ([more info](https://github.com/diffplug/spotless/pull/1838)).
 
 You can easily set the line endings of different files using [a `.gitattributes` file](https://help.github.com/articles/dealing-with-line-endings/).  Here's an example `.gitattributes` which sets all files to unix newlines: `* text eol=lf`.
 
 <a name="custom"></a>
-<a name="custom-rulwa"></a>
+<a name="custom-steps"></a>
 
 ## Custom steps
 
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 8942b6c059..919a05dfbb 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -1586,7 +1586,7 @@ Spotless uses UTF-8 by default, but you can use [any encoding which Java support
 </configuration>
 ```
 
-Line endings can also be set globally or per-format using the `lineEndings` property.  Spotless supports four line ending modes: `UNIX`, `WINDOWS`, `MAC_CLASSIC`, `PLATFORM_NATIVE`, and `GIT_ATTRIBUTES`.  The default value is `GIT_ATTRIBUTES`, and *we highly recommend that you* ***do not change*** *this value*.  Git has opinions about line endings, and if Spotless and git disagree, then you're going to have a bad time.
+Line endings can also be set globally or per-format using the `lineEndings` property.  Spotless supports four line ending modes: `UNIX`, `WINDOWS`, `MAC_CLASSIC`, `PLATFORM_NATIVE`, `GIT_ATTRIBUTES`, and `GIT_ATTRIBUTES_FAST_ALLSAME`.  The default value is `GIT_ATTRIBUTES_FAST_ALLSAME`, and *we highly recommend that you* ***do not change*** *this value*.  Git has opinions about line endings, and if Spotless and git disagree, then you're going to have a bad time. `FAST_ALLSAME` just means that Spotless can assume that every file being formatted has the same line endings ([more info](https://github.com/diffplug/spotless/pull/1838)).
 
 You can easily set the line endings of different files using [a `.gitattributes` file](https://help.github.com/articles/dealing-with-line-endings/).  Here's an example `.gitattributes` which sets all files to unix newlines: `* text eol=lf`.
 

From cdc0c7b3c9d85b358d7aba005e284122cbb925b2 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 28 Sep 2023 15:47:43 -0700
Subject: [PATCH 1246/2068] Update changelogs.

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 3 +++
 plugin-maven/CHANGES.md  | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 87eacf12a5..0fbb14f7ff 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -16,6 +16,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
   the version accordingly. ([#1804](https://github.com/diffplug/spotless/issues/1804)).
 * Support for `google-java-format`'s `skip-javadoc-formatting` option. ([#1793](https://github.com/diffplug/spotless/pull/1793))
 * Support configuration of mirrors for P2 repositories in maven DSL ([#1697](https://github.com/diffplug/spotless/issues/1697)).
+* New line endings mode `GIT_ATTRIBUTES_FAST_ALLSAME`. ([#1838](https://github.com/diffplug/spotless/pull/1838))
 ### Fixed
 * Fix support for plugins when using Prettier version `3.0.0` and newer. ([#1802](https://github.com/diffplug/spotless/pull/1802))
 * Fix configuration cache issue around `external process started '/usr/bin/git --version'`. ([#1806](https://github.com/diffplug/spotless/issues/1806))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 7a92efc514..536747a4ff 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -13,6 +13,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Fixed support for plugins when using Prettier version `3.0.0` and newer. ([#1802](https://github.com/diffplug/spotless/pull/1802))
 ### Changes
 * Bump default `ktlint` version to latest `0.50.0` -> `1.0.0`. ([#1808](https://github.com/diffplug/spotless/pull/1808))
+* **POSSIBLY BREAKING** the default line endings are now `GIT_ATTRIBUTES_FAST_ALLSAME` instead of `GIT_ATTRIBUTES`. ([#1838](https://github.com/diffplug/spotless/pull/1838))
+  * If all the files within a format have the same line endings, then there is no change in behavior.
+  * Fixes large performance regression. ([#1527](https://github.com/diffplug/spotless/issues/1527))
 
 ## [6.21.0] - 2023-08-29
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 1338d42ddb..a6c98e2c96 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -28,6 +28,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changes
 * Bump default `flexmark` version to latest `0.64.0` -> `0.64.8`. ([#1801](https://github.com/diffplug/spotless/pull/1801))
 * Bump default `ktlint` version to latest `0.50.0` -> `1.0.0`. ([#1808](https://github.com/diffplug/spotless/pull/1808))
+* **POSSIBLY BREAKING** the default line endings are now `GIT_ATTRIBUTES_FAST_ALLSAME` instead of `GIT_ATTRIBUTES`. ([#1838](https://github.com/diffplug/spotless/pull/1838))
+  * If all the files within a format have the same line endings, then there is no change in behavior.
+  * Fixes large performance regression. ([#1527](https://github.com/diffplug/spotless/issues/1527))
 
 ## [2.39.0] - 2023-08-29
 ### Added

From 1a1fbfef95ff001ad0d4b5d8cbf8a46bc76c8896 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 28 Sep 2023 16:23:55 -0700
Subject: [PATCH 1247/2068] Remove unused field.

---
 lib/src/main/java/com/diffplug/spotless/LineEnding.java | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/LineEnding.java b/lib/src/main/java/com/diffplug/spotless/LineEnding.java
index 708699904c..74d9c80618 100644
--- a/lib/src/main/java/com/diffplug/spotless/LineEnding.java
+++ b/lib/src/main/java/com/diffplug/spotless/LineEnding.java
@@ -19,11 +19,8 @@
 import java.io.Serializable;
 import java.lang.reflect.Method;
 import java.util.Objects;
-import java.util.function.BiFunction;
 import java.util.function.Supplier;
 
-import javax.annotation.Nullable;
-
 /**
  * Represents the line endings which should be written by the tool.
  */
@@ -76,8 +73,6 @@ public Policy createPolicy(File projectDir, Supplier<Iterable<File>> toFormat) {
 		}
 	}
 
-	private static volatile @Nullable BiFunction<File, Supplier<Iterable<File>>, Policy> gitAttributesPolicyCreator;
-
 	// @formatter:off
 	/** Should use {@link #createPolicy(File, Supplier)} instead, but this will work iff its a path-independent LineEnding policy. */
 	public Policy createPolicy() {
@@ -85,7 +80,7 @@ public Policy createPolicy() {
 		case PLATFORM_NATIVE:	return _platformNativePolicy;
 		case WINDOWS:			return WINDOWS_POLICY;
 		case UNIX:				return UNIX_POLICY;
-        case MAC_CLASSIC:       return MAC_CLASSIC_POLICY;
+		case MAC_CLASSIC:		return MAC_CLASSIC_POLICY;
 		default:	throw new UnsupportedOperationException(this + " is a path-specific line ending.");
 		}
 	}
@@ -129,7 +124,7 @@ public String str() {
 		case PLATFORM_NATIVE:	return _platformNative;
 		case WINDOWS:			return "\r\n";
 		case UNIX:				return "\n";
-		case MAC_CLASSIC:       return "\r";
+		case MAC_CLASSIC:		return "\r";
 		default:	throw new UnsupportedOperationException(this + " is a path-specific line ending.");
 		}
 	}

From 79c7966760f55848fa41106d5d84e7d424214f8d Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az1032-962.a2cmwlnf3g0ujp1vqeksrtzoac.cx.internal.cloudapp.net>
Date: Thu, 28 Sep 2023 23:43:11 +0000
Subject: [PATCH 1248/2068] Published lib/2.42.0

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 0fbb14f7ff..dd89d2c5bd 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.42.0] - 2023-09-28
 ### Added
 * Support for biome. The Rome project [was renamed to Biome](https://biomejs.dev/blog/annoucing-biome/).
   The configuration is still the same, but you should switch to the new `biome` tag / function and adjust

From 5a02315dfefe37f8ece378a97bd3bf7f560c582b Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az1032-962.a2cmwlnf3g0ujp1vqeksrtzoac.cx.internal.cloudapp.net>
Date: Thu, 28 Sep 2023 23:47:42 +0000
Subject: [PATCH 1249/2068] Published gradle/6.22.0

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 56 ++++++++++++++++++++--------------------
 2 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 536747a4ff..74f889fc04 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [6.22.0] - 2023-09-28
 ### Added
 * Added support for `google-java-format`'s `skip-javadoc-formatting` option ([#1793](https://github.com/diffplug/spotless/pull/1793))
 * Add support for `flexmark` in gradle. Previously only Maven was supported. ([#1801](https://github.com/diffplug/spotless/pull/1801))
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index d4537d4b11..16285f88ad 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -14,9 +14,9 @@ output = [
   ].join('\n');
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
-[![Changelog](https://img.shields.io/badge/changelog-6.21.0-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-6.22.0-blue.svg)](CHANGES.md)
 [![Maven central](https://img.shields.io/badge/mavencentral-here-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/index.html)
 
 [![VS Code plugin](https://img.shields.io/badge/IDE-VS_Code-blueviolet.svg)](https://marketplace.visualstudio.com/items?itemName=richardwillis.vscode-spotless-gradle)
 [![IntelliJ plugin](https://img.shields.io/badge/IDE-IntelliJ-blueviolet.svg)](https://plugins.jetbrains.com/plugin/18321-spotless-gradle)
@@ -128,10 +128,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -144,7 +144,7 @@ Spotless requires JRE 11+ and Gradle 6.1.1 or newer.
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -301,8 +301,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -352,8 +352,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -427,7 +427,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -459,7 +459,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -491,7 +491,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -527,7 +527,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ### buf
 
-`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
+`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
 
 **WARNING** this step **must** be the first step in the chain, steps before it will be ignored. Thumbs up [this issue](https://github.com/bufbuild/buf/issues/1035) for a resolution, see [here](https://github.com/diffplug/spotless/pull/1208#discussion_r1264439669) for more details on the problem.
 
@@ -559,7 +559,7 @@ buf {
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -580,7 +580,7 @@ spotless {
 
 ## Flexmark
 
-`com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FlexmarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java)
+`com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FlexmarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java)
 
 [homepage](https://github.com/vsch/flexmark-java). Flexmark is a flexible Commonmark/Markdown parser that can be used to format Markdown files. It supports different [flavors of Markdown](https://github.com/vsch/flexmark-java#markdown-processor-emulation) and [many formatting options](https://github.com/vsch/flexmark-java/wiki/Markdown-Formatter#options).
 
@@ -599,7 +599,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -624,7 +624,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -664,7 +664,7 @@ sql.formatter.indent.size=4
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -758,7 +758,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## Javascript
 
-- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
+- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
 
 ```gradle
 spotless {
@@ -823,7 +823,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -943,7 +943,7 @@ spotless {
 
 ## YAML
 
-- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
+- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
 
 ```gradle
 spotless {
@@ -975,7 +975,7 @@ spotless {
 
 ## Gherkin
 
-- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
+- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
 
 ```gradle
 spotless {
@@ -1362,7 +1362,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -1442,9 +1442,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -1477,11 +1477,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From 9997e70cbde1ee1b09e97ad91928496d7eb5ac3f Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az1032-962.a2cmwlnf3g0ujp1vqeksrtzoac.cx.internal.cloudapp.net>
Date: Thu, 28 Sep 2023 23:52:57 +0000
Subject: [PATCH 1250/2068] Published maven/2.40.0

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index a6c98e2c96..1825628c73 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.40.0] - 2023-09-28
 ### Added
 * Add `-DspotlessIdeHook` that provides the ability to apply Spotless exclusively to a specified file. It accepts the absolute path of the file. ([#1782](https://github.com/diffplug/spotless/pull/1782))
   * BETA, subject to change until we have proven compatibility with some IDE plugins.
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 919a05dfbb..3294575e20 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -8,8 +8,8 @@ output = [
   ].join('\n');
 -->
 [![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Changelog](https://img.shields.io/badge/changelog-2.39.0-blue.svg)](CHANGES.md)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.39.0/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.40.0-blue.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.40.0/index.html)
 <!---freshmark /shields -->
 
 <!---freshmark javadoc

From 5a083a14240170bdc295396b6f02015ea8a276b7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 29 Sep 2023 00:54:14 +0000
Subject: [PATCH 1251/2068] chore(deps): update plugin com.diffplug.spotless to
 v6.22.0

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index f09ed33f57..cb2f3355a9 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-	id 'com.diffplug.spotless' version '6.21.0' apply false
+	id 'com.diffplug.spotless' version '6.22.0' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
 	id 'com.gradle.plugin-publish' version '1.2.1' apply false
 	// https://github.com/gradle-nexus/publish-plugin/releases

From 748ef4107cd6b36b9ce7a12690939c093364368a Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 29 Sep 2023 09:52:33 -0700
Subject: [PATCH 1252/2068] Fix test failures.

---
 .../gradle/spotless/SpotlessTaskImpl.java         |  2 +-
 .../gradle/spotless/SpotlessTaskService.java      | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
index ab584fa7b6..04951a4577 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
@@ -48,7 +48,7 @@ public abstract class SpotlessTaskImpl extends SpotlessTask {
 
 	void init(Provider<SpotlessTaskService> service) {
 		taskServiceProvider = service;
-		usesService(service);
+		SpotlessTaskService.usesServiceTolerateTestFailure(this, service);
 		getTaskService().set(service);
 		getProjectDir().set(getProject().getProjectDir());
 	}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskService.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskService.java
index 67de4b946c..b5a1300ead 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskService.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 DiffPlug
+ * Copyright 2021-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@
 import org.gradle.api.file.DirectoryProperty;
 import org.gradle.api.model.ObjectFactory;
 import org.gradle.api.provider.Property;
+import org.gradle.api.provider.Provider;
 import org.gradle.api.services.BuildService;
 import org.gradle.api.services.BuildServiceParameters;
 import org.gradle.api.tasks.Internal;
@@ -91,6 +92,16 @@ public void close() throws Exception {
 
 	static String INDEPENDENT_HELPER = "Helper";
 
+	static void usesServiceTolerateTestFailure(DefaultTask task, Provider<SpotlessTaskService> serviceProvider) {
+		try {
+			task.usesService(serviceProvider);
+		} catch (ClassCastException e) {
+			// this happens only in our test mocking, e.g. DiffMessageFormatterTest
+			// https://github.com/diffplug/spotless/pull/1570/commits/c45e1f2322c78f272689feb35753bbc633422bfa
+			// it's fine to swallow these exceptions
+		}
+	}
+
 	static abstract class ClientTask extends DefaultTask {
 		@Internal
 		abstract Property<File> getSpotlessOutDirectory();
@@ -105,7 +116,7 @@ static abstract class ClientTask extends DefaultTask {
 		protected abstract ObjectFactory getConfigCacheWorkaround();
 
 		void init(SpotlessTaskImpl impl) {
-			usesService(impl.getTaskServiceProvider());
+			usesServiceTolerateTestFailure(this, impl.getTaskServiceProvider());
 			getSpotlessOutDirectory().set(impl.getOutputDirectory());
 			getTaskService().set(impl.getTaskService());
 			getProjectDir().set(impl.getProjectDir());

From 3be45c7b379f284db2f8f8e8481cfefcb8f5232e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 29 Sep 2023 17:09:37 +0000
Subject: [PATCH 1253/2068] chore(deps): update dependency gradle to v8.4-rc-3

---
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 gradlew                                  | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 98ea390909..1d4d371453 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-rc-2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-rc-3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 0adc8e1a53..1aa94a4269 100755
--- a/gradlew
+++ b/gradlew
@@ -145,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -153,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -202,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

From 2741e57ebe72d9f136df2cfa9f740d1da6b7c041 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sun, 1 Oct 2023 11:55:24 +0800
Subject: [PATCH 1254/2068] Migrate config cache flag

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index dae471f1e7..543d4cf0f1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@
 org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=1024m -Dfile.encoding=UTF-8
 org.gradle.parallel=true
 org.gradle.caching=true
-org.gradle.unsafe.configuration-cache=true
+org.gradle.configuration-cache=true
 
 name=spotless
 description=Spotless - keep your code spotless with Gradle

From e52c46fdaf9c91b9c44350b8d9d6d7bd18e71fe4 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sun, 1 Oct 2023 12:00:01 +0800
Subject: [PATCH 1255/2068] Manually declaring junit-platform-launcher

https://docs.gradle.org/8.4-rc-3/userguide/upgrading_version_8.html?#test_framework_implementation_dependencies
---
 _ext/gradle/java-setup.gradle | 1 +
 lib-extra/build.gradle        | 1 +
 plugin-gradle/build.gradle    | 1 +
 plugin-maven/build.gradle     | 1 +
 testlib/build.gradle          | 1 +
 5 files changed, 5 insertions(+)

diff --git a/_ext/gradle/java-setup.gradle b/_ext/gradle/java-setup.gradle
index d1a1075d84..0007407250 100644
--- a/_ext/gradle/java-setup.gradle
+++ b/_ext/gradle/java-setup.gradle
@@ -20,6 +20,7 @@ dependencies {
 	testImplementation "org.junit.jupiter:junit-jupiter:${VER_JUNIT}"
 	testImplementation "org.assertj:assertj-core:${VER_ASSERTJ}"
 	testImplementation projects.testlib
+	testRuntimeOnly "org.junit.platform:junit-platform-launcher"
 }
 
 tasks.withType(Test).configureEach {
diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index 794ab515be..07135ff726 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -24,6 +24,7 @@ dependencies {
 	testImplementation "org.junit.jupiter:junit-jupiter:${VER_JUNIT}"
 	testImplementation "org.assertj:assertj-core:${VER_ASSERTJ}"
 	testImplementation "com.diffplug.durian:durian-testlib:${VER_DURIAN}"
+	testRuntimeOnly "org.junit.platform:junit-platform-launcher"
 }
 spotless {
 	java {
diff --git a/plugin-gradle/build.gradle b/plugin-gradle/build.gradle
index ba800173a2..9f6ff31cc9 100644
--- a/plugin-gradle/build.gradle
+++ b/plugin-gradle/build.gradle
@@ -26,6 +26,7 @@ dependencies {
 	testImplementation "org.assertj:assertj-core:${VER_ASSERTJ}"
 	testImplementation "com.diffplug.durian:durian-testlib:${VER_DURIAN}"
 	testImplementation 'org.owasp.encoder:encoder:1.2.3'
+	testRuntimeOnly "org.junit.platform:junit-platform-launcher"
 }
 
 apply from: rootProject.file('gradle/special-tests.gradle')
diff --git a/plugin-maven/build.gradle b/plugin-maven/build.gradle
index dcada0b9c9..f2f85f0383 100644
--- a/plugin-maven/build.gradle
+++ b/plugin-maven/build.gradle
@@ -56,6 +56,7 @@ dependencies {
 	testImplementation "org.eclipse.aether:aether-api:${VER_ECLIPSE_AETHER}"
 	testImplementation "org.codehaus.plexus:plexus-resources:${VER_PLEXUS_RESOURCES}"
 	testImplementation "org.apache.maven:maven-core:${VER_MAVEN_API}"
+	testRuntimeOnly "org.junit.platform:junit-platform-launcher"
 }
 
 apply from: rootProject.file('gradle/special-tests.gradle')
diff --git a/testlib/build.gradle b/testlib/build.gradle
index 12b3bcd135..a4c83cfdf4 100644
--- a/testlib/build.gradle
+++ b/testlib/build.gradle
@@ -13,6 +13,7 @@ dependencies {
 	api "org.junit.jupiter:junit-jupiter:${VER_JUNIT}"
 	api "org.assertj:assertj-core:${VER_ASSERTJ}"
 	api "org.mockito:mockito-core:$VER_MOCKITO"
+	runtimeOnly "org.junit.platform:junit-platform-launcher"
 
 	implementation "com.diffplug.durian:durian-io:${VER_DURIAN}"
 	implementation "com.diffplug.durian:durian-collect:${VER_DURIAN}"

From 101c4c9e99eef71597f61b421693de42f9bf77a9 Mon Sep 17 00:00:00 2001
From: tison <wander4096@gmail.com>
Date: Thu, 5 Oct 2023 09:33:49 +0800
Subject: [PATCH 1256/2068] feat: Maven plugin uses CompileSourceRoots

Signed-off-by: tison <wander4096@gmail.com>
---
 .../java/com/diffplug/spotless/maven/java/Java.java | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Java.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Java.java
index b0692446b7..e0ff14b51e 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Java.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Java.java
@@ -20,8 +20,9 @@
 import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Set;
-import java.util.stream.Stream;
 
 import org.apache.maven.model.Build;
 import org.apache.maven.project.MavenProject;
@@ -44,7 +45,15 @@ public class Java extends FormatterFactory {
 	public Set<String> defaultIncludes(MavenProject project) {
 		Path projectDir = project.getBasedir().toPath();
 		Build build = project.getBuild();
-		return Stream.of(build.getSourceDirectory(), build.getTestSourceDirectory())
+
+		List<String> includes = new ArrayList<>();
+		includes.add(build.getSourceDirectory());
+		includes.add(build.getTestSourceDirectory());
+		includes.addAll(project.getCompileSourceRoots());
+		includes.addAll(project.getTestCompileSourceRoots());
+
+		return includes.stream()
+				.distinct()
 				.map(Paths::get)
 				.map(projectDir::relativize)
 				.map(Java::fileMask)

From 35b731e18ca396d1449f84925e4bb2a46ff8f6d9 Mon Sep 17 00:00:00 2001
From: tison <wander4096@gmail.com>
Date: Thu, 5 Oct 2023 09:35:49 +0800
Subject: [PATCH 1257/2068] add CHANGELOG

Signed-off-by: tison <wander4096@gmail.com>
---
 plugin-maven/CHANGES.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 1825628c73..d86096ab05 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]
 
+### Added
+* CompileSourceRoots and TestCompileSourceRoots are now respected as default includes. These properties are commonly set when adding extra source directories. ([#1846](https://github.com/diffplug/spotless/issues/1846))
+
 ## [2.40.0] - 2023-09-28
 ### Added
 * Add `-DspotlessIdeHook` that provides the ability to apply Spotless exclusively to a specified file. It accepts the absolute path of the file. ([#1782](https://github.com/diffplug/spotless/pull/1782))

From 22162c6f8670d7710f32781e8179842c4aaad5e6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 5 Oct 2023 13:49:52 +0000
Subject: [PATCH 1258/2068] chore(deps): update plugin com.gradle.enterprise to
 v3.15.1

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index cb2f3355a9..daa7567f1b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -23,7 +23,7 @@ plugins {
 	// https://github.com/davidburstrom/version-compatibility-gradle-plugin/tags
 	id 'io.github.davidburstrom.version-compatibility' version '0.5.0' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.enterprise
-	id 'com.gradle.enterprise' version '3.15'
+	id 'com.gradle.enterprise' version '3.15.1'
 	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
 	id 'dev.equo.ide' version '1.7.3' apply false
 }

From 1ce91c74ed8869f1fa9534ad002fe9d0b3976892 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sat, 7 Oct 2023 23:30:31 +0800
Subject: [PATCH 1259/2068] Use List.of

---
 .../compat/KtLintCompat0Dot48Dot0Adapter.java | 20 ++++++++-----------
 .../compat/KtLintCompat0Dot49Dot0Adapter.java | 19 ++++++++----------
 .../compat/KtLintCompat0Dot50Dot0Adapter.java | 18 ++++++++---------
 .../compat/KtLintCompat1Dot0Dot0Adapter.java  | 18 ++++++++---------
 .../com/diffplug/spotless/npm/FileFinder.java |  4 ++--
 .../spotless/npm/NpmPathResolver.java         |  4 +---
 6 files changed, 35 insertions(+), 48 deletions(-)

diff --git a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
index 4ee70c6c88..418720aa59 100644
--- a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
@@ -17,8 +17,6 @@
 
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -53,17 +51,15 @@ public class KtLintCompat0Dot48Dot0Adapter implements KtLintCompatAdapter {
 	private static final List<EditorConfigProperty<?>> DEFAULT_EDITOR_CONFIG_PROPERTIES;
 
 	static {
-		List<EditorConfigProperty<?>> list = new ArrayList<>();
-		list.add(CodeStyleEditorConfigPropertyKt.getCODE_STYLE_PROPERTY());
 		//noinspection deprecation
-		list.add(DisabledRulesEditorConfigPropertyKt.getDISABLED_RULES_PROPERTY());
-		//noinspection KotlinInternalInJava,deprecation
-		list.add(DisabledRulesEditorConfigPropertyKt.getKTLINT_DISABLED_RULES_PROPERTY());
-		list.add(IndentStyleEditorConfigPropertyKt.getINDENT_STYLE_PROPERTY());
-		list.add(IndentSizeEditorConfigPropertyKt.getINDENT_SIZE_PROPERTY());
-		list.add(InsertFinalNewLineEditorConfigPropertyKt.getINSERT_FINAL_NEWLINE_PROPERTY());
-		list.add(MaxLineLengthEditorConfigPropertyKt.getMAX_LINE_LENGTH_PROPERTY());
-		DEFAULT_EDITOR_CONFIG_PROPERTIES = Collections.unmodifiableList(list);
+		DEFAULT_EDITOR_CONFIG_PROPERTIES = List.of(
+				CodeStyleEditorConfigPropertyKt.getCODE_STYLE_PROPERTY(),
+				DisabledRulesEditorConfigPropertyKt.getDISABLED_RULES_PROPERTY(),
+				DisabledRulesEditorConfigPropertyKt.getKTLINT_DISABLED_RULES_PROPERTY(),
+				IndentStyleEditorConfigPropertyKt.getINDENT_STYLE_PROPERTY(),
+				IndentSizeEditorConfigPropertyKt.getINDENT_SIZE_PROPERTY(),
+				InsertFinalNewLineEditorConfigPropertyKt.getINSERT_FINAL_NEWLINE_PROPERTY(),
+				MaxLineLengthEditorConfigPropertyKt.getMAX_LINE_LENGTH_PROPERTY());
 	}
 
 	static class FormatterCallback implements Function2<LintError, Boolean, Unit> {
diff --git a/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java b/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
index b391c7b740..ad228c131d 100644
--- a/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
@@ -19,8 +19,6 @@
 import java.lang.reflect.Method;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -61,15 +59,14 @@ public class KtLintCompat0Dot49Dot0Adapter implements KtLintCompatAdapter {
 	private static final List<EditorConfigProperty<?>> DEFAULT_EDITOR_CONFIG_PROPERTIES;
 
 	static {
-		List<EditorConfigProperty<?>> list = new ArrayList<>();
-		list.add(CodeStyleEditorConfigPropertyKt.getCODE_STYLE_PROPERTY());
-		list.add(EndOfLinePropertyKt.getEND_OF_LINE_PROPERTY());
-		list.add(IndentSizeEditorConfigPropertyKt.getINDENT_SIZE_PROPERTY());
-		list.add(IndentStyleEditorConfigPropertyKt.getINDENT_STYLE_PROPERTY());
-		list.add(InsertFinalNewLineEditorConfigPropertyKt.getINSERT_FINAL_NEWLINE_PROPERTY());
-		list.add(MaxLineLengthEditorConfigPropertyKt.getMAX_LINE_LENGTH_PROPERTY());
-		list.add(RuleExecutionEditorConfigPropertyKt.getEXPERIMENTAL_RULES_EXECUTION_PROPERTY());
-		DEFAULT_EDITOR_CONFIG_PROPERTIES = Collections.unmodifiableList(list);
+		DEFAULT_EDITOR_CONFIG_PROPERTIES = List.of(
+				CodeStyleEditorConfigPropertyKt.getCODE_STYLE_PROPERTY(),
+				EndOfLinePropertyKt.getEND_OF_LINE_PROPERTY(),
+				IndentSizeEditorConfigPropertyKt.getINDENT_SIZE_PROPERTY(),
+				IndentStyleEditorConfigPropertyKt.getINDENT_STYLE_PROPERTY(),
+				InsertFinalNewLineEditorConfigPropertyKt.getINSERT_FINAL_NEWLINE_PROPERTY(),
+				MaxLineLengthEditorConfigPropertyKt.getMAX_LINE_LENGTH_PROPERTY(),
+				RuleExecutionEditorConfigPropertyKt.getEXPERIMENTAL_RULES_EXECUTION_PROPERTY());
 	}
 
 	private static final Method RULEID_METHOD;
diff --git a/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java b/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
index 22333392c1..f7c61439de 100644
--- a/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
@@ -17,7 +17,6 @@
 
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -61,15 +60,14 @@ public class KtLintCompat0Dot50Dot0Adapter implements KtLintCompatAdapter {
 	private static final List<EditorConfigProperty<?>> DEFAULT_EDITOR_CONFIG_PROPERTIES;
 
 	static {
-		List<EditorConfigProperty<?>> list = new ArrayList<>();
-		list.add(CodeStyleEditorConfigPropertyKt.getCODE_STYLE_PROPERTY());
-		list.add(EndOfLinePropertyKt.getEND_OF_LINE_PROPERTY());
-		list.add(IndentSizeEditorConfigPropertyKt.getINDENT_SIZE_PROPERTY());
-		list.add(IndentStyleEditorConfigPropertyKt.getINDENT_STYLE_PROPERTY());
-		list.add(InsertFinalNewLineEditorConfigPropertyKt.getINSERT_FINAL_NEWLINE_PROPERTY());
-		list.add(MaxLineLengthEditorConfigPropertyKt.getMAX_LINE_LENGTH_PROPERTY());
-		list.add(RuleExecutionEditorConfigPropertyKt.getEXPERIMENTAL_RULES_EXECUTION_PROPERTY());
-		DEFAULT_EDITOR_CONFIG_PROPERTIES = Collections.unmodifiableList(list);
+		DEFAULT_EDITOR_CONFIG_PROPERTIES = List.of(
+				CodeStyleEditorConfigPropertyKt.getCODE_STYLE_PROPERTY(),
+				EndOfLinePropertyKt.getEND_OF_LINE_PROPERTY(),
+				IndentSizeEditorConfigPropertyKt.getINDENT_SIZE_PROPERTY(),
+				IndentStyleEditorConfigPropertyKt.getINDENT_STYLE_PROPERTY(),
+				InsertFinalNewLineEditorConfigPropertyKt.getINSERT_FINAL_NEWLINE_PROPERTY(),
+				MaxLineLengthEditorConfigPropertyKt.getMAX_LINE_LENGTH_PROPERTY(),
+				RuleExecutionEditorConfigPropertyKt.getEXPERIMENTAL_RULES_EXECUTION_PROPERTY());
 	}
 
 	static class FormatterCallback implements Function2<LintError, Boolean, Unit> {
diff --git a/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java b/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
index 9c2792f769..119cb86373 100644
--- a/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
+++ b/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
@@ -17,7 +17,6 @@
 
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -61,15 +60,14 @@ public class KtLintCompat1Dot0Dot0Adapter implements KtLintCompatAdapter {
 	private static final List<EditorConfigProperty<?>> DEFAULT_EDITOR_CONFIG_PROPERTIES;
 
 	static {
-		List<EditorConfigProperty<?>> list = new ArrayList<>();
-		list.add(CodeStyleEditorConfigPropertyKt.getCODE_STYLE_PROPERTY());
-		list.add(EndOfLinePropertyKt.getEND_OF_LINE_PROPERTY());
-		list.add(IndentSizeEditorConfigPropertyKt.getINDENT_SIZE_PROPERTY());
-		list.add(IndentStyleEditorConfigPropertyKt.getINDENT_STYLE_PROPERTY());
-		list.add(InsertFinalNewLineEditorConfigPropertyKt.getINSERT_FINAL_NEWLINE_PROPERTY());
-		list.add(MaxLineLengthEditorConfigPropertyKt.getMAX_LINE_LENGTH_PROPERTY());
-		list.add(RuleExecutionEditorConfigPropertyKt.getEXPERIMENTAL_RULES_EXECUTION_PROPERTY());
-		DEFAULT_EDITOR_CONFIG_PROPERTIES = Collections.unmodifiableList(list);
+		DEFAULT_EDITOR_CONFIG_PROPERTIES = List.of(
+				CodeStyleEditorConfigPropertyKt.getCODE_STYLE_PROPERTY(),
+				EndOfLinePropertyKt.getEND_OF_LINE_PROPERTY(),
+				IndentSizeEditorConfigPropertyKt.getINDENT_SIZE_PROPERTY(),
+				IndentStyleEditorConfigPropertyKt.getINDENT_STYLE_PROPERTY(),
+				InsertFinalNewLineEditorConfigPropertyKt.getINSERT_FINAL_NEWLINE_PROPERTY(),
+				MaxLineLengthEditorConfigPropertyKt.getMAX_LINE_LENGTH_PROPERTY(),
+				RuleExecutionEditorConfigPropertyKt.getEXPERIMENTAL_RULES_EXECUTION_PROPERTY());
 	}
 
 	static class FormatterCallback implements Function2<LintError, Boolean, Unit> {
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/FileFinder.java b/lib/src/main/java/com/diffplug/spotless/npm/FileFinder.java
index 76016d68db..fce1497de6 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/FileFinder.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/FileFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 DiffPlug
+ * Copyright 2020-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ class FileFinder {
 	private final List<Supplier<Optional<File>>> fileCandidateFinders;
 
 	private FileFinder(Builder builder) {
-		this.fileCandidateFinders = Collections.unmodifiableList(new ArrayList<>(builder.candidateFinders));
+		this.fileCandidateFinders = List.copyOf(builder.candidateFinders);
 	}
 
 	static Builder finderForFilename(String fileName) {
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmPathResolver.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmPathResolver.java
index 4759d2f914..1a7db1c9b8 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmPathResolver.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmPathResolver.java
@@ -16,8 +16,6 @@
 package com.diffplug.spotless.npm;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
@@ -35,7 +33,7 @@ public NpmPathResolver(File explicitNpmExecutable, File explicitNodeExecutable,
 		this.explicitNpmExecutable = explicitNpmExecutable;
 		this.explicitNodeExecutable = explicitNodeExecutable;
 		this.explicitNpmrcFile = explicitNpmrcFile;
-		this.additionalNpmrcLocations = Collections.unmodifiableList(new ArrayList<>(additionalNpmrcLocations));
+		this.additionalNpmrcLocations = List.copyOf(additionalNpmrcLocations);
 	}
 
 	/**

From 0189f717ee13acdb00745bffa86c6ed4ede53ef2 Mon Sep 17 00:00:00 2001
From: Andrew Aylett <andrew@aylett.co.uk>
Date: Sun, 29 Oct 2023 17:26:46 +0000
Subject: [PATCH 1260/2068] Add <p> tags to Javadoc comments

A blank line in Javadoc will not break a paragraph.
---
 .../extra/GitAttributesLineEndings.java       |  2 +-
 .../spotless/extra/GitWorkarounds.java        | 10 +++----
 .../extra/cpp/EclipseCdtFormatterStep.java    |  2 +-
 .../integration/DiffMessageFormatter.java     |  6 ++---
 ...GrEclipseFormatterStepSpecialCaseTest.java |  2 +-
 .../diffplug/spotless/FeatureClassLoader.java |  2 +-
 .../com/diffplug/spotless/ForeignExe.java     |  4 +--
 .../spotless/FormatExceptionPolicy.java       |  4 +--
 .../java/com/diffplug/spotless/Formatter.java |  2 +-
 .../com/diffplug/spotless/FormatterFunc.java  |  4 +--
 .../com/diffplug/spotless/FormatterStep.java  |  4 +--
 .../diffplug/spotless/FormatterStepImpl.java  |  2 +-
 .../java/com/diffplug/spotless/JarState.java  |  2 +-
 .../spotless/LazyForwardingEquality.java      |  4 +--
 .../java/com/diffplug/spotless/NoLambda.java  |  8 +++---
 .../com/diffplug/spotless/PaddedCell.java     |  8 +++---
 .../com/diffplug/spotless/ProcessRunner.java  |  4 +--
 .../com/diffplug/spotless/ThrowingEx.java     |  6 ++---
 .../spotless/annotations/Internal.java        |  4 +--
 .../diffplug/spotless/npm/JsonEscaper.java    |  4 +--
 .../spotless/sql/dbeaver/DBPKeywordType.java  |  4 +--
 .../DBeaverSQLFormatterConfiguration.java     |  6 ++---
 .../diffplug/spotless/sql/dbeaver/Pair.java   |  4 +--
 .../spotless/sql/dbeaver/SQLConstants.java    |  4 +--
 .../spotless/sql/dbeaver/SQLDialect.java      |  4 +--
 .../sql/dbeaver/SQLTokenizedFormatter.java    |  6 ++---
 .../spotless/sql/dbeaver/SQLTokensParser.java |  4 +--
 .../spotless/sql/dbeaver/TokenType.java       |  4 +--
 .../gradle/spotless/FormatExtension.java      | 26 +++++++++----------
 .../gradle/spotless/JavaExtension.java        |  4 +--
 .../spotless/RegisterDependenciesTask.java    |  2 +-
 .../gradle/spotless/SpotlessExtension.java    |  2 +-
 .../spotless/GradleIntegrationHarness.java    |  4 +--
 .../maven/MavenIntegrationHarness.java        |  4 +--
 .../diffplug/spotless/TestProvisioner.java    |  4 +--
 35 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
index 3be75637be..93a95bd6ac 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
@@ -246,7 +246,7 @@ static class Runtime {
 
 		/**
 		 * Default line ending, determined in this order (paths are a teensy different platform to platform).
-		 *
+		 * <p>
 		 * - .git/config (per-repo)
 		 * - ~/.gitconfig (per-user)
 		 * - /etc/gitconfig (system-wide)
diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitWorkarounds.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitWorkarounds.java
index 70f0b9cb99..94065f0059 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitWorkarounds.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitWorkarounds.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 DiffPlug
+ * Copyright 2020-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@ private GitWorkarounds() {}
 
 	/**
 	 * Finds the .git directory for the given project directory.
-	 *
+	 * <p>
 	 * Ordinarily one would just use JGit for this, but it doesn't support worktrees properly.
 	 * So this applies an additional workaround for that.
 	 *
@@ -55,7 +55,7 @@ private GitWorkarounds() {}
 
 	/**
 	 * Creates a {@link RepositorySpecificResolver} for the given project directory.
-	 *
+	 * <p>
 	 * This applies a workaround for JGit not supporting worktrees properly.
 	 *
 	 * @param projectDir the project directory.
@@ -67,7 +67,7 @@ static RepositorySpecificResolver fileRepositoryResolverForProject(File projectD
 
 	/**
 	 * Creates a {@link RepositorySpecificResolver} for the given project directory.
-	 *
+	 * <p>
 	 * This applies a workaround for JGit not supporting worktrees properly.
 	 *
 	 * @param projectDir the project directory.
@@ -86,7 +86,7 @@ static RepositorySpecificResolver fileRepositoryResolverForProject(File projectD
 
 	/**
 	 * Piggyback on the {@link FileRepositoryBuilder} mechanics for finding the git directory.
-	 *
+	 * <p>
 	 * Here we take into account that git repositories can share a common directory. This directory
 	 * will contain ./config ./objects/, ./info/, and ./refs/.
 	 */
diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java
index bcbb58c0f6..8767b68dfe 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java
@@ -27,7 +27,7 @@
 
 /**
  * Formatter step which calls out to the Eclipse CDT formatter.
- *
+ * <p>
  * Eclipse-CDT <code>org.eclipse.core.contenttype.contentTypes</code>
  * extension <code>cSource</code>, <code>cHeader</code>, <code>cxxSource</code> and <code>cxxHeader</code>.
  * can handle: "c", "h", "C", "cpp", "cxx", "cc", "c++", "h", "hpp", "hh", "hxx", "inc"
diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/integration/DiffMessageFormatter.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/integration/DiffMessageFormatter.java
index 55336e8c04..d43478c0b6 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/integration/DiffMessageFormatter.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/integration/DiffMessageFormatter.java
@@ -249,9 +249,9 @@ private String diff(File file) throws IOException {
 
 	/**
 	 * Returns a git-style diff between the two unix strings.
-	 *
+	 * <p>
 	 * Output has no trailing newlines.
-	 *
+	 * <p>
 	 * Boolean args determine whether whitespace or line endings will be visible.
 	 */
 	private static String diffWhitespaceLineEndings(String dirty, String clean, boolean whitespace, boolean lineEndings) throws IOException {
@@ -278,7 +278,7 @@ private static String diffWhitespaceLineEndings(String dirty, String clean, bool
 
 	/**
 	 * Makes the whitespace and/or the lineEndings visible.
-	 *
+	 * <p>
 	 * MyersDiff wants inputs with only unix line endings.  So this ensures that that is the case.
 	 */
 	private static String visibleWhitespaceLineEndings(String input, boolean whitespace, boolean lineEndings) {
diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepSpecialCaseTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepSpecialCaseTest.java
index 25a269834c..0702881ef9 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepSpecialCaseTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepSpecialCaseTest.java
@@ -24,7 +24,7 @@
 public class GrEclipseFormatterStepSpecialCaseTest {
 	/**
 	 * https://github.com/diffplug/spotless/issues/1657
-	 *
+	 * <p>
 	 * broken: ${parm == null ? "" : "<tag>$parm</tag>"}
 	 *  works: ${parm == null ? "" : "<tag>parm</tag>"}
 	 */
diff --git a/lib/src/main/java/com/diffplug/spotless/FeatureClassLoader.java b/lib/src/main/java/com/diffplug/spotless/FeatureClassLoader.java
index d07e7e4324..0eb5aa4d2e 100644
--- a/lib/src/main/java/com/diffplug/spotless/FeatureClassLoader.java
+++ b/lib/src/main/java/com/diffplug/spotless/FeatureClassLoader.java
@@ -34,7 +34,7 @@
  * but linked against the `Url[]`. This allows us to ship classfiles which function as glue
  * code but delay linking/definition to runtime after the user has specified which version
  * of the formatter they want.
- *
+ * <p>
  *  For `"org.slf4j.` and (`com.diffplug.spotless.` but not `com.diffplug.spotless.extra.`)
  * 	the classes are loaded from the buildToolClassLoader.
  */
diff --git a/lib/src/main/java/com/diffplug/spotless/ForeignExe.java b/lib/src/main/java/com/diffplug/spotless/ForeignExe.java
index d1f8abd3ee..4cb15d1a8a 100644
--- a/lib/src/main/java/com/diffplug/spotless/ForeignExe.java
+++ b/lib/src/main/java/com/diffplug/spotless/ForeignExe.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 DiffPlug
+ * Copyright 2020-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@
  * Finds a foreign executable and checks its version.
  * If either part of that fails, it shows you why
  * and helps you fix it.
- *
+ * <p>
  * Usage: {@code ForeignExe.nameAndVersion("grep", "2.5.7").confirmVersionAndGetAbsolutePath()}
  * will find grep, confirm that it is version 2.5.7, and then return.
  */
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatExceptionPolicy.java b/lib/src/main/java/com/diffplug/spotless/FormatExceptionPolicy.java
index da23f74432..50f49e41db 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatExceptionPolicy.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatExceptionPolicy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ public interface FormatExceptionPolicy extends Serializable, NoLambda {
 
 	/**
 	 * Returns a byte array representation of everything inside this {@code FormatExceptionPolicy}.
-	 *
+	 * <p>
 	 * The main purpose of this method is to ensure one can't instantiate this class with lambda
 	 * expressions, which are notoriously difficult to serialize and deserialize properly.
 	 */
diff --git a/lib/src/main/java/com/diffplug/spotless/Formatter.java b/lib/src/main/java/com/diffplug/spotless/Formatter.java
index 46793e24f6..68d9c443bf 100644
--- a/lib/src/main/java/com/diffplug/spotless/Formatter.java
+++ b/lib/src/main/java/com/diffplug/spotless/Formatter.java
@@ -193,7 +193,7 @@ public void applyTo(File file) throws IOException {
 
 	/**
 	 * Applies formatting to the given file.
-	 *
+	 * <p>
 	 * Returns null if the file was already clean, or the
 	 * formatted result with unix newlines if it was not.
 	 */
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java b/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java
index 14b407a2eb..acd05e031b 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java
@@ -42,11 +42,11 @@ interface Closeable extends FormatterFunc, AutoCloseable {
 
 		/**
 		 * Dangerous way to create a {@link Closeable} from an AutoCloseable and a function.
-		 *
+		 * <p>
 		 * It's important for FormatterStep's to allocate their resources as lazily as possible.
 		 * It's easy to create a resource inside the state, and not realize that it may not be
 		 * released.  It's far better to use one of the non-deprecated {@code of()} methods below.
-		 *
+		 * <p>
 		 * The bug (and its fix) which is easy to write using this method: https://github.com/diffplug/spotless/commit/7f16ecca031810b5e6e6f647e1f10a6d2152d9f4
 		 * How the {@code of()} methods below make the correct thing easier to write and safer: https://github.com/diffplug/spotless/commit/18c10f9c93d6f18f753233d0b5f028d5f0961916
 		 */
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
index 5f6ec168d4..d94bd952b0 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
@@ -23,7 +23,7 @@
 
 /**
  * An implementation of this class specifies a single step in a formatting process.
- *
+ * <p>
  * The input is guaranteed to have unix-style newlines, and the output is required
  * to not introduce any windows-style newlines as well.
  */
@@ -75,7 +75,7 @@ public default FormatterStep filterByContent(OnMatch onMatch, String contentPatt
 	/**
 	 * Returns a new FormatterStep which will only apply its changes
 	 * to files which pass the given filter.
-	 *
+	 * <p>
 	 * The provided filter must be serializable.
 	 */
 	public default FormatterStep filterByFile(SerializableFileFilter filter) {
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStepImpl.java b/lib/src/main/java/com/diffplug/spotless/FormatterStepImpl.java
index 17b62e75c6..869e7b7966 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStepImpl.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStepImpl.java
@@ -27,7 +27,7 @@
 /**
  * Standard implementation of FormatExtension which cleanly enforces
  * separation of serializable configuration and a pure format function.
- *
+ * <p>
  * Not an inner-class of FormatterStep so that it can stay entirely private
  * from the API.
  */
diff --git a/lib/src/main/java/com/diffplug/spotless/JarState.java b/lib/src/main/java/com/diffplug/spotless/JarState.java
index afd7c1ddf2..48686c49f8 100644
--- a/lib/src/main/java/com/diffplug/spotless/JarState.java
+++ b/lib/src/main/java/com/diffplug/spotless/JarState.java
@@ -32,7 +32,7 @@
  * Grabs a jar and its dependencies from maven,
  * and makes it easy to access the collection in
  * a classloader.
- *
+ * <p>
  * Serializes the full state of the jar, so it can
  * catch changes in a SNAPSHOT version.
  */
diff --git a/lib/src/main/java/com/diffplug/spotless/LazyForwardingEquality.java b/lib/src/main/java/com/diffplug/spotless/LazyForwardingEquality.java
index e2d6ba8988..8727be3a3c 100644
--- a/lib/src/main/java/com/diffplug/spotless/LazyForwardingEquality.java
+++ b/lib/src/main/java/com/diffplug/spotless/LazyForwardingEquality.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@ public abstract class LazyForwardingEquality<T extends Serializable> implements
 	/**
 	 * This function is guaranteed to be called at most once.
 	 * If the state is never required, then it will never be called at all.
-	 *
+	 * <p>
 	 * Throws exception because it's likely that there will be some IO going on.
 	 */
 	protected abstract T calculateState() throws Exception;
diff --git a/lib/src/main/java/com/diffplug/spotless/NoLambda.java b/lib/src/main/java/com/diffplug/spotless/NoLambda.java
index ce326a6ceb..d2ca6c1401 100644
--- a/lib/src/main/java/com/diffplug/spotless/NoLambda.java
+++ b/lib/src/main/java/com/diffplug/spotless/NoLambda.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,12 +21,12 @@
 /**
  * Marker interface to prevent lambda implementations of
  * single-method interfaces that require serializability.
- *
+ * <p>
  * In order for Spotless to support up-to-date checks, all
  * of its parameters must be {@link Serializable} so that
  * entries can be written to file, and they must implement
  * equals and hashCode correctly.
- *
+ * <p>
  * This interface and its standard implementation,
  * {@link EqualityBasedOnSerialization}, are a quick way
  * to accomplish these goals.
@@ -34,7 +34,7 @@
 public interface NoLambda extends Serializable {
 	/**
 	 * Returns a byte array representation of everything inside this {@code SerializableFileFilter}.
-	 *
+	 * <p>
 	 * The main purpose of this method is to ensure one can't instantiate this class with lambda
 	 * expressions, which are notoriously difficult to serialize and deserialize properly. (See
 	 * {@code SerializableFileFilterImpl.SkipFilesNamed} for an example of how to make a serializable
diff --git a/lib/src/main/java/com/diffplug/spotless/PaddedCell.java b/lib/src/main/java/com/diffplug/spotless/PaddedCell.java
index 91914b7908..910fa940d3 100644
--- a/lib/src/main/java/com/diffplug/spotless/PaddedCell.java
+++ b/lib/src/main/java/com/diffplug/spotless/PaddedCell.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@
 /**
  * Models the result of applying a {@link Formatter} on a given {@link File}
  * while characterizing various failure modes (slow convergence, cycles, and divergence).
- *
+ * <p>
  * See {@link #check(Formatter, File)} as the entry point to this class.
  */
 public final class PaddedCell {
@@ -78,9 +78,9 @@ public List<String> steps() {
 	/**
 	 * Applies the given formatter to the given file, checking that
 	 * F(F(input)) == F(input).
-	 *
+	 * <p>
 	 * If it meets this test, {@link #misbehaved()} will return false.
-	 *
+	 * <p>
 	 * If it fails the test, {@link #misbehaved()} will return true, and you can find
 	 * out more about the misbehavior based on its {@link Type}.
 	 *
diff --git a/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java b/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
index 4e48042184..48307d7d3a 100644
--- a/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
+++ b/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
@@ -43,7 +43,7 @@
  * Shelling out to a process is harder than it ought to be in Java.
  * If you don't read stdout and stderr on their own threads, you risk
  * deadlock on a clogged buffer.
- *
+ * <p>
  * ProcessRunner allocates two threads specifically for the purpose of
  * flushing stdout and stderr to buffers.  These threads will remain alive until
  * the ProcessRunner is closed, so it is especially useful for repeated
@@ -239,7 +239,7 @@ public boolean exitNotZero() {
 		/**
 		 * Asserts that the exit code was zero, and if so, returns
 		 * the content of stdout encoded with the given charset.
-		 *
+		 * <p>
 		 * If the exit code was not zero, throws an exception
 		 * with useful debugging information.
 		 */
diff --git a/lib/src/main/java/com/diffplug/spotless/ThrowingEx.java b/lib/src/main/java/com/diffplug/spotless/ThrowingEx.java
index f664c62bf3..6eb573b5d8 100644
--- a/lib/src/main/java/com/diffplug/spotless/ThrowingEx.java
+++ b/lib/src/main/java/com/diffplug/spotless/ThrowingEx.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 /**
  * Basic functional interfaces which throw exception, along with
  * static helper methods for calling them.
- *
+ * <p>
  * Contains most of the functionality of Durian's Throwing and Errors
  * classes, but stripped down and renamed to avoid any confusion.
  */
@@ -80,7 +80,7 @@ public static <T, R> java.util.function.Function<T, R> wrap(ThrowingEx.Function<
 
 	/**
 	 * Casts or wraps the given exception to be a RuntimeException.
-	 *
+	 * <p>
 	 * If the input exception is a RuntimeException, it is simply
 	 * cast and returned.  Otherwise, it wrapped in a
 	 * {@link WrappedAsRuntimeException} and returned.
diff --git a/lib/src/main/java/com/diffplug/spotless/annotations/Internal.java b/lib/src/main/java/com/diffplug/spotless/annotations/Internal.java
index 77a318f268..d87265fe2d 100644
--- a/lib/src/main/java/com/diffplug/spotless/annotations/Internal.java
+++ b/lib/src/main/java/com/diffplug/spotless/annotations/Internal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
 /**
  * Signifies that a {@code public} API is actually an implementation detail, and should be treated as if it
  * were {@code private}.
- *
+ * <p>
  * The user of the API should be warned that it may unexpectedly disappear in future versions of
  * Spotless. Usually the best place to put this warning is in the API's class JavaDoc.
  */
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/JsonEscaper.java b/lib/src/main/java/com/diffplug/spotless/npm/JsonEscaper.java
index 3ac20d892b..848dd030dd 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/JsonEscaper.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/JsonEscaper.java
@@ -60,7 +60,7 @@ private static String jsonEscape(JsonRawValue jsonRawValue) {
 	private static String jsonEscape(String unescaped) {
 		/**
 		 * the following characters are reserved in JSON and must be properly escaped to be used in strings:
-		 *
+		 * <p>
 		 * Backspace is replaced with \b
 		 * Form feed is replaced with \f
 		 * Newline is replaced with \n
@@ -68,7 +68,7 @@ private static String jsonEscape(String unescaped) {
 		 * Tab is replaced with \t
 		 * Double quote is replaced with \"
 		 * Backslash is replaced with \\
-		 *
+		 * <p>
 		 * additionally we handle xhtml '</bla>' string
 		 * and non-ascii chars
 		 */
diff --git a/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/DBPKeywordType.java b/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/DBPKeywordType.java
index 93c9afb5f8..d31b7520f7 100644
--- a/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/DBPKeywordType.java
+++ b/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/DBPKeywordType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * Forked from
  * DBeaver - Universal Database Manager
  * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
- *
+ * <p>
  * Based on DBPKeywordType from https://github.com/serge-rider/dbeaver,
  * which itself is licensed under the Apache 2.0 license.
  */
diff --git a/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/DBeaverSQLFormatterConfiguration.java b/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/DBeaverSQLFormatterConfiguration.java
index f488bd5a00..58a0119a7f 100644
--- a/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/DBeaverSQLFormatterConfiguration.java
+++ b/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/DBeaverSQLFormatterConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,11 +22,11 @@
 /**
  * **Warning:** Use this class at your own risk. It is an implementation detail and is not
  * guaranteed to exist in future versions.
- *
+ * <p>
  * Forked from
  * DBeaver - Universal Database Manager
  * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
- *
+ * <p>
  * Based on SQLFormatterConfiguration from https://github.com/serge-rider/dbeaver,
  * which itself is licensed under the Apache 2.0 license.
  */
diff --git a/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/Pair.java b/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/Pair.java
index c06ea5a1c0..4ab9f54a0b 100644
--- a/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/Pair.java
+++ b/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/Pair.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * Forked from
  * DBeaver - Universal Database Manager
  * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
- *
+ * <p>
  * Based on Pair from https://github.com/serge-rider/dbeaver,
  * which itself is licensed under the Apache 2.0 license.
  */
diff --git a/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/SQLConstants.java b/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/SQLConstants.java
index 2dc0b61aa0..698c87458f 100644
--- a/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/SQLConstants.java
+++ b/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/SQLConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * Forked from
  * DBeaver - Universal Database Manager
  * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
- *
+ * <p>
  * Based on SQLConstants from https://github.com/serge-rider/dbeaver,
  * which itself is licensed under the Apache 2.0 license.
  */
diff --git a/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/SQLDialect.java b/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/SQLDialect.java
index 3c973885f6..daabd5386b 100644
--- a/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/SQLDialect.java
+++ b/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/SQLDialect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@
  * Forked from
  * DBeaver - Universal Database Manager
  * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
- *
+ * <p>
  * Based on SQLDialect from https://github.com/serge-rider/dbeaver,
  * which itself is licensed under the Apache 2.0 license.
  */
diff --git a/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/SQLTokenizedFormatter.java b/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/SQLTokenizedFormatter.java
index f2c98eebc1..01f0fd759e 100644
--- a/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/SQLTokenizedFormatter.java
+++ b/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/SQLTokenizedFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,11 +25,11 @@
 /**
  * **Warning:** Use this class at your own risk. It is an implementation detail and is not
  * guaranteed to exist in future versions.
- *
+ * <p>
  * Forked from
  * DBeaver - Universal Database Manager
  * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
- *
+ * <p>
  * Based on SQLTokenizedFormatter from https://github.com/serge-rider/dbeaver,
  * which itself is licensed under the Apache 2.0 license.
  */
diff --git a/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/SQLTokensParser.java b/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/SQLTokensParser.java
index 72080d22fc..b1931c3c4c 100644
--- a/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/SQLTokensParser.java
+++ b/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/SQLTokensParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
  * Forked from
  * DBeaver - Universal Database Manager
  * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
- *
+ * <p>
  * Based on SQLTokensParser from https://github.com/serge-rider/dbeaver,
  * which itself is licensed under the Apache 2.0 license.
  */
diff --git a/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/TokenType.java b/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/TokenType.java
index 5f727db571..d6d75faf9a 100644
--- a/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/TokenType.java
+++ b/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/TokenType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * Forked from
  * DBeaver - Universal Database Manager
  * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
- *
+ * <p>
  * Based on TokenType from https://github.com/serge-rider/dbeaver,
  * which itself is licensed under the Apache 2.0 license.
  */
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index 30fded9d5f..3131b1302e 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -204,14 +204,14 @@ protected boolean isLicenseHeaderStep(FormatterStep formatterStep) {
 	/**
 	 * Sets which files should be formatted. Files to be formatted = (target -
 	 * targetExclude).
-	 *
+	 * <p>
 	 * When this method is called multiple times, only the last call has any effect.
-	 *
+	 * <p>
 	 * FileCollections pass through raw. Strings are treated as the 'include' arg to
 	 * fileTree, with project.rootDir as the dir. List<String> are treated as the
 	 * 'includes' arg to fileTree, with project.rootDir as the dir. Anything else
 	 * gets passed to getProject().files().
-	 *
+	 * <p>
 	 * If you pass any strings that start with "**\/*", this method will
 	 * automatically filter out "build", ".gradle", and ".git" folders.
 	 */
@@ -222,9 +222,9 @@ public void target(Object... targets) {
 	/**
 	 * Sets which files will be excluded from formatting. Files to be formatted =
 	 * (target - targetExclude).
-	 *
+	 * <p>
 	 * When this method is called multiple times, only the last call has any effect.
-	 *
+	 * <p>
 	 * FileCollections pass through raw. Strings are treated as the 'include' arg to
 	 * fileTree, with project.rootDir as the dir. List<String> are treated as the
 	 * 'includes' arg to fileTree, with project.rootDir as the dir. Anything else
@@ -236,7 +236,7 @@ public void targetExclude(Object... targets) {
 
 	/**
 	 * Excludes all files whose content contains {@code string}.
-	 *
+	 * <p>
 	 * When this method is called multiple times, only the last call has any effect.
 	 */
 	public void targetExcludeIfContentContains(String string) {
@@ -245,7 +245,7 @@ public void targetExcludeIfContentContains(String string) {
 
 	/**
 	 * Excludes all files whose content contains the given regex.
-	 *
+	 * <p>
 	 * When this method is called multiple times, only the last call has any effect.
 	 */
 	public void targetExcludeIfContentContainsRegex(String regex) {
@@ -392,13 +392,13 @@ public void clearSteps() {
 	 * An optional performance optimization if you are using any of the
 	 * {@code custom} methods. If you aren't explicitly calling {@code custom}, then
 	 * this method has no effect.
-	 *
+	 * <p>
 	 * Spotless tracks what files have changed from run to run, so that it can run
 	 * faster by only checking files which have changed, or whose formatting steps
 	 * have changed. If you use the {@code custom} methods, then gradle can never
 	 * mark your files as {@code up-to-date}, because it can't know if perhaps the
 	 * behavior of your custom function has changed.
-	 *
+	 * <p>
 	 * If you set {@code bumpThisNumberIfACustomStepChanges( <some number> )}, then
 	 * spotless will assume that the custom rules have not changed if the number has
 	 * not changed. If a custom rule does change, then you must bump the number so
@@ -1090,16 +1090,16 @@ public SpotlessApply createIndependentApplyTask(String taskName) {
 	/**
 	 * Creates an independent {@link SpotlessApply} for (very) unusual
 	 * circumstances.
-	 *
+	 * <p>
 	 * Most users will not want this method. In the rare case that you want to
 	 * create a {@code SpotlessApply} which is independent of the normal Spotless
 	 * machinery, this will let you do that.
-	 *
+	 * <p>
 	 * The returned task will not be hooked up to the global {@code spotlessApply},
 	 * and there will be no corresponding {@code check} task.
-	 *
+	 * <p>
 	 * The task name must not end with `Apply`.
-	 *
+	 * <p>
 	 * NOTE: does not respect the rarely-used <a href=
 	 * "https://github.com/diffplug/spotless/blob/b7f8c551a97dcb92cc4b0ee665448da5013b30a3/plugin-gradle/README.md#can-i-apply-spotless-to-specific-files">{@code spotlessFiles}
 	 * property</a>.
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
index c576eb7da8..d530de4434 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
@@ -159,7 +159,7 @@ public GoogleJavaFormatConfig googleJavaFormat() {
 
 	/**
 	 * Uses the given version of <a href="https://github.com/google/google-java-format">google-java-format</a> to format source code.
-	 *
+	 * <p>
 	 * Limited to published versions.  See <a href="https://github.com/diffplug/spotless/issues/33#issuecomment-252315095">issue #33</a>
 	 * for a workaround for using snapshot versions.
 	 */
@@ -243,7 +243,7 @@ public PalantirJavaFormatConfig palantirJavaFormat() {
 
 	/**
 	 * Uses the given version of <a href="https://github.com/palantir/palantir-java-format">palantir-java-format</a> to format source code.
-	 *
+	 * <p>
 	 * Limited to published versions.  See <a href="https://github.com/diffplug/spotless/issues/33#issuecomment-252315095">issue #33</a>
 	 * for a workaround for using snapshot versions.
 	 */
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RegisterDependenciesTask.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RegisterDependenciesTask.java
index b7ffd0a295..33aded8bdd 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RegisterDependenciesTask.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RegisterDependenciesTask.java
@@ -39,7 +39,7 @@
 
 /**
  * NOT AN END-USER TASK, DO NOT USE FOR ANYTHING!
- *
+ * <p>
  * - When a user asks for a formatter, we need to download the jars for that formatter
  * - Gradle wants us to resolve all our dependencies in the root project - no new dependencies in subprojects
  * - So, whenever a SpotlessTask in a subproject gets configured, we call {@link #hookSubprojectTask(SpotlessTask)},
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
index 514945f22d..7ed0837eb5 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
@@ -234,7 +234,7 @@ public boolean isEnforceCheck() {
 	/**
 	 * Configures Gradle's {@code check} task to run {@code spotlessCheck} if {@code true},
 	 * but to not do so if {@code false}.
-	 *
+	 * <p>
 	 * {@code true} by default.
 	 */
 	public void setEnforceCheck(boolean enforceCheck) {
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
index 61d191bab1..ade5cf3d1d 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
@@ -94,12 +94,12 @@ public static <T> Provider<T> providerOf(T value) {
 	/**
 	 * Each test gets its own temp folder, and we create a gradle
 	 * build there and run it.
-	 *
+	 * <p>
 	 * Because those test folders don't have a .gitattributes file,
 	 * git (on windows) will default to \r\n. So now if you read a
 	 * test file from the spotless test resources, and compare it
 	 * to a build result, the line endings won't match.
-	 *
+	 * <p>
 	 * By sticking this .gitattributes file into the test directory,
 	 * we ensure that the default Spotless line endings policy of
 	 * GIT_ATTRIBUTES will use \n, so that tests match the test
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
index 5fd59752e6..4710874e9f 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
@@ -70,12 +70,12 @@ public class MavenIntegrationHarness extends ResourceHarness {
 	/**
 	 * Each test gets its own temp folder, and we create a maven
 	 * build there and run it.
-	 *
+	 * <p>
 	 * Because those test folders don't have a .gitattributes file,
 	 * git on windows will default to \r\n. So now if you read a
 	 * test file from the spotless test resources, and compare it
 	 * to a build result, the line endings won't match.
-	 *
+	 * <p>
 	 * By sticking this .gitattributes file into the test directory,
 	 * we ensure that the default Spotless line endings policy of
 	 * GIT_ATTRIBUTES will use \n, so that tests match the test
diff --git a/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java b/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java
index e06640ccfd..7c7b7b67f7 100644
--- a/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java
+++ b/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java
@@ -52,10 +52,10 @@ public static Project gradleProject(File dir) {
 
 	/**
 	 * Creates a Provisioner for the given repositories.
-	 *
+	 * <p>
 	 * The first time a project is created, there are ~7 seconds of configuration
 	 * which will go away for all subsequent runs.
-	 *
+	 * <p>
 	 * Every call to resolve will take about 1 second, even when all artifacts are resolved.
 	 */
 	private static Provisioner createWithRepositories(Consumer<RepositoryHandler> repoConfig) {

From 6ec2342a4b2b7e5065a19097f4f1a012582f17c0 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Mon, 30 Oct 2023 08:56:47 +0800
Subject: [PATCH 1261/2068] Bump Ktlint to 1.0.1

https://github.com/pinterest/ktlint/releases/tag/1.0.1
---
 CHANGES.md                                                     | 2 ++
 lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java | 2 +-
 plugin-gradle/CHANGES.md                                       | 2 ++
 plugin-maven/CHANGES.md                                        | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index dd89d2c5bd..6e6da03181 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Changes
+* Bump default `ktlint` version to latest `1.0.0` -> `1.0.1`. ([#1855](https://github.com/diffplug/spotless/pull/1855))
 
 ## [2.42.0] - 2023-09-28
 ### Added
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index d08c59b839..4aca4da02e 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -36,7 +36,7 @@ public class KtLintStep {
 	// prevent direct instantiation
 	private KtLintStep() {}
 
-	private static final String DEFAULT_VERSION = "1.0.0";
+	private static final String DEFAULT_VERSION = "1.0.1";
 	static final String NAME = "ktlint";
 	static final String MAVEN_COORDINATE_0_DOT = "com.pinterest:ktlint:";
 	static final String MAVEN_COORDINATE_1_DOT = "com.pinterest.ktlint:ktlint-cli:";
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 74f889fc04..8e803eacf1 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Changes
+* Bump default `ktlint` version to latest `1.0.0` -> `1.0.1`. ([#1855](https://github.com/diffplug/spotless/pull/1855))
 
 ## [6.22.0] - 2023-09-28
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index d86096ab05..b2c84be366 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Changes
+* Bump default `ktlint` version to latest `1.0.0` -> `1.0.1`. ([#1855](https://github.com/diffplug/spotless/pull/1855))
 
 ### Added
 * CompileSourceRoots and TestCompileSourceRoots are now respected as default includes. These properties are commonly set when adding extra source directories. ([#1846](https://github.com/diffplug/spotless/issues/1846))

From 87537c0768c56d81386e05392acf45f9f85e4ec6 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Wed, 18 Oct 2023 11:05:29 -0500
Subject: [PATCH 1262/2068] Add more Ktlint EditorConfig test cases

---
 .../gradle/spotless/KotlinExtensionTest.java  | 43 +++++++++++++++++++
 .../spotless/maven/kotlin/KtlintTest.java     | 25 +++++++++++
 ...lEditorConfigOverride.ktlintOfficial.clean |  6 +++
 .../kotlin/ktlint/intellij_idea/.editorconfig |  6 +++
 .../ktlint/ktlint_official/.editorconfig      |  6 +++
 5 files changed, 86 insertions(+)
 create mode 100644 testlib/src/main/resources/kotlin/ktlint/experimentalEditorConfigOverride.ktlintOfficial.clean
 create mode 100644 testlib/src/main/resources/kotlin/ktlint/intellij_idea/.editorconfig
 create mode 100644 testlib/src/main/resources/kotlin/ktlint/ktlint_official/.editorconfig

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
index 1c23728244..7ce1819d60 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
@@ -105,6 +105,42 @@ void testWithInvalidEditorConfigFile() throws IOException {
 		assertThat(buildOutput).contains(invalidPath);
 	}
 
+	@Test
+	void testReadCodeStyleFromEditorConfigFile() throws IOException {
+		setFile(".editorconfig").toResource("kotlin/ktlint/ktlint_official/.editorconfig");
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    kotlin {",
+				"        ktlint()",
+				"    }",
+				"}");
+		checkKtlintOfficialStyle();
+	}
+
+	@Test
+	void testSetEditorConfigCanOverrideEditorConfigFile() throws IOException {
+		setFile(".editorconfig").toResource("kotlin/ktlint/intellij_idea/.editorconfig");
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    kotlin {",
+				"        ktlint().editorConfigOverride([",
+				"            ktlint_code_style: \"ktlint_official\",",
+				"        ])",
+				"    }",
+				"}");
+		checkKtlintOfficialStyle();
+	}
+
 	@Test
 	void testWithHeader() throws IOException {
 		setFile("build.gradle").toLines(
@@ -144,4 +180,11 @@ void testWithCustomMaxWidthDefaultStyleKtfmt() throws IOException {
 		gradleRunner().withArguments("spotlessApply").build();
 		assertFile("src/main/kotlin/max-width.kt").sameAsResource("kotlin/ktfmt/max-width.clean");
 	}
+
+	private void checkKtlintOfficialStyle() throws IOException {
+		String path = "src/main/kotlin/Main.kt";
+		setFile(path).toResource("kotlin/ktlint/experimentalEditorConfigOverride.dirty");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile(path).sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.ktlintOfficial.clean");
+	}
 }
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
index 060e0de84f..2916e118a5 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
@@ -44,4 +44,29 @@ void testKtlintEditorConfigOverride() throws Exception {
 		mavenRunner().withArguments("spotless:apply").runNoError();
 		assertFile(path).sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.clean");
 	}
+
+	@Test
+	void testReadCodeStyleFromEditorConfigFile() throws Exception {
+		setFile(".editorconfig").toResource("kotlin/ktlint/ktlint_official/.editorconfig");
+		writePomWithKotlinSteps("<ktlint/>");
+		checkKtlintOfficialStyle();
+	}
+
+	@Test
+	void testSetEditorConfigCanOverrideEditorConfigFile() throws Exception {
+		setFile(".editorconfig").toResource("kotlin/ktlint/intellij_idea/.editorconfig");
+		writePomWithKotlinSteps("<ktlint>\n" +
+				"  <editorConfigOverride>\n" +
+				"    <ktlint_code_style>ktlint_official</ktlint_code_style>\n" +
+				"  </editorConfigOverride>\n" +
+				"</ktlint>");
+		checkKtlintOfficialStyle();
+	}
+
+	private void checkKtlintOfficialStyle() throws Exception {
+		String path = "src/main/kotlin/Main.kt";
+		setFile(path).toResource("kotlin/ktlint/experimentalEditorConfigOverride.dirty");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile(path).sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.ktlintOfficial.clean");
+	}
 }
diff --git a/testlib/src/main/resources/kotlin/ktlint/experimentalEditorConfigOverride.ktlintOfficial.clean b/testlib/src/main/resources/kotlin/ktlint/experimentalEditorConfigOverride.ktlintOfficial.clean
new file mode 100644
index 0000000000..2466bb93fc
--- /dev/null
+++ b/testlib/src/main/resources/kotlin/ktlint/experimentalEditorConfigOverride.ktlintOfficial.clean
@@ -0,0 +1,6 @@
+fun main() {
+    val list =
+        listOf(
+            "hello",
+        )
+}
diff --git a/testlib/src/main/resources/kotlin/ktlint/intellij_idea/.editorconfig b/testlib/src/main/resources/kotlin/ktlint/intellij_idea/.editorconfig
new file mode 100644
index 0000000000..9efc62a854
--- /dev/null
+++ b/testlib/src/main/resources/kotlin/ktlint/intellij_idea/.editorconfig
@@ -0,0 +1,6 @@
+root = true
+
+[*.{kt,kts}]
+ij_kotlin_allow_trailing_comma = true
+ij_kotlin_allow_trailing_comma_on_call_site = true
+ktlint_code_style = intellij_idea
diff --git a/testlib/src/main/resources/kotlin/ktlint/ktlint_official/.editorconfig b/testlib/src/main/resources/kotlin/ktlint/ktlint_official/.editorconfig
new file mode 100644
index 0000000000..93a01f2e59
--- /dev/null
+++ b/testlib/src/main/resources/kotlin/ktlint/ktlint_official/.editorconfig
@@ -0,0 +1,6 @@
+root = true
+
+[*.{kt,kts}]
+ij_kotlin_allow_trailing_comma = true
+ij_kotlin_allow_trailing_comma_on_call_site = true
+ktlint_code_style = ktlint_official

From f237fd459e6df4e072f6778fd70b2777faf5e478 Mon Sep 17 00:00:00 2001
From: Chetan Narsude <chetan@celeral.com>
Date: Sun, 22 Oct 2023 19:27:25 -0700
Subject: [PATCH 1263/2068] fix the crash #1858 when the maven build dir is a
 softlink to an actual directory

---
 .../diffplug/spotless/maven/incremental/FileIndex.java   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/FileIndex.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/FileIndex.java
index 8330319cfb..56c38ac3aa 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/FileIndex.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/FileIndex.java
@@ -144,7 +144,14 @@ private void ensureParentDirExists() {
 			throw new IllegalStateException("Index file does not have a parent dir: " + indexFile);
 		}
 		try {
-			Files.createDirectories(parentDir);
+			if (Files.exists(parentDir, LinkOption.NOFOLLOW_LINKS)) {
+				Path realPath = parentDir.toRealPath();
+				if (!Files.exists(realPath)) {
+					Files.createDirectories(realPath);
+				}
+			} else {
+				Files.createDirectories(parentDir);
+			}
 		} catch (IOException e) {
 			throw new UncheckedIOException("Unable to create parent directory for the index file: " + indexFile, e);
 		}

From ef9d6ea0ec72c866969817c607bf275a764f0d80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Rou=C3=A9l?= <andre.rouel@gmail.com>
Date: Mon, 30 Oct 2023 17:24:01 +0100
Subject: [PATCH 1264/2068] Fix #1638: Instantiate the code formatter and don't
 rely on an extension point

---
 .../glue/jdt/EclipseJdtFormatterStepImpl.java |  11 +-
 ...clipseJdtFormatterStepSpecialCaseTest.java |  11 +-
 .../eclipse_formatter_issue_1638.xml          | 391 ++++++++++++++++++
 .../resources/java/eclipse/AbstractType.clean |  67 +--
 4 files changed, 446 insertions(+), 34 deletions(-)
 create mode 100644 lib-extra/src/test/resources/eclipse_formatter_issue_1638.xml

diff --git a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtFormatterStepImpl.java b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtFormatterStepImpl.java
index 40c02d8f3a..40e10beaed 100644
--- a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtFormatterStepImpl.java
+++ b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtFormatterStepImpl.java
@@ -16,11 +16,15 @@
 package com.diffplug.spotless.extra.glue.jdt;
 
 import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Properties;
+import java.util.stream.Collectors;
 
 import org.eclipse.jdt.core.ToolFactory;
 import org.eclipse.jdt.core.formatter.CodeFormatter;
 import org.eclipse.jdt.internal.compiler.env.IModule;
+import org.eclipse.jdt.internal.formatter.DefaultCodeFormatter;
 import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.text.edits.TextEdit;
@@ -33,7 +37,12 @@ public class EclipseJdtFormatterStepImpl {
 	private final CodeFormatter codeFormatter;
 
 	public EclipseJdtFormatterStepImpl(Properties settings) {
-		this.codeFormatter = ToolFactory.createCodeFormatter(settings, ToolFactory.M_FORMAT_EXISTING);
+		Map<String, String> options = settings.entrySet().stream().collect(Collectors.toMap(
+			e -> String.valueOf(e.getKey()),
+			e -> String.valueOf(e.getValue()),
+			(prev, next) -> next,
+			HashMap::new));
+		this.codeFormatter = new DefaultCodeFormatter(options);
 	}
 
 	/** Formatting Java string, distinguishing module-info and compilation unit by file name */
diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java
index eb93cf1f09..474b2156bf 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java
@@ -15,16 +15,25 @@
  */
 package com.diffplug.spotless.extra.java;
 
+import com.diffplug.spotless.extra.EquoBasedStepBuilder;
+
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.StepHarness;
 import com.diffplug.spotless.TestProvisioner;
 
+import java.io.File;
+import java.util.List;
+
 public class EclipseJdtFormatterStepSpecialCaseTest {
 	/** https://github.com/diffplug/spotless/issues/1638 */
 	@Test
 	public void issue_1638() {
-		StepHarness.forStep(EclipseJdtFormatterStep.createBuilder(TestProvisioner.mavenCentral()).build())
+		ClassLoader classLoader = getClass().getClassLoader();
+		File file = new File(classLoader.getResource("eclipse_formatter_issue_1638.xml").getFile());
+		EquoBasedStepBuilder builder = EclipseJdtFormatterStep.createBuilder(TestProvisioner.mavenCentral());
+		builder.setPreferences(List.of(file));
+		StepHarness.forStep(builder.build())
 				.testResource("java/eclipse/AbstractType.test", "java/eclipse/AbstractType.clean");
 	}
 }
diff --git a/lib-extra/src/test/resources/eclipse_formatter_issue_1638.xml b/lib-extra/src/test/resources/eclipse_formatter_issue_1638.xml
new file mode 100644
index 0000000000..583df63026
--- /dev/null
+++ b/lib-extra/src/test/resources/eclipse_formatter_issue_1638.xml
@@ -0,0 +1,391 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<profiles version="20">
+    <profile kind="CodeFormatterProfile" name="Spotless" version="20">
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_with_spaces" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_record_components" value="48"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_logical_operator" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_record_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line" value="one_line_if_empty"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_shift_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="48"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_type_parameters" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_loops" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_enum_constant" value="49"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.text_block_indentation" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_module_statements" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_type_annotations" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_assertion_message_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines" value="2147483647"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="48"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_not_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_type_arguments" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="80"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package" value="49"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_record_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.indent_tag_description" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_record_constructor" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_string_concatenation" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_shift_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_shift_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_additive_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_record_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_relational_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_logical_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/>
+        <setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_method_body_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_additive_operator" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_constructor" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_relational_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_record_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="48"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_relational_operator" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_additive_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_record_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="48"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type" value="49"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable" value="49"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_additive_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field" value="49"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_conditional_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_shift_operator" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_code_block_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_record_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_assignment_operator" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method" value="49"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_record_constructor_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_assertion_message" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_logical_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration" value="48"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_relational_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="48"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_logical_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.javaFormatter" value="org.eclipse.jdt.core.defaultJavaFormatter"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_string_concatenation" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.lineSplit" value="200"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
+    </profile>
+</profiles>
diff --git a/testlib/src/main/resources/java/eclipse/AbstractType.clean b/testlib/src/main/resources/java/eclipse/AbstractType.clean
index 475b1186fd..314dbac1ac 100644
--- a/testlib/src/main/resources/java/eclipse/AbstractType.clean
+++ b/testlib/src/main/resources/java/eclipse/AbstractType.clean
@@ -2,37 +2,40 @@ package test;
 
 public abstract class AbstractType {
 
-	private String _typeName;
-
-	AbstractType(String typeName) {
-		_typeName = typeName;
-	}
-
-	private String _type() {
-		String name = getClass().getSimpleName();
-		return name.endsWith("Type") ? name.substring(0, getClass().getSimpleName().length() - 4) : name;
-	}
-
-	AbstractType argument() {
-		throw new UnsupportedOperationException(getClass().getSimpleName());
-	}
-
-	@Override
-	public boolean equals(Object another) {
-		if (this == another) {
-			return true;
-		}
-		return another instanceof AbstractType t && _typeName.equals(t._typeName);
-	}
-
-	@Override
-	public int hashCode() {
-		return _typeName.hashCode();
-	}
-
-	@Override
-	public String toString() {
-		return getClass().getSimpleName() + "(typeName)";
-	}
+    private String _typeName;
+
+    AbstractType(String typeName) {
+        _typeName = typeName;
+    }
+
+    private String _type() {
+        String name = getClass().getSimpleName();
+        return name.endsWith("Type")
+                ? name.substring(0, getClass().getSimpleName().length() - 4)
+                : name;
+    }
+
+    AbstractType argument() {
+        throw new UnsupportedOperationException(getClass().getSimpleName());
+    }
+
+    @Override
+    public boolean equals(Object another) {
+        if (this == another) {
+            return true;
+        }
+        return another instanceof AbstractType t
+                && _typeName.equals(t._typeName);
+    }
+
+    @Override
+    public int hashCode() {
+        return _typeName.hashCode();
+    }
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + "(typeName)";
+    }
 
 }

From 34a14cd5028868b5e41a540ca78a23d3cb8fbe25 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 1 Nov 2023 17:38:21 -0700
Subject: [PATCH 1265/2068] Fix missing import.

---
 .../java/com/diffplug/spotless/maven/incremental/FileIndex.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/FileIndex.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/FileIndex.java
index 56c38ac3aa..c719419923 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/FileIndex.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/FileIndex.java
@@ -26,6 +26,7 @@
 import java.io.PrintWriter;
 import java.io.UncheckedIOException;
 import java.nio.file.Files;
+import java.nio.file.LinkOption;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.time.Instant;

From 7321d6f740ad09417dd2e88f5b4c01237e99a1ea Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 1 Nov 2023 17:39:54 -0700
Subject: [PATCH 1266/2068] Update changelog.

---
 plugin-maven/CHANGES.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index d86096ab05..0b504f0256 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,7 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
-
+### Fixed
+* Fix crash when build dir is a softlink to another directory. ([#1859](https://github.com/diffplug/spotless/pull/1859))
 ### Added
 * CompileSourceRoots and TestCompileSourceRoots are now respected as default includes. These properties are commonly set when adding extra source directories. ([#1846](https://github.com/diffplug/spotless/issues/1846))
 

From 74467e7e233c074fa9eb4a3e95debf3129ce25e3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 2 Nov 2023 02:50:32 +0000
Subject: [PATCH 1267/2068] chore(deps): update plugin com.github.spotbugs to
 v5.2.1

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index daa7567f1b..02c9c66ef5 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,7 +12,7 @@ plugins {
 	// https://github.com/gradle-nexus/publish-plugin/releases
 	id 'io.github.gradle-nexus.publish-plugin' version '1.3.0' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
-	id 'com.github.spotbugs' version '5.1.3' apply false
+	id 'com.github.spotbugs' version '5.2.1' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
 	id 'com.diffplug.spotless-changelog' version '3.0.2' apply false
 	// https://github.com/diffplug/goomph/blob/main/CHANGES.md

From c3f376376be45c6c2ce4f6e2b44c22b306d66f2f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 2 Nov 2023 02:53:19 +0000
Subject: [PATCH 1268/2068] chore(deps): update dependency gradle to v8.4

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1d4d371453..3fa8f862f7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-rc-3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

From 3eeb1fc077e911c098b44bfb4983671095d3bdf6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 2 Nov 2023 04:47:49 +0000
Subject: [PATCH 1269/2068] fix(deps): update dependency
 org.mockito:mockito-core to v5.6.0

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 543d4cf0f1..c65ea39f94 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -32,4 +32,4 @@ VER_DURIAN=1.2.0
 VER_JGIT=6.7.0.202309050840-r
 VER_JUNIT=5.10.0
 VER_ASSERTJ=3.24.2
-VER_MOCKITO=5.5.0
+VER_MOCKITO=5.6.0

From 32715a200185a1e221157d8bf7d39de442dd9f43 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 2 Nov 2023 06:45:05 +0000
Subject: [PATCH 1270/2068] chore(deps): update plugin com.adarshr.test-logger
 to v4

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 02c9c66ef5..e7b9649cf3 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -19,7 +19,7 @@ plugins {
 	// DO NOT UPDATE, see https://github.com/diffplug/spotless/pull/874
 	id 'com.diffplug.p2.asmaven' version '3.27.0' apply false
 	// https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md
-	id 'com.adarshr.test-logger' version '3.2.0' apply false
+	id 'com.adarshr.test-logger' version '4.0.0' apply false
 	// https://github.com/davidburstrom/version-compatibility-gradle-plugin/tags
 	id 'io.github.davidburstrom.version-compatibility' version '0.5.0' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.enterprise

From e4527feeafdf36a2014ead218940f05c6eff88c9 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Thu, 2 Nov 2023 17:18:48 +0800
Subject: [PATCH 1271/2068] Fix reorderImports not working

---
 plugin-gradle/CHANGES.md                                        | 2 ++
 .../main/java/com/diffplug/gradle/spotless/JavaExtension.java   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 8e803eacf1..2d9788576a 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,6 +5,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changes
 * Bump default `ktlint` version to latest `1.0.0` -> `1.0.1`. ([#1855](https://github.com/diffplug/spotless/pull/1855))
+### Fixed
+* Fix `GoogleJavaFormatConfig.reorderImports` not working. ([#1872](https://github.com/diffplug/spotless/issues/1872))
 
 ## [6.22.0] - 2023-09-28
 ### Added
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
index c576eb7da8..ca73508f27 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
@@ -211,6 +211,7 @@ public GoogleJavaFormatConfig reflowLongStrings(boolean reflowLongStrings) {
 
 		public GoogleJavaFormatConfig reorderImports(boolean reorderImports) {
 			this.reorderImports = reorderImports;
+			replaceStep(createStep());
 			return this;
 		}
 

From 9ac56166679d7ef81a02f536b4369f393ffc135e Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Thu, 2 Nov 2023 23:44:05 +0800
Subject: [PATCH 1272/2068] Add reorderImports tests

---
 .../spotless/java/GoogleJavaFormatStep.java   | 12 +++++++--
 .../GoogleJavaFormatIntegrationTest.java      | 26 +++++++++++++++++++
 .../maven/java/GoogleJavaFormatTest.java      | 18 ++++++++++++-
 ...vaWithReorderImportsDisabledFormatted.test | 11 ++++++++
 ...avaWithReorderImportsEnabledFormatted.test | 13 ++++++++++
 .../JavaWithReorderImportsUnformatted.test    | 11 ++++++++
 .../java/GoogleJavaFormatStepTest.java        | 13 ++++++++++
 7 files changed, 101 insertions(+), 3 deletions(-)
 create mode 100644 testlib/src/main/resources/java/googlejavaformat/JavaWithReorderImportsDisabledFormatted.test
 create mode 100644 testlib/src/main/resources/java/googlejavaformat/JavaWithReorderImportsEnabledFormatted.test
 create mode 100644 testlib/src/main/resources/java/googlejavaformat/JavaWithReorderImportsUnformatted.test

diff --git a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
index b2424cbe2a..e5d990d807 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
@@ -58,7 +58,11 @@ public static FormatterStep create(String version, String style, Provisioner pro
 	}
 
 	public static FormatterStep create(String groupArtifact, String version, String style, Provisioner provisioner, boolean reflowLongStrings) {
-		return create(groupArtifact, version, style, provisioner, reflowLongStrings, false, DEFAULT_FORMAT_JAVADOC);
+		return create(groupArtifact, version, style, provisioner, reflowLongStrings, DEFAULT_REORDER_IMPORTS);
+	}
+
+	public static FormatterStep create(String groupArtifact, String version, String style, Provisioner provisioner, boolean reflowLongStrings, boolean reorderImports) {
+		return create(groupArtifact, version, style, provisioner, reflowLongStrings, reorderImports, DEFAULT_FORMAT_JAVADOC);
 	}
 
 	/** Creates a step which formats everything - groupArtifact, code, import order, and unused imports - and optionally reflows long strings. */
@@ -127,7 +131,11 @@ static final class State implements Serializable {
 		}
 
 		State(String stepName, String version, String style, Provisioner provisioner, boolean reflowLongStrings) throws Exception {
-			this(stepName, MAVEN_COORDINATE, version, style, provisioner, reflowLongStrings, DEFAULT_REORDER_IMPORTS, DEFAULT_FORMAT_JAVADOC);
+			this(stepName, version, style, provisioner, reflowLongStrings, DEFAULT_REORDER_IMPORTS);
+		}
+
+		State(String stepName, String version, String style, Provisioner provisioner, boolean reflowLongStrings, boolean reorderImports) throws Exception {
+			this(stepName, MAVEN_COORDINATE, version, style, provisioner, reflowLongStrings, reorderImports, DEFAULT_FORMAT_JAVADOC);
 		}
 
 		State(String stepName, String groupArtifact, String version, String style, Provisioner provisioner, boolean reflowLongStrings, boolean reorderImports, boolean formatJavadoc) throws Exception {
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GoogleJavaFormatIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GoogleJavaFormatIntegrationTest.java
index 42d9f4314a..b2ee012091 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GoogleJavaFormatIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GoogleJavaFormatIntegrationTest.java
@@ -46,6 +46,32 @@ void integration() throws IOException {
 		checkRunsThenUpToDate();
 	}
 
+	@Test
+	void integrationWithReorderImports() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"",
+				"spotless {",
+				"    java {",
+				"        target file('test.java')",
+				"        googleJavaFormat('1.12.0').aosp().reorderImports(true)",
+				"    }",
+				"}");
+
+		setFile("test.java").toResource("java/googlejavaformat/JavaWithReorderImportsUnformatted.test");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("test.java").sameAsResource("java/googlejavaformat/JavaWithReorderImportsEnabledFormatted.test");
+
+		checkRunsThenUpToDate();
+		replace("build.gradle",
+				"googleJavaFormat('1.12.0')",
+				"googleJavaFormat()");
+		checkRunsThenUpToDate();
+	}
+
 	@Test
 	void integrationWithSkipJavadocFormatting() throws IOException {
 		setFile("build.gradle").toLines(
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/GoogleJavaFormatTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/GoogleJavaFormatTest.java
index 76b2c40fd3..40d8edfed2 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/GoogleJavaFormatTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/GoogleJavaFormatTest.java
@@ -52,6 +52,18 @@ void specificVersionReflowLongStrings() throws Exception {
 		runTest("java/googlejavaformat/JavaCodeFormattedReflowLongStrings.test");
 	}
 
+	@Test
+	void specificVersionReorderImports() throws Exception {
+		writePomWithJavaSteps(
+				"<googleJavaFormat>",
+				"  <version>1.12.0</version>",
+				"  <style>AOSP</style>",
+				"  <reorderImports>true</reorderImports>",
+				"</googleJavaFormat>");
+
+		runTest("java/googlejavaformat/JavaWithReorderImportsEnabledFormatted.test", "java/googlejavaformat/JavaWithReorderImportsUnformatted.test");
+	}
+
 	@Test
 	void specificVersionSkipJavadocFormatting() throws Exception {
 		writePomWithJavaSteps(
@@ -64,8 +76,12 @@ void specificVersionSkipJavadocFormatting() throws Exception {
 	}
 
 	private void runTest(String targetResource) throws Exception {
+		runTest(targetResource, "java/googlejavaformat/JavaCodeUnformatted.test");
+	}
+
+	private void runTest(String targetResource, String sourceResource) throws Exception {
 		String path = "src/main/java/test.java";
-		setFile(path).toResource("java/googlejavaformat/JavaCodeUnformatted.test");
+		setFile(path).toResource(sourceResource);
 		mavenRunner().withArguments("spotless:apply").runNoError();
 		assertFile(path).sameAsResource(targetResource);
 	}
diff --git a/testlib/src/main/resources/java/googlejavaformat/JavaWithReorderImportsDisabledFormatted.test b/testlib/src/main/resources/java/googlejavaformat/JavaWithReorderImportsDisabledFormatted.test
new file mode 100644
index 0000000000..5e62d24108
--- /dev/null
+++ b/testlib/src/main/resources/java/googlejavaformat/JavaWithReorderImportsDisabledFormatted.test
@@ -0,0 +1,11 @@
+import java.nio.file.Paths;
+import my.UsedB;
+import org.xml.sax.InputSource;
+
+public class Java {
+    public static void main(String[] args) {
+        UsedB b = new UsedB();
+        InputSource inputSource = new InputSource();
+        Paths.get("dir");
+    }
+}
diff --git a/testlib/src/main/resources/java/googlejavaformat/JavaWithReorderImportsEnabledFormatted.test b/testlib/src/main/resources/java/googlejavaformat/JavaWithReorderImportsEnabledFormatted.test
new file mode 100644
index 0000000000..d0d4951601
--- /dev/null
+++ b/testlib/src/main/resources/java/googlejavaformat/JavaWithReorderImportsEnabledFormatted.test
@@ -0,0 +1,13 @@
+import my.UsedB;
+
+import org.xml.sax.InputSource;
+
+import java.nio.file.Paths;
+
+public class Java {
+    public static void main(String[] args) {
+        UsedB b = new UsedB();
+        InputSource inputSource = new InputSource();
+        Paths.get("dir");
+    }
+}
diff --git a/testlib/src/main/resources/java/googlejavaformat/JavaWithReorderImportsUnformatted.test b/testlib/src/main/resources/java/googlejavaformat/JavaWithReorderImportsUnformatted.test
new file mode 100644
index 0000000000..bfdbe83d88
--- /dev/null
+++ b/testlib/src/main/resources/java/googlejavaformat/JavaWithReorderImportsUnformatted.test
@@ -0,0 +1,11 @@
+import my.UsedB;
+import java.nio.file.Paths;
+import org.xml.sax.InputSource;
+
+public class Java {
+    public static void main(String[] args) {
+        UsedB b = new UsedB();
+        InputSource inputSource = new InputSource();
+        Paths.get("dir");
+    }
+}
\ No newline at end of file
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java
index df08c483df..f8766d7c6f 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java
@@ -119,6 +119,19 @@ void behaviorWithCustomGroupArtifact() throws Exception {
 				.testResource("java/googlejavaformat/JavaCodeWithPackageUnformatted.test", "java/googlejavaformat/JavaCodeWithPackageFormatted.test");
 	}
 
+	@Test
+	void behaviorWithReorderImports() throws Exception {
+		FormatterStep enabled = GoogleJavaFormatStep.create(GoogleJavaFormatStep.defaultGroupArtifact(), GoogleJavaFormatStep.defaultVersion(), "AOSP", TestProvisioner.mavenCentral(), GoogleJavaFormatStep.defaultReflowLongStrings(), true);
+		FormatterStep disabled = GoogleJavaFormatStep.create(GoogleJavaFormatStep.defaultGroupArtifact(), GoogleJavaFormatStep.defaultVersion(), "AOSP", TestProvisioner.mavenCentral(), GoogleJavaFormatStep.defaultReflowLongStrings(), false);
+		String unformatted = "java/googlejavaformat/JavaWithReorderImportsUnformatted.test";
+		try (StepHarness step = StepHarness.forStep(enabled)) {
+			step.testResource(unformatted, "java/googlejavaformat/JavaWithReorderImportsEnabledFormatted.test");
+		}
+		try (StepHarness step = StepHarness.forStep(disabled)) {
+			step.testResource(unformatted, "java/googlejavaformat/JavaWithReorderImportsDisabledFormatted.test");
+		}
+	}
+
 	@Test
 	void equality() throws Exception {
 		new SerializableEqualityTester() {

From d090d4b896809004f7031ae79f87b2f7ddbd6b04 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Fri, 3 Nov 2023 01:02:44 +0800
Subject: [PATCH 1273/2068] Execute tests in parallel

https://docs.gradle.org/8.4/userguide/performance.html#execute_tests_in_parallel
---
 gradle/special-tests.gradle | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gradle/special-tests.gradle b/gradle/special-tests.gradle
index d4de449bdd..b096efbe13 100644
--- a/gradle/special-tests.gradle
+++ b/gradle/special-tests.gradle
@@ -17,6 +17,12 @@ tasks.withType(Test).configureEach {
 			maxRetries = 2
 			maxFailures = 10
 		}
+
+		// There are only 2 cores in each GitHub Action Runner, we use all of them here.
+		maxParallelForks = Runtime.getRuntime().availableProcessors()
+	} else {
+		// https://docs.gradle.org/8.4/userguide/performance.html#execute_tests_in_parallel
+		maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) ?: 1
 	}
 }
 

From de815f40d4d93a846004a91dcc99c4798d652580 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 3 Nov 2023 08:34:06 -0700
Subject: [PATCH 1274/2068] `spotlessApply`.

---
 .../extra/glue/jdt/EclipseJdtFormatterStepImpl.java      | 9 ++++-----
 .../java/EclipseJdtFormatterStepSpecialCaseTest.java     | 7 +++----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtFormatterStepImpl.java b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtFormatterStepImpl.java
index 40e10beaed..b394b6278d 100644
--- a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtFormatterStepImpl.java
+++ b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtFormatterStepImpl.java
@@ -21,7 +21,6 @@
 import java.util.Properties;
 import java.util.stream.Collectors;
 
-import org.eclipse.jdt.core.ToolFactory;
 import org.eclipse.jdt.core.formatter.CodeFormatter;
 import org.eclipse.jdt.internal.compiler.env.IModule;
 import org.eclipse.jdt.internal.formatter.DefaultCodeFormatter;
@@ -38,10 +37,10 @@ public class EclipseJdtFormatterStepImpl {
 
 	public EclipseJdtFormatterStepImpl(Properties settings) {
 		Map<String, String> options = settings.entrySet().stream().collect(Collectors.toMap(
-			e -> String.valueOf(e.getKey()),
-			e -> String.valueOf(e.getValue()),
-			(prev, next) -> next,
-			HashMap::new));
+				e -> String.valueOf(e.getKey()),
+				e -> String.valueOf(e.getValue()),
+				(prev, next) -> next,
+				HashMap::new));
 		this.codeFormatter = new DefaultCodeFormatter(options);
 	}
 
diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java
index 474b2156bf..21ec889ed6 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java
@@ -15,15 +15,14 @@
  */
 package com.diffplug.spotless.extra.java;
 
-import com.diffplug.spotless.extra.EquoBasedStepBuilder;
+import java.io.File;
+import java.util.List;
 
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.StepHarness;
 import com.diffplug.spotless.TestProvisioner;
-
-import java.io.File;
-import java.util.List;
+import com.diffplug.spotless.extra.EquoBasedStepBuilder;
 
 public class EclipseJdtFormatterStepSpecialCaseTest {
 	/** https://github.com/diffplug/spotless/issues/1638 */

From b08741a60ae65a8542de354070de25561bd9e78b Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 3 Nov 2023 08:37:04 -0700
Subject: [PATCH 1275/2068] Bump changelogs.

---
 CHANGES.md               | 2 ++
 plugin-gradle/CHANGES.md | 2 ++
 plugin-maven/CHANGES.md  | 1 +
 3 files changed, 5 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 6e6da03181..93e693ebf5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Fix Eclipse JDT on some settings files. ([#1864](https://github.com/diffplug/spotless/pull/1864) fixes [#1638](https://github.com/diffplug/spotless/issues/1638))
 ### Changes
 * Bump default `ktlint` version to latest `1.0.0` -> `1.0.1`. ([#1855](https://github.com/diffplug/spotless/pull/1855))
 
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 8e803eacf1..2a197e7cac 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Fix Eclipse JDT on some settings files. ([#1864](https://github.com/diffplug/spotless/pull/1864) fixes [#1638](https://github.com/diffplug/spotless/issues/1638))
 ### Changes
 * Bump default `ktlint` version to latest `1.0.0` -> `1.0.1`. ([#1855](https://github.com/diffplug/spotless/pull/1855))
 
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index e07eadad4c..e941297aa3 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 (
 * CompileSourceRoots and TestCompileSourceRoots are now respected as default includes. These properties are commonly set when adding extra source directories. ([#1846](https://github.com/diffplug/spotless/issues/1846))
 ### Fixed
 * Fix crash when build dir is a softlink to another directory. ([#1859](https://github.com/diffplug/spotless/pull/1859))
+* Fix Eclipse JDT on some settings files. ([#1864](https://github.com/diffplug/spotless/pull/1864) fixes [#1638](https://github.com/diffplug/spotless/issues/1638))
 ### Changes
 * Bump default `ktlint` version to latest `1.0.0` -> `1.0.1`. ([#1855](https://github.com/diffplug/spotless/pull/1855))
 

From a7523be35ba7d9f17f1c92d79dc9ce9c720bc92d Mon Sep 17 00:00:00 2001
From: Marcono1234 <Marcono1234@users.noreply.github.com>
Date: Mon, 6 Nov 2023 22:55:31 +0100
Subject: [PATCH 1276/2068] Fix misleading sentence in Maven plugin README

The previous "add the Spotless dependency" could be misunderstood as
having to add a regular Maven dependency entry for the Spotless plugin.
---
 plugin-maven/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 3294575e20..b3347d50e1 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -73,7 +73,7 @@ user@machine repo % mvn spotless:check
 
 ## Quickstart
 
-To use it in your pom, just [add the Spotless dependency](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22), and configure it like so:
+To use it in your pom, just [add the Spotless plugin](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22), and configure it like so:
 
 ```xml
 <plugin>

From 1899bb08b4c6f0fe6229b9749b586c840eb3b20d Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 7 Nov 2023 10:42:28 +0800
Subject: [PATCH 1277/2068] Disable trimTrailingWhitespace for md files

---
 .editorconfig                    | 1 +
 gradle/spotless-freshmark.gradle | 1 -
 plugin-gradle/README.md          | 2 +-
 plugin-maven/README.md           | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 5d0704bd2b..9fe2fbc6c6 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -11,6 +11,7 @@ charset = utf-8
 [*.md]
 indent_style = space
 indent_size = 2
+trim_trailing_whitespace = false
 
 [*.java]
 # Doc: https://youtrack.jetbrains.com/issue/IDEA-170643#focus=streamItem-27-3708697.0-0
diff --git a/gradle/spotless-freshmark.gradle b/gradle/spotless-freshmark.gradle
index 2a79ab01ba..54623eb05a 100644
--- a/gradle/spotless-freshmark.gradle
+++ b/gradle/spotless-freshmark.gradle
@@ -11,7 +11,6 @@ Action<FreshMarkExtension> freshmarkSetup = {
 		it.put('no', ':white_large_square:')
 	}
 	it.indentWithSpaces(2)
-	it.trimTrailingWhitespace()
 	it.endWithNewline()
 }
 
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 16285f88ad..f53028418b 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -105,7 +105,7 @@ spotless {
 
   format 'misc', {
     // define the files to apply `misc` to
-    target '*.gradle', '*.md', '.gitignore'
+    target '*.gradle', '.gitattributes', '.gitignore'
 
     // define the steps to apply to those files
     trimTrailingWhitespace()
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 3294575e20..c9342f985b 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -88,7 +88,7 @@ To use it in your pom, just [add the Spotless dependency](https://search.maven.o
       <format>
         <!-- define the files to apply to -->
         <includes>
-          <include>*.md</include>
+          <include>.gitattributes</include>
           <include>.gitignore</include>
         </includes>
         <!-- define the steps to apply to those files -->

From 0ab9e62f5dbf90edb46ae534e60ba85aceaae913 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Wed, 8 Nov 2023 00:17:55 +0800
Subject: [PATCH 1278/2068] Manually declaring junit-platform-launcher for
 testCommon

Follow up e52c46fdaf9c91b9c44350b8d9d6d7bd18e71fe4.
---
 lib/build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/build.gradle b/lib/build.gradle
index 0288277c78..a3424a7ee9 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -69,6 +69,7 @@ dependencies {
 	testCommonImplementation "org.junit.jupiter:junit-jupiter:$VER_JUNIT"
 	testCommonImplementation "org.assertj:assertj-core:$VER_ASSERTJ"
 	testCommonImplementation "com.diffplug.durian:durian-testlib:$VER_DURIAN"
+	testCommonRuntimeOnly "org.junit.platform:junit-platform-launcher"
 
 	// GLUE CODE (alphabetic order please)
 	// cleanthat

From 9f79a329fd9d667887ab55024cdcf675e957e498 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Wed, 8 Nov 2023 10:34:18 +0800
Subject: [PATCH 1279/2068] Capitalized Gradle names in docs

---
 CHANGES.md                                     | 18 +++++++++---------
 ISSUE_TEMPLATE.md                              |  2 +-
 README.md                                      |  6 +++---
 _ext/eclipse-wtp/CHANGES.md                    |  2 +-
 gradle/java-publish.gradle                     |  2 +-
 .../com/diffplug/spotless/FormatterStep.java   |  2 +-
 .../npm/PrettierMissingParserException.java    |  2 +-
 plugin-gradle/CHANGES.md                       | 12 ++++++------
 .../gradle/spotless/FormatExtension.java       |  2 +-
 .../gradle/spotless/SpotlessCheck.java         |  4 ++--
 .../spotless/SpotlessPluginRedirect.java       |  2 +-
 .../spotless/SpotlessPluginRedirectTest.java   |  2 +-
 plugin-maven/CHANGES.md                        |  2 +-
 .../diffplug/spotless/maven/MavenRunner.java   |  2 +-
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 93e693ebf5..d8d6a2a168 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -579,9 +579,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changed
 * **BREAKING** `FileSignature` can no longer sign folders, only files.  Signatures are now based only on filename (not path), size, and a content hash.  It throws an error if a signature is attempted on a folder or on multiple files with different paths but the same filename - it never breaks silently.  This change does not break any of Spotless' internal logic, so it is unlikely to affect any of Spotless' consumers either. ([#571](https://github.com/diffplug/spotless/pull/571))
   * This change allows the maven plugin to cache classloaders across subprojects when loading config resources from the classpath (fixes [#559](https://github.com/diffplug/spotless/issues/559)).
-  * This change also allows the gradle plugin to work with the remote buildcache (fixes [#280](https://github.com/diffplug/spotless/issues/280)).
+  * This change also allows the Gradle plugin to work with the remote buildcache (fixes [#280](https://github.com/diffplug/spotless/issues/280)).
 * **BREAKING** `FormatterFunc` no longer `extends ThrowingEx.Function` and `BiFunction`. In a major win for Java's idea of ["target typing"](https://cr.openjdk.java.net/~briangoetz/lambda/lambda-state-final.html), this required no changes anywhere in the codebase except deleting the `extends` part of `FormatterFunc` ([#638](https://github.com/diffplug/spotless/issues/638)).
-* **BREAKING** Heavy refactor of the `LicenseHeaderStep` public API.  Doesn't change internal behavior, but makes implementation of the gradle and maven plugins much easier. ([#628](https://github.com/diffplug/spotless/pull/628))
+* **BREAKING** Heavy refactor of the `LicenseHeaderStep` public API.  Doesn't change internal behavior, but makes implementation of the Gradle and maven plugins much easier. ([#628](https://github.com/diffplug/spotless/pull/628))
 * **BREAKING** Removed all deprecated methods and classes from `lib` and `lib-extra`.
   * [#629](https://github.com/diffplug/spotless/pull/629) removes the code which wasn't being used in plugin-gradle or plugin-maven.
   * [#630](https://github.com/diffplug/spotless/pull/630) moves the code which was still being used in deprecated parts of plugin-gradle into `.deprecated` package in `plugin-gradle`, which allows us to break `lib` without a breaking change in `plugin-gradle`.
@@ -614,7 +614,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * `NodeJsGlobal.setSharedLibFolder` allows to set the location of nodejs shared libs. ([#586](https://github.com/diffplug/spotless/pull/586))
 * `PaddedCell.isClean()` returns the instance of `PaddedCell.DirtyState` which represents clean. ([#590](https://github.com/diffplug/spotless/pull/590))
 ### Fixed
-* Previously, the nodejs-based steps would throw `UnsatisfiedLinkError` if they were ever used from more than one classloader.  Now they can be used from any number of classloaders (important for gradle build daemon). ([#586](https://github.com/diffplug/spotless/pull/586))
+* Previously, the nodejs-based steps would throw `UnsatisfiedLinkError` if they were ever used from more than one classloader.  Now they can be used from any number of classloaders (important for Gradle build daemon). ([#586](https://github.com/diffplug/spotless/pull/586))
 
 ## [1.31.0] - 2020-05-21
 ### Added
@@ -636,8 +636,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changed
 * Updated a bunch of dependencies, most notably: ([#564](https://github.com/diffplug/spotless/pull/564))
   * jgit `5.5.0.201909110433-r` -> `5.7.0.202003110725-r`
-  * gradle `6.2.2` -> `6.3`
-  * spotbugs gradle plugin `2.0.0` -> `4.0.8`
+  * Gradle `6.2.2` -> `6.3`
+  * spotbugs Gradle plugin `2.0.0` -> `4.0.8`
 
 ## [1.28.1] - 2020-04-02
 ### Fixed
@@ -654,7 +654,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * We now use [javadoc.io](https://javadoc.io/) instead of github pages. ([#508](https://github.com/diffplug/spotless/pull/508))
 * We no longer publish `-SNAPSHOT` for every build to `main`, since we have good [JitPack integration](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#gradle---any-commit-in-a-public-github-repo-this-one-or-any-fork). ([#508](https://github.com/diffplug/spotless/pull/508))
 * Improved how we use Spotless on itself. ([#509](https://github.com/diffplug/spotless/pull/509))
-* Fix build warnings when building on Gradle 6+, bump build gradle to 6.2.2, and fix javadoc links. ([#536](https://github.com/diffplug/spotless/pull/536))
+* Fix build warnings when building on Gradle 6+, bump build Gradle to 6.2.2, and fix javadoc links. ([#536](https://github.com/diffplug/spotless/pull/536))
 
 ## [1.27.0] - 2020-01-01
 * Ignored `KtLintStepTest`, because [gradle/gradle#11752](https://github.com/gradle/gradle/issues/11752) is causing too many CI failures. ([#499](https://github.com/diffplug/spotless/pull/499))
@@ -694,7 +694,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
     - but incorrectly marked as good by "check"
     - this led to "check" says all good, but then "apply" still causes format (https://github.com/diffplug/spotless/issues/453)
     - combined with up-to-date checking, could lead to even more confusing results (https://github.com/diffplug/spotless/issues/338)
-    - only affects the gradle plugin, since that was the only plugin to use this feature
+    - only affects the Gradle plugin, since that was the only plugin to use this feature
 * Minor change to `TestProvisioner`, which should fix the cache-breaking issues, allowing us to speed-up the CI builds a bit.
 * Bumped `scalafmt` default version from `1.1.0` to `2.0.1`, since there are [bugs](https://github.com/diffplug/spotless/issues/454) in the old default ([#458](https://github.com/diffplug/spotless/pull/458)).
 
@@ -711,7 +711,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [1.23.1] - 2019-06-17
 * Fixes incorrect M2 cache directory path handling of Eclipse based formatters ([#401](https://github.com/diffplug/spotless/issues/401))
-* Update jgit from `4.9.0.201710071750-r` to `5.3.2.201906051522-r` because gradle project is sometimes broken by `apache httpcomponents` in transitive dependency. ([#407](https://github.com/diffplug/spotless/pull/407))
+* Update jgit from `4.9.0.201710071750-r` to `5.3.2.201906051522-r` because Gradle project is sometimes broken by `apache httpcomponents` in transitive dependency. ([#407](https://github.com/diffplug/spotless/pull/407))
 
 ## [1.23.0] - 2019-04-24
 * Updated default ktlint from 0.21.0 to 0.32.0, and Maven coords to com.pinterest ([#394](https://github.com/diffplug/spotless/pull/394))
@@ -787,7 +787,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [1.12.0] - 2018-05-14
 * Fixed a bug in `LicenseHeaderStep` which caused an exception with some malformed date-aware licenses. ([#222](https://github.com/diffplug/spotless/pull/222))
 * Updated default ktlint from 0.14.0 to 0.21.0
-* Add ability to pass custom options to ktlint in gradle plugin. See plugin-gradle/README for details.
+* Add ability to pass custom options to ktlint in Gradle plugin. See plugin-gradle/README for details.
 
 ## [1.11.0] - 2018-02-26
 * Added default indentation of `4` to `IndentStep`. ([#209](https://github.com/diffplug/spotless/pull/209))
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index 0ae5167a13..36cda06b7e 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,7 +1,7 @@
 If you are submitting a **bug**, please include the following:
 
 - [ ] summary of problem
-- [ ] gradle or maven version
+- [ ] Gradle or maven version
 - [ ] spotless version
 - [ ] operating system and version
 - [ ] copy-paste your full Spotless configuration block(s), and a link to a public git repo that reproduces the problem if possible
diff --git a/README.md b/README.md
index 80dcec21eb..2c45e9e444 100644
--- a/README.md
+++ b/README.md
@@ -176,7 +176,7 @@ Once someone has filled in one square of the formatter/build system matrix, it's
   - breaking spotless into libraries [#56](https://github.com/diffplug/spotless/issues/56)
   - lots of other things, but especially the diff support in `spotlessCheck`
   - constant improvements on a variety of topics with high-quality code reviews
-- Thanks to [Daz DeBoer](https://github.com/bigdaz) for the reworking the guts of our gradle plugin to support [buildcache](https://github.com/diffplug/spotless/pull/576), [InputChanges](https://github.com/diffplug/spotless/pull/607), and [lazy configuration](https://github.com/diffplug/spotless/pull/617).
+- Thanks to [Daz DeBoer](https://github.com/bigdaz) for the reworking the guts of our Gradle plugin to support [buildcache](https://github.com/diffplug/spotless/pull/576), [InputChanges](https://github.com/diffplug/spotless/pull/607), and [lazy configuration](https://github.com/diffplug/spotless/pull/617).
 - Thanks to [Richard Willis](https://github.com/badsyntax) for creating the [VS Code extension for Spotless Gradle](https://marketplace.visualstudio.com/items?itemName=richardwillis.vscode-spotless-gradle).
 - Thanks to [Ryan Gurney](https://github.com/ragurney) for creating the [IntelliJ plugin for Spotless Gradle](https://plugins.jetbrains.com/plugin/18321-spotless-gradle).
 - Thanks to [Markus Heberling](https://github.com/tisoft) for adding [generic native formatters](https://github.com/diffplug/spotless/pull/949), [jsr-223 formatters](https://github.com/diffplug/spotless/pull/945), and [maven pom sorting](https://github.com/diffplug/spotless/pull/946).
@@ -195,7 +195,7 @@ Once someone has filled in one square of the formatter/build system matrix, it's
 - Thanks to [Baptiste Mesta](https://github.com/baptistemesta) for
   - porting the DBeaver formatter to Spotless, and thanks to [DBeaver](https://dbeaver.jkiss.org/) and [its authors](https://github.com/serge-rider/dbeaver/graphs/contributors) for their excellent SQL formatter.
   - making license headers date-aware [#179](https://github.com/diffplug/spotless/pull/179)
-- Thanks to [vmdominguez](https://github.com/vmdominguez) and [Luis Fors](https://github.com/luis-fors-cb) for adding the ability to limit formatting to specific files in gradle ([#322](https://github.com/diffplug/spotless/pull/322)) and maven ([#392](https://github.com/diffplug/spotless/pull/392)), respectively.
+- Thanks to [vmdominguez](https://github.com/vmdominguez) and [Luis Fors](https://github.com/luis-fors-cb) for adding the ability to limit formatting to specific files in Gradle ([#322](https://github.com/diffplug/spotless/pull/322)) and maven ([#392](https://github.com/diffplug/spotless/pull/392)), respectively.
 - Thanks to [bender316](https://github.com/bender316) for fixing classloading on Java 9 ([#426](https://github.com/diffplug/spotless/pull/426)).
 - Thanks to [Stefan Oehme](https://github.com/oehme) for tons of help on the internal mechanics of Gradle.
 - Thanks to [eyalkaspi](https://github.com/eyalkaspi) for adding configurable date ranges to the date-aware license headers.
@@ -203,7 +203,7 @@ Once someone has filled in one square of the formatter/build system matrix, it's
 - Thanks to [Oliver Horn](https://github.com/ohorn) for adding AOSP support for Spotless' google-java-format integration.
 - Formatting by Eclipse
   - Special thanks to [Mateusz Matela](https://waynebeaton.wordpress.com/2015/03/15/great-fixes-for-mars-winners-part-i/) for huge improvements to the eclipse code formatter!
-- Thanks to [Zac Sweers](https://github.com/ZacSweers) for fixing the highly requested ktlint 0.34+ support ([#469](https://github.com/diffplug/spotless/pull/469)), multiple build updates and fixing a gradle deprecation warning ([#434](https://github.com/diffplug/spotless/pull/434) and others).
+- Thanks to [Zac Sweers](https://github.com/ZacSweers) for fixing the highly requested ktlint 0.34+ support ([#469](https://github.com/diffplug/spotless/pull/469)), multiple build updates and fixing a Gradle deprecation warning ([#434](https://github.com/diffplug/spotless/pull/434) and others).
 - Thanks to [Stephen Panaro](https://github.com/smpanaro) for adding support for ktlint FilenameRule ([#974](https://github.com/diffplug/spotless/pull/974)).
 - Thanks to [Nelson Osacky](https://github.com/runningcode) for android doc improvements, versions bump, and a build improvement.
 - Thanks to [Stanley Shyiko](https://github.com/shyiko) for his help integrating [ktlint](https://github.com/shyiko/ktlint).
diff --git a/_ext/eclipse-wtp/CHANGES.md b/_ext/eclipse-wtp/CHANGES.md
index 0001618b1f..d57618ad8c 100644
--- a/_ext/eclipse-wtp/CHANGES.md
+++ b/_ext/eclipse-wtp/CHANGES.md
@@ -4,7 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Fixed
-* Fix typo in gradle variable names ([#1425](https://github.com/diffplug/spotless/pull/1425))
+* Fix typo in Gradle variable names ([#1425](https://github.com/diffplug/spotless/pull/1425))
 
 ## [3.23.0] - 2021-09-22
 ### Added
diff --git a/gradle/java-publish.gradle b/gradle/java-publish.gradle
index 495694a5be..49075c5970 100644
--- a/gradle/java-publish.gradle
+++ b/gradle/java-publish.gradle
@@ -192,7 +192,7 @@ if (System.env['JITPACK'] == 'true' || version.endsWith('-SNAPSHOT')) {
 	changelogTasks.named('changelogBump').configure {
 		dependsOn ":${thisProj.path}:publishPluginMavenPublicationToSonatypeRepository"
 		dependsOn ":closeAndReleaseSonatypeStagingRepository"
-		// if we have a gradle plugin, we need to push it up to the plugin portal too
+		// if we have a Gradle plugin, we need to push it up to the plugin portal too
 		if (thisProj.tasks.names.contains('publishPlugins')) {
 			dependsOn thisProj.tasks.named('publishPlugins')
 		}
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
index 5f6ec168d4..ce24921509 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
@@ -86,7 +86,7 @@ public default FormatterStep filterByFile(SerializableFileFilter filter) {
 	 * Implements a FormatterStep in a strict way which guarantees correct and lazy implementation
 	 * of up-to-date checks.  This maximizes performance for cases where the FormatterStep is not
 	 * actually needed (e.g. don't load eclipse setting file unless this step is actually running)
-	 * while also ensuring that gradle can detect changes in a step's settings to determine that
+	 * while also ensuring that Gradle can detect changes in a step's settings to determine that
 	 * it needs to rerun a format.
 	 */
 	abstract class Strict<State extends Serializable> extends LazyForwardingEquality<State> implements FormatterStep {
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/PrettierMissingParserException.java b/lib/src/main/java/com/diffplug/spotless/npm/PrettierMissingParserException.java
index 6956545135..4debfd5720 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/PrettierMissingParserException.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/PrettierMissingParserException.java
@@ -95,7 +95,7 @@ private static String recommendPlugin(File file) {
 				+ String.format("<https://www.npmjs.com/search?ranking=popularity&q=%s>", pluginName)
 				+ "\n\n"
 				+ "For instructions on how to include plugins for prettier in spotless see our documentation:\n"
-				+ "- for gradle <https://github.com/diffplug/spotless/tree/main/plugin-gradle#prettier-plugins>\n"
+				+ "- for Gradle <https://github.com/diffplug/spotless/tree/main/plugin-gradle#prettier-plugins>\n"
 				+ "- for maven <https://github.com/diffplug/spotless/tree/main/plugin-maven#prettier-plugins>";
 	}
 
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index ec26cf5c63..ac3e4f1c38 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -161,7 +161,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
   * `KtLint` does not maintain a stable API - before this PR, we supported every breaking change in the API since 2019.
   * From now on, we will support no more than 2 breaking changes at a time.
 * `npm`-based formatters `ESLint`, `prettier` and `tsfmt` delay their `npm install` call until the formatters are first
-  used. For gradle this effectively moves the `npm install` call out of the configuration phase and as such enables
+  used. For Gradle this effectively moves the `npm install` call out of the configuration phase and as such enables
   better integration with `gradle-node-plugin`. ([#1522](https://github.com/diffplug/spotless/pull/1522))
 * Bump default `ktlint` version to latest `0.48.1` -> `0.48.2` ([#1529](https://github.com/diffplug/spotless/pull/1529))
 * Bump default `scalafmt` version to latest `3.6.1` -> `3.7.1` ([#1529](https://github.com/diffplug/spotless/pull/1529))
@@ -371,7 +371,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [6.0.4] - 2021-12-07
 ### Fixed
-* Fix gradle composite builds ([#860](https://github.com/diffplug/spotless/issues/860)).
+* Fix Gradle composite builds ([#860](https://github.com/diffplug/spotless/issues/860)).
 
 ## [6.0.3] - 2021-12-06
 ### Fixed
@@ -687,7 +687,7 @@ println "isEager $isEager"
 * LineEndings.GIT_ATTRIBUTES is now a bit more efficient, and paves the way for remote build cache support in Gradle. ([#621](https://github.com/diffplug/spotless/pull/621))
 * `ratchetFrom` now ratchets from the merge base of `HEAD` and the specified branch.  This fixes the surprising behavior when a remote branch advanced ([#631](https://github.com/diffplug/spotless/pull/631) fixes [#627](https://github.com/diffplug/spotless/issues/627)).
 ### Deprecated
-* The default targets for `C/C++`, `freshmark`, `sql`, and `typescript` now generate a warning, asking the user to specify a target manually. There is no well-established convention for these languages in the gradle ecosystem, and the performance of the default target is far worse than a user-provided one.  If you dislike this change, please complain in [#634](https://github.com/diffplug/spotless/pull/634).
+* The default targets for `C/C++`, `freshmark`, `sql`, and `typescript` now generate a warning, asking the user to specify a target manually. There is no well-established convention for these languages in the Gradle ecosystem, and the performance of the default target is far worse than a user-provided one.  If you dislike this change, please complain in [#634](https://github.com/diffplug/spotless/pull/634).
 * `customLazy` and `customLazyGroovy` now generate a warning, asking the user to migrate to `custom`.  There is no longer a performance advantage to `customLazy` in the new modern plugin. See [#635](https://github.com/diffplug/spotless/pull/635/files) for example migrations.
 * inside the `cpp { }` block, the `eclipse` step now generates a warning, asking you to switch to `eclipseCdt`.  It is the same underlying step, but the new name clears up any confusion with the more common Java `eclipse`. [#636](https://github.com/diffplug/spotless/pull/635/files)
 
@@ -765,7 +765,7 @@ spotless {
 **TLDR: This version improves performance and adds support for the local Gradle Build Cache.  You will not need to make any changes in your buildscript.**  It is a breaking change only for a few users who have built *other* plugins on top of this one.
 
 ### Added
-* Support for the gradle build cache. ([#576](https://github.com/diffplug/spotless/pull/576))
+* Support for the Gradle build cache. ([#576](https://github.com/diffplug/spotless/pull/576))
   * The local cache will work great, but the remote cache will always miss until [#566](https://github.com/diffplug/spotless/issues/566) is resolved.
 ### Removed
 * **BREAKING** it used to be possible for any project to format files in any other project.  For example, `:a` could format files in `:b`.  It is now only possible to format files within the project directory.  It is okay (but not advised) to format files in subprojects, since they are within the project directory.
@@ -773,7 +773,7 @@ spotless {
   * Previously, the `check` and `apply` tasks were just marker tasks, and they called `setCheck` and `setApply` on the "worker" task.  Now `check` and `apply` are real tasks in their own right, so the marker-task kludge is no longer necessary.
 ### Changed
 * (Power users only) **BREAKING** `SpotlessTask FormatExtension::createIndependentTask` has been removed, and replaced with `SpotlessApply::createIndependentApplyTask`. ([#576](https://github.com/diffplug/spotless/pull/576))
-* Improve suggested gradle invocation for running `spotlessApply`. ([#578](https://github.com/diffplug/spotless/pull/578))
+* Improve suggested Gradle invocation for running `spotlessApply`. ([#578](https://github.com/diffplug/spotless/pull/578))
 
 ## [3.30.0] - 2020-05-11
 ### Added
@@ -868,7 +868,7 @@ spotless {
 
 ## [3.23.1] - 2019-06-17
 * Fixes incorrect M2 cache directory path handling of Eclipse based formatters ([#401](https://github.com/diffplug/spotless/issues/401))
-* Update jgit from `4.9.0.201710071750-r` to `5.3.2.201906051522-r` because gradle project is sometimes broken by `apache httpcomponents` in transitive dependency. ([#407](https://github.com/diffplug/spotless/pull/407))
+* Update jgit from `4.9.0.201710071750-r` to `5.3.2.201906051522-r` because Gradle project is sometimes broken by `apache httpcomponents` in transitive dependency. ([#407](https://github.com/diffplug/spotless/pull/407))
 
 ## [3.23.0] - 2019-04-24
 * Updated default ktlint from 0.21.0 to 0.32.0, and Maven coords to com.pinterest ([#394](https://github.com/diffplug/spotless/pull/394))
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index 30fded9d5f..ff0d71b15a 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -395,7 +395,7 @@ public void clearSteps() {
 	 *
 	 * Spotless tracks what files have changed from run to run, so that it can run
 	 * faster by only checking files which have changed, or whose formatting steps
-	 * have changed. If you use the {@code custom} methods, then gradle can never
+	 * have changed. If you use the {@code custom} methods, then Gradle can never
 	 * mark your files as {@code up-to-date}, because it can't know if perhaps the
 	 * behavior of your custom function has changed.
 	 *
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessCheck.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessCheck.java
index d0e27d60bf..98b88315ad 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessCheck.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessCheck.java
@@ -86,8 +86,8 @@ public void visitFile(FileVisitDetails fileVisitDetails) {
 						// in its output directory which ought to have been removed. As
 						// best I can tell, this is a filesytem race which is very hard
 						// to trigger.  GitRatchetGradleTest can *sometimes* reproduce it
-						// but it's very erratic, and that test writes both to gradle cache
-						// and git cache very quickly.  Either of gradle or jgit might be
+						// but it's very erratic, and that test writes both to Gradle cache
+						// and git cache very quickly.  Either of Gradle or jgit might be
 						// caching something wrong because of the fast repeated writes.
 						if (!Arrays.equals(userFile, formatted)) {
 							// If the on-disk content is equal to the formatted content,
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPluginRedirect.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPluginRedirect.java
index 975ec5576e..bca8ea7c70 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPluginRedirect.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPluginRedirect.java
@@ -73,7 +73,7 @@ public void apply(Project project) {
 				"If you like the idea behind 'ratchetFrom', you should checkout spotless-changelog",
 				"https://github.com/diffplug/spotless-changelog");
 		if (gradleIsTooOld(project)) {
-			errorMsg = errorMsg.replace("To migrate:\n", "To migrate:\n- Upgrade gradle to " + SpotlessPlugin.VER_GRADLE_min + " or newer (you're on " + project.getGradle().getGradleVersion() + ")\n");
+			errorMsg = errorMsg.replace("To migrate:\n", "To migrate:\n- Upgrade Gradle to " + SpotlessPlugin.VER_GRADLE_min + " or newer (you're on " + project.getGradle().getGradleVersion() + ")\n");
 		}
 		throw new GradleException(errorMsg);
 	}
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessPluginRedirectTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessPluginRedirectTest.java
index acb57f3763..e8616043d1 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessPluginRedirectTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessPluginRedirectTest.java
@@ -54,7 +54,7 @@ void redirectPluginOldGradle() throws IOException {
 						"   > We have moved from 'com.diffplug.gradle.spotless'",
 						"                     to 'com.diffplug.spotless'",
 						"     To migrate:",
-						"     - Upgrade gradle to 6.1.1 or newer (you're on 5.0)",
+						"     - Upgrade Gradle to 6.1.1 or newer (you're on 5.0)",
 						"     - Test your build with: id 'com.diffplug.gradle.spotless' version '4.5.1'"));
 	}
 
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index e941297aa3..ec10d96592 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -696,7 +696,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [1.23.1] - 2019-06-17
 * Fixes incorrect M2 cache directory path handling of Eclipse based formatters ([#401](https://github.com/diffplug/spotless/issues/401))
-* Update jgit from `4.9.0.201710071750-r` to `5.3.2.201906051522-r` because gradle project is sometimes broken by `apache httpcomponents` in transitive dependency. ([#407](https://github.com/diffplug/spotless/pull/407))
+* Update jgit from `4.9.0.201710071750-r` to `5.3.2.201906051522-r` because Gradle project is sometimes broken by `apache httpcomponents` in transitive dependency. ([#407](https://github.com/diffplug/spotless/pull/407))
 
 ## [1.23.0] - 2019-04-24
 * Updated default ktlint from 0.21.0 to 0.32.0, and Maven coords to com.pinterest ([#394](https://github.com/diffplug/spotless/pull/394))
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenRunner.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenRunner.java
index d878b18c5f..3f4c163443 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenRunner.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenRunner.java
@@ -29,7 +29,7 @@
 
 /**
  * Harness for running a maven build, same idea as the
- * <a href="https://docs.gradle.org/current/javadoc/org/gradle/testkit/runner/GradleRunner.html">GradleRunner from the gradle testkit</a>.
+ * <a href="https://docs.gradle.org/current/javadoc/org/gradle/testkit/runner/GradleRunner.html">GradleRunner from the Gradle testkit</a>.
  */
 public class MavenRunner {
 	public static MavenRunner create() {

From 5cc0c55f37cdbce9d4c7e2f887b6f986ee6ee409 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Wed, 8 Nov 2023 10:38:01 +0800
Subject: [PATCH 1280/2068] Capitalized Maven names in docs

---
 CHANGES.md                                     | 18 +++++++++---------
 CONTRIBUTING.md                                |  2 +-
 ISSUE_TEMPLATE.md                              |  2 +-
 README.md                                      |  4 ++--
 .../npm/PrettierMissingParserException.java    |  2 +-
 plugin-gradle/CHANGES.md                       |  8 ++++----
 plugin-gradle/README.md                        |  4 ++--
 .../gradle/spotless/SpotlessCheck.java         |  2 +-
 .../spotless/SpotlessPluginRedirectTest.java   |  2 +-
 plugin-maven/CHANGES.md                        | 12 ++++++------
 plugin-maven/README.md                         |  4 ++--
 .../diffplug/spotless/maven/MavenRunner.java   |  4 ++--
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index d8d6a2a168..c1a11e3a0a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -21,7 +21,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
   The configuration is still the same, but you should switch to the new `biome` tag / function and adjust
   the version accordingly. ([#1804](https://github.com/diffplug/spotless/issues/1804)).
 * Support for `google-java-format`'s `skip-javadoc-formatting` option. ([#1793](https://github.com/diffplug/spotless/pull/1793))
-* Support configuration of mirrors for P2 repositories in maven DSL ([#1697](https://github.com/diffplug/spotless/issues/1697)).
+* Support configuration of mirrors for P2 repositories in Maven DSL ([#1697](https://github.com/diffplug/spotless/issues/1697)).
 * New line endings mode `GIT_ATTRIBUTES_FAST_ALLSAME`. ([#1838](https://github.com/diffplug/spotless/pull/1838))
 ### Fixed
 * Fix support for plugins when using Prettier version `3.0.0` and newer. ([#1802](https://github.com/diffplug/spotless/pull/1802))
@@ -135,7 +135,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [2.33.0] - 2023-01-26
 ### Added
-* `ProcessRunner` has added some convenience methods so it can be used for maven testing. ([#1496](https://github.com/diffplug/spotless/pull/1496))
+* `ProcessRunner` has added some convenience methods so it can be used for Maven testing. ([#1496](https://github.com/diffplug/spotless/pull/1496))
 * `ProcessRunner` allows to limit captured output to a certain number of bytes. ([#1511](https://github.com/diffplug/spotless/pull/1511))
 * `ProcessRunner` is now capable of handling long-running tasks where waiting for exit is delegated to the caller. ([#1511](https://github.com/diffplug/spotless/pull/1511))
 * Allow to specify node executable for node-based formatters using `nodeExecutable` parameter ([#1500](https://github.com/diffplug/spotless/pull/1500))
@@ -208,7 +208,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [2.29.0] - 2022-08-23
 ### Added
-* `scalafmt` integration now has a configuration option `majorScalaVersion` that allows you to configure the Scala version that gets resolved from the maven artifact ([#1283](https://github.com/diffplug/spotless/pull/1283))
+* `scalafmt` integration now has a configuration option `majorScalaVersion` that allows you to configure the Scala version that gets resolved from the Maven artifact ([#1283](https://github.com/diffplug/spotless/pull/1283))
   * Converted `scalafmt` integration to use a compile-only source set (fixes [#524](https://github.com/diffplug/spotless/issues/524))
 ### Changes
 * Add the `ktlint` rule in error messages when `ktlint` fails to apply a fix ([#1279](https://github.com/diffplug/spotless/pull/1279))
@@ -433,7 +433,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changed
 * Update ktfmt from 0.21 to 0.24
 ### Fixed
-* The `<url>` field in the maven POM is now set correctly ([#798](https://github.com/diffplug/spotless/issues/798))
+* The `<url>` field in the Maven POM is now set correctly ([#798](https://github.com/diffplug/spotless/issues/798))
 * Node is re-installed if some other build step removed it ([#863](https://github.com/diffplug/spotless/issues/863))
 
 ## [2.13.4] - 2021-04-21
@@ -507,7 +507,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [2.8.0] - 2020-10-05
 ### Added
-* Exposed new methods in `GitRatchet` to support faster ratcheting in the maven plugin ([#706](https://github.com/diffplug/spotless/pull/706)).
+* Exposed new methods in `GitRatchet` to support faster ratcheting in the Maven plugin ([#706](https://github.com/diffplug/spotless/pull/706)).
 
 ## [2.7.0] - 2020-09-21
 ### Added
@@ -578,10 +578,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * `FormatterFunc.NeedsFile` for implementing file-based formatters more cleanly than we have so far ([#637](https://github.com/diffplug/spotless/issues/637)).
 ### Changed
 * **BREAKING** `FileSignature` can no longer sign folders, only files.  Signatures are now based only on filename (not path), size, and a content hash.  It throws an error if a signature is attempted on a folder or on multiple files with different paths but the same filename - it never breaks silently.  This change does not break any of Spotless' internal logic, so it is unlikely to affect any of Spotless' consumers either. ([#571](https://github.com/diffplug/spotless/pull/571))
-  * This change allows the maven plugin to cache classloaders across subprojects when loading config resources from the classpath (fixes [#559](https://github.com/diffplug/spotless/issues/559)).
+  * This change allows the Maven plugin to cache classloaders across subprojects when loading config resources from the classpath (fixes [#559](https://github.com/diffplug/spotless/issues/559)).
   * This change also allows the Gradle plugin to work with the remote buildcache (fixes [#280](https://github.com/diffplug/spotless/issues/280)).
 * **BREAKING** `FormatterFunc` no longer `extends ThrowingEx.Function` and `BiFunction`. In a major win for Java's idea of ["target typing"](https://cr.openjdk.java.net/~briangoetz/lambda/lambda-state-final.html), this required no changes anywhere in the codebase except deleting the `extends` part of `FormatterFunc` ([#638](https://github.com/diffplug/spotless/issues/638)).
-* **BREAKING** Heavy refactor of the `LicenseHeaderStep` public API.  Doesn't change internal behavior, but makes implementation of the Gradle and maven plugins much easier. ([#628](https://github.com/diffplug/spotless/pull/628))
+* **BREAKING** Heavy refactor of the `LicenseHeaderStep` public API.  Doesn't change internal behavior, but makes implementation of the Gradle and Maven plugins much easier. ([#628](https://github.com/diffplug/spotless/pull/628))
 * **BREAKING** Removed all deprecated methods and classes from `lib` and `lib-extra`.
   * [#629](https://github.com/diffplug/spotless/pull/629) removes the code which wasn't being used in plugin-gradle or plugin-maven.
   * [#630](https://github.com/diffplug/spotless/pull/630) moves the code which was still being used in deprecated parts of plugin-gradle into `.deprecated` package in `plugin-gradle`, which allows us to break `lib` without a breaking change in `plugin-gradle`.
@@ -659,7 +659,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [1.27.0] - 2020-01-01
 * Ignored `KtLintStepTest`, because [gradle/gradle#11752](https://github.com/gradle/gradle/issues/11752) is causing too many CI failures. ([#499](https://github.com/diffplug/spotless/pull/499))
     * Also fixed a minor problem in TestProvisioner.
-* If you set the environment variable `SPOTLESS_EXCLUDE_MAVEN=true` then the maven plugin will be excluded from the build. ([#502](https://github.com/diffplug/spotless/pull/502))
+* If you set the environment variable `SPOTLESS_EXCLUDE_MAVEN=true` then the Maven plugin will be excluded from the build. ([#502](https://github.com/diffplug/spotless/pull/502))
     * We have set this in JitPack, as a workaround for [jitpack/jitpack.io#4112](https://github.com/jitpack/jitpack.io/issues/4112)
 * Deprecated `SpotlessCache.clear()` in favor of the new `SpotlessCache.clearOnce(Object key)`. ([#501](https://github.com/diffplug/spotless/issues/#501))
 
@@ -707,7 +707,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Updated default eclipse-jdt from 4.11.0 to 4.12.0 ([#423](https://github.com/diffplug/spotless/pull/423)).
 * Updated default eclipse-cdt from 4.11.0 to 4.12.0 ([#423](https://github.com/diffplug/spotless/pull/423)).
     * **KNOWN BUG - accidentally published CDT 9.7 rather than 9.8 - fixed in 1.26.0**
-* Added new maven coordinates for scalafmt 2.0.0+, maintains backwards compatability ([#415](https://github.com/diffplug/spotless/issues/415))
+* Added new Maven coordinates for scalafmt 2.0.0+, maintains backwards compatability ([#415](https://github.com/diffplug/spotless/issues/415))
 
 ## [1.23.1] - 2019-06-17
 * Fixes incorrect M2 cache directory path handling of Eclipse based formatters ([#401](https://github.com/diffplug/spotless/issues/401))
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 852a694470..287d835bca 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -27,7 +27,7 @@ Spotless also provides `PaddedCell`, which makes it easy to diagnose and correct
 
 ## Project layout
 
-For the folders below in monospace text, they are published on maven central at the coordinate `com.diffplug.spotless:spotless-${FOLDER_NAME}`.  The other folders are dev infrastructure.
+For the folders below in monospace text, they are published on MavenCentral at the coordinate `com.diffplug.spotless:spotless-${FOLDER_NAME}`.  The other folders are dev infrastructure.
 
 | Folder | Description |
 | ------ | ----------- |
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index 36cda06b7e..76d0ce19ab 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,7 +1,7 @@
 If you are submitting a **bug**, please include the following:
 
 - [ ] summary of problem
-- [ ] Gradle or maven version
+- [ ] Gradle or Maven version
 - [ ] spotless version
 - [ ] operating system and version
 - [ ] copy-paste your full Spotless configuration block(s), and a link to a public git repo that reproduces the problem if possible
diff --git a/README.md b/README.md
index 2c45e9e444..d31fd15b8c 100644
--- a/README.md
+++ b/README.md
@@ -169,7 +169,7 @@ Once someone has filled in one square of the formatter/build system matrix, it's
 
 ## Acknowledgements
 
-- Thanks to [Konstantin Lutovich](https://github.com/lutovich) for [implementing and maintaining the maven plugin](https://github.com/diffplug/spotless/pull/188), as well as fixing [remote-build cache support for Gradle](https://github.com/diffplug/spotless/pull/571).
+- Thanks to [Konstantin Lutovich](https://github.com/lutovich) for [implementing and maintaining the Maven plugin](https://github.com/diffplug/spotless/pull/188), as well as fixing [remote-build cache support for Gradle](https://github.com/diffplug/spotless/pull/571).
 - Thanks to [Frank Vennemeyer](https://github.com/fvgh) for [Groovy support via greclipse](https://github.com/diffplug/spotless/issues/13), [C++ support via CDT](https://github.com/diffplug/spotless/issues/232), [XML support via WTP](https://github.com/diffplug/spotless/pull/241) and a huge body of work with other eclipse-based formatters.
 - Thanks to [Jonathan Bluett-Duncan](https://github.com/jbduncan) for
   - implementing up-to-date checking [#31](https://github.com/diffplug/spotless/issues/31)
@@ -195,7 +195,7 @@ Once someone has filled in one square of the formatter/build system matrix, it's
 - Thanks to [Baptiste Mesta](https://github.com/baptistemesta) for
   - porting the DBeaver formatter to Spotless, and thanks to [DBeaver](https://dbeaver.jkiss.org/) and [its authors](https://github.com/serge-rider/dbeaver/graphs/contributors) for their excellent SQL formatter.
   - making license headers date-aware [#179](https://github.com/diffplug/spotless/pull/179)
-- Thanks to [vmdominguez](https://github.com/vmdominguez) and [Luis Fors](https://github.com/luis-fors-cb) for adding the ability to limit formatting to specific files in Gradle ([#322](https://github.com/diffplug/spotless/pull/322)) and maven ([#392](https://github.com/diffplug/spotless/pull/392)), respectively.
+- Thanks to [vmdominguez](https://github.com/vmdominguez) and [Luis Fors](https://github.com/luis-fors-cb) for adding the ability to limit formatting to specific files in Gradle ([#322](https://github.com/diffplug/spotless/pull/322)) and Maven ([#392](https://github.com/diffplug/spotless/pull/392)), respectively.
 - Thanks to [bender316](https://github.com/bender316) for fixing classloading on Java 9 ([#426](https://github.com/diffplug/spotless/pull/426)).
 - Thanks to [Stefan Oehme](https://github.com/oehme) for tons of help on the internal mechanics of Gradle.
 - Thanks to [eyalkaspi](https://github.com/eyalkaspi) for adding configurable date ranges to the date-aware license headers.
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/PrettierMissingParserException.java b/lib/src/main/java/com/diffplug/spotless/npm/PrettierMissingParserException.java
index 4debfd5720..cc04c7b182 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/PrettierMissingParserException.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/PrettierMissingParserException.java
@@ -96,7 +96,7 @@ private static String recommendPlugin(File file) {
 				+ "\n\n"
 				+ "For instructions on how to include plugins for prettier in spotless see our documentation:\n"
 				+ "- for Gradle <https://github.com/diffplug/spotless/tree/main/plugin-gradle#prettier-plugins>\n"
-				+ "- for maven <https://github.com/diffplug/spotless/tree/main/plugin-maven#prettier-plugins>";
+				+ "- for Maven <https://github.com/diffplug/spotless/tree/main/plugin-maven#prettier-plugins>";
 	}
 
 	private static String guessPlugin(File file) {
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index ac3e4f1c38..e2379a8b5c 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -211,7 +211,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [6.10.0] - 2022-08-23
 ### Added
-* `scalafmt` integration now has a configuration option `majorScalaVersion` that allows you to configure the Scala version that gets resolved from the maven artifact ([#1283](https://github.com/diffplug/spotless/pull/1283))
+* `scalafmt` integration now has a configuration option `majorScalaVersion` that allows you to configure the Scala version that gets resolved from the Maven artifact ([#1283](https://github.com/diffplug/spotless/pull/1283))
 ### Changes
 * Add the `ktlint` rule in error messages when `ktlint` fails to apply a fix ([#1279](https://github.com/diffplug/spotless/pull/1279))
 * Bump default `scalafmt` to latest `3.0.8` -> `3.5.9` (removed support for pre-`3.0.0`) ([#1283](https://github.com/diffplug/spotless/pull/1283))
@@ -496,7 +496,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changed
 * Update ktfmt from 0.21 to 0.24
 ### Fixed
-* The `<url>` field in the maven POM is now set correctly ([#798](https://github.com/diffplug/spotless/issues/798))
+* The `<url>` field in the Maven POM is now set correctly ([#798](https://github.com/diffplug/spotless/issues/798))
 * Node is re-installed if some other build step removed it ([#863](https://github.com/diffplug/spotless/issues/863))
 
 ## [5.12.4] - 2021-04-21
@@ -864,7 +864,7 @@ spotless {
 * Updated default eclipse-jdt from 4.11.0 to 4.12.0 ([#423](https://github.com/diffplug/spotless/pull/423)).
 * Updated default eclipse-cdt from 4.11.0 to 4.12.0 ([#423](https://github.com/diffplug/spotless/pull/423)).
     * **KNOWN BUG - accidentally published CDT 9.7 rather than 9.8 - fixed in 3.26.0**
-* Added new maven coordinates for scalafmt 2.0.0+, maintains backwards compatability ([#415](https://github.com/diffplug/spotless/issues/415))
+* Added new Maven coordinates for scalafmt 2.0.0+, maintains backwards compatability ([#415](https://github.com/diffplug/spotless/issues/415))
 
 ## [3.23.1] - 2019-06-17
 * Fixes incorrect M2 cache directory path handling of Eclipse based formatters ([#401](https://github.com/diffplug/spotless/issues/401))
@@ -1028,7 +1028,7 @@ spotless {
 
 ## [3.0.0] - 2017-01-09
 * BREAKING CHANGE: `customReplace` and `customReplaceRegex` renamed to just `replace` and `replaceRegex`.
-* BREAKING CHANGE: Plugin portal ID is still `com.diffplug.gradle.spotless`, but maven coordinate has changed to `com.diffplug.spotless:spotless-plugin-gradle`.
+* BREAKING CHANGE: Plugin portal ID is still `com.diffplug.gradle.spotless`, but Maven coordinate has changed to `com.diffplug.spotless:spotless-plugin-gradle`.
 * HUGE SPEEDUP: Now supports incremental build / up-to-date-checking.
   + If you are using `custom` or `customLazy`, you might want to take a look at [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/3.27.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-).
 * BREAKING CHANGE: `freshmark` no longer includes all project properties by default.  All properties must now be added manually:
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 16285f88ad..4a879fe49a 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -5,7 +5,7 @@
 output = [
   link(shield('Gradle plugin', 'plugins.gradle.org', 'com.diffplug.spotless', 'blue'), 'https://plugins.gradle.org/plugin/com.diffplug.spotless'),
   link(shield('Changelog', 'changelog', '{{versionLast}}', 'blue'), 'CHANGES.md'),
-  link(shield('Maven central', 'mavencentral', 'here', 'blue'), 'https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22'),
+  link(shield('MavenCentral', 'mavencentral', 'here', 'blue'), 'https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22'),
   link(shield('Javadoc', 'javadoc', 'here', 'blue'), 'https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/{{versionLast}}/index.html'),
   '',
   link(shield('VS Code plugin', 'IDE', 'VS Code', 'blueviolet'), 'https://marketplace.visualstudio.com/items?itemName=richardwillis.vscode-spotless-gradle'),
@@ -15,7 +15,7 @@ output = [
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
 [![Changelog](https://img.shields.io/badge/changelog-6.22.0-blue.svg)](CHANGES.md)
-[![Maven central](https://img.shields.io/badge/mavencentral-here-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
+[![MavenCentral](https://img.shields.io/badge/mavencentral-here-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
 [![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/index.html)
 
 [![VS Code plugin](https://img.shields.io/badge/IDE-VS_Code-blueviolet.svg)](https://marketplace.visualstudio.com/items?itemName=richardwillis.vscode-spotless-gradle)
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessCheck.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessCheck.java
index 98b88315ad..95f051371b 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessCheck.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessCheck.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessPluginRedirectTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessPluginRedirectTest.java
index e8616043d1..a427d6f2ec 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessPluginRedirectTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessPluginRedirectTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 DiffPlug
+ * Copyright 2020-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index ec10d96592..10ebfc57c1 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -142,7 +142,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Respect `sourceDirectory` and `testSourceDirectory` POM configurations for Java formatters ([#1553](https://github.com/diffplug/spotless/pull/1553))
 * **POTENTIALLY BREAKING** `sortByKeys` for JSON formatting now takes into account objects inside arrays ([#1546](https://github.com/diffplug/spotless/pull/1546))
-* Any commit of the Spotless maven plugin now available via JitPack ([#1547](https://github.com/diffplug/spotless/pull/1547))
+* Any commit of the Spotless Maven plugin now available via JitPack ([#1547](https://github.com/diffplug/spotless/pull/1547))
 
 ## [2.31.0] - 2023-01-26
 ### Added
@@ -228,7 +228,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [2.25.0] - 2022-08-23
 ### Added
-* `scalafmt` integration now has a configuration option `majorScalaVersion` that allows you to configure the Scala version that gets resolved from the maven artifact ([#1283](https://github.com/diffplug/spotless/pull/1283))
+* `scalafmt` integration now has a configuration option `majorScalaVersion` that allows you to configure the Scala version that gets resolved from the Maven artifact ([#1283](https://github.com/diffplug/spotless/pull/1283))
 ### Changes
 * Add the `ktlint` rule in error messages when `ktlint` fails to apply a fix ([#1279](https://github.com/diffplug/spotless/pull/1279))
 * Bump default `scalafmt` to latest `3.0.8` -> `3.5.9` (removed support for pre-`3.0.0`) ([#1283](https://github.com/diffplug/spotless/pull/1283))
@@ -462,7 +462,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changed
 * Update ktfmt from 0.21 to 0.24
 ### Fixed
-* The `<url>` field in the maven POM is now set correctly ([#798](https://github.com/diffplug/spotless/issues/798))
+* The `<url>` field in the Maven POM is now set correctly ([#798](https://github.com/diffplug/spotless/issues/798))
 
 ## [2.10.3] - 2021-04-21
 ### Fixed
@@ -596,7 +596,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * `prettier` will now autodetect the parser (and formatter) to use based on the filename, unless you override this using `config` or `configFile` with the option `parser` or `filepath` ([#620](https://github.com/diffplug/spotless/pull/620)).
 * Added ANTLR4 support ([#326](https://github.com/diffplug/spotless/issues/326)).
 ### Removed
-* **BREAKING** the default includes for `<typescript>` and `<cpp>` were removed, and will now generate an error if an `<include>` is not specified.  There is no well-established convention for these languages in the maven ecosystem, and the performance of the default includes is far worse than a user-provided one.  If you dislike this change, please complain in [#634](https://github.com/diffplug/spotless/pull/634), it would not be a breaking change to bring the defaults back.
+* **BREAKING** the default includes for `<typescript>` and `<cpp>` were removed, and will now generate an error if an `<include>` is not specified.  There is no well-established convention for these languages in the Maven ecosystem, and the performance of the default includes is far worse than a user-provided one.  If you dislike this change, please complain in [#634](https://github.com/diffplug/spotless/pull/634), it would not be a breaking change to bring the defaults back.
 * **BREAKING** inside the `<cpp>` block, `<eclipse>` has been renamed to `<eclipseCdt>` to avoid any confusion with the java `<eclipse>` ([#636](https://github.com/diffplug/spotless/pull/636)).
 * **BREAKING** the long-deprecated `<xml>` and `<css>` formats have been removed, in favor of the long-available [`<eclipseWtp>`](https://github.com/diffplug/spotless/tree/main/plugin-maven#eclipse-wtp) step which is available in every generic format ([#630](https://github.com/diffplug/spotless/pull/630)).
   * This probably doesn't affect you, but if it does, you just need to change `<xml>...` into `<formats><format><eclipseWtp><type>XML</type>...`
@@ -644,7 +644,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * Enable IntelliJ-compatible token `$today.year` for specifying the year in license header files. ([#542](https://github.com/diffplug/spotless/pull/542))
 ### Fixed
-* Fix scala and kotlin maven config documentation.
+* Fix scala and kotlin Maven config documentation.
 * Eclipse-WTP formatter (web tools platform, not java) could encounter errors in parallel multiproject builds [#492](https://github.com/diffplug/spotless/issues/492). Fixed for Eclipse-WTP formatter Eclipse version 4.13.0 (default version).
 
 ## [1.27.0] - 2020-01-01
@@ -692,7 +692,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Updated default eclipse-jdt from 4.11.0 to 4.12.0 ([#423](https://github.com/diffplug/spotless/pull/423)).
 * Updated default eclipse-cdt from 4.11.0 to 4.12.0 ([#423](https://github.com/diffplug/spotless/pull/423)).
     * **KNOWN BUG - accidentally published CDT 9.7 rather than 9.8 fixed in 1.26.0**
-* Added new maven coordinates for scalafmt 2.0.0+, maintains backwards compatability ([#415](https://github.com/diffplug/spotless/issues/415))
+* Added new Maven coordinates for scalafmt 2.0.0+, maintains backwards compatability ([#415](https://github.com/diffplug/spotless/issues/415))
 
 ## [1.23.1] - 2019-06-17
 * Fixes incorrect M2 cache directory path handling of Eclipse based formatters ([#401](https://github.com/diffplug/spotless/issues/401))
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 3294575e20..651eaa6720 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -2,12 +2,12 @@
 
 <!---freshmark shields
 output = [
-  link(shield('Maven central', 'mavencentral', '{{group}}:{{artifactIdMaven}}', 'blue'), 'https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22{{group}}%22%20AND%20a%3A%22{{artifactIdMaven}}%22'),
+  link(shield('MavenCentral', 'mavencentral', '{{group}}:{{artifactIdMaven}}', 'blue'), 'https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22{{group}}%22%20AND%20a%3A%22{{artifactIdMaven}}%22'),
   link(shield('Changelog', 'changelog', '{{versionLast}}', 'blue'), 'CHANGES.md'),
   link(shield('Javadoc', 'javadoc', 'here', 'blue'), 'https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/{{versionLast}}/index.html')
   ].join('\n');
 -->
-[![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
+[![MavenCentral](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
 [![Changelog](https://img.shields.io/badge/changelog-2.40.0-blue.svg)](CHANGES.md)
 [![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.40.0/index.html)
 <!---freshmark /shields -->
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenRunner.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenRunner.java
index 3f4c163443..c8d845f8a2 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenRunner.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenRunner.java
@@ -28,7 +28,7 @@
 import com.diffplug.spotless.ProcessRunner;
 
 /**
- * Harness for running a maven build, same idea as the
+ * Harness for running a Maven build, same idea as the
  * <a href="https://docs.gradle.org/current/javadoc/org/gradle/testkit/runner/GradleRunner.html">GradleRunner from the Gradle testkit</a>.
  */
 public class MavenRunner {
@@ -67,7 +67,7 @@ public MavenRunner withRemoteDebug(int port) {
 	private ProcessRunner.Result run() throws IOException, InterruptedException {
 		Objects.requireNonNull(projectDir, "Need to call withProjectDir() first");
 		Objects.requireNonNull(args, "Need to call withArguments() first");
-		// run maven with the given args in the given directory
+		// run Maven with the given args in the given directory
 		String argsString = "-e " + String.join(" ", Arrays.asList(args));
 		return runner.shellWinUnix(projectDir, environment, "mvnw " + argsString, "./mvnw " + argsString);
 	}

From 2ff556b74e485dec0115bf1db35cde99e78e025a Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sun, 19 Nov 2023 01:46:50 +0800
Subject: [PATCH 1281/2068] Check if EditorConfig file exist for Ktlint in
 KotlinGradleExtension

Follow up 959fd854c36080caa13123de2089ebcb7396adb4.
---
 plugin-gradle/CHANGES.md                                   | 1 +
 .../diffplug/gradle/spotless/KotlinGradleExtension.java    | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index e2379a8b5c..9d833b0076 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Fixed
 * Fix Eclipse JDT on some settings files. ([#1864](https://github.com/diffplug/spotless/pull/1864) fixes [#1638](https://github.com/diffplug/spotless/issues/1638))
+* Check if EditorConfig file exist for Ktlint in KotlinGradleExtension. ([#1889](https://github.com/diffplug/spotless/pull/1889)
 ### Changes
 * Bump default `ktlint` version to latest `1.0.0` -> `1.0.1`. ([#1855](https://github.com/diffplug/spotless/pull/1855))
 ### Fixed
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
index b3351194ba..751b649491 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
@@ -74,11 +74,14 @@ public class KotlinFormatExtension {
 		}
 
 		public KotlinFormatExtension setEditorConfigPath(Object editorConfigPath) throws IOException {
-
 			if (editorConfigPath == null) {
 				this.editorConfigPath = null;
 			} else {
-				this.editorConfigPath = FileSignature.signAsList(getProject().file(editorConfigPath));
+				File editorConfigFile = getProject().file(editorConfigPath);
+				if (!editorConfigFile.exists()) {
+					throw new IllegalArgumentException("EditorConfig file does not exist: " + editorConfigFile);
+				}
+				this.editorConfigPath = FileSignature.signAsList(editorConfigFile);
 			}
 			replaceStep(createStep());
 			return this;

From 459708539308161e9f9f91de99a453053535dfb1 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sun, 19 Nov 2023 01:55:53 +0800
Subject: [PATCH 1282/2068] Reuse configs for KotlinExtension and
 KotlinGradleExtension

---
 .../diffplug/spotless/kotlin/DiktatStep.java  |   4 -
 .../diffplug/spotless/kotlin/KtLintStep.java  |  17 --
 .../gradle/spotless/BaseKotlinExtension.java  | 209 ++++++++++++++++++
 .../gradle/spotless/KotlinExtension.java      | 183 +--------------
 .../spotless/KotlinGradleExtension.java       | 189 +---------------
 5 files changed, 217 insertions(+), 385 deletions(-)
 create mode 100644 plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java

diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
index fefda39784..a2650e31fc 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
@@ -53,10 +53,6 @@ public static FormatterStep create(String versionDiktat, Provisioner provisioner
 		return create(versionDiktat, provisioner, false, config);
 	}
 
-	public static FormatterStep createForScript(String versionDiktat, Provisioner provisioner, @Nullable FileSignature config) {
-		return create(versionDiktat, provisioner, true, config);
-	}
-
 	public static FormatterStep create(String versionDiktat, Provisioner provisioner, boolean isScript, @Nullable FileSignature config) {
 		if (BadSemver.version(versionDiktat) < BadSemver.version(MIN_SUPPORTED_VERSION)) {
 			throw new IllegalStateException("Minimum required Diktat version is " + MIN_SUPPORTED_VERSION + ", you tried " + versionDiktat + " which is too old");
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index 4aca4da02e..13fba97c57 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -54,23 +54,6 @@ public static FormatterStep create(String version, Provisioner provisioner,
 		return create(version, provisioner, false, null, userData, editorConfigOverride);
 	}
 
-	public static FormatterStep createForScript(String version, Provisioner provisioner) {
-		return create(version, provisioner, true, null, Collections.emptyMap(), Collections.emptyMap());
-	}
-
-	public static FormatterStep createForScript(String version,
-			Provisioner provisioner,
-			@Nullable FileSignature editorConfigPath,
-			Map<String, String> userData,
-			Map<String, Object> editorConfigOverride) {
-		return create(version,
-				provisioner,
-				true,
-				editorConfigPath,
-				userData,
-				editorConfigOverride);
-	}
-
 	public static FormatterStep create(String version,
 			Provisioner provisioner,
 			boolean isScript,
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java
new file mode 100644
index 0000000000..5ced54a94e
--- /dev/null
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java
@@ -0,0 +1,209 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.gradle.spotless;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Consumer;
+
+import javax.annotation.Nullable;
+
+import com.diffplug.common.collect.ImmutableSortedMap;
+import com.diffplug.spotless.FileSignature;
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.kotlin.DiktatStep;
+import com.diffplug.spotless.kotlin.KtLintStep;
+import com.diffplug.spotless.kotlin.KtfmtStep;
+
+public abstract class BaseKotlinExtension extends FormatExtension {
+	public BaseKotlinExtension(SpotlessExtension spotless) {
+		super(spotless);
+	}
+
+	public DiktatConfig diktat() {
+		return diktat(DiktatStep.defaultVersionDiktat());
+	}
+
+	/** Adds the specified version of <a href="https://github.com/cqfn/diKTat">diktat</a>. */
+	public DiktatConfig diktat(String version) {
+		return new DiktatConfig(version);
+	}
+
+	public KtlintConfig ktlint() throws IOException {
+		return ktlint(KtLintStep.defaultVersion());
+	}
+
+	/** Adds the specified version of <a href="https://github.com/pinterest/ktlint">ktlint</a>. */
+	public KtlintConfig ktlint(String version) throws IOException {
+		return new KtlintConfig(version, Collections.emptyMap(), Collections.emptyMap());
+	}
+
+	/** Uses the <a href="https://github.com/facebookincubator/ktfmt">ktfmt</a> jar to format source code. */
+	public KtfmtConfig ktfmt() {
+		return ktfmt(KtfmtStep.defaultVersion());
+	}
+
+	/**
+	 * Uses the given version of <a href="https://github.com/facebookincubator/ktfmt">ktfmt</a> and applies the dropbox style
+	 * option to format source code.
+	 */
+	public KtfmtConfig ktfmt(String version) {
+		return new KtfmtConfig(version);
+	}
+
+	protected abstract boolean isScript();
+
+	public class DiktatConfig {
+
+		private final String version;
+		private FileSignature config;
+
+		DiktatConfig(String version) {
+			Objects.requireNonNull(version, "version");
+			this.version = version;
+			addStep(createStep());
+		}
+
+		public DiktatConfig configFile(Object file) throws IOException {
+			// Specify the path to the configuration file
+			if (file == null) {
+				this.config = null;
+			} else {
+				this.config = FileSignature.signAsList(getProject().file(file));
+			}
+			replaceStep(createStep());
+			return this;
+		}
+
+		private FormatterStep createStep() {
+			return DiktatStep.create(version, provisioner(), isScript(), config);
+		}
+	}
+
+	public class KtfmtConfig {
+		final String version;
+		KtfmtStep.Style style;
+		KtfmtStep.KtfmtFormattingOptions options;
+
+		private final ConfigurableStyle configurableStyle = new ConfigurableStyle();
+
+		KtfmtConfig(String version) {
+			Objects.requireNonNull(version);
+			this.version = Objects.requireNonNull(version);
+			addStep(createStep());
+		}
+
+		private ConfigurableStyle style(KtfmtStep.Style style) {
+			this.style = style;
+			replaceStep(createStep());
+			return configurableStyle;
+		}
+
+		public ConfigurableStyle dropboxStyle() {
+			return style(KtfmtStep.Style.DROPBOX);
+		}
+
+		public ConfigurableStyle googleStyle() {
+			return style(KtfmtStep.Style.GOOGLE);
+		}
+
+		public ConfigurableStyle kotlinlangStyle() {
+			return style(KtfmtStep.Style.KOTLINLANG);
+		}
+
+		public void configure(Consumer<KtfmtStep.KtfmtFormattingOptions> optionsConfiguration) {
+			this.configurableStyle.configure(optionsConfiguration);
+		}
+
+		private FormatterStep createStep() {
+			return KtfmtStep.create(version, provisioner(), style, options);
+		}
+
+		public class ConfigurableStyle {
+
+			public void configure(Consumer<KtfmtStep.KtfmtFormattingOptions> optionsConfiguration) {
+				KtfmtStep.KtfmtFormattingOptions ktfmtFormattingOptions = new KtfmtStep.KtfmtFormattingOptions();
+				optionsConfiguration.accept(ktfmtFormattingOptions);
+				options = ktfmtFormattingOptions;
+				replaceStep(createStep());
+			}
+		}
+	}
+
+	public class KtlintConfig {
+
+		private final String version;
+		@Nullable
+		private FileSignature editorConfigPath;
+		private Map<String, String> userData;
+		private Map<String, Object> editorConfigOverride;
+
+		KtlintConfig(String version, Map<String, String> config,
+				Map<String, Object> editorConfigOverride) throws IOException {
+			Objects.requireNonNull(version);
+			File defaultEditorConfig = getProject().getRootProject().file(".editorconfig");
+			FileSignature editorConfigPath = defaultEditorConfig.exists() ? FileSignature.signAsList(defaultEditorConfig) : null;
+			this.version = version;
+			this.editorConfigPath = editorConfigPath;
+			this.userData = config;
+			this.editorConfigOverride = editorConfigOverride;
+			addStep(createStep());
+		}
+
+		public KtlintConfig setEditorConfigPath(Object editorConfigPath) throws IOException {
+			if (editorConfigPath == null) {
+				this.editorConfigPath = null;
+			} else {
+				File editorConfigFile = getProject().file(editorConfigPath);
+				if (!editorConfigFile.exists()) {
+					throw new IllegalArgumentException("EditorConfig file does not exist: " + editorConfigFile);
+				}
+				this.editorConfigPath = FileSignature.signAsList(editorConfigFile);
+			}
+			replaceStep(createStep());
+			return this;
+		}
+
+		public KtlintConfig userData(Map<String, String> userData) {
+			// Copy the map to a sorted map because up-to-date checking is based on binary-equals of the serialized
+			// representation.
+			this.userData = ImmutableSortedMap.copyOf(userData);
+			replaceStep(createStep());
+			return this;
+		}
+
+		public KtlintConfig editorConfigOverride(Map<String, Object> editorConfigOverride) {
+			// Copy the map to a sorted map because up-to-date checking is based on binary-equals of the serialized
+			// representation.
+			this.editorConfigOverride = ImmutableSortedMap.copyOf(editorConfigOverride);
+			replaceStep(createStep());
+			return this;
+		}
+
+		private FormatterStep createStep() {
+			return KtLintStep.create(
+					version,
+					provisioner(),
+					isScript(),
+					editorConfigPath,
+					userData,
+					editorConfigOverride);
+		}
+	}
+}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
index 27d93717f4..21ccb8dd0f 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
@@ -17,28 +17,11 @@
 
 import static com.diffplug.spotless.kotlin.KotlinConstants.LICENSE_HEADER_DELIMITER;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Map;
-import java.util.Objects;
-import java.util.function.Consumer;
-
-import javax.annotation.Nullable;
 import javax.inject.Inject;
 
 import org.gradle.api.tasks.SourceSet;
 
-import com.diffplug.common.collect.ImmutableSortedMap;
-import com.diffplug.spotless.FileSignature;
-import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.kotlin.DiktatStep;
-import com.diffplug.spotless.kotlin.KtLintStep;
-import com.diffplug.spotless.kotlin.KtfmtStep;
-import com.diffplug.spotless.kotlin.KtfmtStep.KtfmtFormattingOptions;
-import com.diffplug.spotless.kotlin.KtfmtStep.Style;
-
-public class KotlinExtension extends FormatExtension implements HasBuiltinDelimiterForLicense, JvmLang {
+public class KotlinExtension extends BaseKotlinExtension implements HasBuiltinDelimiterForLicense, JvmLang {
 	static final String NAME = "kotlin";
 
 	@Inject
@@ -56,167 +39,9 @@ public LicenseHeaderConfig licenseHeaderFile(Object licenseHeaderFile) {
 		return licenseHeaderFile(licenseHeaderFile, LICENSE_HEADER_DELIMITER);
 	}
 
-	/** Adds the specified version of <a href="https://github.com/pinterest/ktlint">ktlint</a>. */
-	public KotlinFormatExtension ktlint(String version) throws IOException {
-		Objects.requireNonNull(version);
-		File defaultEditorConfig = getProject().getRootProject().file(".editorconfig");
-		FileSignature editorConfigPath = defaultEditorConfig.exists() ? FileSignature.signAsList(defaultEditorConfig) : null;
-		return new KotlinFormatExtension(version, editorConfigPath, Collections.emptyMap(), Collections.emptyMap());
-	}
-
-	public KotlinFormatExtension ktlint() throws IOException {
-		return ktlint(KtLintStep.defaultVersion());
-	}
-
-	public class KotlinFormatExtension {
-
-		private final String version;
-		@Nullable
-		private FileSignature editorConfigPath;
-		private Map<String, String> userData;
-		private Map<String, Object> editorConfigOverride;
-
-		KotlinFormatExtension(String version, @Nullable FileSignature editorConfigPath, Map<String, String> config,
-				Map<String, Object> editorConfigOverride) {
-			this.version = version;
-			this.editorConfigPath = editorConfigPath;
-			this.userData = config;
-			this.editorConfigOverride = editorConfigOverride;
-			addStep(createStep());
-		}
-
-		public KotlinFormatExtension setEditorConfigPath(Object editorConfigPath) throws IOException {
-			if (editorConfigPath == null) {
-				this.editorConfigPath = null;
-			} else {
-				File editorConfigFile = getProject().file(editorConfigPath);
-				if (!editorConfigFile.exists()) {
-					throw new IllegalArgumentException("EditorConfig file does not exist: " + editorConfigFile);
-				}
-				this.editorConfigPath = FileSignature.signAsList(editorConfigFile);
-			}
-			replaceStep(createStep());
-			return this;
-		}
-
-		public KotlinFormatExtension userData(Map<String, String> userData) {
-			// Copy the map to a sorted map because up-to-date checking is based on binary-equals of the serialized
-			// representation.
-			this.userData = ImmutableSortedMap.copyOf(userData);
-			replaceStep(createStep());
-			return this;
-		}
-
-		public KotlinFormatExtension editorConfigOverride(Map<String, Object> editorConfigOverride) {
-			// Copy the map to a sorted map because up-to-date checking is based on binary-equals of the serialized
-			// representation.
-			this.editorConfigOverride = ImmutableSortedMap.copyOf(editorConfigOverride);
-			replaceStep(createStep());
-			return this;
-		}
-
-		private FormatterStep createStep() {
-			return KtLintStep.create(version, provisioner(), false, editorConfigPath, userData, editorConfigOverride);
-		}
-	}
-
-	/** Uses the <a href="https://github.com/facebookincubator/ktfmt">ktfmt</a> jar to format source code. */
-	public KtfmtConfig ktfmt() {
-		return ktfmt(KtfmtStep.defaultVersion());
-	}
-
-	/**
-	 * Uses the given version of <a href="https://github.com/facebookincubator/ktfmt">ktfmt</a> and applies the dropbox style
-	 * option to format source code.
-	 */
-	public KtfmtConfig ktfmt(String version) {
-		Objects.requireNonNull(version);
-		return new KtfmtConfig(version);
-	}
-
-	public class KtfmtConfig {
-		final String version;
-		Style style;
-		KtfmtFormattingOptions options;
-
-		private final ConfigurableStyle configurableStyle = new ConfigurableStyle();
-
-		KtfmtConfig(String version) {
-			this.version = Objects.requireNonNull(version);
-			addStep(createStep());
-		}
-
-		private ConfigurableStyle style(Style style) {
-			this.style = style;
-			replaceStep(createStep());
-			return configurableStyle;
-		}
-
-		public ConfigurableStyle dropboxStyle() {
-			return style(Style.DROPBOX);
-		}
-
-		public ConfigurableStyle googleStyle() {
-			return style(Style.GOOGLE);
-		}
-
-		public ConfigurableStyle kotlinlangStyle() {
-			return style(Style.KOTLINLANG);
-		}
-
-		public void configure(Consumer<KtfmtFormattingOptions> optionsConfiguration) {
-			this.configurableStyle.configure(optionsConfiguration);
-		}
-
-		private FormatterStep createStep() {
-			return KtfmtStep.create(version, provisioner(), style, options);
-		}
-
-		public class ConfigurableStyle {
-
-			public void configure(Consumer<KtfmtFormattingOptions> optionsConfiguration) {
-				KtfmtFormattingOptions ktfmtFormattingOptions = new KtfmtFormattingOptions();
-				optionsConfiguration.accept(ktfmtFormattingOptions);
-				options = ktfmtFormattingOptions;
-				replaceStep(createStep());
-			}
-		}
-	}
-
-	/** Adds the specified version of <a href="https://github.com/cqfn/diKTat">diktat</a>. */
-	public DiktatFormatExtension diktat(String version) {
-		Objects.requireNonNull(version);
-		return new DiktatFormatExtension(version);
-	}
-
-	public DiktatFormatExtension diktat() {
-		return diktat(DiktatStep.defaultVersionDiktat());
-	}
-
-	public class DiktatFormatExtension {
-
-		private final String version;
-		private FileSignature config;
-
-		DiktatFormatExtension(String version) {
-			this.version = version;
-			addStep(createStep());
-		}
-
-		public DiktatFormatExtension configFile(Object file) throws IOException {
-			// Specify the path to the configuration file
-			if (file == null) {
-				this.config = null;
-			} else {
-				this.config = FileSignature.signAsList(getProject().file(file));
-			}
-			replaceStep(createStep());
-			return this;
-		}
-
-		private FormatterStep createStep() {
-			return DiktatStep.create(version, provisioner(), config);
-		}
+	@Override
+	protected boolean isScript() {
+		return false;
 	}
 
 	/** If the user hasn't specified the files yet, we'll assume he/she means all of the kotlin files. */
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
index 751b649491..5cf2847d62 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
@@ -15,26 +15,9 @@
  */
 package com.diffplug.gradle.spotless;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Map;
-import java.util.Objects;
-import java.util.function.Consumer;
-
-import javax.annotation.Nullable;
 import javax.inject.Inject;
 
-import com.diffplug.common.collect.ImmutableSortedMap;
-import com.diffplug.spotless.FileSignature;
-import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.kotlin.DiktatStep;
-import com.diffplug.spotless.kotlin.KtLintStep;
-import com.diffplug.spotless.kotlin.KtfmtStep;
-import com.diffplug.spotless.kotlin.KtfmtStep.KtfmtFormattingOptions;
-import com.diffplug.spotless.kotlin.KtfmtStep.Style;
-
-public class KotlinGradleExtension extends FormatExtension {
+public class KotlinGradleExtension extends BaseKotlinExtension {
 	private static final String GRADLE_KOTLIN_DSL_FILE_EXTENSION = "*.gradle.kts";
 
 	static final String NAME = "kotlinGradle";
@@ -44,173 +27,9 @@ public KotlinGradleExtension(SpotlessExtension spotless) {
 		super(spotless);
 	}
 
-	/** Adds the specified version of <a href="https://github.com/pinterest/ktlint">ktlint</a>. */
-	public KotlinFormatExtension ktlint(String version) throws IOException {
-		Objects.requireNonNull(version, "version");
-		File defaultEditorConfig = getProject().getRootProject().file(".editorconfig");
-		FileSignature editorConfigPath = defaultEditorConfig.exists() ? FileSignature.signAsList(defaultEditorConfig) : null;
-		return new KotlinFormatExtension(version, editorConfigPath, Collections.emptyMap(), Collections.emptyMap());
-	}
-
-	public KotlinFormatExtension ktlint() throws IOException {
-		return ktlint(KtLintStep.defaultVersion());
-	}
-
-	public class KotlinFormatExtension {
-
-		private final String version;
-		@Nullable
-		private FileSignature editorConfigPath;
-		private Map<String, String> userData;
-		private Map<String, Object> editorConfigOverride;
-
-		KotlinFormatExtension(String version, FileSignature editorConfigPath, Map<String, String> config,
-				Map<String, Object> editorConfigOverride) {
-			this.version = version;
-			this.editorConfigPath = editorConfigPath;
-			this.userData = config;
-			this.editorConfigOverride = editorConfigOverride;
-			addStep(createStep());
-		}
-
-		public KotlinFormatExtension setEditorConfigPath(Object editorConfigPath) throws IOException {
-			if (editorConfigPath == null) {
-				this.editorConfigPath = null;
-			} else {
-				File editorConfigFile = getProject().file(editorConfigPath);
-				if (!editorConfigFile.exists()) {
-					throw new IllegalArgumentException("EditorConfig file does not exist: " + editorConfigFile);
-				}
-				this.editorConfigPath = FileSignature.signAsList(editorConfigFile);
-			}
-			replaceStep(createStep());
-			return this;
-		}
-
-		public KotlinFormatExtension userData(Map<String, String> userData) {
-			// Copy the map to a sorted map because up-to-date checking is based on binary-equals of the serialized
-			// representation.
-			this.userData = ImmutableSortedMap.copyOf(userData);
-			replaceStep(createStep());
-			return this;
-		}
-
-		public KotlinFormatExtension editorConfigOverride(Map<String, Object> editorConfigOverride) {
-			// Copy the map to a sorted map because up-to-date checking is based on binary-equals of the serialized
-			// representation.
-			this.editorConfigOverride = ImmutableSortedMap.copyOf(editorConfigOverride);
-			replaceStep(createStep());
-			return this;
-		}
-
-		private FormatterStep createStep() {
-			return KtLintStep.createForScript(
-					version,
-					provisioner(),
-					editorConfigPath,
-					userData,
-					editorConfigOverride);
-		}
-	}
-
-	/** Uses the <a href="https://github.com/facebookincubator/ktfmt">ktfmt</a> jar to format source code. */
-	public KtfmtConfig ktfmt() {
-		return ktfmt(KtfmtStep.defaultVersion());
-	}
-
-	/**
-	 * Uses the given version of <a href="https://github.com/facebookincubator/ktfmt">ktfmt</a> to format source
-	 * code.
-	 */
-	public KtfmtConfig ktfmt(String version) {
-		Objects.requireNonNull(version);
-		return new KtfmtConfig(version);
-	}
-
-	public class KtfmtConfig {
-		final String version;
-		Style style;
-		KtfmtFormattingOptions options;
-
-		private final ConfigurableStyle configurableStyle = new ConfigurableStyle();
-
-		KtfmtConfig(String version) {
-			this.version = Objects.requireNonNull(version);
-			this.style = Style.DEFAULT;
-			addStep(createStep());
-		}
-
-		private ConfigurableStyle style(Style style) {
-			this.style = style;
-			replaceStep(createStep());
-			return configurableStyle;
-		}
-
-		public ConfigurableStyle dropboxStyle() {
-			return style(Style.DROPBOX);
-		}
-
-		public ConfigurableStyle googleStyle() {
-			return style(Style.GOOGLE);
-		}
-
-		public ConfigurableStyle kotlinlangStyle() {
-			return style(Style.KOTLINLANG);
-		}
-
-		public void configure(Consumer<KtfmtFormattingOptions> optionsConfiguration) {
-			this.configurableStyle.configure(optionsConfiguration);
-		}
-
-		private FormatterStep createStep() {
-			return KtfmtStep.create(version, provisioner(), style, options);
-		}
-
-		public class ConfigurableStyle {
-
-			public void configure(Consumer<KtfmtFormattingOptions> optionsConfiguration) {
-				KtfmtFormattingOptions ktfmtFormattingOptions = new KtfmtFormattingOptions();
-				optionsConfiguration.accept(ktfmtFormattingOptions);
-				options = ktfmtFormattingOptions;
-				replaceStep(createStep());
-			}
-		}
-	}
-
-	/** Adds the specified version of <a href="https://github.com/cqfn/diKTat">diktat</a>. */
-	public DiktatFormatExtension diktat(String version) {
-		Objects.requireNonNull(version, "version");
-		return new DiktatFormatExtension(version);
-	}
-
-	public DiktatFormatExtension diktat() {
-		return diktat(DiktatStep.defaultVersionDiktat());
-	}
-
-	public class DiktatFormatExtension {
-
-		private final String version;
-		private FileSignature config;
-
-		DiktatFormatExtension(String version) {
-			this.version = version;
-			addStep(createStep());
-		}
-
-		public DiktatFormatExtension configFile(Object file) throws IOException {
-			// Specify the path to the configuration file
-			if (file == null) {
-				this.config = null;
-			} else {
-				this.config = FileSignature.signAsList(getProject().file(file));
-			}
-			replaceStep(createStep());
-			return this;
-		}
-
-		private FormatterStep createStep() {
-			return DiktatStep.createForScript(version, provisioner(), config);
-		}
+	@Override
+	protected boolean isScript() {
+		return true;
 	}
 
 	@Override

From a392c72e4383952faa564b892e38357666986cf9 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sun, 19 Nov 2023 18:22:11 +0800
Subject: [PATCH 1283/2068] Clean up BaseKotlinExtension

---
 .../gradle/spotless/BaseKotlinExtension.java  | 41 +++++++++----------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java
index 5ced54a94e..69de375800 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java
@@ -31,8 +31,8 @@
 import com.diffplug.spotless.kotlin.KtLintStep;
 import com.diffplug.spotless.kotlin.KtfmtStep;
 
-public abstract class BaseKotlinExtension extends FormatExtension {
-	public BaseKotlinExtension(SpotlessExtension spotless) {
+abstract class BaseKotlinExtension extends FormatExtension {
+	protected BaseKotlinExtension(SpotlessExtension spotless) {
 		super(spotless);
 	}
 
@@ -70,11 +70,10 @@ public KtfmtConfig ktfmt(String version) {
 	protected abstract boolean isScript();
 
 	public class DiktatConfig {
-
 		private final String version;
 		private FileSignature config;
 
-		DiktatConfig(String version) {
+		private DiktatConfig(String version) {
 			Objects.requireNonNull(version, "version");
 			this.version = version;
 			addStep(createStep());
@@ -97,24 +96,17 @@ private FormatterStep createStep() {
 	}
 
 	public class KtfmtConfig {
-		final String version;
-		KtfmtStep.Style style;
-		KtfmtStep.KtfmtFormattingOptions options;
-
+		private final String version;
 		private final ConfigurableStyle configurableStyle = new ConfigurableStyle();
+		private KtfmtStep.Style style;
+		private KtfmtStep.KtfmtFormattingOptions options;
 
-		KtfmtConfig(String version) {
+		private KtfmtConfig(String version) {
 			Objects.requireNonNull(version);
 			this.version = Objects.requireNonNull(version);
 			addStep(createStep());
 		}
 
-		private ConfigurableStyle style(KtfmtStep.Style style) {
-			this.style = style;
-			replaceStep(createStep());
-			return configurableStyle;
-		}
-
 		public ConfigurableStyle dropboxStyle() {
 			return style(KtfmtStep.Style.DROPBOX);
 		}
@@ -131,13 +123,18 @@ public void configure(Consumer<KtfmtStep.KtfmtFormattingOptions> optionsConfigur
 			this.configurableStyle.configure(optionsConfiguration);
 		}
 
+		private ConfigurableStyle style(KtfmtStep.Style style) {
+			this.style = style;
+			replaceStep(createStep());
+			return configurableStyle;
+		}
+
 		private FormatterStep createStep() {
 			return KtfmtStep.create(version, provisioner(), style, options);
 		}
 
 		public class ConfigurableStyle {
-
-			public void configure(Consumer<KtfmtStep.KtfmtFormattingOptions> optionsConfiguration) {
+			private void configure(Consumer<KtfmtStep.KtfmtFormattingOptions> optionsConfiguration) {
 				KtfmtStep.KtfmtFormattingOptions ktfmtFormattingOptions = new KtfmtStep.KtfmtFormattingOptions();
 				optionsConfiguration.accept(ktfmtFormattingOptions);
 				options = ktfmtFormattingOptions;
@@ -147,26 +144,26 @@ public void configure(Consumer<KtfmtStep.KtfmtFormattingOptions> optionsConfigur
 	}
 
 	public class KtlintConfig {
-
 		private final String version;
-		@Nullable
 		private FileSignature editorConfigPath;
 		private Map<String, String> userData;
 		private Map<String, Object> editorConfigOverride;
 
-		KtlintConfig(String version, Map<String, String> config,
+		private KtlintConfig(
+				String version,
+				Map<String, String> userData,
 				Map<String, Object> editorConfigOverride) throws IOException {
 			Objects.requireNonNull(version);
 			File defaultEditorConfig = getProject().getRootProject().file(".editorconfig");
 			FileSignature editorConfigPath = defaultEditorConfig.exists() ? FileSignature.signAsList(defaultEditorConfig) : null;
 			this.version = version;
 			this.editorConfigPath = editorConfigPath;
-			this.userData = config;
+			this.userData = userData;
 			this.editorConfigOverride = editorConfigOverride;
 			addStep(createStep());
 		}
 
-		public KtlintConfig setEditorConfigPath(Object editorConfigPath) throws IOException {
+		public KtlintConfig setEditorConfigPath(@Nullable Object editorConfigPath) throws IOException {
 			if (editorConfigPath == null) {
 				this.editorConfigPath = null;
 			} else {

From 7cb08d1a4c6e5e44a8279c7abe5149d8782f6794 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sun, 19 Nov 2023 18:37:58 +0800
Subject: [PATCH 1284/2068] Remove unused userData param in Ktlint format step

We don't need this param anymore.
---
 .../compat/KtLintCompat0Dot48Dot0Adapter.java    |  9 ++++++---
 .../compat/KtLintCompat0Dot49Dot0Adapter.java    |  9 ++++++---
 .../compat/KtLintCompat0Dot50Dot0Adapter.java    |  9 ++++++---
 .../compat/KtLintCompat1Dot0Dot0Adapter.java     |  9 ++++++---
 .../glue/ktlint/compat/KtLintCompatAdapter.java  |  6 +++++-
 .../glue/ktlint/KtlintFormatterFunc.java         |  6 ++----
 .../com/diffplug/spotless/kotlin/KtLintStep.java | 16 ++++++----------
 .../KtLintCompat0Dot48Dot0AdapterTest.java       |  8 ++------
 .../KtLintCompat0Dot49Dot0AdapterTest.java       |  8 ++------
 .../KtLintCompat0Dot50Dot0AdapterTest.java       |  8 ++------
 .../compat/KtLintCompat1Dot0Dot0AdapterTest.java |  8 ++------
 plugin-gradle/README.md                          |  3 +--
 .../gradle/spotless/BaseKotlinExtension.java     | 14 +-------------
 .../diffplug/spotless/maven/kotlin/Ktlint.java   |  3 +--
 14 files changed, 48 insertions(+), 68 deletions(-)

diff --git a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
index 418720aa59..b409552031 100644
--- a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
@@ -73,9 +73,12 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	}
 
 	@Override
-	public String format(final String text, Path path, final boolean isScript,
-			Path editorConfigPath, final Map<String, String> userData,
-			final Map<String, Object> editorConfigOverrideMap) {
+	public String format(
+			String text,
+			Path path,
+			boolean isScript,
+			Path editorConfigPath,
+			Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		Set<RuleProvider> allRuleProviders = ServiceLoader.load(RuleSetProviderV2.class, RuleSetProviderV2.class.getClassLoader())
diff --git a/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java b/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
index ad228c131d..b524ca0e91 100644
--- a/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
@@ -119,9 +119,12 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	}
 
 	@Override
-	public String format(final String text, Path path, final boolean isScript,
-			Path editorConfigPath, final Map<String, String> userData,
-			final Map<String, Object> editorConfigOverrideMap) {
+	public String format(
+			String text,
+			Path path,
+			boolean isScript,
+			Path editorConfigPath,
+			Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		Set<RuleProvider> allRuleProviders = ServiceLoader.load(RuleSetProviderV3.class, RuleSetProviderV3.class.getClassLoader())
diff --git a/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java b/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
index f7c61439de..b78a539b76 100644
--- a/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
@@ -82,9 +82,12 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	}
 
 	@Override
-	public String format(final String text, Path path, final boolean isScript,
-			Path editorConfigPath, final Map<String, String> userData,
-			final Map<String, Object> editorConfigOverrideMap) {
+	public String format(
+			String text,
+			Path path,
+			boolean isScript,
+			Path editorConfigPath,
+			Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		Set<RuleProvider> allRuleProviders = ServiceLoader.load(RuleSetProviderV3.class, RuleSetProviderV3.class.getClassLoader())
diff --git a/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java b/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
index 119cb86373..c38203b900 100644
--- a/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
+++ b/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
@@ -82,9 +82,12 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	}
 
 	@Override
-	public String format(final String text, Path path, final boolean isScript,
-			Path editorConfigPath, final Map<String, String> userData,
-			final Map<String, Object> editorConfigOverrideMap) {
+	public String format(
+			String text,
+			Path path,
+			boolean isScript,
+			Path editorConfigPath,
+			Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		Set<RuleProvider> allRuleProviders = ServiceLoader.load(RuleSetProviderV3.class, RuleSetProviderV3.class.getClassLoader())
diff --git a/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java b/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
index 5e5e5fb445..5cbbac843c 100644
--- a/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
+++ b/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
@@ -20,6 +20,10 @@
 
 public interface KtLintCompatAdapter {
 
-	String format(String text, Path path, boolean isScript, Path editorConfigPath, Map<String, String> userData,
+	String format(
+			String text,
+			Path path,
+			boolean isScript,
+			Path editorConfigPath,
 			Map<String, Object> editorConfigOverrideMap);
 }
diff --git a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
index 7ae0222566..870d3d4139 100644
--- a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
+++ b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
@@ -25,13 +25,12 @@
 
 public class KtlintFormatterFunc implements FormatterFunc.NeedsFile {
 
-	private final Map<String, String> userData;
 	private final boolean isScript;
 	private final KtLintCompatAdapter adapter;
 	private final FileSignature editorConfigPath;
 	private final Map<String, Object> editorConfigOverrideMap;
 
-	public KtlintFormatterFunc(String version, boolean isScript, FileSignature editorConfigPath, Map<String, String> userData,
+	public KtlintFormatterFunc(String version, boolean isScript, FileSignature editorConfigPath,
 			Map<String, Object> editorConfigOverrideMap) {
 		String[] versions = version.split("\\.");
 		int majorVersion = Integer.parseInt(versions[0]);
@@ -58,7 +57,6 @@ public KtlintFormatterFunc(String version, boolean isScript, FileSignature edito
 		}
 		this.editorConfigPath = editorConfigPath;
 		this.editorConfigOverrideMap = editorConfigOverrideMap;
-		this.userData = userData;
 		this.isScript = isScript;
 	}
 
@@ -69,6 +67,6 @@ public String applyWithFile(String unix, File file) {
 		if (editorConfigPath != null) {
 			absoluteEditorConfigPath = editorConfigPath.getOnlyFile().toPath();
 		}
-		return adapter.format(unix, file.toPath(), isScript, absoluteEditorConfigPath, userData, editorConfigOverrideMap);
+		return adapter.format(unix, file.toPath(), isScript, absoluteEditorConfigPath, editorConfigOverrideMap);
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index 13fba97c57..7c6801a2b6 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -46,24 +46,23 @@ public static FormatterStep create(Provisioner provisioner) {
 	}
 
 	public static FormatterStep create(String version, Provisioner provisioner) {
-		return create(version, provisioner, Collections.emptyMap(), Collections.emptyMap());
+		return create(version, provisioner, Collections.emptyMap());
 	}
 
 	public static FormatterStep create(String version, Provisioner provisioner,
-			Map<String, String> userData, Map<String, Object> editorConfigOverride) {
-		return create(version, provisioner, false, null, userData, editorConfigOverride);
+			Map<String, Object> editorConfigOverride) {
+		return create(version, provisioner, false, null, editorConfigOverride);
 	}
 
 	public static FormatterStep create(String version,
 			Provisioner provisioner,
 			boolean isScript,
 			@Nullable FileSignature editorConfig,
-			Map<String, String> userData,
 			Map<String, Object> editorConfigOverride) {
 		Objects.requireNonNull(version, "version");
 		Objects.requireNonNull(provisioner, "provisioner");
 		return FormatterStep.createLazy(NAME,
-				() -> new State(version, provisioner, isScript, editorConfig, userData, editorConfigOverride),
+				() -> new State(version, provisioner, isScript, editorConfig, editorConfigOverride),
 				State::createFormat);
 	}
 
@@ -78,7 +77,6 @@ static final class State implements Serializable {
 		private final boolean isScript;
 		/** The jar that contains the formatter. */
 		final JarState jarState;
-		private final TreeMap<String, String> userData;
 		private final TreeMap<String, Object> editorConfigOverride;
 		private final String version;
 		@Nullable
@@ -88,10 +86,8 @@ static final class State implements Serializable {
 				Provisioner provisioner,
 				boolean isScript,
 				@Nullable FileSignature editorConfigPath,
-				Map<String, String> userData,
 				Map<String, Object> editorConfigOverride) throws IOException {
 			this.version = version;
-			this.userData = new TreeMap<>(userData);
 			this.editorConfigOverride = new TreeMap<>(editorConfigOverride);
 			this.jarState = JarState.from((version.startsWith("0.") ? MAVEN_COORDINATE_0_DOT : MAVEN_COORDINATE_1_DOT) + version,
 					provisioner);
@@ -103,8 +99,8 @@ FormatterFunc createFormat() throws Exception {
 			final ClassLoader classLoader = jarState.getClassLoader();
 			Class<?> formatterFunc = classLoader.loadClass("com.diffplug.spotless.glue.ktlint.KtlintFormatterFunc");
 			Constructor<?> constructor = formatterFunc.getConstructor(
-					String.class, boolean.class, FileSignature.class, Map.class, Map.class);
-			return (FormatterFunc.NeedsFile) constructor.newInstance(version, isScript, editorConfigPath, userData, editorConfigOverride);
+					String.class, boolean.class, FileSignature.class, Map.class);
+			return (FormatterFunc.NeedsFile) constructor.newInstance(version, isScript, editorConfigPath, editorConfigOverride);
 		}
 	}
 }
diff --git a/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java b/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java
index 7fc9d1d9a4..4ad5bf46cc 100644
--- a/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java
+++ b/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java
@@ -36,11 +36,9 @@ public void testDefaults(@TempDir Path path) throws IOException {
 		String text = loadAndWriteText(path, "empty_class_body.kt");
 		final Path filePath = Paths.get(path.toString(), "empty_class_body.kt");
 
-		Map<String, String> userData = new HashMap<>();
-
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 
-		String formatted = ktLintCompat0Dot48Dot0Adapter.format(text, filePath, false, null, userData, editorConfigOverrideMap);
+		String formatted = ktLintCompat0Dot48Dot0Adapter.format(text, filePath, false, null, editorConfigOverrideMap);
 		assertEquals("class empty_class_body\n", formatted);
 	}
 
@@ -50,15 +48,13 @@ public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		String text = loadAndWriteText(path, "fails_no_semicolons.kt");
 		final Path filePath = Paths.get(path.toString(), "fails_no_semicolons.kt");
 
-		Map<String, String> userData = new HashMap<>();
-
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 		editorConfigOverrideMap.put("indent_style", "tab");
 		editorConfigOverrideMap.put("ktlint_standard_no-semi", "disabled");
 		// ktlint_filename is an invalid rule in ktlint 0.48.0
 		editorConfigOverrideMap.put("ktlint_filename", "disabled");
 
-		String formatted = ktLintCompat0Dot48Dot0Adapter.format(text, filePath, false, null, userData, editorConfigOverrideMap);
+		String formatted = ktLintCompat0Dot48Dot0Adapter.format(text, filePath, false, null, editorConfigOverrideMap);
 		assertEquals("class fails_no_semicolons {\n\tval i = 0;\n}\n", formatted);
 	}
 
diff --git a/lib/src/testCompatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java b/lib/src/testCompatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java
index a0db6ecddc..50897d875f 100644
--- a/lib/src/testCompatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java
+++ b/lib/src/testCompatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java
@@ -36,11 +36,9 @@ public void testDefaults(@TempDir Path path) throws IOException {
 		String text = loadAndWriteText(path, "EmptyClassBody.kt");
 		final Path filePath = Paths.get(path.toString(), "EmptyClassBody.kt");
 
-		Map<String, String> userData = new HashMap<>();
-
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 
-		String formatted = ktLintCompat0Dot49Dot0Adapter.format(text, filePath, false, null, userData, editorConfigOverrideMap);
+		String formatted = ktLintCompat0Dot49Dot0Adapter.format(text, filePath, false, null, editorConfigOverrideMap);
 		assertEquals("class EmptyClassBody\n", formatted);
 	}
 
@@ -50,13 +48,11 @@ public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		String text = loadAndWriteText(path, "FailsNoSemicolons.kt");
 		final Path filePath = Paths.get(path.toString(), "FailsNoSemicolons.kt");
 
-		Map<String, String> userData = new HashMap<>();
-
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 		editorConfigOverrideMap.put("indent_style", "tab");
 		editorConfigOverrideMap.put("ktlint_standard_no-semi", "disabled");
 
-		String formatted = ktLintCompat0Dot49Dot0Adapter.format(text, filePath, false, null, userData, editorConfigOverrideMap);
+		String formatted = ktLintCompat0Dot49Dot0Adapter.format(text, filePath, false, null, editorConfigOverrideMap);
 		assertEquals("class FailsNoSemicolons {\n\tval i = 0;\n}\n", formatted);
 	}
 
diff --git a/lib/src/testCompatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java b/lib/src/testCompatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java
index f5b76ccae0..a44ee93386 100644
--- a/lib/src/testCompatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java
+++ b/lib/src/testCompatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java
@@ -36,11 +36,9 @@ public void testDefaults(@TempDir Path path) throws IOException {
 		String text = loadAndWriteText(path, "EmptyClassBody.kt");
 		final Path filePath = Paths.get(path.toString(), "EmptyClassBody.kt");
 
-		Map<String, String> userData = new HashMap<>();
-
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 
-		String formatted = KtLintCompat0Dot50Dot0Adapter.format(text, filePath, false, null, userData, editorConfigOverrideMap);
+		String formatted = KtLintCompat0Dot50Dot0Adapter.format(text, filePath, false, null, editorConfigOverrideMap);
 		assertEquals("class EmptyClassBody\n", formatted);
 	}
 
@@ -50,13 +48,11 @@ public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		String text = loadAndWriteText(path, "FailsNoSemicolons.kt");
 		final Path filePath = Paths.get(path.toString(), "FailsNoSemicolons.kt");
 
-		Map<String, String> userData = new HashMap<>();
-
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 		editorConfigOverrideMap.put("indent_style", "tab");
 		editorConfigOverrideMap.put("ktlint_standard_no-semi", "disabled");
 
-		String formatted = KtLintCompat0Dot50Dot0Adapter.format(text, filePath, false, null, userData, editorConfigOverrideMap);
+		String formatted = KtLintCompat0Dot50Dot0Adapter.format(text, filePath, false, null, editorConfigOverrideMap);
 		assertEquals("class FailsNoSemicolons {\n\tval i = 0;\n}\n", formatted);
 	}
 
diff --git a/lib/src/testCompatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java b/lib/src/testCompatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java
index 1f8e6023b4..a62ab22610 100644
--- a/lib/src/testCompatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java
+++ b/lib/src/testCompatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java
@@ -36,11 +36,9 @@ public void testDefaults(@TempDir Path path) throws IOException {
 		String text = loadAndWriteText(path, "EmptyClassBody.kt");
 		final Path filePath = Paths.get(path.toString(), "EmptyClassBody.kt");
 
-		Map<String, String> userData = new HashMap<>();
-
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 
-		String formatted = KtLintCompat1Dot0Dot0Adapter.format(text, filePath, false, null, userData, editorConfigOverrideMap);
+		String formatted = KtLintCompat1Dot0Dot0Adapter.format(text, filePath, false, null, editorConfigOverrideMap);
 		assertEquals("class EmptyClassBody\n", formatted);
 	}
 
@@ -50,13 +48,11 @@ public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		String text = loadAndWriteText(path, "FailsNoSemicolons.kt");
 		final Path filePath = Paths.get(path.toString(), "FailsNoSemicolons.kt");
 
-		Map<String, String> userData = new HashMap<>();
-
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 		editorConfigOverrideMap.put("indent_style", "tab");
 		editorConfigOverrideMap.put("ktlint_standard_no-semi", "disabled");
 
-		String formatted = KtLintCompat1Dot0Dot0Adapter.format(text, filePath, false, null, userData, editorConfigOverrideMap);
+		String formatted = KtLintCompat1Dot0Dot0Adapter.format(text, filePath, false, null, editorConfigOverrideMap);
 		assertEquals("class FailsNoSemicolons {\n\tval i = 0;\n}\n", formatted);
 	}
 
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 64c8845d25..3341bb29ef 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -399,9 +399,8 @@ Additionally, `editorConfigOverride` options will override what's supplied in `.
 ```kotlin
 spotless {
   kotlin {
-    // version, userData and editorConfigOverride are all optional
+    // version, editorConfigPath and editorConfigOverride are all optional
     ktlint("1.0.0")
-      .userData(mapOf("android" to "true"))
       .setEditorConfigPath("$projectDir/config/.editorconfig")  // sample unusual placement
       .editorConfigOverride(
         mapOf(
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java
index 69de375800..e446ce67c4 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java
@@ -51,7 +51,7 @@ public KtlintConfig ktlint() throws IOException {
 
 	/** Adds the specified version of <a href="https://github.com/pinterest/ktlint">ktlint</a>. */
 	public KtlintConfig ktlint(String version) throws IOException {
-		return new KtlintConfig(version, Collections.emptyMap(), Collections.emptyMap());
+		return new KtlintConfig(version, Collections.emptyMap());
 	}
 
 	/** Uses the <a href="https://github.com/facebookincubator/ktfmt">ktfmt</a> jar to format source code. */
@@ -146,19 +146,16 @@ private void configure(Consumer<KtfmtStep.KtfmtFormattingOptions> optionsConfigu
 	public class KtlintConfig {
 		private final String version;
 		private FileSignature editorConfigPath;
-		private Map<String, String> userData;
 		private Map<String, Object> editorConfigOverride;
 
 		private KtlintConfig(
 				String version,
-				Map<String, String> userData,
 				Map<String, Object> editorConfigOverride) throws IOException {
 			Objects.requireNonNull(version);
 			File defaultEditorConfig = getProject().getRootProject().file(".editorconfig");
 			FileSignature editorConfigPath = defaultEditorConfig.exists() ? FileSignature.signAsList(defaultEditorConfig) : null;
 			this.version = version;
 			this.editorConfigPath = editorConfigPath;
-			this.userData = userData;
 			this.editorConfigOverride = editorConfigOverride;
 			addStep(createStep());
 		}
@@ -177,14 +174,6 @@ public KtlintConfig setEditorConfigPath(@Nullable Object editorConfigPath) throw
 			return this;
 		}
 
-		public KtlintConfig userData(Map<String, String> userData) {
-			// Copy the map to a sorted map because up-to-date checking is based on binary-equals of the serialized
-			// representation.
-			this.userData = ImmutableSortedMap.copyOf(userData);
-			replaceStep(createStep());
-			return this;
-		}
-
 		public KtlintConfig editorConfigOverride(Map<String, Object> editorConfigOverride) {
 			// Copy the map to a sorted map because up-to-date checking is based on binary-equals of the serialized
 			// representation.
@@ -199,7 +188,6 @@ private FormatterStep createStep() {
 					provisioner(),
 					isScript(),
 					editorConfigPath,
-					userData,
 					editorConfigOverride);
 		}
 	}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
index fd59d8ba9d..1fc0e75ad3 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
@@ -15,7 +15,6 @@
  */
 package com.diffplug.spotless.maven.kotlin;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -48,6 +47,6 @@ public FormatterStep newFormatterStep(final FormatterStepConfig stepConfig) {
 			editorConfigOverride = new HashMap<>();
 		}
 
-		return KtLintStep.create(ktlintVersion, stepConfig.getProvisioner(), false, configPath, Collections.emptyMap(), editorConfigOverride);
+		return KtLintStep.create(ktlintVersion, stepConfig.getProvisioner(), false, configPath, editorConfigOverride);
 	}
 }

From cb6a7888c3ff7a4f88192530f7f11c885e432338 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Mon, 20 Nov 2023 01:42:46 +0800
Subject: [PATCH 1285/2068] Reuse configs for GroovyExtension and
 GroovyGradleExtension

---
 .../gradle/spotless/BaseGroovyExtension.java  | 75 +++++++++++++++++++
 .../gradle/spotless/GroovyExtension.java      | 56 +-------------
 .../spotless/GroovyGradleExtension.java       | 26 +------
 3 files changed, 79 insertions(+), 78 deletions(-)
 create mode 100644 plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseGroovyExtension.java

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseGroovyExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseGroovyExtension.java
new file mode 100644
index 0000000000..6aa28d1853
--- /dev/null
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseGroovyExtension.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.gradle.spotless;
+
+import static com.diffplug.gradle.spotless.PluginGradlePreconditions.requireElementsNonNull;
+
+import java.util.Map;
+import java.util.Objects;
+
+import org.gradle.api.Project;
+
+import com.diffplug.spotless.extra.EquoBasedStepBuilder;
+import com.diffplug.spotless.extra.groovy.GrEclipseFormatterStep;
+import com.diffplug.spotless.java.ImportOrderStep;
+
+abstract class BaseGroovyExtension extends FormatExtension {
+	protected BaseGroovyExtension(SpotlessExtension spotless) {
+		super(spotless);
+	}
+
+	public void importOrder(String... importOrder) {
+		addStep(ImportOrderStep.forGroovy().createFrom(importOrder));
+	}
+
+	public void importOrderFile(Object importOrderFile) {
+		Objects.requireNonNull(importOrderFile);
+		addStep(ImportOrderStep.forGroovy().createFrom(getProject().file(importOrderFile)));
+	}
+
+	public GrEclipseConfig greclipse() {
+		return greclipse(GrEclipseFormatterStep.defaultVersion());
+	}
+
+	public GrEclipseConfig greclipse(String version) {
+		return new GrEclipseConfig(version, this);
+	}
+
+	public static class GrEclipseConfig {
+		private final EquoBasedStepBuilder builder;
+		private final FormatExtension extension;
+
+		private GrEclipseConfig(String version, FormatExtension extension) {
+			this.extension = extension;
+			builder = GrEclipseFormatterStep.createBuilder(extension.provisioner());
+			builder.setVersion(version);
+			extension.addStep(builder.build());
+		}
+
+		public void configFile(Object... configFiles) {
+			requireElementsNonNull(configFiles);
+			Project project = extension.getProject();
+			builder.setPreferences(project.files(configFiles).getFiles());
+			extension.replaceStep(builder.build());
+		}
+
+		public GrEclipseConfig withP2Mirrors(Map<String, String> mirrors) {
+			builder.setP2Mirrors(mirrors);
+			extension.replaceStep(builder.build());
+			return this;
+		}
+	}
+}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java
index a7f3d98ce4..676bed0aea 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java
@@ -15,27 +15,19 @@
  */
 package com.diffplug.gradle.spotless;
 
-import static com.diffplug.gradle.spotless.PluginGradlePreconditions.requireElementsNonNull;
-
-import java.util.Map;
-import java.util.Objects;
-
 import javax.inject.Inject;
 
 import org.gradle.api.GradleException;
-import org.gradle.api.Project;
 import org.gradle.api.internal.plugins.DslObject;
 import org.gradle.api.plugins.GroovyBasePlugin;
 import org.gradle.api.tasks.GroovySourceDirectorySet;
 import org.gradle.api.tasks.GroovySourceSet;
 import org.gradle.util.GradleVersion;
 
-import com.diffplug.spotless.extra.EquoBasedStepBuilder;
-import com.diffplug.spotless.extra.groovy.GrEclipseFormatterStep;
 import com.diffplug.spotless.generic.LicenseHeaderStep;
-import com.diffplug.spotless.java.ImportOrderStep;
 
-public class GroovyExtension extends FormatExtension implements HasBuiltinDelimiterForLicense, JvmLang {
+public class GroovyExtension extends BaseGroovyExtension implements HasBuiltinDelimiterForLicense, JvmLang {
+	private boolean excludeJava = false;
 	static final String NAME = "groovy";
 
 	@Inject
@@ -43,8 +35,6 @@ public GroovyExtension(SpotlessExtension spotless) {
 		super(spotless);
 	}
 
-	boolean excludeJava = false;
-
 	/** Excludes .java files, to focus on only .groovy files. */
 	public void excludeJava() {
 		excludeJava(true);
@@ -65,48 +55,6 @@ public LicenseHeaderConfig licenseHeaderFile(Object licenseHeaderFile) {
 		return licenseHeaderFile(licenseHeaderFile, JavaExtension.LICENSE_HEADER_DELIMITER);
 	}
 
-	public void importOrder(String... importOrder) {
-		addStep(ImportOrderStep.forGroovy().createFrom(importOrder));
-	}
-
-	public void importOrderFile(Object importOrderFile) {
-		Objects.requireNonNull(importOrderFile);
-		addStep(ImportOrderStep.forGroovy().createFrom(getProject().file(importOrderFile)));
-	}
-
-	public GrEclipseConfig greclipse() {
-		return greclipse(GrEclipseFormatterStep.defaultVersion());
-	}
-
-	public GrEclipseConfig greclipse(String version) {
-		return new GrEclipseConfig(version, this);
-	}
-
-	public static class GrEclipseConfig {
-		private final EquoBasedStepBuilder builder;
-		private final FormatExtension extension;
-
-		GrEclipseConfig(String version, FormatExtension extension) {
-			this.extension = extension;
-			builder = GrEclipseFormatterStep.createBuilder(extension.provisioner());
-			builder.setVersion(version);
-			extension.addStep(builder.build());
-		}
-
-		public void configFile(Object... configFiles) {
-			requireElementsNonNull(configFiles);
-			Project project = extension.getProject();
-			builder.setPreferences(project.files(configFiles).getFiles());
-			extension.replaceStep(builder.build());
-		}
-
-		public GrEclipseConfig withP2Mirrors(Map<String, String> mirrors) {
-			builder.setP2Mirrors(mirrors);
-			extension.replaceStep(builder.build());
-			return this;
-		}
-	}
-
 	/** If the user hasn't specified the files yet, we'll assume he/she means all of the groovy files. */
 	@Override
 	protected void setupTask(SpotlessTask task) {
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java
index 30cb75a2a3..120f99f27a 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,14 +15,9 @@
  */
 package com.diffplug.gradle.spotless;
 
-import java.util.Objects;
-
 import javax.inject.Inject;
 
-import com.diffplug.spotless.extra.groovy.GrEclipseFormatterStep;
-import com.diffplug.spotless.java.ImportOrderStep;
-
-public class GroovyGradleExtension extends FormatExtension {
+public class GroovyGradleExtension extends BaseGroovyExtension {
 	private static final String GRADLE_FILE_EXTENSION = "*.gradle";
 	static final String NAME = "groovyGradle";
 
@@ -31,23 +26,6 @@ public GroovyGradleExtension(SpotlessExtension spotless) {
 		super(spotless);
 	}
 
-	public void importOrder(String... importOrder) {
-		addStep(ImportOrderStep.forGroovy().createFrom(importOrder));
-	}
-
-	public void importOrderFile(Object importOrderFile) {
-		Objects.requireNonNull(importOrderFile);
-		addStep(ImportOrderStep.forGroovy().createFrom(getProject().file(importOrderFile)));
-	}
-
-	public GroovyExtension.GrEclipseConfig greclipse() {
-		return new GroovyExtension.GrEclipseConfig(GrEclipseFormatterStep.defaultVersion(), this);
-	}
-
-	public GroovyExtension.GrEclipseConfig greclipse(String version) {
-		return new GroovyExtension.GrEclipseConfig(version, this);
-	}
-
 	@Override
 	protected void setupTask(SpotlessTask task) {
 		if (target == null) {

From 705e72a7d66efc083e3a87997413f43b2682b756 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 21 Nov 2023 10:41:11 +0800
Subject: [PATCH 1286/2068] Support custom rule sets for Ktlint

---
 CHANGES.md                                    |  2 ++
 .../diffplug/spotless/kotlin/KtLintStep.java  | 19 ++++++++++-----
 plugin-gradle/CHANGES.md                      |  2 ++
 plugin-gradle/README.md                       |  7 +++++-
 .../gradle/spotless/BaseKotlinExtension.java  | 18 +++++++++++---
 .../gradle/spotless/KotlinExtensionTest.java  | 24 +++++++++++++++++++
 plugin-maven/CHANGES.md                       |  1 +
 plugin-maven/README.md                        |  3 +++
 .../spotless/maven/kotlin/Ktlint.java         |  9 ++++++-
 .../spotless/maven/kotlin/KtlintTest.java     | 18 ++++++++++++++
 .../resources/kotlin/ktlint/listScreen.dirty  |  6 +++++
 11 files changed, 98 insertions(+), 11 deletions(-)
 create mode 100644 testlib/src/main/resources/kotlin/ktlint/listScreen.dirty

diff --git a/CHANGES.md b/CHANGES.md
index c1a11e3a0a..404363e199 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* Support custom rule sets for Ktlint. ([#1896](https://github.com/diffplug/spotless/pull/1896)
 ### Fixed
 * Fix Eclipse JDT on some settings files. ([#1864](https://github.com/diffplug/spotless/pull/1864) fixes [#1638](https://github.com/diffplug/spotless/issues/1638))
 ### Changes
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index 7c6801a2b6..e131b2b46f 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -19,8 +19,11 @@
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
 import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 import java.util.TreeMap;
 
 import javax.annotation.Nullable;
@@ -51,18 +54,19 @@ public static FormatterStep create(String version, Provisioner provisioner) {
 
 	public static FormatterStep create(String version, Provisioner provisioner,
 			Map<String, Object> editorConfigOverride) {
-		return create(version, provisioner, false, null, editorConfigOverride);
+		return create(version, provisioner, false, null, editorConfigOverride, Collections.emptyList());
 	}
 
 	public static FormatterStep create(String version,
 			Provisioner provisioner,
 			boolean isScript,
 			@Nullable FileSignature editorConfig,
-			Map<String, Object> editorConfigOverride) {
+			Map<String, Object> editorConfigOverride,
+			List<String> customRuleSets) {
 		Objects.requireNonNull(version, "version");
 		Objects.requireNonNull(provisioner, "provisioner");
 		return FormatterStep.createLazy(NAME,
-				() -> new State(version, provisioner, isScript, editorConfig, editorConfigOverride),
+				() -> new State(version, provisioner, isScript, editorConfig, editorConfigOverride, customRuleSets),
 				State::createFormat);
 	}
 
@@ -86,11 +90,14 @@ static final class State implements Serializable {
 				Provisioner provisioner,
 				boolean isScript,
 				@Nullable FileSignature editorConfigPath,
-				Map<String, Object> editorConfigOverride) throws IOException {
+				Map<String, Object> editorConfigOverride,
+				List<String> customRuleSets) throws IOException {
 			this.version = version;
 			this.editorConfigOverride = new TreeMap<>(editorConfigOverride);
-			this.jarState = JarState.from((version.startsWith("0.") ? MAVEN_COORDINATE_0_DOT : MAVEN_COORDINATE_1_DOT) + version,
-					provisioner);
+			String ktlintCoordinate = (version.startsWith("0.") ? MAVEN_COORDINATE_0_DOT : MAVEN_COORDINATE_1_DOT) + version;
+			Set<String> mavenCoordinates = new HashSet<>(customRuleSets);
+			mavenCoordinates.add(ktlintCoordinate);
+			this.jarState = JarState.from(mavenCoordinates, provisioner);
 			this.editorConfigPath = editorConfigPath;
 			this.isScript = isScript;
 		}
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 9d833b0076..04d3e9bb38 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Added
+* Support custom rule sets for Ktlint. ([#1896](https://github.com/diffplug/spotless/pull/1896)
 ### Fixed
 * Fix Eclipse JDT on some settings files. ([#1864](https://github.com/diffplug/spotless/pull/1864) fixes [#1638](https://github.com/diffplug/spotless/issues/1638))
 * Check if EditorConfig file exist for Ktlint in KotlinGradleExtension. ([#1889](https://github.com/diffplug/spotless/pull/1889)
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 3341bb29ef..6232f9c0e1 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -399,7 +399,7 @@ Additionally, `editorConfigOverride` options will override what's supplied in `.
 ```kotlin
 spotless {
   kotlin {
-    // version, editorConfigPath and editorConfigOverride are all optional
+    // version, editorConfigPath, editorConfigOverride and customRuleSets are all optional
     ktlint("1.0.0")
       .setEditorConfigPath("$projectDir/config/.editorconfig")  // sample unusual placement
       .editorConfigOverride(
@@ -407,6 +407,11 @@ spotless {
           "indent_size" to 2,
         )
       )
+      .customRuleSets(
+        listOf(
+          "io.nlopez.compose.rules:ktlint:0.3.3"
+        )
+      )
   }
 }
 ```
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java
index e446ce67c4..0d89e224f6 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java
@@ -18,12 +18,14 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.function.Consumer;
 
 import javax.annotation.Nullable;
 
+import com.diffplug.common.collect.ImmutableList;
 import com.diffplug.common.collect.ImmutableSortedMap;
 import com.diffplug.spotless.FileSignature;
 import com.diffplug.spotless.FormatterStep;
@@ -51,7 +53,7 @@ public KtlintConfig ktlint() throws IOException {
 
 	/** Adds the specified version of <a href="https://github.com/pinterest/ktlint">ktlint</a>. */
 	public KtlintConfig ktlint(String version) throws IOException {
-		return new KtlintConfig(version, Collections.emptyMap());
+		return new KtlintConfig(version, Collections.emptyMap(), Collections.emptyList());
 	}
 
 	/** Uses the <a href="https://github.com/facebookincubator/ktfmt">ktfmt</a> jar to format source code. */
@@ -147,16 +149,19 @@ public class KtlintConfig {
 		private final String version;
 		private FileSignature editorConfigPath;
 		private Map<String, Object> editorConfigOverride;
+		private List<String> customRuleSets;
 
 		private KtlintConfig(
 				String version,
-				Map<String, Object> editorConfigOverride) throws IOException {
+				Map<String, Object> editorConfigOverride,
+				List<String> customRuleSets) throws IOException {
 			Objects.requireNonNull(version);
 			File defaultEditorConfig = getProject().getRootProject().file(".editorconfig");
 			FileSignature editorConfigPath = defaultEditorConfig.exists() ? FileSignature.signAsList(defaultEditorConfig) : null;
 			this.version = version;
 			this.editorConfigPath = editorConfigPath;
 			this.editorConfigOverride = editorConfigOverride;
+			this.customRuleSets = customRuleSets;
 			addStep(createStep());
 		}
 
@@ -182,13 +187,20 @@ public KtlintConfig editorConfigOverride(Map<String, Object> editorConfigOverrid
 			return this;
 		}
 
+		public KtlintConfig customRuleSets(List<String> customRuleSets) {
+			this.customRuleSets = ImmutableList.copyOf(customRuleSets);
+			replaceStep(createStep());
+			return this;
+		}
+
 		private FormatterStep createStep() {
 			return KtLintStep.create(
 					version,
 					provisioner(),
 					isScript(),
 					editorConfigPath,
-					editorConfigOverride);
+					editorConfigOverride,
+					customRuleSets);
 		}
 	}
 }
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
index 7ce1819d60..dd0f2f5e21 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
@@ -141,6 +141,30 @@ void testSetEditorConfigCanOverrideEditorConfigFile() throws IOException {
 		checkKtlintOfficialStyle();
 	}
 
+	@Test
+	void withCustomRuleSetApply() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    kotlin {",
+				"        ktlint(\"1.0.1\")",
+				"        .customRuleSets([",
+				"            \"io.nlopez.compose.rules:ktlint:0.3.3\"",
+				"        ])",
+				"        .editorConfigOverride([",
+				"            ktlint_function_naming_ignore_when_annotated_with: \"Composable\",",
+				"        ])",
+				"    }",
+				"}");
+		setFile("src/main/kotlin/Main.kt").toResource("kotlin/ktlint/listScreen.dirty");
+		String buildOutput = gradleRunner().withArguments("spotlessCheck").buildAndFail().getOutput();
+		assertThat(buildOutput).contains("Composable functions that return Unit should start with an uppercase letter.");
+	}
+
 	@Test
 	void testWithHeader() throws IOException {
 		setFile("build.gradle").toLines(
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 10ebfc57c1..5122402019 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * CompileSourceRoots and TestCompileSourceRoots are now respected as default includes. These properties are commonly set when adding extra source directories. ([#1846](https://github.com/diffplug/spotless/issues/1846))
+* Support custom rule sets for Ktlint. ([#1896](https://github.com/diffplug/spotless/pull/1896)
 ### Fixed
 * Fix crash when build dir is a softlink to another directory. ([#1859](https://github.com/diffplug/spotless/pull/1859))
 * Fix Eclipse JDT on some settings files. ([#1864](https://github.com/diffplug/spotless/pull/1864) fixes [#1638](https://github.com/diffplug/spotless/issues/1638))
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 7944b5a450..f7849fbdfc 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -416,6 +416,9 @@ Additionally, `editorConfigOverride` options will override what's supplied in `.
     <ij_kotlin_allow_trailing_comma>true</ij_kotlin_allow_trailing_comma>
     <ij_kotlin_allow_trailing_comma_on_call_site>true</ij_kotlin_allow_trailing_comma_on_call_site>
   </editorConfigOverride>
+  <customRuleSets> <!-- optional -->
+    <value>io.nlopez.compose.rules:ktlint:0.3.3</value>
+  </customRuleSets>
 </ktlint>
 ```
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
index 1fc0e75ad3..5c939687b8 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
@@ -15,7 +15,9 @@
  */
 package com.diffplug.spotless.maven.kotlin;
 
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.apache.maven.plugins.annotations.Parameter;
@@ -35,6 +37,8 @@ public class Ktlint implements FormatterStepFactory {
 	private String editorConfigPath;
 	@Parameter
 	private Map<String, Object> editorConfigOverride;
+	@Parameter
+	private List<String> customRuleSets;
 
 	@Override
 	public FormatterStep newFormatterStep(final FormatterStepConfig stepConfig) {
@@ -46,7 +50,10 @@ public FormatterStep newFormatterStep(final FormatterStepConfig stepConfig) {
 		if (editorConfigOverride == null) {
 			editorConfigOverride = new HashMap<>();
 		}
+		if (customRuleSets == null) {
+			customRuleSets = Collections.emptyList();
+		}
 
-		return KtLintStep.create(ktlintVersion, stepConfig.getProvisioner(), false, configPath, editorConfigOverride);
+		return KtLintStep.create(ktlintVersion, stepConfig.getProvisioner(), false, configPath, editorConfigOverride, customRuleSets);
 	}
 }
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
index 2916e118a5..fe5b0e1b57 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
@@ -15,8 +15,11 @@
  */
 package com.diffplug.spotless.maven.kotlin;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import org.junit.jupiter.api.Test;
 
+import com.diffplug.spotless.ProcessRunner;
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
 
 class KtlintTest extends MavenIntegrationHarness {
@@ -63,6 +66,21 @@ void testSetEditorConfigCanOverrideEditorConfigFile() throws Exception {
 		checkKtlintOfficialStyle();
 	}
 
+	@Test
+	void testWithCustomRuleSetApply() throws Exception {
+		writePomWithKotlinSteps("<ktlint>\n" +
+				"  <customRuleSets>\n" +
+				"    <value>io.nlopez.compose.rules:ktlint:0.3.3</value>\n" +
+				"  </customRuleSets>\n" +
+				"  <editorConfigOverride>\n" +
+				"    <ktlint_function_naming_ignore_when_annotated_with>Composable</ktlint_function_naming_ignore_when_annotated_with>\n" +
+				"  </editorConfigOverride>\n" +
+				"</ktlint>");
+		setFile("src/main/kotlin/Main.kt").toResource("kotlin/ktlint/listScreen.dirty");
+		ProcessRunner.Result result = mavenRunner().withArguments("spotless:check").runHasError();
+		assertTrue(result.toString().contains("Composable functions that return Unit should start with an uppercase letter."));
+	}
+
 	private void checkKtlintOfficialStyle() throws Exception {
 		String path = "src/main/kotlin/Main.kt";
 		setFile(path).toResource("kotlin/ktlint/experimentalEditorConfigOverride.dirty");
diff --git a/testlib/src/main/resources/kotlin/ktlint/listScreen.dirty b/testlib/src/main/resources/kotlin/ktlint/listScreen.dirty
new file mode 100644
index 0000000000..14c06d6d43
--- /dev/null
+++ b/testlib/src/main/resources/kotlin/ktlint/listScreen.dirty
@@ -0,0 +1,6 @@
+import androidx.compose.runtime.Composable
+
+@Composable
+fun listScreen() {
+    val list: List<String> = mutableListOf<String>()
+}

From 8bbed1f6f2289bbc79645257851f619e0706ab84 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 21 Nov 2023 11:49:22 +0800
Subject: [PATCH 1287/2068] Remove unused isScript param in Ktlint format step

---
 .../compat/KtLintCompat0Dot48Dot0Adapter.java |  1 -
 .../compat/KtLintCompat0Dot49Dot0Adapter.java |  1 -
 .../compat/KtLintCompat0Dot50Dot0Adapter.java |  1 -
 .../compat/KtLintCompat1Dot0Dot0Adapter.java  |  1 -
 .../ktlint/compat/KtLintCompatAdapter.java    |  1 -
 .../glue/ktlint/KtlintFormatterFunc.java      |  6 ++----
 .../diffplug/spotless/kotlin/KtLintStep.java  | 19 ++++---------------
 .../KtLintCompat0Dot48Dot0AdapterTest.java    |  4 ++--
 .../KtLintCompat0Dot49Dot0AdapterTest.java    |  4 ++--
 .../KtLintCompat0Dot50Dot0AdapterTest.java    |  4 ++--
 .../KtLintCompat1Dot0Dot0AdapterTest.java     |  4 ++--
 .../gradle/spotless/BaseKotlinExtension.java  |  1 -
 .../spotless/maven/kotlin/Ktlint.java         |  2 +-
 13 files changed, 15 insertions(+), 34 deletions(-)

diff --git a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
index b409552031..d7e997abaf 100644
--- a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
@@ -76,7 +76,6 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	public String format(
 			String text,
 			Path path,
-			boolean isScript,
 			Path editorConfigPath,
 			Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
diff --git a/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java b/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
index b524ca0e91..ea8698cfe8 100644
--- a/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
@@ -122,7 +122,6 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	public String format(
 			String text,
 			Path path,
-			boolean isScript,
 			Path editorConfigPath,
 			Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
diff --git a/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java b/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
index b78a539b76..c792e2bb62 100644
--- a/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
@@ -85,7 +85,6 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	public String format(
 			String text,
 			Path path,
-			boolean isScript,
 			Path editorConfigPath,
 			Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
diff --git a/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java b/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
index c38203b900..ac90893157 100644
--- a/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
+++ b/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
@@ -85,7 +85,6 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	public String format(
 			String text,
 			Path path,
-			boolean isScript,
 			Path editorConfigPath,
 			Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
diff --git a/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java b/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
index 5cbbac843c..e508633b95 100644
--- a/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
+++ b/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
@@ -23,7 +23,6 @@ public interface KtLintCompatAdapter {
 	String format(
 			String text,
 			Path path,
-			boolean isScript,
 			Path editorConfigPath,
 			Map<String, Object> editorConfigOverrideMap);
 }
diff --git a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
index 870d3d4139..ec5fbcb67b 100644
--- a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
+++ b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
@@ -25,12 +25,11 @@
 
 public class KtlintFormatterFunc implements FormatterFunc.NeedsFile {
 
-	private final boolean isScript;
 	private final KtLintCompatAdapter adapter;
 	private final FileSignature editorConfigPath;
 	private final Map<String, Object> editorConfigOverrideMap;
 
-	public KtlintFormatterFunc(String version, boolean isScript, FileSignature editorConfigPath,
+	public KtlintFormatterFunc(String version, FileSignature editorConfigPath,
 			Map<String, Object> editorConfigOverrideMap) {
 		String[] versions = version.split("\\.");
 		int majorVersion = Integer.parseInt(versions[0]);
@@ -57,7 +56,6 @@ public KtlintFormatterFunc(String version, boolean isScript, FileSignature edito
 		}
 		this.editorConfigPath = editorConfigPath;
 		this.editorConfigOverrideMap = editorConfigOverrideMap;
-		this.isScript = isScript;
 	}
 
 	@Override
@@ -67,6 +65,6 @@ public String applyWithFile(String unix, File file) {
 		if (editorConfigPath != null) {
 			absoluteEditorConfigPath = editorConfigPath.getOnlyFile().toPath();
 		}
-		return adapter.format(unix, file.toPath(), isScript, absoluteEditorConfigPath, editorConfigOverrideMap);
+		return adapter.format(unix, file.toPath(), absoluteEditorConfigPath, editorConfigOverrideMap);
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index 7c6801a2b6..856b39cc4a 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -46,23 +46,17 @@ public static FormatterStep create(Provisioner provisioner) {
 	}
 
 	public static FormatterStep create(String version, Provisioner provisioner) {
-		return create(version, provisioner, Collections.emptyMap());
-	}
-
-	public static FormatterStep create(String version, Provisioner provisioner,
-			Map<String, Object> editorConfigOverride) {
-		return create(version, provisioner, false, null, editorConfigOverride);
+		return create(version, provisioner, null, Collections.emptyMap());
 	}
 
 	public static FormatterStep create(String version,
 			Provisioner provisioner,
-			boolean isScript,
 			@Nullable FileSignature editorConfig,
 			Map<String, Object> editorConfigOverride) {
 		Objects.requireNonNull(version, "version");
 		Objects.requireNonNull(provisioner, "provisioner");
 		return FormatterStep.createLazy(NAME,
-				() -> new State(version, provisioner, isScript, editorConfig, editorConfigOverride),
+				() -> new State(version, provisioner, editorConfig, editorConfigOverride),
 				State::createFormat);
 	}
 
@@ -72,9 +66,6 @@ public static String defaultVersion() {
 
 	static final class State implements Serializable {
 		private static final long serialVersionUID = 1L;
-
-		/** Are the files being linted Kotlin script files. */
-		private final boolean isScript;
 		/** The jar that contains the formatter. */
 		final JarState jarState;
 		private final TreeMap<String, Object> editorConfigOverride;
@@ -84,7 +75,6 @@ static final class State implements Serializable {
 
 		State(String version,
 				Provisioner provisioner,
-				boolean isScript,
 				@Nullable FileSignature editorConfigPath,
 				Map<String, Object> editorConfigOverride) throws IOException {
 			this.version = version;
@@ -92,15 +82,14 @@ static final class State implements Serializable {
 			this.jarState = JarState.from((version.startsWith("0.") ? MAVEN_COORDINATE_0_DOT : MAVEN_COORDINATE_1_DOT) + version,
 					provisioner);
 			this.editorConfigPath = editorConfigPath;
-			this.isScript = isScript;
 		}
 
 		FormatterFunc createFormat() throws Exception {
 			final ClassLoader classLoader = jarState.getClassLoader();
 			Class<?> formatterFunc = classLoader.loadClass("com.diffplug.spotless.glue.ktlint.KtlintFormatterFunc");
 			Constructor<?> constructor = formatterFunc.getConstructor(
-					String.class, boolean.class, FileSignature.class, Map.class);
-			return (FormatterFunc.NeedsFile) constructor.newInstance(version, isScript, editorConfigPath, editorConfigOverride);
+					String.class, FileSignature.class, Map.class);
+			return (FormatterFunc.NeedsFile) constructor.newInstance(version, editorConfigPath, editorConfigOverride);
 		}
 	}
 }
diff --git a/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java b/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java
index 4ad5bf46cc..bab3764147 100644
--- a/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java
+++ b/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java
@@ -38,7 +38,7 @@ public void testDefaults(@TempDir Path path) throws IOException {
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 
-		String formatted = ktLintCompat0Dot48Dot0Adapter.format(text, filePath, false, null, editorConfigOverrideMap);
+		String formatted = ktLintCompat0Dot48Dot0Adapter.format(text, filePath, null, editorConfigOverrideMap);
 		assertEquals("class empty_class_body\n", formatted);
 	}
 
@@ -54,7 +54,7 @@ public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		// ktlint_filename is an invalid rule in ktlint 0.48.0
 		editorConfigOverrideMap.put("ktlint_filename", "disabled");
 
-		String formatted = ktLintCompat0Dot48Dot0Adapter.format(text, filePath, false, null, editorConfigOverrideMap);
+		String formatted = ktLintCompat0Dot48Dot0Adapter.format(text, filePath, null, editorConfigOverrideMap);
 		assertEquals("class fails_no_semicolons {\n\tval i = 0;\n}\n", formatted);
 	}
 
diff --git a/lib/src/testCompatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java b/lib/src/testCompatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java
index 50897d875f..5804c0b2d7 100644
--- a/lib/src/testCompatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java
+++ b/lib/src/testCompatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java
@@ -38,7 +38,7 @@ public void testDefaults(@TempDir Path path) throws IOException {
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 
-		String formatted = ktLintCompat0Dot49Dot0Adapter.format(text, filePath, false, null, editorConfigOverrideMap);
+		String formatted = ktLintCompat0Dot49Dot0Adapter.format(text, filePath, null, editorConfigOverrideMap);
 		assertEquals("class EmptyClassBody\n", formatted);
 	}
 
@@ -52,7 +52,7 @@ public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		editorConfigOverrideMap.put("indent_style", "tab");
 		editorConfigOverrideMap.put("ktlint_standard_no-semi", "disabled");
 
-		String formatted = ktLintCompat0Dot49Dot0Adapter.format(text, filePath, false, null, editorConfigOverrideMap);
+		String formatted = ktLintCompat0Dot49Dot0Adapter.format(text, filePath, null, editorConfigOverrideMap);
 		assertEquals("class FailsNoSemicolons {\n\tval i = 0;\n}\n", formatted);
 	}
 
diff --git a/lib/src/testCompatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java b/lib/src/testCompatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java
index a44ee93386..1a1f595991 100644
--- a/lib/src/testCompatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java
+++ b/lib/src/testCompatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java
@@ -38,7 +38,7 @@ public void testDefaults(@TempDir Path path) throws IOException {
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 
-		String formatted = KtLintCompat0Dot50Dot0Adapter.format(text, filePath, false, null, editorConfigOverrideMap);
+		String formatted = KtLintCompat0Dot50Dot0Adapter.format(text, filePath, null, editorConfigOverrideMap);
 		assertEquals("class EmptyClassBody\n", formatted);
 	}
 
@@ -52,7 +52,7 @@ public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		editorConfigOverrideMap.put("indent_style", "tab");
 		editorConfigOverrideMap.put("ktlint_standard_no-semi", "disabled");
 
-		String formatted = KtLintCompat0Dot50Dot0Adapter.format(text, filePath, false, null, editorConfigOverrideMap);
+		String formatted = KtLintCompat0Dot50Dot0Adapter.format(text, filePath, null, editorConfigOverrideMap);
 		assertEquals("class FailsNoSemicolons {\n\tval i = 0;\n}\n", formatted);
 	}
 
diff --git a/lib/src/testCompatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java b/lib/src/testCompatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java
index a62ab22610..1d36082815 100644
--- a/lib/src/testCompatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java
+++ b/lib/src/testCompatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java
@@ -38,7 +38,7 @@ public void testDefaults(@TempDir Path path) throws IOException {
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 
-		String formatted = KtLintCompat1Dot0Dot0Adapter.format(text, filePath, false, null, editorConfigOverrideMap);
+		String formatted = KtLintCompat1Dot0Dot0Adapter.format(text, filePath, null, editorConfigOverrideMap);
 		assertEquals("class EmptyClassBody\n", formatted);
 	}
 
@@ -52,7 +52,7 @@ public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		editorConfigOverrideMap.put("indent_style", "tab");
 		editorConfigOverrideMap.put("ktlint_standard_no-semi", "disabled");
 
-		String formatted = KtLintCompat1Dot0Dot0Adapter.format(text, filePath, false, null, editorConfigOverrideMap);
+		String formatted = KtLintCompat1Dot0Dot0Adapter.format(text, filePath, null, editorConfigOverrideMap);
 		assertEquals("class FailsNoSemicolons {\n\tval i = 0;\n}\n", formatted);
 	}
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java
index e446ce67c4..ac6a03c2b8 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java
@@ -186,7 +186,6 @@ private FormatterStep createStep() {
 			return KtLintStep.create(
 					version,
 					provisioner(),
-					isScript(),
 					editorConfigPath,
 					editorConfigOverride);
 		}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
index 1fc0e75ad3..fa033dd2e7 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
@@ -47,6 +47,6 @@ public FormatterStep newFormatterStep(final FormatterStepConfig stepConfig) {
 			editorConfigOverride = new HashMap<>();
 		}
 
-		return KtLintStep.create(ktlintVersion, stepConfig.getProvisioner(), false, configPath, editorConfigOverride);
+		return KtLintStep.create(ktlintVersion, stepConfig.getProvisioner(), configPath, editorConfigOverride);
 	}
 }

From 0bd1d066a2ae865a64d5d08adc6fe03443383498 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 21 Nov 2023 12:25:22 +0800
Subject: [PATCH 1288/2068] Remove unused text param in KtLintCompatAdapter

---
 .../glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java | 1 -
 .../glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java | 1 -
 .../glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java | 1 -
 .../glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java  | 1 -
 .../spotless/glue/ktlint/compat/KtLintCompatAdapter.java  | 1 -
 .../spotless/glue/ktlint/KtlintFormatterFunc.java         | 3 +--
 .../ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java  | 8 ++++----
 .../ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java  | 8 ++++----
 .../ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java  | 8 ++++----
 .../ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java   | 8 ++++----
 10 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
index d7e997abaf..32ef497de8 100644
--- a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
@@ -74,7 +74,6 @@ public Unit invoke(LintError lint, Boolean corrected) {
 
 	@Override
 	public String format(
-			String text,
 			Path path,
 			Path editorConfigPath,
 			Map<String, Object> editorConfigOverrideMap) {
diff --git a/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java b/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
index ea8698cfe8..1ad52da661 100644
--- a/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
@@ -120,7 +120,6 @@ public Unit invoke(LintError lint, Boolean corrected) {
 
 	@Override
 	public String format(
-			String text,
 			Path path,
 			Path editorConfigPath,
 			Map<String, Object> editorConfigOverrideMap) {
diff --git a/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java b/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
index c792e2bb62..2c7fff3f2e 100644
--- a/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
@@ -83,7 +83,6 @@ public Unit invoke(LintError lint, Boolean corrected) {
 
 	@Override
 	public String format(
-			String text,
 			Path path,
 			Path editorConfigPath,
 			Map<String, Object> editorConfigOverrideMap) {
diff --git a/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java b/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
index ac90893157..e65d0503ba 100644
--- a/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
+++ b/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
@@ -83,7 +83,6 @@ public Unit invoke(LintError lint, Boolean corrected) {
 
 	@Override
 	public String format(
-			String text,
 			Path path,
 			Path editorConfigPath,
 			Map<String, Object> editorConfigOverrideMap) {
diff --git a/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java b/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
index e508633b95..1bfa0da6da 100644
--- a/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
+++ b/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
@@ -21,7 +21,6 @@
 public interface KtLintCompatAdapter {
 
 	String format(
-			String text,
 			Path path,
 			Path editorConfigPath,
 			Map<String, Object> editorConfigOverrideMap);
diff --git a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
index ec5fbcb67b..8b2331f3b9 100644
--- a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
+++ b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
@@ -60,11 +60,10 @@ public KtlintFormatterFunc(String version, FileSignature editorConfigPath,
 
 	@Override
 	public String applyWithFile(String unix, File file) {
-
 		Path absoluteEditorConfigPath = null;
 		if (editorConfigPath != null) {
 			absoluteEditorConfigPath = editorConfigPath.getOnlyFile().toPath();
 		}
-		return adapter.format(unix, file.toPath(), absoluteEditorConfigPath, editorConfigOverrideMap);
+		return adapter.format(file.toPath(), absoluteEditorConfigPath, editorConfigOverrideMap);
 	}
 }
diff --git a/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java b/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java
index bab3764147..17fe40fb9c 100644
--- a/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java
+++ b/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java
@@ -33,19 +33,19 @@ public class KtLintCompat0Dot48Dot0AdapterTest {
 	@Test
 	public void testDefaults(@TempDir Path path) throws IOException {
 		KtLintCompat0Dot48Dot0Adapter ktLintCompat0Dot48Dot0Adapter = new KtLintCompat0Dot48Dot0Adapter();
-		String text = loadAndWriteText(path, "empty_class_body.kt");
+		loadAndWriteText(path, "empty_class_body.kt");
 		final Path filePath = Paths.get(path.toString(), "empty_class_body.kt");
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 
-		String formatted = ktLintCompat0Dot48Dot0Adapter.format(text, filePath, null, editorConfigOverrideMap);
+		String formatted = ktLintCompat0Dot48Dot0Adapter.format(filePath, null, editorConfigOverrideMap);
 		assertEquals("class empty_class_body\n", formatted);
 	}
 
 	@Test
 	public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		KtLintCompat0Dot48Dot0Adapter ktLintCompat0Dot48Dot0Adapter = new KtLintCompat0Dot48Dot0Adapter();
-		String text = loadAndWriteText(path, "fails_no_semicolons.kt");
+		loadAndWriteText(path, "fails_no_semicolons.kt");
 		final Path filePath = Paths.get(path.toString(), "fails_no_semicolons.kt");
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
@@ -54,7 +54,7 @@ public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		// ktlint_filename is an invalid rule in ktlint 0.48.0
 		editorConfigOverrideMap.put("ktlint_filename", "disabled");
 
-		String formatted = ktLintCompat0Dot48Dot0Adapter.format(text, filePath, null, editorConfigOverrideMap);
+		String formatted = ktLintCompat0Dot48Dot0Adapter.format(filePath, null, editorConfigOverrideMap);
 		assertEquals("class fails_no_semicolons {\n\tval i = 0;\n}\n", formatted);
 	}
 
diff --git a/lib/src/testCompatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java b/lib/src/testCompatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java
index 5804c0b2d7..b34a83ebc3 100644
--- a/lib/src/testCompatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java
+++ b/lib/src/testCompatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java
@@ -33,26 +33,26 @@ public class KtLintCompat0Dot49Dot0AdapterTest {
 	@Test
 	public void testDefaults(@TempDir Path path) throws IOException {
 		KtLintCompat0Dot49Dot0Adapter ktLintCompat0Dot49Dot0Adapter = new KtLintCompat0Dot49Dot0Adapter();
-		String text = loadAndWriteText(path, "EmptyClassBody.kt");
+		loadAndWriteText(path, "EmptyClassBody.kt");
 		final Path filePath = Paths.get(path.toString(), "EmptyClassBody.kt");
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 
-		String formatted = ktLintCompat0Dot49Dot0Adapter.format(text, filePath, null, editorConfigOverrideMap);
+		String formatted = ktLintCompat0Dot49Dot0Adapter.format(filePath, null, editorConfigOverrideMap);
 		assertEquals("class EmptyClassBody\n", formatted);
 	}
 
 	@Test
 	public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		KtLintCompat0Dot49Dot0Adapter ktLintCompat0Dot49Dot0Adapter = new KtLintCompat0Dot49Dot0Adapter();
-		String text = loadAndWriteText(path, "FailsNoSemicolons.kt");
+		loadAndWriteText(path, "FailsNoSemicolons.kt");
 		final Path filePath = Paths.get(path.toString(), "FailsNoSemicolons.kt");
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 		editorConfigOverrideMap.put("indent_style", "tab");
 		editorConfigOverrideMap.put("ktlint_standard_no-semi", "disabled");
 
-		String formatted = ktLintCompat0Dot49Dot0Adapter.format(text, filePath, null, editorConfigOverrideMap);
+		String formatted = ktLintCompat0Dot49Dot0Adapter.format(filePath, null, editorConfigOverrideMap);
 		assertEquals("class FailsNoSemicolons {\n\tval i = 0;\n}\n", formatted);
 	}
 
diff --git a/lib/src/testCompatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java b/lib/src/testCompatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java
index 1a1f595991..0bb501a06e 100644
--- a/lib/src/testCompatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java
+++ b/lib/src/testCompatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java
@@ -33,26 +33,26 @@ public class KtLintCompat0Dot50Dot0AdapterTest {
 	@Test
 	public void testDefaults(@TempDir Path path) throws IOException {
 		KtLintCompat0Dot50Dot0Adapter KtLintCompat0Dot50Dot0Adapter = new KtLintCompat0Dot50Dot0Adapter();
-		String text = loadAndWriteText(path, "EmptyClassBody.kt");
+		loadAndWriteText(path, "EmptyClassBody.kt");
 		final Path filePath = Paths.get(path.toString(), "EmptyClassBody.kt");
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 
-		String formatted = KtLintCompat0Dot50Dot0Adapter.format(text, filePath, null, editorConfigOverrideMap);
+		String formatted = KtLintCompat0Dot50Dot0Adapter.format(filePath, null, editorConfigOverrideMap);
 		assertEquals("class EmptyClassBody\n", formatted);
 	}
 
 	@Test
 	public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		KtLintCompat0Dot50Dot0Adapter KtLintCompat0Dot50Dot0Adapter = new KtLintCompat0Dot50Dot0Adapter();
-		String text = loadAndWriteText(path, "FailsNoSemicolons.kt");
+		loadAndWriteText(path, "FailsNoSemicolons.kt");
 		final Path filePath = Paths.get(path.toString(), "FailsNoSemicolons.kt");
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 		editorConfigOverrideMap.put("indent_style", "tab");
 		editorConfigOverrideMap.put("ktlint_standard_no-semi", "disabled");
 
-		String formatted = KtLintCompat0Dot50Dot0Adapter.format(text, filePath, null, editorConfigOverrideMap);
+		String formatted = KtLintCompat0Dot50Dot0Adapter.format(filePath, null, editorConfigOverrideMap);
 		assertEquals("class FailsNoSemicolons {\n\tval i = 0;\n}\n", formatted);
 	}
 
diff --git a/lib/src/testCompatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java b/lib/src/testCompatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java
index 1d36082815..0f5f9cf16c 100644
--- a/lib/src/testCompatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java
+++ b/lib/src/testCompatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java
@@ -33,26 +33,26 @@ public class KtLintCompat1Dot0Dot0AdapterTest {
 	@Test
 	public void testDefaults(@TempDir Path path) throws IOException {
 		KtLintCompat1Dot0Dot0Adapter KtLintCompat1Dot0Dot0Adapter = new KtLintCompat1Dot0Dot0Adapter();
-		String text = loadAndWriteText(path, "EmptyClassBody.kt");
+		loadAndWriteText(path, "EmptyClassBody.kt");
 		final Path filePath = Paths.get(path.toString(), "EmptyClassBody.kt");
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 
-		String formatted = KtLintCompat1Dot0Dot0Adapter.format(text, filePath, null, editorConfigOverrideMap);
+		String formatted = KtLintCompat1Dot0Dot0Adapter.format(filePath, null, editorConfigOverrideMap);
 		assertEquals("class EmptyClassBody\n", formatted);
 	}
 
 	@Test
 	public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		KtLintCompat1Dot0Dot0Adapter KtLintCompat1Dot0Dot0Adapter = new KtLintCompat1Dot0Dot0Adapter();
-		String text = loadAndWriteText(path, "FailsNoSemicolons.kt");
+		loadAndWriteText(path, "FailsNoSemicolons.kt");
 		final Path filePath = Paths.get(path.toString(), "FailsNoSemicolons.kt");
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 		editorConfigOverrideMap.put("indent_style", "tab");
 		editorConfigOverrideMap.put("ktlint_standard_no-semi", "disabled");
 
-		String formatted = KtLintCompat1Dot0Dot0Adapter.format(text, filePath, null, editorConfigOverrideMap);
+		String formatted = KtLintCompat1Dot0Dot0Adapter.format(filePath, null, editorConfigOverrideMap);
 		assertEquals("class FailsNoSemicolons {\n\tval i = 0;\n}\n", formatted);
 	}
 

From 84693002052c91bceaea4c84a3444106f3f5dedf Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 21 Nov 2023 13:07:27 +0800
Subject: [PATCH 1289/2068] Refine styles

---
 .../spotless/glue/ktlint/KtlintFormatterFunc.java      | 10 +++++++---
 .../java/com/diffplug/spotless/kotlin/KtLintStep.java  |  8 ++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
index 8b2331f3b9..b81e107609 100644
--- a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
+++ b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
@@ -24,12 +24,13 @@
 import com.diffplug.spotless.glue.ktlint.compat.*;
 
 public class KtlintFormatterFunc implements FormatterFunc.NeedsFile {
-
 	private final KtLintCompatAdapter adapter;
 	private final FileSignature editorConfigPath;
 	private final Map<String, Object> editorConfigOverrideMap;
 
-	public KtlintFormatterFunc(String version, FileSignature editorConfigPath,
+	public KtlintFormatterFunc(
+			String version,
+			FileSignature editorConfigPath,
 			Map<String, Object> editorConfigOverrideMap) {
 		String[] versions = version.split("\\.");
 		int majorVersion = Integer.parseInt(versions[0]);
@@ -64,6 +65,9 @@ public String applyWithFile(String unix, File file) {
 		if (editorConfigPath != null) {
 			absoluteEditorConfigPath = editorConfigPath.getOnlyFile().toPath();
 		}
-		return adapter.format(file.toPath(), absoluteEditorConfigPath, editorConfigOverrideMap);
+		return adapter.format(
+				file.toPath(),
+				absoluteEditorConfigPath,
+				editorConfigOverrideMap);
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index 856b39cc4a..9564dd7d50 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -37,9 +37,9 @@ public class KtLintStep {
 	private KtLintStep() {}
 
 	private static final String DEFAULT_VERSION = "1.0.1";
-	static final String NAME = "ktlint";
-	static final String MAVEN_COORDINATE_0_DOT = "com.pinterest:ktlint:";
-	static final String MAVEN_COORDINATE_1_DOT = "com.pinterest.ktlint:ktlint-cli:";
+	private static final String NAME = "ktlint";
+	private static final String MAVEN_COORDINATE_0_DOT = "com.pinterest:ktlint:";
+	private static final String MAVEN_COORDINATE_1_DOT = "com.pinterest.ktlint:ktlint-cli:";
 
 	public static FormatterStep create(Provisioner provisioner) {
 		return create(defaultVersion(), provisioner);
@@ -67,7 +67,7 @@ public static String defaultVersion() {
 	static final class State implements Serializable {
 		private static final long serialVersionUID = 1L;
 		/** The jar that contains the formatter. */
-		final JarState jarState;
+		private final JarState jarState;
 		private final TreeMap<String, Object> editorConfigOverride;
 		private final String version;
 		@Nullable

From a83c2a994b3813b60c165df56654d9e17b8a90e4 Mon Sep 17 00:00:00 2001
From: AntsyLich <59261191+AntsyLich@users.noreply.github.com>
Date: Tue, 21 Nov 2023 14:17:34 +0600
Subject: [PATCH 1290/2068] Add missing bracket in plugin-gradle/CHANGES.md

---
 plugin-gradle/CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 9d833b0076..c35e7879b1 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,7 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Fixed
 * Fix Eclipse JDT on some settings files. ([#1864](https://github.com/diffplug/spotless/pull/1864) fixes [#1638](https://github.com/diffplug/spotless/issues/1638))
-* Check if EditorConfig file exist for Ktlint in KotlinGradleExtension. ([#1889](https://github.com/diffplug/spotless/pull/1889)
+* Check if EditorConfig file exist for Ktlint in KotlinGradleExtension. ([#1889](https://github.com/diffplug/spotless/pull/1889))
 ### Changes
 * Bump default `ktlint` version to latest `1.0.0` -> `1.0.1`. ([#1855](https://github.com/diffplug/spotless/pull/1855))
 ### Fixed

From 6d4a67906d9c5e48aa5c0b745ce81ba30df8ca9c Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Wed, 22 Nov 2023 04:48:41 +0800
Subject: [PATCH 1291/2068] Cleanups

---
 .../java/com/diffplug/spotless/kotlin/KtLintStep.java    | 9 ++-------
 .../java/com/diffplug/spotless/maven/kotlin/Ktlint.java  | 9 ++++++---
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index 8fa679e7aa..55b4ca4520 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -49,12 +49,7 @@ public static FormatterStep create(Provisioner provisioner) {
 	}
 
 	public static FormatterStep create(String version, Provisioner provisioner) {
-		return create(version, provisioner, Collections.emptyMap());
-	}
-
-	public static FormatterStep create(String version, Provisioner provisioner,
-			Map<String, Object> editorConfigOverride) {
-		return create(version, provisioner, null, editorConfigOverride, Collections.emptyList());
+		return create(version, provisioner, null, Collections.emptyMap(), Collections.emptyList());
 	}
 
 	public static FormatterStep create(String version,
@@ -73,7 +68,7 @@ public static String defaultVersion() {
 		return DEFAULT_VERSION;
 	}
 
-	static final class State implements Serializable {
+	private static final class State implements Serializable {
 		private static final long serialVersionUID = 1L;
 		/** The jar that contains the formatter. */
 		private final JarState jarState;
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
index 7fe492ca6e..2459a52828 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
@@ -30,7 +30,6 @@
 import com.diffplug.spotless.maven.FormatterStepFactory;
 
 public class Ktlint implements FormatterStepFactory {
-
 	@Parameter
 	private String version;
 	@Parameter
@@ -53,7 +52,11 @@ public FormatterStep newFormatterStep(final FormatterStepConfig stepConfig) {
 		if (customRuleSets == null) {
 			customRuleSets = Collections.emptyList();
 		}
-
-		return KtLintStep.create(ktlintVersion, stepConfig.getProvisioner(), configPath, editorConfigOverride, customRuleSets);
+		return KtLintStep.create(
+				ktlintVersion,
+				stepConfig.getProvisioner(),
+				configPath,
+				editorConfigOverride,
+				customRuleSets);
 	}
 }

From 81c3511f3590b789516d41d630643e38ef051fef Mon Sep 17 00:00:00 2001
From: Jose Luis Badano <badanojoseluis@gmail.com>
Date: Mon, 6 Nov 2023 00:25:47 -0300
Subject: [PATCH 1292/2068] Add a step to remove semicolons in Groovy files

Co-authored-by: Goooler <wangzongler@gmail.com>
---
 CHANGES.md                                    |  1 +
 .../spotless/groovy/RemoveSemicolonsStep.java | 76 +++++++++++++++++++
 plugin-gradle/CHANGES.md                      |  1 +
 plugin-gradle/README.md                       |  2 +
 .../gradle/spotless/BaseGroovyExtension.java  |  5 ++
 .../gradle/spotless/GroovyExtensionTest.java  | 21 +++++
 plugin-maven/CHANGES.md                       |  1 +
 plugin-maven/README.md                        |  2 +
 .../spotless/maven/groovy/Groovy.java         |  4 +
 .../maven/groovy/RemoveSemicolons.java        | 29 +++++++
 .../maven/groovy/RemoveSemicolonsTest.java    | 52 +++++++++++++
 .../GroovyCodeWithSemicolons.test             | 10 +++
 .../GroovyCodeWithSemicolonsFormatted.test    | 10 +++
 13 files changed, 214 insertions(+)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/groovy/RemoveSemicolonsStep.java
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy/RemoveSemicolons.java
 create mode 100644 plugin-maven/src/test/java/com/diffplug/spotless/maven/groovy/RemoveSemicolonsTest.java
 create mode 100644 testlib/src/main/resources/groovy/removeSemicolons/GroovyCodeWithSemicolons.test
 create mode 100644 testlib/src/main/resources/groovy/removeSemicolons/GroovyCodeWithSemicolonsFormatted.test

diff --git a/CHANGES.md b/CHANGES.md
index 404363e199..7d7c3dc355 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -16,6 +16,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Fix Eclipse JDT on some settings files. ([#1864](https://github.com/diffplug/spotless/pull/1864) fixes [#1638](https://github.com/diffplug/spotless/issues/1638))
 ### Changes
 * Bump default `ktlint` version to latest `1.0.0` -> `1.0.1`. ([#1855](https://github.com/diffplug/spotless/pull/1855))
+* Add a Step to remove semicolons from Groovy files. ([#1881](https://github.com/diffplug/spotless/pull/1881))
 
 ## [2.42.0] - 2023-09-28
 ### Added
diff --git a/lib/src/main/java/com/diffplug/spotless/groovy/RemoveSemicolonsStep.java b/lib/src/main/java/com/diffplug/spotless/groovy/RemoveSemicolonsStep.java
new file mode 100644
index 0000000000..e24feb5cd3
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/groovy/RemoveSemicolonsStep.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.groovy;
+
+import java.io.BufferedReader;
+import java.io.Serializable;
+import java.io.StringReader;
+
+import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.FormatterStep;
+
+/**
+ * Removes all semicolons from the end of lines.
+ *
+ * @author Jose Luis Badano
+ */
+public final class RemoveSemicolonsStep {
+	private static final String NAME = "Remove unnecessary semicolons";
+
+	private RemoveSemicolonsStep() {
+		// do not instantiate
+	}
+
+	public static FormatterStep create() {
+		return FormatterStep.createLazy(NAME,
+				State::new,
+				RemoveSemicolonsStep.State::toFormatter);
+	}
+
+	private static final class State implements Serializable {
+		private static final long serialVersionUID = 1L;
+
+		FormatterFunc toFormatter() {
+			return raw -> {
+				try (BufferedReader reader = new BufferedReader(new StringReader(raw))) {
+					StringBuilder result = new StringBuilder();
+					String line;
+					while ((line = reader.readLine()) != null) {
+						result.append(removeSemicolon(line));
+						result.append(System.lineSeparator());
+					}
+					return result.toString();
+				}
+			};
+		}
+
+		/**
+		 * Removes the last semicolon in a line if it exists.
+		 *
+		 * @param line the line to remove the semicolon from
+		 * @return the line without the last semicolon
+		 */
+		private String removeSemicolon(String line) {
+			// find last semicolon in a string a remove it
+			int lastSemicolon = line.lastIndexOf(";");
+			if (lastSemicolon != -1 && lastSemicolon == line.length() - 1) {
+				return line.substring(0, lastSemicolon);
+			} else {
+				return line;
+			}
+		}
+	}
+}
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 32bf1bd7c0..03ddf370f4 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -10,6 +10,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Check if EditorConfig file exist for Ktlint in KotlinGradleExtension. ([#1889](https://github.com/diffplug/spotless/pull/1889))
 ### Changes
 * Bump default `ktlint` version to latest `1.0.0` -> `1.0.1`. ([#1855](https://github.com/diffplug/spotless/pull/1855))
+* Add a Step to remove semicolons from Groovy files. ([#1881](https://github.com/diffplug/spotless/pull/1881))
 ### Fixed
 * Fix `GoogleJavaFormatConfig.reorderImports` not working. ([#1872](https://github.com/diffplug/spotless/issues/1872))
 
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 6232f9c0e1..6b707a1eaa 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -320,6 +320,8 @@ spotless {
     // optional: instead of specifying import groups directly you can specify a config file
     // export config file: https://github.com/diffplug/spotless/blob/main/ECLIPSE_SCREENSHOTS.md#creating-spotlessimportorder
     importOrderFile('eclipse-import-order.txt') // import order file as exported from eclipse
+    // removes semicolons at the end of lines
+    removeSemicolons()
 
     excludeJava() // excludes all Java sources within the Groovy source dirs from formatting
     // the Groovy Eclipse formatter extends the Java Eclipse formatter,
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseGroovyExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseGroovyExtension.java
index 6aa28d1853..657ef06a66 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseGroovyExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseGroovyExtension.java
@@ -24,6 +24,7 @@
 
 import com.diffplug.spotless.extra.EquoBasedStepBuilder;
 import com.diffplug.spotless.extra.groovy.GrEclipseFormatterStep;
+import com.diffplug.spotless.groovy.RemoveSemicolonsStep;
 import com.diffplug.spotless.java.ImportOrderStep;
 
 abstract class BaseGroovyExtension extends FormatExtension {
@@ -40,6 +41,10 @@ public void importOrderFile(Object importOrderFile) {
 		addStep(ImportOrderStep.forGroovy().createFrom(getProject().file(importOrderFile)));
 	}
 
+	public void removeSemicolons() {
+		addStep(RemoveSemicolonsStep.create());
+	}
+
 	public GrEclipseConfig greclipse() {
 		return greclipse(GrEclipseFormatterStep.defaultVersion());
 	}
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GroovyExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GroovyExtensionTest.java
index c38df40d54..7f87d8793c 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GroovyExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GroovyExtensionTest.java
@@ -88,6 +88,27 @@ void excludeJavaWithCustomTarget() throws IOException {
 		assertThat(error).hasMessageContaining("'excludeJava' is not supported");
 	}
 
+	@Test
+	void removeSemicolons() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"apply plugin: 'groovy'",
+				"",
+				"spotless {",
+				"    groovy {",
+				"        removeSemicolons()",
+				"    }",
+				"}");
+
+		String withSemicolons = getTestResource("groovy/removeSemicolons/GroovyCodeWithSemicolons.test");
+		String withoutSemicolons = getTestResource("groovy/removeSemicolons/GroovyCodeWithSemicolonsFormatted.test");
+		setFile("src/main/groovy/test.groovy").toContent(withSemicolons);
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("src/main/groovy/test.groovy").hasContent(withoutSemicolons);
+	}
+
 	@Test
 	void groovyPluginMissingCheck() throws IOException {
 		setFile("build.gradle").toLines(
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 5122402019..78fb6f84ca 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -11,6 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Fix Eclipse JDT on some settings files. ([#1864](https://github.com/diffplug/spotless/pull/1864) fixes [#1638](https://github.com/diffplug/spotless/issues/1638))
 ### Changes
 * Bump default `ktlint` version to latest `1.0.0` -> `1.0.1`. ([#1855](https://github.com/diffplug/spotless/pull/1855))
+* Add a Step to remove semicolons from Groovy files. ([#1881](https://github.com/diffplug/spotless/pull/1881))
 
 ## [2.40.0] - 2023-09-28
 ### Added
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index f7849fbdfc..5eb523eca2 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -336,6 +336,8 @@ These mechanisms already exist for the Gradle plugin.
       <order>java|javax,org,com,com.diffplug,,\#com.diffplug,\#</order>  <!-- or use <file>${project.basedir}/eclipse.importorder</file> -->
       <!-- you can use an empty string for all the imports you didn't specify explicitly, '|' to join group without blank line, and '\#` prefix for static imports. -->
     </importOrder>
+    
+    <removeSemicolons /> <!-- removes semicolons at the end of lines -->
 
     <greclipse />          <!-- has its own section below -->
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy/Groovy.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy/Groovy.java
index 35b91f3677..db4b35dfd6 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy/Groovy.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy/Groovy.java
@@ -52,4 +52,8 @@ public void addGreclipse(GrEclipse greclipse) {
 	public void addImportOrder(ImportOrder importOrder) {
 		addStepFactory(importOrder);
 	}
+
+	public void addRemoveSemicolons(RemoveSemicolons removeSemicolons) {
+		addStepFactory(removeSemicolons);
+	}
 }
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy/RemoveSemicolons.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy/RemoveSemicolons.java
new file mode 100644
index 0000000000..a96a078692
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy/RemoveSemicolons.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2016-2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.groovy;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.groovy.RemoveSemicolonsStep;
+import com.diffplug.spotless.maven.FormatterStepConfig;
+import com.diffplug.spotless.maven.FormatterStepFactory;
+
+public class RemoveSemicolons implements FormatterStepFactory {
+
+	@Override
+	public FormatterStep newFormatterStep(FormatterStepConfig config) {
+		return RemoveSemicolonsStep.create();
+	}
+}
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/groovy/RemoveSemicolonsTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/groovy/RemoveSemicolonsTest.java
new file mode 100644
index 0000000000..fc78c87a27
--- /dev/null
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/groovy/RemoveSemicolonsTest.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.groovy;
+
+import org.junit.jupiter.api.Test;
+
+import com.diffplug.spotless.maven.MavenIntegrationHarness;
+
+class RemoveSemicolonsTest extends MavenIntegrationHarness {
+
+	@Test
+	void testRemoveSemicolonsString() throws Exception {
+		writePomWithGroovySteps("<removeSemicolons/>");
+		runTest("Hello World;", "Hello World");
+	}
+
+	@Test
+	void testNotRemoveSemicolonsString() throws Exception {
+		writePomWithGroovySteps("<removeSemicolons/>");
+		runTest("Hello;World", "Hello;World");
+	}
+
+	@Test
+	void testRemoveSemicolons() throws Exception {
+		writePomWithGroovySteps("<removeSemicolons/>");
+
+		String path = "src/main/groovy/test.groovy";
+		setFile(path).toResource("groovy/removeSemicolons/GroovyCodeWithSemicolons.test");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile(path).sameAsResource("groovy/removeSemicolons/GroovyCodeWithSemicolonsFormatted.test");
+	}
+
+	private void runTest(String sourceContent, String targetContent) throws Exception {
+		String path = "src/main/groovy/test.groovy";
+		setFile(path).toContent(sourceContent);
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile(path).hasContent(targetContent);
+	}
+}
diff --git a/testlib/src/main/resources/groovy/removeSemicolons/GroovyCodeWithSemicolons.test b/testlib/src/main/resources/groovy/removeSemicolons/GroovyCodeWithSemicolons.test
new file mode 100644
index 0000000000..b66af4e820
--- /dev/null
+++ b/testlib/src/main/resources/groovy/removeSemicolons/GroovyCodeWithSemicolons.test
@@ -0,0 +1,10 @@
+import mylib.Unused;
+import mylib.UsedB;
+import mylib.UsedA;
+
+public class SomeClass {
+System.out.println("hello");
+UsedB.someMethod();
+UsedA.someMethod();
+}
+}
\ No newline at end of file
diff --git a/testlib/src/main/resources/groovy/removeSemicolons/GroovyCodeWithSemicolonsFormatted.test b/testlib/src/main/resources/groovy/removeSemicolons/GroovyCodeWithSemicolonsFormatted.test
new file mode 100644
index 0000000000..434addfa68
--- /dev/null
+++ b/testlib/src/main/resources/groovy/removeSemicolons/GroovyCodeWithSemicolonsFormatted.test
@@ -0,0 +1,10 @@
+import mylib.Unused
+import mylib.UsedB
+import mylib.UsedA
+
+public class SomeClass {
+System.out.println("hello")
+UsedB.someMethod()
+UsedA.someMethod()
+}
+}
\ No newline at end of file

From ad2f3ca8d2adceb1cc10cee131f9bd65ae9b2ac4 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Wed, 22 Nov 2023 11:00:23 +0800
Subject: [PATCH 1293/2068] Reorder section about Groovy integration

---
 plugin-gradle/README.md | 9 ++++++---
 plugin-maven/README.md  | 8 ++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 6b707a1eaa..4f6b74bdb7 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -322,13 +322,16 @@ spotless {
     importOrderFile('eclipse-import-order.txt') // import order file as exported from eclipse
     // removes semicolons at the end of lines
     removeSemicolons()
-
-    excludeJava() // excludes all Java sources within the Groovy source dirs from formatting
     // the Groovy Eclipse formatter extends the Java Eclipse formatter,
     // so it formats Java files by default (unless `excludeJava` is used).
     greclipse() // has its own section below
+    
+    licenseHeader('/* (C) $YEAR */') // or licenseHeaderFile
 
-    licenseHeader '/* (C) $YEAR */' // or licenseHeaderFile
+    //---- Below is for `groovy` only ----
+    
+    // excludes all Java sources within the Groovy source dirs from formatting
+    excludeJava()
   }
   groovyGradle {
     target '*.gradle' // default target of groovyGradle
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 5eb523eca2..857597beb2 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -331,16 +331,16 @@ These mechanisms already exist for the Gradle plugin.
       <include>src/test/groovy/**/*.groovy</include>
     </includes>
 
-    <importOrder /> <!-- standard import order -->
+    <importOrder/> <!-- standard import order -->
     <importOrder>  <!-- or a custom ordering -->
       <order>java|javax,org,com,com.diffplug,,\#com.diffplug,\#</order>  <!-- or use <file>${project.basedir}/eclipse.importorder</file> -->
       <!-- you can use an empty string for all the imports you didn't specify explicitly, '|' to join group without blank line, and '\#` prefix for static imports. -->
     </importOrder>
     
-    <removeSemicolons /> <!-- removes semicolons at the end of lines -->
-
-    <greclipse />          <!-- has its own section below -->
+    <removeSemicolons/> <!-- removes semicolons at the end of lines -->
+    <greclipse/>          <!-- has its own section below -->
 
+    <excludeJava/>
     <licenseHeader>
       <content>/* (C)$YEAR */</content>  <!-- or <file>${project.basedir}/license-header</file> -->
     </licenseHeader>

From 1f78412810a2f325993b05ae026ce558683dc717 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sun, 26 Nov 2023 13:11:57 +0800
Subject: [PATCH 1294/2068] Bump SpotBugs plugin to 5.2.3

https://github.com/spotbugs/spotbugs-gradle-plugin/releases/tag/5.2.3
https://github.com/spotbugs/spotbugs-gradle-plugin?tab=readme-ov-file#refer-the-version-in-the-build-script
---
 gradle.properties        | 1 -
 gradle/java-setup.gradle | 9 +--------
 settings.gradle          | 2 +-
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index c65ea39f94..b60fa2f805 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,7 +21,6 @@ artifactIdGradle=spotless-plugin-gradle
 
 # Build requirements
 VER_JAVA=11
-VER_SPOTBUGS=4.7.3
 VER_JSR_305=3.0.2
 
 # Dependencies provided by Spotless plugin
diff --git a/gradle/java-setup.gradle b/gradle/java-setup.gradle
index 5a1e23ef0a..91f2f13e8c 100644
--- a/gradle/java-setup.gradle
+++ b/gradle/java-setup.gradle
@@ -14,7 +14,6 @@ tasks.withType(JavaCompile).configureEach {
 //////////////
 apply plugin: 'com.github.spotbugs'
 spotbugs {
-	toolVersion = VER_SPOTBUGS
 	ignoreFailures = false 	// bug free or it doesn't ship!
 	reportLevel = 'medium'	// low|medium|high (low = sensitive to even minor mistakes)
 	omitVisitors = [
@@ -30,16 +29,10 @@ tasks.withType(com.github.spotbugs.snom.SpotBugsTask).configureEach {
 	reports {
 		html.enabled = true
 	}
-	notCompatibleWithConfigurationCache("https://github.com/spotbugs/spotbugs-gradle-plugin/issues/670")
 }
 
-tasks.named('spotbugsMain') {
-	reports {
-		html.enabled = true
-	}
-}
 dependencies {
 	compileOnly 'net.jcip:jcip-annotations:1.0'
-	compileOnly "com.github.spotbugs:spotbugs-annotations:${VER_SPOTBUGS}"
+	compileOnly "com.github.spotbugs:spotbugs-annotations:${spotbugs.toolVersion.get()}"
 	compileOnly "com.google.code.findbugs:jsr305:${VER_JSR_305}"
 }
diff --git a/settings.gradle b/settings.gradle
index e7b9649cf3..e7e5a6d4ea 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,7 +12,7 @@ plugins {
 	// https://github.com/gradle-nexus/publish-plugin/releases
 	id 'io.github.gradle-nexus.publish-plugin' version '1.3.0' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
-	id 'com.github.spotbugs' version '5.2.1' apply false
+	id 'com.github.spotbugs' version '5.2.3' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
 	id 'com.diffplug.spotless-changelog' version '3.0.2' apply false
 	// https://github.com/diffplug/goomph/blob/main/CHANGES.md

From dd344320b5183a20d175d79f3766bde735c8d784 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sun, 26 Nov 2023 15:28:57 +0800
Subject: [PATCH 1295/2068] Omit ConstructorThrow visitor

https://spotbugs.readthedocs.io/en/latest/detectors.html#constructorthrow
---
 gradle/java-setup.gradle | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gradle/java-setup.gradle b/gradle/java-setup.gradle
index 91f2f13e8c..b152097653 100644
--- a/gradle/java-setup.gradle
+++ b/gradle/java-setup.gradle
@@ -17,7 +17,11 @@ spotbugs {
 	ignoreFailures = false 	// bug free or it doesn't ship!
 	reportLevel = 'medium'	// low|medium|high (low = sensitive to even minor mistakes)
 	omitVisitors = [
-		'FindReturnRef'] // https://spotbugs.readthedocs.io/en/latest/detectors.html#findreturnref
+		// https://spotbugs.readthedocs.io/en/latest/detectors.html#constructorthrow
+		'ConstructorThrow',
+		// https://spotbugs.readthedocs.io/en/latest/detectors.html#findreturnref
+		'FindReturnRef',
+	]
 }
 tasks.named('spotbugsTest') {
 	enabled = false

From 997ae051d3b4e3386ccf3d1b8e0229cc6756422e Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sun, 26 Nov 2023 15:37:53 +0800
Subject: [PATCH 1296/2068] Sign task is now CC compatible

---
 gradle/java-publish.gradle | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/gradle/java-publish.gradle b/gradle/java-publish.gradle
index 49075c5970..d6f0afa5a0 100644
--- a/gradle/java-publish.gradle
+++ b/gradle/java-publish.gradle
@@ -199,10 +199,6 @@ if (System.env['JITPACK'] == 'true' || version.endsWith('-SNAPSHOT')) {
 	}
 }
 
-tasks.withType(Sign).configureEach {
-	notCompatibleWithConfigurationCache("https://github.com/gradle/gradle/issues/13470")
-}
-
 tasks.withType(AbstractArchiveTask).configureEach {
 	preserveFileTimestamps = false
 	reproducibleFileOrder = true

From 1031d15db96d159e42614532883d5f1319ffc206 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sun, 26 Nov 2023 15:55:00 +0800
Subject: [PATCH 1297/2068] Defer Jar task configuration

---
 lib-extra/build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index 07135ff726..e6524f76bf 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -56,16 +56,16 @@ for (needsP2 in NEEDS_P2_DEPS) {
 		add("${needsP2}CompileOnly", "dev.equo.ide:solstice:${VER_SOLSTICE}")
 	}
 }
-jar {
+
+def jar = tasks.named('jar', Jar) {
 	for (needsP2 in NEEDS_P2_DEPS) {
-		from sourceSets.getByName(needsP2).output.classesDirs
+		from sourceSets.named(needsP2).map { it.output.classesDirs }
 	}
 }
+
 tasks.withType(Test).configureEach {
 	dependsOn jar
-	doFirst {
-		classpath += jar.outputs.files
-	}
+	classpath += jar.get().outputs.files
 }
 
 apply plugin: 'dev.equo.p2deps'

From 53fe1e0bb2c063e6f9bbbea80bab52306975a1db Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sun, 26 Nov 2023 13:11:57 +0800
Subject: [PATCH 1298/2068] Polish KotlinGradleExtensionTest

---
 .../gradle/spotless/KotlinExtensionTest.java  |  2 +-
 .../spotless/KotlinGradleExtensionTest.java   | 61 ++++++-------------
 2 files changed, 19 insertions(+), 44 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
index dd0f2f5e21..6973eb020c 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
@@ -30,7 +30,7 @@ class KotlinExtensionTest extends GradleIntegrationHarness {
 	void integrationDiktat() throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.4.30'",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
 				"    id 'com.diffplug.spotless'",
 				"}",
 				"repositories { mavenCentral() }",
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
index 7dade5f2ff..f2b8590083 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
@@ -15,34 +15,19 @@
  */
 package com.diffplug.gradle.spotless;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import java.io.IOException;
 
-import org.gradle.testkit.runner.BuildResult;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
-class KotlinGradleExtensionTest extends GradleIntegrationHarness {
-	@Test
-	void integration_default_diktat() throws IOException {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.4.30'",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    kotlinGradle {",
-				"        diktat()",
-				"    }",
-				"}");
-		setFile("configuration.gradle.kts").toResource("kotlin/diktat/basic.dirty");
-		BuildResult result = gradleRunner().withArguments("spotlessApply").buildAndFail();
-		assertThat(result.getOutput()).contains("[AVOID_NESTED_FUNCTIONS] try to avoid using nested functions");
-	}
+/**
+ * We test KotlinGradleExtension only behaviors here.
+ */
+class KotlinGradleExtensionTest extends KotlinExtensionTest {
 
-	@Test
-	void withExperimentalEditorConfigOverride() throws IOException {
+	@ParameterizedTest
+	@ValueSource(booleans = {true, false})
+	void testTarget(boolean useDefaultTarget) throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
 				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
@@ -51,6 +36,7 @@ void withExperimentalEditorConfigOverride() throws IOException {
 				"repositories { mavenCentral() }",
 				"spotless {",
 				"    kotlinGradle {",
+				"        " + (useDefaultTarget ? "" : "target \"*.kts\""),
 				"        ktlint().editorConfigOverride([",
 				"            ktlint_experimental: \"enabled\",",
 				"            ij_kotlin_allow_trailing_comma: true,",
@@ -59,25 +45,14 @@ void withExperimentalEditorConfigOverride() throws IOException {
 				"    }",
 				"}");
 		setFile("configuration.gradle.kts").toResource("kotlin/ktlint/experimentalEditorConfigOverride.dirty");
+		setFile("configuration.kts").toResource("kotlin/ktlint/experimentalEditorConfigOverride.dirty");
 		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("configuration.gradle.kts").sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.clean");
-	}
-
-	@Test
-	void integration_ktfmt_with_dropbox_style() throws IOException {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    kotlinGradle {",
-				"        ktfmt().dropboxStyle()",
-				"    }",
-				"}");
-		setFile("configuration.gradle.kts").toResource("kotlin/ktfmt/dropboxstyle.dirty");
-		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("configuration.gradle.kts").sameAsResource("kotlin/ktfmt/dropboxstyle.clean");
+		if (useDefaultTarget) {
+			assertFile("configuration.gradle.kts").sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.clean");
+			assertFile("configuration.kts").sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.dirty");
+		} else {
+			assertFile("configuration.gradle.kts").sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.clean");
+			assertFile("configuration.kts").sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.clean");
+		}
 	}
 }

From 4775485957c5cafcf5c6c65dab4f3203c5471b06 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sun, 26 Nov 2023 17:17:21 +0800
Subject: [PATCH 1299/2068] Polish GroovyGradleExtensionTest

---
 .../spotless/GroovyGradleExtensionTest.java   | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GroovyGradleExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GroovyGradleExtensionTest.java
index 7f4d593a9c..e94d269644 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GroovyGradleExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GroovyGradleExtensionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,24 +17,20 @@
 
 import java.io.IOException;
 
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 import com.diffplug.common.base.StringPrinter;
 
-class GroovyGradleExtensionTest extends GradleIntegrationHarness {
+/**
+ * We test GroovyGradleExtension only behaviors here.
+ */
+class GroovyGradleExtensionTest extends GroovyExtensionTest {
 	private static final String HEADER = "//My tests header";
 
-	@Test
-	void defaultTarget() throws IOException {
-		testTarget(true);
-	}
-
-	@Test
-	void customTarget() throws IOException {
-		testTarget(false);
-	}
-
-	private void testTarget(boolean useDefaultTarget) throws IOException {
+	@ParameterizedTest
+	@ValueSource(booleans = {true, false})
+	void testTarget(boolean useDefaultTarget) throws IOException {
 		String target = useDefaultTarget ? "" : "target 'other.gradle'";
 		String buildContent = StringPrinter.buildStringFromLines(
 				"plugins {",

From f183b61485616b8c2eb2c5946e03759d5ecc5228 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sun, 26 Nov 2023 18:18:43 +0800
Subject: [PATCH 1300/2068] Bump Kotlin to 1.6.21 in integration tests

We can't use the latest version, due to the Gradle matrix limit in tests.
---
 .../gradle/spotless/KotlinExtensionTest.java   | 18 +++++++++---------
 .../spotless/KotlinGradleExtensionTest.java    |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
index 6973eb020c..bd1175b992 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
@@ -30,7 +30,7 @@ class KotlinExtensionTest extends GradleIntegrationHarness {
 	void integrationDiktat() throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
 				"    id 'com.diffplug.spotless'",
 				"}",
 				"repositories { mavenCentral() }",
@@ -48,7 +48,7 @@ void integrationDiktat() throws IOException {
 	void integrationKtfmt_dropboxStyle_0_19() throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
 				"    id 'com.diffplug.spotless'",
 				"}",
 				"repositories { mavenCentral() }",
@@ -66,7 +66,7 @@ void integrationKtfmt_dropboxStyle_0_19() throws IOException {
 	void withExperimentalEditorConfigOverride() throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
 				"    id 'com.diffplug.spotless'",
 				"}",
 				"repositories { mavenCentral() }",
@@ -90,7 +90,7 @@ void testWithInvalidEditorConfigFile() throws IOException {
 
 		setFile("build.gradle").toLines(
 				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
 				"    id 'com.diffplug.spotless'",
 				"}",
 				"repositories { mavenCentral() }",
@@ -110,7 +110,7 @@ void testReadCodeStyleFromEditorConfigFile() throws IOException {
 		setFile(".editorconfig").toResource("kotlin/ktlint/ktlint_official/.editorconfig");
 		setFile("build.gradle").toLines(
 				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
 				"    id 'com.diffplug.spotless'",
 				"}",
 				"repositories { mavenCentral() }",
@@ -127,7 +127,7 @@ void testSetEditorConfigCanOverrideEditorConfigFile() throws IOException {
 		setFile(".editorconfig").toResource("kotlin/ktlint/intellij_idea/.editorconfig");
 		setFile("build.gradle").toLines(
 				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
 				"    id 'com.diffplug.spotless'",
 				"}",
 				"repositories { mavenCentral() }",
@@ -145,7 +145,7 @@ void testSetEditorConfigCanOverrideEditorConfigFile() throws IOException {
 	void withCustomRuleSetApply() throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
 				"    id 'com.diffplug.spotless'",
 				"}",
 				"repositories { mavenCentral() }",
@@ -169,7 +169,7 @@ void withCustomRuleSetApply() throws IOException {
 	void testWithHeader() throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
 				"    id 'com.diffplug.spotless'",
 				"}",
 				"repositories { mavenCentral() }",
@@ -188,7 +188,7 @@ void testWithHeader() throws IOException {
 	void testWithCustomMaxWidthDefaultStyleKtfmt() throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
 				"    id 'com.diffplug.spotless'",
 				"}",
 				"repositories { mavenCentral() }",
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
index f2b8590083..c607c36912 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
@@ -30,7 +30,7 @@ class KotlinGradleExtensionTest extends KotlinExtensionTest {
 	void testTarget(boolean useDefaultTarget) throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
 				"    id 'com.diffplug.spotless'",
 				"}",
 				"repositories { mavenCentral() }",

From 23972d3fa9c9950bc34eb653f0e598cc968b2620 Mon Sep 17 00:00:00 2001
From: runner <runner@fv-az711-133>
Date: Mon, 27 Nov 2023 05:38:38 +0000
Subject: [PATCH 1301/2068] Published lib/2.43.0

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 7d7c3dc355..f2bc6974c6 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.43.0] - 2023-11-27
 ### Added
 * Support custom rule sets for Ktlint. ([#1896](https://github.com/diffplug/spotless/pull/1896)
 ### Fixed

From 43b5276771e09f4e800c97ffe8a3dce27ad1776a Mon Sep 17 00:00:00 2001
From: runner <runner@fv-az711-133>
Date: Mon, 27 Nov 2023 05:40:51 +0000
Subject: [PATCH 1302/2068] Published gradle/6.23.0

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 56 ++++++++++++++++++++--------------------
 2 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 03ddf370f4..b602c5af2d 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [6.23.0] - 2023-11-27
 ### Added
 * Support custom rule sets for Ktlint. ([#1896](https://github.com/diffplug/spotless/pull/1896)
 ### Fixed
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 4f6b74bdb7..1fdea63c8c 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -14,9 +14,9 @@ output = [
   ].join('\n');
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
-[![Changelog](https://img.shields.io/badge/changelog-6.22.0-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-6.23.0-blue.svg)](CHANGES.md)
 [![MavenCentral](https://img.shields.io/badge/mavencentral-here-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/index.html)
 
 [![VS Code plugin](https://img.shields.io/badge/IDE-VS_Code-blueviolet.svg)](https://marketplace.visualstudio.com/items?itemName=richardwillis.vscode-spotless-gradle)
 [![IntelliJ plugin](https://img.shields.io/badge/IDE-IntelliJ-blueviolet.svg)](https://plugins.jetbrains.com/plugin/18321-spotless-gradle)
@@ -128,10 +128,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -144,7 +144,7 @@ Spotless requires JRE 11+ and Gradle 6.1.1 or newer.
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -301,8 +301,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -357,8 +357,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -436,7 +436,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -468,7 +468,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -500,7 +500,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -536,7 +536,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ### buf
 
-`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
+`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
 
 **WARNING** this step **must** be the first step in the chain, steps before it will be ignored. Thumbs up [this issue](https://github.com/bufbuild/buf/issues/1035) for a resolution, see [here](https://github.com/diffplug/spotless/pull/1208#discussion_r1264439669) for more details on the problem.
 
@@ -568,7 +568,7 @@ buf {
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -589,7 +589,7 @@ spotless {
 
 ## Flexmark
 
-`com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FlexmarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java)
+`com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/FlexmarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java)
 
 [homepage](https://github.com/vsch/flexmark-java). Flexmark is a flexible Commonmark/Markdown parser that can be used to format Markdown files. It supports different [flavors of Markdown](https://github.com/vsch/flexmark-java#markdown-processor-emulation) and [many formatting options](https://github.com/vsch/flexmark-java/wiki/Markdown-Formatter#options).
 
@@ -608,7 +608,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -633,7 +633,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -673,7 +673,7 @@ sql.formatter.indent.size=4
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -767,7 +767,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## Javascript
 
-- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
+- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
 
 ```gradle
 spotless {
@@ -832,7 +832,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -952,7 +952,7 @@ spotless {
 
 ## YAML
 
-- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
+- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
 
 ```gradle
 spotless {
@@ -984,7 +984,7 @@ spotless {
 
 ## Gherkin
 
-- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
+- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
 
 ```gradle
 spotless {
@@ -1371,7 +1371,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -1451,9 +1451,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -1486,11 +1486,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From 6b8568ff45cd8107f806b393afeb8b1c0719d8c6 Mon Sep 17 00:00:00 2001
From: runner <runner@fv-az711-133>
Date: Mon, 27 Nov 2023 05:42:21 +0000
Subject: [PATCH 1303/2068] Published maven/2.41.0

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 78fb6f84ca..576f8f68bd 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.41.0] - 2023-11-27
 ### Added
 * CompileSourceRoots and TestCompileSourceRoots are now respected as default includes. These properties are commonly set when adding extra source directories. ([#1846](https://github.com/diffplug/spotless/issues/1846))
 * Support custom rule sets for Ktlint. ([#1896](https://github.com/diffplug/spotless/pull/1896)
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 857597beb2..3709a65cdf 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -8,8 +8,8 @@ output = [
   ].join('\n');
 -->
 [![MavenCentral](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Changelog](https://img.shields.io/badge/changelog-2.40.0-blue.svg)](CHANGES.md)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.40.0/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.41.0-blue.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.41.0/index.html)
 <!---freshmark /shields -->
 
 <!---freshmark javadoc

From ec07c67010b252501cafb252286dc5bf948de962 Mon Sep 17 00:00:00 2001
From: AntsyLich <59261191+AntsyLich@users.noreply.github.com>
Date: Mon, 27 Nov 2023 12:03:55 +0600
Subject: [PATCH 1304/2068] Add missing bracket in CHANGES.md

---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index f2bc6974c6..d5443669a0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,7 +13,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [2.43.0] - 2023-11-27
 ### Added
-* Support custom rule sets for Ktlint. ([#1896](https://github.com/diffplug/spotless/pull/1896)
+* Support custom rule sets for Ktlint. ([#1896](https://github.com/diffplug/spotless/pull/1896))
 ### Fixed
 * Fix Eclipse JDT on some settings files. ([#1864](https://github.com/diffplug/spotless/pull/1864) fixes [#1638](https://github.com/diffplug/spotless/issues/1638))
 ### Changes

From 5eec2d25290e2d021b19002b4c91c1ca2bd29559 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Mon, 27 Nov 2023 15:32:55 +0800
Subject: [PATCH 1305/2068] Make BaseGroovyExtension and BaseKotlinExtension
 public

---
 plugin-gradle/CHANGES.md                                        | 2 ++
 .../java/com/diffplug/gradle/spotless/BaseGroovyExtension.java  | 2 +-
 .../java/com/diffplug/gradle/spotless/BaseKotlinExtension.java  | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index b602c5af2d..62c55be05a 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Make `BaseGroovyExtension` and `BaseKotlinExtension` public. ([#1912](https://github.com/diffplug/spotless/pull/1912))
 
 ## [6.23.0] - 2023-11-27
 ### Added
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseGroovyExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseGroovyExtension.java
index 657ef06a66..5b302bbe0f 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseGroovyExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseGroovyExtension.java
@@ -27,7 +27,7 @@
 import com.diffplug.spotless.groovy.RemoveSemicolonsStep;
 import com.diffplug.spotless.java.ImportOrderStep;
 
-abstract class BaseGroovyExtension extends FormatExtension {
+public abstract class BaseGroovyExtension extends FormatExtension {
 	protected BaseGroovyExtension(SpotlessExtension spotless) {
 		super(spotless);
 	}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java
index 7a40d99f26..c622c27d0a 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java
@@ -33,7 +33,7 @@
 import com.diffplug.spotless.kotlin.KtLintStep;
 import com.diffplug.spotless.kotlin.KtfmtStep;
 
-abstract class BaseKotlinExtension extends FormatExtension {
+public abstract class BaseKotlinExtension extends FormatExtension {
 	protected BaseKotlinExtension(SpotlessExtension spotless) {
 		super(spotless);
 	}

From e0b3787aad714a79138b3f2980d8d4f1e9735dcf Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Mon, 27 Nov 2023 15:43:14 +0800
Subject: [PATCH 1306/2068] Fix doc formats

---
 plugin-gradle/CHANGES.md | 2 +-
 plugin-maven/CHANGES.md  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 62c55be05a..1d0aacb06e 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -8,7 +8,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [6.23.0] - 2023-11-27
 ### Added
-* Support custom rule sets for Ktlint. ([#1896](https://github.com/diffplug/spotless/pull/1896)
+* Support custom rule sets for Ktlint. ([#1896](https://github.com/diffplug/spotless/pull/1896))
 ### Fixed
 * Fix Eclipse JDT on some settings files. ([#1864](https://github.com/diffplug/spotless/pull/1864) fixes [#1638](https://github.com/diffplug/spotless/issues/1638))
 * Check if EditorConfig file exist for Ktlint in KotlinGradleExtension. ([#1889](https://github.com/diffplug/spotless/pull/1889))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 576f8f68bd..6313c8c8b5 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 (
 ## [2.41.0] - 2023-11-27
 ### Added
 * CompileSourceRoots and TestCompileSourceRoots are now respected as default includes. These properties are commonly set when adding extra source directories. ([#1846](https://github.com/diffplug/spotless/issues/1846))
-* Support custom rule sets for Ktlint. ([#1896](https://github.com/diffplug/spotless/pull/1896)
+* Support custom rule sets for Ktlint. ([#1896](https://github.com/diffplug/spotless/pull/1896))
 ### Fixed
 * Fix crash when build dir is a softlink to another directory. ([#1859](https://github.com/diffplug/spotless/pull/1859))
 * Fix Eclipse JDT on some settings files. ([#1864](https://github.com/diffplug/spotless/pull/1864) fixes [#1638](https://github.com/diffplug/spotless/issues/1638))

From 3c5a9b04f9c8d78d27d7fb58f21420605f6e1797 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Mon, 27 Nov 2023 18:50:55 +0800
Subject: [PATCH 1307/2068] Note breaking changes for Gradle plugin

---
 plugin-gradle/CHANGES.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 1d0aacb06e..d0a3b2afb7 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -10,13 +10,15 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * Support custom rule sets for Ktlint. ([#1896](https://github.com/diffplug/spotless/pull/1896))
 ### Fixed
+* Fix `GoogleJavaFormatConfig.reorderImports` not working. ([#1872](https://github.com/diffplug/spotless/issues/1872))
 * Fix Eclipse JDT on some settings files. ([#1864](https://github.com/diffplug/spotless/pull/1864) fixes [#1638](https://github.com/diffplug/spotless/issues/1638))
 * Check if EditorConfig file exist for Ktlint in KotlinGradleExtension. ([#1889](https://github.com/diffplug/spotless/pull/1889))
 ### Changes
 * Bump default `ktlint` version to latest `1.0.0` -> `1.0.1`. ([#1855](https://github.com/diffplug/spotless/pull/1855))
 * Add a Step to remove semicolons from Groovy files. ([#1881](https://github.com/diffplug/spotless/pull/1881))
-### Fixed
-* Fix `GoogleJavaFormatConfig.reorderImports` not working. ([#1872](https://github.com/diffplug/spotless/issues/1872))
+* **POSSIBLY BREAKING** `userData` method has been removed from Ktlint step in ([#1891](https://github.com/diffplug/spotless/pull/1891)), you may use `editorConfigOverride` instead.
+* **POSSIBLY BREAKING** Reuse configs for `KotlinExtension` and `KotlinGradleExtension` in ([#1890](https://github.com/diffplug/spotless/pull/1890)), this may break your integrations in Gradle Kotlin DSL, wait for Spotless 6.23.1 to fix this.
+* **POSSIBLY BREAKING** Reuse configs for `GroovyExtension` and `GroovyGradleExtension` in ([#1890](https://github.com/diffplug/spotless/pull/1890)), this may break your integrations in Gradle Kotlin DSL, wait for Spotless 6.23.1 to fix this.
 
 ## [6.22.0] - 2023-09-28
 ### Added

From 0d1f6121a3e85655fd9d10faf658743c1fb7b009 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 28 Nov 2023 13:02:44 +0800
Subject: [PATCH 1308/2068] Test Spotless Ktlint integration in kts

---
 .../gradle/spotless/KotlinExtensionTest.java     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
index bd1175b992..d8d5b63e01 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
@@ -143,21 +143,21 @@ void testSetEditorConfigCanOverrideEditorConfigFile() throws IOException {
 
 	@Test
 	void withCustomRuleSetApply() throws IOException {
-		setFile("build.gradle").toLines(
+		setFile("build.gradle.kts").toLines(
 				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
-				"    id 'com.diffplug.spotless'",
+				"    id(\"org.jetbrains.kotlin.jvm\") version \"1.6.21\"",
+				"    id(\"com.diffplug.spotless\")",
 				"}",
 				"repositories { mavenCentral() }",
 				"spotless {",
 				"    kotlin {",
 				"        ktlint(\"1.0.1\")",
-				"        .customRuleSets([",
+				"        .customRuleSets(listOf(",
 				"            \"io.nlopez.compose.rules:ktlint:0.3.3\"",
-				"        ])",
-				"        .editorConfigOverride([",
-				"            ktlint_function_naming_ignore_when_annotated_with: \"Composable\",",
-				"        ])",
+				"        ))",
+				"        .editorConfigOverride(mapOf(",
+				"            \"ktlint_function_naming_ignore_when_annotated_with\" to \"Composable\"",
+				"        ))",
 				"    }",
 				"}");
 		setFile("src/main/kotlin/Main.kt").toResource("kotlin/ktlint/listScreen.dirty");

From 1e76b8fbcf6ac6b4bf3a51cfb470c1abbaa722f7 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 29 Nov 2023 10:01:47 -0800
Subject: [PATCH 1309/2068] Published gradle/6.23.1

---
 plugin-gradle/CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index d0a3b2afb7..f1dce305b9 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [6.23.1] - 2023-11-29
 ### Fixed
 * Make `BaseGroovyExtension` and `BaseKotlinExtension` public. ([#1912](https://github.com/diffplug/spotless/pull/1912))
 

From 1fab9b81accae45e78208d7c0268ea738be774fc Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 29 Nov 2023 10:02:37 -0800
Subject: [PATCH 1310/2068] spotlessApply

---
 plugin-gradle/README.md | 56 ++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 1fdea63c8c..f54e5a12d4 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -14,9 +14,9 @@ output = [
   ].join('\n');
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
-[![Changelog](https://img.shields.io/badge/changelog-6.23.0-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-6.23.1-blue.svg)](CHANGES.md)
 [![MavenCentral](https://img.shields.io/badge/mavencentral-here-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/index.html)
 
 [![VS Code plugin](https://img.shields.io/badge/IDE-VS_Code-blueviolet.svg)](https://marketplace.visualstudio.com/items?itemName=richardwillis.vscode-spotless-gradle)
 [![IntelliJ plugin](https://img.shields.io/badge/IDE-IntelliJ-blueviolet.svg)](https://plugins.jetbrains.com/plugin/18321-spotless-gradle)
@@ -128,10 +128,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -144,7 +144,7 @@ Spotless requires JRE 11+ and Gradle 6.1.1 or newer.
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -301,8 +301,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -357,8 +357,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -436,7 +436,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -468,7 +468,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -500,7 +500,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -536,7 +536,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ### buf
 
-`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
+`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
 
 **WARNING** this step **must** be the first step in the chain, steps before it will be ignored. Thumbs up [this issue](https://github.com/bufbuild/buf/issues/1035) for a resolution, see [here](https://github.com/diffplug/spotless/pull/1208#discussion_r1264439669) for more details on the problem.
 
@@ -568,7 +568,7 @@ buf {
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -589,7 +589,7 @@ spotless {
 
 ## Flexmark
 
-`com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/FlexmarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java)
+`com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/FlexmarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java)
 
 [homepage](https://github.com/vsch/flexmark-java). Flexmark is a flexible Commonmark/Markdown parser that can be used to format Markdown files. It supports different [flavors of Markdown](https://github.com/vsch/flexmark-java#markdown-processor-emulation) and [many formatting options](https://github.com/vsch/flexmark-java/wiki/Markdown-Formatter#options).
 
@@ -608,7 +608,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -633,7 +633,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -673,7 +673,7 @@ sql.formatter.indent.size=4
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -767,7 +767,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## Javascript
 
-- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
+- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
 
 ```gradle
 spotless {
@@ -832,7 +832,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -952,7 +952,7 @@ spotless {
 
 ## YAML
 
-- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
+- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
 
 ```gradle
 spotless {
@@ -984,7 +984,7 @@ spotless {
 
 ## Gherkin
 
-- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
+- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
 
 ```gradle
 spotless {
@@ -1371,7 +1371,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -1451,9 +1451,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -1486,11 +1486,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From 5ecf292924f349a0dabcc4eeba6f7ffaeb5bc433 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 29 Nov 2023 15:44:12 -0800
Subject: [PATCH 1311/2068] Prepare to publish 6.23.2.

---
 plugin-gradle/CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index f1dce305b9..14e39cbae5 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Fix a stuck mavencentral sync from `6.23.1`.
 
 ## [6.23.1] - 2023-11-29
 ### Fixed

From afe162e6784e879b1998dedabfbefbc12cd46579 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 1 Dec 2023 23:26:48 +0000
Subject: [PATCH 1312/2068] Update dependency org.mockito:mockito-core to
 v5.8.0

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index b60fa2f805..c824d18ffd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -31,4 +31,4 @@ VER_DURIAN=1.2.0
 VER_JGIT=6.7.0.202309050840-r
 VER_JUNIT=5.10.0
 VER_ASSERTJ=3.24.2
-VER_MOCKITO=5.6.0
+VER_MOCKITO=5.8.0

From 28e948ebe6875d1a645bd9323bc8f0658c03eeac Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Fri, 1 Dec 2023 18:43:40 +0800
Subject: [PATCH 1313/2068] Update Gradle plugin version refs to 6.23.2

---
 plugin-gradle/CHANGES.md |  4 ++-
 plugin-gradle/README.md  | 56 ++++++++++++++++++++--------------------
 2 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 14e39cbae5..7d2691306a 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,8 +3,10 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [6.23.2] - 2023-12-01
 ### Fixed
-* Fix a stuck mavencentral sync from `6.23.1`.
+* Fix a stuck MavenCentral sync from `6.23.1`.
 
 ## [6.23.1] - 2023-11-29
 ### Fixed
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index f54e5a12d4..be694f910a 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -14,9 +14,9 @@ output = [
   ].join('\n');
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
-[![Changelog](https://img.shields.io/badge/changelog-6.23.1-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-6.23.2-blue.svg)](CHANGES.md)
 [![MavenCentral](https://img.shields.io/badge/mavencentral-here-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/index.html)
 
 [![VS Code plugin](https://img.shields.io/badge/IDE-VS_Code-blueviolet.svg)](https://marketplace.visualstudio.com/items?itemName=richardwillis.vscode-spotless-gradle)
 [![IntelliJ plugin](https://img.shields.io/badge/IDE-IntelliJ-blueviolet.svg)](https://plugins.jetbrains.com/plugin/18321-spotless-gradle)
@@ -128,10 +128,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -144,7 +144,7 @@ Spotless requires JRE 11+ and Gradle 6.1.1 or newer.
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -301,8 +301,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -357,8 +357,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -436,7 +436,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -468,7 +468,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -500,7 +500,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -536,7 +536,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ### buf
 
-`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
+`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
 
 **WARNING** this step **must** be the first step in the chain, steps before it will be ignored. Thumbs up [this issue](https://github.com/bufbuild/buf/issues/1035) for a resolution, see [here](https://github.com/diffplug/spotless/pull/1208#discussion_r1264439669) for more details on the problem.
 
@@ -568,7 +568,7 @@ buf {
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -589,7 +589,7 @@ spotless {
 
 ## Flexmark
 
-`com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/FlexmarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java)
+`com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/FlexmarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java)
 
 [homepage](https://github.com/vsch/flexmark-java). Flexmark is a flexible Commonmark/Markdown parser that can be used to format Markdown files. It supports different [flavors of Markdown](https://github.com/vsch/flexmark-java#markdown-processor-emulation) and [many formatting options](https://github.com/vsch/flexmark-java/wiki/Markdown-Formatter#options).
 
@@ -608,7 +608,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -633,7 +633,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -673,7 +673,7 @@ sql.formatter.indent.size=4
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -767,7 +767,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## Javascript
 
-- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
+- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
 
 ```gradle
 spotless {
@@ -832,7 +832,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -952,7 +952,7 @@ spotless {
 
 ## YAML
 
-- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
+- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
 
 ```gradle
 spotless {
@@ -984,7 +984,7 @@ spotless {
 
 ## Gherkin
 
-- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
+- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
 
 ```gradle
 spotless {
@@ -1371,7 +1371,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -1451,9 +1451,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -1486,11 +1486,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.1/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From de20ea93bc3cc0c923a39af8068c9873709b1d30 Mon Sep 17 00:00:00 2001
From: Sylwester Lachiewicz <slachiewicz@gmail.com>
Date: Sat, 30 Sep 2023 02:43:12 +0800
Subject: [PATCH 1314/2068] Use palantir-java-format 2.38.0 on Java 21

Co-authored-by: Goooler <wangzongler@gmail.com>
---
 CHANGES.md                                                      | 2 ++
 .../java/com/diffplug/spotless/java/PalantirJavaFormatStep.java | 2 +-
 plugin-gradle/CHANGES.md                                        | 2 ++
 plugin-maven/CHANGES.md                                         | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index d5443669a0..f49010b0c8 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Changes
+* Use palantir-java-format 2.38.0 on Java 21. ([#1920](https://github.com/diffplug/spotless/pull/1920))
 
 ## [2.43.0] - 2023-11-27
 ### Added
diff --git a/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
index f769ad09ec..2c3b84c40d 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
@@ -30,7 +30,7 @@ private PalantirJavaFormatStep() {}
 	private static final String DEFAULT_STYLE = "PALANTIR";
 	private static final String NAME = "palantir-java-format";
 	private static final String MAVEN_COORDINATE = "com.palantir.javaformat:palantir-java-format:";
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(8, "1.1.0").add(11, "2.28.0");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(8, "1.1.0").add(11, "2.28.0").add(21, "2.38.0");
 
 	/** Creates a step which formats everything - code, import order, and unused imports. */
 	public static FormatterStep create(Provisioner provisioner) {
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 7d2691306a..74dad45058 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Changes
+* Use palantir-java-format 2.38.0 on Java 21. ([#1920](https://github.com/diffplug/spotless/pull/1920))
 
 ## [6.23.2] - 2023-12-01
 ### Fixed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 6313c8c8b5..9192df0540 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Changes
+* Use palantir-java-format 2.38.0 on Java 21. ([#1920](https://github.com/diffplug/spotless/pull/1920))
 
 ## [2.41.0] - 2023-11-27
 ### Added

From 3908da9c05ff28a46be9df81f33b247085224c67 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sat, 2 Dec 2023 12:13:49 +0800
Subject: [PATCH 1315/2068] Update PR 1892 link ref

---
 plugin-gradle/CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 7d2691306a..c02b710050 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -24,7 +24,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Add a Step to remove semicolons from Groovy files. ([#1881](https://github.com/diffplug/spotless/pull/1881))
 * **POSSIBLY BREAKING** `userData` method has been removed from Ktlint step in ([#1891](https://github.com/diffplug/spotless/pull/1891)), you may use `editorConfigOverride` instead.
 * **POSSIBLY BREAKING** Reuse configs for `KotlinExtension` and `KotlinGradleExtension` in ([#1890](https://github.com/diffplug/spotless/pull/1890)), this may break your integrations in Gradle Kotlin DSL, wait for Spotless 6.23.1 to fix this.
-* **POSSIBLY BREAKING** Reuse configs for `GroovyExtension` and `GroovyGradleExtension` in ([#1890](https://github.com/diffplug/spotless/pull/1890)), this may break your integrations in Gradle Kotlin DSL, wait for Spotless 6.23.1 to fix this.
+* **POSSIBLY BREAKING** Reuse configs for `GroovyExtension` and `GroovyGradleExtension` in ([#1892](https://github.com/diffplug/spotless/pull/1892)), this may break your integrations in Gradle Kotlin DSL, wait for Spotless 6.23.1 to fix this.
 
 ## [6.22.0] - 2023-09-28
 ### Added

From 5f840aa14418718e2d08c9f48af6a748bced7050 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sat, 2 Dec 2023 12:03:44 +0800
Subject: [PATCH 1316/2068] Make KtfmtConfig.ConfigurableStyle#configure public

---
 plugin-gradle/CHANGES.md                        |  2 ++
 .../gradle/spotless/BaseKotlinExtension.java    |  2 +-
 .../gradle/spotless/KotlinExtensionTest.java    | 17 +++++++++++------
 .../kotlin/ktfmt/basic-dropbox-style.clean      | 14 ++++++++++++++
 4 files changed, 28 insertions(+), 7 deletions(-)
 create mode 100644 testlib/src/main/resources/kotlin/ktfmt/basic-dropbox-style.clean

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 7d2691306a..bb0d8f3a03 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Make `KtfmtConfig.ConfigurableStyle#configure` public. ([#1926](https://github.com/diffplug/spotless/pull/1926))
 
 ## [6.23.2] - 2023-12-01
 ### Fixed
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java
index c622c27d0a..4be814a470 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java
@@ -136,7 +136,7 @@ private FormatterStep createStep() {
 		}
 
 		public class ConfigurableStyle {
-			private void configure(Consumer<KtfmtStep.KtfmtFormattingOptions> optionsConfiguration) {
+			public void configure(Consumer<KtfmtStep.KtfmtFormattingOptions> optionsConfiguration) {
 				KtfmtStep.KtfmtFormattingOptions ktfmtFormattingOptions = new KtfmtStep.KtfmtFormattingOptions();
 				optionsConfiguration.accept(ktfmtFormattingOptions);
 				options = ktfmtFormattingOptions;
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
index d8d5b63e01..1e96d34574 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
@@ -45,21 +45,26 @@ void integrationDiktat() throws IOException {
 	}
 
 	@Test
-	void integrationKtfmt_dropboxStyle_0_19() throws IOException {
-		setFile("build.gradle").toLines(
+	void integrationKtfmtDropboxStyleWithPublicApi() throws IOException {
+		setFile("build.gradle.kts").toLines(
 				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
-				"    id 'com.diffplug.spotless'",
+				"    id(\"org.jetbrains.kotlin.jvm\") version \"1.6.21\"",
+				"    id(\"com.diffplug.spotless\")",
 				"}",
 				"repositories { mavenCentral() }",
 				"spotless {",
 				"    kotlin {",
-				"        ktfmt('0.19').dropboxStyle()",
+				"        ktfmt().dropboxStyle().configure {",
+				"            it.setMaxWidth(4)",
+				"            it.setBlockIndent(4)",
+				"            it.setContinuationIndent(4)",
+				"            it.setRemoveUnusedImport(false)",
+				"        }",
 				"    }",
 				"}");
 		setFile("src/main/kotlin/basic.kt").toResource("kotlin/ktfmt/basic.dirty");
 		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("src/main/kotlin/basic.kt").sameAsResource("kotlin/ktfmt/basic-dropboxstyle.clean");
+		assertFile("src/main/kotlin/basic.kt").sameAsResource("kotlin/ktfmt/basic-dropbox-style.clean");
 	}
 
 	@Test
diff --git a/testlib/src/main/resources/kotlin/ktfmt/basic-dropbox-style.clean b/testlib/src/main/resources/kotlin/ktfmt/basic-dropbox-style.clean
new file mode 100644
index 0000000000..428b6d69fb
--- /dev/null
+++ b/testlib/src/main/resources/kotlin/ktfmt/basic-dropbox-style.clean
@@ -0,0 +1,14 @@
+import a.*
+import a.b
+import a.b.c.*
+import kotlinx.android.synthetic.main.layout_name.*
+
+fun main() {
+    fun name() {
+        a()
+        return b
+    }
+    println(
+        ";")
+    println()
+}

From 21c9090d178e41f428235c2acfc81b79e32ab6b6 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sat, 2 Dec 2023 23:28:17 +0800
Subject: [PATCH 1317/2068] Bump default ktfmt version to latest 0.46

https://github.com/facebook/ktfmt/releases/tag/v0.46
---
 CHANGES.md                                                    | 2 ++
 lib/build.gradle                                              | 2 +-
 lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java | 2 +-
 plugin-gradle/CHANGES.md                                      | 2 ++
 plugin-maven/CHANGES.md                                       | 2 ++
 5 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index d5443669a0..7f90146d86 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Changes
+* Bump default `ktfmt` version to latest `0.44` -> `0.46`. ([#1927](https://github.com/diffplug/spotless/pull/1927))
 
 ## [2.43.0] - 2023-11-27
 ### Added
diff --git a/lib/build.gradle b/lib/build.gradle
index a3424a7ee9..d2b6a0a19b 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -92,7 +92,7 @@ dependencies {
 	jacksonCompileOnly "com.fasterxml.jackson.core:jackson-databind:$VER_JACKSON"
 	jacksonCompileOnly "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$VER_JACKSON"
 	// ktfmt
-	ktfmtCompileOnly "com.facebook:ktfmt:0.44"
+	ktfmtCompileOnly "com.facebook:ktfmt:0.46"
 	ktfmtCompileOnly("com.google.googlejavaformat:google-java-format") {
 		version {
 			strictly '1.7' // for JDK 8 compatibility
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
index 098f68d5bd..cf9a2dd231 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
@@ -39,7 +39,7 @@ public class KtfmtStep {
 	// prevent direct instantiation
 	private KtfmtStep() {}
 
-	private static final String DEFAULT_VERSION = "0.44";
+	private static final String DEFAULT_VERSION = "0.46";
 	static final String NAME = "ktfmt";
 	static final String PACKAGE = "com.facebook";
 	static final String MAVEN_COORDINATE = PACKAGE + ":ktfmt:";
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index bb0d8f3a03..298161476e 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,6 +5,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Fixed
 * Make `KtfmtConfig.ConfigurableStyle#configure` public. ([#1926](https://github.com/diffplug/spotless/pull/1926))
+### Changes
+* Bump default `ktfmt` version to latest `0.44` -> `0.46`. ([#1927](https://github.com/diffplug/spotless/pull/1927))
 
 ## [6.23.2] - 2023-12-01
 ### Fixed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 6313c8c8b5..69be17b2dc 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Changes
+* Bump default `ktfmt` version to latest `0.44` -> `0.46`. ([#1927](https://github.com/diffplug/spotless/pull/1927))
 
 ## [2.41.0] - 2023-11-27
 ### Added

From 00596df153e16d12df2ad8da5403485eba55fe52 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sat, 2 Dec 2023 23:54:09 +0800
Subject: [PATCH 1318/2068] Gradle 8.5

https://docs.gradle.org/8.5/release-notes.html
---
 gradle/wrapper/gradle-wrapper.jar             | Bin 63721 -> 43462 bytes
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 .../spotless/GradleIntegrationHarness.java    |   7 ++++++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7f93135c49b765f8051ef9d0a6055ff8e46073d8..d64cd4917707c1f8861d8cb53dd15194d4248596 100644
GIT binary patch
literal 43462
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

literal 63721
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3fa8f862f7..1af9e0930b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
index ade5cf3d1d..9e1856b6b0 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
@@ -54,9 +54,14 @@ public enum GradleVersionSupport {
 		GradleVersionSupport(String version) {
 			String minVersionForRunningJRE;
 			switch (Jvm.version()) {
+			case 22:
+				// TODO: https://docs.gradle.org/current/userguide/compatibility.html
 			case 21:
+				minVersionForRunningJRE = "8.5";
+				break;
 			case 20:
-				// TODO: https://docs.gradle.org/current/userguide/compatibility.html
+				minVersionForRunningJRE = "8.3";
+				break;
 			case 19:
 				minVersionForRunningJRE = "7.6";
 				break;

From 1ba268b7755bc22f3ab40bc7308b33b6b4c1680f Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sat, 2 Dec 2023 23:55:30 +0800
Subject: [PATCH 1319/2068] Add Java 21 to CI matrix

---
 .github/workflows/ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5e436abd95..d11b0b1166 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -42,7 +42,8 @@ jobs:
       fail-fast: false
       matrix:
         kind: [maven, gradle]
-        jre: [11, 17]
+        # Test on the latest Java version once Gradle & Maven support it.
+        jre: [11, 17, 21]
         os: [ubuntu-latest]
         include:
           # test windows at the diagonals of the above matrix

From 7b6cefdadeb1856ef5172d3e6785ec8d2b6fd838 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sun, 3 Dec 2023 00:57:32 +0800
Subject: [PATCH 1320/2068] Bump default googleJavaFormat version to latest
 1.18.1

https://github.com/google/google-java-format/releases
---
 CHANGES.md                                                      | 1 +
 lib/build.gradle                                                | 2 +-
 .../java/com/diffplug/spotless/java/GoogleJavaFormatStep.java   | 2 +-
 plugin-gradle/CHANGES.md                                        | 1 +
 plugin-maven/CHANGES.md                                         | 1 +
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index f49010b0c8..c1e3d9d101 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changes
 * Use palantir-java-format 2.38.0 on Java 21. ([#1920](https://github.com/diffplug/spotless/pull/1920))
+* Bump default `googleJavaFormat` version to latest `1.17.0` -> `1.18.1`. ([#1920](https://github.com/diffplug/spotless/pull/1920))
 
 ## [2.43.0] - 2023-11-27
 ### Added
diff --git a/lib/build.gradle b/lib/build.gradle
index a3424a7ee9..50d6c983f6 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -84,7 +84,7 @@ dependencies {
 	gherkinCompileOnly 'io.cucumber:gherkin-utils:8.0.2'
 	gherkinCompileOnly 'org.slf4j:slf4j-api:2.0.0'
 	// googleJavaFormat
-	googleJavaFormatCompileOnly 'com.google.googlejavaformat:google-java-format:1.17.0'
+	googleJavaFormatCompileOnly 'com.google.googlejavaformat:google-java-format:1.18.1'
 	// gson
 	gsonCompileOnly 'com.google.code.gson:gson:2.10.1'
 	// jackson
diff --git a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
index e5d990d807..0911c1d48d 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
@@ -83,7 +83,7 @@ public static FormatterStep create(String groupArtifact, String version, String
 			.addMin(11, "1.8") // we only support google-java-format >= 1.8 due to api changes
 			.addMin(16, "1.10.0") // java 16 requires at least 1.10.0 due to jdk api changes in JavaTokenizer
 			.addMin(21, "1.17.0") // java 21 requires at least 1.17.0 due to https://github.com/google/google-java-format/issues/898
-			.add(11, "1.17.0"); // default version
+			.add(11, "1.18.1"); // default version
 
 	public static String defaultGroupArtifact() {
 		return MAVEN_COORDINATE;
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 74dad45058..6e0e64195e 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changes
 * Use palantir-java-format 2.38.0 on Java 21. ([#1920](https://github.com/diffplug/spotless/pull/1920))
+* Bump default `googleJavaFormat` version to latest `1.17.0` -> `1.18.1`. ([#1920](https://github.com/diffplug/spotless/pull/1920))
 
 ## [6.23.2] - 2023-12-01
 ### Fixed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 9192df0540..713769f76c 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changes
 * Use palantir-java-format 2.38.0 on Java 21. ([#1920](https://github.com/diffplug/spotless/pull/1920))
+* Bump default `googleJavaFormat` version to latest `1.17.0` -> `1.18.1`. ([#1920](https://github.com/diffplug/spotless/pull/1920))
 
 ## [2.41.0] - 2023-11-27
 ### Added

From 682dcd6d4840002adb834b2db67038869efe5d57 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sun, 3 Dec 2023 01:50:45 +0800
Subject: [PATCH 1321/2068] Declare TARGET_JVM_ENVIRONMENT_ATTRIBUTE attr for
 resolving Guava

---
 .../java/com/diffplug/gradle/spotless/GradleProvisioner.java  | 4 ++++
 .../src/main/java/com/diffplug/spotless/TestProvisioner.java  | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
index 288cc10c72..9003445ddd 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
@@ -26,6 +26,7 @@
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.ConfigurationContainer;
 import org.gradle.api.artifacts.dsl.DependencyHandler;
+import org.gradle.api.attributes.Attribute;
 import org.gradle.api.attributes.Bundling;
 import org.gradle.api.attributes.Category;
 import org.gradle.api.initialization.dsl.ScriptHandler;
@@ -124,6 +125,9 @@ private static Provisioner forConfigurationContainer(Project project, Configurat
 				config.attributes(attr -> {
 					attr.attribute(Category.CATEGORY_ATTRIBUTE, project.getObjects().named(Category.class, Category.LIBRARY));
 					attr.attribute(Bundling.BUNDLING_ATTRIBUTE, project.getObjects().named(Bundling.class, Bundling.EXTERNAL));
+					// TODO: This is a copy-paste from org.gradle.api.attributes.java.TargetJvmEnvironment which is added in Gradle 7.0, remove this once we drop support for Gradle 6.x.
+					// Add this attribute for resolving Guava dependency, see https://github.com/google/guava/issues/6801.
+					attr.attribute(Attribute.of("org.gradle.jvm.environment", String.class), "standard-jvm");
 				});
 				return config.resolve();
 			} catch (Exception e) {
diff --git a/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java b/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java
index 7c7b7b67f7..04c4476804 100644
--- a/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java
+++ b/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java
@@ -31,6 +31,7 @@
 import org.gradle.api.artifacts.Dependency;
 import org.gradle.api.artifacts.ResolveException;
 import org.gradle.api.artifacts.dsl.RepositoryHandler;
+import org.gradle.api.attributes.Attribute;
 import org.gradle.api.attributes.Bundling;
 import org.gradle.api.attributes.Category;
 import org.gradle.testfixtures.ProjectBuilder;
@@ -73,6 +74,9 @@ private static Provisioner createWithRepositories(Consumer<RepositoryHandler> re
 			config.attributes(attr -> {
 				attr.attribute(Category.CATEGORY_ATTRIBUTE, project.getObjects().named(Category.class, Category.LIBRARY));
 				attr.attribute(Bundling.BUNDLING_ATTRIBUTE, project.getObjects().named(Bundling.class, Bundling.EXTERNAL));
+				// TODO: This is a copy-paste from org.gradle.api.attributes.java.TargetJvmEnvironment which is added in Gradle 7.0, remove this once we drop support for Gradle 6.x.
+				// Add this attribute for resolving Guava dependency, see https://github.com/google/guava/issues/6801.
+				attr.attribute(Attribute.of("org.gradle.jvm.environment", String.class), "standard-jvm");
 			});
 			try {
 				return config.resolve();

From a6495edd25ce9ca41f118576f2f28196fe211467 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sun, 3 Dec 2023 02:58:59 +0800
Subject: [PATCH 1322/2068] Use Guava 32.1.3

---
 .../spotless/java/GoogleJavaFormatStep.java         |  2 +-
 .../spotless/java/PalantirJavaFormatStep.java       |  2 +-
 .../diffplug/gradle/spotless/GradleProvisioner.java | 13 ++++++++++++-
 .../java/com/diffplug/spotless/TestProvisioner.java | 13 ++++++++++++-
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
index 0911c1d48d..6a48924170 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
@@ -35,7 +35,7 @@ private GoogleJavaFormatStep() {}
 	private static final boolean DEFAULT_REORDER_IMPORTS = false;
 	private static final boolean DEFAULT_FORMAT_JAVADOC = true;
 	static final String NAME = "google-java-format";
-	static final String MAVEN_COORDINATE = "com.google.googlejavaformat:google-java-format";
+	public static final String MAVEN_COORDINATE = "com.google.googlejavaformat:google-java-format";
 
 	/** Creates a step which formats everything - code, import order, and unused imports. */
 	public static FormatterStep create(Provisioner provisioner) {
diff --git a/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
index 2c3b84c40d..8cb828c624 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
@@ -29,7 +29,7 @@ private PalantirJavaFormatStep() {}
 
 	private static final String DEFAULT_STYLE = "PALANTIR";
 	private static final String NAME = "palantir-java-format";
-	private static final String MAVEN_COORDINATE = "com.palantir.javaformat:palantir-java-format:";
+	public static final String MAVEN_COORDINATE = "com.palantir.javaformat:palantir-java-format:";
 	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(8, "1.1.0").add(11, "2.28.0").add(21, "2.38.0");
 
 	/** Creates a step which formats everything - code, import order, and unused imports. */
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
index 9003445ddd..6bb8c1b50e 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
@@ -36,6 +36,8 @@
 import com.diffplug.common.base.Unhandled;
 import com.diffplug.common.collect.ImmutableList;
 import com.diffplug.spotless.Provisioner;
+import com.diffplug.spotless.java.GoogleJavaFormatStep;
+import com.diffplug.spotless.java.PalantirJavaFormatStep;
 
 /** Should be package-private. */
 class GradleProvisioner {
@@ -117,7 +119,16 @@ private static Provisioner forConfigurationContainer(Project project, Configurat
 						+ new Request(withTransitives, mavenCoords).hashCode());
 				mavenCoords.stream()
 						.map(dependencies::create)
-						.forEach(config.getDependencies()::add);
+						.forEach(dependency -> {
+							config.getDependencies().add(dependency);
+							String coordinate = dependency.getGroup() + ":" + dependency.getName();
+							if (coordinate.startsWith(GoogleJavaFormatStep.MAVEN_COORDINATE) ||
+									coordinate.startsWith(PalantirJavaFormatStep.MAVEN_COORDINATE)) {
+								// Use Guava 32.1.3, see https://github.com/google/guava/issues/6657.
+								// TODO: May remove this after https://github.com/google/google-java-format/pull/996 and https://github.com/palantir/palantir-java-format/issues/957 are released.
+								config.getDependencies().add(dependencies.create("com.google.guava:guava:32.1.3-jre"));
+							}
+						});
 				config.setDescription(mavenCoords.toString());
 				config.setTransitive(withTransitives);
 				config.setCanBeConsumed(false);
diff --git a/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java b/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java
index 04c4476804..53a5cfed30 100644
--- a/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java
+++ b/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java
@@ -25,6 +25,7 @@
 import java.util.Map;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
+import java.util.stream.Stream;
 
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Configuration;
@@ -41,6 +42,8 @@
 import com.diffplug.common.base.Suppliers;
 import com.diffplug.common.collect.ImmutableSet;
 import com.diffplug.common.io.Files;
+import com.diffplug.spotless.java.GoogleJavaFormatStep;
+import com.diffplug.spotless.java.PalantirJavaFormatStep;
 
 public class TestProvisioner {
 	public static Project gradleProject(File dir) {
@@ -65,7 +68,15 @@ private static Provisioner createWithRepositories(Consumer<RepositoryHandler> re
 		Project project = TestProvisioner.gradleProject(tempDir);
 		repoConfig.accept(project.getRepositories());
 		return (withTransitives, mavenCoords) -> {
-			Dependency[] deps = mavenCoords.stream()
+			boolean forceGuava = mavenCoords.stream().anyMatch(coordinate -> coordinate.startsWith(GoogleJavaFormatStep.MAVEN_COORDINATE) ||
+					coordinate.startsWith(PalantirJavaFormatStep.MAVEN_COORDINATE));
+			Stream<String> coordinateStream = mavenCoords.stream();
+			if (forceGuava) {
+				// Use Guava 32.1.3, see https://github.com/google/guava/issues/6657.
+				// TODO: May remove this after https://github.com/google/google-java-format/pull/996 and https://github.com/palantir/palantir-java-format/issues/957 are released.
+				coordinateStream = Stream.concat(coordinateStream, Stream.of("com.google.guava:guava:32.1.3-jre"));
+			}
+			Dependency[] deps = coordinateStream
 					.map(project.getDependencies()::create)
 					.toArray(Dependency[]::new);
 			Configuration config = project.getConfigurations().detachedConfiguration(deps);

From b5341815b942ae5882333cacec23b6a3f0aeff02 Mon Sep 17 00:00:00 2001
From: Kostiantyn Liutovych <lutovich@gmail.com>
Date: Sat, 2 Dec 2023 22:28:58 +0100
Subject: [PATCH 1323/2068] Revert "feat: Maven plugin uses CompileSourceRoots"

This reverts commit 101c4c9e99eef71597f61b421693de42f9bf77a9.
---
 .../java/com/diffplug/spotless/maven/java/Java.java | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Java.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Java.java
index e0ff14b51e..b0692446b7 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Java.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Java.java
@@ -20,9 +20,8 @@
 import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Set;
+import java.util.stream.Stream;
 
 import org.apache.maven.model.Build;
 import org.apache.maven.project.MavenProject;
@@ -45,15 +44,7 @@ public class Java extends FormatterFactory {
 	public Set<String> defaultIncludes(MavenProject project) {
 		Path projectDir = project.getBasedir().toPath();
 		Build build = project.getBuild();
-
-		List<String> includes = new ArrayList<>();
-		includes.add(build.getSourceDirectory());
-		includes.add(build.getTestSourceDirectory());
-		includes.addAll(project.getCompileSourceRoots());
-		includes.addAll(project.getTestCompileSourceRoots());
-
-		return includes.stream()
-				.distinct()
+		return Stream.of(build.getSourceDirectory(), build.getTestSourceDirectory())
 				.map(Paths::get)
 				.map(projectDir::relativize)
 				.map(Java::fileMask)

From 0990a866f524441a75929763c4398d52660c3df0 Mon Sep 17 00:00:00 2001
From: Kostiantyn Liutovych <lutovich@gmail.com>
Date: Sat, 2 Dec 2023 22:36:49 +0100
Subject: [PATCH 1324/2068] Update changelog

---
 plugin-maven/CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 6313c8c8b5..590e57a196 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Revert [#1846](https://github.com/diffplug/spotless/issues/1846) from 2.41.0 which causes the plugin to format generated sources in the `target` directory. ([#1928](https://github.com/diffplug/spotless/pull/1928))
 
 ## [2.41.0] - 2023-11-27
 ### Added

From ce7563c70fe6fbb0a5b5ecbda71d9f715ebc7d33 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sun, 3 Dec 2023 13:27:19 +0800
Subject: [PATCH 1325/2068] Fix tests related to Java 21

* Fix CombinedJavaFormatStepTest

* Fix GoogleJavaFormatStepTest

* Fix PalantirJavaFormatStepTest

* Fix GoogleJavaFormatIntegrationTest

* Fix MultiProjectTest

* Fix MavenProvisionerTest

* Fix PalantirJavaFormatTest

* Fix SpecificFilesTest

* Fix GoogleJavaFormatTest
---
 .../spotless/GoogleJavaFormatIntegrationTest.java  | 12 ++++++------
 .../diffplug/gradle/spotless/MultiProjectTest.java | 14 +++++++-------
 .../spotless/maven/MavenProvisionerTest.java       |  1 -
 .../diffplug/spotless/maven/SpecificFilesTest.java |  1 -
 .../spotless/maven/java/GoogleJavaFormatTest.java  | 10 +++++-----
 .../maven/java/PalantirJavaFormatTest.java         |  2 +-
 .../combined/CombinedJavaFormatStepTest.java       |  2 +-
 .../spotless/java/GoogleJavaFormatStepTest.java    |  9 ++++++---
 .../spotless/java/PalantirJavaFormatStepTest.java  |  2 +-
 9 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GoogleJavaFormatIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GoogleJavaFormatIntegrationTest.java
index b2ee012091..e7fc9d4b74 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GoogleJavaFormatIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GoogleJavaFormatIntegrationTest.java
@@ -31,7 +31,7 @@ void integration() throws IOException {
 				"spotless {",
 				"    java {",
 				"        target file('test.java')",
-				"        googleJavaFormat('1.10.0')",
+				"        googleJavaFormat('1.17.0')",
 				"    }",
 				"}");
 
@@ -41,7 +41,7 @@ void integration() throws IOException {
 
 		checkRunsThenUpToDate();
 		replace("build.gradle",
-				"googleJavaFormat('1.10.0')",
+				"googleJavaFormat('1.17.0')",
 				"googleJavaFormat()");
 		checkRunsThenUpToDate();
 	}
@@ -57,7 +57,7 @@ void integrationWithReorderImports() throws IOException {
 				"spotless {",
 				"    java {",
 				"        target file('test.java')",
-				"        googleJavaFormat('1.12.0').aosp().reorderImports(true)",
+				"        googleJavaFormat('1.17.0').aosp().reorderImports(true)",
 				"    }",
 				"}");
 
@@ -67,7 +67,7 @@ void integrationWithReorderImports() throws IOException {
 
 		checkRunsThenUpToDate();
 		replace("build.gradle",
-				"googleJavaFormat('1.12.0')",
+				"googleJavaFormat('1.17.0')",
 				"googleJavaFormat()");
 		checkRunsThenUpToDate();
 	}
@@ -83,7 +83,7 @@ void integrationWithSkipJavadocFormatting() throws IOException {
 				"spotless {",
 				"    java {",
 				"        target file('test.java')",
-				"        googleJavaFormat('1.12.0').skipJavadocFormatting()",
+				"        googleJavaFormat('1.17.0').skipJavadocFormatting()",
 				"    }",
 				"}");
 
@@ -93,7 +93,7 @@ void integrationWithSkipJavadocFormatting() throws IOException {
 
 		checkRunsThenUpToDate();
 		replace("build.gradle",
-				"googleJavaFormat('1.12.0')",
+				"googleJavaFormat('1.17.0')",
 				"googleJavaFormat()");
 		checkRunsThenUpToDate();
 	}
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/MultiProjectTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/MultiProjectTest.java
index 98761b472a..5d184e15e5 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/MultiProjectTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/MultiProjectTest.java
@@ -47,7 +47,7 @@ void createSubproject(String name) throws IOException {
 				"spotless {",
 				"    java {",
 				"        target file('test.java')",
-				"        googleJavaFormat('1.16.0')",
+				"        googleJavaFormat('1.17.0')",
 				"    }",
 				"}");
 		setFile(name + "/test.java").toResource("java/googlejavaformat/JavaCodeUnformatted.test");
@@ -71,7 +71,7 @@ public void hasRootSpotless() throws IOException {
 				"spotless {",
 				"    java {",
 				"        target file('test.java')",
-				"        googleJavaFormat('1.16.0')",
+				"        googleJavaFormat('1.17.0')",
 				"    }",
 				"}");
 		setFile("test.java").toResource("java/googlejavaformat/JavaCodeUnformatted.test");
@@ -88,7 +88,7 @@ public void predeclaredFails() throws IOException {
 				"spotless { predeclareDeps() }");
 		createNSubprojects();
 		Assertions.assertThat(gradleRunner().withArguments("spotlessApply").buildAndFail().getOutput())
-				.contains("Add a step with [com.google.googlejavaformat:google-java-format:1.16.0] into the `spotlessPredeclare` block in the root project.");
+				.contains("Add a step with [com.google.googlejavaformat:google-java-format:1.17.0] into the `spotlessPredeclare` block in the root project.");
 	}
 
 	@Test
@@ -100,7 +100,7 @@ public void predeclaredSucceeds() throws IOException {
 				"repositories { mavenCentral() }",
 				"spotless { predeclareDeps() }",
 				"spotlessPredeclare {",
-				" java { googleJavaFormat('1.16.0') }",
+				" java { googleJavaFormat('1.17.0') }",
 				"}");
 		createNSubprojects();
 		gradleRunner().withArguments("spotlessApply").build();
@@ -115,7 +115,7 @@ public void predeclaredFromBuildscriptSucceeds() throws IOException {
 				"repositories { mavenCentral() }",
 				"spotless { predeclareDepsFromBuildscript() }",
 				"spotlessPredeclare {",
-				" java { googleJavaFormat('1.16.0') }",
+				" java { googleJavaFormat('1.17.0') }",
 				"}");
 		createNSubprojects();
 		gradleRunner().withArguments("spotlessApply").build();
@@ -129,7 +129,7 @@ public void predeclaredOrdering() throws IOException {
 				"}",
 				"repositories { mavenCentral() }",
 				"spotlessPredeclare {",
-				" java { googleJavaFormat('1.16.0') }",
+				" java { googleJavaFormat('1.17.0') }",
 				"}",
 				"spotless { predeclareDepsFromBuildscript() }");
 		createNSubprojects();
@@ -145,7 +145,7 @@ public void predeclaredUndeclared() throws IOException {
 				"}",
 				"repositories { mavenCentral() }",
 				"spotlessPredeclare {",
-				" java { googleJavaFormat('1.16.0') }",
+				" java { googleJavaFormat('1.17.0') }",
 				"}");
 		createNSubprojects();
 		Assertions.assertThat(gradleRunner().withArguments("spotlessApply").buildAndFail().getOutput())
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenProvisionerTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenProvisionerTest.java
index 5af146c736..e1214a0d59 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenProvisionerTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenProvisionerTest.java
@@ -33,7 +33,6 @@ void testMultipleDependenciesExcludingTransitives() throws Exception {
 	void testSingleDependencyIncludingTransitives() throws Exception {
 		writePomWithJavaSteps(
 				"<googleJavaFormat>",
-				"  <version>1.10.0</version>",
 				"</googleJavaFormat>");
 		assertResolveDependenciesWorks();
 	}
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpecificFilesTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpecificFilesTest.java
index 11cca5994a..6ce11d179f 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpecificFilesTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpecificFilesTest.java
@@ -58,7 +58,6 @@ private void integration(String patterns, boolean firstFormatted, boolean second
 				"  <include>src/**/java/**/*.java</include>",
 				"</includes>",
 				"<googleJavaFormat>",
-				"  <version>1.10.0</version>",
 				"</googleJavaFormat>");
 
 		setFile(testFile(1)).toResource(fixture(false));
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/GoogleJavaFormatTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/GoogleJavaFormatTest.java
index 40d8edfed2..52e89e58db 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/GoogleJavaFormatTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/GoogleJavaFormatTest.java
@@ -24,7 +24,7 @@ class GoogleJavaFormatTest extends MavenIntegrationHarness {
 	void specificVersionDefaultStyle() throws Exception {
 		writePomWithJavaSteps(
 				"<googleJavaFormat>",
-				"  <version>1.10.0</version>",
+				"  <version>1.17.0</version>",
 				"</googleJavaFormat>");
 
 		runTest("java/googlejavaformat/JavaCodeFormatted.test");
@@ -34,7 +34,7 @@ void specificVersionDefaultStyle() throws Exception {
 	void specificVersionSpecificStyle() throws Exception {
 		writePomWithJavaSteps(
 				"<googleJavaFormat>",
-				"  <version>1.10.0</version>",
+				"  <version>1.17.0</version>",
 				"  <style>AOSP</style>",
 				"</googleJavaFormat>");
 
@@ -45,7 +45,7 @@ void specificVersionSpecificStyle() throws Exception {
 	void specificVersionReflowLongStrings() throws Exception {
 		writePomWithJavaSteps(
 				"<googleJavaFormat>",
-				"  <version>1.10.0</version>",
+				"  <version>1.17.0</version>",
 				"  <reflowLongStrings>true</reflowLongStrings>",
 				"</googleJavaFormat>");
 
@@ -56,7 +56,7 @@ void specificVersionReflowLongStrings() throws Exception {
 	void specificVersionReorderImports() throws Exception {
 		writePomWithJavaSteps(
 				"<googleJavaFormat>",
-				"  <version>1.12.0</version>",
+				"  <version>1.17.0</version>",
 				"  <style>AOSP</style>",
 				"  <reorderImports>true</reorderImports>",
 				"</googleJavaFormat>");
@@ -68,7 +68,7 @@ void specificVersionReorderImports() throws Exception {
 	void specificVersionSkipJavadocFormatting() throws Exception {
 		writePomWithJavaSteps(
 				"<googleJavaFormat>",
-				"  <version>1.12.0</version>",
+				"  <version>1.17.0</version>",
 				"  <formatJavadoc>false</formatJavadoc>",
 				"</googleJavaFormat>");
 
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/PalantirJavaFormatTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/PalantirJavaFormatTest.java
index d8d66fa46d..6a3fd8b08b 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/PalantirJavaFormatTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/PalantirJavaFormatTest.java
@@ -34,7 +34,7 @@ void specificVersionDefaultStyle() throws Exception {
 	void specificJava11Version2() throws Exception {
 		writePomWithJavaSteps(
 				"<palantirJavaFormat>",
-				"  <version>2.10.0</version>",
+				"  <version>2.38.0</version>",
 				"</palantirJavaFormat>");
 
 		runTest("java/palantirjavaformat/JavaCodeFormatted.test");
diff --git a/testlib/src/test/java/com/diffplug/spotless/combined/CombinedJavaFormatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/combined/CombinedJavaFormatStepTest.java
index cc32281771..d1eb023400 100644
--- a/testlib/src/test/java/com/diffplug/spotless/combined/CombinedJavaFormatStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/combined/CombinedJavaFormatStepTest.java
@@ -34,7 +34,7 @@ public class CombinedJavaFormatStepTest extends ResourceHarness {
 
 	@Test
 	void checkIssue1679() {
-		FormatterStep gjf = GoogleJavaFormatStep.create("1.15.0", "AOSP", mavenCentral());
+		FormatterStep gjf = GoogleJavaFormatStep.create(GoogleJavaFormatStep.defaultVersion(), "AOSP", mavenCentral());
 		FormatterStep indentWithSpaces = IndentStep.Type.SPACE.create();
 		FormatterStep importOrder = ImportOrderStep.forJava().createFrom();
 		FormatterStep removeUnused = RemoveUnusedImportsStep.create(mavenCentral());
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java
index f8766d7c6f..c2ec5b5d7f 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java
@@ -18,6 +18,7 @@
 import static org.junit.jupiter.api.condition.JRE.JAVA_13;
 import static org.junit.jupiter.api.condition.JRE.JAVA_15;
 import static org.junit.jupiter.api.condition.JRE.JAVA_16;
+import static org.junit.jupiter.api.condition.JRE.JAVA_20;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledForJreRange;
@@ -52,7 +53,7 @@ void behavior18() throws Exception {
 
 	@Test
 	void behavior() throws Exception {
-		FormatterStep step = GoogleJavaFormatStep.create("1.10.0", TestProvisioner.mavenCentral());
+		FormatterStep step = GoogleJavaFormatStep.create(GoogleJavaFormatStep.defaultVersion(), TestProvisioner.mavenCentral());
 		StepHarness.forStep(step)
 				.testResource("java/googlejavaformat/JavaCodeUnformatted.test", "java/googlejavaformat/JavaCodeFormatted.test")
 				.testResource("java/googlejavaformat/JavaCodeWithLicenseUnformatted.test", "java/googlejavaformat/JavaCodeWithLicenseFormatted.test")
@@ -79,7 +80,7 @@ void versionBelowOneDotTenIsNotAllowed() throws Exception {
 
 	@Test
 	void behaviorWithAospStyle() throws Exception {
-		FormatterStep step = GoogleJavaFormatStep.create("1.10.0", "AOSP", TestProvisioner.mavenCentral());
+		FormatterStep step = GoogleJavaFormatStep.create(GoogleJavaFormatStep.defaultVersion(), "AOSP", TestProvisioner.mavenCentral());
 		StepHarness.forStep(step)
 				.testResource("java/googlejavaformat/JavaCodeUnformatted.test", "java/googlejavaformat/JavaCodeFormattedAOSP.test")
 				.testResource("java/googlejavaformat/JavaCodeWithLicenseUnformatted.test", "java/googlejavaformat/JavaCodeWithLicenseFormattedAOSP.test")
@@ -111,7 +112,7 @@ void behaviorWithSkipFormatJavadoc() throws Exception {
 
 	@Test
 	void behaviorWithCustomGroupArtifact() throws Exception {
-		FormatterStep step = GoogleJavaFormatStep.create(GoogleJavaFormatStep.defaultGroupArtifact(), "1.10.0", GoogleJavaFormatStep.defaultStyle(), TestProvisioner.mavenCentral(), false);
+		FormatterStep step = GoogleJavaFormatStep.create(GoogleJavaFormatStep.defaultGroupArtifact(), GoogleJavaFormatStep.defaultVersion(), GoogleJavaFormatStep.defaultStyle(), TestProvisioner.mavenCentral(), false);
 		StepHarness.forStep(step)
 				.testResource("java/googlejavaformat/JavaCodeUnformatted.test", "java/googlejavaformat/JavaCodeFormatted.test")
 				.testResource("java/googlejavaformat/JavaCodeWithLicenseUnformatted.test", "java/googlejavaformat/JavaCodeWithLicenseFormatted.test")
@@ -133,6 +134,7 @@ void behaviorWithReorderImports() throws Exception {
 	}
 
 	@Test
+	@EnabledForJreRange(max = JAVA_20)
 	void equality() throws Exception {
 		new SerializableEqualityTester() {
 			String version = "1.10.0";
@@ -163,6 +165,7 @@ protected FormatterStep create() {
 	}
 
 	@Test
+	@EnabledForJreRange(max = JAVA_20)
 	void equalityGroupArtifact() throws Exception {
 		new SerializableEqualityTester() {
 			String groupArtifact = GoogleJavaFormatStep.defaultGroupArtifact();
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/PalantirJavaFormatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/PalantirJavaFormatStepTest.java
index 81d03b6c32..7cd1aad438 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/PalantirJavaFormatStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/PalantirJavaFormatStepTest.java
@@ -38,7 +38,7 @@ void jvm13Features() throws Exception {
 
 	@Test
 	void behavior2() throws Exception {
-		FormatterStep step = PalantirJavaFormatStep.create("2.28.0", TestProvisioner.mavenCentral());
+		FormatterStep step = PalantirJavaFormatStep.create(TestProvisioner.mavenCentral());
 		StepHarness.forStep(step)
 				.testResource("java/palantirjavaformat/JavaCodeUnformatted.test", "java/palantirjavaformat/JavaCodeFormatted.test")
 				.testResource("java/palantirjavaformat/JavaCodeWithLicenseUnformatted.test", "java/palantirjavaformat/JavaCodeWithLicenseFormatted.test")

From 7901c6422c9d92d522eacf6951c7bb024ec502f0 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sun, 3 Dec 2023 14:37:38 +0800
Subject: [PATCH 1326/2068] SpotBugs Gradle plugin v6

https://github.com/spotbugs/spotbugs-gradle-plugin/releases/tag/6.0.0
https://github.com/spotbugs/spotbugs-gradle-plugin/blob/53f780917d10293098a766f0b568a4fcf0c4cc03/src/main/kotlin/com/github/spotbugs/snom/Confidence.kt#L45-L64
---
 gradle/java-setup.gradle | 3 ++-
 lib-extra/build.gradle   | 5 ++++-
 lib/build.gradle         | 5 ++++-
 settings.gradle          | 2 +-
 testlib/build.gradle     | 5 ++++-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/gradle/java-setup.gradle b/gradle/java-setup.gradle
index b152097653..6663447ba4 100644
--- a/gradle/java-setup.gradle
+++ b/gradle/java-setup.gradle
@@ -15,7 +15,8 @@ tasks.withType(JavaCompile).configureEach {
 apply plugin: 'com.github.spotbugs'
 spotbugs {
 	ignoreFailures = false 	// bug free or it doesn't ship!
-	reportLevel = 'medium'	// low|medium|high (low = sensitive to even minor mistakes)
+	// LOW|MEDIUM|DEFAULT|HIGH (low = sensitive to even minor mistakes).
+	reportLevel = com.github.spotbugs.snom.Confidence.valueOf('MEDIUM')
 	omitVisitors = [
 		// https://spotbugs.readthedocs.io/en/latest/detectors.html#constructorthrow
 		'ConstructorThrow',
diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index e6524f76bf..a7a8a0d39f 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -91,5 +91,8 @@ p2deps {
 }
 
 // we'll hold the core lib to a high standard
-spotbugs { reportLevel = 'low' } // low|medium|high (low = sensitive to even minor mistakes)
+spotbugs {
+	// LOW|MEDIUM|DEFAULT|HIGH (low = sensitive to even minor mistakes).
+	reportLevel = com.github.spotbugs.snom.Confidence.valueOf('LOW')
+}
 
diff --git a/lib/build.gradle b/lib/build.gradle
index a3424a7ee9..6dcb888e73 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -126,7 +126,10 @@ dependencies {
 }
 
 // we'll hold the core lib to a high standard
-spotbugs { reportLevel = 'low' } // low|medium|high (low = sensitive to even minor mistakes)
+spotbugs {
+	// LOW|MEDIUM|DEFAULT|HIGH (low = sensitive to even minor mistakes).
+	reportLevel = com.github.spotbugs.snom.Confidence.valueOf('LOW')
+}
 
 apply from: rootProject.file('gradle/special-tests.gradle')
 tasks.withType(Test).configureEach {
diff --git a/settings.gradle b/settings.gradle
index e7e5a6d4ea..ff03ca6ca3 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,7 +12,7 @@ plugins {
 	// https://github.com/gradle-nexus/publish-plugin/releases
 	id 'io.github.gradle-nexus.publish-plugin' version '1.3.0' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
-	id 'com.github.spotbugs' version '5.2.3' apply false
+	id 'com.github.spotbugs' version '6.0.1' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
 	id 'com.diffplug.spotless-changelog' version '3.0.2' apply false
 	// https://github.com/diffplug/goomph/blob/main/CHANGES.md
diff --git a/testlib/build.gradle b/testlib/build.gradle
index a4c83cfdf4..ce36b83adb 100644
--- a/testlib/build.gradle
+++ b/testlib/build.gradle
@@ -21,7 +21,10 @@ dependencies {
 }
 
 // we'll hold the testlib to a low standard (prize brevity)
-spotbugs { reportLevel = 'high' } // low|medium|high (low = sensitive to even minor mistakes)
+spotbugs {
+	// LOW|MEDIUM|DEFAULT|HIGH (low = sensitive to even minor mistakes).
+	reportLevel = com.github.spotbugs.snom.Confidence.valueOf('HIGH')
+}
 
 apply from: rootProject.file('gradle/special-tests.gradle')
 tasks.withType(Test).configureEach {

From 950cbc72c48cb77752c166e08c1206cfdf826bde Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 3 Dec 2023 08:32:21 -0800
Subject: [PATCH 1327/2068] Bump the nexus publishing plugin, hopefully we can
 have fewer publishing snafus now...

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index ff03ca6ca3..4e81688d29 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -10,7 +10,7 @@ plugins {
 	// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
 	id 'com.gradle.plugin-publish' version '1.2.1' apply false
 	// https://github.com/gradle-nexus/publish-plugin/releases
-	id 'io.github.gradle-nexus.publish-plugin' version '1.3.0' apply false
+	id 'io.github.gradle-nexus.publish-plugin' version '2.0.0-rc-1' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
 	id 'com.github.spotbugs' version '6.0.1' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md

From 770a495462923308c43578211ed20acb14a7ea08 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 3 Dec 2023 08:53:05 -0800
Subject: [PATCH 1328/2068] Bump the gradle plugin major version to reflect the
 breaking change.

---
 plugin-gradle/CHANGES.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index b125024b79..d00ba16d37 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,6 +5,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Fixed
 * Make `KtfmtConfig.ConfigurableStyle#configure` public. ([#1926](https://github.com/diffplug/spotless/pull/1926))
+* **BREAKING CHANGE** `6.23.0` made breaking changes to the ABI of the `KotlinExtension` and `GroovyExtension`. Those are reflected retroactively now.
+  - Previously, we had done semver on the Gradle plugin based only on buildscript compatibility.
+  - From now on, we will consider ABI for the benefit of convention-based plugins.
 
 ## [6.23.2] - 2023-12-01
 ### Fixed

From 2a989c596d20319a7f0572c8f8ab5ffa6eb4a975 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 3 Dec 2023 17:11:21 +0000
Subject: [PATCH 1329/2068] Update dependency org.junit.jupiter:junit-jupiter
 to v5.10.1

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index c824d18ffd..222012d500 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -29,6 +29,6 @@ VER_SLF4J=[1.6,2.0[
 # Used in multiple places
 VER_DURIAN=1.2.0
 VER_JGIT=6.7.0.202309050840-r
-VER_JUNIT=5.10.0
+VER_JUNIT=5.10.1
 VER_ASSERTJ=3.24.2
 VER_MOCKITO=5.8.0

From f2cc906e22570898e3d2ff2c745eb4d4d13d6b45 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 3 Dec 2023 14:56:39 -0800
Subject: [PATCH 1330/2068] Add info about the maven reversion to changelog.

---
 plugin-maven/CHANGES.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 034f89c319..2880df029b 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -11,7 +11,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [2.41.0] - 2023-11-27
 ### Added
-* CompileSourceRoots and TestCompileSourceRoots are now respected as default includes. These properties are commonly set when adding extra source directories. ([#1846](https://github.com/diffplug/spotless/issues/1846))
+* ~~CompileSourceRoots and TestCompileSourceRoots are now respected as default includes. These properties are commonly set when adding extra source directories.~~ ([#1846](https://github.com/diffplug/spotless/issues/1846))
+  * Reverted in the next release (`2.41.1`) due to backward compatibility problems, see [#1914](https://github.com/diffplug/spotless/issues/1914).
 * Support custom rule sets for Ktlint. ([#1896](https://github.com/diffplug/spotless/pull/1896))
 ### Fixed
 * Fix crash when build dir is a softlink to another directory. ([#1859](https://github.com/diffplug/spotless/pull/1859))

From c95574f246a8ad5ee93bf0cbce316c838d9d58ea Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 3 Dec 2023 15:33:11 -0800
Subject: [PATCH 1331/2068] `jvmLocalCache` was failing on Java 21 because the
 trick we used to test JvmLocalCache doesn't work with Gradle 8.5.

---
 .../diffplug/gradle/spotless/ConfigurationCacheTest.java   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ConfigurationCacheTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ConfigurationCacheTest.java
index 396a884cc5..70be5adb82 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ConfigurationCacheTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ConfigurationCacheTest.java
@@ -20,6 +20,8 @@
 import org.gradle.testkit.runner.BuildResult;
 import org.gradle.testkit.runner.GradleRunner;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledForJreRange;
+import org.junit.jupiter.api.condition.JRE;
 
 public class ConfigurationCacheTest extends GradleIntegrationHarness {
 	@Override
@@ -63,6 +65,7 @@ public void helpConfiguresIfTasksAreCreated() throws IOException {
 	}
 
 	@Test
+	@EnabledForJreRange(max = JRE.JAVA_20)
 	public void jvmLocalCache() throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
@@ -91,6 +94,10 @@ public void jvmLocalCache() throws IOException {
 		gradleRunner().withArguments("spotlessApply").build();
 		assertFile("test.java").sameAsResource("java/googlejavaformat/JavaCodeFormatted.test");
 
+		// the withDebug forces it to start a new deamon, but only in Gradle 8.3 and older
+		// starting with Gradle 8.5 this doesn't work anymore
+		// and we need Gradle 8.5 for Java 21
+		// so we can't test this on Java 21 for now
 		BuildResult failure = gradleRunner().withDebug(true).withArguments("spotlessApply", "--stacktrace").buildAndFail();
 		failure.getOutput().contains("Spotless daemon-local cache is stale. Regenerate the cache with\n" +
 				"  rm -rf .gradle/configuration-cache\n" +

From 00a31e366c842b9b1e476b3911f60e1311eb2a36 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 3 Dec 2023 15:57:50 -0800
Subject: [PATCH 1332/2068] Remove the dev flow for Eclipse WTP from the
 project.

---
 _ext/eclipse-base/CHANGES.md                  |  53 --
 _ext/eclipse-base/LICENSE.txt                 |  70 ---
 _ext/eclipse-base/README.md                   |  62 --
 _ext/eclipse-base/build.gradle                |  32 --
 _ext/eclipse-base/gradle.properties           |   8 -
 .../eclipse/base/SpotlessEclipseConfig.java   |  43 --
 .../base/SpotlessEclipseCoreConfig.java       |  57 --
 .../base/SpotlessEclipseFramework.java        | 306 ----------
 .../base/SpotlessEclipsePluginConfig.java     |  90 ---
 .../base/SpotlessEclipseServiceConfig.java    | 154 -----
 .../extra/eclipse/base/osgi/BundleConfig.java |  98 ----
 .../eclipse/base/osgi/BundleController.java   | 256 ---------
 .../extra/eclipse/base/osgi/BundleSet.java    |  71 ---
 .../base/osgi/EclipseBundleLookup.java        | 182 ------
 .../base/osgi/FrameworkBundleRegistry.java    |  53 --
 .../eclipse/base/osgi/ResourceAccessor.java   | 150 -----
 .../eclipse/base/osgi/ServiceCollection.java  | 229 --------
 .../extra/eclipse/base/osgi/SimpleBundle.java | 147 -----
 .../base/osgi/SimpleBundleCapability.java     | 114 ----
 .../extra/eclipse/base/osgi/StaticBundle.java |  79 ---
 .../base/osgi/StaticBundleContext.java        | 166 ------
 .../eclipse/base/osgi/TemporaryBundle.java    | 107 ----
 .../extra/eclipse/base/osgi/package-info.java |  17 -
 .../extra/eclipse/base/package-info.java      |  24 -
 .../eclipse/base/runtime/PluginRegistrar.java | 103 ----
 .../eclipse/base/runtime/package-info.java    |  19 -
 .../base/service/HiddenEnvironment.java       |  81 ---
 .../NoContentTypeSpecificHandling.java        |  95 ----
 .../eclipse/base/service/NoDebugging.java     |  87 ---
 .../base/service/NoEclipsePreferences.java    | 129 -----
 .../base/service/SingleSlf4JService.java      | 533 ------------------
 .../base/service/TemporaryLocation.java       | 144 -----
 .../eclipse/base/service/package-info.java    |  17 -
 .../src/main/resources/META-INF/MANIFEST.MF   |   3 -
 ...osgi.framework.connect.FrameworkUtilHelper |   1 -
 .../base/SpotlessEclipseFrameworkTest.java    | 330 -----------
 .../eclipse/base/osgi/BundleSetTest.java      |  78 ---
 .../base/osgi/ServiceCollectionTest.java      | 115 ----
 .../extra/eclipse/base/osgi/TestBundle.java   | 140 -----
 _ext/eclipse-wtp/CHANGES.md                   |  76 ---
 _ext/eclipse-wtp/LICENSE.txt                  |  70 ---
 _ext/eclipse-wtp/README.md                    |  10 -
 _ext/eclipse-wtp/build.gradle                 | 126 -----
 _ext/eclipse-wtp/gradle.properties            |  16 -
 _ext/eclipse-wtp/spotless.xmlformat.prefs     |   4 -
 .../wtp/EclipseCssFormatterStepImpl.java      |  80 ---
 .../wtp/EclipseHtmlFormatterStepImpl.java     | 159 ------
 .../wtp/EclipseJsFormatterStepImpl.java       | 187 ------
 .../wtp/EclipseJsonFormatterStepImpl.java     | 113 ----
 .../wtp/EclipseXmlFormatterStepImpl.java      | 140 -----
 .../eclipse/wtp/html/JsRegionProcessor.java   |  86 ---
 .../wtp/html/StructuredDocumentProcessor.java | 205 -------
 .../extra/eclipse/wtp/html/package-info.java  |  20 -
 .../extra/eclipse/wtp/package-info.java       |  20 -
 .../extra/eclipse/wtp/sse/CleanupStep.java    | 128 -----
 .../eclipse/wtp/sse/ContentTypeManager.java   | 235 --------
 .../eclipse/wtp/sse/PluginPreferences.java    | 130 -----
 .../PreventExternalURIResolverExtension.java  |  68 ---
 .../extra/eclipse/wtp/sse/package-info.java   |  20 -
 .../src/main/resources/META-INF/MANIFEST.MF   |   3 -
 .../eclipse-wtp/src/main/resources/plugin.xml |  13 -
 .../wtp/EclipseCssFormatterStepImplTest.java  |  83 ---
 .../wtp/EclipseHtmlFormatterStepImplTest.java | 114 ----
 .../wtp/EclipseJsFormatterStepImplTest.java   |  88 ---
 .../wtp/EclipseJsonFormatterStepImplTest.java |  83 ---
 ...ormatterStepImplAllowExternalURIsTest.java |  66 ---
 ...XmlFormatterStepImplCatalogLookupTest.java |  58 --
 .../wtp/EclipseXmlFormatterStepImplTest.java  | 122 ----
 .../spotless/extra/eclipse/wtp/TestData.java  |  77 ---
 .../src/test/resources/html/expected/css.html |  39 --
 .../test/resources/html/expected/html4.html   |  10 -
 .../test/resources/html/expected/html5.html   |  11 -
 .../html/expected/invalid_syntax.html         |   7 -
 .../resources/html/expected/javascript.html   |  41 --
 .../test/resources/html/expected/utf-8.html   |   7 -
 .../src/test/resources/html/input/bom.html    |   2 -
 .../src/test/resources/html/input/css.html    |  23 -
 .../src/test/resources/html/input/html4.html  |  10 -
 .../src/test/resources/html/input/html5.html  |  10 -
 .../resources/html/input/invalid_syntax.html  |   4 -
 .../test/resources/html/input/javascript.html |  34 --
 .../src/test/resources/html/input/utf-8.html  |   2 -
 .../resources/html/restrictions/ReadMe.txt    |   9 -
 .../resources/xml/expected/dtd_external.test  |   8 -
 .../resources/xml/expected/dtd_relative.test  |   8 -
 .../resources/xml/expected/xml_space.test     |   4 -
 .../resources/xml/expected/xsd_external.test  |   7 -
 .../resources/xml/expected/xsd_not_found.test |   7 -
 .../resources/xml/expected/xsd_relative.test  |   7 -
 .../resources/xml/input/dtd_external.test     |   8 -
 .../resources/xml/input/dtd_relative.test     |   8 -
 .../test/resources/xml/input/xml_space.test   |   1 -
 .../resources/xml/input/xsd_external.test     |   4 -
 .../resources/xml/input/xsd_not_found.test    |   4 -
 .../resources/xml/input/xsd_relative.test     |   4 -
 .../resources/xml/restrictions/catalog.xml    |   5 -
 .../test/resources/xml/restrictions/test.dtd  |   4 -
 .../test/resources/xml/restrictions/test.xsd  |  23 -
 _ext/gradle/java-setup.gradle                 |  28 -
 _ext/gradle/p2-fat-jar-setup.gradle           | 169 ------
 _ext/gradle/update-lockfile.gradle            |   6 -
 settings.gradle                               |  31 -
 102 files changed, 7588 deletions(-)
 delete mode 100644 _ext/eclipse-base/CHANGES.md
 delete mode 100644 _ext/eclipse-base/LICENSE.txt
 delete mode 100644 _ext/eclipse-base/README.md
 delete mode 100644 _ext/eclipse-base/build.gradle
 delete mode 100644 _ext/eclipse-base/gradle.properties
 delete mode 100644 _ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/SpotlessEclipseConfig.java
 delete mode 100644 _ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/SpotlessEclipseCoreConfig.java
 delete mode 100644 _ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/SpotlessEclipseFramework.java
 delete mode 100644 _ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/SpotlessEclipsePluginConfig.java
 delete mode 100644 _ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/SpotlessEclipseServiceConfig.java
 delete mode 100644 _ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/BundleConfig.java
 delete mode 100644 _ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/BundleController.java
 delete mode 100644 _ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/BundleSet.java
 delete mode 100644 _ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/EclipseBundleLookup.java
 delete mode 100644 _ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/FrameworkBundleRegistry.java
 delete mode 100644 _ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/ResourceAccessor.java
 delete mode 100644 _ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/ServiceCollection.java
 delete mode 100644 _ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/SimpleBundle.java
 delete mode 100644 _ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/SimpleBundleCapability.java
 delete mode 100644 _ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/StaticBundle.java
 delete mode 100644 _ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/StaticBundleContext.java
 delete mode 100644 _ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/TemporaryBundle.java
 delete mode 100644 _ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/package-info.java
 delete mode 100644 _ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/package-info.java
 delete mode 100644 _ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/runtime/PluginRegistrar.java
 delete mode 100644 _ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/runtime/package-info.java
 delete mode 100644 _ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/service/HiddenEnvironment.java
 delete mode 100644 _ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/service/NoContentTypeSpecificHandling.java
 delete mode 100644 _ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/service/NoDebugging.java
 delete mode 100644 _ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/service/NoEclipsePreferences.java
 delete mode 100644 _ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/service/SingleSlf4JService.java
 delete mode 100644 _ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/service/TemporaryLocation.java
 delete mode 100644 _ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/service/package-info.java
 delete mode 100644 _ext/eclipse-base/src/main/resources/META-INF/MANIFEST.MF
 delete mode 100644 _ext/eclipse-base/src/main/resources/META-INF/services/org.osgi.framework.connect.FrameworkUtilHelper
 delete mode 100644 _ext/eclipse-base/src/test/java/com/diffplug/spotless/extra/eclipse/base/SpotlessEclipseFrameworkTest.java
 delete mode 100644 _ext/eclipse-base/src/test/java/com/diffplug/spotless/extra/eclipse/base/osgi/BundleSetTest.java
 delete mode 100644 _ext/eclipse-base/src/test/java/com/diffplug/spotless/extra/eclipse/base/osgi/ServiceCollectionTest.java
 delete mode 100644 _ext/eclipse-base/src/test/java/com/diffplug/spotless/extra/eclipse/base/osgi/TestBundle.java
 delete mode 100644 _ext/eclipse-wtp/CHANGES.md
 delete mode 100644 _ext/eclipse-wtp/LICENSE.txt
 delete mode 100644 _ext/eclipse-wtp/README.md
 delete mode 100644 _ext/eclipse-wtp/build.gradle
 delete mode 100644 _ext/eclipse-wtp/gradle.properties
 delete mode 100644 _ext/eclipse-wtp/spotless.xmlformat.prefs
 delete mode 100644 _ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseCssFormatterStepImpl.java
 delete mode 100644 _ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseHtmlFormatterStepImpl.java
 delete mode 100644 _ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseJsFormatterStepImpl.java
 delete mode 100644 _ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseJsonFormatterStepImpl.java
 delete mode 100644 _ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseXmlFormatterStepImpl.java
 delete mode 100644 _ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/html/JsRegionProcessor.java
 delete mode 100644 _ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/html/StructuredDocumentProcessor.java
 delete mode 100644 _ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/html/package-info.java
 delete mode 100644 _ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/package-info.java
 delete mode 100644 _ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/sse/CleanupStep.java
 delete mode 100644 _ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/sse/ContentTypeManager.java
 delete mode 100644 _ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/sse/PluginPreferences.java
 delete mode 100644 _ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/sse/PreventExternalURIResolverExtension.java
 delete mode 100644 _ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/sse/package-info.java
 delete mode 100644 _ext/eclipse-wtp/src/main/resources/META-INF/MANIFEST.MF
 delete mode 100644 _ext/eclipse-wtp/src/main/resources/plugin.xml
 delete mode 100644 _ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseCssFormatterStepImplTest.java
 delete mode 100644 _ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseHtmlFormatterStepImplTest.java
 delete mode 100644 _ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseJsFormatterStepImplTest.java
 delete mode 100644 _ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseJsonFormatterStepImplTest.java
 delete mode 100644 _ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseXmlFormatterStepImplAllowExternalURIsTest.java
 delete mode 100644 _ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseXmlFormatterStepImplCatalogLookupTest.java
 delete mode 100644 _ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseXmlFormatterStepImplTest.java
 delete mode 100644 _ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/TestData.java
 delete mode 100644 _ext/eclipse-wtp/src/test/resources/html/expected/css.html
 delete mode 100644 _ext/eclipse-wtp/src/test/resources/html/expected/html4.html
 delete mode 100644 _ext/eclipse-wtp/src/test/resources/html/expected/html5.html
 delete mode 100644 _ext/eclipse-wtp/src/test/resources/html/expected/invalid_syntax.html
 delete mode 100644 _ext/eclipse-wtp/src/test/resources/html/expected/javascript.html
 delete mode 100644 _ext/eclipse-wtp/src/test/resources/html/expected/utf-8.html
 delete mode 100644 _ext/eclipse-wtp/src/test/resources/html/input/bom.html
 delete mode 100644 _ext/eclipse-wtp/src/test/resources/html/input/css.html
 delete mode 100644 _ext/eclipse-wtp/src/test/resources/html/input/html4.html
 delete mode 100644 _ext/eclipse-wtp/src/test/resources/html/input/html5.html
 delete mode 100644 _ext/eclipse-wtp/src/test/resources/html/input/invalid_syntax.html
 delete mode 100644 _ext/eclipse-wtp/src/test/resources/html/input/javascript.html
 delete mode 100644 _ext/eclipse-wtp/src/test/resources/html/input/utf-8.html
 delete mode 100644 _ext/eclipse-wtp/src/test/resources/html/restrictions/ReadMe.txt
 delete mode 100644 _ext/eclipse-wtp/src/test/resources/xml/expected/dtd_external.test
 delete mode 100644 _ext/eclipse-wtp/src/test/resources/xml/expected/dtd_relative.test
 delete mode 100644 _ext/eclipse-wtp/src/test/resources/xml/expected/xml_space.test
 delete mode 100644 _ext/eclipse-wtp/src/test/resources/xml/expected/xsd_external.test
 delete mode 100644 _ext/eclipse-wtp/src/test/resources/xml/expected/xsd_not_found.test
 delete mode 100644 _ext/eclipse-wtp/src/test/resources/xml/expected/xsd_relative.test
 delete mode 100644 _ext/eclipse-wtp/src/test/resources/xml/input/dtd_external.test
 delete mode 100644 _ext/eclipse-wtp/src/test/resources/xml/input/dtd_relative.test
 delete mode 100644 _ext/eclipse-wtp/src/test/resources/xml/input/xml_space.test
 delete mode 100644 _ext/eclipse-wtp/src/test/resources/xml/input/xsd_external.test
 delete mode 100644 _ext/eclipse-wtp/src/test/resources/xml/input/xsd_not_found.test
 delete mode 100644 _ext/eclipse-wtp/src/test/resources/xml/input/xsd_relative.test
 delete mode 100644 _ext/eclipse-wtp/src/test/resources/xml/restrictions/catalog.xml
 delete mode 100644 _ext/eclipse-wtp/src/test/resources/xml/restrictions/test.dtd
 delete mode 100644 _ext/eclipse-wtp/src/test/resources/xml/restrictions/test.xsd
 delete mode 100644 _ext/gradle/java-setup.gradle
 delete mode 100644 _ext/gradle/p2-fat-jar-setup.gradle
 delete mode 100644 _ext/gradle/update-lockfile.gradle

diff --git a/_ext/eclipse-base/CHANGES.md b/_ext/eclipse-base/CHANGES.md
deleted file mode 100644
index 796ed584fd..0000000000
--- a/_ext/eclipse-base/CHANGES.md
+++ /dev/null
@@ -1,53 +0,0 @@
-# spotless-eclipse-base
-
-We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.2.1`).
-
-## [Unreleased]
-
-## [3.5.2] - 2021-10-23
-### Fixed
-* Racing condition when cleaning up temporary workspace on JVM runtime shutdown (see [#967](https://github.com/diffplug/spotless/issues/967)). Can lead to error logs and remaining files in workspace.
-
-## [3.5.1] - 2021-10-16
-### Fixed
-* ~~Racing condition when cleaning up temporary workspace on JVM runtime shutdown (see [#967](https://github.com/diffplug/spotless/issues/967)). Can lead to error logs and remaining files in workspace.~~
-
-## [3.5.0] - 2021-06-20
-### Added
-* Support of `org.eclipse.core.resources` version `3.15.0` required by Eclipse `4.20`.
-* Minimum required Java version changed from 8 to 11.
-
-## [3.4.2] - 2020-12-26
-### Fixed
-* `org.eclipse.osgi` version `3.16.100` does not allow `null` as Debug service for `CloseableBundleFile`.
-
-## [3.4.1] - 2020-09-24
-### Fixed
-* Restored scope of transitive dependencies to 'compile'.
-
-## [3.4.0] - 2020-09-23
-### Added
-* Upgraded to `org.eclipse.osgi` version `3.16`.
-
-## [3.3.0] - 2020-03-04
-### Added
-* Added support of plugin extensions without activator ([#533](https://github.com/diffplug/spotless/issues/533)). Required since `org.eclipse.core.filesystem` version `1.7.600` (see
-[Bug 550548](https://bugs.eclipse.org/bugs/show_bug.cgi?id=550548))
-* Updated configuration via single interface implementation. Functional based configuration still supported.
-
-## [3.2.1] - 2019-09-03
-* Fixed deletion of temporary workspace. ([#447](https://github.com/diffplug/spotless/issues/447))
-
-## [3.2.0] - 2019-06-30
-* Added support of Eclipse 4.12 framework wiring. ([#413](https://github.com/diffplug/spotless/issues/413))
-
-## [3.1.1] - 2019-06-04
-* Fixed problem handling URL escaped characters in JAR file location. ([#401](https://github.com/diffplug/spotless/issues/401))
-
-## [3.1.0] - 2019-02-10
-* Added logging service based on SLF4J. ([#236](https://github.com/diffplug/spotless/issues/236))
-* Updated internal interfaces to support `org.eclipse.osgi` version 3.13.
-* Corrected documentation of version number usage in `gradle.properties`.
-
-## [3.0.0] - 2018-06-18
-* Initial release!
diff --git a/_ext/eclipse-base/LICENSE.txt b/_ext/eclipse-base/LICENSE.txt
deleted file mode 100644
index 3d967aee74..0000000000
--- a/_ext/eclipse-base/LICENSE.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-i) changes to the Program, and
-ii) additions to the Program;
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-b) its license agreement:
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-b) a copy of this Agreement must be included with each copy of the Program.
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
\ No newline at end of file
diff --git a/_ext/eclipse-base/README.md b/_ext/eclipse-base/README.md
deleted file mode 100644
index 39a03591ab..0000000000
--- a/_ext/eclipse-base/README.md
+++ /dev/null
@@ -1,62 +0,0 @@
-# spotless-eclipse-base
-
-Eclipse formatters are embedded in plugins serving multiple purposes and not necessarily supporting headless builds. Hence the plugin interfaces are depending on various Eclipse plugins and services not required for the formatting purpose.
-
-Spotless provides its own plugin framework with `com.diffplug.spotless.JarState`. This allows Spotless to use different Eclipse versions in parallel.
-
-
-The `com.diffplug.gradle.spotless:spotless-eclipse-base` artifact mocks the redundant Eclipse OSGI/plugin framework for Spotless. Furthermore it provides Eclipse services adapted for Spotless's own use, which avoids for example the creation of a permanent Eclipse workspace and reduces dependencies on Eclipse modules unused by the Eclipse code formatters.
-
-## Usage
-
-Include the artifact in your Spotless Eclipse formatter project, where the major version must match the Eclipse core version your formatter supports. The exact default version should be selected by the **lib-extra**.
-Minor versions indicate a change in the minimum Eclipse (core/resource) dependencies.
-Patch versions are always backward compatible.
-
-
-```Gradle
-dependencies {
-  compile "com.diffplug.spotless:spotless-eclipse-base:3.+"
-}
-```
-
-In the constructor of your formatter, the Spotless Eclipse Framework can be configured depending on your formatter's requirements. For example the JDT formatter can be configured like:
-
-```Java
-public EclipseFormatterStepImpl(Properties settings) throws Exception {
-    SpotlessEclipseFramework.setup(plugins -> {
-        plugins.applyDefault();
-        plugins.add(new org.eclipse.jdt.core.JavaCore());
-  });
-  ...
-```
-
-The framework also supports fat JARs, providing multiple plugins.
-In this cases the resources required by plugins, especially the `META-INF` and plugin information, must be located in locations unique to the plugin.
-For this purpose the framework expects that these resources are stored in a sub-directory
-which has the name of the package containing the plugin. For example in case the JDT plugin
-is included in your formatter fat JAR, the directory structure should be:
-
-```
-+ resources
-|
-+--+ org.eclipse.jdt.core
-|  |
-|  +--+ META-INF
-|  |  |
-|  |  +-- MANIFEST.MF
-|  |
-|  +--- plugin.properties
-|  |
-|  +--- plugin.xml
-
-```
-
-## Build
-
-To publish a new version, update the `_ext/eclipse-base/gradle.properties` appropriately and see [CONTRIBUTING.md](../../CONTRIBUTING.md) how to enable
-`_ext` projects.
-
-## License
-
-Spotless at large is under the Apache 2.0 license, but this jar is under the EPL v1.
diff --git a/_ext/eclipse-base/build.gradle b/_ext/eclipse-base/build.gradle
deleted file mode 100644
index 88255b57b3..0000000000
--- a/_ext/eclipse-base/build.gradle
+++ /dev/null
@@ -1,32 +0,0 @@
-apply from: rootProject.file('_ext/gradle/java-setup.gradle')
-apply from: rootProject.file('gradle/java-publish.gradle')
-
-ext {
-	developers = [
-		fvgh: [ name: 'Frank Vennemeyer', email: 'frankgh@zoho.com' ]
-	]
-}
-
-dependencies {
-	api("org.eclipse.platform:org.eclipse.core.resources:${VER_ECLIPSE_CORE_RESOURCES}") {
-		exclude group: 'org.eclipse.platform', module: 'org.eclipse.ant.core'
-		exclude group: 'org.eclipse.platform', module: 'org.eclipse.core.expressions'
-	}
-	api("org.slf4j:slf4j-api:${VER_SLF4J}")
-
-	testImplementation("org.slf4j:slf4j-simple:${VER_SLF4J}")
-}
-
-jar {
-	manifest {
-		from 'src/main/resources/META-INF/MANIFEST.MF'
-	}
-}
-
-//////////
-// Test //
-//////////
-sourceSets {
-	// Use JAR file with all resources for Eclipse-Base integration-tests
-	test.runtimeClasspath = jar.outputs.files + sourceSets.test.output + sourceSets.test.compileClasspath
-}
diff --git a/_ext/eclipse-base/gradle.properties b/_ext/eclipse-base/gradle.properties
deleted file mode 100644
index 9f8774a417..0000000000
--- a/_ext/eclipse-base/gradle.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-artifactId=spotless-eclipse-base
-description=Eclipse bundle controller and services for Spotless
-
-# Build requirements
-VER_JAVA=11
-
-# Compile dependencies
-VER_ECLIPSE_CORE_RESOURCES=[3.15.0,4.0.0[
diff --git a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/SpotlessEclipseConfig.java b/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/SpotlessEclipseConfig.java
deleted file mode 100644
index c8d1fb4db3..0000000000
--- a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/SpotlessEclipseConfig.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.base;
-
-/**
- * Obtain configuration for Eclipse framework setup
- * <p>
- * The setup consitst of 4 phases:
- * <ol>
- * <li>Registration of framework bundles</li>
- * <li>Registration of servicves</li>
- * <li>Resitration of extension points, activation of bundles/plugins</li>
- * <li>Customize bundle/plugin configuration</li>
- * </ol>
- */
-public interface SpotlessEclipseConfig {
-	default public void registerBundles(SpotlessEclipseCoreConfig config) {
-		config.applyDefault();
-	}
-
-	default public void registerServices(SpotlessEclipseServiceConfig config) {
-		config.applyDefault();
-	}
-
-	default public void activatePlugins(SpotlessEclipsePluginConfig config) {
-		config.applyDefault();
-	}
-
-	default public void customize() {}
-}
diff --git a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/SpotlessEclipseCoreConfig.java b/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/SpotlessEclipseCoreConfig.java
deleted file mode 100644
index 4f3aa9c2a2..0000000000
--- a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/SpotlessEclipseCoreConfig.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.base;
-
-import org.osgi.framework.BundleActivator;
-
-import com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseFramework.DefaultBundles;
-import com.diffplug.spotless.extra.eclipse.base.osgi.BundleConfig;
-
-/**
- * Configuration of core bundles which shall be provided by the
- * {@link SpotlessEclipseFramework}.
- * <p>
- * Core bundles are not accessed via the plugin registry, but by static methods.
- * Hence they do not require a registration, which allows a lightweight
- * setup.
- * </p>
- * See {@code org.eclipse.core.internal.runtime.PlatformActivator} implementation for details.
- */
-public class SpotlessEclipseCoreConfig extends BundleConfig<SpotlessEclipseFramework.DefaultBundles> {
-
-	/**
-	 * Don't instantiate and call {@link SpotlessEclipseConfig} directly.
-	 * Registered bundles should only be instantiated once, since
-	 * older bundles still abusing singletons for access.
-	 */
-	SpotlessEclipseCoreConfig() {}
-
-	@Override
-	public void applyDefault() {
-		add(SpotlessEclipseFramework.DefaultBundles.createAll());
-	}
-
-	@Override
-	protected BundleActivator create(DefaultBundles bundle) {
-		return bundle.create();
-	}
-
-	@Override
-	protected int getDefaultState(DefaultBundles bundle) {
-		return bundle.getDesiredState();
-	}
-
-}
diff --git a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/SpotlessEclipseFramework.java b/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/SpotlessEclipseFramework.java
deleted file mode 100644
index 2eaf9e568e..0000000000
--- a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/SpotlessEclipseFramework.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- * Copyright 2016-2021 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.base;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import javax.xml.parsers.SAXParserFactory;
-
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleException;
-
-import com.diffplug.spotless.extra.eclipse.base.osgi.BundleConfig;
-import com.diffplug.spotless.extra.eclipse.base.osgi.BundleController;
-import com.diffplug.spotless.extra.eclipse.base.runtime.PluginRegistrar;
-
-/** Setup a framework for Spotless Eclipse based formatters */
-public final class SpotlessEclipseFramework {
-	/** Spotless demands for internal formatter chains Unix (LF) line endings. */
-	public static final String LINE_DELIMITER = "\n";
-
-	/**
-	 * Default core bundles required by most plugins.
-	 */
-	public enum DefaultBundles {
-		/**
-		 * Plugins ask the platform whether core runtime bundle is in debug mode.
-		 * <p>
-		 * Note that the bundle requires the
-		 * {@link org.eclipse.osgi.service.environment.EnvironmentInfo}
-		 * service.
-		 * </p>
-		 * <p>
-		 * Per default, the platform is not activated. Some plugins use this information
-		 * to determine whether they are running in a headless modes (without IDE).
-		 * </p>
-		 */
-		PLATFORM(org.eclipse.core.internal.runtime.PlatformActivator.class, Bundle.RESOLVED),
-		/** The Spotless {@link BundleController} wraps the OSGi layer. But the plugin/extension look-up still uses the Eclipse OSGi registry.*/
-		REGISTRY(org.eclipse.core.internal.registry.osgi.Activator.class),
-		/** Eclipse preferences always check whether this bundle has been activated before preference are set.*/
-		PREFERENCES(org.eclipse.core.internal.preferences.Activator.class),
-		/** The common runtime provides common services, like log and service adapters registry. */
-		COMMON(org.eclipse.core.internal.runtime.Activator.class);
-
-		private final Class<? extends BundleActivator> activatorClass;
-		private final int state;
-
-		private DefaultBundles(Class<? extends BundleActivator> clazz) {
-			this(clazz, Bundle.ACTIVE);
-		}
-
-		private DefaultBundles(Class<? extends BundleActivator> clazz, int state) {
-			activatorClass = clazz;
-			this.state = state;
-		}
-
-		/** Create new bundle activator instance. */
-		public BundleActivator create() {
-			return createInstance(activatorClass);
-		}
-
-		public int getDesiredState() {
-			return state;
-		}
-
-		/** Create bundle activator instances for all enumerated values. */
-		public static List<BundleConfig.Entry> createAll() {
-			return Arrays.stream(values())
-					.map(value -> new BundleConfig.Entry(value.create(), value.getDesiredState())).collect(Collectors.toList());
-		}
-	}
-
-	/**
-	 * Default plugins required by most Spotless formatters.
-	 * <p>
-	 * Eclipse plugins are OSGI bundles themselves and do not necessarily derive from the Eclipse Plugin class.
-	 * {@link BundleActivator} implementation may as well serve as plugins.
-	 * All plugins must provide a MANIFEST.MF, plugin.properties and plugin.xml description file,
-	 * required for the plugin registration.
-	 * </p>
-	 */
-	public enum DefaultPlugins {
-		/**
-		 * The resources plugin initialized the Eclipse workspace and allows URL look-up.
-		 * Most formatters using the workspace to resolve URLs or create
-		 * file interfaces.
-		 * See {@code org.eclipse.core.resources.IFile} implementation for details.
-		 */
-		RESOURCES(org.eclipse.core.resources.ResourcesPlugin.class);
-
-		private final Class<? extends BundleActivator> pluginClass;
-
-		DefaultPlugins(Class<? extends BundleActivator> clazz) {
-			pluginClass = clazz;
-		}
-
-		/** Create new plugin instance. */
-		public BundleActivator create() {
-			return createInstance(pluginClass);
-		}
-
-		/** Create plugin instances for all enumerated values. */
-		public static List<BundleActivator> createAll() {
-			return Arrays.stream(values()).map(value -> value.create()).collect(Collectors.toList());
-		}
-	}
-
-	private static <T> T createInstance(Class<? extends T> clazz) {
-		try {
-			Constructor<? extends T> ctor = clazz.getConstructor();
-			return ctor.newInstance(new Object[]{});
-		} catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException e) {
-			throw new RuntimeException("Failed to create instance for: " + clazz.getCanonicalName(), e);
-		}
-	}
-
-	private static SpotlessEclipseFramework INSTANCE = null;
-
-	/**
-	 * Creates and configures a new {@link SpotlessEclipseFramework} using
-	 * {@link DefaultBundles}, {@link DefaultPlugins} and default {@link SpotlessEclipseServiceConfig}.
-	 * If there is already a an instance, the call is ignored.
-	 * @return False if the {@link SpotlessEclipseFramework} instance already exists, true otherwise.
-	 * @throws BundleException Throws exception in case the setup failed.
-	 * @deprecated  Use {@link #setup(SpotlessEclipseConfig)} instead.
-	 */
-	@Deprecated
-	public synchronized static boolean setup() throws BundleException {
-		return setup(plugins -> plugins.applyDefault());
-	}
-
-	/**
-	 * Creates and configures a new {@link SpotlessEclipseFramework} using
-	 * {@link DefaultBundles} and {@link DefaultPlugins}.
-	 * If there is already a an instance, the call is ignored.
-	 * @param plugins Eclipse plugins (which are also OSGi bundles) to start
-	 * @return False if the {@link SpotlessEclipseFramework} instance already exists, true otherwise.
-	 * @throws BundleException Throws exception in case the setup failed.
-	 * @deprecated  Use {@link #setup(SpotlessEclipseConfig)} instead.
-	 */
-	@Deprecated
-	public synchronized static boolean setup(Consumer<SpotlessEclipsePluginConfig> plugins) throws BundleException {
-		return setup(config -> config.applyDefault(), plugins);
-	}
-
-	/**
-	 * Creates and configures a new {@link SpotlessEclipseFramework} using {@link DefaultBundles}.
-	 * If there is already a an instance, the call is ignored.
-	 * @param config Framework service configuration
-	 * @param plugins Eclipse plugins (which are also OSGi bundles) to start
-	 * @return False if the {@link SpotlessEclipseFramework} instance already exists, true otherwise.
-	 * @throws BundleException Throws exception in case the setup failed.
-	 * @deprecated  Use {@link #setup(SpotlessEclipseConfig)} instead.
-	 */
-	@Deprecated
-	public synchronized static boolean setup(Consumer<SpotlessEclipseServiceConfig> config, Consumer<SpotlessEclipsePluginConfig> plugins) throws BundleException {
-		return setup(core -> core.applyDefault(), config, plugins);
-	}
-
-	/**
-	 * Creates and configures a new {@link SpotlessEclipseFramework} if there is none.
-	 * If there is already a an instance, the call is ignored.
-	 * @param core Activators of core bundles
-	 * @param services Framework service configuration
-	 * @param plugins Eclipse plugins to start
-	 * @return False if the {@link SpotlessEclipseFramework} instance already exists, true otherwise.
-	 * @throws BundleException Throws exception in case the setup failed.
-	 * @deprecated  Use {@link #setup(SpotlessEclipseConfig)} instead.
-	 */
-	@Deprecated
-	public synchronized static boolean setup(Consumer<SpotlessEclipseCoreConfig> core, Consumer<SpotlessEclipseServiceConfig> services, Consumer<SpotlessEclipsePluginConfig> plugins) throws BundleException {
-		if (null != INSTANCE) {
-			return false;
-		}
-		setup(new SpotlessEclipseConfig() {
-			@Override
-			public void registerBundles(SpotlessEclipseCoreConfig config) {
-				core.accept(config);
-			}
-
-			@Override
-			public void registerServices(SpotlessEclipseServiceConfig config) {
-				services.accept(config);
-			}
-
-			@Override
-			public void activatePlugins(SpotlessEclipsePluginConfig config) {
-				plugins.accept(config);
-			}
-		});
-		return true;
-	}
-
-	/**
-	 * Creates and configures a new {@link SpotlessEclipseFramework} if there is none.
-	 * If there is already a an instance, the call is ignored.
-	 * @param config Configuration
-	 * @throws BundleException Throws exception in case the setup failed.
-	 */
-	public synchronized static void setup(SpotlessEclipseConfig config) throws BundleException {
-		if (null == INSTANCE) {
-			INSTANCE = new SpotlessEclipseFramework();
-			Runtime.getRuntime().addShutdownHook(new Thread(() -> {
-				try {
-					INSTANCE.shutdown();
-				} catch (Exception e) {
-					//At shutdown everything is just done on best-efforts basis
-				}
-			}));
-
-			config.registerServices(INSTANCE.getServiceConfig());
-
-			SpotlessEclipseCoreConfig coreConfig = new SpotlessEclipseCoreConfig();
-			config.registerBundles(coreConfig);
-			INSTANCE.startCoreBundles(coreConfig);
-
-			SpotlessEclipsePluginConfig pluginConfig = new SpotlessEclipsePluginConfig();
-			config.activatePlugins(pluginConfig);
-			for (Class<?> extension : pluginConfig.getExtensions()) {
-				INSTANCE.addExtension(extension);
-			}
-			for (BundleConfig.Entry plugin : pluginConfig.get()) {
-				INSTANCE.addPlugin(plugin.state, plugin.activator);
-			}
-
-			config.customize();
-		}
-	}
-
-	private final Function<Bundle, BundleException> registry;
-	private final BundleController controller;
-
-	private SpotlessEclipseFramework() throws BundleException {
-
-		controller = new BundleController();
-		registry = (pluginBundle) -> {
-			return PluginRegistrar.register(pluginBundle);
-		};
-	}
-
-	void shutdown() {
-		controller.shutdown();
-	}
-
-	private SpotlessEclipseServiceConfig getServiceConfig() {
-		return controller.getServices();
-	}
-
-	private void addExtension(Class<?> clazzInBundleJar) throws BundleException {
-		controller.addBundle(clazzInBundleJar, registry);
-	}
-
-	private void addPlugin(int state, BundleActivator plugin) throws BundleException {
-		controller.addBundle(state, plugin, registry);
-	}
-
-	private void startCoreBundles(SpotlessEclipseCoreConfig coreConfig) throws BundleException {
-		//The SAXParserFactory.class is required for parsing the plugin XML files
-		addMandatoryServiceIfMissing(SAXParserFactory.class, SAXParserFactory.newInstance());
-
-		/*
-		 * Since org.eclipse.core.runtime version 3.15.300, the Eclipse bundle look-up is accomplished
-		 * via the wiring framework, which requires starting the InternalPlatform.
-		 * The internal platform initialization is customized by the services
-		 * registered to the controller.
-		 */
-		InternalPlatform.getDefault().start(controller);
-
-		for (BundleConfig.Entry coreBundle : coreConfig.get()) {
-			try {
-				BundleContext context = controller.createContext(coreBundle.state);
-				coreBundle.activator.start(context);
-			} catch (Exception e) {
-				throw new BundleException(String.format("Failed to start %s", coreBundle.activator.getClass().getName()), BundleException.ACTIVATOR_ERROR, e);
-			}
-		}
-	}
-
-	private <S> void addMandatoryServiceIfMissing(Class<S> interfaceClass, S service) {
-		if (null == controller.getServiceReference(interfaceClass)) {
-			controller.getServices().add(interfaceClass, service);
-		}
-	}
-}
diff --git a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/SpotlessEclipsePluginConfig.java b/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/SpotlessEclipsePluginConfig.java
deleted file mode 100644
index 2569c12cd9..0000000000
--- a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/SpotlessEclipsePluginConfig.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.base;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleActivator;
-
-import com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseFramework.DefaultPlugins;
-import com.diffplug.spotless.extra.eclipse.base.osgi.BundleConfig;
-
-/**
- * Configuration of plugins which shall be provided by the
- * {@link SpotlessEclipseFramework}.
- * <p>
- * Plugins are registered via the Eclipse registry. Therefore they
- * required a {@code plugin.xml} configuration description.
- * Note that a plugin does not necessarily derive from the
- * Eclipse {@link org.eclipse.core.runtime.Plugin} class.
- * </p>
- * <p>
- * Some plugins are pure extensions without any activator.
- * For resource and plugin information lookup, a class can be
- * specified which is in the JAR containing the resources and
- * plugin information. This lookup procedure also supports
- * fat JAR lookups as described in the ReadMe.md.
- * </p>
- * @see org.eclipse.core.runtime.RegistryFactory
- */
-public class SpotlessEclipsePluginConfig extends BundleConfig<SpotlessEclipseFramework.DefaultPlugins> {
-	private final List<Class<?>> extensions;
-
-	/**
-	 * Don't instantiate and call {@link SpotlessEclipseConfig} directly.
-	 * Registered plugins and extensions should only be instantiated once, since
-	 * some still abusing singletons for access.
-	 */
-	SpotlessEclipsePluginConfig() {
-		extensions = new ArrayList<>();
-	}
-
-	/** Add an extension plugin, identified by a class of the plugin. */
-	public void add(Class<?> extensionClass) {
-		Objects.requireNonNull(extensionClass, "Plugin extension class must nor be null");
-		extensions.add(extensionClass);
-	}
-
-	/** Add a set of default bundles with their default states */
-	public void add(Class<?>... extensionClasses) {
-		Arrays.asList(extensionClasses).forEach(extensionClass -> add(extensionClass));
-	}
-
-	/** Returns the current configuration */
-	public List<Class<?>> getExtensions() {
-		return extensions;
-	}
-
-	@Override
-	public void applyDefault() {
-		add(SpotlessEclipseFramework.DefaultPlugins.createAll());
-	}
-
-	@Override
-	protected BundleActivator create(DefaultPlugins bundle) {
-		return bundle.create();
-	}
-
-	@Override
-	protected int getDefaultState(DefaultPlugins bundle) {
-		return Bundle.ACTIVE;
-	}
-
-}
diff --git a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/SpotlessEclipseServiceConfig.java b/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/SpotlessEclipseServiceConfig.java
deleted file mode 100644
index f0b9a97cc4..0000000000
--- a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/SpotlessEclipseServiceConfig.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.base;
-
-import static com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseFramework.LINE_DELIMITER;
-
-import java.util.Map;
-import java.util.function.BiFunction;
-
-import org.eclipse.core.runtime.content.IContentTypeManager;
-import org.eclipse.core.runtime.preferences.IPreferencesService;
-import org.eclipse.equinox.log.ExtendedLogReaderService;
-import org.eclipse.equinox.log.ExtendedLogService;
-import org.eclipse.osgi.service.datalocation.Location;
-import org.eclipse.osgi.service.debug.DebugOptions;
-import org.eclipse.osgi.service.environment.EnvironmentInfo;
-import org.osgi.framework.ServiceException;
-import org.osgi.service.log.LogLevel;
-
-import com.diffplug.spotless.extra.eclipse.base.service.*;
-
-/**
- * Configuration/Provision of services which shall be provided by the {@link SpotlessEclipseFramework}.
- * <p>
- * The services provide basic functions/configuration to the {@link SpotlessEclipseFramework} bundles use the services.
- * Hence the services can be used to customize the behavior of core bundles and plugins configured
- * in the {@link SpotlessEclipseCoreConfig} and {@link SpotlessEclipsePluginConfig}.
- * </p>
- */
-public interface SpotlessEclipseServiceConfig {
-
-	/** Sets property/preference value available to all bundles, plugins and services. */
-	void set(String key, String value);
-
-	/** Sets property/preference values available to all bundles, plugins and services. */
-	default void set(Map<String, String> properties) {
-		properties.forEach((k, v) -> this.set(k, v));
-	}
-
-	/**
-	 * Add custom service to collection.
-	 * <p>
-	 * Only one service per interface is allowed.
-	 * A service instance implementing multiple interfaces, can be added for each interface.
-	 * <p>
-	 * Please refer to the default method implementation for examples.
-	 *
-	 * @param interfaceClass Service interface
-	 * @param service Service instance
-	 * @throws ServiceException in case service has already been configured
-	 */
-	public <S> void add(Class<S> interfaceClass, S service) throws ServiceException;
-
-	/**
-	 * Spotless formatters should not be configured by environment variables, and
-	 * they shall be OS independent.
-	 * @throws ServiceException in case service has already been configured
-	 */
-	default public void hideEnvironment() throws ServiceException {
-		add(EnvironmentInfo.class, new HiddenEnvironment());
-	}
-
-	/**
-	 * Eclipse provides means to lookup the file content type, e.g. by file name extensions.
-	 * This possibility is not required by most Spotless formatters.
-	 * @throws ServiceException in case service has already been configured
-	 */
-	default public void ignoreContentType() throws ServiceException {
-		add(IContentTypeManager.class, new NoContentTypeSpecificHandling());
-	}
-
-	/**
-	 * Disable Eclipse internal debugging.
-	 * @throws ServiceException in case service has already been configured
-	 */
-	default public void disableDebugging() throws ServiceException {
-		add(DebugOptions.class, new NoDebugging());
-	}
-
-	/**
-	 * Ignore accesses of unsupported preference.
-	 * @throws ServiceException in case service has already been configured
-	 */
-	default public void ignoreUnsupportedPreferences() throws ServiceException {
-		add(IPreferencesService.class, new NoEclipsePreferences());
-	}
-
-	/**
-	 * Use temporary locations in case plugins require to store file.
-	 * These files (for example workspace preferences) will be deleted
-	 * as soon as the application terminates.
-	 * @throws ServiceException in case service has already been configured
-	 */
-	default public void useTemporaryLocations() throws ServiceException {
-		add(Location.class, new TemporaryLocation());
-	}
-
-	/**
-	 * In case the string which will be formatted does not contain any
-	 * line delimiter (single line), Eclipse falls back to use the
-	 * system property.
-	 * Change the system default to the UNIX line separator as required
-	 * by Spotless.
-	 * @throws ServiceException in case service has already been configured
-	 */
-	default public void changeSystemLineSeparator() throws ServiceException {
-		System.setProperty("line.separator", LINE_DELIMITER);
-	}
-
-	/**
-	 * Adds Eclipse logging service Slf4J binding.
-	 * @throws ServiceException in case service has already been configured
-	 */
-	default public void useSlf4J(String loggerName) {
-		useSlf4J(loggerName, (s, l) -> s);
-	}
-
-	/**
-	 * Adds Eclipse logging service Slf4J binding with a message customizer function.
-	 * @throws ServiceException in case service has already been configured
-	 */
-	default public void useSlf4J(String loggerName, BiFunction<String, LogLevel, String> messageCustomizer) throws ServiceException {
-		SingleSlf4JService slf4jServce = new SingleSlf4JService(loggerName, messageCustomizer);
-		add(ExtendedLogService.class, slf4jServce);
-		add(ExtendedLogReaderService.class, slf4jServce);
-		slf4jServce.debug("Initialized Eclipse logging service.");
-	}
-
-	/**
-	 * Applies the default configurations.
-	 * @throws ServiceException in case a service has already been configured
-	 */
-	default public void applyDefault() throws ServiceException {
-		hideEnvironment();
-		ignoreContentType();
-		disableDebugging();
-		ignoreUnsupportedPreferences();
-		useTemporaryLocations();
-		changeSystemLineSeparator();
-	}
-}
diff --git a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/BundleConfig.java b/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/BundleConfig.java
deleted file mode 100644
index 8e4b12c8d0..0000000000
--- a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/BundleConfig.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.base.osgi;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleActivator;
-
-/** A bundle configuration is given by its activator and the desired state */
-public abstract class BundleConfig<T extends Enum<T>> {
-	public static class Entry {
-		public final BundleActivator activator;
-		public final int state;
-
-		public Entry(BundleActivator activator, int state) {
-			Objects.requireNonNull(activator, "activator");
-			this.activator = activator;
-			this.state = state;
-		}
-	}
-
-	private final List<Entry> config;
-
-	protected BundleConfig() {
-		config = new ArrayList<Entry>();
-	}
-
-	/**
-	 * Activate a bundle with a certain state. A non-active state is used by
-	 * some bundles to allow a slim instantiation (for example in a headless
-	 * Eclipse).
-	 */
-	public void add(BundleActivator activator, int state) {
-		config.add(new Entry(activator, state));
-	}
-
-	/** Returns the current configuration */
-	public List<BundleConfig.Entry> get() {
-		return config;
-	}
-
-	/** Activate a set of bundles with certain states */
-	public void add(List<Entry> config) {
-		this.config.addAll(config);
-	}
-
-	/** Activate a bundle in active state, which is the nominal choice */
-	public void add(BundleActivator activator) {
-		add(activator, Bundle.ACTIVE);
-	}
-
-	/** Activate a set of bundles with in active state */
-	public void add(Collection<BundleActivator> config) {
-		config.stream().forEach(entry -> add(entry));
-	}
-
-	/** Activate a default bundle with its default state */
-	public void add(T bundle) {
-		add(create(bundle), getDefaultState(bundle));
-	}
-
-	/** Activate a set of default bundles with their default states */
-	@SuppressWarnings("unchecked")
-	public void add(T... bundles) {
-		Arrays.asList(bundles).forEach(bundle -> add(bundle));
-	}
-
-	/** Activate a default bundle with a custom state */
-	public void add(T bundle, int state) {
-		add(create(bundle), state);
-	}
-
-	/** Applies the default configurations. */
-	public abstract void applyDefault();
-
-	protected abstract BundleActivator create(T bundle);
-
-	protected abstract int getDefaultState(T bundle);
-
-}
diff --git a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/BundleController.java b/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/BundleController.java
deleted file mode 100644
index 3589bd7082..0000000000
--- a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/BundleController.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * Copyright 2016-2021 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.base.osgi;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-
-import org.eclipse.core.internal.jobs.JobManager;
-import org.eclipse.osgi.internal.location.LocationHelper;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleException;
-import org.osgi.framework.Constants;
-import org.osgi.framework.Filter;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceReference;
-import org.osgi.framework.wiring.FrameworkWiring;
-
-/**
- * OSGi bundle controller allowing a minimal Eclipse platform setup
- * by bypassing the Eclipse internal platform.
- *
- * Bundles are loaded by the same class loader, sharing the same context.
- * Services do not provide individual properties, but making use of the framework properties.
- * All bundles have a persistent state. The OSGi life-cycle is not supported.
- */
-public final class BundleController implements StaticBundleContext {
-	private static final String ECLIPSE_LAUNCHER_SYMBOLIC_NAME = "org.eclipse.osgi";
-
-	private final SimpleBundle systemBundle;
-	private final Map<String, String> properties;
-	private final ServiceCollection services;
-	private final BundleSet bundles;
-
-	@SuppressWarnings("deprecation")
-	public BundleController() throws BundleException {
-		//OSGI locks are not required, since this framework does not allow changes after initialization.
-		System.setProperty(LocationHelper.PROP_OSGI_LOCKING, LocationHelper.LOCKING_NONE);
-
-		this.properties = new HashMap<String, String>();
-		//Don't activate all plugin bundles. Activation is triggered by this controller where needed.
-		properties.put(org.eclipse.core.internal.runtime.InternalPlatform.PROP_ACTIVATE_PLUGINS, Boolean.toString(false));
-
-		/*
-		 * Used to set-up an internal member of the Eclipse runtime FindSupport,
-		 * which is used during resources look-up from different version of bundles.
-		 * Since the concept of the Spotless Eclipse framework does not allow multiple versions
-		 * for a bundle, this property is never used.
-		 */
-		properties.put(org.eclipse.core.internal.runtime.FindSupport.PROP_NL, "");
-
-		bundles = new BundleSet();
-		systemBundle = new SimpleBundle(this, Bundle.ACTIVE);
-		bundles.add(systemBundle);
-
-		services = new ServiceCollection(systemBundle, properties);
-
-		//Eclipse core (InternalPlatform) still uses PackageAdmin for looking up bundles
-		EclipseBundleLookup bundleLookup = new EclipseBundleLookup(systemBundle, bundles);
-		services.add(org.osgi.service.packageadmin.PackageAdmin.class, bundleLookup);
-		services.add(FrameworkWiring.class, bundleLookup);
-
-		//Redirect framework activator requests to the org.eclipse.osgi bundle to this instance.
-		bundles.add(new SimpleBundle(systemBundle, ECLIPSE_LAUNCHER_SYMBOLIC_NAME, Bundle.ACTIVE));
-		FrameworkBundleRegistry.initialize(this);
-	}
-
-	/**
-	 * Stop {@link org.eclipse.core.internal.jobs.JobManager} worker pool
-	 * and clean up resources of Spotless bundles and services.
-	 *
-	 * @implNote The {@link org.osgi.framework.BundleActivator}s
-	 * are not stopped, since they are not completely started.
-	 * For example services are suppressed by {@link StaticBundleContext}.
-	 */
-	public void shutdown() {
-		JobManager.shutdown();
-		bundles.getAll().forEach(b -> {
-			try {
-				b.stop();
-			} catch (IllegalStateException | BundleException e) {
-				//Stop on best effort basis
-			}
-		});
-		services.stop();
-	}
-
-	public ServiceCollection getServices() {
-		return services;
-	}
-
-	/** Adds and starts a new bundle. */
-	public void addBundle(int bundleState, BundleActivator activator, Function<Bundle, BundleException> register) throws BundleException {
-		BundleContext contextFacade = new BundleControllerContextFacade(this, bundleState, activator);
-		bundles.add(contextFacade.getBundle());
-		BundleException exception = register.apply(contextFacade.getBundle());
-		if (null != exception)
-			throw exception;
-		try {
-			activator.start(contextFacade);
-		} catch (Exception e) {
-			throw new BundleException(String.format("Failed do start %s.", activator.getClass().getName()), BundleException.ACTIVATOR_ERROR, e);
-		}
-	}
-
-	/** Adds new bundel whithout activator (e.g. used for only for extensions) */
-	public void addBundle(Class<?> clazzInBundleJar, Function<Bundle, BundleException> register) throws BundleException {
-		BundleContext contextFacade = new BundleControllerContextFacade(this, clazzInBundleJar);
-		bundles.add(contextFacade.getBundle());
-		BundleException exception = register.apply(contextFacade.getBundle());
-		if (null != exception)
-			throw exception;
-	}
-
-	/** Creates a context with an individual state if required. */
-	public BundleContext createContext(int state) {
-		if (state == systemBundle.getState()) {
-			return this;
-		}
-		return new BundleControllerContextFacade(systemBundle, state);
-	}
-
-	@Override
-	public String getProperty(String key) {
-		return properties.get(key);
-	}
-
-	@Override
-	public Bundle getBundle() {
-		return systemBundle;
-	}
-
-	@Override
-	public Bundle[] getBundles() {
-		Collection<Bundle> shallowCopy = bundles.getAll();
-		return shallowCopy.toArray(new Bundle[shallowCopy.size()]);
-	}
-
-	@Override
-	public Bundle getBundle(long id) {
-		return bundles.get(id);
-	}
-
-	@Override
-	public Bundle getBundle(String location) {
-		if (Constants.SYSTEM_BUNDLE_LOCATION.equals(location)) {
-			return systemBundle;
-		}
-		return null;
-	}
-
-	@Override
-	public ServiceReference<?>[] getAllServiceReferences(String clazz, String filter) throws InvalidSyntaxException {
-		//Filters are based on class names
-		String interfaceClassName = (null == clazz) ? filter : clazz;
-		return services.getReferences(interfaceClassName);
-	}
-
-	@Override
-	public <S> S getService(ServiceReference<S> reference) {
-		return services.getService(reference);
-	}
-
-	@Override
-	public Filter createFilter(String filter) throws InvalidSyntaxException {
-		return services.createFilter(filter);
-	}
-
-	/**
-	 * Facade providing access to an existing controller for a bundle
-	 * <p>
-	 * All bundles have unrestricted access to the framework services and properties.
-	 * However, each bundle and its context needs to maintain its individual
-	 * symbolic name for look-up.
-	 * </p>
-	 */
-	private static class BundleControllerContextFacade implements StaticBundleContext {
-
-		private final BundleContext context;
-		private final Bundle bundle;
-
-		private BundleControllerContextFacade(BundleContext context, int bundleState, BundleActivator activator) throws BundleException {
-			this.context = context;
-			bundle = new SimpleBundle(this, bundleState, activator);
-		}
-
-		private BundleControllerContextFacade(BundleContext context, Class<?> clazzInBundleJar) throws BundleException {
-			this.context = context;
-			bundle = new SimpleBundle(this, clazzInBundleJar);
-		}
-
-		/** Fakes an individual bundle state */
-		private BundleControllerContextFacade(SimpleBundle bundle, int bundleState) {
-			this.context = bundle.getBundleContext();
-			this.bundle = new SimpleBundle(bundle, bundleState);
-		}
-
-		@Override
-		public String getProperty(String key) {
-			return context.getProperty(key);
-		}
-
-		@Override
-		public Bundle getBundle() {
-			return bundle;
-		}
-
-		@Override
-		public Bundle[] getBundles() {
-			return context.getBundles();
-		}
-
-		@Override
-		public Bundle getBundle(long id) {
-			return context.getBundle(id);
-		}
-
-		@Override
-		public Bundle getBundle(String location) {
-			return context.getBundle(location);
-		}
-
-		@Override
-		public ServiceReference<?>[] getAllServiceReferences(String clazz, String filter) throws InvalidSyntaxException {
-			return context.getAllServiceReferences(clazz, filter);
-		}
-
-		@Override
-		public <S> S getService(ServiceReference<S> reference) {
-			return context.getService(reference);
-		}
-
-		@Override
-		public Filter createFilter(String filter) throws InvalidSyntaxException {
-			return context.createFilter(filter);
-		}
-
-	}
-
-}
diff --git a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/BundleSet.java b/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/BundleSet.java
deleted file mode 100644
index 59e15929fd..0000000000
--- a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/BundleSet.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.base.osgi;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-
-/** Thread save set of bundles, whereas each bundle has a unique symbolic name and a unique ID. */
-class BundleSet {
-	private final Map<String, Bundle> symbolicName2bundle;
-	private final Map<Long, Bundle> id2bundle;
-
-	BundleSet() {
-		symbolicName2bundle = new ConcurrentHashMap<String, Bundle>();
-		id2bundle = new ConcurrentHashMap<Long, Bundle>();
-	}
-
-	/** Get all bundles in collection */
-	Collection<Bundle> getAll() {
-		return symbolicName2bundle.values();
-	}
-
-	/** Get bundle by symbolic name or null if collection does not contain the corresponding bundle. */
-	Bundle get(String symbolicName) {
-		return symbolicName2bundle.get(symbolicName);
-	}
-
-	/** Get bundle by its ID or null if collection does not contain the corresponding bundle. */
-	Bundle get(long id) {
-		return id2bundle.get(id);
-	}
-
-	/** Add bundle to collection.
-	 * @throws BundleException */
-	void add(Bundle bundle) throws BundleException {
-		Bundle existingBundle = symbolicName2bundle.put(bundle.getSymbolicName(), bundle);
-		if (null != existingBundle) {
-			throw new BundleException(
-					String.format("Bundle '%s' (ID: %d) is already part of collection with ID %d.",
-							bundle.getSymbolicName(), bundle.getBundleId(), existingBundle.getBundleId()),
-					BundleException.DUPLICATE_BUNDLE_ERROR);
-		}
-		Bundle bundleWithSameID = id2bundle.put(bundle.getBundleId(), bundle);
-		if (null != bundleWithSameID) {
-			throw new BundleException(
-					String.format("Bundle ID '%d' for '%s' is already used by '%s'.",
-							bundle.getBundleId(),
-							bundle.getSymbolicName(),
-							bundleWithSameID.getSymbolicName()),
-					BundleException.DUPLICATE_BUNDLE_ERROR);
-		}
-	}
-
-}
diff --git a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/EclipseBundleLookup.java b/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/EclipseBundleLookup.java
deleted file mode 100644
index 0ec091a58b..0000000000
--- a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/EclipseBundleLookup.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.base.osgi;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import org.eclipse.osgi.internal.framework.FilterImpl;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.FrameworkListener;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.namespace.IdentityNamespace;
-import org.osgi.framework.wiring.BundleCapability;
-import org.osgi.framework.wiring.FrameworkWiring;
-import org.osgi.resource.Namespace;
-import org.osgi.resource.Requirement;
-import org.osgi.service.packageadmin.ExportedPackage;
-import org.osgi.service.packageadmin.PackageAdmin;
-import org.osgi.service.packageadmin.RequiredBundle;
-
-/**
- *
- * {@link PackageAdmin} and {@link FrameworkWiring} service for bundle look-up.
- * <p>
- * The wiring information will always claim that all required bundles are present, since
- * Spotlss does on purpose not provide all dependencies requested by plugins, since
- * only small parts of the plugins are used.
- * Removal and addition requests for bundles will always claim that there is nothing to do.
- * <p>
- * PackageAdmin interface is deprecated, but might still be used by bundles.
- * It is kept for backward compatibility until removed from Eclipse.
- */
-@SuppressWarnings("deprecation")
-class EclipseBundleLookup implements FrameworkWiring, PackageAdmin {
-
-	private static final Set<String> OSGI_KEYS_FOR_SYMBOLIC_NAMES = Collections.unmodifiableSet(Stream.of(IdentityNamespace.IDENTITY_NAMESPACE, IdentityNamespace.TYPE_BUNDLE).collect(Collectors.toSet()));
-	private final Bundle systemBundle;
-	private final BundleSet bundles;
-
-	EclipseBundleLookup(final Bundle systemBundle, final BundleSet bundles) {
-		this.systemBundle = systemBundle;
-		this.bundles = bundles;
-	}
-
-	@Override
-	@Deprecated
-	public ExportedPackage[] getExportedPackages(Bundle bundle) {
-		return null;
-	}
-
-	@Override
-	@Deprecated
-	public ExportedPackage[] getExportedPackages(String name) {
-		return null;
-	}
-
-	@Override
-	@Deprecated
-	public ExportedPackage getExportedPackage(String name) {
-		return null;
-	}
-
-	@Override
-	@Deprecated
-	public void refreshPackages(Bundle[] bundles) {}
-
-	@Override
-	public boolean resolveBundles(Bundle[] bundles) {
-		return true; //All required bundles can be considered available (to be confirmed by UT)
-	}
-
-	@Override
-	public RequiredBundle[] getRequiredBundles(String symbolicName) {
-		return null; // No unresolved required bundles exist
-	}
-
-	@Override
-	public Bundle[] getBundles(String symbolicName, String versionRange) {
-		//Bundles with different versions cannot be supported due to the usage of same class-loader
-		Bundle bundle = bundles.get(symbolicName);
-		return (null == bundle) ? null : new Bundle[]{bundle};
-	}
-
-	@Override
-	public Bundle[] getFragments(Bundle bundle) {
-		return null; //No fragments
-	}
-
-	@Override
-	public Bundle[] getHosts(Bundle bundle) {
-		return null; //No fragments
-	}
-
-	@Override
-	public Bundle getBundle(@SuppressWarnings("rawtypes") Class clazz) {
-		return bundles.get(clazz.getName());
-	}
-
-	@Override
-	public int getBundleType(Bundle bundle) {
-		return 0; //No fragments
-	}
-
-	@Override
-	public Bundle getBundle() {
-		return systemBundle;
-	}
-
-	@Override
-	public void refreshBundles(Collection<Bundle> bundles, FrameworkListener... listeners) {
-		//Spotless bundles cannot be loaded dynamically
-	}
-
-	@Override
-	public boolean resolveBundles(Collection<Bundle> bundles) {
-		return true;
-	}
-
-	@Override
-	public Collection<Bundle> getRemovalPendingBundles() {
-		return Collections.emptyList(); //Nothing to remove
-	}
-
-	@Override
-	public Collection<Bundle> getDependencyClosure(Collection<Bundle> bundles) {
-		return Collections.emptyList(); //No dependencies
-	}
-
-	@Override
-	public Collection<BundleCapability> findProviders(Requirement requirement) {
-		// requirement must not be null (according to interface description)!
-		String filterSpec = requirement.getDirectives().get(Namespace.REQUIREMENT_FILTER_DIRECTIVE);
-		if (null == filterSpec) {
-			throw new IllegalArgumentException("Requirement filter diretive '" + Namespace.REQUIREMENT_FILTER_DIRECTIVE + "' not found.");
-		}
-		try {
-			FilterImpl requirementFilter = FilterImpl.newInstance(filterSpec);
-			Collection<String> requiredSymbolicNames = getRequestedSymbolicNames(requirementFilter);
-			Collection<BundleCapability> capabilities = new ArrayList<BundleCapability>(requiredSymbolicNames.size());
-			requiredSymbolicNames.forEach(symbolicName -> {
-				Bundle bundle = bundles.get(symbolicName);
-				if (bundle != null) {
-					capabilities.add(new SimpleBundleCapability(bundle));
-				}
-			});
-			return capabilities;
-		} catch (InvalidSyntaxException e) {
-			throw new IllegalArgumentException("Filter specifiation invalid:\n" + filterSpec, e);
-		}
-	}
-
-	/**
-	 * Simplified parser irgnoreing the version.
-	 * Parser is incomplete since it ignores the filter operation.
-	 * It basicall implements the bespoke way Eclipse maps its old style bundle handling to OSGI.
-	 */
-	private static Collection<String> getRequestedSymbolicNames(FilterImpl filter) {
-		List<String> symbolicNames = filter.getStandardOSGiAttributes().entrySet().stream().filter(entry -> OSGI_KEYS_FOR_SYMBOLIC_NAMES.contains(entry.getKey())).map(entry -> entry.getValue()).collect(Collectors.toList());
-		filter.getChildren().forEach(childFilter -> {
-			symbolicNames.addAll(getRequestedSymbolicNames(childFilter));
-		});
-		return symbolicNames;
-	}
-}
diff --git a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/FrameworkBundleRegistry.java b/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/FrameworkBundleRegistry.java
deleted file mode 100644
index 18d5c4bed4..0000000000
--- a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/FrameworkBundleRegistry.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2016-2020 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.base.osgi;
-
-import java.util.Optional;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-import org.osgi.framework.connect.FrameworkUtilHelper;
-
-/**
- * Framework bundle registry service for bundles which do not come with an activator.
- *
- * Instead of returning the system bundle, a new bundle is created
- * to provide an individual resource accessor, so that
- * the correct JAR is searched for relative resource paths.
- * Note that this can also be used to override
- * original resources by providing a resource in the
- * corresponding fat JAR location.
- */
-public class FrameworkBundleRegistry implements FrameworkUtilHelper {
-	static BundleController INSTANCE = null;
-
-	static void initialize(BundleController bundleController) {
-		if (INSTANCE != null) {
-			throw new RuntimeException(FrameworkBundleRegistry.class.getName() + " already initialized.");
-		}
-		INSTANCE = bundleController;
-	}
-
-	@Override
-	public Optional<Bundle> getBundle(Class<?> classFromBundle) {
-		try {
-			return Optional.of(new SimpleBundle(INSTANCE, classFromBundle));
-		} catch (BundleException e) {
-			//If the class cannot be associated to a JAR or fat JAR resource location, just retun null
-		}
-		return Optional.empty();
-	}
-}
diff --git a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/ResourceAccessor.java b/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/ResourceAccessor.java
deleted file mode 100644
index b75a2835ac..0000000000
--- a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/ResourceAccessor.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright 2016-2021 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.base.osgi;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.jar.JarFile;
-import java.util.jar.Manifest;
-
-import org.eclipse.osgi.internal.debug.Debug;
-import org.eclipse.osgi.storage.bundlefile.BundleEntry;
-import org.eclipse.osgi.storage.bundlefile.BundleFile;
-import org.eclipse.osgi.storage.bundlefile.DirBundleFile;
-import org.eclipse.osgi.storage.bundlefile.ZipBundleFile;
-import org.eclipse.osgi.util.ManifestElement;
-import org.osgi.framework.BundleException;
-import org.osgi.framework.Constants;
-
-import com.diffplug.spotless.extra.eclipse.base.service.NoDebugging;
-
-/**
- * Helper to access resources.
- * <p>
- * Spotless Eclipse formatters using in many cases fat JARs, compressing multiple
- * bundles within one JAR. Their resources can get overridden in a fat JAR.
- * Hence they provided under the bundle activators path name.
- * </p>
- * <p>
- * The resource overriding prevention is required in case the Spotless
- * Eclipse formatters integrate third party JARs, not available via M2.
- * Additionally it can be used in case existing third party Eclipse plugins
- * are mocked by Spotless, requiring the provision of multiple customized
- * plugin information (META-INF, plugin.xml) within one JAR.
- * </p>
- */
-class ResourceAccessor {
-	private static final Debug NO_DEBUGGING = new Debug(new NoDebugging());
-	private final String fatJarResourcePath;
-	private final BundleFile bundleFile;
-
-	/** Resources are located in the SpotlessFramework JAR */
-	ResourceAccessor() throws BundleException {
-		this(ResourceAccessor.class);
-	}
-
-	/** Resources are located in the JAR of the given class
-	 * @throws BundleException */
-	ResourceAccessor(Class<?> clazz) throws BundleException {
-		String bundleObjPath = clazz.getName();
-		fatJarResourcePath = bundleObjPath.substring(0, bundleObjPath.lastIndexOf('.'));
-		try {
-			bundleFile = getBundlFile(clazz);
-		} catch (BundleException e) {
-			throw new BundleException(String.format("Failed to locate resources for bundle '%s'.", clazz.getName()), e);
-		}
-	}
-
-	private static BundleFile getBundlFile(Class<?> clazz) throws BundleException {
-		URI objUri = getBundleUri(clazz);
-		File jarOrDirectory = new File(objUri.getPath());
-		if (!(jarOrDirectory.exists() && jarOrDirectory.canRead())) {
-			throw new BundleException(String.format("Path '%s' for '%s' is not accessible exist on local file system.", objUri, clazz.getName()), BundleException.READ_ERROR);
-		}
-		try {
-			return jarOrDirectory.isDirectory() ? new DirBundleFile(jarOrDirectory, false) : new ZipBundleFile(jarOrDirectory, null, null, NO_DEBUGGING, false);
-		} catch (IOException e) {
-			throw new BundleException(String.format("Cannot access bundle at '%s'.", jarOrDirectory), BundleException.READ_ERROR, e);
-		}
-	}
-
-	private static URI getBundleUri(Class<?> clazz) throws BundleException {
-		try {
-			URL objUrl = clazz.getProtectionDomain().getCodeSource().getLocation();
-			return objUrl.toURI();
-		} catch (NullPointerException e) {
-			//No bunlde should be used for RT classes lookup. See also org.eclipse.core.runtime.PerformanceStats.
-			throw new BundleException(String.format("No code source can be located for class '%s'. Class is probably not within a bundle, but part of the RT.", clazz.getName()), BundleException.READ_ERROR, e);
-		} catch (SecurityException e) {
-			throw new BundleException(String.format("Access to class '%s' is denied.", clazz.getName()), BundleException.READ_ERROR, e);
-		} catch (URISyntaxException e) {
-			throw new BundleException(String.format("Path for '%s' is invalid.", clazz.getName()), BundleException.READ_ERROR, e);
-		}
-	}
-
-	/** Get the manifest name from the resources. */
-	String getManifestName() throws BundleException {
-		URL manifestUrl = getEntry(JarFile.MANIFEST_NAME);
-		if (null != manifestUrl) {
-			try {
-				Manifest manifest = new Manifest(manifestUrl.openStream());
-				String headerValue = manifest.getMainAttributes().getValue(Constants.BUNDLE_SYMBOLICNAME);
-				if (null == headerValue) {
-					throw new BundleException(String.format("Symbolic values not found in '%s'.", manifestUrl), BundleException.MANIFEST_ERROR);
-				}
-				ManifestElement[] elements = ManifestElement.parseHeader(Constants.BUNDLE_SYMBOLICNAME, headerValue);
-				if (null == elements) {
-					throw new BundleException(String.format("Symbolic name not found '%s'. Value is '%s'.", manifestUrl, headerValue), BundleException.MANIFEST_ERROR);
-				}
-				//The parser already checked that at least one value exists
-				return elements[0].getValueComponents()[0];
-
-			} catch (IOException e) {
-				throw new BundleException(String.format("Failed to parse Manifest '%s' in '%s'.", manifestUrl, bundleFile.toString()), BundleException.MANIFEST_ERROR, e);
-			}
-		}
-		throw new BundleException(String.format("'%s' in '%s' not found. Tried also fat JAR location '%s'.", JarFile.MANIFEST_NAME, bundleFile.toString(), fatJarResourcePath), BundleException.MANIFEST_ERROR);
-	}
-
-	/** Get resource URL for relative path, or null if the path is not present */
-	URL getEntry(String path) {
-		BundleEntry entry = bundleFile.getEntry(getFatJarPath(path));
-		if (null == entry) {
-			entry = bundleFile.getEntry(path);
-		}
-		return null == entry ? null : entry.getLocalURL();
-	}
-
-	/**
-	 * Enumeration of Strings that indicate the paths found or null if the path does not exist.
-	 */
-	Enumeration<String> getEntries(String path) {
-		Enumeration<String> entries = bundleFile.getEntryPaths(getFatJarPath(path));
-		if (null == entries) {
-			entries = bundleFile.getEntryPaths(path);
-		}
-		return entries;
-	}
-
-	private String getFatJarPath(String path) {
-		return fatJarResourcePath + "/" + path;
-	}
-
-}
diff --git a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/ServiceCollection.java b/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/ServiceCollection.java
deleted file mode 100644
index 2ea67f712f..0000000000
--- a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/ServiceCollection.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * Copyright 2016-2021 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.base.osgi;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Dictionary;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-import org.eclipse.osgi.internal.framework.DTOBuilder;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.Filter;
-import org.osgi.framework.ServiceException;
-import org.osgi.framework.ServiceReference;
-import org.osgi.framework.dto.ServiceReferenceDTO;
-
-import com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseServiceConfig;
-
-/**
- * Collection of services.
- * Eclipse service are not expected to hold any resources. Spotless services
- * can implement AutoCloseable in case a resource release is required on shutdown.
- *
- * Note that the collection access is not thread save, since it is expected
- * that the collection is completed before starting any bundles.
- */
-public class ServiceCollection implements SpotlessEclipseServiceConfig {
-	private final Map<String, ServiceReference<?>> className2Service;
-	private final List<AutoCloseable> servicesWithResources;
-	private final Bundle systemBundle;
-	private final Map<String, String> properties;
-
-	/**
-	 * Collection of services
-	 * @param systemBundle All services will belong to the system bundles
-	 * @param All services share the same properties
-	 */
-	ServiceCollection(Bundle systemBundle, Map<String, String> properties) {
-		className2Service = new HashMap<String, ServiceReference<?>>();
-		servicesWithResources = new ArrayList<>();
-		this.systemBundle = systemBundle;
-		this.properties = properties;
-	}
-
-	void stop() {
-		servicesWithResources.stream().forEach(s -> {
-			try {
-				s.close();
-			} catch (Exception e) {
-				//Stop on best effort basis
-			}
-		});
-	}
-
-	@Override
-	public void set(String key, String value) {
-		properties.put(key, value);
-	}
-
-	@Override
-	public <S> void add(Class<S> interfaceClass, S service) throws ServiceException {
-		String className = interfaceClass.getName();
-		if (null != className2Service.put(interfaceClass.getName(), new FrameworkServiceReference<S>(className, service))) {
-			throw new ServiceException(
-					String.format("Service '%s' is already registered.", interfaceClass.getName()), ServiceException.FACTORY_ERROR);
-		}
-		if (service instanceof AutoCloseable) {
-			servicesWithResources.add((AutoCloseable) service);
-		}
-	}
-
-	/** Creates filter object suitable to lookup service by its interface name. */
-	Filter createFilter(String filterDescr) {
-		Optional<String> serviceClassName = className2Service.keySet().stream().filter(serviceClazzName -> filterDescr.contains(serviceClazzName)).findFirst();
-		return new ClassNameBasedFilter(serviceClassName);
-	}
-
-	/**
-	 * Get reference matching interface class name or all references
-	 * @param interfaceClassName Class name filter. All references are returned in case filter is null
-	 * @return Matching or all interfaces. If no interface is matching the filter, null is returned.
-	 */
-	ServiceReference<?>[] getReferences(String interfaceClassName) {
-		if (null == interfaceClassName) {
-			Collection<ServiceReference<?>> allServices = className2Service.values();
-			return allServices.toArray(new ServiceReference<?>[allServices.size()]);
-		}
-		ServiceReference<?> singleService = className2Service.get(interfaceClassName);
-		return (null == singleService) ? null : new ServiceReference<?>[]{singleService};
-	}
-
-	/**
-	 * Return service for reference if it belongs to the system bundle.
-	 * @param reference Service reference
-	 * @return null, if service does not belong to the system bundle
-	 */
-	<S> S getService(ServiceReference<S> reference) {
-		if (systemBundle == reference.getBundle()) {
-			return ((FrameworkServiceReference<S>) reference).getService();
-		}
-		return null;
-	}
-
-	/** References to static services (not modifiable at run-time */
-	private class FrameworkServiceReference<S> implements ServiceReference<S> {
-
-		private final String className;
-		private final S service;
-
-		private FrameworkServiceReference(String className, S service) {
-			this.className = className;
-			this.service = service;
-		}
-
-		private S getService() {
-			return service;
-		}
-
-		@Override
-		public java.lang.Object getProperty(String key) {
-			return properties.get(key);
-		}
-
-		@Override
-		public String[] getPropertyKeys() {
-			return properties.keySet().toArray(new String[properties.size()]);
-		}
-
-		@Override
-		public Bundle getBundle() {
-			return systemBundle;
-		}
-
-		@Override
-		public Bundle[] getUsingBundles() {
-			return new Bundle[]{systemBundle};
-		}
-
-		@Override
-		public boolean isAssignableTo(Bundle bundle, String className) {
-			// Since only one class loader is used, same class come from the same package
-			return this.className.equals(className);
-		}
-
-		@Override
-		@edu.umd.cs.findbugs.annotations.SuppressFBWarnings(value = "EQ_COMPARETO_USE_OBJECT_EQUALS")
-		public int compareTo(Object reference) {
-			return (this == reference) ? 0 : 1;
-		}
-
-		@Override
-		public Dictionary<String, Object> getProperties() {
-			return new Hashtable<String, Object>(properties);
-		}
-
-		@SuppressWarnings("unchecked")
-		@Override
-		public <A> A adapt(Class<A> type) {
-			if (ServiceReferenceDTO.class.equals(type)) {
-				return (A) DTOBuilder.newServiceReferenceDTO(this);
-			}
-			return null;
-		}
-
-	}
-
-	/**
-	 * Class name based service filter
-	 * <p>
-	 * Dictionary and capability look-ups are not supported and marked as deprecated.
-	 */
-	private class ClassNameBasedFilter implements Filter {
-
-		private final static String NO_MATCH_CLASS_NAME = "";
-
-		private final String className;
-
-		private ClassNameBasedFilter(Optional<String> className) {
-			this.className = className.orElse(NO_MATCH_CLASS_NAME);
-		}
-
-		@Override
-		public boolean match(ServiceReference<?> reference) {
-			return reference.isAssignableTo(systemBundle, className);
-		}
-
-		@Override
-		@Deprecated
-		public boolean match(Dictionary<String, ?> dictionary) {
-			throw new UnsupportedOperationException("Dictionary based service look-up is not supported.");
-		}
-
-		@Override
-		@Deprecated
-		public boolean matchCase(Dictionary<String, ?> dictionary) {
-			throw new UnsupportedOperationException("Dictionary based service look-up is not supported.");
-		}
-
-		@Override
-		@Deprecated
-		public boolean matches(Map<String, ?> map) {
-			throw new UnsupportedOperationException("Capability based service look-up is not supported.");
-		}
-
-		@Override
-		public String toString() {
-			return className;
-		}
-
-	}
-
-}
diff --git a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/SimpleBundle.java b/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/SimpleBundle.java
deleted file mode 100644
index bdf8888b30..0000000000
--- a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/SimpleBundle.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.base.osgi;
-
-import java.net.URL;
-import java.util.Enumeration;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleException;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceReference;
-
-/** Fixed state simple bundle. */
-class SimpleBundle implements StaticBundle, TemporaryBundle {
-	private final String name;
-	private final int state;
-	private final BundleContext context;
-	private final int id;
-	private final ResourceAccessor resources;
-
-	/** System bundle corresponding to the SpotlessFramework JARs manifest */
-	SimpleBundle(BundleContext context, int state) throws BundleException {
-		this(context, state, new ResourceAccessor());
-	}
-
-	/** System bundle for a dedicated bundle activator */
-	SimpleBundle(BundleContext context, int state, BundleActivator activator) throws BundleException {
-		this(context, state, new ResourceAccessor(activator.getClass()));
-	}
-
-	/** System bundle providing only extensions and therefore does not require an activator */
-	SimpleBundle(BundleContext context, Class<?> clazzInBundleJar) throws BundleException {
-		//These bundles are always active (means that resources have been resolved)
-		this(context, Bundle.ACTIVE, new ResourceAccessor(clazzInBundleJar));
-	}
-
-	/** Internal constructor  */
-	private SimpleBundle(BundleContext context, int state, ResourceAccessor resources) throws BundleException {
-		this.state = state;
-		this.context = context;
-		this.resources = resources;
-		id = context.getBundles().length;
-		name = resources.getManifestName();
-	}
-
-	/** Additional bundle with a different symbolic name and state */
-	SimpleBundle(SimpleBundle master, String name, int state) {
-		this.name = name;
-		this.state = state;
-		context = master.context;
-		resources = master.resources;
-		id = context.getBundles().length;
-	}
-
-	/** Bundle clone with a different state */
-	SimpleBundle(SimpleBundle master, int state) {
-		this.state = state;
-		context = master.context;
-		resources = master.resources;
-		id = master.id;
-		name = master.name;
-	}
-
-	@Override
-	public <A> A adapt(Class<A> type) {
-		/*
-		 * The adaptation is currently used by the InternalPlugin to get the framework wiring
-		 * implementation from the system bundle.
-		 * The original purpose to provide more specialized access to the Bundle object,
-		 * seems not be used by Eclipse at all.
-		 * Hence the call is mapped to old-style Eclipse services.
-		 */
-		try {
-
-			ServiceReference<?>[] references = context.getAllServiceReferences(type.getName(), "");
-			if ((null != references) && (0 != references.length)) {
-				if (1 != references.length) {
-					throw new IllegalArgumentException("Multiple services found for " + type.getName()); //In Spotless services should always be unique
-				}
-				Object obj = context.getService(references[0]);
-				try {
-					return type.cast(obj);
-				} catch (ClassCastException e) {
-					throw new IllegalArgumentException("Received unexpected class for reference filter " + type.getName(), e);
-				}
-			}
-			return null;
-		} catch (InvalidSyntaxException e) {
-			throw new IllegalArgumentException("Unexpected syntax exception", e); //Should never be thrown by Spotless bundle controller
-		}
-	}
-
-	@Override
-	public int getState() {
-		return state;
-	}
-
-	@Override
-	public long getBundleId() {
-		return id;
-	}
-
-	@Override
-	public ServiceReference<?>[] getRegisteredServices() {
-		try {
-			return context.getAllServiceReferences(null, null);
-		} catch (InvalidSyntaxException e) {
-			throw new RuntimeException(e); //Filter 'null' is valid for 'select all'.
-		}
-	}
-
-	@Override
-	public String getSymbolicName() {
-		return name;
-	}
-
-	@Override
-	public BundleContext getBundleContext() {
-		return context;
-	}
-
-	@Override
-	public Enumeration<String> getEntryPaths(String path) {
-		return resources.getEntries(path);
-	}
-
-	@Override
-	public URL getEntry(String path) {
-		return resources.getEntry(path);
-	}
-
-}
diff --git a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/SimpleBundleCapability.java b/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/SimpleBundleCapability.java
deleted file mode 100644
index 66f331807d..0000000000
--- a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/SimpleBundleCapability.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.base.osgi;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.Version;
-import org.osgi.framework.wiring.BundleCapability;
-import org.osgi.framework.wiring.BundleRequirement;
-import org.osgi.framework.wiring.BundleRevision;
-import org.osgi.framework.wiring.BundleWiring;
-import org.osgi.resource.Capability;
-import org.osgi.resource.Requirement;
-
-/**
- * Simplified bundle capability ignoring internal wiring and versions
- * <p/>
- * Since multiple versions/implementations of bundles for the same
- * capability is not supported a split of bundle capability and revision is not required.
- */
-class SimpleBundleCapability implements BundleCapability, BundleRevision {
-	private final Bundle bundle;
-
-	SimpleBundleCapability(Bundle bundle) {
-		this.bundle = bundle;
-	}
-
-	@Override
-	public BundleRevision getRevision() {
-		return this;
-	}
-
-	@Override
-	public String getNamespace() {
-		return this.getClass().getName(); //All bundles live in th same namespace
-	}
-
-	@Override
-	public Map<String, String> getDirectives() {
-		return Collections.emptyMap();
-	}
-
-	@Override
-	public Map<String, Object> getAttributes() {
-		return Collections.emptyMap();
-	}
-
-	@Override
-	public BundleRevision getResource() {
-		return this;
-	}
-
-	@Override
-	public Bundle getBundle() {
-		return bundle;
-	}
-
-	@Override
-	public String getSymbolicName() {
-		return bundle.getSymbolicName();
-	}
-
-	@Override
-	public Version getVersion() {
-		return bundle.getVersion();
-	}
-
-	@Override
-	public List<BundleCapability> getDeclaredCapabilities(String namespace) {
-		return Collections.emptyList();
-	}
-
-	@Override
-	public List<BundleRequirement> getDeclaredRequirements(String namespace) {
-		return Collections.emptyList();
-	}
-
-	@Override
-	public int getTypes() {
-		return 0; //It does not matter whether this bunddle is a fragment of not since all bundles are initially provided
-	}
-
-	@Override
-	public BundleWiring getWiring() {
-		return null; //No wiring information
-	}
-
-	@Override
-	public List<Capability> getCapabilities(String namespace) {
-		return Collections.emptyList();
-	}
-
-	@Override
-	public List<Requirement> getRequirements(String namespace) {
-		return Collections.emptyList();
-	}
-
-}
diff --git a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/StaticBundle.java b/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/StaticBundle.java
deleted file mode 100644
index 282804a332..0000000000
--- a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/StaticBundle.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.base.osgi;
-
-import java.io.InputStream;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-import org.osgi.framework.ServiceReference;
-
-/**
- * Unmodifiable bundle with a fixed life-cycle.
- * <p>
- * All state related modifications are ignored.
- * Installation related methods (update/uninstall) are unsupported.
- * Unsupported methods are marked as deprecated and causing an exception.
- */
-public interface StaticBundle extends Bundle {
-
-	@Override
-	default public void start(int options) throws BundleException {}
-
-	@Override
-	default public void start() throws BundleException {}
-
-	@Override
-	default public void stop(int options) throws BundleException {}
-
-	@Override
-	default public void stop() throws BundleException {}
-
-	@Override
-	@Deprecated
-	default public void update(InputStream input) throws BundleException {
-		update();
-	}
-
-	@Override
-	@Deprecated
-	default public void update() throws BundleException {
-		throw new UnsupportedOperationException("Bundle modifications are not supported.");
-	}
-
-	@Override
-	@Deprecated
-	default public void uninstall() throws BundleException {
-		throw new UnsupportedOperationException("Bundles cannot be uninstalled.");
-	}
-
-	@Override
-	default public long getLastModified() {
-		return 0;
-	}
-
-	@Override
-	@Deprecated
-	default public String getLocation() {
-		throw new UnsupportedOperationException("Bundle lookup by location only required for installation/update.");
-	}
-
-	@Override
-	default public ServiceReference<?>[] getServicesInUse() {
-		return getRegisteredServices(); //There is no distinction between available services and services in use.
-	}
-
-}
diff --git a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/StaticBundleContext.java b/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/StaticBundleContext.java
deleted file mode 100644
index 040ef98444..0000000000
--- a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/StaticBundleContext.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.base.osgi;
-
-import java.io.File;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Dictionary;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleException;
-import org.osgi.framework.BundleListener;
-import org.osgi.framework.FrameworkListener;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceFactory;
-import org.osgi.framework.ServiceListener;
-import org.osgi.framework.ServiceObjects;
-import org.osgi.framework.ServiceReference;
-import org.osgi.framework.ServiceRegistration;
-
-/**
- * Restriction of the {@link BundleContext} interface rejecting run-time provision of bundles.
- * Services provided at run-time are ignored.
- * <p>
- * Multiple service instances per class are not supported, hence the services can be filtered by class name.
- * Unsupported methods are marked as deprecated an causing an exception.
- * Registration and removal of bundle/service listeners are ignored, since a run-time
- * provision of bundles or services is not supported.
- */
-interface StaticBundleContext extends BundleContext {
-
-	@Override
-	@Deprecated
-	default public Bundle installBundle(String location, InputStream input) throws BundleException {
-		throw new UnsupportedOperationException("Run-time installation of bundles is not supported.");
-	}
-
-	@Override
-	@Deprecated
-	default public Bundle installBundle(String location) throws BundleException {
-		throw new UnsupportedOperationException("Run-time installation of bundles is not supported.");
-	}
-
-	@Override
-	default public void addServiceListener(ServiceListener listener, String filter) throws InvalidSyntaxException {}
-
-	@Override
-	default public void addServiceListener(ServiceListener listener) {}
-
-	@Override
-	default public void removeServiceListener(ServiceListener listener) {}
-
-	@Override
-	default public void addBundleListener(BundleListener listener) {}
-
-	@Override
-	default public void removeBundleListener(BundleListener listener) {}
-
-	@Override
-	default public void addFrameworkListener(FrameworkListener listener) {}
-
-	@Override
-	default public void removeFrameworkListener(FrameworkListener listener) {}
-
-	@Override
-	@Deprecated
-	default public ServiceRegistration<?> registerService(String[] clazzes, Object service, Dictionary<String, ?> properties) {
-		throw new UnsupportedOperationException("Run-time provision of services is not supported.");
-	}
-
-	@Override
-	@Deprecated
-	default public ServiceRegistration<?> registerService(String clazz, Object service, Dictionary<String, ?> properties) {
-		return null; //Ignore additional services
-	}
-
-	@Deprecated
-	@Override
-	default public <S> ServiceRegistration<S> registerService(Class<S> clazz, S service, Dictionary<String, ?> properties) {
-		return null; //Ignore additional services
-	}
-
-	@Override
-	@Deprecated
-	default public <S> ServiceRegistration<S> registerService(Class<S> clazz, ServiceFactory<S> factory, Dictionary<String, ?> properties) {
-		return null; //Ignore additional services
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	default public <S> ServiceReference<S> getServiceReference(Class<S> clazz) {
-		Objects.requireNonNull(clazz, "The class under whose name the service was registered must not be null.");
-		return (ServiceReference<S>) getServiceReference(clazz.getName());
-	}
-
-	@Override
-	default public ServiceReference<?> getServiceReference(String clazz) {
-		Objects.requireNonNull(clazz, "The class under whose name the service was registered must not be null.");
-		ServiceReference<?>[] references;
-		try {
-			references = getServiceReferences(clazz, null);
-		} catch (InvalidSyntaxException e) {
-			throw new RuntimeException(e); //null is always valid
-		}
-		return (null == references) ? null : references[0];
-	}
-
-	@Override
-	default public ServiceReference<?>[] getServiceReferences(String clazz, String filter) throws InvalidSyntaxException {
-		return getAllServiceReferences(clazz, filter); //Services are always considered compatible
-	}
-
-	@Override
-	default public ServiceReference<?>[] getAllServiceReferences(String clazz, String filter) throws InvalidSyntaxException {
-		//Filters are based on class names
-		ServiceReference<?> reference = (null == clazz) ? getServiceReference(filter) : getServiceReference(clazz);
-		return (reference == null) ? null : new ServiceReference<?>[]{reference};
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	default public <S> Collection<ServiceReference<S>> getServiceReferences(Class<S> clazz, String filter) throws InvalidSyntaxException {
-		ServiceReference<?>[] references = getServiceReferences(clazz.getName(), filter);
-		Collection<ServiceReference<S>> result = new ArrayList<ServiceReference<S>>(0);
-		if (null != references) {
-			result = Arrays.stream(references).map(r -> (ServiceReference<S>) r).collect(Collectors.toList());
-		}
-		return result;
-	}
-
-	@Override
-	default public boolean ungetService(ServiceReference<?> reference) {
-		return true; //Services are persistent and never unregistered
-	}
-
-	@Override
-	@Deprecated
-	default public <S> ServiceObjects<S> getServiceObjects(ServiceReference<S> reference) {
-		throw new UnsupportedOperationException("Service specific objects are not supported.");
-	}
-
-	@Override
-	@Deprecated
-	default public File getDataFile(String filename) {
-		throw new UnsupportedOperationException("Persistent data storage provision is handled by the Location service.");
-	}
-
-}
diff --git a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/TemporaryBundle.java b/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/TemporaryBundle.java
deleted file mode 100644
index 24cfadc8c2..0000000000
--- a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/TemporaryBundle.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.base.osgi;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.security.cert.X509Certificate;
-import java.util.Dictionary;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.Version;
-
-/**
- * Temporary bundle loaded by common class loader and added temporarily.
- * It shall not be recognized as a Eclipse plugin (providing plugin.xml)
- * but as a mere OSGI bundle.
- * <p>
- * META data look-ups are not supported (only required for Eclipse plugins).
- * Entry look-up in the bundle space (findEntries) is not supported.
- * Installation related methods (update/uninstall) are not supported.
- * Unsupported methods are marked as deprecated and causing an exception.
- */
-public interface TemporaryBundle extends Bundle {
-
-	@Override
-	default public Version getVersion() {
-		return Version.emptyVersion; //Cannot support multiple version using single class loader.
-	}
-
-	@Override
-	default public int compareTo(Bundle o) {
-		//Symbolic name is sufficient to distinguish bundles
-		return getSymbolicName().compareTo(o.getSymbolicName());
-	}
-
-	@Override
-	default public <A> A adapt(Class<A> type) {
-		return null; //Adaptation is not successful
-	}
-
-	@Override
-	@Deprecated
-	default public Dictionary<String, String> getHeaders() {
-		throw new UnsupportedOperationException("Bundle META information is not available.");
-	}
-
-	@Override
-	@Deprecated
-	default public Dictionary<String, String> getHeaders(String locale) {
-		return getHeaders();
-	}
-
-	@Override
-	default public URL getResource(String name) {
-		return getClass().getClassLoader().getResource(name);
-	}
-
-	@Override
-	default public Enumeration<URL> getResources(String name) throws IOException {
-		return getClass().getClassLoader().getResources(name);
-	}
-
-	@Override
-	@Deprecated
-	default public Enumeration<URL> findEntries(String path, String filePattern, boolean recurse) {
-		return null; //Local JAR look-up are not supported per default
-	}
-
-	@Override
-	default public Class<?> loadClass(String name) throws ClassNotFoundException {
-		return getClass().getClassLoader().loadClass(name);
-	}
-
-	@Override
-	default public boolean hasPermission(Object permission) {
-		return true; //Dedicated permissions are not supported
-	}
-
-	@Override
-	default public Map<X509Certificate, List<X509Certificate>> getSignerCertificates(int signersType) {
-		return new HashMap<X509Certificate, List<X509Certificate>>(0); //Bundle is not signed
-	}
-
-	@Override
-	default public File getDataFile(String filename) {
-		return null; //No file system support for persistent files
-	}
-
-}
diff --git a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/package-info.java b/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/package-info.java
deleted file mode 100644
index da74c0471e..0000000000
--- a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/package-info.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/** Simplified OSGIi implementation bypassing Equinox module layer. */
-package com.diffplug.spotless.extra.eclipse.base.osgi;
diff --git a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/package-info.java b/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/package-info.java
deleted file mode 100644
index b82e4d40ca..0000000000
--- a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/package-info.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * Common Spotless Eclipse Equinox setup classes.
- * Please refer to the {@code eclipse-base} {@code README.md} for
- * usage instructions.
- */
-@ParametersAreNonnullByDefault
-package com.diffplug.spotless.extra.eclipse.base;
-
-import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/runtime/PluginRegistrar.java b/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/runtime/PluginRegistrar.java
deleted file mode 100644
index cdee9893dc..0000000000
--- a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/runtime/PluginRegistrar.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.base.runtime;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.PropertyResourceBundle;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.internal.registry.ExtensionRegistry;
-import org.eclipse.core.runtime.IContributor;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.RegistryFactory;
-import org.eclipse.core.runtime.spi.RegistryContributor;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-
-/** Registers Eclipse plugins at runtime based on a loaded bundle.
- * <p>
- * Note that the functionality provided by this class uses incubation features of the Eclipse core.
- */
-public class PluginRegistrar {
-	private static final String PLUGIN_XML = "plugin.xml";
-	private static final String PLUGIN_PROPERTIES = "plugin.properties";
-
-	public static BundleException register(Bundle bundle) {
-		PluginRegistrar registrar = new PluginRegistrar(bundle);
-		try {
-			registrar.register();
-		} catch (BundleException e) {
-			return e;
-		}
-		return null;
-	}
-
-	private final Bundle bundle;
-
-	private PluginRegistrar(Bundle bundle) {
-		this.bundle = bundle;
-	}
-
-	private void register() throws BundleException {
-		IExtensionRegistry reg = RegistryFactory.getRegistry();
-		Object registryUser = ((ExtensionRegistry) reg).getTemporaryUserToken();
-		if (!reg.addContribution(getStreamForEntry(PLUGIN_XML), createContributor(), false, null, getPluginProperties(), registryUser)) {
-			throw new BundleException("Could not add plugin: " + bundle.getSymbolicName(), BundleException.REJECTED_BY_HOOK);
-		}
-	}
-
-	private IContributor createContributor() {
-		return new RegistryContributor(
-				Long.toString(bundle.getBundleId()),
-				bundle.getSymbolicName(),
-				// Local host
-				null,
-				null);
-	}
-
-	private ResourceBundle getPluginProperties() throws BundleException {
-		//Some plugins, like the org.codehaus.groovy.eclipse.core, do not provide a property file.
-		InputStream is = entryExists(PLUGIN_PROPERTIES) ? getStreamForEntry(PLUGIN_PROPERTIES) : new ByteArrayInputStream(new byte[0]);
-		try {
-			return new PropertyResourceBundle(is);
-		} catch (IOException e) {
-			throw new BundleException(String.format("Bund resource '%s' is not encoded with ISO-8859-1.", PLUGIN_PROPERTIES), BundleException.MANIFEST_ERROR, e);
-		}
-	}
-
-	private InputStream getStreamForEntry(String path) throws BundleException {
-		try {
-			return getEntry(path).openStream();
-		} catch (IOException e) {
-			throw new BundleException(String.format("Cannot access mandatory resource '%s'.", path), BundleException.MANIFEST_ERROR, e);
-		}
-	}
-
-	private URL getEntry(String path) throws BundleException {
-		URL url = bundle.getEntry(path);
-		if (null == url) {
-			throw new BundleException(String.format("Cannot find mandatory resource '%s'.", path), BundleException.MANIFEST_ERROR);
-		}
-		return url;
-	}
-
-	private boolean entryExists(String path) {
-		return null != bundle.getEntry(path);
-	}
-}
diff --git a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/runtime/package-info.java b/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/runtime/package-info.java
deleted file mode 100644
index 5ed08616b9..0000000000
--- a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/runtime/package-info.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * Eclipse Core Runtime adapters allowing runtime modifications which normally requires an Eclipse restart.
- */
-package com.diffplug.spotless.extra.eclipse.base.runtime;
diff --git a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/service/HiddenEnvironment.java b/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/service/HiddenEnvironment.java
deleted file mode 100644
index 8c9c1a6c91..0000000000
--- a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/service/HiddenEnvironment.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.base.service;
-
-import java.util.Locale;
-
-import org.eclipse.osgi.service.environment.Constants;
-import org.eclipse.osgi.service.environment.EnvironmentInfo;
-
-/** Empty default Eclipse environment. No system information is accessible. */
-public class HiddenEnvironment implements EnvironmentInfo {
-
-	@Override
-	public String[] getCommandLineArgs() {
-		return new String[0];
-	}
-
-	@Override
-	public String[] getFrameworkArgs() {
-		return new String[0];
-	}
-
-	@Override
-	public String[] getNonFrameworkArgs() {
-		return new String[0];
-	}
-
-	@Override
-	public String getOSArch() {
-		return System.getProperty("os.arch");
-	}
-
-	@Override
-	public String getNL() {
-		return Locale.getDefault().getLanguage();
-	}
-
-	@Override
-	public String getOS() {
-		return Constants.OS_UNKNOWN;
-	}
-
-	@Override
-	public String getWS() {
-		return null; //No window system
-	}
-
-	@Override
-	public boolean inDebugMode() {
-		return false;
-	}
-
-	@Override
-	public boolean inDevelopmentMode() {
-		return false;
-	}
-
-	@Override
-	public String setProperty(String key, String value) {
-		return value; //Launcher information is not stored
-	}
-
-	@Override
-	public String getProperty(String key) {
-		return null; //Launcher information/configuration is not required
-	}
-
-}
diff --git a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/service/NoContentTypeSpecificHandling.java b/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/service/NoContentTypeSpecificHandling.java
deleted file mode 100644
index 87e1f2f91b..0000000000
--- a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/service/NoContentTypeSpecificHandling.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.base.service;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.core.runtime.content.IContentTypeManager;
-import org.eclipse.core.runtime.content.IContentTypeMatcher;
-import org.eclipse.core.runtime.preferences.IScopeContext;
-
-/** No content type specific handling is supported. */
-public class NoContentTypeSpecificHandling implements IContentTypeManager {
-
-	@Override
-	public IContentType findContentTypeFor(InputStream contents, String fileName) throws IOException {
-		return null;
-	}
-
-	@Override
-	public IContentType findContentTypeFor(String fileName) {
-		return null;
-	}
-
-	@Override
-	public IContentType[] findContentTypesFor(InputStream contents, String fileName) throws IOException {
-		return null;
-	}
-
-	@Override
-	public IContentType[] findContentTypesFor(String fileName) {
-		return null;
-	}
-
-	@Override
-	public IContentDescription getDescriptionFor(InputStream contents, String fileName, QualifiedName[] options) throws IOException {
-		return null;
-	}
-
-	@Override
-	public IContentDescription getDescriptionFor(Reader contents, String fileName, QualifiedName[] options) throws IOException {
-		return null;
-	}
-
-	@Override
-	public void addContentTypeChangeListener(IContentTypeChangeListener listener) {}
-
-	@Override
-	public IContentType[] getAllContentTypes() {
-		return null;
-	}
-
-	@Override
-	public IContentType getContentType(String contentTypeIdentifier) {
-		return null;
-	}
-
-	@Override
-	public IContentTypeMatcher getMatcher(ISelectionPolicy customPolicy, IScopeContext context) {
-		return null;
-	}
-
-	@Override
-	public void removeContentTypeChangeListener(IContentTypeChangeListener listener) {
-
-	}
-
-	@Override
-	public IContentType addContentType(String contentTypeIdentifier, String name, IContentType baseType)
-			throws CoreException {
-		return null;
-	}
-
-	@Override
-	public void removeContentType(String contentTypeIdentifier) throws CoreException {}
-
-}
diff --git a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/service/NoDebugging.java b/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/service/NoDebugging.java
deleted file mode 100644
index 095be889e9..0000000000
--- a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/service/NoDebugging.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.base.service;
-
-import java.io.File;
-import java.util.Map;
-
-import org.eclipse.osgi.service.debug.DebugOptions;
-import org.eclipse.osgi.service.debug.DebugTrace;
-
-/** No debugging shall be performed */
-public class NoDebugging implements DebugOptions {
-
-	@Override
-	public boolean getBooleanOption(String option, boolean defaultValue) {
-		return false;
-	}
-
-	@Override
-	public String getOption(String option) {
-		return null;
-	}
-
-	@Override
-	public String getOption(String option, String defaultValue) {
-		return null;
-	}
-
-	@Override
-	public int getIntegerOption(String option, int defaultValue) {
-		return 0;
-	}
-
-	@Override
-	public Map<String, String> getOptions() {
-		return null;
-	}
-
-	@Override
-	public void setOption(String option, String value) {}
-
-	@Override
-	public void setOptions(Map<String, String> options) {}
-
-	@Override
-	public void removeOption(String option) {}
-
-	@Override
-	public boolean isDebugEnabled() {
-		return false;
-	}
-
-	@Override
-	public void setDebugEnabled(boolean value) {}
-
-	@Override
-	public void setFile(File newFile) {}
-
-	@Override
-	public File getFile() {
-		return null;
-	}
-
-	@Override
-	public DebugTrace newDebugTrace(String bundleSymbolicName) {
-		return null;
-	}
-
-	@Override
-	public DebugTrace newDebugTrace(String bundleSymbolicName, Class<?> traceEntryClass) {
-		return null;
-	}
-
-}
diff --git a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/service/NoEclipsePreferences.java b/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/service/NoEclipsePreferences.java
deleted file mode 100644
index 7f6bed44ed..0000000000
--- a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/service/NoEclipsePreferences.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.base.service;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.preferences.DefaultScope;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.IExportedPreferences;
-import org.eclipse.core.runtime.preferences.IPreferenceFilter;
-import org.eclipse.core.runtime.preferences.IPreferencesService;
-import org.eclipse.core.runtime.preferences.IScopeContext;
-import org.osgi.service.prefs.Preferences;
-
-/**
- * The formatters dependents on plugins which access Eclipse core functionality,
- * configurable by preferences. This functionality is never used by the formatters itself.
- * Hence modifications are ignored and default values are provided on request.
- */
-public class NoEclipsePreferences implements IPreferencesService {
-	private static final String UNUSED = "unused";
-
-	@Override
-	public IEclipsePreferences getRootNode() {
-		//Return value is not effectively used.
-		return DefaultScope.INSTANCE.getNode(UNUSED);
-	}
-
-	@Override
-	public String get(String key, String defaultValue, Preferences[] nodes) {
-		return null;
-	}
-
-	@Override
-	public boolean getBoolean(String qualifier, String key, boolean defaultValue, IScopeContext[] contexts) {
-		return false;
-	}
-
-	@Override
-	public byte[] getByteArray(String qualifier, String key, byte[] defaultValue, IScopeContext[] contexts) {
-		return null;
-	}
-
-	@Override
-	public double getDouble(String qualifier, String key, double defaultValue, IScopeContext[] contexts) {
-		return 0;
-	}
-
-	@Override
-	public float getFloat(String qualifier, String key, float defaultValue, IScopeContext[] contexts) {
-		return 0;
-	}
-
-	@Override
-	public int getInt(String qualifier, String key, int defaultValue, IScopeContext[] contexts) {
-		return 0;
-	}
-
-	@Override
-	public long getLong(String qualifier, String key, long defaultValue, IScopeContext[] contexts) {
-		return 0;
-	}
-
-	@Override
-	public String getString(String qualifier, String key, String defaultValue, IScopeContext[] contexts) {
-		return null;
-	}
-
-	@Override
-	public IStatus exportPreferences(IEclipsePreferences node, OutputStream output, String[] excludesList) throws CoreException {
-		return null;
-	}
-
-	@Override
-	public IStatus importPreferences(InputStream input) throws CoreException {
-		return null;
-	}
-
-	@Override
-	public IStatus applyPreferences(IExportedPreferences preferences) throws CoreException {
-		return null;
-	}
-
-	@Override
-	public IExportedPreferences readPreferences(InputStream input) throws CoreException {
-		return null;
-	}
-
-	@Override
-	public String[] getDefaultLookupOrder(String qualifier, String key) {
-		return null;
-	}
-
-	@Override
-	public String[] getLookupOrder(String qualifier, String key) {
-		return null;
-	}
-
-	@Override
-	public void setDefaultLookupOrder(String qualifier, String key, String[] order) {}
-
-	@Override
-	public void exportPreferences(IEclipsePreferences node, IPreferenceFilter[] filters, OutputStream output) throws CoreException {}
-
-	@Override
-	public IPreferenceFilter[] matches(IEclipsePreferences node, IPreferenceFilter[] filters) throws CoreException {
-		return null;
-	}
-
-	@Override
-	public void applyPreferences(IEclipsePreferences node, IPreferenceFilter[] filters) throws CoreException {}
-
-}
diff --git a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/service/SingleSlf4JService.java b/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/service/SingleSlf4JService.java
deleted file mode 100644
index 6928621c83..0000000000
--- a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/service/SingleSlf4JService.java
+++ /dev/null
@@ -1,533 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.base.service;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.BiConsumer;
-import java.util.function.BiFunction;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
-
-import javax.annotation.Nullable;
-
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.equinox.log.ExtendedLogReaderService;
-import org.eclipse.equinox.log.ExtendedLogService;
-import org.eclipse.equinox.log.LogFilter;
-import org.eclipse.equinox.log.Logger;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.ServiceReference;
-import org.osgi.service.log.LogEntry;
-import org.osgi.service.log.LogLevel;
-import org.osgi.service.log.LogListener;
-import org.osgi.service.log.LoggerConsumer;
-
-/**
- * Eclipse log service facade that delegates to a Slf4J logger.
- * The service does not provide historical log entries (empty history reported).
- * No factory service is provided for OSGI logger extensions (method are marked
- * as deprecated and raise UnsupportedOperationException).
- * All Eclipse logger are delegated to a single Slf4J logger instance.
- * The log messages can be formatted by customizer.
- */
-public class SingleSlf4JService implements ExtendedLogService, ExtendedLogReaderService {
-
-	private final org.slf4j.Logger delegate;
-	private final Map<LogLevel, LogMethods> logLevel2methods;
-	private final Set<LogListener> listener;
-	private final BiFunction<String, LogLevel, String> messageCustomizer;
-
-	/** Create facade for named logger with customized messages. */
-	public SingleSlf4JService(String name, BiFunction<String, LogLevel, String> messageCustomizer) {
-		delegate = org.slf4j.LoggerFactory.getLogger(name);
-		logLevel2methods = new HashMap<LogLevel, LogMethods>();
-		/*
-		 * Audit message are treated as normal info-messages and might not get logged.
-		 * Logging of Eclipse messages in Spotless formatter is meant for debugging purposes and
-		 * detection of erroneous usage/override of internal Eclipse methods.
-		 * Hence the concept of Audit is not required.
-		 */
-		logLevel2methods.put(LogLevel.AUDIT,
-				create(() -> true, m -> delegate.info(m), (m, e) -> delegate.info(m, e)));
-		logLevel2methods.put(LogLevel.DEBUG,
-				create(() -> delegate.isDebugEnabled(), m -> delegate.debug(m), (m, e) -> delegate.debug(m, e)));
-		logLevel2methods.put(LogLevel.ERROR,
-				create(() -> delegate.isErrorEnabled(), m -> delegate.error(m), (m, e) -> delegate.error(m, e)));
-		logLevel2methods.put(LogLevel.INFO,
-				create(() -> delegate.isInfoEnabled(), m -> delegate.info(m), (m, e) -> delegate.info(m, e)));
-		logLevel2methods.put(LogLevel.TRACE,
-				create(() -> delegate.isTraceEnabled(), m -> delegate.trace(m), (m, e) -> delegate.trace(m, e)));
-		logLevel2methods.put(LogLevel.WARN,
-				create(() -> delegate.isWarnEnabled(), m -> delegate.warn(m), (m, e) -> delegate.warn(m, e)));
-		listener = new HashSet<LogListener>();
-		this.messageCustomizer = messageCustomizer;
-	}
-
-	@Override
-	@Deprecated
-	//Backward compatibility with Eclipse OSGI 3.12
-	public void log(int level, String message) {
-		log(this, level, message);
-	}
-
-	@Override
-	@Deprecated
-	//Backward compatibility with Eclipse OSGI 3.12
-	public void log(int level, String message, @Nullable Throwable exception) {
-		log(this, level, message, exception);
-	}
-
-	@SuppressWarnings("rawtypes")
-	@Override
-	@Deprecated
-	//Backward compatibility with Eclipse OSGI 3.12
-	public void log(ServiceReference sr, int level, String message) {
-		log(this, level, message);
-	}
-
-	@SuppressWarnings("rawtypes")
-	@Override
-	@Deprecated
-	//Backward compatibility with Eclipse OSGI 3.12
-	public void log(ServiceReference sr, int level, String message, Throwable exception) {
-		log(this, level, message, exception);
-	}
-
-	@Override
-	public void log(Object context, int level, String message) {
-		log(context, level, message, null);
-	}
-
-	@Override
-	public void log(Object context, int level, String message, @Nullable Throwable exception) {
-		LogLevel logLevel = convertDeprectatedOsgiLevel(level);
-		log(new SimpleLogEntry(logLevel, message, exception));
-	}
-
-	@Override
-	public boolean isLoggable(int level) {
-		LogLevel logLevel = convertDeprectatedOsgiLevel(level);
-		return logLevel2methods.get(logLevel).isEnabled();
-	}
-
-	@SuppressWarnings("deprecation") ////Backward compatibility with Eclipse OSGI 3.12
-	private static LogLevel convertDeprectatedOsgiLevel(int level) {
-		switch (level) {
-		case SingleSlf4JService.LOG_DEBUG:
-			return LogLevel.DEBUG;
-		case SingleSlf4JService.LOG_INFO:
-			return LogLevel.INFO;
-		case SingleSlf4JService.LOG_ERROR:
-			return LogLevel.ERROR;
-		case SingleSlf4JService.LOG_WARNING:
-			return LogLevel.WARN;
-		default:
-			return LogLevel.AUDIT;
-		}
-	}
-
-	@Override
-	public String getName() {
-		return delegate.getName();
-	}
-
-	@Override
-	public Logger getLogger(String loggerName) {
-		return this;
-	}
-
-	@Override
-	public Logger getLogger(Bundle bundle, String loggerName) {
-		return this;
-	}
-
-	@Override
-	public void addLogListener(LogListener listener) {
-		synchronized (this.listener) {
-			this.listener.add(listener);
-		}
-	}
-
-	@Override
-	public void removeLogListener(LogListener listener) {
-		synchronized (this.listener) {
-			this.listener.remove(listener);
-		}
-	}
-
-	private void log(LogEntry entry) {
-		synchronized (listener) {
-			listener.stream().forEach(l -> l.logged(entry));
-		}
-		String customMessage = messageCustomizer.apply(entry.getMessage(), entry.getLogLevel());
-		logLevel2methods.get(entry.getLogLevel()).log(customMessage, entry.getException());
-	}
-
-	@Override
-	@Deprecated
-	//Backward compatibility with Eclipse OSGI 3.12
-	public Enumeration<LogEntry> getLog() {
-		return Collections.emptyEnumeration(); //We do not provide historical information
-	}
-
-	@Override
-	public void addLogListener(LogListener listener, LogFilter filter) {
-		addLogListener(listener); //Listener must filter if required
-
-	}
-
-	@Override
-	public org.osgi.service.log.Logger getLogger(Class<?> clazz) {
-		return this;
-	}
-
-	@Override
-	@Deprecated
-	public <L extends org.osgi.service.log.Logger> L getLogger(String name, Class<L> loggerType) {
-		throw new UnsupportedOperationException("Logger factory for indifivaul types currently not supported.");
-	}
-
-	@Override
-	@Deprecated
-	public <L extends org.osgi.service.log.Logger> L getLogger(Class<?> clazz, Class<L> loggerType) {
-		return getLogger(getName(), loggerType);
-	}
-
-	@Override
-	@Deprecated
-	public <L extends org.osgi.service.log.Logger> L getLogger(Bundle bundle, String name, Class<L> loggerType) {
-		return getLogger(getName(), loggerType);
-	}
-
-	@Override
-	public boolean isTraceEnabled() {
-		return delegate.isTraceEnabled();
-	}
-
-	@Override
-	public void trace(String message) {
-		log(new SimpleLogEntry(LogLevel.TRACE, message));
-	}
-
-	@Override
-	public void trace(String format, Object arg) {
-		trace(String.format(format, arg));
-	}
-
-	@Override
-	public void trace(String format, Object arg1, Object arg2) {
-		trace(String.format(format, arg1, arg2));
-	}
-
-	@Override
-	public void trace(String format, Object... arguments) {
-		trace(String.format(format, arguments));
-	}
-
-	@Override
-	public <E extends Exception> void trace(LoggerConsumer<E> consumer) throws E {
-		consumer.accept(this);
-	}
-
-	@Override
-	public boolean isDebugEnabled() {
-		return delegate.isDebugEnabled();
-	}
-
-	@Override
-	public void debug(String message) {
-		log(new SimpleLogEntry(LogLevel.DEBUG, message));
-	}
-
-	@Override
-	public void debug(String format, Object arg) {
-		debug(String.format(format, arg));
-	}
-
-	@Override
-	public void debug(String format, Object arg1, Object arg2) {
-		debug(String.format(format, arg1, arg2));
-	}
-
-	@Override
-	public void debug(String format, Object... arguments) {
-		debug(String.format(format, arguments));
-	}
-
-	@Override
-	public <E extends Exception> void debug(LoggerConsumer<E> consumer) throws E {
-		consumer.accept(this);
-	}
-
-	@Override
-	public boolean isInfoEnabled() {
-		return delegate.isInfoEnabled();
-	}
-
-	@Override
-	public void info(String message) {
-		log(new SimpleLogEntry(LogLevel.INFO, message));
-	}
-
-	@Override
-	public void info(String format, Object arg) {
-		info(String.format(format, arg));
-	}
-
-	@Override
-	public void info(String format, Object arg1, Object arg2) {
-		info(String.format(format, arg1, arg2));
-	}
-
-	@Override
-	public void info(String format, Object... arguments) {
-		info(String.format(format, arguments));
-	}
-
-	@Override
-	public <E extends Exception> void info(LoggerConsumer<E> consumer) throws E {
-		consumer.accept(this);
-	}
-
-	@Override
-	public boolean isWarnEnabled() {
-		return delegate.isWarnEnabled();
-	}
-
-	@Override
-	public void warn(String message) {
-		log(new SimpleLogEntry(LogLevel.WARN, message));
-	}
-
-	@Override
-	public void warn(String format, Object arg) {
-		warn(String.format(format, arg));
-	}
-
-	@Override
-	public void warn(String format, Object arg1, Object arg2) {
-		warn(String.format(format, arg1, arg2));
-	}
-
-	@Override
-	public void warn(String format, Object... arguments) {
-		warn(String.format(format, arguments));
-	}
-
-	@Override
-	public <E extends Exception> void warn(LoggerConsumer<E> consumer) throws E {
-		consumer.accept(this);
-	}
-
-	@Override
-	public boolean isErrorEnabled() {
-		return delegate.isErrorEnabled();
-	}
-
-	@Override
-	public void error(String message) {
-		log(new SimpleLogEntry(LogLevel.ERROR, message));
-	}
-
-	@Override
-	public void error(String format, Object arg) {
-		error(String.format(format, arg));
-	}
-
-	@Override
-	public void error(String format, Object arg1, Object arg2) {
-		error(String.format(format, arg1, arg2));
-	}
-
-	@Override
-	public void error(String format, Object... arguments) {
-		error(String.format(format, arguments));
-	}
-
-	@Override
-	public <E extends Exception> void error(LoggerConsumer<E> consumer) throws E {
-		consumer.accept(this);
-	}
-
-	@Override
-	public void audit(String message) {
-		log(new SimpleLogEntry(LogLevel.AUDIT, message));
-	}
-
-	@Override
-	public void audit(String format, Object arg) {
-		audit(String.format(format, arg));
-	}
-
-	@Override
-	public void audit(String format, Object arg1, Object arg2) {
-		audit(String.format(format, arg1, arg2));
-	}
-
-	@Override
-	public void audit(String format, Object... arguments) {
-		audit(String.format(format, arguments));
-	}
-
-	/** Internal wrapper for Eclipse OSGI 3.12 based logs and new log services. */
-	private static class SimpleLogEntry implements LogEntry {
-
-		private final LogLevel level;
-		private final String message;
-		private final Optional<Throwable> execption;
-
-		public SimpleLogEntry(LogLevel level, String message) {
-			this(level, message, Optional.empty());
-		}
-
-		public SimpleLogEntry(LogLevel level, String message, @Nullable Throwable execption) {
-			this(level, message, Optional.ofNullable(execption));
-		}
-
-		private SimpleLogEntry(LogLevel level, String message, Optional<Throwable> execption) {
-			this.level = level;
-			this.message = message;
-			this.execption = execption;
-		}
-
-		@Override
-		public Bundle getBundle() {
-			//Return the spotless framework bundle
-			return InternalPlatform.getDefault().getBundleContext().getBundle();
-		}
-
-		@SuppressWarnings({"rawtypes", "unchecked"})
-		@Override
-		public ServiceReference getServiceReference() {
-			return null;
-		}
-
-		@Override
-		@Deprecated
-		//Backward compatibility with Eclipse OSGI 3.12
-		public int getLevel() {
-			switch (level) {
-			case DEBUG:
-			case TRACE:
-				return SingleSlf4JService.LOG_DEBUG;
-			case AUDIT:
-			case INFO:
-				return SingleSlf4JService.LOG_INFO;
-			case ERROR:
-				return SingleSlf4JService.LOG_ERROR;
-			case WARN:
-				return SingleSlf4JService.LOG_WARNING;
-			}
-			return SingleSlf4JService.LOG_ERROR; //Don't fail here. Just log it as error. This is anyway just for debugging internal problems.
-		}
-
-		@Override
-		public String getMessage() {
-			return message;
-		}
-
-		@Override
-		public Throwable getException() {
-			return execption.orElse(null);
-		}
-
-		@Override
-		public long getTime() {
-			return 0;
-		}
-
-		@Override
-		public String toString() {
-			StringWriter result = new StringWriter();
-			result.write(message);
-			if (execption.isPresent()) {
-				result.write('\n');
-				result.write(execption.get().toString());
-				result.write('\n');
-				execption.get().printStackTrace(new PrintWriter(result));
-			}
-			return result.toString();
-		}
-
-		@Override
-		public LogLevel getLogLevel() {
-			return level;
-		}
-
-		@Override
-		public String getLoggerName() {
-			return this.getClass().getSimpleName();
-		}
-
-		@Override
-		public long getSequence() {
-			return 0;
-		}
-
-		@Override
-		public String getThreadInfo() {
-			return null;
-		}
-
-		@Override
-		public StackTraceElement getLocation() {
-			return null; // Not used by SingleSlf4JService
-		}
-
-	}
-
-	private static LogMethods create(Supplier<Boolean> enabled, Consumer<String> log, BiConsumer<String, Throwable> logException) {
-		return new LogMethods(enabled, log, logException);
-	}
-
-	private static class LogMethods {
-		private final Supplier<Boolean> enabled;
-		private final Consumer<String> log;
-		private final BiConsumer<String, Throwable> logException;
-
-		private LogMethods(Supplier<Boolean> enabled, Consumer<String> log, BiConsumer<String, Throwable> logException) {
-			this.enabled = enabled;
-			this.log = log;
-			this.logException = logException;
-		}
-
-		public boolean isEnabled() {
-			return enabled.get();
-		}
-
-		public void log(String message) {
-			log.accept(message);
-		}
-
-		public void log(String message, @Nullable Throwable exception) {
-			if (null == exception) {
-				log(message);
-			} else {
-				logException.accept(message, exception);
-			}
-		}
-
-	};
-
-}
diff --git a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/service/TemporaryLocation.java b/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/service/TemporaryLocation.java
deleted file mode 100644
index 2999014d23..0000000000
--- a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/service/TemporaryLocation.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright 2016-2021 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.base.service;
-
-import java.io.File;
-import java.io.IOError;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Comparator;
-
-import org.eclipse.osgi.service.datalocation.Location;
-
-/** All files generated at runtime are stored in a temporary location. */
-public class TemporaryLocation implements Location, AutoCloseable {
-	private static final String TEMP_PREFIX = "com_diffplug_spotless_extra_eclipse";
-	private final URL location;
-	private Location parent;
-
-	public TemporaryLocation() {
-		this(null, createTemporaryDirectory());
-	}
-
-	private TemporaryLocation(Location parent, URL defaultValue) {
-		this.location = defaultValue;
-		this.parent = parent;
-	}
-
-	private static URL createTemporaryDirectory() {
-		try {
-			Path location = Files.createTempDirectory(TEMP_PREFIX);
-			return location.toUri().toURL();
-		} catch (IOException e) {
-			throw new IOError(e);
-		}
-	}
-
-	@Override
-	public boolean allowsDefault() {
-		return false;
-	}
-
-	@Override
-	public URL getDefault() {
-		return null;
-	}
-
-	@Override
-	public Location getParentLocation() {
-		return parent;
-	}
-
-	@Override
-	public URL getURL() {
-		return location;
-	}
-
-	@Override
-	public boolean isSet() {
-		return true;
-	}
-
-	@Override
-	public boolean isReadOnly() {
-		return false;
-	}
-
-	@Override
-	@Deprecated
-	public boolean setURL(URL value, boolean lock) throws IllegalStateException {
-		throw new IllegalStateException("URL not modifyable.");
-	}
-
-	@Override
-	public boolean set(URL value, boolean lock) throws IllegalStateException, IOException {
-		throw new IllegalStateException("URL not modifyable.");
-	}
-
-	@Override
-	public boolean set(URL value, boolean lock, String lockFilePath) throws IllegalStateException, IOException {
-		throw new IllegalStateException("URL not modifyable.");
-	}
-
-	@Override
-	public boolean lock() throws IOException {
-		return false; //Lock not supported
-	}
-
-	@Override
-	public void release() {
-		//Lock not supported
-	}
-
-	@Override
-	public boolean isLocked() throws IOException {
-		return false; //Lock not supported
-	}
-
-	@Override
-	public Location createLocation(Location parent, URL defaultValue, boolean readonly) {
-		return new TemporaryLocation(parent, defaultValue);
-	}
-
-	@Override
-	public URL getDataArea(String path) throws IOException {
-		try {
-			Path locationPath = Paths.get(location.toURI());
-			return locationPath.resolve(path).toUri().toURL();
-		} catch (URISyntaxException e) {
-			throw new IOException("Location not correctly formatted.", e);
-		}
-	}
-
-	@Override
-	public void close() throws Exception {
-		try {
-			Path path = Path.of(location.toURI());
-			Files.walk(path)
-					.sorted(Comparator.reverseOrder())
-					.map(Path::toFile)
-					.forEach(File::delete);
-			path.toFile().delete();
-		} catch (IOException e) {
-			//At shutdown everything is just done on best-efforts basis
-		}
-	}
-
-}
diff --git a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/service/package-info.java b/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/service/package-info.java
deleted file mode 100644
index b444c0c76a..0000000000
--- a/_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/service/package-info.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/** Mocking Eclipse Equinox OSGi services. */
-package com.diffplug.spotless.extra.eclipse.base.service;
diff --git a/_ext/eclipse-base/src/main/resources/META-INF/MANIFEST.MF b/_ext/eclipse-base/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index 348dc4c453..0000000000
--- a/_ext/eclipse-base/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: com.diffplug.gradle.spotless.eclipse; singleton:=true
diff --git a/_ext/eclipse-base/src/main/resources/META-INF/services/org.osgi.framework.connect.FrameworkUtilHelper b/_ext/eclipse-base/src/main/resources/META-INF/services/org.osgi.framework.connect.FrameworkUtilHelper
deleted file mode 100644
index 0bd6c29641..0000000000
--- a/_ext/eclipse-base/src/main/resources/META-INF/services/org.osgi.framework.connect.FrameworkUtilHelper
+++ /dev/null
@@ -1 +0,0 @@
-com.diffplug.spotless.extra.eclipse.base.osgi.FrameworkBundleRegistry
\ No newline at end of file
diff --git a/_ext/eclipse-base/src/test/java/com/diffplug/spotless/extra/eclipse/base/SpotlessEclipseFrameworkTest.java b/_ext/eclipse-base/src/test/java/com/diffplug/spotless/extra/eclipse/base/SpotlessEclipseFrameworkTest.java
deleted file mode 100644
index ca76c92ce1..0000000000
--- a/_ext/eclipse-base/src/test/java/com/diffplug/spotless/extra/eclipse/base/SpotlessEclipseFrameworkTest.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
- * Copyright 2016-2021 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.base;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-
-import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.assertj.core.api.AbstractAssert;
-import org.assertj.core.api.ObjectArrayAssert;
-import org.assertj.core.api.StringAssert;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.ILog;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.equinox.log.ExtendedLogReaderService;
-import org.eclipse.equinox.log.ExtendedLogService;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleException;
-import org.osgi.framework.ServiceReference;
-import org.osgi.service.log.LogEntry;
-import org.osgi.service.log.LogLevel;
-import org.osgi.service.log.LogListener;
-import org.slf4j.simple.SimpleLogger;
-
-import com.diffplug.spotless.extra.eclipse.base.service.SingleSlf4JService;
-
-/** Integration tests */
-class SpotlessEclipseFrameworkTest {
-
-	private final static String TEST_LOGGER_NAME = SpotlessEclipseFrameworkTest.class.getSimpleName();
-	private final static String CUSTOM_PREFIX = "prefix\t";
-	private final static String CUSTOM_POSTFIX = "\tpostfix";
-	private final static String TEST_EXCEPTION_MESSAGE = "MY TEST-EXCEPTION";
-	private static Slf4JMesssageListener SLF4J_RECEIVER = null;
-
-	private static boolean TREAT_ERROR_AS_EXCEPTION = false;
-
-	@BeforeAll
-	static void frameworkTestSetup() throws BundleException {
-		//Prepare interception of SLF4J messages to System.out
-		SLF4J_RECEIVER = new Slf4JMesssageListener();
-
-		//Configure SLF4J-Simple
-		System.setProperty(SimpleLogger.LOG_FILE_KEY, "System.out");
-		System.setProperty(SimpleLogger.SHOW_SHORT_LOG_NAME_KEY, "true");
-		System.setProperty(SimpleLogger.DEFAULT_LOG_LEVEL_KEY, "warn");
-
-		//Instantiate default framework + SLF4J logger
-		SpotlessEclipseFramework.setup(new SpotlessEclipseConfig() {
-			@Override
-			public void registerServices(SpotlessEclipseServiceConfig config) {
-				config.applyDefault();
-				config.useSlf4J(TEST_LOGGER_NAME, (s, l) -> {
-					if (TREAT_ERROR_AS_EXCEPTION && (LogLevel.ERROR == l)) {
-						throw new IllegalArgumentException(TEST_EXCEPTION_MESSAGE);
-					}
-					return CUSTOM_PREFIX + s + CUSTOM_POSTFIX;
-				});
-			}
-		});
-	}
-
-	@AfterAll
-	static void deregisterSlf4JReceiver() {
-		SLF4J_RECEIVER.deregister();
-	}
-
-	private EclipseMessageListener eclipseMessageListener;
-
-	@BeforeEach
-	void eclipseReceiverSetup() {
-		ExtendedLogReaderService service = getService(ExtendedLogReaderService.class);
-		eclipseMessageListener = new EclipseMessageListener();
-		service.addLogListener(eclipseMessageListener);
-		SLF4J_RECEIVER.clear();
-	}
-
-	@AfterEach
-	void logReceiverTearDown() {
-		ExtendedLogReaderService service = getService(ExtendedLogReaderService.class);
-		service.removeLogListener(eclipseMessageListener);
-	}
-
-	@Test
-	void testCustomizedLogMessage() {
-		ResourcesPlugin.getPlugin().getLog().log(new Status(IStatus.ERROR, "Some plugin", "Hello World!"));
-		assertSlf4J()
-				.as("Error message logged.").received("Hello World!").contains(TEST_LOGGER_NAME)
-				.as("Customization method has been applied.").contains(CUSTOM_PREFIX, CUSTOM_POSTFIX)
-				.as("Status level has been converted to simple SLF4J level").contains("ERROR");
-		assertEclipse()
-				.as("Warning message received.").received("Hello World!")
-				.as("Customization method is only for SLF4J").doesNotContain(CUSTOM_PREFIX);
-	}
-
-	@Test
-	void testCustomizedLogException() {
-		assertThatExceptionOfType(IllegalArgumentException.class)
-				.isThrownBy(() -> {
-					try {
-						TREAT_ERROR_AS_EXCEPTION = true;
-						ResourcesPlugin.getPlugin().getLog().log(new Status(IStatus.ERROR, "Some plugin", "Hello World!"));
-					} finally {
-						TREAT_ERROR_AS_EXCEPTION = false;
-					}
-				})
-				.withMessage(TEST_EXCEPTION_MESSAGE);
-	}
-
-	@Test
-	void testPluginLog() {
-		List<Integer> logLevels = Arrays.asList(IStatus.CANCEL, IStatus.ERROR, IStatus.INFO, IStatus.OK, IStatus.WARNING);
-		List<Integer> enabledLogLevels = Arrays.asList(IStatus.ERROR, IStatus.WARNING);
-		List<Integer> disabledLogLevels = logLevels.stream().filter(level -> !enabledLogLevels.contains(level)).collect(Collectors.toList());
-		ILog logger = ResourcesPlugin.getPlugin().getLog();
-		logLevels.forEach(logLevel -> logger.log(new Status(logLevel, "Some plugin", logLevel.toString())));
-		assertSlf4J()
-				.as("Messages for all enabled levels are logged.").received(
-						enabledLogLevels.stream().map(i -> i.toString()).collect(Collectors.toList()));
-		assertSlf4J()
-				.as("Messages all disabled levels are not logged.").notReceived(
-						disabledLogLevels.stream().map(i -> i.toString()).collect(Collectors.toList()));
-		assertEclipse()
-				.as("All messages received.").received(
-						logLevels.stream().map(i -> i.toString()).collect(Collectors.toList()));
-	}
-
-	@Test
-	void testLogServiceLevel() {
-		ExtendedLogService service = getService(ExtendedLogService.class);
-		assertThat(service.isErrorEnabled()).as("Error log level is enabled").isTrue();
-		assertThat(service.isWarnEnabled()).as("Warning log level is enabled").isTrue();
-		assertThat(service.isInfoEnabled()).as("Info log level is disabled").isFalse();
-		assertThat(service.isDebugEnabled()).as("Debug log level is disabled").isFalse();
-		assertThat(service.isTraceEnabled()).as("Trace log level is disabled").isFalse();
-	}
-
-	@Test
-	void testLogServiceLog() {
-		ExtendedLogService service = getService(ExtendedLogService.class);
-		service.info("Log Info");
-		service.warn("Log Warn");
-		assertSlf4J().received("Log Warn");
-		assertSlf4J().notReceived("Log Info");
-		assertEclipse().received(Arrays.asList("Log Warn", "Log Info"));
-	}
-
-	@Test
-	@Deprecated
-	void testLogServiceLog_3_12() {
-		ExtendedLogService service = getService(ExtendedLogService.class);
-		service.log(SingleSlf4JService.LOG_INFO, "Log Info");
-		try {
-			throw new IllegalArgumentException(TEST_EXCEPTION_MESSAGE);
-		} catch (Exception e) {
-			service.log(SingleSlf4JService.LOG_WARNING, "Log Warn", e);
-		}
-		assertSlf4J().received(Arrays.asList("Log Warn", TEST_EXCEPTION_MESSAGE));
-		assertSlf4J().notReceived("Log Info");
-		assertEclipse().received(Arrays.asList("Log Warn", TEST_EXCEPTION_MESSAGE, "Log Info"));
-	}
-
-	private static <T> T getService(Class<T> serviceClass) {
-		ResourcesPlugin plugin = ResourcesPlugin.getPlugin();
-		assertThat(plugin).as("ResourcesPlugin instantiated as part of framework defaults").isNotNull();
-		Bundle bundle = plugin.getBundle();
-		assertThat(bundle).as("ResourcesPlugin has been started.").isNotNull();
-		BundleContext context = bundle.getBundleContext();
-		assertThat(context).as("ResourcesPlugin has been started.").isNotNull();
-		ServiceReference<T> reference = context.getServiceReference(serviceClass);
-		assertThat(reference).as(serviceClass.getSimpleName() + " has been registered.").isNotNull();
-		T service = context.getService(reference);
-		assertThat(service).as(serviceClass.getSimpleName() + " can be resolved.").isNotNull();
-		return service;
-	}
-
-	private static interface IMessageListener {
-		Collection<String> getMessages();
-	}
-
-	private static class EclipseMessageListener implements LogListener, IMessageListener {
-
-		private final List<String> messages;
-
-		public EclipseMessageListener() {
-			messages = new ArrayList<String>();
-		}
-
-		@Override
-		public Collection<String> getMessages() {
-			return Collections.unmodifiableList(messages);
-		}
-
-		@Override
-		public void logged(LogEntry entry) {
-			messages.add(entry.getMessage());
-			if (null != entry.getException()) {
-				messages.add(entry.getException().getMessage());
-			}
-		}
-	}
-
-	private final static class Slf4JMesssageListener extends PrintStream implements IMessageListener {
-
-		private final List<String> messages;
-		private final PrintStream originalStream;
-
-		public Slf4JMesssageListener() {
-			super(System.out);
-			messages = new ArrayList<String>();
-			originalStream = System.out;
-			System.setOut(this);
-		}
-
-		@Override
-		public void println(String x) {
-			if (x.contains(TEST_LOGGER_NAME)) {
-				messages.add(x);
-			} else {
-				super.println(x);
-			}
-		}
-
-		@Override
-		public void println(Object x) {
-			if (x instanceof Exception) {
-				Exception e = (Exception) x;
-				if (TEST_EXCEPTION_MESSAGE == e.getMessage()) {
-					messages.add(TEST_EXCEPTION_MESSAGE);
-				}
-			}
-			super.println(x);
-		}
-
-		public void deregister() {
-			System.setOut(originalStream);
-		}
-
-		public void clear() {
-			messages.clear();
-		}
-
-		@Override
-		public Collection<String> getMessages() {
-			return Collections.unmodifiableList(messages);
-		}
-	}
-
-	private static class MessageListenerAssert<T extends IMessageListener> extends AbstractAssert<MessageListenerAssert<T>, T> {
-
-		public MessageListenerAssert(T actual) {
-			super(actual, MessageListenerAssert.class);
-		}
-
-		public ObjectArrayAssert<String> received(Collection<String> unformattedMessages) {
-			List<String> formattedMessages = unformattedMessages.stream()
-					.map(unformattedMessage -> getReceivedMessage(unformattedMessage, false))
-					.collect(Collectors.toList());
-			return new ObjectArrayAssert<String>(formattedMessages.toArray(new String[0]));
-		}
-
-		public StringAssert received(String unformattedMessage) {
-			return new StringAssert(getReceivedMessage(unformattedMessage, false));
-		}
-
-		public MessageListenerAssert<T> notReceived(String unformattedMessage) {
-			getReceivedMessage(unformattedMessage, true);
-			return this;
-		}
-
-		public MessageListenerAssert<T> notReceived(Collection<String> unformattedMessages) {
-			unformattedMessages.forEach(unformattedMessage -> getReceivedMessage(unformattedMessage, true));
-			return this;
-		}
-
-		private String getReceivedMessage(String unformattedMessage, boolean negate) {
-			isNotNull();
-			String receivedMessage = null;
-			for (String formattedMessage : actual.getMessages()) {
-				if (formattedMessage.contains(unformattedMessage)) {
-					receivedMessage = formattedMessage;
-					break;
-				}
-			}
-			if ((!negate) && (null == receivedMessage)) {
-				failWithMessage("Message <%s> not received.", unformattedMessage);
-			}
-			if (negate && (null != receivedMessage)) {
-				failWithMessage("Message <%s> has been received. Formatted message is: %s", unformattedMessage, receivedMessage);
-			}
-			return receivedMessage;
-		}
-
-	}
-
-	private static MessageListenerAssert<Slf4JMesssageListener> assertSlf4J() {
-		return new MessageListenerAssert<Slf4JMesssageListener>(SLF4J_RECEIVER).as("SLF4J");
-	}
-
-	private MessageListenerAssert<EclipseMessageListener> assertEclipse() {
-		return new MessageListenerAssert<EclipseMessageListener>(eclipseMessageListener).as("Eclipse");
-	}
-}
diff --git a/_ext/eclipse-base/src/test/java/com/diffplug/spotless/extra/eclipse/base/osgi/BundleSetTest.java b/_ext/eclipse-base/src/test/java/com/diffplug/spotless/extra/eclipse/base/osgi/BundleSetTest.java
deleted file mode 100644
index 9c5c97ddb8..0000000000
--- a/_ext/eclipse-base/src/test/java/com/diffplug/spotless/extra/eclipse/base/osgi/BundleSetTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright 2016-2021 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.base.osgi;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.util.Arrays;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-
-class BundleSetTest {
-
-	BundleSet instance;
-
-	@BeforeEach
-	void initialize() {
-		instance = new BundleSet();
-	}
-
-	@Test
-	void testAddGet() throws BundleException {
-		Bundle testBundle1 = new TestBundle(1, "a");
-		Bundle testBundle2 = new TestBundle(2, "b");
-		instance.add(testBundle1);
-		instance.add(testBundle2);
-		assertEquals(testBundle1, instance.get(1), "Get by ID 1");
-		assertEquals(testBundle2, instance.get(2), "Get by ID 2");
-		assertEquals(testBundle1, instance.get("a"), "Get by symbolic name 'a'");
-		assertEquals(testBundle2, instance.get("b"), "Get by symbolic name 'b'");
-		assertTrue(instance.getAll().containsAll(Arrays.asList(testBundle1, testBundle2)), "Contains all");
-	}
-
-	@Test
-	void testSameSymbolicName() throws BundleException {
-		final String symbolicName = "sym.a";
-		final long id1 = 12345;
-		final long id2 = 23456;
-		Bundle testBundle1 = new TestBundle(id1, symbolicName);
-		Bundle testBundle2 = new TestBundle(id2, symbolicName);
-		instance.add(testBundle1);
-		BundleException e = assertThrows(BundleException.class, () -> instance.add(testBundle2));
-		assertThat(e.getMessage()).as("BundleException does not contain symbolic name.").contains(symbolicName);
-		assertThat(e.getMessage()).as("BundleException does not contain ID of exisiting bundle.").contains(Long.toString(id1));
-		assertThat(e.getMessage()).as("BundleException does not contain ID of new bundle.").contains(Long.toString(id2));
-	}
-
-	@Test
-	void testSameID() throws BundleException {
-		final String symbolicName1 = "sym.a";
-		final String symbolicName2 = "sym.b";
-		final long id = 12345;
-		Bundle testBundle1 = new TestBundle(id, symbolicName1);
-		Bundle testBundle2 = new TestBundle(id, symbolicName2);
-		instance.add(testBundle1);
-		BundleException e = assertThrows(BundleException.class, () -> instance.add(testBundle2));
-		assertThat(e.getMessage()).as("BundleException does not contain ID.").contains(Long.toString(id));
-		assertThat(e.getMessage()).as("BundleException does not contain symbolic name of exisiting bundle.").contains(symbolicName1);
-		assertThat(e.getMessage()).as("BundleException does not contain symbolic name of new bundle.").contains(symbolicName2);
-	}
-
-}
diff --git a/_ext/eclipse-base/src/test/java/com/diffplug/spotless/extra/eclipse/base/osgi/ServiceCollectionTest.java b/_ext/eclipse-base/src/test/java/com/diffplug/spotless/extra/eclipse/base/osgi/ServiceCollectionTest.java
deleted file mode 100644
index 05f18c475c..0000000000
--- a/_ext/eclipse-base/src/test/java/com/diffplug/spotless/extra/eclipse/base/osgi/ServiceCollectionTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright 2016-2021 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.base.osgi;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.util.HashMap;
-
-import org.assertj.core.api.AbstractAssert;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.ServiceException;
-import org.osgi.framework.ServiceReference;
-
-class ServiceCollectionTest {
-
-	ServiceCollection instance;
-
-	@BeforeEach
-	void initialize() {
-		Bundle systemBundle = new TestBundle(0, "test.system");
-		instance = new ServiceCollection(systemBundle, new HashMap<String, String>());
-	}
-
-	@Test
-	void testAddGet() {
-		Service1 service1 = new Service1();
-		Service2 service2 = new Service2();
-		instance.add(Interf1.class, service1);
-		instance.add(Interf2a.class, service2);
-		instance.add(Interf2b.class, service2);
-		assertFor(instance).getServiceForReferences(Interf1.class).matchesService(service1);
-		assertFor(instance).getServiceForReferences(Interf2a.class).matchesService(service2);
-		assertFor(instance).getServiceForReferences(Interf2b.class).matchesService(service2);
-	}
-
-	@Test
-	void testMultipleServicesPerInterface() {
-		Service1 serviceX = new Service1();
-		Service1 serviceY = new Service1();
-		instance.add(Interf1.class, serviceX);
-		ServiceException e = assertThrows(ServiceException.class, () -> instance.add(Interf1.class, serviceY));
-		assertThat(e.getMessage()).as("ServiceException does not contain interface class name.").contains(Interf1.class.getName());
-	}
-
-	private static class ServiceReferenceAssert extends AbstractAssert<ServiceReferenceAssert, ServiceCollection> {
-
-		private final ServiceCollection actual;
-		private final ServiceReference<?> reference;
-
-		public ServiceReferenceAssert(ServiceCollection actual) {
-			this(actual, null);
-		}
-
-		public ServiceReferenceAssert(ServiceCollection actual, ServiceReference<?> reference) {
-			super(actual, ServiceReferenceAssert.class);
-			this.reference = reference;
-			this.actual = actual;
-
-		}
-
-		ServiceReferenceAssert getServiceForReferences(Class<?> interfaceClass) {
-			ServiceReference<?>[] references = actual.getReferences(interfaceClass.getName());
-			int numberOfFoundReferences = null == references ? 0 : references.length;
-			if (numberOfFoundReferences != 1) {
-				failWithMessage("Expected to find exactly 1 reference for <%s> , but found %d.", interfaceClass.getName(), numberOfFoundReferences);
-			}
-			return new ServiceReferenceAssert(actual, references[0]);
-		}
-
-		ServiceReferenceAssert matchesService(Object expected) {
-			if (null == reference) {
-				failWithMessage("No reference requested.");
-			}
-			Object serviceForRef = actual.getService(reference);
-			if (null == serviceForRef) {
-				failWithMessage("No service provided for reference.");
-			}
-			if (!serviceForRef.equals(expected)) {
-				failWithMessage("Unexpected service found.");
-			}
-
-			return this;
-		}
-	}
-
-	private static ServiceReferenceAssert assertFor(ServiceCollection actual) {
-		return new ServiceReferenceAssert(actual);
-	}
-
-	private static interface Interf1 {};
-
-	private static interface Interf2a {};
-
-	private static interface Interf2b {};
-
-	private static class Service1 implements Interf1 {};
-
-	private static class Service2 implements Interf2a, Interf2b {};
-}
diff --git a/_ext/eclipse-base/src/test/java/com/diffplug/spotless/extra/eclipse/base/osgi/TestBundle.java b/_ext/eclipse-base/src/test/java/com/diffplug/spotless/extra/eclipse/base/osgi/TestBundle.java
deleted file mode 100644
index 177442101d..0000000000
--- a/_ext/eclipse-base/src/test/java/com/diffplug/spotless/extra/eclipse/base/osgi/TestBundle.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.base.osgi;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.security.cert.X509Certificate;
-import java.util.Dictionary;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Map;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-import org.osgi.framework.Version;
-
-/** Helper for testing */
-public class TestBundle implements StaticBundle, TemporaryBundle {
-	private final String symbolicName;
-	private final long id;
-
-	public TestBundle(long id, String symbolicName) {
-		this.id = id;
-		this.symbolicName = symbolicName;
-	}
-
-	@Override
-	public int getState() {
-		return 0;
-	}
-
-	@Override
-	@Deprecated
-	public Dictionary<String, String> getHeaders() {
-		return null;
-	}
-
-	@Override
-	public long getBundleId() {
-		return id;
-	}
-
-	@Override
-	public ServiceReference<?>[] getRegisteredServices() {
-		return null;
-	}
-
-	@Override
-	public boolean hasPermission(Object permission) {
-		return false;
-	}
-
-	@Override
-	public URL getResource(String name) {
-		return null;
-	}
-
-	@Override
-	@Deprecated
-	public Dictionary<String, String> getHeaders(String locale) {
-		return null;
-	}
-
-	@Override
-	public String getSymbolicName() {
-		return symbolicName;
-	}
-
-	@Override
-	public Class<?> loadClass(String name) throws ClassNotFoundException {
-		return null;
-	}
-
-	@Override
-	public Enumeration<URL> getResources(String name) throws IOException {
-		return null;
-	}
-
-	@Override
-	public Enumeration<String> getEntryPaths(String path) {
-		return null;
-	}
-
-	@Override
-	public URL getEntry(String path) {
-		return null;
-	}
-
-	@Override
-	@Deprecated
-	public Enumeration<URL> findEntries(String path, String filePattern, boolean recurse) {
-		return null;
-	}
-
-	@Override
-	public BundleContext getBundleContext() {
-		return null;
-	}
-
-	@Override
-	public Map<X509Certificate, List<X509Certificate>> getSignerCertificates(int signersType) {
-		return null;
-	}
-
-	@Override
-	public Version getVersion() {
-		return null;
-	}
-
-	@Override
-	public <A> A adapt(Class<A> type) {
-		return null;
-	}
-
-	@Override
-	public File getDataFile(String filename) {
-		return null;
-	}
-
-	@Override
-	public int compareTo(Bundle o) {
-		return 0;
-	}
-
-}
diff --git a/_ext/eclipse-wtp/CHANGES.md b/_ext/eclipse-wtp/CHANGES.md
deleted file mode 100644
index d57618ad8c..0000000000
--- a/_ext/eclipse-wtp/CHANGES.md
+++ /dev/null
@@ -1,76 +0,0 @@
-# spotless-eclipse-wtp
-
-We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.15.1`).
-
-## [Unreleased]
-### Fixed
-* Fix typo in Gradle variable names ([#1425](https://github.com/diffplug/spotless/pull/1425))
-
-## [3.23.0] - 2021-09-22
-### Added
-* Switch to Web Tools Platform release 3.23.0 for Eclipse 4.21.
-
-## [3.22.0] - 2021-06-27
-### Added
-* Switch to Web Tools Platform release 3.22.0 for Eclipse 4.20.
-
-## [3.21.0] - 2021-06-07
-### Added
-* Switch to Web Tools Platform release 3.21.0 for Eclipse 4.19. Minimum required Java version changed from 8 to 11.
-
-## [3.20.0] - 2020-12-26
-### Added
-* Switch to Web Tools Platform release 3.20.0 for Eclipse 4.18.
-
-## [3.19.0] - 2020-10-17
-### Added
-* Fixed version number determined by change log.
-
-## [3.18.1] - 2020-10-17
-### Added
-* Switch to Web Tools Platform release 3.19.0 for Eclipse 4.17.
-
-## [3.18.0] - 2020-10-03
-### Added
-* Switch to Web Tools Platform release 3.18.0 for Eclipse 4.16.
-
-## [3.17.0] - 2020-10-03
-### Added
-* Switch to Web Tools Platform release 3.17.0 for Eclipse 4.15.
-
-## [3.16.0] - 2020-09-26
-### Added
-* Switch to Web Tools Platform release 3.16.0 for Eclipse 4.14.
-
-## [3.15.3] - 2020-03-26
-### Fixed
-* Handling of character encodings on OS with non-unicode default file encoding format. CSS, HTML and JSON formatter steps encoded intermediately the input using the default file encoding, which was not lossless if the default file encoding did not support the full unicode character set. ([#545](https://github.com/diffplug/spotless/issues/545)).
-
-## [3.15.2] - 2020-03-04
-### Fixed
-* Racing conditions in WTP formatter configurations. Multiple configurations within the same project are no longer supported. ([#492](https://github.com/diffplug/spotless/pull/492)).
-
-## [3.15.1] - 2019-11-27
-* Bugfix: Fix NPE in EclipseXmlFormatterStepImpl ([#490](https://github.com/diffplug/spotless/pull/490)).
-
-## [3.15.0] - 2019-11-06
-* Switch to Web Tools Platform release 3.15.0 for Eclipse 4.13 ([#480](https://github.com/diffplug/spotless/issues/480)).
-
-## [3.14.0] - 2019-06-24
-* Switch to Web Tools Platform release 3.14.0 for Eclipse 4.12 ([#423](https://github.com/diffplug/spotless/pull/423)).
-
-## [3.10.0] - 2019-03-17
-* Switch to Web Tools Platform release 3.10.0 for Eclipse 4.8 ([#378](https://github.com/diffplug/spotless/pull/378)).
-* Include Eclipse logging allowing formatter warnings/errors to be logged via SLF4J ([#236](https://github.com/diffplug/spotless/issues/236)).
-
-## [3.9.8] - 2019-03-10
-* XML formatter ignores external URIs per default. ([#369](https://github.com/diffplug/spotless/issues/369)). Add `resolveExternalURI=true` property to switch to previous behavior.
-
-## [3.9.7] - 2019-02-25
-* Replaced `http` update-site with `https` ([#360](https://github.com/diffplug/spotless/issues/360)).
-
-## [3.9.6] - 2019-02-11
-* Fixed formatting of JSON arrays ([#344](https://github.com/diffplug/spotless/issues/344)).
-
-## [3.9.5] - 2018-08-08
-* Initial release!
diff --git a/_ext/eclipse-wtp/LICENSE.txt b/_ext/eclipse-wtp/LICENSE.txt
deleted file mode 100644
index 3d967aee74..0000000000
--- a/_ext/eclipse-wtp/LICENSE.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-i) changes to the Program, and
-ii) additions to the Program;
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-b) its license agreement:
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-b) a copy of this Agreement must be included with each copy of the Program.
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
\ No newline at end of file
diff --git a/_ext/eclipse-wtp/README.md b/_ext/eclipse-wtp/README.md
deleted file mode 100644
index 41dd58ff9b..0000000000
--- a/_ext/eclipse-wtp/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# spotless-eclipse-wtp
-
-Eclipse WTP is not available in a form which can be easily consumed by maven or gradle. To fix this, we publish Eclipse's WTP formatters, along with a small amount of glue code, into the `com.diffplug.spotless.extra:spotless-eclipse-wtp` artifact.
-
-To publish a new version, update the `_ext/eclipse-wtp/gradle.properties` appropriately and see [CONTRIBUTING.md](../../CONTRIBUTING.md) how to enable
-`_ext` projects.
-
-## License
-
-Spotless at large is under the Apache 2.0 license, but this jar is under the EPL v1.
diff --git a/_ext/eclipse-wtp/build.gradle b/_ext/eclipse-wtp/build.gradle
deleted file mode 100644
index feacfbf4c1..0000000000
--- a/_ext/eclipse-wtp/build.gradle
+++ /dev/null
@@ -1,126 +0,0 @@
-ext {
-	developers = [
-		fvgh: [ name: 'Frank Vennemeyer', email: 'frankgh@zoho.com' ],
-	]
-
-	p2Repository = "https://download.eclipse.org/webtools/repository/${VER_ECLIPSE_WTP}"
-
-	p2Dependencies = [
-		// XML/HTML Formatter  - Dependencies
-		'org.eclipse.wst.xml.core':'+', // DefaultXMLPartitionFormatter and XMLAssociationProvider
-		'org.eclipse.wst.sse.core':'+', // Structure models
-		'org.eclipse.wst.common.uriresolver':'+', // URI resolver for model queries
-		'org.eclipse.wst.dtd.core':'+', // Support DTD extensions
-
-		// XML Formatter - Dependencies
-		'org.eclipse.wst.xsd.core':'+', // Support XSD extensions
-
-		// JS Formatter - Dependencies
-		'org.eclipse.wst.jsdt.core':'+', // DefaultCodeFormatter and related
-		'org.eclipse.wst.jsdt.ui':'+', // Functionality to format comments
-
-		// JSON Formatter - Dependencies
-		'org.eclipse.wst.json.core':'+', // FormatProcessorJSON and related
-		'org.eclipse.json':'+', // Provides JSON node interfaces
-
-		// CSS Formatter - Dependencies
-		'org.eclipse.wst.css.core':'+', // FormatProcessorCSS and related
-
-		// HTML Formatter - Dependencies
-		'org.eclipse.wst.html.core':'+', // HTMLFormatProcessorImpl and related
-	]
-
-	jarInclude = [
-		'**/*.class',
-		// Take all classes
-		'**/*.properties',
-		// Text resources (for messages, etc)
-		'**/*.rsc',
-		// JSDT requires gramar files
-		'**/*.xml',
-		// Plugin XML and other resources
-		'*.html',
-		// License information about the included JARs,
-		'META-INF/**' // Plugin manifest and addtional information
-	]
-
-	fatJarResourcesMap = [
-		'org.eclipse.wst.common.uriresolver': 'org.eclipse.wst.common.uriresolver.internal.provisional',
-		'org.eclipse.wst.css.core': 'org.eclipse.wst.css.core.internal',
-		'org.eclipse.wst.dtd.core': 'org.eclipse.wst.dtd.core.internal',
-		'org.eclipse.wst.html.core': 'org.eclipse.wst.html.core.internal',
-		'org.eclipse.wst.sse.core': 'org.eclipse.wst.sse.core.internal.encoding.util',
-		'org.eclipse.wst.xml.core': 'org.eclipse.wst.xml.core.internal',
-		'org.eclipse.wst.xsd.core': 'org.eclipse.wst.xsd.core.internal'
-	]
-}
-
-apply from: rootProject.file('_ext/gradle/update-lockfile.gradle')
-apply from: rootProject.file('_ext/gradle/p2-fat-jar-setup.gradle')
-apply from: rootProject.file('gradle/java-publish.gradle')
-
-dependencies {
-	implementation "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLIPSE_BASE}"
-	// Required by most WPT formatters
-	implementation "com.ibm.icu:icu4j:${VER_IBM_ICU}"
-	// The XSD/DTD and other models are defined with EMF.
-	implementation "org.eclipse.emf:org.eclipse.emf.common:${VER_ECLIPSE_EMF}"
-	implementation "org.eclipse.emf:org.eclipse.emf.ecore:${VER_ECLIPSE_EMF}"
-	// Some WPT plugins requires OSGI bundle interfaces (but not effectively used)
-	implementation "org.eclipse.platform:org.eclipse.osgi.services:${VER_ECLIPSE_OSGI_SERVICES}"
-	// Provides document data structure and file buffers for formatters
-	implementation "org.eclipse.platform:org.eclipse.core.filebuffers:${VER_ECLIPSE_FILE_BUFFERS}"
-	// Provides text partitioners for formatters
-	implementation ("org.eclipse.platform:org.eclipse.jface.text:${VER_ECLIPSE_JFACE}") {
-		exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt'
-	}
-	// Some WPT plugins use the EFS for storing temporary worspace data
-	implementation "org.eclipse.platform:org.eclipse.core.filesystem:${VER_ECLIPSE_EFS}"
-	// Required by org.eclipse.wst.xsd.core
-	implementation "org.eclipse.emf:org.eclipse.xsd:${VER_ECLIPSE_XSD}"
-
-	testImplementation("org.slf4j:slf4j-simple:${VER_SLF4J}")
-}
-
-jar {
-	manifest {
-		from 'src/main/resources/META-INF/MANIFEST.MF'
-	}
-}
-
-//////////
-// Test //
-//////////
-sourceSets {
-	// Use JAR file with all resources for Eclipse-WTP integration-tests
-	test.runtimeClasspath = jar.outputs.files + sourceSets.test.output + sourceSets.test.compileClasspath
-}
-
-/*
- * All test classes need to run separately since they all instatiate different setups of the
- * Eclipse framework.
- */
-tasks.withType(Test).configureEach {
-	//Skip default tests, which would run every test case.
-	exclude '**'
-}
-
-//Instead make a separate test task per case
-def testLocation = 'src/test/java'
-fileTree(dir: testLocation).include('**/*Test.java').each { file ->
-	def testFile = file.getName().replace(".java", "")
-	def filePath = file.getAbsolutePath().replace(".java", "**") //Don't ask me why the task is not happy when it gets no asterisk
-	filePath = filePath.substring(filePath.lastIndexOf(testLocation) + testLocation.length() + 1)
-	task "${testFile}"(type: Test) {
-		group = LifecycleBasePlugin.VERIFICATION_GROUP
-		description = "Runs ${testFile} integration test."
-		include "${filePath}"
-		reports {
-			html.destination = new File("$buildDir/reports/${testFile}")
-			junitXml.destination = new File("$buildDir/${testFile}")
-		}
-		//classpath = jar.outputs.files + sourceSets.test.output + sourceSets.test.compileClasspath
-		mustRunAfter tasks.jar
-	}
-	test.dependsOn "${testFile}"
-}
diff --git a/_ext/eclipse-wtp/gradle.properties b/_ext/eclipse-wtp/gradle.properties
deleted file mode 100644
index a341c0fb49..0000000000
--- a/_ext/eclipse-wtp/gradle.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-artifactId=spotless-eclipse-wtp
-description=Eclipse's WTP formatters bundled for Spotless
-
-# Build requirements
-VER_JAVA=11
-
-# Compile
-VER_ECLIPSE_WTP=2021-09
-VER_SPOTLESS_ECLIPSE_BASE=[3.5.0,4.0.0[
-VER_IBM_ICU=[67.1,68[
-VER_ECLIPSE_EMF=[2.22.0,3.0.0[
-VER_ECLIPSE_OSGI_SERVICES=[3.10.0,4.0.0[
-VER_ECLIPSE_FILE_BUFFERS=[3.7.0,4.0.0[
-VER_ECLIPSE_JFACE=[3.18.0,4.0.0[
-VER_ECLIPSE_EFS=[1.9.0,2.0.0[
-VER_ECLIPSE_XSD=[2.18.0,3.0.0[
diff --git a/_ext/eclipse-wtp/spotless.xmlformat.prefs b/_ext/eclipse-wtp/spotless.xmlformat.prefs
deleted file mode 100644
index 3bbd7ecd72..0000000000
--- a/_ext/eclipse-wtp/spotless.xmlformat.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-indentationChar=space
-indentationSize=2
-lineWidth=999
diff --git a/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseCssFormatterStepImpl.java b/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseCssFormatterStepImpl.java
deleted file mode 100644
index fb0e1ffeac..0000000000
--- a/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseCssFormatterStepImpl.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.wtp;
-
-import java.util.Properties;
-
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.cleanup.CleanupProcessorCSS;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceInitializer;
-import org.eclipse.wst.sse.core.internal.cleanup.AbstractStructuredCleanupProcessor;
-
-import com.diffplug.spotless.extra.eclipse.base.SpotlessEclipsePluginConfig;
-import com.diffplug.spotless.extra.eclipse.wtp.sse.CleanupStep;
-import com.diffplug.spotless.extra.eclipse.wtp.sse.PluginPreferences;
-
-/** Formatter step which calls out to the Eclipse CSS cleanup and formatter. */
-public class EclipseCssFormatterStepImpl extends CleanupStep {
-
-	public EclipseCssFormatterStepImpl(Properties properties) throws Exception {
-		super(new CleanupProcessor(), new FrameworkConfig(properties));
-		PluginPreferences.assertNoChanges(CSSCorePlugin.getDefault(), properties);
-	}
-
-	/**
-	 * The FormatProcessorCSS does not allow a strict case formatting.
-	 * Hence additionally the CleanupProcessorCSS is used.
-	 */
-	private static class CleanupProcessor extends CleanupProcessorCSS implements CleanupStep.ProcessorAccessor {
-		@Override
-		public String getTypeId() {
-			return getContentType();
-		}
-
-		@Override
-		public void refreshPreferences() {
-			refreshCleanupPreferences();
-		}
-
-		@Override
-		public AbstractStructuredCleanupProcessor get() {
-			return this;
-		}
-	}
-
-	static class FrameworkConfig extends CleanupStep.FrameworkConfig {
-		private final Properties properties;
-
-		FrameworkConfig(Properties properties) {
-			this.properties = properties;
-		}
-
-		@Override
-		public void activatePlugins(SpotlessEclipsePluginConfig config) {
-			super.activatePlugins(config);
-			activateCssPlugins(config);
-		}
-
-		static void activateCssPlugins(SpotlessEclipsePluginConfig config) {
-			config.add(new CSSCorePlugin());
-		}
-
-		@Override
-		public void customize() {
-			PluginPreferences.configure(CSSCorePlugin.getDefault(), new CSSCorePreferenceInitializer(), properties);
-		}
-	}
-}
diff --git a/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseHtmlFormatterStepImpl.java b/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseHtmlFormatterStepImpl.java
deleted file mode 100644
index 4b7f592c3c..0000000000
--- a/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseHtmlFormatterStepImpl.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.wtp;
-
-import static com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseFramework.LINE_DELIMITER;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Properties;
-
-import org.eclipse.wst.html.core.internal.HTMLCorePlugin;
-import org.eclipse.wst.html.core.internal.cleanup.HTMLCleanupProcessorImpl;
-import org.eclipse.wst.html.core.internal.encoding.HTMLDocumentLoader;
-import org.eclipse.wst.html.core.internal.format.HTMLFormatProcessorImpl;
-import org.eclipse.wst.html.core.internal.preferences.HTMLCorePreferenceInitializer;
-import org.eclipse.wst.html.core.text.IHTMLPartitions;
-import org.eclipse.wst.jsdt.core.JavaScriptCore;
-import org.eclipse.wst.jsdt.core.ToolFactory;
-import org.eclipse.wst.jsdt.core.formatter.CodeFormatter;
-import org.eclipse.wst.sse.core.internal.cleanup.AbstractStructuredCleanupProcessor;
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatProcessor;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-
-import com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseConfig;
-import com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseCoreConfig;
-import com.diffplug.spotless.extra.eclipse.base.SpotlessEclipsePluginConfig;
-import com.diffplug.spotless.extra.eclipse.wtp.html.JsRegionProcessor;
-import com.diffplug.spotless.extra.eclipse.wtp.html.StructuredDocumentProcessor;
-import com.diffplug.spotless.extra.eclipse.wtp.sse.CleanupStep;
-import com.diffplug.spotless.extra.eclipse.wtp.sse.PluginPreferences;
-
-/** Formatter step which calls out to the Eclipse HTML cleanup and formatter. */
-public class EclipseHtmlFormatterStepImpl extends CleanupStep {
-
-	private final String htmlFormatterIndent;
-	private final CodeFormatter jsFormatter;
-
-	public EclipseHtmlFormatterStepImpl(Properties properties) throws Exception {
-		super(new CleanupProcessor(), new FrameworkConfig(properties));
-		PluginPreferences.assertNoChanges(HTMLCorePlugin.getDefault(), properties);
-		htmlFormatterIndent = ((CleanupProcessor) processorAccessor).getIndent();
-		jsFormatter = ToolFactory.createCodeFormatter(JavaScriptCore.getOptions(), ToolFactory.M_FORMAT_EXISTING);
-	}
-
-	@Override
-	public String format(String raw) throws Exception {
-		raw = super.format(raw);
-
-		// Not sure how Eclipse binds the JS formatter to HTML. The formatting is accomplished manually instead.
-		IStructuredDocument document = (IStructuredDocument) new HTMLDocumentLoader().createNewStructuredDocument();
-		document.setPreferredLineDelimiter(LINE_DELIMITER);
-		document.set(raw);
-		StructuredDocumentProcessor<CodeFormatter> jsProcessor = new StructuredDocumentProcessor<CodeFormatter>(
-				document, IHTMLPartitions.SCRIPT, JsRegionProcessor.createFactory(htmlFormatterIndent));
-		jsProcessor.apply(jsFormatter);
-
-		return document.get();
-	}
-
-	/**
-	 * * The WTP {@link HTMLFormatProcessorImpl} does not allow a strict case formatting.
-	 * Hence additionally the {@link HTMLCleanupProcessorImpl} is used.
-	 * <p>
-	 * Note that a preferences like {@code TAG_NAME_CASE} are not used by the
-	 * formatter, though configurable in the formatters preference GUI.
-	 * The user must instead configure for example {@code CLEANUP_TAG_NAME_CASE}
-	 * in the cleanup GUI.
-	 * </p>
-	 */
-	private static class CleanupProcessor extends HTMLCleanupProcessorImpl implements CleanupStep.ProcessorAccessor {
-		private HTMLFormatProcessorImpl processor;
-
-		CleanupProcessor() {
-			processor = new HTMLFormatProcessorImpl();
-		}
-
-		@Override
-		public String getTypeId() {
-			return getContentType();
-		}
-
-		@Override
-		public void refreshPreferences() {
-			refreshCleanupPreferences();
-			processor = new HTMLFormatProcessorImpl(); //Constructor reads new preferences
-			processor.refreshFormatPreferences = false; //Don't refresh when cloning
-		}
-
-		@Override
-		public AbstractStructuredCleanupProcessor get() {
-			return this;
-		}
-
-		@Override
-		protected IStructuredFormatProcessor getFormatProcessor() {
-			return processor;
-		}
-
-		String getIndent() {
-			return processor.getFormatPreferences().getIndent();
-		}
-
-	}
-
-	private static class FrameworkConfig extends CleanupStep.FrameworkConfig {
-		private final List<SpotlessEclipseConfig> dependentConfigs;
-		private final Properties properties;
-
-		public FrameworkConfig(Properties properties) {
-			dependentConfigs = Arrays.asList(
-					new EclipseCssFormatterStepImpl.FrameworkConfig(properties),
-					new EclipseJsFormatterStepImpl.FrameworkConfig(properties),
-					new EclipseXmlFormatterStepImpl.FrameworkConfig(properties));
-			this.properties = properties;
-		}
-
-		@Override
-		public void registerBundles(SpotlessEclipseCoreConfig config) {
-			EclipseJsFormatterStepImpl.FrameworkConfig.registerNonHeadlessBundles(config);
-		}
-
-		@Override
-		public void activatePlugins(SpotlessEclipsePluginConfig config) {
-			super.activatePlugins(config);
-			EclipseCssFormatterStepImpl.FrameworkConfig.activateCssPlugins(config);
-			EclipseJsFormatterStepImpl.FrameworkConfig.activateJsPlugins(config);
-			/*
-			 * The HTML formatter only uses the DOCTYPE/SCHEMA for content model selection.
-			 * Hence no external URIs are required.
-			 */
-			boolean allowExternalURI = false;
-			EclipseXmlFormatterStepImpl.FrameworkConfig.activateXmlPlugins(config, allowExternalURI);
-			config.add(new HTMLCorePlugin());
-		}
-
-		@Override
-		public void customize() {
-			dependentConfigs.stream().forEach(c -> {
-				c.customize();
-			});
-			PluginPreferences.configure(HTMLCorePlugin.getDefault(), new HTMLCorePreferenceInitializer(), properties);
-		}
-
-	}
-
-}
diff --git a/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseJsFormatterStepImpl.java b/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseJsFormatterStepImpl.java
deleted file mode 100644
index c101b1a27a..0000000000
--- a/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseJsFormatterStepImpl.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.wtp;
-
-import static com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseFramework.DefaultBundles.*;
-import static com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseFramework.LINE_DELIMITER;
-
-import java.util.AbstractMap.SimpleEntry;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jface.text.ITypedRegion;
-import org.eclipse.jface.text.TextUtilities;
-import org.eclipse.jface.text.TypedPosition;
-import org.eclipse.jface.text.formatter.FormattingContextProperties;
-import org.eclipse.jface.text.formatter.IFormattingContext;
-import org.eclipse.jface.text.rules.FastPartitioner;
-import org.eclipse.text.edits.MultiTextEdit;
-import org.eclipse.text.edits.TextEdit;
-import org.eclipse.wst.jsdt.core.JavaScriptCore;
-import org.eclipse.wst.jsdt.core.ToolFactory;
-import org.eclipse.wst.jsdt.core.formatter.CodeFormatter;
-import org.eclipse.wst.jsdt.core.formatter.DefaultCodeFormatterConstants;
-import org.eclipse.wst.jsdt.internal.ui.text.FastJavaPartitionScanner;
-import org.eclipse.wst.jsdt.internal.ui.text.comment.CommentFormattingContext;
-import org.eclipse.wst.jsdt.internal.ui.text.comment.CommentFormattingStrategy;
-import org.eclipse.wst.jsdt.ui.text.IJavaScriptPartitions;
-import org.osgi.framework.Bundle;
-
-import com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseConfig;
-import com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseCoreConfig;
-import com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseFramework;
-import com.diffplug.spotless.extra.eclipse.base.SpotlessEclipsePluginConfig;
-import com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseServiceConfig;
-import com.diffplug.spotless.extra.eclipse.wtp.sse.PluginPreferences;
-
-/** Formatter step which calls out to the Eclipse JS formatter. */
-public class EclipseJsFormatterStepImpl {
-
-	private final static String[] COMMENT_TYPES = {
-			IJavaScriptPartitions.JAVA_DOC,
-			IJavaScriptPartitions.JAVA_MULTI_LINE_COMMENT,
-			IJavaScriptPartitions.JAVA_SINGLE_LINE_COMMENT,
-			IJavaScriptPartitions.JAVA_STRING,
-			IJavaScriptPartitions.JAVA_CHARACTER
-	};
-
-	private final static Map<String, String> OPTION_2_COMMENT_TYPE = Collections.unmodifiableMap(Stream.of(
-			new SimpleEntry<>(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_LINE_COMMENT, IJavaScriptPartitions.JAVA_SINGLE_LINE_COMMENT),
-			new SimpleEntry<>(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_BLOCK_COMMENT, IJavaScriptPartitions.JAVA_MULTI_LINE_COMMENT),
-			new SimpleEntry<>(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_JAVADOC_COMMENT, IJavaScriptPartitions.JAVA_DOC)).collect(Collectors.toMap((e) -> e.getKey(), (e) -> e.getValue())));
-
-	private final CodeFormatter formatter;
-	private final Hashtable<?, ?> options;
-	private final Set<String> commentTypesToBeFormatted;
-
-	public EclipseJsFormatterStepImpl(Properties properties) throws Exception {
-		SpotlessEclipseFramework.setup(new FrameworkConfig(properties));
-		PluginPreferences.assertNoChanges(JavaScriptCore.getPlugin(), properties);
-		options = JavaScriptCore.getOptions();
-		commentTypesToBeFormatted = OPTION_2_COMMENT_TYPE.entrySet().stream().filter(x -> DefaultCodeFormatterConstants.TRUE.equals(options.get(x.getKey()))).map(x -> x.getValue()).collect(Collectors.toSet());
-		formatter = ToolFactory.createCodeFormatter(options, ToolFactory.M_FORMAT_EXISTING);
-	}
-
-	/** Formatting JavaScript string */
-	public String format(String raw) throws Exception {
-		raw = formatComments(raw);
-		// The comment formatter messed up the code a little bit (adding some line breaks). Now we format the code.
-		IDocument doc = new Document(raw);
-		TextEdit edit = formatter.format(CodeFormatter.K_JAVASCRIPT_UNIT, raw, 0, raw.length(), 0, LINE_DELIMITER);
-		if (edit == null) {
-			throw new IllegalArgumentException("Invalid JavaScript syntax for formatting.");
-		} else {
-			edit.apply(doc);
-		}
-		return doc.get();
-	}
-
-	/**
-	 * Comment formats like it would be accomplished by the JDTS UI, without setting up the UI.
-	 * @see org.eclipse.wst.jsdt.internal.ui.fix.CommentFormatFix
-	 */
-	private String formatComments(String raw) {
-		Document doc = new Document(raw);
-		IDocumentPartitioner commentPartitioner = new FastPartitioner(new FastJavaPartitionScanner(), COMMENT_TYPES);
-		doc.setDocumentPartitioner(IJavaScriptPartitions.JAVA_PARTITIONING, commentPartitioner);
-		commentPartitioner.connect(doc);
-		CommentFormattingStrategy commentFormatter = new CommentFormattingStrategy();
-		IFormattingContext context = new CommentFormattingContext();
-		context.setProperty(FormattingContextProperties.CONTEXT_PREFERENCES, options);
-		context.setProperty(FormattingContextProperties.CONTEXT_DOCUMENT, Boolean.TRUE);
-		context.setProperty(FormattingContextProperties.CONTEXT_MEDIUM, doc);
-		try {
-			ITypedRegion[] regions = TextUtilities.computePartitioning(doc, IJavaScriptPartitions.JAVA_PARTITIONING, 0, doc.getLength(), false);
-			MultiTextEdit resultEdit = new MultiTextEdit();
-			Arrays.asList(regions).stream().filter(reg -> commentTypesToBeFormatted.contains(reg.getType())).forEach(region -> {
-				TypedPosition typedPosition = new TypedPosition(region.getOffset(), region.getLength(), region.getType());
-				context.setProperty(FormattingContextProperties.CONTEXT_PARTITION, typedPosition);
-				commentFormatter.formatterStarts(context);
-				TextEdit edit = commentFormatter.calculateTextEdit();
-				commentFormatter.formatterStops();
-				if (null != edit && edit.hasChildren()) {
-					resultEdit.addChild(edit);
-				}
-			});
-			resultEdit.apply(doc);
-			return doc.get();
-		} catch (BadLocationException e) {
-			//Silently ignore comment formatting exceptions and return the original string
-			return raw;
-		}
-	}
-
-	static class FrameworkConfig implements SpotlessEclipseConfig {
-		private final Properties properties;
-
-		FrameworkConfig(Properties properties) {
-			this.properties = properties;
-		}
-
-		@Override
-		public void registerServices(SpotlessEclipseServiceConfig config) {
-			config.applyDefault();
-			config.useSlf4J(this.getClass().getPackage().getName());
-		}
-
-		@Override
-		public void registerBundles(SpotlessEclipseCoreConfig config) {
-			registerNonHeadlessBundles(config);
-		}
-
-		static void registerNonHeadlessBundles(SpotlessEclipseCoreConfig config) {
-			//The JS model requires the JDT indexer, hence a headless Eclipse cannot be used.
-			config.add(PLATFORM, Bundle.ACTIVE);
-			config.add(REGISTRY, PREFERENCES, COMMON);
-		}
-
-		@Override
-		public void activatePlugins(SpotlessEclipsePluginConfig config) {
-			config.applyDefault();
-			activateJsPlugins(config);
-		}
-
-		static void activateJsPlugins(SpotlessEclipsePluginConfig config) {
-			// The JS core uses EFS for determination of temporary storage location
-			config.add(org.eclipse.core.filesystem.EFS.class);
-			// The JS core provides the JSDT formatter
-			config.add(new org.eclipse.wst.jsdt.core.JavaScriptCore());
-		}
-
-		@Override
-		@SuppressWarnings("unchecked")
-		public void customize() {
-			PluginPreferences.store(JavaScriptCore.getPlugin(), properties);
-			Hashtable<Object, Object> options = JavaScriptCore.getDefaultOptions();
-			options.putAll(DefaultCodeFormatterConstants.getJSLintConventionsSettings());
-			options.putAll(new HashMap<Object, Object>(properties));
-			JavaScriptCore.setOptions(options);
-		}
-
-	}
-
-}
diff --git a/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseJsonFormatterStepImpl.java b/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseJsonFormatterStepImpl.java
deleted file mode 100644
index 91d8516b24..0000000000
--- a/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseJsonFormatterStepImpl.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.wtp;
-
-import java.io.IOException;
-import java.util.Properties;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.json.core.JSONCorePlugin;
-import org.eclipse.wst.json.core.cleanup.CleanupProcessorJSON;
-import org.eclipse.wst.json.core.format.FormatProcessorJSON;
-import org.eclipse.wst.json.core.internal.preferences.JSONCorePreferenceInitializer;
-import org.eclipse.wst.sse.core.internal.cleanup.AbstractStructuredCleanupProcessor;
-
-import com.diffplug.spotless.extra.eclipse.base.SpotlessEclipsePluginConfig;
-import com.diffplug.spotless.extra.eclipse.wtp.sse.CleanupStep;
-import com.diffplug.spotless.extra.eclipse.wtp.sse.PluginPreferences;
-
-/**
- * Formatter step which calls out to the Eclipse JSON cleanup processor and formatter.
- * Note that the cleanup is escaped, since it has known bugs and is currently not used by Eclipse.
- */
-public class EclipseJsonFormatterStepImpl extends CleanupStep {
-
-	public EclipseJsonFormatterStepImpl(Properties properties) throws Exception {
-		super(new CleanupProcessor(), new FrameworkConfig(properties));
-		PluginPreferences.assertNoChanges(JSONCorePlugin.getDefault(), properties);
-	}
-
-	/**
-	 *  The JSON CleanUp is partly implemented.
-	 *  <p>
-	 *  For example the abstract formatter supports the
-	 *  CASE_PROPERTY_NAME configuration item.
-	 *  However, this seems to be all dead code and there seems
-	 *  to be no way in the latest Eclipse GUI to configure
-	 *  or trigger the clean-up process.
-	 *  </p>
-	 *  <p>
-	 *  Here we just use the CleanupProcessorJSON to reuse the common
-	 *  interface to trigger the formatting.
-	 *  </p>
-	 *  See {@code org.eclipse.wst.json.core.internal.format.AbstractJSONSourceFormatter} for details.
-	 */
-	private static class CleanupProcessor extends CleanupProcessorJSON implements CleanupStep.ProcessorAccessor {
-		private final FormatProcessorJSON formatter;
-
-		CleanupProcessor() {
-			formatter = new FormatProcessorJSON();
-		}
-
-		@Override
-		public String getTypeId() {
-			return getContentType();
-		}
-
-		@Override
-		public AbstractStructuredCleanupProcessor get() {
-			return this;
-		}
-
-		@Override
-		public void refreshPreferences() {
-			refreshCleanupPreferences();
-		}
-
-		@Override
-		public String cleanupContent(String input) throws IOException, CoreException {
-			/*
-			 * The CleanupProcessorJSON.cleanupContent is erroneous and disabled in IDE.
-			 * Hence the clean-up itself is replaced by a format processor.
-			 * The SpotlessJsonCleanup still derives from the CleanupStep base class
-			 * to use the common Spotless WTP configuration.
-			 *
-			 * See Spotless issue #344 for details.
-			 */
-			return formatter.formatContent(input);
-		}
-	}
-
-	private static class FrameworkConfig extends CleanupStep.FrameworkConfig {
-		private final Properties properties;
-
-		FrameworkConfig(Properties properties) {
-			this.properties = properties;
-		}
-
-		@Override
-		public void activatePlugins(SpotlessEclipsePluginConfig config) {
-			super.activatePlugins(config);
-			config.add(new JSONCorePlugin());
-		}
-
-		@Override
-		public void customize() {
-			PluginPreferences.configure(JSONCorePlugin.getDefault(), new JSONCorePreferenceInitializer(), properties);
-		}
-	}
-
-}
diff --git a/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseXmlFormatterStepImpl.java b/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseXmlFormatterStepImpl.java
deleted file mode 100644
index 57fce0d503..0000000000
--- a/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseXmlFormatterStepImpl.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.wtp;
-
-import static com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseFramework.LINE_DELIMITER;
-import static org.eclipse.wst.xml.core.internal.preferences.XMLCorePreferenceNames.*;
-
-import java.util.Properties;
-
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.text.edits.TextEdit;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
-import org.eclipse.wst.dtd.core.internal.DTDCorePlugin;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.catalog.Catalog;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.CMDocumentManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.document.DOMModelImpl;
-import org.eclipse.wst.xml.core.internal.formatter.DefaultXMLPartitionFormatter;
-import org.eclipse.wst.xml.core.internal.formatter.XMLFormattingPreferences;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryAdapterFactoryForXML;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.parser.XMLSourceParser;
-import org.eclipse.wst.xml.core.internal.preferences.XMLCorePreferenceInitializer;
-import org.eclipse.wst.xml.core.internal.text.rules.StructuredTextPartitionerForXML;
-import org.eclipse.wst.xsd.core.internal.XSDCorePlugin;
-import org.eclipse.xsd.util.XSDSchemaBuildingTools;
-
-import com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseConfig;
-import com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseFramework;
-import com.diffplug.spotless.extra.eclipse.base.SpotlessEclipsePluginConfig;
-import com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseServiceConfig;
-import com.diffplug.spotless.extra.eclipse.wtp.sse.PluginPreferences;
-import com.diffplug.spotless.extra.eclipse.wtp.sse.PreventExternalURIResolverExtension;
-
-/** Formatter step which calls out to the Eclipse XML formatter. */
-public class EclipseXmlFormatterStepImpl {
-	private final DefaultXMLPartitionFormatter formatter;
-	private final XMLFormattingPreferences preferences;
-	private final INodeAdapterFactory xmlAdapterFactory;
-
-	public EclipseXmlFormatterStepImpl(Properties properties) throws Exception {
-		SpotlessEclipseFramework.setup(new FrameworkConfig(properties));
-		PluginPreferences.assertNoChanges(XMLCorePlugin.getDefault(), properties);
-		preferences = new XMLFormattingPreferences();
-		formatter = new DefaultXMLPartitionFormatter();
-		//The adapter factory maintains the common CMDocumentCache
-		xmlAdapterFactory = new ModelQueryAdapterFactoryForXML();
-	}
-
-	static class FrameworkConfig implements SpotlessEclipseConfig {
-		private final Properties properties;
-
-		FrameworkConfig(Properties properties) {
-			/*
-			 * The cache is only used for system catalogs, but not for user catalogs.
-			 * It requires the SSECorePLugin, which has either a big performance overhead,
-			 * or needs a dirty mocking (we don't really require its functions but it needs to be there).
-			 * So we disable the cache for now.
-			 * This might cause a performance drop in case for example XSDs are formatted.
-			 * But these standard/system restriction files contain anyway no formatting rules.
-			 * So in case of performance inconveniences, we could add a Spotless property to disable the
-			 * XSD/DTD parsing entirely (for example by adding an own URI resolver).
-			 */
-			properties.setProperty(CMDOCUMENT_GLOBAL_CACHE_ENABLED, Boolean.toString(false));
-			this.properties = properties;
-		}
-
-		@Override
-		public void registerServices(SpotlessEclipseServiceConfig config) {
-			config.applyDefault();
-			config.useSlf4J(EclipseXmlFormatterStepImpl.class.getPackage().getName());
-		}
-
-		@Override
-		public void activatePlugins(SpotlessEclipsePluginConfig config) {
-			config.applyDefault();
-			activateXmlPlugins(config, PluginPreferences.isExternalUriAllowed(properties));
-		}
-
-		static void activateXmlPlugins(SpotlessEclipsePluginConfig config, boolean allowExternalURI) {
-			//The WST XML formatter
-			config.add(new XMLCorePlugin());
-			//XSDs/DTDs must be resolved by URI
-			config.add(new URIResolverPlugin());
-			//Support formatting based on DTD restrictions
-			config.add(new DTDCorePlugin());
-			//Support formatting based on XSD restrictions
-			config.add(new XSDCorePlugin());
-			if (!allowExternalURI) {
-				config.add(new PreventExternalURIResolverExtension());
-			}
-		}
-
-		@Override
-		public void customize() {
-			//Register required EMF factories
-			XSDSchemaBuildingTools.getXSDFactory();
-			PluginPreferences.configure(XMLCorePlugin.getDefault(), new XMLCorePreferenceInitializer(), properties);
-			PluginPreferences.configureCatalog(properties, (Catalog) XMLCorePlugin.getDefault().getDefaultXMLCatalog());
-		}
-
-	};
-
-	/** Formatting XML string resolving URIs according its base location  */
-	public String format(String raw, String baseLocation) throws Exception {
-		IStructuredDocument document = new BasicStructuredDocument(new XMLSourceParser());
-		document.setPreferredLineDelimiter(LINE_DELIMITER);
-		IDocumentPartitioner partitioner = new StructuredTextPartitionerForXML();
-		document.setDocumentPartitioner(new StructuredTextPartitionerForXML());
-		partitioner.connect(document);
-		document.set(raw);
-		DOMModelImpl xmlDOM = new DOMModelImpl();
-		xmlDOM.setBaseLocation(baseLocation);
-		xmlDOM.getFactoryRegistry().addFactory(xmlAdapterFactory);
-		xmlDOM.setStructuredDocument(document);
-		ModelQuery modelQuery = ModelQueryUtil.getModelQuery(xmlDOM);
-		modelQuery.getCMDocumentManager().setPropertyEnabled(CMDocumentManager.PROPERTY_USE_CACHED_RESOLVED_URI, true);
-		TextEdit formatterChanges = formatter.format(xmlDOM, 0, document.getLength(), preferences);
-		formatterChanges.apply(document);
-		return document.get();
-	}
-
-}
diff --git a/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/html/JsRegionProcessor.java b/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/html/JsRegionProcessor.java
deleted file mode 100644
index d856335c1b..0000000000
--- a/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/html/JsRegionProcessor.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.wtp.html;
-
-import static com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseFramework.LINE_DELIMITER;
-
-import java.util.function.BiFunction;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.ITypedRegion;
-import org.eclipse.text.edits.MalformedTreeException;
-import org.eclipse.text.edits.MultiTextEdit;
-import org.eclipse.text.edits.TextEdit;
-import org.eclipse.wst.jsdt.core.formatter.CodeFormatter;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-
-import com.diffplug.spotless.extra.eclipse.wtp.html.StructuredDocumentProcessor.RegionProcessor;
-
-/**
- * Provides additional formating to the plain JS {@link CodeFormatter}:
- * <ul>
- *  <li> Eclipse HTML places the embedded JS in separated lines by adding a line break after/before &lt;script/&gt; tag. </li>
- *  <li> Eclipse HTML treats the text before the closing &lt;/script&gt; tag as part of the script region.</li>
- * </ul>
- * <p>
- * Note that the closing tag is indented by Eclipse using the embedded formatters indentation,
- * whereas the opening tag indentation is configured by the HTML preferences.
- * This is more a bug than a feature, but Spotless formatter output shall be identical
- * to the one of Eclipse.
- * </p>
- */
-public class JsRegionProcessor extends RegionProcessor<CodeFormatter> {
-	public JsRegionProcessor(IStructuredDocument document, ITypedRegion scriptRegion, String htmlIndent) {
-		super(document, scriptRegion, htmlIndent);
-	}
-
-	@Override
-	protected void applyFirst(CodeFormatter formatter) throws MalformedTreeException, BadLocationException {
-		MultiTextEdit modifications = new MultiTextEdit();
-		String jsSource = document.get(region.getOffset(), region.getLength());
-		TextEdit jsEdit = formatter.format(CodeFormatter.K_JAVASCRIPT_UNIT, jsSource, 0, jsSource.length(), indentationLevel + 1, LINE_DELIMITER);
-		if (null != jsEdit) {
-			jsEdit.moveTree(region.getOffset());
-			modifications.addChild(jsEdit);
-		}
-		modifications.apply(document);
-	}
-
-	@Override
-	protected void applySecond(CodeFormatter formatter) throws MalformedTreeException, BadLocationException {
-		MultiTextEdit modifications = new MultiTextEdit();
-		int regionEnd = region.getOffset() + region.getLength();
-		regionEnd += fixDelimiter(modifications, region.getOffset(), false);
-		regionEnd += fixDelimiter(modifications, region.getOffset() + region.getLength() - 1, true);
-		modifications.apply(document);
-		modifications.removeChildren();
-		fixTagIndent(modifications, regionEnd, formatter.createIndentationString(indentationLevel));
-		modifications.apply(document);
-	}
-
-	/** Factory for {@link StructuredDocumentProcessor}*/
-	public static BiFunction<IStructuredDocument, ITypedRegion, JsRegionProcessor> createFactory(String htmlIndent) {
-		return new BiFunction<IStructuredDocument, ITypedRegion, JsRegionProcessor>() {
-
-			@Override
-			public JsRegionProcessor apply(IStructuredDocument document, ITypedRegion region) {
-				return new JsRegionProcessor(document, region, htmlIndent);
-			}
-
-		};
-	}
-
-}
diff --git a/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/html/StructuredDocumentProcessor.java b/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/html/StructuredDocumentProcessor.java
deleted file mode 100644
index 6adc258c78..0000000000
--- a/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/html/StructuredDocumentProcessor.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.wtp.html;
-
-import static com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseFramework.LINE_DELIMITER;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.function.BiFunction;
-import java.util.stream.Collectors;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.ITypedRegion;
-import org.eclipse.text.edits.InsertEdit;
-import org.eclipse.text.edits.MalformedTreeException;
-import org.eclipse.text.edits.MultiTextEdit;
-import org.eclipse.text.edits.ReplaceEdit;
-import org.eclipse.text.edits.TextEdit;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-
-/**
- * The HTML formatter uses for different regions of the structured document,
- * other formatters, explicitly for CSS and JS.
- * Adaptations of the current formatter modifications are tedious,
- * since the adaptations e.g. overlap with the required additional modifications.
- * Hence the modifications is split in steps, whereas the regions of the
- * structured documents and their offsets are regenerate between the first
- * ad second step.
- */
-public class StructuredDocumentProcessor<T> {
-	private final String type;
-	private final BiFunction<IStructuredDocument, ITypedRegion, ? extends RegionProcessor<T>> factory;
-	private final IStructuredDocument document;
-	private final int numberOfRegions;
-
-	/**
-	 * Constructs a document processor
-	 * @param document Document to be processed
-	 * @param type Document type ID recognized by {@code IContentTypeManager} service
-	 * @param factory Factory for structured document processor
-	 */
-	public StructuredDocumentProcessor(IStructuredDocument document, String type,
-			BiFunction<IStructuredDocument, ITypedRegion, ? extends RegionProcessor<T>> factory) {
-		this.type = type;
-		this.factory = factory;
-		this.document = document;
-		numberOfRegions = getRegions().size();
-	}
-
-	/** Applies processor on document, using a given formatter */
-	public void apply(T formatter) {
-		for (int currentRegionId = 0; currentRegionId < numberOfRegions; currentRegionId++) {
-			applyOnRegion(currentRegionId, formatter);
-		}
-	}
-
-	private List<ITypedRegion> getRegions() {
-		try {
-			return Arrays.asList(document.computePartitioning(0, document.getLength())).stream().filter(reg -> type == reg.getType()).collect(Collectors.toList());
-		} catch (BadLocationException e) {
-			/*
-			 * This prevents the processing in case the entire document
-			 * cannot be processed (e.g. the document is incomplete).
-			 */
-			return new ArrayList<ITypedRegion>(0);
-		}
-	}
-
-	private void applyOnRegion(int number, T formatter) {
-		RegionProcessor<T> adapter = getRegionProcessor(number);
-		try {
-			adapter.applyFirst(formatter);
-			adapter = getRegionProcessor(number);
-			adapter.applySecond(formatter);
-		} catch (MalformedTreeException | BadLocationException e) {
-			throw new IllegalArgumentException(
-					String.format("%s formatting failed between lines %d and %d. Most likely the syntax is not recognized.",
-							type, adapter.getFirstLine(), adapter.getLastLine()),
-					e);
-		}
-	}
-
-	private RegionProcessor<T> getRegionProcessor(int number) {
-		List<ITypedRegion> regions = getRegions();
-		if (numberOfRegions != regions.size()) {
-			//Don't catch this. This is a severe internal bug!
-			throw new IllegalArgumentException(
-					String.format(
-							"During first '%s' formatting step, the number of detected regions changed from '%d' to '%d'",
-							type, numberOfRegions, regions.size()));
-		}
-		ITypedRegion region = regions.get(number);
-		return factory.apply(document, region);
-	}
-
-	/** Base class for region adaptations. */
-	public static abstract class RegionProcessor<T> {
-		protected final IStructuredDocument document;
-		protected final ITypedRegion region;
-		protected final int indentationLevel;
-		protected final int firstLine;
-		protected final int lastLine;
-
-		protected RegionProcessor(IStructuredDocument document, ITypedRegion region, String htmlIndent) {
-			this.document = document;
-			this.region = region;
-			indentationLevel = computeIndent(document, region, htmlIndent);
-			firstLine = document.getLineOfOffset(region.getOffset());
-			lastLine = document.getLineOfOffset(region.getOffset() + region.getLength());
-		}
-
-		public int getFirstLine() {
-			return firstLine;
-		}
-
-		public int getLastLine() {
-			return lastLine;
-		}
-
-		private static int computeIndent(IStructuredDocument document, ITypedRegion region, String htmlIndent) {
-			int indent = 0;
-			try {
-				int lineNumber = document.getLineOfOffset(region.getOffset());
-				document.getNumberOfLines();
-				int lineOffset = document.getLineOffset(lineNumber);
-				String lineStart = document.get(lineOffset, region.getOffset() - lineOffset);
-				while (lineStart.length() > htmlIndent.length()) {
-					if (lineStart.startsWith(htmlIndent)) {
-						indent++;
-					} else {
-						break;
-					}
-					lineStart = lineStart.substring(htmlIndent.length());
-				}
-			} catch (BadLocationException e) {
-				/*
-				 * Skip addition indentation. This normally indicates a malformed HTML
-				 * outside of this region, which cannot be handled here.
-				 */
-				indent = 0;
-			}
-			return indent;
-		}
-
-		/** Add delimiter at or after given offset, if there is none at the offset position. Returns the number of characters inserted. */
-		protected int fixDelimiter(MultiTextEdit modifications, int offset, boolean addAfter) throws BadLocationException {
-			int delimiterLength = LINE_DELIMITER.length();
-			String delimiter = document.get(offset, delimiterLength);
-			if (!LINE_DELIMITER.equals(delimiter)) {
-				if (addAfter) {
-					offset += 1;
-				}
-				modifications.addChild(new InsertEdit(offset, LINE_DELIMITER));
-				return LINE_DELIMITER.length();
-			}
-			return 0;
-		}
-
-		/** Fix the tag indentation at a given position with a predefined indentation. */
-		protected void fixTagIndent(MultiTextEdit modifications, int offset, String indentString) throws BadLocationException {
-			int lineNumber = document.getLineOfOffset(offset);
-			if (lineNumber >= document.getNumberOfLines()) {
-				//Nothing to change for last line. If syntax is correct, there is no indentation. If syntax is not correct, there is nothing to do.
-				return;
-			}
-			int lineStart = document.getLineOffset(lineNumber);
-			int lineEnd = document.getLineOffset(lineNumber + 1);
-			String lineContent = document.get(lineStart, lineEnd - lineStart);
-			StringBuilder currentIndent = new StringBuilder();
-			lineContent.chars().filter(c -> {
-				if (c == ' ' || c == '\t') {
-					currentIndent.append(c);
-					return false;
-				}
-				return true;
-			}).findFirst();
-			if (!indentString.equals(currentIndent.toString())) {
-				TextEdit replaceIndent = new ReplaceEdit(lineStart, currentIndent.length(), indentString);
-				replaceIndent.apply(document);
-			}
-		}
-
-		/** First application of modifications */
-		abstract protected void applyFirst(T formatter) throws MalformedTreeException, BadLocationException;
-
-		/** Second application of modifications (based on new regions) */
-		abstract protected void applySecond(T formatter) throws MalformedTreeException, BadLocationException;
-
-	}
-
-}
diff --git a/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/html/package-info.java b/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/html/package-info.java
deleted file mode 100644
index 770e126a1b..0000000000
--- a/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/html/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/** Eclipse WTP HTML formatter helper */
-@ParametersAreNonnullByDefault
-package com.diffplug.spotless.extra.eclipse.wtp.html;
-
-import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/package-info.java b/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/package-info.java
deleted file mode 100644
index 6cf6f0bfff..0000000000
--- a/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/** Eclipse WTP based Spotless formatters */
-@ParametersAreNonnullByDefault
-package com.diffplug.spotless.extra.eclipse.wtp;
-
-import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/sse/CleanupStep.java b/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/sse/CleanupStep.java
deleted file mode 100644
index 01be583bd8..0000000000
--- a/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/sse/CleanupStep.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.wtp.sse;
-
-import org.eclipse.core.internal.preferences.PreferencesService;
-import org.eclipse.core.runtime.content.IContentTypeManager;
-import org.eclipse.core.runtime.preferences.IPreferencesService;
-import org.eclipse.wst.sse.core.internal.cleanup.AbstractStructuredCleanupProcessor;
-
-import com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseConfig;
-import com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseFramework;
-import com.diffplug.spotless.extra.eclipse.base.SpotlessEclipsePluginConfig;
-import com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseServiceConfig;
-
-/**
- * Common base class for step implementations based on an SSE cleanup processor.
- * <p>
- * Some WTP formatters do not apply all formatting within a formatter process,
- * but provide a cleanup and a formatter process, whereas the cleanup process
- * calls the formatter process.
- * </p>
- * <p>
- * Not all cleanup processes provided by WTP are suitable for Spotless formatting.
- * For example the XML cleanup processor focus on syntax and line delimiter
- * corrections. The syntax correction is based on the corresponding XSD/DTD,
- * but it must be assumed by the Spotless formatter that the provided files
- * are valid. It cannot be the purpose of a formatter to correct syntax.
- * A Java formatter should also not attempt to correct compilation errors.
- * A line delimiter correction would furthermore violate the Spotless rule
- * that the strings processed by a Spotless formatter chain must use
- * UNIX style delimiters.
- * </p>
- * @see org.eclipse.wst.sse.core.internal.cleanup.AbstractStructuredCleanupProcessor
- */
-public class CleanupStep {
-
-	/** Make some of the protected SEE AbstractStructuredCleanupProcessor methods public. */
-	public interface ProcessorAccessor {
-
-		/** Configure from Eclipse framework preferences */
-		void refreshPreferences();
-
-		/** Get underlying processor */
-		AbstractStructuredCleanupProcessor get();
-
-		/** Get processor content type */
-		String getTypeId();
-	}
-
-	/** Framework configuration public to all formatters using the Cleanup step */
-	public static abstract class FrameworkConfig implements SpotlessEclipseConfig {
-
-		private String processorContentTypeID;
-
-		protected FrameworkConfig() {
-			processorContentTypeID = "none";
-		}
-
-		void setProcessorTypeID(String contentTypeID) {
-			processorContentTypeID = contentTypeID;
-		}
-
-		@Override
-		public void registerServices(SpotlessEclipseServiceConfig config) {
-			config.disableDebugging();
-			config.hideEnvironment();
-			config.useTemporaryLocations();
-			config.changeSystemLineSeparator();
-			config.useSlf4J(this.getClass().getPackage().getName() + "-" + processorContentTypeID);
-
-			//Assure that all file content processed by this formatter step are associated to this cleanup-step
-			config.add(IContentTypeManager.class, new ContentTypeManager(processorContentTypeID));
-
-			//The preference lookup via the ContentTypeManager, requires a preference service
-			config.add(IPreferencesService.class, PreferencesService.getDefault());
-		}
-
-		@Override
-		public void activatePlugins(SpotlessEclipsePluginConfig config) {
-			config.applyDefault();
-			/*
-			 * The core preferences require do lookup the resources "config/override.properties"
-			 * from the plugin ID.
-			 * The values are never used, nor do we require the complete SSE core plugin to be started.
-			 * Hence we just provide the internal plugin.
-			 */
-			config.add(new org.eclipse.wst.sse.core.internal.encoding.util.CodedResourcePlugin());
-		}
-	}
-
-	protected final ProcessorAccessor processorAccessor;
-
-	protected CleanupStep(ProcessorAccessor processorAccessor, FrameworkConfig config) throws Exception {
-		config.setProcessorTypeID(processorAccessor.getTypeId());
-		SpotlessEclipseFramework.setup(config);
-		this.processorAccessor = processorAccessor;
-		this.processorAccessor.refreshPreferences();
-		/*
-		 *  Don't refresh the preferences every time a clone of the processor is created.
-		 *  All processors shall use the preferences of its parent.
-		 */
-		processorAccessor.get().refreshCleanupPreferences = false;
-	}
-
-	/**
-	 * Calls the cleanup and formatting task of the processor and returns the formatted string.
-	 * @param raw Dirty string
-	 * @return Formatted string
-	 * @throws Exception All exceptions are considered fatal to the build process (Gradle, Maven, ...) and should not be caught.
-	 */
-	public String format(String raw) throws Exception {
-		return processorAccessor.get().cleanupContent(raw);
-	}
-
-}
diff --git a/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/sse/ContentTypeManager.java b/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/sse/ContentTypeManager.java
deleted file mode 100644
index 499a147ae9..0000000000
--- a/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/sse/ContentTypeManager.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.wtp.sse;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.core.runtime.content.IContentTypeSettings;
-import org.eclipse.core.runtime.preferences.IScopeContext;
-import org.eclipse.wst.css.core.internal.provisional.contenttype.ContentTypeIdForCSS;
-import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
-import org.eclipse.wst.json.core.contenttype.ContentTypeIdForJSON;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-
-import com.diffplug.spotless.extra.eclipse.base.service.NoContentTypeSpecificHandling;
-
-/**
-
- * WTP ModelHandlerRegistry uses the content type mamanger clean-up formatters
- * to provide association of content to content type related functionality.
- * <p>
- * Preference lookup per content type is accomplished via the
- * Eclipse PreferencesService, which must be provided in combination with
- * this service.
- * </p>
- * The input byte steam encoding detection is accomplished by the
- * content type manager. Normally the encoding is bount do a document/file.
- * Spotless applies the formatting on strings already decoded.
- * The WTP AbstractStructuredCleanupProcessor provides for non-documents
- * a clean-up function converting the decoded string into an UTF-8 encoded byte stream.
- * WTP AbstractDocumentLoader uses content type mamanger to determine the encoding
- * of the input stream.
- * Only the steps are affected that are using the
- * AbstractStructuredCleanupProcessor. All other steps creating an empty document
- * (e.g. via WTP AbstractDocumentLoader) and setting the textual content of the new document.
- *
- * @see org.eclipse.core.internal.preferences.PreferencesService
- * @see org.eclipse.wst.sse.core.internal.cleanup.AbstractStructuredCleanupProcessor
- * @see org.eclipse.wst.sse.core.internal.document.AbstractDocumentLoader
- * @see org.eclipse.wst.sse.core.internal.modelhandler.ModelHandlerRegistry
- */
-class ContentTypeManager extends NoContentTypeSpecificHandling {
-	private final Map<String, IContentType> id2Object;
-	private final IContentType processorStepType;
-	private final IContentDescription processorStepDescription;
-
-	/**
-	 * Content type manager as required for cleanup steps.
-	 * @param formatterContentTypeID The content type of the formatter step
-	 */
-	ContentTypeManager(String formatterContentTypeID) {
-		id2Object = new HashMap<String, IContentType>();
-		Arrays.asList(
-				ContentTypeIdForCSS.ContentTypeID_CSS,
-				ContentTypeIdForXML.ContentTypeID_XML,
-				ContentTypeIdForHTML.ContentTypeID_HTML,
-				ContentTypeIdForJSON.ContentTypeID_JSON)
-				.stream().forEach(id -> id2Object.put(id, new ContentTypeId(id)));
-		processorStepType = id2Object.get(formatterContentTypeID);
-		if (null == processorStepType) {
-			throw new IllegalArgumentException("The manager does not support content type " + formatterContentTypeID);
-		}
-		processorStepDescription = new StringDescription(processorStepType);
-	}
-
-	@Override
-	public IContentType getContentType(String contentTypeIdentifier) {
-		/*
-		 *  It is OK to return null here since the manager is only used as an additional
-		 *  helper to alter default behavior.
-		 */
-		return id2Object.get(contentTypeIdentifier);
-	}
-
-	@Override
-	public IContentType findContentTypeFor(InputStream contents, String fileName) throws IOException {
-		//We only format things here with the given processor, so this answer is always correct.
-		return processorStepType;
-	}
-
-	@Override
-	public IContentDescription getDescriptionFor(InputStream contents, String fileName, QualifiedName[] options) throws IOException {
-		return processorStepDescription;
-	}
-
-	private static class StringDescription implements IContentDescription {
-
-		private final IContentType type;
-
-		public StringDescription(IContentType type) {
-			this.type = type;
-		}
-
-		@Override
-		public boolean isRequested(QualifiedName key) {
-			return false; //Don't use set Property
-		}
-
-		@Override
-		public String getCharset() {
-			//Called by AbstractDocumentLoader.readInputStream
-			return "UTF-8"; //UTF-8 encoded by AbstractStructuredCleanupProcessor.cleanupContent
-		}
-
-		@Override
-		public IContentType getContentType() {
-			return type;
-		}
-
-		@Override
-		public Object getProperty(QualifiedName key) {
-			return null; //Assume that the property map is empty
-		}
-
-		@Override
-		public void setProperty(QualifiedName key, Object value) {
-			throw new IllegalArgumentException("Content description key cannot be set: " + key);
-		}
-	}
-
-	/**
-	 * The WTP uses the manager mainly for ID mapping, so most of the methods are not used.
-	 * Actually it has a hand stitched way for transforming the content type ID
-	 * {@code org.eclipse.wst...source} to the plugin ID {@code org.eclipse.wst...core}.
-	 * @see org.eclipse.wst.sse.core.internal.encoding.ContentBasedPreferenceGateway
-	 */
-	private static class ContentTypeId implements IContentType {
-
-		private final String id;
-
-		ContentTypeId(String id) {
-			this.id = id;
-		}
-
-		@Override
-		public void addFileSpec(String fileSpec, int type) throws CoreException {}
-
-		@Override
-		public void removeFileSpec(String fileSpec, int type) throws CoreException {}
-
-		@Override
-		public void setDefaultCharset(String userCharset) throws CoreException {}
-
-		@Override
-		public boolean isUserDefined() {
-			return false;
-		}
-
-		@Override
-		public IContentType getBaseType() {
-			return null;
-		}
-
-		@Override
-		public IContentDescription getDefaultDescription() {
-			return null;
-		}
-
-		@Override
-		public IContentDescription getDescriptionFor(InputStream contents, QualifiedName[] options) throws IOException {
-			return null;
-		}
-
-		@Override
-		public IContentDescription getDescriptionFor(Reader contents, QualifiedName[] options) throws IOException {
-			return null;
-		}
-
-		@Override
-		public String getDefaultCharset() {
-			return null;
-		}
-
-		@Override
-		public String[] getFileSpecs(int type) {
-			return null;
-		}
-
-		@Override
-		public String getId() {
-			return id;
-		}
-
-		@Override
-		public String getName() {
-			return id;
-		}
-
-		@Override
-		public boolean isAssociatedWith(String fileName) {
-			return false;
-		}
-
-		@Override
-		public boolean isAssociatedWith(String fileName, IScopeContext context) {
-			return false;
-		}
-
-		@Override
-		public boolean isKindOf(IContentType another) {
-			if (null == another) {
-				return false;
-			}
-			return this.id.equals(another.getId());
-		}
-
-		@Override
-		public IContentTypeSettings getSettings(IScopeContext context) throws CoreException {
-			return null;
-		}
-
-	}
-
-}
diff --git a/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/sse/PluginPreferences.java b/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/sse/PluginPreferences.java
deleted file mode 100644
index 81aa772617..0000000000
--- a/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/sse/PluginPreferences.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.wtp.sse;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Properties;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.core.runtime.preferences.DefaultScope;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.wst.xml.core.internal.catalog.Catalog;
-import org.eclipse.wst.xml.core.internal.catalog.CatalogReader;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-
-/**
- * The plugin preference configuration of most WTP formatters is accomplished via the
- * globabl Eclipse preference lookup.
- * Spotless allows different formatter configurations per sub-projects.
- * Fortunately most formatters only perform a lookup on instantiation and not afterwards.
- * This is sometimes not true for all preferences of the formatter.
- *
- *
- */
-public class PluginPreferences {
-	/**
-	 * Optional XML catalog for XSD/DTD lookup.
-	 * Catalog versions 1.0 and 1.1 are supported.
-	 * <p>
-	 * Value is of type {@code Path}.
-	 * </p>
-	 */
-	public static final String USER_CATALOG = "userCatalog";
-
-	/**
-	 * Indicates if external URIs (location hints) should be resolved
-	 * and the referenced DTD/XSD shall be applied. Per default
-	 * external URIs are ignored.
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 */
-	public static final String RESOLVE_EXTERNAL_URI = "resolveExternalURI";
-
-	/** Storage of latest global configuration */
-	private static final Map<String, Properties> CONFIG = new HashMap<>();
-
-	/** \return True if user explicitly set the  */
-	public static boolean isExternalUriAllowed(Properties properties) {
-		return Boolean.parseBoolean(properties.getProperty(PluginPreferences.RESOLVE_EXTERNAL_URI, "false"));
-	}
-
-	/** Configures persistent Eclipse properties */
-	public static void configure(Plugin plugin, AbstractPreferenceInitializer defaultInitializer, Properties properties) {
-		defaultInitializer.initializeDefaultPreferences();
-		IEclipsePreferences globalPreferences = DefaultScope.INSTANCE.getNode(getPluginId(plugin));
-		properties.forEach((key, value) -> {
-			globalPreferences.put((String) key, (String) value);
-		});
-		store(plugin, properties);
-	}
-
-	/** Stores Eclipse properties for later comparison */
-	public static void store(Plugin plugin, Properties properties) {
-		CONFIG.put(getPluginId(plugin), properties);
-	}
-
-	/** Keep in mind that the ID is e.g. equal for all plugins. So assure that all user properties ge stored. */
-	private static String getPluginId(Plugin plugin) {
-		return plugin.getBundle().getSymbolicName();
-	}
-
-	public static void configureCatalog(final Properties properties, final ICatalog defaultCatalogInterface) {
-		Objects.requireNonNull(properties, "Property values are missing.");
-		Objects.requireNonNull(defaultCatalogInterface, "Default catalog missing.");
-		if (!(defaultCatalogInterface instanceof Catalog)) {
-			throw new IllegalArgumentException("Internal error: Catalog implementation '" + defaultCatalogInterface.getClass().getCanonicalName() + "' unsupported.");
-		}
-		Catalog defaultCatalog = (Catalog) defaultCatalogInterface;
-		String catalogProperty = properties.getProperty(USER_CATALOG, "");
-		if (!catalogProperty.isEmpty()) {
-			final File catalogFile = new File(catalogProperty);
-			try {
-				InputStream inputStream = new FileInputStream(catalogFile);
-				String orgBase = defaultCatalog.getBase();
-				defaultCatalog.setBase(catalogFile.toURI().toString());
-				CatalogReader.read((Catalog) defaultCatalog, inputStream);
-				defaultCatalog.setBase(orgBase);
-			} catch (IOException e) {
-				throw new IllegalArgumentException(
-						String.format("Value of '%s' refers to '%s', which cannot be read.", USER_CATALOG, catalogFile));
-			}
-		} else {
-			defaultCatalog.clear();
-		}
-	}
-
-	/** Throws exception in case configuration has changed */
-	public static void assertNoChanges(Plugin plugin, Properties properties) {
-		Objects.requireNonNull(properties, "Property values are missing.");
-		final String preferenceId = plugin.getBundle().getSymbolicName();
-		Properties originalValues = CONFIG.get(preferenceId);
-		if (null == originalValues) {
-			throw new IllegalArgumentException("No configuration found for " + preferenceId);
-		}
-		if (!originalValues.equals(properties)) {
-			throw new IllegalArgumentException("The Eclipse formatter does not support multiple configurations.");
-		}
-	}
-
-}
diff --git a/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/sse/PreventExternalURIResolverExtension.java b/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/sse/PreventExternalURIResolverExtension.java
deleted file mode 100644
index d0b95e5632..0000000000
--- a/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/sse/PreventExternalURIResolverExtension.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.wtp.sse;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverExtension;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-/**
- * The URI resolver extension
- */
-public class PreventExternalURIResolverExtension implements URIResolverExtension, BundleActivator {
-
-	private static final String REFUSE_EXTERNAL_URI = "file://refused.external.uri";
-
-	/**
-	 * @param file the in-workspace base resource, if one exists
-	 * @param baseLocation - the location of the resource that contains the uri
-	 * @param publicId - an optional public identifier (i.e. namespace name), or null if none
-	 * @param systemId - an absolute or relative URI, or null if none
-	 *
-	 * @return an absolute URI or null if this extension can not resolve this reference
-	 */
-	@Override
-	public String resolve(IFile file, String baseLocation, String publicId, String systemId) {
-		if (null != systemId) {
-			try {
-				URI proposalByPreviousResolver = org.eclipse.emf.common.util.URI.createURI(systemId);
-				String host = proposalByPreviousResolver.host();
-				/*
-				 * The host is empty (not null)
-				 */
-				if (!(null == host || host.isEmpty())) {
-					return REFUSE_EXTERNAL_URI;
-				}
-			} catch (IllegalArgumentException ignore) {
-				//If it is no a valid URI, there is nothing to do here.
-			}
-		}
-		return null; //Don't alter the proposal of previous resolver extensions by proposing something else
-	}
-
-	@Override
-	public void start(BundleContext context) throws Exception {
-		//Nothing to do. The bundle-activator interface only allows to load this extension as a stand-alone plugin.
-	}
-
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		//Nothing to do. The bundle-activator interface only allows to load this extension as a stand-alone plugin.
-	}
-
-}
diff --git a/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/sse/package-info.java b/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/sse/package-info.java
deleted file mode 100644
index 931b7e085e..0000000000
--- a/_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/sse/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/** Eclipse WTP Structured Source Editing (SEE) formatter helper */
-@ParametersAreNonnullByDefault
-package com.diffplug.spotless.extra.eclipse.wtp.sse;
-
-import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/_ext/eclipse-wtp/src/main/resources/META-INF/MANIFEST.MF b/_ext/eclipse-wtp/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index 9f785fea6c..0000000000
--- a/_ext/eclipse-wtp/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: com.diffplug.gradle.spotless.eclipse.wtp; singleton:=true
diff --git a/_ext/eclipse-wtp/src/main/resources/plugin.xml b/_ext/eclipse-wtp/src/main/resources/plugin.xml
deleted file mode 100644
index 7ffd251c94..0000000000
--- a/_ext/eclipse-wtp/src/main/resources/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-  <!-- Prevents resolution of external URIs by redirecting them to invalid external URI. -->
-  <!-- The low priority assures that the org.eclipse.wst.common.uriresolver.internal.ExtensibleURIResolver -->
-  <!-- ask this resolver extension at the end and let it override all previous results. Hence the term -->
-  <!-- "low priority' might be missleading. In fact the result of this extension overrules all other -->
-  <!-- physical resolvers with higher priority. -->
-  <extension point="org.eclipse.wst.common.uriresolver.resolverExtensions">
-    <resolverExtension stage="physical" priority="low" class="com.diffplug.spotless.extra.eclipse.wtp.sse.PreventExternalURIResolverExtension">
-    </resolverExtension>
-  </extension>
-</plugin>
diff --git a/_ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseCssFormatterStepImplTest.java b/_ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseCssFormatterStepImplTest.java
deleted file mode 100644
index 8dda3149c0..0000000000
--- a/_ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseCssFormatterStepImplTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2016-2021 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.wtp;
-
-import static com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseFramework.LINE_DELIMITER;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames.*;
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.util.Properties;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-class EclipseCssFormatterStepImplTest {
-
-	private final static String ILLEGAL_CHAR = Character.toString((char) 254);
-	private final static String UNFORMATTED = " body {a: v; b: v;}\n".replaceAll("\n", LINE_DELIMITER);
-	private final static String FORMATTED = "BODY {\n   a: v;\n   b: v;\n}".replaceAll("\n", LINE_DELIMITER);
-	private final static String PRE_CODE_UNFORMATTED = "/**<pre>\"Hello\"</pre>*/\n".replaceAll("\n", LINE_DELIMITER);
-
-	private EclipseCssFormatterStepImpl formatter;
-
-	@BeforeEach
-	void initialize() throws Exception {
-		/*
-		 * The instantiation can be repeated for each step, but only with the same configuration
-		 * All formatter configuration is stored in
-		 * org.eclipse.core.runtime/.settings/org.eclipse.wst.css.core.prefs.
-		 */
-		Properties properties = new Properties();
-		properties.put(INDENTATION_SIZE, "3");
-		properties.put(INDENTATION_CHAR, SPACE); //Default is TAB
-		properties.put(CLEANUP_CASE_SELECTOR, Integer.toString(UPPER)); //Done by cleanup
-		formatter = new EclipseCssFormatterStepImpl(properties);
-	}
-
-	@Test
-	void format() throws Exception {
-		String output = formatter.format(UNFORMATTED);
-		assertEquals(FORMATTED,
-				output, "Unexpected formatting with default preferences.");
-	}
-
-	@Test
-	void illegalCharacter() throws Exception {
-		String output = formatter.format(ILLEGAL_CHAR + UNFORMATTED);
-		assertThat(output).as("Illeagl characters are not handled on best effort basis.").contains("BODY {");
-	}
-
-	@Test
-	void illegalSyntax() throws Exception {
-		String output = formatter.format("{" + UNFORMATTED);
-		assertEquals("{" + LINE_DELIMITER + FORMATTED,
-				output, "Illeagl syntax is not handled on best effort basis.");
-	}
-
-	@Test
-	void formatComment() throws Exception {
-		String output = formatter.format(PRE_CODE_UNFORMATTED + UNFORMATTED);
-		assertEquals(PRE_CODE_UNFORMATTED + FORMATTED,
-				output, "Unexpected formatting of cpomments.");
-	}
-
-	@Test
-	void configurationChange() throws Exception {
-		assertThrows(IllegalArgumentException.class, () -> new EclipseCssFormatterStepImpl(new Properties()));
-	}
-
-}
diff --git a/_ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseHtmlFormatterStepImplTest.java b/_ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseHtmlFormatterStepImplTest.java
deleted file mode 100644
index b75421692a..0000000000
--- a/_ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseHtmlFormatterStepImplTest.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright 2016-2021 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.wtp;
-
-import static org.eclipse.wst.html.core.internal.preferences.HTMLCorePreferenceNames.*;
-import static org.eclipse.wst.jsdt.core.formatter.DefaultCodeFormatterConstants.*;
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.util.Properties;
-
-import org.eclipse.wst.html.core.internal.preferences.HTMLCorePreferenceNames;
-import org.eclipse.wst.jsdt.core.JavaScriptCore;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-class EclipseHtmlFormatterStepImplTest {
-
-	private TestData testData = null;
-	private EclipseHtmlFormatterStepImpl formatter;
-
-	@BeforeEach
-	void initialize() throws Exception {
-		testData = TestData.getTestDataOnFileSystem("html");
-		/*
-		 * The instantiation can be repeated for each step, but only with the same configuration
-		 * All formatter configuration is stored in
-		 * org.eclipse.core.runtime/.settings/org.eclipse.wst.xml.core.prefs.
-		 * So a simple test of one configuration item change is considered sufficient.
-		 */
-		Properties properties = new Properties();
-		properties.put(CLEANUP_TAG_NAME_CASE, Integer.toString(HTMLCorePreferenceNames.UPPER)); //HTML config
-		properties.put(FORMATTER_INSERT_SPACE_BEFORE_SEMICOLON, JavaScriptCore.INSERT); //JS config
-		properties.put(QUOTE_ATTR_VALUES, "TRUE"); //CSS config
-		formatter = new EclipseHtmlFormatterStepImpl(properties);
-	}
-
-	@Test
-	void formatHtml4() throws Exception {
-		String[] input = testData.input("html4.html");
-		String output = formatter.format(input[0]);
-		assertEquals(testData.expected("html4.html"),
-				output, "Unexpected HTML4 formatting.");
-	}
-
-	@Test
-	void formatHtml5() throws Exception {
-		String[] input = testData.input("html5.html");
-		String output = formatter.format(input[0]);
-		assertEquals(testData.expected("html5.html"),
-				output, "Unexpected HTML5 formatting.");
-	}
-
-	@Test
-	void invalidSyntax() throws Exception {
-		String[] input = testData.input("invalid_syntax.html");
-		String output = formatter.format(input[0]);
-		assertEquals(testData.expected("invalid_syntax.html"),
-				output, "Unexpected HTML formatting in case syntax is not valid.");
-	}
-
-	@Test
-	void formatJavaScript() throws Exception {
-		String[] input = testData.input("javascript.html");
-		String output = formatter.format(input[0]);
-		assertEquals(testData.expected("javascript.html"),
-				output, "Unexpected JS formatting.");
-	}
-
-	@Test
-	void formatCSS() throws Exception {
-		String[] input = testData.input("css.html");
-		String output = formatter.format(input[0]);
-		assertEquals(testData.expected("css.html"),
-				output, "Unexpected CSS formatting.");
-	}
-
-	@Test
-	void checkCleanupForNonUtf8() throws Exception {
-		String osEncoding = System.getProperty("file.encoding");
-		System.setProperty("file.encoding", "ISO-8859-1"); //Simulate a non UTF-8 OS
-		String[] input = testData.input("utf-8.html");
-		String output = formatter.format(input[0]);
-		System.setProperty("file.encoding", osEncoding);
-		assertEquals(testData.expected("utf-8.html"), output, "Unexpected formatting of UTF-8");
-	}
-
-	@Test
-	void checkBOMisStripped() throws Exception {
-		String[] input = testData.input("bom.html");
-		String[] inputWithoutBom = testData.input("utf-8.html");
-		//The UTF-8 BOM is interpreted as on UTF-16 character.
-		assertEquals(input[0].length() - 1, inputWithoutBom[0].length(), "BOM input invalid");
-		String output = formatter.format(input[0]);
-		assertEquals(testData.expected("utf-8.html"), output, "BOM is not stripped");
-	}
-
-	@Test
-	void configurationChange() throws Exception {
-		assertThrows(IllegalArgumentException.class, () -> new EclipseHtmlFormatterStepImpl(new Properties()));
-	}
-}
diff --git a/_ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseJsFormatterStepImplTest.java b/_ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseJsFormatterStepImplTest.java
deleted file mode 100644
index 0858c3a04d..0000000000
--- a/_ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseJsFormatterStepImplTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright 2016-2021 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.wtp;
-
-import static com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseFramework.LINE_DELIMITER;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.util.Arrays;
-import java.util.Properties;
-
-import org.eclipse.wst.jsdt.core.JavaScriptCore;
-import org.eclipse.wst.jsdt.core.formatter.DefaultCodeFormatterConstants;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-class EclipseJsFormatterStepImplTest {
-	private final static String ILLEGAL_CHAR = Character.toString((char) 254);
-	private final static String UNFORMATTED = "var TEST = TEST || {};\n" +
-			"TEST.say = function() {\n" +
-			"  console.log(\"Hello world!\"); }\n".replaceAll("\n", LINE_DELIMITER);
-	private final static String FORMATTED = "var TEST = TEST || {};\n" +
-			"TEST.say = function () {\n" +
-			"\tconsole.log(\"Hello world!\");\n}\n".replaceAll("\n", LINE_DELIMITER);
-	// Single line comment remains untouched
-	private final static String SINGLE_LINE_COMMENT = "//  One line \"hello world\"\n".replaceAll("\n", LINE_DELIMITER);
-	// JavaDoc comment get indentation. Within PPRE code, HTML entities are escaped.
-	private final static String PRE_CODE_UNFORMATTED = "/**<pre>\"Hello\"</pre>*/\n".replaceAll("\n", LINE_DELIMITER);
-	private final static String PRE_CODE_FORMATTED = "/**\n * <pre>\n * &quot;Hello&quot;\n * </pre>\n */\n".replaceAll("\n", LINE_DELIMITER);
-
-	private EclipseJsFormatterStepImpl formatter;
-
-	@BeforeEach
-	void initialize() throws Exception {
-		/*
-		 * The instantiation can be repeated for each step, but only with the same configuration
-		 * All formatter configuration is stored in
-		 * org.eclipse.core.runtime/.settings/org.eclipse.jst.jsdt.core.prefs.
-		 */
-		Properties properties = new Properties();
-		properties.setProperty(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
-		formatter = new EclipseJsFormatterStepImpl(properties);
-	}
-
-	@Test
-	void invalidSyntax() throws Exception {
-		IllegalArgumentException error = assertThrows(IllegalArgumentException.class, () -> formatter.format(UNFORMATTED.replace("()", "")));
-		assertThat(error.getMessage()).as("Exception has no hint about invalid syntax.").contains(Arrays.asList("Invalid", "syntax"));
-	}
-
-	@Test
-	void illegalCharacter() throws Exception {
-		String output = formatter.format(UNFORMATTED.replace("function", "function" + ILLEGAL_CHAR));
-		assertThat(output).as("Illegal ASCII charactes are not treated on best effort basis.").contains("function" + ILLEGAL_CHAR);
-	}
-
-	@Test
-	void nominal() throws Exception {
-		String output = formatter.format(UNFORMATTED);
-		assertEquals(FORMATTED, output, "User configuration ignored by formatter.");
-	}
-
-	@Test
-	void formatComments() throws Exception {
-		String output = formatter.format(SINGLE_LINE_COMMENT + PRE_CODE_UNFORMATTED + UNFORMATTED);
-		assertEquals(SINGLE_LINE_COMMENT + PRE_CODE_FORMATTED + FORMATTED,
-				output, "Invalid user configuration not treated on best effort basis.");
-	}
-
-	@Test
-	void configurationChange() throws Exception {
-		assertThrows(IllegalArgumentException.class, () -> new EclipseJsFormatterStepImpl(new Properties()));
-	}
-
-}
diff --git a/_ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseJsonFormatterStepImplTest.java b/_ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseJsonFormatterStepImplTest.java
deleted file mode 100644
index 3bb3b7c988..0000000000
--- a/_ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseJsonFormatterStepImplTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2016-2021 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.wtp;
-
-import static com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseFramework.LINE_DELIMITER;
-import static org.eclipse.wst.json.core.preferences.JSONCorePreferenceNames.*;
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.util.Properties;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-class EclipseJsonFormatterStepImplTest {
-	private final static String ILLEGAL_CHAR = Character.toString((char) 254);
-	private final static String UNFORMATTED_OBJECT = "{\n \"x\": { \"a\" : \"v\",\"properties\" : \"v\" }}".replaceAll("\n", LINE_DELIMITER);
-	private final static String FORMATTED_OBJECT = "{\n   \"x\": {\n      \"a\": \"v\",\n      \"properties\": \"v\"\n   }\n}".replaceAll("\n", LINE_DELIMITER);
-	private final static String UNFORMATTED_ARRAY = "[\n { \"a\" : \"v\",\"properties\" : \"v\" }]".replaceAll("\n", LINE_DELIMITER);
-	private final static String FORMATTED_ARRAY = "[\n   {\n      \"a\": \"v\",\n      \"properties\": \"v\"\n   }\n]".replaceAll("\n", LINE_DELIMITER);
-
-	private EclipseJsonFormatterStepImpl formatter;
-
-	@BeforeEach
-	void initialize() throws Exception {
-		/*
-		 * The instantiation can be repeated for each step, but only with the same configuration
-		 * All formatter configuration is stored in
-		 * org.eclipse.core.runtime/.settings/org.eclipse.wst.json.core.prefs.
-		 * So a simple test of one configuration item change is considered sufficient.
-		 */
-		Properties properties = new Properties();
-		properties.put(INDENTATION_SIZE, "3"); //Default is 1
-		properties.put(INDENTATION_CHAR, SPACE); //Default is TAB
-		properties.put(CASE_PROPERTY_NAME, Integer.toString(UPPER)); //Dead code, ignored
-		formatter = new EclipseJsonFormatterStepImpl(properties);
-	}
-
-	@Test
-	void formatObject() throws Exception {
-		String output = formatter.format(UNFORMATTED_OBJECT);
-		assertEquals(FORMATTED_OBJECT,
-				output, "Unexpected formatting with default preferences.");
-	}
-
-	@Test
-	void formatArray() throws Exception {
-		String output = formatter.format(UNFORMATTED_ARRAY);
-		assertEquals(FORMATTED_ARRAY,
-				output, "Unexpected formatting with default preferences.");
-	}
-
-	@Test
-	void illegalCharacter() throws Exception {
-		String output = formatter.format(ILLEGAL_CHAR + UNFORMATTED_OBJECT);
-		assertEquals(ILLEGAL_CHAR + FORMATTED_OBJECT,
-				output, "Illeagl characteds are not ignored.");
-	}
-
-	@Test
-	void illegalSyntax() throws Exception {
-		String output = formatter.format("{" + UNFORMATTED_OBJECT);
-		assertEquals(FORMATTED_OBJECT,
-				output, "Illeagl syntax is not handled on best effort basis.");
-	}
-
-	@Test
-	void configurationChange() throws Exception {
-		assertThrows(IllegalArgumentException.class, () -> new EclipseJsonFormatterStepImpl(new Properties()));
-	}
-}
diff --git a/_ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseXmlFormatterStepImplAllowExternalURIsTest.java b/_ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseXmlFormatterStepImplAllowExternalURIsTest.java
deleted file mode 100644
index ac3b2c45f6..0000000000
--- a/_ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseXmlFormatterStepImplAllowExternalURIsTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2016-2021 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.wtp;
-
-import static org.eclipse.wst.xml.core.internal.preferences.XMLCorePreferenceNames.INDENTATION_CHAR;
-import static org.eclipse.wst.xml.core.internal.preferences.XMLCorePreferenceNames.INDENTATION_SIZE;
-import static org.eclipse.wst.xml.core.internal.preferences.XMLCorePreferenceNames.SPACE;
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.util.Properties;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import com.diffplug.spotless.extra.eclipse.wtp.sse.PluginPreferences;
-
-/** Test configuration allowExternalURI=false */
-class EclipseXmlFormatterStepImplAllowExternalURIsTest {
-	private TestData testData = null;
-	private EclipseXmlFormatterStepImpl formatter;
-
-	@BeforeEach
-	void initializeStatic() throws Exception {
-		testData = TestData.getTestDataOnFileSystem("xml");
-		/*
-		 * The instantiation can be repeated for each step, but only with the same configuration
-		 * All formatter configuration is stored in
-		 * org.eclipse.core.runtime/.settings/org.eclipse.wst.xml.core.prefs.
-		 * So a simple test of one configuration item change is considered sufficient.
-		 */
-		Properties properties = new Properties();
-		properties.put(PluginPreferences.RESOLVE_EXTERNAL_URI, "TRUE");
-		properties.put(INDENTATION_SIZE, "2");
-		properties.put(INDENTATION_CHAR, SPACE); //Default is TAB
-		formatter = new EclipseXmlFormatterStepImpl(properties);
-	}
-
-	@Test
-	void dtdExternalPath() throws Throwable {
-		String[] input = testData.input("dtd_external.test");
-		String output = formatter.format(input[0], input[1]);
-		assertEquals(testData.expected("dtd_external.test"),
-				output, "External DTD not resolved. Restrictions are not applied by formatter.");
-	}
-
-	@Test
-	void xsdExternalPath() throws Throwable {
-		String[] input = testData.input("xsd_external.test");
-		String output = formatter.format(input[0], input[1]);
-		assertEquals(testData.expected("xsd_external.test"),
-				output, "External XSD not resolved. Restrictions are not applied by formatter.");
-	}
-}
diff --git a/_ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseXmlFormatterStepImplCatalogLookupTest.java b/_ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseXmlFormatterStepImplCatalogLookupTest.java
deleted file mode 100644
index a9ccd85720..0000000000
--- a/_ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseXmlFormatterStepImplCatalogLookupTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2016-2021 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.wtp;
-
-import static org.eclipse.wst.xml.core.internal.preferences.XMLCorePreferenceNames.INDENTATION_CHAR;
-import static org.eclipse.wst.xml.core.internal.preferences.XMLCorePreferenceNames.INDENTATION_SIZE;
-import static org.eclipse.wst.xml.core.internal.preferences.XMLCorePreferenceNames.SPACE;
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.util.Properties;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import com.diffplug.spotless.extra.eclipse.wtp.sse.PluginPreferences;
-
-/** Test configuration allowExternalURI=false */
-class EclipseXmlFormatterStepImplCatalogLookupTest {
-	private TestData testData = null;
-	private EclipseXmlFormatterStepImpl formatter;
-
-	@BeforeEach
-	void initializeStatic() throws Exception {
-		testData = TestData.getTestDataOnFileSystem("xml");
-		/*
-		 * The instantiation can be repeated for each step, but only with the same configuration
-		 * All formatter configuration is stored in
-		 * org.eclipse.core.runtime/.settings/org.eclipse.wst.xml.core.prefs.
-		 * So a simple test of one configuration item change is considered sufficient.
-		 */
-		Properties properties = new Properties();
-		properties.put(INDENTATION_SIZE, "2");
-		properties.put(INDENTATION_CHAR, SPACE); //Default is TAB
-		properties.put(PluginPreferences.USER_CATALOG, testData.getRestrictionsPath("catalog.xml").toString());
-		formatter = new EclipseXmlFormatterStepImpl(properties);
-	}
-
-	@Test
-	void catalogLookup() throws Throwable {
-		String[] input = testData.input("xsd_not_found.test");
-		String output = formatter.format(input[0], input[1]);
-		assertEquals(testData.expected("xsd_not_found.test").replace(" remove spaces ", "remove spaces"),
-				output, "XSD not resolved by catalog. Restrictions are not applied by formatter.");
-	}
-}
diff --git a/_ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseXmlFormatterStepImplTest.java b/_ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseXmlFormatterStepImplTest.java
deleted file mode 100644
index 88b15c42e2..0000000000
--- a/_ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseXmlFormatterStepImplTest.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright 2016-2021 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.wtp;
-
-import static com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseFramework.LINE_DELIMITER;
-import static org.eclipse.wst.xml.core.internal.preferences.XMLCorePreferenceNames.*;
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.util.Properties;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-/** Eclipse WST wrapper integration tests */
-class EclipseXmlFormatterStepImplTest {
-
-	private final static String INCOMPLETE = "<c>";
-	private final static String ILLEGAL_CHAR = "\0";
-
-	private TestData testData = null;
-	private EclipseXmlFormatterStepImpl formatter;
-
-	@BeforeEach
-	void initialize() throws Exception {
-		testData = TestData.getTestDataOnFileSystem("xml");
-		/*
-		 * The instantiation can be repeated for each step, but only with the same configuration
-		 * All formatter configuration is stored in
-		 * org.eclipse.core.runtime/.settings/org.eclipse.wst.xml.core.prefs.
-		 * So a simple test of one configuration item change is considered sufficient.
-		 */
-		Properties properties = new Properties();
-		properties.put(INDENTATION_SIZE, "2");
-		properties.put(INDENTATION_CHAR, SPACE); //Default is TAB
-		formatter = new EclipseXmlFormatterStepImpl(properties);
-	}
-
-	@Test
-	void simpleDefaultFormat() throws Throwable {
-		String[] input = testData.input("xml_space.test");
-		String output = formatter.format(input[0], input[1]);
-		assertEquals(testData.expected("xml_space.test"),
-				output, "Unexpected formatting with default preferences.");
-	}
-
-	@Test
-	void invalidXmlFormat() throws Throwable {
-		String[] input = testData.input("xml_space.test");
-		input[0] += INCOMPLETE;
-		String output = formatter.format(input[0], input[1]);
-		String expected = testData.expected("xml_space.test") + LINE_DELIMITER + INCOMPLETE;
-		assertEquals(expected,
-				output, "Incomplete XML not formatted on best effort basis.");
-	}
-
-	@Test
-	void illegalXmlCharater() throws Throwable {
-		String[] input = testData.input("xml_space.test");
-		input[0] = ILLEGAL_CHAR + input[0];
-		String output = formatter.format(input[0], input[1]);
-		String expected = LINE_DELIMITER + LINE_DELIMITER + testData.expected("xml_space.test");
-		assertEquals(expected, output, "Illegal character not replaced by line delimiter.");
-	}
-
-	@Test
-	void dtdRelativePath() throws Throwable {
-		String[] input = testData.input("dtd_relative.test");
-		String output = formatter.format(input[0], input[1]);
-		assertEquals(testData.expected("dtd_relative.test"),
-				output, "Relative DTD not resolved. Restrictions are not applied by formatter.");
-	}
-
-	@Test
-	void dtdExternalPath() throws Throwable {
-		String[] input = testData.input("dtd_external.test");
-		String output = formatter.format(input[0], input[1]);
-		assertNotEquals(testData.expected("dtd_external.test"),
-				output, "External DTD resolved by default. Restrictions are applied by formatter.");
-	}
-
-	@Test
-	void xsdRelativePath() throws Throwable {
-		String[] input = testData.input("xsd_relative.test");
-		String output = formatter.format(input[0], input[1]);
-		assertEquals(testData.expected("xsd_relative.test"),
-				output, "Relative XSD not resolved. Restrictions are not applied by formatter.");
-	}
-
-	@Test
-	void xsdExternalPath() throws Throwable {
-		String[] input = testData.input("xsd_external.test");
-		String output = formatter.format(input[0], input[1]);
-		assertNotEquals(testData.expected("xsd_external.test"),
-				output, "External XSD resolved per default. Restrictions are applied by formatter.");
-	}
-
-	@Test
-	void xsdNotFound() throws Throwable {
-		String[] input = testData.input("xsd_not_found.test");
-		String output = formatter.format(input[0], input[1]);
-		assertEquals(testData.expected("xsd_not_found.test"),
-				output, "Unresolved XSD/DTD not silently ignored.");
-	}
-
-	@Test
-	void configurationChange() throws Exception {
-		assertThrows(IllegalArgumentException.class, () -> new EclipseXmlFormatterStepImpl(new Properties()));
-	}
-}
diff --git a/_ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/TestData.java b/_ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/TestData.java
deleted file mode 100644
index d767337970..0000000000
--- a/_ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/TestData.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.extra.eclipse.wtp;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-public class TestData {
-	public static TestData getTestDataOnFileSystem(String kind) {
-		final String userDir = System.getProperty("user.dir", ".");
-		Path dataPath = Paths.get(userDir, "src", "test", "resources", kind);
-		if (Files.isDirectory(dataPath)) {
-			return new TestData(dataPath);
-		}
-		return null;
-	}
-
-	private final Path inputPath;
-	private final Path expectedPath;
-	private final Path restrictionsPath;
-
-	private TestData(Path dataPath) {
-		inputPath = dataPath.resolve("input").toAbsolutePath();
-		expectedPath = dataPath.resolve("expected").toAbsolutePath();
-		restrictionsPath = dataPath.resolve("restrictions").toAbsolutePath();
-		for (Path testDataDir : new Path[]{inputPath, expectedPath, restrictionsPath}) {
-			if (!Files.isDirectory(testDataDir)) {
-				throw new IllegalArgumentException(String.format("'%1$s' is not a directory.", testDataDir));
-			}
-		}
-	}
-
-	public String[] input(final String fileName) throws Exception {
-		Path xmlPath = inputPath.resolve(fileName);
-		return new String[]{read(xmlPath), xmlPath.toString()};
-	}
-
-	public String expected(final String fileName) {
-		Path xmlPath = expectedPath.resolve(fileName);
-		return read(xmlPath);
-	}
-
-	private String read(final Path xmlPath) {
-		if (!Files.isRegularFile(xmlPath)) {
-			throw new IllegalArgumentException(String.format("'%1$s' is not a regular file.", xmlPath));
-		}
-		try {
-			String checkedOutFileContent = new String(java.nio.file.Files.readAllBytes(xmlPath), "UTF8");
-			return checkedOutFileContent.replace("\r", ""); //Align GIT end-of-line normalization
-		} catch (IOException e) {
-			throw new IllegalArgumentException(String.format("Failed to read '%1$s'.", xmlPath), e);
-		}
-	}
-
-	public Path getRestrictionsPath(String fileName) {
-		Path filePath = restrictionsPath.resolve(fileName);
-		if (!Files.exists(filePath)) {
-			throw new IllegalArgumentException(String.format("'%1$s' is not a restrictions file.", fileName));
-		}
-		return filePath;
-	}
-}
diff --git a/_ext/eclipse-wtp/src/test/resources/html/expected/css.html b/_ext/eclipse-wtp/src/test/resources/html/expected/css.html
deleted file mode 100644
index cfaea67cd0..0000000000
--- a/_ext/eclipse-wtp/src/test/resources/html/expected/css.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<HTML>
-<HEAD>
-<META charset="UTF-8">
-<STYLE type="text/css">
-#online {
-	text-align: center;
-	color: red;
-}
-</STYLE>
-<STYLE type="text/css">
-#linebreak {
-	text-align: center;
-	color: red;
-}
-</STYLE>
-<STYLE type="text/css">
-#tagindent {
-	text-align: center;
-	color: red;
-}
-</STYLE>
-<STYLE type="text/css">
-#emptylines {
-	text-align: center;
-	color: red;
-}
-</STYLE>
-<STYLE type="text/css">
-#notype {
-	text-align: center;
-	color: red;
-}
-</STYLE>
-<STYLE type="text/css"></STYLE>
-</HEAD>
-<BODY>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/_ext/eclipse-wtp/src/test/resources/html/expected/html4.html b/_ext/eclipse-wtp/src/test/resources/html/expected/html4.html
deleted file mode 100644
index a344ed08a0..0000000000
--- a/_ext/eclipse-wtp/src/test/resources/html/expected/html4.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Strict//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<HTML>
-<BODY>
-	Before
-	<BR> After
-	<!-- Only treated correctly by HTML5 model -->
-	<NAV>
-	<A></A></NAV>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/_ext/eclipse-wtp/src/test/resources/html/expected/html5.html b/_ext/eclipse-wtp/src/test/resources/html/expected/html5.html
deleted file mode 100644
index c79dfdce62..0000000000
--- a/_ext/eclipse-wtp/src/test/resources/html/expected/html5.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<HTML>
-<BODY>
-	Before
-	<BR> After
-	<!-- Only treated correctly by HTML5 model -->
-	<NAV>
-		<A></A>
-	</NAV>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/_ext/eclipse-wtp/src/test/resources/html/expected/invalid_syntax.html b/_ext/eclipse-wtp/src/test/resources/html/expected/invalid_syntax.html
deleted file mode 100644
index 9c05557bb7..0000000000
--- a/_ext/eclipse-wtp/src/test/resources/html/expected/invalid_syntax.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE html>
-<HTML>
-<HEAD>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<TITLE>T<WHATSOEVER></WHATSOEVER></TITLE>
-</HEAD>
-</HTML>
\ No newline at end of file
diff --git a/_ext/eclipse-wtp/src/test/resources/html/expected/javascript.html b/_ext/eclipse-wtp/src/test/resources/html/expected/javascript.html
deleted file mode 100644
index a33ea60503..0000000000
--- a/_ext/eclipse-wtp/src/test/resources/html/expected/javascript.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<HTML>
-<HEAD>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<SCRIPT type="text/javascript">
-    console.log("One line")
-</SCRIPT>
-<SCRIPT type="text/javascript">
-    console.log("Line break, no indent") ;
-</SCRIPT>
-<SCRIPT type="text/javascript">
-    console.log("Line break, wrong indent")
-</SCRIPT>
-</HEAD>
-<BODY>
-	<NAV>
-		<SCRIPT type="text/javascript">
-            console.log("One line, nested")
-        </SCRIPT>
-		<SCRIPT type="text/javascript">
-            console.log("Line break, no indent, nested")
-        </SCRIPT>
-		<SCRIPT type="text/javascript">
-            console.log("Line break, wrong indent, nested") ;
-        </SCRIPT>
-		<SCRIPT type="text/javascript">
-            console.log("Wrong tag indents")
-        </SCRIPT>
-		<SCRIPT type="text/javascript">
-            console.log("Empty lines when closing.") ;
-        </SCRIPT>
-		<SCRIPT type="text/javascript">
-            console.log("Script without type")
-        </SCRIPT>
-		<SCRIPT type="text/javascript"></SCRIPT>
-		<SCRIPT type="text/javascript">
- if (condition) { console.log("Missing end of JS block")
-        </SCRIPT>
-	</NAV>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/_ext/eclipse-wtp/src/test/resources/html/expected/utf-8.html b/_ext/eclipse-wtp/src/test/resources/html/expected/utf-8.html
deleted file mode 100644
index 4bcd6a03c1..0000000000
--- a/_ext/eclipse-wtp/src/test/resources/html/expected/utf-8.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE html>
-<HTML>
-<HEAD>
-<META charset="UTF-8">
-<TITLE>ÄÜ€</TITLE>
-</HEAD>
-</HTML>
\ No newline at end of file
diff --git a/_ext/eclipse-wtp/src/test/resources/html/input/bom.html b/_ext/eclipse-wtp/src/test/resources/html/input/bom.html
deleted file mode 100644
index 3fe6abe797..0000000000
--- a/_ext/eclipse-wtp/src/test/resources/html/input/bom.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE html>
-<html><head><meta charset="UTF-8"><title>ÄÜ€</title></head></html>
\ No newline at end of file
diff --git a/_ext/eclipse-wtp/src/test/resources/html/input/css.html b/_ext/eclipse-wtp/src/test/resources/html/input/css.html
deleted file mode 100644
index 8ccbc4dcc8..0000000000
--- a/_ext/eclipse-wtp/src/test/resources/html/input/css.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8">
-<style type="text/css">#online { text-align: center; color: red; }</style>
-<style type="text/css">
-#linebreak { text-align: center; color: red; }</style>
-         <style type="text/css">
-#tagindent { text-align: center; color: red; }   </style>
-<style type="text/css">
-         
-         
-#emptylines { text-align: center; color: red; }   
-
-
-
-        </style>
-<style>#notype { text-align: center; color: red; }</style>        
-<style type="text/css"></style>        
-</head>
-<body>
-</body>
-</html>
\ No newline at end of file
diff --git a/_ext/eclipse-wtp/src/test/resources/html/input/html4.html b/_ext/eclipse-wtp/src/test/resources/html/input/html4.html
deleted file mode 100644
index 45aa7b56f7..0000000000
--- a/_ext/eclipse-wtp/src/test/resources/html/input/html4.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Strict//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<body>
-Before
-<br>
-After
-<!-- Only treated correctly by HTML5 model -->
-<nav><a></a></nav>
-</body>
-</html>
\ No newline at end of file
diff --git a/_ext/eclipse-wtp/src/test/resources/html/input/html5.html b/_ext/eclipse-wtp/src/test/resources/html/input/html5.html
deleted file mode 100644
index 216c53e8e3..0000000000
--- a/_ext/eclipse-wtp/src/test/resources/html/input/html5.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-Before
-<br>
-After
-<!-- Only treated correctly by HTML5 model -->
-<nav><a></a></nav>
-</body>
-</html>
\ No newline at end of file
diff --git a/_ext/eclipse-wtp/src/test/resources/html/input/invalid_syntax.html b/_ext/eclipse-wtp/src/test/resources/html/input/invalid_syntax.html
deleted file mode 100644
index 04c6cf7f2a..0000000000
--- a/_ext/eclipse-wtp/src/test/resources/html/input/invalid_syntax.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>T</whatsoever>
\ No newline at end of file
diff --git a/_ext/eclipse-wtp/src/test/resources/html/input/javascript.html b/_ext/eclipse-wtp/src/test/resources/html/input/javascript.html
deleted file mode 100644
index dccde2c2dd..0000000000
--- a/_ext/eclipse-wtp/src/test/resources/html/input/javascript.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script type="text/javascript">console.log("One line")</script>
-<script type="text/javascript">
-console.log("Line break, no indent");
-</script>
-<script type="text/javascript">
-  console.log("Line break, wrong indent")
-</script>
-</head>
-<body>
-<nav>
-<script type="text/javascript">console.log("One line, nested")</script>
-<script type="text/javascript">
-console.log("Line break, no indent, nested")
-</script>
-<script type="text/javascript">
-  console.log("Line break, wrong indent, nested");
-</script>
-   <script type="text/javascript">
-console.log("Wrong tag indents")
-                       </script>
-<script type="text/javascript">
-console.log("Empty lines when closing.");
-
-    </script>
-<script>console.log("Script without type")</script>
-<script type="text/javascript"></script>
-<script type="text/javascript"> if (condition) { console.log("Missing end of JS block")</script>
-</nav>
-</body>
-</html>
\ No newline at end of file
diff --git a/_ext/eclipse-wtp/src/test/resources/html/input/utf-8.html b/_ext/eclipse-wtp/src/test/resources/html/input/utf-8.html
deleted file mode 100644
index abf1a7d9a7..0000000000
--- a/_ext/eclipse-wtp/src/test/resources/html/input/utf-8.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE html>
-<html><head><meta charset="UTF-8"><title>ÄÜ€</title></head></html>
\ No newline at end of file
diff --git a/_ext/eclipse-wtp/src/test/resources/html/restrictions/ReadMe.txt b/_ext/eclipse-wtp/src/test/resources/html/restrictions/ReadMe.txt
deleted file mode 100644
index 37c58641d8..0000000000
--- a/_ext/eclipse-wtp/src/test/resources/html/restrictions/ReadMe.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Various manual tests have been performed with external and internal DTDs.
-They seem not to be used by the HTML formatter. Instead they are a 
-helper to parse the DOCTYPE and select the right content model.
-The DTDParser.parse throws a SAXParseException when parsing the 
-HTML DTDs provided with the WST JARs (accessed by the System catalog).
-This nominal and expected exception is eaten (DTDParser.currentDTD not set).
-
-Since currently there seems to be no use case for DTD/XSD/catalog,
-we omit it for Spotless integration.
\ No newline at end of file
diff --git a/_ext/eclipse-wtp/src/test/resources/xml/expected/dtd_external.test b/_ext/eclipse-wtp/src/test/resources/xml/expected/dtd_external.test
deleted file mode 100644
index 6f383afaa7..0000000000
--- a/_ext/eclipse-wtp/src/test/resources/xml/expected/dtd_external.test
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE r SYSTEM "https://raw.githubusercontent.com/diffplug/spotless/main/_ext/eclipse-wtp/src/test/resources/xml/restrictions/test.dtd">
-<r>
-  <x>indent
-    this text</x>
-  <y>preserve 
-  spaces</y>
-</r>
\ No newline at end of file
diff --git a/_ext/eclipse-wtp/src/test/resources/xml/expected/dtd_relative.test b/_ext/eclipse-wtp/src/test/resources/xml/expected/dtd_relative.test
deleted file mode 100644
index 37c565592b..0000000000
--- a/_ext/eclipse-wtp/src/test/resources/xml/expected/dtd_relative.test
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE r SYSTEM "../restrictions/test.dtd">
-<r>
-  <x>indent
-    this text</x>
-  <y>preserve 
-  spaces</y>
-</r>
\ No newline at end of file
diff --git a/_ext/eclipse-wtp/src/test/resources/xml/expected/xml_space.test b/_ext/eclipse-wtp/src/test/resources/xml/expected/xml_space.test
deleted file mode 100644
index 8bc506f692..0000000000
--- a/_ext/eclipse-wtp/src/test/resources/xml/expected/xml_space.test
+++ /dev/null
@@ -1,4 +0,0 @@
-<r a="1" b="2">
-  <x> foo bar </x>
-  <y xml:space="preserve"> preserve   space </y>
-</r>
\ No newline at end of file
diff --git a/_ext/eclipse-wtp/src/test/resources/xml/expected/xsd_external.test b/_ext/eclipse-wtp/src/test/resources/xml/expected/xsd_external.test
deleted file mode 100644
index 0456632618..0000000000
--- a/_ext/eclipse-wtp/src/test/resources/xml/expected/xsd_external.test
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<t:r xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:t="http://foo.bar/test"
-  xsi:schemaLocation="http://foo.bar/test https://raw.githubusercontent.com/diffplug/spotless/main/_ext/eclipse-wtp/src/test/resources/xml/restrictions/test.xsd">
-  <t:x>remove spaces</t:x>
-  <t:y> preserve spaces </t:y>
-</t:r>
\ No newline at end of file
diff --git a/_ext/eclipse-wtp/src/test/resources/xml/expected/xsd_not_found.test b/_ext/eclipse-wtp/src/test/resources/xml/expected/xsd_not_found.test
deleted file mode 100644
index 78a27d902c..0000000000
--- a/_ext/eclipse-wtp/src/test/resources/xml/expected/xsd_not_found.test
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<t:r xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:t="http://foo.bar/test"
-  xsi:schemaLocation="http://foo.bar/test http://foo.bar/test.xsd">
-  <t:x> remove spaces </t:x>
-  <t:y> preserve spaces </t:y>
-</t:r>
\ No newline at end of file
diff --git a/_ext/eclipse-wtp/src/test/resources/xml/expected/xsd_relative.test b/_ext/eclipse-wtp/src/test/resources/xml/expected/xsd_relative.test
deleted file mode 100644
index 93e86ab38e..0000000000
--- a/_ext/eclipse-wtp/src/test/resources/xml/expected/xsd_relative.test
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<t:r xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:t="http://foo.bar/test"
-  xsi:schemaLocation="http://foo.bar/test ../restrictions/test.xsd">
-  <t:x>remove spaces</t:x>
-  <t:y> preserve spaces </t:y>
-</t:r>
\ No newline at end of file
diff --git a/_ext/eclipse-wtp/src/test/resources/xml/input/dtd_external.test b/_ext/eclipse-wtp/src/test/resources/xml/input/dtd_external.test
deleted file mode 100644
index 1293b55e18..0000000000
--- a/_ext/eclipse-wtp/src/test/resources/xml/input/dtd_external.test
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE r SYSTEM "https://raw.githubusercontent.com/diffplug/spotless/main/_ext/eclipse-wtp/src/test/resources/xml/restrictions/test.dtd">
-<r>
-	<x>indent
-  this text</x>
-	<y>preserve 
-  spaces</y>
-</r>
\ No newline at end of file
diff --git a/_ext/eclipse-wtp/src/test/resources/xml/input/dtd_relative.test b/_ext/eclipse-wtp/src/test/resources/xml/input/dtd_relative.test
deleted file mode 100644
index 431354868c..0000000000
--- a/_ext/eclipse-wtp/src/test/resources/xml/input/dtd_relative.test
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE r SYSTEM "../restrictions/test.dtd">
-<r>
-	<x>indent
-  this text</x>
-	<y>preserve 
-  spaces</y>
-</r>
\ No newline at end of file
diff --git a/_ext/eclipse-wtp/src/test/resources/xml/input/xml_space.test b/_ext/eclipse-wtp/src/test/resources/xml/input/xml_space.test
deleted file mode 100644
index 2ddd865f1c..0000000000
--- a/_ext/eclipse-wtp/src/test/resources/xml/input/xml_space.test
+++ /dev/null
@@ -1 +0,0 @@
-<r a="1" b="2"><x> foo  bar </x><y xml:space="preserve"> preserve   space </y></r>
\ No newline at end of file
diff --git a/_ext/eclipse-wtp/src/test/resources/xml/input/xsd_external.test b/_ext/eclipse-wtp/src/test/resources/xml/input/xsd_external.test
deleted file mode 100644
index e75b7ca06f..0000000000
--- a/_ext/eclipse-wtp/src/test/resources/xml/input/xsd_external.test
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<t:r xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:t="http://foo.bar/test" xsi:schemaLocation="http://foo.bar/test https://raw.githubusercontent.com/diffplug/spotless/main/_ext/eclipse-wtp/src/test/resources/xml/restrictions/test.xsd">
-<t:x> remove spaces </t:x><t:y> preserve spaces </t:y>
-</t:r>
\ No newline at end of file
diff --git a/_ext/eclipse-wtp/src/test/resources/xml/input/xsd_not_found.test b/_ext/eclipse-wtp/src/test/resources/xml/input/xsd_not_found.test
deleted file mode 100644
index 483be84785..0000000000
--- a/_ext/eclipse-wtp/src/test/resources/xml/input/xsd_not_found.test
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<t:r xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:t="http://foo.bar/test" xsi:schemaLocation="http://foo.bar/test http://foo.bar/test.xsd">
-<t:x> remove spaces </t:x><t:y> preserve spaces </t:y>
-</t:r>
\ No newline at end of file
diff --git a/_ext/eclipse-wtp/src/test/resources/xml/input/xsd_relative.test b/_ext/eclipse-wtp/src/test/resources/xml/input/xsd_relative.test
deleted file mode 100644
index ce8392adf8..0000000000
--- a/_ext/eclipse-wtp/src/test/resources/xml/input/xsd_relative.test
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<t:r xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:t="http://foo.bar/test" xsi:schemaLocation="http://foo.bar/test ../restrictions/test.xsd">
-<t:x> remove spaces </t:x><t:y> preserve spaces </t:y>
-</t:r>
\ No newline at end of file
diff --git a/_ext/eclipse-wtp/src/test/resources/xml/restrictions/catalog.xml b/_ext/eclipse-wtp/src/test/resources/xml/restrictions/catalog.xml
deleted file mode 100644
index 2fba8dc2b9..0000000000
--- a/_ext/eclipse-wtp/src/test/resources/xml/restrictions/catalog.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-  <!-- OASIS: If the catalog entry file is specified with a relative URI, it is relative to the base URI of the document that contains the processing instruction. -->
-  <system systemId="http://foo.bar/test.xsd" uri="./test.xsd" />
-</catalog>
\ No newline at end of file
diff --git a/_ext/eclipse-wtp/src/test/resources/xml/restrictions/test.dtd b/_ext/eclipse-wtp/src/test/resources/xml/restrictions/test.dtd
deleted file mode 100644
index 5076fd91e0..0000000000
--- a/_ext/eclipse-wtp/src/test/resources/xml/restrictions/test.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ELEMENT r (x,y)>
-<!ELEMENT x (#PCDATA)>
-<!ELEMENT y ANY>
-<!ATTLIST y xml:space (preserve) #FIXED 'preserve'>
diff --git a/_ext/eclipse-wtp/src/test/resources/xml/restrictions/test.xsd b/_ext/eclipse-wtp/src/test/resources/xml/restrictions/test.xsd
deleted file mode 100644
index 6b0e3b5e00..0000000000
--- a/_ext/eclipse-wtp/src/test/resources/xml/restrictions/test.xsd
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http:/foo.bar/test" elementFormDefault="qualified">
-  <xs:element name="r">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="x">
-          <xs:simpleType>
-            <xs:restriction base="xs:string">
-              <xs:whiteSpace value="collapse" />
-            </xs:restriction>
-          </xs:simpleType>
-        </xs:element>
-        <xs:element name="y">
-          <xs:simpleType>
-            <xs:restriction base="xs:string">
-              <xs:whiteSpace value="preserve" />
-            </xs:restriction>
-          </xs:simpleType>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-</xs:schema>
\ No newline at end of file
diff --git a/_ext/gradle/java-setup.gradle b/_ext/gradle/java-setup.gradle
deleted file mode 100644
index 0007407250..0000000000
--- a/_ext/gradle/java-setup.gradle
+++ /dev/null
@@ -1,28 +0,0 @@
-//////////
-// JAVA //
-//////////
-apply from: rootProject.file('gradle/changelog.gradle')
-version = spotlessChangelog.versionNext
-apply from: rootProject.file('gradle/java-setup.gradle')
-
-// Allow declaration of api/compile dependencies
-apply plugin: 'java-library'
-
-// Show warning locations, fail on warnings
-tasks.withType(JavaCompile).configureEach {
-	options.compilerArgs << "-Xlint:unchecked"
-	options.compilerArgs << "-Xlint:deprecation"
-	options.compilerArgs << "-Werror"
-}
-
-//Currently testlib is not used by _ext. Hence the external dependencies are added here.
-dependencies {
-	testImplementation "org.junit.jupiter:junit-jupiter:${VER_JUNIT}"
-	testImplementation "org.assertj:assertj-core:${VER_ASSERTJ}"
-	testImplementation projects.testlib
-	testRuntimeOnly "org.junit.platform:junit-platform-launcher"
-}
-
-tasks.withType(Test).configureEach {
-	useJUnitPlatform()
-}
diff --git a/_ext/gradle/p2-fat-jar-setup.gradle b/_ext/gradle/p2-fat-jar-setup.gradle
deleted file mode 100644
index 0bba3c43c2..0000000000
--- a/_ext/gradle/p2-fat-jar-setup.gradle
+++ /dev/null
@@ -1,169 +0,0 @@
-apply from: rootProject.file('_ext/gradle/java-setup.gradle')
-
-apply plugin: 'com.diffplug.p2.asmaven'
-
-ext {
-	// P2 Repository URL
-	if (!project.hasProperty('p2Repository')) {
-		p2Repository = "p2Repository not defined in project"
-	}
-	// P2 dependencies
-	if (!project.hasProperty('p2Dependencies')) {
-		p2Dependencies = "p2Dependencies not defined in project"
-	}
-
-	// Some JARs may include JARs themselfs, which shall be unpacked and added to the embedded class folder.
-	if (!project.hasProperty('internalJars')) {
-		internalJars = []
-	}
-
-	// Include form the JARs, which goes into a fat-jar with the spottless formatter interface.
-	if (!project.hasProperty('jarInclude')) {
-		jarInclude = [
-			'**/*.class', // Take all classes
-			'**/*.properties', // Text resources (for messages, etc)
-			'**/*.xml', // Plugin XML and other resources
-			'*.html', // License information about the included JARs,
-			'META-INF/**' // Plugin manifest and addtional information
-		]
-	}
-
-	// Exclude form the JARs, which goes into a fat-jar with the spottless formatter interface.
-	if (!project.hasProperty('jarExclude')) {
-		jarExclude = [
-			'META-INF/*.RSA', // The eclipse jars are signed, and our fat-jar breaks the signatures
-			'META-INF/*.SF', // ... so all signatures are filtered
-		]
-	}
-
-	// Map fat-JAR resources path if JAR file name does not correspond to plugin package name (e.g. required for internal plugins)
-	if (!project.hasProperty('fatJarResourcesMap')) {
-		fatJarResourcesMap = [:]
-	}
-
-
-	// The directory contains all external classes for the fat-jar
-	embeddedClassesDirName = 'build/embeddedClasses'
-	embeddedClassesDir = project.file(embeddedClassesDirName)
-}
-
-if (gradle.startParameter.projectProperties.get('com.diffplug.spotless.include.ext.nop2') != 'true') {
-	// build a maven repo in our build folder containing these artifacts
-	p2AsMaven {
-		group 'p2', {
-			repo project.p2Repository
-			p2Dependencies.keySet.each { p2.addIU(it) }
-			p2ant {
-				/*
-				Define p2ant proxy settings as a closure. Refer to the API documents for instructions:
-				https://diffplug.github.io/goomph/javadoc/3.17.4/com/diffplug/gradle/p2/AsMavenPlugin.html
-				*/
-				if (project.hasProperty('setP2AntProxy')) {
-					setP2AntProxy(it)
-				}
- 			}
-		}
-	}
-}
-
-configurations {
-	embeddedJars // P2 JARs the fat-JAR is based uppon
-}
-
-dependencies {
-	p2Dependencies.each { groupArtifact, version ->
-		embeddedJars "p2:${groupArtifact}:${version}"
-	}
-	// Includes the classes from P2 JARs during compilation
-	implementation files(embeddedClassesDir)
-}
-
-jar {
-	// Add P2 clases to fat-JAR
-	from embeddedClassesDir
-}
-
-//////////////////////////
-// Unpack External Deps //
-//////////////////////////
-import java.io.File
-
-task unjarEmbeddedClasses {
-	description = "Copies filtered set of embedded classes from the Eclise/GrEclipse dependencies to '${project.relativePath(embeddedClassesDir)}'."
-	inputs.files(configurations.embeddedJars)
-	inputs.property('internalJars', internalJars)
-	inputs.property('jarInclude', jarInclude)
-	inputs.property('jarExclude', jarExclude)
-	inputs.property('fatJarResourcesMap', fatJarResourcesMap)
-	outputs.dir(embeddedClassesDir)
-
-	doLast {
-		embeddedClassesDir.deleteDir()
-		embeddedClassesDir.mkdirs()
-		configurations.embeddedJars.each {
-			unjar(it, embeddedClassesDir)
-		}
-		// Unpack internal JARs. Maintain the order defined in internalJars
-		internalJars.each {
-			fileTree(embeddedClassesDir).include("${it}.jar").each {
-				unjar(it, embeddedClassesDir)
-				delete(it)
-			}
-		}
-	}
-}
-
-def unjar(File jarFile, File destDir) {
-	ant.unjar(src: jarFile, dest: destDir) {
-		patternset {
-			jarInclude.each {
-				include(name: "${it}")
-			}
-			internalJars.each {
-				include(name: "**/${it}.jar")
-			}
-			jarExclude.each {
-				exclude(name: "${it}")
-			}
-		}
-	}
-	// Provide Fat JAR resources (following naming convention of spotless-eclipse-base)
-	def fat_jar_resource_dir = jarFile.getName().split('-')[0]
-	fat_jar_resource_dir = fatJarResourcesMap.getOrDefault(fat_jar_resource_dir, fat_jar_resource_dir)
-	ant.move(todir: "${destDir}/${fat_jar_resource_dir}/META-INF", quiet: 'true', failonerror: 'false') {
-		fileset(dir: "${destDir}/META-INF")
-	}
-	//Keep licenses and other human readable information for transparency
-	ant.move(todir: "${destDir}/${fat_jar_resource_dir}", quiet: 'true') {
-		fileset(dir: destDir) {
-			include(name: '*')
-			type(type: 'file')
-			exclude(name: '*jar-*')
-			exclude(name: '*.jar')
-		}
-	}
-
-}
-
-tasks.compileJava.dependsOn(unjarEmbeddedClasses)
-
-/////////
-// IDE //
-/////////
-
-apply plugin: 'eclipse'
-
-// always create fresh projects
-tasks.eclipse.dependsOn(cleanEclipse)
-// Encure that the dependent classes are preovided for compilation if project is build via Eclipse instead of command line
-tasks.eclipseClasspath.dependsOn(unjarEmbeddedClasses)
-
-apply plugin: 'idea'
-
-// Encure that the dependent classes are preovided for compilation if project is build via Eclipse instead of command line
-tasks.idea.dependsOn(unjarEmbeddedClasses)
-
-tasks.named('ideaModule') {
-	notCompatibleWithConfigurationCache("https://github.com/gradle/gradle/issues/13480")
-}
-
diff --git a/_ext/gradle/update-lockfile.gradle b/_ext/gradle/update-lockfile.gradle
deleted file mode 100644
index 3c23bb860b..0000000000
--- a/_ext/gradle/update-lockfile.gradle
+++ /dev/null
@@ -1,6 +0,0 @@
-// Use file locking
-configurations.configureEach {
-	resolutionStrategy {
-		activateDependencyLocking()
-	}
-}
diff --git a/settings.gradle b/settings.gradle
index 4e81688d29..d01f901ee6 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -15,9 +15,6 @@ plugins {
 	id 'com.github.spotbugs' version '6.0.1' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
 	id 'com.diffplug.spotless-changelog' version '3.0.2' apply false
-	// https://github.com/diffplug/goomph/blob/main/CHANGES.md
-	// DO NOT UPDATE, see https://github.com/diffplug/spotless/pull/874
-	id 'com.diffplug.p2.asmaven' version '3.27.0' apply false
 	// https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md
 	id 'com.adarshr.test-logger' version '4.0.0' apply false
 	// https://github.com/davidburstrom/version-compatibility-gradle-plugin/tags
@@ -98,31 +95,3 @@ def getStartProperty(java.lang.String name) {
 if (System.getenv('SPOTLESS_EXCLUDE_MAVEN') != 'true' && getStartProperty('SPOTLESS_EXCLUDE_MAVEN') != 'true') {
 	include 'plugin-maven'	// maven-specific glue code
 }
-
-// include external (_ext) projects from development builds
-if (getStartProperty('com.diffplug.spotless.include.ext') == 'true') {
-	file('_ext').eachDirMatch(~/^(?!(\.|gradle)).*/) { dir ->
-		include dir.name
-		project(":${dir.name}").projectDir = dir
-	}
-}
-
-// include external (_ext) projects from development builds, but disable the p2 parts
-if (getStartProperty('com.diffplug.spotless.include.ext.nop2') == 'true') {
-	file('_ext').eachDirMatch(~/^(?!(\.|gradle)).*/) { dir ->
-		include dir.name
-		project(":${dir.name}").projectDir = dir
-	}
-}
-
-// the p2-based projects are too expensive for routine CI builds, so they have to be invoked explicitly
-for (kind in [
-			'cdt',
-			'groovy',
-			'wtp'
-		]) {
-	if (getStartProperty("com.diffplug.spotless.include.ext.${kind}") == 'true') {
-		include "eclipse-${kind}"
-		project(":eclipse-${kind}").projectDir = file("_ext/eclipse-${kind}")
-	}
-}

From 2eaec914b17308e39163070f83ba86cf40470259 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 00:09:18 +0000
Subject: [PATCH 1333/2068] Update actions/setup-java action to v4

---
 .github/workflows/changelog-print.yml | 2 +-
 .github/workflows/ci.yml              | 4 ++--
 .github/workflows/deploy.yml          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/changelog-print.yml b/.github/workflows/changelog-print.yml
index 31b6c9aabc..01bbb88afa 100644
--- a/.github/workflows/changelog-print.yml
+++ b/.github/workflows/changelog-print.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: jdk 11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 11
           distribution: 'temurin'
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d11b0b1166..c6d1eede5d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,7 +24,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Install JDK 11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: "temurin"
           java-version: 11
@@ -62,7 +62,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Install JDK ${{ matrix.distribution }} ${{ matrix.java_version }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: "temurin"
           java-version: ${{ matrix.jre }}
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 0e36087855..e899a2d270 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -38,7 +38,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: jdk 11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 11
           distribution: 'temurin'

From 83d5bf9924d179044674144171ce27e179d29378 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 3 Dec 2023 19:34:56 -0800
Subject: [PATCH 1334/2068] Bump solstice to 1.7.4 to fix #1860,

---
 lib-extra/build.gradle                                          | 2 +-
 .../java/com/diffplug/spotless/extra/EquoBasedStepBuilder.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index a7a8a0d39f..34cee7e0fd 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -7,7 +7,7 @@ version = rootProject.spotlessChangelog.versionNext
 apply from: rootProject.file('gradle/java-setup.gradle')
 apply from: rootProject.file('gradle/java-publish.gradle')
 
-String VER_SOLSTICE = '1.7.3'
+String VER_SOLSTICE = '1.7.4'
 dependencies {
 	api projects.lib
 	// misc useful utilities
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 2d62e25355..3d3bb68241 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
@@ -117,7 +117,7 @@ EquoBasedStepBuilder.State get() throws Exception {
 		}
 		var classpath = new ArrayList<File>();
 		var mavenDeps = new ArrayList<String>();
-		mavenDeps.add("dev.equo.ide:solstice:1.7.3");
+		mavenDeps.add("dev.equo.ide:solstice:1.7.4");
 		mavenDeps.add("com.diffplug.durian:durian-swt.os:4.2.0");
 		mavenDeps.addAll(query.getJarsOnMavenCentral());
 		classpath.addAll(mavenProvisioner.provisionWithTransitives(false, mavenDeps));

From 38021bf0c146e79e59fbf329b8ce56bbc6185f31 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 3 Dec 2023 19:35:06 -0800
Subject: [PATCH 1335/2068] Bump JDT to latest.

---
 .../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 cd766fc8c8..fc477ed881 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
@@ -31,7 +31,7 @@ public final class EclipseJdtFormatterStep {
 	private EclipseJdtFormatterStep() {}
 
 	private static final String NAME = "eclipse jdt formatter";
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "4.26").add(17, "4.27");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "4.26").add(17, "4.29");
 
 	public static String defaultVersion() {
 		return JVM_SUPPORT.getRecommendedFormatterVersion();

From cde60a58fce8cc2b7c8231534dea8b1d03451dc7 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 3 Dec 2023 19:35:18 -0800
Subject: [PATCH 1336/2068] Bump GrEclipse to latest.

---
 .../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 b79918d555..0a38ff5e64 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
@@ -32,7 +32,7 @@ public final class GrEclipseFormatterStep {
 	private GrEclipseFormatterStep() {}
 
 	private static final String NAME = "eclipse groovy formatter";
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "4.26").add(17, "4.28");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "4.26").add(17, "4.29");
 
 	public static String defaultVersion() {
 		return JVM_SUPPORT.getRecommendedFormatterVersion();

From e655ef28c253577c360d96f5096475df0f676c8e Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 3 Dec 2023 19:35:27 -0800
Subject: [PATCH 1337/2068] Bump CDT to latest.

---
 .../diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java
index 8767b68dfe..569dc05e54 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java
@@ -37,7 +37,7 @@ public final class EclipseCdtFormatterStep {
 	private EclipseCdtFormatterStep() {}
 
 	private static final String NAME = "eclipse cdt formatter";
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "10.7").add(17, "11.1");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "10.7").add(17, "11.3");
 
 	public static String defaultVersion() {
 		return JVM_SUPPORT.getRecommendedFormatterVersion();

From c4da6c40089abe86bfbbd639acc70ae4795b1958 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 3 Dec 2023 19:49:29 -0800
Subject: [PATCH 1338/2068] Update changelogs.

---
 CHANGES.md               |  9 +++++++--
 plugin-gradle/CHANGES.md | 14 +++++++++-----
 plugin-maven/CHANGES.md  | 12 ++++++++----
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index d64b8861da..ac7da8ba05 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,10 +10,15 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Eclipse-based steps which contained any jars with a `+` in their path were broken, now fixed. ([#1860](https://github.com/diffplug/spotless/issues/1860#issuecomment-1826113332))
 ### Changes
-* Use palantir-java-format `2.38.0` on Java 21. ([#1920](https://github.com/diffplug/spotless/pull/1920))
-* Bump default `ktfmt` version to latest `0.44` -> `0.46`. ([#1927](https://github.com/diffplug/spotless/pull/1927))
+* Bump default `palantir-java-format` version to latest `2.28.0` -> `2.38.0` on Java 21. ([#1920](https://github.com/diffplug/spotless/pull/1920))
 * Bump default `googleJavaFormat` version to latest `1.17.0` -> `1.18.1`. ([#1920](https://github.com/diffplug/spotless/pull/1920))
+* Bump default `ktfmt` version to latest `0.44` -> `0.46`. ([#1927](https://github.com/diffplug/spotless/pull/1927))
+* Bump default `eclipse` version to latest `4.27` -> `4.29`. ([#1939](https://github.com/diffplug/spotless/pull/1939))
+* Bump default `greclipse` version to latest `4.28` -> `4.29`. ([#1939](https://github.com/diffplug/spotless/pull/1939))
+* Bump default `cdt` version to latest `11.1` -> `11.3`. ([#1939](https://github.com/diffplug/spotless/pull/1939))
 
 ## [2.43.0] - 2023-11-27
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 9071ed2bbf..696828dbac 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,15 +3,19 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
-### Changes
-* **BREAKING CHANGE** `6.23.0` made breaking changes to the ABI of the `KotlinExtension` and `GroovyExtension`. Those are reflected retroactively now.
+**BREAKING CHANGE** `6.23.0` made breaking changes to the ABI of the `KotlinExtension` and `GroovyExtension`. Those are reflected retroactively now.
   - Previously, we had done semver on the Gradle plugin based only on buildscript compatibility.
   - From now on, we will consider ABI for the benefit of convention-based plugins.
-* Bump default `googleJavaFormat` version to latest `1.17.0` -> `1.18.1`. ([#1920](https://github.com/diffplug/spotless/pull/1920))
-* Bump default `ktfmt` version to latest `0.44` -> `0.46`. ([#1927](https://github.com/diffplug/spotless/pull/1927))
-* Use palantir-java-format 2.38.0 on Java 21. ([#1920](https://github.com/diffplug/spotless/pull/1920))
 ### Fixed
+* Eclipse-based steps which contained any jars with a `+` in their path were broken, now fixed. ([#1860](https://github.com/diffplug/spotless/issues/1860#issuecomment-1826113332))
 * Make `KtfmtConfig.ConfigurableStyle#configure` public. ([#1926](https://github.com/diffplug/spotless/pull/1926))
+### Changes
+* Bump default `palantir-java-format` version to latest `2.28.0` -> `2.38.0` on Java 21. ([#1920](https://github.com/diffplug/spotless/pull/1920))
+* Bump default `googleJavaFormat` version to latest `1.17.0` -> `1.18.1`. ([#1920](https://github.com/diffplug/spotless/pull/1920))
+* Bump default `ktfmt` version to latest `0.44` -> `0.46`. ([#1927](https://github.com/diffplug/spotless/pull/1927))
+* Bump default `eclipse` version to latest `4.27` -> `4.29`. ([#1939](https://github.com/diffplug/spotless/pull/1939))
+* Bump default `greclipse` version to latest `4.28` -> `4.29`. ([#1939](https://github.com/diffplug/spotless/pull/1939))
+* Bump default `cdt` version to latest `11.1` -> `11.3`. ([#1939](https://github.com/diffplug/spotless/pull/1939))
 
 ## [6.23.2] - 2023-12-01
 ### Fixed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 1160517f6f..07f20d39cb 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,12 +3,16 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
-### Changes
-* Use palantir-java-format `2.38.0` on Java 21. ([#1920](https://github.com/diffplug/spotless/pull/1920))
-* Bump default `ktfmt` version to latest `0.44` -> `0.46`. ([#1927](https://github.com/diffplug/spotless/pull/1927))
-* Bump default `googleJavaFormat` version to latest `1.17.0` -> `1.18.1`. ([#1920](https://github.com/diffplug/spotless/pull/1920))
 ### Fixed
 * Revert [#1846](https://github.com/diffplug/spotless/issues/1846) from 2.41.0 which causes the plugin to format generated sources in the `target` directory. ([#1928](https://github.com/diffplug/spotless/pull/1928))
+* Eclipse-based steps which contained any jars with a `+` in their path were broken, now fixed. ([#1860](https://github.com/diffplug/spotless/issues/1860#issuecomment-1826113332))
+### Changes
+* Bump default `palantir-java-format` version to latest `2.28.0` -> `2.38.0` on Java 21. ([#1920](https://github.com/diffplug/spotless/pull/1920))
+* Bump default `googleJavaFormat` version to latest `1.17.0` -> `1.18.1`. ([#1920](https://github.com/diffplug/spotless/pull/1920))
+* Bump default `ktfmt` version to latest `0.44` -> `0.46`. ([#1927](https://github.com/diffplug/spotless/pull/1927))
+* Bump default `eclipse` version to latest `4.27` -> `4.29`. ([#1939](https://github.com/diffplug/spotless/pull/1939))
+* Bump default `greclipse` version to latest `4.28` -> `4.29`. ([#1939](https://github.com/diffplug/spotless/pull/1939))
+* Bump default `cdt` version to latest `11.1` -> `11.3`. ([#1939](https://github.com/diffplug/spotless/pull/1939))
 
 ## [2.41.0] - 2023-11-27
 ### Added

From d2adc18755fc3bcbbc73bb41477030f364e6317e Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 3 Dec 2023 20:11:06 -0800
Subject: [PATCH 1339/2068] Disable a flaky configuration cache issue that
 started with Gradle 8.5, hopefully we can get rid of JvmLocalCache soon
 anyway...

---
 .../com/diffplug/gradle/spotless/GitRatchetGradleTest.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GitRatchetGradleTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GitRatchetGradleTest.java
index 51f4808259..ba85155afa 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GitRatchetGradleTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GitRatchetGradleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -153,7 +153,8 @@ private BuildResultAssertion assertFail(String... tasks) throws Exception {
 	private static final String BASELINE_DIRTY = "4cfc3358ccbf186738b82a60276b1e5306bc3870";
 
 	@ParameterizedTest
-	@ValueSource(ints = {0, 1})
+	//@ValueSource(ints = {0, 1}) // TODO: this is a flaky configuration cache issue that started with Gradle 8.5
+	@ValueSource(ints = {0})
 	void multiProject(int useConfigCache) throws Exception {
 		try (Git git = initRepo()) {
 			if (useConfigCache == 1) {

From 053c7aeb6a9c363dea6470e14d54058f513bffa3 Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az1499-347.mb0m5sqlh0wutl0wi0kcl1bndc.bx.internal.cloudapp.net>
Date: Mon, 4 Dec 2023 04:18:57 +0000
Subject: [PATCH 1340/2068] Published lib/2.43.1

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index ac7da8ba05..dd2a1c7999 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.43.1] - 2023-12-04
 ### Fixed
 * Eclipse-based steps which contained any jars with a `+` in their path were broken, now fixed. ([#1860](https://github.com/diffplug/spotless/issues/1860#issuecomment-1826113332))
 ### Changes

From 29bb75cdb02677e276f4f2acbb961fbb4f290c07 Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az1499-347.mb0m5sqlh0wutl0wi0kcl1bndc.bx.internal.cloudapp.net>
Date: Mon, 4 Dec 2023 04:20:50 +0000
Subject: [PATCH 1341/2068] Published gradle/6.23.3

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 56 ++++++++++++++++++++--------------------
 2 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 696828dbac..5c6b219c20 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [6.23.3] - 2023-12-04
 **BREAKING CHANGE** `6.23.0` made breaking changes to the ABI of the `KotlinExtension` and `GroovyExtension`. Those are reflected retroactively now.
   - Previously, we had done semver on the Gradle plugin based only on buildscript compatibility.
   - From now on, we will consider ABI for the benefit of convention-based plugins.
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index be694f910a..7ad010567a 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -14,9 +14,9 @@ output = [
   ].join('\n');
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
-[![Changelog](https://img.shields.io/badge/changelog-6.23.2-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-6.23.3-blue.svg)](CHANGES.md)
 [![MavenCentral](https://img.shields.io/badge/mavencentral-here-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/index.html)
 
 [![VS Code plugin](https://img.shields.io/badge/IDE-VS_Code-blueviolet.svg)](https://marketplace.visualstudio.com/items?itemName=richardwillis.vscode-spotless-gradle)
 [![IntelliJ plugin](https://img.shields.io/badge/IDE-IntelliJ-blueviolet.svg)](https://plugins.jetbrains.com/plugin/18321-spotless-gradle)
@@ -128,10 +128,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -144,7 +144,7 @@ Spotless requires JRE 11+ and Gradle 6.1.1 or newer.
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -301,8 +301,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -357,8 +357,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -436,7 +436,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -468,7 +468,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -500,7 +500,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -536,7 +536,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ### buf
 
-`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
+`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
 
 **WARNING** this step **must** be the first step in the chain, steps before it will be ignored. Thumbs up [this issue](https://github.com/bufbuild/buf/issues/1035) for a resolution, see [here](https://github.com/diffplug/spotless/pull/1208#discussion_r1264439669) for more details on the problem.
 
@@ -568,7 +568,7 @@ buf {
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -589,7 +589,7 @@ spotless {
 
 ## Flexmark
 
-`com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/FlexmarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java)
+`com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/FlexmarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java)
 
 [homepage](https://github.com/vsch/flexmark-java). Flexmark is a flexible Commonmark/Markdown parser that can be used to format Markdown files. It supports different [flavors of Markdown](https://github.com/vsch/flexmark-java#markdown-processor-emulation) and [many formatting options](https://github.com/vsch/flexmark-java/wiki/Markdown-Formatter#options).
 
@@ -608,7 +608,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -633,7 +633,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -673,7 +673,7 @@ sql.formatter.indent.size=4
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -767,7 +767,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## Javascript
 
-- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
+- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
 
 ```gradle
 spotless {
@@ -832,7 +832,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -952,7 +952,7 @@ spotless {
 
 ## YAML
 
-- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
+- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
 
 ```gradle
 spotless {
@@ -984,7 +984,7 @@ spotless {
 
 ## Gherkin
 
-- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
+- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
 
 ```gradle
 spotless {
@@ -1371,7 +1371,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -1451,9 +1451,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -1486,11 +1486,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.2/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From 6de369e03b36ed96c190dccb122be55e7918553b Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az1499-347.mb0m5sqlh0wutl0wi0kcl1bndc.bx.internal.cloudapp.net>
Date: Mon, 4 Dec 2023 04:21:55 +0000
Subject: [PATCH 1342/2068] Published maven/2.41.1

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 07f20d39cb..6ed1087a48 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.41.1] - 2023-12-04
 ### Fixed
 * Revert [#1846](https://github.com/diffplug/spotless/issues/1846) from 2.41.0 which causes the plugin to format generated sources in the `target` directory. ([#1928](https://github.com/diffplug/spotless/pull/1928))
 * Eclipse-based steps which contained any jars with a `+` in their path were broken, now fixed. ([#1860](https://github.com/diffplug/spotless/issues/1860#issuecomment-1826113332))
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 3709a65cdf..f632d78ea7 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -8,8 +8,8 @@ output = [
   ].join('\n');
 -->
 [![MavenCentral](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Changelog](https://img.shields.io/badge/changelog-2.41.0-blue.svg)](CHANGES.md)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.41.0/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.41.1-blue.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.41.1/index.html)
 <!---freshmark /shields -->
 
 <!---freshmark javadoc

From f9d14da41995e14149ccc15cef57afc6c6d13434 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 3 Dec 2023 23:28:35 -0800
Subject: [PATCH 1343/2068] Ignore git ratchet on multiproject and
 singleproject.

---
 .../com/diffplug/gradle/spotless/GitRatchetGradleTest.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GitRatchetGradleTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GitRatchetGradleTest.java
index ba85155afa..0398809f90 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GitRatchetGradleTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GitRatchetGradleTest.java
@@ -54,7 +54,8 @@ protected GradleRunner gradleRunner() throws IOException {
 	}
 
 	@ParameterizedTest
-	@ValueSource(ints = {0, 1})
+	//@ValueSource(ints = {0, 1}) // TODO: this is a flaky configuration cache issue that started with Gradle 8.5
+	@ValueSource(ints = {0})
 	void singleProjectExhaustive(int useConfigCache) throws Exception {
 		try (Git git = initRepo()) {
 			if (useConfigCache == 1) {

From 81128a099f7cf0baf535d28b6235dfb8ab2407e6 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 3 Dec 2023 23:38:10 -0800
Subject: [PATCH 1344/2068] We're seeing warnings from failures that are
 passing on retry.

---
 .github/workflows/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c6d1eede5d..e6c9d91b8c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -85,3 +85,4 @@ jobs:
         with:
           check_name: JUnit ${{ matrix.kind }} ${{ matrix.jre }} ${{ matrix.os }}
           report_paths: '*/build/test-results/*/TEST-*.xml'
+          check_retries: true

From 8e7940b55b021df2250041a0ef32805ad9e42605 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 07:55:59 +0000
Subject: [PATCH 1345/2068] Update plugin com.diffplug.spotless to v6.23.3

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index d01f901ee6..83a7fa8f6d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-	id 'com.diffplug.spotless' version '6.22.0' apply false
+	id 'com.diffplug.spotless' version '6.23.3' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
 	id 'com.gradle.plugin-publish' version '1.2.1' apply false
 	// https://github.com/gradle-nexus/publish-plugin/releases

From eb0df83276d5a1fc044a95c8e4e1be5062ec14a3 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 4 Dec 2023 14:21:32 -0800
Subject: [PATCH 1346/2068] StepHarness (and WithFile) now have a
 `supportsRoundTrip` method so we can start testing round trip serialization
 on steps.

---
 .../spotless/SerializableEqualityTester.java  |  4 +-
 .../com/diffplug/spotless/StepHarness.java    | 18 ++----
 .../diffplug/spotless/StepHarnessBase.java    | 55 +++++++++++++++++++
 .../spotless/StepHarnessWithFile.java         | 16 ++----
 4 files changed, 67 insertions(+), 26 deletions(-)
 create mode 100644 testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java

diff --git a/testlib/src/main/java/com/diffplug/spotless/SerializableEqualityTester.java b/testlib/src/main/java/com/diffplug/spotless/SerializableEqualityTester.java
index 096edf62e2..635f11f305 100644
--- a/testlib/src/main/java/com/diffplug/spotless/SerializableEqualityTester.java
+++ b/testlib/src/main/java/com/diffplug/spotless/SerializableEqualityTester.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -71,7 +71,7 @@ public void areDifferentThan() {
 	}
 
 	@SuppressWarnings("unchecked")
-	private static <T extends Serializable> T reserialize(T input) {
+	static <T extends Serializable> T reserialize(T input) {
 		byte[] asBytes = LazyForwardingEquality.toBytes(input);
 		ByteArrayInputStream byteInput = new ByteArrayInputStream(asBytes);
 		try (ObjectInputStream objectInput = new ObjectInputStream(byteInput)) {
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarness.java b/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
index c611cc738a..79c759770f 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
@@ -21,17 +21,14 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Paths;
 import java.util.Arrays;
-import java.util.Objects;
 
 import org.assertj.core.api.AbstractStringAssert;
 import org.assertj.core.api.Assertions;
 
 /** An api for testing a {@code FormatterStep} that doesn't depend on the File path. DO NOT ADD FILE SUPPORT TO THIS, use {@link StepHarnessWithFile} if you need that. */
-public class StepHarness implements AutoCloseable {
-	private final Formatter formatter;
-
+public class StepHarness extends StepHarnessBase<StepHarness> {
 	private StepHarness(Formatter formatter) {
-		this.formatter = Objects.requireNonNull(formatter);
+		super(formatter);
 	}
 
 	/** Creates a harness for testing steps which don't depend on the file. */
@@ -57,14 +54,14 @@ public static StepHarness forFormatter(Formatter formatter) {
 
 	/** Asserts that the given element is transformed as expected, and that the result is idempotent. */
 	public StepHarness test(String before, String after) {
-		String actual = formatter.compute(LineEnding.toUnix(before), new File(""));
+		String actual = formatter().compute(LineEnding.toUnix(before), new File(""));
 		assertEquals(after, actual, "Step application failed");
 		return testUnaffected(after);
 	}
 
 	/** Asserts that the given element is idempotent w.r.t the step under test. */
 	public StepHarness testUnaffected(String idempotentElement) {
-		String actual = formatter.compute(LineEnding.toUnix(idempotentElement), new File(""));
+		String actual = formatter().compute(LineEnding.toUnix(idempotentElement), new File(""));
 		assertEquals(idempotentElement, actual, "Step is not idempotent");
 		return this;
 	}
@@ -88,7 +85,7 @@ public AbstractStringAssert<?> testResourceExceptionMsg(String resourceBefore) {
 
 	public AbstractStringAssert<?> testExceptionMsg(String before) {
 		try {
-			formatter.compute(LineEnding.toUnix(before), Formatter.NO_FILE_SENTINEL);
+			formatter().compute(LineEnding.toUnix(before), Formatter.NO_FILE_SENTINEL);
 			throw new SecurityException("Expected exception");
 		} catch (Throwable e) {
 			if (e instanceof SecurityException) {
@@ -105,9 +102,4 @@ public AbstractStringAssert<?> testExceptionMsg(String before) {
 			}
 		}
 	}
-
-	@Override
-	public void close() {
-		formatter.close();
-	}
 }
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
new file mode 100644
index 0000000000..95b54b7fbb
--- /dev/null
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless;
+
+import java.util.Objects;
+
+import org.assertj.core.api.Assertions;
+
+class StepHarnessBase<T extends StepHarnessBase<?>> implements AutoCloseable {
+	private final Formatter formatter;
+	private Formatter roundTripped;
+	private boolean supportsRoundTrip = false;
+
+	protected StepHarnessBase(Formatter formatter) {
+		this.formatter = Objects.requireNonNull(formatter);
+	}
+
+	public T supportsRoundTrip(boolean supportsRoundTrip) {
+		this.supportsRoundTrip = supportsRoundTrip;
+		return (T) this;
+	}
+
+	protected Formatter formatter() {
+		if (!supportsRoundTrip) {
+			return formatter;
+		} else {
+			if (roundTripped == null) {
+				roundTripped = SerializableEqualityTester.reserialize(formatter);
+				Assertions.assertThat(roundTripped).isEqualTo(formatter);
+			}
+			return roundTripped;
+		}
+	}
+
+	@Override
+	public void close() {
+		formatter.close();
+		if (roundTripped != null) {
+			roundTripped.close();
+		}
+	}
+}
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java b/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java
index 9a9eb4042b..83bbbe09a1 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java
@@ -26,13 +26,12 @@
 import org.assertj.core.api.Assertions;
 
 /** An api for testing a {@code FormatterStep} that depends on the File path. */
-public class StepHarnessWithFile implements AutoCloseable {
-	private final Formatter formatter;
+public class StepHarnessWithFile extends StepHarnessBase<StepHarnessWithFile> {
 	private final ResourceHarness harness;
 
 	private StepHarnessWithFile(ResourceHarness harness, Formatter formatter) {
+		super(formatter);
 		this.harness = Objects.requireNonNull(harness);
-		this.formatter = Objects.requireNonNull(formatter);
 	}
 
 	/** Creates a harness for testing steps which do depend on the file. */
@@ -54,14 +53,14 @@ public static StepHarnessWithFile forFormatter(ResourceHarness harness, Formatte
 
 	/** Asserts that the given element is transformed as expected, and that the result is idempotent. */
 	public StepHarnessWithFile test(File file, String before, String after) {
-		String actual = formatter.compute(LineEnding.toUnix(before), file);
+		String actual = formatter().compute(LineEnding.toUnix(before), file);
 		assertEquals(after, actual, "Step application failed");
 		return testUnaffected(file, after);
 	}
 
 	/** Asserts that the given element is idempotent w.r.t the step under test. */
 	public StepHarnessWithFile testUnaffected(File file, String idempotentElement) {
-		String actual = formatter.compute(LineEnding.toUnix(idempotentElement), file);
+		String actual = formatter().compute(LineEnding.toUnix(idempotentElement), file);
 		assertEquals(idempotentElement, actual, "Step is not idempotent");
 		return this;
 	}
@@ -96,7 +95,7 @@ public AbstractStringAssert<?> testResourceExceptionMsg(String filename, String
 
 	public AbstractStringAssert<?> testExceptionMsg(File file, String before) {
 		try {
-			formatter.compute(LineEnding.toUnix(before), file);
+			formatter().compute(LineEnding.toUnix(before), file);
 			throw new SecurityException("Expected exception");
 		} catch (Throwable e) {
 			if (e instanceof SecurityException) {
@@ -110,9 +109,4 @@ public AbstractStringAssert<?> testExceptionMsg(File file, String before) {
 			}
 		}
 	}
-
-	@Override
-	public void close() {
-		formatter.close();
-	}
 }

From e3843cd1865aecb2ed1936f3df2786aac1b0ec6b Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 4 Dec 2023 14:58:07 -0800
Subject: [PATCH 1347/2068] `StepHarnessBase` is now embarked on a methodical
 journey to make every step support roundtrip serialization.

---
 .../diffplug/spotless/StepHarnessBase.java    | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
index 95b54b7fbb..f370b5d716 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
@@ -26,11 +26,23 @@ class StepHarnessBase<T extends StepHarnessBase<?>> implements AutoCloseable {
 
 	protected StepHarnessBase(Formatter formatter) {
 		this.formatter = Objects.requireNonNull(formatter);
-	}
-
-	public T supportsRoundTrip(boolean supportsRoundTrip) {
-		this.supportsRoundTrip = supportsRoundTrip;
-		return (T) this;
+		if (formatter.getSteps().size() == 1) {
+			// our goal is for everything to be roundtrip serializable
+			// the steps to get there are
+			// - make every individual step round-trippable
+			// - make the other machinery (Formatter, LineEnding, etc) round-trippable
+			// - done!
+			//
+			// Right now, we're still trying to get each and every single step to be round-trippable.
+			// You can help by add a test below, make sure that the test for that step fails, and then
+			// make the test pass. `FormatterStepEqualityOnStateSerialization` is a good base class for
+			// easily converting a step to round-trip serialization while maintaining easy and concise
+			// equality code.
+			String onlyStepName = formatter.getSteps().get(0).getName();
+			if (onlyStepName.startsWith("indentWith")) {
+				supportsRoundTrip = true;
+			}
+		}
 	}
 
 	protected Formatter formatter() {

From cb346a48f2712f80819c717a32c62f18c3c58dca Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 4 Dec 2023 15:19:14 -0800
Subject: [PATCH 1348/2068] Introduce a new `FormatterStep` base class for the
 serialized roundtrip world.

---
 .../java/com/diffplug/spotless/Formatter.java |  2 +
 ...atterStepEqualityOnStateSerialization.java | 91 +++++++++++++++++++
 2 files changed, 93 insertions(+)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/FormatterStepEqualityOnStateSerialization.java

diff --git a/lib/src/main/java/com/diffplug/spotless/Formatter.java b/lib/src/main/java/com/diffplug/spotless/Formatter.java
index 68d9c443bf..5d2ca8369e 100644
--- a/lib/src/main/java/com/diffplug/spotless/Formatter.java
+++ b/lib/src/main/java/com/diffplug/spotless/Formatter.java
@@ -304,6 +304,8 @@ public void close() {
 		for (FormatterStep step : steps) {
 			if (step instanceof FormatterStepImpl.Standard) {
 				((FormatterStepImpl.Standard) step).cleanupFormatterFunc();
+			} else if (step instanceof FormatterStepEqualityOnStateSerialization) {
+				((FormatterStepEqualityOnStateSerialization) step).cleanupFormatterFunc();
 			}
 		}
 	}
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStepEqualityOnStateSerialization.java b/lib/src/main/java/com/diffplug/spotless/FormatterStepEqualityOnStateSerialization.java
new file mode 100644
index 0000000000..6172d252f9
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStepEqualityOnStateSerialization.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2016-2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless;
+
+import java.io.File;
+import java.io.Serializable;
+import java.util.Arrays;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Standard implementation of FormatterStep which cleanly enforces
+ * separation of a lazily computed "state" object whose serialized form
+ * is used as the basis for equality and hashCode, which is separate
+ * from the serialized form of the step itself, which can include absolute paths
+ * and such without interfering with buildcache keys.
+ */
+@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
+public abstract class FormatterStepEqualityOnStateSerialization<State extends Serializable> implements FormatterStep, Serializable {
+	private static final long serialVersionUID = 1L;
+
+	protected abstract State stateSupplier() throws Exception;
+
+	protected abstract FormatterFunc stateToFormatter(State state) throws Exception;
+
+	private transient FormatterFunc formatter;
+	private transient State stateInternal;
+	private transient byte[] serializedStateInternal;
+
+	@Override
+	public String format(String rawUnix, File file) throws Exception {
+		if (formatter == null) {
+			formatter = stateToFormatter(state());
+		}
+		return formatter.apply(rawUnix, file);
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (o == null) {
+			return false;
+		} else if (getClass() != o.getClass()) {
+			return false;
+		} else {
+			return Arrays.equals(serializedState(), ((FormatterStepEqualityOnStateSerialization<?>) o).serializedState());
+		}
+	}
+
+	@Override
+	public int hashCode() {
+		return Arrays.hashCode(serializedState());
+	}
+
+	void cleanupFormatterFunc() {
+		if (formatter instanceof FormatterFunc.Closeable) {
+			((FormatterFunc.Closeable) formatter).close();
+			formatter = null;
+		}
+	}
+
+	private State state() throws Exception {
+		if (stateInternal == null) {
+			stateInternal = stateSupplier();
+		}
+		return stateInternal;
+	}
+
+	private byte[] serializedState() {
+		if (serializedStateInternal == null) {
+			try {
+				serializedStateInternal = LazyForwardingEquality.toBytes(state());
+			} catch (Exception e) {
+				throw new RuntimeException(e);
+			}
+		}
+		return serializedStateInternal;
+	}
+}

From decbd1bae4147405eeccdf9aab4abe29c8f99634 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 4 Dec 2023 15:29:24 -0800
Subject: [PATCH 1349/2068] Convert `IndentStep` to be roundtrip serializable.

---
 .../diffplug/spotless/generic/IndentStep.java | 59 ++++++++++---------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/generic/IndentStep.java b/lib/src/main/java/com/diffplug/spotless/generic/IndentStep.java
index 4281df736c..6f092d8746 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/IndentStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/IndentStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,19 +15,38 @@
  */
 package com.diffplug.spotless.generic;
 
-import java.io.Serializable;
-import java.util.Objects;
-
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.FormatterStepEqualityOnStateSerialization;
 
 /** Simple step which checks for consistent indentation characters. */
-public final class IndentStep {
+public final class IndentStep extends FormatterStepEqualityOnStateSerialization<IndentStep> {
+	private static final long serialVersionUID = 1L;
 
-	private static final int DEFAULT_NUM_SPACES_PER_TAB = 4;
+	final Type type;
+	final int numSpacesPerTab;
+
+	private IndentStep(Type type, int numSpacesPerTab) {
+		this.type = type;
+		this.numSpacesPerTab = numSpacesPerTab;
+	}
+
+	@Override
+	public String getName() {
+		return "indentWith" + type.tabSpace("Tabs", "Spaces");
+	}
+
+	@Override
+	protected IndentStep stateSupplier() {
+		return this;
+	}
+
+	@Override
+	protected FormatterFunc stateToFormatter(IndentStep state) {
+		return new Runtime(this)::format;
+	}
 
-	// prevent direct instantiation
-	private IndentStep() {}
+	private static final int DEFAULT_NUM_SPACES_PER_TAB = 4;
 
 	public enum Type {
 		TAB, SPACE;
@@ -49,32 +68,14 @@ public FormatterStep create(int numSpacesPerTab) {
 
 	/** Creates a step which will indent with the given type of whitespace, converting between tabs and spaces at the given ratio. */
 	public static FormatterStep create(Type type, int numSpacesPerTab) {
-		Objects.requireNonNull(type, "type");
-		return FormatterStep.create("indentWith" + type.tabSpace("Tabs", "Spaces"),
-				new State(type, numSpacesPerTab), State::toFormatter);
-	}
-
-	private static class State implements Serializable {
-		private static final long serialVersionUID = 1L;
-
-		final Type type;
-		final int numSpacesPerTab;
-
-		State(Type type, int numSpacesPerTab) {
-			this.type = type;
-			this.numSpacesPerTab = numSpacesPerTab;
-		}
-
-		FormatterFunc toFormatter() {
-			return new Runtime(this)::format;
-		}
+		return new IndentStep(type, numSpacesPerTab);
 	}
 
 	static class Runtime {
-		final State state;
+		final IndentStep state;
 		final StringBuilder builder = new StringBuilder();
 
-		Runtime(State state) {
+		Runtime(IndentStep state) {
 			this.state = state;
 		}
 

From 317b2ac571e1956bc06013a6a15473366b665bab Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 4 Dec 2023 15:58:25 -0800
Subject: [PATCH 1350/2068] Remove the long-deprecated and completely unused
 `Set<String> mavenCoordinates` field from `JarState`.

---
 .../spotless/extra/EclipseBasedStepBuilder.java  |  9 +--------
 .../java/com/diffplug/spotless/JarState.java     | 16 +++-------------
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/EclipseBasedStepBuilder.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/EclipseBasedStepBuilder.java
index 4f48a5ed74..0cf14eb32c 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/EclipseBasedStepBuilder.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/EclipseBasedStepBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.Properties;
 
 import com.diffplug.common.base.Errors;
@@ -187,12 +186,6 @@ public Properties getPreferences() {
 			return preferences.getProperties();
 		}
 
-		/** Returns first coordinate from sorted set that starts with a given prefix.*/
-		public Optional<String> getMavenCoordinate(String prefix) {
-			return jarState.getMavenCoordinates().stream()
-					.filter(coordinate -> coordinate.startsWith(prefix)).findFirst();
-		}
-
 		/**
 		 * Load class based on the given configuration of JAR provider and Maven coordinates.
 		 * Different class loader instances are provided in the following scenarios:
diff --git a/lib/src/main/java/com/diffplug/spotless/JarState.java b/lib/src/main/java/com/diffplug/spotless/JarState.java
index 48686c49f8..3dd46a9f3e 100644
--- a/lib/src/main/java/com/diffplug/spotless/JarState.java
+++ b/lib/src/main/java/com/diffplug/spotless/JarState.java
@@ -25,7 +25,6 @@
 import java.util.NoSuchElementException;
 import java.util.Objects;
 import java.util.Set;
-import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -39,12 +38,9 @@
 public final class JarState implements Serializable {
 	private static final long serialVersionUID = 1L;
 
-	@Deprecated
-	private final Set<String> mavenCoordinates;
 	private final FileSignature fileSignature;
 
-	private JarState(Collection<String> mavenCoordinates, FileSignature fileSignature) {
-		this.mavenCoordinates = new TreeSet<>(mavenCoordinates);
+	private JarState(FileSignature fileSignature) {
 		this.fileSignature = fileSignature;
 	}
 
@@ -71,13 +67,13 @@ private static JarState provisionWithTransitives(boolean withTransitives, Collec
 			throw new NoSuchElementException("Resolved to an empty result: " + mavenCoordinates.stream().collect(Collectors.joining(", ")));
 		}
 		FileSignature fileSignature = FileSignature.signAsSet(jars);
-		return new JarState(mavenCoordinates, fileSignature);
+		return new JarState(fileSignature);
 	}
 
 	/** Wraps the given collection of a files as a JarState, maintaining the order in the Collection. */
 	public static JarState preserveOrder(Collection<File> jars) throws IOException {
 		FileSignature fileSignature = FileSignature.signAsList(jars);
-		return new JarState(Collections.emptySet(), fileSignature);
+		return new JarState(fileSignature);
 	}
 
 	URL[] jarUrls() {
@@ -107,10 +103,4 @@ public ClassLoader getClassLoader() {
 	public ClassLoader getClassLoader(Serializable key) {
 		return SpotlessCache.instance().classloader(key, this);
 	}
-
-	/** Returns unmodifiable view on sorted Maven coordinates */
-	@Deprecated
-	public Set<String> getMavenCoordinates() {
-		return Collections.unmodifiableSet(mavenCoordinates);
-	}
 }

From e4d6c494443ace8a86ec3aabeeee9bf47f2806cb Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 4 Dec 2023 16:21:34 -0800
Subject: [PATCH 1351/2068] Introduce `FileSignature.RoundTrippable` and
 `JarState.Promised` so that maven-based formatters can be safely
 roundtripped.

---
 .../com/diffplug/spotless/FileSignature.java  | 44 ++++++++++++++++++-
 .../java/com/diffplug/spotless/JarState.java  | 43 ++++++++++++++++++
 2 files changed, 86 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/FileSignature.java b/lib/src/main/java/com/diffplug/spotless/FileSignature.java
index 59893f26e6..e31337e39c 100644
--- a/lib/src/main/java/com/diffplug/spotless/FileSignature.java
+++ b/lib/src/main/java/com/diffplug/spotless/FileSignature.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,6 +33,7 @@
 import java.util.Locale;
 import java.util.Map;
 
+import edu.umd.cs.findbugs.annotations.Nullable;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /** Computes a signature for any needed files. */
@@ -43,6 +44,8 @@ public final class FileSignature implements Serializable {
 	 * Transient because not needed to uniquely identify a FileSignature instance, and also because
 	 * Gradle only needs this class to be Serializable so it can compare FileSignature instances for
 	 * incremental builds.
+	 *
+	 * We don't want these absolute paths to screw up buildcache keys.
 	 */
 	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
 	private final transient List<File> files;
@@ -93,6 +96,45 @@ private FileSignature(final List<File> files) throws IOException {
 		}
 	}
 
+	/** A view of `FileSignature` which can be safely roundtripped. */
+	public static class RoundTrippable implements Serializable {
+		private final List<File> files;
+		private transient @Nullable FileSignature cached;
+
+		private RoundTrippable(List<File> files, FileSignature cached) {
+			this.files = files;
+			this.cached = cached;
+		}
+
+		public FileSignature stripAbsolutePaths() throws IOException {
+			if (cached == null) {
+				// null when restored via serialization
+				cached = new FileSignature(files);
+			}
+			return cached;
+		}
+	}
+
+	public RoundTrippable roundTrippable() {
+		return new RoundTrippable(files, this);
+	}
+
+	public static @Nullable RoundTrippable roundTrippableNullable(@Nullable FileSignature signature) {
+		if (signature != null) {
+			return signature.roundTrippable();
+		} else {
+			return null;
+		}
+	}
+
+	public static @Nullable FileSignature stripAbsolutePathsNullable(@Nullable RoundTrippable roundTrippable) throws IOException {
+		if (roundTrippable != null) {
+			return roundTrippable.stripAbsolutePaths();
+		} else {
+			return null;
+		}
+	}
+
 	/** Returns all of the files in this signature, throwing an exception if there are more or less than 1 file. */
 	public Collection<File> files() {
 		return Collections.unmodifiableList(files);
diff --git a/lib/src/main/java/com/diffplug/spotless/JarState.java b/lib/src/main/java/com/diffplug/spotless/JarState.java
index 3dd46a9f3e..5a52b4af6d 100644
--- a/lib/src/main/java/com/diffplug/spotless/JarState.java
+++ b/lib/src/main/java/com/diffplug/spotless/JarState.java
@@ -17,6 +17,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.ObjectStreamException;
 import java.io.Serializable;
 import java.net.URI;
 import java.net.URL;
@@ -36,6 +37,48 @@
  * catch changes in a SNAPSHOT version.
  */
 public final class JarState implements Serializable {
+	/** A lazily evaluated JarState, which becomes a set of files when serialized. */
+	public static class Promised implements Serializable {
+		private final transient ThrowingEx.Supplier<JarState> supplier;
+		private FileSignature.RoundTrippable cached;
+
+		public Promised(ThrowingEx.Supplier<JarState> supplier) {
+			this.supplier = supplier;
+		}
+
+		public JarState get() {
+			try {
+				if (cached == null) {
+					JarState result = supplier.get();
+					cached = result.fileSignature.roundTrippable();
+					return result;
+				}
+				return new JarState(cached.stripAbsolutePaths());
+			} catch (Exception e) {
+				throw ThrowingEx.asRuntime(e);
+			}
+		}
+
+		// override serialize output
+		private void writeObject(java.io.ObjectOutputStream out)
+				throws IOException {
+			get();
+			out.defaultWriteObject();
+		}
+
+		private void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException {
+			in.defaultReadObject();
+		}
+
+		private void readObjectNoData() throws ObjectStreamException {
+			throw new UnsupportedOperationException();
+		}
+	}
+
+	public static Promised promise(ThrowingEx.Supplier<JarState> supplier) {
+		return new Promised(supplier);
+	}
+
 	private static final long serialVersionUID = 1L;
 
 	private final FileSignature fileSignature;

From 6f7edd33ec2e7f7ccb273fe36761eb4923547168 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 4 Dec 2023 16:21:52 -0800
Subject: [PATCH 1352/2068] Make `DiktatStep` round-trippable.

---
 .../diffplug/spotless/kotlin/DiktatStep.java  | 43 +++++++++++++------
 .../diffplug/spotless/StepHarnessBase.java    |  2 +
 2 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
index a2650e31fc..1e4b6ef7d8 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
@@ -25,10 +25,16 @@
 import com.diffplug.spotless.*;
 
 /** Wraps up <a href="https://github.com/cqfn/diKTat">diktat</a> as a FormatterStep. */
-public class DiktatStep {
-
-	// prevent direct instantiation
-	private DiktatStep() {}
+public class DiktatStep extends FormatterStepEqualityOnStateSerialization<DiktatStep.State> {
+	private final JarState.Promised jarState;
+	private final boolean isScript;
+	private final @Nullable FileSignature.RoundTrippable config;
+
+	private DiktatStep(JarState.Promised jarState, boolean isScript, @Nullable FileSignature config) {
+		this.jarState = jarState;
+		this.isScript = isScript;
+		this.config = FileSignature.roundTrippableNullable(config);
+	}
 
 	private static final String MIN_SUPPORTED_VERSION = "1.2.1";
 
@@ -59,26 +65,35 @@ public static FormatterStep create(String versionDiktat, Provisioner provisioner
 		}
 		Objects.requireNonNull(versionDiktat, "versionDiktat");
 		Objects.requireNonNull(provisioner, "provisioner");
-		return FormatterStep.createLazy(NAME,
-				() -> new DiktatStep.State(versionDiktat, provisioner, isScript, config),
-				DiktatStep.State::createFormat);
+		return new DiktatStep(JarState.promise(() -> JarState.from(MAVEN_COORDINATE + versionDiktat, provisioner)), isScript, config);
+	}
+
+	@Override
+	public String getName() {
+		return NAME;
+	}
+
+	@Override
+	protected State stateSupplier() throws Exception {
+		return new State(jarState.get(), isScript, FileSignature.stripAbsolutePathsNullable(config));
+	}
+
+	@Override
+	protected FormatterFunc stateToFormatter(State state) throws Exception {
+		return state.createFormat();
 	}
 
 	static final class State implements Serializable {
 
 		private static final long serialVersionUID = 1L;
 
+		final JarState jar;
 		/** Are the files being linted Kotlin script files. */
 		private final boolean isScript;
 		private final @Nullable FileSignature config;
-		final JarState jar;
-
-		State(String versionDiktat, Provisioner provisioner, boolean isScript, @Nullable FileSignature config) throws IOException {
-
-			HashSet<String> pkgSet = new HashSet<>();
-			pkgSet.add(MAVEN_COORDINATE + versionDiktat);
 
-			this.jar = JarState.from(pkgSet, provisioner);
+		State(JarState jar, boolean isScript, @Nullable FileSignature config) throws IOException {
+			this.jar = jar;
 			this.isScript = isScript;
 			this.config = config;
 		}
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
index f370b5d716..0a0154176b 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
@@ -41,6 +41,8 @@ protected StepHarnessBase(Formatter formatter) {
 			String onlyStepName = formatter.getSteps().get(0).getName();
 			if (onlyStepName.startsWith("indentWith")) {
 				supportsRoundTrip = true;
+			} else if (onlyStepName.equals("diktat")) {
+				supportsRoundTrip = true;
 			}
 		}
 	}

From 9fa1da3126ab55898f2d41e243aebd67d302024c Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 4 Dec 2023 16:28:54 -0800
Subject: [PATCH 1353/2068] Fix spotbugs warnings.

---
 lib/src/main/java/com/diffplug/spotless/FileSignature.java     | 2 ++
 lib/src/main/java/com/diffplug/spotless/JarState.java          | 1 +
 lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java | 1 +
 3 files changed, 4 insertions(+)

diff --git a/lib/src/main/java/com/diffplug/spotless/FileSignature.java b/lib/src/main/java/com/diffplug/spotless/FileSignature.java
index e31337e39c..05777ccdcc 100644
--- a/lib/src/main/java/com/diffplug/spotless/FileSignature.java
+++ b/lib/src/main/java/com/diffplug/spotless/FileSignature.java
@@ -98,7 +98,9 @@ private FileSignature(final List<File> files) throws IOException {
 
 	/** A view of `FileSignature` which can be safely roundtripped. */
 	public static class RoundTrippable implements Serializable {
+		private static final long serialVersionUID = 1L;
 		private final List<File> files;
+		@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
 		private transient @Nullable FileSignature cached;
 
 		private RoundTrippable(List<File> files, FileSignature cached) {
diff --git a/lib/src/main/java/com/diffplug/spotless/JarState.java b/lib/src/main/java/com/diffplug/spotless/JarState.java
index 5a52b4af6d..70de7fb7c5 100644
--- a/lib/src/main/java/com/diffplug/spotless/JarState.java
+++ b/lib/src/main/java/com/diffplug/spotless/JarState.java
@@ -39,6 +39,7 @@
 public final class JarState implements Serializable {
 	/** A lazily evaluated JarState, which becomes a set of files when serialized. */
 	public static class Promised implements Serializable {
+		private static final long serialVersionUID = 1L;
 		private final transient ThrowingEx.Supplier<JarState> supplier;
 		private FileSignature.RoundTrippable cached;
 
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
index 1e4b6ef7d8..9ad96797e9 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
@@ -26,6 +26,7 @@
 
 /** Wraps up <a href="https://github.com/cqfn/diKTat">diktat</a> as a FormatterStep. */
 public class DiktatStep extends FormatterStepEqualityOnStateSerialization<DiktatStep.State> {
+	private static final long serialVersionUID = 1L;
 	private final JarState.Promised jarState;
 	private final boolean isScript;
 	private final @Nullable FileSignature.RoundTrippable config;

From 873ce0b119d75be6d240d55e08f6147a2452a04e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 5 Dec 2023 04:24:18 +0000
Subject: [PATCH 1354/2068] Update plugin com.github.spotbugs to v6.0.2

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 83a7fa8f6d..5118bae9e8 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,7 +12,7 @@ plugins {
 	// https://github.com/gradle-nexus/publish-plugin/releases
 	id 'io.github.gradle-nexus.publish-plugin' version '2.0.0-rc-1' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
-	id 'com.github.spotbugs' version '6.0.1' apply false
+	id 'com.github.spotbugs' version '6.0.2' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
 	id 'com.diffplug.spotless-changelog' version '3.0.2' apply false
 	// https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md

From 144394c2d87d0382941e96f4a80a76300b48547e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 5 Dec 2023 15:38:36 +0000
Subject: [PATCH 1355/2068] Update plugin com.gradle.enterprise to v3.16

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 83a7fa8f6d..11578b28a2 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -20,7 +20,7 @@ plugins {
 	// https://github.com/davidburstrom/version-compatibility-gradle-plugin/tags
 	id 'io.github.davidburstrom.version-compatibility' version '0.5.0' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.enterprise
-	id 'com.gradle.enterprise' version '3.15.1'
+	id 'com.gradle.enterprise' version '3.16'
 	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
 	id 'dev.equo.ide' version '1.7.3' apply false
 }

From cce20d45e78788189212d2ca89bda460927173bb Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 5 Dec 2023 11:54:35 -0800
Subject: [PATCH 1356/2068] Rename `FileSignature.RoundTrippable` to
 `FileSignature.Promised` to match `JarState`'s naming convention.

---
 .../com/diffplug/spotless/FileSignature.java     | 16 ++++++++++------
 .../java/com/diffplug/spotless/JarState.java     |  2 +-
 .../com/diffplug/spotless/kotlin/DiktatStep.java |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/FileSignature.java b/lib/src/main/java/com/diffplug/spotless/FileSignature.java
index 05777ccdcc..92518cca17 100644
--- a/lib/src/main/java/com/diffplug/spotless/FileSignature.java
+++ b/lib/src/main/java/com/diffplug/spotless/FileSignature.java
@@ -97,13 +97,13 @@ private FileSignature(final List<File> files) throws IOException {
 	}
 
 	/** A view of `FileSignature` which can be safely roundtripped. */
-	public static class RoundTrippable implements Serializable {
+	public static class Promised implements Serializable {
 		private static final long serialVersionUID = 1L;
 		private final List<File> files;
 		@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
 		private transient @Nullable FileSignature cached;
 
-		private RoundTrippable(List<File> files, FileSignature cached) {
+		private Promised(List<File> files, FileSignature cached) {
 			this.files = files;
 			this.cached = cached;
 		}
@@ -117,11 +117,15 @@ public FileSignature stripAbsolutePaths() throws IOException {
 		}
 	}
 
-	public RoundTrippable roundTrippable() {
-		return new RoundTrippable(files, this);
+	public static Promised promise(Iterable<File> files) {
+		return new Promised(MoreIterables.toNullHostileList(files), null);
 	}
 
-	public static @Nullable RoundTrippable roundTrippableNullable(@Nullable FileSignature signature) {
+	public Promised roundTrippable() {
+		return new Promised(files, this);
+	}
+
+	public static @Nullable Promised roundTrippableNullable(@Nullable FileSignature signature) {
 		if (signature != null) {
 			return signature.roundTrippable();
 		} else {
@@ -129,7 +133,7 @@ public RoundTrippable roundTrippable() {
 		}
 	}
 
-	public static @Nullable FileSignature stripAbsolutePathsNullable(@Nullable RoundTrippable roundTrippable) throws IOException {
+	public static @Nullable FileSignature stripAbsolutePathsNullable(@Nullable Promised roundTrippable) throws IOException {
 		if (roundTrippable != null) {
 			return roundTrippable.stripAbsolutePaths();
 		} else {
diff --git a/lib/src/main/java/com/diffplug/spotless/JarState.java b/lib/src/main/java/com/diffplug/spotless/JarState.java
index 70de7fb7c5..659894a40a 100644
--- a/lib/src/main/java/com/diffplug/spotless/JarState.java
+++ b/lib/src/main/java/com/diffplug/spotless/JarState.java
@@ -41,7 +41,7 @@ public final class JarState implements Serializable {
 	public static class Promised implements Serializable {
 		private static final long serialVersionUID = 1L;
 		private final transient ThrowingEx.Supplier<JarState> supplier;
-		private FileSignature.RoundTrippable cached;
+		private FileSignature.Promised cached;
 
 		public Promised(ThrowingEx.Supplier<JarState> supplier) {
 			this.supplier = supplier;
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
index 9ad96797e9..6e01eda91e 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
@@ -29,7 +29,7 @@ public class DiktatStep extends FormatterStepEqualityOnStateSerialization<Diktat
 	private static final long serialVersionUID = 1L;
 	private final JarState.Promised jarState;
 	private final boolean isScript;
-	private final @Nullable FileSignature.RoundTrippable config;
+	private final @Nullable FileSignature.Promised config;
 
 	private DiktatStep(JarState.Promised jarState, boolean isScript, @Nullable FileSignature config) {
 		this.jarState = jarState;

From d1dc4b04029422e9753cbafdccd8de3559705bd4 Mon Sep 17 00:00:00 2001
From: Steven Sheehy <steven.sheehy@swirldslabs.com>
Date: Tue, 5 Dec 2023 17:55:44 -0600
Subject: [PATCH 1357/2068] Bump palantir-java-format from 2.38.0 to 2.39.0

Signed-off-by: Steven Sheehy <steven.sheehy@swirldslabs.com>
---
 CHANGES.md                                                      | 2 ++
 .../java/com/diffplug/spotless/java/PalantirJavaFormatStep.java | 2 +-
 plugin-gradle/CHANGES.md                                        | 2 ++
 plugin-maven/CHANGES.md                                         | 2 ++
 .../diffplug/spotless/maven/java/PalantirJavaFormatTest.java    | 2 +-
 5 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index dd2a1c7999..3393a04f1c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Changes
+* Use palantir-java-format 2.39.0 on Java 21. ([#XXXX](https://github.com/diffplug/spotless/pull/XXXX))
 
 ## [2.43.1] - 2023-12-04
 ### Fixed
diff --git a/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
index 8cb828c624..88488ac2d7 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
@@ -30,7 +30,7 @@ private PalantirJavaFormatStep() {}
 	private static final String DEFAULT_STYLE = "PALANTIR";
 	private static final String NAME = "palantir-java-format";
 	public static final String MAVEN_COORDINATE = "com.palantir.javaformat:palantir-java-format:";
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(8, "1.1.0").add(11, "2.28.0").add(21, "2.38.0");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(8, "1.1.0").add(11, "2.28.0").add(21, "2.39.0");
 
 	/** Creates a step which formats everything - code, import order, and unused imports. */
 	public static FormatterStep create(Provisioner provisioner) {
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 5c6b219c20..1a36cf6741 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Changes
+* Use palantir-java-format 2.39.0 on Java 21. ([#XXXX](https://github.com/diffplug/spotless/pull/XXXX))
 
 ## [6.23.3] - 2023-12-04
 **BREAKING CHANGE** `6.23.0` made breaking changes to the ABI of the `KotlinExtension` and `GroovyExtension`. Those are reflected retroactively now.
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 6ed1087a48..f08b5dd0bc 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Changes
+* Use palantir-java-format 2.39.0 on Java 21. ([#XXXX](https://github.com/diffplug/spotless/pull/XXXX))
 
 ## [2.41.1] - 2023-12-04
 ### Fixed
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/PalantirJavaFormatTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/PalantirJavaFormatTest.java
index 6a3fd8b08b..685f00595c 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/PalantirJavaFormatTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/PalantirJavaFormatTest.java
@@ -34,7 +34,7 @@ void specificVersionDefaultStyle() throws Exception {
 	void specificJava11Version2() throws Exception {
 		writePomWithJavaSteps(
 				"<palantirJavaFormat>",
-				"  <version>2.38.0</version>",
+				"  <version>2.39.0</version>",
 				"</palantirJavaFormat>");
 
 		runTest("java/palantirjavaformat/JavaCodeFormatted.test");

From eb84d2edb7aa86901768b4bba0443f3dc79788d2 Mon Sep 17 00:00:00 2001
From: Steven Sheehy <steven.sheehy@swirldslabs.com>
Date: Tue, 5 Dec 2023 18:01:13 -0600
Subject: [PATCH 1358/2068] Update CHANGES with PR #

Signed-off-by: Steven Sheehy <steven.sheehy@swirldslabs.com>
---
 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 3393a04f1c..8293abcd22 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,7 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Changes
-* Use palantir-java-format 2.39.0 on Java 21. ([#XXXX](https://github.com/diffplug/spotless/pull/XXXX))
+* Use palantir-java-format 2.39.0 on Java 21. ([#1948](https://github.com/diffplug/spotless/pull/1948))
 
 ## [2.43.1] - 2023-12-04
 ### Fixed
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 1a36cf6741..d888f4863f 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -4,7 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Changes
-* Use palantir-java-format 2.39.0 on Java 21. ([#XXXX](https://github.com/diffplug/spotless/pull/XXXX))
+* Use palantir-java-format 2.39.0 on Java 21. ([#1948](https://github.com/diffplug/spotless/pull/1948))
 
 ## [6.23.3] - 2023-12-04
 **BREAKING CHANGE** `6.23.0` made breaking changes to the ABI of the `KotlinExtension` and `GroovyExtension`. Those are reflected retroactively now.
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index f08b5dd0bc..4fab316049 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -4,7 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Changes
-* Use palantir-java-format 2.39.0 on Java 21. ([#XXXX](https://github.com/diffplug/spotless/pull/XXXX))
+* Use palantir-java-format 2.39.0 on Java 21. ([#1948](https://github.com/diffplug/spotless/pull/1948))
 
 ## [2.41.1] - 2023-12-04
 ### Fixed

From 56bb67e92d74a913a2bb3e74f1cad18416e778b6 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 5 Dec 2023 19:18:16 -0800
Subject: [PATCH 1359/2068] More improvements to `StepHarnessWithFile`.

---
 .../com/diffplug/spotless/StepHarnessWithFile.java    | 11 ++++++++---
 .../spotless/generic/LicenseHeaderStepTest.java       | 11 ++++-------
 .../spotless/npm/EslintFormatterStepTest.java         |  9 +++------
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java b/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java
index 83bbbe09a1..a557b76017 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java
@@ -52,7 +52,8 @@ public static StepHarnessWithFile forFormatter(ResourceHarness harness, Formatte
 	}
 
 	/** Asserts that the given element is transformed as expected, and that the result is idempotent. */
-	public StepHarnessWithFile test(File file, String before, String after) {
+	public StepHarnessWithFile test(String filename, String before, String after) {
+		File file = harness.setFile(filename).toContent(before);
 		String actual = formatter().compute(LineEnding.toUnix(before), file);
 		assertEquals(after, actual, "Step application failed");
 		return testUnaffected(file, after);
@@ -65,6 +66,11 @@ public StepHarnessWithFile testUnaffected(File file, String idempotentElement) {
 		return this;
 	}
 
+	/** Asserts that the given element is idempotent w.r.t the step under test. */
+	public StepHarnessWithFile testUnaffected(String file, String idempotentElement) {
+		return testUnaffected(harness.setFile(file).toContent(idempotentElement), idempotentElement);
+	}
+
 	/** Asserts that the given elements in  the resources directory are transformed as expected. */
 	public StepHarnessWithFile testResource(String resourceBefore, String resourceAfter) {
 		return testResource(resourceBefore, resourceBefore, resourceAfter);
@@ -72,8 +78,7 @@ public StepHarnessWithFile testResource(String resourceBefore, String resourceAf
 
 	public StepHarnessWithFile testResource(String filename, String resourceBefore, String resourceAfter) {
 		String contentBefore = ResourceHarness.getTestResource(resourceBefore);
-		File file = harness.setFile(filename).toContent(contentBefore);
-		return test(file, contentBefore, ResourceHarness.getTestResource(resourceAfter));
+		return test(filename, contentBefore, ResourceHarness.getTestResource(resourceAfter));
 	}
 
 	/** Asserts that the given elements in the resources directory are transformed as expected. */
diff --git a/testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java b/testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java
index 92c6794643..a9ec563e58 100644
--- a/testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java
@@ -268,7 +268,7 @@ void should_preserve_year_for_license_with_address() throws Throwable {
 	void should_apply_license_containing_filename_token() throws Exception {
 		FormatterStep step = LicenseHeaderStep.headerDelimiter(header(HEADER_WITH_$FILE), package_).build();
 		StepHarnessWithFile.forStep(this, step)
-				.test(new File("Test.java"), getTestResource(FILE_NO_LICENSE), hasHeaderFileName(HEADER_WITH_$FILE, "Test.java"))
+				.test("Test.java", getTestResource(FILE_NO_LICENSE), hasHeaderFileName(HEADER_WITH_$FILE, "Test.java"))
 				.testUnaffected(new File("Test.java"), hasHeaderFileName(HEADER_WITH_$FILE, "Test.java"));
 	}
 
@@ -276,8 +276,7 @@ void should_apply_license_containing_filename_token() throws Exception {
 	void should_update_license_containing_filename_token() throws Exception {
 		FormatterStep step = LicenseHeaderStep.headerDelimiter(header(HEADER_WITH_$FILE), package_).build();
 		StepHarnessWithFile.forStep(this, step)
-				.test(
-						new File("After.java"),
+				.test("After.java",
 						hasHeaderFileName(HEADER_WITH_$FILE, "Before.java"),
 						hasHeaderFileName(HEADER_WITH_$FILE, "After.java"));
 	}
@@ -286,12 +285,10 @@ void should_update_license_containing_filename_token() throws Exception {
 	void should_apply_license_containing_YEAR_filename_token() throws Exception {
 		FormatterStep step = LicenseHeaderStep.headerDelimiter(header(HEADER_WITH_$YEAR_$FILE), package_).build();
 		StepHarnessWithFile.forStep(this, step)
-				.test(
-						new File("Test.java"),
+				.test("Test.java",
 						getTestResource(FILE_NO_LICENSE),
 						hasHeaderYearFileName(HEADER_WITH_$YEAR_$FILE, currentYear(), "Test.java"))
-				.testUnaffected(
-						new File("Test.java"),
+				.testUnaffected("Test.java",
 						hasHeaderYearFileName(HEADER_WITH_$YEAR_$FILE, currentYear(), "Test.java"));
 	}
 
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
index 631a4beaa7..1b365e8d11 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
@@ -56,7 +56,6 @@ void formattingUsingRulesetsFile(String ruleSetName) throws Exception {
 			//			final File eslintRc = setFile(buildDir().getPath() + "/.eslintrc.js").toResource(filedir + ".eslintrc.js");
 
 			final String dirtyFile = filedir + "javascript-es6.dirty";
-			File dirtyFileFile = setFile(testDir + "test.js").toResource(dirtyFile);
 			final String cleanFile = filedir + "javascript-es6.clean";
 
 			final FormatterStep formatterStep = EslintFormatterStep.create(
@@ -69,7 +68,7 @@ void formattingUsingRulesetsFile(String ruleSetName) throws Exception {
 					new EslintConfig(eslintRc, null));
 
 			try (StepHarnessWithFile stepHarness = StepHarnessWithFile.forStep(this, formatterStep)) {
-				stepHarness.test(dirtyFileFile, ResourceHarness.getTestResource(dirtyFile), ResourceHarness.getTestResource(cleanFile));
+				stepHarness.test("test.js", ResourceHarness.getTestResource(dirtyFile), ResourceHarness.getTestResource(cleanFile));
 			}
 		}
 	}
@@ -100,7 +99,6 @@ void formattingUsingRulesetsFile(String ruleSetName) throws Exception {
 				tsconfigFile = setFile(testDir + "tsconfig.json").toResource(filedir + "tsconfig.json");
 			}
 			final String dirtyFile = filedir + "typescript.dirty";
-			File dirtyFileFile = setFile(testDir + "test.ts").toResource(dirtyFile);
 			final String cleanFile = filedir + "typescript.clean";
 
 			final FormatterStep formatterStep = EslintFormatterStep.create(
@@ -113,7 +111,7 @@ void formattingUsingRulesetsFile(String ruleSetName) throws Exception {
 					new EslintTypescriptConfig(eslintRc, null, tsconfigFile));
 
 			try (StepHarnessWithFile stepHarness = StepHarnessWithFile.forStep(this, formatterStep)) {
-				stepHarness.test(dirtyFileFile, ResourceHarness.getTestResource(dirtyFile), ResourceHarness.getTestResource(cleanFile));
+				stepHarness.test(testDir + "test.ts", ResourceHarness.getTestResource(dirtyFile), ResourceHarness.getTestResource(cleanFile));
 			}
 		}
 	}
@@ -158,7 +156,6 @@ void formattingUsingInlineXoConfig() throws Exception {
 
 			File tsconfigFile = setFile(testDir + "tsconfig.json").toResource(filedir + "tsconfig.json");
 			final String dirtyFile = filedir + "typescript.dirty";
-			File dirtyFileFile = setFile(testDir + "test.ts").toResource(dirtyFile);
 			final String cleanFile = filedir + "typescript.clean";
 
 			final FormatterStep formatterStep = EslintFormatterStep.create(
@@ -171,7 +168,7 @@ void formattingUsingInlineXoConfig() throws Exception {
 					new EslintTypescriptConfig(null, esLintConfig, tsconfigFile));
 
 			try (StepHarnessWithFile stepHarness = StepHarnessWithFile.forStep(this, formatterStep)) {
-				stepHarness.test(dirtyFileFile, ResourceHarness.getTestResource(dirtyFile), ResourceHarness.getTestResource(cleanFile));
+				stepHarness.test(testDir + "test.ts", ResourceHarness.getTestResource(dirtyFile), ResourceHarness.getTestResource(cleanFile));
 			}
 		}
 	}

From c56968af79218da1935fb351ed30556ba83178d2 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 5 Dec 2023 19:17:01 -0800
Subject: [PATCH 1360/2068] Add a roundtrip-serializable method to
 `FormatterStep`.

---
 .../com/diffplug/spotless/FormatterStep.java  | 23 ++++++
 .../FormatterStepSerializationRoundtrip.java  | 71 +++++++++++++++++++
 .../diffplug/spotless/SerializedFunction.java | 21 ++++++
 3 files changed, 115 insertions(+)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java
 create mode 100644 lib/src/main/java/com/diffplug/spotless/SerializedFunction.java

diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
index ca37303b1f..ec3880a098 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
@@ -104,6 +104,29 @@ public final String format(String rawUnix, File file) throws Exception {
 		}
 	}
 
+	/**
+	 * @param name
+	 *             The name of the formatter step.
+	 * @param roundtripInit
+	 *             If the step has any state, this supplier will calculate it lazily. The supplier doesn't
+	 *             have to be serializable, but the result it calculates needs to be serializable.
+	 * @param equalityFunc
+	 * 		       A pure serializable function (method reference recommended) which takes the result of `roundtripInit`,
+	 * 		       and returns a serializable object whose serialized representation will be used for `.equals` and
+	 * 		       `.hashCode` of the FormatterStep.
+	 * @param formatterFunc
+	 * 		       A pure serializable function (method reference recommended) which takes the result of `equalityFunc`,
+	 * 		       and returns a `FormatterFunc` which will be used for the actual formatting.
+	 * @return A FormatterStep which can be losslessly roundtripped through the java serialization machinery.
+	 */
+	static <RoundtripState extends Serializable, EqualityState extends Serializable> FormatterStep createLazy(
+			String name,
+			ThrowingEx.Supplier<RoundtripState> roundtripInit,
+			SerializedFunction<RoundtripState, EqualityState> equalityFunc,
+			SerializedFunction<EqualityState, FormatterFunc> formatterFunc) {
+		return new FormatterStepSerializationRoundtrip(name, roundtripInit, equalityFunc, formatterFunc);
+	}
+
 	/**
 	 * @param name
 	 *             The name of the formatter step
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java b/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java
new file mode 100644
index 0000000000..5eb46b8cab
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless;
+
+import java.io.IOException;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+
+import edu.umd.cs.findbugs.annotations.Nullable;
+
+class FormatterStepSerializationRoundtrip<RoundtripState extends Serializable, EqualityState extends Serializable> extends FormatterStepEqualityOnStateSerialization<EqualityState> {
+	private final String name;
+	private final transient ThrowingEx.Supplier<RoundtripState> initializer;
+	private @Nullable RoundtripState roundtripStateInternal;
+	private final SerializedFunction<RoundtripState, EqualityState> equalityStateExtractor;
+	private final SerializedFunction<EqualityState, FormatterFunc> equalityStateToFormatter;
+
+	public FormatterStepSerializationRoundtrip(String name, ThrowingEx.Supplier<RoundtripState> initializer, SerializedFunction<RoundtripState, EqualityState> equalityStateExtractor, SerializedFunction<EqualityState, FormatterFunc> equalityStateToFormatter) {
+		this.name = name;
+		this.initializer = initializer;
+		this.equalityStateExtractor = equalityStateExtractor;
+		this.equalityStateToFormatter = equalityStateToFormatter;
+	}
+
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	@Override
+	protected EqualityState stateSupplier() throws Exception {
+		if (roundtripStateInternal != null) {
+			roundtripStateInternal = initializer.get();
+		}
+		return equalityStateExtractor.apply(roundtripStateInternal);
+	}
+
+	@Override
+	protected FormatterFunc stateToFormatter(EqualityState equalityState) throws Exception {
+		return equalityStateToFormatter.apply(equalityState);
+	}
+
+	// override serialize output
+	private void writeObject(java.io.ObjectOutputStream out) throws IOException {
+		if (roundtripStateInternal == null) {
+			roundtripStateInternal = ThrowingEx.get(initializer::get);
+		}
+		out.defaultWriteObject();
+	}
+
+	private void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException {
+		in.defaultReadObject();
+	}
+
+	private void readObjectNoData() throws ObjectStreamException {
+		throw new UnsupportedOperationException();
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/SerializedFunction.java b/lib/src/main/java/com/diffplug/spotless/SerializedFunction.java
new file mode 100644
index 0000000000..5af924a871
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/SerializedFunction.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless;
+
+import java.io.Serializable;
+
+@FunctionalInterface
+interface SerializedFunction<T, R> extends Serializable, ThrowingEx.Function<T, R> {}

From 46635c61cb424f9909757f2197b2a4ece5fe051b Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 5 Dec 2023 23:49:23 -0800
Subject: [PATCH 1361/2068] Fixup the `FormatterStep` api.

---
 .../com/diffplug/spotless/FormatterStep.java  | 22 +++++++++++++++++++
 ...atterStepEqualityOnStateSerialization.java |  8 ++-----
 .../FormatterStepSerializationRoundtrip.java  |  2 +-
 .../diffplug/spotless/SerializedFunction.java |  6 ++++-
 4 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
index ec3880a098..fdaa9cc068 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
@@ -127,6 +127,28 @@ static <RoundtripState extends Serializable, EqualityState extends Serializable>
 		return new FormatterStepSerializationRoundtrip(name, roundtripInit, equalityFunc, formatterFunc);
 	}
 
+	/**
+	 * @param name
+	 *             The name of the formatter step.
+	 * @param roundTrip
+	 *             The roundtrip serializable state of the step.
+	 * @param equalityFunc
+	 * 		       A pure serializable function (method reference recommended) which takes the result of `roundTrip`,
+	 * 		       and returns a serializable object whose serialized representation will be used for `.equals` and
+	 * 		       `.hashCode` of the FormatterStep.
+	 * @param formatterFunc
+	 * 		       A pure serializable function (method reference recommended) which takes the result of `equalityFunc`,
+	 * 		       and returns a `FormatterFunc` which will be used for the actual formatting.
+	 * @return A FormatterStep which can be losslessly roundtripped through the java serialization machinery.
+	 */
+	static <RoundtripState extends Serializable, EqualityState extends Serializable> FormatterStep create(
+			String name,
+			RoundtripState roundTrip,
+			SerializedFunction<RoundtripState, EqualityState> equalityFunc,
+			SerializedFunction<EqualityState, FormatterFunc> formatterFunc) {
+		return createLazy(name, () -> roundTrip, equalityFunc, formatterFunc);
+	}
+
 	/**
 	 * @param name
 	 *             The name of the formatter step
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStepEqualityOnStateSerialization.java b/lib/src/main/java/com/diffplug/spotless/FormatterStepEqualityOnStateSerialization.java
index 6172d252f9..ca7fa7cfc0 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStepEqualityOnStateSerialization.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStepEqualityOnStateSerialization.java
@@ -29,7 +29,7 @@
  * and such without interfering with buildcache keys.
  */
 @SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
-public abstract class FormatterStepEqualityOnStateSerialization<State extends Serializable> implements FormatterStep, Serializable {
+abstract class FormatterStepEqualityOnStateSerialization<State extends Serializable> implements FormatterStep, Serializable {
 	private static final long serialVersionUID = 1L;
 
 	protected abstract State stateSupplier() throws Exception;
@@ -80,11 +80,7 @@ private State state() throws Exception {
 
 	private byte[] serializedState() {
 		if (serializedStateInternal == null) {
-			try {
-				serializedStateInternal = LazyForwardingEquality.toBytes(state());
-			} catch (Exception e) {
-				throw new RuntimeException(e);
-			}
+			serializedStateInternal = ThrowingEx.get(() -> LazyForwardingEquality.toBytes(state()));
 		}
 		return serializedStateInternal;
 	}
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java b/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java
index 5eb46b8cab..9152fcdeac 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java
@@ -42,7 +42,7 @@ public String getName() {
 
 	@Override
 	protected EqualityState stateSupplier() throws Exception {
-		if (roundtripStateInternal != null) {
+		if (roundtripStateInternal == null) {
 			roundtripStateInternal = initializer.get();
 		}
 		return equalityStateExtractor.apply(roundtripStateInternal);
diff --git a/lib/src/main/java/com/diffplug/spotless/SerializedFunction.java b/lib/src/main/java/com/diffplug/spotless/SerializedFunction.java
index 5af924a871..56f5974870 100644
--- a/lib/src/main/java/com/diffplug/spotless/SerializedFunction.java
+++ b/lib/src/main/java/com/diffplug/spotless/SerializedFunction.java
@@ -18,4 +18,8 @@
 import java.io.Serializable;
 
 @FunctionalInterface
-interface SerializedFunction<T, R> extends Serializable, ThrowingEx.Function<T, R> {}
+public interface SerializedFunction<T, R> extends Serializable, ThrowingEx.Function<T, R> {
+	static <T> SerializedFunction<T, T> identity() {
+		return t -> t;
+	}
+}

From f5f683678001b5ad8f54fe04c0a53d57cabee694 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 5 Dec 2023 23:50:53 -0800
Subject: [PATCH 1362/2068] Use the new API.

---
 .../diffplug/spotless/generic/IndentStep.java | 30 ++++++++-----------
 .../diffplug/spotless/kotlin/DiktatStep.java  | 20 ++++---------
 2 files changed, 17 insertions(+), 33 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/generic/IndentStep.java b/lib/src/main/java/com/diffplug/spotless/generic/IndentStep.java
index 6f092d8746..5eb7c0f758 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/IndentStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/IndentStep.java
@@ -15,12 +15,14 @@
  */
 package com.diffplug.spotless.generic;
 
+import java.io.Serializable;
+
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.FormatterStepEqualityOnStateSerialization;
+import com.diffplug.spotless.SerializedFunction;
 
 /** Simple step which checks for consistent indentation characters. */
-public final class IndentStep extends FormatterStepEqualityOnStateSerialization<IndentStep> {
+public final class IndentStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	final Type type;
@@ -31,21 +33,6 @@ private IndentStep(Type type, int numSpacesPerTab) {
 		this.numSpacesPerTab = numSpacesPerTab;
 	}
 
-	@Override
-	public String getName() {
-		return "indentWith" + type.tabSpace("Tabs", "Spaces");
-	}
-
-	@Override
-	protected IndentStep stateSupplier() {
-		return this;
-	}
-
-	@Override
-	protected FormatterFunc stateToFormatter(IndentStep state) {
-		return new Runtime(this)::format;
-	}
-
 	private static final int DEFAULT_NUM_SPACES_PER_TAB = 4;
 
 	public enum Type {
@@ -68,7 +55,14 @@ public FormatterStep create(int numSpacesPerTab) {
 
 	/** Creates a step which will indent with the given type of whitespace, converting between tabs and spaces at the given ratio. */
 	public static FormatterStep create(Type type, int numSpacesPerTab) {
-		return new IndentStep(type, numSpacesPerTab);
+		return FormatterStep.create("indentWith" + type.tabSpace("Tabs", "Spaces"),
+				new IndentStep(type, numSpacesPerTab), SerializedFunction.identity(),
+				IndentStep::startFormatting);
+	}
+
+	private FormatterFunc startFormatting() {
+		var runtime = new Runtime(this);
+		return runtime::format;
 	}
 
 	static class Runtime {
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
index 6e01eda91e..9694033752 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
@@ -25,7 +25,7 @@
 import com.diffplug.spotless.*;
 
 /** Wraps up <a href="https://github.com/cqfn/diKTat">diktat</a> as a FormatterStep. */
-public class DiktatStep extends FormatterStepEqualityOnStateSerialization<DiktatStep.State> {
+public class DiktatStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private final JarState.Promised jarState;
 	private final boolean isScript;
@@ -66,26 +66,16 @@ public static FormatterStep create(String versionDiktat, Provisioner provisioner
 		}
 		Objects.requireNonNull(versionDiktat, "versionDiktat");
 		Objects.requireNonNull(provisioner, "provisioner");
-		return new DiktatStep(JarState.promise(() -> JarState.from(MAVEN_COORDINATE + versionDiktat, provisioner)), isScript, config);
+		return FormatterStep.create(NAME,
+				new DiktatStep(JarState.promise(() -> JarState.from(MAVEN_COORDINATE + versionDiktat, provisioner)), isScript, config),
+				DiktatStep::equalityState, State::createFormat);
 	}
 
-	@Override
-	public String getName() {
-		return NAME;
-	}
-
-	@Override
-	protected State stateSupplier() throws Exception {
+	private State equalityState() throws Exception {
 		return new State(jarState.get(), isScript, FileSignature.stripAbsolutePathsNullable(config));
 	}
 
-	@Override
-	protected FormatterFunc stateToFormatter(State state) throws Exception {
-		return state.createFormat();
-	}
-
 	static final class State implements Serializable {
-
 		private static final long serialVersionUID = 1L;
 
 		final JarState jar;

From 44b3126ff4968fbe01c891ce8f69006046dd8219 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 5 Dec 2023 23:53:27 -0800
Subject: [PATCH 1363/2068] Fixup spotbugs warnings.

---
 lib/src/main/java/com/diffplug/spotless/FileSignature.java      | 2 +-
 .../diffplug/spotless/FormatterStepSerializationRoundtrip.java  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/FileSignature.java b/lib/src/main/java/com/diffplug/spotless/FileSignature.java
index 92518cca17..9bbc62b9ec 100644
--- a/lib/src/main/java/com/diffplug/spotless/FileSignature.java
+++ b/lib/src/main/java/com/diffplug/spotless/FileSignature.java
@@ -103,7 +103,7 @@ public static class Promised implements Serializable {
 		@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
 		private transient @Nullable FileSignature cached;
 
-		private Promised(List<File> files, FileSignature cached) {
+		private Promised(List<File> files, @Nullable FileSignature cached) {
 			this.files = files;
 			this.cached = cached;
 		}
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java b/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java
index 9152fcdeac..d996c0b360 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java
@@ -22,6 +22,7 @@
 import edu.umd.cs.findbugs.annotations.Nullable;
 
 class FormatterStepSerializationRoundtrip<RoundtripState extends Serializable, EqualityState extends Serializable> extends FormatterStepEqualityOnStateSerialization<EqualityState> {
+	private static final long serialVersionUID = 1L;
 	private final String name;
 	private final transient ThrowingEx.Supplier<RoundtripState> initializer;
 	private @Nullable RoundtripState roundtripStateInternal;

From 55481fa8cc07fe4525f5f69683bfa668157a74b4 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 6 Dec 2023 00:04:53 -0800
Subject: [PATCH 1364/2068] `FileSignature.Promised` and `JarState.Promised`
 should both have `get()` as their method.

---
 lib/src/main/java/com/diffplug/spotless/FileSignature.java | 6 +++---
 lib/src/main/java/com/diffplug/spotless/JarState.java      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/FileSignature.java b/lib/src/main/java/com/diffplug/spotless/FileSignature.java
index 9bbc62b9ec..e252232772 100644
--- a/lib/src/main/java/com/diffplug/spotless/FileSignature.java
+++ b/lib/src/main/java/com/diffplug/spotless/FileSignature.java
@@ -108,10 +108,10 @@ private Promised(List<File> files, @Nullable FileSignature cached) {
 			this.cached = cached;
 		}
 
-		public FileSignature stripAbsolutePaths() throws IOException {
+		public FileSignature get() {
 			if (cached == null) {
 				// null when restored via serialization
-				cached = new FileSignature(files);
+				cached = ThrowingEx.get(() -> new FileSignature(files));
 			}
 			return cached;
 		}
@@ -135,7 +135,7 @@ public Promised roundTrippable() {
 
 	public static @Nullable FileSignature stripAbsolutePathsNullable(@Nullable Promised roundTrippable) throws IOException {
 		if (roundTrippable != null) {
-			return roundTrippable.stripAbsolutePaths();
+			return roundTrippable.get();
 		} else {
 			return null;
 		}
diff --git a/lib/src/main/java/com/diffplug/spotless/JarState.java b/lib/src/main/java/com/diffplug/spotless/JarState.java
index 659894a40a..73e5167fc1 100644
--- a/lib/src/main/java/com/diffplug/spotless/JarState.java
+++ b/lib/src/main/java/com/diffplug/spotless/JarState.java
@@ -54,7 +54,7 @@ public JarState get() {
 					cached = result.fileSignature.roundTrippable();
 					return result;
 				}
-				return new JarState(cached.stripAbsolutePaths());
+				return new JarState(cached.get());
 			} catch (Exception e) {
 				throw ThrowingEx.asRuntime(e);
 			}

From ab1452d82f11da3712d0ed8ec4aeb9f6d530c6c4 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 6 Dec 2023 00:10:02 -0800
Subject: [PATCH 1365/2068] Streamline the `FileSignature` api.

---
 .../com/diffplug/spotless/FileSignature.java   | 18 +-----------------
 .../java/com/diffplug/spotless/JarState.java   |  2 +-
 .../diffplug/spotless/kotlin/DiktatStep.java   |  4 ++--
 3 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/FileSignature.java b/lib/src/main/java/com/diffplug/spotless/FileSignature.java
index e252232772..35949426ea 100644
--- a/lib/src/main/java/com/diffplug/spotless/FileSignature.java
+++ b/lib/src/main/java/com/diffplug/spotless/FileSignature.java
@@ -121,26 +121,10 @@ public static Promised promise(Iterable<File> files) {
 		return new Promised(MoreIterables.toNullHostileList(files), null);
 	}
 
-	public Promised roundTrippable() {
+	public Promised asPromise() {
 		return new Promised(files, this);
 	}
 
-	public static @Nullable Promised roundTrippableNullable(@Nullable FileSignature signature) {
-		if (signature != null) {
-			return signature.roundTrippable();
-		} else {
-			return null;
-		}
-	}
-
-	public static @Nullable FileSignature stripAbsolutePathsNullable(@Nullable Promised roundTrippable) throws IOException {
-		if (roundTrippable != null) {
-			return roundTrippable.get();
-		} else {
-			return null;
-		}
-	}
-
 	/** Returns all of the files in this signature, throwing an exception if there are more or less than 1 file. */
 	public Collection<File> files() {
 		return Collections.unmodifiableList(files);
diff --git a/lib/src/main/java/com/diffplug/spotless/JarState.java b/lib/src/main/java/com/diffplug/spotless/JarState.java
index 73e5167fc1..cdb8943877 100644
--- a/lib/src/main/java/com/diffplug/spotless/JarState.java
+++ b/lib/src/main/java/com/diffplug/spotless/JarState.java
@@ -51,7 +51,7 @@ public JarState get() {
 			try {
 				if (cached == null) {
 					JarState result = supplier.get();
-					cached = result.fileSignature.roundTrippable();
+					cached = result.fileSignature.asPromise();
 					return result;
 				}
 				return new JarState(cached.get());
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
index 9694033752..23d364502e 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
@@ -34,7 +34,7 @@ public class DiktatStep implements Serializable {
 	private DiktatStep(JarState.Promised jarState, boolean isScript, @Nullable FileSignature config) {
 		this.jarState = jarState;
 		this.isScript = isScript;
-		this.config = FileSignature.roundTrippableNullable(config);
+		this.config = config != null ? config.asPromise() : null;
 	}
 
 	private static final String MIN_SUPPORTED_VERSION = "1.2.1";
@@ -72,7 +72,7 @@ public static FormatterStep create(String versionDiktat, Provisioner provisioner
 	}
 
 	private State equalityState() throws Exception {
-		return new State(jarState.get(), isScript, FileSignature.stripAbsolutePathsNullable(config));
+		return new State(jarState.get(), isScript, config != null ? config.get() : null);
 	}
 
 	static final class State implements Serializable {

From 1ed19a755ee4b485e5bdd746bb507d3e76b1d90c Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 5 Dec 2023 11:21:31 -0800
Subject: [PATCH 1366/2068] Refactor EquoResourceHarness to go through
 `StepHarnessWithFile`.

---
 .../cpp/EclipseCdtFormatterStepTest.java      |  9 ++--
 .../extra/eclipse/EquoResourceHarness.java    | 48 ++-----------------
 .../groovy/GrEclipseFormatterStepTest.java    |  5 +-
 .../java/EclipseJdtFormatterStepTest.java     | 16 +++----
 4 files changed, 18 insertions(+), 60 deletions(-)

diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStepTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStepTest.java
index 9ed9f2f227..a548d3077b 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStepTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStepTest.java
@@ -24,17 +24,16 @@
 import com.diffplug.spotless.extra.eclipse.EquoResourceHarness;
 
 class EclipseCdtFormatterStepTest extends EquoResourceHarness {
-	private final static String INPUT = "#include <a.h>;\nint main(int argc,   \nchar *argv[]) {}";
-	private final static String EXPECTED = "#include <a.h>;\nint main(int argc, char *argv[]) {\n}\n";
-
 	public EclipseCdtFormatterStepTest() {
-		super(EclipseCdtFormatterStep.createBuilder(TestProvisioner.mavenCentral()), INPUT, EXPECTED);
+		super(EclipseCdtFormatterStep.createBuilder(TestProvisioner.mavenCentral()));
 	}
 
 	@ParameterizedTest
 	@MethodSource
 	void formatWithVersion(String version) throws Exception {
-		assertFormatted(version);
+		harnessFor(version).test("main.c",
+				"#include <a.h>;\nint main(int argc,   \nchar *argv[]) {}",
+				"#include <a.h>;\nint main(int argc, char *argv[]) {\n}\n");
 	}
 
 	private static Stream<String> formatWithVersion() {
diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/eclipse/EquoResourceHarness.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/eclipse/EquoResourceHarness.java
index 8d5d955c02..0cb2e4c700 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/eclipse/EquoResourceHarness.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/eclipse/EquoResourceHarness.java
@@ -15,14 +15,12 @@
  */
 package com.diffplug.spotless.extra.eclipse;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import java.io.File;
 import java.util.Arrays;
 
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.LineEnding;
 import com.diffplug.spotless.ResourceHarness;
+import com.diffplug.spotless.StepHarnessWithFile;
 import com.diffplug.spotless.extra.EquoBasedStepBuilder;
 
 /**
@@ -43,57 +41,19 @@
  */
 public class EquoResourceHarness extends ResourceHarness {
 	private final EquoBasedStepBuilder stepBuilder;
-	private final String fileName;
-	private final String input;
-	private final String expected;
-
-	/**
-	 * Create harness to be used for several versions of the formatter step
-	 * @param builder Eclipse Formatter step builder
-	 * @param unformatted Simple unformatted input
-	 * @param formatted Expected formatted output
-	 */
-	public EquoResourceHarness(EquoBasedStepBuilder builder, String unformatted, String formatted) {
-		this(builder, "someSourceFile", unformatted, formatted);
-	}
 
 	/**
 	 * Create harness to be used for several versions of the formatter step
 	 * @param builder Eclipse Formatter step builder
-	 * @param sourceFileName File name of the source file
-	 * @param unformatted Simple unformatted input
-	 * @param formatted Expected formatted output
 	 */
-	public EquoResourceHarness(EquoBasedStepBuilder builder, String sourceFileName, String unformatted, String formatted) {
+	public EquoResourceHarness(EquoBasedStepBuilder builder) {
 		stepBuilder = builder;
-		fileName = sourceFileName;
-		input = unformatted;
-		expected = formatted;
 	}
 
-	/**
-	 * Assert that formatting input results in expected output
-	 * @param formatterVersion Formatter version
-	 * @param settingsFiles Formatter settings
-	 * @return Formatted string
-	 */
-	protected String assertFormatted(String formatterVersion, File... settingsFiles) throws Exception {
-		String output = format(formatterVersion, settingsFiles);
-		assertThat(output).isEqualTo(expected);
-		return output;
-	}
-
-	/**
-	 * Formatting input results and returns output
-	 * @param formatterVersion Formatter version
-	 * @param settingsFiles Formatter settings
-	 * @return Formatted string
-	 */
-	protected String format(String formatterVersion, File... settingsFiles) throws Exception {
-		File inputFile = setFile(fileName).toContent(input);
+	protected StepHarnessWithFile harnessFor(String formatterVersion, File... settingsFiles) throws Exception {
 		stepBuilder.setVersion(formatterVersion);
 		stepBuilder.setPreferences(Arrays.asList(settingsFiles));
 		FormatterStep step = stepBuilder.build();
-		return LineEnding.toUnix(step.format(input, inputFile));
+		return StepHarnessWithFile.forStep(this, step);
 	}
 }
diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepTest.java
index 2bd68d0281..b5d294e71c 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepTest.java
@@ -28,13 +28,14 @@ public class GrEclipseFormatterStepTest extends EquoResourceHarness {
 	private final static String EXPECTED = "class F{\n\tdef m(){}\n}";
 
 	public GrEclipseFormatterStepTest() {
-		super(GrEclipseFormatterStep.createBuilder(TestProvisioner.mavenCentral()), INPUT, EXPECTED);
+		super(GrEclipseFormatterStep.createBuilder(TestProvisioner.mavenCentral()));
 	}
 
 	@ParameterizedTest
 	@MethodSource
 	void formatWithVersion(String version) throws Exception {
-		assertFormatted(version);
+		harnessFor(version).test("test.groovy",
+				"class F{ def m(){} }", "class F{\n\tdef m(){}\n}");
 	}
 
 	private static Stream<String> formatWithVersion() {
diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepTest.java
index 91bc8740ab..5567a590c0 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepTest.java
@@ -15,7 +15,6 @@
  */
 package com.diffplug.spotless.extra.java;
 
-import java.io.File;
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.Nested;
@@ -28,21 +27,20 @@
 import com.diffplug.spotless.extra.eclipse.EquoResourceHarness;
 
 class EclipseJdtFormatterStepTest extends EquoResourceHarness {
-	private final static String INPUT = "package p; class C{}";
-	private final static String EXPECTED = "package p;\nclass C {\n}";
-
 	private static EquoBasedStepBuilder createBuilder() {
 		return EclipseJdtFormatterStep.createBuilder(TestProvisioner.mavenCentral());
 	}
 
 	public EclipseJdtFormatterStepTest() {
-		super(createBuilder(), INPUT, EXPECTED);
+		super(createBuilder());
 	}
 
 	@ParameterizedTest
 	@MethodSource
 	void formatWithVersion(String version) throws Exception {
-		assertFormatted(version);
+		harnessFor(version).test("test.java",
+				"package p; class C{}",
+				"package p;\nclass C {\n}");
 	}
 
 	private static Stream<String> formatWithVersion() {
@@ -53,13 +51,13 @@ private static Stream<String> formatWithVersion() {
 	@Nested
 	class NewFormatInterface extends EquoResourceHarness {
 		public NewFormatInterface() {
-			super(createBuilder(), "module-info.java", getTestResource("java/eclipse/ModuleInfoUnformatted.test"), getTestResource("java/eclipse/ModuleInfoFormatted.test"));
+			super(createBuilder());
 		}
 
 		@Test
 		void formatModuleInfo() throws Exception {
-			File settingsFile = createTestFile("java/eclipse/ModuleInfo.prefs");
-			assertFormatted("4.11", settingsFile);
+			harnessFor("4.11", createTestFile("java/eclipse/ModuleInfo.prefs"))
+					.testResource("module-info.java", "java/eclipse/ModuleInfoUnformatted.test", "java/eclipse/ModuleInfoFormatted.test");
 		}
 	}
 }

From 6173676581acd238504488df81562cad1d4e1cae Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 6 Dec 2023 00:13:48 -0800
Subject: [PATCH 1367/2068] Make the equo-based formatters serializable.

---
 .../spotless/extra/EquoBasedStepBuilder.java  | 74 +++++++++++--------
 .../diffplug/spotless/StepHarnessBase.java    |  2 +
 2 files changed, 46 insertions(+), 30 deletions(-)

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 3d3bb68241..95fd08fb90 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
@@ -34,7 +34,7 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
-import com.diffplug.spotless.ThrowingEx;
+import com.diffplug.spotless.SerializedFunction;
 
 import dev.equo.solstice.NestedJars;
 import dev.equo.solstice.p2.P2ClientCache;
@@ -48,19 +48,19 @@
 public abstract class EquoBasedStepBuilder {
 	private final String formatterName;
 	private final Provisioner mavenProvisioner;
-	private final ThrowingEx.Function<State, FormatterFunc> stateToFormatter;
+	private final SerializedFunction<State, FormatterFunc> stateToFormatter;
 	private String formatterVersion;
 	private Iterable<File> settingsFiles = new ArrayList<>();
 	private Map<String, String> p2Mirrors = Map.of();
 
 	/** @deprecated if you use this constructor you *must* call {@link #setVersion(String)} before calling {@link #build()} */
 	@Deprecated
-	public EquoBasedStepBuilder(String formatterName, Provisioner mavenProvisioner, ThrowingEx.Function<State, FormatterFunc> stateToFormatter) {
+	public EquoBasedStepBuilder(String formatterName, Provisioner mavenProvisioner, SerializedFunction<State, FormatterFunc> stateToFormatter) {
 		this(formatterName, mavenProvisioner, null, stateToFormatter);
 	}
 
 	/** Initialize valid default configuration, taking latest version */
-	public EquoBasedStepBuilder(String formatterName, Provisioner mavenProvisioner, @Nullable String defaultVersion, ThrowingEx.Function<State, FormatterFunc> stateToFormatter) {
+	public EquoBasedStepBuilder(String formatterName, Provisioner mavenProvisioner, @Nullable String defaultVersion, SerializedFunction<State, FormatterFunc> stateToFormatter) {
 		this.formatterName = formatterName;
 		this.mavenProvisioner = mavenProvisioner;
 		this.formatterVersion = defaultVersion;
@@ -83,11 +83,6 @@ public void setP2Mirrors(Collection<P2Mirror> p2Mirrors) {
 		this.p2Mirrors = p2Mirrors.stream().collect(toMap(P2Mirror::getPrefix, P2Mirror::getUrl));
 	}
 
-	/** Returns the FormatterStep (whose state will be calculated lazily). */
-	public FormatterStep build() {
-		return FormatterStep.createLazy(formatterName, this::get, stateToFormatter);
-	}
-
 	protected abstract P2Model model(String version);
 
 	protected void addPlatformRepo(P2Model model, String version) {
@@ -107,26 +102,28 @@ protected void addPlatformRepo(P2Model model, String version) {
 		}
 	}
 
-	/** Creates the state of the configuration. */
-	EquoBasedStepBuilder.State get() throws Exception {
-		P2QueryResult query;
-		try {
-			query = createModelWithMirrors().query(P2ClientCache.PREFER_OFFLINE, P2QueryCache.ALLOW);
-		} catch (Exception x) {
-			throw new IOException("Failed to load " + formatterName + ": " + x, x);
-		}
-		var classpath = new ArrayList<File>();
-		var mavenDeps = new ArrayList<String>();
-		mavenDeps.add("dev.equo.ide:solstice:1.7.4");
-		mavenDeps.add("com.diffplug.durian:durian-swt.os:4.2.0");
-		mavenDeps.addAll(query.getJarsOnMavenCentral());
-		classpath.addAll(mavenProvisioner.provisionWithTransitives(false, mavenDeps));
-		classpath.addAll(query.getJarsNotOnMavenCentral());
-		for (var nested : NestedJars.inFiles(query.getJarsNotOnMavenCentral()).extractAllNestedJars()) {
-			classpath.add(nested.getValue());
-		}
-		var jarState = JarState.preserveOrder(classpath);
-		return new State(formatterVersion, jarState, FileSignature.signAsList(settingsFiles));
+	/** Returns the FormatterStep (whose state will be calculated lazily). */
+	public FormatterStep build() {
+		var roundtrippableState = new EquoStep(formatterVersion, FileSignature.promise(settingsFiles), JarState.promise(() -> {
+			P2QueryResult query;
+			try {
+				query = createModelWithMirrors().query(P2ClientCache.PREFER_OFFLINE, P2QueryCache.ALLOW);
+			} catch (Exception x) {
+				throw new IOException("Failed to load " + formatterName + ": " + x, x);
+			}
+			var classpath = new ArrayList<File>();
+			var mavenDeps = new ArrayList<String>();
+			mavenDeps.add("dev.equo.ide:solstice:1.7.4");
+			mavenDeps.add("com.diffplug.durian:durian-swt.os:4.2.0");
+			mavenDeps.addAll(query.getJarsOnMavenCentral());
+			classpath.addAll(mavenProvisioner.provisionWithTransitives(false, mavenDeps));
+			classpath.addAll(query.getJarsNotOnMavenCentral());
+			for (var nested : NestedJars.inFiles(query.getJarsNotOnMavenCentral()).extractAllNestedJars()) {
+				classpath.add(nested.getValue());
+			}
+			return JarState.preserveOrder(classpath);
+		}));
+		return FormatterStep.create(formatterName, roundtrippableState, EquoStep::state, stateToFormatter);
 	}
 
 	private P2Model createModelWithMirrors() {
@@ -152,12 +149,29 @@ private P2Model createModelWithMirrors() {
 		return model;
 	}
 
+	static class EquoStep implements Serializable {
+		private static final long serialVersionUID = 1;
+		private final String semanticVersion;
+		private final FileSignature.Promised settingsPromise;
+		private final JarState.Promised jarPromise;
+
+		EquoStep(String semanticVersion, FileSignature.Promised settingsPromise, JarState.Promised jarPromise) {
+			this.semanticVersion = semanticVersion;
+			this.settingsPromise = settingsPromise;
+			this.jarPromise = jarPromise;
+		}
+
+		private State state() {
+			return new State(semanticVersion, jarPromise.get(), settingsPromise.get());
+		}
+	}
+
 	/**
 	 * State of Eclipse configuration items, providing functionality to derived information
 	 * based on the state.
 	 */
 	public static class State implements Serializable {
-		private static final long serialVersionUID = 584400372246020995L;
+		private static final long serialVersionUID = 1;
 		final String semanticVersion;
 		final JarState jarState;
 		final FileSignature settingsFiles;
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
index 0a0154176b..3ebed8a48d 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
@@ -43,6 +43,8 @@ protected StepHarnessBase(Formatter formatter) {
 				supportsRoundTrip = true;
 			} else if (onlyStepName.equals("diktat")) {
 				supportsRoundTrip = true;
+			} else if (onlyStepName.equals("eclipse jdt formatter") || onlyStepName.equals("eclipse cdt formatter") || onlyStepName.equals("eclipse groovy formatter")) {
+				supportsRoundTrip = true;
 			}
 		}
 	}

From f838d2a4f6a463cd8392118662dff0fa50d0106a Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 6 Dec 2023 12:24:30 -0800
Subject: [PATCH 1368/2068] Refactor the legacy EclipseResourceHarness to use
 StepHarness.

---
 .../extra/eclipse/EclipseResourceHarness.java | 50 +++----------------
 .../wtp/EclipseWtpFormatterStepTest.java      | 16 +++---
 2 files changed, 15 insertions(+), 51 deletions(-)

diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/eclipse/EclipseResourceHarness.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/eclipse/EclipseResourceHarness.java
index 71cb4b78de..9023aa6300 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/eclipse/EclipseResourceHarness.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/eclipse/EclipseResourceHarness.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,8 +21,8 @@
 import java.util.Arrays;
 
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.LineEnding;
 import com.diffplug.spotless.ResourceHarness;
+import com.diffplug.spotless.StepHarnessWithFile;
 import com.diffplug.spotless.extra.EclipseBasedStepBuilder;
 
 /**
@@ -43,57 +43,19 @@
  */
 public class EclipseResourceHarness extends ResourceHarness {
 	private final EclipseBasedStepBuilder stepBuilder;
-	private final String fileName;
-	private final String input;
-	private final String expected;
 
 	/**
 	 * Create harness to be used for several versions of the formatter step
 	 * @param builder Eclipse Formatter step builder
-	 * @param unformatted Simple unformatted input
-	 * @param formatted Expected formatted output
 	 */
-	public EclipseResourceHarness(EclipseBasedStepBuilder builder, String unformatted, String formatted) {
-		this(builder, "someSourceFile", unformatted, formatted);
+	public EclipseResourceHarness(EclipseBasedStepBuilder builder) {
+		this.stepBuilder = builder;
 	}
 
-	/**
-	 * Create harness to be used for several versions of the formatter step
-	 * @param builder Eclipse Formatter step builder
-	 * @param sourceFileName File name of the source file
-	 * @param unformatted Simple unformatted input
-	 * @param formatted Expected formatted output
-	 */
-	public EclipseResourceHarness(EclipseBasedStepBuilder builder, String sourceFileName, String unformatted, String formatted) {
-		stepBuilder = builder;
-		fileName = sourceFileName;
-		input = unformatted;
-		expected = formatted;
-	}
-
-	/**
-	 * Assert that formatting input results in expected output
-	 * @param formatterVersion Formatter version
-	 * @param settingsFiles Formatter settings
-	 * @return Formatted string
-	 */
-	protected String assertFormatted(String formatterVersion, File... settingsFiles) throws Exception {
-		String output = format(formatterVersion, settingsFiles);
-		assertThat(output).isEqualTo(expected);
-		return output;
-	}
-
-	/**
-	 * Formatting input results and returns output
-	 * @param formatterVersion Formatter version
-	 * @param settingsFiles Formatter settings
-	 * @return Formatted string
-	 */
-	protected String format(String formatterVersion, File... settingsFiles) throws Exception {
-		File inputFile = setFile(fileName).toContent(input);
+	protected StepHarnessWithFile harnessFor(String formatterVersion, File... settingsFiles) throws Exception {
 		stepBuilder.setVersion(formatterVersion);
 		stepBuilder.setPreferences(Arrays.asList(settingsFiles));
 		FormatterStep step = stepBuilder.build();
-		return LineEnding.toUnix(step.format(input, inputFile));
+		return StepHarnessWithFile.forStep(this, step);
 	}
 }
diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterStepTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterStepTest.java
index 9517c24121..be2f874084 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterStepTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,6 @@
  */
 package com.diffplug.spotless.extra.wtp;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -38,14 +36,18 @@ public class EclipseWtpFormatterStepTest {
 	private final static Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support("Oldest Version").add(8, "4.8.0");
 
 	private static class NestedTests extends EclipseResourceHarness {
+		private final String unformatted, formatted;
+
 		public NestedTests(String unformatted, String formatted, EclipseWtpFormatterStep kind) {
-			super(kind.createBuilder(TestProvisioner.mavenCentral()), unformatted, formatted);
+			super(kind.createBuilder(TestProvisioner.mavenCentral()));
+			this.unformatted = unformatted;
+			this.formatted = formatted;
 		}
 
 		@ParameterizedTest
 		@MethodSource
 		void formatWithVersion(String version) throws Exception {
-			assertFormatted(version);
+			harnessFor(version).test("someFilename", unformatted, formatted);
 		}
 
 		private static Stream<String> formatWithVersion() {
@@ -67,8 +69,8 @@ void multipleConfigurations() throws Exception {
 				config.setProperty("indentationChar", "space");
 				config.setProperty("indentationSize", "5");
 			});
-			String defaultFormatted = assertFormatted(EclipseWtpFormatterStep.defaultVersion(), tabPropertyFile);
-			assertThat(format(EclipseWtpFormatterStep.defaultVersion(), spacePropertyFile)).as("Space formatting output unexpected").isEqualTo(defaultFormatted.replace("\t", "     "));
+			harnessFor(EclipseWtpFormatterStep.defaultVersion(), tabPropertyFile).test("someFilename", unformatted, formatted);
+			harnessFor(EclipseWtpFormatterStep.defaultVersion(), spacePropertyFile).test("someFilename", unformatted, formatted.replace("\t", "     "));
 		}
 
 		private File createPropertyFile(Consumer<Properties> config) throws IOException {

From 0def93eb26f57297a1766b4c429054b191d6a4ca Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 6 Dec 2023 12:26:46 -0800
Subject: [PATCH 1369/2068] Wtp tests are now failing because they are not
 roundtrip serializable.

---
 .../src/main/java/com/diffplug/spotless/StepHarnessBase.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
index 3ebed8a48d..ce3b19a9ae 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
@@ -15,6 +15,7 @@
  */
 package com.diffplug.spotless;
 
+import java.util.Locale;
 import java.util.Objects;
 
 import org.assertj.core.api.Assertions;
@@ -43,7 +44,7 @@ protected StepHarnessBase(Formatter formatter) {
 				supportsRoundTrip = true;
 			} else if (onlyStepName.equals("diktat")) {
 				supportsRoundTrip = true;
-			} else if (onlyStepName.equals("eclipse jdt formatter") || onlyStepName.equals("eclipse cdt formatter") || onlyStepName.equals("eclipse groovy formatter")) {
+			} else if (onlyStepName.toLowerCase(Locale.ROOT).contains("eclipse")) {
 				supportsRoundTrip = true;
 			}
 		}

From 0257d0ba118e01649944335fdc02d10333418931 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 6 Dec 2023 12:36:59 -0800
Subject: [PATCH 1370/2068] Make the eclipse-based steps round-trip
 serializable.

---
 .../extra/EclipseBasedStepBuilder.java        | 52 +++++++++++--------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/EclipseBasedStepBuilder.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/EclipseBasedStepBuilder.java
index 0cf14eb32c..e894857abc 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/EclipseBasedStepBuilder.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/EclipseBasedStepBuilder.java
@@ -33,7 +33,7 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
-import com.diffplug.spotless.ThrowingEx;
+import com.diffplug.spotless.SerializedFunction;
 
 /**
  * Generic Eclipse based formatter step {@link State} builder.
@@ -41,7 +41,7 @@
 public class EclipseBasedStepBuilder {
 	private final String formatterName;
 	private final String formatterStepExt;
-	private final ThrowingEx.Function<State, FormatterFunc> stateToFormatter;
+	private final SerializedFunction<State, FormatterFunc> stateToFormatter;
 	private final Provisioner jarProvisioner;
 	private String formatterVersion;
 
@@ -63,12 +63,12 @@ public class EclipseBasedStepBuilder {
 	private Iterable<File> settingsFiles = new ArrayList<>();
 
 	/** Initialize valid default configuration, taking latest version */
-	public EclipseBasedStepBuilder(String formatterName, Provisioner jarProvisioner, ThrowingEx.Function<State, FormatterFunc> stateToFormatter) {
+	public EclipseBasedStepBuilder(String formatterName, Provisioner jarProvisioner, SerializedFunction<State, FormatterFunc> stateToFormatter) {
 		this(formatterName, "", jarProvisioner, stateToFormatter);
 	}
 
 	/** Initialize valid default configuration, taking latest version */
-	public EclipseBasedStepBuilder(String formatterName, String formatterStepExt, Provisioner jarProvisioner, ThrowingEx.Function<State, FormatterFunc> stateToFormatter) {
+	public EclipseBasedStepBuilder(String formatterName, String formatterStepExt, Provisioner jarProvisioner, SerializedFunction<State, FormatterFunc> stateToFormatter) {
 		this.formatterName = Objects.requireNonNull(formatterName, "formatterName");
 		this.formatterStepExt = Objects.requireNonNull(formatterStepExt, "formatterStepExt");
 		this.jarProvisioner = Objects.requireNonNull(jarProvisioner, "jarProvisioner");
@@ -78,7 +78,11 @@ public EclipseBasedStepBuilder(String formatterName, String formatterStepExt, Pr
 
 	/** Returns the FormatterStep (whose state will be calculated lazily). */
 	public FormatterStep build() {
-		return FormatterStep.createLazy(formatterName + formatterStepExt, this::get, stateToFormatter);
+		var roundtrippableState = new EclipseStep(formatterVersion, formatterStepExt, FileSignature.promise(settingsFiles), JarState.promise(() -> {
+			return JarState.withoutTransitives(dependencies, jarProvisioner);
+		}));
+		return FormatterStep.create(formatterName + formatterStepExt, roundtrippableState,
+				EclipseStep::state, stateToFormatter);
 	}
 
 	/** Set dependencies for the corresponding Eclipse version */
@@ -122,21 +126,23 @@ public void setPreferences(Iterable<File> settingsFiles) {
 		this.settingsFiles = settingsFiles;
 	}
 
-	/** Creates the state of the configuration. */
-	EclipseBasedStepBuilder.State get() throws IOException {
-		/*
-		 * The current use case is tailored for Gradle.
-		 * Gradle calls this method only once per execution
-		 * and compares the State with the one of a previous run
-		 * for incremental building.
-		 * Hence a lazy construction is not required.
-		 */
-		return new State(
-				formatterVersion,
-				formatterStepExt,
-				jarProvisioner,
-				dependencies,
-				settingsFiles);
+	static class EclipseStep implements Serializable {
+		private static final long serialVersionUID = 1;
+		private final String semanticVersion;
+		private final String formatterStepExt;
+		private final FileSignature.Promised settingsPromise;
+		private final JarState.Promised jarPromise;
+
+		EclipseStep(String semanticVersion, String formatterStepExt, FileSignature.Promised settingsPromise, JarState.Promised jarPromise) {
+			this.semanticVersion = semanticVersion;
+			this.formatterStepExt = formatterStepExt;
+			this.settingsPromise = settingsPromise;
+			this.jarPromise = jarPromise;
+		}
+
+		private State state() {
+			return new State(semanticVersion, formatterStepExt, jarPromise.get(), settingsPromise.get());
+		}
 	}
 
 	/**
@@ -155,9 +161,9 @@ public static class State implements Serializable {
 		private final FileSignature settingsFiles;
 
 		/** State constructor expects that all passed items are not modified afterwards */
-		protected State(String formatterVersion, String formatterStepExt, Provisioner jarProvisioner, List<String> dependencies, Iterable<File> settingsFiles) throws IOException {
-			this.jarState = JarState.withoutTransitives(dependencies, jarProvisioner);
-			this.settingsFiles = FileSignature.signAsList(settingsFiles);
+		protected State(String formatterVersion, String formatterStepExt, JarState jarState, FileSignature settingsFiles) {
+			this.jarState = jarState;
+			this.settingsFiles = settingsFiles;
 			this.formatterStepExt = formatterStepExt;
 			semanticVersion = convertEclipseVersion(formatterVersion);
 		}

From 4e54fc226410654880c461a4c293e9a9662d53fa Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 6 Dec 2023 12:52:52 -0800
Subject: [PATCH 1371/2068] Update the `CONTRIBUTING.md` for our new roundtrip
 serializable world.

---
 CONTRIBUTING.md | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 287d835bca..d9079d8fed 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -95,10 +95,31 @@ Here's a checklist for creating a new step for Spotless:
 
 - [ ] Class name ends in Step, `SomeNewStep`.
 - [ ] Class has a public static method named `create` that returns a `FormatterStep`.
-- [ ] Has a test class named `SomeNewStepTest`.
+- [ ] Has a test class named `SomeNewStepTest` that uses `StepHarness` or `StepHarnessWithFile` to test the step.
+  - [ ] Start with `StepHarness.forStep(myStep).supportsRoundTrip(false)`, and then add round trip support as decribed in the next section. 
 - [ ] Test class has test methods to verify behavior.
 - [ ] Test class has a test method `equality()` which tests equality using `StepEqualityTester` (see existing methods for examples).
 
+### Serialization roundtrip
+
+In order to support Gradle's configuration cache, all `FormatterStep` must be round-trip serializable. This is a bit tricky because step equality is based on the serialied form of the state, and `transient` is used to take absolute paths out of the equality check. To make this work, roundtrip compatible steps actually have *two* states
+
+- `RoundtripState` which must be roundtrip serializable but has no equality constraints
+  - `FileSignature.Promised` for settings files and `JarState.Promised` for the classpath 
+- `EqualityState` which will never be reserialized and its serialized form is used for equality / hashCode checks
+  - `FileSignature` for settings files and `JarState` for the classpath
+
+```java
+FormatterStep create(String name,
+  RoundtripState roundTrip,
+  SerializedFunction<RoundtripState, EqualityState> equalityFunc,
+  SerializedFunction<EqualityState, FormatterFunc> formatterFunc)
+FormatterStep createLazy(String name,
+  Supplier<RoundtripState> roundTrip,
+  SerializedFunction<RoundtripState, EqualityState> equalityFunc,
+  SerializedFunction<EqualityState, FormatterFunc> formatterFunc)
+```
+
 ### Third-party dependencies via reflection or compile-only source sets
 
 Most formatters are going to use some kind of third-party jar. Spotless integrates with many formatters, some of which have incompatible transitive dependencies. To address this, we resolve third-party dependencies using [`JarState`](https://github.com/diffplug/spotless/blob/b26f0972b185995d7c6a7aefa726c146d24d9a82/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java#L118). To call methods on the classes in that `JarState`, you can either use reflection or a compile-only source set. See [#524](https://github.com/diffplug/spotless/issues/524) for examples of both approaches.

From c188741074ea89621a950c641dbc05eda6e06bad Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 6 Dec 2023 13:29:56 -0800
Subject: [PATCH 1372/2068] Add `FenceStep` as it is after we do the lint
 refactor.

---
 .../diffplug/spotless/generic/FenceStep.java  | 217 ++++++++++++++++++
 .../spotless/generic/FenceStepTest.java       | 116 ++++++++++
 2 files changed, 333 insertions(+)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
 create mode 100644 testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java

diff --git a/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java b/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
new file mode 100644
index 0000000000..33a9adb6db
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
@@ -0,0 +1,217 @@
+/*
+ * Copyright 2020-2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.generic;
+
+import java.io.File;
+import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import com.diffplug.spotless.Formatter;
+import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.LineEnding;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+public class FenceStep {
+	/** Declares the name of the step. */
+	public static FenceStep named(String name) {
+		return new FenceStep(name);
+	}
+
+	public static String defaultToggleName() {
+		return "toggle";
+	}
+
+	public static String defaultToggleOff() {
+		return "spotless:off";
+	}
+
+	public static String defaultToggleOn() {
+		return "spotless:on";
+	}
+
+	String name;
+	Pattern regex;
+
+	private FenceStep(String name) {
+		this.name = Objects.requireNonNull(name);
+	}
+
+	/** Defines the opening and closing markers. */
+	public FenceStep openClose(String open, String close) {
+		return regex(Pattern.quote(open) + "([\\s\\S]*?)" + Pattern.quote(close));
+	}
+
+	/** Defines the pipe via regex. Must have *exactly one* capturing group. */
+	public FenceStep regex(String regex) {
+		return regex(Pattern.compile(regex));
+	}
+
+	/** Defines the pipe via regex. Must have *exactly one* capturing group. */
+	public FenceStep regex(Pattern regex) {
+		this.regex = Objects.requireNonNull(regex);
+		return this;
+	}
+
+	private void assertRegexSet() {
+		Objects.requireNonNull(regex, "must call regex() or openClose()");
+	}
+
+	/** Returns a step which will apply the given steps but preserve the content selected by the regex / openClose pair. */
+	public FormatterStep preserveWithin(List<FormatterStep> steps) {
+		assertRegexSet();
+		return FormatterStep.createLazy(name,
+				() -> new PreserveWithin(regex, steps),
+				state -> FormatterFunc.Closeable.of(state.buildFormatter(), state));
+	}
+
+	/**
+	 * Returns a step which will apply the given steps only within the blocks selected by the regex / openClose pair.
+	 * Linting within the substeps is not supported.
+	 */
+	public FormatterStep applyWithin(List<FormatterStep> steps) {
+		assertRegexSet();
+		return FormatterStep.createLazy(name,
+				() -> new ApplyWithin(regex, steps),
+				state -> FormatterFunc.Closeable.of(state.buildFormatter(), state));
+	}
+
+	static class ApplyWithin extends Apply implements FormatterFunc.Closeable.ResourceFuncNeedsFile<Formatter> {
+		private static final long serialVersionUID = 17061466531957339L;
+
+		ApplyWithin(Pattern regex, List<FormatterStep> steps) {
+			super(regex, steps);
+		}
+
+		@Override
+		public String apply(Formatter formatter, String unix, File file) throws Exception {
+			List<String> groups = groupsZeroed();
+			Matcher matcher = regex.matcher(unix);
+			while (matcher.find()) {
+				// apply the formatter to each group
+				groups.add(formatter.compute(matcher.group(1), file));
+			}
+			// and then assemble the result right away
+			return assembleGroups(unix);
+		}
+	}
+
+	static class PreserveWithin extends Apply implements FormatterFunc.Closeable.ResourceFuncNeedsFile<Formatter> {
+		private static final long serialVersionUID = -8676786492305178343L;
+
+		PreserveWithin(Pattern regex, List<FormatterStep> steps) {
+			super(regex, steps);
+		}
+
+		private void storeGroups(String unix) {
+			List<String> groups = groupsZeroed();
+			Matcher matcher = regex.matcher(unix);
+			while (matcher.find()) {
+				// store whatever is within the open/close tags
+				groups.add(matcher.group(1));
+			}
+		}
+
+		@Override
+		public String apply(Formatter formatter, String unix, File file) throws Exception {
+			storeGroups(unix);
+			String formatted = formatter.compute(unix, file);
+			return assembleGroups(formatted);
+		}
+	}
+
+	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
+	static class Apply implements Serializable {
+		private static final long serialVersionUID = -2301848328356559915L;
+		final Pattern regex;
+		final List<FormatterStep> steps;
+
+		transient ArrayList<String> groups = new ArrayList<>();
+		transient StringBuilder builderInternal;
+
+		public Apply(Pattern regex, List<FormatterStep> steps) {
+			this.regex = regex;
+			this.steps = steps;
+		}
+
+		protected ArrayList<String> groupsZeroed() {
+			if (groups == null) {
+				groups = new ArrayList<>();
+			} else {
+				groups.clear();
+			}
+			return groups;
+		}
+
+		private StringBuilder builderZeroed() {
+			if (builderInternal == null) {
+				builderInternal = new StringBuilder();
+			} else {
+				builderInternal.setLength(0);
+			}
+			return builderInternal;
+		}
+
+		protected Formatter buildFormatter() {
+			return Formatter.builder()
+					.encoding(StandardCharsets.UTF_8) // can be any UTF, doesn't matter
+					.lineEndingsPolicy(LineEnding.UNIX.createPolicy()) // just internal, won't conflict with user
+					.steps(steps)
+					.build();
+		}
+
+		protected String assembleGroups(String unix) {
+			if (groups.isEmpty()) {
+				return unix;
+			}
+			StringBuilder builder = builderZeroed();
+			Matcher matcher = regex.matcher(unix);
+			int lastEnd = 0;
+			int groupIdx = 0;
+			while (matcher.find()) {
+				builder.append(unix, lastEnd, matcher.start(1));
+				builder.append(groups.get(groupIdx));
+				lastEnd = matcher.end(1);
+				++groupIdx;
+			}
+			if (groupIdx == groups.size()) {
+				builder.append(unix, lastEnd, unix.length());
+				return builder.toString();
+			} else {
+				// these will be needed to generate Lints later on
+				// int startLine = 1 + (int) builder.toString().codePoints().filter(c -> c == '\n').count();
+				// int endLine = 1 + (int) unix.codePoints().filter(c -> c == '\n').count();
+
+				// throw an error with either the full regex, or the nicer open/close pair
+				Matcher openClose = Pattern.compile("\\\\Q([\\s\\S]*?)\\\\E" + "\\Q([\\s\\S]*?)\\E" + "\\\\Q([\\s\\S]*?)\\\\E")
+						.matcher(regex.pattern());
+				String pattern;
+				if (openClose.matches()) {
+					pattern = openClose.group(1) + " " + openClose.group(2);
+				} else {
+					pattern = regex.pattern();
+				}
+				throw new Error("An intermediate step removed a match of " + pattern);
+			}
+		}
+	}
+}
diff --git a/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java b/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java
new file mode 100644
index 0000000000..37e3131cd0
--- /dev/null
+++ b/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2020-2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.generic;
+
+import java.util.Arrays;
+import java.util.Locale;
+
+import org.junit.jupiter.api.Test;
+
+import com.diffplug.common.base.StringPrinter;
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.ResourceHarness;
+import com.diffplug.spotless.StepHarness;
+import com.diffplug.spotless.StepHarnessWithFile;
+
+class FenceStepTest extends ResourceHarness {
+	@Test
+	void single() {
+		FormatterStep fence = FenceStep.named("underTest").openClose("spotless:off", "spotless:on")
+				.preserveWithin(Arrays.asList(FormatterStep.createNeverUpToDate("lowercase", str -> str.toLowerCase(Locale.ROOT))));
+		StepHarness harness = StepHarness.forSteps(fence);
+		harness.test(
+				StringPrinter.buildStringFromLines(
+						"A B C",
+						"spotless:off",
+						"D E F",
+						"spotless:on",
+						"G H I"),
+				StringPrinter.buildStringFromLines(
+						"a b c",
+						"spotless:off",
+						"D E F",
+						"spotless:on",
+						"g h i"));
+	}
+
+	@Test
+	void multiple() {
+		FormatterStep fence = FenceStep.named("underTest").openClose("spotless:off", "spotless:on")
+				.preserveWithin(Arrays.asList(FormatterStep.createNeverUpToDate("lowercase", str -> str.toLowerCase(Locale.ROOT))));
+		StepHarness harness = StepHarness.forSteps(fence);
+		harness.test(
+				StringPrinter.buildStringFromLines(
+						"A B C",
+						"spotless:off",
+						"D E F",
+						"spotless:on",
+						"G H I",
+						"spotless:off J K L spotless:on",
+						"M N O",
+						"P Q R",
+						"S T U spotless:off V W",
+						" X ",
+						" Y spotless:on Z",
+						"1 2 3"),
+				StringPrinter.buildStringFromLines(
+						"a b c",
+						"spotless:off",
+						"D E F",
+						"spotless:on",
+						"g h i",
+						"spotless:off J K L spotless:on",
+						"m n o",
+						"p q r",
+						"s t u spotless:off V W",
+						" X ",
+						" Y spotless:on z",
+						"1 2 3"));
+	}
+
+	@Test
+	void broken() {
+		FormatterStep fence = FenceStep.named("underTest").openClose("spotless:off", "spotless:on")
+				.preserveWithin(Arrays.asList(FormatterStep.createNeverUpToDate("uppercase", str -> str.toUpperCase(Locale.ROOT))));
+		StepHarnessWithFile harness = StepHarnessWithFile.forStep(this, fence);
+		// this fails because uppercase turns spotless:off into SPOTLESS:OFF, etc
+		harness.testExceptionMsg(newFile("test"), StringPrinter.buildStringFromLines("A B C",
+				"spotless:off",
+				"D E F",
+				"spotless:on",
+				"G H I")).isEqualTo("An intermediate step removed a match of spotless:off spotless:on");
+	}
+
+	@Test
+	void andApply() {
+		FormatterStep fence = FenceStep.named("lowercaseSometimes").openClose("<lower>", "</lower>")
+				.applyWithin(Arrays.asList(
+						FormatterStep.createNeverUpToDate("lowercase", str -> str.toLowerCase(Locale.ROOT))));
+		StepHarness.forSteps(fence).test(
+				StringPrinter.buildStringFromLines(
+						"A B C",
+						"<lower>",
+						"D E F",
+						"</lower>",
+						"G H I"),
+				StringPrinter.buildStringFromLines(
+						"A B C",
+						"<lower>",
+						"d e f",
+						"</lower>",
+						"G H I"));
+	}
+}

From 577374ed930a7f1575967839dbd1f48e810f41bd Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 6 Dec 2023 13:30:41 -0800
Subject: [PATCH 1373/2068] Deprecate `PipeStepPair`.

---
 .../java/com/diffplug/spotless/generic/PipeStepPair.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/generic/PipeStepPair.java b/lib/src/main/java/com/diffplug/spotless/generic/PipeStepPair.java
index 38373fec59..6ffa204eec 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/PipeStepPair.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/PipeStepPair.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 DiffPlug
+ * Copyright 2020-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,6 +33,10 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
+/**
+ * @deprecated use FenceStep instead
+ */
+@Deprecated
 public class PipeStepPair {
 	/** The two steps will be named {@code <name>In} and {@code <name>Out}. */
 	public static Builder named(String name) {

From d1bec5be2f5f3574b202164d506370bb94d7162e Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 6 Dec 2023 13:52:24 -0800
Subject: [PATCH 1374/2068] Adapt `FenceStep` for the reality that we haven't
 shipped linting yet.

---
 lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java b/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
index 33a9adb6db..d2ffc74351 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
@@ -18,6 +18,7 @@
 import java.io.File;
 import java.io.Serializable;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -176,6 +177,7 @@ protected Formatter buildFormatter() {
 					.encoding(StandardCharsets.UTF_8) // can be any UTF, doesn't matter
 					.lineEndingsPolicy(LineEnding.UNIX.createPolicy()) // just internal, won't conflict with user
 					.steps(steps)
+					.rootDir(Path.of("")) // TODO: error messages will be suboptimal for now, but it will get fixed when we ship linting
 					.build();
 		}
 

From 20af1c8c0bfc887a7c5ad2ea3c43190421089dac Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 6 Dec 2023 13:52:50 -0800
Subject: [PATCH 1375/2068] Stop using PipeStepPair internally.

---
 .../combined/CombinedJavaFormatStepTest.java  | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/testlib/src/test/java/com/diffplug/spotless/combined/CombinedJavaFormatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/combined/CombinedJavaFormatStepTest.java
index d1eb023400..90b9956892 100644
--- a/testlib/src/test/java/com/diffplug/spotless/combined/CombinedJavaFormatStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/combined/CombinedJavaFormatStepTest.java
@@ -17,14 +17,16 @@
 
 import static com.diffplug.spotless.TestProvisioner.mavenCentral;
 
+import java.util.List;
+
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.ResourceHarness;
 import com.diffplug.spotless.StepHarness;
 import com.diffplug.spotless.generic.EndWithNewlineStep;
+import com.diffplug.spotless.generic.FenceStep;
 import com.diffplug.spotless.generic.IndentStep;
-import com.diffplug.spotless.generic.PipeStepPair;
 import com.diffplug.spotless.generic.TrimTrailingWhitespaceStep;
 import com.diffplug.spotless.java.GoogleJavaFormatStep;
 import com.diffplug.spotless.java.ImportOrderStep;
@@ -40,16 +42,15 @@ void checkIssue1679() {
 		FormatterStep removeUnused = RemoveUnusedImportsStep.create(mavenCentral());
 		FormatterStep trimTrailing = TrimTrailingWhitespaceStep.create();
 		FormatterStep endWithNewLine = EndWithNewlineStep.create();
-		PipeStepPair toggleOffOnPair = PipeStepPair.named(PipeStepPair.defaultToggleName()).openClose("formatting:off", "formatting:on").buildPair();
+		FenceStep toggleOffOnPair = FenceStep.named(FenceStep.defaultToggleName()).openClose("formatting:off", "formatting:on");
 		try (StepHarness formatter = StepHarness.forSteps(
-				toggleOffOnPair.in(),
-				gjf,
-				indentWithSpaces,
-				importOrder,
-				removeUnused,
-				trimTrailing,
-				endWithNewLine,
-				toggleOffOnPair.out())) {
+				toggleOffOnPair.preserveWithin(List.of(
+						gjf,
+						indentWithSpaces,
+						importOrder,
+						removeUnused,
+						trimTrailing,
+						endWithNewLine)))) {
 			formatter.testResource("combined/issue1679.dirty", "combined/issue1679.clean");
 		}
 	}

From 30681239e4547a1ba237cf0d6ecd519e162f9aef Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 6 Dec 2023 13:53:05 -0800
Subject: [PATCH 1376/2068] Replace `Pipe` with `Fence` in the Gradle plugin.

---
 .../gradle/spotless/FormatExtension.java      | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index eae8ac667d..6e66545365 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -57,11 +57,11 @@
 import com.diffplug.spotless.extra.EclipseBasedStepBuilder;
 import com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep;
 import com.diffplug.spotless.generic.EndWithNewlineStep;
+import com.diffplug.spotless.generic.FenceStep;
 import com.diffplug.spotless.generic.IndentStep;
 import com.diffplug.spotless.generic.LicenseHeaderStep;
 import com.diffplug.spotless.generic.LicenseHeaderStep.YearMode;
 import com.diffplug.spotless.generic.NativeCmdStep;
-import com.diffplug.spotless.generic.PipeStepPair;
 import com.diffplug.spotless.generic.ReplaceRegexStep;
 import com.diffplug.spotless.generic.ReplaceStep;
 import com.diffplug.spotless.generic.TrimTrailingWhitespaceStep;
@@ -989,7 +989,7 @@ public void withinBlocks(String name, String open, String close, Action<FormatEx
 	 */
 	public <T extends FormatExtension> void withinBlocks(String name, String open, String close, Class<T> clazz,
 			Action<T> configure) {
-		withinBlocksHelper(PipeStepPair.named(name).openClose(open, close), clazz, configure);
+		withinBlocksHelper(FenceStep.named(name).openClose(open, close), clazz, configure);
 	}
 
 	/**
@@ -1007,18 +1007,17 @@ public void withinBlocksRegex(String name, String regex, Action<FormatExtension>
 	 */
 	public <T extends FormatExtension> void withinBlocksRegex(String name, String regex, Class<T> clazz,
 			Action<T> configure) {
-		withinBlocksHelper(PipeStepPair.named(name).regex(regex), clazz, configure);
+		withinBlocksHelper(FenceStep.named(name).regex(regex), clazz, configure);
 	}
 
-	private <T extends FormatExtension> void withinBlocksHelper(PipeStepPair.Builder builder, Class<T> clazz,
+	private <T extends FormatExtension> void withinBlocksHelper(FenceStep fence, Class<T> clazz,
 			Action<T> configure) {
 		// create the sub-extension
 		T formatExtension = spotless.instantiateFormatExtension(clazz);
 		// configure it
 		configure.execute(formatExtension);
 		// create a step which applies all of those steps as sub-steps
-		FormatterStep step = builder.buildStepWhichAppliesSubSteps(spotless.project.getRootDir().toPath(),
-				formatExtension.steps);
+		FormatterStep step = fence.applyWithin(formatExtension.steps);
 		addStep(step);
 	}
 
@@ -1027,17 +1026,17 @@ private <T extends FormatExtension> void withinBlocksHelper(PipeStepPair.Builder
 	 * that captured group.
 	 */
 	public void toggleOffOnRegex(String regex) {
-		this.togglePair = PipeStepPair.named(PipeStepPair.defaultToggleName()).regex(regex).buildPair();
+		this.toggleFence = FenceStep.named(FenceStep.defaultToggleName()).regex(regex);
 	}
 
 	/** Disables formatting between the given tags. */
 	public void toggleOffOn(String off, String on) {
-		this.togglePair = PipeStepPair.named(PipeStepPair.defaultToggleName()).openClose(off, on).buildPair();
+		this.toggleFence = FenceStep.named(FenceStep.defaultToggleName()).openClose(off, on);
 	}
 
 	/** Disables formatting between {@code spotless:off} and {@code spotless:on}. */
 	public void toggleOffOn() {
-		toggleOffOn(PipeStepPair.defaultToggleOff(), PipeStepPair.defaultToggleOn());
+		toggleOffOn(FenceStep.defaultToggleOff(), FenceStep.defaultToggleOn());
 	}
 
 	/**
@@ -1045,10 +1044,10 @@ public void toggleOffOn() {
 	 * {@link #toggleOffOn(String, String)}.
 	 */
 	public void toggleOffOnDisable() {
-		this.togglePair = null;
+		this.toggleFence = null;
 	}
 
-	private @Nullable PipeStepPair togglePair;
+	private @Nullable FenceStep toggleFence;
 
 	/** Sets up a format task according to the values in this extension. */
 	protected void setupTask(SpotlessTask task) {
@@ -1057,11 +1056,8 @@ protected void setupTask(SpotlessTask task) {
 		FileCollection totalTarget = targetExclude == null ? target : target.minus(targetExclude);
 		task.setTarget(totalTarget);
 		List<FormatterStep> steps;
-		if (togglePair != null) {
-			steps = new ArrayList<>(this.steps.size() + 2);
-			steps.add(togglePair.in());
-			steps.addAll(this.steps);
-			steps.add(togglePair.out());
+		if (toggleFence != null) {
+			steps = List.of(toggleFence.preserveWithin(this.steps));
 		} else {
 			steps = this.steps;
 		}

From 1cbc39155ffc014cfd255496f13cd04cc376e34f Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 6 Dec 2023 13:53:12 -0800
Subject: [PATCH 1377/2068] Replace `Pipe` with `Fence` in the Maven plugin.

---
 .../diffplug/spotless/maven/FormatterFactory.java  |  6 ++----
 .../spotless/maven/generic/ToggleOffOn.java        | 14 +++++++-------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java
index c4a6663087..7294057d39 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java
@@ -36,7 +36,6 @@
 import com.diffplug.spotless.Formatter;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.LineEnding;
-import com.diffplug.spotless.generic.PipeStepPair;
 import com.diffplug.spotless.maven.generic.EclipseWtp;
 import com.diffplug.spotless.maven.generic.EndWithNewline;
 import com.diffplug.spotless.maven.generic.Indent;
@@ -97,9 +96,8 @@ public final Formatter newFormatter(Supplier<Iterable<File>> filesToFormat, Form
 				.map(factory -> factory.newFormatterStep(stepConfig))
 				.collect(Collectors.toCollection(() -> new ArrayList<FormatterStep>()));
 		if (toggle != null) {
-			PipeStepPair pair = toggle.createPair();
-			formatterSteps.add(0, pair.in());
-			formatterSteps.add(pair.out());
+			List<FormatterStep> formatterStepsBeforeToggle = formatterSteps;
+			formatterSteps = List.of(toggle.createFence().preserveWithin(formatterStepsBeforeToggle));
 		}
 
 		String formatterName = this.getClass().getSimpleName();
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/ToggleOffOn.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/ToggleOffOn.java
index fe1676aec9..81ad79083f 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/ToggleOffOn.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/ToggleOffOn.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 DiffPlug
+ * Copyright 2020-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,23 +17,23 @@
 
 import org.apache.maven.plugins.annotations.Parameter;
 
-import com.diffplug.spotless.generic.PipeStepPair;
+import com.diffplug.spotless.generic.FenceStep;
 
 public class ToggleOffOn {
 	@Parameter
-	public String off = PipeStepPair.defaultToggleOff();
+	public String off = FenceStep.defaultToggleOff();
 
 	@Parameter
-	public String on = PipeStepPair.defaultToggleOn();
+	public String on = FenceStep.defaultToggleOn();
 
 	@Parameter
 	public String regex;
 
-	public PipeStepPair createPair() {
+	public FenceStep createFence() {
 		if (regex != null) {
-			return PipeStepPair.named(PipeStepPair.defaultToggleName()).regex(regex).buildPair();
+			return FenceStep.named(FenceStep.defaultToggleName()).regex(regex);
 		} else {
-			return PipeStepPair.named(PipeStepPair.defaultToggleName()).openClose(off, on).buildPair();
+			return FenceStep.named(FenceStep.defaultToggleName()).openClose(off, on);
 		}
 	}
 }

From d12de4f9b876fe72f02a7ca056d5bc17038e4bdf Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 6 Dec 2023 15:13:13 -0800
Subject: [PATCH 1378/2068] Make `FenceStep` compatible with roundtrip
 serialization.

---
 .../diffplug/spotless/generic/FenceStep.java  |  3 +
 .../diffplug/spotless/StepHarnessBase.java    |  2 +
 .../spotless/generic/FenceStepTest.java       | 60 +++++++++++++++----
 3 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java b/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
index d2ffc74351..7f280f98a8 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
@@ -29,6 +29,7 @@
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.LineEnding;
+import com.diffplug.spotless.SerializedFunction;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
@@ -82,6 +83,7 @@ public FormatterStep preserveWithin(List<FormatterStep> steps) {
 		assertRegexSet();
 		return FormatterStep.createLazy(name,
 				() -> new PreserveWithin(regex, steps),
+				SerializedFunction.identity(),
 				state -> FormatterFunc.Closeable.of(state.buildFormatter(), state));
 	}
 
@@ -93,6 +95,7 @@ public FormatterStep applyWithin(List<FormatterStep> steps) {
 		assertRegexSet();
 		return FormatterStep.createLazy(name,
 				() -> new ApplyWithin(regex, steps),
+				SerializedFunction.identity(),
 				state -> FormatterFunc.Closeable.of(state.buildFormatter(), state));
 	}
 
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
index ce3b19a9ae..d7e8609942 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
@@ -46,6 +46,8 @@ protected StepHarnessBase(Formatter formatter) {
 				supportsRoundTrip = true;
 			} else if (onlyStepName.toLowerCase(Locale.ROOT).contains("eclipse")) {
 				supportsRoundTrip = true;
+			} else if (onlyStepName.equals("fence")) {
+				supportsRoundTrip = true;
 			}
 		}
 	}
diff --git a/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java b/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java
index 37e3131cd0..f58110b2c5 100644
--- a/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java
@@ -15,12 +15,17 @@
  */
 package com.diffplug.spotless.generic;
 
+import java.io.File;
+import java.io.Serializable;
 import java.util.Arrays;
-import java.util.Locale;
+import java.util.Objects;
+
+import javax.annotation.Nullable;
 
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.common.base.StringPrinter;
+import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.ResourceHarness;
 import com.diffplug.spotless.StepHarness;
@@ -29,8 +34,8 @@
 class FenceStepTest extends ResourceHarness {
 	@Test
 	void single() {
-		FormatterStep fence = FenceStep.named("underTest").openClose("spotless:off", "spotless:on")
-				.preserveWithin(Arrays.asList(FormatterStep.createNeverUpToDate("lowercase", str -> str.toLowerCase(Locale.ROOT))));
+		FormatterStep fence = FenceStep.named("fence").openClose("spotless:off", "spotless:on")
+				.preserveWithin(Arrays.asList(createNeverUpToDateSerializable("lowercase", String::toLowerCase)));
 		StepHarness harness = StepHarness.forSteps(fence);
 		harness.test(
 				StringPrinter.buildStringFromLines(
@@ -49,8 +54,8 @@ void single() {
 
 	@Test
 	void multiple() {
-		FormatterStep fence = FenceStep.named("underTest").openClose("spotless:off", "spotless:on")
-				.preserveWithin(Arrays.asList(FormatterStep.createNeverUpToDate("lowercase", str -> str.toLowerCase(Locale.ROOT))));
+		FormatterStep fence = FenceStep.named("fence").openClose("spotless:off", "spotless:on")
+				.preserveWithin(Arrays.asList(createNeverUpToDateSerializable("lowercase", String::toLowerCase)));
 		StepHarness harness = StepHarness.forSteps(fence);
 		harness.test(
 				StringPrinter.buildStringFromLines(
@@ -83,8 +88,8 @@ void multiple() {
 
 	@Test
 	void broken() {
-		FormatterStep fence = FenceStep.named("underTest").openClose("spotless:off", "spotless:on")
-				.preserveWithin(Arrays.asList(FormatterStep.createNeverUpToDate("uppercase", str -> str.toUpperCase(Locale.ROOT))));
+		FormatterStep fence = FenceStep.named("fence").openClose("spotless:off", "spotless:on")
+				.preserveWithin(Arrays.asList(createNeverUpToDateSerializable("uppercase", String::toUpperCase)));
 		StepHarnessWithFile harness = StepHarnessWithFile.forStep(this, fence);
 		// this fails because uppercase turns spotless:off into SPOTLESS:OFF, etc
 		harness.testExceptionMsg(newFile("test"), StringPrinter.buildStringFromLines("A B C",
@@ -96,9 +101,8 @@ void broken() {
 
 	@Test
 	void andApply() {
-		FormatterStep fence = FenceStep.named("lowercaseSometimes").openClose("<lower>", "</lower>")
-				.applyWithin(Arrays.asList(
-						FormatterStep.createNeverUpToDate("lowercase", str -> str.toLowerCase(Locale.ROOT))));
+		FormatterStep fence = FenceStep.named("fence").openClose("<lower>", "</lower>")
+				.applyWithin(Arrays.asList(createNeverUpToDateSerializable("lowercase", String::toLowerCase)));
 		StepHarness.forSteps(fence).test(
 				StringPrinter.buildStringFromLines(
 						"A B C",
@@ -113,4 +117,40 @@ void andApply() {
 						"</lower>",
 						"G H I"));
 	}
+
+	/**
+	 * @param name
+	 *             The name of the formatter step
+	 * @param function
+	 *             The function used by the formatter step
+	 * @return A FormatterStep which will never report that it is up-to-date, because
+	 *         it is not equal to the serialized representation of itself.
+	 */
+	static <T extends FormatterFunc & Serializable> FormatterStep createNeverUpToDateSerializable(
+			String name,
+			T function) {
+		Objects.requireNonNull(function, "function");
+		return new NeverUpToDateSerializable(name, function);
+	}
+
+	static class NeverUpToDateSerializable<T extends FormatterFunc & Serializable> implements FormatterStep, Serializable {
+		private final String name;
+		private final T formatterFunc;
+
+		private NeverUpToDateSerializable(String name, T formatterFunc) {
+			this.name = name;
+			this.formatterFunc = formatterFunc;
+		}
+
+		@Override
+		public String getName() {
+			return name;
+		}
+
+		@Nullable
+		@Override
+		public String format(String rawUnix, File file) throws Exception {
+			return formatterFunc.apply(rawUnix, file);
+		}
+	}
 }

From 0fe5d422810422a23870578273002bf5d2cf7931 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 6 Dec 2023 15:25:50 -0800
Subject: [PATCH 1379/2068] Make `ForeignExe` serializable.

---
 lib/src/main/java/com/diffplug/spotless/ForeignExe.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/ForeignExe.java b/lib/src/main/java/com/diffplug/spotless/ForeignExe.java
index 4cb15d1a8a..3deaf7cb55 100644
--- a/lib/src/main/java/com/diffplug/spotless/ForeignExe.java
+++ b/lib/src/main/java/com/diffplug/spotless/ForeignExe.java
@@ -16,6 +16,7 @@
 package com.diffplug.spotless;
 
 import java.io.IOException;
+import java.io.Serializable;
 import java.nio.charset.Charset;
 import java.util.Objects;
 import java.util.regex.Matcher;
@@ -31,7 +32,8 @@
  * Usage: {@code ForeignExe.nameAndVersion("grep", "2.5.7").confirmVersionAndGetAbsolutePath()}
  * will find grep, confirm that it is version 2.5.7, and then return.
  */
-public class ForeignExe {
+public class ForeignExe implements Serializable {
+	private static final long serialVersionUID = 1L;
 	private @Nullable String pathToExe;
 	private String versionFlag = "--version";
 	private Pattern versionRegex = Pattern.compile("version (\\S*)");

From bf0d73a9f8749a23fc3d1ca32ea6e41d703e9c9e Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 6 Dec 2023 15:26:05 -0800
Subject: [PATCH 1380/2068] Make BufStep serializable.

---
 .../diffplug/spotless/protobuf/BufStep.java   | 26 +++++++++++++++----
 .../diffplug/spotless/StepHarnessBase.java    |  2 ++
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java b/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java
index a5a6a6cdef..9f41c4bca1 100644
--- a/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java
@@ -59,16 +59,32 @@ public BufStep withPathToExe(String pathToExe) {
 	}
 
 	public FormatterStep create() {
-		return FormatterStep.createLazy(name(), this::createState, State::toFunc);
+		return FormatterStep.createLazy(name(), this::createRoundtrip, RoundtripState::state, State::toFunc);
 	}
 
-	private State createState() {
+	private RoundtripState createRoundtrip() {
 		String instructions = "https://docs.buf.build/installation";
 		ForeignExe exeAbsPath = ForeignExe.nameAndVersion("buf", version)
 				.pathToExe(pathToExe)
 				.versionRegex(Pattern.compile("(\\S*)"))
 				.fixCantFind("Try following the instructions at " + instructions + ", or else tell Spotless where it is with {@code buf().pathToExe('path/to/executable')}");
-		return new State(this, exeAbsPath);
+		return new RoundtripState(version, exeAbsPath);
+	}
+
+	private static class RoundtripState implements Serializable {
+		private static final long serialVersionUID = 1L;
+
+		final String version;
+		final ForeignExe exe;
+
+		RoundtripState(String version, ForeignExe exe) {
+			this.version = version;
+			this.exe = exe;
+		}
+
+		private State state() {
+			return new State(version, exe);
+		}
 	}
 
 	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
@@ -80,8 +96,8 @@ static class State implements Serializable {
 		// used for executing
 		private transient @Nullable List<String> args;
 
-		State(BufStep step, ForeignExe exeAbsPath) {
-			this.version = step.version;
+		State(String version, ForeignExe exeAbsPath) {
+			this.version = version;
 			this.exe = Objects.requireNonNull(exeAbsPath);
 		}
 
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
index d7e8609942..d73010b02c 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
@@ -48,6 +48,8 @@ protected StepHarnessBase(Formatter formatter) {
 				supportsRoundTrip = true;
 			} else if (onlyStepName.equals("fence")) {
 				supportsRoundTrip = true;
+			} else if (onlyStepName.equals("buf")) {
+				supportsRoundTrip = true;
 			}
 		}
 	}

From 15960a82446a026fd6ad3d6ed02f5cfa36f8f8a0 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 6 Dec 2023 15:29:45 -0800
Subject: [PATCH 1381/2068] Make ClangFormatStep serializable.

---
 .../spotless/cpp/ClangFormatStep.java         | 32 +++++++++++++++----
 .../diffplug/spotless/StepHarnessBase.java    |  3 +-
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/cpp/ClangFormatStep.java b/lib/src/main/java/com/diffplug/spotless/cpp/ClangFormatStep.java
index 5591045505..17c516594c 100644
--- a/lib/src/main/java/com/diffplug/spotless/cpp/ClangFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/cpp/ClangFormatStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 DiffPlug
+ * Copyright 2020-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -64,10 +64,10 @@ public ClangFormatStep withPathToExe(String pathToExe) {
 	}
 
 	public FormatterStep create() {
-		return FormatterStep.createLazy(name(), this::createState, State::toFunc);
+		return FormatterStep.createLazy(name(), this::createState, RoundtripState::state, State::toFunc);
 	}
 
-	private State createState() throws IOException, InterruptedException {
+	private RoundtripState createState() throws IOException, InterruptedException {
 		String howToInstall = "" +
 				"You can download clang-format from https://releases.llvm.org and " +
 				"then point Spotless to it with {@code pathToExe('/path/to/clang-format')} " +
@@ -82,7 +82,25 @@ private State createState() throws IOException, InterruptedException {
 				.fixWrongVersion(
 						"You can tell Spotless to use the version you already have with {@code clangFormat('{versionFound}')}" +
 								"or you can download the currently specified version, {version}.\n" + howToInstall);
-		return new State(this, exe);
+		return new RoundtripState(this, exe);
+	}
+
+	static class RoundtripState implements Serializable {
+		private static final long serialVersionUID = 1L;
+
+		final String version;
+		final @Nullable String style;
+		final ForeignExe exe;
+
+		RoundtripState(ClangFormatStep step, ForeignExe exe) {
+			this.version = step.version;
+			this.style = step.style;
+			this.exe = exe;
+		}
+
+		private State state() {
+			return new State(version, style, exe);
+		}
 	}
 
 	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
@@ -95,9 +113,9 @@ static class State implements Serializable {
 		// used for executing
 		private transient @Nullable List<String> args;
 
-		State(ClangFormatStep step, ForeignExe pathToExe) {
-			this.version = step.version;
-			this.style = step.style;
+		State(String version, @Nullable String style, ForeignExe pathToExe) {
+			this.version = version;
+			this.style = style;
 			this.exe = Objects.requireNonNull(pathToExe);
 		}
 
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
index d73010b02c..02f2beac18 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
@@ -17,6 +17,7 @@
 
 import java.util.Locale;
 import java.util.Objects;
+import java.util.Set;
 
 import org.assertj.core.api.Assertions;
 
@@ -48,7 +49,7 @@ protected StepHarnessBase(Formatter formatter) {
 				supportsRoundTrip = true;
 			} else if (onlyStepName.equals("fence")) {
 				supportsRoundTrip = true;
-			} else if (onlyStepName.equals("buf")) {
+			} else if (Set.of("buf", "clang").contains(onlyStepName)) {
 				supportsRoundTrip = true;
 			}
 		}

From d280cb63c3a07f10bb193ff0cb0c484d0d0f1298 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 6 Dec 2023 15:32:48 -0800
Subject: [PATCH 1382/2068] Make BlackStep serializable.

---
 .../diffplug/spotless/python/BlackStep.java   | 28 +++++++++++++++----
 .../diffplug/spotless/StepHarnessBase.java    |  2 +-
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/python/BlackStep.java b/lib/src/main/java/com/diffplug/spotless/python/BlackStep.java
index 9bce2241dd..364b24bc3f 100644
--- a/lib/src/main/java/com/diffplug/spotless/python/BlackStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/python/BlackStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 DiffPlug
+ * Copyright 2020-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,17 +56,33 @@ public BlackStep withPathToExe(String pathToExe) {
 	}
 
 	public FormatterStep create() {
-		return FormatterStep.createLazy(name(), this::createState, State::toFunc);
+		return FormatterStep.createLazy(name(), this::createState, RoundtripState::state, State::toFunc);
 	}
 
-	private State createState() throws IOException, InterruptedException {
+	private RoundtripState createState() {
 		String trackingIssue = "\n  github issue to handle this better: https://github.com/diffplug/spotless/issues/674";
 		ForeignExe exeAbsPath = ForeignExe.nameAndVersion("black", version)
 				.pathToExe(pathToExe)
 				.versionRegex(Pattern.compile("(?:black, version|black,|version) (\\S*)"))
 				.fixCantFind("Try running {@code pip install black=={version}}, or else tell Spotless where it is with {@code black().pathToExe('path/to/executable')}" + trackingIssue)
 				.fixWrongVersion("Try running {@code pip install --force-reinstall black=={version}}, or else specify {@code black('{versionFound}')} to Spotless" + trackingIssue);
-		return new State(this, exeAbsPath);
+		return new RoundtripState(version, exeAbsPath);
+	}
+
+	static class RoundtripState implements Serializable {
+		private static final long serialVersionUID = 1L;
+
+		final String version;
+		final ForeignExe exe;
+
+		RoundtripState(String version, ForeignExe exe) {
+			this.version = version;
+			this.exe = exe;
+		}
+
+		private State state() {
+			return new State(version, exe);
+		}
 	}
 
 	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
@@ -78,8 +94,8 @@ static class State implements Serializable {
 		// used for executing
 		private transient @Nullable String[] args;
 
-		State(BlackStep step, ForeignExe exeAbsPath) {
-			this.version = step.version;
+		State(String version, ForeignExe exeAbsPath) {
+			this.version = version;
 			this.exe = Objects.requireNonNull(exeAbsPath);
 		}
 
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
index 02f2beac18..d8ae91207d 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
@@ -49,7 +49,7 @@ protected StepHarnessBase(Formatter formatter) {
 				supportsRoundTrip = true;
 			} else if (onlyStepName.equals("fence")) {
 				supportsRoundTrip = true;
-			} else if (Set.of("buf", "clang").contains(onlyStepName)) {
+			} else if (Set.of("black", "buf", "clang").contains(onlyStepName)) {
 				supportsRoundTrip = true;
 			}
 		}

From 54a2848db8f67686fe1f0b691444fb01544911d4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 8 Dec 2023 01:46:51 +0000
Subject: [PATCH 1383/2068] Update dependency dev.equo.ide:solstice to v1.7.5

---
 lib-extra/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index 34cee7e0fd..35952873a5 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -7,7 +7,7 @@ version = rootProject.spotlessChangelog.versionNext
 apply from: rootProject.file('gradle/java-setup.gradle')
 apply from: rootProject.file('gradle/java-publish.gradle')
 
-String VER_SOLSTICE = '1.7.4'
+String VER_SOLSTICE = '1.7.5'
 dependencies {
 	api projects.lib
 	// misc useful utilities

From 5903bb6ce863d8744534d819d5d022e976dd6f13 Mon Sep 17 00:00:00 2001
From: Konrad Windszus <kwin@apache.org>
Date: Fri, 8 Dec 2023 18:13:18 +0100
Subject: [PATCH 1384/2068] Emit contextual error message during incremental
 m2e builds

This closes #1960
---
 .../spotless/extra/integration/DiffMessageFormatter.java  | 8 ++++++--
 .../com/diffplug/spotless/maven/SpotlessCheckMojo.java    | 5 +++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/integration/DiffMessageFormatter.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/integration/DiffMessageFormatter.java
index d43478c0b6..b0fc26203d 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/integration/DiffMessageFormatter.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/integration/DiffMessageFormatter.java
@@ -55,10 +55,10 @@ interface CleanProvider {
 		String getFormatted(File file, String rawUnix);
 	}
 
-	private static class CleanProviderFormatter implements CleanProvider {
+	public static class CleanProviderFormatter implements CleanProvider {
 		private final Formatter formatter;
 
-		CleanProviderFormatter(Formatter formatter) {
+		public CleanProviderFormatter(Formatter formatter) {
 			this.formatter = Objects.requireNonNull(formatter);
 		}
 
@@ -234,6 +234,10 @@ private void addIntendedLine(String indent, String line) {
 	 * sequence (\n, \r, \r\n).
 	 */
 	private String diff(File file) throws IOException {
+		return diff(formatter, file);
+	}
+
+	public static String diff(CleanProvider formatter, File file) throws IOException {
 		String raw = new String(Files.readAllBytes(file.toPath()), formatter.getEncoding());
 		String rawUnix = LineEnding.toUnix(raw);
 		String formatted = formatter.getFormatted(file, rawUnix);
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java
index 03e55e224a..58e176f575 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java
@@ -23,10 +23,12 @@
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
+import org.sonatype.plexus.build.incremental.BuildContext;
 
 import com.diffplug.spotless.Formatter;
 import com.diffplug.spotless.PaddedCell;
 import com.diffplug.spotless.extra.integration.DiffMessageFormatter;
+import com.diffplug.spotless.extra.integration.DiffMessageFormatter.CleanProviderFormatter;
 import com.diffplug.spotless.maven.incremental.UpToDateChecker;
 
 /**
@@ -54,6 +56,9 @@ protected void process(Iterable<File> files, Formatter formatter, UpToDateChecke
 				PaddedCell.DirtyState dirtyState = PaddedCell.calculateDirtyState(formatter, file);
 				if (!dirtyState.isClean() && !dirtyState.didNotConverge()) {
 					problemFiles.add(file);
+					if (buildContext.isIncremental()) {
+						buildContext.addMessage(file, 0, 0, DiffMessageFormatter.diff(new CleanProviderFormatter(formatter), file), BuildContext.SEVERITY_ERROR, null);
+					}
 					counter.cleaned();
 				} else {
 					counter.checkedButAlreadyClean();

From bdecbad91f66464a84c4d1f326cdfc9402b58066 Mon Sep 17 00:00:00 2001
From: Konrad Windszus <kwin@apache.org>
Date: Fri, 8 Dec 2023 19:53:02 +0100
Subject: [PATCH 1385/2068] Emit line number of first difference

Keep CleanProviderFormatter private
---
 .../integration/DiffMessageFormatter.java     | 30 ++++++++++++++-----
 .../spotless/maven/SpotlessCheckMojo.java     |  7 +++--
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/integration/DiffMessageFormatter.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/integration/DiffMessageFormatter.java
index b0fc26203d..1649d5aef4 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/integration/DiffMessageFormatter.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/integration/DiffMessageFormatter.java
@@ -22,11 +22,14 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.AbstractMap;
 import java.util.List;
 import java.util.ListIterator;
+import java.util.Map;
 import java.util.Objects;
 
 import org.eclipse.jgit.diff.DiffFormatter;
+import org.eclipse.jgit.diff.Edit;
 import org.eclipse.jgit.diff.EditList;
 import org.eclipse.jgit.diff.MyersDiff;
 import org.eclipse.jgit.diff.RawText;
@@ -55,10 +58,10 @@ interface CleanProvider {
 		String getFormatted(File file, String rawUnix);
 	}
 
-	public static class CleanProviderFormatter implements CleanProvider {
+	private static class CleanProviderFormatter implements CleanProvider {
 		private final Formatter formatter;
 
-		public CleanProviderFormatter(Formatter formatter) {
+		CleanProviderFormatter(Formatter formatter) {
 			this.formatter = Objects.requireNonNull(formatter);
 		}
 
@@ -234,10 +237,19 @@ private void addIntendedLine(String indent, String line) {
 	 * sequence (\n, \r, \r\n).
 	 */
 	private String diff(File file) throws IOException {
-		return diff(formatter, file);
+		return diff(formatter, file).getKey();
 	}
 
-	public static String diff(CleanProvider formatter, File file) throws IOException {
+	/**
+	 * Returns a map entry with key being a git-style diff between the contents of the given file and what those contents would
+	 * look like if formatted using the given formatter. Does not end with any newline
+	 * sequence (\n, \r, \r\n). The value of the map entry is the line where the first difference occurred.
+	 */
+	public static Map.Entry<String, Integer> diff(Formatter formatter, File file) throws IOException {
+		return diff(new CleanProviderFormatter(formatter), file);
+	}
+
+	private static Map.Entry<String, Integer> diff(CleanProvider formatter, File file) throws IOException {
 		String raw = new String(Files.readAllBytes(file.toPath()), formatter.getEncoding());
 		String rawUnix = LineEnding.toUnix(raw);
 		String formatted = formatter.getFormatted(file, rawUnix);
@@ -252,13 +264,13 @@ public static String diff(CleanProvider formatter, File file) throws IOException
 	}
 
 	/**
-	 * Returns a git-style diff between the two unix strings.
+	 * Returns a map entry with key being a git-style diff between the two unix strings and value being the line of the first difference (in the dirty string)
 	 * <p>
 	 * Output has no trailing newlines.
 	 * <p>
 	 * Boolean args determine whether whitespace or line endings will be visible.
 	 */
-	private static String diffWhitespaceLineEndings(String dirty, String clean, boolean whitespace, boolean lineEndings) throws IOException {
+	private static Map.Entry<String, Integer> diffWhitespaceLineEndings(String dirty, String clean, boolean whitespace, boolean lineEndings) throws IOException {
 		dirty = visibleWhitespaceLineEndings(dirty, whitespace, lineEndings);
 		clean = visibleWhitespaceLineEndings(clean, whitespace, lineEndings);
 
@@ -275,7 +287,11 @@ private static String diffWhitespaceLineEndings(String dirty, String clean, bool
 
 		// we don't need the diff to show this, since we display newlines ourselves
 		formatted = formatted.replace("\\ No newline at end of file\n", "");
-		return NEWLINE_MATCHER.trimTrailingFrom(formatted);
+		return new AbstractMap.SimpleEntry<>(NEWLINE_MATCHER.trimTrailingFrom(formatted), getLineOfFirstDifference(edits));
+	}
+
+	private static int getLineOfFirstDifference(EditList edits) {
+		return edits.stream().mapToInt(Edit::getBeginA).min().getAsInt();
 	}
 
 	private static final CharMatcher NEWLINE_MATCHER = CharMatcher.is('\n');
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java
index 58e176f575..c0e959e362 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java
@@ -19,6 +19,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
@@ -28,7 +29,6 @@
 import com.diffplug.spotless.Formatter;
 import com.diffplug.spotless.PaddedCell;
 import com.diffplug.spotless.extra.integration.DiffMessageFormatter;
-import com.diffplug.spotless.extra.integration.DiffMessageFormatter.CleanProviderFormatter;
 import com.diffplug.spotless.maven.incremental.UpToDateChecker;
 
 /**
@@ -57,7 +57,8 @@ protected void process(Iterable<File> files, Formatter formatter, UpToDateChecke
 				if (!dirtyState.isClean() && !dirtyState.didNotConverge()) {
 					problemFiles.add(file);
 					if (buildContext.isIncremental()) {
-						buildContext.addMessage(file, 0, 0, DiffMessageFormatter.diff(new CleanProviderFormatter(formatter), file), BuildContext.SEVERITY_ERROR, null);
+						Map.Entry<String, Integer> diffEntry = DiffMessageFormatter.diff(formatter, file);
+						buildContext.addMessage(file, diffEntry.getValue(), 0, diffEntry.getKey(), BuildContext.SEVERITY_ERROR, null);
 					}
 					counter.cleaned();
 				} else {
@@ -65,7 +66,7 @@ protected void process(Iterable<File> files, Formatter formatter, UpToDateChecke
 					upToDateChecker.setUpToDate(file.toPath());
 				}
 			} catch (IOException | RuntimeException e) {
-				throw new MojoExecutionException("Unable to format file " + file, e);
+				throw new MojoExecutionException("Unable to check file " + file, e);
 			}
 		}
 

From 0f2e67fa153c9d208c2ea837555937a2fbb7c985 Mon Sep 17 00:00:00 2001
From: Konrad Windszus <kwin@apache.org>
Date: Fri, 8 Dec 2023 20:00:02 +0100
Subject: [PATCH 1386/2068] Line numbers must be 1-based

---
 .../java/com/diffplug/spotless/maven/SpotlessCheckMojo.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java
index c0e959e362..d04cf46c73 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java
@@ -58,7 +58,7 @@ protected void process(Iterable<File> files, Formatter formatter, UpToDateChecke
 					problemFiles.add(file);
 					if (buildContext.isIncremental()) {
 						Map.Entry<String, Integer> diffEntry = DiffMessageFormatter.diff(formatter, file);
-						buildContext.addMessage(file, diffEntry.getValue(), 0, diffEntry.getKey(), BuildContext.SEVERITY_ERROR, null);
+						buildContext.addMessage(file, diffEntry.getValue() + 1, 0, diffEntry.getKey(), BuildContext.SEVERITY_ERROR, null);
 					}
 					counter.cleaned();
 				} else {

From dc6a103243f6f62a8b7550dfadd61ed9805938f4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 9 Dec 2023 04:38:56 +0000
Subject: [PATCH 1387/2068] Update plugin dev.equo.ide to v1.7.5

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 4d549f2b19..24e757bdc2 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -22,7 +22,7 @@ plugins {
 	// https://plugins.gradle.org/plugin/com.gradle.enterprise
 	id 'com.gradle.enterprise' version '3.16'
 	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
-	id 'dev.equo.ide' version '1.7.3' apply false
+	id 'dev.equo.ide' version '1.7.5' apply false
 }
 
 dependencyResolutionManagement {

From 7b65d9a2ba6fb3d6f60bdb5a0ea36f98bef5d769 Mon Sep 17 00:00:00 2001
From: Konrad Windszus <kwin@apache.org>
Date: Sat, 9 Dec 2023 12:04:08 +0100
Subject: [PATCH 1388/2068] Swap key and value in map

Use Map.entry() instead of AbstractMap.SimpleEntry()
---
 .../extra/integration/DiffMessageFormatter.java | 17 ++++++++---------
 .../spotless/maven/SpotlessCheckMojo.java       |  4 ++--
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/integration/DiffMessageFormatter.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/integration/DiffMessageFormatter.java
index 1649d5aef4..9294055a4f 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/integration/DiffMessageFormatter.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/integration/DiffMessageFormatter.java
@@ -22,7 +22,6 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.AbstractMap;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
@@ -237,19 +236,19 @@ private void addIntendedLine(String indent, String line) {
 	 * sequence (\n, \r, \r\n).
 	 */
 	private String diff(File file) throws IOException {
-		return diff(formatter, file).getKey();
+		return diff(formatter, file).getValue();
 	}
 
 	/**
-	 * Returns a map entry with key being a git-style diff between the contents of the given file and what those contents would
+	 * Returns a map entry with value being a git-style diff between the contents of the given file and what those contents would
 	 * look like if formatted using the given formatter. Does not end with any newline
-	 * sequence (\n, \r, \r\n). The value of the map entry is the line where the first difference occurred.
+	 * sequence (\n, \r, \r\n). The key of the map entry is the 0-based line where the first difference occurred.
 	 */
-	public static Map.Entry<String, Integer> diff(Formatter formatter, File file) throws IOException {
+	public static Map.Entry<Integer, String> diff(Formatter formatter, File file) throws IOException {
 		return diff(new CleanProviderFormatter(formatter), file);
 	}
 
-	private static Map.Entry<String, Integer> diff(CleanProvider formatter, File file) throws IOException {
+	private static Map.Entry<Integer, String> diff(CleanProvider formatter, File file) throws IOException {
 		String raw = new String(Files.readAllBytes(file.toPath()), formatter.getEncoding());
 		String rawUnix = LineEnding.toUnix(raw);
 		String formatted = formatter.getFormatted(file, rawUnix);
@@ -264,13 +263,13 @@ private static Map.Entry<String, Integer> diff(CleanProvider formatter, File fil
 	}
 
 	/**
-	 * Returns a map entry with key being a git-style diff between the two unix strings and value being the line of the first difference (in the dirty string)
+	 * Returns a map entry with value being a git-style diff between the two unix strings and key being the 0-based line of the first difference (in the dirty string)
 	 * <p>
 	 * Output has no trailing newlines.
 	 * <p>
 	 * Boolean args determine whether whitespace or line endings will be visible.
 	 */
-	private static Map.Entry<String, Integer> diffWhitespaceLineEndings(String dirty, String clean, boolean whitespace, boolean lineEndings) throws IOException {
+	private static Map.Entry<Integer, String> diffWhitespaceLineEndings(String dirty, String clean, boolean whitespace, boolean lineEndings) throws IOException {
 		dirty = visibleWhitespaceLineEndings(dirty, whitespace, lineEndings);
 		clean = visibleWhitespaceLineEndings(clean, whitespace, lineEndings);
 
@@ -287,7 +286,7 @@ private static Map.Entry<String, Integer> diffWhitespaceLineEndings(String dirty
 
 		// we don't need the diff to show this, since we display newlines ourselves
 		formatted = formatted.replace("\\ No newline at end of file\n", "");
-		return new AbstractMap.SimpleEntry<>(NEWLINE_MATCHER.trimTrailingFrom(formatted), getLineOfFirstDifference(edits));
+		return Map.entry(getLineOfFirstDifference(edits), NEWLINE_MATCHER.trimTrailingFrom(formatted));
 	}
 
 	private static int getLineOfFirstDifference(EditList edits) {
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java
index d04cf46c73..cc83b3f3c9 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java
@@ -57,8 +57,8 @@ protected void process(Iterable<File> files, Formatter formatter, UpToDateChecke
 				if (!dirtyState.isClean() && !dirtyState.didNotConverge()) {
 					problemFiles.add(file);
 					if (buildContext.isIncremental()) {
-						Map.Entry<String, Integer> diffEntry = DiffMessageFormatter.diff(formatter, file);
-						buildContext.addMessage(file, diffEntry.getValue() + 1, 0, diffEntry.getKey(), BuildContext.SEVERITY_ERROR, null);
+						Map.Entry<Integer, String> diffEntry = DiffMessageFormatter.diff(formatter, file);
+						buildContext.addMessage(file, diffEntry.getKey() + 1, 0, diffEntry.getValue(), BuildContext.SEVERITY_ERROR, null);
 					}
 					counter.cleaned();
 				} else {

From ef4721428bd7a70bb8be31a1141167f30c9e61a0 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Mon, 11 Dec 2023 21:17:40 +0800
Subject: [PATCH 1389/2068] Reuse testKitDir

Use this to share test dependencies cache for speeding up clean build.

https://docs.gradle.org/8.5/javadoc/org/gradle/testkit/runner/GradleRunner.html#withTestKitDir-java.io.File-
---
 .../gradle/spotless/GradleIntegrationHarness.java        | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
index 9e1856b6b0..417bc23b52 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
@@ -119,6 +119,7 @@ protected GradleRunner gradleRunner() throws IOException {
 		return GradleRunner.create()
 				.withGradleVersion(GradleVersionSupport.MINIMUM.version)
 				.withProjectDir(rootFolder())
+				.withTestKitDir(getTestKitDir())
 				.withPluginClasspath();
 	}
 
@@ -221,4 +222,12 @@ static String buildResultToString(BuildResult result) {
 			}
 		});
 	}
+
+	private static File getTestKitDir() {
+		String gradleUserHome = System.getenv("GRADLE_USER_HOME");
+		if (gradleUserHome == null || gradleUserHome.isEmpty()) {
+			gradleUserHome = new File(System.getProperty("user.home"), ".gradle").getAbsolutePath();
+		}
+		return new File(gradleUserHome, "testkit");
+	}
 }

From 478135bab9a0d183527fcaa7e3bbdd625c753a7d Mon Sep 17 00:00:00 2001
From: Konrad Windszus <kwin@apache.org>
Date: Thu, 14 Dec 2023 20:28:16 +0100
Subject: [PATCH 1390/2068] Add changelog entries

---
 CHANGES.md              | 1 +
 plugin-maven/CHANGES.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 8293abcd22..13b18f6ecf 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,6 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Changes
+* Add new static method to `DiffMessageFormatter` which allows to retrieve diffs with their line numbers ([#1960](https://github.com/diffplug/spotless/issues/1960))
 * Use palantir-java-format 2.39.0 on Java 21. ([#1948](https://github.com/diffplug/spotless/pull/1948))
 
 ## [2.43.1] - 2023-12-04
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 4fab316049..84d21f29b7 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -4,6 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Changes
+* M2E support: Emit file specific errors during incremental build. ([#1960](https://github.com/diffplug/spotless/issues/1960))
 * Use palantir-java-format 2.39.0 on Java 21. ([#1948](https://github.com/diffplug/spotless/pull/1948))
 
 ## [2.41.1] - 2023-12-04

From a4641caf52e469a2b5513a5849e0fe22fc92f4a1 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 15 Dec 2023 15:27:06 -0800
Subject: [PATCH 1391/2068] Minor update to changelog entries.

---
 CHANGES.md              | 3 ++-
 plugin-maven/CHANGES.md | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 13b18f6ecf..dc040c9aa2 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,8 +10,9 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* New static method to `DiffMessageFormatter` which allows to retrieve diffs with their line numbers ([#1960](https://github.com/diffplug/spotless/issues/1960))
 ### Changes
-* Add new static method to `DiffMessageFormatter` which allows to retrieve diffs with their line numbers ([#1960](https://github.com/diffplug/spotless/issues/1960))
 * Use palantir-java-format 2.39.0 on Java 21. ([#1948](https://github.com/diffplug/spotless/pull/1948))
 
 ## [2.43.1] - 2023-12-04
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 84d21f29b7..55f451ad4e 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,8 +3,9 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
-### Changes
+### Added
 * M2E support: Emit file specific errors during incremental build. ([#1960](https://github.com/diffplug/spotless/issues/1960))
+### Changes
 * Use palantir-java-format 2.39.0 on Java 21. ([#1948](https://github.com/diffplug/spotless/pull/1948))
 
 ## [2.41.1] - 2023-12-04

From 005113e78388919ef447f70a35652b203dc848ed Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 15 Dec 2023 15:44:44 -0800
Subject: [PATCH 1392/2068] Remove unneeded `public` declarations.

---
 .../com/diffplug/spotless/FormatterStep.java  | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
index fdaa9cc068..13076e8744 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
@@ -29,7 +29,7 @@
  */
 public interface FormatterStep extends Serializable {
 	/** The name of the step, for debugging purposes. */
-	public String getName();
+	String getName();
 
 	/**
 	 * Returns a formatted version of the given content.
@@ -43,7 +43,8 @@ public interface FormatterStep extends Serializable {
 	 *         if the formatter step doesn't have any changes to make
 	 * @throws Exception if the formatter step experiences a problem
 	 */
-	public @Nullable String format(String rawUnix, File file) throws Exception;
+	@Nullable
+	String format(String rawUnix, File file) throws Exception;
 
 	/**
 	 * Returns a new FormatterStep which will only apply its changes
@@ -54,7 +55,7 @@ public interface FormatterStep extends Serializable {
 	 * @return FormatterStep
 	 */
 	@Deprecated
-	public default FormatterStep filterByContentPattern(String contentPattern) {
+	default FormatterStep filterByContentPattern(String contentPattern) {
 		return filterByContent(OnMatch.INCLUDE, contentPattern);
 	}
 
@@ -68,7 +69,7 @@ public default FormatterStep filterByContentPattern(String contentPattern) {
 	 *            java regular expression used to filter in or out files which content contain pattern
 	 * @return FormatterStep
 	 */
-	public default FormatterStep filterByContent(OnMatch onMatch, String contentPattern) {
+	default FormatterStep filterByContent(OnMatch onMatch, String contentPattern) {
 		return new FilterByContentPatternFormatterStep(this, onMatch, contentPattern);
 	}
 
@@ -78,7 +79,7 @@ public default FormatterStep filterByContent(OnMatch onMatch, String contentPatt
 	 * <p>
 	 * The provided filter must be serializable.
 	 */
-	public default FormatterStep filterByFile(SerializableFileFilter filter) {
+	default FormatterStep filterByFile(SerializableFileFilter filter) {
 		return new FilterByFileFormatterStep(this, filter);
 	}
 
@@ -124,7 +125,7 @@ static <RoundtripState extends Serializable, EqualityState extends Serializable>
 			ThrowingEx.Supplier<RoundtripState> roundtripInit,
 			SerializedFunction<RoundtripState, EqualityState> equalityFunc,
 			SerializedFunction<EqualityState, FormatterFunc> formatterFunc) {
-		return new FormatterStepSerializationRoundtrip(name, roundtripInit, equalityFunc, formatterFunc);
+		return new FormatterStepSerializationRoundtrip<>(name, roundtripInit, equalityFunc, formatterFunc);
 	}
 
 	/**
@@ -160,7 +161,7 @@ static <RoundtripState extends Serializable, EqualityState extends Serializable>
 	 *             only the state supplied by state and nowhere else.
 	 * @return A FormatterStep
 	 */
-	public static <State extends Serializable> FormatterStep createLazy(
+	static <State extends Serializable> FormatterStep createLazy(
 			String name,
 			ThrowingEx.Supplier<State> stateSupplier,
 			ThrowingEx.Function<State, FormatterFunc> stateToFormatter) {
@@ -177,7 +178,7 @@ public static <State extends Serializable> FormatterStep createLazy(
 	 *             only the state supplied by state and nowhere else.
 	 * @return A FormatterStep
 	 */
-	public static <State extends Serializable> FormatterStep create(
+	static <State extends Serializable> FormatterStep create(
 			String name,
 			State state,
 			ThrowingEx.Function<State, FormatterFunc> stateToFormatter) {
@@ -194,7 +195,7 @@ public static <State extends Serializable> FormatterStep create(
 	 * @return A FormatterStep which will never report that it is up-to-date, because
 	 *         it is not equal to the serialized representation of itself.
 	 */
-	public static FormatterStep createNeverUpToDateLazy(
+	static FormatterStep createNeverUpToDateLazy(
 			String name,
 			ThrowingEx.Supplier<FormatterFunc> functionSupplier) {
 		return new FormatterStepImpl.NeverUpToDate(name, functionSupplier);
@@ -208,7 +209,7 @@ public static FormatterStep createNeverUpToDateLazy(
 	 * @return A FormatterStep which will never report that it is up-to-date, because
 	 *         it is not equal to the serialized representation of itself.
 	 */
-	public static FormatterStep createNeverUpToDate(
+	static FormatterStep createNeverUpToDate(
 			String name,
 			FormatterFunc function) {
 		Objects.requireNonNull(function, "function");

From a1fc08f1eed06f61fd4bf402ca6ff51b0154694f Mon Sep 17 00:00:00 2001
From: Nariman Abdullin <nulls.narik@gmail.com>
Date: Tue, 28 Nov 2023 18:33:01 +0300
Subject: [PATCH 1393/2068] Support diktat 2.0

### What's done:
- added compat for diktat 2.x
- implemented new api
---
 lib/build.gradle                              | 16 ++++
 .../compat/DiktatCompat1Dot2Dot5Adapter.java  | 77 +++++++++++++++++++
 .../compat/DiktatCompat2Dot0Dot0Adapter.java  | 71 +++++++++++++++++
 .../diktat/compat/DiktatCompatAdapter.java    | 22 ++++++
 .../glue/diktat/DiktatFormatterFunc.java      |  2 +
 .../diffplug/spotless/kotlin/DiktatStep.java  |  8 +-
 6 files changed, 193 insertions(+), 3 deletions(-)
 create mode 100644 lib/src/compatDiktat1Dot2Dot5/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat1Dot2Dot5Adapter.java
 create mode 100644 lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java
 create mode 100644 lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompatAdapter.java

diff --git a/lib/build.gradle b/lib/build.gradle
index 475c226a81..1882b2a0f9 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -2,6 +2,10 @@ plugins {
 	id 'java-library'
 	id 'io.github.davidburstrom.version-compatibility'
 }
+repositories {
+	mavenCentral()
+	mavenLocal()
+}
 ext.artifactId = project.artifactIdLib
 version = rootProject.spotlessChangelog.versionNext
 apply from: rootProject.file('gradle/java-setup.gradle')
@@ -52,6 +56,13 @@ versionCompatibility {
 			]
 			targetSourceSetName = 'ktlint'
 		}
+		namespaces.register('Diktat') {
+			versions = [
+				'1.2.5',
+				'2.0.0',
+			]
+			targetSourceSetName = 'diktat'
+		}
 	}
 }
 
@@ -78,6 +89,10 @@ dependencies {
 	compatCleanthat2Dot1CompileAndTestOnly "io.github.solven-eu.cleanthat:java:$VER_CLEANTHAT"
 	// diktat
 	diktatCompileOnly 'org.cqfn.diktat:diktat-rules:1.2.5'
+	// diktat olders supported version 1.x
+	compatDiktat1Dot2Dot5CompileOnly "org.cqfn.diktat:diktat-rules:1.2.5"
+	// diktat latest supported version 2.x
+	compatDiktat2Dot0Dot0CompileOnly "com.saveourtool.diktat:diktat-runner:2.0.0-rc.8.107+20231128T142927Z"
 	// flexmark
 	flexmarkCompileOnly 'com.vladsch.flexmark:flexmark-all:0.64.0'
 	// gherkin
@@ -121,6 +136,7 @@ dependencies {
 	// sortPom
 	sortPomCompileOnly 'com.github.ekryd.sortpom:sortpom-sorter:3.2.1'
 	sortPomCompileOnly 'org.slf4j:slf4j-api:2.0.0'
+
 	// zjsonPatch
 	zjsonPatchCompileOnly 'com.flipkart.zjsonpatch:zjsonpatch:0.4.14'
 }
diff --git a/lib/src/compatDiktat1Dot2Dot5/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat1Dot2Dot5Adapter.java b/lib/src/compatDiktat1Dot2Dot5/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat1Dot2Dot5Adapter.java
new file mode 100644
index 0000000000..cbc720a55f
--- /dev/null
+++ b/lib/src/compatDiktat1Dot2Dot5/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat1Dot2Dot5Adapter.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.glue.diktat.compat;
+
+import com.pinterest.ktlint.core.KtLint;
+import com.pinterest.ktlint.core.LintError;
+import com.pinterest.ktlint.core.RuleSet;
+
+import com.pinterest.ktlint.core.api.EditorConfigOverride;
+
+import kotlin.Unit;
+import kotlin.jvm.functions.Function2;
+
+import org.cqfn.diktat.ruleset.rules.DiktatRuleSetProvider;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class DiktatCompat1Dot2Dot5Adapter implements DiktatCompatAdapter {
+
+	private final List<RuleSet> ruleSets;
+	private final Function2<? super LintError, ? super Boolean, Unit> formatterCallback;
+	private final ArrayList<LintError> errors = new ArrayList<>();
+
+	public DiktatCompat1Dot2Dot5Adapter() {
+		this.ruleSets = Collections.singletonList(new DiktatRuleSetProvider().get());
+		this.formatterCallback = new FormatterCallback(errors);
+	}
+
+	static class FormatterCallback implements Function2<LintError, Boolean, Unit> {
+		private final ArrayList<LintError> errors;
+
+		FormatterCallback(ArrayList<LintError> errors) {
+			this.errors = errors;
+		}
+
+		@Override
+		public Unit invoke(LintError lintError, Boolean corrected) {
+			if (!corrected) {
+				errors.add(lintError);
+			}
+			return null;
+		}
+	}
+
+	@Override
+	public String format(final File file, final String content, final boolean isScript) {
+		return KtLint.INSTANCE.format(new KtLint.ExperimentalParams(
+			// Unlike Ktlint, Diktat requires full path to the file.
+			// See https://github.com/diffplug/spotless/issues/1189, https://github.com/analysis-dev/diktat/issues/1202
+			file.getAbsolutePath(),
+			content,
+			ruleSets,
+			Collections.emptyMap(),
+			formatterCallback,
+			isScript,
+			null,
+			false,
+			new EditorConfigOverride(),
+			false));
+	}
+}
diff --git a/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java b/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java
new file mode 100644
index 0000000000..0b65b0aaf9
--- /dev/null
+++ b/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java
@@ -0,0 +1,71 @@
+package com.diffplug.spotless.glue.diktat.compat;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.saveourtool.diktat.DiktatFactoriesKt;
+import com.saveourtool.diktat.DiktatProcessor;
+import com.saveourtool.diktat.api.DiktatCallback;
+import com.saveourtool.diktat.api.DiktatError;
+import com.saveourtool.diktat.api.DiktatRuleConfig;
+import com.saveourtool.diktat.api.DiktatRuleSet;
+
+import kotlin.Unit;
+
+import org.jetbrains.annotations.NotNull;
+
+public class DiktatCompat2Dot0Dot0Adapter implements DiktatCompatAdapter {
+	private final DiktatProcessor processor;
+	private final DiktatCallback formatterCallback;
+
+	public DiktatCompat2Dot0Dot0Adapter(File configFile) {
+		this.processor = getDiktatReporter(configFile);
+		this.formatterCallback = new FormatterCallback(new ArrayList<>());
+	}
+
+	@Override
+	public String format(File file, String content, boolean isScript) {
+		return processor.fix(
+			file.toPath(),
+			formatterCallback
+		);
+	}
+
+	private static class FormatterCallback implements DiktatCallback {
+		private final ArrayList<DiktatError> errors;
+
+		FormatterCallback(ArrayList<DiktatError> errors) {
+			this.errors = errors;
+		}
+
+		@Override
+		public Unit invoke(DiktatError diktatError, Boolean corrected) {
+			if (!corrected) {
+				errors.add(diktatError);
+			}
+			return Unit.INSTANCE;
+		}
+
+		@Override
+		public void invoke(@NotNull DiktatError diktatError, boolean corrected) {
+			if (!corrected) {
+				errors.add(diktatError);
+			}
+		}
+	}
+
+	private static DiktatProcessor getDiktatReporter(File configFile) {
+		try {
+			final InputStream configInputStream = new FileInputStream(configFile);
+			final List<DiktatRuleConfig> ruleConfigs = DiktatFactoriesKt.getDiktatRuleConfigReader().invoke(configInputStream);
+			final DiktatRuleSet ruleSet = DiktatFactoriesKt.getDiktatRuleSetFactory().invoke(ruleConfigs);
+			return DiktatFactoriesKt.getDiktatProcessorFactory().invoke(ruleSet);
+		} catch (FileNotFoundException e) {
+			throw new IllegalArgumentException("Config file doesn't exist", e);
+		}
+	}
+}
diff --git a/lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompatAdapter.java b/lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompatAdapter.java
new file mode 100644
index 0000000000..fdc6e77afa
--- /dev/null
+++ b/lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompatAdapter.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.glue.diktat.compat;
+
+import java.io.File;
+
+public interface DiktatCompatAdapter {
+	String format(File file, String content, boolean isScript);
+}
diff --git a/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java b/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java
index 0b9d115c2b..be76f6524a 100644
--- a/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java
+++ b/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java
@@ -30,6 +30,8 @@
 import kotlin.Unit;
 import kotlin.jvm.functions.Function2;
 
+import org.jetbrains.annotations.NotNull;
+
 public class DiktatFormatterFunc implements FormatterFunc.NeedsFile {
 
 	private final List<RuleSet> rulesets;
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
index a2650e31fc..33084b45ac 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
@@ -34,8 +34,10 @@ private DiktatStep() {}
 
 	private static final String DEFAULT_VERSION = "1.2.5";
 	static final String NAME = "diktat";
-	static final String PACKAGE_DIKTAT = "org.cqfn.diktat";
-	static final String MAVEN_COORDINATE = PACKAGE_DIKTAT + ":diktat-rules:";
+	static final String PACKAGE_PRE_2_0_0 = "org.cqfn.diktat";
+	static final String PACKAGE = "com.saveourtool.diktat";
+	static final String MAVEN_COORDINATE_PRE_2_0_0 = PACKAGE_PRE_2_0_0 + ":diktat-rules:";
+	static final String MAVEN_COORDINATE = PACKAGE + ":diktat-runner:";
 
 	public static String defaultVersionDiktat() {
 		return DEFAULT_VERSION;
@@ -76,7 +78,7 @@ static final class State implements Serializable {
 		State(String versionDiktat, Provisioner provisioner, boolean isScript, @Nullable FileSignature config) throws IOException {
 
 			HashSet<String> pkgSet = new HashSet<>();
-			pkgSet.add(MAVEN_COORDINATE + versionDiktat);
+			pkgSet.add(MAVEN_COORDINATE_PRE_2_0_0 + versionDiktat);
 
 			this.jar = JarState.from(pkgSet, provisioner);
 			this.isScript = isScript;

From 18a8742aab2e021d260e0436c7d234e861624f15 Mon Sep 17 00:00:00 2001
From: Nariman Abdullin <nulls.narik@gmail.com>
Date: Wed, 29 Nov 2023 13:30:07 +0300
Subject: [PATCH 1394/2068] finished support of next version of diktat

---
 lib/build.gradle                              |  4 +-
 .../compat/DiktatCompat1Dot2Dot5Adapter.java  | 15 +++-
 .../compat/DiktatCompat2Dot0Dot0Adapter.java  | 39 +++++---
 .../glue/diktat/compat/DiktatReporting.java   | 38 ++++++++
 .../glue/diktat/DiktatFormatterFunc.java      | 88 +++++--------------
 .../diffplug/spotless/kotlin/DiktatStep.java  | 29 +++---
 .../diffplug/spotless/TestProvisioner.java    |  8 ++
 .../spotless/kotlin/DiktatStepTest.java       |  2 +-
 8 files changed, 128 insertions(+), 95 deletions(-)
 create mode 100644 lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatReporting.java

diff --git a/lib/build.gradle b/lib/build.gradle
index 1882b2a0f9..aed9a6a5a8 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -87,9 +87,7 @@ dependencies {
 	String VER_CLEANTHAT='2.17'
 	cleanthatCompileOnly "io.github.solven-eu.cleanthat:java:$VER_CLEANTHAT"
 	compatCleanthat2Dot1CompileAndTestOnly "io.github.solven-eu.cleanthat:java:$VER_CLEANTHAT"
-	// diktat
-	diktatCompileOnly 'org.cqfn.diktat:diktat-rules:1.2.5'
-	// diktat olders supported version 1.x
+	// diktat old supported version 1.x
 	compatDiktat1Dot2Dot5CompileOnly "org.cqfn.diktat:diktat-rules:1.2.5"
 	// diktat latest supported version 2.x
 	compatDiktat2Dot0Dot0CompileOnly "com.saveourtool.diktat:diktat-runner:2.0.0-rc.8.107+20231128T142927Z"
diff --git a/lib/src/compatDiktat1Dot2Dot5/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat1Dot2Dot5Adapter.java b/lib/src/compatDiktat1Dot2Dot5/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat1Dot2Dot5Adapter.java
index cbc720a55f..dc5cde1c4d 100644
--- a/lib/src/compatDiktat1Dot2Dot5/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat1Dot2Dot5Adapter.java
+++ b/lib/src/compatDiktat1Dot2Dot5/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat1Dot2Dot5Adapter.java
@@ -26,18 +26,22 @@
 
 import org.cqfn.diktat.ruleset.rules.DiktatRuleSetProvider;
 
+import javax.annotation.Nullable;
+
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 public class DiktatCompat1Dot2Dot5Adapter implements DiktatCompatAdapter {
-
 	private final List<RuleSet> ruleSets;
 	private final Function2<? super LintError, ? super Boolean, Unit> formatterCallback;
 	private final ArrayList<LintError> errors = new ArrayList<>();
 
-	public DiktatCompat1Dot2Dot5Adapter() {
+	public DiktatCompat1Dot2Dot5Adapter(@Nullable File configFile) {
+		if (configFile != null) {
+			System.setProperty("diktat.config.path", configFile.getAbsolutePath());
+		}
 		this.ruleSets = Collections.singletonList(new DiktatRuleSetProvider().get());
 		this.formatterCallback = new FormatterCallback(errors);
 	}
@@ -60,7 +64,8 @@ public Unit invoke(LintError lintError, Boolean corrected) {
 
 	@Override
 	public String format(final File file, final String content, final boolean isScript) {
-		return KtLint.INSTANCE.format(new KtLint.ExperimentalParams(
+		errors.clear();
+		String result = KtLint.INSTANCE.format(new KtLint.ExperimentalParams(
 			// Unlike Ktlint, Diktat requires full path to the file.
 			// See https://github.com/diffplug/spotless/issues/1189, https://github.com/analysis-dev/diktat/issues/1202
 			file.getAbsolutePath(),
@@ -73,5 +78,9 @@ public String format(final File file, final String content, final boolean isScri
 			false,
 			new EditorConfigOverride(),
 			false));
+
+		DiktatReporting.reportIfRequired(errors, LintError::getLine, LintError::getCol, LintError::getDetail);
+
+		return result;
 	}
 }
diff --git a/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java b/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java
index 0b65b0aaf9..6b8c5c2e28 100644
--- a/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java
+++ b/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.glue.diktat.compat;
 
 import java.io.File;
@@ -17,22 +32,24 @@
 import kotlin.Unit;
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 public class DiktatCompat2Dot0Dot0Adapter implements DiktatCompatAdapter {
 	private final DiktatProcessor processor;
 	private final DiktatCallback formatterCallback;
+	private final ArrayList<DiktatError> errors = new ArrayList<>();
 
-	public DiktatCompat2Dot0Dot0Adapter(File configFile) {
-		this.processor = getDiktatReporter(configFile);
-		this.formatterCallback = new FormatterCallback(new ArrayList<>());
+	public DiktatCompat2Dot0Dot0Adapter(@Nullable File configFile) {
+		this.processor = getDiktatReporter(configFile != null ? configFile : new File("diktat-analysis.yml"));
+		this.formatterCallback = new FormatterCallback(errors);
 	}
 
 	@Override
 	public String format(File file, String content, boolean isScript) {
-		return processor.fix(
-			file.toPath(),
-			formatterCallback
-		);
+		errors.clear();
+		String result = processor.fix(file.toPath(), formatterCallback);
+		DiktatReporting.reportIfRequired(errors, DiktatError::getLine, DiktatError::getCol, DiktatError::getDetail);
+		return result;
 	}
 
 	private static class FormatterCallback implements DiktatCallback {
@@ -44,14 +61,16 @@ private static class FormatterCallback implements DiktatCallback {
 
 		@Override
 		public Unit invoke(DiktatError diktatError, Boolean corrected) {
-			if (!corrected) {
-				errors.add(diktatError);
-			}
+			doInvoke(diktatError, corrected);
 			return Unit.INSTANCE;
 		}
 
 		@Override
 		public void invoke(@NotNull DiktatError diktatError, boolean corrected) {
+			doInvoke(diktatError, corrected);
+		}
+
+		private void doInvoke(@NotNull DiktatError diktatError, boolean corrected) {
 			if (!corrected) {
 				errors.add(diktatError);
 			}
diff --git a/lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatReporting.java b/lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatReporting.java
new file mode 100644
index 0000000000..a4c92e59d4
--- /dev/null
+++ b/lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatReporting.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.glue.diktat.compat;
+
+import java.util.List;
+import java.util.function.Function;
+import java.util.function.ToIntFunction;
+
+final class DiktatReporting {
+	static <T> void reportIfRequired(List<T> errors, ToIntFunction<T> lineGetter, ToIntFunction<T> columnGetter, Function<T, String> detailGetter) {
+		if (!errors.isEmpty()) {
+			StringBuilder error = new StringBuilder();
+			error.append("There are ").append(errors.size()).append(" unfixed errors:");
+			for (T er : errors) {
+				error.append(System.lineSeparator())
+					.append("Error on line: ").append(lineGetter.applyAsInt(er))
+					.append(", column: ").append(columnGetter.applyAsInt(er))
+					.append(" cannot be fixed automatically")
+					.append(System.lineSeparator())
+					.append(detailGetter.apply(er));
+			}
+			throw new AssertionError(error);
+		}
+	}
+}
diff --git a/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java b/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java
index be76f6524a..93529130bd 100644
--- a/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java
+++ b/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 DiffPlug
+ * Copyright 2021-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,83 +16,35 @@
 package com.diffplug.spotless.glue.diktat;
 
 import java.io.File;
-import java.util.*;
 
-import org.cqfn.diktat.ruleset.rules.DiktatRuleSetProvider;
-
-import com.pinterest.ktlint.core.KtLint;
-import com.pinterest.ktlint.core.LintError;
-import com.pinterest.ktlint.core.RuleSet;
-import com.pinterest.ktlint.core.api.EditorConfigOverride;
+import com.diffplug.spotless.glue.diktat.compat.DiktatCompat1Dot2Dot5Adapter;
+import com.diffplug.spotless.glue.diktat.compat.DiktatCompat2Dot0Dot0Adapter;
+import com.diffplug.spotless.glue.diktat.compat.DiktatCompatAdapter;
 
 import com.diffplug.spotless.FormatterFunc;
 
-import kotlin.Unit;
-import kotlin.jvm.functions.Function2;
-
-import org.jetbrains.annotations.NotNull;
-
 public class DiktatFormatterFunc implements FormatterFunc.NeedsFile {
-
-	private final List<RuleSet> rulesets;
-	private final Function2<? super LintError, ? super Boolean, Unit> formatterCallback;
+	private final DiktatCompatAdapter adapter;
 	private final boolean isScript;
 
-	private final ArrayList<LintError> errors = new ArrayList<>();
-
-	public DiktatFormatterFunc(boolean isScript) {
-		rulesets = Collections.singletonList(new DiktatRuleSetProvider().get());
-		this.formatterCallback = new FormatterCallback(errors);
-		this.isScript = isScript;
-	}
-
-	static class FormatterCallback implements Function2<LintError, Boolean, Unit> {
-		private final ArrayList<LintError> errors;
-
-		FormatterCallback(ArrayList<LintError> errors) {
-			this.errors = errors;
-		}
-
-		@Override
-		public Unit invoke(LintError lintError, Boolean corrected) {
-			if (!corrected) {
-				errors.add(lintError);
-			}
-			return null;
+	public DiktatFormatterFunc(
+		String version,
+		File configFile,
+		boolean isScript
+	) {
+		int majorVersion = Integer.parseInt(version.split("\\.")[0]);
+		if (majorVersion == 1) {
+			this.adapter = new DiktatCompat1Dot2Dot5Adapter(configFile);
+		} else if (majorVersion == 2) {
+			this.adapter = new DiktatCompat2Dot0Dot0Adapter(configFile);
+		} else {
+			throw new IllegalStateException("Not supported version of Diktat!");
 		}
+		this.isScript = isScript;
 	}
 
 	@Override
-	public String applyWithFile(String unix, File file) throws Exception {
-		errors.clear();
-		String result = KtLint.INSTANCE.format(new KtLint.ExperimentalParams(
-				// Unlike Ktlint, Diktat requires full path to the file.
-				// See https://github.com/diffplug/spotless/issues/1189, https://github.com/analysis-dev/diktat/issues/1202
-				file.getAbsolutePath(),
-				unix,
-				rulesets,
-				Collections.emptyMap(),
-				formatterCallback,
-				isScript,
-				null,
-				false,
-				new EditorConfigOverride(),
-				false));
-
-		if (!errors.isEmpty()) {
-			StringBuilder error = new StringBuilder();
-			error.append("There are ").append(errors.size()).append(" unfixed errors:");
-			for (LintError er : errors) {
-				error.append(System.lineSeparator())
-						.append("Error on line: ").append(er.getLine())
-						.append(", column: ").append(er.getCol())
-						.append(" cannot be fixed automatically")
-						.append(System.lineSeparator())
-						.append(er.getDetail());
-			}
-			throw new AssertionError(error);
-		}
-
-		return result;
+	public String applyWithFile(String unix, File file) {
+		return adapter.format(file, unix, isScript);
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
index 33084b45ac..f02cab6efe 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
@@ -15,6 +15,7 @@
  */
 package com.diffplug.spotless.kotlin;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
@@ -24,7 +25,7 @@
 
 import com.diffplug.spotless.*;
 
-/** Wraps up <a href="https://github.com/cqfn/diKTat">diktat</a> as a FormatterStep. */
+/** Wraps up <a href="https://github.com/saveourtool/diktat">diktat</a> as a FormatterStep. */
 public class DiktatStep {
 
 	// prevent direct instantiation
@@ -32,7 +33,9 @@ private DiktatStep() {}
 
 	private static final String MIN_SUPPORTED_VERSION = "1.2.1";
 
-	private static final String DEFAULT_VERSION = "1.2.5";
+	private static final String PACKAGE_RELOCATED_VERSION = "2.0.0";
+
+	private static final String DEFAULT_VERSION = "2.0.0";
 	static final String NAME = "diktat";
 	static final String PACKAGE_PRE_2_0_0 = "org.cqfn.diktat";
 	static final String PACKAGE = "com.saveourtool.diktat";
@@ -70,29 +73,35 @@ static final class State implements Serializable {
 
 		private static final long serialVersionUID = 1L;
 
+		private final String versionDiktat;
 		/** Are the files being linted Kotlin script files. */
 		private final boolean isScript;
 		private final @Nullable FileSignature config;
 		final JarState jar;
 
 		State(String versionDiktat, Provisioner provisioner, boolean isScript, @Nullable FileSignature config) throws IOException {
-
 			HashSet<String> pkgSet = new HashSet<>();
-			pkgSet.add(MAVEN_COORDINATE_PRE_2_0_0 + versionDiktat);
+			if (BadSemver.version(versionDiktat) >= BadSemver.version(PACKAGE_RELOCATED_VERSION)) {
+				pkgSet.add(MAVEN_COORDINATE + versionDiktat);
+			} else {
+				pkgSet.add(MAVEN_COORDINATE_PRE_2_0_0 + versionDiktat);
+			}
 
 			this.jar = JarState.from(pkgSet, provisioner);
+			this.versionDiktat = versionDiktat;
 			this.isScript = isScript;
 			this.config = config;
 		}
 
 		FormatterFunc createFormat() throws Exception {
-			if (config != null) {
-				System.setProperty("diktat.config.path", config.getOnlyFile().getAbsolutePath());
-			}
-
+			final File configFile = (config != null) ? config.getOnlyFile() : null;
 			Class<?> formatterFunc = jar.getClassLoader().loadClass("com.diffplug.spotless.glue.diktat.DiktatFormatterFunc");
-			Constructor<?> constructor = formatterFunc.getConstructor(boolean.class);
-			return (FormatterFunc.NeedsFile) constructor.newInstance(isScript);
+			Constructor<?> constructor = formatterFunc.getConstructor(
+				String.class,
+				File.class,
+				boolean.class
+			);
+			return (FormatterFunc.NeedsFile) constructor.newInstance(versionDiktat, configFile, isScript);
 		}
 	}
 }
diff --git a/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java b/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java
index 53a5cfed30..b86b38c3bc 100644
--- a/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java
+++ b/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java
@@ -164,7 +164,15 @@ public static Provisioner mavenLocal() {
 		return mavenLocal.get();
 	}
 
+	public static Provisioner mavenCentralAndLocal() {
+		return mavenCentralAndLocal.get();
+	}
+
 	private static final Supplier<Provisioner> mavenLocal = () -> createWithRepositories(repo -> repo.mavenLocal());
+	private static final Supplier<Provisioner> mavenCentralAndLocal = () -> createWithRepositories(repo -> {
+		repo.mavenCentral();
+		repo.mavenLocal();
+	});
 
 	/** Creates a Provisioner for the Sonatype snapshots maven repo for development purpose. */
 	public static Provisioner snapshots() {
diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
index 5055f47e8d..6052d97cd9 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
@@ -32,7 +32,7 @@ class DiktatStepTest extends ResourceHarness {
 
 	@Test
 	void behavior() {
-		FormatterStep step = DiktatStep.create(TestProvisioner.mavenCentral());
+		FormatterStep step = DiktatStep.create("2.0.0-rc.8.108+b4039ad", TestProvisioner.mavenCentralAndLocal());
 		StepHarnessWithFile.forStep(this, step).testResourceExceptionMsg("kotlin/diktat/Unsolvable.kt").isEqualTo("There are 2 unfixed errors:" +
 				System.lineSeparator() + "Error on line: 1, column: 1 cannot be fixed automatically" +
 				System.lineSeparator() + "[DEBUG_PRINT] use a dedicated logging library: found println()" +

From 44d8320b3bfe0543aa686ca0bf92ad5f69def701 Mon Sep 17 00:00:00 2001
From: Nariman Abdullin <nulls.narik@gmail.com>
Date: Thu, 30 Nov 2023 16:07:51 +0300
Subject: [PATCH 1395/2068] support empty config file

---
 .../compat/DiktatCompat2Dot0Dot0Adapter.java    | 17 ++++++++++++-----
 .../diffplug/spotless/kotlin/DiktatStep.java    |  2 +-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java b/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java
index 6b8c5c2e28..e6d8fc9c78 100644
--- a/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java
+++ b/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java
@@ -20,6 +20,7 @@
 import java.io.FileNotFoundException;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import com.saveourtool.diktat.DiktatFactoriesKt;
@@ -40,7 +41,7 @@ public class DiktatCompat2Dot0Dot0Adapter implements DiktatCompatAdapter {
 	private final ArrayList<DiktatError> errors = new ArrayList<>();
 
 	public DiktatCompat2Dot0Dot0Adapter(@Nullable File configFile) {
-		this.processor = getDiktatReporter(configFile != null ? configFile : new File("diktat-analysis.yml"));
+		this.processor = getDiktatReporter(configFile);
 		this.formatterCallback = new FormatterCallback(errors);
 	}
 
@@ -78,13 +79,19 @@ private void doInvoke(@NotNull DiktatError diktatError, boolean corrected) {
 	}
 
 	private static DiktatProcessor getDiktatReporter(File configFile) {
+		final DiktatRuleSet ruleSet = DiktatFactoriesKt.getDiktatRuleSetFactory().invoke(readRuleConfigs(configFile));
+		return DiktatFactoriesKt.getDiktatProcessorFactory().invoke(ruleSet);
+	}
+
+	private static List<DiktatRuleConfig> readRuleConfigs(File configFile) {
+		if (configFile == null) {
+			return Collections.emptyList();
+		}
 		try {
 			final InputStream configInputStream = new FileInputStream(configFile);
-			final List<DiktatRuleConfig> ruleConfigs = DiktatFactoriesKt.getDiktatRuleConfigReader().invoke(configInputStream);
-			final DiktatRuleSet ruleSet = DiktatFactoriesKt.getDiktatRuleSetFactory().invoke(ruleConfigs);
-			return DiktatFactoriesKt.getDiktatProcessorFactory().invoke(ruleSet);
+			return DiktatFactoriesKt.getDiktatRuleConfigReader().invoke(configInputStream);
 		} catch (FileNotFoundException e) {
-			throw new IllegalArgumentException("Config file doesn't exist", e);
+			throw new IllegalArgumentException("Fail to read configFile", e);
 		}
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
index f02cab6efe..4573b13d7d 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
@@ -82,7 +82,7 @@ static final class State implements Serializable {
 		State(String versionDiktat, Provisioner provisioner, boolean isScript, @Nullable FileSignature config) throws IOException {
 			HashSet<String> pkgSet = new HashSet<>();
 			if (BadSemver.version(versionDiktat) >= BadSemver.version(PACKAGE_RELOCATED_VERSION)) {
-				pkgSet.add(MAVEN_COORDINATE + versionDiktat);
+				pkgSet.add(MAVEN_COORDINATE + versionDiktat + ":shadow");
 			} else {
 				pkgSet.add(MAVEN_COORDINATE_PRE_2_0_0 + versionDiktat);
 			}

From 56025fc47d2e5f7459a5ca5014d8ece007c202ab Mon Sep 17 00:00:00 2001
From: Nariman Abdullin <nulls.narik@gmail.com>
Date: Mon, 18 Dec 2023 15:00:41 +0300
Subject: [PATCH 1396/2068] fixed log message

---
 .../java/com/diffplug/spotless/kotlin/DiktatStepTest.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
index 6052d97cd9..fadaed76bd 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
@@ -32,9 +32,10 @@ class DiktatStepTest extends ResourceHarness {
 
 	@Test
 	void behavior() {
-		FormatterStep step = DiktatStep.create("2.0.0-rc.8.108+b4039ad", TestProvisioner.mavenCentralAndLocal());
+//		FormatterStep step = DiktatStep.create("1.2.5", TestProvisioner.mavenCentralAndLocal());
+		FormatterStep step = DiktatStep.create("2.0.0-rc.8.145+5b7b3c5", TestProvisioner.mavenCentralAndLocal());
 		StepHarnessWithFile.forStep(this, step).testResourceExceptionMsg("kotlin/diktat/Unsolvable.kt").isEqualTo("There are 2 unfixed errors:" +
-				System.lineSeparator() + "Error on line: 1, column: 1 cannot be fixed automatically" +
+				System.lineSeparator() + "Error on line: 12, column: 9 cannot be fixed automatically" +
 				System.lineSeparator() + "[DEBUG_PRINT] use a dedicated logging library: found println()" +
 				System.lineSeparator() + "Error on line: 13, column: 9 cannot be fixed automatically" +
 				System.lineSeparator() + "[DEBUG_PRINT] use a dedicated logging library: found println()");

From 408b221ceaee93f6b3a11f61ab5d3998adee9834 Mon Sep 17 00:00:00 2001
From: Nariman Abdullin <nulls.narik@gmail.com>
Date: Mon, 18 Dec 2023 15:08:24 +0300
Subject: [PATCH 1397/2068] we support only 1.x or 2.x

---
 .../diffplug/spotless/glue/diktat/DiktatFormatterFunc.java    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java b/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java
index 93529130bd..d80051b864 100644
--- a/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java
+++ b/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java
@@ -35,10 +35,8 @@ public DiktatFormatterFunc(
 		int majorVersion = Integer.parseInt(version.split("\\.")[0]);
 		if (majorVersion == 1) {
 			this.adapter = new DiktatCompat1Dot2Dot5Adapter(configFile);
-		} else if (majorVersion == 2) {
-			this.adapter = new DiktatCompat2Dot0Dot0Adapter(configFile);
 		} else {
-			throw new IllegalStateException("Not supported version of Diktat!");
+			this.adapter = new DiktatCompat2Dot0Dot0Adapter(configFile);
 		}
 		this.isScript = isScript;
 	}

From 209e2cecc1e89714bbbefed491762ef5241f734f Mon Sep 17 00:00:00 2001
From: Nariman Abdullin <nulls.narik@gmail.com>
Date: Mon, 18 Dec 2023 15:12:55 +0300
Subject: [PATCH 1398/2068] not need to parse major version

---
 .../com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java b/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java
index d80051b864..93eebbf0ee 100644
--- a/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java
+++ b/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java
@@ -32,8 +32,7 @@ public DiktatFormatterFunc(
 		File configFile,
 		boolean isScript
 	) {
-		int majorVersion = Integer.parseInt(version.split("\\.")[0]);
-		if (majorVersion == 1) {
+		if (version.startsWith("1.")) {
 			this.adapter = new DiktatCompat1Dot2Dot5Adapter(configFile);
 		} else {
 			this.adapter = new DiktatCompat2Dot0Dot0Adapter(configFile);

From 281b5b3f55f3af8a6f5abe248e56c43b976ee822 Mon Sep 17 00:00:00 2001
From: Nariman Abdullin <nulls.narik@gmail.com>
Date: Mon, 18 Dec 2023 17:47:03 +0300
Subject: [PATCH 1399/2068] reverted changes related to testing

---
 lib/build.gradle                                          | 7 +------
 .../main/java/com/diffplug/spotless/TestProvisioner.java  | 8 --------
 .../java/com/diffplug/spotless/kotlin/DiktatStepTest.java | 3 +--
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index aed9a6a5a8..c8c3375375 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -2,10 +2,6 @@ plugins {
 	id 'java-library'
 	id 'io.github.davidburstrom.version-compatibility'
 }
-repositories {
-	mavenCentral()
-	mavenLocal()
-}
 ext.artifactId = project.artifactIdLib
 version = rootProject.spotlessChangelog.versionNext
 apply from: rootProject.file('gradle/java-setup.gradle')
@@ -90,7 +86,7 @@ dependencies {
 	// diktat old supported version 1.x
 	compatDiktat1Dot2Dot5CompileOnly "org.cqfn.diktat:diktat-rules:1.2.5"
 	// diktat latest supported version 2.x
-	compatDiktat2Dot0Dot0CompileOnly "com.saveourtool.diktat:diktat-runner:2.0.0-rc.8.107+20231128T142927Z"
+	compatDiktat2Dot0Dot0CompileOnly "com.saveourtool.diktat:diktat-runner:2.0.0"
 	// flexmark
 	flexmarkCompileOnly 'com.vladsch.flexmark:flexmark-all:0.64.0'
 	// gherkin
@@ -134,7 +130,6 @@ dependencies {
 	// sortPom
 	sortPomCompileOnly 'com.github.ekryd.sortpom:sortpom-sorter:3.2.1'
 	sortPomCompileOnly 'org.slf4j:slf4j-api:2.0.0'
-
 	// zjsonPatch
 	zjsonPatchCompileOnly 'com.flipkart.zjsonpatch:zjsonpatch:0.4.14'
 }
diff --git a/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java b/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java
index b86b38c3bc..53a5cfed30 100644
--- a/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java
+++ b/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java
@@ -164,15 +164,7 @@ public static Provisioner mavenLocal() {
 		return mavenLocal.get();
 	}
 
-	public static Provisioner mavenCentralAndLocal() {
-		return mavenCentralAndLocal.get();
-	}
-
 	private static final Supplier<Provisioner> mavenLocal = () -> createWithRepositories(repo -> repo.mavenLocal());
-	private static final Supplier<Provisioner> mavenCentralAndLocal = () -> createWithRepositories(repo -> {
-		repo.mavenCentral();
-		repo.mavenLocal();
-	});
 
 	/** Creates a Provisioner for the Sonatype snapshots maven repo for development purpose. */
 	public static Provisioner snapshots() {
diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
index fadaed76bd..9976fe0e84 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
@@ -32,8 +32,7 @@ class DiktatStepTest extends ResourceHarness {
 
 	@Test
 	void behavior() {
-//		FormatterStep step = DiktatStep.create("1.2.5", TestProvisioner.mavenCentralAndLocal());
-		FormatterStep step = DiktatStep.create("2.0.0-rc.8.145+5b7b3c5", TestProvisioner.mavenCentralAndLocal());
+		FormatterStep step = DiktatStep.create(TestProvisioner.mavenCentral());
 		StepHarnessWithFile.forStep(this, step).testResourceExceptionMsg("kotlin/diktat/Unsolvable.kt").isEqualTo("There are 2 unfixed errors:" +
 				System.lineSeparator() + "Error on line: 12, column: 9 cannot be fixed automatically" +
 				System.lineSeparator() + "[DEBUG_PRINT] use a dedicated logging library: found println()" +

From f865381e4d7ca70db4f04f3754e4b337db2819b7 Mon Sep 17 00:00:00 2001
From: Nariman Abdullin <nulls.narik@gmail.com>
Date: Tue, 19 Dec 2023 10:28:12 +0300
Subject: [PATCH 1400/2068] fix content provided by spotless and file is used
 only for as a virtual path

---
 .../glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java b/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java
index e6d8fc9c78..acd826758b 100644
--- a/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java
+++ b/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java
@@ -48,7 +48,7 @@ public DiktatCompat2Dot0Dot0Adapter(@Nullable File configFile) {
 	@Override
 	public String format(File file, String content, boolean isScript) {
 		errors.clear();
-		String result = processor.fix(file.toPath(), formatterCallback);
+		String result = processor.fix(content, file.toPath(), formatterCallback);
 		DiktatReporting.reportIfRequired(errors, DiktatError::getLine, DiktatError::getCol, DiktatError::getDetail);
 		return result;
 	}

From 63c718699bb8086c512e15e36d602acbe3c0b638 Mon Sep 17 00:00:00 2001
From: Nariman Abdullin <nulls.narik@gmail.com>
Date: Tue, 19 Dec 2023 10:34:22 +0300
Subject: [PATCH 1401/2068] updated CHANGES.md

---
 plugin-gradle/CHANGES.md | 1 +
 plugin-maven/CHANGES.md  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index d888f4863f..d0c2495a55 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changes
 * Use palantir-java-format 2.39.0 on Java 21. ([#1948](https://github.com/diffplug/spotless/pull/1948))
+* Bump default `diktat` version to latest `1.2.5` -> `2.0.0`. ([#1972](https://github.com/diffplug/spotless/pull/1972))
 
 ## [6.23.3] - 2023-12-04
 **BREAKING CHANGE** `6.23.0` made breaking changes to the ABI of the `KotlinExtension` and `GroovyExtension`. Those are reflected retroactively now.
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 55f451ad4e..2b365d31b0 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 (
 * M2E support: Emit file specific errors during incremental build. ([#1960](https://github.com/diffplug/spotless/issues/1960))
 ### Changes
 * Use palantir-java-format 2.39.0 on Java 21. ([#1948](https://github.com/diffplug/spotless/pull/1948))
+* Bump default `diktat` version to latest `1.2.5` -> `2.0.0`. ([#1972](https://github.com/diffplug/spotless/pull/1972))
 
 ## [2.41.1] - 2023-12-04
 ### Fixed

From 4fef28ff8ff26f00b073d0a9cb66ceabea37c397 Mon Sep 17 00:00:00 2001
From: Nariman Abdullin <nulls.narik@gmail.com>
Date: Tue, 19 Dec 2023 10:42:25 +0300
Subject: [PATCH 1402/2068] spotlessApply

---
 .../compat/DiktatCompat1Dot2Dot5Adapter.java  | 43 +++++++++----------
 .../compat/DiktatCompat2Dot0Dot0Adapter.java  |  6 +--
 .../glue/diktat/compat/DiktatReporting.java   | 10 ++---
 .../glue/diktat/DiktatFormatterFunc.java      | 10 ++---
 .../diffplug/spotless/kotlin/DiktatStep.java  |  7 ++-
 5 files changed, 36 insertions(+), 40 deletions(-)

diff --git a/lib/src/compatDiktat1Dot2Dot5/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat1Dot2Dot5Adapter.java b/lib/src/compatDiktat1Dot2Dot5/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat1Dot2Dot5Adapter.java
index dc5cde1c4d..749d0a1f61 100644
--- a/lib/src/compatDiktat1Dot2Dot5/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat1Dot2Dot5Adapter.java
+++ b/lib/src/compatDiktat1Dot2Dot5/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat1Dot2Dot5Adapter.java
@@ -15,24 +15,23 @@
  */
 package com.diffplug.spotless.glue.diktat.compat;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import org.cqfn.diktat.ruleset.rules.DiktatRuleSetProvider;
+
 import com.pinterest.ktlint.core.KtLint;
 import com.pinterest.ktlint.core.LintError;
 import com.pinterest.ktlint.core.RuleSet;
-
 import com.pinterest.ktlint.core.api.EditorConfigOverride;
 
 import kotlin.Unit;
 import kotlin.jvm.functions.Function2;
 
-import org.cqfn.diktat.ruleset.rules.DiktatRuleSetProvider;
-
-import javax.annotation.Nullable;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 public class DiktatCompat1Dot2Dot5Adapter implements DiktatCompatAdapter {
 	private final List<RuleSet> ruleSets;
 	private final Function2<? super LintError, ? super Boolean, Unit> formatterCallback;
@@ -66,18 +65,18 @@ public Unit invoke(LintError lintError, Boolean corrected) {
 	public String format(final File file, final String content, final boolean isScript) {
 		errors.clear();
 		String result = KtLint.INSTANCE.format(new KtLint.ExperimentalParams(
-			// Unlike Ktlint, Diktat requires full path to the file.
-			// See https://github.com/diffplug/spotless/issues/1189, https://github.com/analysis-dev/diktat/issues/1202
-			file.getAbsolutePath(),
-			content,
-			ruleSets,
-			Collections.emptyMap(),
-			formatterCallback,
-			isScript,
-			null,
-			false,
-			new EditorConfigOverride(),
-			false));
+				// Unlike Ktlint, Diktat requires full path to the file.
+				// See https://github.com/diffplug/spotless/issues/1189, https://github.com/analysis-dev/diktat/issues/1202
+				file.getAbsolutePath(),
+				content,
+				ruleSets,
+				Collections.emptyMap(),
+				formatterCallback,
+				isScript,
+				null,
+				false,
+				new EditorConfigOverride(),
+				false));
 
 		DiktatReporting.reportIfRequired(errors, LintError::getLine, LintError::getCol, LintError::getDetail);
 
diff --git a/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java b/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java
index acd826758b..8ad2730be1 100644
--- a/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java
+++ b/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java
@@ -23,6 +23,9 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
 import com.saveourtool.diktat.DiktatFactoriesKt;
 import com.saveourtool.diktat.DiktatProcessor;
 import com.saveourtool.diktat.api.DiktatCallback;
@@ -32,9 +35,6 @@
 
 import kotlin.Unit;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
 public class DiktatCompat2Dot0Dot0Adapter implements DiktatCompatAdapter {
 	private final DiktatProcessor processor;
 	private final DiktatCallback formatterCallback;
diff --git a/lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatReporting.java b/lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatReporting.java
index a4c92e59d4..b0c337973e 100644
--- a/lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatReporting.java
+++ b/lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatReporting.java
@@ -26,11 +26,11 @@ static <T> void reportIfRequired(List<T> errors, ToIntFunction<T> lineGetter, To
 			error.append("There are ").append(errors.size()).append(" unfixed errors:");
 			for (T er : errors) {
 				error.append(System.lineSeparator())
-					.append("Error on line: ").append(lineGetter.applyAsInt(er))
-					.append(", column: ").append(columnGetter.applyAsInt(er))
-					.append(" cannot be fixed automatically")
-					.append(System.lineSeparator())
-					.append(detailGetter.apply(er));
+						.append("Error on line: ").append(lineGetter.applyAsInt(er))
+						.append(", column: ").append(columnGetter.applyAsInt(er))
+						.append(" cannot be fixed automatically")
+						.append(System.lineSeparator())
+						.append(detailGetter.apply(er));
 			}
 			throw new AssertionError(error);
 		}
diff --git a/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java b/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java
index 93eebbf0ee..1f1c15c97d 100644
--- a/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java
+++ b/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java
@@ -17,21 +17,19 @@
 
 import java.io.File;
 
+import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.glue.diktat.compat.DiktatCompat1Dot2Dot5Adapter;
 import com.diffplug.spotless.glue.diktat.compat.DiktatCompat2Dot0Dot0Adapter;
 import com.diffplug.spotless.glue.diktat.compat.DiktatCompatAdapter;
 
-import com.diffplug.spotless.FormatterFunc;
-
 public class DiktatFormatterFunc implements FormatterFunc.NeedsFile {
 	private final DiktatCompatAdapter adapter;
 	private final boolean isScript;
 
 	public DiktatFormatterFunc(
-		String version,
-		File configFile,
-		boolean isScript
-	) {
+			String version,
+			File configFile,
+			boolean isScript) {
 		if (version.startsWith("1.")) {
 			this.adapter = new DiktatCompat1Dot2Dot5Adapter(configFile);
 		} else {
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
index 4573b13d7d..c9f84d1d62 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
@@ -97,10 +97,9 @@ FormatterFunc createFormat() throws Exception {
 			final File configFile = (config != null) ? config.getOnlyFile() : null;
 			Class<?> formatterFunc = jar.getClassLoader().loadClass("com.diffplug.spotless.glue.diktat.DiktatFormatterFunc");
 			Constructor<?> constructor = formatterFunc.getConstructor(
-				String.class,
-				File.class,
-				boolean.class
-			);
+					String.class,
+					File.class,
+					boolean.class);
 			return (FormatterFunc.NeedsFile) constructor.newInstance(versionDiktat, configFile, isScript);
 		}
 	}

From 005d364168048cebc8c232c0b935d003f658fc9a Mon Sep 17 00:00:00 2001
From: Nariman Abdullin <nulls.narik@gmail.com>
Date: Tue, 19 Dec 2023 11:16:56 +0300
Subject: [PATCH 1403/2068] removed usage of shadow jar

---
 lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
index c9f84d1d62..e6062632a0 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
@@ -82,7 +82,7 @@ static final class State implements Serializable {
 		State(String versionDiktat, Provisioner provisioner, boolean isScript, @Nullable FileSignature config) throws IOException {
 			HashSet<String> pkgSet = new HashSet<>();
 			if (BadSemver.version(versionDiktat) >= BadSemver.version(PACKAGE_RELOCATED_VERSION)) {
-				pkgSet.add(MAVEN_COORDINATE + versionDiktat + ":shadow");
+				pkgSet.add(MAVEN_COORDINATE + versionDiktat);
 			} else {
 				pkgSet.add(MAVEN_COORDINATE_PRE_2_0_0 + versionDiktat);
 			}

From 9d4db520febea3c8a57868f2eea28731d0b718b3 Mon Sep 17 00:00:00 2001
From: Nariman Abdullin <nulls.narik@gmail.com>
Date: Tue, 19 Dec 2023 11:43:00 +0300
Subject: [PATCH 1404/2068] fixed found bug with unclosed stream

---
 .../diktat/compat/DiktatCompat2Dot0Dot0Adapter.java  | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java b/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java
index 8ad2730be1..9c0902eccb 100644
--- a/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java
+++ b/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java
@@ -15,10 +15,7 @@
  */
 package com.diffplug.spotless.glue.diktat.compat;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
+import java.io.*;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -87,11 +84,10 @@ private static List<DiktatRuleConfig> readRuleConfigs(File configFile) {
 		if (configFile == null) {
 			return Collections.emptyList();
 		}
-		try {
-			final InputStream configInputStream = new FileInputStream(configFile);
+		try (final InputStream configInputStream = new FileInputStream(configFile)) {
 			return DiktatFactoriesKt.getDiktatRuleConfigReader().invoke(configInputStream);
-		} catch (FileNotFoundException e) {
+		} catch (IOException e) {
 			throw new IllegalArgumentException("Fail to read configFile", e);
 		}
-	}
+    }
 }

From f943dc1c5a69787a6b83edc3e97fd54769228294 Mon Sep 17 00:00:00 2001
From: Nariman Abdullin <nulls.narik@gmail.com>
Date: Tue, 19 Dec 2023 11:46:59 +0300
Subject: [PATCH 1405/2068] changed whitespaces to tabs

---
 .../glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java b/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java
index 9c0902eccb..e60f24d67b 100644
--- a/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java
+++ b/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java
@@ -89,5 +89,5 @@ private static List<DiktatRuleConfig> readRuleConfigs(File configFile) {
 		} catch (IOException e) {
 			throw new IllegalArgumentException("Fail to read configFile", e);
 		}
-    }
+	}
 }

From c9fc307d06dc538827e63ff2492eb9f44b1e731b Mon Sep 17 00:00:00 2001
From: Nariman Abdullin <nulls.narik@gmail.com>
Date: Tue, 19 Dec 2023 13:55:06 +0300
Subject: [PATCH 1406/2068] Apply suggestions from code review

Co-authored-by: Goooler <wangzongler@gmail.com>
---
 .../glue/diktat/compat/DiktatReporting.java        |  8 ++++++--
 .../com/diffplug/spotless/kotlin/DiktatStep.java   | 14 +++++++-------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatReporting.java b/lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatReporting.java
index b0c337973e..576a9aa8bc 100644
--- a/lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatReporting.java
+++ b/lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatReporting.java
@@ -19,8 +19,12 @@
 import java.util.function.Function;
 import java.util.function.ToIntFunction;
 
-final class DiktatReporting {
-	static <T> void reportIfRequired(List<T> errors, ToIntFunction<T> lineGetter, ToIntFunction<T> columnGetter, Function<T, String> detailGetter) {
+interface DiktatReporting {
+	static <T> void reportIfRequired(
+		List<T> errors,
+		ToIntFunction<T> lineGetter,
+		ToIntFunction<T> columnGetter,
+		Function<T, String> detailGetter) {
 		if (!errors.isEmpty()) {
 			StringBuilder error = new StringBuilder();
 			error.append("There are ").append(errors.size()).append(" unfixed errors:");
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
index e6062632a0..6bc881663f 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
@@ -36,11 +36,9 @@ private DiktatStep() {}
 	private static final String PACKAGE_RELOCATED_VERSION = "2.0.0";
 
 	private static final String DEFAULT_VERSION = "2.0.0";
-	static final String NAME = "diktat";
-	static final String PACKAGE_PRE_2_0_0 = "org.cqfn.diktat";
-	static final String PACKAGE = "com.saveourtool.diktat";
-	static final String MAVEN_COORDINATE_PRE_2_0_0 = PACKAGE_PRE_2_0_0 + ":diktat-rules:";
-	static final String MAVEN_COORDINATE = PACKAGE + ":diktat-runner:";
+	private static final String NAME = "diktat";
+	private static final String MAVEN_COORDINATE_PRE_2_0_0 = "org.cqfn.diktat:diktat-rules:";
+	private static final String MAVEN_COORDINATE = "com.saveourtool.diktat:diktat-runner:";
 
 	public static String defaultVersionDiktat() {
 		return DEFAULT_VERSION;
@@ -81,11 +79,13 @@ static final class State implements Serializable {
 
 		State(String versionDiktat, Provisioner provisioner, boolean isScript, @Nullable FileSignature config) throws IOException {
 			HashSet<String> pkgSet = new HashSet<>();
+			final String diktatCoordinate;
 			if (BadSemver.version(versionDiktat) >= BadSemver.version(PACKAGE_RELOCATED_VERSION)) {
-				pkgSet.add(MAVEN_COORDINATE + versionDiktat);
+				diktatCoordinate = MAVEN_COORDINATE + versionDiktat;
 			} else {
-				pkgSet.add(MAVEN_COORDINATE_PRE_2_0_0 + versionDiktat);
+				diktatCoordinate = MAVEN_COORDINATE_PRE_2_0_0 + versionDiktat;
 			}
+			this.jar = JarState.from(diktatCoordinate, provisioner);
 
 			this.jar = JarState.from(pkgSet, provisioner);
 			this.versionDiktat = versionDiktat;

From acc29adddea006abb132afa07fb743a7b49b55a2 Mon Sep 17 00:00:00 2001
From: Nariman Abdullin <nulls.narik@gmail.com>
Date: Tue, 19 Dec 2023 13:57:29 +0300
Subject: [PATCH 1407/2068] review changes + fixed after applying suggestions

---
 .../glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java  | 5 ++++-
 .../spotless/glue/diktat/compat/DiktatReporting.java      | 8 ++++----
 .../java/com/diffplug/spotless/kotlin/DiktatStep.java     | 3 ---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java b/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java
index e60f24d67b..5b264a46ed 100644
--- a/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java
+++ b/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java
@@ -15,7 +15,10 @@
  */
 package com.diffplug.spotless.glue.diktat.compat;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
diff --git a/lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatReporting.java b/lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatReporting.java
index 576a9aa8bc..fdc7e56614 100644
--- a/lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatReporting.java
+++ b/lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatReporting.java
@@ -21,10 +21,10 @@
 
 interface DiktatReporting {
 	static <T> void reportIfRequired(
-		List<T> errors,
-		ToIntFunction<T> lineGetter,
-		ToIntFunction<T> columnGetter,
-		Function<T, String> detailGetter) {
+			List<T> errors,
+			ToIntFunction<T> lineGetter,
+			ToIntFunction<T> columnGetter,
+			Function<T, String> detailGetter) {
 		if (!errors.isEmpty()) {
 			StringBuilder error = new StringBuilder();
 			error.append("There are ").append(errors.size()).append(" unfixed errors:");
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
index 6bc881663f..afd479b4c5 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
@@ -78,7 +78,6 @@ static final class State implements Serializable {
 		final JarState jar;
 
 		State(String versionDiktat, Provisioner provisioner, boolean isScript, @Nullable FileSignature config) throws IOException {
-			HashSet<String> pkgSet = new HashSet<>();
 			final String diktatCoordinate;
 			if (BadSemver.version(versionDiktat) >= BadSemver.version(PACKAGE_RELOCATED_VERSION)) {
 				diktatCoordinate = MAVEN_COORDINATE + versionDiktat;
@@ -86,8 +85,6 @@ static final class State implements Serializable {
 				diktatCoordinate = MAVEN_COORDINATE_PRE_2_0_0 + versionDiktat;
 			}
 			this.jar = JarState.from(diktatCoordinate, provisioner);
-
-			this.jar = JarState.from(pkgSet, provisioner);
 			this.versionDiktat = versionDiktat;
 			this.isScript = isScript;
 			this.config = config;

From 0e6b460c090e7d58ce05648388f9840c05dc5667 Mon Sep 17 00:00:00 2001
From: Andrew Parmet <andrew@parmet.com>
Date: Sun, 24 Dec 2023 11:07:08 -0500
Subject: [PATCH 1408/2068] don't reuse buf step args between calls

---
 .../diffplug/spotless/protobuf/BufStep.java   | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java b/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java
index a5a6a6cdef..88a87ffd99 100644
--- a/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java
@@ -64,11 +64,11 @@ public FormatterStep create() {
 
 	private State createState() {
 		String instructions = "https://docs.buf.build/installation";
-		ForeignExe exeAbsPath = ForeignExe.nameAndVersion("buf", version)
+		ForeignExe exe = ForeignExe.nameAndVersion("buf", version)
 				.pathToExe(pathToExe)
 				.versionRegex(Pattern.compile("(\\S*)"))
 				.fixCantFind("Try following the instructions at " + instructions + ", or else tell Spotless where it is with {@code buf().pathToExe('path/to/executable')}");
-		return new State(this, exeAbsPath);
+		return new State(this, exe);
 	}
 
 	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
@@ -77,22 +77,21 @@ static class State implements Serializable {
 		// used for up-to-date checks and caching
 		final String version;
 		final transient ForeignExe exe;
-		// used for executing
-		private transient @Nullable List<String> args;
 
-		State(BufStep step, ForeignExe exeAbsPath) {
+        State(BufStep step, ForeignExe exe) {
 			this.version = step.version;
-			this.exe = Objects.requireNonNull(exeAbsPath);
+			this.exe = Objects.requireNonNull(exe);
 		}
 
 		String format(ProcessRunner runner, String input, File file) throws IOException, InterruptedException {
-			if (args == null) {
-				args = Arrays.asList(
-						exe.confirmVersionAndGetAbsolutePath(),
-						"format",
-						file.getAbsolutePath());
-			}
-			return runner.exec(input.getBytes(StandardCharsets.UTF_8), args).assertExitZero(StandardCharsets.UTF_8);
+			return runner.exec(
+				input.getBytes(StandardCharsets.UTF_8),
+				List.of(
+					exe.confirmVersionAndGetAbsolutePath(),
+					"format",
+					file.getAbsolutePath()
+				)
+			).assertExitZero(StandardCharsets.UTF_8);
 		}
 
 		FormatterFunc.Closeable toFunc() {

From cb36c8bd9d0a49dc2e8ebd68adf81c73968490e7 Mon Sep 17 00:00:00 2001
From: Andrew Parmet <andrew@parmet.com>
Date: Sun, 24 Dec 2023 11:11:22 -0500
Subject: [PATCH 1409/2068] run spotless

---
 .../com/diffplug/spotless/protobuf/BufStep.java     | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java b/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java
index 88a87ffd99..7e0d44ba0c 100644
--- a/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java
@@ -19,7 +19,6 @@
 import java.io.IOException;
 import java.io.Serializable;
 import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.regex.Pattern;
@@ -78,20 +77,14 @@ static class State implements Serializable {
 		final String version;
 		final transient ForeignExe exe;
 
-        State(BufStep step, ForeignExe exe) {
+		State(BufStep step, ForeignExe exe) {
 			this.version = step.version;
 			this.exe = Objects.requireNonNull(exe);
 		}
 
 		String format(ProcessRunner runner, String input, File file) throws IOException, InterruptedException {
-			return runner.exec(
-				input.getBytes(StandardCharsets.UTF_8),
-				List.of(
-					exe.confirmVersionAndGetAbsolutePath(),
-					"format",
-					file.getAbsolutePath()
-				)
-			).assertExitZero(StandardCharsets.UTF_8);
+			List<String> args = List.of(exe.confirmVersionAndGetAbsolutePath(), "format", file.getAbsolutePath());
+			return runner.exec(input.getBytes(StandardCharsets.UTF_8), args).assertExitZero(StandardCharsets.UTF_8);
 		}
 
 		FormatterFunc.Closeable toFunc() {

From 5dc52d721a71a1f49a82306c3b423f331862d677 Mon Sep 17 00:00:00 2001
From: Andrew Parmet <andrew@parmet.com>
Date: Sun, 24 Dec 2023 11:15:53 -0500
Subject: [PATCH 1410/2068] changelog

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index dc040c9aa2..60069ebb25 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * New static method to `DiffMessageFormatter` which allows to retrieve diffs with their line numbers ([#1960](https://github.com/diffplug/spotless/issues/1960))
+### Fixed
+* Fix a regression in BufStep where the same arguments were being provided to every `buf` invocation. ([#1976](https://github.com/diffplug/spotless/issues/1976))
 ### Changes
 * Use palantir-java-format 2.39.0 on Java 21. ([#1948](https://github.com/diffplug/spotless/pull/1948))
 

From 1a9bea7c90d9122d95e34c5cc01c10aab4780933 Mon Sep 17 00:00:00 2001
From: Andrew Parmet <andrew@parmet.com>
Date: Sun, 24 Dec 2023 11:37:35 -0500
Subject: [PATCH 1411/2068] only confirm version once

---
 .../java/com/diffplug/spotless/protobuf/BufStep.java   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java b/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java
index 7e0d44ba0c..e7b39747b9 100644
--- a/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java
@@ -75,7 +75,10 @@ static class State implements Serializable {
 		private static final long serialVersionUID = -1825662356883926318L;
 		// used for up-to-date checks and caching
 		final String version;
-		final transient ForeignExe exe;
+
+		// used for executing
+		private final transient ForeignExe exe;
+		private transient String exeAbsPath;
 
 		State(BufStep step, ForeignExe exe) {
 			this.version = step.version;
@@ -83,7 +86,10 @@ static class State implements Serializable {
 		}
 
 		String format(ProcessRunner runner, String input, File file) throws IOException, InterruptedException {
-			List<String> args = List.of(exe.confirmVersionAndGetAbsolutePath(), "format", file.getAbsolutePath());
+			if (exeAbsPath == null) {
+				exeAbsPath = exe.confirmVersionAndGetAbsolutePath();
+			}
+			List<String> args = List.of(exeAbsPath, "format", file.getAbsolutePath());
 			return runner.exec(input.getBytes(StandardCharsets.UTF_8), args).assertExitZero(StandardCharsets.UTF_8);
 		}
 

From 9b9163603ae005ca009514867c7e4f8496d93b3a Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 19 Dec 2023 07:39:30 +0800
Subject: [PATCH 1412/2068] Bump google-java-format to 1.19.2

https://github.com/google/google-java-format/releases/tag/v1.19.0
https://github.com/google/google-java-format/releases/tag/v1.19.1
https://github.com/google/google-java-format/releases/tag/v1.19.2
---
 CHANGES.md                                                    | 1 +
 lib/build.gradle                                              | 2 +-
 .../java/com/diffplug/spotless/java/GoogleJavaFormatStep.java | 4 ++--
 plugin-gradle/CHANGES.md                                      | 1 +
 plugin-maven/CHANGES.md                                       | 1 +
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index dc040c9aa2..f3e5775197 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -14,6 +14,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * New static method to `DiffMessageFormatter` which allows to retrieve diffs with their line numbers ([#1960](https://github.com/diffplug/spotless/issues/1960))
 ### Changes
 * Use palantir-java-format 2.39.0 on Java 21. ([#1948](https://github.com/diffplug/spotless/pull/1948))
+* Bump default `googleJavaFormat` version to latest `1.18.1` -> `1.19.2`. ([#1971](https://github.com/diffplug/spotless/pull/1971))
 
 ## [2.43.1] - 2023-12-04
 ### Fixed
diff --git a/lib/build.gradle b/lib/build.gradle
index 475c226a81..5e42c42cc9 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -84,7 +84,7 @@ dependencies {
 	gherkinCompileOnly 'io.cucumber:gherkin-utils:8.0.2'
 	gherkinCompileOnly 'org.slf4j:slf4j-api:2.0.0'
 	// googleJavaFormat
-	googleJavaFormatCompileOnly 'com.google.googlejavaformat:google-java-format:1.18.1'
+	googleJavaFormatCompileOnly 'com.google.googlejavaformat:google-java-format:1.19.2'
 	// gson
 	gsonCompileOnly 'com.google.code.gson:gson:2.10.1'
 	// jackson
diff --git a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
index 6a48924170..d0312dcc1e 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -83,7 +83,7 @@ public static FormatterStep create(String groupArtifact, String version, String
 			.addMin(11, "1.8") // we only support google-java-format >= 1.8 due to api changes
 			.addMin(16, "1.10.0") // java 16 requires at least 1.10.0 due to jdk api changes in JavaTokenizer
 			.addMin(21, "1.17.0") // java 21 requires at least 1.17.0 due to https://github.com/google/google-java-format/issues/898
-			.add(11, "1.18.1"); // default version
+			.add(11, "1.19.2"); // default version
 
 	public static String defaultGroupArtifact() {
 		return MAVEN_COORDINATE;
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index d888f4863f..2e8f86abad 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changes
 * Use palantir-java-format 2.39.0 on Java 21. ([#1948](https://github.com/diffplug/spotless/pull/1948))
+* Bump default `googleJavaFormat` version to latest `1.18.1` -> `1.19.2`. ([#1971](https://github.com/diffplug/spotless/pull/1971))
 
 ## [6.23.3] - 2023-12-04
 **BREAKING CHANGE** `6.23.0` made breaking changes to the ABI of the `KotlinExtension` and `GroovyExtension`. Those are reflected retroactively now.
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 55f451ad4e..c6169ec26e 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 (
 * M2E support: Emit file specific errors during incremental build. ([#1960](https://github.com/diffplug/spotless/issues/1960))
 ### Changes
 * Use palantir-java-format 2.39.0 on Java 21. ([#1948](https://github.com/diffplug/spotless/pull/1948))
+* Bump default `googleJavaFormat` version to latest `1.18.1` -> `1.19.2`. ([#1971](https://github.com/diffplug/spotless/pull/1971))
 
 ## [2.41.1] - 2023-12-04
 ### Fixed

From a6d2e615556b7acbf570b581470570f1ea12cef2 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 19 Dec 2023 13:58:20 +0800
Subject: [PATCH 1413/2068] Remove the workaround for pinning Guava

This reverts commit a6495edd
---
 .../spotless/java/GoogleJavaFormatStep.java       |  2 +-
 .../spotless/java/PalantirJavaFormatStep.java     |  4 ++--
 .../gradle/spotless/GradleProvisioner.java        | 15 ++-------------
 .../com/diffplug/spotless/TestProvisioner.java    | 15 ++-------------
 4 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
index d0312dcc1e..e6882249fe 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
@@ -35,7 +35,7 @@ private GoogleJavaFormatStep() {}
 	private static final boolean DEFAULT_REORDER_IMPORTS = false;
 	private static final boolean DEFAULT_FORMAT_JAVADOC = true;
 	static final String NAME = "google-java-format";
-	public static final String MAVEN_COORDINATE = "com.google.googlejavaformat:google-java-format";
+	static final String MAVEN_COORDINATE = "com.google.googlejavaformat:google-java-format";
 
 	/** Creates a step which formats everything - code, import order, and unused imports. */
 	public static FormatterStep create(Provisioner provisioner) {
diff --git a/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
index 88488ac2d7..8232a247fa 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@ private PalantirJavaFormatStep() {}
 
 	private static final String DEFAULT_STYLE = "PALANTIR";
 	private static final String NAME = "palantir-java-format";
-	public static final String MAVEN_COORDINATE = "com.palantir.javaformat:palantir-java-format:";
+	private static final String MAVEN_COORDINATE = "com.palantir.javaformat:palantir-java-format:";
 	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(8, "1.1.0").add(11, "2.28.0").add(21, "2.39.0");
 
 	/** Creates a step which formats everything - code, import order, and unused imports. */
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
index 6bb8c1b50e..5d5c07f4fe 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,8 +36,6 @@
 import com.diffplug.common.base.Unhandled;
 import com.diffplug.common.collect.ImmutableList;
 import com.diffplug.spotless.Provisioner;
-import com.diffplug.spotless.java.GoogleJavaFormatStep;
-import com.diffplug.spotless.java.PalantirJavaFormatStep;
 
 /** Should be package-private. */
 class GradleProvisioner {
@@ -119,16 +117,7 @@ private static Provisioner forConfigurationContainer(Project project, Configurat
 						+ new Request(withTransitives, mavenCoords).hashCode());
 				mavenCoords.stream()
 						.map(dependencies::create)
-						.forEach(dependency -> {
-							config.getDependencies().add(dependency);
-							String coordinate = dependency.getGroup() + ":" + dependency.getName();
-							if (coordinate.startsWith(GoogleJavaFormatStep.MAVEN_COORDINATE) ||
-									coordinate.startsWith(PalantirJavaFormatStep.MAVEN_COORDINATE)) {
-								// Use Guava 32.1.3, see https://github.com/google/guava/issues/6657.
-								// TODO: May remove this after https://github.com/google/google-java-format/pull/996 and https://github.com/palantir/palantir-java-format/issues/957 are released.
-								config.getDependencies().add(dependencies.create("com.google.guava:guava:32.1.3-jre"));
-							}
-						});
+						.forEach(config.getDependencies()::add);
 				config.setDescription(mavenCoords.toString());
 				config.setTransitive(withTransitives);
 				config.setCanBeConsumed(false);
diff --git a/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java b/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java
index 53a5cfed30..1ba0a745ee 100644
--- a/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java
+++ b/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,6 @@
 import java.util.Map;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
-import java.util.stream.Stream;
 
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Configuration;
@@ -42,8 +41,6 @@
 import com.diffplug.common.base.Suppliers;
 import com.diffplug.common.collect.ImmutableSet;
 import com.diffplug.common.io.Files;
-import com.diffplug.spotless.java.GoogleJavaFormatStep;
-import com.diffplug.spotless.java.PalantirJavaFormatStep;
 
 public class TestProvisioner {
 	public static Project gradleProject(File dir) {
@@ -68,15 +65,7 @@ private static Provisioner createWithRepositories(Consumer<RepositoryHandler> re
 		Project project = TestProvisioner.gradleProject(tempDir);
 		repoConfig.accept(project.getRepositories());
 		return (withTransitives, mavenCoords) -> {
-			boolean forceGuava = mavenCoords.stream().anyMatch(coordinate -> coordinate.startsWith(GoogleJavaFormatStep.MAVEN_COORDINATE) ||
-					coordinate.startsWith(PalantirJavaFormatStep.MAVEN_COORDINATE));
-			Stream<String> coordinateStream = mavenCoords.stream();
-			if (forceGuava) {
-				// Use Guava 32.1.3, see https://github.com/google/guava/issues/6657.
-				// TODO: May remove this after https://github.com/google/google-java-format/pull/996 and https://github.com/palantir/palantir-java-format/issues/957 are released.
-				coordinateStream = Stream.concat(coordinateStream, Stream.of("com.google.guava:guava:32.1.3-jre"));
-			}
-			Dependency[] deps = coordinateStream
+			Dependency[] deps = mavenCoords.stream()
 					.map(project.getDependencies()::create)
 					.toArray(Dependency[]::new);
 			Configuration config = project.getConfigurations().detachedConfiguration(deps);

From 3b7d660d02a03b0b978e787aad84702322ce0600 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 19 Dec 2023 20:09:23 +0800
Subject: [PATCH 1414/2068] Bump Ktlint to 1.1.1

https://github.com/pinterest/ktlint/releases/tag/1.1.0
https://github.com/pinterest/ktlint/releases/tag/1.1.1
---
 CHANGES.md                                                    | 1 +
 .../main/java/com/diffplug/spotless/kotlin/KtLintStep.java    | 4 ++--
 plugin-gradle/CHANGES.md                                      | 1 +
 plugin-maven/CHANGES.md                                       | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index dc040c9aa2..590f75ac43 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -14,6 +14,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * New static method to `DiffMessageFormatter` which allows to retrieve diffs with their line numbers ([#1960](https://github.com/diffplug/spotless/issues/1960))
 ### Changes
 * Use palantir-java-format 2.39.0 on Java 21. ([#1948](https://github.com/diffplug/spotless/pull/1948))
+* Bump default `ktlint` version to latest `1.0.1` -> `1.1.1`. ([#1973](https://github.com/diffplug/spotless/pull/1973))
 
 ## [2.43.1] - 2023-12-04
 ### Fixed
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index 55b4ca4520..6a5374bd68 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@ public class KtLintStep {
 	// prevent direct instantiation
 	private KtLintStep() {}
 
-	private static final String DEFAULT_VERSION = "1.0.1";
+	private static final String DEFAULT_VERSION = "1.1.1";
 	private static final String NAME = "ktlint";
 	private static final String MAVEN_COORDINATE_0_DOT = "com.pinterest:ktlint:";
 	private static final String MAVEN_COORDINATE_1_DOT = "com.pinterest.ktlint:ktlint-cli:";
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index d888f4863f..8713380605 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changes
 * Use palantir-java-format 2.39.0 on Java 21. ([#1948](https://github.com/diffplug/spotless/pull/1948))
+* Bump default `ktlint` version to latest `1.0.1` -> `1.1.1`. ([#1973](https://github.com/diffplug/spotless/pull/1973))
 
 ## [6.23.3] - 2023-12-04
 **BREAKING CHANGE** `6.23.0` made breaking changes to the ABI of the `KotlinExtension` and `GroovyExtension`. Those are reflected retroactively now.
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 55f451ad4e..ca9a93c395 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 (
 * M2E support: Emit file specific errors during incremental build. ([#1960](https://github.com/diffplug/spotless/issues/1960))
 ### Changes
 * Use palantir-java-format 2.39.0 on Java 21. ([#1948](https://github.com/diffplug/spotless/pull/1948))
+* Bump default `ktlint` version to latest `1.0.1` -> `1.1.1`. ([#1973](https://github.com/diffplug/spotless/pull/1973))
 
 ## [2.41.1] - 2023-12-04
 ### Fixed

From d73d05e5e0b428939880fcca16a9e267d8c70fbc Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <awa@xima.de>
Date: Tue, 9 Jan 2024 21:52:42 +0100
Subject: [PATCH 1415/2068] Fixes #1987, no empty files with biome when
 formatting ignored files

The issue happens only with the latest release 1.5.0.

* When the biome output is empty, the contents of the input file to format are used unchanged instead.
* When biome outputs warnings / errors to stderr, these are now logged. This includes warnings such as
  when biome ignores files. Otherwise people would be left wondering why certain files are not formatted.

I also added a test for this scenarion.

On another note, I mostly use Maven, so I always need to look up how to run tests via Gradle. I added
a short section to CONTRIBUTING.md that gives some example commands how to run tests for this project,
especially how to run only a single test.
---
 CHANGES.md                                    |  2 ++
 CONTRIBUTING.md                               | 20 +++++++++++++
 .../com/diffplug/spotless/rome/RomeStep.java  | 18 ++++++++++--
 plugin-gradle/README.md                       | 23 +++++++++++----
 .../gradle/spotless/BiomeIntegrationTest.java | 28 +++++++++++++++++++
 plugin-maven/README.md                        | 20 ++++++++++---
 .../spotless/maven/biome/BiomeMavenTest.java  | 16 +++++++++++
 .../main/resources/biome/json/package.json    |  3 ++
 .../resources/biome/json/packageAfter.json    |  3 ++
 .../resources/biome/json/packageBefore.json   |  3 ++
 .../diffplug/spotless/rome/RomeStepTest.java  | 13 +++++++++
 11 files changed, 138 insertions(+), 11 deletions(-)
 create mode 100644 testlib/src/main/resources/biome/json/package.json
 create mode 100644 testlib/src/main/resources/biome/json/packageAfter.json
 create mode 100644 testlib/src/main/resources/biome/json/packageBefore.json

diff --git a/CHANGES.md b/CHANGES.md
index dc040c9aa2..23f58ea9d1 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * New static method to `DiffMessageFormatter` which allows to retrieve diffs with their line numbers ([#1960](https://github.com/diffplug/spotless/issues/1960))
+### Fixed
+* Fix empty files with biome >= 1.5.0 when formatting files that are in the ignore list of the biome configuration file. (fixes [#1987](https://github.com/diffplug/spotless/issues/1987))
 ### Changes
 * Use palantir-java-format 2.39.0 on Java 21. ([#1948](https://github.com/diffplug/spotless/pull/1948))
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 287d835bca..6fb993f419 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -151,6 +151,26 @@ The gist of it is that you will have to:
 
 If you get something running, we'd love to host your plugin within this repo as a peer to `plugin-gradle` and `plugin-maven`.
 
+## Run tests
+
+To run all tests, simply do
+
+> gradlew test
+
+Since that takes some time, you might only want to run the tests
+concerning what you are working on:
+
+```shell
+# Run only from test from the "lib" project
+gradlew :testlib:test --tests com.diffplug.spotless.generic.IndentStepTest
+
+# Run only one test from the "plugin-maven" project
+gradlew :plugin-maven:test --tests com.diffplug.spotless.maven.pom.SortPomMavenTest
+
+# Run only one test from the "plugin-gradle" project
+gradlew :plugin-gradle:test --tests com.diffplug.gradle.spotless.FreshMarkExtensionTest
+```
+
 ## Integration testing
 
 ### Gradle - locally
diff --git a/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java b/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java
index 5ba33d593d..92a0fdc689 100644
--- a/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java
@@ -427,9 +427,23 @@ private String format(ProcessRunner runner, String input, File file) throws IOEx
 			var stdin = input.getBytes(StandardCharsets.UTF_8);
 			var args = buildBiomeCommand(file);
 			if (logger.isDebugEnabled()) {
-				logger.debug("Running Biome comand to format code: '{}'", String.join(", ", args));
+				logger.debug("Running Biome command to format code: '{}'", String.join(", ", args));
+			}
+			var runnerResult = runner.exec(stdin, args);
+			var stdErr = runnerResult.stdErrUtf8();
+			if (stdErr != null && !stdErr.isEmpty()) {
+				logger.warn("Biome stderr ouptut for file '{}'\n{}", file, stdErr.trim());
+			}
+			var formatted = runnerResult.assertExitZero(StandardCharsets.UTF_8);
+			// When biome encounters an ignored file, it does not output any formatted code
+			// Ignored files come from (a) the biome.json configuration file and (b) from
+			// a list of hard-coded file names, such as package.json or tsconfig.json.
+			if (formatted == null || formatted.isEmpty()) {
+				return input;
+			}
+			else {
+				return formatted;
 			}
-			return runner.exec(stdin, args).assertExitZero(StandardCharsets.UTF_8);
 		}
 
 		/**
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 7ad010567a..98416cdd05 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -1218,11 +1218,6 @@ spotless {
 }
 ```
 
-**Limitations:**
-
-- The auto-discovery of config files (up the file tree) will not work when using
-  Biome within spotless.
-
 To apply Biome to more kinds of files with a different configuration, just add
 more formats:
 
@@ -1243,6 +1238,24 @@ spotless {
 }
 ```
 
+**Limitations:**
+
+- The auto-discovery of config files (up the file tree) will not work when using
+  Biome within spotless.
+- The `ignore` option of the `biome.json` configuration file will not be applied.
+  Include and exclude patterns are configured in the spotless configuration in the
+  Gradle settings file instead.
+
+Note: Due to a limitation of biome, if the name of a file matches a pattern in
+the `ignore` option of the specified `biome.json` configuration file, it will not be
+formatted, even if included in the biome configuration section of the Gradle settings
+file.
+You could specify a different `biome.json` configuration file without an `ignore`
+pattern to circumvent this.
+
+Note 2: Biome is hard-coded to ignore certain special files, such as `package.json`
+or `tsconfig.json`. These files will never be formatted.
+
 ### Biome binary
 
 To format with Biome, spotless needs to find the Biome binary. By default,
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java
index a2665a3bf1..139d477bf0 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java
@@ -340,4 +340,32 @@ void failureWhenNotParseable() throws Exception {
 		assertThat(spotlessApply.getOutput()).contains("Format with errors is disabled.");
 		assertThat(spotlessApply.getOutput()).contains("Step 'biome' found problem in 'biome_test.js'");
 	}
+
+	/**
+	 * Biome is hard-coded to ignore certain files, such as package.json. Since version 1.5.0,
+	 * the biome CLI does not output any formatted code anymore, whereas previously it printed
+	 * the input as-is. This tests checks that when the biome formatter outputs an empty string,
+	 * the contents of the file to format are used instead.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void preservesIgnoredFiles() throws Exception {
+		setFile("build.gradle").toLines(
+			"plugins {",
+			"    id 'com.diffplug.spotless'",
+			"}",
+			"repositories { mavenCentral() }",
+			"spotless {",
+			"    json {",
+			"        target '**/*.json'",
+			"        biome('1.5.0')",
+			"    }",
+			"}");
+		setFile("package.json").toResource("biome/json/packageBefore.json");
+
+		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		assertFile("package.json").sameAsResource("biome/json/packageAfter.json");
+	}
 }
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index f632d78ea7..593368c7ac 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -1300,10 +1300,6 @@ usually you will be creating a generic format.
 </configuration>
 ```
 
-**Limitations:**
-- The auto-discovery of config files (up the file tree) will not work when using
-  Biome within spotless.
-
 To apply Biome to more kinds of files with a different configuration, just add
 more formats:
 
@@ -1315,6 +1311,22 @@ more formats:
 </configuration>
 ```
 
+**Limitations:**
+- The auto-discovery of config files (up the file tree) will not work when using
+  Biome within spotless.
+- The `ignore` option of the `biome.json` configuration file will not be applied.
+  Include and exclude patterns are configured in the spotless configuration in the
+  Maven pom instead.
+
+Note: Due to a limitation of biome, if the name of a file matches a pattern in
+the `ignore` option of the specified `biome.json` configuration file, it will not be
+formatted, even if included in the biome configuration section of the Maven pom.
+You could specify a different `biome.json` configuration file without an `ignore`
+pattern to circumvent this.
+
+Note 2: Biome is hard-coded to ignore certain special files, such as `package.json`
+or `tsconfig.json`. These files will never be formatted.
+
 ### Biome binary
 
 To format with Biome, spotless needs to find the Biome binary. By default,
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/biome/BiomeMavenTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/biome/BiomeMavenTest.java
index e015b934f5..ffbd73484f 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/biome/BiomeMavenTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/biome/BiomeMavenTest.java
@@ -199,4 +199,20 @@ void failureWhenNotParseable() throws Exception {
 		assertThat(result.stdOutUtf8()).contains("Unable to format file");
 		assertThat(result.stdOutUtf8()).contains("Step 'biome' found problem in 'biome_test.js'");
 	}
+
+	/**
+	 * Biome is hard-coded to ignore certain files, such as package.json. Since version 1.5.0,
+	 * the biome CLI does not output any formatted code anymore, whereas previously it printed
+	 * the input as-is. This tests checks that when the biome formatter outputs an empty string,
+	 * the contents of the file to format are used instead.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void preservesIgnoredFiles() throws Exception {
+		writePomWithJsonSteps("**/*.json", "<biome><version>1.5.0</version></biome>");
+		setFile("package.json").toResource("biome/json/packageBefore.json");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("package.json").sameAsResource("biome/json/packageAfter.json");
+	}
 }
diff --git a/testlib/src/main/resources/biome/json/package.json b/testlib/src/main/resources/biome/json/package.json
new file mode 100644
index 0000000000..94e8f88de5
--- /dev/null
+++ b/testlib/src/main/resources/biome/json/package.json
@@ -0,0 +1,3 @@
+{
+"name": "test-package","version": "0.0.1"
+  }
\ No newline at end of file
diff --git a/testlib/src/main/resources/biome/json/packageAfter.json b/testlib/src/main/resources/biome/json/packageAfter.json
new file mode 100644
index 0000000000..94e8f88de5
--- /dev/null
+++ b/testlib/src/main/resources/biome/json/packageAfter.json
@@ -0,0 +1,3 @@
+{
+"name": "test-package","version": "0.0.1"
+  }
\ No newline at end of file
diff --git a/testlib/src/main/resources/biome/json/packageBefore.json b/testlib/src/main/resources/biome/json/packageBefore.json
new file mode 100644
index 0000000000..94e8f88de5
--- /dev/null
+++ b/testlib/src/main/resources/biome/json/packageBefore.json
@@ -0,0 +1,3 @@
+{
+"name": "test-package","version": "0.0.1"
+  }
\ No newline at end of file
diff --git a/testlib/src/test/java/com/diffplug/spotless/rome/RomeStepTest.java b/testlib/src/test/java/com/diffplug/spotless/rome/RomeStepTest.java
index f723a561c2..7ab4112bef 100644
--- a/testlib/src/test/java/com/diffplug/spotless/rome/RomeStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/rome/RomeStepTest.java
@@ -392,6 +392,19 @@ void testAutoDetectTsx() {
 				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
 				stepHarness.testResource("biome/ts/fileBefore.tsx", "biome/ts/fileAfter.tsx");
 			}
+
+			/**
+			 * Biome is hard-coded to ignore certain files, such as package.json. Since version 1.5.0,
+			 * the biome CLI does not output any formatted code anymore, whereas previously it printed
+			 * the input as-is. This tests checks that when the biome formatter outputs an empty string,
+			 * the contents of the file to format are used instead.
+			 */
+			@Test
+			void preservesIgnoredFiles() {
+				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.5.0", downloadDir.toString()).create();
+				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				stepHarness.testResource("biome/json/package.json", "biome/json/packageAfter.json");
+			}
 		}
 
 		@Nested

From b82e75bbba14371bed58efd59e79107c7e900a0d Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <awa@xima.de>
Date: Tue, 9 Jan 2024 22:01:31 +0100
Subject: [PATCH 1416/2068] Update changelog

---
 CHANGES.md               | 2 +-
 plugin-gradle/CHANGES.md | 2 ++
 plugin-maven/CHANGES.md  | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 23f58ea9d1..cd641ef75f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,7 +13,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * New static method to `DiffMessageFormatter` which allows to retrieve diffs with their line numbers ([#1960](https://github.com/diffplug/spotless/issues/1960))
 ### Fixed
-* Fix empty files with biome >= 1.5.0 when formatting files that are in the ignore list of the biome configuration file. (fixes [#1987](https://github.com/diffplug/spotless/issues/1987))
+* Fix empty files with biome >= 1.5.0 when formatting files that are in the ignore list of the biome configuration file. ([#1989](https://github.com/diffplug/spotless/pull/1989) fixes [#1987](https://github.com/diffplug/spotless/issues/1987))
 ### Changes
 * Use palantir-java-format 2.39.0 on Java 21. ([#1948](https://github.com/diffplug/spotless/pull/1948))
 
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index d888f4863f..20c9a6029c 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Fix empty files with biome >= 1.5.0 when formatting files that are in the ignore list of the biome configuration file. ([#1989](https://github.com/diffplug/spotless/pull/1989) fixes [#1987](https://github.com/diffplug/spotless/issues/1987))
 ### Changes
 * Use palantir-java-format 2.39.0 on Java 21. ([#1948](https://github.com/diffplug/spotless/pull/1948))
 
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 55f451ad4e..cea32ce89e 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,6 +5,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * M2E support: Emit file specific errors during incremental build. ([#1960](https://github.com/diffplug/spotless/issues/1960))
+### Fixed
+* Fix empty files with biome >= 1.5.0 when formatting files that are in the ignore list of the biome configuration file. ([#1989](https://github.com/diffplug/spotless/pull/1989) fixes [#1987](https://github.com/diffplug/spotless/issues/1987))
 ### Changes
 * Use palantir-java-format 2.39.0 on Java 21. ([#1948](https://github.com/diffplug/spotless/pull/1948))
 

From c431a705ab0745459d1be9f64e24722335c0f99a Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <awa@xima.de>
Date: Tue, 9 Jan 2024 22:04:04 +0100
Subject: [PATCH 1417/2068] Format code

---
 .../com/diffplug/spotless/rome/RomeStep.java  |  5 ++---
 .../gradle/spotless/BiomeIntegrationTest.java | 22 +++++++++----------
 .../spotless/maven/biome/BiomeMavenTest.java  |  2 +-
 .../diffplug/spotless/rome/RomeStepTest.java  |  2 +-
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java b/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java
index 92a0fdc689..0d0cca65a0 100644
--- a/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -440,8 +440,7 @@ private String format(ProcessRunner runner, String input, File file) throws IOEx
 			// a list of hard-coded file names, such as package.json or tsconfig.json.
 			if (formatted == null || formatted.isEmpty()) {
 				return input;
-			}
-			else {
+			} else {
 				return formatted;
 			}
 		}
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java
index 139d477bf0..db4ca4b027 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -352,16 +352,16 @@ void failureWhenNotParseable() throws Exception {
 	@Test
 	void preservesIgnoredFiles() throws Exception {
 		setFile("build.gradle").toLines(
-			"plugins {",
-			"    id 'com.diffplug.spotless'",
-			"}",
-			"repositories { mavenCentral() }",
-			"spotless {",
-			"    json {",
-			"        target '**/*.json'",
-			"        biome('1.5.0')",
-			"    }",
-			"}");
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    json {",
+				"        target '**/*.json'",
+				"        biome('1.5.0')",
+				"    }",
+				"}");
 		setFile("package.json").toResource("biome/json/packageBefore.json");
 
 		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/biome/BiomeMavenTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/biome/BiomeMavenTest.java
index ffbd73484f..ff763c3cf8 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/biome/BiomeMavenTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/biome/BiomeMavenTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/testlib/src/test/java/com/diffplug/spotless/rome/RomeStepTest.java b/testlib/src/test/java/com/diffplug/spotless/rome/RomeStepTest.java
index 7ab4112bef..8ab92e90e0 100644
--- a/testlib/src/test/java/com/diffplug/spotless/rome/RomeStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/rome/RomeStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From ac505ea898e9f7bd9213cbc5464a80745599e273 Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <awa@xima.de>
Date: Tue, 9 Jan 2024 22:14:02 +0100
Subject: [PATCH 1418/2068] Remove null check

---
 lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java b/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java
index 0d0cca65a0..de5b3e80ee 100644
--- a/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java
@@ -431,14 +431,14 @@ private String format(ProcessRunner runner, String input, File file) throws IOEx
 			}
 			var runnerResult = runner.exec(stdin, args);
 			var stdErr = runnerResult.stdErrUtf8();
-			if (stdErr != null && !stdErr.isEmpty()) {
+			if (!stdErr.isEmpty()) {
 				logger.warn("Biome stderr ouptut for file '{}'\n{}", file, stdErr.trim());
 			}
 			var formatted = runnerResult.assertExitZero(StandardCharsets.UTF_8);
 			// When biome encounters an ignored file, it does not output any formatted code
 			// Ignored files come from (a) the biome.json configuration file and (b) from
 			// a list of hard-coded file names, such as package.json or tsconfig.json.
-			if (formatted == null || formatted.isEmpty()) {
+			if (formatted.isEmpty()) {
 				return input;
 			} else {
 				return formatted;

From 9818181080f6e480dbb60eea57b069799db31eec Mon Sep 17 00:00:00 2001
From: Tyler Crawford <tcrawford@figure.com>
Date: Fri, 12 Jan 2024 21:12:15 -0500
Subject: [PATCH 1419/2068] Add shell script support via shfmt

---
 CHANGES.md                                    |   1 +
 README.md                                     |   2 +-
 .../diffplug/spotless/shell/ShfmtStep.java    | 110 ++++++++++++++++++
 plugin-gradle/CHANGES.md                      |   2 +
 plugin-gradle/README.md                       |  33 ++++++
 .../gradle/spotless/ShellExtension.java       |  73 ++++++++++++
 .../gradle/spotless/SpotlessExtension.java    |   8 +-
 .../gradle/spotless/ShfmtIntegrationTest.java |  41 +++++++
 .../com/diffplug/spotless/tag/ShfmtTest.java  |  30 +++++
 .../main/resources/shell/shfmt/shfmt.clean    |  17 +++
 .../src/main/resources/shell/shfmt/shfmt.sh   |  18 +++
 .../spotless/shell/ShfmtStepTest.java         |  32 +++++
 12 files changed, 365 insertions(+), 2 deletions(-)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java
 create mode 100644 plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ShellExtension.java
 create mode 100644 plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ShfmtIntegrationTest.java
 create mode 100644 testlib/src/main/java/com/diffplug/spotless/tag/ShfmtTest.java
 create mode 100644 testlib/src/main/resources/shell/shfmt/shfmt.clean
 create mode 100644 testlib/src/main/resources/shell/shfmt/shfmt.sh
 create mode 100644 testlib/src/test/java/com/diffplug/spotless/shell/ShfmtStepTest.java

diff --git a/CHANGES.md b/CHANGES.md
index dc040c9aa2..10b0effa45 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * New static method to `DiffMessageFormatter` which allows to retrieve diffs with their line numbers ([#1960](https://github.com/diffplug/spotless/issues/1960))
+* Gradle support for shell via [shfmt](https://github.com/mvdan/sh).
 ### Changes
 * Use palantir-java-format 2.39.0 on Java 21. ([#1948](https://github.com/diffplug/spotless/pull/1948))
 
diff --git a/README.md b/README.md
index d31fd15b8c..49e7d589ab 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 [![Maven Plugin](https://img.shields.io/maven-central/v/com.diffplug.spotless/spotless-maven-plugin?color=blue&label=maven%20plugin)](plugin-maven)
 [![SBT Plugin](https://img.shields.io/badge/sbt%20plugin-0.1.3-blue)](https://github.com/moznion/sbt-spotless)
 
-Spotless can format &lt;antlr | c | c# | c++ | css | flow | graphql | groovy | html | java | javascript | json | jsx | kotlin | less | license headers | markdown | objective-c | protobuf | python | scala | scss | sql | typeScript | vue | yaml | anything> using &lt;gradle | maven | sbt | anything>.
+Spotless can format &lt;antlr | c | c# | c++ | css | flow | graphql | groovy | html | java | javascript | json | jsx | kotlin | less | license headers | markdown | objective-c | protobuf | python | scala | scss | shell | sql | typeScript | vue | yaml | anything> using &lt;gradle | maven | sbt | anything>.
 
 You probably want one of the links below:
 
diff --git a/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java b/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java
new file mode 100644
index 0000000000..cc452fce69
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.shell;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Objects;
+import java.util.regex.Pattern;
+
+import javax.annotation.Nullable;
+
+import com.diffplug.spotless.ForeignExe;
+import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.ProcessRunner;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+public class ShfmtStep {
+	public static String name() {
+		return "shfmt";
+	}
+
+	public static String defaultVersion() {
+		return "3.7.0";
+	}
+
+	private final String version;
+	private final @Nullable String pathToExe;
+
+	private ShfmtStep(String version, @Nullable String pathToExe) {
+		this.version = version;
+		this.pathToExe = pathToExe;
+	}
+
+	public static ShfmtStep withVersion(String version) {
+		return new ShfmtStep(version, null);
+	}
+
+	public ShfmtStep withPathToExe(String pathToExe) {
+		return new ShfmtStep(version, pathToExe);
+	}
+
+	public FormatterStep create() {
+		return FormatterStep.createLazy(name(), this::createState, State::toFunc);
+	}
+
+	private State createState() throws IOException, InterruptedException {
+		String howToInstall = "" +
+				"You can download shfmt from https://github.com/mvdan/sh and " +
+				"then point Spotless to it with {@code pathToExe('/path/to/shfmt')} " +
+				"or you can use your platform's package manager:" +
+				"\n  win:   choco install shfmt" +
+				"\n  mac:   brew install shfmt" +
+				"\n  linux: apt install shfmt" +
+				"\n    github issue to handle this better: https://github.com/diffplug/spotless/issues/673";
+		final ForeignExe exe = ForeignExe.nameAndVersion("shfmt", version)
+				.pathToExe(pathToExe)
+				.versionRegex(Pattern.compile("(\\S*)"))
+				.fixCantFind(howToInstall)
+				.fixWrongVersion(
+						"You can tell Spotless to use the version you already have with {@code shfmt('{versionFound}')}" +
+								"or you can download the currently specified version, {version}.\n" + howToInstall);
+		return new State(this, exe);
+	}
+
+	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
+	static class State implements Serializable {
+		private static final long serialVersionUID = -1825662356883926318L;
+		// used for up-to-date checks and caching
+		final String version;
+		final transient ForeignExe exe;
+		// used for executing
+		private transient @Nullable List<String> args;
+
+		State(ShfmtStep step, ForeignExe pathToExe) {
+			this.version = step.version;
+			this.exe = Objects.requireNonNull(pathToExe);
+		}
+
+		String format(ProcessRunner runner, String input, File file) throws IOException, InterruptedException {
+			if (args == null) {
+				args = List.of(exe.confirmVersionAndGetAbsolutePath(), "-i", "2", "-ci");
+			}
+
+			return runner.exec(input.getBytes(StandardCharsets.UTF_8), args).assertExitZero(StandardCharsets.UTF_8);
+		}
+
+		FormatterFunc.Closeable toFunc() {
+			ProcessRunner runner = new ProcessRunner();
+			return FormatterFunc.Closeable.of(runner, this::format);
+		}
+	}
+}
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index d888f4863f..3df481a9e0 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Added
+* Support for shell via [shfmt](https://github.com/mvdan/sh).
 ### Changes
 * Use palantir-java-format 2.39.0 on Java 21. ([#1948](https://github.com/diffplug/spotless/pull/1948))
 
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 7ad010567a..5753ba573c 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -69,6 +69,7 @@ Spotless supports all of Gradle's built-in performance features (incremental bui
   - [Javascript](#javascript) ([prettier](#prettier), [ESLint](#eslint-javascript), [Biome](#biome))
   - [JSON](#json) ([simple](#simple), [gson](#gson), [jackson](#jackson), [Biome](#biome), [jsonPatch](#jsonPatch))
   - [YAML](#yaml)
+  - [Shell](#shell)
   - [Gherkin](#gherkin)
   - Multiple languages
     - [Prettier](#prettier) ([plugins](#prettier-plugins), [npm detection](#npm-detection), [`.npmrc` detection](#npmrc-detection), [caching `npm install` results](#caching-results-of-npm-install))
@@ -982,6 +983,38 @@ spotless {
 }
 ```
 
+## Shell
+
+`com.diffplug.gradle.spotless.ShellExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/ShellExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ShellExtension.java)
+
+```gradle
+spotless {
+  shell {
+    target 'scripts/**/*.sh' // default: '*.sh'
+
+    shfmt()  // has its own section below
+  }
+}
+```
+
+### shfmt
+
+[homepage](https://github.com/mvdan/sh). [changelog](https://github.com/mvdan/sh/blob/master/CHANGELOG.md).
+
+```gradle
+shfmt('3.7.0') // version is optional
+
+// if shfmt is not on your path, you must specify its location manually
+shfmt().pathToExe('/opt/homebrew/bin/shfmt')
+// Spotless always checks the version of the shfmt it is using
+// and will fail with an error if it does not match the expected version
+// (whether manually specified or default). If there is a problem, Spotless
+// will suggest commands to help install the correct version.
+//   TODO: handle installation & packaging automatically - https://github.com/diffplug/spotless/issues/674
+```
+
+<a name="applying-freshmark-to-markdown-files"></a>
+
 ## Gherkin
 
 - `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ShellExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ShellExtension.java
new file mode 100644
index 0000000000..9149467eaa
--- /dev/null
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ShellExtension.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.gradle.spotless;
+
+import java.util.Objects;
+
+import javax.inject.Inject;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.shell.ShfmtStep;
+
+public class ShellExtension extends FormatExtension {
+	private static final String SHELL_FILE_EXTENSION = "*.sh";
+
+	static final String NAME = "shell";
+
+	@Inject
+	public ShellExtension(SpotlessExtension spotless) {
+		super(spotless);
+	}
+
+	/** If the user hasn't specified files, assume all shell files should be checked. */
+	@Override
+	protected void setupTask(SpotlessTask task) {
+		if (target == null) {
+			target = parseTarget(SHELL_FILE_EXTENSION);
+		}
+		super.setupTask(task);
+	}
+
+	/** Adds the specified version of <a href="https://github.com/mvdan/sh">shfmt</a>. */
+	public ShfmtExtension shfmt(String version) {
+		Objects.requireNonNull(version);
+		return new ShfmtExtension(version);
+	}
+
+	/** Adds the specified version of <a href="https://github.com/mvdan/sh">shfmt</a>. */
+	public ShfmtExtension shfmt() {
+		return shfmt(ShfmtStep.defaultVersion());
+	}
+
+	public class ShfmtExtension {
+		ShfmtStep step;
+
+		ShfmtExtension(String version) {
+			this.step = ShfmtStep.withVersion(version);
+			addStep(createStep());
+		}
+
+		public ShfmtExtension pathToExe(String pathToExe) {
+			step = step.withPathToExe(pathToExe);
+			replaceStep(createStep());
+			return this;
+		}
+
+		private FormatterStep createStep() {
+			return step.create();
+		}
+	}
+}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
index 7ed0837eb5..b4c8e3cc03 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -205,6 +205,12 @@ public void protobuf(Action<ProtobufExtension> closure) {
 		format(ProtobufExtension.NAME, ProtobufExtension.class, closure);
 	}
 
+	/** Configures the special shell-specific extension. */
+	public void shell(Action<ShellExtension> closure) {
+		requireNonNull(closure);
+		format(ShellExtension.NAME, ShellExtension.class, closure);
+	}
+
 	/** Configures the special YAML-specific extension. */
 	public void yaml(Action<YamlExtension> closure) {
 		requireNonNull(closure);
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ShfmtIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ShfmtIntegrationTest.java
new file mode 100644
index 0000000000..9693790679
--- /dev/null
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ShfmtIntegrationTest.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.gradle.spotless;
+
+import java.io.IOException;
+
+import org.junit.jupiter.api.Test;
+
+import com.diffplug.spotless.tag.ShfmtTest;
+
+@ShfmtTest
+public class ShfmtIntegrationTest extends GradleIntegrationHarness {
+	@Test
+	void shfmt() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"  id 'com.diffplug.spotless'",
+				"}",
+				"spotless {",
+				"  shell {",
+				"    shfmt()",
+				"  }",
+				"}");
+		setFile("shfmt.sh").toResource("shell/shfmt/shfmt.sh");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("shfmt.sh").sameAsResource("shell/shfmt/shfmt.clean");
+	}
+}
diff --git a/testlib/src/main/java/com/diffplug/spotless/tag/ShfmtTest.java b/testlib/src/main/java/com/diffplug/spotless/tag/ShfmtTest.java
new file mode 100644
index 0000000000..efea44ec07
--- /dev/null
+++ b/testlib/src/main/java/com/diffplug/spotless/tag/ShfmtTest.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.tag;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import org.junit.jupiter.api.Tag;
+
+@Target({TYPE, METHOD})
+@Retention(RUNTIME)
+@Tag("Shfmt")
+public @interface ShfmtTest {}
diff --git a/testlib/src/main/resources/shell/shfmt/shfmt.clean b/testlib/src/main/resources/shell/shfmt/shfmt.clean
new file mode 100644
index 0000000000..c1b9b25064
--- /dev/null
+++ b/testlib/src/main/resources/shell/shfmt/shfmt.clean
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+function foo() {
+  if [ -x $file ]; then
+    myArray=(item1 item2 item3)
+  elif [ $file1 -nt $file2 ]; then
+    unset myArray
+  else
+    echo "Usage: $0 file ..."
+  fi
+}
+
+for ((i = 0; i < 5; i++)); do
+  read -p r
+  print -n $r
+  wait $!
+done
diff --git a/testlib/src/main/resources/shell/shfmt/shfmt.sh b/testlib/src/main/resources/shell/shfmt/shfmt.sh
new file mode 100644
index 0000000000..9d15c477d4
--- /dev/null
+++ b/testlib/src/main/resources/shell/shfmt/shfmt.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+function foo() {
+    if [ -x $file ]; then
+              myArray=(item1 item2 item3)
+  elif [ $file1 -nt $file2 ]
+    then
+        unset myArray
+        else
+echo "Usage: $0 file ..."
+    fi
+}
+
+for ((i = 0; i < 5; i++)); do
+    read -p r
+  print -n $r
+  wait $!
+done
diff --git a/testlib/src/test/java/com/diffplug/spotless/shell/ShfmtStepTest.java b/testlib/src/test/java/com/diffplug/spotless/shell/ShfmtStepTest.java
new file mode 100644
index 0000000000..41dc38e225
--- /dev/null
+++ b/testlib/src/test/java/com/diffplug/spotless/shell/ShfmtStepTest.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.shell;
+
+import org.junit.jupiter.api.Test;
+
+import com.diffplug.spotless.ResourceHarness;
+import com.diffplug.spotless.StepHarness;
+import com.diffplug.spotless.tag.ShfmtTest;
+
+@ShfmtTest
+public class ShfmtStepTest extends ResourceHarness {
+	@Test
+	void test() throws Exception {
+		try (StepHarness harness = StepHarness.forStep(ShfmtStep.withVersion(ShfmtStep.defaultVersion()).create())) {
+			harness.testResource("shell/shfmt/shfmt.sh", "shell/shfmt/shfmt.clean").close();
+		}
+	}
+}

From 2a74c61117369429a16a74c05d57d87b1886e36c Mon Sep 17 00:00:00 2001
From: Tyler Crawford <tcrawford@figure.com>
Date: Fri, 12 Jan 2024 21:15:24 -0500
Subject: [PATCH 1420/2068] Update changelog

---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 10b0effa45..2af7287368 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,7 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * New static method to `DiffMessageFormatter` which allows to retrieve diffs with their line numbers ([#1960](https://github.com/diffplug/spotless/issues/1960))
-* Gradle support for shell via [shfmt](https://github.com/mvdan/sh).
+* Gradle support for shell via [shfmt](https://github.com/mvdan/sh). Fixes ([#1567](https://github.com/diffplug/spotless/issues/1567)).
 ### Changes
 * Use palantir-java-format 2.39.0 on Java 21. ([#1948](https://github.com/diffplug/spotless/pull/1948))
 

From 6d7e5a626d5b34af2773e5c8a9f5f49249c6fd5e Mon Sep 17 00:00:00 2001
From: Tyler Crawford <tcrawford@figure.com>
Date: Fri, 12 Jan 2024 21:16:44 -0500
Subject: [PATCH 1421/2068] Remove issue link

---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 2af7287368..10b0effa45 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,7 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * New static method to `DiffMessageFormatter` which allows to retrieve diffs with their line numbers ([#1960](https://github.com/diffplug/spotless/issues/1960))
-* Gradle support for shell via [shfmt](https://github.com/mvdan/sh). Fixes ([#1567](https://github.com/diffplug/spotless/issues/1567)).
+* Gradle support for shell via [shfmt](https://github.com/mvdan/sh).
 ### Changes
 * Use palantir-java-format 2.39.0 on Java 21. ([#1948](https://github.com/diffplug/spotless/pull/1948))
 

From 6ebed557e1a6f53e10b06c2698c4f6adb4a9cb12 Mon Sep 17 00:00:00 2001
From: Tyler Crawford <tcrawford@figure.com>
Date: Fri, 12 Jan 2024 21:17:57 -0500
Subject: [PATCH 1422/2068] Add link to open pull request

---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 10b0effa45..0543b262e1 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,7 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * New static method to `DiffMessageFormatter` which allows to retrieve diffs with their line numbers ([#1960](https://github.com/diffplug/spotless/issues/1960))
-* Gradle support for shell via [shfmt](https://github.com/mvdan/sh).
+* Gradle support for shell via [shfmt](https://github.com/mvdan/sh). ([#1994](https://github.com/diffplug/spotless/pull/1994))
 ### Changes
 * Use palantir-java-format 2.39.0 on Java 21. ([#1948](https://github.com/diffplug/spotless/pull/1948))
 

From 2cf1fa536bc497b4e446855d5b47da0cfbac67e4 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 14 Jan 2024 15:05:27 -0800
Subject: [PATCH 1423/2068] Revert changes to API.

---
 .../java/com/diffplug/spotless/java/GoogleJavaFormatStep.java   | 2 +-
 .../java/com/diffplug/spotless/java/PalantirJavaFormatStep.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
index e6882249fe..d0312dcc1e 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
@@ -35,7 +35,7 @@ private GoogleJavaFormatStep() {}
 	private static final boolean DEFAULT_REORDER_IMPORTS = false;
 	private static final boolean DEFAULT_FORMAT_JAVADOC = true;
 	static final String NAME = "google-java-format";
-	static final String MAVEN_COORDINATE = "com.google.googlejavaformat:google-java-format";
+	public static final String MAVEN_COORDINATE = "com.google.googlejavaformat:google-java-format";
 
 	/** Creates a step which formats everything - code, import order, and unused imports. */
 	public static FormatterStep create(Provisioner provisioner) {
diff --git a/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
index 8232a247fa..95f7b355f7 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
@@ -29,7 +29,7 @@ private PalantirJavaFormatStep() {}
 
 	private static final String DEFAULT_STYLE = "PALANTIR";
 	private static final String NAME = "palantir-java-format";
-	private static final String MAVEN_COORDINATE = "com.palantir.javaformat:palantir-java-format:";
+	public static final String MAVEN_COORDINATE = "com.palantir.javaformat:palantir-java-format:";
 	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(8, "1.1.0").add(11, "2.28.0").add(21, "2.39.0");
 
 	/** Creates a step which formats everything - code, import order, and unused imports. */

From 48ef7caf3ce88137d4360668a8e5a9d3fa5fd80c Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 14 Jan 2024 15:38:57 -0800
Subject: [PATCH 1424/2068] Update changelog.

---
 plugin-gradle/CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 1369889ad5..267927fe0f 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Fix a regression in BufStep where the same arguments were being provided to every `buf` invocation. ([#1976](https://github.com/diffplug/spotless/issues/1976))
 ### Changes
 * Use palantir-java-format 2.39.0 on Java 21. ([#1948](https://github.com/diffplug/spotless/pull/1948))
 * Bump default `ktlint` version to latest `1.0.1` -> `1.1.1`. ([#1973](https://github.com/diffplug/spotless/pull/1973))

From d055d4f8a7ec561fa7636a28d6d1b5342f088ce9 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 14 Jan 2024 15:48:34 -0800
Subject: [PATCH 1425/2068] spotlessApply

---
 lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java b/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java
index e7b39747b9..ac39eac935 100644
--- a/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 DiffPlug
+ * Copyright 2022-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 85d21528a930bb189c293a29423f991c516d1dd1 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 14 Jan 2024 16:33:42 -0800
Subject: [PATCH 1426/2068] Mark `shfmt` as a test that needs a special
 dependency.

---
 gradle/special-tests.gradle | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gradle/special-tests.gradle b/gradle/special-tests.gradle
index b096efbe13..ae9da9a06e 100644
--- a/gradle/special-tests.gradle
+++ b/gradle/special-tests.gradle
@@ -1,9 +1,10 @@
 apply plugin: 'com.adarshr.test-logger'
 def special = [
-	'Npm',
 	'Black',
+	'Buf',
 	'Clang',
-	'Buf'
+	'Npm',
+	'Shfmt'
 ]
 
 boolean isCiServer = System.getenv().containsKey("CI")

From 886048d1d98a196e86fc1d9aa9a2bb7e5ebbfb98 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 14 Jan 2024 16:46:31 -0800
Subject: [PATCH 1427/2068] Add Shfmt to the root README.

---
 README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 49e7d589ab..4515eaf0a1 100644
--- a/README.md
+++ b/README.md
@@ -75,6 +75,7 @@ lib('generic.ReplaceRegexStep')                  +'{{yes}}       | {{yes}}
 lib('generic.ReplaceStep')                       +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('generic.TrimTrailingWhitespaceStep')        +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('antlr4.Antlr4FormatterStep')                +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
+lib('biome.BiomeStep')                           +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('cpp.ClangFormatStep')                       +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
 extra('cpp.EclipseFormatterStep')                +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
 lib('gherkin.GherkinUtilsStep')                  +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
@@ -101,8 +102,8 @@ lib('npm.TsFmtFormatterStep')                    +'{{yes}}       | {{yes}}
 lib('pom.SortPomStepStep')                       +'{{no}}        | {{yes}}      | {{no}}       | {{no}}  |',
 lib('protobuf.BufStep')                          +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
 lib('python.BlackStep')                          +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
-lib('biome.BiomeStep')                           +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('scala.ScalaFmtStep')                        +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
+lib('shell.ShfmtStep')                           +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
 lib('sql.DBeaverSQLFormatterStep')               +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
 extra('wtp.EclipseWtpFormatterStep')             +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('yaml.JacksonYamlStep')                      +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
@@ -127,6 +128,7 @@ lib('yaml.JacksonYamlStep')                      +'{{yes}}       | {{yes}}
 | [`generic.ReplaceStep`](lib/src/main/java/com/diffplug/spotless/generic/ReplaceStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`generic.TrimTrailingWhitespaceStep`](lib/src/main/java/com/diffplug/spotless/generic/TrimTrailingWhitespaceStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`antlr4.Antlr4FormatterStep`](lib/src/main/java/com/diffplug/spotless/antlr4/Antlr4FormatterStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
+| [`biome.BiomeStep`](lib/src/main/java/com/diffplug/spotless/biome/BiomeStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`cpp.ClangFormatStep`](lib/src/main/java/com/diffplug/spotless/cpp/ClangFormatStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
 | [`cpp.EclipseFormatterStep`](lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseFormatterStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`gherkin.GherkinUtilsStep`](lib/src/main/java/com/diffplug/spotless/gherkin/GherkinUtilsStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
@@ -153,8 +155,8 @@ lib('yaml.JacksonYamlStep')                      +'{{yes}}       | {{yes}}
 | [`pom.SortPomStepStep`](lib/src/main/java/com/diffplug/spotless/pom/SortPomStepStep.java) | :white_large_square:        | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`protobuf.BufStep`](lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
 | [`python.BlackStep`](lib/src/main/java/com/diffplug/spotless/python/BlackStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
-| [`biome.BiomeStep`](lib/src/main/java/com/diffplug/spotless/biome/BiomeStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`scala.ScalaFmtStep`](lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
+| [`shell.ShfmtStep`](lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
 | [`sql.DBeaverSQLFormatterStep`](lib/src/main/java/com/diffplug/spotless/sql/DBeaverSQLFormatterStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`wtp.EclipseWtpFormatterStep`](lib-extra/src/main/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`yaml.JacksonYamlStep`](lib/src/main/java/com/diffplug/spotless/yaml/JacksonYamlStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |

From f82e0ffa350f457d5e622b5e10f91496152c67c3 Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az1493-570.mbrrm1wwqy3eneuh0nkjogyspa.dx.internal.cloudapp.net>
Date: Mon, 15 Jan 2024 01:00:43 +0000
Subject: [PATCH 1428/2068] Published lib/2.44.0

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 6fac04cd17..af37f3a337 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.44.0] - 2024-01-15
 ### Added
 * New static method to `DiffMessageFormatter` which allows to retrieve diffs with their line numbers ([#1960](https://github.com/diffplug/spotless/issues/1960))
 * Format shell via [shfmt](https://github.com/mvdan/sh). ([#1994](https://github.com/diffplug/spotless/pull/1994))

From 1387d1beedfdd644db8fe4521c288176dddd989c Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az1493-570.mbrrm1wwqy3eneuh0nkjogyspa.dx.internal.cloudapp.net>
Date: Mon, 15 Jan 2024 01:04:35 +0000
Subject: [PATCH 1429/2068] Published gradle/6.24.0

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 58 ++++++++++++++++++++--------------------
 2 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index ac903322af..77b39d6804 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [6.24.0] - 2024-01-15
 ### Added
 * Support for shell via [shfmt](https://github.com/mvdan/sh).
 ### Fixed
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 1ea1ef5cf5..730a947d49 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -14,9 +14,9 @@ output = [
   ].join('\n');
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
-[![Changelog](https://img.shields.io/badge/changelog-6.23.3-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-6.24.0-blue.svg)](CHANGES.md)
 [![MavenCentral](https://img.shields.io/badge/mavencentral-here-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/index.html)
 
 [![VS Code plugin](https://img.shields.io/badge/IDE-VS_Code-blueviolet.svg)](https://marketplace.visualstudio.com/items?itemName=richardwillis.vscode-spotless-gradle)
 [![IntelliJ plugin](https://img.shields.io/badge/IDE-IntelliJ-blueviolet.svg)](https://plugins.jetbrains.com/plugin/18321-spotless-gradle)
@@ -129,10 +129,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -145,7 +145,7 @@ Spotless requires JRE 11+ and Gradle 6.1.1 or newer.
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -302,8 +302,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -358,8 +358,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -437,7 +437,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -469,7 +469,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -501,7 +501,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -537,7 +537,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ### buf
 
-`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
+`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
 
 **WARNING** this step **must** be the first step in the chain, steps before it will be ignored. Thumbs up [this issue](https://github.com/bufbuild/buf/issues/1035) for a resolution, see [here](https://github.com/diffplug/spotless/pull/1208#discussion_r1264439669) for more details on the problem.
 
@@ -569,7 +569,7 @@ buf {
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -590,7 +590,7 @@ spotless {
 
 ## Flexmark
 
-`com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/FlexmarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java)
+`com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/FlexmarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java)
 
 [homepage](https://github.com/vsch/flexmark-java). Flexmark is a flexible Commonmark/Markdown parser that can be used to format Markdown files. It supports different [flavors of Markdown](https://github.com/vsch/flexmark-java#markdown-processor-emulation) and [many formatting options](https://github.com/vsch/flexmark-java/wiki/Markdown-Formatter#options).
 
@@ -609,7 +609,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -634,7 +634,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -674,7 +674,7 @@ sql.formatter.indent.size=4
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -768,7 +768,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## Javascript
 
-- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
+- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
 
 ```gradle
 spotless {
@@ -833,7 +833,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -953,7 +953,7 @@ spotless {
 
 ## YAML
 
-- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
+- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
 
 ```gradle
 spotless {
@@ -985,7 +985,7 @@ spotless {
 
 ## Shell
 
-`com.diffplug.gradle.spotless.ShellExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/ShellExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ShellExtension.java)
+`com.diffplug.gradle.spotless.ShellExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/ShellExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ShellExtension.java)
 
 ```gradle
 spotless {
@@ -1017,7 +1017,7 @@ shfmt().pathToExe('/opt/homebrew/bin/shfmt')
 
 ## Gherkin
 
-- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
+- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
 
 ```gradle
 spotless {
@@ -1417,7 +1417,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -1497,9 +1497,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -1532,11 +1532,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.23.3/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From 797a665465429729b5308ee77f392c170c57242e Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az1493-570.mbrrm1wwqy3eneuh0nkjogyspa.dx.internal.cloudapp.net>
Date: Mon, 15 Jan 2024 01:07:02 +0000
Subject: [PATCH 1430/2068] Published maven/2.42.0

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index cf3ea63b2d..789f4430f4 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.42.0] - 2024-01-15
 ### Added
 * M2E support: Emit file specific errors during incremental build. ([#1960](https://github.com/diffplug/spotless/issues/1960))
 ### Fixed
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 593368c7ac..efc15b515f 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -8,8 +8,8 @@ output = [
   ].join('\n');
 -->
 [![MavenCentral](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Changelog](https://img.shields.io/badge/changelog-2.41.1-blue.svg)](CHANGES.md)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.41.1/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.42.0-blue.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.42.0/index.html)
 <!---freshmark /shields -->
 
 <!---freshmark javadoc

From d2fc6ca3aa15e9fb065f9ec0896b53b4ee36a2d3 Mon Sep 17 00:00:00 2001
From: Tyler Crawford <tcrawford@figure.com>
Date: Mon, 15 Jan 2024 10:22:46 -0500
Subject: [PATCH 1431/2068] Add maven shell script formattings support via
 shfmt

---
 plugin-maven/CHANGES.md                       |  2 +
 .../spotless/maven/AbstractSpotlessMojo.java  |  8 +++-
 .../diffplug/spotless/maven/shell/Shell.java  | 46 +++++++++++++++++++
 .../diffplug/spotless/maven/shell/Shfmt.java  | 41 +++++++++++++++++
 .../maven/MavenIntegrationHarness.java        |  6 ++-
 .../spotless/maven/shell/ShellTest.java       | 34 ++++++++++++++
 6 files changed, 134 insertions(+), 3 deletions(-)
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/shell/Shell.java
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/shell/Shfmt.java
 create mode 100644 plugin-maven/src/test/java/com/diffplug/spotless/maven/shell/ShellTest.java

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 789f4430f4..045d005715 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* Support for formatting shell scripts via [shfmt](https://github.com/mvdan/sh). TODO [#9999](https://github.com/diffplug/spotless/issues/9999)
 
 ## [2.42.0] - 2024-01-15
 ### Added
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
index 97a61ddaea..5a4a1f6742 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -73,6 +73,7 @@
 import com.diffplug.spotless.maven.pom.Pom;
 import com.diffplug.spotless.maven.python.Python;
 import com.diffplug.spotless.maven.scala.Scala;
+import com.diffplug.spotless.maven.shell.Shell;
 import com.diffplug.spotless.maven.sql.Sql;
 import com.diffplug.spotless.maven.typescript.Typescript;
 import com.diffplug.spotless.maven.yaml.Yaml;
@@ -178,6 +179,9 @@ public abstract class AbstractSpotlessMojo extends AbstractMojo {
 	@Parameter
 	private Json json;
 
+	@Parameter
+	private Shell shell;
+
 	@Parameter
 	private Yaml yaml;
 
@@ -358,7 +362,7 @@ private FileLocator getFileLocator() {
 	}
 
 	private List<FormatterFactory> getFormatterFactories() {
-		return Stream.concat(formats.stream(), Stream.of(groovy, java, scala, kotlin, cpp, typescript, javascript, antlr4, pom, sql, python, markdown, json, yaml, gherkin))
+		return Stream.concat(formats.stream(), Stream.of(groovy, java, scala, kotlin, cpp, typescript, javascript, antlr4, pom, sql, python, markdown, json, shell, yaml, gherkin))
 				.filter(Objects::nonNull)
 				.collect(toList());
 	}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/shell/Shell.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/shell/Shell.java
new file mode 100644
index 0000000000..6285bfc410
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/shell/Shell.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.shell;
+
+import java.util.Collections;
+import java.util.Set;
+
+import org.apache.maven.project.MavenProject;
+
+import com.diffplug.spotless.maven.FormatterFactory;
+import com.diffplug.spotless.maven.generic.LicenseHeader;
+
+/**
+ * A {@link FormatterFactory} implementation that corresponds to {@code <shell>...</shell>} configuration element.
+ * <p>
+ * It defines a formatter for shell source files that can execute both language agnostic (e.g. {@link LicenseHeader})
+ * and shell-specific (e.g. {@link Shfmt}) steps.
+ */
+public class Shell extends FormatterFactory {
+	@Override
+	public Set<String> defaultIncludes(MavenProject project) {
+		return Collections.emptySet();
+	}
+
+	@Override
+	public String licenseHeaderDelimiter() {
+		return null;
+	}
+
+	public void addShfmt(Shfmt shfmt) {
+		addStepFactory(shfmt);
+	}
+}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/shell/Shfmt.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/shell/Shfmt.java
new file mode 100644
index 0000000000..09b83240b0
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/shell/Shfmt.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.shell;
+
+import org.apache.maven.plugins.annotations.Parameter;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.maven.FormatterStepConfig;
+import com.diffplug.spotless.maven.FormatterStepFactory;
+import com.diffplug.spotless.shell.ShfmtStep;
+
+public class Shfmt implements FormatterStepFactory {
+
+	@Parameter
+	private String version;
+
+	@Parameter
+	private String pathToExe;
+
+	@Override
+	public FormatterStep newFormatterStep(FormatterStepConfig config) {
+		ShfmtStep shfmt = ShfmtStep.withVersion(version == null ? ShfmtStep.defaultVersion() : version);
+		if (pathToExe != null) {
+			shfmt = shfmt.withPathToExe(pathToExe);
+		}
+		return shfmt.create();
+	}
+}
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
index 4710874e9f..6b629e3596 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -179,6 +179,10 @@ protected void writePomWithJsonSteps(String... steps) throws IOException {
 		writePom(groupWithSteps("json", including("**/*.json"), steps));
 	}
 
+	protected void writePomWithShellSteps(String... steps) throws IOException {
+		writePom(groupWithSteps("shell", including("**/*.sh"), steps));
+	}
+
 	protected void writePomWithYamlSteps(String... steps) throws IOException {
 		writePom(groupWithSteps("yaml", including("**/*.yaml"), steps));
 	}
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/shell/ShellTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/shell/ShellTest.java
new file mode 100644
index 0000000000..7ffc04f49b
--- /dev/null
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/shell/ShellTest.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.shell;
+
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.diffplug.spotless.maven.MavenIntegrationHarness;
+
+public class ShellTest extends MavenIntegrationHarness {
+	private static final Logger LOGGER = LoggerFactory.getLogger(ShellTest.class);
+
+	@Test
+	public void testFormatShell() throws Exception {
+		writePomWithShellSteps("<shfmt/>");
+		setFile("shfmt.sh").toResource("shell/shfmt/shfmt.sh");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("shfmt.sh").sameAsResource("shell/shfmt/shfmt.clean");
+	}
+}

From fc9b6ee0f0aa2de1b9ce3ce2f50374f693798da4 Mon Sep 17 00:00:00 2001
From: Tyler Crawford <tcrawford@figure.com>
Date: Mon, 15 Jan 2024 10:28:42 -0500
Subject: [PATCH 1432/2068] Update documentation to reflect maven shell
 formatting support

---
 CHANGES.md | 4 +++-
 README.md  | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index af37f3a337..32e536f883 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,11 +10,13 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* Maven - Support for formatting shell scripts via [shfmt](https://github.com/mvdan/sh). TODO ([#9999](https://github.com/diffplug/spotless/pull/9999))
 
 ## [2.44.0] - 2024-01-15
 ### Added
 * New static method to `DiffMessageFormatter` which allows to retrieve diffs with their line numbers ([#1960](https://github.com/diffplug/spotless/issues/1960))
-* Format shell via [shfmt](https://github.com/mvdan/sh). ([#1994](https://github.com/diffplug/spotless/pull/1994))
+* Gradle - Support for formatting shell scripts via [shfmt](https://github.com/mvdan/sh). ([#1994](https://github.com/diffplug/spotless/pull/1994))
 ### Fixed
 * Fix empty files with biome >= 1.5.0 when formatting files that are in the ignore list of the biome configuration file. ([#1989](https://github.com/diffplug/spotless/pull/1989) fixes [#1987](https://github.com/diffplug/spotless/issues/1987))
 * Fix a regression in BufStep where the same arguments were being provided to every `buf` invocation. ([#1976](https://github.com/diffplug/spotless/issues/1976))
diff --git a/README.md b/README.md
index 4515eaf0a1..e9f94bd211 100644
--- a/README.md
+++ b/README.md
@@ -103,7 +103,7 @@ lib('pom.SortPomStepStep')                       +'{{no}}        | {{yes}}
 lib('protobuf.BufStep')                          +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
 lib('python.BlackStep')                          +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
 lib('scala.ScalaFmtStep')                        +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
-lib('shell.ShfmtStep')                           +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
+lib('shell.ShfmtStep')                           +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('sql.DBeaverSQLFormatterStep')               +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
 extra('wtp.EclipseWtpFormatterStep')             +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('yaml.JacksonYamlStep')                      +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',

From 88e95d38065470e4e970c02dc4d0c024819d2a6d Mon Sep 17 00:00:00 2001
From: Tyler Crawford <tcrawford@figure.com>
Date: Mon, 15 Jan 2024 10:30:25 -0500
Subject: [PATCH 1433/2068] Follow up with PR number

---
 CHANGES.md              | 2 +-
 plugin-maven/CHANGES.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 32e536f883..0e8940dec6 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,7 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* Maven - Support for formatting shell scripts via [shfmt](https://github.com/mvdan/sh). TODO ([#9999](https://github.com/diffplug/spotless/pull/9999))
+* Maven - Support for formatting shell scripts via [shfmt](https://github.com/mvdan/sh). ([#1998](https://github.com/diffplug/spotless/pull/1998))
 
 ## [2.44.0] - 2024-01-15
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 045d005715..8e1f2df629 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -4,7 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* Support for formatting shell scripts via [shfmt](https://github.com/mvdan/sh). TODO [#9999](https://github.com/diffplug/spotless/issues/9999)
+* Support for formatting shell scripts via [shfmt](https://github.com/mvdan/sh). [#1998](https://github.com/diffplug/spotless/issues/1998)
 
 ## [2.42.0] - 2024-01-15
 ### Added

From db7563331a33a7455a244b7ae6f80ab9653d8bdd Mon Sep 17 00:00:00 2001
From: Tyler Crawford <tcrawford@figure.com>
Date: Mon, 15 Jan 2024 10:31:32 -0500
Subject: [PATCH 1434/2068] Fix support matrix

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e9f94bd211..495c826df6 100644
--- a/README.md
+++ b/README.md
@@ -156,7 +156,7 @@ lib('yaml.JacksonYamlStep')                      +'{{yes}}       | {{yes}}
 | [`protobuf.BufStep`](lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
 | [`python.BlackStep`](lib/src/main/java/com/diffplug/spotless/python/BlackStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
 | [`scala.ScalaFmtStep`](lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
-| [`shell.ShfmtStep`](lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
+| [`shell.ShfmtStep`](lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`sql.DBeaverSQLFormatterStep`](lib/src/main/java/com/diffplug/spotless/sql/DBeaverSQLFormatterStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`wtp.EclipseWtpFormatterStep`](lib-extra/src/main/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`yaml.JacksonYamlStep`](lib/src/main/java/com/diffplug/spotless/yaml/JacksonYamlStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |

From 96879e54fd8a5035325ad62994486a880c924641 Mon Sep 17 00:00:00 2001
From: Tyler Crawford <tcrawford@figure.com>
Date: Mon, 15 Jan 2024 10:33:39 -0500
Subject: [PATCH 1435/2068] Put PR link in parentheses

---
 plugin-maven/CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 8e1f2df629..f056aadf6e 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -4,7 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* Support for formatting shell scripts via [shfmt](https://github.com/mvdan/sh). [#1998](https://github.com/diffplug/spotless/issues/1998)
+* Support for formatting shell scripts via [shfmt](https://github.com/mvdan/sh). ([#1998](https://github.com/diffplug/spotless/issues/1998))
 
 ## [2.42.0] - 2024-01-15
 ### Added

From e32e45d489ed7285b05b9ca8eedf9c2158f641d8 Mon Sep 17 00:00:00 2001
From: Tyler Crawford <tcrawford@figure.com>
Date: Mon, 15 Jan 2024 11:05:05 -0500
Subject: [PATCH 1436/2068] Rename ShfmtIntegrationTest, disable ShellTest

---
 .../{ShfmtIntegrationTest.java => ShellExtensionTest.java}      | 2 +-
 .../test/java/com/diffplug/spotless/maven/shell/ShellTest.java  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
 rename plugin-gradle/src/test/java/com/diffplug/gradle/spotless/{ShfmtIntegrationTest.java => ShellExtensionTest.java} (94%)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ShfmtIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ShellExtensionTest.java
similarity index 94%
rename from plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ShfmtIntegrationTest.java
rename to plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ShellExtensionTest.java
index 9693790679..1a4f567ccb 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ShfmtIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ShellExtensionTest.java
@@ -22,7 +22,7 @@
 import com.diffplug.spotless.tag.ShfmtTest;
 
 @ShfmtTest
-public class ShfmtIntegrationTest extends GradleIntegrationHarness {
+public class ShellExtensionTest extends GradleIntegrationHarness {
 	@Test
 	void shfmt() throws IOException {
 		setFile("build.gradle").toLines(
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/shell/ShellTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/shell/ShellTest.java
index 7ffc04f49b..870de85849 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/shell/ShellTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/shell/ShellTest.java
@@ -15,12 +15,14 @@
  */
 package com.diffplug.spotless.maven.shell;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
 
+@Disabled // Disabled due to GHA not having shfmt
 public class ShellTest extends MavenIntegrationHarness {
 	private static final Logger LOGGER = LoggerFactory.getLogger(ShellTest.class);
 

From 00204bbecb58a83e71d3ccde05575afd0e597f24 Mon Sep 17 00:00:00 2001
From: Valery Yatsynovich <valery_yatsynovich@epam.com>
Date: Mon, 15 Jan 2024 18:05:08 +0200
Subject: [PATCH 1437/2068] Fix typo in Gradle plugin changelog

---
 plugin-gradle/CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 77b39d6804..a95dd2d23b 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -8,7 +8,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * Support for shell via [shfmt](https://github.com/mvdan/sh).
 ### Fixed
-* Fix empty files with biome >= 1.5.0 when formatting files that are in the ignore list of the biome configuration file. ([#1989](https://github.com/diffplug/spotless/pull/1989) fixes [#1987](https://github.com/diffplug/spotless/issues/1987))=======
+* Fix empty files with biome >= 1.5.0 when formatting files that are in the ignore list of the biome configuration file. ([#1989](https://github.com/diffplug/spotless/pull/1989) fixes [#1987](https://github.com/diffplug/spotless/issues/1987))
 * Fix a regression in BufStep where the same arguments were being provided to every `buf` invocation. ([#1976](https://github.com/diffplug/spotless/issues/1976))
 ### Changes
 * Use palantir-java-format 2.39.0 on Java 21. ([#1948](https://github.com/diffplug/spotless/pull/1948))

From 4f68773ba5e7511474601a3c8196f2531d1e5649 Mon Sep 17 00:00:00 2001
From: Peter Trifanov <peter.trifanov@gmail.com>
Date: Mon, 15 Jan 2024 22:12:24 +0100
Subject: [PATCH 1438/2068] Support gofmt

---
 README.md                                     |  1 +
 gradle/special-tests.gradle                   |  1 +
 .../diffplug/spotless/go/GofmtFormatStep.java | 90 +++++++++++++++++++
 .../gradle/spotless/FormatExtension.java      | 28 ++++++
 .../gradle/spotless/GoGradleTest.java         | 41 +++++++++
 .../com/diffplug/spotless/tag/GofmtTest.java  | 30 +++++++
 testlib/src/main/resources/go/gofmt/go.clean  | 14 +++
 testlib/src/main/resources/go/gofmt/go.dirty  | 14 +++
 .../spotless/go/GofmtFormatStepTest.java      | 17 ++++
 9 files changed, 236 insertions(+)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/go/GofmtFormatStep.java
 create mode 100644 plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GoGradleTest.java
 create mode 100644 testlib/src/main/java/com/diffplug/spotless/tag/GofmtTest.java
 create mode 100644 testlib/src/main/resources/go/gofmt/go.clean
 create mode 100644 testlib/src/main/resources/go/gofmt/go.dirty
 create mode 100644 testlib/src/test/java/com/diffplug/spotless/go/GofmtFormatStepTest.java

diff --git a/README.md b/README.md
index 4515eaf0a1..2020bbafa7 100644
--- a/README.md
+++ b/README.md
@@ -78,6 +78,7 @@ lib('antlr4.Antlr4FormatterStep')                +'{{yes}}       | {{yes}}
 lib('biome.BiomeStep')                           +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('cpp.ClangFormatStep')                       +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
 extra('cpp.EclipseFormatterStep')                +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
+lib('go.GofmtFormatStep')                        +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
 lib('gherkin.GherkinUtilsStep')                  +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 extra('groovy.GrEclipseFormatterStep')           +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
 lib('java.GoogleJavaFormatStep')                 +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
diff --git a/gradle/special-tests.gradle b/gradle/special-tests.gradle
index ae9da9a06e..7da0324ab7 100644
--- a/gradle/special-tests.gradle
+++ b/gradle/special-tests.gradle
@@ -3,6 +3,7 @@ def special = [
 	'Black',
 	'Buf',
 	'Clang',
+	'gofmt',
 	'Npm',
 	'Shfmt'
 ]
diff --git a/lib/src/main/java/com/diffplug/spotless/go/GofmtFormatStep.java b/lib/src/main/java/com/diffplug/spotless/go/GofmtFormatStep.java
new file mode 100644
index 0000000000..fd3a066f7c
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/go/GofmtFormatStep.java
@@ -0,0 +1,90 @@
+package com.diffplug.spotless.go;
+
+import com.diffplug.spotless.ForeignExe;
+import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.ProcessRunner;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+import javax.annotation.Nullable;
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Note: gofmt doesn't have a version flag, because it's part of standard Go distribution.
+ * So `go` executable can be used to determine base path and version, and path to gofmt can be built from it.
+ */
+public class GofmtFormatStep {
+    public static String name() {
+        return "gofmt";
+    }
+
+    public static String defaultVersion() {
+        return "1.20.0";
+    }
+
+    private final String version;
+    private final @Nullable String pathToExe;
+
+    private GofmtFormatStep(String version, String pathToExe) {
+        this.version = version;
+        this.pathToExe = pathToExe;
+    }
+
+    public static GofmtFormatStep withVersion(String version) {
+        return new GofmtFormatStep(version, null);
+    }
+
+    public GofmtFormatStep withGoExecutable(String pathToExe) {
+        return new GofmtFormatStep(version, pathToExe);
+    }
+
+    public FormatterStep create() {
+        return FormatterStep.createLazy(name(), this::createState, GofmtFormatStep.State::toFunc);
+    }
+
+    private State createState() throws IOException, InterruptedException {
+        String howToInstall = "gofmt is a part of standard go distribution. If spotless can't discover it automatically, " +
+                "you can point Spotless to the go binary with {@code pathToExe('/path/to/go')}";
+        final ForeignExe exe = ForeignExe.nameAndVersion("go", version)
+                .pathToExe(pathToExe)
+                .versionFlag("version")
+                .fixCantFind(howToInstall)
+                .fixWrongVersion(
+                        "You can tell Spotless to use the version you already have with {@code gofmt('{versionFound}')}" +
+                                "or you can install the currently specified Go version, {version}.\n" + howToInstall);
+        return new State(this, exe);
+    }
+
+    @SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
+    static class State implements Serializable {
+        private static final long serialVersionUID = -1825662355363926318L;
+        // used for up-to-date checks and caching
+        final String version;
+        final transient ForeignExe exe;
+
+        public State(GofmtFormatStep step, ForeignExe goExecutable) {
+            this.version = step.version;
+            this.exe = Objects.requireNonNull(goExecutable);
+        }
+
+        String format(ProcessRunner runner, String input, File file) throws IOException, InterruptedException {
+            final List<String> processArgs = new ArrayList<>();
+            String pathToGoBinary = exe.confirmVersionAndGetAbsolutePath();
+            String pathToGoFmt = Path.of(pathToGoBinary).getParent().resolve("gofmt").toString();
+            processArgs.add(pathToGoFmt);
+            return runner.exec(input.getBytes(StandardCharsets.UTF_8), processArgs).assertExitZero(StandardCharsets.UTF_8);
+        }
+
+        FormatterFunc.Closeable toFunc() {
+            ProcessRunner runner = new ProcessRunner();
+            return FormatterFunc.Closeable.of(runner, this::format);
+        }
+    }
+}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index eae8ac667d..c3eaef5628 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -36,6 +36,7 @@
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 
+import com.diffplug.spotless.go.GofmtFormatStep;
 import org.gradle.api.Action;
 import org.gradle.api.GradleException;
 import org.gradle.api.Project;
@@ -956,6 +957,33 @@ public EclipseWtpConfig eclipseWtp(EclipseWtpFormatterStep type, String version)
 		return new EclipseWtpConfig(type, version);
 	}
 
+	public class GofmtConfig {
+		GofmtFormatStep stepCfg;
+
+		public GofmtConfig(String version) {
+			stepCfg = (GofmtFormatStep) GofmtFormatStep.withVersion(version).create();
+			addStep(createStep());
+		}
+
+		public GofmtConfig withGoExecutable(String pathToGo) {
+			stepCfg = stepCfg.withGoExecutable(pathToGo);
+			replaceStep(createStep());
+			return this;
+		}
+
+		private FormatterStep createStep() {
+			return stepCfg.create();
+		}
+	}
+
+	public GofmtConfig gofmt() {
+		return new GofmtConfig(GofmtFormatStep.defaultVersion());
+	}
+
+	public GofmtConfig gofmt(String version) {
+		return new GofmtConfig(version);
+	}
+
 	/**
 	 * <pre>
 	 * spotless {
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GoGradleTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GoGradleTest.java
new file mode 100644
index 0000000000..3488462580
--- /dev/null
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GoGradleTest.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2020-2021 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.gradle.spotless;
+
+import com.diffplug.spotless.tag.GofmtTest;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+
+@GofmtTest
+class GoGradleTest extends GradleIntegrationHarness {
+	@Test
+	void gofmt() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"  id 'com.diffplug.spotless'",
+				"}",
+				"spotless {",
+				"  format 'go' {",
+				"    target 'src/**/*.go'",
+				"    gofmt()",
+				"  }",
+				"}");
+		setFile("src/test.go").toResource("go/gofmt/go.dirty");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("src/test.go").sameAsResource("go/gofmt/go.clean");
+	}
+}
diff --git a/testlib/src/main/java/com/diffplug/spotless/tag/GofmtTest.java b/testlib/src/main/java/com/diffplug/spotless/tag/GofmtTest.java
new file mode 100644
index 0000000000..90091c1d69
--- /dev/null
+++ b/testlib/src/main/java/com/diffplug/spotless/tag/GofmtTest.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2021 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.tag;
+
+import org.junit.jupiter.api.Tag;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Target({TYPE, METHOD})
+@Retention(RUNTIME)
+@Tag("gofmt")
+public @interface GofmtTest {}
diff --git a/testlib/src/main/resources/go/gofmt/go.clean b/testlib/src/main/resources/go/gofmt/go.clean
new file mode 100644
index 0000000000..321185cd76
--- /dev/null
+++ b/testlib/src/main/resources/go/gofmt/go.clean
@@ -0,0 +1,14 @@
+package main
+
+import "fmt"
+
+func split(sum int) (x int, y int) {
+	x = sum * 4 / 9
+	y = sum - x
+	return
+}
+
+func main() {
+	fmt.Println(
+		split(17))
+}
diff --git a/testlib/src/main/resources/go/gofmt/go.dirty b/testlib/src/main/resources/go/gofmt/go.dirty
new file mode 100644
index 0000000000..f1f9adaca7
--- /dev/null
+++ b/testlib/src/main/resources/go/gofmt/go.dirty
@@ -0,0 +1,14 @@
+package main
+
+import "fmt"
+
+func split (sum int) (x int ,  y int) {
+	x = sum   * 4 / 9
+	y    = sum - x
+	return
+}
+
+func main() {
+	fmt.Println(
+  split(17))
+}
diff --git a/testlib/src/test/java/com/diffplug/spotless/go/GofmtFormatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/go/GofmtFormatStepTest.java
new file mode 100644
index 0000000000..6d35336730
--- /dev/null
+++ b/testlib/src/test/java/com/diffplug/spotless/go/GofmtFormatStepTest.java
@@ -0,0 +1,17 @@
+package com.diffplug.spotless.go;
+
+import com.diffplug.spotless.ResourceHarness;
+import com.diffplug.spotless.StepHarness;
+import com.diffplug.spotless.tag.GofmtTest;
+import org.junit.jupiter.api.Test;
+
+@GofmtTest
+public class GofmtFormatStepTest extends ResourceHarness {
+    @Test
+    void test() {
+        try (StepHarness harness = StepHarness.forStep(GofmtFormatStep.withVersion("go1.21.5").create())) {
+                harness.testResource("go/gofmt/go.dirty", "go/gofmt/go.clean")
+                    .close();
+        }
+    }
+}

From 2453b4fbcd01444e8a16efe50c6b7cd11ef06214 Mon Sep 17 00:00:00 2001
From: Peter Trifanov <peter.trifanov@gmail.com>
Date: Mon, 15 Jan 2024 22:27:37 +0100
Subject: [PATCH 1439/2068] Run `spotlessApply`

---
 .../diffplug/spotless/go/GofmtFormatStep.java | 163 ++++++++++--------
 .../gradle/spotless/FormatExtension.java      |   4 +-
 .../gradle/spotless/GoGradleTest.java         |   7 +-
 .../com/diffplug/spotless/tag/GofmtTest.java  |  10 +-
 .../spotless/go/GofmtFormatStepTest.java      |  32 +++-
 5 files changed, 125 insertions(+), 91 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/go/GofmtFormatStep.java b/lib/src/main/java/com/diffplug/spotless/go/GofmtFormatStep.java
index fd3a066f7c..82cc4956de 100644
--- a/lib/src/main/java/com/diffplug/spotless/go/GofmtFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/go/GofmtFormatStep.java
@@ -1,12 +1,20 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.go;
 
-import com.diffplug.spotless.ForeignExe;
-import com.diffplug.spotless.FormatterFunc;
-import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.ProcessRunner;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
-import javax.annotation.Nullable;
 import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
@@ -16,75 +24,84 @@
 import java.util.List;
 import java.util.Objects;
 
+import javax.annotation.Nullable;
+
+import com.diffplug.spotless.ForeignExe;
+import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.ProcessRunner;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 /**
  * Note: gofmt doesn't have a version flag, because it's part of standard Go distribution.
  * So `go` executable can be used to determine base path and version, and path to gofmt can be built from it.
  */
 public class GofmtFormatStep {
-    public static String name() {
-        return "gofmt";
-    }
-
-    public static String defaultVersion() {
-        return "1.20.0";
-    }
-
-    private final String version;
-    private final @Nullable String pathToExe;
-
-    private GofmtFormatStep(String version, String pathToExe) {
-        this.version = version;
-        this.pathToExe = pathToExe;
-    }
-
-    public static GofmtFormatStep withVersion(String version) {
-        return new GofmtFormatStep(version, null);
-    }
-
-    public GofmtFormatStep withGoExecutable(String pathToExe) {
-        return new GofmtFormatStep(version, pathToExe);
-    }
-
-    public FormatterStep create() {
-        return FormatterStep.createLazy(name(), this::createState, GofmtFormatStep.State::toFunc);
-    }
-
-    private State createState() throws IOException, InterruptedException {
-        String howToInstall = "gofmt is a part of standard go distribution. If spotless can't discover it automatically, " +
-                "you can point Spotless to the go binary with {@code pathToExe('/path/to/go')}";
-        final ForeignExe exe = ForeignExe.nameAndVersion("go", version)
-                .pathToExe(pathToExe)
-                .versionFlag("version")
-                .fixCantFind(howToInstall)
-                .fixWrongVersion(
-                        "You can tell Spotless to use the version you already have with {@code gofmt('{versionFound}')}" +
-                                "or you can install the currently specified Go version, {version}.\n" + howToInstall);
-        return new State(this, exe);
-    }
-
-    @SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
-    static class State implements Serializable {
-        private static final long serialVersionUID = -1825662355363926318L;
-        // used for up-to-date checks and caching
-        final String version;
-        final transient ForeignExe exe;
-
-        public State(GofmtFormatStep step, ForeignExe goExecutable) {
-            this.version = step.version;
-            this.exe = Objects.requireNonNull(goExecutable);
-        }
-
-        String format(ProcessRunner runner, String input, File file) throws IOException, InterruptedException {
-            final List<String> processArgs = new ArrayList<>();
-            String pathToGoBinary = exe.confirmVersionAndGetAbsolutePath();
-            String pathToGoFmt = Path.of(pathToGoBinary).getParent().resolve("gofmt").toString();
-            processArgs.add(pathToGoFmt);
-            return runner.exec(input.getBytes(StandardCharsets.UTF_8), processArgs).assertExitZero(StandardCharsets.UTF_8);
-        }
-
-        FormatterFunc.Closeable toFunc() {
-            ProcessRunner runner = new ProcessRunner();
-            return FormatterFunc.Closeable.of(runner, this::format);
-        }
-    }
+	public static String name() {
+		return "gofmt";
+	}
+
+	public static String defaultVersion() {
+		return "1.20.0";
+	}
+
+	private final String version;
+	private final @Nullable String pathToExe;
+
+	private GofmtFormatStep(String version, String pathToExe) {
+		this.version = version;
+		this.pathToExe = pathToExe;
+	}
+
+	public static GofmtFormatStep withVersion(String version) {
+		return new GofmtFormatStep(version, null);
+	}
+
+	public GofmtFormatStep withGoExecutable(String pathToExe) {
+		return new GofmtFormatStep(version, pathToExe);
+	}
+
+	public FormatterStep create() {
+		return FormatterStep.createLazy(name(), this::createState, GofmtFormatStep.State::toFunc);
+	}
+
+	private State createState() throws IOException, InterruptedException {
+		String howToInstall = "gofmt is a part of standard go distribution. If spotless can't discover it automatically, " +
+				"you can point Spotless to the go binary with {@code pathToExe('/path/to/go')}";
+		final ForeignExe exe = ForeignExe.nameAndVersion("go", version)
+				.pathToExe(pathToExe)
+				.versionFlag("version")
+				.fixCantFind(howToInstall)
+				.fixWrongVersion(
+						"You can tell Spotless to use the version you already have with {@code gofmt('{versionFound}')}" +
+								"or you can install the currently specified Go version, {version}.\n" + howToInstall);
+		return new State(this, exe);
+	}
+
+	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
+	static class State implements Serializable {
+		private static final long serialVersionUID = -1825662355363926318L;
+		// used for up-to-date checks and caching
+		final String version;
+		final transient ForeignExe exe;
+
+		public State(GofmtFormatStep step, ForeignExe goExecutable) {
+			this.version = step.version;
+			this.exe = Objects.requireNonNull(goExecutable);
+		}
+
+		String format(ProcessRunner runner, String input, File file) throws IOException, InterruptedException {
+			final List<String> processArgs = new ArrayList<>();
+			String pathToGoBinary = exe.confirmVersionAndGetAbsolutePath();
+			String pathToGoFmt = Path.of(pathToGoBinary).getParent().resolve("gofmt").toString();
+			processArgs.add(pathToGoFmt);
+			return runner.exec(input.getBytes(StandardCharsets.UTF_8), processArgs).assertExitZero(StandardCharsets.UTF_8);
+		}
+
+		FormatterFunc.Closeable toFunc() {
+			ProcessRunner runner = new ProcessRunner();
+			return FormatterFunc.Closeable.of(runner, this::format);
+		}
+	}
 }
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index c3eaef5628..a19918796e 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,7 +36,6 @@
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 
-import com.diffplug.spotless.go.GofmtFormatStep;
 import org.gradle.api.Action;
 import org.gradle.api.GradleException;
 import org.gradle.api.Project;
@@ -66,6 +65,7 @@
 import com.diffplug.spotless.generic.ReplaceRegexStep;
 import com.diffplug.spotless.generic.ReplaceStep;
 import com.diffplug.spotless.generic.TrimTrailingWhitespaceStep;
+import com.diffplug.spotless.go.GofmtFormatStep;
 import com.diffplug.spotless.npm.NpmPathResolver;
 import com.diffplug.spotless.npm.PrettierFormatterStep;
 import com.diffplug.spotless.rome.BiomeFlavor;
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GoGradleTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GoGradleTest.java
index 3488462580..1d5fea7e41 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GoGradleTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GoGradleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 DiffPlug
+ * Copyright 2020-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +15,11 @@
  */
 package com.diffplug.gradle.spotless;
 
-import com.diffplug.spotless.tag.GofmtTest;
+import java.io.IOException;
+
 import org.junit.jupiter.api.Test;
 
-import java.io.IOException;
+import com.diffplug.spotless.tag.GofmtTest;
 
 @GofmtTest
 class GoGradleTest extends GradleIntegrationHarness {
diff --git a/testlib/src/main/java/com/diffplug/spotless/tag/GofmtTest.java b/testlib/src/main/java/com/diffplug/spotless/tag/GofmtTest.java
index 90091c1d69..6228a84895 100644
--- a/testlib/src/main/java/com/diffplug/spotless/tag/GofmtTest.java
+++ b/testlib/src/main/java/com/diffplug/spotless/tag/GofmtTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2021-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,14 +15,14 @@
  */
 package com.diffplug.spotless.tag;
 
-import org.junit.jupiter.api.Tag;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import org.junit.jupiter.api.Tag;
 
 @Target({TYPE, METHOD})
 @Retention(RUNTIME)
diff --git a/testlib/src/test/java/com/diffplug/spotless/go/GofmtFormatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/go/GofmtFormatStepTest.java
index 6d35336730..c9158088fa 100644
--- a/testlib/src/test/java/com/diffplug/spotless/go/GofmtFormatStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/go/GofmtFormatStepTest.java
@@ -1,17 +1,33 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.go;
 
+import org.junit.jupiter.api.Test;
+
 import com.diffplug.spotless.ResourceHarness;
 import com.diffplug.spotless.StepHarness;
 import com.diffplug.spotless.tag.GofmtTest;
-import org.junit.jupiter.api.Test;
 
 @GofmtTest
 public class GofmtFormatStepTest extends ResourceHarness {
-    @Test
-    void test() {
-        try (StepHarness harness = StepHarness.forStep(GofmtFormatStep.withVersion("go1.21.5").create())) {
-                harness.testResource("go/gofmt/go.dirty", "go/gofmt/go.clean")
-                    .close();
-        }
-    }
+	@Test
+	void test() {
+		try (StepHarness harness = StepHarness.forStep(GofmtFormatStep.withVersion("go1.21.5").create())) {
+			harness.testResource("go/gofmt/go.dirty", "go/gofmt/go.clean")
+					.close();
+		}
+	}
 }

From 18f1b3c4dc18ab666ee6911499185b5afdda8617 Mon Sep 17 00:00:00 2001
From: Peter Trifanov <peter.trifanov@gmail.com>
Date: Mon, 15 Jan 2024 22:29:57 +0100
Subject: [PATCH 1440/2068] Update `CHANGES.md` and `plugin-gradle/CHANGES.md`

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index af37f3a337..59dad96973 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,7 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+* Support for `gofmt` ([#861](https://github.com/diffplug/spotless/issues/861))
 
 ## [2.44.0] - 2024-01-15
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 77b39d6804..5d0d741931 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,7 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+* Support for `gofmt` ([#861](https://github.com/diffplug/spotless/issues/861))
 
 ## [6.24.0] - 2024-01-15
 ### Added

From 32f33f11b1f04dbcf74d04f723909a7590f02832 Mon Sep 17 00:00:00 2001
From: Peter Trifanov <peter.trifanov@gmail.com>
Date: Mon, 15 Jan 2024 22:35:04 +0100
Subject: [PATCH 1441/2068] Run `spotlessApply`

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 2020bbafa7..9449709b02 100644
--- a/README.md
+++ b/README.md
@@ -132,6 +132,7 @@ lib('yaml.JacksonYamlStep')                      +'{{yes}}       | {{yes}}
 | [`biome.BiomeStep`](lib/src/main/java/com/diffplug/spotless/biome/BiomeStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`cpp.ClangFormatStep`](lib/src/main/java/com/diffplug/spotless/cpp/ClangFormatStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
 | [`cpp.EclipseFormatterStep`](lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseFormatterStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
+| [`go.GofmtFormatStep`](lib/src/main/java/com/diffplug/spotless/go/GofmtFormatStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
 | [`gherkin.GherkinUtilsStep`](lib/src/main/java/com/diffplug/spotless/gherkin/GherkinUtilsStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`groovy.GrEclipseFormatterStep`](lib-extra/src/main/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`java.GoogleJavaFormatStep`](lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |

From 6b2a8e0ce1de4ddc1a788e5cd7ff1f726023fc57 Mon Sep 17 00:00:00 2001
From: Peter Trifanov <peter.trifanov@gmail.com>
Date: Mon, 15 Jan 2024 23:03:29 +0100
Subject: [PATCH 1442/2068] Fix spotbugs findings

---
 .../main/java/com/diffplug/spotless/go/GofmtFormatStep.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/go/GofmtFormatStep.java b/lib/src/main/java/com/diffplug/spotless/go/GofmtFormatStep.java
index 82cc4956de..9b5dac5f48 100644
--- a/lib/src/main/java/com/diffplug/spotless/go/GofmtFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/go/GofmtFormatStep.java
@@ -94,7 +94,11 @@ public State(GofmtFormatStep step, ForeignExe goExecutable) {
 		String format(ProcessRunner runner, String input, File file) throws IOException, InterruptedException {
 			final List<String> processArgs = new ArrayList<>();
 			String pathToGoBinary = exe.confirmVersionAndGetAbsolutePath();
-			String pathToGoFmt = Path.of(pathToGoBinary).getParent().resolve("gofmt").toString();
+			Path goBasePath = Path.of(pathToGoBinary).getParent();
+			if (goBasePath == null) {
+				throw new IllegalStateException("Unable to resolve base path of Go installation directory");
+			}
+			String pathToGoFmt = goBasePath.resolve("gofmt").toString();
 			processArgs.add(pathToGoFmt);
 			return runner.exec(input.getBytes(StandardCharsets.UTF_8), processArgs).assertExitZero(StandardCharsets.UTF_8);
 		}

From e075ffaff74f9d7cd163e8fcc903a5d8dbd65fd7 Mon Sep 17 00:00:00 2001
From: Tyler Crawford <tcrawford@figure.com>
Date: Mon, 15 Jan 2024 19:23:21 -0500
Subject: [PATCH 1443/2068] Update Gradle changelog for shfmt support

---
 plugin-gradle/CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 77b39d6804..5c41b913d2 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -6,7 +6,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [6.24.0] - 2024-01-15
 ### Added
-* Support for shell via [shfmt](https://github.com/mvdan/sh).
+* Support for shell formatting via [shfmt](https://github.com/mvdan/sh). ([#1994](https://github.com/diffplug/spotless/pull/1994))
 ### Fixed
 * Fix empty files with biome >= 1.5.0 when formatting files that are in the ignore list of the biome configuration file. ([#1989](https://github.com/diffplug/spotless/pull/1989) fixes [#1987](https://github.com/diffplug/spotless/issues/1987))=======
 * Fix a regression in BufStep where the same arguments were being provided to every `buf` invocation. ([#1976](https://github.com/diffplug/spotless/issues/1976))

From 4aac2f52b2b1cecd2eb45300d05c5256002c0a0c Mon Sep 17 00:00:00 2001
From: Peter Trifanov <peter.trifanov@gmail.com>
Date: Tue, 16 Jan 2024 17:42:47 +0100
Subject: [PATCH 1444/2068] Apply review suggestions

---
 CHANGES.md               | 2 +-
 plugin-gradle/CHANGES.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 59dad96973..d6dc48b10f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,7 +10,7 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
-* Support for `gofmt` ([#861](https://github.com/diffplug/spotless/issues/861))
+* Support for `gofmt` ([#2001](https://github.com/diffplug/spotless/issues/2001))
 
 ## [2.44.0] - 2024-01-15
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 5d0d741931..b3d918e343 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,7 +3,7 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
-* Support for `gofmt` ([#861](https://github.com/diffplug/spotless/issues/861))
+* Support for `gofmt` ([#2001](https://github.com/diffplug/spotless/issues/2001))
 
 ## [6.24.0] - 2024-01-15
 ### Added

From e868f630283b19a7166f7c91d227349600b90541 Mon Sep 17 00:00:00 2001
From: Peter Trifanov <peter.trifanov@gmail.com>
Date: Tue, 16 Jan 2024 18:08:27 +0100
Subject: [PATCH 1445/2068] Implement gofmt support in plugin-maven

---
 plugin-maven/CHANGES.md                       |  1 +
 plugin-maven/README.md                        | 28 +++++++++++++++++++
 .../spotless/maven/AbstractSpotlessMojo.java  |  6 +++-
 .../com/diffplug/spotless/maven/go/Go.java    | 23 +++++++++++++++
 .../com/diffplug/spotless/maven/go/Gofmt.java | 25 +++++++++++++++++
 .../maven/MavenIntegrationHarness.java        |  4 +++
 .../diffplug/spotless/maven/go/GofmtTest.java | 16 +++++++++++
 7 files changed, 102 insertions(+), 1 deletion(-)
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/go/Go.java
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/go/Gofmt.java
 create mode 100644 plugin-maven/src/test/java/com/diffplug/spotless/maven/go/GofmtTest.java

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 789f4430f4..4966621d38 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,7 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+* Support for `gofmt` ([#2001](https://github.com/diffplug/spotless/issues/2001))
 
 ## [2.42.0] - 2024-01-15
 ### Added
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index efc15b515f..47ee6b5d37 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -54,6 +54,7 @@ user@machine repo % mvn spotless:check
   - [JSON](#json) ([simple](#simple), [gson](#gson), [jackson](#jackson), [Biome](#biome), [jsonPatch](#jsonPatch))
   - [YAML](#yaml)
   - [Gherkin](#gherkin)
+  - [Go](#go)
   - Multiple languages
     - [Prettier](#prettier) ([plugins](#prettier-plugins), [npm detection](#npm-detection), [`.npmrc` detection](#npmrc-detection), [caching `npm install` results](#caching-results-of-npm-install))
     - [eclipse web tools platform](#eclipse-web-tools-platform)
@@ -1047,6 +1048,33 @@ Uses a Gherkin pretty-printer that optionally allows configuring the number of s
 </gherkinUtils>
 ```
 
+## Go
+
+- `com.diffplug.spotless.maven.FormatterFactory.addStepFactory(FormatterStepFactory)` [code](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/go/Go.java)
+
+```xml
+<configuration>
+  <go>
+    <includes>     <!-- You have to set the target manually -->
+      <include>src/**/*.go</include>
+    </includes>
+
+    <gofmt />    <!-- has its own section below -->
+  </go>
+</configuration>
+```
+
+### gofmt
+
+Standard Go formatter, part of Go distribution.
+
+```xml
+<gofmt>
+  <version>go1.25.1</version>
+  <goExecutablePath>/opt/sdks/go1.25.1/bin/go</goExecutablePath>
+</gofmt>
+```
+
 ## Prettier
 
 [homepage](https://prettier.io/). [changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md). [official plugins](https://prettier.io/docs/en/plugins.html#official-plugins). [community plugins](https://prettier.io/docs/en/plugins.html#community-plugins). Prettier is a formatter that can format almost every anything - JavaScript, JSX, Angular, Vue, Flow, TypeScript, CSS, Less, SCSS, HTML, JSON, GraphQL, Markdown (including GFM and MDX), and YAML.  It can format even more [using plugins](https://prettier.io/docs/en/plugins.html) (PHP, Ruby, Swift, XML, Apex, Elm, Java (!!), Kotlin, pgSQL, .properties, solidity, svelte, toml, shellscript, ...).
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
index 97a61ddaea..2cecfaa1c1 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
@@ -38,6 +38,7 @@
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
+import com.diffplug.spotless.maven.go.Go;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.annotations.Component;
@@ -184,6 +185,9 @@ public abstract class AbstractSpotlessMojo extends AbstractMojo {
 	@Parameter
 	private Gherkin gherkin;
 
+	@Parameter
+	private Go go;
+
 	@Parameter(property = "spotlessFiles")
 	private String filePatterns;
 
@@ -358,7 +362,7 @@ private FileLocator getFileLocator() {
 	}
 
 	private List<FormatterFactory> getFormatterFactories() {
-		return Stream.concat(formats.stream(), Stream.of(groovy, java, scala, kotlin, cpp, typescript, javascript, antlr4, pom, sql, python, markdown, json, yaml, gherkin))
+		return Stream.concat(formats.stream(), Stream.of(groovy, java, scala, kotlin, cpp, typescript, javascript, antlr4, pom, sql, python, markdown, json, yaml, gherkin, go))
 				.filter(Objects::nonNull)
 				.collect(toList());
 	}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/go/Go.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/go/Go.java
new file mode 100644
index 0000000000..b69f6652cb
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/go/Go.java
@@ -0,0 +1,23 @@
+package com.diffplug.spotless.maven.go;
+
+import com.diffplug.spotless.maven.FormatterFactory;
+import org.apache.maven.project.MavenProject;
+
+import java.util.Collections;
+import java.util.Set;
+
+public class Go extends FormatterFactory {
+    @Override
+    public Set<String> defaultIncludes(MavenProject project) {
+        return Collections.emptySet();
+    }
+
+    @Override
+    public String licenseHeaderDelimiter() {
+        return null;
+    }
+
+    public void addGofmt(Gofmt gofmt) {
+        addStepFactory(gofmt);
+    }
+}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/go/Gofmt.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/go/Gofmt.java
new file mode 100644
index 0000000000..47bb9576c8
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/go/Gofmt.java
@@ -0,0 +1,25 @@
+package com.diffplug.spotless.maven.go;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.go.GofmtFormatStep;
+import com.diffplug.spotless.maven.FormatterStepConfig;
+import com.diffplug.spotless.maven.FormatterStepFactory;
+import org.apache.maven.plugins.annotations.Parameter;
+
+public class Gofmt implements FormatterStepFactory {
+
+    @Parameter
+    private String version;
+
+    @Parameter
+    private String goExecutablePath;
+
+    @Override
+    public FormatterStep newFormatterStep(FormatterStepConfig config) {
+        GofmtFormatStep step = GofmtFormatStep.withVersion(version == null ? GofmtFormatStep.defaultVersion() : version);
+        if (goExecutablePath != null) {
+            step = step.withGoExecutable(goExecutablePath);
+        }
+        return step.create();
+    }
+}
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
index 4710874e9f..e9b0233a14 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
@@ -187,6 +187,10 @@ protected void writePomWithGherkinSteps(String... steps) throws IOException {
 		writePom(groupWithSteps("gherkin", including("**/*.feature"), steps));
 	}
 
+	protected void writePomWithGoSteps(String... steps) throws IOException {
+		writePom(groupWithSteps("go", including("**/*.go"), steps));
+	}
+
 	protected void writePom(String... configuration) throws IOException {
 		writePom(null, configuration, null, null);
 	}
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/go/GofmtTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/go/GofmtTest.java
new file mode 100644
index 0000000000..a8ba456325
--- /dev/null
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/go/GofmtTest.java
@@ -0,0 +1,16 @@
+package com.diffplug.spotless.maven.go;
+
+import com.diffplug.spotless.maven.MavenIntegrationHarness;
+import org.junit.jupiter.api.Test;
+
+@com.diffplug.spotless.tag.GofmtTest
+public class GofmtTest extends MavenIntegrationHarness {
+    @Test
+    void testGofmt() throws Exception {
+        writePomWithGoSteps("<gofmt><version>go1.21.5</version></gofmt>");
+
+        setFile("src/main/go/example.go").toResource("go/gofmt/go.dirty");
+        mavenRunner().withArguments("spotless:apply").runNoError();
+        assertFile("src/main/go/example.go").sameAsResource("go/gofmt/go.clean");
+    }
+}

From 2870d069634c5f35f920a560caf96adbda466b74 Mon Sep 17 00:00:00 2001
From: Peter Trifanov <peter.trifanov@gmail.com>
Date: Tue, 16 Jan 2024 18:14:55 +0100
Subject: [PATCH 1446/2068] Run `spotlessApply`

---
 .../spotless/maven/AbstractSpotlessMojo.java  |  4 +-
 .../com/diffplug/spotless/maven/go/Go.java    | 44 +++++++++++++------
 .../com/diffplug/spotless/maven/go/Gofmt.java | 42 ++++++++++++------
 .../maven/MavenIntegrationHarness.java        |  2 +-
 .../diffplug/spotless/maven/go/GofmtTest.java | 32 ++++++++++----
 5 files changed, 86 insertions(+), 38 deletions(-)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
index 2cecfaa1c1..35e490b581 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,7 +38,6 @@
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
-import com.diffplug.spotless.maven.go.Go;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.annotations.Component;
@@ -63,6 +62,7 @@
 import com.diffplug.spotless.maven.generic.Format;
 import com.diffplug.spotless.maven.generic.LicenseHeader;
 import com.diffplug.spotless.maven.gherkin.Gherkin;
+import com.diffplug.spotless.maven.go.Go;
 import com.diffplug.spotless.maven.groovy.Groovy;
 import com.diffplug.spotless.maven.incremental.UpToDateChecker;
 import com.diffplug.spotless.maven.incremental.UpToDateChecking;
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/go/Go.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/go/Go.java
index b69f6652cb..bb26bd0355 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/go/Go.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/go/Go.java
@@ -1,23 +1,39 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.maven.go;
 
-import com.diffplug.spotless.maven.FormatterFactory;
-import org.apache.maven.project.MavenProject;
-
 import java.util.Collections;
 import java.util.Set;
 
+import org.apache.maven.project.MavenProject;
+
+import com.diffplug.spotless.maven.FormatterFactory;
+
 public class Go extends FormatterFactory {
-    @Override
-    public Set<String> defaultIncludes(MavenProject project) {
-        return Collections.emptySet();
-    }
+	@Override
+	public Set<String> defaultIncludes(MavenProject project) {
+		return Collections.emptySet();
+	}
 
-    @Override
-    public String licenseHeaderDelimiter() {
-        return null;
-    }
+	@Override
+	public String licenseHeaderDelimiter() {
+		return null;
+	}
 
-    public void addGofmt(Gofmt gofmt) {
-        addStepFactory(gofmt);
-    }
+	public void addGofmt(Gofmt gofmt) {
+		addStepFactory(gofmt);
+	}
 }
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/go/Gofmt.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/go/Gofmt.java
index 47bb9576c8..aaa30efb4f 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/go/Gofmt.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/go/Gofmt.java
@@ -1,25 +1,41 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.maven.go;
 
+import org.apache.maven.plugins.annotations.Parameter;
+
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.go.GofmtFormatStep;
 import com.diffplug.spotless.maven.FormatterStepConfig;
 import com.diffplug.spotless.maven.FormatterStepFactory;
-import org.apache.maven.plugins.annotations.Parameter;
 
 public class Gofmt implements FormatterStepFactory {
 
-    @Parameter
-    private String version;
+	@Parameter
+	private String version;
 
-    @Parameter
-    private String goExecutablePath;
+	@Parameter
+	private String goExecutablePath;
 
-    @Override
-    public FormatterStep newFormatterStep(FormatterStepConfig config) {
-        GofmtFormatStep step = GofmtFormatStep.withVersion(version == null ? GofmtFormatStep.defaultVersion() : version);
-        if (goExecutablePath != null) {
-            step = step.withGoExecutable(goExecutablePath);
-        }
-        return step.create();
-    }
+	@Override
+	public FormatterStep newFormatterStep(FormatterStepConfig config) {
+		GofmtFormatStep step = GofmtFormatStep.withVersion(version == null ? GofmtFormatStep.defaultVersion() : version);
+		if (goExecutablePath != null) {
+			step = step.withGoExecutable(goExecutablePath);
+		}
+		return step.create();
+	}
 }
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
index e9b0233a14..45256de6c3 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/go/GofmtTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/go/GofmtTest.java
index a8ba456325..5cf4398f70 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/go/GofmtTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/go/GofmtTest.java
@@ -1,16 +1,32 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.maven.go;
 
-import com.diffplug.spotless.maven.MavenIntegrationHarness;
 import org.junit.jupiter.api.Test;
 
+import com.diffplug.spotless.maven.MavenIntegrationHarness;
+
 @com.diffplug.spotless.tag.GofmtTest
 public class GofmtTest extends MavenIntegrationHarness {
-    @Test
-    void testGofmt() throws Exception {
-        writePomWithGoSteps("<gofmt><version>go1.21.5</version></gofmt>");
+	@Test
+	void testGofmt() throws Exception {
+		writePomWithGoSteps("<gofmt><version>go1.21.5</version></gofmt>");
 
-        setFile("src/main/go/example.go").toResource("go/gofmt/go.dirty");
-        mavenRunner().withArguments("spotless:apply").runNoError();
-        assertFile("src/main/go/example.go").sameAsResource("go/gofmt/go.clean");
-    }
+		setFile("src/main/go/example.go").toResource("go/gofmt/go.dirty");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("src/main/go/example.go").sameAsResource("go/gofmt/go.clean");
+	}
 }

From 5351d784711a9564dc024b526ea2f7f51a78f4db Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 16 Jan 2024 21:32:20 -0800
Subject: [PATCH 1447/2068] Replace @Disabled with @ShfmtTest.

---
 .../java/com/diffplug/spotless/maven/shell/ShellTest.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/shell/ShellTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/shell/ShellTest.java
index 870de85849..bf0e58fca6 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/shell/ShellTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/shell/ShellTest.java
@@ -15,14 +15,14 @@
  */
 package com.diffplug.spotless.maven.shell;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
+import com.diffplug.spotless.tag.ShfmtTest;
 
-@Disabled // Disabled due to GHA not having shfmt
+@ShfmtTest
 public class ShellTest extends MavenIntegrationHarness {
 	private static final Logger LOGGER = LoggerFactory.getLogger(ShellTest.class);
 

From 4e5fa17209585212ebe8e9e7ed322b1acd2c54e1 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 16 Jan 2024 21:36:52 -0800
Subject: [PATCH 1448/2068] The special tests had a configuration bug at some
 point where their tag was being simultaneously excluded and included.

---
 gradle/special-tests.gradle | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/gradle/special-tests.gradle b/gradle/special-tests.gradle
index ae9da9a06e..f45759294b 100644
--- a/gradle/special-tests.gradle
+++ b/gradle/special-tests.gradle
@@ -1,4 +1,6 @@
 apply plugin: 'com.adarshr.test-logger'
+
+// See com.diffplug.spotless.tag package for available JUnit 5 @Tag annotations
 def special = [
 	'Black',
 	'Buf',
@@ -9,10 +11,6 @@ def special = [
 
 boolean isCiServer = System.getenv().containsKey("CI")
 tasks.withType(Test).configureEach {
-	// See com.diffplug.spotless.tag package for available JUnit 5 @Tag annotations
-	useJUnitPlatform {
-		excludeTags special as String[]
-	}
 	if (isCiServer) {
 		retry {
 			maxRetries = 2
@@ -26,7 +24,11 @@ tasks.withType(Test).configureEach {
 		maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) ?: 1
 	}
 }
-
+tasks.named('test').configure {
+	useJUnitPlatform {
+		excludeTags special as String[]
+	}
+}
 special.forEach { tag ->
 	tasks.register("test${tag}", Test) {
 		useJUnitPlatform { includeTags tag }

From d3f7680bf7c5e7d4bfa821e5a1e50533edf8defe Mon Sep 17 00:00:00 2001
From: Peter Trifanov <peter.trifanov@gmail.com>
Date: Wed, 17 Jan 2024 18:49:25 +0100
Subject: [PATCH 1449/2068] Introduce `go` extension for plugin-gradle

---
 .../diffplug/spotless/go/GofmtFormatStep.java |  2 +-
 .../gradle/spotless/FormatExtension.java      | 27 ---------
 .../diffplug/gradle/spotless/GoExtension.java | 57 +++++++++++++++++++
 .../gradle/spotless/SpotlessExtension.java    |  5 ++
 .../gradle/spotless/GoGradleTest.java         |  4 +-
 5 files changed, 65 insertions(+), 30 deletions(-)
 create mode 100644 plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GoExtension.java

diff --git a/lib/src/main/java/com/diffplug/spotless/go/GofmtFormatStep.java b/lib/src/main/java/com/diffplug/spotless/go/GofmtFormatStep.java
index 9b5dac5f48..18e388cf5b 100644
--- a/lib/src/main/java/com/diffplug/spotless/go/GofmtFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/go/GofmtFormatStep.java
@@ -43,7 +43,7 @@ public static String name() {
 	}
 
 	public static String defaultVersion() {
-		return "1.20.0";
+		return "go1.20.0";
 	}
 
 	private final String version;
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index a19918796e..73189ba4e0 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -957,33 +957,6 @@ public EclipseWtpConfig eclipseWtp(EclipseWtpFormatterStep type, String version)
 		return new EclipseWtpConfig(type, version);
 	}
 
-	public class GofmtConfig {
-		GofmtFormatStep stepCfg;
-
-		public GofmtConfig(String version) {
-			stepCfg = (GofmtFormatStep) GofmtFormatStep.withVersion(version).create();
-			addStep(createStep());
-		}
-
-		public GofmtConfig withGoExecutable(String pathToGo) {
-			stepCfg = stepCfg.withGoExecutable(pathToGo);
-			replaceStep(createStep());
-			return this;
-		}
-
-		private FormatterStep createStep() {
-			return stepCfg.create();
-		}
-	}
-
-	public GofmtConfig gofmt() {
-		return new GofmtConfig(GofmtFormatStep.defaultVersion());
-	}
-
-	public GofmtConfig gofmt(String version) {
-		return new GofmtConfig(version);
-	}
-
 	/**
 	 * <pre>
 	 * spotless {
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GoExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GoExtension.java
new file mode 100644
index 0000000000..60aa1aa71d
--- /dev/null
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GoExtension.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.gradle.spotless;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.go.GofmtFormatStep;
+
+import javax.inject.Inject;
+
+public class GoExtension extends FormatExtension {
+    public static final String NAME = "go";
+
+    @Inject
+    public GoExtension(SpotlessExtension spotless) {
+        super(spotless);
+    }
+
+    public GofmtConfig gofmt() {
+        return new GofmtConfig(GofmtFormatStep.defaultVersion());
+    }
+
+    public GofmtConfig gofmt(String version) {
+        return new GofmtConfig(version);
+    }
+
+    public class GofmtConfig {
+        GofmtFormatStep stepCfg;
+
+        public GofmtConfig(String version) {
+            stepCfg = GofmtFormatStep.withVersion(version);
+            addStep(createStep());
+        }
+
+        public GofmtConfig withGoExecutable(String pathToGo) {
+            stepCfg = stepCfg.withGoExecutable(pathToGo);
+            replaceStep(createStep());
+            return this;
+        }
+
+        private FormatterStep createStep() {
+            return stepCfg.create();
+        }
+    }
+}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
index b4c8e3cc03..f02ac28548 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
@@ -223,6 +223,11 @@ public void gherkin(Action<GherkinExtension> closure) {
 		format(GherkinExtension.NAME, GherkinExtension.class, closure);
 	}
 
+	public void go(Action<GoExtension> closure) {
+		requireNonNull(closure);
+		format(GoExtension.NAME, GoExtension.class, closure);
+	}
+
 	/** Configures a custom extension. */
 	public void format(String name, Action<FormatExtension> closure) {
 		requireNonNull(name, "name");
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GoGradleTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GoGradleTest.java
index 1d5fea7e41..94bd345854 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GoGradleTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GoGradleTest.java
@@ -30,9 +30,9 @@ void gofmt() throws IOException {
 				"  id 'com.diffplug.spotless'",
 				"}",
 				"spotless {",
-				"  format 'go' {",
+				"  go {",
 				"    target 'src/**/*.go'",
-				"    gofmt()",
+				"    gofmt(\"go1.21.5\")",
 				"  }",
 				"}");
 		setFile("src/test.go").toResource("go/gofmt/go.dirty");

From 163ed2d7987cd6a819cf5f930ba51a9f978c4093 Mon Sep 17 00:00:00 2001
From: Peter Trifanov <peter.trifanov@gmail.com>
Date: Wed, 17 Jan 2024 18:56:19 +0100
Subject: [PATCH 1450/2068] Run `spotlessApply`

---
 .../gradle/spotless/FormatExtension.java      |  1 -
 .../diffplug/gradle/spotless/GoExtension.java | 70 +++++++++----------
 2 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index 73189ba4e0..6f6630b1b5 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -65,7 +65,6 @@
 import com.diffplug.spotless.generic.ReplaceRegexStep;
 import com.diffplug.spotless.generic.ReplaceStep;
 import com.diffplug.spotless.generic.TrimTrailingWhitespaceStep;
-import com.diffplug.spotless.go.GofmtFormatStep;
 import com.diffplug.spotless.npm.NpmPathResolver;
 import com.diffplug.spotless.npm.PrettierFormatterStep;
 import com.diffplug.spotless.rome.BiomeFlavor;
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GoExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GoExtension.java
index 60aa1aa71d..145e90c19a 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GoExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GoExtension.java
@@ -15,43 +15,43 @@
  */
 package com.diffplug.gradle.spotless;
 
+import javax.inject.Inject;
+
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.go.GofmtFormatStep;
 
-import javax.inject.Inject;
-
 public class GoExtension extends FormatExtension {
-    public static final String NAME = "go";
-
-    @Inject
-    public GoExtension(SpotlessExtension spotless) {
-        super(spotless);
-    }
-
-    public GofmtConfig gofmt() {
-        return new GofmtConfig(GofmtFormatStep.defaultVersion());
-    }
-
-    public GofmtConfig gofmt(String version) {
-        return new GofmtConfig(version);
-    }
-
-    public class GofmtConfig {
-        GofmtFormatStep stepCfg;
-
-        public GofmtConfig(String version) {
-            stepCfg = GofmtFormatStep.withVersion(version);
-            addStep(createStep());
-        }
-
-        public GofmtConfig withGoExecutable(String pathToGo) {
-            stepCfg = stepCfg.withGoExecutable(pathToGo);
-            replaceStep(createStep());
-            return this;
-        }
-
-        private FormatterStep createStep() {
-            return stepCfg.create();
-        }
-    }
+	public static final String NAME = "go";
+
+	@Inject
+	public GoExtension(SpotlessExtension spotless) {
+		super(spotless);
+	}
+
+	public GofmtConfig gofmt() {
+		return new GofmtConfig(GofmtFormatStep.defaultVersion());
+	}
+
+	public GofmtConfig gofmt(String version) {
+		return new GofmtConfig(version);
+	}
+
+	public class GofmtConfig {
+		GofmtFormatStep stepCfg;
+
+		public GofmtConfig(String version) {
+			stepCfg = GofmtFormatStep.withVersion(version);
+			addStep(createStep());
+		}
+
+		public GofmtConfig withGoExecutable(String pathToGo) {
+			stepCfg = stepCfg.withGoExecutable(pathToGo);
+			replaceStep(createStep());
+			return this;
+		}
+
+		private FormatterStep createStep() {
+			return stepCfg.create();
+		}
+	}
 }

From 602128c203ba22a6209c17809cf4f791c725f332 Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <awa@xima.de>
Date: Thu, 18 Jan 2024 10:48:21 +0100
Subject: [PATCH 1451/2068] Implements #1995, flag to format JavaDoc for
 Palantir formatter

---
 CHANGES.md                                    |  1 +
 CONTRIBUTING.md                               | 11 ++++++
 .../spotless/java/PalantirJavaFormatStep.java | 35 ++++++++++++-----
 .../pjf/PalantirJavaFormatFormatterFunc.java  | 33 +++++++++++++---
 plugin-gradle/CHANGES.md                      |  3 ++
 plugin-gradle/README.md                       |  2 +
 .../gradle/spotless/JavaExtension.java        | 11 +++++-
 .../PalantirJavaFormatIntegrationTest.java    | 24 +++++++++++-
 plugin-maven/CHANGES.md                       |  1 +
 plugin-maven/README.md                        |  3 +-
 .../maven/java/PalantirJavaFormat.java        |  8 +++-
 .../maven/java/PalantirJavaFormatTest.java    | 21 +++++++---
 .../JavaCodeWithJavaDocFormatted.test         | 39 +++++++++++++++++++
 .../JavaCodeWithJavaDocUnformatted.test       | 30 ++++++++++++++
 .../java/PalantirJavaFormatStepTest.java      | 22 ++++++++++-
 15 files changed, 217 insertions(+), 27 deletions(-)
 create mode 100644 testlib/src/main/resources/java/palantirjavaformat/JavaCodeWithJavaDocFormatted.test
 create mode 100644 testlib/src/main/resources/java/palantirjavaformat/JavaCodeWithJavaDocUnformatted.test

diff --git a/CHANGES.md b/CHANGES.md
index 0e8940dec6..97218538a9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Maven - Support for formatting shell scripts via [shfmt](https://github.com/mvdan/sh). ([#1998](https://github.com/diffplug/spotless/pull/1998))
+* Maven / Gradle - Support for formatting Java Docs for the Palantir formatter ([#1995](https://github.com/diffplug/spotless/issues/1995))
 
 ## [2.44.0] - 2024-01-15
 ### Added
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6fb993f419..f0a4b4d59c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -171,6 +171,17 @@ gradlew :plugin-maven:test --tests com.diffplug.spotless.maven.pom.SortPomMavenT
 gradlew :plugin-gradle:test --tests com.diffplug.gradle.spotless.FreshMarkExtensionTest
 ```
 
+## Check and format code
+
+Before creating a pull request, you might want to format (yes, spotless is  formatted by spotless)
+the code and check for possible bugs
+
+* `./gradlew spotlessApply`
+* `./gradlew spotbugsMain`
+
+These checks are also run by the automated pipeline when you submit a pull request, if
+the pipeline fails, first check if the code is formatted and no bugs were found.
+
 ## Integration testing
 
 ### Gradle - locally
diff --git a/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
index 95f7b355f7..c4d06cc731 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
@@ -27,6 +27,7 @@ public class PalantirJavaFormatStep {
 	// prevent direct instantiation
 	private PalantirJavaFormatStep() {}
 
+	private static final boolean DEFAULT_FORMAT_JAVADOC = false;
 	private static final String DEFAULT_STYLE = "PALANTIR";
 	private static final String NAME = "palantir-java-format";
 	public static final String MAVEN_COORDINATE = "com.palantir.javaformat:palantir-java-format:";
@@ -42,14 +43,25 @@ public static FormatterStep create(String version, Provisioner provisioner) {
 		return create(version, defaultStyle(), provisioner);
 	}
 
-	/** Creates a step which formats everything - code, import order, and unused imports. And with the style input. */
+	/**
+	 * Creates a step which formats code, import order, and unused imports, but not Java docs. And with the given format
+	 * style.
+	 */
 	public static FormatterStep create(String version, String style, Provisioner provisioner) {
+		return create(version, style, defaultFormatJavadoc(), provisioner);
+	}
+
+	/**
+	 * Creates a step which formats everything - code, import order, unused imports, and Java docs. And with the given
+	 * format style.
+	 */
+	public static FormatterStep create(String version, String style, boolean formatJavadoc, Provisioner provisioner) {
 		Objects.requireNonNull(version, "version");
 		Objects.requireNonNull(style, "style");
 		Objects.requireNonNull(provisioner, "provisioner");
 
 		return FormatterStep.createLazy(NAME,
-				() -> new State(JarState.from(MAVEN_COORDINATE + version, provisioner), version, style),
+				() -> new State(JarState.from(MAVEN_COORDINATE + version, provisioner), version, style, formatJavadoc),
 				State::createFormat);
 	}
 
@@ -63,6 +75,11 @@ public static String defaultStyle() {
 		return DEFAULT_STYLE;
 	}
 
+	/** Get default for whether Java docs should be formatted */
+	public static boolean defaultFormatJavadoc() {
+		return DEFAULT_FORMAT_JAVADOC;
+	}
+
 	private static final class State implements Serializable {
 		private static final long serialVersionUID = 1L;
 
@@ -71,23 +88,23 @@ private static final class State implements Serializable {
 		/** Version of the formatter jar. */
 		private final String formatterVersion;
 		private final String style;
+		/** Whether to format Java docs. */
+		private final boolean formatJavadoc;
 
-		State(JarState jarState, String formatterVersion) {
-			this(jarState, formatterVersion, DEFAULT_STYLE);
-		}
-
-		State(JarState jarState, String formatterVersion, String style) {
+		State(JarState jarState, String formatterVersion, String style, boolean formatJavadoc) {
 			ModuleHelper.doOpenInternalPackagesIfRequired();
 			this.jarState = jarState;
 			this.formatterVersion = formatterVersion;
 			this.style = style;
+			this.formatJavadoc = formatJavadoc;
 		}
 
 		FormatterFunc createFormat() throws Exception {
 			final ClassLoader classLoader = jarState.getClassLoader();
 			final Class<?> formatterFunc = classLoader.loadClass("com.diffplug.spotless.glue.pjf.PalantirJavaFormatFormatterFunc");
-			final Constructor<?> constructor = formatterFunc.getConstructor(String.class); // style
-			return JVM_SUPPORT.suggestLaterVersionOnError(formatterVersion, (FormatterFunc) constructor.newInstance(style));
+			// 1st arg is "style", 2nd arg is "formatJavadoc"
+			final Constructor<?> constructor = formatterFunc.getConstructor(String.class, boolean.class);
+			return JVM_SUPPORT.suggestLaterVersionOnError(formatterVersion, (FormatterFunc) constructor.newInstance(style, formatJavadoc));
 		}
 	}
 }
diff --git a/lib/src/palantirJavaFormat/java/com/diffplug/spotless/glue/pjf/PalantirJavaFormatFormatterFunc.java b/lib/src/palantirJavaFormat/java/com/diffplug/spotless/glue/pjf/PalantirJavaFormatFormatterFunc.java
index 189bbb54be..bdec215435 100644
--- a/lib/src/palantirJavaFormat/java/com/diffplug/spotless/glue/pjf/PalantirJavaFormatFormatterFunc.java
+++ b/lib/src/palantirJavaFormat/java/com/diffplug/spotless/glue/pjf/PalantirJavaFormatFormatterFunc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 DiffPlug
+ * Copyright 2022-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,9 @@
  */
 package com.diffplug.spotless.glue.pjf;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
 import com.palantir.javaformat.java.Formatter;
 import com.palantir.javaformat.java.ImportOrderer;
 import com.palantir.javaformat.java.JavaFormatterOptions;
@@ -28,11 +31,20 @@ public class PalantirJavaFormatFormatterFunc implements FormatterFunc {
 
 	private final JavaFormatterOptions.Style formatterStyle;
 
-	public PalantirJavaFormatFormatterFunc(String style) {
+	/**
+	 * Creates a new formatter func that formats code via Palantir.
+	 * @param style The style to use for formatting.
+	 * @param formatJavadoc Whether to format Java docs. Requires at least Palantir 2.36.0 or later, otherwise the
+	 * constructor will throw.
+	 */
+	public PalantirJavaFormatFormatterFunc(String style, boolean formatJavadoc) {
 		this.formatterStyle = JavaFormatterOptions.Style.valueOf(style);
-		formatter = Formatter.createFormatter(JavaFormatterOptions.builder()
-				.style(formatterStyle)
-				.build());
+		JavaFormatterOptions.Builder builder = JavaFormatterOptions.builder();
+		builder.style(formatterStyle);
+		if (formatJavadoc) {
+			applyFormatJavadoc(builder);
+		}
+		formatter = Formatter.createFormatter(builder.build());
 	}
 
 	@Override
@@ -47,4 +59,15 @@ public String apply(String input) throws Exception {
 	public String toString() {
 		return "PalantirJavaFormatFormatterFunc{formatter=" + formatter + '}';
 	}
+
+	private static void applyFormatJavadoc(JavaFormatterOptions.Builder builder) {
+		// The formatJavadoc option is available since Palantir 2.36.0
+		// To support older versions for now, attempt to invoke the builder method via reflection.
+		try {
+			Method formatJavadoc = JavaFormatterOptions.Builder.class.getMethod("formatJavadoc", boolean.class);
+			formatJavadoc.invoke(builder, true);
+		} catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
+			throw new IllegalStateException("Cannot enable formatJavadoc option, make sure you are using Palantir with version 2.36.0 or later", e);
+		}
+	}
 }
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 593d4a2af8..48d8e515de 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]
 
+### Added
+* Maven / Gradle - Support for formatting Java Docs for the Palantir formatter ([#1995](https://github.com/diffplug/spotless/issues/1995))
+
 ## [6.24.0] - 2024-01-15
 ### Added
 * Support for shell formatting via [shfmt](https://github.com/mvdan/sh). ([#1994](https://github.com/diffplug/spotless/pull/1994))
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 730a947d49..7ee996a444 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -220,6 +220,8 @@ spotless {
     palantirJavaFormat()
     // optional: you can specify a specific version and/or switch to AOSP/GOOGLE style
     palantirJavaFormat('2.9.0').style("GOOGLE")
+    // optional: you can also format Javadocs, requires at least Palantir 2.39.0
+    palantirJavaFormat('2.39.0').formatJavadoc(true)
 ```
 
 ### eclipse jdt
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
index bb24a716cd..db869dc4e6 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -256,6 +256,7 @@ public PalantirJavaFormatConfig palantirJavaFormat(String version) {
 	public class PalantirJavaFormatConfig {
 		final String version;
 		String style;
+		boolean formatJavadoc;
 
 		PalantirJavaFormatConfig(String version) {
 			this.version = Objects.requireNonNull(version);
@@ -269,8 +270,14 @@ public PalantirJavaFormatConfig style(String style) {
 			return this;
 		}
 
+		public PalantirJavaFormatConfig formatJavadoc(boolean formatJavadoc) {
+			this.formatJavadoc = formatJavadoc;
+			replaceStep(createStep());
+			return this;
+		}
+
 		private FormatterStep createStep() {
-			return PalantirJavaFormatStep.create(version, style, provisioner());
+			return PalantirJavaFormatStep.create(version, style, formatJavadoc, provisioner());
 		}
 	}
 
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PalantirJavaFormatIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PalantirJavaFormatIntegrationTest.java
index 2283ce34bf..9990039cd3 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PalantirJavaFormatIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PalantirJavaFormatIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 DiffPlug
+ * Copyright 2022-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,4 +45,26 @@ void integration() throws IOException {
 				"palantirJavaFormat('1.0.1')");
 		checkRunsThenUpToDate();
 	}
+
+	@Test
+	void formatJavaDoc() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"",
+				"spotless {",
+				"    java {",
+				"        target file('test.java')",
+				"        palantirJavaFormat('2.39.0').formatJavadoc(true)",
+				"    }",
+				"}");
+
+		setFile("test.java").toResource("java/palantirjavaformat/JavaCodeWithJavaDocUnformatted.test");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("test.java").sameAsResource("java/palantirjavaformat/JavaCodeWithJavaDocFormatted.test");
+
+		checkRunsThenUpToDate();
+	}
 }
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index f056aadf6e..c13abc2511 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Support for formatting shell scripts via [shfmt](https://github.com/mvdan/sh). ([#1998](https://github.com/diffplug/spotless/issues/1998))
+* Maven / Gradle - Support for formatting Java Docs for the Palantir formatter ([#1995](https://github.com/diffplug/spotless/issues/1995))
 
 ## [2.42.0] - 2024-01-15
 ### Added
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index efc15b515f..7785412a32 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -246,8 +246,9 @@ any other maven phase (i.e. compile) then it can be configured as below;
 
 ```xml
 <palantirJavaFormat>
-  <version>2.10.0</version>                     <!-- optional -->
+  <version>2.39.0</version>                     <!-- optional -->
   <style>PALANTIR</style>                       <!-- or AOSP/GOOGLE (optional) -->
+  <formatJavadoc>false</formatJavadoc>          <!-- defaults to false (optional, requires at least Palantir 2.39.0) -->
 </palantirJavaFormat>
 ```
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/PalantirJavaFormat.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/PalantirJavaFormat.java
index 192588d85d..674238d2e8 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/PalantirJavaFormat.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/PalantirJavaFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,10 +30,14 @@ public class PalantirJavaFormat implements FormatterStepFactory {
 	@Parameter
 	private String style;
 
+	@Parameter
+	private Boolean formatJavadoc;
+
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig config) {
 		String version = this.version != null ? this.version : PalantirJavaFormatStep.defaultVersion();
 		String style = this.style != null ? this.style : PalantirJavaFormatStep.defaultStyle();
-		return PalantirJavaFormatStep.create(version, style, config.getProvisioner());
+		boolean formatJavadoc = this.formatJavadoc != null ? this.formatJavadoc : PalantirJavaFormatStep.defaultFormatJavadoc();
+		return PalantirJavaFormatStep.create(version, style, formatJavadoc, config.getProvisioner());
 	}
 }
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/PalantirJavaFormatTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/PalantirJavaFormatTest.java
index 685f00595c..eee4fab8c5 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/PalantirJavaFormatTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/PalantirJavaFormatTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 DiffPlug
+ * Copyright 2022-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@ void specificVersionDefaultStyle() throws Exception {
 				"  <version>1.1.0</version>",
 				"</palantirJavaFormat>");
 
-		runTest("java/palantirjavaformat/JavaCodeFormatted.test");
+		runTest("java/palantirjavaformat/JavaCodeFormatted.test", "java/palantirjavaformat/JavaCodeUnformatted.test");
 	}
 
 	@Test
@@ -37,12 +37,23 @@ void specificJava11Version2() throws Exception {
 				"  <version>2.39.0</version>",
 				"</palantirJavaFormat>");
 
-		runTest("java/palantirjavaformat/JavaCodeFormatted.test");
+		runTest("java/palantirjavaformat/JavaCodeFormatted.test", "java/palantirjavaformat/JavaCodeUnformatted.test");
 	}
 
-	private void runTest(String targetResource) throws Exception {
+	@Test
+	void formatJavaDoc() throws Exception {
+		writePomWithJavaSteps(
+				"<palantirJavaFormat>",
+				"  <version>2.39.0</version>",
+				"  <formatJavadoc>true</formatJavadoc>",
+				"</palantirJavaFormat>");
+
+		runTest("java/palantirjavaformat/JavaCodeWithJavaDocFormatted.test", "java/palantirjavaformat/JavaCodeWithJavaDocUnformatted.test");
+	}
+
+	private void runTest(String targetResource, String sourceResource) throws Exception {
 		String path = "src/main/java/test.java";
-		setFile(path).toResource("java/palantirjavaformat/JavaCodeUnformatted.test");
+		setFile(path).toResource(sourceResource);
 		mavenRunner().withArguments("spotless:apply").runNoError();
 		assertFile(path).sameAsResource(targetResource);
 	}
diff --git a/testlib/src/main/resources/java/palantirjavaformat/JavaCodeWithJavaDocFormatted.test b/testlib/src/main/resources/java/palantirjavaformat/JavaCodeWithJavaDocFormatted.test
new file mode 100644
index 0000000000..9cff5e17a1
--- /dev/null
+++ b/testlib/src/main/resources/java/palantirjavaformat/JavaCodeWithJavaDocFormatted.test
@@ -0,0 +1,39 @@
+import mylib.Unused;
+import mylib.UsedA;
+import mylib.UsedB;
+
+/**
+ * This is a test class with a long unformatted JavaDoc description. Lorem ipsum dolor sit amet, consectetur adipiscing
+ * elit. Vestibulum pulvinar condimentum elit, eget mollis magna sollicitudin in. Aenean pharetra nunc nec luctus
+ * consequat. Donec nec tincidunt quam, in auctor ipsum. Nam in sem orci. Maecenas interdum posuere orci a semper. Cras
+ * vulputate blandit metus, nec semper urna porttitor at. Praesent velit turpis, consequat in cursus eget, posuere eget
+ * magna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque ante eros, sagittis sed tempus nec,
+ * rutrum ac arcu. Sed porttitor quam at enim commodo dictum. Sed fringilla tincidunt ex in aliquet.
+ *
+ * @author https://www.lipsum.com/
+ * @since 0.0.2
+ */
+public class Java {
+    /**
+     * A very simple method that I really like a lot?
+     *
+     * <p>Care for more details?
+     *
+     * <ul>
+     *   <li>Too
+     *   <li>bad
+     *   <li>I
+     *   <li>don't
+     *   <li>have
+     *   <li>any
+     * </ul>
+     *
+     * @param args Useless args, but see {@link Unused}, perhaps even {@link UsedA} or even {@link UsedB b }?
+     */
+    public static void main(String[] args) {
+        System.out.println(
+                "A very very very very very very very very very very very very very very very very very very very very very long string that goes beyond the 100-character line length.");
+        UsedB.someMethod();
+        UsedA.someMethod();
+    }
+}
diff --git a/testlib/src/main/resources/java/palantirjavaformat/JavaCodeWithJavaDocUnformatted.test b/testlib/src/main/resources/java/palantirjavaformat/JavaCodeWithJavaDocUnformatted.test
new file mode 100644
index 0000000000..fcb3ad660c
--- /dev/null
+++ b/testlib/src/main/resources/java/palantirjavaformat/JavaCodeWithJavaDocUnformatted.test
@@ -0,0 +1,30 @@
+
+import mylib.Unused;
+import mylib.UsedB;
+import mylib.UsedA;
+
+/** This is a test class with a long unformatted JavaDoc description. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum pulvinar condimentum elit, eget mollis magna sollicitudin in. Aenean pharetra nunc nec luctus consequat. Donec nec tincidunt quam, in auctor ipsum. Nam in sem orci. Maecenas interdum posuere orci a semper. Cras vulputate blandit metus, nec semper urna porttitor at. Praesent velit turpis, consequat in cursus eget, posuere eget magna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque ante eros, sagittis sed tempus nec, rutrum ac arcu. Sed porttitor quam at enim commodo dictum. Sed fringilla tincidunt ex in aliquet.
+ *             @author              https://www.lipsum.com/
+ *    @since  0.0.2
+ */
+public class Java {
+   /**
+    * A very simple method that I
+    * really
+    * like
+    * a lot?
+    *
+    * Care for more details? <ul><li>Too</li><li>bad</li>
+    * <li>I</li><li>don't</li><li>have</li>
+    *    <li>any</li>
+    * </ul>
+    *
+    *    @param args Useless args, but
+    * see   {@link Unused}, perhaps even {@link UsedA} or even {@link UsedB   b }?
+    */
+public static void main(String[] args) {
+System.out.println("A very very very very very very very very very very very very very very very very very very very very very long string that goes beyond the 100-character line length.");
+UsedB.someMethod();
+UsedA.someMethod();
+}
+}
\ No newline at end of file
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/PalantirJavaFormatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/PalantirJavaFormatStepTest.java
index 7cd1aad438..cb8777728b 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/PalantirJavaFormatStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/PalantirJavaFormatStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 DiffPlug
+ * Copyright 2022-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,6 +54,14 @@ void behavior() throws Exception {
 				.testResource("java/palantirjavaformat/JavaCodeWithPackageUnformatted.test", "java/palantirjavaformat/JavaCodeWithPackageFormatted.test");
 	}
 
+	@Test
+	void formatJavadoc() throws Exception {
+		FormatterStep step = PalantirJavaFormatStep.create("2.39.0", "PALANTIR", true, TestProvisioner.mavenCentral());
+		StepHarness.forStep(step)
+				.testResource("java/palantirjavaformat/JavaCodeWithJavaDocUnformatted.test", "java/palantirjavaformat/JavaCodeWithJavaDocFormatted.test")
+				.testResource("java/palantirjavaformat/JavaCodeWithPackageUnformatted.test", "java/palantirjavaformat/JavaCodeWithPackageFormatted.test");
+	}
+
 	@Test
 	void behaviorWithGoogleStyle() throws Exception {
 		FormatterStep step = PalantirJavaFormatStep.create("1.1.0", "GOOGLE", TestProvisioner.mavenCentral());
@@ -68,23 +76,33 @@ void equality() {
 		new SerializableEqualityTester() {
 			String version = "1.1.0";
 			String style = "";
+			boolean formatJavadoc = false;
 
 			@Override
 			protected void setupTest(API api) {
 				// same version == same
 				api.areDifferentThan();
+
 				// change the version, and it's different
 				version = "1.0.0";
 				api.areDifferentThan();
+				version = "1.1.0";
+
 				// change the style, and it's different
 				style = "AOSP";
 				api.areDifferentThan();
+				style = "";
+
+				// change the format Java doc flag, and it's different
+				formatJavadoc = true;
+				api.areDifferentThan();
+				formatJavadoc = false;
 			}
 
 			@Override
 			protected FormatterStep create() {
 				String finalVersion = this.version;
-				return PalantirJavaFormatStep.create(finalVersion, style, TestProvisioner.mavenCentral());
+				return PalantirJavaFormatStep.create(finalVersion, style, formatJavadoc, TestProvisioner.mavenCentral());
 			}
 		}.testEquals();
 	}

From 1cb7f0a0b197c1e7b0ddd3ee66656ed411251a53 Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <sensenmann5@gmail.com>
Date: Thu, 18 Jan 2024 14:06:52 +0100
Subject: [PATCH 1452/2068] Add reference to PR in changelog, minor code style
 fix

Co-authored-by: Zongle Wang <wangzongler@gmail.com>
---
 CHANGES.md                                                      | 2 +-
 .../java/com/diffplug/spotless/java/PalantirJavaFormatStep.java | 2 +-
 plugin-gradle/CHANGES.md                                        | 2 +-
 plugin-maven/CHANGES.md                                         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 97218538a9..cbe48b5235 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,7 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Maven - Support for formatting shell scripts via [shfmt](https://github.com/mvdan/sh). ([#1998](https://github.com/diffplug/spotless/pull/1998))
-* Maven / Gradle - Support for formatting Java Docs for the Palantir formatter ([#1995](https://github.com/diffplug/spotless/issues/1995))
+* Maven / Gradle - Support for formatting Java Docs for the Palantir formatter ([#2009](https://github.com/diffplug/spotless/pull/2009))
 
 ## [2.44.0] - 2024-01-15
 ### Added
diff --git a/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
index c4d06cc731..a670a6fea7 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
@@ -48,7 +48,7 @@ public static FormatterStep create(String version, Provisioner provisioner) {
 	 * style.
 	 */
 	public static FormatterStep create(String version, String style, Provisioner provisioner) {
-		return create(version, style, defaultFormatJavadoc(), provisioner);
+		return create(version, style, DEFAULT_FORMAT_JAVADOC, provisioner);
 	}
 
 	/**
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 48d8e515de..132ad16ebc 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,7 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 
 ### Added
-* Maven / Gradle - Support for formatting Java Docs for the Palantir formatter ([#1995](https://github.com/diffplug/spotless/issues/1995))
+* Maven / Gradle - Support for formatting Java Docs for the Palantir formatter ([#2009](https://github.com/diffplug/spotless/pull/2009))
 
 ## [6.24.0] - 2024-01-15
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index c13abc2511..b95f2e998e 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,7 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Support for formatting shell scripts via [shfmt](https://github.com/mvdan/sh). ([#1998](https://github.com/diffplug/spotless/issues/1998))
-* Maven / Gradle - Support for formatting Java Docs for the Palantir formatter ([#1995](https://github.com/diffplug/spotless/issues/1995))
+* Maven / Gradle - Support for formatting Java Docs for the Palantir formatter ([#2009](https://github.com/diffplug/spotless/pull/2009))
 
 ## [2.42.0] - 2024-01-15
 ### Added

From 9d71e6d7c3a00437a1e838d1949066d2ebce367b Mon Sep 17 00:00:00 2001
From: Peter Trifanov <peter.trifanov@gmail.com>
Date: Sat, 20 Jan 2024 17:30:49 +0100
Subject: [PATCH 1453/2068] Fixes according to review

---
 CHANGES.md                                                      | 2 +-
 plugin-gradle/CHANGES.md                                        | 2 +-
 .../main/java/com/diffplug/gradle/spotless/FormatExtension.java | 2 +-
 plugin-maven/CHANGES.md                                         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 272735a791..e13eed2745 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,7 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Maven - Support for formatting shell scripts via [shfmt](https://github.com/mvdan/sh). ([#1998](https://github.com/diffplug/spotless/pull/1998))
-* Support for `gofmt` ([#2001](https://github.com/diffplug/spotless/issues/2001))
+* Support for `gofmt` ([#2001](https://github.com/diffplug/spotless/pull/2001))
 
 ## [2.44.0] - 2024-01-15
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 4a0ac12a5b..b712a4e3d8 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,7 +3,7 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
-* Support for `gofmt` ([#2001](https://github.com/diffplug/spotless/issues/2001))
+* Support for `gofmt` ([#2001](https://github.com/diffplug/spotless/pull/2001))
 
 ## [6.24.0] - 2024-01-15
 ### Added
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index 6f6630b1b5..eae8ac667d 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index e73ccde66d..b7dd430f8e 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,7 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Support for formatting shell scripts via [shfmt](https://github.com/mvdan/sh). ([#1998](https://github.com/diffplug/spotless/issues/1998))
-* Support for `gofmt` ([#2001](https://github.com/diffplug/spotless/issues/2001))
+* Support for `gofmt` ([#2001](https://github.com/diffplug/spotless/pull/2001))
 
 ## [2.42.0] - 2024-01-15
 ### Added

From 56a019c78ba9b2ef2d6f59283b312821441a897a Mon Sep 17 00:00:00 2001
From: Johannes Ptaszyk <johannes@ptaszyk.de>
Date: Sun, 21 Jan 2024 19:34:45 +0100
Subject: [PATCH 1454/2068] Update README.md

Enhance prettier plugin configuration docs to better differentiate v2 and v3.
---
 plugin-gradle/README.md | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 730a947d49..bfa8733504 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -1086,16 +1086,32 @@ To apply prettier to more kinds of files, just add more formats
 Since spotless uses the actual npm prettier package behind the scenes, it is possible to use prettier with
 [plugins](https://prettier.io/docs/en/plugins.html#official-plugins) or [community-plugins](https://www.npmjs.com/search?q=prettier-plugin) in order to support even more file types.
 
+#### prettier version below 3
+
 ```gradle
 spotless {
   java {
     prettier(['prettier': '2.8.8', 'prettier-plugin-java': '2.2.0']).config(['parser': 'java', 'tabWidth': 4])
-    // prettier(['prettier': '3.0.3', 'prettier-plugin-java': '2.3.0']).config(['parser': 'java', 'tabWidth': 4, 'plugins': ['prettier-plugin-java']]) // Prettier v3 requires additional 'plugins' config
   }
   format 'php', {
     target 'src/**/*.php'
     prettier(['prettier': '2.8.8', '@prettier/plugin-php': '0.19.6']).config(['parser': 'php', 'tabWidth': 3])
-    // prettier(['prettier': '3.0.3', '@prettier/plugin-php': '0.20.1']).config(['parser': 'php', 'tabWidth': 3, 'plugins': ['@prettier/plugin-php']]) // Prettier v3 requires additional 'plugins' config
+  }
+}
+```
+
+#### prettier version 3+
+
+With version 3 prettier it is required to pass in an additional 'plugins' parameter to the config block with a list of plugins you want to use.
+
+```gradle
+spotless {
+  java {
+    prettier(['prettier': '3.0.3', 'prettier-plugin-java': '2.3.0']).config(['parser': 'java', 'tabWidth': 4, 'plugins': ['prettier-plugin-java']])
+  }
+  format 'php', {
+    target 'src/**/*.php'
+    prettier(['prettier': '3.0.3', '@prettier/plugin-php': '0.20.1']).config(['parser': 'php', 'tabWidth': 3, 'plugins': ['@prettier/plugin-php']])
   }
 }
 ```

From d4b102ce1d06ce98886bbd4737cc9b3ca4dddafb Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 21 Jan 2024 22:16:52 -0800
Subject: [PATCH 1455/2068] Apply suggestions from code review

Co-authored-by: Zongle Wang <wangzongler@gmail.com>
---
 plugin-gradle/README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index bfa8733504..4b57a07f02 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -1107,11 +1107,13 @@ With version 3 prettier it is required to pass in an additional 'plugins' parame
 ```gradle
 spotless {
   java {
-    prettier(['prettier': '3.0.3', 'prettier-plugin-java': '2.3.0']).config(['parser': 'java', 'tabWidth': 4, 'plugins': ['prettier-plugin-java']])
+    prettier(['prettier': '3.0.3', 'prettier-plugin-java': '2.3.0'])
+      .config(['parser': 'java', 'tabWidth': 4, 'plugins': ['prettier-plugin-java']])
   }
   format 'php', {
     target 'src/**/*.php'
-    prettier(['prettier': '3.0.3', '@prettier/plugin-php': '0.20.1']).config(['parser': 'php', 'tabWidth': 3, 'plugins': ['@prettier/plugin-php']])
+    prettier(['prettier': '3.0.3', '@prettier/plugin-php': '0.20.1'])
+      .config(['parser': 'php', 'tabWidth': 3, 'plugins': ['@prettier/plugin-php']])
   }
 }
 ```

From 9d468eb752c064e5190343648597e0638bbaa9e2 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 22 Jan 2024 21:32:10 -0800
Subject: [PATCH 1456/2068] Remove `_ext` from `CONTRIBUTING.md`.

---
 CONTRIBUTING.md | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f0a4b4d59c..5fce5a9460 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -36,7 +36,6 @@ For the folders below in monospace text, they are published on MavenCentral at t
 | `lib-extra` | Contains the optional parts of Spotless which require external dependencies.  `LineEnding.GIT_ATTRIBUTES` won't work unless `lib-extra` is available. |
 | `plugin-gradle` | Integrates spotless and all of its formatters into Gradle. |
 | `plugin-maven` | Integrates spotless and all of its formatters into Maven. |
-| `_ext` | Folder for generating glue jars (specifically packaging Eclipse jars from p2 for consumption using maven).
 
 ## How to add a new FormatterStep
 
@@ -119,24 +118,6 @@ There are many great formatters (prettier, clang-format, black, etc.) which live
 
 Because of Spotless' up-to-date checking and [git ratcheting](https://github.com/diffplug/spotless/tree/main/plugin-gradle#ratchet), Spotless actually doesn't have to call formatters very often, so even an expensive shell call for every single invocation isn't that bad.  Anything that works is better than nothing, and we can always speed things up later if it feels too slow (but it probably won't).
 
-## How to enable the `_ext` projects
-
-The `_ext` projects are disabled per default, since:
-
-* some of the projects perform vast downloads at configuration time
-* the downloaded content may change on server side and break CI builds
-
-
-The `_ext` can be activated via the root project property `com.diffplug.spotless.include.ext`.
-
-Activate the property via command line, like for example:
-
-```
-gradlew -Pcom.diffplug.spotless.include.ext=true build
-```
-
-Or set the property in your user `gradle.properties` file, which is especially recommended if you like to work with the `_ext` projects using IDEs.
-
 ## How to add a new plugin for a build system
 
 The gist of it is that you will have to:

From a48a91c92ddb3c6142ed895dcc1b37e17016fda5 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 22 Jan 2024 21:32:28 -0800
Subject: [PATCH 1457/2068] Remove `_ext` from `.gitignore`.

---
 .gitignore | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8a0bc11e97..ab04bc7021 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,9 +19,6 @@ gradle-app.setting
 # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
 !gradle-wrapper.jar
 
-#Gradle-Lock files in _ext just serving as an input for lib-extra
-_ext/*/gradle/dependency-locks/*.lockfile
-
 ### Eclipse ###
 .metadata
 .gradle

From ce34f8958667ba39350073ed4fa811d7e507832a Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 22 Jan 2024 22:49:57 -0800
Subject: [PATCH 1458/2068] Fix various typos found by @jbduncan

---
 CONTRIBUTING.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d9079d8fed..0e33516840 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -96,13 +96,13 @@ Here's a checklist for creating a new step for Spotless:
 - [ ] Class name ends in Step, `SomeNewStep`.
 - [ ] Class has a public static method named `create` that returns a `FormatterStep`.
 - [ ] Has a test class named `SomeNewStepTest` that uses `StepHarness` or `StepHarnessWithFile` to test the step.
-  - [ ] Start with `StepHarness.forStep(myStep).supportsRoundTrip(false)`, and then add round trip support as decribed in the next section. 
+  - [ ] Start with `StepHarness.forStep(myStep).supportsRoundTrip(false)`, and then add round trip support as described in the next section. 
 - [ ] Test class has test methods to verify behavior.
 - [ ] Test class has a test method `equality()` which tests equality using `StepEqualityTester` (see existing methods for examples).
 
 ### Serialization roundtrip
 
-In order to support Gradle's configuration cache, all `FormatterStep` must be round-trip serializable. This is a bit tricky because step equality is based on the serialied form of the state, and `transient` is used to take absolute paths out of the equality check. To make this work, roundtrip compatible steps actually have *two* states
+In order to support Gradle's configuration cache, all `FormatterStep` must be round-trip serializable. This is a bit tricky because step equality is based on the serialized form of the state, and `transient` is used to take absolute paths out of the equality check. To make this work, roundtrip compatible steps actually have *two* states:
 
 - `RoundtripState` which must be roundtrip serializable but has no equality constraints
   - `FileSignature.Promised` for settings files and `JarState.Promised` for the classpath 

From 3bd42431e1c8b820f24474c471ff69eed8e800a9 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 22 Jan 2024 22:59:32 -0800
Subject: [PATCH 1459/2068] Copyright updates.

---
 .../com/diffplug/spotless/extra/EclipseBasedStepBuilder.java    | 2 +-
 lib/src/main/java/com/diffplug/spotless/FileSignature.java      | 2 +-
 lib/src/main/java/com/diffplug/spotless/Formatter.java          | 2 +-
 lib/src/main/java/com/diffplug/spotless/FormatterStep.java      | 2 +-
 .../spotless/FormatterStepEqualityOnStateSerialization.java     | 2 +-
 .../diffplug/spotless/FormatterStepSerializationRoundtrip.java  | 2 +-
 lib/src/main/java/com/diffplug/spotless/JarState.java           | 2 +-
 lib/src/main/java/com/diffplug/spotless/SerializedFunction.java | 2 +-
 lib/src/main/java/com/diffplug/spotless/generic/IndentStep.java | 2 +-
 .../java/com/diffplug/spotless/SerializableEqualityTester.java  | 2 +-
 testlib/src/main/java/com/diffplug/spotless/StepHarness.java    | 2 +-
 .../src/main/java/com/diffplug/spotless/StepHarnessBase.java    | 2 +-
 .../main/java/com/diffplug/spotless/StepHarnessWithFile.java    | 2 +-
 .../com/diffplug/spotless/generic/LicenseHeaderStepTest.java    | 2 +-
 .../java/com/diffplug/spotless/npm/EslintFormatterStepTest.java | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/EclipseBasedStepBuilder.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/EclipseBasedStepBuilder.java
index 0cf14eb32c..f22d0a6806 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/EclipseBasedStepBuilder.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/EclipseBasedStepBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/main/java/com/diffplug/spotless/FileSignature.java b/lib/src/main/java/com/diffplug/spotless/FileSignature.java
index 35949426ea..6896d99167 100644
--- a/lib/src/main/java/com/diffplug/spotless/FileSignature.java
+++ b/lib/src/main/java/com/diffplug/spotless/FileSignature.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/main/java/com/diffplug/spotless/Formatter.java b/lib/src/main/java/com/diffplug/spotless/Formatter.java
index 5d2ca8369e..fc6fe32afd 100644
--- a/lib/src/main/java/com/diffplug/spotless/Formatter.java
+++ b/lib/src/main/java/com/diffplug/spotless/Formatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
index 13076e8744..26bc1e56e5 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStepEqualityOnStateSerialization.java b/lib/src/main/java/com/diffplug/spotless/FormatterStepEqualityOnStateSerialization.java
index ca7fa7cfc0..0ff279c5f5 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStepEqualityOnStateSerialization.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStepEqualityOnStateSerialization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java b/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java
index d996c0b360..3af89083fc 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/main/java/com/diffplug/spotless/JarState.java b/lib/src/main/java/com/diffplug/spotless/JarState.java
index cdb8943877..8680932b9e 100644
--- a/lib/src/main/java/com/diffplug/spotless/JarState.java
+++ b/lib/src/main/java/com/diffplug/spotless/JarState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/main/java/com/diffplug/spotless/SerializedFunction.java b/lib/src/main/java/com/diffplug/spotless/SerializedFunction.java
index 56f5974870..d4d36edfb4 100644
--- a/lib/src/main/java/com/diffplug/spotless/SerializedFunction.java
+++ b/lib/src/main/java/com/diffplug/spotless/SerializedFunction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/main/java/com/diffplug/spotless/generic/IndentStep.java b/lib/src/main/java/com/diffplug/spotless/generic/IndentStep.java
index 5eb7c0f758..91155b1a79 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/IndentStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/IndentStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/testlib/src/main/java/com/diffplug/spotless/SerializableEqualityTester.java b/testlib/src/main/java/com/diffplug/spotless/SerializableEqualityTester.java
index 635f11f305..726597a323 100644
--- a/testlib/src/main/java/com/diffplug/spotless/SerializableEqualityTester.java
+++ b/testlib/src/main/java/com/diffplug/spotless/SerializableEqualityTester.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarness.java b/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
index 79c759770f..0f6ddc9ad9 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
index 0a0154176b..8624972c4e 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java b/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java
index a557b76017..ae2f22db1e 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java b/testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java
index a9ec563e58..b5e08d2232 100644
--- a/testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/generic/LicenseHeaderStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
index 1b365e8d11..ab54b11bee 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 52654ef8c4a6191d983b10a2370d53b1ca023f7d Mon Sep 17 00:00:00 2001
From: runner <runner@fv-az1380-177>
Date: Tue, 23 Jan 2024 07:03:59 +0000
Subject: [PATCH 1460/2068] Published lib/2.45.0

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index a94d20dd09..adf6d109e7 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.45.0] - 2024-01-23
 ### Added
 * Support for `gofmt` ([#2001](https://github.com/diffplug/spotless/pull/2001))
 * Support for formatting Java Docs for the Palantir formatter ([#2009](https://github.com/diffplug/spotless/pull/2009))

From cac8d8f8f2d2c12eca1cc91485844a888eb4e29f Mon Sep 17 00:00:00 2001
From: runner <runner@fv-az1380-177>
Date: Tue, 23 Jan 2024 07:06:09 +0000
Subject: [PATCH 1461/2068] Published gradle/6.25.0

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 58 ++++++++++++++++++++--------------------
 2 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index ac5be538c7..28b238a85a 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [6.25.0] - 2024-01-23
 * Support for `gofmt` ([#2001](https://github.com/diffplug/spotless/pull/2001))
 
 ### Added
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index e80d143653..060b900bdc 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -14,9 +14,9 @@ output = [
   ].join('\n');
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
-[![Changelog](https://img.shields.io/badge/changelog-6.24.0-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-6.25.0-blue.svg)](CHANGES.md)
 [![MavenCentral](https://img.shields.io/badge/mavencentral-here-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/index.html)
 
 [![VS Code plugin](https://img.shields.io/badge/IDE-VS_Code-blueviolet.svg)](https://marketplace.visualstudio.com/items?itemName=richardwillis.vscode-spotless-gradle)
 [![IntelliJ plugin](https://img.shields.io/badge/IDE-IntelliJ-blueviolet.svg)](https://plugins.jetbrains.com/plugin/18321-spotless-gradle)
@@ -129,10 +129,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -145,7 +145,7 @@ Spotless requires JRE 11+ and Gradle 6.1.1 or newer.
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -304,8 +304,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -360,8 +360,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -439,7 +439,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -471,7 +471,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -503,7 +503,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -539,7 +539,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ### buf
 
-`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
+`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
 
 **WARNING** this step **must** be the first step in the chain, steps before it will be ignored. Thumbs up [this issue](https://github.com/bufbuild/buf/issues/1035) for a resolution, see [here](https://github.com/diffplug/spotless/pull/1208#discussion_r1264439669) for more details on the problem.
 
@@ -571,7 +571,7 @@ buf {
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -592,7 +592,7 @@ spotless {
 
 ## Flexmark
 
-`com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/FlexmarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java)
+`com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/FlexmarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java)
 
 [homepage](https://github.com/vsch/flexmark-java). Flexmark is a flexible Commonmark/Markdown parser that can be used to format Markdown files. It supports different [flavors of Markdown](https://github.com/vsch/flexmark-java#markdown-processor-emulation) and [many formatting options](https://github.com/vsch/flexmark-java/wiki/Markdown-Formatter#options).
 
@@ -611,7 +611,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -636,7 +636,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -676,7 +676,7 @@ sql.formatter.indent.size=4
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -770,7 +770,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## Javascript
 
-- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
+- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
 
 ```gradle
 spotless {
@@ -835,7 +835,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -955,7 +955,7 @@ spotless {
 
 ## YAML
 
-- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
+- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
 
 ```gradle
 spotless {
@@ -987,7 +987,7 @@ spotless {
 
 ## Shell
 
-`com.diffplug.gradle.spotless.ShellExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/ShellExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ShellExtension.java)
+`com.diffplug.gradle.spotless.ShellExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/ShellExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ShellExtension.java)
 
 ```gradle
 spotless {
@@ -1019,7 +1019,7 @@ shfmt().pathToExe('/opt/homebrew/bin/shfmt')
 
 ## Gherkin
 
-- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
+- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
 
 ```gradle
 spotless {
@@ -1437,7 +1437,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -1517,9 +1517,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -1552,11 +1552,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.24.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From 965b8260c028bdd103f69f199cd60c643dcfe377 Mon Sep 17 00:00:00 2001
From: runner <runner@fv-az1380-177>
Date: Tue, 23 Jan 2024 07:08:05 +0000
Subject: [PATCH 1462/2068] Published maven/2.43.0

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index d1f158d533..56cd5a5104 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.43.0] - 2024-01-23
 ### Added
 * Support for formatting shell scripts via [shfmt](https://github.com/mvdan/sh). ([#1998](https://github.com/diffplug/spotless/issues/1998))
 * Support for `gofmt` ([#2001](https://github.com/diffplug/spotless/pull/2001))
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 97128768d9..1063f3ad12 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -8,8 +8,8 @@ output = [
   ].join('\n');
 -->
 [![MavenCentral](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Changelog](https://img.shields.io/badge/changelog-2.42.0-blue.svg)](CHANGES.md)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.42.0/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.43.0-blue.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.43.0/index.html)
 <!---freshmark /shields -->
 
 <!---freshmark javadoc

From 4d3ac6d48b5e56034f185fb0f2c78ac620a9d175 Mon Sep 17 00:00:00 2001
From: Zongle Wang <wangzongler@gmail.com>
Date: Tue, 23 Jan 2024 15:25:00 +0800
Subject: [PATCH 1463/2068] Group added changes in SGP 6.25.0

---
 plugin-gradle/CHANGES.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 28b238a85a..d4ce3b410e 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,10 +5,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 
 ## [6.25.0] - 2024-01-23
-* Support for `gofmt` ([#2001](https://github.com/diffplug/spotless/pull/2001))
-
 ### Added
 * Maven / Gradle - Support for formatting Java Docs for the Palantir formatter ([#2009](https://github.com/diffplug/spotless/pull/2009))
+* Support for `gofmt` ([#2001](https://github.com/diffplug/spotless/pull/2001))
 
 ## [6.24.0] - 2024-01-15
 ### Added

From acafe5c1dc76ddaac71293664964938d5b78774b Mon Sep 17 00:00:00 2001
From: Jack Gough <goughy000@gmail.com>
Date: Tue, 23 Jan 2024 20:51:57 +0000
Subject: [PATCH 1464/2068] Ignore external git config in unit tests

---
 .../spotless/extra/GitAttributesTest.java     |  4 +-
 .../extra/GitRachetMergeBaseTest.java         |  4 +-
 .../spotless/extra/GitWorkaroundsTest.java    |  4 +-
 .../gradle/spotless/GitRatchetGradleTest.java |  8 ++-
 .../gradle/spotless/LicenseHeaderTest.java    |  5 +-
 .../spotless/maven/GitRatchetMavenTest.java   |  4 +-
 .../generic/LicenseHeaderRatchetTest.java     |  4 +-
 testlib/build.gradle                          |  1 +
 .../com/diffplug/spotless/ClearGitConfig.java | 61 +++++++++++++++++++
 9 files changed, 86 insertions(+), 9 deletions(-)
 create mode 100644 testlib/src/main/java/com/diffplug/spotless/ClearGitConfig.java

diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/GitAttributesTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/GitAttributesTest.java
index a7cde9e58f..8af0478543 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/GitAttributesTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/GitAttributesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,9 +27,11 @@
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.common.base.StringPrinter;
+import com.diffplug.spotless.ClearGitConfig;
 import com.diffplug.spotless.LineEnding;
 import com.diffplug.spotless.ResourceHarness;
 
+@ClearGitConfig
 class GitAttributesTest extends ResourceHarness {
 	private List<File> testFiles(String prefix) {
 		List<File> result = new ArrayList<>();
diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/GitRachetMergeBaseTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/GitRachetMergeBaseTest.java
index 02447a36bd..7f2ad99b54 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/GitRachetMergeBaseTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/GitRachetMergeBaseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 DiffPlug
+ * Copyright 2020-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,8 +27,10 @@
 import org.eclipse.jgit.lib.RefDatabase;
 import org.junit.jupiter.api.Test;
 
+import com.diffplug.spotless.ClearGitConfig;
 import com.diffplug.spotless.ResourceHarness;
 
+@ClearGitConfig
 class GitRachetMergeBaseTest extends ResourceHarness {
 	@Test
 	void test() throws IllegalStateException, GitAPIException, IOException {
diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/GitWorkaroundsTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/GitWorkaroundsTest.java
index a90716f5de..b8a1bf8c89 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/GitWorkaroundsTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/GitWorkaroundsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 DiffPlug
+ * Copyright 2022-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,9 +27,11 @@
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
+import com.diffplug.spotless.ClearGitConfig;
 import com.diffplug.spotless.ResourceHarness;
 import com.diffplug.spotless.extra.GitWorkarounds.RepositorySpecificResolver;
 
+@ClearGitConfig
 class GitWorkaroundsTest extends ResourceHarness {
 	@Test
 	void inline() throws IOException, GitAPIException {
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GitRatchetGradleTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GitRatchetGradleTest.java
index 0398809f90..388bbbb8d1 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GitRatchetGradleTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GitRatchetGradleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,6 +36,9 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
+import com.diffplug.spotless.ClearGitConfig;
+
+@ClearGitConfig
 class GitRatchetGradleTest extends GradleIntegrationHarness {
 	private static final String TEST_PATH = "src/markdown/test.md";
 
@@ -268,10 +271,9 @@ public BuildResultAssertion outcome(String taskPath, TaskOutcome expected) {
 	private RevCommit addAndCommit(Git git) throws NoFilepatternException, GitAPIException {
 		PersonIdent emptyPerson = new PersonIdent("jane doe", "jane@doe.com", new Date(0), TimeZone.getTimeZone("UTC"));
 		git.add().addFilepattern(".").call();
-		RevCommit commit = git.commit().setMessage("baseline")
+		return git.commit().setMessage("baseline")
 				.setCommitter(emptyPerson)
 				.setAuthor(emptyPerson)
 				.call();
-		return commit;
 	}
 }
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/LicenseHeaderTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/LicenseHeaderTest.java
index 4b0784832f..d4c01cdc6d 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/LicenseHeaderTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/LicenseHeaderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,9 @@
 import org.eclipse.jgit.api.Git;
 import org.junit.jupiter.api.Test;
 
+import com.diffplug.spotless.ClearGitConfig;
+
+@ClearGitConfig
 class LicenseHeaderTest extends GradleIntegrationHarness {
 	private static final String NOW = String.valueOf(YearMonth.now().getYear());
 
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/GitRatchetMavenTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/GitRatchetMavenTest.java
index 7d2b26ee89..c1cb0f78d7 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/GitRatchetMavenTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/GitRatchetMavenTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 DiffPlug
+ * Copyright 2020-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,9 @@
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.common.base.StringPrinter;
+import com.diffplug.spotless.ClearGitConfig;
 
+@ClearGitConfig
 class GitRatchetMavenTest extends MavenIntegrationHarness {
 	private static final String TEST_PATH = "src/markdown/test.md";
 
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/generic/LicenseHeaderRatchetTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/generic/LicenseHeaderRatchetTest.java
index cb6d54a1e4..24200020f2 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/generic/LicenseHeaderRatchetTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/generic/LicenseHeaderRatchetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 DiffPlug
+ * Copyright 2020-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,8 +21,10 @@
 import org.eclipse.jgit.api.Git;
 import org.junit.jupiter.api.Test;
 
+import com.diffplug.spotless.ClearGitConfig;
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
 
+@ClearGitConfig
 class LicenseHeaderRatchetTest extends MavenIntegrationHarness {
 	private static final String NOW = String.valueOf(YearMonth.now().getYear());
 
diff --git a/testlib/build.gradle b/testlib/build.gradle
index ce36b83adb..38e598369e 100644
--- a/testlib/build.gradle
+++ b/testlib/build.gradle
@@ -17,6 +17,7 @@ dependencies {
 
 	implementation "com.diffplug.durian:durian-io:${VER_DURIAN}"
 	implementation "com.diffplug.durian:durian-collect:${VER_DURIAN}"
+	implementation "org.eclipse.jgit:org.eclipse.jgit:${VER_JGIT}"
 	implementation gradleTestKit()
 }
 
diff --git a/testlib/src/main/java/com/diffplug/spotless/ClearGitConfig.java b/testlib/src/main/java/com/diffplug/spotless/ClearGitConfig.java
new file mode 100644
index 0000000000..9be13af036
--- /dev/null
+++ b/testlib/src/main/java/com/diffplug/spotless/ClearGitConfig.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.jgit.lib.StoredConfig;
+import org.eclipse.jgit.util.SystemReader;
+import org.junit.jupiter.api.extension.AfterAllCallback;
+import org.junit.jupiter.api.extension.BeforeAllCallback;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.parallel.ResourceAccessMode;
+import org.junit.jupiter.api.parallel.ResourceLock;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE, ElementType.METHOD})
+@ExtendWith(ClearGitConfig.GitConfigExtension.class)
+@ResourceLock(value = "GIT", mode = ResourceAccessMode.READ_WRITE)
+public @interface ClearGitConfig {
+
+	class GitConfigExtension implements BeforeAllCallback, AfterAllCallback {
+
+		@Override
+		public void beforeAll(ExtensionContext extensionContext) throws Exception {
+			for (var config : getConfigs()) {
+				config.clear();
+			}
+		}
+
+		@Override
+		public void afterAll(ExtensionContext extensionContext) throws Exception {
+			for (var config : getConfigs()) {
+				config.load();
+			}
+		}
+
+		private List<StoredConfig> getConfigs() throws Exception {
+			var reader = SystemReader.getInstance();
+			return Arrays.asList(reader.getUserConfig(), reader.getSystemConfig());
+		}
+	}
+}

From e15e694b076ff12c833f6f39650900d0f4154ac3 Mon Sep 17 00:00:00 2001
From: Jack Gough <goughy000@gmail.com>
Date: Tue, 23 Jan 2024 20:57:16 +0000
Subject: [PATCH 1465/2068] add change notes

---
 CHANGES.md               | 2 ++
 plugin-gradle/CHANGES.md | 2 ++
 plugin-maven/CHANGES.md  | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index adf6d109e7..1151dd8430 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Ignore system git config when running tests ([#1990](https://github.com/diffplug/spotless/issues/1990))
 
 ## [2.45.0] - 2024-01-23
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index d4ce3b410e..5e7d8823b9 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Ignore system git config when running tests ([#1990](https://github.com/diffplug/spotless/issues/1990))
 
 ## [6.25.0] - 2024-01-23
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 56cd5a5104..37cc1de12e 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Ignore system git config when running tests ([#1990](https://github.com/diffplug/spotless/issues/1990))
 
 ## [2.43.0] - 2024-01-23
 ### Added

From 647f7e842427ee046558c9c6b4d26fb7de95162f Mon Sep 17 00:00:00 2001
From: Jack Gough <goughy000@gmail.com>
Date: Tue, 23 Jan 2024 21:18:04 +0000
Subject: [PATCH 1466/2068] wrap per test

---
 .../com/diffplug/spotless/ClearGitConfig.java     | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/testlib/src/main/java/com/diffplug/spotless/ClearGitConfig.java b/testlib/src/main/java/com/diffplug/spotless/ClearGitConfig.java
index 9be13af036..1655845831 100644
--- a/testlib/src/main/java/com/diffplug/spotless/ClearGitConfig.java
+++ b/testlib/src/main/java/com/diffplug/spotless/ClearGitConfig.java
@@ -19,13 +19,12 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.util.Arrays;
 import java.util.List;
 
 import org.eclipse.jgit.lib.StoredConfig;
 import org.eclipse.jgit.util.SystemReader;
-import org.junit.jupiter.api.extension.AfterAllCallback;
-import org.junit.jupiter.api.extension.BeforeAllCallback;
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.parallel.ResourceAccessMode;
@@ -37,25 +36,25 @@
 @ResourceLock(value = "GIT", mode = ResourceAccessMode.READ_WRITE)
 public @interface ClearGitConfig {
 
-	class GitConfigExtension implements BeforeAllCallback, AfterAllCallback {
+	class GitConfigExtension implements BeforeEachCallback, AfterEachCallback {
 
 		@Override
-		public void beforeAll(ExtensionContext extensionContext) throws Exception {
+		public void beforeEach(ExtensionContext extensionContext) throws Exception {
 			for (var config : getConfigs()) {
 				config.clear();
 			}
 		}
 
 		@Override
-		public void afterAll(ExtensionContext extensionContext) throws Exception {
+		public void afterEach(ExtensionContext extensionContext) throws Exception {
 			for (var config : getConfigs()) {
 				config.load();
 			}
 		}
 
-		private List<StoredConfig> getConfigs() throws Exception {
+		private static List<StoredConfig> getConfigs() throws Exception {
 			var reader = SystemReader.getInstance();
-			return Arrays.asList(reader.getUserConfig(), reader.getSystemConfig());
+			return List.of(reader.getUserConfig(), reader.getSystemConfig());
 		}
 	}
 }

From 4fdb178503728aa1bc2c49a26f87e8e45a6230a7 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 23 Jan 2024 13:52:00 -0800
Subject: [PATCH 1467/2068] Remove unused method.

---
 lib/src/main/java/com/diffplug/spotless/FileSignature.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/FileSignature.java b/lib/src/main/java/com/diffplug/spotless/FileSignature.java
index 6896d99167..d6a23a8fd1 100644
--- a/lib/src/main/java/com/diffplug/spotless/FileSignature.java
+++ b/lib/src/main/java/com/diffplug/spotless/FileSignature.java
@@ -117,10 +117,6 @@ public FileSignature get() {
 		}
 	}
 
-	public static Promised promise(Iterable<File> files) {
-		return new Promised(MoreIterables.toNullHostileList(files), null);
-	}
-
 	public Promised asPromise() {
 		return new Promised(files, this);
 	}

From 14991e4ab61ce757c70f996605205f4487652035 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 23 Jan 2024 13:52:07 -0800
Subject: [PATCH 1468/2068] Update changelog.

---
 CHANGES.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index adf6d109e7..c6c9f29430 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,10 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* `FileSignature.Promised` and `JarState.Promised` to facilitate round-trip serialization for the Gradle configuration cache. ([#1945](https://github.com/diffplug/spotless/pull/1945)) 
+### Removed
+* **BREAKING** Remove `JarState.getMavenCoordinate(String prefix)`. ([#1945](https://github.com/diffplug/spotless/pull/1945))
 
 ## [2.45.0] - 2024-01-23
 ### Added

From 4b15b3930b15b7df7af279d9a2c2c59e2ea53c46 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 23 Jan 2024 14:15:14 -0800
Subject: [PATCH 1469/2068] Fix an oversight from the merge conflict earlier.

---
 .../java/com/diffplug/spotless/kotlin/DiktatStep.java     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
index b3cfa88c1a..425786d64e 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
@@ -71,8 +71,14 @@ public static FormatterStep create(String versionDiktat, Provisioner provisioner
 		}
 		Objects.requireNonNull(versionDiktat, "versionDiktat");
 		Objects.requireNonNull(provisioner, "provisioner");
+		final String diktatCoordinate;
+		if (BadSemver.version(versionDiktat) >= BadSemver.version(PACKAGE_RELOCATED_VERSION)) {
+			diktatCoordinate = MAVEN_COORDINATE + versionDiktat;
+		} else {
+			diktatCoordinate = MAVEN_COORDINATE_PRE_2_0_0 + versionDiktat;
+		}
 		return FormatterStep.create(NAME,
-				new DiktatStep(JarState.promise(() -> JarState.from(MAVEN_COORDINATE + versionDiktat, provisioner)), versionDiktat, isScript, config),
+				new DiktatStep(JarState.promise(() -> JarState.from(diktatCoordinate, provisioner)), versionDiktat, isScript, config),
 				DiktatStep::equalityState, State::createFormat);
 	}
 

From 5833a2bb59f49d4be5b72cf7933cb632dc035117 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 23 Jan 2024 14:59:40 -0800
Subject: [PATCH 1470/2068] Our special tests got into a terrible state where
 some were capitalized and others weren't. They shold all be the same.

---
 gradle/special-tests.gradle                          | 12 ++++++------
 .../java/com/diffplug/spotless/tag/BlackTest.java    |  4 ++--
 .../main/java/com/diffplug/spotless/tag/BufTest.java |  4 ++--
 .../java/com/diffplug/spotless/tag/ClangTest.java    |  4 ++--
 .../main/java/com/diffplug/spotless/tag/NpmTest.java |  4 ++--
 .../java/com/diffplug/spotless/tag/ShfmtTest.java    |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/gradle/special-tests.gradle b/gradle/special-tests.gradle
index 8d9004a709..8721f1e22d 100644
--- a/gradle/special-tests.gradle
+++ b/gradle/special-tests.gradle
@@ -2,12 +2,12 @@ apply plugin: 'com.adarshr.test-logger'
 
 // See com.diffplug.spotless.tag package for available JUnit 5 @Tag annotations
 def special = [
-	'Black',
-	'Buf',
-	'Clang',
+	'black',
+	'buf',
+	'clang',
 	'gofmt',
-	'Npm',
-	'Shfmt'
+	'npm',
+	'shfmt'
 ]
 
 boolean isCiServer = System.getenv().containsKey("CI")
@@ -31,7 +31,7 @@ tasks.named('test').configure {
 	}
 }
 special.forEach { tag ->
-	tasks.register("test${tag}", Test) {
+	tasks.register("test${tag.capitalize()}", Test) {
 		useJUnitPlatform { includeTags tag }
 	}
 }
diff --git a/testlib/src/main/java/com/diffplug/spotless/tag/BlackTest.java b/testlib/src/main/java/com/diffplug/spotless/tag/BlackTest.java
index 3d76499ea5..d0b34be10b 100644
--- a/testlib/src/main/java/com/diffplug/spotless/tag/BlackTest.java
+++ b/testlib/src/main/java/com/diffplug/spotless/tag/BlackTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2021-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,5 +26,5 @@
 
 @Target({TYPE, METHOD})
 @Retention(RUNTIME)
-@Tag("Black")
+@Tag("black")
 public @interface BlackTest {}
diff --git a/testlib/src/main/java/com/diffplug/spotless/tag/BufTest.java b/testlib/src/main/java/com/diffplug/spotless/tag/BufTest.java
index 90f32ec6c3..19923f4c6d 100644
--- a/testlib/src/main/java/com/diffplug/spotless/tag/BufTest.java
+++ b/testlib/src/main/java/com/diffplug/spotless/tag/BufTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 DiffPlug
+ * Copyright 2022-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,5 +26,5 @@
 
 @Target({TYPE, METHOD})
 @Retention(RUNTIME)
-@Tag("Buf")
+@Tag("buf")
 public @interface BufTest {}
diff --git a/testlib/src/main/java/com/diffplug/spotless/tag/ClangTest.java b/testlib/src/main/java/com/diffplug/spotless/tag/ClangTest.java
index 6eb9ee386e..e9f893bdfe 100644
--- a/testlib/src/main/java/com/diffplug/spotless/tag/ClangTest.java
+++ b/testlib/src/main/java/com/diffplug/spotless/tag/ClangTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2021-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,5 +26,5 @@
 
 @Target({TYPE, METHOD})
 @Retention(RUNTIME)
-@Tag("Clang")
+@Tag("clang")
 public @interface ClangTest {}
diff --git a/testlib/src/main/java/com/diffplug/spotless/tag/NpmTest.java b/testlib/src/main/java/com/diffplug/spotless/tag/NpmTest.java
index a1a6420b42..4f19ce3dfe 100644
--- a/testlib/src/main/java/com/diffplug/spotless/tag/NpmTest.java
+++ b/testlib/src/main/java/com/diffplug/spotless/tag/NpmTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2021-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,5 +26,5 @@
 
 @Target({TYPE, METHOD})
 @Retention(RUNTIME)
-@Tag("Npm")
+@Tag("npm")
 public @interface NpmTest {}
diff --git a/testlib/src/main/java/com/diffplug/spotless/tag/ShfmtTest.java b/testlib/src/main/java/com/diffplug/spotless/tag/ShfmtTest.java
index efea44ec07..e7998f6a83 100644
--- a/testlib/src/main/java/com/diffplug/spotless/tag/ShfmtTest.java
+++ b/testlib/src/main/java/com/diffplug/spotless/tag/ShfmtTest.java
@@ -26,5 +26,5 @@
 
 @Target({TYPE, METHOD})
 @Retention(RUNTIME)
-@Tag("Shfmt")
+@Tag("shfmt")
 public @interface ShfmtTest {}

From f5762675552fd9cd725cbd2341341aecd3fa94b9 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 23 Jan 2024 15:52:25 -0800
Subject: [PATCH 1471/2068] Add back the method we removed before, because it
 avoids IOExceptions.

---
 lib/src/main/java/com/diffplug/spotless/FileSignature.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/src/main/java/com/diffplug/spotless/FileSignature.java b/lib/src/main/java/com/diffplug/spotless/FileSignature.java
index d6a23a8fd1..10bba7a716 100644
--- a/lib/src/main/java/com/diffplug/spotless/FileSignature.java
+++ b/lib/src/main/java/com/diffplug/spotless/FileSignature.java
@@ -121,6 +121,10 @@ public Promised asPromise() {
 		return new Promised(files, this);
 	}
 
+	public static Promised promise(Iterable<File> files) {
+		return new Promised(MoreIterables.toNullHostileList(files), null);
+	}
+
 	/** Returns all of the files in this signature, throwing an exception if there are more or less than 1 file. */
 	public Collection<File> files() {
 		return Collections.unmodifiableList(files);

From 99eebec05c26294a0e3a90255728854698e618ef Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 23 Jan 2024 15:52:35 -0800
Subject: [PATCH 1472/2068] Fix copyright headers.

---
 .../com/diffplug/spotless/extra/EquoBasedStepBuilder.java     | 4 ++--
 .../spotless/extra/cpp/EclipseCdtFormatterStepTest.java       | 2 +-
 .../diffplug/spotless/extra/eclipse/EquoResourceHarness.java  | 2 +-
 .../spotless/extra/groovy/GrEclipseFormatterStepTest.java     | 2 +-
 .../spotless/extra/java/EclipseJdtFormatterStepTest.java      | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

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 95fd08fb90..eaedfb55d3 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -113,7 +113,7 @@ public FormatterStep build() {
 			}
 			var classpath = new ArrayList<File>();
 			var mavenDeps = new ArrayList<String>();
-			mavenDeps.add("dev.equo.ide:solstice:1.7.4");
+			mavenDeps.add("dev.equo.ide:solstice:1.7.5");
 			mavenDeps.add("com.diffplug.durian:durian-swt.os:4.2.0");
 			mavenDeps.addAll(query.getJarsOnMavenCentral());
 			classpath.addAll(mavenProvisioner.provisionWithTransitives(false, mavenDeps));
diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStepTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStepTest.java
index a548d3077b..144310b654 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStepTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/eclipse/EquoResourceHarness.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/eclipse/EquoResourceHarness.java
index 0cb2e4c700..185bbd1326 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/eclipse/EquoResourceHarness.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/eclipse/EquoResourceHarness.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepTest.java
index b5d294e71c..7bfddc8e1c 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepTest.java
index 5567a590c0..dbbfdb04a0 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 6b3e692c6d175c436654a54bae13061b88d41a94 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 23 Jan 2024 16:03:15 -0800
Subject: [PATCH 1473/2068] spotlessApply

---
 .../diffplug/spotless/extra/eclipse/EclipseResourceHarness.java | 2 +-
 .../spotless/extra/wtp/EclipseWtpFormatterStepTest.java         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/eclipse/EclipseResourceHarness.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/eclipse/EclipseResourceHarness.java
index 9023aa6300..cd4bebd390 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/eclipse/EclipseResourceHarness.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/eclipse/EclipseResourceHarness.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterStepTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterStepTest.java
index be2f874084..e4a2b7cc0e 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterStepTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 5fe9d1269ce4a5c3f6a4eb892b7752c190f71a25 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 23 Jan 2024 19:26:17 -0800
Subject: [PATCH 1474/2068] Copyright headers

---
 .../spotless/extra/integration/DiffMessageFormatter.java        | 2 +-
 .../glue/diktat/compat/DiktatCompat1Dot2Dot5Adapter.java        | 2 +-
 .../glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java        | 2 +-
 .../spotless/glue/diktat/compat/DiktatCompatAdapter.java        | 2 +-
 .../diffplug/spotless/glue/diktat/compat/DiktatReporting.java   | 2 +-
 .../com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java  | 2 +-
 lib/src/main/java/com/diffplug/spotless/ForeignExe.java         | 2 +-
 .../main/java/com/diffplug/spotless/cpp/ClangFormatStep.java    | 2 +-
 lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java  | 2 +-
 .../main/java/com/diffplug/spotless/generic/PipeStepPair.java   | 2 +-
 lib/src/main/java/com/diffplug/spotless/python/BlackStep.java   | 2 +-
 .../main/java/com/diffplug/gradle/spotless/FormatExtension.java | 2 +-
 .../com/diffplug/gradle/spotless/GradleIntegrationHarness.java  | 2 +-
 .../main/java/com/diffplug/spotless/maven/FormatterFactory.java | 2 +-
 .../java/com/diffplug/spotless/maven/SpotlessCheckMojo.java     | 2 +-
 .../java/com/diffplug/spotless/maven/generic/ToggleOffOn.java   | 2 +-
 .../diffplug/spotless/combined/CombinedJavaFormatStepTest.java  | 2 +-
 .../test/java/com/diffplug/spotless/generic/FenceStepTest.java  | 2 +-
 .../test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java  | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/integration/DiffMessageFormatter.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/integration/DiffMessageFormatter.java
index 9294055a4f..7610514184 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/integration/DiffMessageFormatter.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/integration/DiffMessageFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/compatDiktat1Dot2Dot5/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat1Dot2Dot5Adapter.java b/lib/src/compatDiktat1Dot2Dot5/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat1Dot2Dot5Adapter.java
index 749d0a1f61..b340d2ffbb 100644
--- a/lib/src/compatDiktat1Dot2Dot5/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat1Dot2Dot5Adapter.java
+++ b/lib/src/compatDiktat1Dot2Dot5/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat1Dot2Dot5Adapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java b/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java
index 5b264a46ed..30f1d441e3 100644
--- a/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java
+++ b/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompatAdapter.java b/lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompatAdapter.java
index fdc6e77afa..567684138f 100644
--- a/lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompatAdapter.java
+++ b/lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompatAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatReporting.java b/lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatReporting.java
index fdc7e56614..bcecb884b6 100644
--- a/lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatReporting.java
+++ b/lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatReporting.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java b/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java
index 1f1c15c97d..44fd4571de 100644
--- a/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java
+++ b/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 DiffPlug
+ * Copyright 2021-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/main/java/com/diffplug/spotless/ForeignExe.java b/lib/src/main/java/com/diffplug/spotless/ForeignExe.java
index 3deaf7cb55..43846a2c9e 100644
--- a/lib/src/main/java/com/diffplug/spotless/ForeignExe.java
+++ b/lib/src/main/java/com/diffplug/spotless/ForeignExe.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 DiffPlug
+ * Copyright 2020-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/main/java/com/diffplug/spotless/cpp/ClangFormatStep.java b/lib/src/main/java/com/diffplug/spotless/cpp/ClangFormatStep.java
index 17c516594c..345ac723c3 100644
--- a/lib/src/main/java/com/diffplug/spotless/cpp/ClangFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/cpp/ClangFormatStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 DiffPlug
+ * Copyright 2020-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java b/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
index 7f280f98a8..cbfe016679 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 DiffPlug
+ * Copyright 2020-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/main/java/com/diffplug/spotless/generic/PipeStepPair.java b/lib/src/main/java/com/diffplug/spotless/generic/PipeStepPair.java
index 6ffa204eec..b15cb0ca54 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/PipeStepPair.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/PipeStepPair.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 DiffPlug
+ * Copyright 2020-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/main/java/com/diffplug/spotless/python/BlackStep.java b/lib/src/main/java/com/diffplug/spotless/python/BlackStep.java
index 364b24bc3f..9fe26cdae8 100644
--- a/lib/src/main/java/com/diffplug/spotless/python/BlackStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/python/BlackStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 DiffPlug
+ * Copyright 2020-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index 6e66545365..e0c0473737 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
index 417bc23b52..4441b90c7a 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java
index 7294057d39..6393c65858 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java
index cc83b3f3c9..6e3561f984 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/ToggleOffOn.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/ToggleOffOn.java
index 81ad79083f..984a82601f 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/ToggleOffOn.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/ToggleOffOn.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 DiffPlug
+ * Copyright 2020-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/testlib/src/test/java/com/diffplug/spotless/combined/CombinedJavaFormatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/combined/CombinedJavaFormatStepTest.java
index 90b9956892..8d91d7ca6e 100644
--- a/testlib/src/test/java/com/diffplug/spotless/combined/CombinedJavaFormatStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/combined/CombinedJavaFormatStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java b/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java
index f58110b2c5..17159ae5a4 100644
--- a/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 DiffPlug
+ * Copyright 2020-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
index 9976fe0e84..6c029d8fe5 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 DiffPlug
+ * Copyright 2021-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 2d477fb919752e7712c9b84ce14bec12fadd43c8 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 23 Jan 2024 19:31:47 -0800
Subject: [PATCH 1475/2068] Copyright headers.

---
 lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java  | 2 +-
 .../main/java/com/diffplug/spotless/generic/PipeStepPair.java   | 2 +-
 .../main/java/com/diffplug/gradle/spotless/FormatExtension.java | 2 +-
 .../main/java/com/diffplug/spotless/maven/FormatterFactory.java | 2 +-
 .../java/com/diffplug/spotless/maven/generic/ToggleOffOn.java   | 2 +-
 .../diffplug/spotless/combined/CombinedJavaFormatStepTest.java  | 2 +-
 .../test/java/com/diffplug/spotless/generic/FenceStepTest.java  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java b/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
index 7f280f98a8..cbfe016679 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 DiffPlug
+ * Copyright 2020-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/main/java/com/diffplug/spotless/generic/PipeStepPair.java b/lib/src/main/java/com/diffplug/spotless/generic/PipeStepPair.java
index 6ffa204eec..b15cb0ca54 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/PipeStepPair.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/PipeStepPair.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 DiffPlug
+ * Copyright 2020-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index 6e66545365..e0c0473737 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java
index 7294057d39..6393c65858 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/ToggleOffOn.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/ToggleOffOn.java
index 81ad79083f..984a82601f 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/ToggleOffOn.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/ToggleOffOn.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 DiffPlug
+ * Copyright 2020-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/testlib/src/test/java/com/diffplug/spotless/combined/CombinedJavaFormatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/combined/CombinedJavaFormatStepTest.java
index 90b9956892..8d91d7ca6e 100644
--- a/testlib/src/test/java/com/diffplug/spotless/combined/CombinedJavaFormatStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/combined/CombinedJavaFormatStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java b/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java
index f58110b2c5..17159ae5a4 100644
--- a/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 DiffPlug
+ * Copyright 2020-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 62aecadaf030c3c059345a18c09498f3bc17b32c Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 23 Jan 2024 19:35:47 -0800
Subject: [PATCH 1476/2068] Small update to the changelog.

---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index 5af6d41b63..cb8bf9706e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -14,6 +14,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * `FileSignature.Promised` and `JarState.Promised` to facilitate round-trip serialization for the Gradle configuration cache. ([#1945](https://github.com/diffplug/spotless/pull/1945)) 
 ### Removed
 * **BREAKING** Remove `JarState.getMavenCoordinate(String prefix)`. ([#1945](https://github.com/diffplug/spotless/pull/1945))
+* **BREAKING** Replace `PipeStepPair` with `FenceStep`. ([#1954](https://github.com/diffplug/spotless/pull/1954))
 ### Fixed
 * Ignore system git config when running tests ([#1990](https://github.com/diffplug/spotless/issues/1990))
 

From 43e8093cf61507685abfc0e6a072f5de1ca1737f Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sat, 27 Jan 2024 12:23:13 +0800
Subject: [PATCH 1477/2068] Use gradle/actions/setup-gradle v3

https://github.com/gradle/gradle-build-action/releases/tag/v3.0.0-rc.1
---
 .github/workflows/changelog-print.yml | 2 +-
 .github/workflows/ci.yml              | 4 ++--
 .github/workflows/deploy.yml          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/changelog-print.yml b/.github/workflows/changelog-print.yml
index 01bbb88afa..e9b15ce5fc 100644
--- a/.github/workflows/changelog-print.yml
+++ b/.github/workflows/changelog-print.yml
@@ -16,7 +16,7 @@ jobs:
           java-version: 11
           distribution: 'temurin'
       - name: gradle caching
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
         with:
           gradle-home-cache-cleanup: true
       - run: ./gradlew changelogPrint
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e6c9d91b8c..6a767bc2bb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ jobs:
           distribution: "temurin"
           java-version: 11
       - name: gradle caching
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
         with:
           gradle-home-cache-cleanup: true
       - name: spotlessCheck
@@ -67,7 +67,7 @@ jobs:
           distribution: "temurin"
           java-version: ${{ matrix.jre }}
       - name: gradle caching
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
         with:
           gradle-home-cache-cleanup: true
       - name: build (maven-only)
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index e899a2d270..d5106c79a3 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -43,7 +43,7 @@ jobs:
           java-version: 11
           distribution: 'temurin'
       - name: gradle caching
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
         with:
           gradle-home-cache-cleanup: true
       - name: git fetch origin main

From bf5a7ca54c9e1c357446c7cbb5c9d7eb07b1828a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 28 Jan 2024 10:25:46 +0000
Subject: [PATCH 1478/2068] Update dependency com.vladsch.flexmark:flexmark-all
 to v0.64.8

---
 lib/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 738e2975fc..b1174b6bb7 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -88,7 +88,7 @@ dependencies {
 	// diktat latest supported version 2.x
 	compatDiktat2Dot0Dot0CompileOnly "com.saveourtool.diktat:diktat-runner:2.0.0"
 	// flexmark
-	flexmarkCompileOnly 'com.vladsch.flexmark:flexmark-all:0.64.0'
+	flexmarkCompileOnly 'com.vladsch.flexmark:flexmark-all:0.64.8'
 	// gherkin
 	gherkinCompileOnly 'io.cucumber:gherkin-utils:8.0.2'
 	gherkinCompileOnly 'org.slf4j:slf4j-api:2.0.0'

From 6d04f189735f9ddec4a62afa9380f7b81b7b65dc Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Wed, 31 Jan 2024 22:39:23 +0800
Subject: [PATCH 1479/2068] Add RoundedStep

---
 .../extra/EclipseBasedStepBuilder.java        |  3 ++-
 .../spotless/extra/EquoBasedStepBuilder.java  |  3 ++-
 .../com/diffplug/spotless/RoundedStep.java    | 20 +++++++++++++++++++
 .../diffplug/spotless/generic/IndentStep.java |  5 ++---
 .../diffplug/spotless/kotlin/DiktatStep.java  |  2 +-
 5 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/RoundedStep.java

diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/EclipseBasedStepBuilder.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/EclipseBasedStepBuilder.java
index 0dff3f6898..3e43e49d37 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/EclipseBasedStepBuilder.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/EclipseBasedStepBuilder.java
@@ -33,6 +33,7 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
+import com.diffplug.spotless.RoundedStep;
 import com.diffplug.spotless.SerializedFunction;
 
 /**
@@ -126,7 +127,7 @@ public void setPreferences(Iterable<File> settingsFiles) {
 		this.settingsFiles = settingsFiles;
 	}
 
-	static class EclipseStep implements Serializable {
+	static class EclipseStep implements RoundedStep {
 		private static final long serialVersionUID = 1;
 		private final String semanticVersion;
 		private final String formatterStepExt;
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 eaedfb55d3..e2b3661d9b 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
@@ -34,6 +34,7 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
+import com.diffplug.spotless.RoundedStep;
 import com.diffplug.spotless.SerializedFunction;
 
 import dev.equo.solstice.NestedJars;
@@ -149,7 +150,7 @@ private P2Model createModelWithMirrors() {
 		return model;
 	}
 
-	static class EquoStep implements Serializable {
+	static class EquoStep implements RoundedStep {
 		private static final long serialVersionUID = 1;
 		private final String semanticVersion;
 		private final FileSignature.Promised settingsPromise;
diff --git a/lib/src/main/java/com/diffplug/spotless/RoundedStep.java b/lib/src/main/java/com/diffplug/spotless/RoundedStep.java
new file mode 100644
index 0000000000..8b346273c4
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/RoundedStep.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless;
+
+import java.io.Serializable;
+
+public interface RoundedStep extends Serializable {}
diff --git a/lib/src/main/java/com/diffplug/spotless/generic/IndentStep.java b/lib/src/main/java/com/diffplug/spotless/generic/IndentStep.java
index 91155b1a79..1bd7454c14 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/IndentStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/IndentStep.java
@@ -15,14 +15,13 @@
  */
 package com.diffplug.spotless.generic;
 
-import java.io.Serializable;
-
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.RoundedStep;
 import com.diffplug.spotless.SerializedFunction;
 
 /** Simple step which checks for consistent indentation characters. */
-public final class IndentStep implements Serializable {
+public final class IndentStep implements RoundedStep {
 	private static final long serialVersionUID = 1L;
 
 	final Type type;
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
index 425786d64e..d1803b16a8 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
@@ -26,7 +26,7 @@
 import com.diffplug.spotless.*;
 
 /** Wraps up <a href="https://github.com/cqfn/diKTat">diktat</a> as a FormatterStep. */
-public class DiktatStep implements Serializable {
+public class DiktatStep implements RoundedStep {
 	private static final long serialVersionUID = 1L;
 	private final JarState.Promised jarState;
 	private final String versionDiktat;

From 4e10fd47eed24c248e3036c2cc3d13f0f0b88f48 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Wed, 31 Jan 2024 22:21:22 +0800
Subject: [PATCH 1480/2068] Make KtLintStep round-trippable

---
 .../diffplug/spotless/kotlin/KtLintStep.java  | 46 +++++++++++++------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index 6a5374bd68..f76e7763f4 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -15,7 +15,6 @@
  */
 package com.diffplug.spotless.kotlin;
 
-import java.io.IOException;
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
 import java.util.Collections;
@@ -33,17 +32,32 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
+import com.diffplug.spotless.RoundedStep;
 
 /** Wraps up <a href="https://github.com/pinterest/ktlint">ktlint</a> as a FormatterStep. */
-public class KtLintStep {
-	// prevent direct instantiation
-	private KtLintStep() {}
-
+public class KtLintStep implements RoundedStep {
+	private static final long serialVersionUID = 1L;
 	private static final String DEFAULT_VERSION = "1.1.1";
 	private static final String NAME = "ktlint";
 	private static final String MAVEN_COORDINATE_0_DOT = "com.pinterest:ktlint:";
 	private static final String MAVEN_COORDINATE_1_DOT = "com.pinterest.ktlint:ktlint-cli:";
 
+	private final JarState.Promised jarState;
+	@Nullable
+	private final FileSignature.Promised config;
+	private final Map<String, Object> editorConfigOverride;
+	private final String version;
+
+	private KtLintStep(String version,
+			JarState.Promised jarState,
+			@Nullable FileSignature config,
+			Map<String, Object> editorConfigOverride) {
+		this.version = version;
+		this.jarState = jarState;
+		this.config = config != null ? config.asPromise() : null;
+		this.editorConfigOverride = editorConfigOverride;
+	}
+
 	public static FormatterStep create(Provisioner provisioner) {
 		return create(defaultVersion(), provisioner);
 	}
@@ -59,8 +73,12 @@ public static FormatterStep create(String version,
 			List<String> customRuleSets) {
 		Objects.requireNonNull(version, "version");
 		Objects.requireNonNull(provisioner, "provisioner");
-		return FormatterStep.createLazy(NAME,
-				() -> new State(version, provisioner, editorConfig, editorConfigOverride, customRuleSets),
+		String ktlintCoordinate = (version.startsWith("0.") ? MAVEN_COORDINATE_0_DOT : MAVEN_COORDINATE_1_DOT) + version;
+		Set<String> mavenCoordinates = new HashSet<>(customRuleSets);
+		mavenCoordinates.add(ktlintCoordinate);
+		return FormatterStep.create(NAME,
+				new KtLintStep(version, JarState.promise(() -> JarState.from(mavenCoordinates, provisioner)), editorConfig, editorConfigOverride),
+				KtLintStep::equalityState,
 				State::createFormat);
 	}
 
@@ -68,6 +86,10 @@ public static String defaultVersion() {
 		return DEFAULT_VERSION;
 	}
 
+	private State equalityState() {
+		return new State(version, jarState.get(), config != null ? config.get() : null, editorConfigOverride);
+	}
+
 	private static final class State implements Serializable {
 		private static final long serialVersionUID = 1L;
 		/** The jar that contains the formatter. */
@@ -78,16 +100,12 @@ private static final class State implements Serializable {
 		private final FileSignature editorConfigPath;
 
 		State(String version,
-				Provisioner provisioner,
+				JarState jarState,
 				@Nullable FileSignature editorConfigPath,
-				Map<String, Object> editorConfigOverride,
-				List<String> customRuleSets) throws IOException {
+				Map<String, Object> editorConfigOverride) {
 			this.version = version;
+			this.jarState = jarState;
 			this.editorConfigOverride = new TreeMap<>(editorConfigOverride);
-			String ktlintCoordinate = (version.startsWith("0.") ? MAVEN_COORDINATE_0_DOT : MAVEN_COORDINATE_1_DOT) + version;
-			Set<String> mavenCoordinates = new HashSet<>(customRuleSets);
-			mavenCoordinates.add(ktlintCoordinate);
-			this.jarState = JarState.from(mavenCoordinates, provisioner);
 			this.editorConfigPath = editorConfigPath;
 		}
 

From 6e6ceaa19531a906147f291f4be472a6145d7a98 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Wed, 31 Jan 2024 23:20:54 +0800
Subject: [PATCH 1481/2068] Make KtfmtStep round-trippable

---
 .../diffplug/spotless/kotlin/KtfmtStep.java   | 79 +++++++++++--------
 1 file changed, 48 insertions(+), 31 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
index cf9a2dd231..768cd335cf 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 
 import static com.diffplug.spotless.kotlin.KtfmtStep.Style.DEFAULT;
 
-import java.io.IOException;
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -30,19 +29,38 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
+import com.diffplug.spotless.RoundedStep;
 import com.diffplug.spotless.ThrowingEx;
 
 /**
  * Wraps up <a href="https://github.com/facebookincubator/ktfmt">ktfmt</a> as a FormatterStep.
  */
-public class KtfmtStep {
-	// prevent direct instantiation
-	private KtfmtStep() {}
-
+public class KtfmtStep implements RoundedStep {
+	private static final long serialVersionUID = 1L;
 	private static final String DEFAULT_VERSION = "0.46";
-	static final String NAME = "ktfmt";
-	static final String PACKAGE = "com.facebook";
-	static final String MAVEN_COORDINATE = PACKAGE + ":ktfmt:";
+	private static final String NAME = "ktfmt";
+	private static final String MAVEN_COORDINATE = "com.facebook:ktfmt:";
+
+	private final String version;
+	/**
+	 * Option that allows to apply formatting options to perform a 4-space block and continuation indent.
+	 */
+	@Nullable
+	private final Style style;
+	@Nullable
+	private final KtfmtFormattingOptions options;
+	/** The jar that contains the formatter. */
+	private final JarState.Promised jarState;
+
+	private KtfmtStep(String version,
+			JarState.Promised jarState,
+			@Nullable Style style,
+			@Nullable KtfmtFormattingOptions options) {
+		this.version = Objects.requireNonNull(version, "version");
+		this.style = style;
+		this.options = options;
+		this.jarState = Objects.requireNonNull(jarState, "jarState");
+	}
 
 	/**
 	 * Used to allow multiple style option through formatting options and since when is each of them available.
@@ -136,39 +154,38 @@ public static FormatterStep create(String version, Provisioner provisioner) {
 	public static FormatterStep create(String version, Provisioner provisioner, @Nullable Style style, @Nullable KtfmtFormattingOptions options) {
 		Objects.requireNonNull(version, "version");
 		Objects.requireNonNull(provisioner, "provisioner");
-		return FormatterStep.createLazy(
-				NAME, () -> new State(version, provisioner, style, options), State::createFormat);
+		return FormatterStep.create(NAME,
+				new KtfmtStep(version, JarState.promise(() -> JarState.from(MAVEN_COORDINATE + version, provisioner)), style, options),
+				KtfmtStep::equalityState,
+				State::createFormat);
 	}
 
 	public static String defaultVersion() {
 		return DEFAULT_VERSION;
 	}
 
-	static final class State implements Serializable {
-		private static final long serialVersionUID = 1L;
+	private State equalityState() {
+		return new State(version, jarState.get(), style, options);
+	}
 
+	private static final class State implements Serializable {
+		private static final long serialVersionUID = 1L;
+		private static final String PACKAGE = "com.facebook.ktfmt";
 		private final String version;
-
-		private final String pkg;
-		/**
-		 * Option that allows to apply formatting options to perform a 4 spaces block and continuation indent.
-		 */
 		@Nullable
 		private final Style style;
-		/**
-		 *
-		 */
 		@Nullable
 		private final KtfmtFormattingOptions options;
-		/** The jar that contains the formatter. */
-		final JarState jarState;
+		private final JarState jarState;
 
-		State(String version, Provisioner provisioner, @Nullable Style style, @Nullable KtfmtFormattingOptions options) throws IOException {
+		State(String version,
+				JarState jarState,
+				@Nullable Style style,
+				@Nullable KtfmtFormattingOptions options) {
 			this.version = version;
 			this.options = options;
-			this.pkg = PACKAGE;
 			this.style = style;
-			this.jarState = JarState.from(MAVEN_COORDINATE + version, provisioner);
+			this.jarState = jarState;
 		}
 
 		FormatterFunc createFormat() throws Exception {
@@ -259,7 +276,7 @@ private Object getCustomFormattingOptions(ClassLoader classLoader, Style style)
 
 			// fallback to old, pre-0.19 ktfmt interface.
 			if (style == Style.DEFAULT || style == Style.DROPBOX) {
-				Class<?> formattingOptionsCompanionClazz = classLoader.loadClass(pkg + ".ktfmt.FormattingOptions$Companion");
+				Class<?> formattingOptionsCompanionClazz = classLoader.loadClass(PACKAGE + ".FormattingOptions$Companion");
 				Object companion = formattingOptionsCompanionClazz.getConstructors()[0].newInstance((Object) null);
 				Method formattingOptionsMethod = formattingOptionsCompanionClazz.getDeclaredMethod("dropboxStyle");
 				return formattingOptionsMethod.invoke(companion);
@@ -271,9 +288,9 @@ private Object getCustomFormattingOptions(ClassLoader classLoader, Style style)
 		private Class<?> getFormatterClazz(ClassLoader classLoader) throws Exception {
 			Class<?> formatterClazz;
 			if (BadSemver.version(version) >= BadSemver.version(0, 31)) {
-				formatterClazz = classLoader.loadClass(pkg + ".ktfmt.format.Formatter");
+				formatterClazz = classLoader.loadClass(PACKAGE + ".format.Formatter");
 			} else {
-				formatterClazz = classLoader.loadClass(pkg + ".ktfmt.FormatterKt");
+				formatterClazz = classLoader.loadClass(PACKAGE + ".FormatterKt");
 			}
 			return formatterClazz;
 		}
@@ -281,9 +298,9 @@ private Class<?> getFormatterClazz(ClassLoader classLoader) throws Exception {
 		private Class<?> getFormattingOptionsClazz(ClassLoader classLoader) throws Exception {
 			Class<?> formattingOptionsClazz;
 			if (BadSemver.version(version) >= BadSemver.version(0, 31)) {
-				formattingOptionsClazz = classLoader.loadClass(pkg + ".ktfmt.format.FormattingOptions");
+				formattingOptionsClazz = classLoader.loadClass(PACKAGE + ".format.FormattingOptions");
 			} else {
-				formattingOptionsClazz = classLoader.loadClass(pkg + ".ktfmt.FormattingOptions");
+				formattingOptionsClazz = classLoader.loadClass(PACKAGE + ".FormattingOptions");
 			}
 			return formattingOptionsClazz;
 		}

From 37428703bde4abb78bb0802d1ce1f23959799d79 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Thu, 1 Feb 2024 12:27:17 +0800
Subject: [PATCH 1482/2068] Make ScalaFmtStep round-trippable

---
 .../diffplug/spotless/scala/ScalaFmtStep.java | 36 +++++++++++++------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java b/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java
index 114f4a9f1a..1f7eaf2ba9 100644
--- a/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,17 +28,26 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
+import com.diffplug.spotless.RoundedStep;
 
 /** Wraps up <a href="https://github.com/scalameta/scalafmt">scalafmt</a> as a FormatterStep. */
-public class ScalaFmtStep {
-	// prevent direct instantiation
-	private ScalaFmtStep() {}
+public class ScalaFmtStep implements RoundedStep {
+	private static final long serialVersionUID = 1L;
 
 	static final String DEFAULT_VERSION = "3.7.3";
 
 	private static final String DEFAULT_SCALA_MAJOR_VERSION = "2.13";
-	static final String NAME = "scalafmt";
-	static final String MAVEN_COORDINATE = "org.scalameta:scalafmt-core_";
+	private static final String NAME = "scalafmt";
+	private static final String MAVEN_COORDINATE = "org.scalameta:scalafmt-core_";
+
+	private final JarState.Promised jarState;
+	@Nullable
+	private final File configFile;
+
+	private ScalaFmtStep(JarState.Promised jarState, @Nullable File configFile) {
+		this.jarState = jarState;
+		this.configFile = configFile;
+	}
 
 	public static FormatterStep create(Provisioner provisioner) {
 		return create(defaultVersion(), defaultScalaMajorVersion(), provisioner, null);
@@ -51,8 +60,9 @@ public static FormatterStep create(String version, Provisioner provisioner, @Nul
 	public static FormatterStep create(String version, @Nullable String scalaMajorVersion, Provisioner provisioner, @Nullable File configFile) {
 		String finalScalaMajorVersion = scalaMajorVersion == null ? DEFAULT_SCALA_MAJOR_VERSION : scalaMajorVersion;
 
-		return FormatterStep.createLazy(NAME,
-				() -> new State(JarState.from(MAVEN_COORDINATE + finalScalaMajorVersion + ":" + version, provisioner), configFile),
+		return FormatterStep.create(NAME,
+				new ScalaFmtStep(JarState.promise(() -> JarState.from(MAVEN_COORDINATE + finalScalaMajorVersion + ":" + version, provisioner)), configFile),
+				ScalaFmtStep::equalityState,
 				State::createFormat);
 	}
 
@@ -64,11 +74,15 @@ public static String defaultScalaMajorVersion() {
 		return DEFAULT_SCALA_MAJOR_VERSION;
 	}
 
-	static final class State implements Serializable {
+	private State equalityState() throws IOException {
+		return new State(jarState.get(), configFile);
+	}
+
+	private static final class State implements Serializable {
 		private static final long serialVersionUID = 1L;
 
-		final JarState jarState;
-		final FileSignature configSignature;
+		private final JarState jarState;
+		private final FileSignature configSignature;
 
 		State(JarState jarState, @Nullable File configFile) throws IOException {
 			this.jarState = jarState;

From f86c26861b0463c568b0a745acddcdba0290c138 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Thu, 1 Feb 2024 12:07:54 +0800
Subject: [PATCH 1483/2068] Make PalantirJavaFormatStep round-trippable

---
 .../spotless/java/PalantirJavaFormatStep.java | 36 ++++++++++++++-----
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
index a670a6fea7..a41811b57a 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
@@ -23,16 +23,32 @@
 
 /** Wraps up <a href="https://github.com/palantir/palantir-java-format">palantir-java-format</a> fork of
  * <a href="https://github.com/google/google-java-format">google-java-format</a> as a FormatterStep. */
-public class PalantirJavaFormatStep {
-	// prevent direct instantiation
-	private PalantirJavaFormatStep() {}
-
+public class PalantirJavaFormatStep implements RoundedStep {
+	private static final long serialVersionUID = 1L;
 	private static final boolean DEFAULT_FORMAT_JAVADOC = false;
 	private static final String DEFAULT_STYLE = "PALANTIR";
 	private static final String NAME = "palantir-java-format";
 	public static final String MAVEN_COORDINATE = "com.palantir.javaformat:palantir-java-format:";
 	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(8, "1.1.0").add(11, "2.28.0").add(21, "2.39.0");
 
+	/** The jar that contains the formatter. */
+	private final JarState.Promised jarState;
+	/** Version of the formatter jar. */
+	private final String formatterVersion;
+	private final String style;
+	/** Whether to format Java docs. */
+	private final boolean formatJavadoc;
+
+	private PalantirJavaFormatStep(JarState.Promised jarState,
+			String formatterVersion,
+			String style,
+			boolean formatJavadoc) {
+		this.jarState = jarState;
+		this.formatterVersion = formatterVersion;
+		this.style = style;
+		this.formatJavadoc = formatJavadoc;
+	}
+
 	/** Creates a step which formats everything - code, import order, and unused imports. */
 	public static FormatterStep create(Provisioner provisioner) {
 		return create(defaultVersion(), provisioner);
@@ -60,8 +76,9 @@ public static FormatterStep create(String version, String style, boolean formatJ
 		Objects.requireNonNull(style, "style");
 		Objects.requireNonNull(provisioner, "provisioner");
 
-		return FormatterStep.createLazy(NAME,
-				() -> new State(JarState.from(MAVEN_COORDINATE + version, provisioner), version, style, formatJavadoc),
+		return FormatterStep.create(NAME,
+				new PalantirJavaFormatStep(JarState.promise(() -> JarState.from(MAVEN_COORDINATE + version, provisioner)), version, style, formatJavadoc),
+				PalantirJavaFormatStep::equalityState,
 				State::createFormat);
 	}
 
@@ -80,15 +97,16 @@ public static boolean defaultFormatJavadoc() {
 		return DEFAULT_FORMAT_JAVADOC;
 	}
 
+	private State equalityState() {
+		return new State(jarState.get(), formatterVersion, style, formatJavadoc);
+	}
+
 	private static final class State implements Serializable {
 		private static final long serialVersionUID = 1L;
 
-		/** The jar that contains the formatter. */
 		private final JarState jarState;
-		/** Version of the formatter jar. */
 		private final String formatterVersion;
 		private final String style;
-		/** Whether to format Java docs. */
 		private final boolean formatJavadoc;
 
 		State(JarState jarState, String formatterVersion, String style, boolean formatJavadoc) {

From 2e7ef03845149ab0e92ceff81fea595ad935f3e1 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Thu, 1 Feb 2024 10:48:25 +0800
Subject: [PATCH 1484/2068] Make GoogleJavaFormatStep round-trippable

---
 .../spotless/java/GoogleJavaFormatStep.java   | 88 +++++++++++--------
 1 file changed, 51 insertions(+), 37 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
index d0312dcc1e..85460c6d27 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
@@ -24,18 +24,39 @@
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Jvm;
 import com.diffplug.spotless.Provisioner;
+import com.diffplug.spotless.RoundedStep;
 
 /** Wraps up <a href="https://github.com/google/google-java-format">google-java-format</a> as a FormatterStep. */
-public class GoogleJavaFormatStep {
-	// prevent direct instantiation
-	private GoogleJavaFormatStep() {}
-
+public class GoogleJavaFormatStep implements RoundedStep {
+	private static final long serialVersionUID = 1L;
 	private static final String DEFAULT_STYLE = "GOOGLE";
 	private static final boolean DEFAULT_REFLOW_LONG_STRINGS = false;
 	private static final boolean DEFAULT_REORDER_IMPORTS = false;
 	private static final boolean DEFAULT_FORMAT_JAVADOC = true;
-	static final String NAME = "google-java-format";
-	public static final String MAVEN_COORDINATE = "com.google.googlejavaformat:google-java-format";
+	private static final String NAME = "google-java-format";
+	private static final String MAVEN_COORDINATE = "com.google.googlejavaformat:google-java-format";
+
+	/** The jar that contains the formatter. */
+	private final JarState.Promised jarState;
+	private final String version;
+	private final String style;
+	private final boolean reflowLongStrings;
+	private final boolean reorderImports;
+	private final boolean formatJavadoc;
+
+	private GoogleJavaFormatStep(JarState.Promised jarState,
+			String version,
+			String style,
+			boolean reflowLongStrings,
+			boolean reorderImports,
+			boolean formatJavadoc) {
+		this.jarState = jarState;
+		this.version = version;
+		this.style = style;
+		this.reflowLongStrings = reflowLongStrings;
+		this.reorderImports = reorderImports;
+		this.formatJavadoc = formatJavadoc;
+	}
 
 	/** Creates a step which formats everything - code, import order, and unused imports. */
 	public static FormatterStep create(Provisioner provisioner) {
@@ -74,12 +95,13 @@ public static FormatterStep create(String groupArtifact, String version, String
 		Objects.requireNonNull(version, "version");
 		Objects.requireNonNull(style, "style");
 		Objects.requireNonNull(provisioner, "provisioner");
-		return FormatterStep.createLazy(NAME,
-				() -> new State(NAME, groupArtifact, version, style, provisioner, reflowLongStrings, reorderImports, formatJavadoc),
+		return FormatterStep.create(NAME,
+				new GoogleJavaFormatStep(JarState.promise(() -> JarState.from(groupArtifact + ":" + version, provisioner)), version, style, reflowLongStrings, reorderImports, formatJavadoc),
+				GoogleJavaFormatStep::equalityState,
 				State::createFormat);
 	}
 
-	static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME)
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME)
 			.addMin(11, "1.8") // we only support google-java-format >= 1.8 due to api changes
 			.addMin(16, "1.10.0") // java 16 requires at least 1.10.0 due to jdk api changes in JavaTokenizer
 			.addMin(21, "1.17.0") // java 21 requires at least 1.17.0 due to https://github.com/google/google-java-format/issues/898
@@ -91,7 +113,7 @@ public static String defaultGroupArtifact() {
 
 	/** Get default formatter version */
 	public static String defaultVersion() {
-		return JVM_SUPPORT.getRecommendedFormatterVersion();
+		return Objects.requireNonNull(JVM_SUPPORT.getRecommendedFormatterVersion());
 	}
 
 	public static String defaultStyle() {
@@ -110,39 +132,33 @@ public static boolean defaultFormatJavadoc() {
 		return DEFAULT_FORMAT_JAVADOC;
 	}
 
+	private State equalityState() {
+		return new State(version, style, jarState.get(), reflowLongStrings, reorderImports, formatJavadoc);
+	}
+
 	static final class State implements Serializable {
 		private static final long serialVersionUID = 1L;
 
-		/** The jar that contains the formatter. */
-		final JarState jarState;
-		final String stepName;
-		final String version;
-		final String style;
-		final boolean reflowLongStrings;
-		final boolean reorderImports;
-		final boolean formatJavadoc;
-
-		State(String stepName, String version, Provisioner provisioner) throws Exception {
-			this(stepName, version, DEFAULT_STYLE, provisioner);
-		}
+		private final JarState jarState;
+		private final String version;
+		private final String style;
+		private final boolean reflowLongStrings;
+		private final boolean reorderImports;
+		private final boolean formatJavadoc;
 
-		State(String stepName, String version, String style, Provisioner provisioner) throws Exception {
-			this(stepName, version, style, provisioner, DEFAULT_REFLOW_LONG_STRINGS);
+		State(String version, JarState jarState) {
+			this(version, DEFAULT_STYLE, jarState, DEFAULT_REFLOW_LONG_STRINGS, DEFAULT_REORDER_IMPORTS, DEFAULT_FORMAT_JAVADOC);
 		}
 
-		State(String stepName, String version, String style, Provisioner provisioner, boolean reflowLongStrings) throws Exception {
-			this(stepName, version, style, provisioner, reflowLongStrings, DEFAULT_REORDER_IMPORTS);
-		}
-
-		State(String stepName, String version, String style, Provisioner provisioner, boolean reflowLongStrings, boolean reorderImports) throws Exception {
-			this(stepName, MAVEN_COORDINATE, version, style, provisioner, reflowLongStrings, reorderImports, DEFAULT_FORMAT_JAVADOC);
-		}
-
-		State(String stepName, String groupArtifact, String version, String style, Provisioner provisioner, boolean reflowLongStrings, boolean reorderImports, boolean formatJavadoc) throws Exception {
+		State(String version,
+				String style,
+				JarState jarState,
+				boolean reflowLongStrings,
+				boolean reorderImports,
+				boolean formatJavadoc) {
 			JVM_SUPPORT.assertFormatterSupported(version);
 			ModuleHelper.doOpenInternalPackagesIfRequired();
-			this.jarState = JarState.from(groupArtifact + ":" + version, provisioner);
-			this.stepName = stepName;
+			this.jarState = jarState;
 			this.version = version;
 			this.style = style;
 			this.reflowLongStrings = reflowLongStrings;
@@ -167,7 +183,5 @@ FormatterFunc createRemoveUnusedImportsOnly() throws Exception {
 
 			return JVM_SUPPORT.suggestLaterVersionOnError(version, googleJavaFormatRemoveUnusedImporterFormatterFunc);
 		}
-
 	}
-
 }

From 4747a73b8aa41259c9a00e9d82a02eb8a27c1903 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Thu, 1 Feb 2024 11:05:24 +0800
Subject: [PATCH 1485/2068] Make CleanthatJavaStep round-trippable

---
 .../spotless/java/CleanthatJavaStep.java      | 91 +++++++++++--------
 .../java/RemoveUnusedImportsStep.java         |  4 +-
 2 files changed, 53 insertions(+), 42 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
index 91439a1767..f829d20329 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  */
 package com.diffplug.spotless.java;
 
-import java.io.IOException;
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
@@ -27,6 +26,7 @@
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Jvm;
 import com.diffplug.spotless.Provisioner;
+import com.diffplug.spotless.RoundedStep;
 
 /**
  * Enables CleanThat as a SpotLess step.
@@ -34,23 +34,43 @@
  * @author Benoit Lacelle
  */
 // https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep
-public final class CleanthatJavaStep {
-
+public final class CleanthatJavaStep implements RoundedStep {
+	private static final long serialVersionUID = 1L;
 	private static final String NAME = "cleanthat";
 	private static final String MAVEN_COORDINATE = "io.github.solven-eu.cleanthat:java";
-
-	// CleanThat changelog is available at https://github.com/solven-eu/cleanthat/blob/master/CHANGES.MD
+	/**
+	 * CleanThat changelog is available at <a href="https://github.com/solven-eu/cleanthat/blob/master/CHANGES.MD">here</a>.
+	 */
 	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "2.16");
 
-	// prevent direct instantiation
-	private CleanthatJavaStep() {}
+	private final JarState.Promised jarState;
+	private final String version;
+	private final String sourceJdkVersion;
+	private final List<String> included;
+	private final List<String> excluded;
+	private final boolean includeDraft;
+
+	private CleanthatJavaStep(JarState.Promised jarState,
+			String version,
+			String sourceJdkVersion,
+			List<String> included,
+			List<String> excluded,
+			boolean includeDraft) {
+		this.jarState = jarState;
+		this.version = version;
+
+		this.sourceJdkVersion = sourceJdkVersion;
+		this.included = included;
+		this.excluded = excluded;
+		this.includeDraft = includeDraft;
+	}
 
-	/** Creates a step which apply default CleanThat mutators. */
+	/** Creates a step that applies default CleanThat mutators. */
 	public static FormatterStep create(Provisioner provisioner) {
 		return create(defaultVersion(), provisioner);
 	}
 
-	/** Creates a step which apply default CleanThat mutators. */
+	/** Creates a step that applies default CleanThat mutators. */
 	public static FormatterStep create(String version, Provisioner provisioner) {
 		return create(MAVEN_COORDINATE, version, defaultSourceJdk(), defaultMutators(), defaultExcludedMutators(), defaultIncludeDraft(), provisioner);
 	}
@@ -64,7 +84,6 @@ public static String defaultSourceJdk() {
 
 	/**
 	 * By default, we include only safe and consensual mutators
-	 * @return
 	 */
 	public static List<String> defaultMutators() {
 		// see ICleanthatStepParametersProperties.SAFE_AND_CONSENSUAL
@@ -79,7 +98,7 @@ public static boolean defaultIncludeDraft() {
 		return false;
 	}
 
-	/** Creates a step which apply selected CleanThat mutators. */
+	/** Creates a step that applies selected CleanThat mutators. */
 	public static FormatterStep create(String groupArtifact,
 			String version,
 			String sourceJdkVersion,
@@ -93,57 +112,51 @@ public static FormatterStep create(String groupArtifact,
 		}
 		Objects.requireNonNull(version, "version");
 		Objects.requireNonNull(provisioner, "provisioner");
-		return FormatterStep.createLazy(NAME,
-				() -> new JavaRefactorerState(NAME, groupArtifact, version, sourceJdkVersion, included, excluded, includeDraft, provisioner),
-				JavaRefactorerState::createFormat);
+		return FormatterStep.create(NAME,
+				new CleanthatJavaStep(JarState.promise(() -> JarState.from(groupArtifact + ":" + version, provisioner)), version, sourceJdkVersion, included, excluded, includeDraft),
+				CleanthatJavaStep::equalityState,
+				State::createFormat);
 	}
 
 	/** Get default formatter version */
 	public static String defaultVersion() {
-		return JVM_SUPPORT.getRecommendedFormatterVersion();
+		return Objects.requireNonNull(JVM_SUPPORT.getRecommendedFormatterVersion());
 	}
 
 	public static String defaultGroupArtifact() {
 		return MAVEN_COORDINATE;
 	}
 
-	static final class JavaRefactorerState implements Serializable {
-		private static final long serialVersionUID = 1L;
-
-		final JarState jarState;
-		final String stepName;
-		final String version;
+	private State equalityState() {
+		return new State(jarState.get(), version, sourceJdkVersion, included, excluded, includeDraft);
+	}
 
-		final String sourceJdkVersion;
-		final List<String> included;
-		final List<String> excluded;
-		final boolean includeDraft;
+	static final class State implements Serializable {
+		private static final long serialVersionUID = 1L;
 
-		JavaRefactorerState(String stepName, String version, Provisioner provisioner) throws IOException {
-			this(stepName, MAVEN_COORDINATE, version, defaultSourceJdk(), defaultMutators(), defaultExcludedMutators(), defaultIncludeDraft(), provisioner);
-		}
+		private final JarState jarState;
+		private final String version;
+		private final String sourceJdkVersion;
+		private final List<String> included;
+		private final List<String> excluded;
+		private final boolean includeDraft;
 
-		JavaRefactorerState(String stepName,
-				String groupArtifact,
+		State(JarState jarState,
 				String version,
 				String sourceJdkVersion,
 				List<String> included,
 				List<String> excluded,
-				boolean includeDraft,
-				Provisioner provisioner) throws IOException {
+				boolean includeDraft) {
 			JVM_SUPPORT.assertFormatterSupported(version);
 			ModuleHelper.doOpenInternalPackagesIfRequired();
-			this.jarState = JarState.from(groupArtifact + ":" + version, provisioner);
-			this.stepName = stepName;
+			this.jarState = jarState;
 			this.version = version;
-
 			this.sourceJdkVersion = sourceJdkVersion;
 			this.included = included;
 			this.excluded = excluded;
 			this.includeDraft = includeDraft;
 		}
 
-		@SuppressWarnings("PMD.UseProperClassLoader")
 		FormatterFunc createFormat() {
 			ClassLoader classLoader = jarState.getClassLoader();
 
@@ -159,9 +172,7 @@ FormatterFunc createFormat() {
 				throw new IllegalStateException("Issue executing the formatter", e);
 			}
 
-			return JVM_SUPPORT.suggestLaterVersionOnError(version, input -> {
-				return (String) formatterMethod.invoke(formatter, input);
-			});
+			return JVM_SUPPORT.suggestLaterVersionOnError(version, input -> (String) formatterMethod.invoke(formatter, input));
 		}
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java b/lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java
index a4c460e929..af04d3ec66 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java
@@ -52,8 +52,8 @@ public static FormatterStep create(String unusedImportRemover, Provisioner provi
 					GoogleJavaFormatStep.State::createRemoveUnusedImportsOnly);
 		} else if (CLEANTHAT.equals(unusedImportRemover)) {
 			return FormatterStep.createLazy(NAME,
-					() -> new CleanthatJavaStep.JavaRefactorerState(NAME, CleanthatJavaStep.defaultGroupArtifact(), CleanthatJavaStep.defaultVersion(), "99.9", Arrays.asList(CLEANTHAT_MUTATOR), Arrays.asList(), false, provisioner),
-					CleanthatJavaStep.JavaRefactorerState::createFormat);
+					() -> new CleanthatJavaStep.State(NAME, CleanthatJavaStep.defaultGroupArtifact(), CleanthatJavaStep.defaultVersion(), "99.9", Arrays.asList(CLEANTHAT_MUTATOR), Arrays.asList(), false, provisioner),
+					CleanthatJavaStep.State::createFormat);
 		} else {
 			throw new IllegalArgumentException("Invalid unusedImportRemover: " + unusedImportRemover);
 		}

From 0b66cca74fe1ba1cded57ec59f58ddd0b073c405 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Thu, 1 Feb 2024 11:18:20 +0800
Subject: [PATCH 1486/2068] Make RemoveUnusedImportsStep round-trippable

---
 .../spotless/java/CleanthatJavaStep.java      |  2 +-
 .../spotless/java/GoogleJavaFormatStep.java   | 31 +++++++++++++------
 .../java/RemoveUnusedImportsStep.java         | 28 ++++++++---------
 3 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
index f829d20329..93a3b7662c 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
@@ -131,7 +131,7 @@ private State equalityState() {
 		return new State(jarState.get(), version, sourceJdkVersion, included, excluded, includeDraft);
 	}
 
-	static final class State implements Serializable {
+	private static final class State implements Serializable {
 		private static final long serialVersionUID = 1L;
 
 		private final JarState jarState;
diff --git a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
index 85460c6d27..00452fef46 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
@@ -88,6 +88,14 @@ public static FormatterStep create(String groupArtifact, String version, String
 
 	/** Creates a step which formats everything - groupArtifact, code, import order, and unused imports - and optionally reflows long strings. */
 	public static FormatterStep create(String groupArtifact, String version, String style, Provisioner provisioner, boolean reflowLongStrings, boolean reorderImports, boolean formatJavadoc) {
+		return createInternally(groupArtifact, version, style, provisioner, reflowLongStrings, reorderImports, formatJavadoc, false);
+	}
+
+	static FormatterStep createRemoveUnusedImportsOnly(Provisioner provisioner) {
+		return createInternally(MAVEN_COORDINATE, defaultVersion(), defaultStyle(), provisioner, defaultReflowLongStrings(), defaultReorderImports(), defaultFormatJavadoc(), true);
+	}
+
+	private static FormatterStep createInternally(String groupArtifact, String version, String style, Provisioner provisioner, boolean reflowLongStrings, boolean reorderImports, boolean formatJavadoc, boolean removeImports) {
 		Objects.requireNonNull(groupArtifact, "groupArtifact");
 		if (groupArtifact.chars().filter(ch -> ch == ':').count() != 1) {
 			throw new IllegalArgumentException("groupArtifact must be in the form 'groupId:artifactId'");
@@ -95,10 +103,19 @@ public static FormatterStep create(String groupArtifact, String version, String
 		Objects.requireNonNull(version, "version");
 		Objects.requireNonNull(style, "style");
 		Objects.requireNonNull(provisioner, "provisioner");
-		return FormatterStep.create(NAME,
-				new GoogleJavaFormatStep(JarState.promise(() -> JarState.from(groupArtifact + ":" + version, provisioner)), version, style, reflowLongStrings, reorderImports, formatJavadoc),
-				GoogleJavaFormatStep::equalityState,
-				State::createFormat);
+
+		GoogleJavaFormatStep step = new GoogleJavaFormatStep(JarState.promise(() -> JarState.from(groupArtifact + ":" + version, provisioner)), version, style, reflowLongStrings, reorderImports, formatJavadoc);
+		if (removeImports) {
+			return FormatterStep.create(NAME,
+					step,
+					GoogleJavaFormatStep::equalityState,
+					State::createRemoveUnusedImportsOnly);
+		} else {
+			return FormatterStep.create(NAME,
+					step,
+					GoogleJavaFormatStep::equalityState,
+					State::createFormat);
+		}
 	}
 
 	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME)
@@ -136,7 +153,7 @@ private State equalityState() {
 		return new State(version, style, jarState.get(), reflowLongStrings, reorderImports, formatJavadoc);
 	}
 
-	static final class State implements Serializable {
+	private static final class State implements Serializable {
 		private static final long serialVersionUID = 1L;
 
 		private final JarState jarState;
@@ -146,10 +163,6 @@ static final class State implements Serializable {
 		private final boolean reorderImports;
 		private final boolean formatJavadoc;
 
-		State(String version, JarState jarState) {
-			this(version, DEFAULT_STYLE, jarState, DEFAULT_REFLOW_LONG_STRINGS, DEFAULT_REORDER_IMPORTS, DEFAULT_FORMAT_JAVADOC);
-		}
-
 		State(String version,
 				String style,
 				JarState jarState,
diff --git a/lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java b/lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java
index af04d3ec66..89129e8171 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,15 +15,17 @@
  */
 package com.diffplug.spotless.java;
 
-import java.util.Arrays;
+import java.util.List;
 import java.util.Objects;
 
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.Provisioner;
+import com.diffplug.spotless.RoundedStep;
 
 /** Uses google-java-format or cleanthat.UnnecessaryImport, but only to remove unused imports. */
-public class RemoveUnusedImportsStep {
-	static final String NAME = "removeUnusedImports";
+public class RemoveUnusedImportsStep implements RoundedStep {
+	private static final long serialVersionUID = 1L;
+	private static final String NAME = "removeUnusedImports";
 
 	static final String GJF = "google-java-format";
 	static final String CLEANTHAT = "cleanthat-javaparser-unnecessaryimport";
@@ -34,7 +36,7 @@ public class RemoveUnusedImportsStep {
 	// prevent direct instantiation
 	private RemoveUnusedImportsStep() {}
 
-	public static final String defaultFormatter() {
+	public static String defaultFormatter() {
 		return GJF;
 	}
 
@@ -45,16 +47,12 @@ public static FormatterStep create(Provisioner provisioner) {
 
 	public static FormatterStep create(String unusedImportRemover, Provisioner provisioner) {
 		Objects.requireNonNull(provisioner, "provisioner");
-
-		if (GJF.equals(unusedImportRemover)) {
-			return FormatterStep.createLazy(NAME,
-					() -> new GoogleJavaFormatStep.State(NAME, GoogleJavaFormatStep.defaultVersion(), provisioner),
-					GoogleJavaFormatStep.State::createRemoveUnusedImportsOnly);
-		} else if (CLEANTHAT.equals(unusedImportRemover)) {
-			return FormatterStep.createLazy(NAME,
-					() -> new CleanthatJavaStep.State(NAME, CleanthatJavaStep.defaultGroupArtifact(), CleanthatJavaStep.defaultVersion(), "99.9", Arrays.asList(CLEANTHAT_MUTATOR), Arrays.asList(), false, provisioner),
-					CleanthatJavaStep.State::createFormat);
-		} else {
+		switch (unusedImportRemover) {
+		case GJF:
+			return GoogleJavaFormatStep.createRemoveUnusedImportsOnly(provisioner);
+		case CLEANTHAT:
+			return CleanthatJavaStep.create(CleanthatJavaStep.defaultGroupArtifact(), CleanthatJavaStep.defaultVersion(), "99.9", List.of(CLEANTHAT_MUTATOR), List.of(), false, provisioner);
+		default:
 			throw new IllegalArgumentException("Invalid unusedImportRemover: " + unusedImportRemover);
 		}
 	}

From 931e106f2dbd3a6d4aacaf92cef288da9647cef5 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Thu, 1 Feb 2024 11:58:08 +0800
Subject: [PATCH 1487/2068] Make FormatAnnotationsStep round-trippable

---
 .../spotless/java/FormatAnnotationsStep.java         | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java b/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java
index 5a2d856850..bb74f7a0bc 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 DiffPlug
+ * Copyright 2022-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@
 
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.RoundedStep;
 
 /**
  * Some formatters put every annotation on its own line
@@ -36,7 +37,8 @@
  * <p>
  * Note: A type annotation is an annotation that is meta-annotated with {@code @Target({ElementType.TYPE_USE})}.
  */
-public final class FormatAnnotationsStep {
+public final class FormatAnnotationsStep implements RoundedStep {
+	private static final long serialVersionUID = 1L;
 
 	/**
 	 * Simple names of type annotations.
@@ -389,7 +391,7 @@ public final class FormatAnnotationsStep {
 
 			);
 
-	static final String NAME = "No line break between type annotation and type";
+	private static final String NAME = "No line break between type annotation and type";
 
 	public static FormatterStep create() {
 		return create(Collections.emptyList(), Collections.emptyList());
@@ -432,13 +434,13 @@ private static final class State implements Serializable {
 		}
 
 		FormatterFunc toFormatter() {
-			return unixStr -> fixupTypeAnnotations(unixStr);
+			return this::fixupTypeAnnotations;
 		}
 
 		/**
 		 * Removes line break between type annotations and the following type.
 		 *
-		 * @param the text of a Java file
+		 * @param unixStr the text of a Java file
 		 * @return corrected text of the Java file
 		 */
 		String fixupTypeAnnotations(String unixStr) {

From f5e3dd326772f42603efa9734678d6cdf13b0ff0 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Thu, 1 Feb 2024 12:01:14 +0800
Subject: [PATCH 1488/2068] Make ImportOrderStep round-trippable

---
 .../spotless/java/ImportOrderStep.java        | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/ImportOrderStep.java b/lib/src/main/java/com/diffplug/spotless/java/ImportOrderStep.java
index e1e63458d9..ad4cead559 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/ImportOrderStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/ImportOrderStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,12 +34,16 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import javax.annotation.Nullable;
+
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.RoundedStep;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
-public final class ImportOrderStep {
+public final class ImportOrderStep implements RoundedStep {
+	private static final long serialVersionUID = 1L;
 	private static final boolean WILDCARDS_LAST_DEFAULT = false;
 	private static final boolean SEMANTIC_SORT_DEFAULT = false;
 	private static final Set<String> TREAT_AS_PACKAGE_DEFAULT = Set.of();
@@ -84,9 +88,8 @@ public FormatterStep createFrom(boolean wildcardsLast, boolean semanticSort, Set
 
 	private FormatterStep createFrom(boolean wildcardsLast, boolean semanticSort, Set<String> treatAsPackage,
 			Set<String> treatAsClass, Supplier<List<String>> importOrder) {
-		return FormatterStep.createLazy("importOrder",
-				() -> new State(importOrder.get(), lineFormat, wildcardsLast, semanticSort, treatAsPackage,
-						treatAsClass),
+		return FormatterStep.create("importOrder",
+				new State(importOrder.get(), lineFormat, wildcardsLast, semanticSort, treatAsPackage, treatAsClass),
 				State::toFormatter);
 	}
 
@@ -121,8 +124,12 @@ private static final class State implements Serializable {
 		private final TreeSet<String> treatAsPackage;
 		private final TreeSet<String> treatAsClass;
 
-		State(List<String> importOrder, String lineFormat, boolean wildcardsLast, boolean semanticSort,
-				Set<String> treatAsPackage, Set<String> treatAsClass) {
+		State(List<String> importOrder,
+				String lineFormat,
+				boolean wildcardsLast,
+				boolean semanticSort,
+				@Nullable Set<String> treatAsPackage,
+				@Nullable Set<String> treatAsClass) {
 			this.importOrder = importOrder;
 			this.lineFormat = lineFormat;
 			this.wildcardsLast = wildcardsLast;

From adb6ec77e0041f9c415ca4535697be36d7b196ce Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Thu, 1 Feb 2024 16:36:42 +0800
Subject: [PATCH 1489/2068] Make RemoveSemicolonsStep round-trippable

---
 .../spotless/groovy/RemoveSemicolonsStep.java      | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/groovy/RemoveSemicolonsStep.java b/lib/src/main/java/com/diffplug/spotless/groovy/RemoveSemicolonsStep.java
index e24feb5cd3..31ebb069e0 100644
--- a/lib/src/main/java/com/diffplug/spotless/groovy/RemoveSemicolonsStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/groovy/RemoveSemicolonsStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,13 +21,15 @@
 
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.RoundedStep;
 
 /**
  * Removes all semicolons from the end of lines.
  *
  * @author Jose Luis Badano
  */
-public final class RemoveSemicolonsStep {
+public final class RemoveSemicolonsStep implements RoundedStep {
+	private static final long serialVersionUID = 1L;
 	private static final String NAME = "Remove unnecessary semicolons";
 
 	private RemoveSemicolonsStep() {
@@ -35,9 +37,9 @@ private RemoveSemicolonsStep() {
 	}
 
 	public static FormatterStep create() {
-		return FormatterStep.createLazy(NAME,
-				State::new,
-				RemoveSemicolonsStep.State::toFormatter);
+		return FormatterStep.create(NAME,
+				new State(),
+				State::toFormatter);
 	}
 
 	private static final class State implements Serializable {
@@ -64,7 +66,7 @@ FormatterFunc toFormatter() {
 		 * @return the line without the last semicolon
 		 */
 		private String removeSemicolon(String line) {
-			// find last semicolon in a string a remove it
+			// Find the last semicolon in a string and remove it.
 			int lastSemicolon = line.lastIndexOf(";");
 			if (lastSemicolon != -1 && lastSemicolon == line.length() - 1) {
 				return line.substring(0, lastSemicolon);

From 489846224141124e13e1f3263116fc660daf78ed Mon Sep 17 00:00:00 2001
From: Tyler Crawford <tcrawford@figure.com>
Date: Fri, 26 Jan 2024 16:43:09 -0500
Subject: [PATCH 1490/2068] Stash progress

---
 .../diffplug/spotless/shell/ShfmtStep.java    |  4 +++-
 .../gradle/spotless/ShellExtension.java       |  2 +-
 .../gradle/spotless/ShellExtensionTest.java   |  2 +-
 .../spotless/maven/shell/ShellTest.java       |  2 +-
 testlib/build.gradle                          |  2 +-
 .../diffplug/spotless/ResourceHarness.java    |  1 +
 .../main/resources/shell/shfmt/.editorconfig  | 10 ++++++++++
 .../spotless/shell/ShfmtStepTest.java         | 20 ++++++++++++++++---
 8 files changed, 35 insertions(+), 8 deletions(-)
 create mode 100644 testlib/src/main/resources/shell/shfmt/.editorconfig

diff --git a/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java b/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java
index cc452fce69..ab1c685b73 100644
--- a/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java
@@ -96,7 +96,9 @@ static class State implements Serializable {
 
 		String format(ProcessRunner runner, String input, File file) throws IOException, InterruptedException {
 			if (args == null) {
-				args = List.of(exe.confirmVersionAndGetAbsolutePath(), "-i", "2", "-ci");
+				// When reading from stdin, shfmt requires a filename argument
+				// in order for the editorconfig configuration to be resolved.
+				args = List.of(exe.confirmVersionAndGetAbsolutePath(), "-filename", "PLACEHOLDER.sh");
 			}
 
 			return runner.exec(input.getBytes(StandardCharsets.UTF_8), args).assertExitZero(StandardCharsets.UTF_8);
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ShellExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ShellExtension.java
index 9149467eaa..6a21f2ffb4 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ShellExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ShellExtension.java
@@ -23,7 +23,7 @@
 import com.diffplug.spotless.shell.ShfmtStep;
 
 public class ShellExtension extends FormatExtension {
-	private static final String SHELL_FILE_EXTENSION = "*.sh";
+	private static final String SHELL_FILE_EXTENSION = "**/*.sh";
 
 	static final String NAME = "shell";
 
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ShellExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ShellExtensionTest.java
index 1a4f567ccb..772bd7c479 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ShellExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ShellExtensionTest.java
@@ -21,7 +21,7 @@
 
 import com.diffplug.spotless.tag.ShfmtTest;
 
-@ShfmtTest
+//@ShfmtTest
 public class ShellExtensionTest extends GradleIntegrationHarness {
 	@Test
 	void shfmt() throws IOException {
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/shell/ShellTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/shell/ShellTest.java
index bf0e58fca6..149015896b 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/shell/ShellTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/shell/ShellTest.java
@@ -22,7 +22,7 @@
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
 import com.diffplug.spotless.tag.ShfmtTest;
 
-@ShfmtTest
+//@ShfmtTest
 public class ShellTest extends MavenIntegrationHarness {
 	private static final Logger LOGGER = LoggerFactory.getLogger(ShellTest.class);
 
diff --git a/testlib/build.gradle b/testlib/build.gradle
index 38e598369e..16a9e18488 100644
--- a/testlib/build.gradle
+++ b/testlib/build.gradle
@@ -7,7 +7,7 @@ apply from: rootProject.file('gradle/java-setup.gradle')
 
 dependencies {
 	api projects.lib
-	api files(projects.lib.dependencyProject.sourceSets.sortPom.output.classesDirs)
+//	api files(projects.lib.dependencyProject.sourceSets.sortPom.output.classesDirs)
 	api "com.diffplug.durian:durian-core:${VER_DURIAN}"
 	api "com.diffplug.durian:durian-testlib:${VER_DURIAN}"
 	api "org.junit.jupiter:junit-jupiter:${VER_JUNIT}"
diff --git a/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java b/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java
index 0304889e1f..5a1d5137d2 100644
--- a/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java
+++ b/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java
@@ -100,6 +100,7 @@ protected static boolean existsTestResource(String filename) {
 
 	private static Optional<URL> getTestResourceUrl(String filename) {
 		URL url = ResourceHarness.class.getResource("/" + filename);
+//		System.out.println(url.getPath());
 		return Optional.ofNullable(url);
 	}
 
diff --git a/testlib/src/main/resources/shell/shfmt/.editorconfig b/testlib/src/main/resources/shell/shfmt/.editorconfig
new file mode 100644
index 0000000000..8a7d8d6043
--- /dev/null
+++ b/testlib/src/main/resources/shell/shfmt/.editorconfig
@@ -0,0 +1,10 @@
+root = true
+
+[*]
+charset = utf-8
+
+[*.sh]
+indent_style = space
+indent_size = 2
+space_redirects = true
+switch_case_indent = true
diff --git a/testlib/src/test/java/com/diffplug/spotless/shell/ShfmtStepTest.java b/testlib/src/test/java/com/diffplug/spotless/shell/ShfmtStepTest.java
index 41dc38e225..57e85dd711 100644
--- a/testlib/src/test/java/com/diffplug/spotless/shell/ShfmtStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/shell/ShfmtStepTest.java
@@ -15,18 +15,32 @@
  */
 package com.diffplug.spotless.shell;
 
+import com.diffplug.spotless.StepHarnessWithFile;
+
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.ResourceHarness;
-import com.diffplug.spotless.StepHarness;
 import com.diffplug.spotless.tag.ShfmtTest;
 
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+
 @ShfmtTest
 public class ShfmtStepTest extends ResourceHarness {
 	@Test
 	void test() throws Exception {
-		try (StepHarness harness = StepHarness.forStep(ShfmtStep.withVersion(ShfmtStep.defaultVersion()).create())) {
-			harness.testResource("shell/shfmt/shfmt.sh", "shell/shfmt/shfmt.clean").close();
+		try (StepHarnessWithFile harness = StepHarnessWithFile.forStep(this, ShfmtStep.withVersion(ShfmtStep.defaultVersion()).create())) {
+			final String filedir = "shell/shfmt/";
+
+			setFile(".editorconfig").toResource(filedir + ".editorconfig");
+
+			final List<File> files = List.of(rootFolder().listFiles());
+
+			final String dirtyFile = filedir + "shfmt.sh";
+			final String cleanFile = filedir + "shfmt.clean";
+
+			harness.testResource(dirtyFile, cleanFile).close();
 		}
 	}
 }

From d95436a456cf41b756a491640ca2712020c75b2d Mon Sep 17 00:00:00 2001
From: Tyler Crawford <tcrawford@figure.com>
Date: Tue, 30 Jan 2024 17:10:10 -0500
Subject: [PATCH 1491/2068] Add .editorconfig support for shfmt

---
 .../diffplug/spotless/shell/ShfmtStep.java    | 35 ++++++++++++------
 .../gradle/spotless/ShellExtensionTest.java   | 36 +++++++++++++++----
 .../spotless/maven/shell/ShellTest.java       | 23 +++++++++---
 testlib/build.gradle                          |  2 +-
 .../diffplug/spotless/ResourceHarness.java    |  4 +--
 .../shfmt/{ => with-config}/.editorconfig     |  0
 .../shell/shfmt/{ => with-config}/shfmt.clean |  0
 .../shell/shfmt/{ => with-config}/shfmt.sh    |  0
 .../shell/shfmt/without-config/shfmt.clean    | 17 +++++++++
 .../shell/shfmt/without-config/shfmt.sh       | 18 ++++++++++
 .../spotless/shell/ShfmtStepTest.java         | 23 ++++++------
 11 files changed, 124 insertions(+), 34 deletions(-)
 rename testlib/src/main/resources/shell/shfmt/{ => with-config}/.editorconfig (100%)
 rename testlib/src/main/resources/shell/shfmt/{ => with-config}/shfmt.clean (100%)
 rename testlib/src/main/resources/shell/shfmt/{ => with-config}/shfmt.sh (100%)
 create mode 100644 testlib/src/main/resources/shell/shfmt/without-config/shfmt.clean
 create mode 100644 testlib/src/main/resources/shell/shfmt/without-config/shfmt.sh

diff --git a/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java b/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java
index ab1c685b73..f4434bb41f 100644
--- a/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java
@@ -86,27 +86,40 @@ static class State implements Serializable {
 		// used for up-to-date checks and caching
 		final String version;
 		final transient ForeignExe exe;
-		// used for executing
-		private transient @Nullable List<String> args;
 
 		State(ShfmtStep step, ForeignExe pathToExe) {
 			this.version = step.version;
 			this.exe = Objects.requireNonNull(pathToExe);
 		}
 
+		FormatterFunc.Closeable toFunc() {
+			ProcessRunner runner = new ProcessRunner();
+			return FormatterFunc.Closeable.ofDangerous(runner, new ShfmtFilePathPassingFormatterFunc(runner, exe));
+		}
+	}
+
+	private static class ShfmtFilePathPassingFormatterFunc implements FormatterFunc.NeedsFile {
+		// used for executing
+		private transient @Nullable List<String> args;
+		final transient ForeignExe exe;
+		final transient ProcessRunner runner;
+
+		ShfmtFilePathPassingFormatterFunc(ProcessRunner runner, ForeignExe exe) {
+			this.runner = runner;
+			this.exe = exe;
+		}
+
+		@Override
+		public String applyWithFile(String unix, File file) throws Exception {
+			return format(runner, unix, file);
+		}
+
 		String format(ProcessRunner runner, String input, File file) throws IOException, InterruptedException {
 			if (args == null) {
-				// When reading from stdin, shfmt requires a filename argument
-				// in order for the editorconfig configuration to be resolved.
-				args = List.of(exe.confirmVersionAndGetAbsolutePath(), "-filename", "PLACEHOLDER.sh");
+				args = List.of(exe.confirmVersionAndGetAbsolutePath(), file.getAbsolutePath());
 			}
 
-			return runner.exec(input.getBytes(StandardCharsets.UTF_8), args).assertExitZero(StandardCharsets.UTF_8);
-		}
-
-		FormatterFunc.Closeable toFunc() {
-			ProcessRunner runner = new ProcessRunner();
-			return FormatterFunc.Closeable.of(runner, this::format);
+			return runner.exec(args).assertExitZero(StandardCharsets.UTF_8);
 		}
 	}
 }
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ShellExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ShellExtensionTest.java
index 772bd7c479..55929ccfbb 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ShellExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ShellExtensionTest.java
@@ -21,21 +21,45 @@
 
 import com.diffplug.spotless.tag.ShfmtTest;
 
-//@ShfmtTest
+@ShfmtTest
 public class ShellExtensionTest extends GradleIntegrationHarness {
 	@Test
-	void shfmt() throws IOException {
-		setFile("build.gradle").toLines(
+	void shfmtWithEditorconfig() throws IOException {
+		String fileDir = "shell/shfmt/with-config/";
+		setFile(".editorconfig").toResource(fileDir + ".editorconfig");
+		setFile("build.gradle.kts").toLines(
 				"plugins {",
-				"  id 'com.diffplug.spotless'",
+				"  id(\"com.diffplug.spotless\")",
 				"}",
+				"repositories { mavenCentral() }",
 				"spotless {",
 				"  shell {",
 				"    shfmt()",
 				"  }",
 				"}");
-		setFile("shfmt.sh").toResource("shell/shfmt/shfmt.sh");
+		setFile("shfmt.sh").toResource(fileDir + "shfmt.sh");
+
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("shfmt.sh").sameAsResource(fileDir + "shfmt.clean");
+	}
+
+	@Test
+	void shfmtWithoutEditorconfig() throws IOException {
+		String fileDir = "shell/shfmt/without-config/";
+
+		setFile("build.gradle.kts").toLines(
+				"plugins {",
+				"  id(\"com.diffplug.spotless\")",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"  shell {",
+				"    shfmt()",
+				"  }",
+				"}");
+		setFile("shfmt.sh").toResource(fileDir + "shfmt.sh");
+
 		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("shfmt.sh").sameAsResource("shell/shfmt/shfmt.clean");
+		assertFile("shfmt.sh").sameAsResource(fileDir + "shfmt.clean");
 	}
 }
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/shell/ShellTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/shell/ShellTest.java
index 149015896b..f3746d843d 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/shell/ShellTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/shell/ShellTest.java
@@ -22,15 +22,30 @@
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
 import com.diffplug.spotless.tag.ShfmtTest;
 
-//@ShfmtTest
+@ShfmtTest
 public class ShellTest extends MavenIntegrationHarness {
 	private static final Logger LOGGER = LoggerFactory.getLogger(ShellTest.class);
 
 	@Test
-	public void testFormatShell() throws Exception {
+	public void testFormatShellWithEditorconfig() throws Exception {
+		String fileDir = "shell/shfmt/with-config/";
+		setFile("shfmt.sh").toResource(fileDir + "shfmt.sh");
+		setFile(".editorconfig").toResource(fileDir + ".editorconfig");
+
 		writePomWithShellSteps("<shfmt/>");
-		setFile("shfmt.sh").toResource("shell/shfmt/shfmt.sh");
 		mavenRunner().withArguments("spotless:apply").runNoError();
-		assertFile("shfmt.sh").sameAsResource("shell/shfmt/shfmt.clean");
+
+		assertFile("shfmt.sh").sameAsResource(fileDir + "shfmt.clean");
+	}
+
+	@Test
+	public void testFormatShellWithoutEditorconfig() throws Exception {
+		String fileDir = "shell/shfmt/without-config/";
+		setFile("shfmt.sh").toResource(fileDir + "shfmt.sh");
+
+		writePomWithShellSteps("<shfmt/>");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+
+		assertFile("shfmt.sh").sameAsResource(fileDir + "shfmt.clean");
 	}
 }
diff --git a/testlib/build.gradle b/testlib/build.gradle
index 16a9e18488..5aad81bae2 100644
--- a/testlib/build.gradle
+++ b/testlib/build.gradle
@@ -7,7 +7,7 @@ apply from: rootProject.file('gradle/java-setup.gradle')
 
 dependencies {
 	api projects.lib
-//	api files(projects.lib.dependencyProject.sourceSets.sortPom.output.classesDirs)
+	//	api files(projects.lib.dependencyProject.sourceSets.sortPom.output.classesDirs)
 	api "com.diffplug.durian:durian-core:${VER_DURIAN}"
 	api "com.diffplug.durian:durian-testlib:${VER_DURIAN}"
 	api "org.junit.jupiter:junit-jupiter:${VER_JUNIT}"
diff --git a/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java b/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java
index 5a1d5137d2..88295a3346 100644
--- a/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java
+++ b/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -100,7 +100,7 @@ protected static boolean existsTestResource(String filename) {
 
 	private static Optional<URL> getTestResourceUrl(String filename) {
 		URL url = ResourceHarness.class.getResource("/" + filename);
-//		System.out.println(url.getPath());
+		//		System.out.println(url.getPath());
 		return Optional.ofNullable(url);
 	}
 
diff --git a/testlib/src/main/resources/shell/shfmt/.editorconfig b/testlib/src/main/resources/shell/shfmt/with-config/.editorconfig
similarity index 100%
rename from testlib/src/main/resources/shell/shfmt/.editorconfig
rename to testlib/src/main/resources/shell/shfmt/with-config/.editorconfig
diff --git a/testlib/src/main/resources/shell/shfmt/shfmt.clean b/testlib/src/main/resources/shell/shfmt/with-config/shfmt.clean
similarity index 100%
rename from testlib/src/main/resources/shell/shfmt/shfmt.clean
rename to testlib/src/main/resources/shell/shfmt/with-config/shfmt.clean
diff --git a/testlib/src/main/resources/shell/shfmt/shfmt.sh b/testlib/src/main/resources/shell/shfmt/with-config/shfmt.sh
similarity index 100%
rename from testlib/src/main/resources/shell/shfmt/shfmt.sh
rename to testlib/src/main/resources/shell/shfmt/with-config/shfmt.sh
diff --git a/testlib/src/main/resources/shell/shfmt/without-config/shfmt.clean b/testlib/src/main/resources/shell/shfmt/without-config/shfmt.clean
new file mode 100644
index 0000000000..80386d472e
--- /dev/null
+++ b/testlib/src/main/resources/shell/shfmt/without-config/shfmt.clean
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+function foo() {
+	if [ -x $file ]; then
+		myArray=(item1 item2 item3)
+	elif [ $file1 -nt $file2 ]; then
+		unset myArray
+	else
+		echo "Usage: $0 file ..."
+	fi
+}
+
+for ((i = 0; i < 5; i++)); do
+	read -p r
+	print -n $r
+	wait $!
+done
diff --git a/testlib/src/main/resources/shell/shfmt/without-config/shfmt.sh b/testlib/src/main/resources/shell/shfmt/without-config/shfmt.sh
new file mode 100644
index 0000000000..9d15c477d4
--- /dev/null
+++ b/testlib/src/main/resources/shell/shfmt/without-config/shfmt.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+function foo() {
+    if [ -x $file ]; then
+              myArray=(item1 item2 item3)
+  elif [ $file1 -nt $file2 ]
+    then
+        unset myArray
+        else
+echo "Usage: $0 file ..."
+    fi
+}
+
+for ((i = 0; i < 5; i++)); do
+    read -p r
+  print -n $r
+  wait $!
+done
diff --git a/testlib/src/test/java/com/diffplug/spotless/shell/ShfmtStepTest.java b/testlib/src/test/java/com/diffplug/spotless/shell/ShfmtStepTest.java
index 57e85dd711..821af2468b 100644
--- a/testlib/src/test/java/com/diffplug/spotless/shell/ShfmtStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/shell/ShfmtStepTest.java
@@ -15,32 +15,35 @@
  */
 package com.diffplug.spotless.shell;
 
-import com.diffplug.spotless.StepHarnessWithFile;
-
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.ResourceHarness;
+import com.diffplug.spotless.StepHarnessWithFile;
 import com.diffplug.spotless.tag.ShfmtTest;
 
-import java.io.File;
-import java.util.Arrays;
-import java.util.List;
-
 @ShfmtTest
 public class ShfmtStepTest extends ResourceHarness {
 	@Test
-	void test() throws Exception {
+	void testWithEditorconfig() throws Exception {
 		try (StepHarnessWithFile harness = StepHarnessWithFile.forStep(this, ShfmtStep.withVersion(ShfmtStep.defaultVersion()).create())) {
-			final String filedir = "shell/shfmt/";
+			final String filedir = "shell/shfmt/with-config/";
+			final String dirtyFile = filedir + "shfmt.sh";
+			final String cleanFile = filedir + "shfmt.clean";
 
 			setFile(".editorconfig").toResource(filedir + ".editorconfig");
 
-			final List<File> files = List.of(rootFolder().listFiles());
+			harness.testResource(dirtyFile, cleanFile);
+		}
+	}
 
+	@Test
+	void testWithoutEditorconfig() throws Exception {
+		try (StepHarnessWithFile harness = StepHarnessWithFile.forStep(this, ShfmtStep.withVersion(ShfmtStep.defaultVersion()).create())) {
+			final String filedir = "shell/shfmt/without-config/";
 			final String dirtyFile = filedir + "shfmt.sh";
 			final String cleanFile = filedir + "shfmt.clean";
 
-			harness.testResource(dirtyFile, cleanFile).close();
+			harness.testResource(dirtyFile, cleanFile);
 		}
 	}
 }

From 4ae13c97820491600625de7104b09bbc5c14bf24 Mon Sep 17 00:00:00 2001
From: Tyler Crawford <tcrawford@figure.com>
Date: Tue, 30 Jan 2024 17:25:37 -0500
Subject: [PATCH 1492/2068] Revert unnecessary changes

---
 testlib/build.gradle                                           | 2 +-
 .../src/main/java/com/diffplug/spotless/ResourceHarness.java   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/testlib/build.gradle b/testlib/build.gradle
index 5aad81bae2..38e598369e 100644
--- a/testlib/build.gradle
+++ b/testlib/build.gradle
@@ -7,7 +7,7 @@ apply from: rootProject.file('gradle/java-setup.gradle')
 
 dependencies {
 	api projects.lib
-	//	api files(projects.lib.dependencyProject.sourceSets.sortPom.output.classesDirs)
+	api files(projects.lib.dependencyProject.sourceSets.sortPom.output.classesDirs)
 	api "com.diffplug.durian:durian-core:${VER_DURIAN}"
 	api "com.diffplug.durian:durian-testlib:${VER_DURIAN}"
 	api "org.junit.jupiter:junit-jupiter:${VER_JUNIT}"
diff --git a/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java b/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java
index 88295a3346..0304889e1f 100644
--- a/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java
+++ b/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -100,7 +100,6 @@ protected static boolean existsTestResource(String filename) {
 
 	private static Optional<URL> getTestResourceUrl(String filename) {
 		URL url = ResourceHarness.class.getResource("/" + filename);
-		//		System.out.println(url.getPath());
 		return Optional.ofNullable(url);
 	}
 

From 1b3335d28b3cccf868d7ec03a4ff004077179dab Mon Sep 17 00:00:00 2001
From: Tyler Crawford <tcrawford@figure.com>
Date: Tue, 30 Jan 2024 20:25:15 -0500
Subject: [PATCH 1493/2068] Update change logs and documentation for shell
 formatting

---
 CHANGES.md                                    |  2 ++
 plugin-gradle/CHANGES.md                      |  3 ++
 plugin-gradle/README.md                       |  6 +++-
 plugin-maven/CHANGES.md                       |  3 ++
 plugin-maven/README.md                        | 31 ++++++++++++++++++-
 .../diffplug/spotless/maven/shell/Shell.java  |  5 +--
 .../diffplug/spotless/maven/shell/Shfmt.java  |  1 -
 7 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index cb8bf9706e..b0d80fd7ff 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * `FileSignature.Promised` and `JarState.Promised` to facilitate round-trip serialization for the Gradle configuration cache. ([#1945](https://github.com/diffplug/spotless/pull/1945)) 
+* Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
+
 ### Removed
 * **BREAKING** Remove `JarState.getMavenCoordinate(String prefix)`. ([#1945](https://github.com/diffplug/spotless/pull/1945))
 * **BREAKING** Replace `PipeStepPair` with `FenceStep`. ([#1954](https://github.com/diffplug/spotless/pull/1954))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 5e7d8823b9..7ce10e1edc 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -6,6 +6,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Ignore system git config when running tests ([#1990](https://github.com/diffplug/spotless/issues/1990))
 
+### Added
+* Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
+
 ## [6.25.0] - 2024-01-23
 ### Added
 * Maven / Gradle - Support for formatting Java Docs for the Palantir formatter ([#2009](https://github.com/diffplug/spotless/pull/2009))
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 060b900bdc..4f2d0e6930 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -992,7 +992,7 @@ spotless {
 ```gradle
 spotless {
   shell {
-    target 'scripts/**/*.sh' // default: '*.sh'
+    target 'scripts/**/*.sh' // default: '**/*.sh'
 
     shfmt()  // has its own section below
   }
@@ -1003,11 +1003,15 @@ spotless {
 
 [homepage](https://github.com/mvdan/sh). [changelog](https://github.com/mvdan/sh/blob/master/CHANGELOG.md).
 
+When formatting shell scripts via `shfmt`, configure `shfmt` settings via `.editorconfig`. 
+Refer to the `shfmt` man page for `.editorconfig` settings. 
+
 ```gradle
 shfmt('3.7.0') // version is optional
 
 // if shfmt is not on your path, you must specify its location manually
 shfmt().pathToExe('/opt/homebrew/bin/shfmt')
+
 // Spotless always checks the version of the shfmt it is using
 // and will fail with an error if it does not match the expected version
 // (whether manually specified or default). If there is a problem, Spotless
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 37cc1de12e..3e3cc975b3 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -6,6 +6,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Ignore system git config when running tests ([#1990](https://github.com/diffplug/spotless/issues/1990))
 
+### Added
+* Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
+
 ## [2.43.0] - 2024-01-23
 ### Added
 * Support for formatting shell scripts via [shfmt](https://github.com/mvdan/sh). ([#1998](https://github.com/diffplug/spotless/issues/1998))
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 1063f3ad12..fbe4248b7b 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -1021,11 +1021,40 @@ Uses Jackson and YAMLFactory to pretty print objects:
 </jackson>
 ```
 
+## Shell
+
+- `com.diffplug.spotless.maven.FormatterFactory.addStepFactory(FormatterStepFactory)` [code](./src/main/java/com/diffplug/spotless/maven/shell/Shell.java)
+
+```xml
+<configuration>
+  <shell>
+    <includes>     <!-- Not required. Defaults to **/*.sh -->
+      <include>scripts/**/*.sh</include>
+    </includes>
+    
+    <shfmt />    <!-- has its own section below -->
+  </shell>
+</configuration>
+```
+
+### shfmt
+
+[homepage](https://github.com/mvdan/sh). [changelog](https://github.com/mvdan/sh/blob/master/CHANGELOG.md).
+
+When formatting shell scripts via `shfmt`, configure `shfmt` settings via `.editorconfig`.
+
+```xml
+<shfmt>
+  <version>3.7.0</version>                         <!-- optional: Custom version of 'mvdan/sh' -->
+  <pathToExe>/opt/homebrew/bin/shfmt</pathToExe>   <!-- optional: if shfmt is not on your path, you must specify its location manually -->
+</shfmt>
+```
+
 ## Gherkin
 
 - `com.diffplug.spotless.maven.FormatterFactory.addStepFactory(FormatterStepFactory)` [code](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/gherkin/Gherkin.java)
 
-```gradle
+```xml
 <configuration>
   <gherkin>
     <includes>     <!-- You have to set the target manually -->
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/shell/Shell.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/shell/Shell.java
index 6285bfc410..0626c5ceb9 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/shell/Shell.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/shell/Shell.java
@@ -15,7 +15,6 @@
  */
 package com.diffplug.spotless.maven.shell;
 
-import java.util.Collections;
 import java.util.Set;
 
 import org.apache.maven.project.MavenProject;
@@ -30,9 +29,11 @@
  * and shell-specific (e.g. {@link Shfmt}) steps.
  */
 public class Shell extends FormatterFactory {
+	private static final Set<String> DEFAULT_INCLUDES = Set.of("**/*.sh");
+
 	@Override
 	public Set<String> defaultIncludes(MavenProject project) {
-		return Collections.emptySet();
+		return DEFAULT_INCLUDES;
 	}
 
 	@Override
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/shell/Shfmt.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/shell/Shfmt.java
index 09b83240b0..4bab77ecd6 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/shell/Shfmt.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/shell/Shfmt.java
@@ -23,7 +23,6 @@
 import com.diffplug.spotless.shell.ShfmtStep;
 
 public class Shfmt implements FormatterStepFactory {
-
 	@Parameter
 	private String version;
 

From 733f7dae3fe7b354bb7bb35d64781797d621b4ec Mon Sep 17 00:00:00 2001
From: Tyler Crawford <91682066+tcrawford-figure@users.noreply.github.com>
Date: Thu, 1 Feb 2024 09:27:04 -0500
Subject: [PATCH 1494/2068] Make files private

Co-authored-by: Zongle Wang <wangzongler@gmail.com>
---
 lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java b/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java
index f4434bb41f..d1a9934a4c 100644
--- a/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java
@@ -101,8 +101,8 @@ FormatterFunc.Closeable toFunc() {
 	private static class ShfmtFilePathPassingFormatterFunc implements FormatterFunc.NeedsFile {
 		// used for executing
 		private transient @Nullable List<String> args;
-		final transient ForeignExe exe;
-		final transient ProcessRunner runner;
+		private final transient ForeignExe exe;
+		private final transient ProcessRunner runner;
 
 		ShfmtFilePathPassingFormatterFunc(ProcessRunner runner, ForeignExe exe) {
 			this.runner = runner;

From 3c2701d5eb0189e380754894818feca14bd66c50 Mon Sep 17 00:00:00 2001
From: Tyler Crawford <tcrawford@figure.com>
Date: Thu, 1 Feb 2024 13:51:47 -0500
Subject: [PATCH 1495/2068] Fix formatting multiple shell files at the same
 time

---
 .../diffplug/spotless/shell/ShfmtStep.java    | 35 ++++--------
 .../gradle/spotless/ShellExtensionTest.java   | 55 +++++++++++++++++--
 .../spotless/maven/shell/ShellTest.java       |  4 +-
 .../{ => multifile}/with-config/.editorconfig |  0
 .../shfmt/multifile/with-config/other.clean   | 20 +++++++
 .../shfmt/multifile/with-config/other.sh      | 20 +++++++
 .../{ => multifile}/with-config/shfmt.clean   |  0
 .../{ => multifile}/with-config/shfmt.sh      |  0
 .../multifile/without-config/other.clean      | 20 +++++++
 .../shfmt/multifile/without-config/other.sh   | 20 +++++++
 .../without-config/shfmt.clean                |  0
 .../{ => multifile}/without-config/shfmt.sh   |  0
 .../singlefile/with-config/.editorconfig      | 10 ++++
 .../shfmt/singlefile/with-config/shfmt.clean  | 17 ++++++
 .../shfmt/singlefile/with-config/shfmt.sh     | 18 ++++++
 .../singlefile/without-config/shfmt.clean     | 17 ++++++
 .../shfmt/singlefile/without-config/shfmt.sh  | 18 ++++++
 .../spotless/shell/ShfmtStepTest.java         | 14 ++---
 18 files changed, 231 insertions(+), 37 deletions(-)
 rename testlib/src/main/resources/shell/shfmt/{ => multifile}/with-config/.editorconfig (100%)
 create mode 100644 testlib/src/main/resources/shell/shfmt/multifile/with-config/other.clean
 create mode 100644 testlib/src/main/resources/shell/shfmt/multifile/with-config/other.sh
 rename testlib/src/main/resources/shell/shfmt/{ => multifile}/with-config/shfmt.clean (100%)
 rename testlib/src/main/resources/shell/shfmt/{ => multifile}/with-config/shfmt.sh (100%)
 create mode 100644 testlib/src/main/resources/shell/shfmt/multifile/without-config/other.clean
 create mode 100644 testlib/src/main/resources/shell/shfmt/multifile/without-config/other.sh
 rename testlib/src/main/resources/shell/shfmt/{ => multifile}/without-config/shfmt.clean (100%)
 rename testlib/src/main/resources/shell/shfmt/{ => multifile}/without-config/shfmt.sh (100%)
 create mode 100644 testlib/src/main/resources/shell/shfmt/singlefile/with-config/.editorconfig
 create mode 100644 testlib/src/main/resources/shell/shfmt/singlefile/with-config/shfmt.clean
 create mode 100644 testlib/src/main/resources/shell/shfmt/singlefile/with-config/shfmt.sh
 create mode 100644 testlib/src/main/resources/shell/shfmt/singlefile/without-config/shfmt.clean
 create mode 100644 testlib/src/main/resources/shell/shfmt/singlefile/without-config/shfmt.sh

diff --git a/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java b/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java
index d1a9934a4c..b92c55c686 100644
--- a/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java
@@ -83,43 +83,30 @@ private State createState() throws IOException, InterruptedException {
 	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
 	static class State implements Serializable {
 		private static final long serialVersionUID = -1825662356883926318L;
+
 		// used for up-to-date checks and caching
 		final String version;
 		final transient ForeignExe exe;
 
-		State(ShfmtStep step, ForeignExe pathToExe) {
-			this.version = step.version;
-			this.exe = Objects.requireNonNull(pathToExe);
-		}
-
-		FormatterFunc.Closeable toFunc() {
-			ProcessRunner runner = new ProcessRunner();
-			return FormatterFunc.Closeable.ofDangerous(runner, new ShfmtFilePathPassingFormatterFunc(runner, exe));
-		}
-	}
-
-	private static class ShfmtFilePathPassingFormatterFunc implements FormatterFunc.NeedsFile {
 		// used for executing
 		private transient @Nullable List<String> args;
-		private final transient ForeignExe exe;
-		private final transient ProcessRunner runner;
-
-		ShfmtFilePathPassingFormatterFunc(ProcessRunner runner, ForeignExe exe) {
-			this.runner = runner;
-			this.exe = exe;
-		}
 
-		@Override
-		public String applyWithFile(String unix, File file) throws Exception {
-			return format(runner, unix, file);
+		State(ShfmtStep step, ForeignExe pathToExe) {
+			this.version = step.version;
+			this.exe = Objects.requireNonNull(pathToExe);
 		}
 
 		String format(ProcessRunner runner, String input, File file) throws IOException, InterruptedException {
 			if (args == null) {
-				args = List.of(exe.confirmVersionAndGetAbsolutePath(), file.getAbsolutePath());
+				args = List.of(exe.confirmVersionAndGetAbsolutePath(), "--filename", file.getPath());
 			}
 
-			return runner.exec(args).assertExitZero(StandardCharsets.UTF_8);
+			return runner.exec(input.getBytes(StandardCharsets.UTF_8), args).assertExitZero(StandardCharsets.UTF_8);
+		}
+
+		FormatterFunc.Closeable toFunc() {
+			ProcessRunner runner = new ProcessRunner();
+			return FormatterFunc.Closeable.of(runner, this::format);
 		}
 	}
 }
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ShellExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ShellExtensionTest.java
index 55929ccfbb..6e75b5b17d 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ShellExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ShellExtensionTest.java
@@ -25,41 +25,88 @@
 public class ShellExtensionTest extends GradleIntegrationHarness {
 	@Test
 	void shfmtWithEditorconfig() throws IOException {
-		String fileDir = "shell/shfmt/with-config/";
+		String fileDir = "shell/shfmt/singlefile/with-config/";
 		setFile(".editorconfig").toResource(fileDir + ".editorconfig");
 		setFile("build.gradle.kts").toLines(
 				"plugins {",
 				"  id(\"com.diffplug.spotless\")",
 				"}",
-				"repositories { mavenCentral() }",
 				"spotless {",
 				"  shell {",
 				"    shfmt()",
 				"  }",
 				"}");
+
 		setFile("shfmt.sh").toResource(fileDir + "shfmt.sh");
 
 		gradleRunner().withArguments("spotlessApply").build();
 		assertFile("shfmt.sh").sameAsResource(fileDir + "shfmt.clean");
 	}
 
+	@Test
+	void shfmtMultipleFilesWithEditorconfig() throws IOException {
+		String fileDir = "shell/shfmt/multifile/with-config/";
+
+		setFile(".editorconfig").toResource(fileDir + ".editorconfig");
+		setFile("build.gradle.kts").toLines(
+				"plugins {",
+				"  id(\"com.diffplug.spotless\")",
+				"}",
+				"spotless {",
+				"  shell {",
+				"    shfmt()",
+				"  }",
+				"}");
+
+		setFile("shfmt.sh").toResource(fileDir + "shfmt.sh");
+		setFile("other.sh").toResource(fileDir + "other.sh");
+
+		gradleRunner().withArguments("spotlessApply").build();
+
+		assertFile("other.sh").sameAsResource(fileDir + "other.clean");
+		assertFile("shfmt.sh").sameAsResource(fileDir + "shfmt.clean");
+	}
+
 	@Test
 	void shfmtWithoutEditorconfig() throws IOException {
-		String fileDir = "shell/shfmt/without-config/";
+		String fileDir = "shell/shfmt/singlefile/without-config/";
 
 		setFile("build.gradle.kts").toLines(
 				"plugins {",
 				"  id(\"com.diffplug.spotless\")",
 				"}",
-				"repositories { mavenCentral() }",
 				"spotless {",
 				"  shell {",
 				"    shfmt()",
 				"  }",
 				"}");
+
+		setFile("shfmt.sh").toResource(fileDir + "shfmt.sh");
+
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("shfmt.sh").sameAsResource(fileDir + "shfmt.clean");
+	}
+
+	@Test
+	void shfmtMultipleFilesWithoutEditorconfig() throws IOException {
+		String fileDir = "shell/shfmt/multifile/without-config/";
+
+		setFile("build.gradle.kts").toLines(
+				"plugins {",
+				"  id(\"com.diffplug.spotless\")",
+				"}",
+				"spotless {",
+				"  shell {",
+				"    shfmt()",
+				"  }",
+				"}");
+
 		setFile("shfmt.sh").toResource(fileDir + "shfmt.sh");
+		setFile("other.sh").toResource(fileDir + "other.sh");
 
 		gradleRunner().withArguments("spotlessApply").build();
+
+		assertFile("other.sh").sameAsResource(fileDir + "other.clean");
 		assertFile("shfmt.sh").sameAsResource(fileDir + "shfmt.clean");
 	}
 }
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/shell/ShellTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/shell/ShellTest.java
index f3746d843d..723e39ba4e 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/shell/ShellTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/shell/ShellTest.java
@@ -28,7 +28,7 @@ public class ShellTest extends MavenIntegrationHarness {
 
 	@Test
 	public void testFormatShellWithEditorconfig() throws Exception {
-		String fileDir = "shell/shfmt/with-config/";
+		String fileDir = "shell/shfmt/singlefile/with-config/";
 		setFile("shfmt.sh").toResource(fileDir + "shfmt.sh");
 		setFile(".editorconfig").toResource(fileDir + ".editorconfig");
 
@@ -40,7 +40,7 @@ public void testFormatShellWithEditorconfig() throws Exception {
 
 	@Test
 	public void testFormatShellWithoutEditorconfig() throws Exception {
-		String fileDir = "shell/shfmt/without-config/";
+		String fileDir = "shell/shfmt/singlefile/without-config/";
 		setFile("shfmt.sh").toResource(fileDir + "shfmt.sh");
 
 		writePomWithShellSteps("<shfmt/>");
diff --git a/testlib/src/main/resources/shell/shfmt/with-config/.editorconfig b/testlib/src/main/resources/shell/shfmt/multifile/with-config/.editorconfig
similarity index 100%
rename from testlib/src/main/resources/shell/shfmt/with-config/.editorconfig
rename to testlib/src/main/resources/shell/shfmt/multifile/with-config/.editorconfig
diff --git a/testlib/src/main/resources/shell/shfmt/multifile/with-config/other.clean b/testlib/src/main/resources/shell/shfmt/multifile/with-config/other.clean
new file mode 100644
index 0000000000..ba84ece688
--- /dev/null
+++ b/testlib/src/main/resources/shell/shfmt/multifile/with-config/other.clean
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+fruit="apple"
+
+case $fruit in
+  "apple")
+    echo "This is a red fruit."
+    ;;
+  "banana")
+    echo "This is a yellow fruit."
+    ;;
+  "orange")
+    echo "This is an orange fruit."
+    ;;
+  *)
+    echo "Unknown fruit."
+    ;;
+esac
+
+echo "This is some text." > output.txt
diff --git a/testlib/src/main/resources/shell/shfmt/multifile/with-config/other.sh b/testlib/src/main/resources/shell/shfmt/multifile/with-config/other.sh
new file mode 100644
index 0000000000..58f97b8276
--- /dev/null
+++ b/testlib/src/main/resources/shell/shfmt/multifile/with-config/other.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+fruit="apple"
+
+case $fruit in
+    "apple")
+        echo "This is a red fruit."
+    ;;
+    "banana")
+        echo "This is a yellow fruit."
+;;
+    "orange")
+        echo "This is an orange fruit."
+      ;;
+    *)
+          echo "Unknown fruit."
+        ;;
+esac
+
+      echo "This is some text." >       output.txt
diff --git a/testlib/src/main/resources/shell/shfmt/with-config/shfmt.clean b/testlib/src/main/resources/shell/shfmt/multifile/with-config/shfmt.clean
similarity index 100%
rename from testlib/src/main/resources/shell/shfmt/with-config/shfmt.clean
rename to testlib/src/main/resources/shell/shfmt/multifile/with-config/shfmt.clean
diff --git a/testlib/src/main/resources/shell/shfmt/with-config/shfmt.sh b/testlib/src/main/resources/shell/shfmt/multifile/with-config/shfmt.sh
similarity index 100%
rename from testlib/src/main/resources/shell/shfmt/with-config/shfmt.sh
rename to testlib/src/main/resources/shell/shfmt/multifile/with-config/shfmt.sh
diff --git a/testlib/src/main/resources/shell/shfmt/multifile/without-config/other.clean b/testlib/src/main/resources/shell/shfmt/multifile/without-config/other.clean
new file mode 100644
index 0000000000..cba42806aa
--- /dev/null
+++ b/testlib/src/main/resources/shell/shfmt/multifile/without-config/other.clean
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+fruit="apple"
+
+case $fruit in
+"apple")
+	echo "This is a red fruit."
+	;;
+"banana")
+	echo "This is a yellow fruit."
+	;;
+"orange")
+	echo "This is an orange fruit."
+	;;
+*)
+	echo "Unknown fruit."
+	;;
+esac
+
+echo "This is some text." >output.txt
diff --git a/testlib/src/main/resources/shell/shfmt/multifile/without-config/other.sh b/testlib/src/main/resources/shell/shfmt/multifile/without-config/other.sh
new file mode 100644
index 0000000000..58f97b8276
--- /dev/null
+++ b/testlib/src/main/resources/shell/shfmt/multifile/without-config/other.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+fruit="apple"
+
+case $fruit in
+    "apple")
+        echo "This is a red fruit."
+    ;;
+    "banana")
+        echo "This is a yellow fruit."
+;;
+    "orange")
+        echo "This is an orange fruit."
+      ;;
+    *)
+          echo "Unknown fruit."
+        ;;
+esac
+
+      echo "This is some text." >       output.txt
diff --git a/testlib/src/main/resources/shell/shfmt/without-config/shfmt.clean b/testlib/src/main/resources/shell/shfmt/multifile/without-config/shfmt.clean
similarity index 100%
rename from testlib/src/main/resources/shell/shfmt/without-config/shfmt.clean
rename to testlib/src/main/resources/shell/shfmt/multifile/without-config/shfmt.clean
diff --git a/testlib/src/main/resources/shell/shfmt/without-config/shfmt.sh b/testlib/src/main/resources/shell/shfmt/multifile/without-config/shfmt.sh
similarity index 100%
rename from testlib/src/main/resources/shell/shfmt/without-config/shfmt.sh
rename to testlib/src/main/resources/shell/shfmt/multifile/without-config/shfmt.sh
diff --git a/testlib/src/main/resources/shell/shfmt/singlefile/with-config/.editorconfig b/testlib/src/main/resources/shell/shfmt/singlefile/with-config/.editorconfig
new file mode 100644
index 0000000000..8a7d8d6043
--- /dev/null
+++ b/testlib/src/main/resources/shell/shfmt/singlefile/with-config/.editorconfig
@@ -0,0 +1,10 @@
+root = true
+
+[*]
+charset = utf-8
+
+[*.sh]
+indent_style = space
+indent_size = 2
+space_redirects = true
+switch_case_indent = true
diff --git a/testlib/src/main/resources/shell/shfmt/singlefile/with-config/shfmt.clean b/testlib/src/main/resources/shell/shfmt/singlefile/with-config/shfmt.clean
new file mode 100644
index 0000000000..c1b9b25064
--- /dev/null
+++ b/testlib/src/main/resources/shell/shfmt/singlefile/with-config/shfmt.clean
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+function foo() {
+  if [ -x $file ]; then
+    myArray=(item1 item2 item3)
+  elif [ $file1 -nt $file2 ]; then
+    unset myArray
+  else
+    echo "Usage: $0 file ..."
+  fi
+}
+
+for ((i = 0; i < 5; i++)); do
+  read -p r
+  print -n $r
+  wait $!
+done
diff --git a/testlib/src/main/resources/shell/shfmt/singlefile/with-config/shfmt.sh b/testlib/src/main/resources/shell/shfmt/singlefile/with-config/shfmt.sh
new file mode 100644
index 0000000000..9d15c477d4
--- /dev/null
+++ b/testlib/src/main/resources/shell/shfmt/singlefile/with-config/shfmt.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+function foo() {
+    if [ -x $file ]; then
+              myArray=(item1 item2 item3)
+  elif [ $file1 -nt $file2 ]
+    then
+        unset myArray
+        else
+echo "Usage: $0 file ..."
+    fi
+}
+
+for ((i = 0; i < 5; i++)); do
+    read -p r
+  print -n $r
+  wait $!
+done
diff --git a/testlib/src/main/resources/shell/shfmt/singlefile/without-config/shfmt.clean b/testlib/src/main/resources/shell/shfmt/singlefile/without-config/shfmt.clean
new file mode 100644
index 0000000000..80386d472e
--- /dev/null
+++ b/testlib/src/main/resources/shell/shfmt/singlefile/without-config/shfmt.clean
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+function foo() {
+	if [ -x $file ]; then
+		myArray=(item1 item2 item3)
+	elif [ $file1 -nt $file2 ]; then
+		unset myArray
+	else
+		echo "Usage: $0 file ..."
+	fi
+}
+
+for ((i = 0; i < 5; i++)); do
+	read -p r
+	print -n $r
+	wait $!
+done
diff --git a/testlib/src/main/resources/shell/shfmt/singlefile/without-config/shfmt.sh b/testlib/src/main/resources/shell/shfmt/singlefile/without-config/shfmt.sh
new file mode 100644
index 0000000000..9d15c477d4
--- /dev/null
+++ b/testlib/src/main/resources/shell/shfmt/singlefile/without-config/shfmt.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+function foo() {
+    if [ -x $file ]; then
+              myArray=(item1 item2 item3)
+  elif [ $file1 -nt $file2 ]
+    then
+        unset myArray
+        else
+echo "Usage: $0 file ..."
+    fi
+}
+
+for ((i = 0; i < 5; i++)); do
+    read -p r
+  print -n $r
+  wait $!
+done
diff --git a/testlib/src/test/java/com/diffplug/spotless/shell/ShfmtStepTest.java b/testlib/src/test/java/com/diffplug/spotless/shell/ShfmtStepTest.java
index 821af2468b..c2d8edd15b 100644
--- a/testlib/src/test/java/com/diffplug/spotless/shell/ShfmtStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/shell/ShfmtStepTest.java
@@ -26,11 +26,11 @@ public class ShfmtStepTest extends ResourceHarness {
 	@Test
 	void testWithEditorconfig() throws Exception {
 		try (StepHarnessWithFile harness = StepHarnessWithFile.forStep(this, ShfmtStep.withVersion(ShfmtStep.defaultVersion()).create())) {
-			final String filedir = "shell/shfmt/with-config/";
-			final String dirtyFile = filedir + "shfmt.sh";
-			final String cleanFile = filedir + "shfmt.clean";
+			final String fileDir = "shell/shfmt/singlefile/with-config/";
+			final String dirtyFile = fileDir + "shfmt.sh";
+			final String cleanFile = fileDir + "shfmt.clean";
 
-			setFile(".editorconfig").toResource(filedir + ".editorconfig");
+			setFile(".editorconfig").toResource(fileDir + ".editorconfig");
 
 			harness.testResource(dirtyFile, cleanFile);
 		}
@@ -39,9 +39,9 @@ void testWithEditorconfig() throws Exception {
 	@Test
 	void testWithoutEditorconfig() throws Exception {
 		try (StepHarnessWithFile harness = StepHarnessWithFile.forStep(this, ShfmtStep.withVersion(ShfmtStep.defaultVersion()).create())) {
-			final String filedir = "shell/shfmt/without-config/";
-			final String dirtyFile = filedir + "shfmt.sh";
-			final String cleanFile = filedir + "shfmt.clean";
+			final String fileDir = "shell/shfmt/singlefile/without-config/";
+			final String dirtyFile = fileDir + "shfmt.sh";
+			final String cleanFile = fileDir + "shfmt.clean";
 
 			harness.testResource(dirtyFile, cleanFile);
 		}

From 8bf8d8fd5b5b10ed5138d8a3d6108ba740f8340c Mon Sep 17 00:00:00 2001
From: Tyler Crawford <tcrawford@figure.com>
Date: Thu, 1 Feb 2024 14:02:37 -0500
Subject: [PATCH 1496/2068] Add multi-file shfmt tests for maven

---
 .../spotless/maven/shell/ShellTest.java       | 31 +++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/shell/ShellTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/shell/ShellTest.java
index 723e39ba4e..a8ac7305e3 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/shell/ShellTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/shell/ShellTest.java
@@ -27,7 +27,7 @@ public class ShellTest extends MavenIntegrationHarness {
 	private static final Logger LOGGER = LoggerFactory.getLogger(ShellTest.class);
 
 	@Test
-	public void testFormatShellWithEditorconfig() throws Exception {
+	public void testSingleFileFormatShellWithEditorconfig() throws Exception {
 		String fileDir = "shell/shfmt/singlefile/with-config/";
 		setFile("shfmt.sh").toResource(fileDir + "shfmt.sh");
 		setFile(".editorconfig").toResource(fileDir + ".editorconfig");
@@ -39,7 +39,7 @@ public void testFormatShellWithEditorconfig() throws Exception {
 	}
 
 	@Test
-	public void testFormatShellWithoutEditorconfig() throws Exception {
+	public void testSingleFileFormatShellWithoutEditorconfig() throws Exception {
 		String fileDir = "shell/shfmt/singlefile/without-config/";
 		setFile("shfmt.sh").toResource(fileDir + "shfmt.sh");
 
@@ -48,4 +48,31 @@ public void testFormatShellWithoutEditorconfig() throws Exception {
 
 		assertFile("shfmt.sh").sameAsResource(fileDir + "shfmt.clean");
 	}
+
+	@Test
+	public void testMultiFileFormatShellWithEditorconfig() throws Exception {
+		String fileDir = "shell/shfmt/multifile/with-config/";
+		setFile("shfmt.sh").toResource(fileDir + "shfmt.sh");
+		setFile("other.sh").toResource(fileDir + "other.sh");
+		setFile(".editorconfig").toResource(fileDir + ".editorconfig");
+
+		writePomWithShellSteps("<shfmt/>");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+
+		assertFile("shfmt.sh").sameAsResource(fileDir + "shfmt.clean");
+		assertFile("other.sh").sameAsResource(fileDir + "other.clean");
+	}
+
+	@Test
+	public void testMultiFileFormatShellWithoutEditorconfig() throws Exception {
+		String fileDir = "shell/shfmt/multifile/without-config/";
+		setFile("shfmt.sh").toResource(fileDir + "shfmt.sh");
+		setFile("other.sh").toResource(fileDir + "other.sh");
+
+		writePomWithShellSteps("<shfmt/>");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+
+		assertFile("shfmt.sh").sameAsResource(fileDir + "shfmt.clean");
+		assertFile("other.sh").sameAsResource(fileDir + "other.clean");
+	}
 }

From 4c4b7bce005b2b3d84c45958500068ba4cc1f370 Mon Sep 17 00:00:00 2001
From: Tyler Crawford <91682066+tcrawford-figure@users.noreply.github.com>
Date: Fri, 2 Feb 2024 09:00:04 -0500
Subject: [PATCH 1497/2068] Fix plugin-gradle/README.md typo

Co-authored-by: Zongle Wang <wangzongler@gmail.com>
---
 plugin-gradle/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 4f2d0e6930..89d72e034b 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -1004,7 +1004,7 @@ spotless {
 [homepage](https://github.com/mvdan/sh). [changelog](https://github.com/mvdan/sh/blob/master/CHANGELOG.md).
 
 When formatting shell scripts via `shfmt`, configure `shfmt` settings via `.editorconfig`. 
-Refer to the `shfmt` man page for `.editorconfig` settings. 
+Refer to the `shfmt` main page for `.editorconfig` settings. 
 
 ```gradle
 shfmt('3.7.0') // version is optional

From 2c382477ba80e22adb612194727671726c37f805 Mon Sep 17 00:00:00 2001
From: Tyler Crawford <tcrawford@figure.com>
Date: Mon, 5 Feb 2024 11:46:04 -0500
Subject: [PATCH 1498/2068] Fix how Shfmt args are constructed, tidy tests

---
 .../diffplug/spotless/shell/ShfmtStep.java    | 12 ++++-
 .../gradle/spotless/ShellExtensionTest.java   | 54 +++----------------
 .../spotless/maven/shell/ShellTest.java       | 43 +++------------
 .../singlefile/with-config/.editorconfig      | 10 ----
 .../shfmt/singlefile/with-config/shfmt.clean  | 17 ------
 .../shfmt/singlefile/with-config/shfmt.sh     | 18 -------
 .../singlefile/without-config/shfmt.clean     | 17 ------
 .../shfmt/singlefile/without-config/shfmt.sh  | 18 -------
 .../{multifile => }/with-config/.editorconfig |  0
 .../{multifile => }/with-config/other.clean   |  0
 .../{multifile => }/with-config/other.sh      |  0
 .../{multifile => }/with-config/shfmt.clean   |  0
 .../{multifile => }/with-config/shfmt.sh      |  0
 .../without-config/other.clean                |  0
 .../{multifile => }/without-config/other.sh   |  0
 .../without-config/shfmt.clean                |  0
 .../{multifile => }/without-config/shfmt.sh   |  0
 .../spotless/shell/ShfmtStepTest.java         |  4 +-
 18 files changed, 28 insertions(+), 165 deletions(-)
 delete mode 100644 testlib/src/main/resources/shell/shfmt/singlefile/with-config/.editorconfig
 delete mode 100644 testlib/src/main/resources/shell/shfmt/singlefile/with-config/shfmt.clean
 delete mode 100644 testlib/src/main/resources/shell/shfmt/singlefile/with-config/shfmt.sh
 delete mode 100644 testlib/src/main/resources/shell/shfmt/singlefile/without-config/shfmt.clean
 delete mode 100644 testlib/src/main/resources/shell/shfmt/singlefile/without-config/shfmt.sh
 rename testlib/src/main/resources/shell/shfmt/{multifile => }/with-config/.editorconfig (100%)
 rename testlib/src/main/resources/shell/shfmt/{multifile => }/with-config/other.clean (100%)
 rename testlib/src/main/resources/shell/shfmt/{multifile => }/with-config/other.sh (100%)
 rename testlib/src/main/resources/shell/shfmt/{multifile => }/with-config/shfmt.clean (100%)
 rename testlib/src/main/resources/shell/shfmt/{multifile => }/with-config/shfmt.sh (100%)
 rename testlib/src/main/resources/shell/shfmt/{multifile => }/without-config/other.clean (100%)
 rename testlib/src/main/resources/shell/shfmt/{multifile => }/without-config/other.sh (100%)
 rename testlib/src/main/resources/shell/shfmt/{multifile => }/without-config/shfmt.clean (100%)
 rename testlib/src/main/resources/shell/shfmt/{multifile => }/without-config/shfmt.sh (100%)

diff --git a/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java b/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java
index b92c55c686..4203a8ed7f 100644
--- a/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java
@@ -22,6 +22,8 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import javax.annotation.Nullable;
 
@@ -98,10 +100,16 @@ static class State implements Serializable {
 
 		String format(ProcessRunner runner, String input, File file) throws IOException, InterruptedException {
 			if (args == null) {
-				args = List.of(exe.confirmVersionAndGetAbsolutePath(), "--filename", file.getPath());
+				// args will be reused during a single spotless task execution,
+				// so this "prefix" is being "cached" for each spotless task.
+				args = List.of(exe.confirmVersionAndGetAbsolutePath(), "--filename");
 			}
 
-			return runner.exec(input.getBytes(StandardCharsets.UTF_8), args).assertExitZero(StandardCharsets.UTF_8);
+			// This will ensure that the next file name is retrieved on every format
+			final List<String> finalArgs = Stream.concat(args.stream(), Stream.of(file.getAbsolutePath()))
+					.collect(Collectors.toList());
+
+			return runner.exec(input.getBytes(StandardCharsets.UTF_8), finalArgs).assertExitZero(StandardCharsets.UTF_8);
 		}
 
 		FormatterFunc.Closeable toFunc() {
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ShellExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ShellExtensionTest.java
index 6e75b5b17d..2860325132 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ShellExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ShellExtensionTest.java
@@ -23,10 +23,11 @@
 
 @ShfmtTest
 public class ShellExtensionTest extends GradleIntegrationHarness {
+
 	@Test
 	void shfmtWithEditorconfig() throws IOException {
-		String fileDir = "shell/shfmt/singlefile/with-config/";
-		setFile(".editorconfig").toResource(fileDir + ".editorconfig");
+		String fileDir = "shell/shfmt/with-config/";
+
 		setFile("build.gradle.kts").toLines(
 				"plugins {",
 				"  id(\"com.diffplug.spotless\")",
@@ -37,59 +38,20 @@ void shfmtWithEditorconfig() throws IOException {
 				"  }",
 				"}");
 
-		setFile("shfmt.sh").toResource(fileDir + "shfmt.sh");
-
-		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("shfmt.sh").sameAsResource(fileDir + "shfmt.clean");
-	}
-
-	@Test
-	void shfmtMultipleFilesWithEditorconfig() throws IOException {
-		String fileDir = "shell/shfmt/multifile/with-config/";
-
 		setFile(".editorconfig").toResource(fileDir + ".editorconfig");
-		setFile("build.gradle.kts").toLines(
-				"plugins {",
-				"  id(\"com.diffplug.spotless\")",
-				"}",
-				"spotless {",
-				"  shell {",
-				"    shfmt()",
-				"  }",
-				"}");
 
 		setFile("shfmt.sh").toResource(fileDir + "shfmt.sh");
-		setFile("other.sh").toResource(fileDir + "other.sh");
+		setFile("scripts/other.sh").toResource(fileDir + "other.sh");
 
 		gradleRunner().withArguments("spotlessApply").build();
 
-		assertFile("other.sh").sameAsResource(fileDir + "other.clean");
 		assertFile("shfmt.sh").sameAsResource(fileDir + "shfmt.clean");
+		assertFile("scripts/other.sh").sameAsResource(fileDir + "other.clean");
 	}
 
 	@Test
 	void shfmtWithoutEditorconfig() throws IOException {
-		String fileDir = "shell/shfmt/singlefile/without-config/";
-
-		setFile("build.gradle.kts").toLines(
-				"plugins {",
-				"  id(\"com.diffplug.spotless\")",
-				"}",
-				"spotless {",
-				"  shell {",
-				"    shfmt()",
-				"  }",
-				"}");
-
-		setFile("shfmt.sh").toResource(fileDir + "shfmt.sh");
-
-		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("shfmt.sh").sameAsResource(fileDir + "shfmt.clean");
-	}
-
-	@Test
-	void shfmtMultipleFilesWithoutEditorconfig() throws IOException {
-		String fileDir = "shell/shfmt/multifile/without-config/";
+		String fileDir = "shell/shfmt/without-config/";
 
 		setFile("build.gradle.kts").toLines(
 				"plugins {",
@@ -102,11 +64,11 @@ void shfmtMultipleFilesWithoutEditorconfig() throws IOException {
 				"}");
 
 		setFile("shfmt.sh").toResource(fileDir + "shfmt.sh");
-		setFile("other.sh").toResource(fileDir + "other.sh");
+		setFile("scripts/other.sh").toResource(fileDir + "other.sh");
 
 		gradleRunner().withArguments("spotlessApply").build();
 
-		assertFile("other.sh").sameAsResource(fileDir + "other.clean");
 		assertFile("shfmt.sh").sameAsResource(fileDir + "shfmt.clean");
+		assertFile("scripts/other.sh").sameAsResource(fileDir + "other.clean");
 	}
 }
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/shell/ShellTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/shell/ShellTest.java
index a8ac7305e3..534835c644 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/shell/ShellTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/shell/ShellTest.java
@@ -16,63 +16,36 @@
 package com.diffplug.spotless.maven.shell;
 
 import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
 import com.diffplug.spotless.tag.ShfmtTest;
 
 @ShfmtTest
 public class ShellTest extends MavenIntegrationHarness {
-	private static final Logger LOGGER = LoggerFactory.getLogger(ShellTest.class);
-
-	@Test
-	public void testSingleFileFormatShellWithEditorconfig() throws Exception {
-		String fileDir = "shell/shfmt/singlefile/with-config/";
-		setFile("shfmt.sh").toResource(fileDir + "shfmt.sh");
-		setFile(".editorconfig").toResource(fileDir + ".editorconfig");
-
-		writePomWithShellSteps("<shfmt/>");
-		mavenRunner().withArguments("spotless:apply").runNoError();
-
-		assertFile("shfmt.sh").sameAsResource(fileDir + "shfmt.clean");
-	}
-
-	@Test
-	public void testSingleFileFormatShellWithoutEditorconfig() throws Exception {
-		String fileDir = "shell/shfmt/singlefile/without-config/";
-		setFile("shfmt.sh").toResource(fileDir + "shfmt.sh");
-
-		writePomWithShellSteps("<shfmt/>");
-		mavenRunner().withArguments("spotless:apply").runNoError();
-
-		assertFile("shfmt.sh").sameAsResource(fileDir + "shfmt.clean");
-	}
-
 	@Test
-	public void testMultiFileFormatShellWithEditorconfig() throws Exception {
-		String fileDir = "shell/shfmt/multifile/with-config/";
+	public void testFormatShellWithEditorconfig() throws Exception {
+		String fileDir = "shell/shfmt/with-config/";
 		setFile("shfmt.sh").toResource(fileDir + "shfmt.sh");
-		setFile("other.sh").toResource(fileDir + "other.sh");
+		setFile("scripts/other.sh").toResource(fileDir + "other.sh");
 		setFile(".editorconfig").toResource(fileDir + ".editorconfig");
 
 		writePomWithShellSteps("<shfmt/>");
 		mavenRunner().withArguments("spotless:apply").runNoError();
 
 		assertFile("shfmt.sh").sameAsResource(fileDir + "shfmt.clean");
-		assertFile("other.sh").sameAsResource(fileDir + "other.clean");
+		assertFile("scripts/other.sh").sameAsResource(fileDir + "other.clean");
 	}
 
 	@Test
-	public void testMultiFileFormatShellWithoutEditorconfig() throws Exception {
-		String fileDir = "shell/shfmt/multifile/without-config/";
+	public void testFormatShellWithoutEditorconfig() throws Exception {
+		String fileDir = "shell/shfmt/without-config/";
 		setFile("shfmt.sh").toResource(fileDir + "shfmt.sh");
-		setFile("other.sh").toResource(fileDir + "other.sh");
+		setFile("scripts/other.sh").toResource(fileDir + "other.sh");
 
 		writePomWithShellSteps("<shfmt/>");
 		mavenRunner().withArguments("spotless:apply").runNoError();
 
 		assertFile("shfmt.sh").sameAsResource(fileDir + "shfmt.clean");
-		assertFile("other.sh").sameAsResource(fileDir + "other.clean");
+		assertFile("scripts/other.sh").sameAsResource(fileDir + "other.clean");
 	}
 }
diff --git a/testlib/src/main/resources/shell/shfmt/singlefile/with-config/.editorconfig b/testlib/src/main/resources/shell/shfmt/singlefile/with-config/.editorconfig
deleted file mode 100644
index 8a7d8d6043..0000000000
--- a/testlib/src/main/resources/shell/shfmt/singlefile/with-config/.editorconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-root = true
-
-[*]
-charset = utf-8
-
-[*.sh]
-indent_style = space
-indent_size = 2
-space_redirects = true
-switch_case_indent = true
diff --git a/testlib/src/main/resources/shell/shfmt/singlefile/with-config/shfmt.clean b/testlib/src/main/resources/shell/shfmt/singlefile/with-config/shfmt.clean
deleted file mode 100644
index c1b9b25064..0000000000
--- a/testlib/src/main/resources/shell/shfmt/singlefile/with-config/shfmt.clean
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-function foo() {
-  if [ -x $file ]; then
-    myArray=(item1 item2 item3)
-  elif [ $file1 -nt $file2 ]; then
-    unset myArray
-  else
-    echo "Usage: $0 file ..."
-  fi
-}
-
-for ((i = 0; i < 5; i++)); do
-  read -p r
-  print -n $r
-  wait $!
-done
diff --git a/testlib/src/main/resources/shell/shfmt/singlefile/with-config/shfmt.sh b/testlib/src/main/resources/shell/shfmt/singlefile/with-config/shfmt.sh
deleted file mode 100644
index 9d15c477d4..0000000000
--- a/testlib/src/main/resources/shell/shfmt/singlefile/with-config/shfmt.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-
-function foo() {
-    if [ -x $file ]; then
-              myArray=(item1 item2 item3)
-  elif [ $file1 -nt $file2 ]
-    then
-        unset myArray
-        else
-echo "Usage: $0 file ..."
-    fi
-}
-
-for ((i = 0; i < 5; i++)); do
-    read -p r
-  print -n $r
-  wait $!
-done
diff --git a/testlib/src/main/resources/shell/shfmt/singlefile/without-config/shfmt.clean b/testlib/src/main/resources/shell/shfmt/singlefile/without-config/shfmt.clean
deleted file mode 100644
index 80386d472e..0000000000
--- a/testlib/src/main/resources/shell/shfmt/singlefile/without-config/shfmt.clean
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-function foo() {
-	if [ -x $file ]; then
-		myArray=(item1 item2 item3)
-	elif [ $file1 -nt $file2 ]; then
-		unset myArray
-	else
-		echo "Usage: $0 file ..."
-	fi
-}
-
-for ((i = 0; i < 5; i++)); do
-	read -p r
-	print -n $r
-	wait $!
-done
diff --git a/testlib/src/main/resources/shell/shfmt/singlefile/without-config/shfmt.sh b/testlib/src/main/resources/shell/shfmt/singlefile/without-config/shfmt.sh
deleted file mode 100644
index 9d15c477d4..0000000000
--- a/testlib/src/main/resources/shell/shfmt/singlefile/without-config/shfmt.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-
-function foo() {
-    if [ -x $file ]; then
-              myArray=(item1 item2 item3)
-  elif [ $file1 -nt $file2 ]
-    then
-        unset myArray
-        else
-echo "Usage: $0 file ..."
-    fi
-}
-
-for ((i = 0; i < 5; i++)); do
-    read -p r
-  print -n $r
-  wait $!
-done
diff --git a/testlib/src/main/resources/shell/shfmt/multifile/with-config/.editorconfig b/testlib/src/main/resources/shell/shfmt/with-config/.editorconfig
similarity index 100%
rename from testlib/src/main/resources/shell/shfmt/multifile/with-config/.editorconfig
rename to testlib/src/main/resources/shell/shfmt/with-config/.editorconfig
diff --git a/testlib/src/main/resources/shell/shfmt/multifile/with-config/other.clean b/testlib/src/main/resources/shell/shfmt/with-config/other.clean
similarity index 100%
rename from testlib/src/main/resources/shell/shfmt/multifile/with-config/other.clean
rename to testlib/src/main/resources/shell/shfmt/with-config/other.clean
diff --git a/testlib/src/main/resources/shell/shfmt/multifile/with-config/other.sh b/testlib/src/main/resources/shell/shfmt/with-config/other.sh
similarity index 100%
rename from testlib/src/main/resources/shell/shfmt/multifile/with-config/other.sh
rename to testlib/src/main/resources/shell/shfmt/with-config/other.sh
diff --git a/testlib/src/main/resources/shell/shfmt/multifile/with-config/shfmt.clean b/testlib/src/main/resources/shell/shfmt/with-config/shfmt.clean
similarity index 100%
rename from testlib/src/main/resources/shell/shfmt/multifile/with-config/shfmt.clean
rename to testlib/src/main/resources/shell/shfmt/with-config/shfmt.clean
diff --git a/testlib/src/main/resources/shell/shfmt/multifile/with-config/shfmt.sh b/testlib/src/main/resources/shell/shfmt/with-config/shfmt.sh
similarity index 100%
rename from testlib/src/main/resources/shell/shfmt/multifile/with-config/shfmt.sh
rename to testlib/src/main/resources/shell/shfmt/with-config/shfmt.sh
diff --git a/testlib/src/main/resources/shell/shfmt/multifile/without-config/other.clean b/testlib/src/main/resources/shell/shfmt/without-config/other.clean
similarity index 100%
rename from testlib/src/main/resources/shell/shfmt/multifile/without-config/other.clean
rename to testlib/src/main/resources/shell/shfmt/without-config/other.clean
diff --git a/testlib/src/main/resources/shell/shfmt/multifile/without-config/other.sh b/testlib/src/main/resources/shell/shfmt/without-config/other.sh
similarity index 100%
rename from testlib/src/main/resources/shell/shfmt/multifile/without-config/other.sh
rename to testlib/src/main/resources/shell/shfmt/without-config/other.sh
diff --git a/testlib/src/main/resources/shell/shfmt/multifile/without-config/shfmt.clean b/testlib/src/main/resources/shell/shfmt/without-config/shfmt.clean
similarity index 100%
rename from testlib/src/main/resources/shell/shfmt/multifile/without-config/shfmt.clean
rename to testlib/src/main/resources/shell/shfmt/without-config/shfmt.clean
diff --git a/testlib/src/main/resources/shell/shfmt/multifile/without-config/shfmt.sh b/testlib/src/main/resources/shell/shfmt/without-config/shfmt.sh
similarity index 100%
rename from testlib/src/main/resources/shell/shfmt/multifile/without-config/shfmt.sh
rename to testlib/src/main/resources/shell/shfmt/without-config/shfmt.sh
diff --git a/testlib/src/test/java/com/diffplug/spotless/shell/ShfmtStepTest.java b/testlib/src/test/java/com/diffplug/spotless/shell/ShfmtStepTest.java
index c2d8edd15b..2d764d877f 100644
--- a/testlib/src/test/java/com/diffplug/spotless/shell/ShfmtStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/shell/ShfmtStepTest.java
@@ -26,7 +26,7 @@ public class ShfmtStepTest extends ResourceHarness {
 	@Test
 	void testWithEditorconfig() throws Exception {
 		try (StepHarnessWithFile harness = StepHarnessWithFile.forStep(this, ShfmtStep.withVersion(ShfmtStep.defaultVersion()).create())) {
-			final String fileDir = "shell/shfmt/singlefile/with-config/";
+			final String fileDir = "shell/shfmt/with-config/";
 			final String dirtyFile = fileDir + "shfmt.sh";
 			final String cleanFile = fileDir + "shfmt.clean";
 
@@ -39,7 +39,7 @@ void testWithEditorconfig() throws Exception {
 	@Test
 	void testWithoutEditorconfig() throws Exception {
 		try (StepHarnessWithFile harness = StepHarnessWithFile.forStep(this, ShfmtStep.withVersion(ShfmtStep.defaultVersion()).create())) {
-			final String fileDir = "shell/shfmt/singlefile/without-config/";
+			final String fileDir = "shell/shfmt/without-config/";
 			final String dirtyFile = fileDir + "shfmt.sh";
 			final String cleanFile = fileDir + "shfmt.clean";
 

From 28b079cf42d2b2cc3b0f6847b4a0aeef86e548be Mon Sep 17 00:00:00 2001
From: Tyler Crawford <tcrawford@figure.com>
Date: Mon, 5 Feb 2024 16:30:58 -0500
Subject: [PATCH 1499/2068] Include shfmt check in ci build

---
 .github/workflows/ci.yml | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6a767bc2bb..ba6d40388f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,7 +5,7 @@
 on:
   pull_request:
   push:
-    branches: [main]
+    branches: [ main ]
   workflow_dispatch:
 
 concurrency:
@@ -23,17 +23,21 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+
       - name: Install JDK 11
         uses: actions/setup-java@v4
         with:
           distribution: "temurin"
           java-version: 11
+
       - name: gradle caching
         uses: gradle/actions/setup-gradle@v3
         with:
           gradle-home-cache-cleanup: true
+
       - name: spotlessCheck
         run: ./gradlew spotlessCheck
+
       - name: assemble testClasses
         run: ./gradlew assemble testClasses
   build:
@@ -41,10 +45,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kind: [maven, gradle]
+        kind: [ maven, gradle ]
         # Test on the latest Java version once Gradle & Maven support it.
-        jre: [11, 17, 21]
-        os: [ubuntu-latest]
+        jre: [ 11, 17, 21 ]
+        os: [ ubuntu-latest ]
         include:
           # test windows at the diagonals of the above matrix
           - kind: maven
@@ -57,28 +61,48 @@ jobs:
           - kind: npm
             jre: 11
             os: ubuntu-latest
+          - kind: shfmt
+            jre: 11
+            os: ubuntu-latest
+            shfmt-version: 3.7.0
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+
       - name: Install JDK ${{ matrix.distribution }} ${{ matrix.java_version }}
         uses: actions/setup-java@v4
         with:
           distribution: "temurin"
           java-version: ${{ matrix.jre }}
+
       - name: gradle caching
         uses: gradle/actions/setup-gradle@v3
         with:
           gradle-home-cache-cleanup: true
+
       - name: build (maven-only)
         if: matrix.kind == 'maven'
         run: ./gradlew :plugin-maven:build -x spotlessCheck
+
       - name: build (everything-but-maven)
         if: matrix.kind == 'gradle'
         run: ./gradlew build -x spotlessCheck -PSPOTLESS_EXCLUDE_MAVEN=true
+
       - name: test npm
         if: matrix.kind == 'npm'
         run: ./gradlew testNpm
+
+      - name: Install shfmt
+        if: matrix.kind == 'shfmt'
+        run: |
+          curl -sSfL "https://github.com/mvdan/sh/releases/download/v${{ matrix.shfmt-version }}/shfmt_v${{ matrix.shfmt-version }}_linux_amd64" -o /usr/local/bin/shfmt
+          chmod +x /usr/local/bin/shfmt
+
+      - name: Test shfmt
+        if: matrix.kind == 'shfmt'
+        run: ./gradlew testShfmt
+
       - name: junit result
         uses: mikepenz/action-junit-report@v4
         if: always() # always run even if the previous step fails

From 62f27ca84ec8c89094057b2850a9fdaba24fc8ae Mon Sep 17 00:00:00 2001
From: Tyler Crawford <tcrawford@figure.com>
Date: Mon, 5 Feb 2024 16:58:54 -0500
Subject: [PATCH 1500/2068] Fix version regex to only match digits and '.'

---
 .github/workflows/ci.yml                                     | 4 ++--
 lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ba6d40388f..58b3e9bd8a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -96,8 +96,8 @@ jobs:
       - name: Install shfmt
         if: matrix.kind == 'shfmt'
         run: |
-          curl -sSfL "https://github.com/mvdan/sh/releases/download/v${{ matrix.shfmt-version }}/shfmt_v${{ matrix.shfmt-version }}_linux_amd64" -o /usr/local/bin/shfmt
-          chmod +x /usr/local/bin/shfmt
+          sudo curl -sSfL "https://github.com/mvdan/sh/releases/download/v${{ matrix.shfmt-version }}/shfmt_v${{ matrix.shfmt-version }}_linux_amd64" -o /usr/local/bin/shfmt
+          sudo chmod +x /usr/local/bin/shfmt
 
       - name: Test shfmt
         if: matrix.kind == 'shfmt'
diff --git a/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java b/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java
index 4203a8ed7f..971dce6b03 100644
--- a/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java
@@ -74,7 +74,7 @@ private State createState() throws IOException, InterruptedException {
 				"\n    github issue to handle this better: https://github.com/diffplug/spotless/issues/673";
 		final ForeignExe exe = ForeignExe.nameAndVersion("shfmt", version)
 				.pathToExe(pathToExe)
-				.versionRegex(Pattern.compile("(\\S*)"))
+				.versionRegex(Pattern.compile("([\\d.]+)"))
 				.fixCantFind(howToInstall)
 				.fixWrongVersion(
 						"You can tell Spotless to use the version you already have with {@code shfmt('{versionFound}')}" +

From 42b43dc2eac7891178411274b80cf8364623d6b0 Mon Sep 17 00:00:00 2001
From: Tyler Crawford <tcrawford@figure.com>
Date: Mon, 5 Feb 2024 16:59:21 -0500
Subject: [PATCH 1501/2068] Remove sudo, it should be unnecessary

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 58b3e9bd8a..ba6d40388f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -96,8 +96,8 @@ jobs:
       - name: Install shfmt
         if: matrix.kind == 'shfmt'
         run: |
-          sudo curl -sSfL "https://github.com/mvdan/sh/releases/download/v${{ matrix.shfmt-version }}/shfmt_v${{ matrix.shfmt-version }}_linux_amd64" -o /usr/local/bin/shfmt
-          sudo chmod +x /usr/local/bin/shfmt
+          curl -sSfL "https://github.com/mvdan/sh/releases/download/v${{ matrix.shfmt-version }}/shfmt_v${{ matrix.shfmt-version }}_linux_amd64" -o /usr/local/bin/shfmt
+          chmod +x /usr/local/bin/shfmt
 
       - name: Test shfmt
         if: matrix.kind == 'shfmt'

From fc82b24c1381f47d5f70b5a1acae68b9de99c33c Mon Sep 17 00:00:00 2001
From: Tyler Crawford <tcrawford@figure.com>
Date: Mon, 5 Feb 2024 17:05:33 -0500
Subject: [PATCH 1502/2068] Fix comment

---
 lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java b/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java
index 971dce6b03..9580a4876a 100644
--- a/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java
@@ -101,7 +101,7 @@ static class State implements Serializable {
 		String format(ProcessRunner runner, String input, File file) throws IOException, InterruptedException {
 			if (args == null) {
 				// args will be reused during a single spotless task execution,
-				// so this "prefix" is being "cached" for each spotless task.
+				// so this "prefix" is being "cached" for each spotless format with shfmt.
 				args = List.of(exe.confirmVersionAndGetAbsolutePath(), "--filename");
 			}
 

From 06325f8f8246172c0c5f691ec3c039f07bc83572 Mon Sep 17 00:00:00 2001
From: Tyler Crawford <tcrawford@figure.com>
Date: Mon, 5 Feb 2024 17:12:23 -0500
Subject: [PATCH 1503/2068] Add shfmt man page link to gradle readme

---
 plugin-gradle/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 89d72e034b..c7feb3559e 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -1004,7 +1004,7 @@ spotless {
 [homepage](https://github.com/mvdan/sh). [changelog](https://github.com/mvdan/sh/blob/master/CHANGELOG.md).
 
 When formatting shell scripts via `shfmt`, configure `shfmt` settings via `.editorconfig`. 
-Refer to the `shfmt` main page for `.editorconfig` settings. 
+Refer to the `shfmt` [man page](https://github.com/mvdan/sh/blob/master/cmd/shfmt/shfmt.1.scd) for `.editorconfig` settings. 
 
 ```gradle
 shfmt('3.7.0') // version is optional

From 6e52d6e8e7d8eea5a20568b6f4fefe5683c217b2 Mon Sep 17 00:00:00 2001
From: Tyler Crawford <tcrawford@figure.com>
Date: Thu, 8 Feb 2024 08:49:13 -0500
Subject: [PATCH 1504/2068] Undo yaml formatting changes, update spotless to
 Spotless

---
 .github/workflows/ci.yml                      | 20 ++++---------------
 .../diffplug/spotless/shell/ShfmtStep.java    |  4 ++--
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ba6d40388f..5d4cfb57e6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,7 +5,7 @@
 on:
   pull_request:
   push:
-    branches: [ main ]
+    branches: [main]
   workflow_dispatch:
 
 concurrency:
@@ -23,21 +23,17 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-
       - name: Install JDK 11
         uses: actions/setup-java@v4
         with:
           distribution: "temurin"
           java-version: 11
-
       - name: gradle caching
         uses: gradle/actions/setup-gradle@v3
         with:
           gradle-home-cache-cleanup: true
-
       - name: spotlessCheck
         run: ./gradlew spotlessCheck
-
       - name: assemble testClasses
         run: ./gradlew assemble testClasses
   build:
@@ -45,10 +41,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kind: [ maven, gradle ]
+        kind: [maven, gradle]
         # Test on the latest Java version once Gradle & Maven support it.
-        jre: [ 11, 17, 21 ]
-        os: [ ubuntu-latest ]
+        jre: [11, 17, 21]
+        os: [ubuntu-latest]
         include:
           # test windows at the diagonals of the above matrix
           - kind: maven
@@ -69,40 +65,32 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-
       - name: Install JDK ${{ matrix.distribution }} ${{ matrix.java_version }}
         uses: actions/setup-java@v4
         with:
           distribution: "temurin"
           java-version: ${{ matrix.jre }}
-
       - name: gradle caching
         uses: gradle/actions/setup-gradle@v3
         with:
           gradle-home-cache-cleanup: true
-
       - name: build (maven-only)
         if: matrix.kind == 'maven'
         run: ./gradlew :plugin-maven:build -x spotlessCheck
-
       - name: build (everything-but-maven)
         if: matrix.kind == 'gradle'
         run: ./gradlew build -x spotlessCheck -PSPOTLESS_EXCLUDE_MAVEN=true
-
       - name: test npm
         if: matrix.kind == 'npm'
         run: ./gradlew testNpm
-
       - name: Install shfmt
         if: matrix.kind == 'shfmt'
         run: |
           curl -sSfL "https://github.com/mvdan/sh/releases/download/v${{ matrix.shfmt-version }}/shfmt_v${{ matrix.shfmt-version }}_linux_amd64" -o /usr/local/bin/shfmt
           chmod +x /usr/local/bin/shfmt
-
       - name: Test shfmt
         if: matrix.kind == 'shfmt'
         run: ./gradlew testShfmt
-
       - name: junit result
         uses: mikepenz/action-junit-report@v4
         if: always() # always run even if the previous step fails
diff --git a/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java b/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java
index 9580a4876a..46f833bd0d 100644
--- a/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java
@@ -100,8 +100,8 @@ static class State implements Serializable {
 
 		String format(ProcessRunner runner, String input, File file) throws IOException, InterruptedException {
 			if (args == null) {
-				// args will be reused during a single spotless task execution,
-				// so this "prefix" is being "cached" for each spotless format with shfmt.
+				// args will be reused during a single Spotless task execution,
+				// so this "prefix" is being "cached" for each Spotless format with shfmt.
 				args = List.of(exe.confirmVersionAndGetAbsolutePath(), "--filename");
 			}
 

From adbe14e2e20a7a999d824fe1dc82bf291e70c432 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 12 Feb 2024 15:32:27 -0800
Subject: [PATCH 1505/2068] Revert spurious copyright updates.

---
 .../spotless/extra/integration/DiffMessageFormatter.java        | 2 +-
 .../glue/diktat/compat/DiktatCompat1Dot2Dot5Adapter.java        | 2 +-
 .../glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java        | 2 +-
 .../spotless/glue/diktat/compat/DiktatCompatAdapter.java        | 2 +-
 .../diffplug/spotless/glue/diktat/compat/DiktatReporting.java   | 2 +-
 .../com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java  | 2 +-
 .../com/diffplug/gradle/spotless/GradleIntegrationHarness.java  | 2 +-
 .../java/com/diffplug/spotless/maven/SpotlessCheckMojo.java     | 2 +-
 .../test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java  | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/integration/DiffMessageFormatter.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/integration/DiffMessageFormatter.java
index 7610514184..9294055a4f 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/integration/DiffMessageFormatter.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/integration/DiffMessageFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/compatDiktat1Dot2Dot5/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat1Dot2Dot5Adapter.java b/lib/src/compatDiktat1Dot2Dot5/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat1Dot2Dot5Adapter.java
index b340d2ffbb..749d0a1f61 100644
--- a/lib/src/compatDiktat1Dot2Dot5/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat1Dot2Dot5Adapter.java
+++ b/lib/src/compatDiktat1Dot2Dot5/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat1Dot2Dot5Adapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 DiffPlug
+ * Copyright 2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java b/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java
index 30f1d441e3..5b264a46ed 100644
--- a/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java
+++ b/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 DiffPlug
+ * Copyright 2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompatAdapter.java b/lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompatAdapter.java
index 567684138f..fdc6e77afa 100644
--- a/lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompatAdapter.java
+++ b/lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompatAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 DiffPlug
+ * Copyright 2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatReporting.java b/lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatReporting.java
index bcecb884b6..fdc7e56614 100644
--- a/lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatReporting.java
+++ b/lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatReporting.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 DiffPlug
+ * Copyright 2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java b/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java
index 44fd4571de..1f1c15c97d 100644
--- a/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java
+++ b/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 DiffPlug
+ * Copyright 2021-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
index 4441b90c7a..417bc23b52 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java
index 6e3561f984..cc83b3f3c9 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
index 6c029d8fe5..9976fe0e84 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 DiffPlug
+ * Copyright 2021-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 8910c687cbdccc7cfb2220bd14e24b95b0d955ea Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 12 Feb 2024 20:43:38 -0800
Subject: [PATCH 1506/2068] Adjust `StepHarnessBase` so that the newly fixed
 roundtrips get tested.

---
 .../src/main/java/com/diffplug/spotless/StepHarnessBase.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
index c82de128a1..fb1ef97d43 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
@@ -17,6 +17,7 @@
 
 import java.util.Locale;
 import java.util.Objects;
+import java.util.Set;
 
 import org.assertj.core.api.Assertions;
 
@@ -48,6 +49,10 @@ protected StepHarnessBase(Formatter formatter) {
 				supportsRoundTrip = true;
 			} else if (onlyStepName.equals("fence")) {
 				supportsRoundTrip = true;
+			} else if (Set.of("ktlint", "ktfmt", "scalafmt", "palantir-java-format", "google-java-format",
+					"removeUnusedImports", "cleanthat", "No line break between type annotation and type",
+					"importOrder", "Remove unnecessary semicolons").contains(onlyStepName)) {
+				supportsRoundTrip = true;
 			}
 		}
 	}

From a5b7bec10805779e43e187aaee802c59c3ff3464 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 12 Feb 2024 20:54:10 -0800
Subject: [PATCH 1507/2068] Add missing arguments to make
 `FormatAnnotationsStep` and `ImportOrderStep` serializable.

---
 .../java/com/diffplug/spotless/java/FormatAnnotationsStep.java | 3 ++-
 .../main/java/com/diffplug/spotless/java/ImportOrderStep.java  | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java b/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java
index bb74f7a0bc..18b6444606 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java
@@ -27,6 +27,7 @@
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.RoundedStep;
+import com.diffplug.spotless.SerializedFunction;
 
 /**
  * Some formatters put every annotation on its own line
@@ -398,7 +399,7 @@ public static FormatterStep create() {
 	}
 
 	public static FormatterStep create(List<String> addedTypeAnnotations, List<String> removedTypeAnnotations) {
-		return FormatterStep.create(NAME, new State(addedTypeAnnotations, removedTypeAnnotations), State::toFormatter);
+		return FormatterStep.create(NAME, new State(addedTypeAnnotations, removedTypeAnnotations), SerializedFunction.identity(), State::toFormatter);
 	}
 
 	private FormatAnnotationsStep() {}
diff --git a/lib/src/main/java/com/diffplug/spotless/java/ImportOrderStep.java b/lib/src/main/java/com/diffplug/spotless/java/ImportOrderStep.java
index ad4cead559..8e359eece2 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/ImportOrderStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/ImportOrderStep.java
@@ -39,6 +39,7 @@
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.RoundedStep;
+import com.diffplug.spotless.SerializedFunction;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
@@ -90,6 +91,7 @@ private FormatterStep createFrom(boolean wildcardsLast, boolean semanticSort, Se
 			Set<String> treatAsClass, Supplier<List<String>> importOrder) {
 		return FormatterStep.create("importOrder",
 				new State(importOrder.get(), lineFormat, wildcardsLast, semanticSort, treatAsPackage, treatAsClass),
+				SerializedFunction.identity(),
 				State::toFormatter);
 	}
 

From 4dd6db41c018f0930e5871fb4c5db3a4ebd4cb6c Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 13 Feb 2024 17:25:19 +0800
Subject: [PATCH 1508/2068] Make GsonStep round-trippable

---
 .../diffplug/spotless/json/gson/GsonStep.java | 31 +++++++++++++------
 .../diffplug/spotless/StepHarnessBase.java    |  1 +
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
index ec90255b77..2c795e28b3 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 DiffPlug
+ * Copyright 2022-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  */
 package com.diffplug.spotless.json.gson;
 
-import java.io.IOException;
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -25,19 +24,32 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
+import com.diffplug.spotless.RoundedStep;
 
-public class GsonStep {
+public class GsonStep implements RoundedStep {
+	private static final long serialVersionUID = 1L;
 	private static final String MAVEN_COORDINATES = "com.google.code.gson:gson";
 	private static final String INCOMPATIBLE_ERROR_MESSAGE = "There was a problem interacting with Gson; maybe you set an incompatible version?";
+	public static final String NAME = "gson";
 
-	@Deprecated
-	public static FormatterStep create(int indentSpaces, boolean sortByKeys, boolean escapeHtml, String version, Provisioner provisioner) {
-		return create(new GsonConfig(sortByKeys, escapeHtml, indentSpaces, version), provisioner);
+	private final JarState.Promised jarState;
+	private final GsonConfig gsonConfig;
+
+	private GsonStep(JarState.Promised jarState, GsonConfig gsonConfig) {
+		this.gsonConfig = gsonConfig;
+		this.jarState = jarState;
 	}
 
 	public static FormatterStep create(GsonConfig gsonConfig, Provisioner provisioner) {
 		Objects.requireNonNull(provisioner, "provisioner cannot be null");
-		return FormatterStep.createLazy("gson", () -> new State(gsonConfig, provisioner), State::toFormatter);
+		return FormatterStep.create(NAME,
+				new GsonStep(JarState.promise(() -> JarState.from(MAVEN_COORDINATES + ":" + gsonConfig.getVersion(), provisioner)), gsonConfig),
+				GsonStep::equalityState,
+				State::toFormatter);
+	}
+
+	private State equalityState() {
+		return new State(jarState.get(), gsonConfig);
 	}
 
 	private static final class State implements Serializable {
@@ -46,9 +58,9 @@ private static final class State implements Serializable {
 		private final JarState jarState;
 		private final GsonConfig gsonConfig;
 
-		private State(GsonConfig gsonConfig, Provisioner provisioner) throws IOException {
+		private State(JarState jarState, GsonConfig gsonConfig) {
+			this.jarState = jarState;
 			this.gsonConfig = gsonConfig;
-			this.jarState = JarState.from(MAVEN_COORDINATES + ":" + gsonConfig.getVersion(), provisioner);
 		}
 
 		FormatterFunc toFormatter() {
@@ -62,5 +74,4 @@ FormatterFunc toFormatter() {
 			}
 		}
 	}
-
 }
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
index 63d8ddefee..4afa453be5 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
@@ -51,6 +51,7 @@ protected StepHarnessBase(Formatter formatter) {
 				supportsRoundTrip = true;
 			} else if (Set.of("black", "buf", "clang", "ktlint", "ktfmt", "scalafmt", "palantir-java-format", "google-java-format",
 					"removeUnusedImports", "cleanthat", "No line break between type annotation and type",
+					"gson",
 					"importOrder", "Remove unnecessary semicolons").contains(onlyStepName)) {
 				supportsRoundTrip = true;
 			}

From 7f047076dbfd5dbfd177a2c9684eeb534c7905f4 Mon Sep 17 00:00:00 2001
From: Patrick Reinhart <patrick@reini.net>
Date: Tue, 13 Feb 2024 12:48:18 +0100
Subject: [PATCH 1509/2068] Improves documentation and usage

Signed-off-by: Patrick Reinhart <patrick@reini.net>
---
 plugin-gradle/CHANGES.md                                     | 2 +-
 plugin-gradle/README.md                                      | 4 ++++
 .../com/diffplug/gradle/spotless/BaseGroovyExtension.java    | 5 +++--
 .../main/java/com/diffplug/gradle/spotless/CppExtension.java | 5 +++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 7ce10e1edc..da2466339c 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -138,7 +138,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
   ```
   spotless {
     java {
-      eclipse().withP2Mirrors(['https://download.eclipse.org/', 'https://some.internal.mirror/eclipse'])
+      eclipse().withP2Mirrors(['https://download.eclipse.org/': 'https://some.internal.mirror/eclipse'])
     }
   }
   ```
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index c7feb3559e..2add917650 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -234,6 +234,10 @@ spotless {
     eclipse()
     // optional: you can specify a specific version and/or config file
     eclipse('4.26').configFile('eclipse-prefs.xml')
+    // if the access to the p2 repositories is restricted, mirrors can be
+    // specified using a URI prefix map as follows:
+    echlise().withP2Mirrors(['https://download.eclipse.org/eclipse/updates/4.29/':'https://some.internal.mirror/4-29-updates-p2/'])
+       
 ```
 
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseGroovyExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseGroovyExtension.java
index 5b302bbe0f..6e8b141e49 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseGroovyExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseGroovyExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -64,11 +64,12 @@ private GrEclipseConfig(String version, FormatExtension extension) {
 			extension.addStep(builder.build());
 		}
 
-		public void configFile(Object... configFiles) {
+		public GrEclipseConfig configFile(Object... configFiles) {
 			requireElementsNonNull(configFiles);
 			Project project = extension.getProject();
 			builder.setPreferences(project.files(configFiles).getFiles());
 			extension.replaceStep(builder.build());
+			return this;
 		}
 
 		public GrEclipseConfig withP2Mirrors(Map<String, String> mirrors) {
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java
index 6a08946c48..677f5f1bc3 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,11 +52,12 @@ public class EclipseConfig {
 			addStep(builder.build());
 		}
 
-		public void configFile(Object... configFiles) {
+		public EclipseConfig configFile(Object... configFiles) {
 			requireElementsNonNull(configFiles);
 			Project project = getProject();
 			builder.setPreferences(project.files(configFiles).getFiles());
 			replaceStep(builder.build());
+			return this;
 		}
 
 		public EclipseConfig withP2Mirrors(Map<String, String> mirrors) {

From 27b4b7f4bd78372d7278474346314a1f955677f4 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 13 Feb 2024 21:29:10 +0800
Subject: [PATCH 1510/2068] Make JacksonJsonStep round-trippable

---
 .../spotless/json/JacksonJsonStep.java        | 42 +++++++++++--------
 .../diffplug/spotless/StepHarnessBase.java    |  2 +-
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java b/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java
index 94c48e0c5c..79bfb43f85 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 DiffPlug
+ * Copyright 2021-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  */
 package com.diffplug.spotless.json;
 
-import java.io.IOException;
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -25,48 +24,57 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
+import com.diffplug.spotless.RoundedStep;
 
 /**
  * Simple YAML formatter which reformats the file according to Jackson YAMLFactory.
  */
 // https://stackoverflow.com/questions/14515994/convert-json-string-to-pretty-print-json-output-using-jackson
-public class JacksonJsonStep {
-	static final String MAVEN_COORDINATE = "com.fasterxml.jackson.core:jackson-databind:";
-	// https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind
-	static final String DEFAULT_VERSION = "2.14.2";
+public class JacksonJsonStep implements RoundedStep {
+	private static final long serialVersionUID = 1L;
+	private static final String MAVEN_COORDINATE = "com.fasterxml.jackson.core:jackson-databind:";
+	private static final String DEFAULT_VERSION = "2.14.2";
+	public static final String NAME = "jacksonJson";
 
-	private JacksonJsonStep() {}
+	private final JarState.Promised jarState;
+	private final JacksonConfig jacksonConfig;
+
+	private JacksonJsonStep(JarState.Promised jarState, JacksonConfig jacksonConfig) {
+		this.jarState = jarState;
+		this.jacksonConfig = jacksonConfig;
+	}
 
 	public static String defaultVersion() {
 		return DEFAULT_VERSION;
 	}
 
+	public static FormatterStep create(Provisioner provisioner) {
+		return create(new JacksonJsonConfig(), defaultVersion(), provisioner);
+	}
+
 	public static FormatterStep create(JacksonJsonConfig jacksonConfig,
 			String jacksonVersion,
 			Provisioner provisioner) {
 		Objects.requireNonNull(provisioner, "provisioner cannot be null");
-		return FormatterStep.createLazy("json",
-				() -> new State(jacksonConfig, jacksonVersion, provisioner),
+		return FormatterStep.create(NAME,
+				new JacksonJsonStep(JarState.promise(() -> JarState.from(MAVEN_COORDINATE + jacksonVersion, provisioner)), jacksonConfig),
+				JacksonJsonStep::equalityState,
 				State::toFormatter);
 	}
 
-	public static FormatterStep create(Provisioner provisioner) {
-		return create(new JacksonJsonConfig(), defaultVersion(), provisioner);
+	private State equalityState() {
+		return new State(jarState.get(), jacksonConfig);
 	}
 
 	private static final class State implements Serializable {
 		private static final long serialVersionUID = 1L;
 
 		private final JacksonConfig jacksonConfig;
-
 		private final JarState jarState;
 
-		private State(JacksonConfig jacksonConfig,
-				String jacksonVersion,
-				Provisioner provisioner) throws IOException {
+		State(JarState jarState, JacksonConfig jacksonConfig) {
+			this.jarState = jarState;
 			this.jacksonConfig = jacksonConfig;
-
-			this.jarState = JarState.from(JacksonJsonStep.MAVEN_COORDINATE + jacksonVersion, provisioner);
 		}
 
 		FormatterFunc toFormatter() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException,
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
index 4afa453be5..75f2ac8eac 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
@@ -51,7 +51,7 @@ protected StepHarnessBase(Formatter formatter) {
 				supportsRoundTrip = true;
 			} else if (Set.of("black", "buf", "clang", "ktlint", "ktfmt", "scalafmt", "palantir-java-format", "google-java-format",
 					"removeUnusedImports", "cleanthat", "No line break between type annotation and type",
-					"gson",
+					"gson", "jacksonJson",
 					"importOrder", "Remove unnecessary semicolons").contains(onlyStepName)) {
 				supportsRoundTrip = true;
 			}

From a22f07a39542b8b0f9661c770ba9de425f6f0412 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 13 Feb 2024 21:40:12 +0800
Subject: [PATCH 1511/2068] Make JsonPatchStep round-trippable

---
 .../diffplug/spotless/json/JsonPatchStep.java | 59 +++++++++++++------
 .../diffplug/spotless/StepHarnessBase.java    |  2 +-
 2 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/json/JsonPatchStep.java b/lib/src/main/java/com/diffplug/spotless/json/JsonPatchStep.java
index 71f4380264..d02e94f329 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/JsonPatchStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/JsonPatchStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  */
 package com.diffplug.spotless.json;
 
-import java.io.IOException;
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -23,17 +22,33 @@
 import java.util.Map;
 import java.util.Objects;
 
+import javax.annotation.Nullable;
+
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
+import com.diffplug.spotless.RoundedStep;
+
+public class JsonPatchStep implements RoundedStep {
+	private static final long serialVersionUID = 1L;
+	private static final String MAVEN_COORDINATE = "com.flipkart.zjsonpatch:zjsonpatch";
+	private static final String DEFAULT_VERSION = "0.4.14";
+	public static final String NAME = "apply-json-patch";
 
-public class JsonPatchStep {
-	// https://mvnrepository.com/artifact/com.flipkart.zjsonpatch/zjsonpatch
-	static final String MAVEN_COORDINATE = "com.flipkart.zjsonpatch:zjsonpatch";
-	static final String DEFAULT_VERSION = "0.4.14";
+	private final JarState.Promised jarState;
+	@Nullable
+	private final List<Map<String, Object>> patch;
+	@Nullable
+	private final String patchString;
 
-	private JsonPatchStep() {}
+	private JsonPatchStep(JarState.Promised jarState,
+			@Nullable String patchString,
+			@Nullable List<Map<String, Object>> patch) {
+		this.jarState = jarState;
+		this.patchString = patchString;
+		this.patch = patch;
+	}
 
 	public static FormatterStep create(String patchString, Provisioner provisioner) {
 		return create(DEFAULT_VERSION, patchString, provisioner);
@@ -43,7 +58,10 @@ public static FormatterStep create(String zjsonPatchVersion, String patchString,
 		Objects.requireNonNull(zjsonPatchVersion, "zjsonPatchVersion cannot be null");
 		Objects.requireNonNull(patchString, "patchString cannot be null");
 		Objects.requireNonNull(provisioner, "provisioner cannot be null");
-		return FormatterStep.createLazy("apply-json-patch", () -> new State(zjsonPatchVersion, patchString, provisioner), State::toFormatter);
+		return FormatterStep.create(NAME,
+				new JsonPatchStep(JarState.promise(() -> JarState.from(MAVEN_COORDINATE + ":" + zjsonPatchVersion, provisioner)), patchString, null),
+				JsonPatchStep::equalityState,
+				State::toFormatter);
 	}
 
 	public static FormatterStep create(List<Map<String, Object>> patch, Provisioner provisioner) {
@@ -54,26 +72,31 @@ public static FormatterStep create(String zjsonPatchVersion, List<Map<String, Ob
 		Objects.requireNonNull(zjsonPatchVersion, "zjsonPatchVersion cannot be null");
 		Objects.requireNonNull(patch, "patch cannot be null");
 		Objects.requireNonNull(provisioner, "provisioner cannot be null");
-		return FormatterStep.createLazy("apply-json-patch", () -> new State(zjsonPatchVersion, patch, provisioner), State::toFormatter);
+		return FormatterStep.create(NAME,
+				new JsonPatchStep(JarState.promise(() -> JarState.from(MAVEN_COORDINATE + ":" + zjsonPatchVersion, provisioner)), null, patch),
+				JsonPatchStep::equalityState,
+				State::toFormatter);
+	}
+
+	private State equalityState() {
+		return new State(jarState.get(), patchString, patch);
 	}
 
 	static final class State implements Serializable {
 		private static final long serialVersionUID = 1L;
 
 		private final JarState jarState;
+		@Nullable
 		private final List<Map<String, Object>> patch;
+		@Nullable
 		private final String patchString;
 
-		private State(String zjsonPatchVersion, List<Map<String, Object>> patch, Provisioner provisioner) throws IOException {
-			this.jarState = JarState.from(MAVEN_COORDINATE + ":" + zjsonPatchVersion, provisioner);
-			this.patch = patch;
-			this.patchString = null;
-		}
-
-		private State(String zjsonPatchVersion, String patchString, Provisioner provisioner) throws IOException {
-			this.jarState = JarState.from(MAVEN_COORDINATE + ":" + zjsonPatchVersion, provisioner);
-			this.patch = null;
+		State(JarState jarState,
+				@Nullable String patchString,
+				@Nullable List<Map<String, Object>> patch) {
+			this.jarState = jarState;
 			this.patchString = patchString;
+			this.patch = patch;
 		}
 
 		FormatterFunc toFormatter() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException {
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
index 75f2ac8eac..da497566e4 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
@@ -51,7 +51,7 @@ protected StepHarnessBase(Formatter formatter) {
 				supportsRoundTrip = true;
 			} else if (Set.of("black", "buf", "clang", "ktlint", "ktfmt", "scalafmt", "palantir-java-format", "google-java-format",
 					"removeUnusedImports", "cleanthat", "No line break between type annotation and type",
-					"gson", "jacksonJson",
+					"gson", "jacksonJson", "apply-json-patch",
 					"importOrder", "Remove unnecessary semicolons").contains(onlyStepName)) {
 				supportsRoundTrip = true;
 			}

From d25658c7ec04729be8e06a2f1ccf911e17adf6a6 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 13 Feb 2024 21:45:58 +0800
Subject: [PATCH 1512/2068] Make JsonSimpleStep round-trippable

---
 .../spotless/json/JsonSimpleStep.java         | 33 +++++++++++++------
 .../diffplug/spotless/StepHarnessBase.java    |  2 +-
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/json/JsonSimpleStep.java b/lib/src/main/java/com/diffplug/spotless/json/JsonSimpleStep.java
index 85ccbfa6e2..2348451011 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/JsonSimpleStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/JsonSimpleStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 DiffPlug
+ * Copyright 2021-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  */
 package com.diffplug.spotless.json;
 
-import java.io.IOException;
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -26,17 +25,35 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
+import com.diffplug.spotless.RoundedStep;
 
 /**
  * Simple JSON formatter which reformats the file according to the org.json library's default pretty-printing, but has no ability to customise more than the indentation size.
  */
-public final class JsonSimpleStep {
+public final class JsonSimpleStep implements RoundedStep {
+	private static final long serialVersionUID = 1L;
 	private static final String MAVEN_COORDINATE = "org.json:json:";
 	private static final String DEFAULT_VERSION = "20210307";
+	public static final String NAME = "jsonSimple";
+
+	private final JarState.Promised jarState;
+	private final int indentSpaces;
+
+	private JsonSimpleStep(JarState.Promised jarState, int indentSpaces) {
+		this.indentSpaces = indentSpaces;
+		this.jarState = jarState;
+	}
 
 	public static FormatterStep create(int indent, Provisioner provisioner) {
 		Objects.requireNonNull(provisioner, "provisioner cannot be null");
-		return FormatterStep.createLazy("json", () -> new State(indent, provisioner), State::toFormatter);
+		return FormatterStep.create(NAME,
+				new JsonSimpleStep(JarState.promise(() -> JarState.from(MAVEN_COORDINATE + DEFAULT_VERSION, provisioner)), indent),
+				JsonSimpleStep::equalityState,
+				State::toFormatter);
+	}
+
+	private State equalityState() {
+		return new State(jarState.get(), indentSpaces);
 	}
 
 	private static final class State implements Serializable {
@@ -45,9 +62,9 @@ private static final class State implements Serializable {
 		private final int indentSpaces;
 		private final JarState jarState;
 
-		private State(int indent, Provisioner provisioner) throws IOException {
+		State(JarState jarState, int indent) {
+			this.jarState = jarState;
 			this.indentSpaces = indent;
-			this.jarState = JarState.from(MAVEN_COORDINATE + DEFAULT_VERSION, provisioner);
 		}
 
 		FormatterFunc toFormatter() {
@@ -94,8 +111,4 @@ private String format(Constructor<?> constructor, Method toString, String input)
 			}
 		}
 	}
-
-	private JsonSimpleStep() {
-		// cannot be directly instantiated
-	}
 }
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
index da497566e4..feae5f3b19 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
@@ -51,7 +51,7 @@ protected StepHarnessBase(Formatter formatter) {
 				supportsRoundTrip = true;
 			} else if (Set.of("black", "buf", "clang", "ktlint", "ktfmt", "scalafmt", "palantir-java-format", "google-java-format",
 					"removeUnusedImports", "cleanthat", "No line break between type annotation and type",
-					"gson", "jacksonJson", "apply-json-patch",
+					"gson", "jacksonJson", "apply-json-patch", "jsonSimple",
 					"importOrder", "Remove unnecessary semicolons").contains(onlyStepName)) {
 				supportsRoundTrip = true;
 			}

From 43d57dc5bbfead027f4dffbe58bbd2d68f639a75 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 13 Feb 2024 21:55:06 +0800
Subject: [PATCH 1513/2068] Make SortPomStep round-trippable

---
 .../diffplug/spotless/pom/SortPomStep.java    | 37 +++++++++++++------
 .../diffplug/spotless/StepHarnessBase.java    |  2 +-
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/pom/SortPomStep.java b/lib/src/main/java/com/diffplug/spotless/pom/SortPomStep.java
index 4325d16516..d9e662684a 100644
--- a/lib/src/main/java/com/diffplug/spotless/pom/SortPomStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/pom/SortPomStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 DiffPlug
+ * Copyright 2021-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  */
 package com.diffplug.spotless.pom;
 
-import java.io.IOException;
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -24,27 +23,41 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
+import com.diffplug.spotless.RoundedStep;
 
-public class SortPomStep {
+public class SortPomStep implements RoundedStep {
+	private static final long serialVersionUID = 1L;
+	private static final String MAVEN_COORDINATE = "com.github.ekryd.sortpom:sortpom-sorter:";
 	public static final String NAME = "sortPom";
-	static final String PACKAGE = "com.github.ekryd.sortpom";
-	static final String MAVEN_COORDINATE = PACKAGE + ":sortpom-sorter:";
 
-	private SortPomStep() {}
+	private final JarState.Promised jarState;
+	private final SortPomCfg cfg;
+
+	private SortPomStep(JarState.Promised jarState, SortPomCfg cfg) {
+		this.jarState = jarState;
+		this.cfg = cfg;
+	}
 
 	public static FormatterStep create(SortPomCfg cfg, Provisioner provisioner) {
-		return FormatterStep.createLazy(NAME, () -> new State(cfg, provisioner), State::createFormat);
+		return FormatterStep.create(NAME,
+				new SortPomStep(JarState.promise(() -> JarState.from(MAVEN_COORDINATE + cfg.version, provisioner)), cfg),
+				SortPomStep::equalityState,
+				State::createFormat);
+	}
+
+	private State equalityState() {
+		return new State(jarState.get(), cfg);
 	}
 
-	static class State implements Serializable {
+	private static class State implements Serializable {
 		private static final long serialVersionUID = 1;
 
-		SortPomCfg cfg;
-		JarState jarState;
+		private final SortPomCfg cfg;
+		private final JarState jarState;
 
-		public State(SortPomCfg cfg, Provisioner provisioner) throws IOException {
+		State(JarState jarState, SortPomCfg cfg) {
+			this.jarState = jarState;
 			this.cfg = cfg;
-			this.jarState = JarState.from(MAVEN_COORDINATE + cfg.version, provisioner);
 		}
 
 		FormatterFunc createFormat() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException {
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
index feae5f3b19..c6ec4c53d9 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
@@ -51,7 +51,7 @@ protected StepHarnessBase(Formatter formatter) {
 				supportsRoundTrip = true;
 			} else if (Set.of("black", "buf", "clang", "ktlint", "ktfmt", "scalafmt", "palantir-java-format", "google-java-format",
 					"removeUnusedImports", "cleanthat", "No line break between type annotation and type",
-					"gson", "jacksonJson", "apply-json-patch", "jsonSimple",
+					"gson", "jacksonJson", "apply-json-patch", "jsonSimple", "sortPom",
 					"importOrder", "Remove unnecessary semicolons").contains(onlyStepName)) {
 				supportsRoundTrip = true;
 			}

From 3261a135a9792556e34156714e49de163d0a2fc8 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 13 Feb 2024 22:01:17 +0800
Subject: [PATCH 1514/2068] Make JacksonYamlStep round-trippable

---
 .../spotless/yaml/JacksonYamlStep.java        | 38 +++++++++++--------
 .../diffplug/spotless/StepHarnessBase.java    |  2 +-
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/yaml/JacksonYamlStep.java b/lib/src/main/java/com/diffplug/spotless/yaml/JacksonYamlStep.java
index a87e40f420..6c1e353599 100644
--- a/lib/src/main/java/com/diffplug/spotless/yaml/JacksonYamlStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/yaml/JacksonYamlStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 DiffPlug
+ * Copyright 2021-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  */
 package com.diffplug.spotless.yaml;
 
-import java.io.IOException;
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -25,18 +24,26 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
+import com.diffplug.spotless.RoundedStep;
 
 /**
  * Simple YAML formatter which reformats the file according to Jackson YAMLFactory.
  */
 // https://stackoverflow.com/questions/14515994/convert-json-string-to-pretty-print-json-output-using-jackson
 // https://stackoverflow.com/questions/60891174/i-want-to-load-a-yaml-file-possibly-edit-the-data-and-then-dump-it-again-how
-public class JacksonYamlStep {
-	static final String MAVEN_COORDINATE = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:";
-	// https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml
-	static final String DEFAULT_VERSION = "2.14.1";
+public class JacksonYamlStep implements RoundedStep {
+	private static final long serialVersionUID = 1L;
+	private static final String MAVEN_COORDINATE = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:";
+	private static final String DEFAULT_VERSION = "2.14.1";
+	public static final String NAME = "jacksonYaml";
 
-	private JacksonYamlStep() {}
+	private final JarState.Promised jarState;
+	private final JacksonYamlConfig jacksonConfig;
+
+	private JacksonYamlStep(JarState.Promised jarState, JacksonYamlConfig jacksonConfig) {
+		this.jarState = jarState;
+		this.jacksonConfig = jacksonConfig;
+	}
 
 	public static String defaultVersion() {
 		return DEFAULT_VERSION;
@@ -47,8 +54,9 @@ public static FormatterStep create(JacksonYamlConfig jacksonConfig,
 			Provisioner provisioner) {
 		Objects.requireNonNull(jacksonConfig, "jacksonConfig cannot be null");
 		Objects.requireNonNull(provisioner, "provisioner cannot be null");
-		return FormatterStep.createLazy("yaml",
-				() -> new State(jacksonConfig, jacksonVersion, provisioner),
+		return FormatterStep.create(NAME,
+				new JacksonYamlStep(JarState.promise(() -> JarState.from(MAVEN_COORDINATE + jacksonVersion, provisioner)), jacksonConfig),
+				JacksonYamlStep::equalityState,
 				State::toFormatter);
 	}
 
@@ -56,19 +64,19 @@ public static FormatterStep create(Provisioner provisioner) {
 		return create(new JacksonYamlConfig(), defaultVersion(), provisioner);
 	}
 
+	private State equalityState() {
+		return new State(jarState.get(), jacksonConfig);
+	}
+
 	private static final class State implements Serializable {
 		private static final long serialVersionUID = 1L;
 
 		private final JacksonYamlConfig jacksonConfig;
-
 		private final JarState jarState;
 
-		private State(JacksonYamlConfig jacksonConfig,
-				String jacksonVersion,
-				Provisioner provisioner) throws IOException {
+		State(JarState jarState, JacksonYamlConfig jacksonConfig) {
+			this.jarState = jarState;
 			this.jacksonConfig = jacksonConfig;
-
-			this.jarState = JarState.from(JacksonYamlStep.MAVEN_COORDINATE + jacksonVersion, provisioner);
 		}
 
 		FormatterFunc toFormatter() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException,
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
index c6ec4c53d9..53e5d8d5f9 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
@@ -51,7 +51,7 @@ protected StepHarnessBase(Formatter formatter) {
 				supportsRoundTrip = true;
 			} else if (Set.of("black", "buf", "clang", "ktlint", "ktfmt", "scalafmt", "palantir-java-format", "google-java-format",
 					"removeUnusedImports", "cleanthat", "No line break between type annotation and type",
-					"gson", "jacksonJson", "apply-json-patch", "jsonSimple", "sortPom",
+					"gson", "jacksonJson", "apply-json-patch", "jsonSimple", "sortPom", "jacksonYaml",
 					"importOrder", "Remove unnecessary semicolons").contains(onlyStepName)) {
 				supportsRoundTrip = true;
 			}

From fec005dfcd14dc950167d406994c2fe464e280e7 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 13 Feb 2024 22:12:22 +0800
Subject: [PATCH 1515/2068] Make GherkinUtilsStep round-trippable

---
 .../spotless/gherkin/GherkinUtilsStep.java    | 33 +++++++++++++------
 .../diffplug/spotless/StepHarnessBase.java    |  2 +-
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/gherkin/GherkinUtilsStep.java b/lib/src/main/java/com/diffplug/spotless/gherkin/GherkinUtilsStep.java
index 78f5eacd32..6e9e9fdfe2 100644
--- a/lib/src/main/java/com/diffplug/spotless/gherkin/GherkinUtilsStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/gherkin/GherkinUtilsStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 DiffPlug
+ * Copyright 2021-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  */
 package com.diffplug.spotless.gherkin;
 
-import java.io.IOException;
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -25,10 +24,21 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
+import com.diffplug.spotless.RoundedStep;
 
-public class GherkinUtilsStep {
+public class GherkinUtilsStep implements RoundedStep {
+	private static final long serialVersionUID = 1L;
 	private static final String MAVEN_COORDINATE = "io.cucumber:gherkin-utils:";
 	private static final String DEFAULT_VERSION = "8.0.2";
+	public static final String NAME = "gherkinUtils";
+
+	private final JarState.Promised jarState;
+	private final GherkinUtilsConfig gherkinSimpleConfig;
+
+	private GherkinUtilsStep(JarState.Promised jarState, GherkinUtilsConfig gherkinSimpleConfig) {
+		this.jarState = jarState;
+		this.gherkinSimpleConfig = gherkinSimpleConfig;
+	}
 
 	public static String defaultVersion() {
 		return DEFAULT_VERSION;
@@ -37,7 +47,14 @@ public static String defaultVersion() {
 	public static FormatterStep create(GherkinUtilsConfig gherkinSimpleConfig,
 			String formatterVersion, Provisioner provisioner) {
 		Objects.requireNonNull(provisioner, "provisioner cannot be null");
-		return FormatterStep.createLazy("gherkin", () -> new GherkinUtilsStep.State(gherkinSimpleConfig, formatterVersion, provisioner), GherkinUtilsStep.State::toFormatter);
+		return FormatterStep.create(NAME,
+				new GherkinUtilsStep(JarState.promise(() -> JarState.from(MAVEN_COORDINATE + formatterVersion, provisioner)), gherkinSimpleConfig),
+				GherkinUtilsStep::equalityState,
+				GherkinUtilsStep.State::toFormatter);
+	}
+
+	private State equalityState() {
+		return new State(jarState.get(), gherkinSimpleConfig);
 	}
 
 	private static final class State implements Serializable {
@@ -46,9 +63,9 @@ private static final class State implements Serializable {
 		private final GherkinUtilsConfig gherkinSimpleConfig;
 		private final JarState jarState;
 
-		private State(GherkinUtilsConfig gherkinSimpleConfig, String formatterVersion, Provisioner provisioner) throws IOException {
+		State(JarState jarState, GherkinUtilsConfig gherkinSimpleConfig) {
+			this.jarState = jarState;
 			this.gherkinSimpleConfig = gherkinSimpleConfig;
-			this.jarState = JarState.from(MAVEN_COORDINATE + formatterVersion, provisioner);
 		}
 
 		FormatterFunc toFormatter() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException,
@@ -58,8 +75,4 @@ FormatterFunc toFormatter() throws ClassNotFoundException, NoSuchMethodException
 			return (FormatterFunc) constructor.newInstance(gherkinSimpleConfig);
 		}
 	}
-
-	private GherkinUtilsStep() {
-		// cannot be directly instantiated
-	}
 }
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
index 53e5d8d5f9..70bdef3d88 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
@@ -51,7 +51,7 @@ protected StepHarnessBase(Formatter formatter) {
 				supportsRoundTrip = true;
 			} else if (Set.of("black", "buf", "clang", "ktlint", "ktfmt", "scalafmt", "palantir-java-format", "google-java-format",
 					"removeUnusedImports", "cleanthat", "No line break between type annotation and type",
-					"gson", "jacksonJson", "apply-json-patch", "jsonSimple", "sortPom", "jacksonYaml",
+					"gson", "jacksonJson", "apply-json-patch", "jsonSimple", "sortPom", "jacksonYaml", "gherkinUtils",
 					"importOrder", "Remove unnecessary semicolons").contains(onlyStepName)) {
 				supportsRoundTrip = true;
 			}

From a704a68142276996b9fb05d7e4b75de5c3881669 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 13 Feb 2024 22:17:17 +0800
Subject: [PATCH 1516/2068] Make Antlr4FormatterStep round-trippable

---
 .../spotless/antlr4/Antlr4FormatterStep.java  | 44 ++++++++++++-------
 .../diffplug/spotless/StepHarnessBase.java    |  2 +-
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/antlr4/Antlr4FormatterStep.java b/lib/src/main/java/com/diffplug/spotless/antlr4/Antlr4FormatterStep.java
index d71182c65d..ca1d021d63 100644
--- a/lib/src/main/java/com/diffplug/spotless/antlr4/Antlr4FormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/antlr4/Antlr4FormatterStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,44 +15,54 @@
  */
 package com.diffplug.spotless.antlr4;
 
-import java.io.IOException;
 import java.io.Serializable;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-import com.diffplug.spotless.*;
-
-public class Antlr4FormatterStep {
+import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.JarState;
+import com.diffplug.spotless.Provisioner;
+import com.diffplug.spotless.RoundedStep;
+import com.diffplug.spotless.ThrowingEx;
 
+public class Antlr4FormatterStep implements RoundedStep {
+	private static final long serialVersionUID = 1L;
+	private static final String MAVEN_COORDINATE = "com.khubla.antlr4formatter:antlr4-formatter:";
+	private static final String DEFAULT_VERSION = "1.2.1";
 	public static final String NAME = "antlr4Formatter";
 
-	private Antlr4FormatterStep() {}
+	private final JarState.Promised jarState;
 
-	private static final String MAVEN_COORDINATE = "com.khubla.antlr4formatter:antlr4-formatter:";
-	private static final String DEFAULT_VERSION = "1.2.1";
+	private Antlr4FormatterStep(JarState.Promised jarState) {
+		this.jarState = jarState;
+	}
 
 	public static FormatterStep create(Provisioner provisioner) {
 		return create(defaultVersion(), provisioner);
 	}
 
 	public static FormatterStep create(String version, Provisioner provisioner) {
-		return FormatterStep.createLazy(NAME, () -> new State(version, provisioner), State::createFormat);
+		return FormatterStep.create(NAME,
+				new Antlr4FormatterStep(JarState.promise(() -> JarState.from(MAVEN_COORDINATE + version, provisioner))),
+				Antlr4FormatterStep::equalityState,
+				State::createFormat);
 	}
 
 	public static String defaultVersion() {
 		return DEFAULT_VERSION;
 	}
 
-	static final class State implements Serializable {
-		private static final long serialVersionUID = 1L;
+	private State equalityState() {
+		return new State(jarState.get());
+	}
 
-		/**
-		 * The jar that contains the formatter.
-		 */
-		final JarState jarState;
+	private static final class State implements Serializable {
+		private static final long serialVersionUID = 1L;
+		private final JarState jarState;
 
-		State(String version, Provisioner provisioner) throws IOException {
-			this.jarState = JarState.from(MAVEN_COORDINATE + version, provisioner);
+		State(JarState jarState) {
+			this.jarState = jarState;
 		}
 
 		FormatterFunc createFormat() throws ClassNotFoundException, NoSuchMethodException {
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
index 70bdef3d88..7af822609f 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
@@ -50,7 +50,7 @@ protected StepHarnessBase(Formatter formatter) {
 			} else if (onlyStepName.equals("fence")) {
 				supportsRoundTrip = true;
 			} else if (Set.of("black", "buf", "clang", "ktlint", "ktfmt", "scalafmt", "palantir-java-format", "google-java-format",
-					"removeUnusedImports", "cleanthat", "No line break between type annotation and type",
+					"removeUnusedImports", "cleanthat", "No line break between type annotation and type", "antlr4Formatter",
 					"gson", "jacksonJson", "apply-json-patch", "jsonSimple", "sortPom", "jacksonYaml", "gherkinUtils",
 					"importOrder", "Remove unnecessary semicolons").contains(onlyStepName)) {
 				supportsRoundTrip = true;

From fb4b0ffd2d59e4524e6ba906f2996e00e6e123c6 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 13 Feb 2024 22:24:23 +0800
Subject: [PATCH 1517/2068] Make Jsr223Step round-trippable

---
 .../diffplug/spotless/generic/Jsr223Step.java | 33 ++++++++++++++-----
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/generic/Jsr223Step.java b/lib/src/main/java/com/diffplug/spotless/generic/Jsr223Step.java
index 90f57b24ef..f9b88ef6cc 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/Jsr223Step.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/Jsr223Step.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2021-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+import javax.annotation.Nullable;
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
 
@@ -26,28 +27,44 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
+import com.diffplug.spotless.RoundedStep;
 
-public final class Jsr223Step {
-	// prevent direct instantiation
-	private Jsr223Step() {}
+public final class Jsr223Step implements RoundedStep {
+	private static final long serialVersionUID = 1L;
+	@Nullable
+	private final JarState.Promised jarState;
+	private final String engine;
+	private final String script;
 
-	public static FormatterStep create(String name, String dependency, CharSequence engine, CharSequence script, Provisioner provisioner) {
+	private Jsr223Step(@Nullable JarState.Promised jarState, String engine, String script) {
+		this.jarState = jarState;
+		this.engine = engine;
+		this.script = script;
+	}
+
+	public static FormatterStep create(String name, @Nullable String dependency, CharSequence engine, CharSequence script, Provisioner provisioner) {
 		Objects.requireNonNull(name, "name");
 		Objects.requireNonNull(engine, "engine");
 		Objects.requireNonNull(script, "script");
-		return FormatterStep.createLazy(name,
-				() -> new State(dependency == null ? null : JarState.from(dependency, provisioner), engine, script),
+		return FormatterStep.create(name,
+				new Jsr223Step(dependency == null ? null : JarState.promise(() -> JarState.from(dependency, provisioner)), engine.toString(), script.toString()),
+				Jsr223Step::equalityState,
 				State::toFormatter);
 	}
 
+	private State equalityState() {
+		return new State(jarState == null ? null : jarState.get(), engine, script);
+	}
+
 	private static final class State implements Serializable {
 		private static final long serialVersionUID = 1L;
 
+		@Nullable
 		private final JarState jarState;
 		private final String engine;
 		private final String script;
 
-		State(JarState jarState, CharSequence engine, CharSequence script) {
+		State(@Nullable JarState jarState, CharSequence engine, CharSequence script) {
 			this.jarState = jarState;
 			this.engine = engine.toString();
 			this.script = script.toString();

From efc15b426e95d797ce6a75aa69c3ff53d0a05416 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 13 Feb 2024 22:32:08 +0800
Subject: [PATCH 1518/2068] Make FlexmarkStep round-trippable

---
 .../spotless/markdown/FlexmarkStep.java       | 30 ++++++++++++-------
 .../diffplug/spotless/StepHarnessBase.java    |  1 +
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/markdown/FlexmarkStep.java b/lib/src/main/java/com/diffplug/spotless/markdown/FlexmarkStep.java
index 65d903cba3..6b9d735425 100644
--- a/lib/src/main/java/com/diffplug/spotless/markdown/FlexmarkStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/markdown/FlexmarkStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,15 +23,20 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
+import com.diffplug.spotless.RoundedStep;
 
 /** A step for <a href="https://github.com/vsch/flexmark-java">flexmark-java</a>. */
-public class FlexmarkStep {
-	// prevent direct instantiation
-	private FlexmarkStep() {}
-
+public class FlexmarkStep implements RoundedStep {
+	private static final long serialVersionUID = 1L;
 	private static final String DEFAULT_VERSION = "0.64.8";
-	private static final String NAME = "flexmark-java";
 	private static final String MAVEN_COORDINATE = "com.vladsch.flexmark:flexmark-all:";
+	public static final String NAME = "flexmark-java";
+
+	private final JarState.Promised jarState;
+
+	private FlexmarkStep(JarState.Promised jarState) {
+		this.jarState = jarState;
+	}
 
 	/** Creates a formatter step for the default version. */
 	public static FormatterStep create(Provisioner provisioner) {
@@ -42,8 +47,9 @@ public static FormatterStep create(Provisioner provisioner) {
 	public static FormatterStep create(String version, Provisioner provisioner) {
 		Objects.requireNonNull(version, "version");
 		Objects.requireNonNull(provisioner, "provisioner");
-		return FormatterStep.createLazy(NAME,
-				() -> new State(JarState.from(MAVEN_COORDINATE + version, provisioner)),
+		return FormatterStep.create(NAME,
+				new FlexmarkStep(JarState.promise(() -> JarState.from(MAVEN_COORDINATE + version, provisioner))),
+				FlexmarkStep::equalityState,
 				State::createFormat);
 	}
 
@@ -51,11 +57,14 @@ public static String defaultVersion() {
 		return DEFAULT_VERSION;
 	}
 
+	private State equalityState() {
+		return new State(jarState.get());
+	}
+
 	private static class State implements Serializable {
 		private static final long serialVersionUID = 1L;
 
-		/** The jar that contains the formatter. */
-		final JarState jarState;
+		private final JarState jarState;
 
 		State(JarState jarState) {
 			this.jarState = jarState;
@@ -67,6 +76,5 @@ FormatterFunc createFormat() throws Exception {
 			final Constructor<?> constructor = formatterFunc.getConstructor();
 			return (FormatterFunc) constructor.newInstance();
 		}
-
 	}
 }
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
index 7af822609f..32e3999c69 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
@@ -52,6 +52,7 @@ protected StepHarnessBase(Formatter formatter) {
 			} else if (Set.of("black", "buf", "clang", "ktlint", "ktfmt", "scalafmt", "palantir-java-format", "google-java-format",
 					"removeUnusedImports", "cleanthat", "No line break between type annotation and type", "antlr4Formatter",
 					"gson", "jacksonJson", "apply-json-patch", "jsonSimple", "sortPom", "jacksonYaml", "gherkinUtils",
+					"flexmark-java",
 					"importOrder", "Remove unnecessary semicolons").contains(onlyStepName)) {
 				supportsRoundTrip = true;
 			}

From 8977d9ef65e3cb6d522a04242c488a0a82b6f812 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 13 Feb 2024 22:39:18 +0800
Subject: [PATCH 1519/2068] Make FreshMarkStep round-trippable

---
 .../spotless/markdown/FreshMarkStep.java      | 35 ++++++++++++-------
 .../gradle/spotless/FreshMarkExtension.java   | 14 ++++----
 .../diffplug/spotless/StepHarnessBase.java    |  2 +-
 .../spotless/markdown/FreshMarkStepTest.java  | 12 +++----
 4 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/markdown/FreshMarkStep.java b/lib/src/main/java/com/diffplug/spotless/markdown/FreshMarkStep.java
index 4477c640c7..c1e140fdf1 100644
--- a/lib/src/main/java/com/diffplug/spotless/markdown/FreshMarkStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/markdown/FreshMarkStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,12 +35,11 @@
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Jvm;
 import com.diffplug.spotless.Provisioner;
-import com.diffplug.spotless.ThrowingEx.Supplier;
+import com.diffplug.spotless.RoundedStep;
 
 /** A step for <a href="https://github.com/diffplug/freshmark">FreshMark</a>. */
-public class FreshMarkStep {
-	// prevent direct instantiation
-	private FreshMarkStep() {}
+public class FreshMarkStep implements RoundedStep {
+	private static final long serialVersionUID = 1L;
 
 	private static final String DEFAULT_VERSION = "1.3.1";
 	private static final String NAME = "freshmark";
@@ -52,13 +51,21 @@ private FreshMarkStep() {}
 	private static final String FORMATTER_CLASS = "com.diffplug.freshmark.FreshMark";
 	private static final String FORMATTER_METHOD = "compile";
 
+	private final JarState.Promised jarState;
+	private final Map<String, ?> properties;
+
+	private FreshMarkStep(JarState.Promised jarState, Map<String, ?> properties) {
+		this.jarState = jarState;
+		this.properties = properties;
+	}
+
 	/** Creates a formatter step for the given version and settings file. */
-	public static FormatterStep create(Supplier<Map<String, ?>> properties, Provisioner provisioner) {
+	public static FormatterStep create(Map<String, ?> properties, Provisioner provisioner) {
 		return create(defaultVersion(), properties, provisioner);
 	}
 
 	/** Creates a formatter step for the given version and settings file. */
-	public static FormatterStep create(String version, Supplier<Map<String, ?>> properties, Provisioner provisioner) {
+	public static FormatterStep create(String version, Map<String, ?> properties, Provisioner provisioner) {
 		Objects.requireNonNull(version, "version");
 		Objects.requireNonNull(properties, "properties");
 		Objects.requireNonNull(provisioner, "provisioner");
@@ -70,8 +77,9 @@ public static FormatterStep create(String version, Supplier<Map<String, ?>> prop
 			mavenCoordinates.add(NASHORN_MAVEN_COORDINATE + NASHORN_VERSION);
 		}
 
-		return FormatterStep.createLazy(NAME,
-				() -> new State(JarState.from(mavenCoordinates, provisioner), properties.get()),
+		return FormatterStep.create(NAME,
+				new FreshMarkStep(JarState.promise(() -> JarState.from(mavenCoordinates, provisioner)), properties),
+				FreshMarkStep::equalityState,
 				State::createFormat);
 	}
 
@@ -79,12 +87,15 @@ public static String defaultVersion() {
 		return DEFAULT_VERSION;
 	}
 
+	private State equalityState() throws Exception {
+		return new State(jarState.get(), properties);
+	}
+
 	private static class State implements Serializable {
 		private static final long serialVersionUID = 1L;
 
-		/** The jar that contains the formatter. */
-		final JarState jarState;
-		final NavigableMap<String, ?> properties;
+		private final JarState jarState;
+		private final NavigableMap<String, ?> properties;
 
 		State(JarState jarState, Map<String, ?> properties) {
 			this.jarState = jarState;
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java
index b046beda7c..c6c289a2a9 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,13 +38,11 @@ public class FreshMarkExtension extends FormatExtension {
 	@Inject
 	public FreshMarkExtension(SpotlessExtension spotless) {
 		super(spotless);
-		addStep(FreshMarkStep.create(() -> {
-			Map<String, Object> map = new HashMap<>();
-			for (Action<Map<String, Object>> action : propertyActions) {
-				action.execute(map);
-			}
-			return map;
-		}, provisioner()));
+		Map<String, Object> map = new HashMap<>();
+		for (Action<Map<String, Object>> action : propertyActions) {
+			action.execute(map);
+		}
+		addStep(FreshMarkStep.create(map, provisioner()));
 	}
 
 	public void properties(Action<Map<String, Object>> action) {
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
index 32e3999c69..29b253872f 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
@@ -52,7 +52,7 @@ protected StepHarnessBase(Formatter formatter) {
 			} else if (Set.of("black", "buf", "clang", "ktlint", "ktfmt", "scalafmt", "palantir-java-format", "google-java-format",
 					"removeUnusedImports", "cleanthat", "No line break between type annotation and type", "antlr4Formatter",
 					"gson", "jacksonJson", "apply-json-patch", "jsonSimple", "sortPom", "jacksonYaml", "gherkinUtils",
-					"flexmark-java",
+					"flexmark-java", "freshmark",
 					"importOrder", "Remove unnecessary semicolons").contains(onlyStepName)) {
 				supportsRoundTrip = true;
 			}
diff --git a/testlib/src/test/java/com/diffplug/spotless/markdown/FreshMarkStepTest.java b/testlib/src/test/java/com/diffplug/spotless/markdown/FreshMarkStepTest.java
index 586212383d..97c62e8659 100644
--- a/testlib/src/test/java/com/diffplug/spotless/markdown/FreshMarkStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/markdown/FreshMarkStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,19 +27,19 @@
 
 class FreshMarkStepTest {
 	@Test
-	void behavior() throws Exception {
+	void behavior() {
 		HashMap<String, String> map = new HashMap<>();
 		map.put("lib", "MyLib");
 		map.put("author", "Me");
-		StepHarness.forStep(FreshMarkStep.create(() -> map, TestProvisioner.mavenCentral()))
+		StepHarness.forStep(FreshMarkStep.create(map, TestProvisioner.mavenCentral()))
 				.testResource("freshmark/FreshMarkUnformatted.test", "freshmark/FreshMarkFormatted.test");
 	}
 
 	@Test
-	void equality() throws Exception {
+	void equality() {
 		new SerializableEqualityTester() {
 			String version = "1.3.1";
-			Map<String, Object> props = new HashMap<>();
+			final Map<String, Object> props = new HashMap<>();
 
 			@Override
 			protected void setupTest(API api) {
@@ -57,7 +57,7 @@ protected void setupTest(API api) {
 			protected FormatterStep create() {
 				String finalVersion = this.version;
 				Map<String, ?> finalProps = new HashMap<>(props);
-				return FreshMarkStep.create(finalVersion, () -> finalProps, TestProvisioner.mavenCentral());
+				return FreshMarkStep.create(finalVersion, finalProps, TestProvisioner.mavenCentral());
 			}
 		}.testEquals();
 	}

From f41f12cddfdb53f40b7930eeee43de2d6e794194 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sat, 17 Feb 2024 04:33:42 +0800
Subject: [PATCH 1520/2068] Support ktfmt 0.47 or newer

---
 CHANGES.md                                    |  3 +-
 lib/build.gradle                              |  2 +-
 .../glue/ktfmt/KtfmtFormatterFunc.java        | 33 ++++++++++++++-----
 .../diffplug/spotless/kotlin/KtfmtStep.java   |  2 +-
 plugin-gradle/CHANGES.md                      |  3 +-
 plugin-maven/CHANGES.md                       |  3 +-
 .../spotless/kotlin/KtfmtStepTest.java        | 10 +++++-
 7 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index b0d80fd7ff..1b21b57858 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,7 +13,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * `FileSignature.Promised` and `JarState.Promised` to facilitate round-trip serialization for the Gradle configuration cache. ([#1945](https://github.com/diffplug/spotless/pull/1945)) 
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
-
+### Changes
+* Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
 ### Removed
 * **BREAKING** Remove `JarState.getMavenCoordinate(String prefix)`. ([#1945](https://github.com/diffplug/spotless/pull/1945))
 * **BREAKING** Replace `PipeStepPair` with `FenceStep`. ([#1954](https://github.com/diffplug/spotless/pull/1954))
diff --git a/lib/build.gradle b/lib/build.gradle
index 738e2975fc..8d313f123a 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -101,7 +101,7 @@ dependencies {
 	jacksonCompileOnly "com.fasterxml.jackson.core:jackson-databind:$VER_JACKSON"
 	jacksonCompileOnly "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$VER_JACKSON"
 	// ktfmt
-	ktfmtCompileOnly "com.facebook:ktfmt:0.46"
+	ktfmtCompileOnly "com.facebook:ktfmt:0.47"
 	ktfmtCompileOnly("com.google.googlejavaformat:google-java-format") {
 		version {
 			strictly '1.7' // for JDK 8 compatibility
diff --git a/lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtFormatterFunc.java b/lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtFormatterFunc.java
index 80f4a42fcd..1d191c05d5 100644
--- a/lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtFormatterFunc.java
+++ b/lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtFormatterFunc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 DiffPlug
+ * Copyright 2022-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
  */
 package com.diffplug.spotless.glue.ktfmt;
 
+import java.lang.reflect.Method;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
@@ -54,7 +56,7 @@ public String apply(@Nonnull String input) throws Exception {
 		return Formatter.format(createFormattingOptions(), input);
 	}
 
-	private FormattingOptions createFormattingOptions() {
+	private FormattingOptions createFormattingOptions() throws Exception {
 		FormattingOptions formattingOptions;
 		switch (style) {
 		case DEFAULT:
@@ -74,13 +76,26 @@ private FormattingOptions createFormattingOptions() {
 		}
 
 		if (ktfmtFormattingOptions != null) {
-			formattingOptions = formattingOptions.copy(
-					formattingOptions.getStyle(),
-					ktfmtFormattingOptions.getMaxWidth().orElse(formattingOptions.getMaxWidth()),
-					ktfmtFormattingOptions.getBlockIndent().orElse(formattingOptions.getBlockIndent()),
-					ktfmtFormattingOptions.getContinuationIndent().orElse(formattingOptions.getContinuationIndent()),
-					ktfmtFormattingOptions.getRemoveUnusedImport().orElse(formattingOptions.getRemoveUnusedImports()),
-					formattingOptions.getDebuggingPrintOpsAfterFormatting());
+			try {
+				formattingOptions = formattingOptions.copy(
+						formattingOptions.getStyle(),
+						ktfmtFormattingOptions.getMaxWidth().orElse(formattingOptions.getMaxWidth()),
+						ktfmtFormattingOptions.getBlockIndent().orElse(formattingOptions.getBlockIndent()),
+						ktfmtFormattingOptions.getContinuationIndent().orElse(formattingOptions.getContinuationIndent()),
+						ktfmtFormattingOptions.getRemoveUnusedImport().orElse(formattingOptions.getRemoveUnusedImports()),
+						formattingOptions.getDebuggingPrintOpsAfterFormatting(),
+						formattingOptions.getManageTrailingCommas());
+			} catch (NoSuchMethodError e) {
+				//noinspection JavaReflectionMemberAccess, ABI change from ktfmt 0.47
+				Method copyMethod = formattingOptions.getClass().getMethod("copy", FormattingOptions.Style.class, int.class, int.class, int.class, boolean.class, boolean.class);
+				formattingOptions = (FormattingOptions) copyMethod.invoke(formattingOptions,
+						formattingOptions.getStyle(),
+						ktfmtFormattingOptions.getMaxWidth().orElse(formattingOptions.getMaxWidth()),
+						ktfmtFormattingOptions.getBlockIndent().orElse(formattingOptions.getBlockIndent()),
+						ktfmtFormattingOptions.getContinuationIndent().orElse(formattingOptions.getContinuationIndent()),
+						ktfmtFormattingOptions.getRemoveUnusedImport().orElse(formattingOptions.getRemoveUnusedImports()),
+						formattingOptions.getDebuggingPrintOpsAfterFormatting());
+			}
 		}
 
 		return formattingOptions;
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
index 768cd335cf..4ffdc380b2 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
@@ -37,7 +37,7 @@
  */
 public class KtfmtStep implements RoundedStep {
 	private static final long serialVersionUID = 1L;
-	private static final String DEFAULT_VERSION = "0.46";
+	private static final String DEFAULT_VERSION = "0.47";
 	private static final String NAME = "ktfmt";
 	private static final String MAVEN_COORDINATE = "com.facebook:ktfmt:";
 
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index da2466339c..a97304f59b 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,7 +5,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Fixed
 * Ignore system git config when running tests ([#1990](https://github.com/diffplug/spotless/issues/1990))
-
+### Changes
+* Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
 ### Added
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
 
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 3e3cc975b3..95661d4ebe 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,7 +5,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Fixed
 * Ignore system git config when running tests ([#1990](https://github.com/diffplug/spotless/issues/1990))
-
+### Changes
+* Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
 ### Added
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
 
diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java
index 72e0adb4e2..e9458c9d39 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,14 @@ void behavior() throws Exception {
 		StepHarness.forStep(step).testResource("kotlin/ktfmt/basic.dirty", "kotlin/ktfmt/basic.clean");
 	}
 
+	@Test
+	void behaviorWithOptions() {
+		KtfmtStep.KtfmtFormattingOptions options = new KtfmtStep.KtfmtFormattingOptions();
+		options.setMaxWidth(100);
+		FormatterStep step = KtfmtStep.create(KtfmtStep.defaultVersion(), TestProvisioner.mavenCentral(), KtfmtStep.Style.GOOGLE, options);
+		StepHarness.forStep(step).testResource("kotlin/ktfmt/basic.dirty", "kotlin/ktfmt/basic.clean");
+	}
+
 	@Test
 	void dropboxStyle_0_18() throws Exception {
 		FormatterStep step = KtfmtStep.create("0.18", TestProvisioner.mavenCentral(), KtfmtStep.Style.DROPBOX, null);

From e7f259e7b74fb704a709dc526e8b35aa052ea9cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Ekryd?= <bjornatekryd.se>
Date: Tue, 20 Feb 2024 10:35:03 +0100
Subject: [PATCH 1521/2068] Updated SortPom from 3.2.1 to 3.4.0 with support
 for endWithNewline

---
 lib/build.gradle                                          | 4 ++--
 .../main/java/com/diffplug/spotless/pom/SortPomCfg.java   | 6 ++++--
 .../diffplug/spotless/glue/pom/SortPomFormatterFunc.java  | 4 ++--
 plugin-maven/README.md                                    | 2 ++
 .../java/com/diffplug/spotless/maven/pom/SortPom.java     | 6 +++++-
 .../test/java/com/diffplug/spotless/pom/SortPomTest.java  | 8 ++++----
 6 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 8d313f123a..7b52442f92 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -128,8 +128,8 @@ dependencies {
 	// scalafmt
 	scalafmtCompileOnly "org.scalameta:scalafmt-core_2.13:3.7.3"
 	// sortPom
-	sortPomCompileOnly 'com.github.ekryd.sortpom:sortpom-sorter:3.2.1'
-	sortPomCompileOnly 'org.slf4j:slf4j-api:2.0.0'
+	sortPomCompileOnly 'com.github.ekryd.sortpom:sortpom-sorter:3.4.0'
+	sortPomCompileOnly 'org.slf4j:slf4j-api:2.0.12'
 	// zjsonPatch
 	zjsonPatchCompileOnly 'com.flipkart.zjsonpatch:zjsonpatch:0.4.14'
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/pom/SortPomCfg.java b/lib/src/main/java/com/diffplug/spotless/pom/SortPomCfg.java
index 8315035dc7..c24e91cf80 100644
--- a/lib/src/main/java/com/diffplug/spotless/pom/SortPomCfg.java
+++ b/lib/src/main/java/com/diffplug/spotless/pom/SortPomCfg.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 DiffPlug
+ * Copyright 2021-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 public class SortPomCfg implements Serializable {
 	private static final long serialVersionUID = 1L;
 
-	public String version = "3.2.1";
+	public String version = "3.4.0";
 
 	public String encoding = "UTF-8";
 
@@ -33,6 +33,8 @@ public class SortPomCfg implements Serializable {
 
 	public boolean keepBlankLines = true;
 
+	public boolean endWithNewline = true;
+
 	public int nrOfIndentSpace = 2;
 
 	public boolean indentBlankLines = false;
diff --git a/lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java b/lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java
index 4dcde62bae..57b96d70c7 100644
--- a/lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java
+++ b/lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 DiffPlug
+ * Copyright 2021-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,7 +50,7 @@ public String apply(String input) throws Exception {
 				.setPomFile(pom)
 				.setFileOutput(false, null, null, false)
 				.setEncoding(cfg.encoding)
-				.setFormatting(cfg.lineSeparator, cfg.expandEmptyElements, cfg.spaceBeforeCloseEmptyElement, cfg.keepBlankLines)
+				.setFormatting(cfg.lineSeparator, cfg.expandEmptyElements, cfg.spaceBeforeCloseEmptyElement, cfg.keepBlankLines, cfg.endWithNewline)
 				.setIndent(cfg.nrOfIndentSpace, cfg.indentBlankLines, cfg.indentSchemaLocation)
 				.setSortOrder(cfg.sortOrderFile, cfg.predefinedSortOrder)
 				.setSortEntities(cfg.sortDependencies, cfg.sortDependencyExclusions, cfg.sortDependencyManagement,
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index fbe4248b7b..384d3f78a5 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -659,6 +659,8 @@ All configuration settings are optional, they are described in detail [here](htt
 
   <keepBlankLines>true</keepBlankLines> <!-- Keep empty lines -->
 
+  <endWithNewline>true</endWithNewline> <!-- Whether sorted pom ends with a newline -->
+
   <nrOfIndentSpace>2</nrOfIndentSpace> <!-- Indentation -->
 
   <indentBlankLines>false</indentBlankLines> <!-- Should empty lines be indented -->
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/pom/SortPom.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/pom/SortPom.java
index 8620427f79..efa2f533b8 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/pom/SortPom.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/pom/SortPom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 DiffPlug
+ * Copyright 2021-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,6 +44,9 @@ public class SortPom implements FormatterStepFactory {
 	@Parameter
 	boolean keepBlankLines = defaultValues.keepBlankLines;
 
+	@Parameter
+	boolean endWithNewline = defaultValues.endWithNewline;
+
 	@Parameter
 	int nrOfIndentSpace = defaultValues.nrOfIndentSpace;
 
@@ -89,6 +92,7 @@ public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 		cfg.expandEmptyElements = expandEmptyElements;
 		cfg.spaceBeforeCloseEmptyElement = spaceBeforeCloseEmptyElement;
 		cfg.keepBlankLines = keepBlankLines;
+		cfg.endWithNewline = endWithNewline;
 		cfg.nrOfIndentSpace = nrOfIndentSpace;
 		cfg.indentBlankLines = indentBlankLines;
 		cfg.indentSchemaLocation = indentSchemaLocation;
diff --git a/testlib/src/test/java/com/diffplug/spotless/pom/SortPomTest.java b/testlib/src/test/java/com/diffplug/spotless/pom/SortPomTest.java
index c88918f505..5a0ad297c5 100644
--- a/testlib/src/test/java/com/diffplug/spotless/pom/SortPomTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/pom/SortPomTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 DiffPlug
+ * Copyright 2021-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,16 +21,16 @@
 
 public class SortPomTest extends ResourceHarness {
 	@Test
-	public void testSortPomWithDefaultConfig() throws Exception {
+	public void testSortPomWithDefaultConfig() {
 		SortPomCfg cfg = new SortPomCfg();
 		FormatterStep step = SortPomStep.create(cfg, TestProvisioner.mavenCentral());
 		StepHarness.forStep(step).testResource("pom/pom_dirty.xml", "pom/pom_clean_default.xml");
 	}
 
 	@Test
-	public void testSortPomWithVersion() throws Exception {
+	public void testSortPomWithVersion() {
 		SortPomCfg cfg = new SortPomCfg();
-		cfg.version = "3.2.1";
+		cfg.version = "3.4.0";
 		FormatterStep step = SortPomStep.create(cfg, TestProvisioner.mavenCentral());
 		StepHarness.forStep(step).testResource("pom/pom_dirty.xml", "pom/pom_clean_default.xml");
 	}

From 9dec37ac294f4cc71e2c97b9f50785cb51533fc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Ekryd?= <bjornatekryd.se>
Date: Tue, 20 Feb 2024 10:41:22 +0100
Subject: [PATCH 1522/2068] Updated change logs

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 1 +
 plugin-maven/CHANGES.md  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 1b21b57858..e86f61a3f6 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,6 +15,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
 ### Changes
 * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
+* Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049))
 ### Removed
 * **BREAKING** Remove `JarState.getMavenCoordinate(String prefix)`. ([#1945](https://github.com/diffplug/spotless/pull/1945))
 * **BREAKING** Replace `PipeStepPair` with `FenceStep`. ([#1954](https://github.com/diffplug/spotless/pull/1954))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index a97304f59b..f5d7558a29 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -7,6 +7,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Ignore system git config when running tests ([#1990](https://github.com/diffplug/spotless/issues/1990))
 ### Changes
 * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
+* Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049))
 ### Added
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
 
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 95661d4ebe..b4f1b42e18 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 (
 * Ignore system git config when running tests ([#1990](https://github.com/diffplug/spotless/issues/1990))
 ### Changes
 * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
+* Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049))
 ### Added
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
 

From fd26da46b4e43795d1be79f1e5683e6b03c66eb9 Mon Sep 17 00:00:00 2001
From: Tyler Crawford <tcrawford@figure.com>
Date: Tue, 20 Feb 2024 10:16:25 -0500
Subject: [PATCH 1523/2068] Bump default `shfmt` version to latest `3.7.0` ->
 `3.8.0`

---
 .github/workflows/ci.yml                               | 10 +++++++---
 CHANGES.md                                             |  1 +
 .../java/com/diffplug/spotless/shell/ShfmtStep.java    |  2 +-
 plugin-gradle/CHANGES.md                               |  1 +
 plugin-gradle/README.md                                |  2 +-
 plugin-maven/CHANGES.md                                |  1 +
 plugin-maven/README.md                                 |  2 +-
 7 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5d4cfb57e6..5e015ed123 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -60,7 +60,7 @@ jobs:
           - kind: shfmt
             jre: 11
             os: ubuntu-latest
-            shfmt-version: 3.7.0
+            shfmt-version: v3.8.0
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
@@ -83,11 +83,15 @@ jobs:
       - name: test npm
         if: matrix.kind == 'npm'
         run: ./gradlew testNpm
+      - name: Setup go
+        if: matrix.kind == 'shfmt'
+        uses: actions/setup-go@v5
+        with:
+          go-version: 'stable'
       - name: Install shfmt
         if: matrix.kind == 'shfmt'
         run: |
-          curl -sSfL "https://github.com/mvdan/sh/releases/download/v${{ matrix.shfmt-version }}/shfmt_v${{ matrix.shfmt-version }}_linux_amd64" -o /usr/local/bin/shfmt
-          chmod +x /usr/local/bin/shfmt
+          go install mvdan.cc/sh/v3/cmd/shfmt@${{ matrix.shfmt-version }}
       - name: Test shfmt
         if: matrix.kind == 'shfmt'
         run: ./gradlew testShfmt
diff --git a/CHANGES.md b/CHANGES.md
index 1b21b57858..b5a6b23f42 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,6 +15,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
 ### Changes
 * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
+* Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#TODO](https://github.com/diffplug/spotless/pull/TODO))
 ### Removed
 * **BREAKING** Remove `JarState.getMavenCoordinate(String prefix)`. ([#1945](https://github.com/diffplug/spotless/pull/1945))
 * **BREAKING** Replace `PipeStepPair` with `FenceStep`. ([#1954](https://github.com/diffplug/spotless/pull/1954))
diff --git a/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java b/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java
index 46f833bd0d..6fd83aac80 100644
--- a/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java
@@ -40,7 +40,7 @@ public static String name() {
 	}
 
 	public static String defaultVersion() {
-		return "3.7.0";
+		return "3.8.0";
 	}
 
 	private final String version;
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index a97304f59b..2279b49352 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -7,6 +7,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Ignore system git config when running tests ([#1990](https://github.com/diffplug/spotless/issues/1990))
 ### Changes
 * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
+* Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#TODO](https://github.com/diffplug/spotless/pull/TODO))
 ### Added
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
 
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 2add917650..db76229450 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -1011,7 +1011,7 @@ When formatting shell scripts via `shfmt`, configure `shfmt` settings via `.edit
 Refer to the `shfmt` [man page](https://github.com/mvdan/sh/blob/master/cmd/shfmt/shfmt.1.scd) for `.editorconfig` settings. 
 
 ```gradle
-shfmt('3.7.0') // version is optional
+shfmt('3.8.0') // version is optional
 
 // if shfmt is not on your path, you must specify its location manually
 shfmt().pathToExe('/opt/homebrew/bin/shfmt')
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 95661d4ebe..26f2848649 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 (
 * Ignore system git config when running tests ([#1990](https://github.com/diffplug/spotless/issues/1990))
 ### Changes
 * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
+* Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#TODO](https://github.com/diffplug/spotless/pull/TODO))
 ### Added
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
 
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index fbe4248b7b..89dd9e66ec 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -1045,7 +1045,7 @@ When formatting shell scripts via `shfmt`, configure `shfmt` settings via `.edit
 
 ```xml
 <shfmt>
-  <version>3.7.0</version>                         <!-- optional: Custom version of 'mvdan/sh' -->
+  <version>3.8.0</version>                         <!-- optional: Custom version of 'mvdan/sh' -->
   <pathToExe>/opt/homebrew/bin/shfmt</pathToExe>   <!-- optional: if shfmt is not on your path, you must specify its location manually -->
 </shfmt>
 ```

From df8f951636d47c2b78cbc4b3a14d43722ad97983 Mon Sep 17 00:00:00 2001
From: Tyler Crawford <tcrawford@figure.com>
Date: Tue, 20 Feb 2024 11:31:19 -0500
Subject: [PATCH 1524/2068] Add pull request number

---
 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 b5a6b23f42..7e4a8c53a8 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,7 +15,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
 ### Changes
 * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
-* Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#TODO](https://github.com/diffplug/spotless/pull/TODO))
+* Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
 ### Removed
 * **BREAKING** Remove `JarState.getMavenCoordinate(String prefix)`. ([#1945](https://github.com/diffplug/spotless/pull/1945))
 * **BREAKING** Replace `PipeStepPair` with `FenceStep`. ([#1954](https://github.com/diffplug/spotless/pull/1954))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 2279b49352..20c78e8808 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -7,7 +7,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Ignore system git config when running tests ([#1990](https://github.com/diffplug/spotless/issues/1990))
 ### Changes
 * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
-* Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#TODO](https://github.com/diffplug/spotless/pull/TODO))
+* Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
 ### Added
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
 
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 26f2848649..1178b93603 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 (
 * Ignore system git config when running tests ([#1990](https://github.com/diffplug/spotless/issues/1990))
 ### Changes
 * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
-* Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#TODO](https://github.com/diffplug/spotless/pull/TODO))
+* Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
 ### Added
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
 

From efdc63769115fc0f1c1632354a2bd8e2a4acf45d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 23 Feb 2024 07:05:50 +0000
Subject: [PATCH 1525/2068] Update dependency dev.equo.ide:solstice to v1.7.6

---
 lib-extra/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index 35952873a5..9ea3f29afe 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -7,7 +7,7 @@ version = rootProject.spotlessChangelog.versionNext
 apply from: rootProject.file('gradle/java-setup.gradle')
 apply from: rootProject.file('gradle/java-publish.gradle')
 
-String VER_SOLSTICE = '1.7.5'
+String VER_SOLSTICE = '1.7.6'
 dependencies {
 	api projects.lib
 	// misc useful utilities

From 9bdfc9794b4a3ede12b9711aa7f289141f04ea04 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 23 Feb 2024 18:54:41 +0000
Subject: [PATCH 1526/2068] Update dependency io.cucumber:gherkin-utils to
 v8.0.6

---
 lib/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 7b52442f92..ba21f474f6 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -90,7 +90,7 @@ dependencies {
 	// flexmark
 	flexmarkCompileOnly 'com.vladsch.flexmark:flexmark-all:0.64.0'
 	// gherkin
-	gherkinCompileOnly 'io.cucumber:gherkin-utils:8.0.2'
+	gherkinCompileOnly 'io.cucumber:gherkin-utils:8.0.6'
 	gherkinCompileOnly 'org.slf4j:slf4j-api:2.0.0'
 	// googleJavaFormat
 	googleJavaFormatCompileOnly 'com.google.googlejavaformat:google-java-format:1.19.2'

From 7080be58cf61a38fd11741d3601d470b0c26f7e3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 25 Feb 2024 09:11:23 +0000
Subject: [PATCH 1527/2068] Update dependency
 com.flipkart.zjsonpatch:zjsonpatch to v0.4.16

---
 lib/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 7b52442f92..be89c3002f 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -131,7 +131,7 @@ dependencies {
 	sortPomCompileOnly 'com.github.ekryd.sortpom:sortpom-sorter:3.4.0'
 	sortPomCompileOnly 'org.slf4j:slf4j-api:2.0.12'
 	// zjsonPatch
-	zjsonPatchCompileOnly 'com.flipkart.zjsonpatch:zjsonpatch:0.4.14'
+	zjsonPatchCompileOnly 'com.flipkart.zjsonpatch:zjsonpatch:0.4.16'
 }
 
 // we'll hold the core lib to a high standard

From dceed82afece0e4ced230aae432fae1cf2ddf5dd Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Wed, 28 Feb 2024 18:33:06 +0800
Subject: [PATCH 1528/2068] Tweak GJF version comment for Maven

---
 plugin-maven/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 9a17cd2be7..b9821e2d44 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -232,7 +232,7 @@ any other maven phase (i.e. compile) then it can be configured as below;
 
 ```xml
 <googleJavaFormat>
-  <version>1.8</version>                      <!-- optional, 1.8 is minimum supported version -->
+  <version>1.8</version>                      <!-- optional, 1.8 is the minimum supported version for Java 11-->
   <style>GOOGLE</style>                       <!-- or AOSP (optional) -->
   <reflowLongStrings>true</reflowLongStrings> <!-- optional -->
   <formatJavadoc>false</formatJavadoc>        <!-- optional -->

From fc6c7113e9145dd496412453ffabd448b0c2f30a Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Thu, 29 Feb 2024 10:17:25 +0800
Subject: [PATCH 1529/2068] Bump default Ktlint version to 1.2.1

https://github.com/pinterest/ktlint/releases/tag/1.2.0
https://github.com/pinterest/ktlint/releases/tag/1.2.1
---
 CHANGES.md                                                     | 1 +
 lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java | 2 +-
 plugin-gradle/CHANGES.md                                       | 1 +
 plugin-maven/CHANGES.md                                        | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index e94f0c7446..3d38f4fd9d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,6 +17,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
 * Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049))
 * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
+* Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))
 ### Removed
 * **BREAKING** Remove `JarState.getMavenCoordinate(String prefix)`. ([#1945](https://github.com/diffplug/spotless/pull/1945))
 * **BREAKING** Replace `PipeStepPair` with `FenceStep`. ([#1954](https://github.com/diffplug/spotless/pull/1954))
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index f76e7763f4..0df35a0616 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -37,7 +37,7 @@
 /** Wraps up <a href="https://github.com/pinterest/ktlint">ktlint</a> as a FormatterStep. */
 public class KtLintStep implements RoundedStep {
 	private static final long serialVersionUID = 1L;
-	private static final String DEFAULT_VERSION = "1.1.1";
+	private static final String DEFAULT_VERSION = "1.2.1";
 	private static final String NAME = "ktlint";
 	private static final String MAVEN_COORDINATE_0_DOT = "com.pinterest:ktlint:";
 	private static final String MAVEN_COORDINATE_1_DOT = "com.pinterest.ktlint:ktlint-cli:";
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index bac42cee6e..e703374978 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -9,6 +9,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
 * Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049))
 * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
+* Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))
 ### Added
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
 
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 35de3c18ac..dc7ce6b707 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -9,6 +9,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
 * Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049))
 * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
+* Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))
 ### Added
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
 

From d0460d74fa791bc15d03b01f328c99e268e7c308 Mon Sep 17 00:00:00 2001
From: Konrad Windszus <kwin@apache.org>
Date: Sat, 2 Mar 2024 15:26:37 +0100
Subject: [PATCH 1530/2068] Skip execution in incremental (m2e) builds by
 default

Clear stale messages during "check" mojo
Allow to parameterize message severity
Add Spotless prefix to messages

This closes #1814
This closes #2037
---
 .../spotless/maven/AbstractSpotlessMojo.java  | 11 +++++++
 .../spotless/maven/SpotlessCheckMojo.java     | 31 +++++++++++++++++--
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
index 0528cccbdb..8da27ff8dd 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
@@ -201,6 +201,13 @@ public abstract class AbstractSpotlessMojo extends AbstractMojo {
 	@Parameter
 	private UpToDateChecking upToDateChecking = UpToDateChecking.enabled();
 
+	/**
+	 * If set to {@code true} will also run on incremental builds (i.e. within Eclipse with m2e).
+	 * Otherwise this goal is skipped in incremental builds and only runs on full builds.
+	 */
+	@Parameter(defaultValue = "false")
+	protected boolean enableForIncrementalBuild;
+
 	protected abstract void process(Iterable<File> files, Formatter formatter, UpToDateChecker upToDateChecker) throws MojoExecutionException;
 
 	private static final int MINIMUM_JRE = 11;
@@ -245,6 +252,10 @@ private boolean shouldSkip() {
 		if (skip) {
 			return true;
 		}
+		if (buildContext.isIncremental() && !enableForIncrementalBuild) {
+			getLog().debug("Skipping for incremental builds as parameter 'enableForIncrementalBuilds' is set to 'false'");
+			return true;
+		}
 
 		switch (goal) {
 		case GOAL_CHECK:
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java
index cc83b3f3c9..dbb86e805c 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
 import org.sonatype.plexus.build.incremental.BuildContext;
 
 import com.diffplug.spotless.Formatter;
@@ -38,6 +39,30 @@
 @Mojo(name = AbstractSpotlessMojo.GOAL_CHECK, defaultPhase = LifecyclePhase.VERIFY, threadSafe = true)
 public class SpotlessCheckMojo extends AbstractSpotlessMojo {
 
+	private static final String INCREMENTAL_MESSAGE_PREFIX = "Spotless Violation: ";
+
+	public enum MessageSeverity {
+		WARNING(BuildContext.SEVERITY_WARNING), ERROR(BuildContext.SEVERITY_ERROR);
+
+		private final int severity;
+
+		MessageSeverity(int severity) {
+			this.severity = severity;
+		}
+
+		public int getSeverity() {
+			return severity;
+		}
+	}
+
+	/**
+	 * The severity used to emit messages during incremental builds.
+	 * Either {@code WARNING} or {@code ERROR}.
+	 * @see AbstractSpotlessMojo#enableForIncrementalBuild
+	 */
+	@Parameter(defaultValue = "WARNING")
+	private MessageSeverity incrementalBuildMessageSeverity;
+
 	@Override
 	protected void process(Iterable<File> files, Formatter formatter, UpToDateChecker upToDateChecker) throws MojoExecutionException {
 		ImpactedFilesTracker counter = new ImpactedFilesTracker();
@@ -51,14 +76,14 @@ protected void process(Iterable<File> files, Formatter formatter, UpToDateChecke
 				}
 				continue;
 			}
-
+			buildContext.removeMessages(file);
 			try {
 				PaddedCell.DirtyState dirtyState = PaddedCell.calculateDirtyState(formatter, file);
 				if (!dirtyState.isClean() && !dirtyState.didNotConverge()) {
 					problemFiles.add(file);
 					if (buildContext.isIncremental()) {
 						Map.Entry<Integer, String> diffEntry = DiffMessageFormatter.diff(formatter, file);
-						buildContext.addMessage(file, diffEntry.getKey() + 1, 0, diffEntry.getValue(), BuildContext.SEVERITY_ERROR, null);
+						buildContext.addMessage(file, diffEntry.getKey() + 1, 0, INCREMENTAL_MESSAGE_PREFIX + diffEntry.getValue(), incrementalBuildMessageSeverity.getSeverity(), null);
 					}
 					counter.cleaned();
 				} else {

From 70ba6eadd46ef1b574c948ba56b2fd2297194f2d Mon Sep 17 00:00:00 2001
From: Konrad Windszus <kwin@apache.org>
Date: Mon, 4 Mar 2024 10:40:18 +0100
Subject: [PATCH 1531/2068] Add section to readme how to enable m2e support

---
 plugin-maven/README.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 9a17cd2be7..ee598fcca6 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -1696,6 +1696,26 @@ cmd> mvn spotless:apply -DspotlessFiles=my/file/pattern.java,more/generic/.*-pat
 
 The patterns are matched using `String#matches(String)` against the absolute file path.
 
+## Does Spotless support incremental builds in Eclipse
+
+Spotless comes with [m2e](https://eclipse.dev/m2e/) support. However by default its execution is skipped by default in incremental builds. To enable it use the following parameter.
+
+```
+<configuration>
+    <enableForIncrementalBuild>true</enableForIncrementalBuild><!-- this is false by default -->
+</configuration>
+```
+
+In addition Eclipse problem markers are being emitted. By default they have the severity `WARNING`.
+You can adjust this with 
+
+```
+<configuration>
+    <incrementalBuildMessageSeverity>ERROR</incrementalBuildMessageSeverity><!-- WARNING or ERROR -->
+</configuration>
+```
+Note that for Incremental build support the goals have to be bound to a phase prior to `test`.
+
 <a name="examples"></a>
 
 ## Example configurations (from real-world projects)

From 7b1e2f2b94eba06a530c9bf6bea9f3c6c9510c60 Mon Sep 17 00:00:00 2001
From: Konrad Windszus <kwin@apache.org>
Date: Mon, 4 Mar 2024 10:46:25 +0100
Subject: [PATCH 1532/2068] more markdown fixes

---
 plugin-maven/README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index ee598fcca6..dfc69ee0f0 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -1698,7 +1698,7 @@ The patterns are matched using `String#matches(String)` against the absolute fil
 
 ## Does Spotless support incremental builds in Eclipse
 
-Spotless comes with [m2e](https://eclipse.dev/m2e/) support. However by default its execution is skipped by default in incremental builds. To enable it use the following parameter.
+Spotless comes with [m2e](https://eclipse.dev/m2e/) support. However by default its execution is skipped by default in incremental builds. To enable it use the following parameter
 
 ```
 <configuration>
@@ -1714,6 +1714,7 @@ You can adjust this with
     <incrementalBuildMessageSeverity>ERROR</incrementalBuildMessageSeverity><!-- WARNING or ERROR -->
 </configuration>
 ```
+
 Note that for Incremental build support the goals have to be bound to a phase prior to `test`.
 
 <a name="examples"></a>

From 2c2cdfa596604bb71a340a1df46852831418f19a Mon Sep 17 00:00:00 2001
From: Konrad Windszus <kwin@apache.org>
Date: Mon, 4 Mar 2024 10:47:01 +0100
Subject: [PATCH 1533/2068] missing question mark

---
 plugin-maven/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index dfc69ee0f0..b99743aefe 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -1696,7 +1696,7 @@ cmd> mvn spotless:apply -DspotlessFiles=my/file/pattern.java,more/generic/.*-pat
 
 The patterns are matched using `String#matches(String)` against the absolute file path.
 
-## Does Spotless support incremental builds in Eclipse
+## Does Spotless support incremental builds in Eclipse?
 
 Spotless comes with [m2e](https://eclipse.dev/m2e/) support. However by default its execution is skipped by default in incremental builds. To enable it use the following parameter
 

From 144b173ccc900b46459001354b63ad484d7c7c9d Mon Sep 17 00:00:00 2001
From: Konrad Windszus <kwin@apache.org>
Date: Mon, 4 Mar 2024 10:51:31 +0100
Subject: [PATCH 1534/2068] Add reasoning for disabling incremental support by
 default

---
 plugin-maven/README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index b99743aefe..233f53178b 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -1698,7 +1698,8 @@ The patterns are matched using `String#matches(String)` against the absolute fil
 
 ## Does Spotless support incremental builds in Eclipse?
 
-Spotless comes with [m2e](https://eclipse.dev/m2e/) support. However by default its execution is skipped by default in incremental builds. To enable it use the following parameter
+Spotless comes with [m2e](https://eclipse.dev/m2e/) support. However, by default its execution is skipped in incremental builds as most developers want to fix all issues in one go via explicit `mvn spotless:apply` prior to raising a PR and don't want to be bothered with Spotless issues during working on the source code in the IDE.
+To enable it use the following parameter
 
 ```
 <configuration>

From 2a963f411191d7899b92bbc644f1d5de040682df Mon Sep 17 00:00:00 2001
From: Julian Honnen <julianhonnen@gmail.com>
Date: Tue, 19 Mar 2024 13:45:19 +0100
Subject: [PATCH 1535/2068] Don't capture the FormatExtension in LiveCache

Fixed memory leak caused by capturing the Gradle project model
referenced by the LineEndings Provider stored in the JvmLocalCache.

Fixes #2067
---
 plugin-gradle/CHANGES.md                                       | 1 +
 .../java/com/diffplug/gradle/spotless/FormatExtension.java     | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index bac42cee6e..e72ad8e355 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Fixed
 * Ignore system git config when running tests ([#1990](https://github.com/diffplug/spotless/issues/1990))
+* Fixed memory leak introduced in 6.21.0 ([#2067](https://github.com/diffplug/spotless/issues/2067))
 ### Changes
 * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
 * Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049))
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index e0c0473737..08d6088d60 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -1067,8 +1067,9 @@ protected void setupTask(SpotlessTask task) {
 		}
 		task.setSteps(steps);
 		Directory projectDir = getProject().getLayout().getProjectDirectory();
+		LineEnding lineEndings = getLineEndings();
 		task.setLineEndingsPolicy(
-				getProject().provider(() -> getLineEndings().createPolicy(projectDir.getAsFile(), () -> totalTarget)));
+				getProject().provider(() -> lineEndings.createPolicy(projectDir.getAsFile(), () -> totalTarget)));
 		spotless.getRegisterDependenciesTask().hookSubprojectTask(task);
 		task.setupRatchet(getRatchetFrom() != null ? getRatchetFrom() : "");
 	}

From fa0375717612e7ce5b21b8809f835927ec140995 Mon Sep 17 00:00:00 2001
From: mbaitelman <mendy@baitelman.com>
Date: Wed, 27 Mar 2024 13:54:20 -0700
Subject: [PATCH 1536/2068] Fix MD file

---
 plugin-gradle/README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index db76229450..7891d29eed 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -799,8 +799,6 @@ hence you are required to provide resolvable file paths for config files, or alt
 The configuration is very similar to the [ESLint (Typescript)](#eslint-typescript) configuration. In javascript, *no*
 `tsconfig.json` is supported.
 
-```gradle
-
 ```gradle
 spotless {
   javascript {

From 0670d5a3ceb75acc47fd6a9d46371688066ccc66 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2024 08:15:38 +0000
Subject: [PATCH 1537/2068] Update dependency org.scalameta:scalafmt-core_2.13
 to v3.8.1

---
 lib/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 7b52442f92..793262f60e 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -126,7 +126,7 @@ dependencies {
 	// palantirJavaFormat
 	palantirJavaFormatCompileOnly 'com.palantir.javaformat:palantir-java-format:1.1.0' 	// this version needs to stay compilable against Java 8 for CI Job testNpm
 	// scalafmt
-	scalafmtCompileOnly "org.scalameta:scalafmt-core_2.13:3.7.3"
+	scalafmtCompileOnly "org.scalameta:scalafmt-core_2.13:3.8.1"
 	// sortPom
 	sortPomCompileOnly 'com.github.ekryd.sortpom:sortpom-sorter:3.4.0'
 	sortPomCompileOnly 'org.slf4j:slf4j-api:2.0.12'

From f9dfdb944bdb2f3e315fb607d3fe78872c93d82a Mon Sep 17 00:00:00 2001
From: Mark Chesney <mches@users.noreply.github.com>
Date: Sat, 30 Mar 2024 10:45:17 -0700
Subject: [PATCH 1538/2068] Bump sortpom to 3.4.1

---
 CHANGES.md                                                      | 1 +
 lib/build.gradle                                                | 2 +-
 lib/src/main/java/com/diffplug/spotless/pom/SortPomCfg.java     | 2 +-
 plugin-gradle/CHANGES.md                                        | 1 +
 plugin-maven/CHANGES.md                                         | 1 +
 .../src/test/java/com/diffplug/spotless/pom/SortPomTest.java    | 2 +-
 6 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index e94f0c7446..78341a8654 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,6 +17,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
 * Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049))
 * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
+* Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078))
 ### Removed
 * **BREAKING** Remove `JarState.getMavenCoordinate(String prefix)`. ([#1945](https://github.com/diffplug/spotless/pull/1945))
 * **BREAKING** Replace `PipeStepPair` with `FenceStep`. ([#1954](https://github.com/diffplug/spotless/pull/1954))
diff --git a/lib/build.gradle b/lib/build.gradle
index 7b52442f92..9a1e1ac3b9 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -128,7 +128,7 @@ dependencies {
 	// scalafmt
 	scalafmtCompileOnly "org.scalameta:scalafmt-core_2.13:3.7.3"
 	// sortPom
-	sortPomCompileOnly 'com.github.ekryd.sortpom:sortpom-sorter:3.4.0'
+	sortPomCompileOnly 'com.github.ekryd.sortpom:sortpom-sorter:3.4.1'
 	sortPomCompileOnly 'org.slf4j:slf4j-api:2.0.12'
 	// zjsonPatch
 	zjsonPatchCompileOnly 'com.flipkart.zjsonpatch:zjsonpatch:0.4.14'
diff --git a/lib/src/main/java/com/diffplug/spotless/pom/SortPomCfg.java b/lib/src/main/java/com/diffplug/spotless/pom/SortPomCfg.java
index c24e91cf80..58e3f9d45a 100644
--- a/lib/src/main/java/com/diffplug/spotless/pom/SortPomCfg.java
+++ b/lib/src/main/java/com/diffplug/spotless/pom/SortPomCfg.java
@@ -21,7 +21,7 @@
 public class SortPomCfg implements Serializable {
 	private static final long serialVersionUID = 1L;
 
-	public String version = "3.4.0";
+	public String version = "3.4.1";
 
 	public String encoding = "UTF-8";
 
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index bac42cee6e..026ba02c74 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -9,6 +9,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
 * Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049))
 * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
+* Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078))
 ### Added
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
 
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 35de3c18ac..7de690a145 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -9,6 +9,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
 * Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049))
 * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
+* Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078))
 ### Added
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
 
diff --git a/testlib/src/test/java/com/diffplug/spotless/pom/SortPomTest.java b/testlib/src/test/java/com/diffplug/spotless/pom/SortPomTest.java
index 5a0ad297c5..873511cdda 100644
--- a/testlib/src/test/java/com/diffplug/spotless/pom/SortPomTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/pom/SortPomTest.java
@@ -30,7 +30,7 @@ public void testSortPomWithDefaultConfig() {
 	@Test
 	public void testSortPomWithVersion() {
 		SortPomCfg cfg = new SortPomCfg();
-		cfg.version = "3.4.0";
+		cfg.version = "3.4.1";
 		FormatterStep step = SortPomStep.create(cfg, TestProvisioner.mavenCentral());
 		StepHarness.forStep(step).testResource("pom/pom_dirty.xml", "pom/pom_clean_default.xml");
 	}

From 6be9445631105afc78b4963027a0370e599f0bfc Mon Sep 17 00:00:00 2001
From: Mark Chesney <mches@users.noreply.github.com>
Date: Sat, 30 Mar 2024 12:48:20 -0700
Subject: [PATCH 1539/2068] Fix broken links in PR template

---
 PULL_REQUEST_TEMPLATE.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
index bb9ef60188..406a0c1e66 100644
--- a/PULL_REQUEST_TEMPLATE.md
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -1,8 +1,8 @@
 Please **DO NOT FORCE PUSH**. Don't worry about messy history, it's easier to do code review if we can tell what happened after the review, and force pushing breaks that.
 
-Please make sure that your [PR allows edits from maintainers](https://help.github.com/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork/).  Sometimes its faster for us to just fix something than it is to describe how to fix it.
+Please make sure that your [PR allows edits from maintainers](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork).  Sometimes it's faster for us to just fix something than it is to describe how to fix it.
 
-![Allow edits from maintainers](https://help.github.com/assets/images/help/pull_requests/allow-maintainers-to-make-edits-sidebar-checkbox.png)
+<img src="https://docs.github.com/assets/cb-87454/images/help/pull_requests/allow-edits-and-access-by-maintainers.png" height="297" alt="Allow edits from maintainers">
 
 After creating the PR, please add a commit that adds a bullet-point under the `[Unreleased]` section of [CHANGES.md](https://github.com/diffplug/spotless/blob/main/CHANGES.md), [plugin-gradle/CHANGES.md](https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md), and [plugin-maven/CHANGES.md](https://github.com/diffplug/spotless/blob/main/plugin-maven/CHANGES.md) which includes:
 

From 9dbb6bb0c6924babe1749067c065108b7e6028ce Mon Sep 17 00:00:00 2001
From: Mark Chesney <mches@users.noreply.github.com>
Date: Sat, 30 Mar 2024 15:09:43 -0700
Subject: [PATCH 1540/2068] Publish build scans conditionally

---
 settings.gradle | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/settings.gradle b/settings.gradle
index 24e757bdc2..b309f25572 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -60,10 +60,12 @@ if (System.env['CI'] != null) {
 }
 
 gradleEnterprise {
-	buildScan {
-		termsOfServiceUrl = "https://gradle.com/terms-of-service"
-		termsOfServiceAgree = "yes"
-		publishAlways()
+	if (System.env['CI'] != null) {
+		buildScan {
+			termsOfServiceUrl = "https://gradle.com/terms-of-service"
+			termsOfServiceAgree = "yes"
+			publishAlways()
+		}
 	}
 }
 

From a9875a19e097635cefc5350870440eaec4788210 Mon Sep 17 00:00:00 2001
From: Mark Chesney <mches@users.noreply.github.com>
Date: Sat, 30 Mar 2024 19:36:45 -0700
Subject: [PATCH 1541/2068] Add Gradle support for Maven POM sorting/formatting

---
 README.md                                     |   2 +-
 plugin-gradle/CHANGES.md                      |   1 +
 plugin-gradle/README.md                       |  47 ++++++
 .../gradle/spotless/PomExtension.java         | 159 ++++++++++++++++++
 .../gradle/spotless/SpotlessExtension.java    |   6 +
 .../gradle/spotless/SortPomGradleTest.java    | 127 ++++++++++++++
 plugin-maven/README.md                        |   4 +-
 7 files changed, 344 insertions(+), 2 deletions(-)
 create mode 100644 plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PomExtension.java
 create mode 100644 plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SortPomGradleTest.java

diff --git a/README.md b/README.md
index 3c5d13b179..00864c559a 100644
--- a/README.md
+++ b/README.md
@@ -154,7 +154,7 @@ lib('yaml.JacksonYamlStep')                      +'{{yes}}       | {{yes}}
 | [`npm.EslintFormatterStep`](lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`npm.PrettierFormatterStep`](lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`npm.TsFmtFormatterStep`](lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
-| [`pom.SortPomStepStep`](lib/src/main/java/com/diffplug/spotless/pom/SortPomStepStep.java) | :white_large_square:        | :+1:      | :white_large_square:       | :white_large_square:  |
+| [`pom.SortPomStep`](lib/src/main/java/com/diffplug/spotless/pom/SortPomStep.java) | :+1:        | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`protobuf.BufStep`](lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
 | [`python.BlackStep`](lib/src/main/java/com/diffplug/spotless/python/BlackStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
 | [`scala.ScalaFmtStep`](lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index bac42cee6e..e58fd5cfb6 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -11,6 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
 ### Added
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
+* Add support for formatting and sorting Maven POMs ([#2081](https://github.com/diffplug/spotless/issues/2081))
 
 ## [6.25.0] - 2024-01-23
 ### Added
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index db76229450..d5a6aba912 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -65,6 +65,7 @@ Spotless supports all of Gradle's built-in performance features (incremental bui
   - [Flexmark](#flexmark) aka markdown
   - [Antlr4](#antlr4) ([antlr4formatter](#antlr4formatter))
   - [SQL](#sql) ([dbeaver](#dbeaver), [prettier](#prettier))
+  - [Maven POM](#maven-pom) ([sortPom](#sortpom))
   - [Typescript](#typescript) ([tsfmt](#tsfmt), [prettier](#prettier), [ESLint](#eslint-typescript), [Biome](#biome))
   - [Javascript](#javascript) ([prettier](#prettier), [ESLint](#eslint-javascript), [Biome](#biome))
   - [JSON](#json) ([simple](#simple), [gson](#gson), [jackson](#jackson), [Biome](#biome), [jsonPatch](#jsonPatch))
@@ -676,6 +677,52 @@ sql.formatter.indent.type=space
 sql.formatter.indent.size=4
 ```
 
+## Maven POM
+
+`com.diffplug.gradle.spotless.PomExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/PomExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PomExtension.java)
+
+```gradle
+spotless {
+  pom {
+    target('pom.xml') // default value, you can change if you want
+
+    sortPom()  // has its own section below
+  }
+}
+```
+
+### sortPom
+
+[homepage](https://github.com/Ekryd/sortpom).
+
+All configuration settings are optional, they are described in detail [here](https://github.com/Ekryd/sortpom/wiki/Parameters).
+
+```gradle
+spotless {
+  pom {
+    sortPom('3.4.0')
+      .encoding('UTF-8') // The encoding of the pom files
+      .lineSeparator(System.getProperty('line.separator')) // line separator to use
+      .expandEmptyElements(true) // Should empty elements be expanded
+      .spaceBeforeCloseEmptyElement(false) // Should a space be added inside self-closing elements
+      .keepBlankLines(true) // Keep empty lines
+      .endWithNewline(true) // Whether sorted pom ends with a newline
+      .nrOfIndentSpace(2) // Indentation
+      .indentBlankLines(false) // Should empty lines be indented
+      .indentSchemaLocation(false) // Should schema locations be indented
+      .predefinedSortOrder('recommended_2008_06') // Sort order of elements: https://github.com/Ekryd/sortpom/wiki/PredefinedSortOrderProfiles
+      .sortOrderFile(null) // Custom sort order of elements: https://raw.githubusercontent.com/Ekryd/sortpom/master/sorter/src/main/resources/custom_1.xml
+      .sortDependencies(null) // Sort dependencies: https://github.com/Ekryd/sortpom/wiki/SortDependencies
+      .sortDependencyManagement(null) // Sort dependency management: https://github.com/Ekryd/sortpom/wiki/SortDependencies
+      .sortDependencyExclusions(null) // Sort dependency exclusions: https://github.com/Ekryd/sortpom/wiki/SortDependencies
+      .sortPlugins(null) // Sort plugins: https://github.com/Ekryd/sortpom/wiki/SortPlugins
+      .sortProperties(false) // Sort properties
+      .sortModules(false) // Sort modules
+      .sortExecutions(false) // Sort plugin executions
+  }
+}
+```
+
 <a name="applying-to-typescript-source"></a>
 
 ## Typescript
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PomExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PomExtension.java
new file mode 100644
index 0000000000..a7f3b0389c
--- /dev/null
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PomExtension.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.gradle.spotless;
+
+import java.util.Objects;
+
+import javax.inject.Inject;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.pom.SortPomCfg;
+import com.diffplug.spotless.pom.SortPomStep;
+
+public class PomExtension extends FormatExtension {
+	private static final String POM_FILE = "pom.xml";
+
+	static final String NAME = "pom";
+
+	@Inject
+	public PomExtension(SpotlessExtension spotless) {
+		super(spotless);
+	}
+
+	@Override
+	protected void setupTask(SpotlessTask task) {
+		if (target == null) {
+			target = parseTarget(POM_FILE);
+		}
+		super.setupTask(task);
+	}
+
+	public SortPomGradleConfig sortPom() {
+		return new SortPomGradleConfig();
+	}
+
+	public SortPomGradleConfig sortPom(String version) {
+		Objects.requireNonNull(version);
+		return new SortPomGradleConfig(version);
+	}
+
+	public class SortPomGradleConfig {
+		final SortPomCfg cfg = new SortPomCfg();
+
+		SortPomGradleConfig() {
+			addStep(createStep());
+		}
+
+		SortPomGradleConfig(String version) {
+			this();
+			cfg.version = Objects.requireNonNull(version);
+		}
+
+		public SortPomGradleConfig encoding(String encoding) {
+			cfg.encoding = encoding;
+			return this;
+		}
+
+		public SortPomGradleConfig lineSeparator(String lineSeparator) {
+			cfg.lineSeparator = lineSeparator;
+			return this;
+		}
+
+		public SortPomGradleConfig expandEmptyElements(boolean expandEmptyElements) {
+			cfg.expandEmptyElements = expandEmptyElements;
+			return this;
+		}
+
+		public SortPomGradleConfig spaceBeforeCloseEmptyElement(boolean spaceBeforeCloseEmptyElement) {
+			cfg.spaceBeforeCloseEmptyElement = spaceBeforeCloseEmptyElement;
+			return this;
+		}
+
+		public SortPomGradleConfig keepBlankLines(boolean keepBlankLines) {
+			cfg.keepBlankLines = keepBlankLines;
+			return this;
+		}
+
+		public SortPomGradleConfig endWithNewline(boolean endWithNewline) {
+			cfg.endWithNewline = endWithNewline;
+			return this;
+		}
+
+		public SortPomGradleConfig nrOfIndentSpace(int nrOfIndentSpace) {
+			cfg.nrOfIndentSpace = nrOfIndentSpace;
+			return this;
+		}
+
+		public SortPomGradleConfig indentBlankLines(boolean indentBlankLines) {
+			cfg.indentBlankLines = indentBlankLines;
+			return this;
+		}
+
+		public SortPomGradleConfig indentSchemaLocation(boolean indentSchemaLocation) {
+			cfg.indentSchemaLocation = indentSchemaLocation;
+			return this;
+		}
+
+		public SortPomGradleConfig predefinedSortOrder(String predefinedSortOrder) {
+			cfg.predefinedSortOrder = predefinedSortOrder;
+			return this;
+		}
+
+		public SortPomGradleConfig sortOrderFile(String sortOrderFile) {
+			cfg.sortOrderFile = sortOrderFile;
+			return this;
+		}
+
+		public SortPomGradleConfig sortDependencies(String sortDependencies) {
+			cfg.sortDependencies = sortDependencies;
+			return this;
+		}
+
+		public SortPomGradleConfig sortDependencyManagement(String sortDependencyManagement) {
+			cfg.sortDependencyManagement = sortDependencyManagement;
+			return this;
+		}
+
+		public SortPomGradleConfig sortDependencyExclusions(String sortDependencyExclusions) {
+			cfg.sortDependencyExclusions = sortDependencyExclusions;
+			return this;
+		}
+
+		public SortPomGradleConfig sortPlugins(String sortPlugins) {
+			cfg.sortPlugins = sortPlugins;
+			return this;
+		}
+
+		public SortPomGradleConfig sortProperties(boolean sortProperties) {
+			cfg.sortProperties = sortProperties;
+			return this;
+		}
+
+		public SortPomGradleConfig sortModules(boolean sortModules) {
+			cfg.sortModules = sortModules;
+			return this;
+		}
+
+		public SortPomGradleConfig sortExecutions(boolean sortExecutions) {
+			cfg.sortExecutions = sortExecutions;
+			return this;
+		}
+
+		private FormatterStep createStep() {
+			return SortPomStep.create(cfg, provisioner());
+		}
+	}
+}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
index f02ac28548..7fee3d950e 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
@@ -228,6 +228,12 @@ public void go(Action<GoExtension> closure) {
 		format(GoExtension.NAME, GoExtension.class, closure);
 	}
 
+	/** Configures the special POM-specific extension. */
+	public void pom(Action<PomExtension> closure) {
+		requireNonNull(closure);
+		format(PomExtension.NAME, PomExtension.class, closure);
+	}
+
 	/** Configures a custom extension. */
 	public void format(String name, Action<FormatExtension> closure) {
 		requireNonNull(name, "name");
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SortPomGradleTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SortPomGradleTest.java
new file mode 100644
index 0000000000..1c51d4c2a8
--- /dev/null
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SortPomGradleTest.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.gradle.spotless;
+
+import org.junit.jupiter.api.Test;
+
+class SortPomGradleTest extends GradleIntegrationHarness {
+	@Test
+	void sortPom() throws Exception {
+		// given
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"  id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"  pom {",
+				"    sortPom()",
+				"  }",
+				"}");
+		setFile("pom.xml").toResource("pom/pom_dirty.xml");
+
+		// when
+		gradleRunner().withArguments("spotlessApply").build();
+
+		// then
+		assertFile("pom.xml").sameAsResource("pom/pom_clean_default.xml");
+	}
+
+	@Test
+	void sortPomWithTarget() throws Exception {
+		// given
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"  id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"  pom {",
+				"    target('test.xml')",
+				"    sortPom()",
+				"  }",
+				"}");
+		setFile("test.xml").toResource("pom/pom_dirty.xml");
+
+		// when
+		gradleRunner().withArguments("spotlessApply").build();
+
+		// then
+		assertFile("test.xml").sameAsResource("pom/pom_clean_default.xml");
+	}
+
+	@Test
+	void sortPomWithVersion() throws Exception {
+		// given
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"  id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"  pom {",
+				"    sortPom '3.4.0'",
+				"  }",
+				"}");
+		setFile("pom.xml").toResource("pom/pom_dirty.xml");
+
+		// when
+		gradleRunner().withArguments("spotlessApply").build();
+
+		// then
+		assertFile("pom.xml").sameAsResource("pom/pom_clean_default.xml");
+	}
+
+	@Test
+	void sortPomWithParameters() throws Exception {
+		// given
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"  id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"  pom {",
+				"    sortPom()",
+				"      .encoding('UTF-8')",
+				"      .lineSeparator(System.getProperty('line.separator'))",
+				"      .expandEmptyElements(true)",
+				"      .spaceBeforeCloseEmptyElement(false)",
+				"      .keepBlankLines(true)",
+				"      .endWithNewline(true)",
+				"      .nrOfIndentSpace(2)",
+				"      .indentBlankLines(false)",
+				"      .indentSchemaLocation(false)",
+				"      .predefinedSortOrder('recommended_2008_06')",
+				"      .sortOrderFile(null)",
+				"      .sortDependencies(null)",
+				"      .sortDependencyManagement(null)",
+				"      .sortDependencyExclusions(null)",
+				"      .sortPlugins(null)",
+				"      .sortProperties(false)",
+				"      .sortModules(false)",
+				"      .sortExecutions(false)",
+				"  }",
+				"}");
+		setFile("pom.xml").toResource("pom/pom_dirty.xml");
+
+		// when
+		gradleRunner().withArguments("spotlessApply").build();
+
+		// then
+		assertFile("pom.xml").sameAsResource("pom/pom_clean_default.xml");
+	}
+}
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 9a17cd2be7..85c364d3ff 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -665,7 +665,7 @@ All configuration settings are optional, they are described in detail [here](htt
 
   <indentBlankLines>false</indentBlankLines> <!-- Should empty lines be indented -->
 
-  <indentSchemaLocation>false</indentSchemaLocation> <!-- Should schema locations be indended -->
+  <indentSchemaLocation>false</indentSchemaLocation> <!-- Should schema locations be indented -->
 
   <predefinedSortOrder>recommended_2008_06</predefinedSortOrder> <!-- Sort order of elements: https://github.com/Ekryd/sortpom/wiki/PredefinedSortOrderProfiles-->
 
@@ -673,6 +673,8 @@ All configuration settings are optional, they are described in detail [here](htt
 
   <sortDependencies></sortDependencies> <!-- Sort dependencies: https://github.com/Ekryd/sortpom/wiki/SortDependencies-->
 
+  <sortDependencyManagement></sortDependencyManagement> <!-- Sort dependency management: https://github.com/Ekryd/sortpom/wiki/SortDependencies-->
+
   <sortDependencyExclusions></sortDependencyExclusions> <!-- Sort dependency exclusions: https://github.com/Ekryd/sortpom/wiki/SortDependencies-->
 
   <sortPlugins></sortPlugins> <!-- Sort plugins: https://github.com/Ekryd/sortpom/wiki/SortPlugins -->

From 0d3f519da4d980922e42ad644c2964052f9dcfcf Mon Sep 17 00:00:00 2001
From: Mark Chesney <mches@users.noreply.github.com>
Date: Mon, 1 Apr 2024 08:40:00 -0700
Subject: [PATCH 1542/2068] Prefer a provider to access the CI environment
 variable

---
 settings.gradle | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/settings.gradle b/settings.gradle
index b309f25572..305c461b2d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -60,12 +60,10 @@ if (System.env['CI'] != null) {
 }
 
 gradleEnterprise {
-	if (System.env['CI'] != null) {
-		buildScan {
-			termsOfServiceUrl = "https://gradle.com/terms-of-service"
-			termsOfServiceAgree = "yes"
-			publishAlways()
-		}
+	buildScan {
+		termsOfServiceUrl = "https://gradle.com/terms-of-service"
+		termsOfServiceAgree = "yes"
+		publishAlways(providers.environmentVariable('CI').present)
 	}
 }
 

From d87b8ac1819b4e227461d677a90a768c7fcc52d6 Mon Sep 17 00:00:00 2001
From: Zongle Wang <wangzongler@gmail.com>
Date: Tue, 2 Apr 2024 14:04:57 +0800
Subject: [PATCH 1543/2068] It should be publishAlwaysIf

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 305c461b2d..1126463326 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -63,7 +63,7 @@ gradleEnterprise {
 	buildScan {
 		termsOfServiceUrl = "https://gradle.com/terms-of-service"
 		termsOfServiceAgree = "yes"
-		publishAlways(providers.environmentVariable('CI').present)
+		publishAlwaysIf(providers.environmentVariable('CI').present)
 	}
 }
 

From 5ca30971cc941564e99896e73535314fabe5123b Mon Sep 17 00:00:00 2001
From: Mark Chesney <mches@users.noreply.github.com>
Date: Mon, 1 Apr 2024 23:22:20 -0700
Subject: [PATCH 1544/2068] Fix formatting

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 00864c559a..9f295f96cb 100644
--- a/README.md
+++ b/README.md
@@ -100,7 +100,7 @@ lib('markdown.FlexmarkStep')                     +'{{yes}}       | {{yes}}
 lib('npm.EslintFormatterStep')                   +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('npm.PrettierFormatterStep')                 +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('npm.TsFmtFormatterStep')                    +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
-lib('pom.SortPomStepStep')                       +'{{no}}        | {{yes}}      | {{no}}       | {{no}}  |',
+lib('pom.SortPomStep')                           +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('protobuf.BufStep')                          +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
 lib('python.BlackStep')                          +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
 lib('scala.ScalaFmtStep')                        +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
@@ -154,7 +154,7 @@ lib('yaml.JacksonYamlStep')                      +'{{yes}}       | {{yes}}
 | [`npm.EslintFormatterStep`](lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`npm.PrettierFormatterStep`](lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`npm.TsFmtFormatterStep`](lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
-| [`pom.SortPomStep`](lib/src/main/java/com/diffplug/spotless/pom/SortPomStep.java) | :+1:        | :+1:      | :white_large_square:       | :white_large_square:  |
+| [`pom.SortPomStep`](lib/src/main/java/com/diffplug/spotless/pom/SortPomStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`protobuf.BufStep`](lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
 | [`python.BlackStep`](lib/src/main/java/com/diffplug/spotless/python/BlackStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
 | [`scala.ScalaFmtStep`](lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |

From ec7f49fceadce73e35ae0325b200a43d35b0ce35 Mon Sep 17 00:00:00 2001
From: Mark Chesney <mches@users.noreply.github.com>
Date: Tue, 2 Apr 2024 05:56:50 -0700
Subject: [PATCH 1545/2068] Reduce visibility

Co-authored-by: Zongle Wang <wangzongler@gmail.com>
---
 .../main/java/com/diffplug/gradle/spotless/PomExtension.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PomExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PomExtension.java
index a7f3b0389c..463463d320 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PomExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PomExtension.java
@@ -51,7 +51,7 @@ public SortPomGradleConfig sortPom(String version) {
 	}
 
 	public class SortPomGradleConfig {
-		final SortPomCfg cfg = new SortPomCfg();
+		private final SortPomCfg cfg = new SortPomCfg();
 
 		SortPomGradleConfig() {
 			addStep(createStep());

From d0f6592dafc3cda1f11de4fe2bcb2d13d4e30188 Mon Sep 17 00:00:00 2001
From: Mark Chesney <mches@users.noreply.github.com>
Date: Tue, 2 Apr 2024 05:57:18 -0700
Subject: [PATCH 1546/2068] Update changelog

Co-authored-by: Zongle Wang <wangzongler@gmail.com>
---
 plugin-gradle/CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index e58fd5cfb6..9629118b0b 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -11,7 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
 ### Added
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
-* Add support for formatting and sorting Maven POMs ([#2081](https://github.com/diffplug/spotless/issues/2081))
+* Add support for formatting and sorting Maven POMs ([#2082](https://github.com/diffplug/spotless/issues/2082))
 
 ## [6.25.0] - 2024-01-23
 ### Added

From 337cf74b816525050b59f047060fff2705f586c6 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sun, 25 Feb 2024 10:37:10 +0800
Subject: [PATCH 1547/2068] Correctly provide EditorConfig property types for
 Ktlint

---
 CHANGES.md                                                  | 1 +
 .../glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java   | 5 +++--
 .../glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java   | 6 +++---
 .../glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java    | 6 +++---
 plugin-gradle/CHANGES.md                                    | 1 +
 plugin-maven/CHANGES.md                                     | 1 +
 .../resources/kotlin/ktlint/ktlint_official/.editorconfig   | 2 ++
 7 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 0c21870e72..22f14f2137 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -24,6 +24,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * **BREAKING** Replace `PipeStepPair` with `FenceStep`. ([#1954](https://github.com/diffplug/spotless/pull/1954))
 ### Fixed
 * Ignore system git config when running tests ([#1990](https://github.com/diffplug/spotless/issues/1990))
+* Correctly provide EditorConfig property types for Ktlint ([#2052](https://github.com/diffplug/spotless/issues/2052))
 
 ## [2.45.0] - 2024-01-23
 ### Added
diff --git a/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java b/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
index 1ad52da661..00c6744b4c 100644
--- a/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,6 +38,7 @@
 import com.pinterest.ktlint.rule.engine.api.LintError;
 import com.pinterest.ktlint.rule.engine.core.api.Rule;
 import com.pinterest.ktlint.rule.engine.core.api.RuleProvider;
+import com.pinterest.ktlint.rule.engine.core.api.RuleProviderKt;
 import com.pinterest.ktlint.rule.engine.core.api.editorconfig.CodeStyleEditorConfigPropertyKt;
 import com.pinterest.ktlint.rule.engine.core.api.editorconfig.EditorConfigProperty;
 import com.pinterest.ktlint.rule.engine.core.api.editorconfig.EndOfLinePropertyKt;
@@ -142,7 +143,7 @@ public String format(
 		if (editorConfigPath == null || !Files.exists(editorConfigPath)) {
 			editorConfig = EditorConfigDefaults.Companion.getEMPTY_EDITOR_CONFIG_DEFAULTS();
 		} else {
-			editorConfig = EditorConfigDefaults.Companion.load(editorConfigPath);
+			editorConfig = EditorConfigDefaults.Companion.load(editorConfigPath, RuleProviderKt.propertyTypes(allRuleProviders));
 		}
 
 		return new KtLintRuleEngine(
diff --git a/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java b/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
index 2c7fff3f2e..b683b84ca1 100644
--- a/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -38,6 +37,7 @@
 import com.pinterest.ktlint.rule.engine.core.api.Rule;
 import com.pinterest.ktlint.rule.engine.core.api.RuleId;
 import com.pinterest.ktlint.rule.engine.core.api.RuleProvider;
+import com.pinterest.ktlint.rule.engine.core.api.RuleProviderKt;
 import com.pinterest.ktlint.rule.engine.core.api.RuleSetId;
 import com.pinterest.ktlint.rule.engine.core.api.editorconfig.CodeStyleEditorConfigPropertyKt;
 import com.pinterest.ktlint.rule.engine.core.api.editorconfig.EditorConfigProperty;
@@ -105,7 +105,7 @@ public String format(
 		if (editorConfigPath == null || !Files.exists(editorConfigPath)) {
 			editorConfig = EditorConfigDefaults.Companion.getEMPTY_EDITOR_CONFIG_DEFAULTS();
 		} else {
-			editorConfig = EditorConfigDefaults.Companion.load(editorConfigPath, Collections.emptySet());
+			editorConfig = EditorConfigDefaults.Companion.load(editorConfigPath, RuleProviderKt.propertyTypes(allRuleProviders));
 		}
 
 		return new KtLintRuleEngine(
diff --git a/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java b/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
index e65d0503ba..1790f9475c 100644
--- a/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
+++ b/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -38,6 +37,7 @@
 import com.pinterest.ktlint.rule.engine.core.api.Rule;
 import com.pinterest.ktlint.rule.engine.core.api.RuleId;
 import com.pinterest.ktlint.rule.engine.core.api.RuleProvider;
+import com.pinterest.ktlint.rule.engine.core.api.RuleProviderKt;
 import com.pinterest.ktlint.rule.engine.core.api.RuleSetId;
 import com.pinterest.ktlint.rule.engine.core.api.editorconfig.CodeStyleEditorConfigPropertyKt;
 import com.pinterest.ktlint.rule.engine.core.api.editorconfig.EditorConfigProperty;
@@ -105,7 +105,7 @@ public String format(
 		if (editorConfigPath == null || !Files.exists(editorConfigPath)) {
 			editorConfig = EditorConfigDefaults.Companion.getEMPTY_EDITOR_CONFIG_DEFAULTS();
 		} else {
-			editorConfig = EditorConfigDefaults.Companion.load(editorConfigPath, Collections.emptySet());
+			editorConfig = EditorConfigDefaults.Companion.load(editorConfigPath, RuleProviderKt.propertyTypes(allRuleProviders));
 		}
 
 		return new KtLintRuleEngine(
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index b53c8bda8e..11e9f04fc3 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Fixed
 * Ignore system git config when running tests ([#1990](https://github.com/diffplug/spotless/issues/1990))
+* Correctly provide EditorConfig property types for Ktlint ([#2052](https://github.com/diffplug/spotless/issues/2052))
 * Fixed memory leak introduced in 6.21.0 ([#2067](https://github.com/diffplug/spotless/issues/2067))
 ### Changes
 * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index cfdcddd8c9..38018c0d12 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Fixed
 * Ignore system git config when running tests ([#1990](https://github.com/diffplug/spotless/issues/1990))
+* Correctly provide EditorConfig property types for Ktlint ([#2052](https://github.com/diffplug/spotless/issues/2052))
 ### Changes
 * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
 * Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049))
diff --git a/testlib/src/main/resources/kotlin/ktlint/ktlint_official/.editorconfig b/testlib/src/main/resources/kotlin/ktlint/ktlint_official/.editorconfig
index 93a01f2e59..d66df12e40 100644
--- a/testlib/src/main/resources/kotlin/ktlint/ktlint_official/.editorconfig
+++ b/testlib/src/main/resources/kotlin/ktlint/ktlint_official/.editorconfig
@@ -4,3 +4,5 @@ root = true
 ij_kotlin_allow_trailing_comma = true
 ij_kotlin_allow_trailing_comma_on_call_site = true
 ktlint_code_style = ktlint_official
+# See https://github.com/diffplug/spotless/issues/1904.
+ktlint_function_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = 2

From e60fcc250374e11e431fc43888c1c9e1610fadf6 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 3 Apr 2024 00:15:25 -0700
Subject: [PATCH 1548/2068] Remove dead code from `JacksonJsonStepTest`.

---
 .../com/diffplug/spotless/json/JacksonJsonStepTest.java   | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/testlib/src/test/java/com/diffplug/spotless/json/JacksonJsonStepTest.java b/testlib/src/test/java/com/diffplug/spotless/json/JacksonJsonStepTest.java
index be681653e1..4c6d7d7ce3 100644
--- a/testlib/src/test/java/com/diffplug/spotless/json/JacksonJsonStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/json/JacksonJsonStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 DiffPlug
+ * Copyright 2021-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,12 +22,6 @@
 import com.diffplug.spotless.TestProvisioner;
 
 class JacksonJsonStepTest {
-
-	private static final int INDENT = 4;
-
-	private final FormatterStep step = JsonSimpleStep.create(INDENT, TestProvisioner.mavenCentral());
-	private final StepHarness stepHarness = StepHarness.forStep(step);
-
 	@Test
 	void canSetCustomIndentationLevel() {
 		FormatterStep step = JacksonJsonStep.create(TestProvisioner.mavenCentral());

From b321bf08a877539116d5ac74a9d0e29c48cd17f4 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 3 Apr 2024 00:15:50 -0700
Subject: [PATCH 1549/2068] Make JacksonConfig use `TreeMap` for reliable key
 ordering.

---
 .../main/java/com/diffplug/spotless/json/JacksonConfig.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/json/JacksonConfig.java b/lib/src/main/java/com/diffplug/spotless/json/JacksonConfig.java
index f0dba8f072..6a35a1e693 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/JacksonConfig.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/JacksonConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.TreeMap;
 
 /**
  * A DTO holding the basic for Jackson-based formatters
@@ -36,7 +37,7 @@ public class JacksonConfig implements Serializable {
 		DEFAULT_FEATURE_TOGGLES = defaultFeatureToggles;
 	}
 
-	protected Map<String, Boolean> featureToToggle = new LinkedHashMap<>(DEFAULT_FEATURE_TOGGLES);
+	protected Map<String, Boolean> featureToToggle = new TreeMap<>(DEFAULT_FEATURE_TOGGLES);
 
 	public Map<String, Boolean> getFeatureToToggle() {
 		return Collections.unmodifiableMap(featureToToggle);

From 5a21446e80ec969fc61932a643f0122182065f75 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 3 Apr 2024 08:37:31 -0700
Subject: [PATCH 1550/2068] Make FreshMark lazy again.

---
 .../diffplug/gradle/spotless/FreshMarkExtension.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java
index c6c289a2a9..71904b2bb4 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java
@@ -18,10 +18,10 @@
 import static com.diffplug.gradle.spotless.PluginGradlePreconditions.requireElementsNonNull;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.TreeMap;
 
 import javax.inject.Inject;
 
@@ -38,11 +38,7 @@ public class FreshMarkExtension extends FormatExtension {
 	@Inject
 	public FreshMarkExtension(SpotlessExtension spotless) {
 		super(spotless);
-		Map<String, Object> map = new HashMap<>();
-		for (Action<Map<String, Object>> action : propertyActions) {
-			action.execute(map);
-		}
-		addStep(FreshMarkStep.create(map, provisioner()));
+		addStep(FreshMarkStep.create(Map.of(), provisioner()));
 	}
 
 	public void properties(Action<Map<String, Object>> action) {
@@ -65,6 +61,10 @@ protected void setupTask(SpotlessTask task) {
 		if (target == null) {
 			throw noDefaultTargetException();
 		}
+		// replace the step
+		TreeMap<String, Object> props = new TreeMap<>();
+		propertyActions.forEach(action -> action.execute(props));
+		replaceStep(FreshMarkStep.create(props, provisioner()));
 		super.setupTask(task);
 	}
 }

From 2f45f983c280f4d2fb51a02cb7067f965298f543 Mon Sep 17 00:00:00 2001
From: Konrad Windszus <kwin@apache.org>
Date: Wed, 3 Apr 2024 18:04:00 +0200
Subject: [PATCH 1551/2068] rename parameters to have a m2e prefix

---
 plugin-maven/README.md                                      | 4 ++--
 .../com/diffplug/spotless/maven/AbstractSpotlessMojo.java   | 4 ++--
 .../java/com/diffplug/spotless/maven/SpotlessCheckMojo.java | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 233f53178b..b0ad703928 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -1703,7 +1703,7 @@ To enable it use the following parameter
 
 ```
 <configuration>
-    <enableForIncrementalBuild>true</enableForIncrementalBuild><!-- this is false by default -->
+    <m2eEnableForIncrementalBuild>true</m2eEnableForIncrementalBuild><!-- this is false by default -->
 </configuration>
 ```
 
@@ -1712,7 +1712,7 @@ You can adjust this with
 
 ```
 <configuration>
-    <incrementalBuildMessageSeverity>ERROR</incrementalBuildMessageSeverity><!-- WARNING or ERROR -->
+    <m2eIncrementalBuildMessageSeverity>ERROR</m2eIncrementalBuildMessageSeverity><!-- WARNING or ERROR -->
 </configuration>
 ```
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
index 8da27ff8dd..9f4d0e01bc 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
@@ -206,7 +206,7 @@ public abstract class AbstractSpotlessMojo extends AbstractMojo {
 	 * Otherwise this goal is skipped in incremental builds and only runs on full builds.
 	 */
 	@Parameter(defaultValue = "false")
-	protected boolean enableForIncrementalBuild;
+	protected boolean m2eEnableForIncrementalBuild;
 
 	protected abstract void process(Iterable<File> files, Formatter formatter, UpToDateChecker upToDateChecker) throws MojoExecutionException;
 
@@ -252,7 +252,7 @@ private boolean shouldSkip() {
 		if (skip) {
 			return true;
 		}
-		if (buildContext.isIncremental() && !enableForIncrementalBuild) {
+		if (buildContext.isIncremental() && !m2eEnableForIncrementalBuild) {
 			getLog().debug("Skipping for incremental builds as parameter 'enableForIncrementalBuilds' is set to 'false'");
 			return true;
 		}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java
index dbb86e805c..b326767c3c 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java
@@ -58,10 +58,10 @@ public int getSeverity() {
 	/**
 	 * The severity used to emit messages during incremental builds.
 	 * Either {@code WARNING} or {@code ERROR}.
-	 * @see AbstractSpotlessMojo#enableForIncrementalBuild
+	 * @see AbstractSpotlessMojo#m2eEnableForIncrementalBuild
 	 */
 	@Parameter(defaultValue = "WARNING")
-	private MessageSeverity incrementalBuildMessageSeverity;
+	private MessageSeverity m2eIncrementalBuildMessageSeverity;
 
 	@Override
 	protected void process(Iterable<File> files, Formatter formatter, UpToDateChecker upToDateChecker) throws MojoExecutionException {
@@ -83,7 +83,7 @@ protected void process(Iterable<File> files, Formatter formatter, UpToDateChecke
 					problemFiles.add(file);
 					if (buildContext.isIncremental()) {
 						Map.Entry<Integer, String> diffEntry = DiffMessageFormatter.diff(formatter, file);
-						buildContext.addMessage(file, diffEntry.getKey() + 1, 0, INCREMENTAL_MESSAGE_PREFIX + diffEntry.getValue(), incrementalBuildMessageSeverity.getSeverity(), null);
+						buildContext.addMessage(file, diffEntry.getKey() + 1, 0, INCREMENTAL_MESSAGE_PREFIX + diffEntry.getValue(), m2eIncrementalBuildMessageSeverity.getSeverity(), null);
 					}
 					counter.cleaned();
 				} else {

From de7732d53ea1ef240d10c65eeb9f554d96ece826 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 3 Apr 2024 16:02:52 -0700
Subject: [PATCH 1552/2068] Everything that gets passed to StepHarness now gets
 round-tripped.

---
 .../com/diffplug/spotless/StepHarness.java    |  2 +-
 .../diffplug/spotless/StepHarnessBase.java    | 50 ++-----------------
 .../spotless/StepHarnessWithFile.java         |  2 +-
 3 files changed, 6 insertions(+), 48 deletions(-)

diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarness.java b/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
index 0f6ddc9ad9..43ff60f7a8 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
@@ -26,7 +26,7 @@
 import org.assertj.core.api.Assertions;
 
 /** An api for testing a {@code FormatterStep} that doesn't depend on the File path. DO NOT ADD FILE SUPPORT TO THIS, use {@link StepHarnessWithFile} if you need that. */
-public class StepHarness extends StepHarnessBase<StepHarness> {
+public class StepHarness extends StepHarnessBase {
 	private StepHarness(Formatter formatter) {
 		super(formatter);
 	}
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
index 29b253872f..a9b7cda734 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
@@ -15,67 +15,25 @@
  */
 package com.diffplug.spotless;
 
-import java.util.Locale;
 import java.util.Objects;
-import java.util.Set;
 
 import org.assertj.core.api.Assertions;
 
-class StepHarnessBase<T extends StepHarnessBase<?>> implements AutoCloseable {
+class StepHarnessBase implements AutoCloseable {
 	private final Formatter formatter;
-	private Formatter roundTripped;
-	private boolean supportsRoundTrip = false;
 
 	protected StepHarnessBase(Formatter formatter) {
 		this.formatter = Objects.requireNonNull(formatter);
-		if (formatter.getSteps().size() == 1) {
-			// our goal is for everything to be roundtrip serializable
-			// the steps to get there are
-			// - make every individual step round-trippable
-			// - make the other machinery (Formatter, LineEnding, etc) round-trippable
-			// - done!
-			//
-			// Right now, we're still trying to get each and every single step to be round-trippable.
-			// You can help by add a test below, make sure that the test for that step fails, and then
-			// make the test pass. `FormatterStepEqualityOnStateSerialization` is a good base class for
-			// easily converting a step to round-trip serialization while maintaining easy and concise
-			// equality code.
-			String onlyStepName = formatter.getSteps().get(0).getName();
-			if (onlyStepName.startsWith("indentWith")) {
-				supportsRoundTrip = true;
-			} else if (onlyStepName.equals("diktat")) {
-				supportsRoundTrip = true;
-			} else if (onlyStepName.toLowerCase(Locale.ROOT).contains("eclipse")) {
-				supportsRoundTrip = true;
-			} else if (onlyStepName.equals("fence")) {
-				supportsRoundTrip = true;
-			} else if (Set.of("black", "buf", "clang", "ktlint", "ktfmt", "scalafmt", "palantir-java-format", "google-java-format",
-					"removeUnusedImports", "cleanthat", "No line break between type annotation and type", "antlr4Formatter",
-					"gson", "jacksonJson", "apply-json-patch", "jsonSimple", "sortPom", "jacksonYaml", "gherkinUtils",
-					"flexmark-java", "freshmark",
-					"importOrder", "Remove unnecessary semicolons").contains(onlyStepName)) {
-				supportsRoundTrip = true;
-			}
-		}
+		Formatter roundTripped = SerializableEqualityTester.reserialize(formatter);
+		Assertions.assertThat(roundTripped).isEqualTo(formatter);
 	}
 
 	protected Formatter formatter() {
-		if (!supportsRoundTrip) {
-			return formatter;
-		} else {
-			if (roundTripped == null) {
-				roundTripped = SerializableEqualityTester.reserialize(formatter);
-				Assertions.assertThat(roundTripped).isEqualTo(formatter);
-			}
-			return roundTripped;
-		}
+		return formatter;
 	}
 
 	@Override
 	public void close() {
 		formatter.close();
-		if (roundTripped != null) {
-			roundTripped.close();
-		}
 	}
 }
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java b/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java
index ae2f22db1e..d09cc62668 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java
@@ -26,7 +26,7 @@
 import org.assertj.core.api.Assertions;
 
 /** An api for testing a {@code FormatterStep} that depends on the File path. */
-public class StepHarnessWithFile extends StepHarnessBase<StepHarnessWithFile> {
+public class StepHarnessWithFile extends StepHarnessBase {
 	private final ResourceHarness harness;
 
 	private StepHarnessWithFile(ResourceHarness harness, Formatter formatter) {

From f4d5315fb247d3557e642e0c643e5e646635f2a4 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Thu, 4 Apr 2024 10:25:45 +0800
Subject: [PATCH 1553/2068] Migrate to develocity plugin

https://docs.gradle.com/enterprise/gradle-plugin/legacy/#develocity_migration
---
 settings.gradle | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/settings.gradle b/settings.gradle
index 1126463326..29d208c029 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -19,8 +19,8 @@ plugins {
 	id 'com.adarshr.test-logger' version '4.0.0' apply false
 	// https://github.com/davidburstrom/version-compatibility-gradle-plugin/tags
 	id 'io.github.davidburstrom.version-compatibility' version '0.5.0' apply false
-	// https://plugins.gradle.org/plugin/com.gradle.enterprise
-	id 'com.gradle.enterprise' version '3.16'
+	// https://plugins.gradle.org/plugin/com.gradle.develocity
+	id 'com.gradle.develocity' version '3.17'
 	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
 	id 'dev.equo.ide' version '1.7.5' apply false
 }
@@ -59,11 +59,15 @@ if (System.env['CI'] != null) {
 	}
 }
 
-gradleEnterprise {
+def isCI = providers.environmentVariable('CI').present
+
+develocity {
 	buildScan {
-		termsOfServiceUrl = "https://gradle.com/terms-of-service"
-		termsOfServiceAgree = "yes"
-		publishAlwaysIf(providers.environmentVariable('CI').present)
+		termsOfUseUrl = "https://gradle.com/terms-of-service"
+		termsOfUseAgree = "yes"
+		publishing {
+			onlyIf { isCI }
+		}
 	}
 }
 

From 0513051b905f7f88bb91c82a9523d98631e12e49 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Thu, 4 Apr 2024 10:47:07 +0800
Subject: [PATCH 1554/2068] Remove build-scans.gradle

Seems it's unused for now, we configure build scans in settings.gradle.
---
 gradle/build-scans.gradle | 40 ---------------------------------------
 1 file changed, 40 deletions(-)
 delete mode 100644 gradle/build-scans.gradle

diff --git a/gradle/build-scans.gradle b/gradle/build-scans.gradle
deleted file mode 100644
index b134b6f142..0000000000
--- a/gradle/build-scans.gradle
+++ /dev/null
@@ -1,40 +0,0 @@
-File acceptFile = new File(gradle.gradleUserHomeDir, "build-scans/spotless/gradle-scans-license-agree.txt")
-acceptFile.parentFile.mkdirs()
-def env = System.getenv()
-boolean isCI = env.CI || env.TRAVIS
-boolean hasAccepted = isCI || env.SPOTLESS_GRADLE_SCANS_ACCEPT=='yes' || acceptFile.exists() && acceptFile.text.trim() == 'yes'
-boolean hasRefused = env.SPOTLESS_GRADLE_SCANS_ACCEPT=='no' || acceptFile.exists() && acceptFile.text.trim() == 'no'
-
-buildScan {
-	if (hasAccepted) {
-		termsOfServiceAgree = 'yes'
-	} else if (!hasRefused) {
-		gradle.buildFinished {
-			println """
-This build uses Gradle Build Scans to gather statistics, share information about 
-failures, environmental issues, dependencies resolved during the build and more.
-Build scans will be published after each build, if you accept the terms of 
-service, and in particular the privacy policy.
-
-Please read 
-   
-    https://gradle.com/terms-of-service 
-    https://gradle.com/legal/privacy
-
-and then:
-
-  - set the `SPOTLESS_GRADLE_SCANS_ACCEPT` to `yes`/`no` if you agree with/refuse the TOS
-  - or create the ${acceptFile} file with `yes`/`no` in it if you agree with/refuse
-
-    echo 'yes' >> ${acceptFile}
-
-    or
-
-    echo 'no' >> ${acceptFile}
-
-And we'll not bother you again. Note that build scans are only made public if 
-you share the URL at the end of the build.
-"""
-		}
-	}
-}

From a4f8e2b2cf598119778747aadc726760a562ad09 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 3 Apr 2024 22:57:26 -0700
Subject: [PATCH 1555/2068] FenceStep can't use serialization for equality on
 its delegate steps anymore, it has to use "real" equality now.

---
 .../java/com/diffplug/spotless/Formatter.java |  4 ++
 .../diffplug/spotless/generic/FenceStep.java  | 65 ++++++++++++++-----
 2 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/Formatter.java b/lib/src/main/java/com/diffplug/spotless/Formatter.java
index fc6fe32afd..0732ab4592 100644
--- a/lib/src/main/java/com/diffplug/spotless/Formatter.java
+++ b/lib/src/main/java/com/diffplug/spotless/Formatter.java
@@ -35,6 +35,8 @@
 
 import javax.annotation.Nullable;
 
+import com.diffplug.spotless.generic.FenceStep;
+
 /** Formatter which performs the full formatting. */
 public final class Formatter implements Serializable, AutoCloseable {
 	private static final long serialVersionUID = 1L;
@@ -306,6 +308,8 @@ public void close() {
 				((FormatterStepImpl.Standard) step).cleanupFormatterFunc();
 			} else if (step instanceof FormatterStepEqualityOnStateSerialization) {
 				((FormatterStepEqualityOnStateSerialization) step).cleanupFormatterFunc();
+			} else if (step instanceof FenceStep.Apply) {
+				((FenceStep.Apply) step).cleanup();
 			}
 		}
 	}
diff --git a/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java b/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
index cbfe016679..9adabc5a4b 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
@@ -25,11 +25,12 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import javax.annotation.Nullable;
+
 import com.diffplug.spotless.Formatter;
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.LineEnding;
-import com.diffplug.spotless.SerializedFunction;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
@@ -81,10 +82,7 @@ private void assertRegexSet() {
 	/** Returns a step which will apply the given steps but preserve the content selected by the regex / openClose pair. */
 	public FormatterStep preserveWithin(List<FormatterStep> steps) {
 		assertRegexSet();
-		return FormatterStep.createLazy(name,
-				() -> new PreserveWithin(regex, steps),
-				SerializedFunction.identity(),
-				state -> FormatterFunc.Closeable.of(state.buildFormatter(), state));
+		return new PreserveWithin(name, regex, steps);
 	}
 
 	/**
@@ -93,17 +91,14 @@ public FormatterStep preserveWithin(List<FormatterStep> steps) {
 	 */
 	public FormatterStep applyWithin(List<FormatterStep> steps) {
 		assertRegexSet();
-		return FormatterStep.createLazy(name,
-				() -> new ApplyWithin(regex, steps),
-				SerializedFunction.identity(),
-				state -> FormatterFunc.Closeable.of(state.buildFormatter(), state));
+		return new ApplyWithin(name, regex, steps);
 	}
 
 	static class ApplyWithin extends Apply implements FormatterFunc.Closeable.ResourceFuncNeedsFile<Formatter> {
 		private static final long serialVersionUID = 17061466531957339L;
 
-		ApplyWithin(Pattern regex, List<FormatterStep> steps) {
-			super(regex, steps);
+		ApplyWithin(String name, Pattern regex, List<FormatterStep> steps) {
+			super(name, regex, steps);
 		}
 
 		@Override
@@ -122,8 +117,8 @@ public String apply(Formatter formatter, String unix, File file) throws Exceptio
 	static class PreserveWithin extends Apply implements FormatterFunc.Closeable.ResourceFuncNeedsFile<Formatter> {
 		private static final long serialVersionUID = -8676786492305178343L;
 
-		PreserveWithin(Pattern regex, List<FormatterStep> steps) {
-			super(regex, steps);
+		PreserveWithin(String name, Pattern regex, List<FormatterStep> steps) {
+			super(name, regex, steps);
 		}
 
 		private void storeGroups(String unix) {
@@ -144,7 +139,8 @@ public String apply(Formatter formatter, String unix, File file) throws Exceptio
 	}
 
 	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
-	static class Apply implements Serializable {
+	public static abstract class Apply implements Serializable, FormatterStep, FormatterFunc.Closeable.ResourceFuncNeedsFile<Formatter> {
+		final String name;
 		private static final long serialVersionUID = -2301848328356559915L;
 		final Pattern regex;
 		final List<FormatterStep> steps;
@@ -152,7 +148,8 @@ static class Apply implements Serializable {
 		transient ArrayList<String> groups = new ArrayList<>();
 		transient StringBuilder builderInternal;
 
-		public Apply(Pattern regex, List<FormatterStep> steps) {
+		public Apply(String name, Pattern regex, List<FormatterStep> steps) {
+			this.name = name;
 			this.regex = regex;
 			this.steps = steps;
 		}
@@ -218,5 +215,43 @@ protected String assembleGroups(String unix) {
 				throw new Error("An intermediate step removed a match of " + pattern);
 			}
 		}
+
+		@Override
+		public String getName() {
+			return name;
+		}
+
+		private transient Formatter formatter;
+
+		@Nullable
+		@Override
+		public String format(String rawUnix, File file) throws Exception {
+			if (formatter == null) {
+				formatter = buildFormatter();
+			}
+			return this.apply(formatter, rawUnix, file);
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o)
+				return true;
+			if (o == null || getClass() != o.getClass())
+				return false;
+			Apply step = (Apply) o;
+			return name.equals(step.name) && regex.pattern().equals(step.regex.pattern()) && regex.flags() == step.regex.flags() && steps.equals(step.steps);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(name, regex.pattern(), regex.flags(), steps);
+		}
+
+		public void cleanup() {
+			if (formatter != null) {
+				formatter.close();
+				formatter = null;
+			}
+		}
 	}
 }

From 532078b8cd5b8d5a5e88f0bb14d0236e7e001944 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 3 Apr 2024 22:59:01 -0700
Subject: [PATCH 1556/2068] Fix a long-standing bug where delegate steps (which
 are created by filename filters) weren't getting cleaned-up.

---
 lib/src/main/java/com/diffplug/spotless/Formatter.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/src/main/java/com/diffplug/spotless/Formatter.java b/lib/src/main/java/com/diffplug/spotless/Formatter.java
index 0732ab4592..72016c353d 100644
--- a/lib/src/main/java/com/diffplug/spotless/Formatter.java
+++ b/lib/src/main/java/com/diffplug/spotless/Formatter.java
@@ -304,6 +304,9 @@ public boolean equals(Object obj) {
 	@Override
 	public void close() {
 		for (FormatterStep step : steps) {
+			if (step instanceof DelegateFormatterStep) {
+				step = ((DelegateFormatterStep) step).delegateStep;
+			}
 			if (step instanceof FormatterStepImpl.Standard) {
 				((FormatterStepImpl.Standard) step).cleanupFormatterFunc();
 			} else if (step instanceof FormatterStepEqualityOnStateSerialization) {

From cee7cad08fa9520f90583d083ed7fe56b2bd8683 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 3 Apr 2024 23:09:40 -0700
Subject: [PATCH 1557/2068] Fix spotbugs.

---
 lib/src/main/java/com/diffplug/spotless/Formatter.java |  4 ++--
 .../java/com/diffplug/spotless/generic/FenceStep.java  | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/Formatter.java b/lib/src/main/java/com/diffplug/spotless/Formatter.java
index 72016c353d..05b27c1cf0 100644
--- a/lib/src/main/java/com/diffplug/spotless/Formatter.java
+++ b/lib/src/main/java/com/diffplug/spotless/Formatter.java
@@ -311,8 +311,8 @@ public void close() {
 				((FormatterStepImpl.Standard) step).cleanupFormatterFunc();
 			} else if (step instanceof FormatterStepEqualityOnStateSerialization) {
 				((FormatterStepEqualityOnStateSerialization) step).cleanupFormatterFunc();
-			} else if (step instanceof FenceStep.Apply) {
-				((FenceStep.Apply) step).cleanup();
+			} else if (step instanceof FenceStep.BaseStep) {
+				((FenceStep.BaseStep) step).cleanup();
 			}
 		}
 	}
diff --git a/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java b/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
index 9adabc5a4b..e1b486bc22 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
@@ -94,7 +94,7 @@ public FormatterStep applyWithin(List<FormatterStep> steps) {
 		return new ApplyWithin(name, regex, steps);
 	}
 
-	static class ApplyWithin extends Apply implements FormatterFunc.Closeable.ResourceFuncNeedsFile<Formatter> {
+	static class ApplyWithin extends BaseStep {
 		private static final long serialVersionUID = 17061466531957339L;
 
 		ApplyWithin(String name, Pattern regex, List<FormatterStep> steps) {
@@ -114,7 +114,7 @@ public String apply(Formatter formatter, String unix, File file) throws Exceptio
 		}
 	}
 
-	static class PreserveWithin extends Apply implements FormatterFunc.Closeable.ResourceFuncNeedsFile<Formatter> {
+	static class PreserveWithin extends BaseStep {
 		private static final long serialVersionUID = -8676786492305178343L;
 
 		PreserveWithin(String name, Pattern regex, List<FormatterStep> steps) {
@@ -139,7 +139,7 @@ public String apply(Formatter formatter, String unix, File file) throws Exceptio
 	}
 
 	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
-	public static abstract class Apply implements Serializable, FormatterStep, FormatterFunc.Closeable.ResourceFuncNeedsFile<Formatter> {
+	public static abstract class BaseStep implements Serializable, FormatterStep, FormatterFunc.Closeable.ResourceFuncNeedsFile<Formatter> {
 		final String name;
 		private static final long serialVersionUID = -2301848328356559915L;
 		final Pattern regex;
@@ -148,7 +148,7 @@ public static abstract class Apply implements Serializable, FormatterStep, Forma
 		transient ArrayList<String> groups = new ArrayList<>();
 		transient StringBuilder builderInternal;
 
-		public Apply(String name, Pattern regex, List<FormatterStep> steps) {
+		public BaseStep(String name, Pattern regex, List<FormatterStep> steps) {
 			this.name = name;
 			this.regex = regex;
 			this.steps = steps;
@@ -238,7 +238,7 @@ public boolean equals(Object o) {
 				return true;
 			if (o == null || getClass() != o.getClass())
 				return false;
-			Apply step = (Apply) o;
+			BaseStep step = (BaseStep) o;
 			return name.equals(step.name) && regex.pattern().equals(step.regex.pattern()) && regex.flags() == step.regex.flags() && steps.equals(step.steps);
 		}
 

From 63414a748e55782275602ae648f463604aa20db0 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 3 Apr 2024 23:41:16 -0700
Subject: [PATCH 1558/2068] Make roundtripping optional-ish.

---
 .../java/com/diffplug/spotless/StepHarness.java     |  6 +++---
 .../java/com/diffplug/spotless/StepHarnessBase.java | 13 +++++++++++--
 .../com/diffplug/spotless/StepHarnessWithFile.java  |  8 ++++----
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarness.java b/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
index 43ff60f7a8..6c55165251 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
@@ -27,8 +27,8 @@
 
 /** An api for testing a {@code FormatterStep} that doesn't depend on the File path. DO NOT ADD FILE SUPPORT TO THIS, use {@link StepHarnessWithFile} if you need that. */
 public class StepHarness extends StepHarnessBase {
-	private StepHarness(Formatter formatter) {
-		super(formatter);
+	private StepHarness(Formatter formatter, RoundTrip roundTrip) {
+		super(formatter, roundTrip);
 	}
 
 	/** Creates a harness for testing steps which don't depend on the file. */
@@ -49,7 +49,7 @@ public static StepHarness forSteps(FormatterStep... steps) {
 
 	/** Creates a harness for testing a formatter whose steps don't depend on the file. */
 	public static StepHarness forFormatter(Formatter formatter) {
-		return new StepHarness(formatter);
+		return new StepHarness(formatter, RoundTrip.ASSERT_EQUAL);
 	}
 
 	/** Asserts that the given element is transformed as expected, and that the result is idempotent. */
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
index a9b7cda734..656057cd4e 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
@@ -20,12 +20,21 @@
 import org.assertj.core.api.Assertions;
 
 class StepHarnessBase implements AutoCloseable {
+	enum RoundTrip {
+		ASSERT_EQUAL, DONT_ASSERT_EQUAL, DONT_ROUNDTRIP
+	}
+
 	private final Formatter formatter;
 
-	protected StepHarnessBase(Formatter formatter) {
+	protected StepHarnessBase(Formatter formatter, RoundTrip roundTrip) {
 		this.formatter = Objects.requireNonNull(formatter);
+		if (roundTrip == RoundTrip.DONT_ROUNDTRIP) {
+			return;
+		}
 		Formatter roundTripped = SerializableEqualityTester.reserialize(formatter);
-		Assertions.assertThat(roundTripped).isEqualTo(formatter);
+		if (roundTrip == RoundTrip.ASSERT_EQUAL) {
+			Assertions.assertThat(roundTripped).isEqualTo(formatter);
+		}
 	}
 
 	protected Formatter formatter() {
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java b/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java
index d09cc62668..871da6f385 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java
@@ -29,14 +29,14 @@
 public class StepHarnessWithFile extends StepHarnessBase {
 	private final ResourceHarness harness;
 
-	private StepHarnessWithFile(ResourceHarness harness, Formatter formatter) {
-		super(formatter);
+	private StepHarnessWithFile(ResourceHarness harness, Formatter formatter, RoundTrip roundTrip) {
+		super(formatter, roundTrip);
 		this.harness = Objects.requireNonNull(harness);
 	}
 
 	/** Creates a harness for testing steps which do depend on the file. */
 	public static StepHarnessWithFile forStep(ResourceHarness harness, FormatterStep step) {
-		return new StepHarnessWithFile(harness, Formatter.builder()
+		return forFormatter(harness, Formatter.builder()
 				.name(step.getName())
 				.encoding(StandardCharsets.UTF_8)
 				.lineEndingsPolicy(LineEnding.UNIX.createPolicy())
@@ -48,7 +48,7 @@ public static StepHarnessWithFile forStep(ResourceHarness harness, FormatterStep
 
 	/** Creates a harness for testing a formatter whose steps do depend on the file. */
 	public static StepHarnessWithFile forFormatter(ResourceHarness harness, Formatter formatter) {
-		return new StepHarnessWithFile(harness, formatter);
+		return new StepHarnessWithFile(harness, formatter, RoundTrip.ASSERT_EQUAL);
 	}
 
 	/** Asserts that the given element is transformed as expected, and that the result is idempotent. */

From 9f016c8aaf1870cd2545ab7f3e0f5b3f9764a9b8 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 3 Apr 2024 23:46:44 -0700
Subject: [PATCH 1559/2068] Because there are a few legitimate reasons to not
 roundtrip.

---
 .../main/java/com/diffplug/spotless/StepHarness.java  | 10 ++++++++++
 .../com/diffplug/spotless/generic/FenceStepTest.java  | 11 +++++------
 .../spotless/java/GoogleJavaFormatStepTest.java       |  6 +++---
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarness.java b/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
index 6c55165251..735dedb80c 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
@@ -52,6 +52,16 @@ public static StepHarness forFormatter(Formatter formatter) {
 		return new StepHarness(formatter, RoundTrip.ASSERT_EQUAL);
 	}
 
+	public static StepHarness forStepNoRoundtrip(FormatterStep step) {
+		return new StepHarness(Formatter.builder()
+				.steps(Arrays.asList(step))
+				.lineEndingsPolicy(LineEnding.UNIX.createPolicy())
+				.encoding(StandardCharsets.UTF_8)
+				.rootDir(Paths.get(""))
+				.exceptionPolicy(new FormatExceptionPolicyStrict())
+				.build(), RoundTrip.DONT_ROUNDTRIP);
+	}
+
 	/** Asserts that the given element is transformed as expected, and that the result is idempotent. */
 	public StepHarness test(String before, String after) {
 		String actual = formatter().compute(LineEnding.toUnix(before), new File(""));
diff --git a/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java b/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java
index 17159ae5a4..2f64dac0f5 100644
--- a/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java
@@ -29,14 +29,13 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.ResourceHarness;
 import com.diffplug.spotless.StepHarness;
-import com.diffplug.spotless.StepHarnessWithFile;
 
 class FenceStepTest extends ResourceHarness {
 	@Test
 	void single() {
 		FormatterStep fence = FenceStep.named("fence").openClose("spotless:off", "spotless:on")
 				.preserveWithin(Arrays.asList(createNeverUpToDateSerializable("lowercase", String::toLowerCase)));
-		StepHarness harness = StepHarness.forSteps(fence);
+		StepHarness harness = StepHarness.forStepNoRoundtrip(fence);
 		harness.test(
 				StringPrinter.buildStringFromLines(
 						"A B C",
@@ -56,7 +55,7 @@ void single() {
 	void multiple() {
 		FormatterStep fence = FenceStep.named("fence").openClose("spotless:off", "spotless:on")
 				.preserveWithin(Arrays.asList(createNeverUpToDateSerializable("lowercase", String::toLowerCase)));
-		StepHarness harness = StepHarness.forSteps(fence);
+		StepHarness harness = StepHarness.forStepNoRoundtrip(fence);
 		harness.test(
 				StringPrinter.buildStringFromLines(
 						"A B C",
@@ -90,9 +89,8 @@ void multiple() {
 	void broken() {
 		FormatterStep fence = FenceStep.named("fence").openClose("spotless:off", "spotless:on")
 				.preserveWithin(Arrays.asList(createNeverUpToDateSerializable("uppercase", String::toUpperCase)));
-		StepHarnessWithFile harness = StepHarnessWithFile.forStep(this, fence);
 		// this fails because uppercase turns spotless:off into SPOTLESS:OFF, etc
-		harness.testExceptionMsg(newFile("test"), StringPrinter.buildStringFromLines("A B C",
+		StepHarness.forStepNoRoundtrip(fence).testExceptionMsg(StringPrinter.buildStringFromLines("A B C",
 				"spotless:off",
 				"D E F",
 				"spotless:on",
@@ -103,7 +101,7 @@ void broken() {
 	void andApply() {
 		FormatterStep fence = FenceStep.named("fence").openClose("<lower>", "</lower>")
 				.applyWithin(Arrays.asList(createNeverUpToDateSerializable("lowercase", String::toLowerCase)));
-		StepHarness.forSteps(fence).test(
+		StepHarness.forStepNoRoundtrip(fence).test(
 				StringPrinter.buildStringFromLines(
 						"A B C",
 						"<lower>",
@@ -152,5 +150,6 @@ public String getName() {
 		public String format(String rawUnix, File file) throws Exception {
 			return formatterFunc.apply(rawUnix, file);
 		}
+
 	}
 }
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java
index c2ec5b5d7f..4b157c536a 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -64,7 +64,7 @@ void behavior() throws Exception {
 	@Test
 	void versionBelowMinimumRequiredVersionIsNotAllowed() throws Exception {
 		FormatterStep step = GoogleJavaFormatStep.create("1.2", "AOSP", TestProvisioner.mavenCentral());
-		StepHarness.forStep(step)
+		StepHarness.forStepNoRoundtrip(step)
 				.testResourceExceptionMsg("java/googlejavaformat/JavaCodeWithLicenseUnformatted.test")
 				.contains("you are using 1.2");
 	}
@@ -73,7 +73,7 @@ void versionBelowMinimumRequiredVersionIsNotAllowed() throws Exception {
 	@EnabledForJreRange(min = JAVA_16)
 	void versionBelowOneDotTenIsNotAllowed() throws Exception {
 		FormatterStep step = GoogleJavaFormatStep.create("1.9", "AOSP", TestProvisioner.mavenCentral());
-		StepHarness.forStep(step)
+		StepHarness.forStepNoRoundtrip(step)
 				.testResourceExceptionMsg("java/googlejavaformat/JavaCodeWithLicenseUnformatted.test")
 				.contains("you are using 1.9");
 	}

From e84da36ebd2cdda2772530e8c9f2db1d99d434e4 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 4 Apr 2024 08:53:01 -0700
Subject: [PATCH 1560/2068] Remove `RoundedStep`.

---
 .../extra/EclipseBasedStepBuilder.java        |  3 +--
 .../spotless/extra/EquoBasedStepBuilder.java  |  3 +--
 .../com/diffplug/spotless/RoundedStep.java    | 20 -------------------
 .../spotless/antlr4/Antlr4FormatterStep.java  |  3 +--
 .../diffplug/spotless/generic/IndentStep.java |  3 +--
 .../diffplug/spotless/generic/Jsr223Step.java |  3 +--
 .../spotless/gherkin/GherkinUtilsStep.java    |  3 +--
 .../spotless/groovy/RemoveSemicolonsStep.java |  3 +--
 .../spotless/java/CleanthatJavaStep.java      |  3 +--
 .../spotless/java/FormatAnnotationsStep.java  |  3 +--
 .../spotless/java/GoogleJavaFormatStep.java   |  3 +--
 .../spotless/java/ImportOrderStep.java        |  3 +--
 .../spotless/java/PalantirJavaFormatStep.java |  2 +-
 .../java/RemoveUnusedImportsStep.java         |  3 +--
 .../spotless/json/JacksonJsonStep.java        |  3 +--
 .../diffplug/spotless/json/JsonPatchStep.java |  3 +--
 .../spotless/json/JsonSimpleStep.java         |  3 +--
 .../diffplug/spotless/json/gson/GsonStep.java |  3 +--
 .../diffplug/spotless/kotlin/DiktatStep.java  |  2 +-
 .../diffplug/spotless/kotlin/KtLintStep.java  |  3 +--
 .../diffplug/spotless/kotlin/KtfmtStep.java   |  3 +--
 .../spotless/markdown/FlexmarkStep.java       |  3 +--
 .../spotless/markdown/FreshMarkStep.java      |  3 +--
 .../diffplug/spotless/pom/SortPomStep.java    |  3 +--
 .../diffplug/spotless/scala/ScalaFmtStep.java |  3 +--
 .../spotless/yaml/JacksonYamlStep.java        |  3 +--
 26 files changed, 25 insertions(+), 68 deletions(-)
 delete mode 100644 lib/src/main/java/com/diffplug/spotless/RoundedStep.java

diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/EclipseBasedStepBuilder.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/EclipseBasedStepBuilder.java
index 3e43e49d37..c7460dc1fe 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/EclipseBasedStepBuilder.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/EclipseBasedStepBuilder.java
@@ -33,7 +33,6 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
-import com.diffplug.spotless.RoundedStep;
 import com.diffplug.spotless.SerializedFunction;
 
 /**
@@ -127,7 +126,7 @@ public void setPreferences(Iterable<File> settingsFiles) {
 		this.settingsFiles = settingsFiles;
 	}
 
-	static class EclipseStep implements RoundedStep {
+	static class EclipseStep implements java.io.Serializable {
 		private static final long serialVersionUID = 1;
 		private final String semanticVersion;
 		private final String formatterStepExt;
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 e2b3661d9b..5aaa1a4dee 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
@@ -34,7 +34,6 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
-import com.diffplug.spotless.RoundedStep;
 import com.diffplug.spotless.SerializedFunction;
 
 import dev.equo.solstice.NestedJars;
@@ -150,7 +149,7 @@ private P2Model createModelWithMirrors() {
 		return model;
 	}
 
-	static class EquoStep implements RoundedStep {
+	static class EquoStep implements java.io.Serializable {
 		private static final long serialVersionUID = 1;
 		private final String semanticVersion;
 		private final FileSignature.Promised settingsPromise;
diff --git a/lib/src/main/java/com/diffplug/spotless/RoundedStep.java b/lib/src/main/java/com/diffplug/spotless/RoundedStep.java
deleted file mode 100644
index 8b346273c4..0000000000
--- a/lib/src/main/java/com/diffplug/spotless/RoundedStep.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2024 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless;
-
-import java.io.Serializable;
-
-public interface RoundedStep extends Serializable {}
diff --git a/lib/src/main/java/com/diffplug/spotless/antlr4/Antlr4FormatterStep.java b/lib/src/main/java/com/diffplug/spotless/antlr4/Antlr4FormatterStep.java
index ca1d021d63..9405a401d1 100644
--- a/lib/src/main/java/com/diffplug/spotless/antlr4/Antlr4FormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/antlr4/Antlr4FormatterStep.java
@@ -23,10 +23,9 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
-import com.diffplug.spotless.RoundedStep;
 import com.diffplug.spotless.ThrowingEx;
 
-public class Antlr4FormatterStep implements RoundedStep {
+public class Antlr4FormatterStep implements java.io.Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String MAVEN_COORDINATE = "com.khubla.antlr4formatter:antlr4-formatter:";
 	private static final String DEFAULT_VERSION = "1.2.1";
diff --git a/lib/src/main/java/com/diffplug/spotless/generic/IndentStep.java b/lib/src/main/java/com/diffplug/spotless/generic/IndentStep.java
index 1bd7454c14..e4e2f84ca8 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/IndentStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/IndentStep.java
@@ -17,11 +17,10 @@
 
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.RoundedStep;
 import com.diffplug.spotless.SerializedFunction;
 
 /** Simple step which checks for consistent indentation characters. */
-public final class IndentStep implements RoundedStep {
+public final class IndentStep implements java.io.Serializable {
 	private static final long serialVersionUID = 1L;
 
 	final Type type;
diff --git a/lib/src/main/java/com/diffplug/spotless/generic/Jsr223Step.java b/lib/src/main/java/com/diffplug/spotless/generic/Jsr223Step.java
index f9b88ef6cc..2e67e5a465 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/Jsr223Step.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/Jsr223Step.java
@@ -27,9 +27,8 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
-import com.diffplug.spotless.RoundedStep;
 
-public final class Jsr223Step implements RoundedStep {
+public final class Jsr223Step implements java.io.Serializable {
 	private static final long serialVersionUID = 1L;
 	@Nullable
 	private final JarState.Promised jarState;
diff --git a/lib/src/main/java/com/diffplug/spotless/gherkin/GherkinUtilsStep.java b/lib/src/main/java/com/diffplug/spotless/gherkin/GherkinUtilsStep.java
index 6e9e9fdfe2..b606789052 100644
--- a/lib/src/main/java/com/diffplug/spotless/gherkin/GherkinUtilsStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/gherkin/GherkinUtilsStep.java
@@ -24,9 +24,8 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
-import com.diffplug.spotless.RoundedStep;
 
-public class GherkinUtilsStep implements RoundedStep {
+public class GherkinUtilsStep implements java.io.Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String MAVEN_COORDINATE = "io.cucumber:gherkin-utils:";
 	private static final String DEFAULT_VERSION = "8.0.2";
diff --git a/lib/src/main/java/com/diffplug/spotless/groovy/RemoveSemicolonsStep.java b/lib/src/main/java/com/diffplug/spotless/groovy/RemoveSemicolonsStep.java
index 31ebb069e0..0f1582c305 100644
--- a/lib/src/main/java/com/diffplug/spotless/groovy/RemoveSemicolonsStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/groovy/RemoveSemicolonsStep.java
@@ -21,14 +21,13 @@
 
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.RoundedStep;
 
 /**
  * Removes all semicolons from the end of lines.
  *
  * @author Jose Luis Badano
  */
-public final class RemoveSemicolonsStep implements RoundedStep {
+public final class RemoveSemicolonsStep implements java.io.Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String NAME = "Remove unnecessary semicolons";
 
diff --git a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
index 93a3b7662c..0408ba6749 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
@@ -26,7 +26,6 @@
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Jvm;
 import com.diffplug.spotless.Provisioner;
-import com.diffplug.spotless.RoundedStep;
 
 /**
  * Enables CleanThat as a SpotLess step.
@@ -34,7 +33,7 @@
  * @author Benoit Lacelle
  */
 // https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep
-public final class CleanthatJavaStep implements RoundedStep {
+public final class CleanthatJavaStep implements java.io.Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String NAME = "cleanthat";
 	private static final String MAVEN_COORDINATE = "io.github.solven-eu.cleanthat:java";
diff --git a/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java b/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java
index 18b6444606..f557e0cb60 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java
@@ -26,7 +26,6 @@
 
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.RoundedStep;
 import com.diffplug.spotless.SerializedFunction;
 
 /**
@@ -38,7 +37,7 @@
  * <p>
  * Note: A type annotation is an annotation that is meta-annotated with {@code @Target({ElementType.TYPE_USE})}.
  */
-public final class FormatAnnotationsStep implements RoundedStep {
+public final class FormatAnnotationsStep implements java.io.Serializable {
 	private static final long serialVersionUID = 1L;
 
 	/**
diff --git a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
index 00452fef46..1378ec5c90 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
@@ -24,10 +24,9 @@
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Jvm;
 import com.diffplug.spotless.Provisioner;
-import com.diffplug.spotless.RoundedStep;
 
 /** Wraps up <a href="https://github.com/google/google-java-format">google-java-format</a> as a FormatterStep. */
-public class GoogleJavaFormatStep implements RoundedStep {
+public class GoogleJavaFormatStep implements java.io.Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String DEFAULT_STYLE = "GOOGLE";
 	private static final boolean DEFAULT_REFLOW_LONG_STRINGS = false;
diff --git a/lib/src/main/java/com/diffplug/spotless/java/ImportOrderStep.java b/lib/src/main/java/com/diffplug/spotless/java/ImportOrderStep.java
index 8e359eece2..60f16caf2b 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/ImportOrderStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/ImportOrderStep.java
@@ -38,12 +38,11 @@
 
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.RoundedStep;
 import com.diffplug.spotless.SerializedFunction;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
-public final class ImportOrderStep implements RoundedStep {
+public final class ImportOrderStep implements java.io.Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final boolean WILDCARDS_LAST_DEFAULT = false;
 	private static final boolean SEMANTIC_SORT_DEFAULT = false;
diff --git a/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
index a41811b57a..e27e8a78d5 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
@@ -23,7 +23,7 @@
 
 /** Wraps up <a href="https://github.com/palantir/palantir-java-format">palantir-java-format</a> fork of
  * <a href="https://github.com/google/google-java-format">google-java-format</a> as a FormatterStep. */
-public class PalantirJavaFormatStep implements RoundedStep {
+public class PalantirJavaFormatStep implements java.io.Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final boolean DEFAULT_FORMAT_JAVADOC = false;
 	private static final String DEFAULT_STYLE = "PALANTIR";
diff --git a/lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java b/lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java
index 89129e8171..01a4cc730a 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java
@@ -20,10 +20,9 @@
 
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.Provisioner;
-import com.diffplug.spotless.RoundedStep;
 
 /** Uses google-java-format or cleanthat.UnnecessaryImport, but only to remove unused imports. */
-public class RemoveUnusedImportsStep implements RoundedStep {
+public class RemoveUnusedImportsStep implements java.io.Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String NAME = "removeUnusedImports";
 
diff --git a/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java b/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java
index 79bfb43f85..ebc081a759 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java
@@ -24,13 +24,12 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
-import com.diffplug.spotless.RoundedStep;
 
 /**
  * Simple YAML formatter which reformats the file according to Jackson YAMLFactory.
  */
 // https://stackoverflow.com/questions/14515994/convert-json-string-to-pretty-print-json-output-using-jackson
-public class JacksonJsonStep implements RoundedStep {
+public class JacksonJsonStep implements java.io.Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String MAVEN_COORDINATE = "com.fasterxml.jackson.core:jackson-databind:";
 	private static final String DEFAULT_VERSION = "2.14.2";
diff --git a/lib/src/main/java/com/diffplug/spotless/json/JsonPatchStep.java b/lib/src/main/java/com/diffplug/spotless/json/JsonPatchStep.java
index d02e94f329..5082f07472 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/JsonPatchStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/JsonPatchStep.java
@@ -28,9 +28,8 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
-import com.diffplug.spotless.RoundedStep;
 
-public class JsonPatchStep implements RoundedStep {
+public class JsonPatchStep implements java.io.Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String MAVEN_COORDINATE = "com.flipkart.zjsonpatch:zjsonpatch";
 	private static final String DEFAULT_VERSION = "0.4.14";
diff --git a/lib/src/main/java/com/diffplug/spotless/json/JsonSimpleStep.java b/lib/src/main/java/com/diffplug/spotless/json/JsonSimpleStep.java
index 2348451011..2f1d1e7ea3 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/JsonSimpleStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/JsonSimpleStep.java
@@ -25,12 +25,11 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
-import com.diffplug.spotless.RoundedStep;
 
 /**
  * Simple JSON formatter which reformats the file according to the org.json library's default pretty-printing, but has no ability to customise more than the indentation size.
  */
-public final class JsonSimpleStep implements RoundedStep {
+public final class JsonSimpleStep implements java.io.Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String MAVEN_COORDINATE = "org.json:json:";
 	private static final String DEFAULT_VERSION = "20210307";
diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
index 2c795e28b3..b61910913d 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
@@ -24,9 +24,8 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
-import com.diffplug.spotless.RoundedStep;
 
-public class GsonStep implements RoundedStep {
+public class GsonStep implements java.io.Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String MAVEN_COORDINATES = "com.google.code.gson:gson";
 	private static final String INCOMPATIBLE_ERROR_MESSAGE = "There was a problem interacting with Gson; maybe you set an incompatible version?";
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
index d1803b16a8..215b1c290b 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
@@ -26,7 +26,7 @@
 import com.diffplug.spotless.*;
 
 /** Wraps up <a href="https://github.com/cqfn/diKTat">diktat</a> as a FormatterStep. */
-public class DiktatStep implements RoundedStep {
+public class DiktatStep implements java.io.Serializable {
 	private static final long serialVersionUID = 1L;
 	private final JarState.Promised jarState;
 	private final String versionDiktat;
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index 0df35a0616..0f154e1ef8 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -32,10 +32,9 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
-import com.diffplug.spotless.RoundedStep;
 
 /** Wraps up <a href="https://github.com/pinterest/ktlint">ktlint</a> as a FormatterStep. */
-public class KtLintStep implements RoundedStep {
+public class KtLintStep implements java.io.Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String DEFAULT_VERSION = "1.2.1";
 	private static final String NAME = "ktlint";
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
index 4ffdc380b2..cee8c379e5 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
@@ -29,13 +29,12 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
-import com.diffplug.spotless.RoundedStep;
 import com.diffplug.spotless.ThrowingEx;
 
 /**
  * Wraps up <a href="https://github.com/facebookincubator/ktfmt">ktfmt</a> as a FormatterStep.
  */
-public class KtfmtStep implements RoundedStep {
+public class KtfmtStep implements java.io.Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String DEFAULT_VERSION = "0.47";
 	private static final String NAME = "ktfmt";
diff --git a/lib/src/main/java/com/diffplug/spotless/markdown/FlexmarkStep.java b/lib/src/main/java/com/diffplug/spotless/markdown/FlexmarkStep.java
index 6b9d735425..64b09b7fbd 100644
--- a/lib/src/main/java/com/diffplug/spotless/markdown/FlexmarkStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/markdown/FlexmarkStep.java
@@ -23,10 +23,9 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
-import com.diffplug.spotless.RoundedStep;
 
 /** A step for <a href="https://github.com/vsch/flexmark-java">flexmark-java</a>. */
-public class FlexmarkStep implements RoundedStep {
+public class FlexmarkStep implements java.io.Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String DEFAULT_VERSION = "0.64.8";
 	private static final String MAVEN_COORDINATE = "com.vladsch.flexmark:flexmark-all:";
diff --git a/lib/src/main/java/com/diffplug/spotless/markdown/FreshMarkStep.java b/lib/src/main/java/com/diffplug/spotless/markdown/FreshMarkStep.java
index c1e140fdf1..123b860eb7 100644
--- a/lib/src/main/java/com/diffplug/spotless/markdown/FreshMarkStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/markdown/FreshMarkStep.java
@@ -35,10 +35,9 @@
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Jvm;
 import com.diffplug.spotless.Provisioner;
-import com.diffplug.spotless.RoundedStep;
 
 /** A step for <a href="https://github.com/diffplug/freshmark">FreshMark</a>. */
-public class FreshMarkStep implements RoundedStep {
+public class FreshMarkStep implements java.io.Serializable {
 	private static final long serialVersionUID = 1L;
 
 	private static final String DEFAULT_VERSION = "1.3.1";
diff --git a/lib/src/main/java/com/diffplug/spotless/pom/SortPomStep.java b/lib/src/main/java/com/diffplug/spotless/pom/SortPomStep.java
index d9e662684a..21468db7f9 100644
--- a/lib/src/main/java/com/diffplug/spotless/pom/SortPomStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/pom/SortPomStep.java
@@ -23,9 +23,8 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
-import com.diffplug.spotless.RoundedStep;
 
-public class SortPomStep implements RoundedStep {
+public class SortPomStep implements java.io.Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String MAVEN_COORDINATE = "com.github.ekryd.sortpom:sortpom-sorter:";
 	public static final String NAME = "sortPom";
diff --git a/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java b/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java
index 1f7eaf2ba9..eea96d236f 100644
--- a/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java
@@ -28,10 +28,9 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
-import com.diffplug.spotless.RoundedStep;
 
 /** Wraps up <a href="https://github.com/scalameta/scalafmt">scalafmt</a> as a FormatterStep. */
-public class ScalaFmtStep implements RoundedStep {
+public class ScalaFmtStep implements java.io.Serializable {
 	private static final long serialVersionUID = 1L;
 
 	static final String DEFAULT_VERSION = "3.7.3";
diff --git a/lib/src/main/java/com/diffplug/spotless/yaml/JacksonYamlStep.java b/lib/src/main/java/com/diffplug/spotless/yaml/JacksonYamlStep.java
index 6c1e353599..03515800f8 100644
--- a/lib/src/main/java/com/diffplug/spotless/yaml/JacksonYamlStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/yaml/JacksonYamlStep.java
@@ -24,14 +24,13 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
-import com.diffplug.spotless.RoundedStep;
 
 /**
  * Simple YAML formatter which reformats the file according to Jackson YAMLFactory.
  */
 // https://stackoverflow.com/questions/14515994/convert-json-string-to-pretty-print-json-output-using-jackson
 // https://stackoverflow.com/questions/60891174/i-want-to-load-a-yaml-file-possibly-edit-the-data-and-then-dump-it-again-how
-public class JacksonYamlStep implements RoundedStep {
+public class JacksonYamlStep implements java.io.Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String MAVEN_COORDINATE = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:";
 	private static final String DEFAULT_VERSION = "2.14.1";

From a2caf6e8d054766cff39605e42e7715dc32c4e62 Mon Sep 17 00:00:00 2001
From: Konrad Windszus <kwin@apache.org>
Date: Thu, 4 Apr 2024 18:06:04 +0200
Subject: [PATCH 1561/2068] add changelog entry

---
 plugin-maven/CHANGES.md | 1 +
 plugin-maven/README.md  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 35de3c18ac..bd5b475f6b 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -11,6 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
 ### Added
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
+* Skip execution in M2E (incremental) builds by default ([#1814](https://github.com/diffplug/spotless/issues/1814), [#2037](https://github.com/diffplug/spotless/issues/2037)) 
 
 ## [2.43.0] - 2024-01-23
 ### Added
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index b0ad703928..f38e2ff4c9 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -1707,7 +1707,7 @@ To enable it use the following parameter
 </configuration>
 ```
 
-In addition Eclipse problem markers are being emitted. By default they have the severity `WARNING`.
+In addition Eclipse problem markers are being emitted for goal `check`. By default they have the severity `WARNING`.
 You can adjust this with 
 
 ```

From 0363e9c8a89e719ecaab9670b368d3c537b42ae1 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 4 Apr 2024 09:27:11 -0700
Subject: [PATCH 1562/2068] Remove `JvmLocalCache` now that everything is
 round-trippable on its own.

---
 .../gradle/spotless/JvmLocalCache.java        | 104 ------------------
 .../gradle/spotless/SpotlessTask.java         |  32 ++----
 .../spotless/DiffMessageFormatterTest.java    |   6 +-
 .../gradle/spotless/FormatTaskTest.java       |   5 +-
 .../gradle/spotless/PaddedCellTaskTest.java   |   5 +-
 5 files changed, 20 insertions(+), 132 deletions(-)
 delete mode 100644 plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JvmLocalCache.java

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JvmLocalCache.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JvmLocalCache.java
deleted file mode 100644
index bcc480b7c6..0000000000
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JvmLocalCache.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright 2021-2022 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.gradle.spotless;
-
-import java.io.File;
-import java.io.Serializable;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
-import org.gradle.api.GradleException;
-import org.gradle.api.Task;
-
-import com.diffplug.spotless.FileSignature;
-import com.diffplug.spotless.LazyForwardingEquality;
-
-class JvmLocalCache {
-	private static GradleException cacheIsStale() {
-		return new GradleException("Spotless JVM-local cache is stale. Regenerate the cache with\n" +
-				"  " + (FileSignature.machineIsWin() ? "rmdir /q /s" : "rm -rf") + " .gradle/configuration-cache\n" +
-				"To make this workaround obsolete, please upvote https://github.com/diffplug/spotless/issues/987");
-	}
-
-	interface LiveCache<T> {
-		T get();
-
-		void set(T value);
-	}
-
-	static <T> LiveCache<T> createLive(Task task, String propertyName) {
-		return new LiveCacheKeyImpl<T>(new InternalCacheKey(task.getProject().getProjectDir(), task.getPath(), propertyName));
-	}
-
-	static class LiveCacheKeyImpl<T> implements LiveCache<T>, Serializable {
-		InternalCacheKey internalKey;
-
-		LiveCacheKeyImpl(InternalCacheKey internalKey) {
-			this.internalKey = internalKey;
-		}
-
-		@Override
-		public void set(T value) {
-
-			// whenever we cache an instance of LazyForwardingEquality, we want to make sure that we give it
-			// a chance to null-out its initialization lambda (see https://github.com/diffplug/spotless/issues/1194#issuecomment-1120744842)
-			LazyForwardingEquality.unlazy(value);
-			daemonState.put(internalKey, value);
-		}
-
-		@Override
-		public T get() {
-			Object value = daemonState.get(internalKey);
-			if (value == null) {
-				// TODO: throw TriggerConfigurationException(); (see https://github.com/diffplug/spotless/issues/987)
-				throw cacheIsStale();
-			} else {
-				return (T) value;
-			}
-		}
-	}
-
-	private static Map<InternalCacheKey, Object> daemonState = Collections.synchronizedMap(new HashMap<>());
-
-	private static class InternalCacheKey implements Serializable {
-		private File projectDir;
-		private String taskPath;
-		private String propertyName;
-
-		InternalCacheKey(File projectDir, String taskPath, String keyName) {
-			this.projectDir = projectDir;
-			this.taskPath = taskPath;
-			this.propertyName = keyName;
-		}
-
-		@Override
-		public boolean equals(Object o) {
-			if (this == o)
-				return true;
-			if (o == null || getClass() != o.getClass())
-				return false;
-			InternalCacheKey that = (InternalCacheKey) o;
-			return projectDir.equals(that.projectDir) && taskPath.equals(that.taskPath) && propertyName.equals(that.propertyName);
-		}
-
-		@Override
-		public int hashCode() {
-			return Objects.hash(projectDir, taskPath, propertyName);
-		}
-	}
-}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
index 7b225eacd0..8f472c5b7d 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 DiffPlug
+ * Copyright 2020-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,7 +37,6 @@
 import org.gradle.api.tasks.PathSensitivity;
 import org.gradle.work.Incremental;
 
-import com.diffplug.gradle.spotless.JvmLocalCache.LiveCache;
 import com.diffplug.spotless.FormatExceptionPolicy;
 import com.diffplug.spotless.FormatExceptionPolicyStrict;
 import com.diffplug.spotless.Formatter;
@@ -49,10 +48,6 @@ public abstract class SpotlessTask extends DefaultTask {
 	@Internal
 	abstract Property<SpotlessTaskService> getTaskService();
 
-	protected <T> LiveCache<T> createLive(String keyName) {
-		return JvmLocalCache.createLive(this, keyName);
-	}
-
 	// set by SpotlessExtension, but possibly overridden by FormatExtension
 	protected String encoding = "UTF-8";
 
@@ -65,15 +60,15 @@ public void setEncoding(String encoding) {
 		this.encoding = Objects.requireNonNull(encoding);
 	}
 
-	protected final LiveCache<Provider<LineEnding.Policy>> lineEndingsPolicy = createLive("lineEndingsPolicy");
+	protected Provider<LineEnding.Policy> lineEndingsPolicy = null;
 
 	@Input
 	public Provider<LineEnding.Policy> getLineEndingsPolicy() {
-		return lineEndingsPolicy.get();
+		return lineEndingsPolicy;
 	}
 
 	public void setLineEndingsPolicy(Provider<LineEnding.Policy> lineEndingsPolicy) {
-		this.lineEndingsPolicy.set(lineEndingsPolicy);
+		this.lineEndingsPolicy = lineEndingsPolicy;
 	}
 
 	/** The sha of the tree at repository root, used for determining if an individual *file* is clean according to git. */
@@ -155,22 +150,17 @@ public File getOutputDirectory() {
 		return outputDirectory;
 	}
 
-	protected final LiveCache<List<FormatterStep>> steps = createLive("steps");
-	{
-		steps.set(new ArrayList<FormatterStep>());
-	}
+	protected final List<FormatterStep> steps = new ArrayList<>();
 
 	@Input
 	public List<FormatterStep> getSteps() {
-		return Collections.unmodifiableList(steps.get());
+		return Collections.unmodifiableList(steps);
 	}
 
 	public void setSteps(List<FormatterStep> steps) {
-		this.steps.set(PluginGradlePreconditions.requireElementsNonNull(steps));
-	}
-
-	public boolean addStep(FormatterStep step) {
-		return this.steps.get().add(Objects.requireNonNull(step));
+		this.steps.clear();
+		PluginGradlePreconditions.requireElementsNonNull(steps);
+		this.steps.addAll(steps);
 	}
 
 	/** Returns the name of this format. */
@@ -186,10 +176,10 @@ String formatName() {
 	Formatter buildFormatter() {
 		return Formatter.builder()
 				.name(formatName())
-				.lineEndingsPolicy(lineEndingsPolicy.get().get())
+				.lineEndingsPolicy(getLineEndingsPolicy().get())
 				.encoding(Charset.forName(encoding))
 				.rootDir(getProjectDir().get().getAsFile().toPath())
-				.steps(steps.get())
+				.steps(steps)
 				.exceptionPolicy(exceptionPolicy)
 				.build();
 	}
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/DiffMessageFormatterTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/DiffMessageFormatterTest.java
index bc556ac06e..af724ab961 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/DiffMessageFormatterTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/DiffMessageFormatterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -151,10 +151,10 @@ void customRunToFixMessage() throws Exception {
 	@Test
 	void whitespaceProblem() throws Exception {
 		Bundle spotless = create(setFile("testFile").toContent("A \nB\t\nC  \n"));
-		spotless.task.addStep(FormatterStep.createNeverUpToDate("trimTrailing", input -> {
+		spotless.task.setSteps(List.of(FormatterStep.createNeverUpToDate("trimTrailing", input -> {
 			Pattern pattern = Pattern.compile("[ \t]+$", Pattern.UNIX_LINES | Pattern.MULTILINE);
 			return pattern.matcher(input).replaceAll("");
-		}));
+		})));
 		assertCheckFailure(spotless,
 				"    testFile",
 				"        @@ -1,3 +1,3 @@",
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/FormatTaskTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/FormatTaskTest.java
index ddd813468d..92f6818f3e 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/FormatTaskTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/FormatTaskTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 
 import java.io.File;
 import java.util.Collections;
+import java.util.List;
 
 import org.gradle.api.Project;
 import org.gradle.api.services.BuildServiceParameters;
@@ -61,7 +62,7 @@ void testStep() throws Exception {
 		File outputFile = new File(spotlessTask.getOutputDirectory(), "testFile");
 		spotlessTask.setTarget(Collections.singleton(testFile));
 
-		spotlessTask.addStep(FormatterStep.createNeverUpToDate("double-p", content -> content.replace("pp", "p")));
+		spotlessTask.setSteps(List.of(FormatterStep.createNeverUpToDate("double-p", content -> content.replace("pp", "p"))));
 		Tasks.execute(spotlessTask);
 
 		assertFile(outputFile).hasContent("aple");
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PaddedCellTaskTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PaddedCellTaskTest.java
index 4fe78d884d..7dc5581f5b 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PaddedCellTaskTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PaddedCellTaskTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.List;
 
 import org.gradle.api.Project;
 import org.gradle.api.provider.Provider;
@@ -65,7 +66,7 @@ public BuildServiceParameters.None getParameters() {
 		private SpotlessTaskImpl createFormatTask(String name, FormatterStep step) {
 			SpotlessTaskImpl task = project.getTasks().create("spotless" + SpotlessPlugin.capitalize(name), SpotlessTaskImpl.class);
 			task.init(taskService);
-			task.addStep(step);
+			task.setSteps(List.of(step));
 			task.setLineEndingsPolicy(project.provider(LineEnding.UNIX::createPolicy));
 			task.setTarget(Collections.singletonList(file));
 			return task;

From 92ff1c604f171a3783f3c71a7606a59daa0cf690 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 4 Apr 2024 09:46:40 -0700
Subject: [PATCH 1563/2068] Error messages are slightly different now.

---
 .../com/diffplug/gradle/spotless/BiomeIntegrationTest.java    | 2 +-
 .../com/diffplug/gradle/spotless/RomeIntegrationTest.java     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java
index db4ca4b027..ba39af1705 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java
@@ -310,7 +310,7 @@ void failureWhenExeNotFound() throws Exception {
 		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").buildAndFail();
 		assertThat(spotlessApply.getOutput()).contains("Build failed with an exception");
 		assertFile("biome_test.js").sameAsResource("biome/js/fileBefore.js");
-		assertThat(spotlessApply.getOutput()).contains("Could not create task ':spotlessMybiomeApply'");
+		assertThat(spotlessApply.getOutput()).contains("Execution failed for task ':spotlessMybiome'");
 		assertThat(spotlessApply.getOutput()).contains("Biome executable does not exist");
 	}
 
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/RomeIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/RomeIntegrationTest.java
index 0c12f9f500..e9f33f64ac 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/RomeIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/RomeIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -310,7 +310,7 @@ void failureWhenExeNotFound() throws Exception {
 		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").buildAndFail();
 		assertThat(spotlessApply.getOutput()).contains("Build failed with an exception");
 		assertFile("rome_test.js").sameAsResource("rome/js/fileBefore.js");
-		assertThat(spotlessApply.getOutput()).contains("Could not create task ':spotlessMyromeApply'");
+		assertThat(spotlessApply.getOutput()).contains("Execution failed for task ':spotlessMyrome'");
 		assertThat(spotlessApply.getOutput()).contains("Biome executable does not exist");
 	}
 

From c40c63bba9b12101353bd58368c688bc55440b1c Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 4 Apr 2024 12:54:35 -0700
Subject: [PATCH 1564/2068] We don't need to test for a broken JvmLocalCache
 anymore.

---
 .../gradle/spotless/ConfigurationCacheTest.java | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ConfigurationCacheTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ConfigurationCacheTest.java
index 70be5adb82..0306f087ac 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ConfigurationCacheTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ConfigurationCacheTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 DiffPlug
+ * Copyright 2020-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,11 +17,8 @@
 
 import java.io.IOException;
 
-import org.gradle.testkit.runner.BuildResult;
 import org.gradle.testkit.runner.GradleRunner;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledForJreRange;
-import org.junit.jupiter.api.condition.JRE;
 
 public class ConfigurationCacheTest extends GradleIntegrationHarness {
 	@Override
@@ -65,8 +62,7 @@ public void helpConfiguresIfTasksAreCreated() throws IOException {
 	}
 
 	@Test
-	@EnabledForJreRange(max = JRE.JAVA_20)
-	public void jvmLocalCache() throws IOException {
+	public void multipleRuns() throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
 				"    id 'com.diffplug.spotless'",
@@ -93,14 +89,5 @@ public void jvmLocalCache() throws IOException {
 		gradleRunner().withArguments("spotlessCheck").buildAndFail();
 		gradleRunner().withArguments("spotlessApply").build();
 		assertFile("test.java").sameAsResource("java/googlejavaformat/JavaCodeFormatted.test");
-
-		// the withDebug forces it to start a new deamon, but only in Gradle 8.3 and older
-		// starting with Gradle 8.5 this doesn't work anymore
-		// and we need Gradle 8.5 for Java 21
-		// so we can't test this on Java 21 for now
-		BuildResult failure = gradleRunner().withDebug(true).withArguments("spotlessApply", "--stacktrace").buildAndFail();
-		failure.getOutput().contains("Spotless daemon-local cache is stale. Regenerate the cache with\n" +
-				"  rm -rf .gradle/configuration-cache\n" +
-				"For more information see #123\n");
 	}
 }

From a3612995dd3be244422bdd4f6257b4351aba5d28 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 4 Apr 2024 15:48:20 -0700
Subject: [PATCH 1565/2068] Disallow old-style `GIT_ATTRIBUTES`.

---
 .../java/com/diffplug/gradle/spotless/SpotlessExtension.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
index 7fee3d950e..276bdadcfd 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
@@ -64,6 +64,9 @@ public LineEnding getLineEndings() {
 	}
 
 	public void setLineEndings(LineEnding lineEndings) {
+		if (lineEndings == LineEnding.GIT_ATTRIBUTES) {
+			throw new IllegalArgumentException("GIT_ATTRIBUTES not supported in Gradle, use GIT_ATTRIBUTES_FAST_ALLSAME instead. See https://github.com/diffplug/spotless/issues/1274 for more details.");
+		}
 		this.lineEndings = requireNonNull(lineEndings);
 	}
 

From b83f62ddd69dfb45e453735c2af9578d6d5e1db7 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sat, 6 Apr 2024 17:45:07 -0700
Subject: [PATCH 1566/2068] Update
 plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java

Co-authored-by: Zongle Wang <wangzongler@gmail.com>
---
 .../main/java/com/diffplug/gradle/spotless/SpotlessTask.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
index 8f472c5b7d..77f22c5f0c 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
@@ -158,8 +158,8 @@ public List<FormatterStep> getSteps() {
 	}
 
 	public void setSteps(List<FormatterStep> steps) {
+                PluginGradlePreconditions.requireElementsNonNull(steps);
 		this.steps.clear();
-		PluginGradlePreconditions.requireElementsNonNull(steps);
 		this.steps.addAll(steps);
 	}
 

From 38a354eae09e65e8d918d2ede6eb99ed621a5c46 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 7 Apr 2024 15:21:01 -0700
Subject: [PATCH 1567/2068] spotlessApply

---
 .../main/java/com/diffplug/gradle/spotless/SpotlessTask.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
index 77f22c5f0c..f930685baf 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
@@ -158,7 +158,7 @@ public List<FormatterStep> getSteps() {
 	}
 
 	public void setSteps(List<FormatterStep> steps) {
-                PluginGradlePreconditions.requireElementsNonNull(steps);
+		PluginGradlePreconditions.requireElementsNonNull(steps);
 		this.steps.clear();
 		this.steps.addAll(steps);
 	}

From 53d03993d99e49e3d210b0d3bcacd6c4f546852a Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 7 Apr 2024 15:24:46 -0700
Subject: [PATCH 1568/2068] Update changelog.

---
 plugin-gradle/CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 11e9f04fc3..ffaaa932dc 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -4,6 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Fixed
+* Full no-asterisk support for configuration cache ([#2088](https://github.com/diffplug/spotless/pull/2088) closes [#1274](https://github.com/diffplug/spotless/issues/1274) and [#987](https://github.com/diffplug/spotless/issues/987)).
 * Ignore system git config when running tests ([#1990](https://github.com/diffplug/spotless/issues/1990))
 * Correctly provide EditorConfig property types for Ktlint ([#2052](https://github.com/diffplug/spotless/issues/2052))
 * Fixed memory leak introduced in 6.21.0 ([#2067](https://github.com/diffplug/spotless/issues/2067))

From 51175ce604c8d2f3801c22af23864318f58e1342 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 7 Apr 2024 15:48:10 -0700
Subject: [PATCH 1569/2068] FormatterStep now extends `AutoCloseable`, instead
 of having a bunch of ad-hoc "cleanup" methods.

---
 .../diffplug/spotless/DelegateFormatterStep.java  |  7 ++++++-
 .../java/com/diffplug/spotless/Formatter.java     | 15 ++++-----------
 .../java/com/diffplug/spotless/FormatterStep.java |  2 +-
 ...FormatterStepEqualityOnStateSerialization.java |  3 ++-
 .../com/diffplug/spotless/FormatterStepImpl.java  | 13 +++++++++++--
 .../com/diffplug/spotless/generic/FenceStep.java  |  3 ++-
 .../diffplug/spotless/generic/FenceStepTest.java  |  6 ++++++
 7 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/DelegateFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/DelegateFormatterStep.java
index 829652a5dc..18d64b4759 100644
--- a/lib/src/main/java/com/diffplug/spotless/DelegateFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/DelegateFormatterStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 DiffPlug
+ * Copyright 2022-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,4 +29,9 @@ abstract class DelegateFormatterStep implements FormatterStep {
 	public final String getName() {
 		return delegateStep.getName();
 	}
+
+	@Override
+	public void close() throws Exception {
+		delegateStep.close();
+	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/Formatter.java b/lib/src/main/java/com/diffplug/spotless/Formatter.java
index 05b27c1cf0..9400989ddf 100644
--- a/lib/src/main/java/com/diffplug/spotless/Formatter.java
+++ b/lib/src/main/java/com/diffplug/spotless/Formatter.java
@@ -35,8 +35,6 @@
 
 import javax.annotation.Nullable;
 
-import com.diffplug.spotless.generic.FenceStep;
-
 /** Formatter which performs the full formatting. */
 public final class Formatter implements Serializable, AutoCloseable {
 	private static final long serialVersionUID = 1L;
@@ -304,15 +302,10 @@ public boolean equals(Object obj) {
 	@Override
 	public void close() {
 		for (FormatterStep step : steps) {
-			if (step instanceof DelegateFormatterStep) {
-				step = ((DelegateFormatterStep) step).delegateStep;
-			}
-			if (step instanceof FormatterStepImpl.Standard) {
-				((FormatterStepImpl.Standard) step).cleanupFormatterFunc();
-			} else if (step instanceof FormatterStepEqualityOnStateSerialization) {
-				((FormatterStepEqualityOnStateSerialization) step).cleanupFormatterFunc();
-			} else if (step instanceof FenceStep.BaseStep) {
-				((FenceStep.BaseStep) step).cleanup();
+			try {
+				step.close();
+			} catch (Exception e) {
+				throw ThrowingEx.asRuntime(e);
 			}
 		}
 	}
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
index 26bc1e56e5..d2e87b8675 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
@@ -27,7 +27,7 @@
  * The input is guaranteed to have unix-style newlines, and the output is required
  * to not introduce any windows-style newlines as well.
  */
-public interface FormatterStep extends Serializable {
+public interface FormatterStep extends Serializable, AutoCloseable {
 	/** The name of the step, for debugging purposes. */
 	String getName();
 
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStepEqualityOnStateSerialization.java b/lib/src/main/java/com/diffplug/spotless/FormatterStepEqualityOnStateSerialization.java
index 0ff279c5f5..52bf9fc760 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStepEqualityOnStateSerialization.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStepEqualityOnStateSerialization.java
@@ -64,7 +64,8 @@ public int hashCode() {
 		return Arrays.hashCode(serializedState());
 	}
 
-	void cleanupFormatterFunc() {
+	@Override
+	public void close() {
 		if (formatter instanceof FormatterFunc.Closeable) {
 			((FormatterFunc.Closeable) formatter).close();
 			formatter = null;
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStepImpl.java b/lib/src/main/java/com/diffplug/spotless/FormatterStepImpl.java
index 869e7b7966..8e2982d6db 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStepImpl.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStepImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -82,7 +82,8 @@ protected String format(State state, String rawUnix, File file) throws Exception
 			return formatter.apply(rawUnix, file);
 		}
 
-		void cleanupFormatterFunc() {
+		@Override
+		public void close() throws Exception {
 			if (formatter instanceof FormatterFunc.Closeable) {
 				((FormatterFunc.Closeable) formatter).close();
 				formatter = null;
@@ -114,6 +115,14 @@ protected String format(Integer state, String rawUnix, File file) throws Excepti
 			}
 			return formatter.apply(rawUnix, file);
 		}
+
+		@Override
+		public void close() throws Exception {
+			if (formatter instanceof FormatterFunc.Closeable) {
+				((FormatterFunc.Closeable) formatter).close();
+				formatter = null;
+			}
+		}
 	}
 
 	static void checkNotSentinel(File file) {
diff --git a/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java b/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
index e1b486bc22..1db94d0885 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
@@ -247,7 +247,8 @@ public int hashCode() {
 			return Objects.hash(name, regex.pattern(), regex.flags(), steps);
 		}
 
-		public void cleanup() {
+		@Override
+		public void close() {
 			if (formatter != null) {
 				formatter.close();
 				formatter = null;
diff --git a/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java b/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java
index 2f64dac0f5..682855755e 100644
--- a/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java
@@ -151,5 +151,11 @@ public String format(String rawUnix, File file) throws Exception {
 			return formatterFunc.apply(rawUnix, file);
 		}
 
+		@Override
+		public void close() throws Exception {
+			if (formatterFunc instanceof FormatterFunc.Closeable) {
+				((FormatterFunc.Closeable) formatterFunc).close();
+			}
+		}
 	}
 }

From aeabaf061f7f7c488d831a47aa1066efe24e68bd Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 7 Apr 2024 15:50:12 -0700
Subject: [PATCH 1570/2068] Update changelog.

---
 CHANGES.md | 1273 +++++++++++++++++++++++++++++++++-------------------
 1 file changed, 807 insertions(+), 466 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 22f14f2137..b559749835 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,896 +10,1237 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
 ### Added
-* `FileSignature.Promised` and `JarState.Promised` to facilitate round-trip serialization for the Gradle configuration cache. ([#1945](https://github.com/diffplug/spotless/pull/1945)) 
-* Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
+
+- `FileSignature.Promised` and `JarState.Promised` to facilitate round-trip serialization for the Gradle configuration cache. ([#1945](https://github.com/diffplug/spotless/pull/1945))
+- Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
+
 ### Changes
-* Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
-* Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049))
-* Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
-* Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))
-* Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078))
+
+- **BREAKING** `FormatterStep` now extends `AutoCloseable`. ([#2091](https://github.com/diffplug/spotless/pull/2091))
+- Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
+- Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049))
+- Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
+- Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))
+- Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078))
+
 ### Removed
-* **BREAKING** Remove `JarState.getMavenCoordinate(String prefix)`. ([#1945](https://github.com/diffplug/spotless/pull/1945))
-* **BREAKING** Replace `PipeStepPair` with `FenceStep`. ([#1954](https://github.com/diffplug/spotless/pull/1954))
+
+- **BREAKING** Remove `JarState.getMavenCoordinate(String prefix)`. ([#1945](https://github.com/diffplug/spotless/pull/1945))
+- **BREAKING** Replace `PipeStepPair` with `FenceStep`. ([#1954](https://github.com/diffplug/spotless/pull/1954))
+
 ### Fixed
-* Ignore system git config when running tests ([#1990](https://github.com/diffplug/spotless/issues/1990))
-* Correctly provide EditorConfig property types for Ktlint ([#2052](https://github.com/diffplug/spotless/issues/2052))
+
+- Ignore system git config when running tests ([#1990](https://github.com/diffplug/spotless/issues/1990))
+- Correctly provide EditorConfig property types for Ktlint ([#2052](https://github.com/diffplug/spotless/issues/2052))
 
 ## [2.45.0] - 2024-01-23
+
 ### Added
-* Support for `gofmt` ([#2001](https://github.com/diffplug/spotless/pull/2001))
-* Support for formatting Java Docs for the Palantir formatter ([#2009](https://github.com/diffplug/spotless/pull/2009))
+
+- Support for `gofmt` ([#2001](https://github.com/diffplug/spotless/pull/2001))
+- Support for formatting Java Docs for the Palantir formatter ([#2009](https://github.com/diffplug/spotless/pull/2009))
 
 ## [2.44.0] - 2024-01-15
+
 ### Added
-* New static method to `DiffMessageFormatter` which allows to retrieve diffs with their line numbers ([#1960](https://github.com/diffplug/spotless/issues/1960))
-* Gradle - Support for formatting shell scripts via [shfmt](https://github.com/mvdan/sh). ([#1994](https://github.com/diffplug/spotless/pull/1994))
+
+- New static method to `DiffMessageFormatter` which allows to retrieve diffs with their line numbers ([#1960](https://github.com/diffplug/spotless/issues/1960))
+- Gradle - Support for formatting shell scripts via [shfmt](https://github.com/mvdan/sh). ([#1994](https://github.com/diffplug/spotless/pull/1994))
+
 ### Fixed
-* Fix empty files with biome >= 1.5.0 when formatting files that are in the ignore list of the biome configuration file. ([#1989](https://github.com/diffplug/spotless/pull/1989) fixes [#1987](https://github.com/diffplug/spotless/issues/1987))
-* Fix a regression in BufStep where the same arguments were being provided to every `buf` invocation. ([#1976](https://github.com/diffplug/spotless/issues/1976))
+
+- Fix empty files with biome >= 1.5.0 when formatting files that are in the ignore list of the biome configuration file. ([#1989](https://github.com/diffplug/spotless/pull/1989) fixes [#1987](https://github.com/diffplug/spotless/issues/1987))
+- Fix a regression in BufStep where the same arguments were being provided to every `buf` invocation. ([#1976](https://github.com/diffplug/spotless/issues/1976))
+
 ### Changes
-* Use palantir-java-format 2.39.0 on Java 21. ([#1948](https://github.com/diffplug/spotless/pull/1948))
-* Bump default `ktlint` version to latest `1.0.1` -> `1.1.1`. ([#1973](https://github.com/diffplug/spotless/pull/1973))
-* Bump default `googleJavaFormat` version to latest `1.18.1` -> `1.19.2`. ([#1971](https://github.com/diffplug/spotless/pull/1971))
-* Bump default `diktat` version to latest `1.2.5` -> `2.0.0`. ([#1972](https://github.com/diffplug/spotless/pull/1972))
+
+- Use palantir-java-format 2.39.0 on Java 21. ([#1948](https://github.com/diffplug/spotless/pull/1948))
+- Bump default `ktlint` version to latest `1.0.1` -> `1.1.1`. ([#1973](https://github.com/diffplug/spotless/pull/1973))
+- Bump default `googleJavaFormat` version to latest `1.18.1` -> `1.19.2`. ([#1971](https://github.com/diffplug/spotless/pull/1971))
+- Bump default `diktat` version to latest `1.2.5` -> `2.0.0`. ([#1972](https://github.com/diffplug/spotless/pull/1972))
 
 ## [2.43.1] - 2023-12-04
+
 ### Fixed
-* Eclipse-based steps which contained any jars with a `+` in their path were broken, now fixed. ([#1860](https://github.com/diffplug/spotless/issues/1860#issuecomment-1826113332))
+
+- Eclipse-based steps which contained any jars with a `+` in their path were broken, now fixed. ([#1860](https://github.com/diffplug/spotless/issues/1860#issuecomment-1826113332))
+
 ### Changes
-* Bump default `palantir-java-format` version to latest `2.28.0` -> `2.38.0` on Java 21. ([#1920](https://github.com/diffplug/spotless/pull/1920))
-* Bump default `googleJavaFormat` version to latest `1.17.0` -> `1.18.1`. ([#1920](https://github.com/diffplug/spotless/pull/1920))
-* Bump default `ktfmt` version to latest `0.44` -> `0.46`. ([#1927](https://github.com/diffplug/spotless/pull/1927))
-* Bump default `eclipse` version to latest `4.27` -> `4.29`. ([#1939](https://github.com/diffplug/spotless/pull/1939))
-* Bump default `greclipse` version to latest `4.28` -> `4.29`. ([#1939](https://github.com/diffplug/spotless/pull/1939))
-* Bump default `cdt` version to latest `11.1` -> `11.3`. ([#1939](https://github.com/diffplug/spotless/pull/1939))
+
+- Bump default `palantir-java-format` version to latest `2.28.0` -> `2.38.0` on Java 21. ([#1920](https://github.com/diffplug/spotless/pull/1920))
+- Bump default `googleJavaFormat` version to latest `1.17.0` -> `1.18.1`. ([#1920](https://github.com/diffplug/spotless/pull/1920))
+- Bump default `ktfmt` version to latest `0.44` -> `0.46`. ([#1927](https://github.com/diffplug/spotless/pull/1927))
+- Bump default `eclipse` version to latest `4.27` -> `4.29`. ([#1939](https://github.com/diffplug/spotless/pull/1939))
+- Bump default `greclipse` version to latest `4.28` -> `4.29`. ([#1939](https://github.com/diffplug/spotless/pull/1939))
+- Bump default `cdt` version to latest `11.1` -> `11.3`. ([#1939](https://github.com/diffplug/spotless/pull/1939))
 
 ## [2.43.0] - 2023-11-27
+
 ### Added
-* Support custom rule sets for Ktlint. ([#1896](https://github.com/diffplug/spotless/pull/1896))
+
+- Support custom rule sets for Ktlint. ([#1896](https://github.com/diffplug/spotless/pull/1896))
+
 ### Fixed
-* Fix Eclipse JDT on some settings files. ([#1864](https://github.com/diffplug/spotless/pull/1864) fixes [#1638](https://github.com/diffplug/spotless/issues/1638))
+
+- Fix Eclipse JDT on some settings files. ([#1864](https://github.com/diffplug/spotless/pull/1864) fixes [#1638](https://github.com/diffplug/spotless/issues/1638))
+
 ### Changes
-* Bump default `ktlint` version to latest `1.0.0` -> `1.0.1`. ([#1855](https://github.com/diffplug/spotless/pull/1855))
-* Add a Step to remove semicolons from Groovy files. ([#1881](https://github.com/diffplug/spotless/pull/1881))
+
+- Bump default `ktlint` version to latest `1.0.0` -> `1.0.1`. ([#1855](https://github.com/diffplug/spotless/pull/1855))
+- Add a Step to remove semicolons from Groovy files. ([#1881](https://github.com/diffplug/spotless/pull/1881))
 
 ## [2.42.0] - 2023-09-28
+
 ### Added
-* Support for biome. The Rome project [was renamed to Biome](https://biomejs.dev/blog/annoucing-biome/).
+
+- Support for biome. The Rome project [was renamed to Biome](https://biomejs.dev/blog/annoucing-biome/).
   The configuration is still the same, but you should switch to the new `biome` tag / function and adjust
   the version accordingly. ([#1804](https://github.com/diffplug/spotless/issues/1804)).
-* Support for `google-java-format`'s `skip-javadoc-formatting` option. ([#1793](https://github.com/diffplug/spotless/pull/1793))
-* Support configuration of mirrors for P2 repositories in Maven DSL ([#1697](https://github.com/diffplug/spotless/issues/1697)).
-* New line endings mode `GIT_ATTRIBUTES_FAST_ALLSAME`. ([#1838](https://github.com/diffplug/spotless/pull/1838))
+- Support for `google-java-format`'s `skip-javadoc-formatting` option. ([#1793](https://github.com/diffplug/spotless/pull/1793))
+- Support configuration of mirrors for P2 repositories in Maven DSL ([#1697](https://github.com/diffplug/spotless/issues/1697)).
+- New line endings mode `GIT_ATTRIBUTES_FAST_ALLSAME`. ([#1838](https://github.com/diffplug/spotless/pull/1838))
+
 ### Fixed
-* Fix support for plugins when using Prettier version `3.0.0` and newer. ([#1802](https://github.com/diffplug/spotless/pull/1802))
-* Fix configuration cache issue around `external process started '/usr/bin/git --version'`. ([#1806](https://github.com/diffplug/spotless/issues/1806))
+
+- Fix support for plugins when using Prettier version `3.0.0` and newer. ([#1802](https://github.com/diffplug/spotless/pull/1802))
+- Fix configuration cache issue around `external process started '/usr/bin/git --version'`. ([#1806](https://github.com/diffplug/spotless/issues/1806))
+
 ### Changes
-* Bump default `flexmark` version to latest `0.64.0` -> `0.64.8`. ([#1801](https://github.com/diffplug/spotless/pull/1801))
-* Bump default `ktlint` version to latest `0.50.0` -> `1.0.0`. ([#1808](https://github.com/diffplug/spotless/pull/1808))
+
+- Bump default `flexmark` version to latest `0.64.0` -> `0.64.8`. ([#1801](https://github.com/diffplug/spotless/pull/1801))
+- Bump default `ktlint` version to latest `0.50.0` -> `1.0.0`. ([#1808](https://github.com/diffplug/spotless/pull/1808))
 
 ## [2.41.0] - 2023-08-29
+
 ### Added
-* Add a `jsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
-* Support GJF own import order. ([#1780](https://github.com/diffplug/spotless/pull/1780))
+
+- Add a `jsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
+- Support GJF own import order. ([#1780](https://github.com/diffplug/spotless/pull/1780))
+
 ### Fixed
-* Use latest versions of popular style guides for `eslint` tests to fix failing `useEslintXoStandardRules` test. ([#1761](https://github.com/diffplug/spotless/pull/1761), [#1756](https://github.com/diffplug/spotless/issues/1756))
-* Add support for `prettier` version `3.0.0` and newer. ([#1760](https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
-* Fix npm install calls when npm cache is not up-to-date. ([#1760](https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))
+
+- Use latest versions of popular style guides for `eslint` tests to fix failing `useEslintXoStandardRules` test. ([#1761](https://github.com/diffplug/spotless/pull/1761), [#1756](https://github.com/diffplug/spotless/issues/1756))
+- Add support for `prettier` version `3.0.0` and newer. ([#1760](https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
+- Fix npm install calls when npm cache is not up-to-date. ([#1760](https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))
+
 ### Changes
-* Bump default `eslint` version to latest `8.31.0` -> `8.45.0` ([#1761](https://github.com/diffplug/spotless/pull/1761))
-* Bump default `prettier` version to latest (v2) `2.8.1` -> `2.8.8`. ([#1760](https://github.com/diffplug/spotless/pull/1760))
-* Bump default `greclipse` version to latest `4.27` -> `4.28`. ([#1775](https://github.com/diffplug/spotless/pull/1775))
+
+- Bump default `eslint` version to latest `8.31.0` -> `8.45.0` ([#1761](https://github.com/diffplug/spotless/pull/1761))
+- Bump default `prettier` version to latest (v2) `2.8.1` -> `2.8.8`. ([#1760](https://github.com/diffplug/spotless/pull/1760))
+- Bump default `greclipse` version to latest `4.27` -> `4.28`. ([#1775](https://github.com/diffplug/spotless/pull/1775))
 
 ## [2.40.0] - 2023-07-17
+
 ### Added
-* Added support for Protobuf formatting based on [Buf](https://buf.build/). (#1208)
-* `enum OnMatch { INCLUDE, EXCLUDE }` so that `FormatterStep.filterByContent` can not only include based on the pattern but also exclude. ([#1749](https://github.com/diffplug/spotless/pull/1749))
+
+- Added support for Protobuf formatting based on [Buf](https://buf.build/). (#1208)
+- `enum OnMatch { INCLUDE, EXCLUDE }` so that `FormatterStep.filterByContent` can not only include based on the pattern but also exclude. ([#1749](https://github.com/diffplug/spotless/pull/1749))
+
 ### Fixed
-* Update documented default `semanticSort` to `false`. ([#1728](https://github.com/diffplug/spotless/pull/1728))
+
+- Update documented default `semanticSort` to `false`. ([#1728](https://github.com/diffplug/spotless/pull/1728))
+
 ### Changes
-* Bump default `cleanthat` version to latest `2.13` -> `2.17`. ([#1734](https://github.com/diffplug/spotless/pull/1734))
-* Bump default `ktlint` version to latest `0.49.1` -> `0.50.0`. ([#1741](https://github.com/diffplug/spotless/issues/1741))
-  * Dropped support for `ktlint 0.47.x` following our policy of supporting two breaking changes at a time.
-  * Dropped support for deprecated `useExperimental` parameter in favor of the `ktlint_experimental` property.
+
+- Bump default `cleanthat` version to latest `2.13` -> `2.17`. ([#1734](https://github.com/diffplug/spotless/pull/1734))
+- Bump default `ktlint` version to latest `0.49.1` -> `0.50.0`. ([#1741](https://github.com/diffplug/spotless/issues/1741))
+  - Dropped support for `ktlint 0.47.x` following our policy of supporting two breaking changes at a time.
+  - Dropped support for deprecated `useExperimental` parameter in favor of the `ktlint_experimental` property.
 
 ## [2.39.0] - 2023-05-24
+
 ### Added
-* `Jvm.Support` now accepts `-SNAPSHOT` versions, treated as the non`-SNAPSHOT`. ([#1583](https://github.com/diffplug/spotless/issues/1583))
-* Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. ([#1663](https://github.com/diffplug/spotless/pull/1663))
-* Add semantics-aware Java import ordering (i.e. sort by package, then class, then member). ([#522](https://github.com/diffplug/spotless/issues/522))
+
+- `Jvm.Support` now accepts `-SNAPSHOT` versions, treated as the non`-SNAPSHOT`. ([#1583](https://github.com/diffplug/spotless/issues/1583))
+- Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. ([#1663](https://github.com/diffplug/spotless/pull/1663))
+- Add semantics-aware Java import ordering (i.e. sort by package, then class, then member). ([#522](https://github.com/diffplug/spotless/issues/522))
+
 ### Fixed
-* Fixed a regression which changed the import sorting order in `googleJavaFormat` introduced in `2.38.0`. ([#1680](https://github.com/diffplug/spotless/pull/1680))
-* Equo-based formatters now work on platforms unsupported by Eclipse such as PowerPC (fixes [durian-swt#20](https://github.com/diffplug/durian-swt/issues/20))
-* When P2 download fails, indicate the responsible formatter. ([#1698](https://github.com/diffplug/spotless/issues/1698))
+
+- Fixed a regression which changed the import sorting order in `googleJavaFormat` introduced in `2.38.0`. ([#1680](https://github.com/diffplug/spotless/pull/1680))
+- Equo-based formatters now work on platforms unsupported by Eclipse such as PowerPC (fixes [durian-swt#20](https://github.com/diffplug/durian-swt/issues/20))
+- When P2 download fails, indicate the responsible formatter. ([#1698](https://github.com/diffplug/spotless/issues/1698))
+
 ### Changes
-* Equo-based formatters now download metadata to `~/.m2/repository/dev/equo/p2-data` rather than `~/.equo`, and for CI machines without a home directory the p2 data goes to `$GRADLE_USER_HOME/caches/p2-data`. ([#1714](https://github.com/diffplug/spotless/pull/1714))
-* Bump default `googleJavaFormat` version to latest `1.16.0` -> `1.17.0`. ([#1710](https://github.com/diffplug/spotless/pull/1710))
-* Bump default `ktfmt` version to latest `0.43` -> `0.44`. ([#1691](https://github.com/diffplug/spotless/pull/1691))
-* Bump default `ktlint` version to latest `0.48.2` -> `0.49.1`. ([#1696](https://github.com/diffplug/spotless/issues/1696))
-  * Dropped support for `ktlint 0.46.x` following our policy of supporting two breaking changes at a time.
-* Bump default `sortpom` version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675))
+
+- Equo-based formatters now download metadata to `~/.m2/repository/dev/equo/p2-data` rather than `~/.equo`, and for CI machines without a home directory the p2 data goes to `$GRADLE_USER_HOME/caches/p2-data`. ([#1714](https://github.com/diffplug/spotless/pull/1714))
+- Bump default `googleJavaFormat` version to latest `1.16.0` -> `1.17.0`. ([#1710](https://github.com/diffplug/spotless/pull/1710))
+- Bump default `ktfmt` version to latest `0.43` -> `0.44`. ([#1691](https://github.com/diffplug/spotless/pull/1691))
+- Bump default `ktlint` version to latest `0.48.2` -> `0.49.1`. ([#1696](https://github.com/diffplug/spotless/issues/1696))
+  - Dropped support for `ktlint 0.46.x` following our policy of supporting two breaking changes at a time.
+- Bump default `sortpom` version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675))
 
 ## [2.38.0] - 2023-04-06
+
 ### Added
-* Support configuration of mirrors for P2 repositories in `EquoBasedStepBuilder` ([#1629](https://github.com/diffplug/spotless/issues/1629)).
-* The `style` option in Palantir Java Format ([#1654](https://github.com/diffplug/spotless/pull/1654)).
-* Added formatter for Gherkin feature files ([#1649](https://github.com/diffplug/spotless/issues/1649)).
+
+- Support configuration of mirrors for P2 repositories in `EquoBasedStepBuilder` ([#1629](https://github.com/diffplug/spotless/issues/1629)).
+- The `style` option in Palantir Java Format ([#1654](https://github.com/diffplug/spotless/pull/1654)).
+- Added formatter for Gherkin feature files ([#1649](https://github.com/diffplug/spotless/issues/1649)).
+
 ### Changes
-* **POTENTIALLY BREAKING** Converted `googleJavaFormat` to a compile-only dependency and drop support for versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
-* Bump default `cleanthat` version to latest `2.6` -> `2.13`. ([#1589](https://github.com/diffplug/spotless/pull/1589) and [#1661](https://github.com/diffplug/spotless/pull/1661))
-* Bump default `diktat` version `1.2.4.2` -> `1.2.5`. ([#1631](https://github.com/diffplug/spotless/pull/1631))
-* Bump default `flexmark` version `0.62.2` -> `0.64.0`. ([#1302](https://github.com/diffplug/spotless/pull/1302))
-* Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
-* Bump default `scalafmt` version `3.7.1` -> `3.7.3`. ([#1584](https://github.com/diffplug/spotless/pull/1584))
-* Bump default Eclipse formatters for the 2023-03 release. ([#1662](https://github.com/diffplug/spotless/pull/1662))
-  * JDT and GrEclipse `4.26` -> `4.27`
-    * Improve GrEclipse error reporting. ([#1660](https://github.com/diffplug/spotless/pull/1660))
-  * CDT `11.0` -> `11.1`
+
+- **POTENTIALLY BREAKING** Converted `googleJavaFormat` to a compile-only dependency and drop support for versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
+- Bump default `cleanthat` version to latest `2.6` -> `2.13`. ([#1589](https://github.com/diffplug/spotless/pull/1589) and [#1661](https://github.com/diffplug/spotless/pull/1661))
+- Bump default `diktat` version `1.2.4.2` -> `1.2.5`. ([#1631](https://github.com/diffplug/spotless/pull/1631))
+- Bump default `flexmark` version `0.62.2` -> `0.64.0`. ([#1302](https://github.com/diffplug/spotless/pull/1302))
+- Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
+- Bump default `scalafmt` version `3.7.1` -> `3.7.3`. ([#1584](https://github.com/diffplug/spotless/pull/1584))
+- Bump default Eclipse formatters for the 2023-03 release. ([#1662](https://github.com/diffplug/spotless/pull/1662))
+  - JDT and GrEclipse `4.26` -> `4.27`
+    - Improve GrEclipse error reporting. ([#1660](https://github.com/diffplug/spotless/pull/1660))
+  - CDT `11.0` -> `11.1`
 
 ## [2.37.0] - 2023-03-13
+
 ### Added
-* You can now put the filename into a license header template with `$FILE`. ([#1605](https://github.com/diffplug/spotless/pull/1605) fixes [#1147](https://github.com/diffplug/spotless/issues/1147))
+
+- You can now put the filename into a license header template with `$FILE`. ([#1605](https://github.com/diffplug/spotless/pull/1605) fixes [#1147](https://github.com/diffplug/spotless/issues/1147))
+
 ### Changes
-* We are now opting in to Gradle's new stable configuration cache. ([#1591](https://github.com/diffplug/spotless/pull/1591))
-* Adopt [Equo Solstice OSGi and p2 shim](https://github.com/equodev/equo-ide/tree/main/solstice) to update all Eclipse-based plugins. ([#1524](https://github.com/diffplug/spotless/pull/1524))
-  * Eclipse JDT now supports `4.9` through `4.26`. Also we now recommend dropping the last `.0`, e.g. `4.26` instead of `4.26.0`, you'll get warnings to help you switch.
-  * Eclipse Groovy now supports `4.18` through `4.26`. Also we now recommend dropping the last `.0`, e.g. `4.26` instead of `4.26.0`, you'll get warnings to help you switch.
-  * Eclipse CDT now supports `10.6` through `11.0`.
-  * Eclipse WTP is still WIP at [#1622](https://github.com/diffplug/spotless/pull/1622).
+
+- We are now opting in to Gradle's new stable configuration cache. ([#1591](https://github.com/diffplug/spotless/pull/1591))
+- Adopt [Equo Solstice OSGi and p2 shim](https://github.com/equodev/equo-ide/tree/main/solstice) to update all Eclipse-based plugins. ([#1524](https://github.com/diffplug/spotless/pull/1524))
+  - Eclipse JDT now supports `4.9` through `4.26`. Also we now recommend dropping the last `.0`, e.g. `4.26` instead of `4.26.0`, you'll get warnings to help you switch.
+  - Eclipse Groovy now supports `4.18` through `4.26`. Also we now recommend dropping the last `.0`, e.g. `4.26` instead of `4.26.0`, you'll get warnings to help you switch.
+  - Eclipse CDT now supports `10.6` through `11.0`.
+  - Eclipse WTP is still WIP at [#1622](https://github.com/diffplug/spotless/pull/1622).
 
 ## [2.36.0] - 2023-02-27
+
 ### Added
-* `gradlew equoIde` opens a repeatable clean Spotless dev environment. ([#1523](https://github.com/diffplug/spotless/pull/1523))
-* `cleanthat` added `includeDraft` option, to include draft mutators from composite mutators. ([#1574](https://github.com/diffplug/spotless/pull/1574))
-* `npm`-based formatters now support caching of `node_modules` directory ([#1590](https://github.com/diffplug/spotless/pull/1590))
+
+- `gradlew equoIde` opens a repeatable clean Spotless dev environment. ([#1523](https://github.com/diffplug/spotless/pull/1523))
+- `cleanthat` added `includeDraft` option, to include draft mutators from composite mutators. ([#1574](https://github.com/diffplug/spotless/pull/1574))
+- `npm`-based formatters now support caching of `node_modules` directory ([#1590](https://github.com/diffplug/spotless/pull/1590))
+
 ### Fixed
-* `JacksonJsonFormatterFunc` handles json files with an Array as root. ([#1585](https://github.com/diffplug/spotless/pull/1585))
+
+- `JacksonJsonFormatterFunc` handles json files with an Array as root. ([#1585](https://github.com/diffplug/spotless/pull/1585))
+
 ### Changes
-* Bump default `cleanthat` version to latest `2.1` -> `2.6` ([#1569](https://github.com/diffplug/spotless/pull/1569) and [#1574](https://github.com/diffplug/spotless/pull/1574))
-* Reduce logging-noise created by `npm`-based formatters ([#1590](https://github.com/diffplug/spotless/pull/1590) fixes [#1582](https://github.com/diffplug/spotless/issues/1582))
+
+- Bump default `cleanthat` version to latest `2.1` -> `2.6` ([#1569](https://github.com/diffplug/spotless/pull/1569) and [#1574](https://github.com/diffplug/spotless/pull/1574))
+- Reduce logging-noise created by `npm`-based formatters ([#1590](https://github.com/diffplug/spotless/pull/1590) fixes [#1582](https://github.com/diffplug/spotless/issues/1582))
 
 ## [2.35.0] - 2023-02-10
+
 ### Added
-* CleanThat Java Refactorer. ([#1560](https://github.com/diffplug/spotless/pull/1560))
-* Introduce `LazyArgLogger` to allow for lazy evaluation of log messages in slf4j logging. ([#1565](https://github.com/diffplug/spotless/pull/1565))
+
+- CleanThat Java Refactorer. ([#1560](https://github.com/diffplug/spotless/pull/1560))
+- Introduce `LazyArgLogger` to allow for lazy evaluation of log messages in slf4j logging. ([#1565](https://github.com/diffplug/spotless/pull/1565))
+
 ### Fixed
-* Allow multiple instances of the same npm-based formatter to be used by separating their `node_modules` directories. ([#1565](https://github.com/diffplug/spotless/pull/1565))
-* `ktfmt` default style uses correct continuation indent. ([#1562](https://github.com/diffplug/spotless/pull/1562))
+
+- Allow multiple instances of the same npm-based formatter to be used by separating their `node_modules` directories. ([#1565](https://github.com/diffplug/spotless/pull/1565))
+- `ktfmt` default style uses correct continuation indent. ([#1562](https://github.com/diffplug/spotless/pull/1562))
+
 ### Changes
-* Bump default `ktfmt` version to latest `0.42` -> `0.43` ([#1561](https://github.com/diffplug/spotless/pull/1561))
-* Bump default `jackson` version to latest `2.14.1` -> `2.14.2` ([#1536](https://github.com/diffplug/spotless/pull/1536))
+
+- Bump default `ktfmt` version to latest `0.42` -> `0.43` ([#1561](https://github.com/diffplug/spotless/pull/1561))
+- Bump default `jackson` version to latest `2.14.1` -> `2.14.2` ([#1536](https://github.com/diffplug/spotless/pull/1536))
 
 ## [2.34.1] - 2023-02-05
+
 ### Changes
-* **POTENTIALLY BREAKING** Bump bytecode from Java 8 to 11 ([#1530](https://github.com/diffplug/spotless/pull/1530) part 2 of [#1337](https://github.com/diffplug/spotless/issues/1337))
+
+- **POTENTIALLY BREAKING** Bump bytecode from Java 8 to 11 ([#1530](https://github.com/diffplug/spotless/pull/1530) part 2 of [#1337](https://github.com/diffplug/spotless/issues/1337))
+
 ### Fixed
-* **POTENTIALLY BREAKING** `sortByKeys` for JSON formatting now takes into account objects inside arrays ([#1546](https://github.com/diffplug/spotless/pull/1546))
-* `freshmark` fixed on java 15+ ([#1304](https://github.com/diffplug/spotless/pull/1304) fixes [#803](https://github.com/diffplug/spotless/issues/803))
+
+- **POTENTIALLY BREAKING** `sortByKeys` for JSON formatting now takes into account objects inside arrays ([#1546](https://github.com/diffplug/spotless/pull/1546))
+- `freshmark` fixed on java 15+ ([#1304](https://github.com/diffplug/spotless/pull/1304) fixes [#803](https://github.com/diffplug/spotless/issues/803))
 
 ## [2.34.0] - 2023-01-26
+
 ### Added
-* `Formatter` now has a field `public static final File NO_FILE_SENTINEL` which can be used to pass string content to a Formatter or FormatterStep when there is no actual File to format. ([#1525](https://github.com/diffplug/spotless/pull/1525))
+
+- `Formatter` now has a field `public static final File NO_FILE_SENTINEL` which can be used to pass string content to a Formatter or FormatterStep when there is no actual File to format. ([#1525](https://github.com/diffplug/spotless/pull/1525))
 
 ## [2.33.0] - 2023-01-26
+
 ### Added
-* `ProcessRunner` has added some convenience methods so it can be used for Maven testing. ([#1496](https://github.com/diffplug/spotless/pull/1496))
-* `ProcessRunner` allows to limit captured output to a certain number of bytes. ([#1511](https://github.com/diffplug/spotless/pull/1511))
-* `ProcessRunner` is now capable of handling long-running tasks where waiting for exit is delegated to the caller. ([#1511](https://github.com/diffplug/spotless/pull/1511))
-* Allow to specify node executable for node-based formatters using `nodeExecutable` parameter ([#1500](https://github.com/diffplug/spotless/pull/1500))
+
+- `ProcessRunner` has added some convenience methods so it can be used for Maven testing. ([#1496](https://github.com/diffplug/spotless/pull/1496))
+- `ProcessRunner` allows to limit captured output to a certain number of bytes. ([#1511](https://github.com/diffplug/spotless/pull/1511))
+- `ProcessRunner` is now capable of handling long-running tasks where waiting for exit is delegated to the caller. ([#1511](https://github.com/diffplug/spotless/pull/1511))
+- Allow to specify node executable for node-based formatters using `nodeExecutable` parameter ([#1500](https://github.com/diffplug/spotless/pull/1500))
+
 ### Fixed
-* The default list of type annotations used by `formatAnnotations` has had 8 more annotations from the Checker Framework added [#1494](https://github.com/diffplug/spotless/pull/1494)
+
+- The default list of type annotations used by `formatAnnotations` has had 8 more annotations from the Checker Framework added [#1494](https://github.com/diffplug/spotless/pull/1494)
+
 ### Changes
-* **POTENTIALLY BREAKING** Bump minimum JRE from 8 to 11, next release likely to bump bytecode to Java 11 ([#1514](https://github.com/diffplug/spotless/pull/1514) part 1 of [#1337](https://github.com/diffplug/spotless/issues/1337))
-* Rename `YamlJacksonStep` into `JacksonYamlStep` while normalizing Jackson usage ([#1492](https://github.com/diffplug/spotless/pull/1492))
-* Convert `gson` integration to use a compile-only source set ([#1510](https://github.com/diffplug/spotless/pull/1510)).
-* ** POTENTIALLY BREAKING** Removed support for KtLint 0.3x and 0.45.2 ([#1475](https://github.com/diffplug/spotless/pull/1475))
-  * `KtLint` does not maintain a stable API - before this PR, we supported every breaking change in the API since 2019.
-  * From now on, we will support no more than 2 breaking changes at a time.
-* NpmFormatterStepStateBase delays `npm install` call until the formatter is first used. This enables better integration
+
+- **POTENTIALLY BREAKING** Bump minimum JRE from 8 to 11, next release likely to bump bytecode to Java 11 ([#1514](https://github.com/diffplug/spotless/pull/1514) part 1 of [#1337](https://github.com/diffplug/spotless/issues/1337))
+- Rename `YamlJacksonStep` into `JacksonYamlStep` while normalizing Jackson usage ([#1492](https://github.com/diffplug/spotless/pull/1492))
+- Convert `gson` integration to use a compile-only source set ([#1510](https://github.com/diffplug/spotless/pull/1510)).
+- ** POTENTIALLY BREAKING** Removed support for KtLint 0.3x and 0.45.2 ([#1475](https://github.com/diffplug/spotless/pull/1475))
+  - `KtLint` does not maintain a stable API - before this PR, we supported every breaking change in the API since 2019.
+  - From now on, we will support no more than 2 breaking changes at a time.
+- NpmFormatterStepStateBase delays `npm install` call until the formatter is first used. This enables better integration
   with `gradle-node-plugin`. ([#1522](https://github.com/diffplug/spotless/pull/1522))
-* Bump default `ktlint` version to latest `0.48.1` -> `0.48.2` ([#1529](https://github.com/diffplug/spotless/pull/1529))
-* Bump default `scalafmt` version to latest `3.6.1` -> `3.7.1` ([#1529](https://github.com/diffplug/spotless/pull/1529))
+- Bump default `ktlint` version to latest `0.48.1` -> `0.48.2` ([#1529](https://github.com/diffplug/spotless/pull/1529))
+- Bump default `scalafmt` version to latest `3.6.1` -> `3.7.1` ([#1529](https://github.com/diffplug/spotless/pull/1529))
 
 ## [2.32.0] - 2023-01-13
+
 ### Added
-* Add option `editorConfigFile` for `ktLint` [#142](https://github.com/diffplug/spotless/issues/142)
-  * **POTENTIALLY BREAKING** `ktlint` step now modifies license headers. Make sure to put `licenseHeader` *after* `ktlint`.
-* Added `skipLinesMatching` option to `licenseHeader` to support formats where license header cannot be immediately added to the top of the file (e.g. xml, sh). ([#1441](https://github.com/diffplug/spotless/pull/1441)).
-* Add YAML support through Jackson ([#1478](https://github.com/diffplug/spotless/pull/1478))
-* Added support for npm-based [ESLint](https://eslint.org/)-formatter for javascript and typescript ([#1453](https://github.com/diffplug/spotless/pull/1453))
-* Better suggested messages when user's default is set by JVM limitation. ([#995](https://github.com/diffplug/spotless/pull/995))
+
+- Add option `editorConfigFile` for `ktLint` [#142](https://github.com/diffplug/spotless/issues/142)
+  - **POTENTIALLY BREAKING** `ktlint` step now modifies license headers. Make sure to put `licenseHeader` _after_ `ktlint`.
+- Added `skipLinesMatching` option to `licenseHeader` to support formats where license header cannot be immediately added to the top of the file (e.g. xml, sh). ([#1441](https://github.com/diffplug/spotless/pull/1441)).
+- Add YAML support through Jackson ([#1478](https://github.com/diffplug/spotless/pull/1478))
+- Added support for npm-based [ESLint](https://eslint.org/)-formatter for javascript and typescript ([#1453](https://github.com/diffplug/spotless/pull/1453))
+- Better suggested messages when user's default is set by JVM limitation. ([#995](https://github.com/diffplug/spotless/pull/995))
+
 ### Fixed
-* Support `ktlint` 0.48+ new rule disabling syntax ([#1456](https://github.com/diffplug/spotless/pull/1456)) fixes ([#1444](https://github.com/diffplug/spotless/issues/1444))
-* Fix subgroups leading catch all matcher.
+
+- Support `ktlint` 0.48+ new rule disabling syntax ([#1456](https://github.com/diffplug/spotless/pull/1456)) fixes ([#1444](https://github.com/diffplug/spotless/issues/1444))
+- Fix subgroups leading catch all matcher.
+
 ### Changes
-* Bump default version for `prettier` from `2.0.5` to `2.8.1` ([#1453](https://github.com/diffplug/spotless/pull/1453))
-* Bump the dev version of Gradle from `7.5.1` to `7.6` ([#1409](https://github.com/diffplug/spotless/pull/1409))
-  * We also removed the no-longer-required dependency `org.codehaus.groovy:groovy-xml`
-* Breaking changes to Spotless' internal testing infrastructure `testlib` ([#1443](https://github.com/diffplug/spotless/pull/1443))
-  * `ResourceHarness` no longer has any duplicated functionality which was also present in `StepHarness`
-  * `StepHarness` now operates on `Formatter` rather than a `FormatterStep`
-  * `StepHarnessWithFile` now takes a `ResourceHarness` in its constructor to handle the file manipulation parts
-  * Standardized that we test exception *messages*, not types, which will ease the transition to linting later on
-  * Bump default `ktlint` version to latest `0.47.1` -> `0.48.1` ([#1456](https://github.com/diffplug/spotless/pull/1456))
-* Switch our publishing infrastructure from CircleCI to GitHub Actions ([#1462](https://github.com/diffplug/spotless/pull/1462)).
-  * Help wanted for moving our tests too ([#1472](https://github.com/diffplug/spotless/issues/1472))
+
+- Bump default version for `prettier` from `2.0.5` to `2.8.1` ([#1453](https://github.com/diffplug/spotless/pull/1453))
+- Bump the dev version of Gradle from `7.5.1` to `7.6` ([#1409](https://github.com/diffplug/spotless/pull/1409))
+  - We also removed the no-longer-required dependency `org.codehaus.groovy:groovy-xml`
+- Breaking changes to Spotless' internal testing infrastructure `testlib` ([#1443](https://github.com/diffplug/spotless/pull/1443))
+  - `ResourceHarness` no longer has any duplicated functionality which was also present in `StepHarness`
+  - `StepHarness` now operates on `Formatter` rather than a `FormatterStep`
+  - `StepHarnessWithFile` now takes a `ResourceHarness` in its constructor to handle the file manipulation parts
+  - Standardized that we test exception _messages_, not types, which will ease the transition to linting later on
+  - Bump default `ktlint` version to latest `0.47.1` -> `0.48.1` ([#1456](https://github.com/diffplug/spotless/pull/1456))
+- Switch our publishing infrastructure from CircleCI to GitHub Actions ([#1462](https://github.com/diffplug/spotless/pull/1462)).
+  - Help wanted for moving our tests too ([#1472](https://github.com/diffplug/spotless/issues/1472))
 
 ## [2.31.1] - 2023-01-02
+
 ### Fixed
-* Improve memory usage when using git ratchet ([#1426](https://github.com/diffplug/spotless/pull/1426))
-* Support `ktlint` 0.48+ ([#1432](https://github.com/diffplug/spotless/pull/1432)) fixes ([#1430](https://github.com/diffplug/spotless/issues/1430))
+
+- Improve memory usage when using git ratchet ([#1426](https://github.com/diffplug/spotless/pull/1426))
+- Support `ktlint` 0.48+ ([#1432](https://github.com/diffplug/spotless/pull/1432)) fixes ([#1430](https://github.com/diffplug/spotless/issues/1430))
+
 ### Changes
-* Bump default `ktlint` version to latest `0.47.1` -> `0.48.0` ([#1432](https://github.com/diffplug/spotless/pull/1432))
-* Bump default `ktfmt` version to latest `0.41` -> `0.42` ([#1421](https://github.com/diffplug/spotless/pull/1421))
+
+- Bump default `ktlint` version to latest `0.47.1` -> `0.48.0` ([#1432](https://github.com/diffplug/spotless/pull/1432))
+- Bump default `ktfmt` version to latest `0.41` -> `0.42` ([#1421](https://github.com/diffplug/spotless/pull/1421))
 
 ## [2.31.0] - 2022-11-24
+
 ### Added
-* `importOrder` now support groups of imports without blank lines ([#1401](https://github.com/diffplug/spotless/pull/1401))
+
+- `importOrder` now support groups of imports without blank lines ([#1401](https://github.com/diffplug/spotless/pull/1401))
+
 ### Fixed
-* Don't treat `@Value` as a type annotation [#1367](https://github.com/diffplug/spotless/pull/1367)
-* Support `ktlint_disabled_rules` in `ktlint` 0.47.x [#1378](https://github.com/diffplug/spotless/pull/1378)
-* Share git repositories across projects when using ratchet ([#1426](https://github.com/diffplug/spotless/pull/1426))
+
+- Don't treat `@Value` as a type annotation [#1367](https://github.com/diffplug/spotless/pull/1367)
+- Support `ktlint_disabled_rules` in `ktlint` 0.47.x [#1378](https://github.com/diffplug/spotless/pull/1378)
+- Share git repositories across projects when using ratchet ([#1426](https://github.com/diffplug/spotless/pull/1426))
+
 ### Changes
-* Bump default `ktfmt` version to latest `0.40` -> `0.41` ([#1340](https://github.com/diffplug/spotless/pull/1340))
-* Bump default `scalafmt` version to latest `3.5.9` -> `3.6.1` ([#1373](https://github.com/diffplug/spotless/pull/1373))
-* Bump default `diktat` version to latest `1.2.3` -> `1.2.4.2` ([#1393](https://github.com/diffplug/spotless/pull/1393))
-* Bump default `palantir-java-format` version to latest `2.10` -> `2.28` ([#1393](https://github.com/diffplug/spotless/pull/1393))
+
+- Bump default `ktfmt` version to latest `0.40` -> `0.41` ([#1340](https://github.com/diffplug/spotless/pull/1340))
+- Bump default `scalafmt` version to latest `3.5.9` -> `3.6.1` ([#1373](https://github.com/diffplug/spotless/pull/1373))
+- Bump default `diktat` version to latest `1.2.3` -> `1.2.4.2` ([#1393](https://github.com/diffplug/spotless/pull/1393))
+- Bump default `palantir-java-format` version to latest `2.10` -> `2.28` ([#1393](https://github.com/diffplug/spotless/pull/1393))
 
 ## [2.30.0] - 2022-09-14
+
 ### Added
-* `formatAnnotations()` step to correct formatting of Java type annotations.  It puts type annotations on the same line as the type that they qualify.  Run it after a Java formatting step, such as `googleJavaFormat()`. ([#1275](https://github.com/diffplug/spotless/pull/1275))
+
+- `formatAnnotations()` step to correct formatting of Java type annotations. It puts type annotations on the same line as the type that they qualify. Run it after a Java formatting step, such as `googleJavaFormat()`. ([#1275](https://github.com/diffplug/spotless/pull/1275))
+
 ### Changes
-* Bump default `ktfmt` version to latest `0.39` -> `0.40` ([#1312](https://github.com/diffplug/spotless/pull/1312))
-* Bump default `ktlint` version to latest `0.46.1` -> `0.47.1` ([#1303](https://github.com/diffplug/spotless/pull/1303))
-  * Also restored support for older versions of ktlint back to `0.31.0`
+
+- Bump default `ktfmt` version to latest `0.39` -> `0.40` ([#1312](https://github.com/diffplug/spotless/pull/1312))
+- Bump default `ktlint` version to latest `0.46.1` -> `0.47.1` ([#1303](https://github.com/diffplug/spotless/pull/1303))
+  - Also restored support for older versions of ktlint back to `0.31.0`
 
 ## [2.29.0] - 2022-08-23
+
 ### Added
-* `scalafmt` integration now has a configuration option `majorScalaVersion` that allows you to configure the Scala version that gets resolved from the Maven artifact ([#1283](https://github.com/diffplug/spotless/pull/1283))
-  * Converted `scalafmt` integration to use a compile-only source set (fixes [#524](https://github.com/diffplug/spotless/issues/524))
+
+- `scalafmt` integration now has a configuration option `majorScalaVersion` that allows you to configure the Scala version that gets resolved from the Maven artifact ([#1283](https://github.com/diffplug/spotless/pull/1283))
+  - Converted `scalafmt` integration to use a compile-only source set (fixes [#524](https://github.com/diffplug/spotless/issues/524))
+
 ### Changes
-* Add the `ktlint` rule in error messages when `ktlint` fails to apply a fix ([#1279](https://github.com/diffplug/spotless/pull/1279))
-* Bump default `scalafmt` to latest `3.0.8` -> `3.5.9` (removed support for pre-`3.0.0`) ([#1283](https://github.com/diffplug/spotless/pull/1283))
+
+- Add the `ktlint` rule in error messages when `ktlint` fails to apply a fix ([#1279](https://github.com/diffplug/spotless/pull/1279))
+- Bump default `scalafmt` to latest `3.0.8` -> `3.5.9` (removed support for pre-`3.0.0`) ([#1283](https://github.com/diffplug/spotless/pull/1283))
 
 ## [2.28.1] - 2022-08-10
+
 ### Fixed
-* Fix Clang not knowing the filename and changing the format ([#1268](https://github.com/diffplug/spotless/pull/1268) fixes [#1267](https://github.com/diffplug/spotless/issues/1267)).
+
+- Fix Clang not knowing the filename and changing the format ([#1268](https://github.com/diffplug/spotless/pull/1268) fixes [#1267](https://github.com/diffplug/spotless/issues/1267)).
+
 ### Changes
-* Bump default `diktat` version to latest `1.2.1` -> `1.2.3` ([#1266](https://github.com/diffplug/spotless/pull/1266))
+
+- Bump default `diktat` version to latest `1.2.1` -> `1.2.3` ([#1266](https://github.com/diffplug/spotless/pull/1266))
 
 ## [2.28.0] - 2022-07-28
+
 ### Added
-* Clang and Black no longer break the build when the binary is unavailable, if they will not be run during that build ([#1257](https://github.com/diffplug/spotless/pull/1257)).
-* License header support for Kotlin files without `package` or `@file` but do at least have `import` ([#1263](https://github.com/diffplug/spotless/pull/1263)).
+
+- Clang and Black no longer break the build when the binary is unavailable, if they will not be run during that build ([#1257](https://github.com/diffplug/spotless/pull/1257)).
+- License header support for Kotlin files without `package` or `@file` but do at least have `import` ([#1263](https://github.com/diffplug/spotless/pull/1263)).
 
 ## [2.27.0] - 2022-06-30
+
 ### Added
-* Support for `MAC_CLASSIC` (`\r`) line ending ([#1243](https://github.com/diffplug/spotless/pull/1243) fixes [#1196](https://github.com/diffplug/spotless/issues/1196))
+
+- Support for `MAC_CLASSIC` (`\r`) line ending ([#1243](https://github.com/diffplug/spotless/pull/1243) fixes [#1196](https://github.com/diffplug/spotless/issues/1196))
+
 ### Changes
-* Bump default `ktlint` version to latest `0.45.2` -> `0.46.1` ([#1239](https://github.com/diffplug/spotless/issues/1239))
-  * Minimum supported version also bumped to `0.46.0` (we have abandoned strong backward compatibility for `ktlint`, from here on out Spotless will only support the most-recent breaking change).
-* Bump default `diktat` version to latest `1.1.0` -> `1.2.1` ([#1246](https://github.com/diffplug/spotless/pull/1246))
-  * Minimum supported version also bumped to `1.2.1` (diktat is based on ktlint and has the same backward compatibility issues).
-* Bump default `ktfmt` version to latest `0.37` -> `0.39` ([#1240](https://github.com/diffplug/spotless/pull/1240))
+
+- Bump default `ktlint` version to latest `0.45.2` -> `0.46.1` ([#1239](https://github.com/diffplug/spotless/issues/1239))
+  - Minimum supported version also bumped to `0.46.0` (we have abandoned strong backward compatibility for `ktlint`, from here on out Spotless will only support the most-recent breaking change).
+- Bump default `diktat` version to latest `1.1.0` -> `1.2.1` ([#1246](https://github.com/diffplug/spotless/pull/1246))
+  - Minimum supported version also bumped to `1.2.1` (diktat is based on ktlint and has the same backward compatibility issues).
+- Bump default `ktfmt` version to latest `0.37` -> `0.39` ([#1240](https://github.com/diffplug/spotless/pull/1240))
 
 ## [2.26.2] - 2022-06-11
+
 ### Fixed
-* `PalantirJavaFormatStep` no longer needs the `--add-exports` calls in the `org.gradle.jvmargs` property in `gradle.properties`. ([#1233](https://github.com/diffplug/spotless/pull/1233))
+
+- `PalantirJavaFormatStep` no longer needs the `--add-exports` calls in the `org.gradle.jvmargs` property in `gradle.properties`. ([#1233](https://github.com/diffplug/spotless/pull/1233))
 
 ## [2.26.1] - 2022-06-10
+
 ### Fixed
-* (Second try) `googleJavaFormat` and `removeUnusedImports` works on JDK16+ without jvm args workaround. ([#1228](https://github.com/diffplug/spotless/pull/1228))
+
+- (Second try) `googleJavaFormat` and `removeUnusedImports` works on JDK16+ without jvm args workaround. ([#1228](https://github.com/diffplug/spotless/pull/1228))
 
 ## [2.26.0] - 2022-06-05
+
 ### Added
-* Support for `editorConfigOverride` in `ktlint`. ([#1218](https://github.com/diffplug/spotless/pull/1218) fixes [#1193](https://github.com/diffplug/spotless/issues/1193))
+
+- Support for `editorConfigOverride` in `ktlint`. ([#1218](https://github.com/diffplug/spotless/pull/1218) fixes [#1193](https://github.com/diffplug/spotless/issues/1193))
+
 ### Fixed
-* `google-java-format` and `RemoveUnusedImportsStep` works on JDK16+ without jvm args workaround. ([#1224](https://github.com/diffplug/spotless/pull/1224) fixes [#834](https://github.com/diffplug/spotless/issues/834))
+
+- `google-java-format` and `RemoveUnusedImportsStep` works on JDK16+ without jvm args workaround. ([#1224](https://github.com/diffplug/spotless/pull/1224) fixes [#834](https://github.com/diffplug/spotless/issues/834))
 
 ## [2.25.3] - 2022-05-10
+
 ### Fixed
-* Update the `black` version regex to fix `19.10b0` and earlier. (fixes [#1195](https://github.com/diffplug/spotless/issues/1195), regression introduced in `2.25.0`)
-* `GitAttributesLineEndings$RelocatablePolicy` and `FormatterStepImpl` now null-out their initialization lambdas after their state has been calculated, which allows GC to collect variables which were incidentally captured but not needed in the calculated state. ([#1198](https://github.com/diffplug/spotless/pull/1198))
+
+- Update the `black` version regex to fix `19.10b0` and earlier. (fixes [#1195](https://github.com/diffplug/spotless/issues/1195), regression introduced in `2.25.0`)
+- `GitAttributesLineEndings$RelocatablePolicy` and `FormatterStepImpl` now null-out their initialization lambdas after their state has been calculated, which allows GC to collect variables which were incidentally captured but not needed in the calculated state. ([#1198](https://github.com/diffplug/spotless/pull/1198))
+
 ### Changes
-* Bump default `ktfmt` version to latest `0.36` -> `0.37`. ([#1200](https://github.com/diffplug/spotless/pull/1200))
+
+- Bump default `ktfmt` version to latest `0.36` -> `0.37`. ([#1200](https://github.com/diffplug/spotless/pull/1200))
 
 ## [2.25.2] - 2022-05-03
+
 ### Changes
-* Bump default `diktat` version to latest `1.0.1` -> `1.1.0`. ([#1190](https://github.com/diffplug/spotless/pull/1190))
-  * Converted `diktat` integration to use a compile-only source set. (fixes [#524](https://github.com/diffplug/spotless/issues/524))
-  * Use the full path to a file in `diktat` integration. (fixes [#1189](https://github.com/diffplug/spotless/issues/1189))
+
+- Bump default `diktat` version to latest `1.0.1` -> `1.1.0`. ([#1190](https://github.com/diffplug/spotless/pull/1190))
+  - Converted `diktat` integration to use a compile-only source set. (fixes [#524](https://github.com/diffplug/spotless/issues/524))
+  - Use the full path to a file in `diktat` integration. (fixes [#1189](https://github.com/diffplug/spotless/issues/1189))
 
 ## [2.25.1] - 2022-04-27
+
 ### Changes
-* Bump default `ktfmt` version to latest `0.35` -> `0.36`. ([#1183](https://github.com/diffplug/spotless/issues/1183))
-* Bump default `google-java-format` version to latest `1.13.0` -> `1.15.0`.
-  * ~~This means it is no longer necessary to use the `--add-exports` workaround (fixes [#834](https://github.com/diffplug/spotless/issues/834)).~~ `--add-exports` workaround is still needed.
+
+- Bump default `ktfmt` version to latest `0.35` -> `0.36`. ([#1183](https://github.com/diffplug/spotless/issues/1183))
+- Bump default `google-java-format` version to latest `1.13.0` -> `1.15.0`.
+  - ~~This means it is no longer necessary to use the `--add-exports` workaround (fixes [#834](https://github.com/diffplug/spotless/issues/834)).~~ `--add-exports` workaround is still needed.
 
 ## [2.25.0] - 2022-04-22
+
 ### Added
-* Added support for enabling ktlint experimental ruleset. ([#1145](https://github.com/diffplug/spotless/pull/1168))
+
+- Added support for enabling ktlint experimental ruleset. ([#1145](https://github.com/diffplug/spotless/pull/1168))
+
 ### Fixed
-* Fixed support for Python Black's new version reporting. ([#1170](https://github.com/diffplug/spotless/issues/1170))
-* Error messages for unexpected file encoding now works on Java 8. (fixes [#1081](https://github.com/diffplug/spotless/issues/1081))
+
+- Fixed support for Python Black's new version reporting. ([#1170](https://github.com/diffplug/spotless/issues/1170))
+- Error messages for unexpected file encoding now works on Java 8. (fixes [#1081](https://github.com/diffplug/spotless/issues/1081))
+
 ### Changes
-* Bump default `black` version to latest `19.10b0` -> `22.3.0`. ([#1170](https://github.com/diffplug/spotless/issues/1170))
-* Bump default `ktfmt` version to latest `0.34` -> `0.35`. ([#1159](https://github.com/diffplug/spotless/pull/1159))
-* Bump default `ktlint` version to latest `0.43.2` -> `0.45.2`. ([#1177](https://github.com/diffplug/spotless/pull/1177))
+
+- Bump default `black` version to latest `19.10b0` -> `22.3.0`. ([#1170](https://github.com/diffplug/spotless/issues/1170))
+- Bump default `ktfmt` version to latest `0.34` -> `0.35`. ([#1159](https://github.com/diffplug/spotless/pull/1159))
+- Bump default `ktlint` version to latest `0.43.2` -> `0.45.2`. ([#1177](https://github.com/diffplug/spotless/pull/1177))
 
 ## [2.24.2] - 2022-04-06
+
 ### Fixed
-* Git user config and system config also included for defaultEndings configuration. ([#540](https://github.com/diffplug/spotless/issues/540))
+
+- Git user config and system config also included for defaultEndings configuration. ([#540](https://github.com/diffplug/spotless/issues/540))
 
 ## [2.24.1] - 2022-03-30
+
 ### Fixed
-* Fixed access modifiers for setters in KtfmtStep configuration
+
+- Fixed access modifiers for setters in KtfmtStep configuration
 
 ## [2.24.0] - 2022-03-28
+
 ### Added
-* Added support for setting custom parameters for Kotlin ktfmt in Gradle and Maven plugins. ([#1145](https://github.com/diffplug/spotless/pull/1145))
+
+- Added support for setting custom parameters for Kotlin ktfmt in Gradle and Maven plugins. ([#1145](https://github.com/diffplug/spotless/pull/1145))
 
 ## [2.23.0] - 2022-02-15
+
 ### Added
-* Added support for JSON formatting based on [Gson](https://github.com/google/gson) ([#1125](https://github.com/diffplug/spotless/pull/1125)).
+
+- Added support for JSON formatting based on [Gson](https://github.com/google/gson) ([#1125](https://github.com/diffplug/spotless/pull/1125)).
+
 ### Changed
-* Use SLF4J for logging ([#1116](https://github.com/diffplug/spotless/issues/1116))
+
+- Use SLF4J for logging ([#1116](https://github.com/diffplug/spotless/issues/1116))
 
 ## [2.22.2] - 2022-02-09
+
 ### Changed
-* Bump default ktfmt `0.30` -> `0.31` ([#1118](https://github.com/diffplug/spotless/pull/1118)).
+
+- Bump default ktfmt `0.30` -> `0.31` ([#1118](https://github.com/diffplug/spotless/pull/1118)).
+
 ### Fixed
-* Add full support for git worktrees ([#1119](https://github.com/diffplug/spotless/pull/1119)).
+
+- Add full support for git worktrees ([#1119](https://github.com/diffplug/spotless/pull/1119)).
 
 ## [2.22.1] - 2022-02-01
+
 ### Changed
-* Bump CI from Java 15 to 17 ([#1094](https://github.com/diffplug/spotless/pull/1094)).
-* Bump default versions of formatters ([#1095](https://github.com/diffplug/spotless/pull/1095)).
-  * google-java-format `1.12.0` -> `1.13.0`
-  * ktfmt `0.29` -> `0.30`
-* Added support for git property `core.autocrlf` ([#540](https://github.com/diffplug/spotless/issues/540))
+
+- Bump CI from Java 15 to 17 ([#1094](https://github.com/diffplug/spotless/pull/1094)).
+- Bump default versions of formatters ([#1095](https://github.com/diffplug/spotless/pull/1095)).
+  - google-java-format `1.12.0` -> `1.13.0`
+  - ktfmt `0.29` -> `0.30`
+- Added support for git property `core.autocrlf` ([#540](https://github.com/diffplug/spotless/issues/540))
 
 ## [2.22.0] - 2022-01-13
+
 ### Added
-* Added support for the [palantir-java-format](https://github.com/palantir/palantir-java-format) Java formatter ([#1083](https://github.com/diffplug/spotless/pull/1083)).
+
+- Added support for the [palantir-java-format](https://github.com/palantir/palantir-java-format) Java formatter ([#1083](https://github.com/diffplug/spotless/pull/1083)).
 
 ## [2.21.2] - 2022-01-07
+
 ### Fixed
-* Update IndentStep to allow leading space on multiline comments ([#1072](https://github.com/diffplug/spotless/pull/1072)).
+
+- Update IndentStep to allow leading space on multiline comments ([#1072](https://github.com/diffplug/spotless/pull/1072)).
 
 ## [2.21.1] - 2022-01-06
+
 ### Changed
-* Bumped default DiKTat from `0.4.0` to `1.0.1`. This is a breaking change for DiKTat users on the default version, because some rules were renamed/changed. Check [DiKTat changelog](https://github.com/analysis-dev/diktat/releases) for details.
+
+- Bumped default DiKTat from `0.4.0` to `1.0.1`. This is a breaking change for DiKTat users on the default version, because some rules were renamed/changed. Check [DiKTat changelog](https://github.com/analysis-dev/diktat/releases) for details.
 
 ## [2.21.0] - 2021-12-23
+
 ### Added
-* Added support for Markdown with `flexmark` at `0.62.2` ([#1011](https://github.com/diffplug/spotless/pull/1011)).
+
+- Added support for Markdown with `flexmark` at `0.62.2` ([#1011](https://github.com/diffplug/spotless/pull/1011)).
 
 ## [2.20.3] - 2021-12-15
+
 ### Fixed
-* Performance improvements to GitRatchet ([#1038](https://github.com/diffplug/spotless/pull/1038)).
+
+- Performance improvements to GitRatchet ([#1038](https://github.com/diffplug/spotless/pull/1038)).
 
 ## [2.20.2] - 2021-12-05
+
 ### Changed
-* Bumped default ktlint from `0.43.0` to `0.43.2`.
-* Converted `ktlint` integration to use a compile-only source set. ([#524](https://github.com/diffplug/spotless/issues/524))
+
+- Bumped default ktlint from `0.43.0` to `0.43.2`.
+- Converted `ktlint` integration to use a compile-only source set. ([#524](https://github.com/diffplug/spotless/issues/524))
 
 ## [2.20.1] - 2021-12-01
+
 ### Changed
-* Added `named` option to `licenseHeader` to support alternate license header within same format (like java) ([872](https://github.com/diffplug/spotless/issues/872)).
-* Added `onlyIfContentMatches` option to `licenseHeader` to skip license header application  based on source file content pattern ([#650](https://github.com/diffplug/spotless/issues/650)).
-* Bump jgit version ([#992](https://github.com/diffplug/spotless/pull/992)).
-  * jgit `5.10.0.202012080955-r` -> `5.13.0.202109080827-r`
+
+- Added `named` option to `licenseHeader` to support alternate license header within same format (like java) ([872](https://github.com/diffplug/spotless/issues/872)).
+- Added `onlyIfContentMatches` option to `licenseHeader` to skip license header application based on source file content pattern ([#650](https://github.com/diffplug/spotless/issues/650)).
+- Bump jgit version ([#992](https://github.com/diffplug/spotless/pull/992)).
+  - jgit `5.10.0.202012080955-r` -> `5.13.0.202109080827-r`
 
 ## [2.20.0] - 2021-11-09
+
 ### Added
-* `DiffMessageFormatter` can now generate messages based on a folder of cleaned files, as an alternative to a `Formatter` ([#982](https://github.com/diffplug/spotless/pull/982)).
+
+- `DiffMessageFormatter` can now generate messages based on a folder of cleaned files, as an alternative to a `Formatter` ([#982](https://github.com/diffplug/spotless/pull/982)).
+
 ### Fixed
-* Fix CI and various spotbugs nits ([#988](https://github.com/diffplug/spotless/pull/988)).
+
+- Fix CI and various spotbugs nits ([#988](https://github.com/diffplug/spotless/pull/988)).
+
 ### Changed
-* Bump default formatter versions ([#989](https://github.com/diffplug/spotless/pull/989))
-  * google-java-format `1.11.0` -> `1.12.0`
-  * ktlint `0.42.1` -> `0.43.0`
-  * ktfmt `0.27` -> `0.29`
-  * scalafmt `3.0.0` -> `3.0.8`
+
+- Bump default formatter versions ([#989](https://github.com/diffplug/spotless/pull/989))
+  - google-java-format `1.11.0` -> `1.12.0`
+  - ktlint `0.42.1` -> `0.43.0`
+  - ktfmt `0.27` -> `0.29`
+  - scalafmt `3.0.0` -> `3.0.8`
 
 ## [2.19.2] - 2021-10-26
+
 ### Changed
-* Added support and bump Eclipse formatter default versions to `4.21` for `eclipse-groovy`. Change is only applied for JVM 11+.
-* Added support for ktlint's FilenameRule ([#974](https://github.com/diffplug/spotless/pull/974)).
+
+- Added support and bump Eclipse formatter default versions to `4.21` for `eclipse-groovy`. Change is only applied for JVM 11+.
+- Added support for ktlint's FilenameRule ([#974](https://github.com/diffplug/spotless/pull/974)).
 
 ### Fixed
- * Temporary workspace deletion for Eclipse based formatters on JVM shutdown ([#967](https://github.com/diffplug/spotless/issues/967)). Change is only applied for Eclipse versions using JVM 11+, no back-port to older versions is planned.
+
+- Temporary workspace deletion for Eclipse based formatters on JVM shutdown ([#967](https://github.com/diffplug/spotless/issues/967)). Change is only applied for Eclipse versions using JVM 11+, no back-port to older versions is planned.
 
 ## [2.19.1] - 2021-10-13
+
 ### Fixed
- * [module-info formatting](https://github.com/diffplug/spotless/pull/958) in `eclipse-jdt` versions `4.20` and `4.21`. Note that the problem also affects older versions.
- * Added workaround to support projects using git worktrees ([#965](https://github.com/diffplug/spotless/pull/965))
+
+- [module-info formatting](https://github.com/diffplug/spotless/pull/958) in `eclipse-jdt` versions `4.20` and `4.21`. Note that the problem also affects older versions.
+- Added workaround to support projects using git worktrees ([#965](https://github.com/diffplug/spotless/pull/965))
 
 ## [2.19.0] - 2021-10-02
-* Added `wildcardsLast` option for Java `ImportOrderStep` ([#954](https://github.com/diffplug/spotless/pull/954))
+
+- Added `wildcardsLast` option for Java `ImportOrderStep` ([#954](https://github.com/diffplug/spotless/pull/954))
 
 ### Added
-* Added support for JBDI bind list params in sql formatter ([#955](https://github.com/diffplug/spotless/pull/955))
+
+- Added support for JBDI bind list params in sql formatter ([#955](https://github.com/diffplug/spotless/pull/955))
 
 ## [2.18.0] - 2021-09-30
+
 ### Added
-* Added support for custom JSR223 formatters ([#945](https://github.com/diffplug/spotless/pull/945))
-* Added support for formatting and sorting Maven POMs ([#946](https://github.com/diffplug/spotless/pull/946))
+
+- Added support for custom JSR223 formatters ([#945](https://github.com/diffplug/spotless/pull/945))
+- Added support for formatting and sorting Maven POMs ([#946](https://github.com/diffplug/spotless/pull/946))
 
 ## [2.17.0] - 2021-09-27
+
 ### Added
-* Added support for calling local binary formatters ([#949](https://github.com/diffplug/spotless/pull/949))
+
+- Added support for calling local binary formatters ([#949](https://github.com/diffplug/spotless/pull/949))
+
 ### Changed
-* Added support and bump Eclipse formatter default versions to `4.21` for `eclipse-cdt`, `eclipse-jdt`, `eclipse-wtp`. Change is only applied for JVM 11+.
-* Added `groupArtifact` option for `google-java-format` ([#944](https://github.com/diffplug/spotless/pull/944))
+
+- Added support and bump Eclipse formatter default versions to `4.21` for `eclipse-cdt`, `eclipse-jdt`, `eclipse-wtp`. Change is only applied for JVM 11+.
+- Added `groupArtifact` option for `google-java-format` ([#944](https://github.com/diffplug/spotless/pull/944))
 
 ## [2.16.1] - 2021-09-20
+
 ### Changed
-* Added support and bump Eclipse formatter default versions for JVM 11+. For older JVMs the previous defaults remain.
-  * `eclipse-cdt` from `4.16` to `4.20`
-  * `eclipse-groovy` from `4.19` to `4.20`
-  * `eclipse-jdt` from `4.19` to `4.20`
-  * `eclipse-wtp` from `4.18` to `4.20`
+
+- Added support and bump Eclipse formatter default versions for JVM 11+. For older JVMs the previous defaults remain.
+  - `eclipse-cdt` from `4.16` to `4.20`
+  - `eclipse-groovy` from `4.19` to `4.20`
+  - `eclipse-jdt` from `4.19` to `4.20`
+  - `eclipse-wtp` from `4.18` to `4.20`
 
 ## [2.16.0] - 2021-09-04
+
 ### Added
-* Added support for `google-java-format`'s `skip-reflowing-long-strings` option ([#929](https://github.com/diffplug/spotless/pull/929))
+
+- Added support for `google-java-format`'s `skip-reflowing-long-strings` option ([#929](https://github.com/diffplug/spotless/pull/929))
 
 ## [2.15.3] - 2021-08-20
+
 ### Changed
-* Added support for [scalafmt 3.0.0](https://github.com/scalameta/scalafmt/releases/tag/v3.0.0) and bump default scalafmt version to `3.0.0` ([#913](https://github.com/diffplug/spotless/pull/913)).
-* Bump default versions ([#915](https://github.com/diffplug/spotless/pull/915))
-  * `ktfmt` from `0.24` to `0.27`
-  * `ktlint` from `0.35.0` to `0.42.1`
-  * `google-java-format` from `1.10.0` to `1.11.0`
-* Fix javadoc publishing ([#916](https://github.com/diffplug/spotless/pull/916) fixes [#775](https://github.com/diffplug/spotless/issues/775)).
+
+- Added support for [scalafmt 3.0.0](https://github.com/scalameta/scalafmt/releases/tag/v3.0.0) and bump default scalafmt version to `3.0.0` ([#913](https://github.com/diffplug/spotless/pull/913)).
+- Bump default versions ([#915](https://github.com/diffplug/spotless/pull/915))
+  - `ktfmt` from `0.24` to `0.27`
+  - `ktlint` from `0.35.0` to `0.42.1`
+  - `google-java-format` from `1.10.0` to `1.11.0`
+- Fix javadoc publishing ([#916](https://github.com/diffplug/spotless/pull/916) fixes [#775](https://github.com/diffplug/spotless/issues/775)).
 
 ## [2.15.2] - 2021-07-20
+
 ### Fixed
- * Improved [SQL formatting](https://github.com/diffplug/spotless/pull/897) with respect to comments
+
+- Improved [SQL formatting](https://github.com/diffplug/spotless/pull/897) with respect to comments
 
 ## [2.15.1] - 2021-07-06
+
 ### Changed
-* Improved exception messages for [JSON formatting](https://github.com/diffplug/spotless/pull/885) failures
+
+- Improved exception messages for [JSON formatting](https://github.com/diffplug/spotless/pull/885) failures
 
 ## [2.15.0] - 2021-06-17
 
 ### Added
-* Added formatter for [JVM-based JSON formatting](https://github.com/diffplug/spotless/issues/850)
-* Added Gradle configuration JVM-based JSON formatting
+
+- Added formatter for [JVM-based JSON formatting](https://github.com/diffplug/spotless/issues/850)
+- Added Gradle configuration JVM-based JSON formatting
 
 ## [2.14.0] - 2021-06-10
+
 ### Added
-* Added support for `eclipse-cdt` at `4.19.0`. Note that version requires Java 11 or higher.
-* Added support for `eclipse-groovy` at `4.18.0` and `4.19.0`.
-* Added support for `eclipse-wtp` at `4.19.0`. Note that version requires Java 11 or higher.
+
+- Added support for `eclipse-cdt` at `4.19.0`. Note that version requires Java 11 or higher.
+- Added support for `eclipse-groovy` at `4.18.0` and `4.19.0`.
+- Added support for `eclipse-wtp` at `4.19.0`. Note that version requires Java 11 or higher.
+
 ### Changed
-* Bump `eclipse-groovy` default version from `4.17.0` to `4.19.0`.
+
+- Bump `eclipse-groovy` default version from `4.17.0` to `4.19.0`.
 
 ## [2.13.5] - 2021-05-13
+
 ### Changed
-* Update ktfmt from 0.21 to 0.24
+
+- Update ktfmt from 0.21 to 0.24
+
 ### Fixed
-* The `<url>` field in the Maven POM is now set correctly ([#798](https://github.com/diffplug/spotless/issues/798))
-* Node is re-installed if some other build step removed it ([#863](https://github.com/diffplug/spotless/issues/863))
+
+- The `<url>` field in the Maven POM is now set correctly ([#798](https://github.com/diffplug/spotless/issues/798))
+- Node is re-installed if some other build step removed it ([#863](https://github.com/diffplug/spotless/issues/863))
 
 ## [2.13.4] - 2021-04-21
+
 ### Fixed
-* Explicitly separate target file from git arguments when parsing year for license header to prevent command from failing on argument-like paths ([#847](https://github.com/diffplug/spotless/pull/847))
+
+- Explicitly separate target file from git arguments when parsing year for license header to prevent command from failing on argument-like paths ([#847](https://github.com/diffplug/spotless/pull/847))
 
 ## [2.13.3] - 2021-04-20
+
 ### Fixed
-* LicenseHeaderStep treats address as copyright year ([#716](https://github.com/diffplug/spotless/issues/716))
+
+- LicenseHeaderStep treats address as copyright year ([#716](https://github.com/diffplug/spotless/issues/716))
 
 ## [2.13.2] - 2021-04-12
+
 ### Fixed
-* Fix license header bug for years in range ([#840](https://github.com/diffplug/spotless/pull/840)).
+
+- Fix license header bug for years in range ([#840](https://github.com/diffplug/spotless/pull/840)).
 
 ## [2.13.1] - 2021-04-10
+
 ### Changed
-* Update default google-java-format from 1.9 to 1.10.0
-* Expose configuration exceptions from scalafmt ([#837](https://github.com/diffplug/spotless/issues/837))
+
+- Update default google-java-format from 1.9 to 1.10.0
+- Expose configuration exceptions from scalafmt ([#837](https://github.com/diffplug/spotless/issues/837))
 
 ## [2.13.0] - 2021-03-05
+
 ### Added
-* Bump ktfmt to 0.21 and add support to Google and Kotlinlang formats ([#812](https://github.com/diffplug/spotless/pull/812))
+
+- Bump ktfmt to 0.21 and add support to Google and Kotlinlang formats ([#812](https://github.com/diffplug/spotless/pull/812))
 
 ## [2.12.1] - 2021-02-16
+
 ### Fixed
-* Allow licence headers to be blank ([#801](https://github.com/diffplug/spotless/pull/801)).
+
+- Allow licence headers to be blank ([#801](https://github.com/diffplug/spotless/pull/801)).
 
 ## [2.12.0] - 2021-02-09
+
 ### Added
-* Support for diktat ([#789](https://github.com/diffplug/spotless/pull/789))
+
+- Support for diktat ([#789](https://github.com/diffplug/spotless/pull/789))
 
 ## [2.11.0] - 2021-01-04
+
 ### Added
-* Added support for `eclipse-cdt`, `eclipse-jdt`, and `eclipse-wtp` at `4.18.0`.
+
+- Added support for `eclipse-cdt`, `eclipse-jdt`, and `eclipse-wtp` at `4.18.0`.
+
 ### Changed
-* Bump `eclipse-jdt` default version from `4.17.0` to `4.18.0`.
-* Bump `eclipse-wtp` default version from `4.17.0` to `4.18.0`.
-* Bump `ktfmt` default version from `0.16` to `0.19` ([#748](https://github.com/diffplug/spotless/issues/748) and [#773](https://github.com/diffplug/spotless/issues/773)).
-* Bump `jgit` from `5.9` to `5.10` ([#773](https://github.com/diffplug/spotless/issues/773)).
-### Fixed
-* Fixed `ratchetFrom` support for git-submodule ([#746](https://github.com/diffplug/spotless/issues/746)).
-* Fixed `ratchetFrom` excess memory consumption ([#735](https://github.com/diffplug/spotless/issues/735)).
-* `ktfmt` v0.19+ with dropbox-style works again ([#765](https://github.com/diffplug/spotless/pull/765)).
-* `prettier` no longer throws errors on empty files ([#751](https://github.com/diffplug/spotless/pull/751)).
-* Fixed error when running on root of windows mountpoint ([#760](https://github.com/diffplug/spotless/pull/760)).
-* Fixed typo in javadoc comment for SQL\_FORMATTER\_INDENT\_TYPE ([#753](https://github.com/diffplug/spotless/pull/753)).
+
+- Bump `eclipse-jdt` default version from `4.17.0` to `4.18.0`.
+- Bump `eclipse-wtp` default version from `4.17.0` to `4.18.0`.
+- Bump `ktfmt` default version from `0.16` to `0.19` ([#748](https://github.com/diffplug/spotless/issues/748) and [#773](https://github.com/diffplug/spotless/issues/773)).
+- Bump `jgit` from `5.9` to `5.10` ([#773](https://github.com/diffplug/spotless/issues/773)).
+
+### Fixed
+
+- Fixed `ratchetFrom` support for git-submodule ([#746](https://github.com/diffplug/spotless/issues/746)).
+- Fixed `ratchetFrom` excess memory consumption ([#735](https://github.com/diffplug/spotless/issues/735)).
+- `ktfmt` v0.19+ with dropbox-style works again ([#765](https://github.com/diffplug/spotless/pull/765)).
+- `prettier` no longer throws errors on empty files ([#751](https://github.com/diffplug/spotless/pull/751)).
+- Fixed error when running on root of windows mountpoint ([#760](https://github.com/diffplug/spotless/pull/760)).
+- Fixed typo in javadoc comment for SQL_FORMATTER_INDENT_TYPE ([#753](https://github.com/diffplug/spotless/pull/753)).
 
 ## [2.10.2] - 2020-11-16
+
 ### Fixed
-* Fixed a bug which occurred if the root directory of the project was also the filesystem root ([#732](https://github.com/diffplug/spotless/pull/732))
+
+- Fixed a bug which occurred if the root directory of the project was also the filesystem root ([#732](https://github.com/diffplug/spotless/pull/732))
 
 ## [2.10.1] - 2020-11-13
+
 ### Fixed
-* Bump JGit from `5.8.0` to `5.9.0` to improve performance ([#726](https://github.com/diffplug/spotless/issues/726))
+
+- Bump JGit from `5.8.0` to `5.9.0` to improve performance ([#726](https://github.com/diffplug/spotless/issues/726))
 
 ## [2.10.0] - 2020-11-02
+
 ### Added
-* Added support to npm-based steps for picking up `.npmrc` files ([#727](https://github.com/diffplug/spotless/pull/727))
+
+- Added support to npm-based steps for picking up `.npmrc` files ([#727](https://github.com/diffplug/spotless/pull/727))
 
 ## [2.9.0] - 2020-10-20
+
 ### Added
-* Added support for eclipse-cdt 4.14.0, 4.16.0 and 4.17.0 ([#722](https://github.com/diffplug/spotless/pull/722)).
-* Added support for eclipse-groovy 4.14.0, 4.15.0, 4.16.0 and 4.17.0 ([#722](https://github.com/diffplug/spotless/pull/722)).
-* Added support for eclipse-jdt 4.17.0 ([#722](https://github.com/diffplug/spotless/pull/722)).
-* Added support for eclipse-wtp 4.14.0, 4.15.0, 4.16.0 and 4.17.0 ([#722](https://github.com/diffplug/spotless/pull/722)).
+
+- Added support for eclipse-cdt 4.14.0, 4.16.0 and 4.17.0 ([#722](https://github.com/diffplug/spotless/pull/722)).
+- Added support for eclipse-groovy 4.14.0, 4.15.0, 4.16.0 and 4.17.0 ([#722](https://github.com/diffplug/spotless/pull/722)).
+- Added support for eclipse-jdt 4.17.0 ([#722](https://github.com/diffplug/spotless/pull/722)).
+- Added support for eclipse-wtp 4.14.0, 4.15.0, 4.16.0 and 4.17.0 ([#722](https://github.com/diffplug/spotless/pull/722)).
+
 ### Changed
-* Updated default eclipse-cdt from 4.13.0 to 4.16.0 ([#722](https://github.com/diffplug/spotless/pull/722)). Note that version 4.17.0 is supported, but requires Java 11 or higher.
-* Updated default eclipse-groovy from 4.13.0 to 4.17.0 ([#722](https://github.com/diffplug/spotless/pull/722)).
-* Updated default eclipse-jdt from 4.16.0 to 4.17.0 ([#722](https://github.com/diffplug/spotless/pull/722)).
-* Updated default eclipse-wtp from 4.13.0 to 4.17.0 ([#722](https://github.com/diffplug/spotless/pull/722)).
+
+- Updated default eclipse-cdt from 4.13.0 to 4.16.0 ([#722](https://github.com/diffplug/spotless/pull/722)). Note that version 4.17.0 is supported, but requires Java 11 or higher.
+- Updated default eclipse-groovy from 4.13.0 to 4.17.0 ([#722](https://github.com/diffplug/spotless/pull/722)).
+- Updated default eclipse-jdt from 4.16.0 to 4.17.0 ([#722](https://github.com/diffplug/spotless/pull/722)).
+- Updated default eclipse-wtp from 4.13.0 to 4.17.0 ([#722](https://github.com/diffplug/spotless/pull/722)).
 
 ## [2.8.0] - 2020-10-05
+
 ### Added
-* Exposed new methods in `GitRatchet` to support faster ratcheting in the Maven plugin ([#706](https://github.com/diffplug/spotless/pull/706)).
+
+- Exposed new methods in `GitRatchet` to support faster ratcheting in the Maven plugin ([#706](https://github.com/diffplug/spotless/pull/706)).
 
 ## [2.7.0] - 2020-09-21
+
 ### Added
-* `PipeStepPair.Builder` now has a method `.buildStepWhichAppliesSubSteps(Path rootPath, Collection<FormatterStep> steps)`, which returns a single `FormatterStep` that applies the given steps within the regex defined earlier in the builder. Used for formatting inception (implements [#412](https://github.com/diffplug/spotless/issues/412)).
+
+- `PipeStepPair.Builder` now has a method `.buildStepWhichAppliesSubSteps(Path rootPath, Collection<FormatterStep> steps)`, which returns a single `FormatterStep` that applies the given steps within the regex defined earlier in the builder. Used for formatting inception (implements [#412](https://github.com/diffplug/spotless/issues/412)).
 
 ## [2.6.2] - 2020-09-18
+
 ### Fixed
-* Don't assume that file content passed into Prettier is at least 50 characters (https://github.com/diffplug/spotless/pull/699).
+
+- Don't assume that file content passed into Prettier is at least 50 characters (https://github.com/diffplug/spotless/pull/699).
 
 ## [2.6.1] - 2020-09-12
+
 ### Fixed
-* Improved JRE parsing to handle strings like `16-loom` (fixes [#693](https://github.com/diffplug/spotless/issues/693)).
+
+- Improved JRE parsing to handle strings like `16-loom` (fixes [#693](https://github.com/diffplug/spotless/issues/693)).
 
 ## [2.6.0] - 2020-09-11
+
 ### Added
-* `PipeStepPair` which allows extracting blocks of text in one step, then injecting those blocks back in later. Currently only used for `spotless:off` `spotless:on`, but could also be used to [apply different steps in different places](https://github.com/diffplug/spotless/issues/412) ([#691](https://github.com/diffplug/spotless/pull/691)).
+
+- `PipeStepPair` which allows extracting blocks of text in one step, then injecting those blocks back in later. Currently only used for `spotless:off` `spotless:on`, but could also be used to [apply different steps in different places](https://github.com/diffplug/spotless/issues/412) ([#691](https://github.com/diffplug/spotless/pull/691)).
+
 ### Changed
-* When applying license headers for the first time, we are now more lenient about parsing existing years from the header ([#690](https://github.com/diffplug/spotless/pull/690)).
+
+- When applying license headers for the first time, we are now more lenient about parsing existing years from the header ([#690](https://github.com/diffplug/spotless/pull/690)).
 
 ## [2.5.0] - 2020-09-08
+
 ### Added
-* `GoogleJavaFormatStep.defaultVersion()` now returns `1.9` on JDK 11+, while continuing to return `1.7` on earlier JDKs. This is especially helpful to `RemoveUnusedImportsStep`, since it always uses the default version of GJF (fixes [#681](https://github.com/diffplug/spotless/issues/681)).
+
+- `GoogleJavaFormatStep.defaultVersion()` now returns `1.9` on JDK 11+, while continuing to return `1.7` on earlier JDKs. This is especially helpful to `RemoveUnusedImportsStep`, since it always uses the default version of GJF (fixes [#681](https://github.com/diffplug/spotless/issues/681)).
+
 ### Fixed
-* We now run all tests against JDK 8, JDK 11, and also JDK 14 ([#684](https://github.com/diffplug/spotless/pull/684)).
-* We had test files in `testlib/src/main/resources` named `module-info.java` and `package-info.java`. They cause problems for the Eclipse IDE trying to interpret them literally. Added `.test` suffix to the filenames so that eclipse doesn't barf on them anymore ([#683](https://github.com/diffplug/spotless/pull/683)).
+
+- We now run all tests against JDK 8, JDK 11, and also JDK 14 ([#684](https://github.com/diffplug/spotless/pull/684)).
+- We had test files in `testlib/src/main/resources` named `module-info.java` and `package-info.java`. They cause problems for the Eclipse IDE trying to interpret them literally. Added `.test` suffix to the filenames so that eclipse doesn't barf on them anymore ([#683](https://github.com/diffplug/spotless/pull/683)).
 
 ## [2.4.0] - 2020-08-29
+
 ### Added
-* Added support for  eclipse-jdt 4.14.0, 4.15.0 and 4.16.0 ([#678](https://github.com/diffplug/spotless/pull/678)).
+
+- Added support for eclipse-jdt 4.14.0, 4.15.0 and 4.16.0 ([#678](https://github.com/diffplug/spotless/pull/678)).
+
 ### Changed
-* Updated default eclipse-jdt from 4.13.0 to 4.16.0 ([#678](https://github.com/diffplug/spotless/pull/678)).
+
+- Updated default eclipse-jdt from 4.13.0 to 4.16.0 ([#678](https://github.com/diffplug/spotless/pull/678)).
 
 ## [2.3.0] - 2020-08-25
+
 ### Added
-* The ability to shell out to formatters with their own executables. ([#672](https://github.com/diffplug/spotless/pull/672))
-  * `ProcessRunner` makes it easy to efficiently and debuggably call foreign executables, and pipe their stdout and stderr to strings.
-  * `ForeignExe` finds executables on the path (or other strategies), and confirms that they have the correct version (to facilitate Spotless' caching). If the executable is not present or the wrong version, it points the user towards how to fix the problem.
-  * These classes were used to add support for [python black](https://github.com/psf/black) and [clang-format](https://clang.llvm.org/docs/ClangFormat.html).
-  * Incidental to this effort, `FormatterFunc.Closeable` now has new methods which make resource-handling safer.  The old method is still available as `ofDangerous`, but it should not be used outside of a testing situation. There are some legacy usages of `ofDangerous` in the codebase, and it would be nice to fix them, but the existing usages are using it safely.
+
+- The ability to shell out to formatters with their own executables. ([#672](https://github.com/diffplug/spotless/pull/672))
+  - `ProcessRunner` makes it easy to efficiently and debuggably call foreign executables, and pipe their stdout and stderr to strings.
+  - `ForeignExe` finds executables on the path (or other strategies), and confirms that they have the correct version (to facilitate Spotless' caching). If the executable is not present or the wrong version, it points the user towards how to fix the problem.
+  - These classes were used to add support for [python black](https://github.com/psf/black) and [clang-format](https://clang.llvm.org/docs/ClangFormat.html).
+  - Incidental to this effort, `FormatterFunc.Closeable` now has new methods which make resource-handling safer. The old method is still available as `ofDangerous`, but it should not be used outside of a testing situation. There are some legacy usages of `ofDangerous` in the codebase, and it would be nice to fix them, but the existing usages are using it safely.
 
 ## [2.2.2] - 2020-08-21
+
 ### Fixed
-* `KtLintStep` is now more robust when parsing version string for version-dependent implementation details, fixes [#668](https://github.com/diffplug/spotless/issues/668).
+
+- `KtLintStep` is now more robust when parsing version string for version-dependent implementation details, fixes [#668](https://github.com/diffplug/spotless/issues/668).
 
 ## [2.2.1] - 2020-08-05
+
 ### Fixed
-* `FormatterFunc.Closeable` had a "use after free" bug which caused errors in the npm-based formatters (e.g. prettier) if `spotlessCheck` was called on dirty files. ([#651](https://github.com/diffplug/spotless/issues/651))
+
+- `FormatterFunc.Closeable` had a "use after free" bug which caused errors in the npm-based formatters (e.g. prettier) if `spotlessCheck` was called on dirty files. ([#651](https://github.com/diffplug/spotless/issues/651))
+
 ### Changed
-* Bump default ktfmt from `0.15` to `0.16`, and remove duplicated logic for the `--dropbox-style` option ([#642](https://github.com/diffplug/spotless/pull/648))
+
+- Bump default ktfmt from `0.15` to `0.16`, and remove duplicated logic for the `--dropbox-style` option ([#642](https://github.com/diffplug/spotless/pull/648))
 
 ## [2.2.0] - 2020-07-13
+
 ### Added
-* Bump default ktfmt from 0.13 to 0.15, and add support for the --dropbox-style option ([#641](https://github.com/diffplug/spotless/issues/641)).
+
+- Bump default ktfmt from 0.13 to 0.15, and add support for the --dropbox-style option ([#641](https://github.com/diffplug/spotless/issues/641)).
 
 ## [2.1.0] - 2020-07-04
+
 ### Added
-* `FileSignature.machineIsWin()`, to replace the now-deprecated `LineEnding.nativeIsWin()`, because it turns out that `\r\n` is [not a reliable way](https://github.com/diffplug/spotless/issues/559#issuecomment-653739898) to detect the windows OS ([#639](https://github.com/diffplug/spotless/pull/639)).
+
+- `FileSignature.machineIsWin()`, to replace the now-deprecated `LineEnding.nativeIsWin()`, because it turns out that `\r\n` is [not a reliable way](https://github.com/diffplug/spotless/issues/559#issuecomment-653739898) to detect the windows OS ([#639](https://github.com/diffplug/spotless/pull/639)).
+
 ### Fixed
-* `GitAttributesLineEndings` was fatally broken (always returned platform default), and our tests missed it because they tested the part before the broken part ([#639](https://github.com/diffplug/spotless/pull/639)).
+
+- `GitAttributesLineEndings` was fatally broken (always returned platform default), and our tests missed it because they tested the part before the broken part ([#639](https://github.com/diffplug/spotless/pull/639)).
 
 ## [2.0.0] - 2020-07-02
+
 ### Changed
-* `LineEnding.GIT_ATTRIBUTES` now creates a policy whose serialized state can be relocated from one machine to another.  No user-visible change, but paves the way for remote build cache support in Gradle. ([#621](https://github.com/diffplug/spotless/pull/621))
+
+- `LineEnding.GIT_ATTRIBUTES` now creates a policy whose serialized state can be relocated from one machine to another. No user-visible change, but paves the way for remote build cache support in Gradle. ([#621](https://github.com/diffplug/spotless/pull/621))
+
 ### Added
-* `prettier` will now autodetect the parser (and formatter) to use based on the filename, unless you override this using `config` or `configFile` with the option `parser` or `filepath`. ([#620](https://github.com/diffplug/spotless/pull/620))
-* `GitRatchet` now lives in `lib-extra`, and is shared across `plugin-gradle` and `plugin-maven` ([#626](https://github.com/diffplug/spotless/pull/626)).
-* Added ANTLR4 support ([#326](https://github.com/diffplug/spotless/issues/326)).
-* `FormatterFunc.NeedsFile` for implementing file-based formatters more cleanly than we have so far ([#637](https://github.com/diffplug/spotless/issues/637)).
+
+- `prettier` will now autodetect the parser (and formatter) to use based on the filename, unless you override this using `config` or `configFile` with the option `parser` or `filepath`. ([#620](https://github.com/diffplug/spotless/pull/620))
+- `GitRatchet` now lives in `lib-extra`, and is shared across `plugin-gradle` and `plugin-maven` ([#626](https://github.com/diffplug/spotless/pull/626)).
+- Added ANTLR4 support ([#326](https://github.com/diffplug/spotless/issues/326)).
+- `FormatterFunc.NeedsFile` for implementing file-based formatters more cleanly than we have so far ([#637](https://github.com/diffplug/spotless/issues/637)).
+
 ### Changed
-* **BREAKING** `FileSignature` can no longer sign folders, only files.  Signatures are now based only on filename (not path), size, and a content hash.  It throws an error if a signature is attempted on a folder or on multiple files with different paths but the same filename - it never breaks silently.  This change does not break any of Spotless' internal logic, so it is unlikely to affect any of Spotless' consumers either. ([#571](https://github.com/diffplug/spotless/pull/571))
-  * This change allows the Maven plugin to cache classloaders across subprojects when loading config resources from the classpath (fixes [#559](https://github.com/diffplug/spotless/issues/559)).
-  * This change also allows the Gradle plugin to work with the remote buildcache (fixes [#280](https://github.com/diffplug/spotless/issues/280)).
-* **BREAKING** `FormatterFunc` no longer `extends ThrowingEx.Function` and `BiFunction`. In a major win for Java's idea of ["target typing"](https://cr.openjdk.java.net/~briangoetz/lambda/lambda-state-final.html), this required no changes anywhere in the codebase except deleting the `extends` part of `FormatterFunc` ([#638](https://github.com/diffplug/spotless/issues/638)).
-* **BREAKING** Heavy refactor of the `LicenseHeaderStep` public API.  Doesn't change internal behavior, but makes implementation of the Gradle and Maven plugins much easier. ([#628](https://github.com/diffplug/spotless/pull/628))
-* **BREAKING** Removed all deprecated methods and classes from `lib` and `lib-extra`.
-  * [#629](https://github.com/diffplug/spotless/pull/629) removes the code which wasn't being used in plugin-gradle or plugin-maven.
-  * [#630](https://github.com/diffplug/spotless/pull/630) moves the code which was still being used in deprecated parts of plugin-gradle into `.deprecated` package in `plugin-gradle`, which allows us to break `lib` without a breaking change in `plugin-gradle`.
+
+- **BREAKING** `FileSignature` can no longer sign folders, only files. Signatures are now based only on filename (not path), size, and a content hash. It throws an error if a signature is attempted on a folder or on multiple files with different paths but the same filename - it never breaks silently. This change does not break any of Spotless' internal logic, so it is unlikely to affect any of Spotless' consumers either. ([#571](https://github.com/diffplug/spotless/pull/571))
+  - This change allows the Maven plugin to cache classloaders across subprojects when loading config resources from the classpath (fixes [#559](https://github.com/diffplug/spotless/issues/559)).
+  - This change also allows the Gradle plugin to work with the remote buildcache (fixes [#280](https://github.com/diffplug/spotless/issues/280)).
+- **BREAKING** `FormatterFunc` no longer `extends ThrowingEx.Function` and `BiFunction`. In a major win for Java's idea of ["target typing"](https://cr.openjdk.java.net/~briangoetz/lambda/lambda-state-final.html), this required no changes anywhere in the codebase except deleting the `extends` part of `FormatterFunc` ([#638](https://github.com/diffplug/spotless/issues/638)).
+- **BREAKING** Heavy refactor of the `LicenseHeaderStep` public API. Doesn't change internal behavior, but makes implementation of the Gradle and Maven plugins much easier. ([#628](https://github.com/diffplug/spotless/pull/628))
+- **BREAKING** Removed all deprecated methods and classes from `lib` and `lib-extra`.
+  - [#629](https://github.com/diffplug/spotless/pull/629) removes the code which wasn't being used in plugin-gradle or plugin-maven.
+  - [#630](https://github.com/diffplug/spotless/pull/630) moves the code which was still being used in deprecated parts of plugin-gradle into `.deprecated` package in `plugin-gradle`, which allows us to break `lib` without a breaking change in `plugin-gradle`.
 
 ## [1.34.1] - 2020-06-17
+
 ### Changed
-* Nodejs-based formatters `prettier` and `tsfmt` now use native node instead of the J2V8 approach. ([#606](https://github.com/diffplug/spotless/pull/606))
-  * This removes the dependency to the no-longer-maintained Linux/Windows/macOs variants of J2V8.
-  * This enables spotless to use the latest `prettier` versions (instead of being stuck at prettier version <= `1.19.0`)
-  * Bumped default versions, prettier `1.16.4` -> `2.0.5`, tslint `5.12.1` -> `6.1.2`
-* Our main branch is now called `main`. ([#613](https://github.com/diffplug/spotless/pull/613))
+
+- Nodejs-based formatters `prettier` and `tsfmt` now use native node instead of the J2V8 approach. ([#606](https://github.com/diffplug/spotless/pull/606))
+  - This removes the dependency to the no-longer-maintained Linux/Windows/macOs variants of J2V8.
+  - This enables spotless to use the latest `prettier` versions (instead of being stuck at prettier version <= `1.19.0`)
+  - Bumped default versions, prettier `1.16.4` -> `2.0.5`, tslint `5.12.1` -> `6.1.2`
+- Our main branch is now called `main`. ([#613](https://github.com/diffplug/spotless/pull/613))
 
 ## [1.34.0] - 2020-06-05
+
 ### Added
-* `LicenseHeaderStep.setLicenseHeaderYearsFromGitHistory`, which does an expensive search through git history to determine the oldest and newest commits for each file, and uses that to determine license header years. ([#604](https://github.com/diffplug/spotless/pull/604))
+
+- `LicenseHeaderStep.setLicenseHeaderYearsFromGitHistory`, which does an expensive search through git history to determine the oldest and newest commits for each file, and uses that to determine license header years. ([#604](https://github.com/diffplug/spotless/pull/604))
 
 ## [1.33.1] - 2020-06-04
-* We are now running CI on windows. ([#596](https://github.com/diffplug/spotless/pull/596))
-* We are now dogfooding `ratchetFrom` and `licenseHeader` with a `$YEAR` token to ensure that Spotless copyright headers stay up-to-date without adding noise to file history. ([#595](https://github.com/diffplug/spotless/pull/595))
-* Added `LineEnding.nativeIsWin()`, `FileSignature.pathNativeToUnix()`, and `FileSignature.pathUnixToNative()`, along with many API-invisible fixes and cleanup. ([#592](https://github.com/diffplug/spotless/pull/592))
+
+- We are now running CI on windows. ([#596](https://github.com/diffplug/spotless/pull/596))
+- We are now dogfooding `ratchetFrom` and `licenseHeader` with a `$YEAR` token to ensure that Spotless copyright headers stay up-to-date without adding noise to file history. ([#595](https://github.com/diffplug/spotless/pull/595))
+- Added `LineEnding.nativeIsWin()`, `FileSignature.pathNativeToUnix()`, and `FileSignature.pathUnixToNative()`, along with many API-invisible fixes and cleanup. ([#592](https://github.com/diffplug/spotless/pull/592))
 
 ## [1.33.0] - 2020-06-03
+
 ### Added
-* `LicenseHeaderStep` now has an `updateYearWithLatest` parameter which can update copyright headers to today's date. ([#593](https://github.com/diffplug/spotless/pull/593))
-  * Parsing of existing years from headers is now more lenient.
-  * The `LicenseHeaderStep` constructor is now public, which allows capturing its state lazily, which is helpful for setting defaults based on `ratchetFrom`.
+
+- `LicenseHeaderStep` now has an `updateYearWithLatest` parameter which can update copyright headers to today's date. ([#593](https://github.com/diffplug/spotless/pull/593))
+  - Parsing of existing years from headers is now more lenient.
+  - The `LicenseHeaderStep` constructor is now public, which allows capturing its state lazily, which is helpful for setting defaults based on `ratchetFrom`.
 
 ## [1.32.0] - 2020-06-01
+
 ### Added
-* `NodeJsGlobal.setSharedLibFolder` allows to set the location of nodejs shared libs. ([#586](https://github.com/diffplug/spotless/pull/586))
-* `PaddedCell.isClean()` returns the instance of `PaddedCell.DirtyState` which represents clean. ([#590](https://github.com/diffplug/spotless/pull/590))
+
+- `NodeJsGlobal.setSharedLibFolder` allows to set the location of nodejs shared libs. ([#586](https://github.com/diffplug/spotless/pull/586))
+- `PaddedCell.isClean()` returns the instance of `PaddedCell.DirtyState` which represents clean. ([#590](https://github.com/diffplug/spotless/pull/590))
+
 ### Fixed
-* Previously, the nodejs-based steps would throw `UnsatisfiedLinkError` if they were ever used from more than one classloader.  Now they can be used from any number of classloaders (important for Gradle build daemon). ([#586](https://github.com/diffplug/spotless/pull/586))
+
+- Previously, the nodejs-based steps would throw `UnsatisfiedLinkError` if they were ever used from more than one classloader. Now they can be used from any number of classloaders (important for Gradle build daemon). ([#586](https://github.com/diffplug/spotless/pull/586))
 
 ## [1.31.0] - 2020-05-21
+
 ### Added
-* `PaddedCell.calculateDirtyState` is now defensive about misconfigured character encoding. ([#575](https://github.com/diffplug/spotless/pull/575))
+
+- `PaddedCell.calculateDirtyState` is now defensive about misconfigured character encoding. ([#575](https://github.com/diffplug/spotless/pull/575))
 
 ## [1.30.1] - 2020-05-17
+
 ### Fixed
-* `PaddedCell.DirtyState::writeCanonicalTo(File)` can now create a new file if necessary (previously required to overwrite an existing file) ([#576](https://github.com/diffplug/spotless/pull/576)).
+
+- `PaddedCell.DirtyState::writeCanonicalTo(File)` can now create a new file if necessary (previously required to overwrite an existing file) ([#576](https://github.com/diffplug/spotless/pull/576)).
 
 ## [1.30.0] - 2020-05-11
+
 ### Added
-* `PaddedCell.calculateDirtyState(Formatter, File, byte[])` to allow IDE integrations to send dirty editor buffers.
+
+- `PaddedCell.calculateDirtyState(Formatter, File, byte[])` to allow IDE integrations to send dirty editor buffers.
 
 ## [1.29.0] - 2020-05-05
+
 ### Added
-* Support for google-java-format 1.8 (including test infrastructure for Java 11). ([#562](https://github.com/diffplug/spotless/issues/562))
-* Improved PaddedCell such that it is as performant as non-padded cell - no reason not to have it always enabled.  Deprecated all of `PaddedCellBulk`. ([#561](https://github.com/diffplug/spotless/pull/561))
-* Support for ktfmt 0.13 ([#569](https://github.com/diffplug/spotless/pull/569))
+
+- Support for google-java-format 1.8 (including test infrastructure for Java 11). ([#562](https://github.com/diffplug/spotless/issues/562))
+- Improved PaddedCell such that it is as performant as non-padded cell - no reason not to have it always enabled. Deprecated all of `PaddedCellBulk`. ([#561](https://github.com/diffplug/spotless/pull/561))
+- Support for ktfmt 0.13 ([#569](https://github.com/diffplug/spotless/pull/569))
+
 ### Changed
-* Updated a bunch of dependencies, most notably: ([#564](https://github.com/diffplug/spotless/pull/564))
-  * jgit `5.5.0.201909110433-r` -> `5.7.0.202003110725-r`
-  * Gradle `6.2.2` -> `6.3`
-  * spotbugs Gradle plugin `2.0.0` -> `4.0.8`
+
+- Updated a bunch of dependencies, most notably: ([#564](https://github.com/diffplug/spotless/pull/564))
+  - jgit `5.5.0.201909110433-r` -> `5.7.0.202003110725-r`
+  - Gradle `6.2.2` -> `6.3`
+  - spotbugs Gradle plugin `2.0.0` -> `4.0.8`
 
 ## [1.28.1] - 2020-04-02
+
 ### Fixed
-* Javadoc for the `ext/eclipse-*` projects.
-* Replace the deprecated `compile` with `implementation` for the `ext/eclipse-*` projects.
+
+- Javadoc for the `ext/eclipse-*` projects.
+- Replace the deprecated `compile` with `implementation` for the `ext/eclipse-*` projects.
 
 ## [1.28.0] - 2020-03-20
+
 ### Added
-* Enable IntelliJ-compatible token `$today.year` for specifying the year in license header files. ([#542](https://github.com/diffplug/spotless/pull/542))
+
+- Enable IntelliJ-compatible token `$today.year` for specifying the year in license header files. ([#542](https://github.com/diffplug/spotless/pull/542))
+
 ### Fixed
-* Eclipse-WTP formatter (web tools platform, not java) could encounter errors in parallel multiproject builds [#492](https://github.com/diffplug/spotless/issues/492). Fixed for Eclipse-WTP formatter Eclipse version 4.13.0 (default version).
+
+- Eclipse-WTP formatter (web tools platform, not java) could encounter errors in parallel multiproject builds [#492](https://github.com/diffplug/spotless/issues/492). Fixed for Eclipse-WTP formatter Eclipse version 4.13.0 (default version).
+
 ### Build
-* All `CHANGES.md` are now in keepachangelog format. ([#507](https://github.com/diffplug/spotless/pull/507))
-* We now use [javadoc.io](https://javadoc.io/) instead of github pages. ([#508](https://github.com/diffplug/spotless/pull/508))
-* We no longer publish `-SNAPSHOT` for every build to `main`, since we have good [JitPack integration](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#gradle---any-commit-in-a-public-github-repo-this-one-or-any-fork). ([#508](https://github.com/diffplug/spotless/pull/508))
-* Improved how we use Spotless on itself. ([#509](https://github.com/diffplug/spotless/pull/509))
-* Fix build warnings when building on Gradle 6+, bump build Gradle to 6.2.2, and fix javadoc links. ([#536](https://github.com/diffplug/spotless/pull/536))
+
+- All `CHANGES.md` are now in keepachangelog format. ([#507](https://github.com/diffplug/spotless/pull/507))
+- We now use [javadoc.io](https://javadoc.io/) instead of github pages. ([#508](https://github.com/diffplug/spotless/pull/508))
+- We no longer publish `-SNAPSHOT` for every build to `main`, since we have good [JitPack integration](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#gradle---any-commit-in-a-public-github-repo-this-one-or-any-fork). ([#508](https://github.com/diffplug/spotless/pull/508))
+- Improved how we use Spotless on itself. ([#509](https://github.com/diffplug/spotless/pull/509))
+- Fix build warnings when building on Gradle 6+, bump build Gradle to 6.2.2, and fix javadoc links. ([#536](https://github.com/diffplug/spotless/pull/536))
 
 ## [1.27.0] - 2020-01-01
-* Ignored `KtLintStepTest`, because [gradle/gradle#11752](https://github.com/gradle/gradle/issues/11752) is causing too many CI failures. ([#499](https://github.com/diffplug/spotless/pull/499))
-    * Also fixed a minor problem in TestProvisioner.
-* If you set the environment variable `SPOTLESS_EXCLUDE_MAVEN=true` then the Maven plugin will be excluded from the build. ([#502](https://github.com/diffplug/spotless/pull/502))
-    * We have set this in JitPack, as a workaround for [jitpack/jitpack.io#4112](https://github.com/jitpack/jitpack.io/issues/4112)
-* Deprecated `SpotlessCache.clear()` in favor of the new `SpotlessCache.clearOnce(Object key)`. ([#501](https://github.com/diffplug/spotless/issues/#501))
+
+- Ignored `KtLintStepTest`, because [gradle/gradle#11752](https://github.com/gradle/gradle/issues/11752) is causing too many CI failures. ([#499](https://github.com/diffplug/spotless/pull/499))
+  - Also fixed a minor problem in TestProvisioner.
+- If you set the environment variable `SPOTLESS_EXCLUDE_MAVEN=true` then the Maven plugin will be excluded from the build. ([#502](https://github.com/diffplug/spotless/pull/502))
+  - We have set this in JitPack, as a workaround for [jitpack/jitpack.io#4112](https://github.com/jitpack/jitpack.io/issues/4112)
+- Deprecated `SpotlessCache.clear()` in favor of the new `SpotlessCache.clearOnce(Object key)`. ([#501](https://github.com/diffplug/spotless/issues/#501))
 
 ## [1.26.1] - 2019-11-27
-* Revert the change in console display of errors from 1.26.0 ([#485](https://github.com/diffplug/spotless/pull/485)) because [of these problems](https://github.com/diffplug/spotless/pull/485#issuecomment-552925932).
-* Bugfix: Fix NPE in EclipseXmlFormatterStepImpl ([#489](https://github.com/diffplug/spotless/pull/489))
+
+- Revert the change in console display of errors from 1.26.0 ([#485](https://github.com/diffplug/spotless/pull/485)) because [of these problems](https://github.com/diffplug/spotless/pull/485#issuecomment-552925932).
+- Bugfix: Fix NPE in EclipseXmlFormatterStepImpl ([#489](https://github.com/diffplug/spotless/pull/489))
 
 ## [1.26.0] - 2019-11-11
-* Fix project URLs in poms. ([#478](https://github.com/diffplug/spotless/pull/478))
-* Fix `ImportSorter` crashing with empty files. ([#474](https://github.com/diffplug/spotless/pull/474))
-    * Fixes [#305](https://github.com/diffplug/spotless/issues/305) StringIndexOutOfBoundsException for empty Groovy file when performing importOrder
-* Bugfix: CDT version `4.12.0` now properly uses `9.8`, whereas before it used `9.7`. ([#482](https://github.com/diffplug/spotless/pull/482#discussion_r341380884))
-* Add support for Eclipse 4.13 and all related formatters (JDT, CDT, WTP, and Groovy). ([#480](https://github.com/diffplug/spotless/issues/480))
-* Bump default version of KtLint from `0.34.2` to `0.35.0`. ([#473](https://github.com/diffplug/spotless/issues/473))
-* Several improvements to the console display of formatting errors. ([#465](https://github.com/diffplug/spotless/pull/465))
-    * Visualize \r and \n as ␍ and ␊ when possible ([#465](https://github.com/diffplug/spotless/pull/465))
-    * Make end-of-lines visible when file contains whitespace and end-of-line issues at the same time ([#465](https://github.com/diffplug/spotless/pull/465))
-    * Print actual diff line instead of "1 more lines that didn't fit" ([#467](https://github.com/diffplug/spotless/issues/467))
-* Automatically configure import order for IntelliJ IDEA with `.editorconfig` ([#486](https://github.com/diffplug/spotless/issues/486))
+
+- Fix project URLs in poms. ([#478](https://github.com/diffplug/spotless/pull/478))
+- Fix `ImportSorter` crashing with empty files. ([#474](https://github.com/diffplug/spotless/pull/474))
+  - Fixes [#305](https://github.com/diffplug/spotless/issues/305) StringIndexOutOfBoundsException for empty Groovy file when performing importOrder
+- Bugfix: CDT version `4.12.0` now properly uses `9.8`, whereas before it used `9.7`. ([#482](https://github.com/diffplug/spotless/pull/482#discussion_r341380884))
+- Add support for Eclipse 4.13 and all related formatters (JDT, CDT, WTP, and Groovy). ([#480](https://github.com/diffplug/spotless/issues/480))
+- Bump default version of KtLint from `0.34.2` to `0.35.0`. ([#473](https://github.com/diffplug/spotless/issues/473))
+- Several improvements to the console display of formatting errors. ([#465](https://github.com/diffplug/spotless/pull/465))
+  - Visualize \r and \n as ␍ and ␊ when possible ([#465](https://github.com/diffplug/spotless/pull/465))
+  - Make end-of-lines visible when file contains whitespace and end-of-line issues at the same time ([#465](https://github.com/diffplug/spotless/pull/465))
+  - Print actual diff line instead of "1 more lines that didn't fit" ([#467](https://github.com/diffplug/spotless/issues/467))
+- Automatically configure import order for IntelliJ IDEA with `.editorconfig` ([#486](https://github.com/diffplug/spotless/issues/486))
 
 ## [1.25.0] - 2019-10-06
 
-* Add support for ktlint `0.34+`, and bump default version from `0.32.0` to `0.34.2`. ([#469](https://github.com/diffplug/spotless/pull/469))
+- Add support for ktlint `0.34+`, and bump default version from `0.32.0` to `0.34.2`. ([#469](https://github.com/diffplug/spotless/pull/469))
 
 ## [1.24.3] - 2019-09-23
-* Update jgit from `5.3.2.201906051522-r` to `5.5.0.201909110433-r`. ([#445](https://github.com/diffplug/spotless/pull/445))
-  * Fixes [#410](https://github.com/diffplug/spotless/issues/410) AccessDeniedException in MinGW/ GitBash.
-  * Also fixes occasional [hang on NFS due to filesystem timers](https://github.com/diffplug/spotless/pull/407#issuecomment-514824364).
-* Eclipse-based formatters used to leave temporary files around ([#447](https://github.com/diffplug/spotless/issues/447)). This is now fixed, but only for eclipse 4.12+, no back-port to older Eclipse formatter versions is planned. ([#451](https://github.com/diffplug/spotless/issues/451))
-* `PaddedCellBulk` had a bug where badly-formatted files with well-behaving formatters were being:
-    - correctly formatted by "apply"
-    - but incorrectly marked as good by "check"
-    - this led to "check" says all good, but then "apply" still causes format (https://github.com/diffplug/spotless/issues/453)
-    - combined with up-to-date checking, could lead to even more confusing results (https://github.com/diffplug/spotless/issues/338)
-    - only affects the Gradle plugin, since that was the only plugin to use this feature
-* Minor change to `TestProvisioner`, which should fix the cache-breaking issues, allowing us to speed-up the CI builds a bit.
-* Bumped `scalafmt` default version from `1.1.0` to `2.0.1`, since there are [bugs](https://github.com/diffplug/spotless/issues/454) in the old default ([#458](https://github.com/diffplug/spotless/pull/458)).
+
+- Update jgit from `5.3.2.201906051522-r` to `5.5.0.201909110433-r`. ([#445](https://github.com/diffplug/spotless/pull/445))
+  - Fixes [#410](https://github.com/diffplug/spotless/issues/410) AccessDeniedException in MinGW/ GitBash.
+  - Also fixes occasional [hang on NFS due to filesystem timers](https://github.com/diffplug/spotless/pull/407#issuecomment-514824364).
+- Eclipse-based formatters used to leave temporary files around ([#447](https://github.com/diffplug/spotless/issues/447)). This is now fixed, but only for eclipse 4.12+, no back-port to older Eclipse formatter versions is planned. ([#451](https://github.com/diffplug/spotless/issues/451))
+- `PaddedCellBulk` had a bug where badly-formatted files with well-behaving formatters were being:
+  - correctly formatted by "apply"
+  - but incorrectly marked as good by "check"
+  - this led to "check" says all good, but then "apply" still causes format (https://github.com/diffplug/spotless/issues/453)
+  - combined with up-to-date checking, could lead to even more confusing results (https://github.com/diffplug/spotless/issues/338)
+  - only affects the Gradle plugin, since that was the only plugin to use this feature
+- Minor change to `TestProvisioner`, which should fix the cache-breaking issues, allowing us to speed-up the CI builds a bit.
+- Bumped `scalafmt` default version from `1.1.0` to `2.0.1`, since there are [bugs](https://github.com/diffplug/spotless/issues/454) in the old default ([#458](https://github.com/diffplug/spotless/pull/458)).
 
 ## [1.24.1] - 2019-08-12
-* Fixes class loading issue with Java 9+ ([#426](https://github.com/diffplug/spotless/pull/426)).
+
+- Fixes class loading issue with Java 9+ ([#426](https://github.com/diffplug/spotless/pull/426)).
 
 ## [1.24.0] - 2019-07-29
-* Updated default eclipse-wtp from 4.8.0 to 4.12.0 ([#423](https://github.com/diffplug/spotless/pull/423)).
-* Updated default eclipse-groovy from 4.10 to 4.12.0 ([#423](https://github.com/diffplug/spotless/pull/423)).
-* Updated default eclipse-jdt from 4.11.0 to 4.12.0 ([#423](https://github.com/diffplug/spotless/pull/423)).
-* Updated default eclipse-cdt from 4.11.0 to 4.12.0 ([#423](https://github.com/diffplug/spotless/pull/423)).
-    * **KNOWN BUG - accidentally published CDT 9.7 rather than 9.8 - fixed in 1.26.0**
-* Added new Maven coordinates for scalafmt 2.0.0+, maintains backwards compatability ([#415](https://github.com/diffplug/spotless/issues/415))
+
+- Updated default eclipse-wtp from 4.8.0 to 4.12.0 ([#423](https://github.com/diffplug/spotless/pull/423)).
+- Updated default eclipse-groovy from 4.10 to 4.12.0 ([#423](https://github.com/diffplug/spotless/pull/423)).
+- Updated default eclipse-jdt from 4.11.0 to 4.12.0 ([#423](https://github.com/diffplug/spotless/pull/423)).
+- Updated default eclipse-cdt from 4.11.0 to 4.12.0 ([#423](https://github.com/diffplug/spotless/pull/423)).
+  - **KNOWN BUG - accidentally published CDT 9.7 rather than 9.8 - fixed in 1.26.0**
+- Added new Maven coordinates for scalafmt 2.0.0+, maintains backwards compatability ([#415](https://github.com/diffplug/spotless/issues/415))
 
 ## [1.23.1] - 2019-06-17
-* Fixes incorrect M2 cache directory path handling of Eclipse based formatters ([#401](https://github.com/diffplug/spotless/issues/401))
-* Update jgit from `4.9.0.201710071750-r` to `5.3.2.201906051522-r` because Gradle project is sometimes broken by `apache httpcomponents` in transitive dependency. ([#407](https://github.com/diffplug/spotless/pull/407))
+
+- Fixes incorrect M2 cache directory path handling of Eclipse based formatters ([#401](https://github.com/diffplug/spotless/issues/401))
+- Update jgit from `4.9.0.201710071750-r` to `5.3.2.201906051522-r` because Gradle project is sometimes broken by `apache httpcomponents` in transitive dependency. ([#407](https://github.com/diffplug/spotless/pull/407))
 
 ## [1.23.0] - 2019-04-24
-* Updated default ktlint from 0.21.0 to 0.32.0, and Maven coords to com.pinterest ([#394](https://github.com/diffplug/spotless/pull/394))
+
+- Updated default ktlint from 0.21.0 to 0.32.0, and Maven coords to com.pinterest ([#394](https://github.com/diffplug/spotless/pull/394))
 
 ## [1.22.0] - 2019-04-15
-* Updated default eclipse-cdt from 4.7.3a to 4.11.0 ([#390](https://github.com/diffplug/spotless/pull/390)).
+
+- Updated default eclipse-cdt from 4.7.3a to 4.11.0 ([#390](https://github.com/diffplug/spotless/pull/390)).
 
 ## [1.21.1] - 2019-03-29
-* Fixes incorrect plugin and pom metadata in `1.21.0` ([#388](https://github.com/diffplug/spotless/issues/388)).
+
+- Fixes incorrect plugin and pom metadata in `1.21.0` ([#388](https://github.com/diffplug/spotless/issues/388)).
 
 ## [1.21.0] - 2019-03-28
-* We now use a remote build cache to speed up CI builds.  Reduced build time from ~13 minutes to as low as ~3 minutes, dependending on how deep the change is ([#380](https://github.com/diffplug/spotless/pull/380)).
-* Updated default eclipse-wtp from 4.7.3b to 4.8.0 ([#382](https://github.com/diffplug/spotless/pull/382)).
-* Updated default eclipse-groovy from 4.8.1 to 4.10.0 ([#382](https://github.com/diffplug/spotless/pull/382)).
-* Updated default eclipse-jdt from 4.10.0 to 4.11.0 ([#384](https://github.com/diffplug/spotless/pull/384)).
+
+- We now use a remote build cache to speed up CI builds. Reduced build time from ~13 minutes to as low as ~3 minutes, dependending on how deep the change is ([#380](https://github.com/diffplug/spotless/pull/380)).
+- Updated default eclipse-wtp from 4.7.3b to 4.8.0 ([#382](https://github.com/diffplug/spotless/pull/382)).
+- Updated default eclipse-groovy from 4.8.1 to 4.10.0 ([#382](https://github.com/diffplug/spotless/pull/382)).
+- Updated default eclipse-jdt from 4.10.0 to 4.11.0 ([#384](https://github.com/diffplug/spotless/pull/384)).
 
 ## [1.20.0] - 2019-03-11
-* Made npm package versions of [`prettier`](https://prettier.io/) and [`tsfmt`](https://github.com/vvakame/typescript-formatter) (and its internal packages) configurable. ([#363](https://github.com/diffplug/spotless/pull/363))
-  * Updated default npm package version of `prettier` from 1.13.4 to 1.16.4
-  * Updated default npm package version of internally used typescript package from 2.9.2 to 3.3.3 and tslint package from 5.1.0 to 5.12.0 (both used by `tsfmt`)
-* Updated default eclipse-wtp from 4.7.3a to 4.7.3b ([#371](https://github.com/diffplug/spotless/pull/371)).
-* Configured `build-scan` plugin in build ([#356](https://github.com/diffplug/spotless/pull/356)).
-  * Runs on every CI build automatically.
-  * Users need to opt-in on their local machine.
-* Default behavior of XML formatter changed to ignore external URIs ([#369](https://github.com/diffplug/spotless/issues/369)).
-  * **WARNING RESOLVED: By default, xml formatter no longer downloads external entities. You can opt-in to resolve external entities by setting resolveExternalURI to true. However, if you do opt-in, be sure that all external entities are referenced over https and not http, or you may be vulnerable to XXE attacks.**
+
+- Made npm package versions of [`prettier`](https://prettier.io/) and [`tsfmt`](https://github.com/vvakame/typescript-formatter) (and its internal packages) configurable. ([#363](https://github.com/diffplug/spotless/pull/363))
+  - Updated default npm package version of `prettier` from 1.13.4 to 1.16.4
+  - Updated default npm package version of internally used typescript package from 2.9.2 to 3.3.3 and tslint package from 5.1.0 to 5.12.0 (both used by `tsfmt`)
+- Updated default eclipse-wtp from 4.7.3a to 4.7.3b ([#371](https://github.com/diffplug/spotless/pull/371)).
+- Configured `build-scan` plugin in build ([#356](https://github.com/diffplug/spotless/pull/356)).
+  - Runs on every CI build automatically.
+  - Users need to opt-in on their local machine.
+- Default behavior of XML formatter changed to ignore external URIs ([#369](https://github.com/diffplug/spotless/issues/369)).
+  - **WARNING RESOLVED: By default, xml formatter no longer downloads external entities. You can opt-in to resolve external entities by setting resolveExternalURI to true. However, if you do opt-in, be sure that all external entities are referenced over https and not http, or you may be vulnerable to XXE attacks.**
 
 ## [1.19.0] - 2019-03-11
+
 **WARNING: xml formatter in this version may be vulnerable to XXE attacks, fixed in 1.20.0 (see [#358](https://github.com/diffplug/spotless/issues/358)).**
 
-* Security fix: Updated groovy, c/c++, and eclipse WTP formatters so that they download their source jars securely using `https` rather than `http` ([#360](https://github.com/diffplug/spotless/issues/360)).
-* Updated default eclipse-jdt from 4.9.0 to 4.10.0 ([#368](https://github.com/diffplug/spotless/pull/368))
+- Security fix: Updated groovy, c/c++, and eclipse WTP formatters so that they download their source jars securely using `https` rather than `http` ([#360](https://github.com/diffplug/spotless/issues/360)).
+- Updated default eclipse-jdt from 4.9.0 to 4.10.0 ([#368](https://github.com/diffplug/spotless/pull/368))
 
 ## [1.18.0] - 2019-02-11
+
 **WARNING: xml formatter in this version may be vulnerable to XXE attacks, fixed in 1.20.0 (see [#358](https://github.com/diffplug/spotless/issues/358)).**
 
-* CSS and XML extensions are discontinued ([#325](https://github.com/diffplug/spotless/pull/325)).
-* Provided features with access to SLF4J interface of build tools. ([#236](https://github.com/diffplug/spotless/issues/236))
-* Updated default google-java-format from 1.5 to 1.7 ([#335](https://github.com/diffplug/spotless/issues/335)).
-* `ImportOrderStep.createFromFile` is now lazy ([#218](https://github.com/diffplug/spotless/issues/218)).
+- CSS and XML extensions are discontinued ([#325](https://github.com/diffplug/spotless/pull/325)).
+- Provided features with access to SLF4J interface of build tools. ([#236](https://github.com/diffplug/spotless/issues/236))
+- Updated default google-java-format from 1.5 to 1.7 ([#335](https://github.com/diffplug/spotless/issues/335)).
+- `ImportOrderStep.createFromFile` is now lazy ([#218](https://github.com/diffplug/spotless/issues/218)).
 
 ## [1.17.0] - 2018-10-30
+
 **WARNING: xml formatter in this version may be vulnerable to XXE attacks, fixed in 1.20.0 (see [#358](https://github.com/diffplug/spotless/issues/358)).**
 
-* Updated default eclipse-jdt from 4.7.3a to 4.9.0 ([#316](https://github.com/diffplug/spotless/pull/316)). New version addresses enum-tab formatting bug in 4.8 ([#314](https://github.com/diffplug/spotless/issues/314)).
+- Updated default eclipse-jdt from 4.7.3a to 4.9.0 ([#316](https://github.com/diffplug/spotless/pull/316)). New version addresses enum-tab formatting bug in 4.8 ([#314](https://github.com/diffplug/spotless/issues/314)).
 
 ## [1.16.0] - 2018-10-30
+
 **WARNING: xml formatter in this version may be vulnerable to XXE attacks, fixed in 1.20.0 (see [#358](https://github.com/diffplug/spotless/issues/358)).**
 
-* Minor support for plugin-gradle and plugin-maven CSS plugins ([#311](https://github.com/diffplug/spotless/pull/311)).
+- Minor support for plugin-gradle and plugin-maven CSS plugins ([#311](https://github.com/diffplug/spotless/pull/311)).
 
 ## [1.15.0] - 2018-09-23
+
 **WARNING: xml formatter in this version may be vulnerable to XXE attacks, fixed in 1.20.0 (see [#358](https://github.com/diffplug/spotless/issues/358)).**
 
-* Added C/C++ support ([#232](https://github.com/diffplug/spotless/issues/232)).
-* Integrated Eclipse CDT formatter ([#274](https://github.com/diffplug/spotless/pull/274))
-* Extended dependency provisioner to exclude transitives on request ([#297](https://github.com/diffplug/spotless/pull/297)).This prevents unnecessary downloads of unused transitive dependencies for Eclipse based formatter steps.
-* Updated default groovy-eclipse from 4.8.0 to 4.8.1 ([#288](https://github.com/diffplug/spotless/pull/288)). New version is based on [Groovy-Eclipse 3.0.0](https://github.com/groovy/groovy-eclipse/wiki/3.0.0-Release-Notes).
-* Integrated Eclipse WTP formatter ([#290](https://github.com/diffplug/spotless/pull/290))
-* Updated JSR305 annotation from 3.0.0 to 3.0.2 ([#274](https://github.com/diffplug/spotless/pull/274))
-* Migrated from FindBugs annotations 3.0.0 to SpotBugs annotations 3.1.6 ([#274](https://github.com/diffplug/spotless/pull/274))
-* `Formatter` now implements `AutoCloseable`.  This means that users of `Formatter` are expected to use the try-with-resources pattern.  The reason for this change is so that `FormatterFunc.Closeable` actually works. ([#284](https://github.com/diffplug/spotless/pull/284))* Added [`prettier`](https://prettier.io/) and [`tsfmt`](https://github.com/vvakame/typescript-formatter) support, as well as general infrastructure for calling `nodeJS` code using `j2v8` ([#283](https://github.com/diffplug/spotless/pull/283)).
+- Added C/C++ support ([#232](https://github.com/diffplug/spotless/issues/232)).
+- Integrated Eclipse CDT formatter ([#274](https://github.com/diffplug/spotless/pull/274))
+- Extended dependency provisioner to exclude transitives on request ([#297](https://github.com/diffplug/spotless/pull/297)).This prevents unnecessary downloads of unused transitive dependencies for Eclipse based formatter steps.
+- Updated default groovy-eclipse from 4.8.0 to 4.8.1 ([#288](https://github.com/diffplug/spotless/pull/288)). New version is based on [Groovy-Eclipse 3.0.0](https://github.com/groovy/groovy-eclipse/wiki/3.0.0-Release-Notes).
+- Integrated Eclipse WTP formatter ([#290](https://github.com/diffplug/spotless/pull/290))
+- Updated JSR305 annotation from 3.0.0 to 3.0.2 ([#274](https://github.com/diffplug/spotless/pull/274))
+- Migrated from FindBugs annotations 3.0.0 to SpotBugs annotations 3.1.6 ([#274](https://github.com/diffplug/spotless/pull/274))
+- `Formatter` now implements `AutoCloseable`. This means that users of `Formatter` are expected to use the try-with-resources pattern. The reason for this change is so that `FormatterFunc.Closeable` actually works. ([#284](https://github.com/diffplug/spotless/pull/284))\* Added [`prettier`](https://prettier.io/) and [`tsfmt`](https://github.com/vvakame/typescript-formatter) support, as well as general infrastructure for calling `nodeJS` code using `j2v8` ([#283](https://github.com/diffplug/spotless/pull/283)).
 
 ## [1.14.0] - 2018-07-24
-* Updated default groovy-eclipse from 4.6.3 to 4.8.0 ([#244](https://github.com/diffplug/spotless/pull/244)). New version allows to ignore internal formatter errors/warnings.
-* Updated default eclipse-jdt from 4.7.2 to 4.8.0 ([#239](https://github.com/diffplug/spotless/pull/239)). New version fixes a bug preventing Java code formatting within JavaDoc comments ([#191](https://github.com/diffplug/spotless/issues/191)).
-* Eclipse formatter versions decoupled from Spotless formatter step implementations to allow independent updates of maven-based Eclipse dependencies. ([#253](https://github.com/diffplug/spotless/pull/253))
-* Use guaranteed binary and source compatibility between releases of Scalafmt. ([#260](https://github.com/diffplug/spotless/pull/260))
+
+- Updated default groovy-eclipse from 4.6.3 to 4.8.0 ([#244](https://github.com/diffplug/spotless/pull/244)). New version allows to ignore internal formatter errors/warnings.
+- Updated default eclipse-jdt from 4.7.2 to 4.8.0 ([#239](https://github.com/diffplug/spotless/pull/239)). New version fixes a bug preventing Java code formatting within JavaDoc comments ([#191](https://github.com/diffplug/spotless/issues/191)).
+- Eclipse formatter versions decoupled from Spotless formatter step implementations to allow independent updates of maven-based Eclipse dependencies. ([#253](https://github.com/diffplug/spotless/pull/253))
+- Use guaranteed binary and source compatibility between releases of Scalafmt. ([#260](https://github.com/diffplug/spotless/pull/260))
 
 ## [1.13.0] - 2018-06-01
-* Add line and column numbers to ktlint errors. ([#251](https://github.com/diffplug/spotless/pull/251))
+
+- Add line and column numbers to ktlint errors. ([#251](https://github.com/diffplug/spotless/pull/251))
 
 ## [1.12.0] - 2018-05-14
-* Fixed a bug in `LicenseHeaderStep` which caused an exception with some malformed date-aware licenses. ([#222](https://github.com/diffplug/spotless/pull/222))
-* Updated default ktlint from 0.14.0 to 0.21.0
-* Add ability to pass custom options to ktlint in Gradle plugin. See plugin-gradle/README for details.
+
+- Fixed a bug in `LicenseHeaderStep` which caused an exception with some malformed date-aware licenses. ([#222](https://github.com/diffplug/spotless/pull/222))
+- Updated default ktlint from 0.14.0 to 0.21.0
+- Add ability to pass custom options to ktlint in Gradle plugin. See plugin-gradle/README for details.
 
 ## [1.11.0] - 2018-02-26
-* Added default indentation of `4` to `IndentStep`. ([#209](https://github.com/diffplug/spotless/pull/209))
+
+- Added default indentation of `4` to `IndentStep`. ([#209](https://github.com/diffplug/spotless/pull/209))
 
 ## [1.10.0] - 2018-02-15
-* LicenseHeaderStep now supports customizing the year range separator in copyright notices. ([#199](https://github.com/diffplug/spotless/pull/199))
-* Breaking change to testlib - removed `ResourceHarness.write` and added `ResourceHarness.[set/assert]File` for easier-to-read tests. ([#203](https://github.com/diffplug/spotless/pull/203))
+
+- LicenseHeaderStep now supports customizing the year range separator in copyright notices. ([#199](https://github.com/diffplug/spotless/pull/199))
+- Breaking change to testlib - removed `ResourceHarness.write` and added `ResourceHarness.[set/assert]File` for easier-to-read tests. ([#203](https://github.com/diffplug/spotless/pull/203))
 
 ## [1.9.0] - 2018-02-05
-* Updated default ktlint from 0.6.1 to 0.14.0
-* Updated default google-java-format from 1.3 to 1.5
-* Updated default eclipse-jdt from 4.7.1 to 4.7.2
-* Added a configuration option to `googleJavaFormat` to switch the formatter style ([#193](https://github.com/diffplug/spotless/pull/193))
+
+- Updated default ktlint from 0.6.1 to 0.14.0
+- Updated default google-java-format from 1.3 to 1.5
+- Updated default eclipse-jdt from 4.7.1 to 4.7.2
+- Added a configuration option to `googleJavaFormat` to switch the formatter style ([#193](https://github.com/diffplug/spotless/pull/193))
 
 ## [1.8.0] - 2018-01-02
-* LicenseHeaderStep now supports time-aware copyright notices in license headers. ([#179](https://github.com/diffplug/spotless/pull/179), thanks to @baptistemesta)
+
+- LicenseHeaderStep now supports time-aware copyright notices in license headers. ([#179](https://github.com/diffplug/spotless/pull/179), thanks to @baptistemesta)
 
 ## [1.7.0] - 2018-12-02
-* Updated default eclipse-jdt version to `4.7.1` from `4.6.3`.
-* Updated jgit from `4.5.0.201609210915-r` to `4.9.0.201710071750-r`.
-* Updated concurrent-trees from `2.6.0` to `2.6.1` (performance improvement).
-* Added `dbeaverSql` formatter step, for formatting sql scripts. ([#166](https://github.com/diffplug/spotless/pull/166))
-  + Many thanks to [Baptiste Mesta](https://github.com/baptistemesta) for porting to Spotless.
-  + Many thanks to [DBeaver](https://dbeaver.jkiss.org/) and the [DBeaver contributors](https://github.com/serge-rider/dbeaver/graphs/contributors) for building the implementation.
+
+- Updated default eclipse-jdt version to `4.7.1` from `4.6.3`.
+- Updated jgit from `4.5.0.201609210915-r` to `4.9.0.201710071750-r`.
+- Updated concurrent-trees from `2.6.0` to `2.6.1` (performance improvement).
+- Added `dbeaverSql` formatter step, for formatting sql scripts. ([#166](https://github.com/diffplug/spotless/pull/166))
+  - Many thanks to [Baptiste Mesta](https://github.com/baptistemesta) for porting to Spotless.
+  - Many thanks to [DBeaver](https://dbeaver.jkiss.org/) and the [DBeaver contributors](https://github.com/serge-rider/dbeaver/graphs/contributors) for building the implementation.
 
 ## [1.6.0] - 2017-09-29
-* Added `public static boolean PaddedCell::applyAnyChanged(Formatter formatter, File file)`.
+
+- Added `public static boolean PaddedCell::applyAnyChanged(Formatter formatter, File file)`.
 
 ## [1.5.1] - 2017-08-14
-* Added `KtLintStep.createForScript`.
+
+- Added `KtLintStep.createForScript`.
 
 ## [1.5.0] - 2017-08-13
-* Deprecated `ImportOrderStep.createFromOrder(List<String>` in favor of `(String...`.
+
+- Deprecated `ImportOrderStep.createFromOrder(List<String>` in favor of `(String...`.
 
 ## [1.4.1] - 2017-07-11
-* Default eclipse version for `EclipseFormatterStep` bumped to `4.6.3` from `4.6.1`. ([#116](https://github.com/diffplug/spotless/issues/116))
-* Default scalafmt version for `ScalaFmtStep` bumped to `1.1.0` from `0.5.7` ([#124](https://github.com/diffplug/spotless/pull/124))
-  + Also added support for the API change to scalafmt introduced in `0.7.0-RC1`
+
+- Default eclipse version for `EclipseFormatterStep` bumped to `4.6.3` from `4.6.1`. ([#116](https://github.com/diffplug/spotless/issues/116))
+- Default scalafmt version for `ScalaFmtStep` bumped to `1.1.0` from `0.5.7` ([#124](https://github.com/diffplug/spotless/pull/124))
+  - Also added support for the API change to scalafmt introduced in `0.7.0-RC1`
 
 ## [1.4.0] - 2017-05-21
-* `ImportOrderStep` can now handle multi-line comments and misplaced imports.
-  + Especially helpful for Groovy and Gradle files.
+
+- `ImportOrderStep` can now handle multi-line comments and misplaced imports.
+  - Especially helpful for Groovy and Gradle files.
 
 ## [1.3.2] - 2017-05-03
-* Fixed a bug in `PaddedCellBulk.check()` which caused a `check` to fail even after an `apply` for cases which caused CYCLE.
+
+- Fixed a bug in `PaddedCellBulk.check()` which caused a `check` to fail even after an `apply` for cases which caused CYCLE.
 
 ## [1.3.0] - 2017-04-11
-* Added support for Groovy via [greclipse](https://github.com/groovy/groovy-eclipse).
-* When a JarState resolution failed, it threw a Gradle-specific error message. That message has been moved out of `lib` and into `plugin-gradle` where it belongs.
+
+- Added support for Groovy via [greclipse](https://github.com/groovy/groovy-eclipse).
+- When a JarState resolution failed, it threw a Gradle-specific error message. That message has been moved out of `lib` and into `plugin-gradle` where it belongs.
 
 ## [1.2.0] - 2017-04-03
-* Deprecated `FileSignature.from` in favor of `FileSignature.signAsSet` and the new `FileSignature.signAsList`.
-* Added a `FormatterProperties` class which loads `.properties` files and eclipse-style `.xml` files.
-* `SerializableFileFilter.skipFilesNamed` can now skip multiple file names.
-* Update default KtLint from 0.3.1 to 0.6.1.
-  + This means we no longer look for rules in the typo package `com.gihub.shyiko`, now only in `com.github.shyiko` (note the `t`).
+
+- Deprecated `FileSignature.from` in favor of `FileSignature.signAsSet` and the new `FileSignature.signAsList`.
+- Added a `FormatterProperties` class which loads `.properties` files and eclipse-style `.xml` files.
+- `SerializableFileFilter.skipFilesNamed` can now skip multiple file names.
+- Update default KtLint from 0.3.1 to 0.6.1.
+  - This means we no longer look for rules in the typo package `com.gihub.shyiko`, now only in `com.github.shyiko` (note the `t`).
 
 ## [1.1.0] - 2017-02-27
-* Added support for Scala via [scalafmt](https://github.com/olafurpg/scalafmt).
-* Added support for Kotlin via [ktlint](https://github.com/pinterest/ktlint).
-* Better error messages for JarState.
-* Improved test harnessing.
-* Formatter now has pluggable exception policies,
+
+- Added support for Scala via [scalafmt](https://github.com/olafurpg/scalafmt).
+- Added support for Kotlin via [ktlint](https://github.com/pinterest/ktlint).
+- Better error messages for JarState.
+- Improved test harnessing.
+- Formatter now has pluggable exception policies,
 
 ## [1.0.0] - 2017-01-09
-* Initial release!
+
+- Initial release!

From 3c12c68ce281508a5f0eeb44745f76fe1192c807 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 7 Apr 2024 16:34:39 -0700
Subject: [PATCH 1571/2068] Remove deprecated PipeStepPair.

---
 .../spotless/generic/PipeStepPair.java        | 214 ------------------
 1 file changed, 214 deletions(-)
 delete mode 100644 lib/src/main/java/com/diffplug/spotless/generic/PipeStepPair.java

diff --git a/lib/src/main/java/com/diffplug/spotless/generic/PipeStepPair.java b/lib/src/main/java/com/diffplug/spotless/generic/PipeStepPair.java
deleted file mode 100644
index b15cb0ca54..0000000000
--- a/lib/src/main/java/com/diffplug/spotless/generic/PipeStepPair.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Copyright 2020-2024 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.generic;
-
-import java.io.File;
-import java.io.Serializable;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import com.diffplug.spotless.Formatter;
-import com.diffplug.spotless.FormatterFunc;
-import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.LineEnding;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
-/**
- * @deprecated use FenceStep instead
- */
-@Deprecated
-public class PipeStepPair {
-	/** The two steps will be named {@code <name>In} and {@code <name>Out}. */
-	public static Builder named(String name) {
-		return new Builder(name);
-	}
-
-	public static String defaultToggleName() {
-		return "toggle";
-	}
-
-	public static String defaultToggleOff() {
-		return "spotless:off";
-	}
-
-	public static String defaultToggleOn() {
-		return "spotless:on";
-	}
-
-	public static class Builder {
-		String name;
-		Pattern regex;
-
-		private Builder(String name) {
-			this.name = Objects.requireNonNull(name);
-		}
-
-		/** Defines the opening and closing markers. */
-		public Builder openClose(String open, String close) {
-			return regex(Pattern.quote(open) + "([\\s\\S]*?)" + Pattern.quote(close));
-		}
-
-		/** Defines the pipe via regex. Must have *exactly one* capturing group. */
-		public Builder regex(String regex) {
-			return regex(Pattern.compile(regex));
-		}
-
-		/** Defines the pipe via regex. Must have *exactly one* capturing group. */
-		public Builder regex(Pattern regex) {
-			this.regex = Objects.requireNonNull(regex);
-			return this;
-		}
-
-		/** Returns a pair of steps which captures in the first part, then returns in the second. */
-		public PipeStepPair buildPair() {
-			return new PipeStepPair(name, regex);
-		}
-
-		/** Returns a single step which will apply the given steps only within the blocks selected by the regex / openClose pair. */
-		public FormatterStep buildStepWhichAppliesSubSteps(Path rootPath, Collection<? extends FormatterStep> steps) {
-			return FormatterStep.createLazy(name,
-					() -> new StateApplyToBlock(regex, steps),
-					state -> FormatterFunc.Closeable.of(state.buildFormatter(rootPath), state::format));
-		}
-	}
-
-	final FormatterStep in, out;
-
-	private PipeStepPair(String name, Pattern pattern) {
-		StateIn stateIn = new StateIn(pattern);
-		StateOut stateOut = new StateOut(stateIn);
-		in = FormatterStep.create(name + "In", stateIn, state -> state::format);
-		out = FormatterStep.create(name + "Out", stateOut, state -> state::format);
-	}
-
-	public FormatterStep in() {
-		return in;
-	}
-
-	public FormatterStep out() {
-		return out;
-	}
-
-	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
-	static class StateApplyToBlock extends StateIn implements Serializable {
-		private static final long serialVersionUID = -844178006407733370L;
-
-		final List<FormatterStep> steps;
-		final transient StringBuilder builder = new StringBuilder();
-
-		StateApplyToBlock(Pattern regex, Collection<? extends FormatterStep> steps) {
-			super(regex);
-			this.steps = new ArrayList<>(steps);
-		}
-
-		Formatter buildFormatter(Path rootDir) {
-			return Formatter.builder()
-					.encoding(StandardCharsets.UTF_8) // can be any UTF, doesn't matter
-					.lineEndingsPolicy(LineEnding.UNIX.createPolicy()) // just internal, won't conflict with user
-					.steps(steps)
-					.rootDir(rootDir)
-					.build();
-		}
-
-		private String format(Formatter formatter, String unix, File file) throws Exception {
-			groups.clear();
-			Matcher matcher = regex.matcher(unix);
-			while (matcher.find()) {
-				// apply the formatter to each group
-				groups.add(formatter.compute(matcher.group(1), file));
-			}
-			// and then assemble the result right away
-			return stateOutCompute(this, builder, unix);
-		}
-	}
-
-	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
-	static class StateIn implements Serializable {
-		private static final long serialVersionUID = -844178006407733370L;
-
-		final Pattern regex;
-
-		public StateIn(Pattern regex) {
-			this.regex = Objects.requireNonNull(regex);
-		}
-
-		final transient ArrayList<String> groups = new ArrayList<>();
-
-		private String format(String unix) throws Exception {
-			groups.clear();
-			Matcher matcher = regex.matcher(unix);
-			while (matcher.find()) {
-				groups.add(matcher.group(1));
-			}
-			return unix;
-		}
-	}
-
-	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
-	static class StateOut implements Serializable {
-		private static final long serialVersionUID = -1195263184715054229L;
-
-		final StateIn in;
-
-		StateOut(StateIn in) {
-			this.in = Objects.requireNonNull(in);
-		}
-
-		final transient StringBuilder builder = new StringBuilder();
-
-		private String format(String unix) {
-			return stateOutCompute(in, builder, unix);
-		}
-	}
-
-	private static String stateOutCompute(StateIn in, StringBuilder builder, String unix) {
-		if (in.groups.isEmpty()) {
-			return unix;
-		}
-		builder.setLength(0);
-		Matcher matcher = in.regex.matcher(unix);
-		int lastEnd = 0;
-		int groupIdx = 0;
-		while (matcher.find()) {
-			builder.append(unix, lastEnd, matcher.start(1));
-			builder.append(in.groups.get(groupIdx));
-			lastEnd = matcher.end(1);
-			++groupIdx;
-		}
-		if (groupIdx == in.groups.size()) {
-			builder.append(unix, lastEnd, unix.length());
-			return builder.toString();
-		} else {
-			// throw an error with either the full regex, or the nicer open/close pair
-			Matcher openClose = Pattern.compile("\\\\Q([\\s\\S]*?)\\\\E" + "\\Q([\\s\\S]*?)\\E" + "\\\\Q([\\s\\S]*?)\\\\E")
-					.matcher(in.regex.pattern());
-			String pattern;
-			if (openClose.matches()) {
-				pattern = openClose.group(1) + " " + openClose.group(2);
-			} else {
-				pattern = in.regex.pattern();
-			}
-			throw new Error("An intermediate step removed a match of " + pattern);
-		}
-	}
-}

From e1f159ac621dd917671cfdcb7f300ba0cd918406 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 7 Apr 2024 16:34:53 -0700
Subject: [PATCH 1572/2068] Remove deprecated
 `FormatterStep.filterByContentPattern`

---
 .../java/com/diffplug/spotless/FormatterStep.java   | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
index d2e87b8675..070e502a0c 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
@@ -46,19 +46,6 @@ public interface FormatterStep extends Serializable, AutoCloseable {
 	@Nullable
 	String format(String rawUnix, File file) throws Exception;
 
-	/**
-	 * Returns a new FormatterStep which will only apply its changes
-	 * to files which pass the given filter.
-	 *
-	 * @param contentPattern
-	 *            java regular expression used to filter out files which content doesn't contain pattern
-	 * @return FormatterStep
-	 */
-	@Deprecated
-	default FormatterStep filterByContentPattern(String contentPattern) {
-		return filterByContent(OnMatch.INCLUDE, contentPattern);
-	}
-
 	/**
 	 * Returns a new {@code FormatterStep} which, observing the value of {@code formatIfMatches},
 	 * will only apply, or not, its changes to files which pass the given filter.

From ae5f565f0603a84172fa8ba65eb43746054a8bf6 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 7 Apr 2024 16:35:10 -0700
Subject: [PATCH 1573/2068] Remove deprecated duplicate of
 `FormatterStep.ofDangerous`

---
 lib/src/main/java/com/diffplug/spotless/FormatterFunc.java | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java b/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java
index acd05e031b..b13271c887 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java
@@ -71,12 +71,6 @@ public String apply(String unix) throws Exception {
 			};
 		}
 
-		/** @deprecated synonym for {@link #ofDangerous(AutoCloseable, FormatterFunc)} */
-		@Deprecated
-		public static Closeable of(AutoCloseable closeable, FormatterFunc function) {
-			return ofDangerous(closeable, function);
-		}
-
 		@FunctionalInterface
 		interface ResourceFunc<T extends AutoCloseable> {
 			String apply(T resource, String unix) throws Exception;

From b901431962b04a327960871f493c03a90c49a7e6 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 7 Apr 2024 16:35:21 -0700
Subject: [PATCH 1574/2068] Remove deprecated EquoBasedStepBuilder constructor

---
 .../com/diffplug/spotless/extra/EquoBasedStepBuilder.java   | 6 ------
 1 file changed, 6 deletions(-)

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 5aaa1a4dee..2654bfba26 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
@@ -53,12 +53,6 @@ public abstract class EquoBasedStepBuilder {
 	private Iterable<File> settingsFiles = new ArrayList<>();
 	private Map<String, String> p2Mirrors = Map.of();
 
-	/** @deprecated if you use this constructor you *must* call {@link #setVersion(String)} before calling {@link #build()} */
-	@Deprecated
-	public EquoBasedStepBuilder(String formatterName, Provisioner mavenProvisioner, SerializedFunction<State, FormatterFunc> stateToFormatter) {
-		this(formatterName, mavenProvisioner, null, stateToFormatter);
-	}
-
 	/** Initialize valid default configuration, taking latest version */
 	public EquoBasedStepBuilder(String formatterName, Provisioner mavenProvisioner, @Nullable String defaultVersion, SerializedFunction<State, FormatterFunc> stateToFormatter) {
 		this.formatterName = formatterName;

From 2b8dc94a4d134e9e120a01eebed2923d1d9d27d5 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 7 Apr 2024 16:36:45 -0700
Subject: [PATCH 1575/2068] spotlessApply

---
 lib/src/main/java/com/diffplug/spotless/FormatterFunc.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java b/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java
index b13271c887..7aee828b0d 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From abf994e2e831383b63529c16a8230e0eed86fd0d Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Mon, 8 Apr 2024 11:47:01 +0800
Subject: [PATCH 1576/2068] Note the default Ktlint style sections in docs

---
 plugin-gradle/README.md | 2 ++
 plugin-maven/README.md  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 606589ed7f..64d8f711b6 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -418,6 +418,8 @@ spotless {
       .editorConfigOverride(
         mapOf(
           "indent_size" to 2,
+          // intellij_idea is the default style we preset in Spotless, you can override it referring to https://pinterest.github.io/ktlint/latest/rules/code-styles.
+          "ktlint_code_style" to "intellij_idea",
         )
       )
       .customRuleSets(
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 383efd53ec..cfa0a59a73 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -419,6 +419,8 @@ Additionally, `editorConfigOverride` options will override what's supplied in `.
   <editorConfigOverride> <!-- optional -->
     <ij_kotlin_allow_trailing_comma>true</ij_kotlin_allow_trailing_comma>
     <ij_kotlin_allow_trailing_comma_on_call_site>true</ij_kotlin_allow_trailing_comma_on_call_site>
+    <!-- intellij_idea is the default style we preset in Spotless, you can override it referring to https://pinterest.github.io/ktlint/latest/rules/code-styles. -->
+    <ktlint_code_style>intellij_idea</ktlint_code_style>
   </editorConfigOverride>
   <customRuleSets> <!-- optional -->
     <value>io.nlopez.compose.rules:ktlint:0.3.3</value>

From c35888a27e095661162572e288a6b67e0a53ddd9 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Thu, 11 Apr 2024 20:37:12 +0200
Subject: [PATCH 1577/2068] chore: try reproducing issue 1984

---
 .../spotless/PrettierIntegrationTest.java     | 50 ++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java
index 74b6db9167..9799fbcf15 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -358,6 +358,54 @@ void autodetectNpmrcFileConfig(String prettierVersion) throws IOException {
 		Assertions.assertThat(spotlessApply.getOutput()).containsPattern("Running npm command.*npm install.* failed with exit code: 1");
 	}
 
+	@ParameterizedTest(name = "{index}: verifyCleanAndSpotlessWorks with prettier {0}")
+	@ValueSource(strings = {PRETTIER_VERSION_2, PRETTIER_VERSION_3})
+	void verifyCleanAndSpotlessWorks(String prettierVersion) throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"def prettierConfig = [:]",
+				"prettierConfig['printWidth'] = 20",
+				"prettierConfig['parser'] = 'typescript'",
+				"spotless {",
+				"    format 'mytypescript', {",
+				"        target 'test.ts'",
+				"        prettier('" + prettierVersion + "').config(prettierConfig)",
+				"    }",
+				"}");
+		setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
+		final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "clean", "spotlessApply").build();
+		Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		final BuildResult spotlessApply2 = gradleRunner().withArguments("--stacktrace", "clean", "spotlessApply").build();
+		Assertions.assertThat(spotlessApply2.getOutput()).contains("BUILD SUCCESSFUL");
+	}
+
+	@ParameterizedTest(name = "{index}: verifyCleanAndSpotlessWithNpmInstallCacheWorks with prettier {0}")
+	@ValueSource(strings = {PRETTIER_VERSION_2, PRETTIER_VERSION_3})
+	void verifyCleanAndSpotlessWithNpmInstallCacheWorks(String prettierVersion) throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"def prettierConfig = [:]",
+				"prettierConfig['printWidth'] = 20",
+				"prettierConfig['parser'] = 'typescript'",
+				"spotless {",
+				"    format 'mytypescript', {",
+				"        target 'test.ts'",
+				"        prettier('" + prettierVersion + "').npmInstallCache().config(prettierConfig)",
+				"    }",
+				"}");
+		setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
+		final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "clean", "spotlessApply").build();
+		Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		final BuildResult spotlessApply2 = gradleRunner().withArguments("--stacktrace", "clean", "spotlessApply").build();
+		Assertions.assertThat(spotlessApply2.getOutput()).contains("BUILD SUCCESSFUL");
+	}
+
 	@ParameterizedTest(name = "{index}: autodetectNpmrcFileConfig with prettier {0}")
 	@ValueSource(strings = {PRETTIER_VERSION_2, PRETTIER_VERSION_3})
 	void pickupNpmrcFileConfig(String prettierVersion) throws IOException {

From f3dc4801b4288dd0f97a6fe5c284e59ff3304910 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Thu, 11 Apr 2024 20:53:18 +0200
Subject: [PATCH 1578/2068] fix: increase robustness by recreating cache dir

---
 .../NodeModulesCachingNpmProcessFactory.java  |  9 ++++----
 .../com/diffplug/spotless/npm/ShadowCopy.java | 22 ++++++++++++-------
 .../diffplug/spotless/npm/ShadowCopyTest.java |  5 +++--
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NodeModulesCachingNpmProcessFactory.java b/lib/src/main/java/com/diffplug/spotless/npm/NodeModulesCachingNpmProcessFactory.java
index 8a3af5fdf2..2f1addf2af 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NodeModulesCachingNpmProcessFactory.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NodeModulesCachingNpmProcessFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,11 +38,11 @@ public class NodeModulesCachingNpmProcessFactory implements NpmProcessFactory {
 
 	private NodeModulesCachingNpmProcessFactory(@Nonnull File cacheDir) {
 		this.cacheDir = Objects.requireNonNull(cacheDir);
-		assertDir(cacheDir);
-		this.shadowCopy = new ShadowCopy(cacheDir);
+		assertDir(); // throws if cacheDir is not a directory
+		this.shadowCopy = new ShadowCopy(this::assertDir);
 	}
 
-	private void assertDir(File cacheDir) {
+	private synchronized File assertDir() {
 		if (cacheDir.exists() && !cacheDir.isDirectory()) {
 			throw new IllegalArgumentException("Cache dir must be a directory");
 		}
@@ -51,6 +51,7 @@ private void assertDir(File cacheDir) {
 				throw new IllegalArgumentException("Cache dir could not be created.");
 			}
 		}
+		return cacheDir;
 	}
 
 	public static NodeModulesCachingNpmProcessFactory create(@Nonnull File cacheDir) {
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/ShadowCopy.java b/lib/src/main/java/com/diffplug/spotless/npm/ShadowCopy.java
index 044b5d70ea..0241d0cbcc 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/ShadowCopy.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/ShadowCopy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@
 import java.nio.file.attribute.BasicFileAttributes;
 import java.time.Duration;
 import java.util.concurrent.TimeoutException;
+import java.util.function.Supplier;
 
 import javax.annotation.Nonnull;
 
@@ -39,13 +40,18 @@ class ShadowCopy {
 
 	private static final Logger logger = LoggerFactory.getLogger(ShadowCopy.class);
 
-	private final File shadowCopyRoot;
+	private final Supplier<File> shadowCopyRootSupplier;
 
-	public ShadowCopy(@Nonnull File shadowCopyRoot) {
-		this.shadowCopyRoot = shadowCopyRoot;
+	public ShadowCopy(@Nonnull Supplier<File> shadowCopyRootSupplier) {
+		this.shadowCopyRootSupplier = shadowCopyRootSupplier;
+	}
+
+	private File shadowCopyRoot() {
+		File shadowCopyRoot = shadowCopyRootSupplier.get();
 		if (!shadowCopyRoot.isDirectory()) {
-			throw new IllegalArgumentException("Shadow copy root must be a directory: " + shadowCopyRoot);
+			throw new IllegalStateException("Shadow copy root must be a directory: " + shadowCopyRoot);
 		}
+		return shadowCopyRoot;
 	}
 
 	public void addEntry(String key, File orig) {
@@ -86,17 +92,17 @@ private void cleanupReservation(String key) {
 	}
 
 	private Path markerFilePath(String key) {
-		return Paths.get(shadowCopyRoot.getAbsolutePath(), key + ".marker");
+		return Paths.get(shadowCopyRoot().getAbsolutePath(), key + ".marker");
 	}
 
 	private File entry(String key, String origName) {
-		return Paths.get(shadowCopyRoot.getAbsolutePath(), key, origName).toFile();
+		return Paths.get(shadowCopyRoot().getAbsolutePath(), key, origName).toFile();
 	}
 
 	private boolean reserveSubFolder(String key) {
 		// put a marker file named "key".marker in "shadowCopyRoot" to make sure no other process is using it or return false if it already exists
 		try {
-			Files.createFile(Paths.get(shadowCopyRoot.getAbsolutePath(), key + ".marker"));
+			Files.createFile(Paths.get(shadowCopyRoot().getAbsolutePath(), key + ".marker"));
 			return true;
 		} catch (FileAlreadyExistsException e) {
 			return false;
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/ShadowCopyTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/ShadowCopyTest.java
index 1ef1b77caa..297fa1d5bd 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/ShadowCopyTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/ShadowCopyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,6 +29,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import com.diffplug.common.base.Suppliers;
 import com.diffplug.spotless.ResourceHarness;
 
 class ShadowCopyTest extends ResourceHarness {
@@ -43,7 +44,7 @@ class ShadowCopyTest extends ResourceHarness {
 	@BeforeEach
 	void setUp() throws IOException {
 		shadowCopyRoot = newFolder("shadowCopyRoot");
-		shadowCopy = new ShadowCopy(shadowCopyRoot);
+		shadowCopy = new ShadowCopy(Suppliers.ofInstance(shadowCopyRoot));
 	}
 
 	@Test

From dda3a8e2cde34c1b4a3d903a4a4972d674fde3bc Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Thu, 11 Apr 2024 20:53:28 +0200
Subject: [PATCH 1579/2068] chore: add changelog

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 1 +
 plugin-maven/CHANGES.md  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 22f14f2137..aab29376e3 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -19,6 +19,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
 * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))
 * Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078))
+* Made ShadowCopy (`npmInstallCache`) more robust by re-creating the cache dir if it goes missing ([#1984](https://github.com/diffplug/spotless/issues/1984),[2096](https://github.com/diffplug/spotless/pull/2096))
 ### Removed
 * **BREAKING** Remove `JarState.getMavenCoordinate(String prefix)`. ([#1945](https://github.com/diffplug/spotless/pull/1945))
 * **BREAKING** Replace `PipeStepPair` with `FenceStep`. ([#1954](https://github.com/diffplug/spotless/pull/1954))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index ffaaa932dc..5865966320 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -14,6 +14,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
 * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))
 * Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078))
+* Made ShadowCopy (`npmInstallCache`) more robust by re-creating the cache dir if it goes missing ([#1984](https://github.com/diffplug/spotless/issues/1984),[2096](https://github.com/diffplug/spotless/pull/2096))
 ### Added
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
 * Add support for formatting and sorting Maven POMs ([#2082](https://github.com/diffplug/spotless/issues/2082))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index af419b1ad3..e2858b1095 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
 * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))
 * Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078))
+* Made ShadowCopy (`npmInstallCache`) more robust by re-creating the cache dir if it goes missing ([#1984](https://github.com/diffplug/spotless/issues/1984),[2096](https://github.com/diffplug/spotless/pull/2096))
 ### Added
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
 * Skip execution in M2E (incremental) builds by default ([#1814](https://github.com/diffplug/spotless/issues/1814), [#2037](https://github.com/diffplug/spotless/issues/2037)) 

From 2c4d883e7abf9a2cf34b2c1c8c0182d68ee7fc92 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 25 Apr 2024 00:01:31 -0700
Subject: [PATCH 1580/2068] Revert "Update changelog."

This reverts commit aeabaf061f7f7c488d831a47aa1066efe24e68bd.
---
 CHANGES.md | 1273 +++++++++++++++++++---------------------------------
 1 file changed, 466 insertions(+), 807 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index b559749835..22f14f2137 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,1237 +10,896 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
-
 ### Added
-
-- `FileSignature.Promised` and `JarState.Promised` to facilitate round-trip serialization for the Gradle configuration cache. ([#1945](https://github.com/diffplug/spotless/pull/1945))
-- Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
-
+* `FileSignature.Promised` and `JarState.Promised` to facilitate round-trip serialization for the Gradle configuration cache. ([#1945](https://github.com/diffplug/spotless/pull/1945)) 
+* Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
 ### Changes
-
-- **BREAKING** `FormatterStep` now extends `AutoCloseable`. ([#2091](https://github.com/diffplug/spotless/pull/2091))
-- Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
-- Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049))
-- Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
-- Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))
-- Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078))
-
+* Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
+* Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049))
+* Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
+* Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))
+* Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078))
 ### Removed
-
-- **BREAKING** Remove `JarState.getMavenCoordinate(String prefix)`. ([#1945](https://github.com/diffplug/spotless/pull/1945))
-- **BREAKING** Replace `PipeStepPair` with `FenceStep`. ([#1954](https://github.com/diffplug/spotless/pull/1954))
-
+* **BREAKING** Remove `JarState.getMavenCoordinate(String prefix)`. ([#1945](https://github.com/diffplug/spotless/pull/1945))
+* **BREAKING** Replace `PipeStepPair` with `FenceStep`. ([#1954](https://github.com/diffplug/spotless/pull/1954))
 ### Fixed
-
-- Ignore system git config when running tests ([#1990](https://github.com/diffplug/spotless/issues/1990))
-- Correctly provide EditorConfig property types for Ktlint ([#2052](https://github.com/diffplug/spotless/issues/2052))
+* Ignore system git config when running tests ([#1990](https://github.com/diffplug/spotless/issues/1990))
+* Correctly provide EditorConfig property types for Ktlint ([#2052](https://github.com/diffplug/spotless/issues/2052))
 
 ## [2.45.0] - 2024-01-23
-
 ### Added
-
-- Support for `gofmt` ([#2001](https://github.com/diffplug/spotless/pull/2001))
-- Support for formatting Java Docs for the Palantir formatter ([#2009](https://github.com/diffplug/spotless/pull/2009))
+* Support for `gofmt` ([#2001](https://github.com/diffplug/spotless/pull/2001))
+* Support for formatting Java Docs for the Palantir formatter ([#2009](https://github.com/diffplug/spotless/pull/2009))
 
 ## [2.44.0] - 2024-01-15
-
 ### Added
-
-- New static method to `DiffMessageFormatter` which allows to retrieve diffs with their line numbers ([#1960](https://github.com/diffplug/spotless/issues/1960))
-- Gradle - Support for formatting shell scripts via [shfmt](https://github.com/mvdan/sh). ([#1994](https://github.com/diffplug/spotless/pull/1994))
-
+* New static method to `DiffMessageFormatter` which allows to retrieve diffs with their line numbers ([#1960](https://github.com/diffplug/spotless/issues/1960))
+* Gradle - Support for formatting shell scripts via [shfmt](https://github.com/mvdan/sh). ([#1994](https://github.com/diffplug/spotless/pull/1994))
 ### Fixed
-
-- Fix empty files with biome >= 1.5.0 when formatting files that are in the ignore list of the biome configuration file. ([#1989](https://github.com/diffplug/spotless/pull/1989) fixes [#1987](https://github.com/diffplug/spotless/issues/1987))
-- Fix a regression in BufStep where the same arguments were being provided to every `buf` invocation. ([#1976](https://github.com/diffplug/spotless/issues/1976))
-
+* Fix empty files with biome >= 1.5.0 when formatting files that are in the ignore list of the biome configuration file. ([#1989](https://github.com/diffplug/spotless/pull/1989) fixes [#1987](https://github.com/diffplug/spotless/issues/1987))
+* Fix a regression in BufStep where the same arguments were being provided to every `buf` invocation. ([#1976](https://github.com/diffplug/spotless/issues/1976))
 ### Changes
-
-- Use palantir-java-format 2.39.0 on Java 21. ([#1948](https://github.com/diffplug/spotless/pull/1948))
-- Bump default `ktlint` version to latest `1.0.1` -> `1.1.1`. ([#1973](https://github.com/diffplug/spotless/pull/1973))
-- Bump default `googleJavaFormat` version to latest `1.18.1` -> `1.19.2`. ([#1971](https://github.com/diffplug/spotless/pull/1971))
-- Bump default `diktat` version to latest `1.2.5` -> `2.0.0`. ([#1972](https://github.com/diffplug/spotless/pull/1972))
+* Use palantir-java-format 2.39.0 on Java 21. ([#1948](https://github.com/diffplug/spotless/pull/1948))
+* Bump default `ktlint` version to latest `1.0.1` -> `1.1.1`. ([#1973](https://github.com/diffplug/spotless/pull/1973))
+* Bump default `googleJavaFormat` version to latest `1.18.1` -> `1.19.2`. ([#1971](https://github.com/diffplug/spotless/pull/1971))
+* Bump default `diktat` version to latest `1.2.5` -> `2.0.0`. ([#1972](https://github.com/diffplug/spotless/pull/1972))
 
 ## [2.43.1] - 2023-12-04
-
 ### Fixed
-
-- Eclipse-based steps which contained any jars with a `+` in their path were broken, now fixed. ([#1860](https://github.com/diffplug/spotless/issues/1860#issuecomment-1826113332))
-
+* Eclipse-based steps which contained any jars with a `+` in their path were broken, now fixed. ([#1860](https://github.com/diffplug/spotless/issues/1860#issuecomment-1826113332))
 ### Changes
-
-- Bump default `palantir-java-format` version to latest `2.28.0` -> `2.38.0` on Java 21. ([#1920](https://github.com/diffplug/spotless/pull/1920))
-- Bump default `googleJavaFormat` version to latest `1.17.0` -> `1.18.1`. ([#1920](https://github.com/diffplug/spotless/pull/1920))
-- Bump default `ktfmt` version to latest `0.44` -> `0.46`. ([#1927](https://github.com/diffplug/spotless/pull/1927))
-- Bump default `eclipse` version to latest `4.27` -> `4.29`. ([#1939](https://github.com/diffplug/spotless/pull/1939))
-- Bump default `greclipse` version to latest `4.28` -> `4.29`. ([#1939](https://github.com/diffplug/spotless/pull/1939))
-- Bump default `cdt` version to latest `11.1` -> `11.3`. ([#1939](https://github.com/diffplug/spotless/pull/1939))
+* Bump default `palantir-java-format` version to latest `2.28.0` -> `2.38.0` on Java 21. ([#1920](https://github.com/diffplug/spotless/pull/1920))
+* Bump default `googleJavaFormat` version to latest `1.17.0` -> `1.18.1`. ([#1920](https://github.com/diffplug/spotless/pull/1920))
+* Bump default `ktfmt` version to latest `0.44` -> `0.46`. ([#1927](https://github.com/diffplug/spotless/pull/1927))
+* Bump default `eclipse` version to latest `4.27` -> `4.29`. ([#1939](https://github.com/diffplug/spotless/pull/1939))
+* Bump default `greclipse` version to latest `4.28` -> `4.29`. ([#1939](https://github.com/diffplug/spotless/pull/1939))
+* Bump default `cdt` version to latest `11.1` -> `11.3`. ([#1939](https://github.com/diffplug/spotless/pull/1939))
 
 ## [2.43.0] - 2023-11-27
-
 ### Added
-
-- Support custom rule sets for Ktlint. ([#1896](https://github.com/diffplug/spotless/pull/1896))
-
+* Support custom rule sets for Ktlint. ([#1896](https://github.com/diffplug/spotless/pull/1896))
 ### Fixed
-
-- Fix Eclipse JDT on some settings files. ([#1864](https://github.com/diffplug/spotless/pull/1864) fixes [#1638](https://github.com/diffplug/spotless/issues/1638))
-
+* Fix Eclipse JDT on some settings files. ([#1864](https://github.com/diffplug/spotless/pull/1864) fixes [#1638](https://github.com/diffplug/spotless/issues/1638))
 ### Changes
-
-- Bump default `ktlint` version to latest `1.0.0` -> `1.0.1`. ([#1855](https://github.com/diffplug/spotless/pull/1855))
-- Add a Step to remove semicolons from Groovy files. ([#1881](https://github.com/diffplug/spotless/pull/1881))
+* Bump default `ktlint` version to latest `1.0.0` -> `1.0.1`. ([#1855](https://github.com/diffplug/spotless/pull/1855))
+* Add a Step to remove semicolons from Groovy files. ([#1881](https://github.com/diffplug/spotless/pull/1881))
 
 ## [2.42.0] - 2023-09-28
-
 ### Added
-
-- Support for biome. The Rome project [was renamed to Biome](https://biomejs.dev/blog/annoucing-biome/).
+* Support for biome. The Rome project [was renamed to Biome](https://biomejs.dev/blog/annoucing-biome/).
   The configuration is still the same, but you should switch to the new `biome` tag / function and adjust
   the version accordingly. ([#1804](https://github.com/diffplug/spotless/issues/1804)).
-- Support for `google-java-format`'s `skip-javadoc-formatting` option. ([#1793](https://github.com/diffplug/spotless/pull/1793))
-- Support configuration of mirrors for P2 repositories in Maven DSL ([#1697](https://github.com/diffplug/spotless/issues/1697)).
-- New line endings mode `GIT_ATTRIBUTES_FAST_ALLSAME`. ([#1838](https://github.com/diffplug/spotless/pull/1838))
-
+* Support for `google-java-format`'s `skip-javadoc-formatting` option. ([#1793](https://github.com/diffplug/spotless/pull/1793))
+* Support configuration of mirrors for P2 repositories in Maven DSL ([#1697](https://github.com/diffplug/spotless/issues/1697)).
+* New line endings mode `GIT_ATTRIBUTES_FAST_ALLSAME`. ([#1838](https://github.com/diffplug/spotless/pull/1838))
 ### Fixed
-
-- Fix support for plugins when using Prettier version `3.0.0` and newer. ([#1802](https://github.com/diffplug/spotless/pull/1802))
-- Fix configuration cache issue around `external process started '/usr/bin/git --version'`. ([#1806](https://github.com/diffplug/spotless/issues/1806))
-
+* Fix support for plugins when using Prettier version `3.0.0` and newer. ([#1802](https://github.com/diffplug/spotless/pull/1802))
+* Fix configuration cache issue around `external process started '/usr/bin/git --version'`. ([#1806](https://github.com/diffplug/spotless/issues/1806))
 ### Changes
-
-- Bump default `flexmark` version to latest `0.64.0` -> `0.64.8`. ([#1801](https://github.com/diffplug/spotless/pull/1801))
-- Bump default `ktlint` version to latest `0.50.0` -> `1.0.0`. ([#1808](https://github.com/diffplug/spotless/pull/1808))
+* Bump default `flexmark` version to latest `0.64.0` -> `0.64.8`. ([#1801](https://github.com/diffplug/spotless/pull/1801))
+* Bump default `ktlint` version to latest `0.50.0` -> `1.0.0`. ([#1808](https://github.com/diffplug/spotless/pull/1808))
 
 ## [2.41.0] - 2023-08-29
-
 ### Added
-
-- Add a `jsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
-- Support GJF own import order. ([#1780](https://github.com/diffplug/spotless/pull/1780))
-
+* Add a `jsonPatch` step to `json` formatter configurations. This allows patching of JSON documents using [JSON Patches](https://jsonpatch.com). ([#1753](https://github.com/diffplug/spotless/pull/1753))
+* Support GJF own import order. ([#1780](https://github.com/diffplug/spotless/pull/1780))
 ### Fixed
-
-- Use latest versions of popular style guides for `eslint` tests to fix failing `useEslintXoStandardRules` test. ([#1761](https://github.com/diffplug/spotless/pull/1761), [#1756](https://github.com/diffplug/spotless/issues/1756))
-- Add support for `prettier` version `3.0.0` and newer. ([#1760](https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
-- Fix npm install calls when npm cache is not up-to-date. ([#1760](https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))
-
+* Use latest versions of popular style guides for `eslint` tests to fix failing `useEslintXoStandardRules` test. ([#1761](https://github.com/diffplug/spotless/pull/1761), [#1756](https://github.com/diffplug/spotless/issues/1756))
+* Add support for `prettier` version `3.0.0` and newer. ([#1760](https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
+* Fix npm install calls when npm cache is not up-to-date. ([#1760](https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))
 ### Changes
-
-- Bump default `eslint` version to latest `8.31.0` -> `8.45.0` ([#1761](https://github.com/diffplug/spotless/pull/1761))
-- Bump default `prettier` version to latest (v2) `2.8.1` -> `2.8.8`. ([#1760](https://github.com/diffplug/spotless/pull/1760))
-- Bump default `greclipse` version to latest `4.27` -> `4.28`. ([#1775](https://github.com/diffplug/spotless/pull/1775))
+* Bump default `eslint` version to latest `8.31.0` -> `8.45.0` ([#1761](https://github.com/diffplug/spotless/pull/1761))
+* Bump default `prettier` version to latest (v2) `2.8.1` -> `2.8.8`. ([#1760](https://github.com/diffplug/spotless/pull/1760))
+* Bump default `greclipse` version to latest `4.27` -> `4.28`. ([#1775](https://github.com/diffplug/spotless/pull/1775))
 
 ## [2.40.0] - 2023-07-17
-
 ### Added
-
-- Added support for Protobuf formatting based on [Buf](https://buf.build/). (#1208)
-- `enum OnMatch { INCLUDE, EXCLUDE }` so that `FormatterStep.filterByContent` can not only include based on the pattern but also exclude. ([#1749](https://github.com/diffplug/spotless/pull/1749))
-
+* Added support for Protobuf formatting based on [Buf](https://buf.build/). (#1208)
+* `enum OnMatch { INCLUDE, EXCLUDE }` so that `FormatterStep.filterByContent` can not only include based on the pattern but also exclude. ([#1749](https://github.com/diffplug/spotless/pull/1749))
 ### Fixed
-
-- Update documented default `semanticSort` to `false`. ([#1728](https://github.com/diffplug/spotless/pull/1728))
-
+* Update documented default `semanticSort` to `false`. ([#1728](https://github.com/diffplug/spotless/pull/1728))
 ### Changes
-
-- Bump default `cleanthat` version to latest `2.13` -> `2.17`. ([#1734](https://github.com/diffplug/spotless/pull/1734))
-- Bump default `ktlint` version to latest `0.49.1` -> `0.50.0`. ([#1741](https://github.com/diffplug/spotless/issues/1741))
-  - Dropped support for `ktlint 0.47.x` following our policy of supporting two breaking changes at a time.
-  - Dropped support for deprecated `useExperimental` parameter in favor of the `ktlint_experimental` property.
+* Bump default `cleanthat` version to latest `2.13` -> `2.17`. ([#1734](https://github.com/diffplug/spotless/pull/1734))
+* Bump default `ktlint` version to latest `0.49.1` -> `0.50.0`. ([#1741](https://github.com/diffplug/spotless/issues/1741))
+  * Dropped support for `ktlint 0.47.x` following our policy of supporting two breaking changes at a time.
+  * Dropped support for deprecated `useExperimental` parameter in favor of the `ktlint_experimental` property.
 
 ## [2.39.0] - 2023-05-24
-
 ### Added
-
-- `Jvm.Support` now accepts `-SNAPSHOT` versions, treated as the non`-SNAPSHOT`. ([#1583](https://github.com/diffplug/spotless/issues/1583))
-- Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. ([#1663](https://github.com/diffplug/spotless/pull/1663))
-- Add semantics-aware Java import ordering (i.e. sort by package, then class, then member). ([#522](https://github.com/diffplug/spotless/issues/522))
-
+* `Jvm.Support` now accepts `-SNAPSHOT` versions, treated as the non`-SNAPSHOT`. ([#1583](https://github.com/diffplug/spotless/issues/1583))
+* Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. ([#1663](https://github.com/diffplug/spotless/pull/1663))
+* Add semantics-aware Java import ordering (i.e. sort by package, then class, then member). ([#522](https://github.com/diffplug/spotless/issues/522))
 ### Fixed
-
-- Fixed a regression which changed the import sorting order in `googleJavaFormat` introduced in `2.38.0`. ([#1680](https://github.com/diffplug/spotless/pull/1680))
-- Equo-based formatters now work on platforms unsupported by Eclipse such as PowerPC (fixes [durian-swt#20](https://github.com/diffplug/durian-swt/issues/20))
-- When P2 download fails, indicate the responsible formatter. ([#1698](https://github.com/diffplug/spotless/issues/1698))
-
+* Fixed a regression which changed the import sorting order in `googleJavaFormat` introduced in `2.38.0`. ([#1680](https://github.com/diffplug/spotless/pull/1680))
+* Equo-based formatters now work on platforms unsupported by Eclipse such as PowerPC (fixes [durian-swt#20](https://github.com/diffplug/durian-swt/issues/20))
+* When P2 download fails, indicate the responsible formatter. ([#1698](https://github.com/diffplug/spotless/issues/1698))
 ### Changes
-
-- Equo-based formatters now download metadata to `~/.m2/repository/dev/equo/p2-data` rather than `~/.equo`, and for CI machines without a home directory the p2 data goes to `$GRADLE_USER_HOME/caches/p2-data`. ([#1714](https://github.com/diffplug/spotless/pull/1714))
-- Bump default `googleJavaFormat` version to latest `1.16.0` -> `1.17.0`. ([#1710](https://github.com/diffplug/spotless/pull/1710))
-- Bump default `ktfmt` version to latest `0.43` -> `0.44`. ([#1691](https://github.com/diffplug/spotless/pull/1691))
-- Bump default `ktlint` version to latest `0.48.2` -> `0.49.1`. ([#1696](https://github.com/diffplug/spotless/issues/1696))
-  - Dropped support for `ktlint 0.46.x` following our policy of supporting two breaking changes at a time.
-- Bump default `sortpom` version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675))
+* Equo-based formatters now download metadata to `~/.m2/repository/dev/equo/p2-data` rather than `~/.equo`, and for CI machines without a home directory the p2 data goes to `$GRADLE_USER_HOME/caches/p2-data`. ([#1714](https://github.com/diffplug/spotless/pull/1714))
+* Bump default `googleJavaFormat` version to latest `1.16.0` -> `1.17.0`. ([#1710](https://github.com/diffplug/spotless/pull/1710))
+* Bump default `ktfmt` version to latest `0.43` -> `0.44`. ([#1691](https://github.com/diffplug/spotless/pull/1691))
+* Bump default `ktlint` version to latest `0.48.2` -> `0.49.1`. ([#1696](https://github.com/diffplug/spotless/issues/1696))
+  * Dropped support for `ktlint 0.46.x` following our policy of supporting two breaking changes at a time.
+* Bump default `sortpom` version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675))
 
 ## [2.38.0] - 2023-04-06
-
 ### Added
-
-- Support configuration of mirrors for P2 repositories in `EquoBasedStepBuilder` ([#1629](https://github.com/diffplug/spotless/issues/1629)).
-- The `style` option in Palantir Java Format ([#1654](https://github.com/diffplug/spotless/pull/1654)).
-- Added formatter for Gherkin feature files ([#1649](https://github.com/diffplug/spotless/issues/1649)).
-
+* Support configuration of mirrors for P2 repositories in `EquoBasedStepBuilder` ([#1629](https://github.com/diffplug/spotless/issues/1629)).
+* The `style` option in Palantir Java Format ([#1654](https://github.com/diffplug/spotless/pull/1654)).
+* Added formatter for Gherkin feature files ([#1649](https://github.com/diffplug/spotless/issues/1649)).
 ### Changes
-
-- **POTENTIALLY BREAKING** Converted `googleJavaFormat` to a compile-only dependency and drop support for versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
-- Bump default `cleanthat` version to latest `2.6` -> `2.13`. ([#1589](https://github.com/diffplug/spotless/pull/1589) and [#1661](https://github.com/diffplug/spotless/pull/1661))
-- Bump default `diktat` version `1.2.4.2` -> `1.2.5`. ([#1631](https://github.com/diffplug/spotless/pull/1631))
-- Bump default `flexmark` version `0.62.2` -> `0.64.0`. ([#1302](https://github.com/diffplug/spotless/pull/1302))
-- Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
-- Bump default `scalafmt` version `3.7.1` -> `3.7.3`. ([#1584](https://github.com/diffplug/spotless/pull/1584))
-- Bump default Eclipse formatters for the 2023-03 release. ([#1662](https://github.com/diffplug/spotless/pull/1662))
-  - JDT and GrEclipse `4.26` -> `4.27`
-    - Improve GrEclipse error reporting. ([#1660](https://github.com/diffplug/spotless/pull/1660))
-  - CDT `11.0` -> `11.1`
+* **POTENTIALLY BREAKING** Converted `googleJavaFormat` to a compile-only dependency and drop support for versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
+* Bump default `cleanthat` version to latest `2.6` -> `2.13`. ([#1589](https://github.com/diffplug/spotless/pull/1589) and [#1661](https://github.com/diffplug/spotless/pull/1661))
+* Bump default `diktat` version `1.2.4.2` -> `1.2.5`. ([#1631](https://github.com/diffplug/spotless/pull/1631))
+* Bump default `flexmark` version `0.62.2` -> `0.64.0`. ([#1302](https://github.com/diffplug/spotless/pull/1302))
+* Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
+* Bump default `scalafmt` version `3.7.1` -> `3.7.3`. ([#1584](https://github.com/diffplug/spotless/pull/1584))
+* Bump default Eclipse formatters for the 2023-03 release. ([#1662](https://github.com/diffplug/spotless/pull/1662))
+  * JDT and GrEclipse `4.26` -> `4.27`
+    * Improve GrEclipse error reporting. ([#1660](https://github.com/diffplug/spotless/pull/1660))
+  * CDT `11.0` -> `11.1`
 
 ## [2.37.0] - 2023-03-13
-
 ### Added
-
-- You can now put the filename into a license header template with `$FILE`. ([#1605](https://github.com/diffplug/spotless/pull/1605) fixes [#1147](https://github.com/diffplug/spotless/issues/1147))
-
+* You can now put the filename into a license header template with `$FILE`. ([#1605](https://github.com/diffplug/spotless/pull/1605) fixes [#1147](https://github.com/diffplug/spotless/issues/1147))
 ### Changes
-
-- We are now opting in to Gradle's new stable configuration cache. ([#1591](https://github.com/diffplug/spotless/pull/1591))
-- Adopt [Equo Solstice OSGi and p2 shim](https://github.com/equodev/equo-ide/tree/main/solstice) to update all Eclipse-based plugins. ([#1524](https://github.com/diffplug/spotless/pull/1524))
-  - Eclipse JDT now supports `4.9` through `4.26`. Also we now recommend dropping the last `.0`, e.g. `4.26` instead of `4.26.0`, you'll get warnings to help you switch.
-  - Eclipse Groovy now supports `4.18` through `4.26`. Also we now recommend dropping the last `.0`, e.g. `4.26` instead of `4.26.0`, you'll get warnings to help you switch.
-  - Eclipse CDT now supports `10.6` through `11.0`.
-  - Eclipse WTP is still WIP at [#1622](https://github.com/diffplug/spotless/pull/1622).
+* We are now opting in to Gradle's new stable configuration cache. ([#1591](https://github.com/diffplug/spotless/pull/1591))
+* Adopt [Equo Solstice OSGi and p2 shim](https://github.com/equodev/equo-ide/tree/main/solstice) to update all Eclipse-based plugins. ([#1524](https://github.com/diffplug/spotless/pull/1524))
+  * Eclipse JDT now supports `4.9` through `4.26`. Also we now recommend dropping the last `.0`, e.g. `4.26` instead of `4.26.0`, you'll get warnings to help you switch.
+  * Eclipse Groovy now supports `4.18` through `4.26`. Also we now recommend dropping the last `.0`, e.g. `4.26` instead of `4.26.0`, you'll get warnings to help you switch.
+  * Eclipse CDT now supports `10.6` through `11.0`.
+  * Eclipse WTP is still WIP at [#1622](https://github.com/diffplug/spotless/pull/1622).
 
 ## [2.36.0] - 2023-02-27
-
 ### Added
-
-- `gradlew equoIde` opens a repeatable clean Spotless dev environment. ([#1523](https://github.com/diffplug/spotless/pull/1523))
-- `cleanthat` added `includeDraft` option, to include draft mutators from composite mutators. ([#1574](https://github.com/diffplug/spotless/pull/1574))
-- `npm`-based formatters now support caching of `node_modules` directory ([#1590](https://github.com/diffplug/spotless/pull/1590))
-
+* `gradlew equoIde` opens a repeatable clean Spotless dev environment. ([#1523](https://github.com/diffplug/spotless/pull/1523))
+* `cleanthat` added `includeDraft` option, to include draft mutators from composite mutators. ([#1574](https://github.com/diffplug/spotless/pull/1574))
+* `npm`-based formatters now support caching of `node_modules` directory ([#1590](https://github.com/diffplug/spotless/pull/1590))
 ### Fixed
-
-- `JacksonJsonFormatterFunc` handles json files with an Array as root. ([#1585](https://github.com/diffplug/spotless/pull/1585))
-
+* `JacksonJsonFormatterFunc` handles json files with an Array as root. ([#1585](https://github.com/diffplug/spotless/pull/1585))
 ### Changes
-
-- Bump default `cleanthat` version to latest `2.1` -> `2.6` ([#1569](https://github.com/diffplug/spotless/pull/1569) and [#1574](https://github.com/diffplug/spotless/pull/1574))
-- Reduce logging-noise created by `npm`-based formatters ([#1590](https://github.com/diffplug/spotless/pull/1590) fixes [#1582](https://github.com/diffplug/spotless/issues/1582))
+* Bump default `cleanthat` version to latest `2.1` -> `2.6` ([#1569](https://github.com/diffplug/spotless/pull/1569) and [#1574](https://github.com/diffplug/spotless/pull/1574))
+* Reduce logging-noise created by `npm`-based formatters ([#1590](https://github.com/diffplug/spotless/pull/1590) fixes [#1582](https://github.com/diffplug/spotless/issues/1582))
 
 ## [2.35.0] - 2023-02-10
-
 ### Added
-
-- CleanThat Java Refactorer. ([#1560](https://github.com/diffplug/spotless/pull/1560))
-- Introduce `LazyArgLogger` to allow for lazy evaluation of log messages in slf4j logging. ([#1565](https://github.com/diffplug/spotless/pull/1565))
-
+* CleanThat Java Refactorer. ([#1560](https://github.com/diffplug/spotless/pull/1560))
+* Introduce `LazyArgLogger` to allow for lazy evaluation of log messages in slf4j logging. ([#1565](https://github.com/diffplug/spotless/pull/1565))
 ### Fixed
-
-- Allow multiple instances of the same npm-based formatter to be used by separating their `node_modules` directories. ([#1565](https://github.com/diffplug/spotless/pull/1565))
-- `ktfmt` default style uses correct continuation indent. ([#1562](https://github.com/diffplug/spotless/pull/1562))
-
+* Allow multiple instances of the same npm-based formatter to be used by separating their `node_modules` directories. ([#1565](https://github.com/diffplug/spotless/pull/1565))
+* `ktfmt` default style uses correct continuation indent. ([#1562](https://github.com/diffplug/spotless/pull/1562))
 ### Changes
-
-- Bump default `ktfmt` version to latest `0.42` -> `0.43` ([#1561](https://github.com/diffplug/spotless/pull/1561))
-- Bump default `jackson` version to latest `2.14.1` -> `2.14.2` ([#1536](https://github.com/diffplug/spotless/pull/1536))
+* Bump default `ktfmt` version to latest `0.42` -> `0.43` ([#1561](https://github.com/diffplug/spotless/pull/1561))
+* Bump default `jackson` version to latest `2.14.1` -> `2.14.2` ([#1536](https://github.com/diffplug/spotless/pull/1536))
 
 ## [2.34.1] - 2023-02-05
-
 ### Changes
-
-- **POTENTIALLY BREAKING** Bump bytecode from Java 8 to 11 ([#1530](https://github.com/diffplug/spotless/pull/1530) part 2 of [#1337](https://github.com/diffplug/spotless/issues/1337))
-
+* **POTENTIALLY BREAKING** Bump bytecode from Java 8 to 11 ([#1530](https://github.com/diffplug/spotless/pull/1530) part 2 of [#1337](https://github.com/diffplug/spotless/issues/1337))
 ### Fixed
-
-- **POTENTIALLY BREAKING** `sortByKeys` for JSON formatting now takes into account objects inside arrays ([#1546](https://github.com/diffplug/spotless/pull/1546))
-- `freshmark` fixed on java 15+ ([#1304](https://github.com/diffplug/spotless/pull/1304) fixes [#803](https://github.com/diffplug/spotless/issues/803))
+* **POTENTIALLY BREAKING** `sortByKeys` for JSON formatting now takes into account objects inside arrays ([#1546](https://github.com/diffplug/spotless/pull/1546))
+* `freshmark` fixed on java 15+ ([#1304](https://github.com/diffplug/spotless/pull/1304) fixes [#803](https://github.com/diffplug/spotless/issues/803))
 
 ## [2.34.0] - 2023-01-26
-
 ### Added
-
-- `Formatter` now has a field `public static final File NO_FILE_SENTINEL` which can be used to pass string content to a Formatter or FormatterStep when there is no actual File to format. ([#1525](https://github.com/diffplug/spotless/pull/1525))
+* `Formatter` now has a field `public static final File NO_FILE_SENTINEL` which can be used to pass string content to a Formatter or FormatterStep when there is no actual File to format. ([#1525](https://github.com/diffplug/spotless/pull/1525))
 
 ## [2.33.0] - 2023-01-26
-
 ### Added
-
-- `ProcessRunner` has added some convenience methods so it can be used for Maven testing. ([#1496](https://github.com/diffplug/spotless/pull/1496))
-- `ProcessRunner` allows to limit captured output to a certain number of bytes. ([#1511](https://github.com/diffplug/spotless/pull/1511))
-- `ProcessRunner` is now capable of handling long-running tasks where waiting for exit is delegated to the caller. ([#1511](https://github.com/diffplug/spotless/pull/1511))
-- Allow to specify node executable for node-based formatters using `nodeExecutable` parameter ([#1500](https://github.com/diffplug/spotless/pull/1500))
-
+* `ProcessRunner` has added some convenience methods so it can be used for Maven testing. ([#1496](https://github.com/diffplug/spotless/pull/1496))
+* `ProcessRunner` allows to limit captured output to a certain number of bytes. ([#1511](https://github.com/diffplug/spotless/pull/1511))
+* `ProcessRunner` is now capable of handling long-running tasks where waiting for exit is delegated to the caller. ([#1511](https://github.com/diffplug/spotless/pull/1511))
+* Allow to specify node executable for node-based formatters using `nodeExecutable` parameter ([#1500](https://github.com/diffplug/spotless/pull/1500))
 ### Fixed
-
-- The default list of type annotations used by `formatAnnotations` has had 8 more annotations from the Checker Framework added [#1494](https://github.com/diffplug/spotless/pull/1494)
-
+* The default list of type annotations used by `formatAnnotations` has had 8 more annotations from the Checker Framework added [#1494](https://github.com/diffplug/spotless/pull/1494)
 ### Changes
-
-- **POTENTIALLY BREAKING** Bump minimum JRE from 8 to 11, next release likely to bump bytecode to Java 11 ([#1514](https://github.com/diffplug/spotless/pull/1514) part 1 of [#1337](https://github.com/diffplug/spotless/issues/1337))
-- Rename `YamlJacksonStep` into `JacksonYamlStep` while normalizing Jackson usage ([#1492](https://github.com/diffplug/spotless/pull/1492))
-- Convert `gson` integration to use a compile-only source set ([#1510](https://github.com/diffplug/spotless/pull/1510)).
-- ** POTENTIALLY BREAKING** Removed support for KtLint 0.3x and 0.45.2 ([#1475](https://github.com/diffplug/spotless/pull/1475))
-  - `KtLint` does not maintain a stable API - before this PR, we supported every breaking change in the API since 2019.
-  - From now on, we will support no more than 2 breaking changes at a time.
-- NpmFormatterStepStateBase delays `npm install` call until the formatter is first used. This enables better integration
+* **POTENTIALLY BREAKING** Bump minimum JRE from 8 to 11, next release likely to bump bytecode to Java 11 ([#1514](https://github.com/diffplug/spotless/pull/1514) part 1 of [#1337](https://github.com/diffplug/spotless/issues/1337))
+* Rename `YamlJacksonStep` into `JacksonYamlStep` while normalizing Jackson usage ([#1492](https://github.com/diffplug/spotless/pull/1492))
+* Convert `gson` integration to use a compile-only source set ([#1510](https://github.com/diffplug/spotless/pull/1510)).
+* ** POTENTIALLY BREAKING** Removed support for KtLint 0.3x and 0.45.2 ([#1475](https://github.com/diffplug/spotless/pull/1475))
+  * `KtLint` does not maintain a stable API - before this PR, we supported every breaking change in the API since 2019.
+  * From now on, we will support no more than 2 breaking changes at a time.
+* NpmFormatterStepStateBase delays `npm install` call until the formatter is first used. This enables better integration
   with `gradle-node-plugin`. ([#1522](https://github.com/diffplug/spotless/pull/1522))
-- Bump default `ktlint` version to latest `0.48.1` -> `0.48.2` ([#1529](https://github.com/diffplug/spotless/pull/1529))
-- Bump default `scalafmt` version to latest `3.6.1` -> `3.7.1` ([#1529](https://github.com/diffplug/spotless/pull/1529))
+* Bump default `ktlint` version to latest `0.48.1` -> `0.48.2` ([#1529](https://github.com/diffplug/spotless/pull/1529))
+* Bump default `scalafmt` version to latest `3.6.1` -> `3.7.1` ([#1529](https://github.com/diffplug/spotless/pull/1529))
 
 ## [2.32.0] - 2023-01-13
-
 ### Added
-
-- Add option `editorConfigFile` for `ktLint` [#142](https://github.com/diffplug/spotless/issues/142)
-  - **POTENTIALLY BREAKING** `ktlint` step now modifies license headers. Make sure to put `licenseHeader` _after_ `ktlint`.
-- Added `skipLinesMatching` option to `licenseHeader` to support formats where license header cannot be immediately added to the top of the file (e.g. xml, sh). ([#1441](https://github.com/diffplug/spotless/pull/1441)).
-- Add YAML support through Jackson ([#1478](https://github.com/diffplug/spotless/pull/1478))
-- Added support for npm-based [ESLint](https://eslint.org/)-formatter for javascript and typescript ([#1453](https://github.com/diffplug/spotless/pull/1453))
-- Better suggested messages when user's default is set by JVM limitation. ([#995](https://github.com/diffplug/spotless/pull/995))
-
+* Add option `editorConfigFile` for `ktLint` [#142](https://github.com/diffplug/spotless/issues/142)
+  * **POTENTIALLY BREAKING** `ktlint` step now modifies license headers. Make sure to put `licenseHeader` *after* `ktlint`.
+* Added `skipLinesMatching` option to `licenseHeader` to support formats where license header cannot be immediately added to the top of the file (e.g. xml, sh). ([#1441](https://github.com/diffplug/spotless/pull/1441)).
+* Add YAML support through Jackson ([#1478](https://github.com/diffplug/spotless/pull/1478))
+* Added support for npm-based [ESLint](https://eslint.org/)-formatter for javascript and typescript ([#1453](https://github.com/diffplug/spotless/pull/1453))
+* Better suggested messages when user's default is set by JVM limitation. ([#995](https://github.com/diffplug/spotless/pull/995))
 ### Fixed
-
-- Support `ktlint` 0.48+ new rule disabling syntax ([#1456](https://github.com/diffplug/spotless/pull/1456)) fixes ([#1444](https://github.com/diffplug/spotless/issues/1444))
-- Fix subgroups leading catch all matcher.
-
+* Support `ktlint` 0.48+ new rule disabling syntax ([#1456](https://github.com/diffplug/spotless/pull/1456)) fixes ([#1444](https://github.com/diffplug/spotless/issues/1444))
+* Fix subgroups leading catch all matcher.
 ### Changes
-
-- Bump default version for `prettier` from `2.0.5` to `2.8.1` ([#1453](https://github.com/diffplug/spotless/pull/1453))
-- Bump the dev version of Gradle from `7.5.1` to `7.6` ([#1409](https://github.com/diffplug/spotless/pull/1409))
-  - We also removed the no-longer-required dependency `org.codehaus.groovy:groovy-xml`
-- Breaking changes to Spotless' internal testing infrastructure `testlib` ([#1443](https://github.com/diffplug/spotless/pull/1443))
-  - `ResourceHarness` no longer has any duplicated functionality which was also present in `StepHarness`
-  - `StepHarness` now operates on `Formatter` rather than a `FormatterStep`
-  - `StepHarnessWithFile` now takes a `ResourceHarness` in its constructor to handle the file manipulation parts
-  - Standardized that we test exception _messages_, not types, which will ease the transition to linting later on
-  - Bump default `ktlint` version to latest `0.47.1` -> `0.48.1` ([#1456](https://github.com/diffplug/spotless/pull/1456))
-- Switch our publishing infrastructure from CircleCI to GitHub Actions ([#1462](https://github.com/diffplug/spotless/pull/1462)).
-  - Help wanted for moving our tests too ([#1472](https://github.com/diffplug/spotless/issues/1472))
+* Bump default version for `prettier` from `2.0.5` to `2.8.1` ([#1453](https://github.com/diffplug/spotless/pull/1453))
+* Bump the dev version of Gradle from `7.5.1` to `7.6` ([#1409](https://github.com/diffplug/spotless/pull/1409))
+  * We also removed the no-longer-required dependency `org.codehaus.groovy:groovy-xml`
+* Breaking changes to Spotless' internal testing infrastructure `testlib` ([#1443](https://github.com/diffplug/spotless/pull/1443))
+  * `ResourceHarness` no longer has any duplicated functionality which was also present in `StepHarness`
+  * `StepHarness` now operates on `Formatter` rather than a `FormatterStep`
+  * `StepHarnessWithFile` now takes a `ResourceHarness` in its constructor to handle the file manipulation parts
+  * Standardized that we test exception *messages*, not types, which will ease the transition to linting later on
+  * Bump default `ktlint` version to latest `0.47.1` -> `0.48.1` ([#1456](https://github.com/diffplug/spotless/pull/1456))
+* Switch our publishing infrastructure from CircleCI to GitHub Actions ([#1462](https://github.com/diffplug/spotless/pull/1462)).
+  * Help wanted for moving our tests too ([#1472](https://github.com/diffplug/spotless/issues/1472))
 
 ## [2.31.1] - 2023-01-02
-
 ### Fixed
-
-- Improve memory usage when using git ratchet ([#1426](https://github.com/diffplug/spotless/pull/1426))
-- Support `ktlint` 0.48+ ([#1432](https://github.com/diffplug/spotless/pull/1432)) fixes ([#1430](https://github.com/diffplug/spotless/issues/1430))
-
+* Improve memory usage when using git ratchet ([#1426](https://github.com/diffplug/spotless/pull/1426))
+* Support `ktlint` 0.48+ ([#1432](https://github.com/diffplug/spotless/pull/1432)) fixes ([#1430](https://github.com/diffplug/spotless/issues/1430))
 ### Changes
-
-- Bump default `ktlint` version to latest `0.47.1` -> `0.48.0` ([#1432](https://github.com/diffplug/spotless/pull/1432))
-- Bump default `ktfmt` version to latest `0.41` -> `0.42` ([#1421](https://github.com/diffplug/spotless/pull/1421))
+* Bump default `ktlint` version to latest `0.47.1` -> `0.48.0` ([#1432](https://github.com/diffplug/spotless/pull/1432))
+* Bump default `ktfmt` version to latest `0.41` -> `0.42` ([#1421](https://github.com/diffplug/spotless/pull/1421))
 
 ## [2.31.0] - 2022-11-24
-
 ### Added
-
-- `importOrder` now support groups of imports without blank lines ([#1401](https://github.com/diffplug/spotless/pull/1401))
-
+* `importOrder` now support groups of imports without blank lines ([#1401](https://github.com/diffplug/spotless/pull/1401))
 ### Fixed
-
-- Don't treat `@Value` as a type annotation [#1367](https://github.com/diffplug/spotless/pull/1367)
-- Support `ktlint_disabled_rules` in `ktlint` 0.47.x [#1378](https://github.com/diffplug/spotless/pull/1378)
-- Share git repositories across projects when using ratchet ([#1426](https://github.com/diffplug/spotless/pull/1426))
-
+* Don't treat `@Value` as a type annotation [#1367](https://github.com/diffplug/spotless/pull/1367)
+* Support `ktlint_disabled_rules` in `ktlint` 0.47.x [#1378](https://github.com/diffplug/spotless/pull/1378)
+* Share git repositories across projects when using ratchet ([#1426](https://github.com/diffplug/spotless/pull/1426))
 ### Changes
-
-- Bump default `ktfmt` version to latest `0.40` -> `0.41` ([#1340](https://github.com/diffplug/spotless/pull/1340))
-- Bump default `scalafmt` version to latest `3.5.9` -> `3.6.1` ([#1373](https://github.com/diffplug/spotless/pull/1373))
-- Bump default `diktat` version to latest `1.2.3` -> `1.2.4.2` ([#1393](https://github.com/diffplug/spotless/pull/1393))
-- Bump default `palantir-java-format` version to latest `2.10` -> `2.28` ([#1393](https://github.com/diffplug/spotless/pull/1393))
+* Bump default `ktfmt` version to latest `0.40` -> `0.41` ([#1340](https://github.com/diffplug/spotless/pull/1340))
+* Bump default `scalafmt` version to latest `3.5.9` -> `3.6.1` ([#1373](https://github.com/diffplug/spotless/pull/1373))
+* Bump default `diktat` version to latest `1.2.3` -> `1.2.4.2` ([#1393](https://github.com/diffplug/spotless/pull/1393))
+* Bump default `palantir-java-format` version to latest `2.10` -> `2.28` ([#1393](https://github.com/diffplug/spotless/pull/1393))
 
 ## [2.30.0] - 2022-09-14
-
 ### Added
-
-- `formatAnnotations()` step to correct formatting of Java type annotations. It puts type annotations on the same line as the type that they qualify. Run it after a Java formatting step, such as `googleJavaFormat()`. ([#1275](https://github.com/diffplug/spotless/pull/1275))
-
+* `formatAnnotations()` step to correct formatting of Java type annotations.  It puts type annotations on the same line as the type that they qualify.  Run it after a Java formatting step, such as `googleJavaFormat()`. ([#1275](https://github.com/diffplug/spotless/pull/1275))
 ### Changes
-
-- Bump default `ktfmt` version to latest `0.39` -> `0.40` ([#1312](https://github.com/diffplug/spotless/pull/1312))
-- Bump default `ktlint` version to latest `0.46.1` -> `0.47.1` ([#1303](https://github.com/diffplug/spotless/pull/1303))
-  - Also restored support for older versions of ktlint back to `0.31.0`
+* Bump default `ktfmt` version to latest `0.39` -> `0.40` ([#1312](https://github.com/diffplug/spotless/pull/1312))
+* Bump default `ktlint` version to latest `0.46.1` -> `0.47.1` ([#1303](https://github.com/diffplug/spotless/pull/1303))
+  * Also restored support for older versions of ktlint back to `0.31.0`
 
 ## [2.29.0] - 2022-08-23
-
 ### Added
-
-- `scalafmt` integration now has a configuration option `majorScalaVersion` that allows you to configure the Scala version that gets resolved from the Maven artifact ([#1283](https://github.com/diffplug/spotless/pull/1283))
-  - Converted `scalafmt` integration to use a compile-only source set (fixes [#524](https://github.com/diffplug/spotless/issues/524))
-
+* `scalafmt` integration now has a configuration option `majorScalaVersion` that allows you to configure the Scala version that gets resolved from the Maven artifact ([#1283](https://github.com/diffplug/spotless/pull/1283))
+  * Converted `scalafmt` integration to use a compile-only source set (fixes [#524](https://github.com/diffplug/spotless/issues/524))
 ### Changes
-
-- Add the `ktlint` rule in error messages when `ktlint` fails to apply a fix ([#1279](https://github.com/diffplug/spotless/pull/1279))
-- Bump default `scalafmt` to latest `3.0.8` -> `3.5.9` (removed support for pre-`3.0.0`) ([#1283](https://github.com/diffplug/spotless/pull/1283))
+* Add the `ktlint` rule in error messages when `ktlint` fails to apply a fix ([#1279](https://github.com/diffplug/spotless/pull/1279))
+* Bump default `scalafmt` to latest `3.0.8` -> `3.5.9` (removed support for pre-`3.0.0`) ([#1283](https://github.com/diffplug/spotless/pull/1283))
 
 ## [2.28.1] - 2022-08-10
-
 ### Fixed
-
-- Fix Clang not knowing the filename and changing the format ([#1268](https://github.com/diffplug/spotless/pull/1268) fixes [#1267](https://github.com/diffplug/spotless/issues/1267)).
-
+* Fix Clang not knowing the filename and changing the format ([#1268](https://github.com/diffplug/spotless/pull/1268) fixes [#1267](https://github.com/diffplug/spotless/issues/1267)).
 ### Changes
-
-- Bump default `diktat` version to latest `1.2.1` -> `1.2.3` ([#1266](https://github.com/diffplug/spotless/pull/1266))
+* Bump default `diktat` version to latest `1.2.1` -> `1.2.3` ([#1266](https://github.com/diffplug/spotless/pull/1266))
 
 ## [2.28.0] - 2022-07-28
-
 ### Added
-
-- Clang and Black no longer break the build when the binary is unavailable, if they will not be run during that build ([#1257](https://github.com/diffplug/spotless/pull/1257)).
-- License header support for Kotlin files without `package` or `@file` but do at least have `import` ([#1263](https://github.com/diffplug/spotless/pull/1263)).
+* Clang and Black no longer break the build when the binary is unavailable, if they will not be run during that build ([#1257](https://github.com/diffplug/spotless/pull/1257)).
+* License header support for Kotlin files without `package` or `@file` but do at least have `import` ([#1263](https://github.com/diffplug/spotless/pull/1263)).
 
 ## [2.27.0] - 2022-06-30
-
 ### Added
-
-- Support for `MAC_CLASSIC` (`\r`) line ending ([#1243](https://github.com/diffplug/spotless/pull/1243) fixes [#1196](https://github.com/diffplug/spotless/issues/1196))
-
+* Support for `MAC_CLASSIC` (`\r`) line ending ([#1243](https://github.com/diffplug/spotless/pull/1243) fixes [#1196](https://github.com/diffplug/spotless/issues/1196))
 ### Changes
-
-- Bump default `ktlint` version to latest `0.45.2` -> `0.46.1` ([#1239](https://github.com/diffplug/spotless/issues/1239))
-  - Minimum supported version also bumped to `0.46.0` (we have abandoned strong backward compatibility for `ktlint`, from here on out Spotless will only support the most-recent breaking change).
-- Bump default `diktat` version to latest `1.1.0` -> `1.2.1` ([#1246](https://github.com/diffplug/spotless/pull/1246))
-  - Minimum supported version also bumped to `1.2.1` (diktat is based on ktlint and has the same backward compatibility issues).
-- Bump default `ktfmt` version to latest `0.37` -> `0.39` ([#1240](https://github.com/diffplug/spotless/pull/1240))
+* Bump default `ktlint` version to latest `0.45.2` -> `0.46.1` ([#1239](https://github.com/diffplug/spotless/issues/1239))
+  * Minimum supported version also bumped to `0.46.0` (we have abandoned strong backward compatibility for `ktlint`, from here on out Spotless will only support the most-recent breaking change).
+* Bump default `diktat` version to latest `1.1.0` -> `1.2.1` ([#1246](https://github.com/diffplug/spotless/pull/1246))
+  * Minimum supported version also bumped to `1.2.1` (diktat is based on ktlint and has the same backward compatibility issues).
+* Bump default `ktfmt` version to latest `0.37` -> `0.39` ([#1240](https://github.com/diffplug/spotless/pull/1240))
 
 ## [2.26.2] - 2022-06-11
-
 ### Fixed
-
-- `PalantirJavaFormatStep` no longer needs the `--add-exports` calls in the `org.gradle.jvmargs` property in `gradle.properties`. ([#1233](https://github.com/diffplug/spotless/pull/1233))
+* `PalantirJavaFormatStep` no longer needs the `--add-exports` calls in the `org.gradle.jvmargs` property in `gradle.properties`. ([#1233](https://github.com/diffplug/spotless/pull/1233))
 
 ## [2.26.1] - 2022-06-10
-
 ### Fixed
-
-- (Second try) `googleJavaFormat` and `removeUnusedImports` works on JDK16+ without jvm args workaround. ([#1228](https://github.com/diffplug/spotless/pull/1228))
+* (Second try) `googleJavaFormat` and `removeUnusedImports` works on JDK16+ without jvm args workaround. ([#1228](https://github.com/diffplug/spotless/pull/1228))
 
 ## [2.26.0] - 2022-06-05
-
 ### Added
-
-- Support for `editorConfigOverride` in `ktlint`. ([#1218](https://github.com/diffplug/spotless/pull/1218) fixes [#1193](https://github.com/diffplug/spotless/issues/1193))
-
+* Support for `editorConfigOverride` in `ktlint`. ([#1218](https://github.com/diffplug/spotless/pull/1218) fixes [#1193](https://github.com/diffplug/spotless/issues/1193))
 ### Fixed
-
-- `google-java-format` and `RemoveUnusedImportsStep` works on JDK16+ without jvm args workaround. ([#1224](https://github.com/diffplug/spotless/pull/1224) fixes [#834](https://github.com/diffplug/spotless/issues/834))
+* `google-java-format` and `RemoveUnusedImportsStep` works on JDK16+ without jvm args workaround. ([#1224](https://github.com/diffplug/spotless/pull/1224) fixes [#834](https://github.com/diffplug/spotless/issues/834))
 
 ## [2.25.3] - 2022-05-10
-
 ### Fixed
-
-- Update the `black` version regex to fix `19.10b0` and earlier. (fixes [#1195](https://github.com/diffplug/spotless/issues/1195), regression introduced in `2.25.0`)
-- `GitAttributesLineEndings$RelocatablePolicy` and `FormatterStepImpl` now null-out their initialization lambdas after their state has been calculated, which allows GC to collect variables which were incidentally captured but not needed in the calculated state. ([#1198](https://github.com/diffplug/spotless/pull/1198))
-
+* Update the `black` version regex to fix `19.10b0` and earlier. (fixes [#1195](https://github.com/diffplug/spotless/issues/1195), regression introduced in `2.25.0`)
+* `GitAttributesLineEndings$RelocatablePolicy` and `FormatterStepImpl` now null-out their initialization lambdas after their state has been calculated, which allows GC to collect variables which were incidentally captured but not needed in the calculated state. ([#1198](https://github.com/diffplug/spotless/pull/1198))
 ### Changes
-
-- Bump default `ktfmt` version to latest `0.36` -> `0.37`. ([#1200](https://github.com/diffplug/spotless/pull/1200))
+* Bump default `ktfmt` version to latest `0.36` -> `0.37`. ([#1200](https://github.com/diffplug/spotless/pull/1200))
 
 ## [2.25.2] - 2022-05-03
-
 ### Changes
-
-- Bump default `diktat` version to latest `1.0.1` -> `1.1.0`. ([#1190](https://github.com/diffplug/spotless/pull/1190))
-  - Converted `diktat` integration to use a compile-only source set. (fixes [#524](https://github.com/diffplug/spotless/issues/524))
-  - Use the full path to a file in `diktat` integration. (fixes [#1189](https://github.com/diffplug/spotless/issues/1189))
+* Bump default `diktat` version to latest `1.0.1` -> `1.1.0`. ([#1190](https://github.com/diffplug/spotless/pull/1190))
+  * Converted `diktat` integration to use a compile-only source set. (fixes [#524](https://github.com/diffplug/spotless/issues/524))
+  * Use the full path to a file in `diktat` integration. (fixes [#1189](https://github.com/diffplug/spotless/issues/1189))
 
 ## [2.25.1] - 2022-04-27
-
 ### Changes
-
-- Bump default `ktfmt` version to latest `0.35` -> `0.36`. ([#1183](https://github.com/diffplug/spotless/issues/1183))
-- Bump default `google-java-format` version to latest `1.13.0` -> `1.15.0`.
-  - ~~This means it is no longer necessary to use the `--add-exports` workaround (fixes [#834](https://github.com/diffplug/spotless/issues/834)).~~ `--add-exports` workaround is still needed.
+* Bump default `ktfmt` version to latest `0.35` -> `0.36`. ([#1183](https://github.com/diffplug/spotless/issues/1183))
+* Bump default `google-java-format` version to latest `1.13.0` -> `1.15.0`.
+  * ~~This means it is no longer necessary to use the `--add-exports` workaround (fixes [#834](https://github.com/diffplug/spotless/issues/834)).~~ `--add-exports` workaround is still needed.
 
 ## [2.25.0] - 2022-04-22
-
 ### Added
-
-- Added support for enabling ktlint experimental ruleset. ([#1145](https://github.com/diffplug/spotless/pull/1168))
-
+* Added support for enabling ktlint experimental ruleset. ([#1145](https://github.com/diffplug/spotless/pull/1168))
 ### Fixed
-
-- Fixed support for Python Black's new version reporting. ([#1170](https://github.com/diffplug/spotless/issues/1170))
-- Error messages for unexpected file encoding now works on Java 8. (fixes [#1081](https://github.com/diffplug/spotless/issues/1081))
-
+* Fixed support for Python Black's new version reporting. ([#1170](https://github.com/diffplug/spotless/issues/1170))
+* Error messages for unexpected file encoding now works on Java 8. (fixes [#1081](https://github.com/diffplug/spotless/issues/1081))
 ### Changes
-
-- Bump default `black` version to latest `19.10b0` -> `22.3.0`. ([#1170](https://github.com/diffplug/spotless/issues/1170))
-- Bump default `ktfmt` version to latest `0.34` -> `0.35`. ([#1159](https://github.com/diffplug/spotless/pull/1159))
-- Bump default `ktlint` version to latest `0.43.2` -> `0.45.2`. ([#1177](https://github.com/diffplug/spotless/pull/1177))
+* Bump default `black` version to latest `19.10b0` -> `22.3.0`. ([#1170](https://github.com/diffplug/spotless/issues/1170))
+* Bump default `ktfmt` version to latest `0.34` -> `0.35`. ([#1159](https://github.com/diffplug/spotless/pull/1159))
+* Bump default `ktlint` version to latest `0.43.2` -> `0.45.2`. ([#1177](https://github.com/diffplug/spotless/pull/1177))
 
 ## [2.24.2] - 2022-04-06
-
 ### Fixed
-
-- Git user config and system config also included for defaultEndings configuration. ([#540](https://github.com/diffplug/spotless/issues/540))
+* Git user config and system config also included for defaultEndings configuration. ([#540](https://github.com/diffplug/spotless/issues/540))
 
 ## [2.24.1] - 2022-03-30
-
 ### Fixed
-
-- Fixed access modifiers for setters in KtfmtStep configuration
+* Fixed access modifiers for setters in KtfmtStep configuration
 
 ## [2.24.0] - 2022-03-28
-
 ### Added
-
-- Added support for setting custom parameters for Kotlin ktfmt in Gradle and Maven plugins. ([#1145](https://github.com/diffplug/spotless/pull/1145))
+* Added support for setting custom parameters for Kotlin ktfmt in Gradle and Maven plugins. ([#1145](https://github.com/diffplug/spotless/pull/1145))
 
 ## [2.23.0] - 2022-02-15
-
 ### Added
-
-- Added support for JSON formatting based on [Gson](https://github.com/google/gson) ([#1125](https://github.com/diffplug/spotless/pull/1125)).
-
+* Added support for JSON formatting based on [Gson](https://github.com/google/gson) ([#1125](https://github.com/diffplug/spotless/pull/1125)).
 ### Changed
-
-- Use SLF4J for logging ([#1116](https://github.com/diffplug/spotless/issues/1116))
+* Use SLF4J for logging ([#1116](https://github.com/diffplug/spotless/issues/1116))
 
 ## [2.22.2] - 2022-02-09
-
 ### Changed
-
-- Bump default ktfmt `0.30` -> `0.31` ([#1118](https://github.com/diffplug/spotless/pull/1118)).
-
+* Bump default ktfmt `0.30` -> `0.31` ([#1118](https://github.com/diffplug/spotless/pull/1118)).
 ### Fixed
-
-- Add full support for git worktrees ([#1119](https://github.com/diffplug/spotless/pull/1119)).
+* Add full support for git worktrees ([#1119](https://github.com/diffplug/spotless/pull/1119)).
 
 ## [2.22.1] - 2022-02-01
-
 ### Changed
-
-- Bump CI from Java 15 to 17 ([#1094](https://github.com/diffplug/spotless/pull/1094)).
-- Bump default versions of formatters ([#1095](https://github.com/diffplug/spotless/pull/1095)).
-  - google-java-format `1.12.0` -> `1.13.0`
-  - ktfmt `0.29` -> `0.30`
-- Added support for git property `core.autocrlf` ([#540](https://github.com/diffplug/spotless/issues/540))
+* Bump CI from Java 15 to 17 ([#1094](https://github.com/diffplug/spotless/pull/1094)).
+* Bump default versions of formatters ([#1095](https://github.com/diffplug/spotless/pull/1095)).
+  * google-java-format `1.12.0` -> `1.13.0`
+  * ktfmt `0.29` -> `0.30`
+* Added support for git property `core.autocrlf` ([#540](https://github.com/diffplug/spotless/issues/540))
 
 ## [2.22.0] - 2022-01-13
-
 ### Added
-
-- Added support for the [palantir-java-format](https://github.com/palantir/palantir-java-format) Java formatter ([#1083](https://github.com/diffplug/spotless/pull/1083)).
+* Added support for the [palantir-java-format](https://github.com/palantir/palantir-java-format) Java formatter ([#1083](https://github.com/diffplug/spotless/pull/1083)).
 
 ## [2.21.2] - 2022-01-07
-
 ### Fixed
-
-- Update IndentStep to allow leading space on multiline comments ([#1072](https://github.com/diffplug/spotless/pull/1072)).
+* Update IndentStep to allow leading space on multiline comments ([#1072](https://github.com/diffplug/spotless/pull/1072)).
 
 ## [2.21.1] - 2022-01-06
-
 ### Changed
-
-- Bumped default DiKTat from `0.4.0` to `1.0.1`. This is a breaking change for DiKTat users on the default version, because some rules were renamed/changed. Check [DiKTat changelog](https://github.com/analysis-dev/diktat/releases) for details.
+* Bumped default DiKTat from `0.4.0` to `1.0.1`. This is a breaking change for DiKTat users on the default version, because some rules were renamed/changed. Check [DiKTat changelog](https://github.com/analysis-dev/diktat/releases) for details.
 
 ## [2.21.0] - 2021-12-23
-
 ### Added
-
-- Added support for Markdown with `flexmark` at `0.62.2` ([#1011](https://github.com/diffplug/spotless/pull/1011)).
+* Added support for Markdown with `flexmark` at `0.62.2` ([#1011](https://github.com/diffplug/spotless/pull/1011)).
 
 ## [2.20.3] - 2021-12-15
-
 ### Fixed
-
-- Performance improvements to GitRatchet ([#1038](https://github.com/diffplug/spotless/pull/1038)).
+* Performance improvements to GitRatchet ([#1038](https://github.com/diffplug/spotless/pull/1038)).
 
 ## [2.20.2] - 2021-12-05
-
 ### Changed
-
-- Bumped default ktlint from `0.43.0` to `0.43.2`.
-- Converted `ktlint` integration to use a compile-only source set. ([#524](https://github.com/diffplug/spotless/issues/524))
+* Bumped default ktlint from `0.43.0` to `0.43.2`.
+* Converted `ktlint` integration to use a compile-only source set. ([#524](https://github.com/diffplug/spotless/issues/524))
 
 ## [2.20.1] - 2021-12-01
-
 ### Changed
-
-- Added `named` option to `licenseHeader` to support alternate license header within same format (like java) ([872](https://github.com/diffplug/spotless/issues/872)).
-- Added `onlyIfContentMatches` option to `licenseHeader` to skip license header application based on source file content pattern ([#650](https://github.com/diffplug/spotless/issues/650)).
-- Bump jgit version ([#992](https://github.com/diffplug/spotless/pull/992)).
-  - jgit `5.10.0.202012080955-r` -> `5.13.0.202109080827-r`
+* Added `named` option to `licenseHeader` to support alternate license header within same format (like java) ([872](https://github.com/diffplug/spotless/issues/872)).
+* Added `onlyIfContentMatches` option to `licenseHeader` to skip license header application  based on source file content pattern ([#650](https://github.com/diffplug/spotless/issues/650)).
+* Bump jgit version ([#992](https://github.com/diffplug/spotless/pull/992)).
+  * jgit `5.10.0.202012080955-r` -> `5.13.0.202109080827-r`
 
 ## [2.20.0] - 2021-11-09
-
 ### Added
-
-- `DiffMessageFormatter` can now generate messages based on a folder of cleaned files, as an alternative to a `Formatter` ([#982](https://github.com/diffplug/spotless/pull/982)).
-
+* `DiffMessageFormatter` can now generate messages based on a folder of cleaned files, as an alternative to a `Formatter` ([#982](https://github.com/diffplug/spotless/pull/982)).
 ### Fixed
-
-- Fix CI and various spotbugs nits ([#988](https://github.com/diffplug/spotless/pull/988)).
-
+* Fix CI and various spotbugs nits ([#988](https://github.com/diffplug/spotless/pull/988)).
 ### Changed
-
-- Bump default formatter versions ([#989](https://github.com/diffplug/spotless/pull/989))
-  - google-java-format `1.11.0` -> `1.12.0`
-  - ktlint `0.42.1` -> `0.43.0`
-  - ktfmt `0.27` -> `0.29`
-  - scalafmt `3.0.0` -> `3.0.8`
+* Bump default formatter versions ([#989](https://github.com/diffplug/spotless/pull/989))
+  * google-java-format `1.11.0` -> `1.12.0`
+  * ktlint `0.42.1` -> `0.43.0`
+  * ktfmt `0.27` -> `0.29`
+  * scalafmt `3.0.0` -> `3.0.8`
 
 ## [2.19.2] - 2021-10-26
-
 ### Changed
-
-- Added support and bump Eclipse formatter default versions to `4.21` for `eclipse-groovy`. Change is only applied for JVM 11+.
-- Added support for ktlint's FilenameRule ([#974](https://github.com/diffplug/spotless/pull/974)).
+* Added support and bump Eclipse formatter default versions to `4.21` for `eclipse-groovy`. Change is only applied for JVM 11+.
+* Added support for ktlint's FilenameRule ([#974](https://github.com/diffplug/spotless/pull/974)).
 
 ### Fixed
-
-- Temporary workspace deletion for Eclipse based formatters on JVM shutdown ([#967](https://github.com/diffplug/spotless/issues/967)). Change is only applied for Eclipse versions using JVM 11+, no back-port to older versions is planned.
+ * Temporary workspace deletion for Eclipse based formatters on JVM shutdown ([#967](https://github.com/diffplug/spotless/issues/967)). Change is only applied for Eclipse versions using JVM 11+, no back-port to older versions is planned.
 
 ## [2.19.1] - 2021-10-13
-
 ### Fixed
-
-- [module-info formatting](https://github.com/diffplug/spotless/pull/958) in `eclipse-jdt` versions `4.20` and `4.21`. Note that the problem also affects older versions.
-- Added workaround to support projects using git worktrees ([#965](https://github.com/diffplug/spotless/pull/965))
+ * [module-info formatting](https://github.com/diffplug/spotless/pull/958) in `eclipse-jdt` versions `4.20` and `4.21`. Note that the problem also affects older versions.
+ * Added workaround to support projects using git worktrees ([#965](https://github.com/diffplug/spotless/pull/965))
 
 ## [2.19.0] - 2021-10-02
-
-- Added `wildcardsLast` option for Java `ImportOrderStep` ([#954](https://github.com/diffplug/spotless/pull/954))
+* Added `wildcardsLast` option for Java `ImportOrderStep` ([#954](https://github.com/diffplug/spotless/pull/954))
 
 ### Added
-
-- Added support for JBDI bind list params in sql formatter ([#955](https://github.com/diffplug/spotless/pull/955))
+* Added support for JBDI bind list params in sql formatter ([#955](https://github.com/diffplug/spotless/pull/955))
 
 ## [2.18.0] - 2021-09-30
-
 ### Added
-
-- Added support for custom JSR223 formatters ([#945](https://github.com/diffplug/spotless/pull/945))
-- Added support for formatting and sorting Maven POMs ([#946](https://github.com/diffplug/spotless/pull/946))
+* Added support for custom JSR223 formatters ([#945](https://github.com/diffplug/spotless/pull/945))
+* Added support for formatting and sorting Maven POMs ([#946](https://github.com/diffplug/spotless/pull/946))
 
 ## [2.17.0] - 2021-09-27
-
 ### Added
-
-- Added support for calling local binary formatters ([#949](https://github.com/diffplug/spotless/pull/949))
-
+* Added support for calling local binary formatters ([#949](https://github.com/diffplug/spotless/pull/949))
 ### Changed
-
-- Added support and bump Eclipse formatter default versions to `4.21` for `eclipse-cdt`, `eclipse-jdt`, `eclipse-wtp`. Change is only applied for JVM 11+.
-- Added `groupArtifact` option for `google-java-format` ([#944](https://github.com/diffplug/spotless/pull/944))
+* Added support and bump Eclipse formatter default versions to `4.21` for `eclipse-cdt`, `eclipse-jdt`, `eclipse-wtp`. Change is only applied for JVM 11+.
+* Added `groupArtifact` option for `google-java-format` ([#944](https://github.com/diffplug/spotless/pull/944))
 
 ## [2.16.1] - 2021-09-20
-
 ### Changed
-
-- Added support and bump Eclipse formatter default versions for JVM 11+. For older JVMs the previous defaults remain.
-  - `eclipse-cdt` from `4.16` to `4.20`
-  - `eclipse-groovy` from `4.19` to `4.20`
-  - `eclipse-jdt` from `4.19` to `4.20`
-  - `eclipse-wtp` from `4.18` to `4.20`
+* Added support and bump Eclipse formatter default versions for JVM 11+. For older JVMs the previous defaults remain.
+  * `eclipse-cdt` from `4.16` to `4.20`
+  * `eclipse-groovy` from `4.19` to `4.20`
+  * `eclipse-jdt` from `4.19` to `4.20`
+  * `eclipse-wtp` from `4.18` to `4.20`
 
 ## [2.16.0] - 2021-09-04
-
 ### Added
-
-- Added support for `google-java-format`'s `skip-reflowing-long-strings` option ([#929](https://github.com/diffplug/spotless/pull/929))
+* Added support for `google-java-format`'s `skip-reflowing-long-strings` option ([#929](https://github.com/diffplug/spotless/pull/929))
 
 ## [2.15.3] - 2021-08-20
-
 ### Changed
-
-- Added support for [scalafmt 3.0.0](https://github.com/scalameta/scalafmt/releases/tag/v3.0.0) and bump default scalafmt version to `3.0.0` ([#913](https://github.com/diffplug/spotless/pull/913)).
-- Bump default versions ([#915](https://github.com/diffplug/spotless/pull/915))
-  - `ktfmt` from `0.24` to `0.27`
-  - `ktlint` from `0.35.0` to `0.42.1`
-  - `google-java-format` from `1.10.0` to `1.11.0`
-- Fix javadoc publishing ([#916](https://github.com/diffplug/spotless/pull/916) fixes [#775](https://github.com/diffplug/spotless/issues/775)).
+* Added support for [scalafmt 3.0.0](https://github.com/scalameta/scalafmt/releases/tag/v3.0.0) and bump default scalafmt version to `3.0.0` ([#913](https://github.com/diffplug/spotless/pull/913)).
+* Bump default versions ([#915](https://github.com/diffplug/spotless/pull/915))
+  * `ktfmt` from `0.24` to `0.27`
+  * `ktlint` from `0.35.0` to `0.42.1`
+  * `google-java-format` from `1.10.0` to `1.11.0`
+* Fix javadoc publishing ([#916](https://github.com/diffplug/spotless/pull/916) fixes [#775](https://github.com/diffplug/spotless/issues/775)).
 
 ## [2.15.2] - 2021-07-20
-
 ### Fixed
-
-- Improved [SQL formatting](https://github.com/diffplug/spotless/pull/897) with respect to comments
+ * Improved [SQL formatting](https://github.com/diffplug/spotless/pull/897) with respect to comments
 
 ## [2.15.1] - 2021-07-06
-
 ### Changed
-
-- Improved exception messages for [JSON formatting](https://github.com/diffplug/spotless/pull/885) failures
+* Improved exception messages for [JSON formatting](https://github.com/diffplug/spotless/pull/885) failures
 
 ## [2.15.0] - 2021-06-17
 
 ### Added
-
-- Added formatter for [JVM-based JSON formatting](https://github.com/diffplug/spotless/issues/850)
-- Added Gradle configuration JVM-based JSON formatting
+* Added formatter for [JVM-based JSON formatting](https://github.com/diffplug/spotless/issues/850)
+* Added Gradle configuration JVM-based JSON formatting
 
 ## [2.14.0] - 2021-06-10
-
 ### Added
-
-- Added support for `eclipse-cdt` at `4.19.0`. Note that version requires Java 11 or higher.
-- Added support for `eclipse-groovy` at `4.18.0` and `4.19.0`.
-- Added support for `eclipse-wtp` at `4.19.0`. Note that version requires Java 11 or higher.
-
+* Added support for `eclipse-cdt` at `4.19.0`. Note that version requires Java 11 or higher.
+* Added support for `eclipse-groovy` at `4.18.0` and `4.19.0`.
+* Added support for `eclipse-wtp` at `4.19.0`. Note that version requires Java 11 or higher.
 ### Changed
-
-- Bump `eclipse-groovy` default version from `4.17.0` to `4.19.0`.
+* Bump `eclipse-groovy` default version from `4.17.0` to `4.19.0`.
 
 ## [2.13.5] - 2021-05-13
-
 ### Changed
-
-- Update ktfmt from 0.21 to 0.24
-
+* Update ktfmt from 0.21 to 0.24
 ### Fixed
-
-- The `<url>` field in the Maven POM is now set correctly ([#798](https://github.com/diffplug/spotless/issues/798))
-- Node is re-installed if some other build step removed it ([#863](https://github.com/diffplug/spotless/issues/863))
+* The `<url>` field in the Maven POM is now set correctly ([#798](https://github.com/diffplug/spotless/issues/798))
+* Node is re-installed if some other build step removed it ([#863](https://github.com/diffplug/spotless/issues/863))
 
 ## [2.13.4] - 2021-04-21
-
 ### Fixed
-
-- Explicitly separate target file from git arguments when parsing year for license header to prevent command from failing on argument-like paths ([#847](https://github.com/diffplug/spotless/pull/847))
+* Explicitly separate target file from git arguments when parsing year for license header to prevent command from failing on argument-like paths ([#847](https://github.com/diffplug/spotless/pull/847))
 
 ## [2.13.3] - 2021-04-20
-
 ### Fixed
-
-- LicenseHeaderStep treats address as copyright year ([#716](https://github.com/diffplug/spotless/issues/716))
+* LicenseHeaderStep treats address as copyright year ([#716](https://github.com/diffplug/spotless/issues/716))
 
 ## [2.13.2] - 2021-04-12
-
 ### Fixed
-
-- Fix license header bug for years in range ([#840](https://github.com/diffplug/spotless/pull/840)).
+* Fix license header bug for years in range ([#840](https://github.com/diffplug/spotless/pull/840)).
 
 ## [2.13.1] - 2021-04-10
-
 ### Changed
-
-- Update default google-java-format from 1.9 to 1.10.0
-- Expose configuration exceptions from scalafmt ([#837](https://github.com/diffplug/spotless/issues/837))
+* Update default google-java-format from 1.9 to 1.10.0
+* Expose configuration exceptions from scalafmt ([#837](https://github.com/diffplug/spotless/issues/837))
 
 ## [2.13.0] - 2021-03-05
-
 ### Added
-
-- Bump ktfmt to 0.21 and add support to Google and Kotlinlang formats ([#812](https://github.com/diffplug/spotless/pull/812))
+* Bump ktfmt to 0.21 and add support to Google and Kotlinlang formats ([#812](https://github.com/diffplug/spotless/pull/812))
 
 ## [2.12.1] - 2021-02-16
-
 ### Fixed
-
-- Allow licence headers to be blank ([#801](https://github.com/diffplug/spotless/pull/801)).
+* Allow licence headers to be blank ([#801](https://github.com/diffplug/spotless/pull/801)).
 
 ## [2.12.0] - 2021-02-09
-
 ### Added
-
-- Support for diktat ([#789](https://github.com/diffplug/spotless/pull/789))
+* Support for diktat ([#789](https://github.com/diffplug/spotless/pull/789))
 
 ## [2.11.0] - 2021-01-04
-
 ### Added
-
-- Added support for `eclipse-cdt`, `eclipse-jdt`, and `eclipse-wtp` at `4.18.0`.
-
+* Added support for `eclipse-cdt`, `eclipse-jdt`, and `eclipse-wtp` at `4.18.0`.
 ### Changed
-
-- Bump `eclipse-jdt` default version from `4.17.0` to `4.18.0`.
-- Bump `eclipse-wtp` default version from `4.17.0` to `4.18.0`.
-- Bump `ktfmt` default version from `0.16` to `0.19` ([#748](https://github.com/diffplug/spotless/issues/748) and [#773](https://github.com/diffplug/spotless/issues/773)).
-- Bump `jgit` from `5.9` to `5.10` ([#773](https://github.com/diffplug/spotless/issues/773)).
-
-### Fixed
-
-- Fixed `ratchetFrom` support for git-submodule ([#746](https://github.com/diffplug/spotless/issues/746)).
-- Fixed `ratchetFrom` excess memory consumption ([#735](https://github.com/diffplug/spotless/issues/735)).
-- `ktfmt` v0.19+ with dropbox-style works again ([#765](https://github.com/diffplug/spotless/pull/765)).
-- `prettier` no longer throws errors on empty files ([#751](https://github.com/diffplug/spotless/pull/751)).
-- Fixed error when running on root of windows mountpoint ([#760](https://github.com/diffplug/spotless/pull/760)).
-- Fixed typo in javadoc comment for SQL_FORMATTER_INDENT_TYPE ([#753](https://github.com/diffplug/spotless/pull/753)).
+* Bump `eclipse-jdt` default version from `4.17.0` to `4.18.0`.
+* Bump `eclipse-wtp` default version from `4.17.0` to `4.18.0`.
+* Bump `ktfmt` default version from `0.16` to `0.19` ([#748](https://github.com/diffplug/spotless/issues/748) and [#773](https://github.com/diffplug/spotless/issues/773)).
+* Bump `jgit` from `5.9` to `5.10` ([#773](https://github.com/diffplug/spotless/issues/773)).
+### Fixed
+* Fixed `ratchetFrom` support for git-submodule ([#746](https://github.com/diffplug/spotless/issues/746)).
+* Fixed `ratchetFrom` excess memory consumption ([#735](https://github.com/diffplug/spotless/issues/735)).
+* `ktfmt` v0.19+ with dropbox-style works again ([#765](https://github.com/diffplug/spotless/pull/765)).
+* `prettier` no longer throws errors on empty files ([#751](https://github.com/diffplug/spotless/pull/751)).
+* Fixed error when running on root of windows mountpoint ([#760](https://github.com/diffplug/spotless/pull/760)).
+* Fixed typo in javadoc comment for SQL\_FORMATTER\_INDENT\_TYPE ([#753](https://github.com/diffplug/spotless/pull/753)).
 
 ## [2.10.2] - 2020-11-16
-
 ### Fixed
-
-- Fixed a bug which occurred if the root directory of the project was also the filesystem root ([#732](https://github.com/diffplug/spotless/pull/732))
+* Fixed a bug which occurred if the root directory of the project was also the filesystem root ([#732](https://github.com/diffplug/spotless/pull/732))
 
 ## [2.10.1] - 2020-11-13
-
 ### Fixed
-
-- Bump JGit from `5.8.0` to `5.9.0` to improve performance ([#726](https://github.com/diffplug/spotless/issues/726))
+* Bump JGit from `5.8.0` to `5.9.0` to improve performance ([#726](https://github.com/diffplug/spotless/issues/726))
 
 ## [2.10.0] - 2020-11-02
-
 ### Added
-
-- Added support to npm-based steps for picking up `.npmrc` files ([#727](https://github.com/diffplug/spotless/pull/727))
+* Added support to npm-based steps for picking up `.npmrc` files ([#727](https://github.com/diffplug/spotless/pull/727))
 
 ## [2.9.0] - 2020-10-20
-
 ### Added
-
-- Added support for eclipse-cdt 4.14.0, 4.16.0 and 4.17.0 ([#722](https://github.com/diffplug/spotless/pull/722)).
-- Added support for eclipse-groovy 4.14.0, 4.15.0, 4.16.0 and 4.17.0 ([#722](https://github.com/diffplug/spotless/pull/722)).
-- Added support for eclipse-jdt 4.17.0 ([#722](https://github.com/diffplug/spotless/pull/722)).
-- Added support for eclipse-wtp 4.14.0, 4.15.0, 4.16.0 and 4.17.0 ([#722](https://github.com/diffplug/spotless/pull/722)).
-
+* Added support for eclipse-cdt 4.14.0, 4.16.0 and 4.17.0 ([#722](https://github.com/diffplug/spotless/pull/722)).
+* Added support for eclipse-groovy 4.14.0, 4.15.0, 4.16.0 and 4.17.0 ([#722](https://github.com/diffplug/spotless/pull/722)).
+* Added support for eclipse-jdt 4.17.0 ([#722](https://github.com/diffplug/spotless/pull/722)).
+* Added support for eclipse-wtp 4.14.0, 4.15.0, 4.16.0 and 4.17.0 ([#722](https://github.com/diffplug/spotless/pull/722)).
 ### Changed
-
-- Updated default eclipse-cdt from 4.13.0 to 4.16.0 ([#722](https://github.com/diffplug/spotless/pull/722)). Note that version 4.17.0 is supported, but requires Java 11 or higher.
-- Updated default eclipse-groovy from 4.13.0 to 4.17.0 ([#722](https://github.com/diffplug/spotless/pull/722)).
-- Updated default eclipse-jdt from 4.16.0 to 4.17.0 ([#722](https://github.com/diffplug/spotless/pull/722)).
-- Updated default eclipse-wtp from 4.13.0 to 4.17.0 ([#722](https://github.com/diffplug/spotless/pull/722)).
+* Updated default eclipse-cdt from 4.13.0 to 4.16.0 ([#722](https://github.com/diffplug/spotless/pull/722)). Note that version 4.17.0 is supported, but requires Java 11 or higher.
+* Updated default eclipse-groovy from 4.13.0 to 4.17.0 ([#722](https://github.com/diffplug/spotless/pull/722)).
+* Updated default eclipse-jdt from 4.16.0 to 4.17.0 ([#722](https://github.com/diffplug/spotless/pull/722)).
+* Updated default eclipse-wtp from 4.13.0 to 4.17.0 ([#722](https://github.com/diffplug/spotless/pull/722)).
 
 ## [2.8.0] - 2020-10-05
-
 ### Added
-
-- Exposed new methods in `GitRatchet` to support faster ratcheting in the Maven plugin ([#706](https://github.com/diffplug/spotless/pull/706)).
+* Exposed new methods in `GitRatchet` to support faster ratcheting in the Maven plugin ([#706](https://github.com/diffplug/spotless/pull/706)).
 
 ## [2.7.0] - 2020-09-21
-
 ### Added
-
-- `PipeStepPair.Builder` now has a method `.buildStepWhichAppliesSubSteps(Path rootPath, Collection<FormatterStep> steps)`, which returns a single `FormatterStep` that applies the given steps within the regex defined earlier in the builder. Used for formatting inception (implements [#412](https://github.com/diffplug/spotless/issues/412)).
+* `PipeStepPair.Builder` now has a method `.buildStepWhichAppliesSubSteps(Path rootPath, Collection<FormatterStep> steps)`, which returns a single `FormatterStep` that applies the given steps within the regex defined earlier in the builder. Used for formatting inception (implements [#412](https://github.com/diffplug/spotless/issues/412)).
 
 ## [2.6.2] - 2020-09-18
-
 ### Fixed
-
-- Don't assume that file content passed into Prettier is at least 50 characters (https://github.com/diffplug/spotless/pull/699).
+* Don't assume that file content passed into Prettier is at least 50 characters (https://github.com/diffplug/spotless/pull/699).
 
 ## [2.6.1] - 2020-09-12
-
 ### Fixed
-
-- Improved JRE parsing to handle strings like `16-loom` (fixes [#693](https://github.com/diffplug/spotless/issues/693)).
+* Improved JRE parsing to handle strings like `16-loom` (fixes [#693](https://github.com/diffplug/spotless/issues/693)).
 
 ## [2.6.0] - 2020-09-11
-
 ### Added
-
-- `PipeStepPair` which allows extracting blocks of text in one step, then injecting those blocks back in later. Currently only used for `spotless:off` `spotless:on`, but could also be used to [apply different steps in different places](https://github.com/diffplug/spotless/issues/412) ([#691](https://github.com/diffplug/spotless/pull/691)).
-
+* `PipeStepPair` which allows extracting blocks of text in one step, then injecting those blocks back in later. Currently only used for `spotless:off` `spotless:on`, but could also be used to [apply different steps in different places](https://github.com/diffplug/spotless/issues/412) ([#691](https://github.com/diffplug/spotless/pull/691)).
 ### Changed
-
-- When applying license headers for the first time, we are now more lenient about parsing existing years from the header ([#690](https://github.com/diffplug/spotless/pull/690)).
+* When applying license headers for the first time, we are now more lenient about parsing existing years from the header ([#690](https://github.com/diffplug/spotless/pull/690)).
 
 ## [2.5.0] - 2020-09-08
-
 ### Added
-
-- `GoogleJavaFormatStep.defaultVersion()` now returns `1.9` on JDK 11+, while continuing to return `1.7` on earlier JDKs. This is especially helpful to `RemoveUnusedImportsStep`, since it always uses the default version of GJF (fixes [#681](https://github.com/diffplug/spotless/issues/681)).
-
+* `GoogleJavaFormatStep.defaultVersion()` now returns `1.9` on JDK 11+, while continuing to return `1.7` on earlier JDKs. This is especially helpful to `RemoveUnusedImportsStep`, since it always uses the default version of GJF (fixes [#681](https://github.com/diffplug/spotless/issues/681)).
 ### Fixed
-
-- We now run all tests against JDK 8, JDK 11, and also JDK 14 ([#684](https://github.com/diffplug/spotless/pull/684)).
-- We had test files in `testlib/src/main/resources` named `module-info.java` and `package-info.java`. They cause problems for the Eclipse IDE trying to interpret them literally. Added `.test` suffix to the filenames so that eclipse doesn't barf on them anymore ([#683](https://github.com/diffplug/spotless/pull/683)).
+* We now run all tests against JDK 8, JDK 11, and also JDK 14 ([#684](https://github.com/diffplug/spotless/pull/684)).
+* We had test files in `testlib/src/main/resources` named `module-info.java` and `package-info.java`. They cause problems for the Eclipse IDE trying to interpret them literally. Added `.test` suffix to the filenames so that eclipse doesn't barf on them anymore ([#683](https://github.com/diffplug/spotless/pull/683)).
 
 ## [2.4.0] - 2020-08-29
-
 ### Added
-
-- Added support for eclipse-jdt 4.14.0, 4.15.0 and 4.16.0 ([#678](https://github.com/diffplug/spotless/pull/678)).
-
+* Added support for  eclipse-jdt 4.14.0, 4.15.0 and 4.16.0 ([#678](https://github.com/diffplug/spotless/pull/678)).
 ### Changed
-
-- Updated default eclipse-jdt from 4.13.0 to 4.16.0 ([#678](https://github.com/diffplug/spotless/pull/678)).
+* Updated default eclipse-jdt from 4.13.0 to 4.16.0 ([#678](https://github.com/diffplug/spotless/pull/678)).
 
 ## [2.3.0] - 2020-08-25
-
 ### Added
-
-- The ability to shell out to formatters with their own executables. ([#672](https://github.com/diffplug/spotless/pull/672))
-  - `ProcessRunner` makes it easy to efficiently and debuggably call foreign executables, and pipe their stdout and stderr to strings.
-  - `ForeignExe` finds executables on the path (or other strategies), and confirms that they have the correct version (to facilitate Spotless' caching). If the executable is not present or the wrong version, it points the user towards how to fix the problem.
-  - These classes were used to add support for [python black](https://github.com/psf/black) and [clang-format](https://clang.llvm.org/docs/ClangFormat.html).
-  - Incidental to this effort, `FormatterFunc.Closeable` now has new methods which make resource-handling safer. The old method is still available as `ofDangerous`, but it should not be used outside of a testing situation. There are some legacy usages of `ofDangerous` in the codebase, and it would be nice to fix them, but the existing usages are using it safely.
+* The ability to shell out to formatters with their own executables. ([#672](https://github.com/diffplug/spotless/pull/672))
+  * `ProcessRunner` makes it easy to efficiently and debuggably call foreign executables, and pipe their stdout and stderr to strings.
+  * `ForeignExe` finds executables on the path (or other strategies), and confirms that they have the correct version (to facilitate Spotless' caching). If the executable is not present or the wrong version, it points the user towards how to fix the problem.
+  * These classes were used to add support for [python black](https://github.com/psf/black) and [clang-format](https://clang.llvm.org/docs/ClangFormat.html).
+  * Incidental to this effort, `FormatterFunc.Closeable` now has new methods which make resource-handling safer.  The old method is still available as `ofDangerous`, but it should not be used outside of a testing situation. There are some legacy usages of `ofDangerous` in the codebase, and it would be nice to fix them, but the existing usages are using it safely.
 
 ## [2.2.2] - 2020-08-21
-
 ### Fixed
-
-- `KtLintStep` is now more robust when parsing version string for version-dependent implementation details, fixes [#668](https://github.com/diffplug/spotless/issues/668).
+* `KtLintStep` is now more robust when parsing version string for version-dependent implementation details, fixes [#668](https://github.com/diffplug/spotless/issues/668).
 
 ## [2.2.1] - 2020-08-05
-
 ### Fixed
-
-- `FormatterFunc.Closeable` had a "use after free" bug which caused errors in the npm-based formatters (e.g. prettier) if `spotlessCheck` was called on dirty files. ([#651](https://github.com/diffplug/spotless/issues/651))
-
+* `FormatterFunc.Closeable` had a "use after free" bug which caused errors in the npm-based formatters (e.g. prettier) if `spotlessCheck` was called on dirty files. ([#651](https://github.com/diffplug/spotless/issues/651))
 ### Changed
-
-- Bump default ktfmt from `0.15` to `0.16`, and remove duplicated logic for the `--dropbox-style` option ([#642](https://github.com/diffplug/spotless/pull/648))
+* Bump default ktfmt from `0.15` to `0.16`, and remove duplicated logic for the `--dropbox-style` option ([#642](https://github.com/diffplug/spotless/pull/648))
 
 ## [2.2.0] - 2020-07-13
-
 ### Added
-
-- Bump default ktfmt from 0.13 to 0.15, and add support for the --dropbox-style option ([#641](https://github.com/diffplug/spotless/issues/641)).
+* Bump default ktfmt from 0.13 to 0.15, and add support for the --dropbox-style option ([#641](https://github.com/diffplug/spotless/issues/641)).
 
 ## [2.1.0] - 2020-07-04
-
 ### Added
-
-- `FileSignature.machineIsWin()`, to replace the now-deprecated `LineEnding.nativeIsWin()`, because it turns out that `\r\n` is [not a reliable way](https://github.com/diffplug/spotless/issues/559#issuecomment-653739898) to detect the windows OS ([#639](https://github.com/diffplug/spotless/pull/639)).
-
+* `FileSignature.machineIsWin()`, to replace the now-deprecated `LineEnding.nativeIsWin()`, because it turns out that `\r\n` is [not a reliable way](https://github.com/diffplug/spotless/issues/559#issuecomment-653739898) to detect the windows OS ([#639](https://github.com/diffplug/spotless/pull/639)).
 ### Fixed
-
-- `GitAttributesLineEndings` was fatally broken (always returned platform default), and our tests missed it because they tested the part before the broken part ([#639](https://github.com/diffplug/spotless/pull/639)).
+* `GitAttributesLineEndings` was fatally broken (always returned platform default), and our tests missed it because they tested the part before the broken part ([#639](https://github.com/diffplug/spotless/pull/639)).
 
 ## [2.0.0] - 2020-07-02
-
 ### Changed
-
-- `LineEnding.GIT_ATTRIBUTES` now creates a policy whose serialized state can be relocated from one machine to another. No user-visible change, but paves the way for remote build cache support in Gradle. ([#621](https://github.com/diffplug/spotless/pull/621))
-
+* `LineEnding.GIT_ATTRIBUTES` now creates a policy whose serialized state can be relocated from one machine to another.  No user-visible change, but paves the way for remote build cache support in Gradle. ([#621](https://github.com/diffplug/spotless/pull/621))
 ### Added
-
-- `prettier` will now autodetect the parser (and formatter) to use based on the filename, unless you override this using `config` or `configFile` with the option `parser` or `filepath`. ([#620](https://github.com/diffplug/spotless/pull/620))
-- `GitRatchet` now lives in `lib-extra`, and is shared across `plugin-gradle` and `plugin-maven` ([#626](https://github.com/diffplug/spotless/pull/626)).
-- Added ANTLR4 support ([#326](https://github.com/diffplug/spotless/issues/326)).
-- `FormatterFunc.NeedsFile` for implementing file-based formatters more cleanly than we have so far ([#637](https://github.com/diffplug/spotless/issues/637)).
-
+* `prettier` will now autodetect the parser (and formatter) to use based on the filename, unless you override this using `config` or `configFile` with the option `parser` or `filepath`. ([#620](https://github.com/diffplug/spotless/pull/620))
+* `GitRatchet` now lives in `lib-extra`, and is shared across `plugin-gradle` and `plugin-maven` ([#626](https://github.com/diffplug/spotless/pull/626)).
+* Added ANTLR4 support ([#326](https://github.com/diffplug/spotless/issues/326)).
+* `FormatterFunc.NeedsFile` for implementing file-based formatters more cleanly than we have so far ([#637](https://github.com/diffplug/spotless/issues/637)).
 ### Changed
-
-- **BREAKING** `FileSignature` can no longer sign folders, only files. Signatures are now based only on filename (not path), size, and a content hash. It throws an error if a signature is attempted on a folder or on multiple files with different paths but the same filename - it never breaks silently. This change does not break any of Spotless' internal logic, so it is unlikely to affect any of Spotless' consumers either. ([#571](https://github.com/diffplug/spotless/pull/571))
-  - This change allows the Maven plugin to cache classloaders across subprojects when loading config resources from the classpath (fixes [#559](https://github.com/diffplug/spotless/issues/559)).
-  - This change also allows the Gradle plugin to work with the remote buildcache (fixes [#280](https://github.com/diffplug/spotless/issues/280)).
-- **BREAKING** `FormatterFunc` no longer `extends ThrowingEx.Function` and `BiFunction`. In a major win for Java's idea of ["target typing"](https://cr.openjdk.java.net/~briangoetz/lambda/lambda-state-final.html), this required no changes anywhere in the codebase except deleting the `extends` part of `FormatterFunc` ([#638](https://github.com/diffplug/spotless/issues/638)).
-- **BREAKING** Heavy refactor of the `LicenseHeaderStep` public API. Doesn't change internal behavior, but makes implementation of the Gradle and Maven plugins much easier. ([#628](https://github.com/diffplug/spotless/pull/628))
-- **BREAKING** Removed all deprecated methods and classes from `lib` and `lib-extra`.
-  - [#629](https://github.com/diffplug/spotless/pull/629) removes the code which wasn't being used in plugin-gradle or plugin-maven.
-  - [#630](https://github.com/diffplug/spotless/pull/630) moves the code which was still being used in deprecated parts of plugin-gradle into `.deprecated` package in `plugin-gradle`, which allows us to break `lib` without a breaking change in `plugin-gradle`.
+* **BREAKING** `FileSignature` can no longer sign folders, only files.  Signatures are now based only on filename (not path), size, and a content hash.  It throws an error if a signature is attempted on a folder or on multiple files with different paths but the same filename - it never breaks silently.  This change does not break any of Spotless' internal logic, so it is unlikely to affect any of Spotless' consumers either. ([#571](https://github.com/diffplug/spotless/pull/571))
+  * This change allows the Maven plugin to cache classloaders across subprojects when loading config resources from the classpath (fixes [#559](https://github.com/diffplug/spotless/issues/559)).
+  * This change also allows the Gradle plugin to work with the remote buildcache (fixes [#280](https://github.com/diffplug/spotless/issues/280)).
+* **BREAKING** `FormatterFunc` no longer `extends ThrowingEx.Function` and `BiFunction`. In a major win for Java's idea of ["target typing"](https://cr.openjdk.java.net/~briangoetz/lambda/lambda-state-final.html), this required no changes anywhere in the codebase except deleting the `extends` part of `FormatterFunc` ([#638](https://github.com/diffplug/spotless/issues/638)).
+* **BREAKING** Heavy refactor of the `LicenseHeaderStep` public API.  Doesn't change internal behavior, but makes implementation of the Gradle and Maven plugins much easier. ([#628](https://github.com/diffplug/spotless/pull/628))
+* **BREAKING** Removed all deprecated methods and classes from `lib` and `lib-extra`.
+  * [#629](https://github.com/diffplug/spotless/pull/629) removes the code which wasn't being used in plugin-gradle or plugin-maven.
+  * [#630](https://github.com/diffplug/spotless/pull/630) moves the code which was still being used in deprecated parts of plugin-gradle into `.deprecated` package in `plugin-gradle`, which allows us to break `lib` without a breaking change in `plugin-gradle`.
 
 ## [1.34.1] - 2020-06-17
-
 ### Changed
-
-- Nodejs-based formatters `prettier` and `tsfmt` now use native node instead of the J2V8 approach. ([#606](https://github.com/diffplug/spotless/pull/606))
-  - This removes the dependency to the no-longer-maintained Linux/Windows/macOs variants of J2V8.
-  - This enables spotless to use the latest `prettier` versions (instead of being stuck at prettier version <= `1.19.0`)
-  - Bumped default versions, prettier `1.16.4` -> `2.0.5`, tslint `5.12.1` -> `6.1.2`
-- Our main branch is now called `main`. ([#613](https://github.com/diffplug/spotless/pull/613))
+* Nodejs-based formatters `prettier` and `tsfmt` now use native node instead of the J2V8 approach. ([#606](https://github.com/diffplug/spotless/pull/606))
+  * This removes the dependency to the no-longer-maintained Linux/Windows/macOs variants of J2V8.
+  * This enables spotless to use the latest `prettier` versions (instead of being stuck at prettier version <= `1.19.0`)
+  * Bumped default versions, prettier `1.16.4` -> `2.0.5`, tslint `5.12.1` -> `6.1.2`
+* Our main branch is now called `main`. ([#613](https://github.com/diffplug/spotless/pull/613))
 
 ## [1.34.0] - 2020-06-05
-
 ### Added
-
-- `LicenseHeaderStep.setLicenseHeaderYearsFromGitHistory`, which does an expensive search through git history to determine the oldest and newest commits for each file, and uses that to determine license header years. ([#604](https://github.com/diffplug/spotless/pull/604))
+* `LicenseHeaderStep.setLicenseHeaderYearsFromGitHistory`, which does an expensive search through git history to determine the oldest and newest commits for each file, and uses that to determine license header years. ([#604](https://github.com/diffplug/spotless/pull/604))
 
 ## [1.33.1] - 2020-06-04
-
-- We are now running CI on windows. ([#596](https://github.com/diffplug/spotless/pull/596))
-- We are now dogfooding `ratchetFrom` and `licenseHeader` with a `$YEAR` token to ensure that Spotless copyright headers stay up-to-date without adding noise to file history. ([#595](https://github.com/diffplug/spotless/pull/595))
-- Added `LineEnding.nativeIsWin()`, `FileSignature.pathNativeToUnix()`, and `FileSignature.pathUnixToNative()`, along with many API-invisible fixes and cleanup. ([#592](https://github.com/diffplug/spotless/pull/592))
+* We are now running CI on windows. ([#596](https://github.com/diffplug/spotless/pull/596))
+* We are now dogfooding `ratchetFrom` and `licenseHeader` with a `$YEAR` token to ensure that Spotless copyright headers stay up-to-date without adding noise to file history. ([#595](https://github.com/diffplug/spotless/pull/595))
+* Added `LineEnding.nativeIsWin()`, `FileSignature.pathNativeToUnix()`, and `FileSignature.pathUnixToNative()`, along with many API-invisible fixes and cleanup. ([#592](https://github.com/diffplug/spotless/pull/592))
 
 ## [1.33.0] - 2020-06-03
-
 ### Added
-
-- `LicenseHeaderStep` now has an `updateYearWithLatest` parameter which can update copyright headers to today's date. ([#593](https://github.com/diffplug/spotless/pull/593))
-  - Parsing of existing years from headers is now more lenient.
-  - The `LicenseHeaderStep` constructor is now public, which allows capturing its state lazily, which is helpful for setting defaults based on `ratchetFrom`.
+* `LicenseHeaderStep` now has an `updateYearWithLatest` parameter which can update copyright headers to today's date. ([#593](https://github.com/diffplug/spotless/pull/593))
+  * Parsing of existing years from headers is now more lenient.
+  * The `LicenseHeaderStep` constructor is now public, which allows capturing its state lazily, which is helpful for setting defaults based on `ratchetFrom`.
 
 ## [1.32.0] - 2020-06-01
-
 ### Added
-
-- `NodeJsGlobal.setSharedLibFolder` allows to set the location of nodejs shared libs. ([#586](https://github.com/diffplug/spotless/pull/586))
-- `PaddedCell.isClean()` returns the instance of `PaddedCell.DirtyState` which represents clean. ([#590](https://github.com/diffplug/spotless/pull/590))
-
+* `NodeJsGlobal.setSharedLibFolder` allows to set the location of nodejs shared libs. ([#586](https://github.com/diffplug/spotless/pull/586))
+* `PaddedCell.isClean()` returns the instance of `PaddedCell.DirtyState` which represents clean. ([#590](https://github.com/diffplug/spotless/pull/590))
 ### Fixed
-
-- Previously, the nodejs-based steps would throw `UnsatisfiedLinkError` if they were ever used from more than one classloader. Now they can be used from any number of classloaders (important for Gradle build daemon). ([#586](https://github.com/diffplug/spotless/pull/586))
+* Previously, the nodejs-based steps would throw `UnsatisfiedLinkError` if they were ever used from more than one classloader.  Now they can be used from any number of classloaders (important for Gradle build daemon). ([#586](https://github.com/diffplug/spotless/pull/586))
 
 ## [1.31.0] - 2020-05-21
-
 ### Added
-
-- `PaddedCell.calculateDirtyState` is now defensive about misconfigured character encoding. ([#575](https://github.com/diffplug/spotless/pull/575))
+* `PaddedCell.calculateDirtyState` is now defensive about misconfigured character encoding. ([#575](https://github.com/diffplug/spotless/pull/575))
 
 ## [1.30.1] - 2020-05-17
-
 ### Fixed
-
-- `PaddedCell.DirtyState::writeCanonicalTo(File)` can now create a new file if necessary (previously required to overwrite an existing file) ([#576](https://github.com/diffplug/spotless/pull/576)).
+* `PaddedCell.DirtyState::writeCanonicalTo(File)` can now create a new file if necessary (previously required to overwrite an existing file) ([#576](https://github.com/diffplug/spotless/pull/576)).
 
 ## [1.30.0] - 2020-05-11
-
 ### Added
-
-- `PaddedCell.calculateDirtyState(Formatter, File, byte[])` to allow IDE integrations to send dirty editor buffers.
+* `PaddedCell.calculateDirtyState(Formatter, File, byte[])` to allow IDE integrations to send dirty editor buffers.
 
 ## [1.29.0] - 2020-05-05
-
 ### Added
-
-- Support for google-java-format 1.8 (including test infrastructure for Java 11). ([#562](https://github.com/diffplug/spotless/issues/562))
-- Improved PaddedCell such that it is as performant as non-padded cell - no reason not to have it always enabled. Deprecated all of `PaddedCellBulk`. ([#561](https://github.com/diffplug/spotless/pull/561))
-- Support for ktfmt 0.13 ([#569](https://github.com/diffplug/spotless/pull/569))
-
+* Support for google-java-format 1.8 (including test infrastructure for Java 11). ([#562](https://github.com/diffplug/spotless/issues/562))
+* Improved PaddedCell such that it is as performant as non-padded cell - no reason not to have it always enabled.  Deprecated all of `PaddedCellBulk`. ([#561](https://github.com/diffplug/spotless/pull/561))
+* Support for ktfmt 0.13 ([#569](https://github.com/diffplug/spotless/pull/569))
 ### Changed
-
-- Updated a bunch of dependencies, most notably: ([#564](https://github.com/diffplug/spotless/pull/564))
-  - jgit `5.5.0.201909110433-r` -> `5.7.0.202003110725-r`
-  - Gradle `6.2.2` -> `6.3`
-  - spotbugs Gradle plugin `2.0.0` -> `4.0.8`
+* Updated a bunch of dependencies, most notably: ([#564](https://github.com/diffplug/spotless/pull/564))
+  * jgit `5.5.0.201909110433-r` -> `5.7.0.202003110725-r`
+  * Gradle `6.2.2` -> `6.3`
+  * spotbugs Gradle plugin `2.0.0` -> `4.0.8`
 
 ## [1.28.1] - 2020-04-02
-
 ### Fixed
-
-- Javadoc for the `ext/eclipse-*` projects.
-- Replace the deprecated `compile` with `implementation` for the `ext/eclipse-*` projects.
+* Javadoc for the `ext/eclipse-*` projects.
+* Replace the deprecated `compile` with `implementation` for the `ext/eclipse-*` projects.
 
 ## [1.28.0] - 2020-03-20
-
 ### Added
-
-- Enable IntelliJ-compatible token `$today.year` for specifying the year in license header files. ([#542](https://github.com/diffplug/spotless/pull/542))
-
+* Enable IntelliJ-compatible token `$today.year` for specifying the year in license header files. ([#542](https://github.com/diffplug/spotless/pull/542))
 ### Fixed
-
-- Eclipse-WTP formatter (web tools platform, not java) could encounter errors in parallel multiproject builds [#492](https://github.com/diffplug/spotless/issues/492). Fixed for Eclipse-WTP formatter Eclipse version 4.13.0 (default version).
-
+* Eclipse-WTP formatter (web tools platform, not java) could encounter errors in parallel multiproject builds [#492](https://github.com/diffplug/spotless/issues/492). Fixed for Eclipse-WTP formatter Eclipse version 4.13.0 (default version).
 ### Build
-
-- All `CHANGES.md` are now in keepachangelog format. ([#507](https://github.com/diffplug/spotless/pull/507))
-- We now use [javadoc.io](https://javadoc.io/) instead of github pages. ([#508](https://github.com/diffplug/spotless/pull/508))
-- We no longer publish `-SNAPSHOT` for every build to `main`, since we have good [JitPack integration](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#gradle---any-commit-in-a-public-github-repo-this-one-or-any-fork). ([#508](https://github.com/diffplug/spotless/pull/508))
-- Improved how we use Spotless on itself. ([#509](https://github.com/diffplug/spotless/pull/509))
-- Fix build warnings when building on Gradle 6+, bump build Gradle to 6.2.2, and fix javadoc links. ([#536](https://github.com/diffplug/spotless/pull/536))
+* All `CHANGES.md` are now in keepachangelog format. ([#507](https://github.com/diffplug/spotless/pull/507))
+* We now use [javadoc.io](https://javadoc.io/) instead of github pages. ([#508](https://github.com/diffplug/spotless/pull/508))
+* We no longer publish `-SNAPSHOT` for every build to `main`, since we have good [JitPack integration](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#gradle---any-commit-in-a-public-github-repo-this-one-or-any-fork). ([#508](https://github.com/diffplug/spotless/pull/508))
+* Improved how we use Spotless on itself. ([#509](https://github.com/diffplug/spotless/pull/509))
+* Fix build warnings when building on Gradle 6+, bump build Gradle to 6.2.2, and fix javadoc links. ([#536](https://github.com/diffplug/spotless/pull/536))
 
 ## [1.27.0] - 2020-01-01
-
-- Ignored `KtLintStepTest`, because [gradle/gradle#11752](https://github.com/gradle/gradle/issues/11752) is causing too many CI failures. ([#499](https://github.com/diffplug/spotless/pull/499))
-  - Also fixed a minor problem in TestProvisioner.
-- If you set the environment variable `SPOTLESS_EXCLUDE_MAVEN=true` then the Maven plugin will be excluded from the build. ([#502](https://github.com/diffplug/spotless/pull/502))
-  - We have set this in JitPack, as a workaround for [jitpack/jitpack.io#4112](https://github.com/jitpack/jitpack.io/issues/4112)
-- Deprecated `SpotlessCache.clear()` in favor of the new `SpotlessCache.clearOnce(Object key)`. ([#501](https://github.com/diffplug/spotless/issues/#501))
+* Ignored `KtLintStepTest`, because [gradle/gradle#11752](https://github.com/gradle/gradle/issues/11752) is causing too many CI failures. ([#499](https://github.com/diffplug/spotless/pull/499))
+    * Also fixed a minor problem in TestProvisioner.
+* If you set the environment variable `SPOTLESS_EXCLUDE_MAVEN=true` then the Maven plugin will be excluded from the build. ([#502](https://github.com/diffplug/spotless/pull/502))
+    * We have set this in JitPack, as a workaround for [jitpack/jitpack.io#4112](https://github.com/jitpack/jitpack.io/issues/4112)
+* Deprecated `SpotlessCache.clear()` in favor of the new `SpotlessCache.clearOnce(Object key)`. ([#501](https://github.com/diffplug/spotless/issues/#501))
 
 ## [1.26.1] - 2019-11-27
-
-- Revert the change in console display of errors from 1.26.0 ([#485](https://github.com/diffplug/spotless/pull/485)) because [of these problems](https://github.com/diffplug/spotless/pull/485#issuecomment-552925932).
-- Bugfix: Fix NPE in EclipseXmlFormatterStepImpl ([#489](https://github.com/diffplug/spotless/pull/489))
+* Revert the change in console display of errors from 1.26.0 ([#485](https://github.com/diffplug/spotless/pull/485)) because [of these problems](https://github.com/diffplug/spotless/pull/485#issuecomment-552925932).
+* Bugfix: Fix NPE in EclipseXmlFormatterStepImpl ([#489](https://github.com/diffplug/spotless/pull/489))
 
 ## [1.26.0] - 2019-11-11
-
-- Fix project URLs in poms. ([#478](https://github.com/diffplug/spotless/pull/478))
-- Fix `ImportSorter` crashing with empty files. ([#474](https://github.com/diffplug/spotless/pull/474))
-  - Fixes [#305](https://github.com/diffplug/spotless/issues/305) StringIndexOutOfBoundsException for empty Groovy file when performing importOrder
-- Bugfix: CDT version `4.12.0` now properly uses `9.8`, whereas before it used `9.7`. ([#482](https://github.com/diffplug/spotless/pull/482#discussion_r341380884))
-- Add support for Eclipse 4.13 and all related formatters (JDT, CDT, WTP, and Groovy). ([#480](https://github.com/diffplug/spotless/issues/480))
-- Bump default version of KtLint from `0.34.2` to `0.35.0`. ([#473](https://github.com/diffplug/spotless/issues/473))
-- Several improvements to the console display of formatting errors. ([#465](https://github.com/diffplug/spotless/pull/465))
-  - Visualize \r and \n as ␍ and ␊ when possible ([#465](https://github.com/diffplug/spotless/pull/465))
-  - Make end-of-lines visible when file contains whitespace and end-of-line issues at the same time ([#465](https://github.com/diffplug/spotless/pull/465))
-  - Print actual diff line instead of "1 more lines that didn't fit" ([#467](https://github.com/diffplug/spotless/issues/467))
-- Automatically configure import order for IntelliJ IDEA with `.editorconfig` ([#486](https://github.com/diffplug/spotless/issues/486))
+* Fix project URLs in poms. ([#478](https://github.com/diffplug/spotless/pull/478))
+* Fix `ImportSorter` crashing with empty files. ([#474](https://github.com/diffplug/spotless/pull/474))
+    * Fixes [#305](https://github.com/diffplug/spotless/issues/305) StringIndexOutOfBoundsException for empty Groovy file when performing importOrder
+* Bugfix: CDT version `4.12.0` now properly uses `9.8`, whereas before it used `9.7`. ([#482](https://github.com/diffplug/spotless/pull/482#discussion_r341380884))
+* Add support for Eclipse 4.13 and all related formatters (JDT, CDT, WTP, and Groovy). ([#480](https://github.com/diffplug/spotless/issues/480))
+* Bump default version of KtLint from `0.34.2` to `0.35.0`. ([#473](https://github.com/diffplug/spotless/issues/473))
+* Several improvements to the console display of formatting errors. ([#465](https://github.com/diffplug/spotless/pull/465))
+    * Visualize \r and \n as ␍ and ␊ when possible ([#465](https://github.com/diffplug/spotless/pull/465))
+    * Make end-of-lines visible when file contains whitespace and end-of-line issues at the same time ([#465](https://github.com/diffplug/spotless/pull/465))
+    * Print actual diff line instead of "1 more lines that didn't fit" ([#467](https://github.com/diffplug/spotless/issues/467))
+* Automatically configure import order for IntelliJ IDEA with `.editorconfig` ([#486](https://github.com/diffplug/spotless/issues/486))
 
 ## [1.25.0] - 2019-10-06
 
-- Add support for ktlint `0.34+`, and bump default version from `0.32.0` to `0.34.2`. ([#469](https://github.com/diffplug/spotless/pull/469))
+* Add support for ktlint `0.34+`, and bump default version from `0.32.0` to `0.34.2`. ([#469](https://github.com/diffplug/spotless/pull/469))
 
 ## [1.24.3] - 2019-09-23
-
-- Update jgit from `5.3.2.201906051522-r` to `5.5.0.201909110433-r`. ([#445](https://github.com/diffplug/spotless/pull/445))
-  - Fixes [#410](https://github.com/diffplug/spotless/issues/410) AccessDeniedException in MinGW/ GitBash.
-  - Also fixes occasional [hang on NFS due to filesystem timers](https://github.com/diffplug/spotless/pull/407#issuecomment-514824364).
-- Eclipse-based formatters used to leave temporary files around ([#447](https://github.com/diffplug/spotless/issues/447)). This is now fixed, but only for eclipse 4.12+, no back-port to older Eclipse formatter versions is planned. ([#451](https://github.com/diffplug/spotless/issues/451))
-- `PaddedCellBulk` had a bug where badly-formatted files with well-behaving formatters were being:
-  - correctly formatted by "apply"
-  - but incorrectly marked as good by "check"
-  - this led to "check" says all good, but then "apply" still causes format (https://github.com/diffplug/spotless/issues/453)
-  - combined with up-to-date checking, could lead to even more confusing results (https://github.com/diffplug/spotless/issues/338)
-  - only affects the Gradle plugin, since that was the only plugin to use this feature
-- Minor change to `TestProvisioner`, which should fix the cache-breaking issues, allowing us to speed-up the CI builds a bit.
-- Bumped `scalafmt` default version from `1.1.0` to `2.0.1`, since there are [bugs](https://github.com/diffplug/spotless/issues/454) in the old default ([#458](https://github.com/diffplug/spotless/pull/458)).
+* Update jgit from `5.3.2.201906051522-r` to `5.5.0.201909110433-r`. ([#445](https://github.com/diffplug/spotless/pull/445))
+  * Fixes [#410](https://github.com/diffplug/spotless/issues/410) AccessDeniedException in MinGW/ GitBash.
+  * Also fixes occasional [hang on NFS due to filesystem timers](https://github.com/diffplug/spotless/pull/407#issuecomment-514824364).
+* Eclipse-based formatters used to leave temporary files around ([#447](https://github.com/diffplug/spotless/issues/447)). This is now fixed, but only for eclipse 4.12+, no back-port to older Eclipse formatter versions is planned. ([#451](https://github.com/diffplug/spotless/issues/451))
+* `PaddedCellBulk` had a bug where badly-formatted files with well-behaving formatters were being:
+    - correctly formatted by "apply"
+    - but incorrectly marked as good by "check"
+    - this led to "check" says all good, but then "apply" still causes format (https://github.com/diffplug/spotless/issues/453)
+    - combined with up-to-date checking, could lead to even more confusing results (https://github.com/diffplug/spotless/issues/338)
+    - only affects the Gradle plugin, since that was the only plugin to use this feature
+* Minor change to `TestProvisioner`, which should fix the cache-breaking issues, allowing us to speed-up the CI builds a bit.
+* Bumped `scalafmt` default version from `1.1.0` to `2.0.1`, since there are [bugs](https://github.com/diffplug/spotless/issues/454) in the old default ([#458](https://github.com/diffplug/spotless/pull/458)).
 
 ## [1.24.1] - 2019-08-12
-
-- Fixes class loading issue with Java 9+ ([#426](https://github.com/diffplug/spotless/pull/426)).
+* Fixes class loading issue with Java 9+ ([#426](https://github.com/diffplug/spotless/pull/426)).
 
 ## [1.24.0] - 2019-07-29
-
-- Updated default eclipse-wtp from 4.8.0 to 4.12.0 ([#423](https://github.com/diffplug/spotless/pull/423)).
-- Updated default eclipse-groovy from 4.10 to 4.12.0 ([#423](https://github.com/diffplug/spotless/pull/423)).
-- Updated default eclipse-jdt from 4.11.0 to 4.12.0 ([#423](https://github.com/diffplug/spotless/pull/423)).
-- Updated default eclipse-cdt from 4.11.0 to 4.12.0 ([#423](https://github.com/diffplug/spotless/pull/423)).
-  - **KNOWN BUG - accidentally published CDT 9.7 rather than 9.8 - fixed in 1.26.0**
-- Added new Maven coordinates for scalafmt 2.0.0+, maintains backwards compatability ([#415](https://github.com/diffplug/spotless/issues/415))
+* Updated default eclipse-wtp from 4.8.0 to 4.12.0 ([#423](https://github.com/diffplug/spotless/pull/423)).
+* Updated default eclipse-groovy from 4.10 to 4.12.0 ([#423](https://github.com/diffplug/spotless/pull/423)).
+* Updated default eclipse-jdt from 4.11.0 to 4.12.0 ([#423](https://github.com/diffplug/spotless/pull/423)).
+* Updated default eclipse-cdt from 4.11.0 to 4.12.0 ([#423](https://github.com/diffplug/spotless/pull/423)).
+    * **KNOWN BUG - accidentally published CDT 9.7 rather than 9.8 - fixed in 1.26.0**
+* Added new Maven coordinates for scalafmt 2.0.0+, maintains backwards compatability ([#415](https://github.com/diffplug/spotless/issues/415))
 
 ## [1.23.1] - 2019-06-17
-
-- Fixes incorrect M2 cache directory path handling of Eclipse based formatters ([#401](https://github.com/diffplug/spotless/issues/401))
-- Update jgit from `4.9.0.201710071750-r` to `5.3.2.201906051522-r` because Gradle project is sometimes broken by `apache httpcomponents` in transitive dependency. ([#407](https://github.com/diffplug/spotless/pull/407))
+* Fixes incorrect M2 cache directory path handling of Eclipse based formatters ([#401](https://github.com/diffplug/spotless/issues/401))
+* Update jgit from `4.9.0.201710071750-r` to `5.3.2.201906051522-r` because Gradle project is sometimes broken by `apache httpcomponents` in transitive dependency. ([#407](https://github.com/diffplug/spotless/pull/407))
 
 ## [1.23.0] - 2019-04-24
-
-- Updated default ktlint from 0.21.0 to 0.32.0, and Maven coords to com.pinterest ([#394](https://github.com/diffplug/spotless/pull/394))
+* Updated default ktlint from 0.21.0 to 0.32.0, and Maven coords to com.pinterest ([#394](https://github.com/diffplug/spotless/pull/394))
 
 ## [1.22.0] - 2019-04-15
-
-- Updated default eclipse-cdt from 4.7.3a to 4.11.0 ([#390](https://github.com/diffplug/spotless/pull/390)).
+* Updated default eclipse-cdt from 4.7.3a to 4.11.0 ([#390](https://github.com/diffplug/spotless/pull/390)).
 
 ## [1.21.1] - 2019-03-29
-
-- Fixes incorrect plugin and pom metadata in `1.21.0` ([#388](https://github.com/diffplug/spotless/issues/388)).
+* Fixes incorrect plugin and pom metadata in `1.21.0` ([#388](https://github.com/diffplug/spotless/issues/388)).
 
 ## [1.21.0] - 2019-03-28
-
-- We now use a remote build cache to speed up CI builds. Reduced build time from ~13 minutes to as low as ~3 minutes, dependending on how deep the change is ([#380](https://github.com/diffplug/spotless/pull/380)).
-- Updated default eclipse-wtp from 4.7.3b to 4.8.0 ([#382](https://github.com/diffplug/spotless/pull/382)).
-- Updated default eclipse-groovy from 4.8.1 to 4.10.0 ([#382](https://github.com/diffplug/spotless/pull/382)).
-- Updated default eclipse-jdt from 4.10.0 to 4.11.0 ([#384](https://github.com/diffplug/spotless/pull/384)).
+* We now use a remote build cache to speed up CI builds.  Reduced build time from ~13 minutes to as low as ~3 minutes, dependending on how deep the change is ([#380](https://github.com/diffplug/spotless/pull/380)).
+* Updated default eclipse-wtp from 4.7.3b to 4.8.0 ([#382](https://github.com/diffplug/spotless/pull/382)).
+* Updated default eclipse-groovy from 4.8.1 to 4.10.0 ([#382](https://github.com/diffplug/spotless/pull/382)).
+* Updated default eclipse-jdt from 4.10.0 to 4.11.0 ([#384](https://github.com/diffplug/spotless/pull/384)).
 
 ## [1.20.0] - 2019-03-11
-
-- Made npm package versions of [`prettier`](https://prettier.io/) and [`tsfmt`](https://github.com/vvakame/typescript-formatter) (and its internal packages) configurable. ([#363](https://github.com/diffplug/spotless/pull/363))
-  - Updated default npm package version of `prettier` from 1.13.4 to 1.16.4
-  - Updated default npm package version of internally used typescript package from 2.9.2 to 3.3.3 and tslint package from 5.1.0 to 5.12.0 (both used by `tsfmt`)
-- Updated default eclipse-wtp from 4.7.3a to 4.7.3b ([#371](https://github.com/diffplug/spotless/pull/371)).
-- Configured `build-scan` plugin in build ([#356](https://github.com/diffplug/spotless/pull/356)).
-  - Runs on every CI build automatically.
-  - Users need to opt-in on their local machine.
-- Default behavior of XML formatter changed to ignore external URIs ([#369](https://github.com/diffplug/spotless/issues/369)).
-  - **WARNING RESOLVED: By default, xml formatter no longer downloads external entities. You can opt-in to resolve external entities by setting resolveExternalURI to true. However, if you do opt-in, be sure that all external entities are referenced over https and not http, or you may be vulnerable to XXE attacks.**
+* Made npm package versions of [`prettier`](https://prettier.io/) and [`tsfmt`](https://github.com/vvakame/typescript-formatter) (and its internal packages) configurable. ([#363](https://github.com/diffplug/spotless/pull/363))
+  * Updated default npm package version of `prettier` from 1.13.4 to 1.16.4
+  * Updated default npm package version of internally used typescript package from 2.9.2 to 3.3.3 and tslint package from 5.1.0 to 5.12.0 (both used by `tsfmt`)
+* Updated default eclipse-wtp from 4.7.3a to 4.7.3b ([#371](https://github.com/diffplug/spotless/pull/371)).
+* Configured `build-scan` plugin in build ([#356](https://github.com/diffplug/spotless/pull/356)).
+  * Runs on every CI build automatically.
+  * Users need to opt-in on their local machine.
+* Default behavior of XML formatter changed to ignore external URIs ([#369](https://github.com/diffplug/spotless/issues/369)).
+  * **WARNING RESOLVED: By default, xml formatter no longer downloads external entities. You can opt-in to resolve external entities by setting resolveExternalURI to true. However, if you do opt-in, be sure that all external entities are referenced over https and not http, or you may be vulnerable to XXE attacks.**
 
 ## [1.19.0] - 2019-03-11
-
 **WARNING: xml formatter in this version may be vulnerable to XXE attacks, fixed in 1.20.0 (see [#358](https://github.com/diffplug/spotless/issues/358)).**
 
-- Security fix: Updated groovy, c/c++, and eclipse WTP formatters so that they download their source jars securely using `https` rather than `http` ([#360](https://github.com/diffplug/spotless/issues/360)).
-- Updated default eclipse-jdt from 4.9.0 to 4.10.0 ([#368](https://github.com/diffplug/spotless/pull/368))
+* Security fix: Updated groovy, c/c++, and eclipse WTP formatters so that they download their source jars securely using `https` rather than `http` ([#360](https://github.com/diffplug/spotless/issues/360)).
+* Updated default eclipse-jdt from 4.9.0 to 4.10.0 ([#368](https://github.com/diffplug/spotless/pull/368))
 
 ## [1.18.0] - 2019-02-11
-
 **WARNING: xml formatter in this version may be vulnerable to XXE attacks, fixed in 1.20.0 (see [#358](https://github.com/diffplug/spotless/issues/358)).**
 
-- CSS and XML extensions are discontinued ([#325](https://github.com/diffplug/spotless/pull/325)).
-- Provided features with access to SLF4J interface of build tools. ([#236](https://github.com/diffplug/spotless/issues/236))
-- Updated default google-java-format from 1.5 to 1.7 ([#335](https://github.com/diffplug/spotless/issues/335)).
-- `ImportOrderStep.createFromFile` is now lazy ([#218](https://github.com/diffplug/spotless/issues/218)).
+* CSS and XML extensions are discontinued ([#325](https://github.com/diffplug/spotless/pull/325)).
+* Provided features with access to SLF4J interface of build tools. ([#236](https://github.com/diffplug/spotless/issues/236))
+* Updated default google-java-format from 1.5 to 1.7 ([#335](https://github.com/diffplug/spotless/issues/335)).
+* `ImportOrderStep.createFromFile` is now lazy ([#218](https://github.com/diffplug/spotless/issues/218)).
 
 ## [1.17.0] - 2018-10-30
-
 **WARNING: xml formatter in this version may be vulnerable to XXE attacks, fixed in 1.20.0 (see [#358](https://github.com/diffplug/spotless/issues/358)).**
 
-- Updated default eclipse-jdt from 4.7.3a to 4.9.0 ([#316](https://github.com/diffplug/spotless/pull/316)). New version addresses enum-tab formatting bug in 4.8 ([#314](https://github.com/diffplug/spotless/issues/314)).
+* Updated default eclipse-jdt from 4.7.3a to 4.9.0 ([#316](https://github.com/diffplug/spotless/pull/316)). New version addresses enum-tab formatting bug in 4.8 ([#314](https://github.com/diffplug/spotless/issues/314)).
 
 ## [1.16.0] - 2018-10-30
-
 **WARNING: xml formatter in this version may be vulnerable to XXE attacks, fixed in 1.20.0 (see [#358](https://github.com/diffplug/spotless/issues/358)).**
 
-- Minor support for plugin-gradle and plugin-maven CSS plugins ([#311](https://github.com/diffplug/spotless/pull/311)).
+* Minor support for plugin-gradle and plugin-maven CSS plugins ([#311](https://github.com/diffplug/spotless/pull/311)).
 
 ## [1.15.0] - 2018-09-23
-
 **WARNING: xml formatter in this version may be vulnerable to XXE attacks, fixed in 1.20.0 (see [#358](https://github.com/diffplug/spotless/issues/358)).**
 
-- Added C/C++ support ([#232](https://github.com/diffplug/spotless/issues/232)).
-- Integrated Eclipse CDT formatter ([#274](https://github.com/diffplug/spotless/pull/274))
-- Extended dependency provisioner to exclude transitives on request ([#297](https://github.com/diffplug/spotless/pull/297)).This prevents unnecessary downloads of unused transitive dependencies for Eclipse based formatter steps.
-- Updated default groovy-eclipse from 4.8.0 to 4.8.1 ([#288](https://github.com/diffplug/spotless/pull/288)). New version is based on [Groovy-Eclipse 3.0.0](https://github.com/groovy/groovy-eclipse/wiki/3.0.0-Release-Notes).
-- Integrated Eclipse WTP formatter ([#290](https://github.com/diffplug/spotless/pull/290))
-- Updated JSR305 annotation from 3.0.0 to 3.0.2 ([#274](https://github.com/diffplug/spotless/pull/274))
-- Migrated from FindBugs annotations 3.0.0 to SpotBugs annotations 3.1.6 ([#274](https://github.com/diffplug/spotless/pull/274))
-- `Formatter` now implements `AutoCloseable`. This means that users of `Formatter` are expected to use the try-with-resources pattern. The reason for this change is so that `FormatterFunc.Closeable` actually works. ([#284](https://github.com/diffplug/spotless/pull/284))\* Added [`prettier`](https://prettier.io/) and [`tsfmt`](https://github.com/vvakame/typescript-formatter) support, as well as general infrastructure for calling `nodeJS` code using `j2v8` ([#283](https://github.com/diffplug/spotless/pull/283)).
+* Added C/C++ support ([#232](https://github.com/diffplug/spotless/issues/232)).
+* Integrated Eclipse CDT formatter ([#274](https://github.com/diffplug/spotless/pull/274))
+* Extended dependency provisioner to exclude transitives on request ([#297](https://github.com/diffplug/spotless/pull/297)).This prevents unnecessary downloads of unused transitive dependencies for Eclipse based formatter steps.
+* Updated default groovy-eclipse from 4.8.0 to 4.8.1 ([#288](https://github.com/diffplug/spotless/pull/288)). New version is based on [Groovy-Eclipse 3.0.0](https://github.com/groovy/groovy-eclipse/wiki/3.0.0-Release-Notes).
+* Integrated Eclipse WTP formatter ([#290](https://github.com/diffplug/spotless/pull/290))
+* Updated JSR305 annotation from 3.0.0 to 3.0.2 ([#274](https://github.com/diffplug/spotless/pull/274))
+* Migrated from FindBugs annotations 3.0.0 to SpotBugs annotations 3.1.6 ([#274](https://github.com/diffplug/spotless/pull/274))
+* `Formatter` now implements `AutoCloseable`.  This means that users of `Formatter` are expected to use the try-with-resources pattern.  The reason for this change is so that `FormatterFunc.Closeable` actually works. ([#284](https://github.com/diffplug/spotless/pull/284))* Added [`prettier`](https://prettier.io/) and [`tsfmt`](https://github.com/vvakame/typescript-formatter) support, as well as general infrastructure for calling `nodeJS` code using `j2v8` ([#283](https://github.com/diffplug/spotless/pull/283)).
 
 ## [1.14.0] - 2018-07-24
-
-- Updated default groovy-eclipse from 4.6.3 to 4.8.0 ([#244](https://github.com/diffplug/spotless/pull/244)). New version allows to ignore internal formatter errors/warnings.
-- Updated default eclipse-jdt from 4.7.2 to 4.8.0 ([#239](https://github.com/diffplug/spotless/pull/239)). New version fixes a bug preventing Java code formatting within JavaDoc comments ([#191](https://github.com/diffplug/spotless/issues/191)).
-- Eclipse formatter versions decoupled from Spotless formatter step implementations to allow independent updates of maven-based Eclipse dependencies. ([#253](https://github.com/diffplug/spotless/pull/253))
-- Use guaranteed binary and source compatibility between releases of Scalafmt. ([#260](https://github.com/diffplug/spotless/pull/260))
+* Updated default groovy-eclipse from 4.6.3 to 4.8.0 ([#244](https://github.com/diffplug/spotless/pull/244)). New version allows to ignore internal formatter errors/warnings.
+* Updated default eclipse-jdt from 4.7.2 to 4.8.0 ([#239](https://github.com/diffplug/spotless/pull/239)). New version fixes a bug preventing Java code formatting within JavaDoc comments ([#191](https://github.com/diffplug/spotless/issues/191)).
+* Eclipse formatter versions decoupled from Spotless formatter step implementations to allow independent updates of maven-based Eclipse dependencies. ([#253](https://github.com/diffplug/spotless/pull/253))
+* Use guaranteed binary and source compatibility between releases of Scalafmt. ([#260](https://github.com/diffplug/spotless/pull/260))
 
 ## [1.13.0] - 2018-06-01
-
-- Add line and column numbers to ktlint errors. ([#251](https://github.com/diffplug/spotless/pull/251))
+* Add line and column numbers to ktlint errors. ([#251](https://github.com/diffplug/spotless/pull/251))
 
 ## [1.12.0] - 2018-05-14
-
-- Fixed a bug in `LicenseHeaderStep` which caused an exception with some malformed date-aware licenses. ([#222](https://github.com/diffplug/spotless/pull/222))
-- Updated default ktlint from 0.14.0 to 0.21.0
-- Add ability to pass custom options to ktlint in Gradle plugin. See plugin-gradle/README for details.
+* Fixed a bug in `LicenseHeaderStep` which caused an exception with some malformed date-aware licenses. ([#222](https://github.com/diffplug/spotless/pull/222))
+* Updated default ktlint from 0.14.0 to 0.21.0
+* Add ability to pass custom options to ktlint in Gradle plugin. See plugin-gradle/README for details.
 
 ## [1.11.0] - 2018-02-26
-
-- Added default indentation of `4` to `IndentStep`. ([#209](https://github.com/diffplug/spotless/pull/209))
+* Added default indentation of `4` to `IndentStep`. ([#209](https://github.com/diffplug/spotless/pull/209))
 
 ## [1.10.0] - 2018-02-15
-
-- LicenseHeaderStep now supports customizing the year range separator in copyright notices. ([#199](https://github.com/diffplug/spotless/pull/199))
-- Breaking change to testlib - removed `ResourceHarness.write` and added `ResourceHarness.[set/assert]File` for easier-to-read tests. ([#203](https://github.com/diffplug/spotless/pull/203))
+* LicenseHeaderStep now supports customizing the year range separator in copyright notices. ([#199](https://github.com/diffplug/spotless/pull/199))
+* Breaking change to testlib - removed `ResourceHarness.write` and added `ResourceHarness.[set/assert]File` for easier-to-read tests. ([#203](https://github.com/diffplug/spotless/pull/203))
 
 ## [1.9.0] - 2018-02-05
-
-- Updated default ktlint from 0.6.1 to 0.14.0
-- Updated default google-java-format from 1.3 to 1.5
-- Updated default eclipse-jdt from 4.7.1 to 4.7.2
-- Added a configuration option to `googleJavaFormat` to switch the formatter style ([#193](https://github.com/diffplug/spotless/pull/193))
+* Updated default ktlint from 0.6.1 to 0.14.0
+* Updated default google-java-format from 1.3 to 1.5
+* Updated default eclipse-jdt from 4.7.1 to 4.7.2
+* Added a configuration option to `googleJavaFormat` to switch the formatter style ([#193](https://github.com/diffplug/spotless/pull/193))
 
 ## [1.8.0] - 2018-01-02
-
-- LicenseHeaderStep now supports time-aware copyright notices in license headers. ([#179](https://github.com/diffplug/spotless/pull/179), thanks to @baptistemesta)
+* LicenseHeaderStep now supports time-aware copyright notices in license headers. ([#179](https://github.com/diffplug/spotless/pull/179), thanks to @baptistemesta)
 
 ## [1.7.0] - 2018-12-02
-
-- Updated default eclipse-jdt version to `4.7.1` from `4.6.3`.
-- Updated jgit from `4.5.0.201609210915-r` to `4.9.0.201710071750-r`.
-- Updated concurrent-trees from `2.6.0` to `2.6.1` (performance improvement).
-- Added `dbeaverSql` formatter step, for formatting sql scripts. ([#166](https://github.com/diffplug/spotless/pull/166))
-  - Many thanks to [Baptiste Mesta](https://github.com/baptistemesta) for porting to Spotless.
-  - Many thanks to [DBeaver](https://dbeaver.jkiss.org/) and the [DBeaver contributors](https://github.com/serge-rider/dbeaver/graphs/contributors) for building the implementation.
+* Updated default eclipse-jdt version to `4.7.1` from `4.6.3`.
+* Updated jgit from `4.5.0.201609210915-r` to `4.9.0.201710071750-r`.
+* Updated concurrent-trees from `2.6.0` to `2.6.1` (performance improvement).
+* Added `dbeaverSql` formatter step, for formatting sql scripts. ([#166](https://github.com/diffplug/spotless/pull/166))
+  + Many thanks to [Baptiste Mesta](https://github.com/baptistemesta) for porting to Spotless.
+  + Many thanks to [DBeaver](https://dbeaver.jkiss.org/) and the [DBeaver contributors](https://github.com/serge-rider/dbeaver/graphs/contributors) for building the implementation.
 
 ## [1.6.0] - 2017-09-29
-
-- Added `public static boolean PaddedCell::applyAnyChanged(Formatter formatter, File file)`.
+* Added `public static boolean PaddedCell::applyAnyChanged(Formatter formatter, File file)`.
 
 ## [1.5.1] - 2017-08-14
-
-- Added `KtLintStep.createForScript`.
+* Added `KtLintStep.createForScript`.
 
 ## [1.5.0] - 2017-08-13
-
-- Deprecated `ImportOrderStep.createFromOrder(List<String>` in favor of `(String...`.
+* Deprecated `ImportOrderStep.createFromOrder(List<String>` in favor of `(String...`.
 
 ## [1.4.1] - 2017-07-11
-
-- Default eclipse version for `EclipseFormatterStep` bumped to `4.6.3` from `4.6.1`. ([#116](https://github.com/diffplug/spotless/issues/116))
-- Default scalafmt version for `ScalaFmtStep` bumped to `1.1.0` from `0.5.7` ([#124](https://github.com/diffplug/spotless/pull/124))
-  - Also added support for the API change to scalafmt introduced in `0.7.0-RC1`
+* Default eclipse version for `EclipseFormatterStep` bumped to `4.6.3` from `4.6.1`. ([#116](https://github.com/diffplug/spotless/issues/116))
+* Default scalafmt version for `ScalaFmtStep` bumped to `1.1.0` from `0.5.7` ([#124](https://github.com/diffplug/spotless/pull/124))
+  + Also added support for the API change to scalafmt introduced in `0.7.0-RC1`
 
 ## [1.4.0] - 2017-05-21
-
-- `ImportOrderStep` can now handle multi-line comments and misplaced imports.
-  - Especially helpful for Groovy and Gradle files.
+* `ImportOrderStep` can now handle multi-line comments and misplaced imports.
+  + Especially helpful for Groovy and Gradle files.
 
 ## [1.3.2] - 2017-05-03
-
-- Fixed a bug in `PaddedCellBulk.check()` which caused a `check` to fail even after an `apply` for cases which caused CYCLE.
+* Fixed a bug in `PaddedCellBulk.check()` which caused a `check` to fail even after an `apply` for cases which caused CYCLE.
 
 ## [1.3.0] - 2017-04-11
-
-- Added support for Groovy via [greclipse](https://github.com/groovy/groovy-eclipse).
-- When a JarState resolution failed, it threw a Gradle-specific error message. That message has been moved out of `lib` and into `plugin-gradle` where it belongs.
+* Added support for Groovy via [greclipse](https://github.com/groovy/groovy-eclipse).
+* When a JarState resolution failed, it threw a Gradle-specific error message. That message has been moved out of `lib` and into `plugin-gradle` where it belongs.
 
 ## [1.2.0] - 2017-04-03
-
-- Deprecated `FileSignature.from` in favor of `FileSignature.signAsSet` and the new `FileSignature.signAsList`.
-- Added a `FormatterProperties` class which loads `.properties` files and eclipse-style `.xml` files.
-- `SerializableFileFilter.skipFilesNamed` can now skip multiple file names.
-- Update default KtLint from 0.3.1 to 0.6.1.
-  - This means we no longer look for rules in the typo package `com.gihub.shyiko`, now only in `com.github.shyiko` (note the `t`).
+* Deprecated `FileSignature.from` in favor of `FileSignature.signAsSet` and the new `FileSignature.signAsList`.
+* Added a `FormatterProperties` class which loads `.properties` files and eclipse-style `.xml` files.
+* `SerializableFileFilter.skipFilesNamed` can now skip multiple file names.
+* Update default KtLint from 0.3.1 to 0.6.1.
+  + This means we no longer look for rules in the typo package `com.gihub.shyiko`, now only in `com.github.shyiko` (note the `t`).
 
 ## [1.1.0] - 2017-02-27
-
-- Added support for Scala via [scalafmt](https://github.com/olafurpg/scalafmt).
-- Added support for Kotlin via [ktlint](https://github.com/pinterest/ktlint).
-- Better error messages for JarState.
-- Improved test harnessing.
-- Formatter now has pluggable exception policies,
+* Added support for Scala via [scalafmt](https://github.com/olafurpg/scalafmt).
+* Added support for Kotlin via [ktlint](https://github.com/pinterest/ktlint).
+* Better error messages for JarState.
+* Improved test harnessing.
+* Formatter now has pluggable exception policies,
 
 ## [1.0.0] - 2017-01-09
-
-- Initial release!
+* Initial release!

From b629ccf936869b1b4db3887f79dca7edfad8b188 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 2 May 2024 06:27:22 +0000
Subject: [PATCH 1581/2068] Update dependency
 com.github.spullara.mustache.java:compiler to v0.9.13

---
 plugin-maven/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-maven/build.gradle b/plugin-maven/build.gradle
index f2f85f0383..461b7876de 100644
--- a/plugin-maven/build.gradle
+++ b/plugin-maven/build.gradle
@@ -50,7 +50,7 @@ dependencies {
 	testImplementation "org.assertj:assertj-core:${VER_ASSERTJ}"
 	testImplementation "org.mockito:mockito-core:${VER_MOCKITO}"
 	testImplementation "com.diffplug.durian:durian-io:${VER_DURIAN}"
-	testImplementation 'com.github.spullara.mustache.java:compiler:0.9.10'
+	testImplementation 'com.github.spullara.mustache.java:compiler:0.9.13'
 	testImplementation 'org.owasp.encoder:encoder:1.2.3'
 	testImplementation "org.apache.maven:maven-plugin-api:${VER_MAVEN_API}"
 	testImplementation "org.eclipse.aether:aether-api:${VER_ECLIPSE_AETHER}"

From d6e37e73d489c1bc6d9b1803f6a7340402031cb2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 5 May 2024 03:25:55 +0000
Subject: [PATCH 1582/2068] Update dependency
 com.fasterxml.jackson.core:jackson-databind to v2.17.1

---
 lib/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 9a1e1ac3b9..aa9d047a8a 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -97,7 +97,7 @@ dependencies {
 	// gson
 	gsonCompileOnly 'com.google.code.gson:gson:2.10.1'
 	// jackson
-	String VER_JACKSON='2.14.2'
+	String VER_JACKSON='2.17.1'
 	jacksonCompileOnly "com.fasterxml.jackson.core:jackson-databind:$VER_JACKSON"
 	jacksonCompileOnly "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$VER_JACKSON"
 	// ktfmt

From 503c8f6e5ab439f1d572cda07da354212b56cfa9 Mon Sep 17 00:00:00 2001
From: Julius Lehmann <git@devpi.de>
Date: Mon, 6 May 2024 10:53:47 +0200
Subject: [PATCH 1583/2068] Add NativeCmdStepTest to test serialization

---
 .../spotless/generic/NativeCmdStepTest.java   | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 testlib/src/test/java/com/diffplug/spotless/generic/NativeCmdStepTest.java

diff --git a/testlib/src/test/java/com/diffplug/spotless/generic/NativeCmdStepTest.java b/testlib/src/test/java/com/diffplug/spotless/generic/NativeCmdStepTest.java
new file mode 100644
index 0000000000..e5253966b7
--- /dev/null
+++ b/testlib/src/test/java/com/diffplug/spotless/generic/NativeCmdStepTest.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2021-2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.generic;
+
+import static org.assertj.core.api.Assumptions.assumeThat;
+
+import java.io.File;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.ResourceHarness;
+import com.diffplug.spotless.StepHarnessWithFile;
+
+public class NativeCmdStepTest extends ResourceHarness {
+
+	@Test
+	public void testWithSed() {
+		File sed = new File("/usr/bin/sed");
+		assumeThat(sed).exists();
+		FormatterStep step = NativeCmdStep.create("format-native", sed, List.of("s/placeholder/replaced/g"));
+		StepHarnessWithFile.forStep(this, step)
+				.testResource("native_cmd/dirty.txt", "native_cmd/clean.txt");
+	}
+}

From 33764c3428d81befc56e3c9dad40ea2754fa69b0 Mon Sep 17 00:00:00 2001
From: Mark Chesney <mches@users.noreply.github.com>
Date: Sun, 19 May 2024 13:06:27 -0700
Subject: [PATCH 1584/2068] Update sortpom to 4.0.0

---
 lib/build.gradle                                             | 2 +-
 lib/src/main/java/com/diffplug/spotless/pom/SortPomCfg.java  | 4 +++-
 .../com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java | 2 +-
 plugin-gradle/README.md                                      | 3 ++-
 .../main/java/com/diffplug/gradle/spotless/PomExtension.java | 5 +++++
 .../java/com/diffplug/gradle/spotless/SortPomGradleTest.java | 3 ++-
 plugin-maven/README.md                                       | 2 ++
 .../main/java/com/diffplug/spotless/maven/pom/SortPom.java   | 4 ++++
 .../src/test/java/com/diffplug/spotless/pom/SortPomTest.java | 2 +-
 9 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 9a1e1ac3b9..cbcbe69d37 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -128,7 +128,7 @@ dependencies {
 	// scalafmt
 	scalafmtCompileOnly "org.scalameta:scalafmt-core_2.13:3.7.3"
 	// sortPom
-	sortPomCompileOnly 'com.github.ekryd.sortpom:sortpom-sorter:3.4.1'
+	sortPomCompileOnly 'com.github.ekryd.sortpom:sortpom-sorter:4.0.0'
 	sortPomCompileOnly 'org.slf4j:slf4j-api:2.0.12'
 	// zjsonPatch
 	zjsonPatchCompileOnly 'com.flipkart.zjsonpatch:zjsonpatch:0.4.14'
diff --git a/lib/src/main/java/com/diffplug/spotless/pom/SortPomCfg.java b/lib/src/main/java/com/diffplug/spotless/pom/SortPomCfg.java
index 58e3f9d45a..656b6f16f4 100644
--- a/lib/src/main/java/com/diffplug/spotless/pom/SortPomCfg.java
+++ b/lib/src/main/java/com/diffplug/spotless/pom/SortPomCfg.java
@@ -21,7 +21,7 @@
 public class SortPomCfg implements Serializable {
 	private static final long serialVersionUID = 1L;
 
-	public String version = "3.4.1";
+	public String version = "4.0.0";
 
 	public String encoding = "UTF-8";
 
@@ -41,6 +41,8 @@ public class SortPomCfg implements Serializable {
 
 	public boolean indentSchemaLocation = false;
 
+	public String indentAttribute = null;
+
 	public String predefinedSortOrder = "recommended_2008_06";
 
 	public String sortOrderFile = null;
diff --git a/lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java b/lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java
index 57b96d70c7..49c416adfc 100644
--- a/lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java
+++ b/lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java
@@ -51,7 +51,7 @@ public String apply(String input) throws Exception {
 				.setFileOutput(false, null, null, false)
 				.setEncoding(cfg.encoding)
 				.setFormatting(cfg.lineSeparator, cfg.expandEmptyElements, cfg.spaceBeforeCloseEmptyElement, cfg.keepBlankLines, cfg.endWithNewline)
-				.setIndent(cfg.nrOfIndentSpace, cfg.indentBlankLines, cfg.indentSchemaLocation)
+				.setIndent(cfg.nrOfIndentSpace, cfg.indentBlankLines, cfg.indentSchemaLocation, cfg.indentAttribute)
 				.setSortOrder(cfg.sortOrderFile, cfg.predefinedSortOrder)
 				.setSortEntities(cfg.sortDependencies, cfg.sortDependencyExclusions, cfg.sortDependencyManagement,
 						cfg.sortPlugins, cfg.sortProperties, cfg.sortModules, cfg.sortExecutions)
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 606589ed7f..bb1a9dd6dc 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -700,7 +700,7 @@ All configuration settings are optional, they are described in detail [here](htt
 ```gradle
 spotless {
   pom {
-    sortPom('3.4.0')
+    sortPom('4.0.0')
       .encoding('UTF-8') // The encoding of the pom files
       .lineSeparator(System.getProperty('line.separator')) // line separator to use
       .expandEmptyElements(true) // Should empty elements be expanded
@@ -710,6 +710,7 @@ spotless {
       .nrOfIndentSpace(2) // Indentation
       .indentBlankLines(false) // Should empty lines be indented
       .indentSchemaLocation(false) // Should schema locations be indented
+      .indentAttribute(null) // Should the xml attributes be indented
       .predefinedSortOrder('recommended_2008_06') // Sort order of elements: https://github.com/Ekryd/sortpom/wiki/PredefinedSortOrderProfiles
       .sortOrderFile(null) // Custom sort order of elements: https://raw.githubusercontent.com/Ekryd/sortpom/master/sorter/src/main/resources/custom_1.xml
       .sortDependencies(null) // Sort dependencies: https://github.com/Ekryd/sortpom/wiki/SortDependencies
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PomExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PomExtension.java
index 463463d320..4474a36385 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PomExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PomExtension.java
@@ -107,6 +107,11 @@ public SortPomGradleConfig indentSchemaLocation(boolean indentSchemaLocation) {
 			return this;
 		}
 
+		public SortPomGradleConfig indentAttribute(String indentAttribute) {
+			cfg.indentAttribute = indentAttribute;
+			return this;
+		}
+
 		public SortPomGradleConfig predefinedSortOrder(String predefinedSortOrder) {
 			cfg.predefinedSortOrder = predefinedSortOrder;
 			return this;
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SortPomGradleTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SortPomGradleTest.java
index 1c51d4c2a8..6b798326c4 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SortPomGradleTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SortPomGradleTest.java
@@ -73,7 +73,7 @@ void sortPomWithVersion() throws Exception {
 				"repositories { mavenCentral() }",
 				"spotless {",
 				"  pom {",
-				"    sortPom '3.4.0'",
+				"    sortPom '4.0.0'",
 				"  }",
 				"}");
 		setFile("pom.xml").toResource("pom/pom_dirty.xml");
@@ -105,6 +105,7 @@ void sortPomWithParameters() throws Exception {
 				"      .nrOfIndentSpace(2)",
 				"      .indentBlankLines(false)",
 				"      .indentSchemaLocation(false)",
+				"      .indentAttribute(null)",
 				"      .predefinedSortOrder('recommended_2008_06')",
 				"      .sortOrderFile(null)",
 				"      .sortDependencies(null)",
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 383efd53ec..ff46b87bb7 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -667,6 +667,8 @@ All configuration settings are optional, they are described in detail [here](htt
 
   <indentSchemaLocation>false</indentSchemaLocation> <!-- Should schema locations be indented -->
 
+  <indentAttribute></indentAttribute> <!-- Should the xml attributes be indented -->
+
   <predefinedSortOrder>recommended_2008_06</predefinedSortOrder> <!-- Sort order of elements: https://github.com/Ekryd/sortpom/wiki/PredefinedSortOrderProfiles-->
 
   <sortOrderFile></sortOrderFile> <!-- Custom sort order of elements: https://raw.githubusercontent.com/Ekryd/sortpom/master/sorter/src/main/resources/custom_1.xml -->
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/pom/SortPom.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/pom/SortPom.java
index efa2f533b8..8b0df8a7b0 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/pom/SortPom.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/pom/SortPom.java
@@ -56,6 +56,9 @@ public class SortPom implements FormatterStepFactory {
 	@Parameter
 	boolean indentSchemaLocation = defaultValues.indentSchemaLocation;
 
+	@Parameter
+	String indentAttribute = defaultValues.indentAttribute;
+
 	@Parameter
 	String predefinedSortOrder = defaultValues.predefinedSortOrder;
 
@@ -96,6 +99,7 @@ public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 		cfg.nrOfIndentSpace = nrOfIndentSpace;
 		cfg.indentBlankLines = indentBlankLines;
 		cfg.indentSchemaLocation = indentSchemaLocation;
+		cfg.indentAttribute = indentAttribute;
 		cfg.predefinedSortOrder = predefinedSortOrder;
 		cfg.sortOrderFile = sortOrderFile;
 		cfg.sortDependencies = sortDependencies;
diff --git a/testlib/src/test/java/com/diffplug/spotless/pom/SortPomTest.java b/testlib/src/test/java/com/diffplug/spotless/pom/SortPomTest.java
index 873511cdda..36a6c72612 100644
--- a/testlib/src/test/java/com/diffplug/spotless/pom/SortPomTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/pom/SortPomTest.java
@@ -30,7 +30,7 @@ public void testSortPomWithDefaultConfig() {
 	@Test
 	public void testSortPomWithVersion() {
 		SortPomCfg cfg = new SortPomCfg();
-		cfg.version = "3.4.1";
+		cfg.version = "4.0.0";
 		FormatterStep step = SortPomStep.create(cfg, TestProvisioner.mavenCentral());
 		StepHarness.forStep(step).testResource("pom/pom_dirty.xml", "pom/pom_clean_default.xml");
 	}

From cdb0510345562e1ffc9b45df82519a98dfc5aa91 Mon Sep 17 00:00:00 2001
From: Mark Chesney <mches@users.noreply.github.com>
Date: Sun, 19 May 2024 13:11:55 -0700
Subject: [PATCH 1585/2068] Update changelogs

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 1 +
 plugin-maven/CHANGES.md  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 22f14f2137..5088c30325 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -19,6 +19,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
 * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))
 * Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078))
+* Bump default `sortpom` version to latest `3.4.1` -> `4.0.0`. ([#2115](https://github.com/diffplug/spotless/pull/2115))
 ### Removed
 * **BREAKING** Remove `JarState.getMavenCoordinate(String prefix)`. ([#1945](https://github.com/diffplug/spotless/pull/1945))
 * **BREAKING** Replace `PipeStepPair` with `FenceStep`. ([#1954](https://github.com/diffplug/spotless/pull/1954))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index ffaaa932dc..3ecceb775f 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -14,6 +14,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
 * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))
 * Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078))
+* Bump default `sortpom` version to latest `3.4.1` -> `4.0.0`. ([#2115](https://github.com/diffplug/spotless/pull/2115))
 ### Added
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
 * Add support for formatting and sorting Maven POMs ([#2082](https://github.com/diffplug/spotless/issues/2082))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index af419b1ad3..7de8196828 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
 * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))
 * Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078))
+* Bump default `sortpom` version to latest `3.4.1` -> `4.0.0`. ([#2115](https://github.com/diffplug/spotless/pull/2115))
 ### Added
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
 * Skip execution in M2E (incremental) builds by default ([#1814](https://github.com/diffplug/spotless/issues/1814), [#2037](https://github.com/diffplug/spotless/issues/2037)) 

From 51b106fd922b4836a8e28c88f8017f2b4fff9669 Mon Sep 17 00:00:00 2001
From: Mark Chesney <mches@users.noreply.github.com>
Date: Mon, 20 May 2024 07:08:47 -0700
Subject: [PATCH 1586/2068] Support sortpom versions back to 3.2.1

---
 CHANGES.md                                    |  2 +-
 .../glue/pom/SortPomFormatterFunc.java        | 41 ++++++++++++++++---
 plugin-gradle/CHANGES.md                      |  2 +-
 .../gradle/spotless/SortPomGradleTest.java    |  9 ++--
 plugin-maven/CHANGES.md                       |  2 +-
 5 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 5088c30325..0e44b999e2 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -19,7 +19,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
 * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))
 * Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078))
-* Bump default `sortpom` version to latest `3.4.1` -> `4.0.0`. ([#2115](https://github.com/diffplug/spotless/pull/2115))
+* Bump default `sortpom` version to latest `3.4.1` -> `4.0.0` and support versions back to `3.2.1`. ([#2115](https://github.com/diffplug/spotless/pull/2115))
 ### Removed
 * **BREAKING** Remove `JarState.getMavenCoordinate(String prefix)`. ([#1945](https://github.com/diffplug/spotless/pull/1945))
 * **BREAKING** Replace `PipeStepPair` with `FenceStep`. ([#1954](https://github.com/diffplug/spotless/pull/1954))
diff --git a/lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java b/lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java
index 49c416adfc..d1f6d8862d 100644
--- a/lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java
+++ b/lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java
@@ -16,6 +16,7 @@
 package com.diffplug.spotless.glue.pom;
 
 import java.io.*;
+import java.lang.reflect.Method;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
 
@@ -46,17 +47,45 @@ public String apply(String input) throws Exception {
 			writer.write(input);
 		}
 		SortPomImpl sortPom = new SortPomImpl();
-		sortPom.setup(new MySortPomLogger(), PluginParameters.builder()
+		PluginParameters.Builder builder = PluginParameters.builder()
 				.setPomFile(pom)
 				.setFileOutput(false, null, null, false)
-				.setEncoding(cfg.encoding)
-				.setFormatting(cfg.lineSeparator, cfg.expandEmptyElements, cfg.spaceBeforeCloseEmptyElement, cfg.keepBlankLines, cfg.endWithNewline)
-				.setIndent(cfg.nrOfIndentSpace, cfg.indentBlankLines, cfg.indentSchemaLocation, cfg.indentAttribute)
+				.setEncoding(cfg.encoding);
+		try {
+			builder = builder
+					.setFormatting(cfg.lineSeparator, cfg.expandEmptyElements, cfg.spaceBeforeCloseEmptyElement,
+							cfg.keepBlankLines, cfg.endWithNewline);
+		} catch (NoSuchMethodError e) {
+			try {
+				Method method = PluginParameters.Builder.class
+						.getMethod("setFormatting", String.class, boolean.class, boolean.class, boolean.class);
+				builder = (PluginParameters.Builder) method
+						.invoke(builder, cfg.lineSeparator, cfg.expandEmptyElements, cfg.spaceBeforeCloseEmptyElement,
+								cfg.keepBlankLines);
+			} catch (Exception ignore) {
+				throw e;
+			}
+		}
+		try {
+			builder = builder
+					.setIndent(cfg.nrOfIndentSpace, cfg.indentBlankLines, cfg.indentSchemaLocation,
+							cfg.indentAttribute);
+		} catch (NoSuchMethodError e) {
+			try {
+				Method method = PluginParameters.Builder.class
+						.getMethod("setIndent", int.class, boolean.class, boolean.class);
+				builder = (PluginParameters.Builder) method
+						.invoke(builder, cfg.nrOfIndentSpace, cfg.indentBlankLines, cfg.indentSchemaLocation);
+			} catch (Exception ignore) {
+				throw e;
+			}
+		}
+		builder = builder
 				.setSortOrder(cfg.sortOrderFile, cfg.predefinedSortOrder)
 				.setSortEntities(cfg.sortDependencies, cfg.sortDependencyExclusions, cfg.sortDependencyManagement,
 						cfg.sortPlugins, cfg.sortProperties, cfg.sortModules, cfg.sortExecutions)
-				.setIgnoreLineSeparators(false)
-				.build());
+				.setIgnoreLineSeparators(false);
+		sortPom.setup(new MySortPomLogger(), builder.build());
 		sortPom.sortPom();
 		return Files.readString(pom.toPath(), Charset.forName(cfg.encoding));
 	}
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 3ecceb775f..9ff689d273 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -14,7 +14,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
 * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))
 * Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078))
-* Bump default `sortpom` version to latest `3.4.1` -> `4.0.0`. ([#2115](https://github.com/diffplug/spotless/pull/2115))
+* Bump default `sortpom` version to latest `3.4.1` -> `4.0.0` and support versions back to `3.2.1`. ([#2115](https://github.com/diffplug/spotless/pull/2115))
 ### Added
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
 * Add support for formatting and sorting Maven POMs ([#2082](https://github.com/diffplug/spotless/issues/2082))
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SortPomGradleTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SortPomGradleTest.java
index 6b798326c4..80c8f254f2 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SortPomGradleTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SortPomGradleTest.java
@@ -16,6 +16,8 @@
 package com.diffplug.gradle.spotless;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 class SortPomGradleTest extends GradleIntegrationHarness {
 	@Test
@@ -63,8 +65,9 @@ void sortPomWithTarget() throws Exception {
 		assertFile("test.xml").sameAsResource("pom/pom_clean_default.xml");
 	}
 
-	@Test
-	void sortPomWithVersion() throws Exception {
+	@ParameterizedTest
+	@ValueSource(strings = {"3.2.1", "3.3.0", "3.4.1", "4.0.0"})
+	void sortPomWithVersion(String version) throws Exception {
 		// given
 		setFile("build.gradle").toLines(
 				"plugins {",
@@ -73,7 +76,7 @@ void sortPomWithVersion() throws Exception {
 				"repositories { mavenCentral() }",
 				"spotless {",
 				"  pom {",
-				"    sortPom '4.0.0'",
+				"    sortPom '" + version + "'",
 				"  }",
 				"}");
 		setFile("pom.xml").toResource("pom/pom_dirty.xml");
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 7de8196828..a759f923b9 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -12,7 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
 * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))
 * Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078))
-* Bump default `sortpom` version to latest `3.4.1` -> `4.0.0`. ([#2115](https://github.com/diffplug/spotless/pull/2115))
+* Bump default `sortpom` version to latest `3.4.1` -> `4.0.0` and support versions back to `3.2.1`. ([#2115](https://github.com/diffplug/spotless/pull/2115))
 ### Added
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
 * Skip execution in M2E (incremental) builds by default ([#1814](https://github.com/diffplug/spotless/issues/1814), [#2037](https://github.com/diffplug/spotless/issues/2037)) 

From baaed39b5264b6c69daf84602c336981a79d9620 Mon Sep 17 00:00:00 2001
From: Mark Chesney <mches@users.noreply.github.com>
Date: Mon, 20 May 2024 17:50:55 -0700
Subject: [PATCH 1587/2068] Fix SpotBugs recommendations

---
 .../com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java b/lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java
index d1f6d8862d..d1ab469af0 100644
--- a/lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java
+++ b/lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java
@@ -62,7 +62,7 @@ public String apply(String input) throws Exception {
 				builder = (PluginParameters.Builder) method
 						.invoke(builder, cfg.lineSeparator, cfg.expandEmptyElements, cfg.spaceBeforeCloseEmptyElement,
 								cfg.keepBlankLines);
-			} catch (Exception ignore) {
+			} catch (ReflectiveOperationException | RuntimeException ignore) {
 				throw e;
 			}
 		}
@@ -76,7 +76,7 @@ public String apply(String input) throws Exception {
 						.getMethod("setIndent", int.class, boolean.class, boolean.class);
 				builder = (PluginParameters.Builder) method
 						.invoke(builder, cfg.nrOfIndentSpace, cfg.indentBlankLines, cfg.indentSchemaLocation);
-			} catch (Exception ignore) {
+			} catch (ReflectiveOperationException | RuntimeException ignore) {
 				throw e;
 			}
 		}

From 01e8639e373f8aa61a1b89f40a5f8c948b792c94 Mon Sep 17 00:00:00 2001
From: Mark Chesney <mches@users.noreply.github.com>
Date: Mon, 20 May 2024 17:59:48 -0700
Subject: [PATCH 1588/2068] Ensure support for sortpom versions back to 3.2.1

---
 .../test/java/com/diffplug/spotless/pom/SortPomTest.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/testlib/src/test/java/com/diffplug/spotless/pom/SortPomTest.java b/testlib/src/test/java/com/diffplug/spotless/pom/SortPomTest.java
index 36a6c72612..15610ace58 100644
--- a/testlib/src/test/java/com/diffplug/spotless/pom/SortPomTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/pom/SortPomTest.java
@@ -16,6 +16,8 @@
 package com.diffplug.spotless.pom;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 import com.diffplug.spotless.*;
 
@@ -27,10 +29,11 @@ public void testSortPomWithDefaultConfig() {
 		StepHarness.forStep(step).testResource("pom/pom_dirty.xml", "pom/pom_clean_default.xml");
 	}
 
-	@Test
-	public void testSortPomWithVersion() {
+	@ParameterizedTest
+	@ValueSource(strings = {"3.2.1", "3.3.0", "3.4.1", "4.0.0"})
+	public void testSortPomWithVersion(String version) {
 		SortPomCfg cfg = new SortPomCfg();
-		cfg.version = "4.0.0";
+		cfg.version = version;
 		FormatterStep step = SortPomStep.create(cfg, TestProvisioner.mavenCentral());
 		StepHarness.forStep(step).testResource("pom/pom_dirty.xml", "pom/pom_clean_default.xml");
 	}

From 1fff681353aedcd5766a9dfc4150e452124fa884 Mon Sep 17 00:00:00 2001
From: SimY4 <alex.simkin@outlook.com>
Date: Tue, 10 Oct 2023 14:30:05 +1000
Subject: [PATCH 1589/2068] ScalaFmt takes filepath into consideration.

fix formatting.
---
 .../spotless/glue/scalafmt/ScalafmtFormatterFunc.java    | 7 ++++++-
 .../src/main/java/com/diffplug/spotless/StepHarness.java | 6 +++++-
 testlib/src/main/resources/scala/scalafmt/basic.dirty    | 2 +-
 .../resources/scala/scalafmt/scalafmt.fileoverride.conf  | 9 +++++++++
 .../com/diffplug/spotless/scala/ScalaFmtStepTest.java    | 9 ++++++++-
 5 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 testlib/src/main/resources/scala/scalafmt/scalafmt.fileoverride.conf

diff --git a/lib/src/scalafmt/java/com/diffplug/spotless/glue/scalafmt/ScalafmtFormatterFunc.java b/lib/src/scalafmt/java/com/diffplug/spotless/glue/scalafmt/ScalafmtFormatterFunc.java
index 49e1b6a1be..c01f7463d8 100644
--- a/lib/src/scalafmt/java/com/diffplug/spotless/glue/scalafmt/ScalafmtFormatterFunc.java
+++ b/lib/src/scalafmt/java/com/diffplug/spotless/glue/scalafmt/ScalafmtFormatterFunc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 DiffPlug
+ * Copyright 2022-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,4 +51,9 @@ public ScalafmtFormatterFunc(FileSignature configSignature) throws Exception {
 	public String apply(String input) {
 		return Scalafmt.format(input, config, Set$.MODULE$.empty()).get();
 	}
+
+	@Override
+	public String apply(String input, File file) {
+		return Scalafmt.format(input, config, Set$.MODULE$.empty(), file.getAbsolutePath()).get();
+	}
 }
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarness.java b/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
index 735dedb80c..6bec145f66 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
@@ -80,7 +80,11 @@ public StepHarness testUnaffected(String idempotentElement) {
 	public StepHarness testResource(String resourceBefore, String resourceAfter) {
 		String before = ResourceHarness.getTestResource(resourceBefore);
 		String after = ResourceHarness.getTestResource(resourceAfter);
-		return test(before, after);
+		String actual = formatter().compute(LineEnding.toUnix(before), new File(resourceBefore));
+		assertEquals(after, actual, "Step application failed");
+		actual = formatter().compute(LineEnding.toUnix(after), new File(resourceAfter));
+		assertEquals(after, actual, "Step is not idempotent");
+		return this;
 	}
 
 	/** Asserts that the given elements in the resources directory are transformed as expected. */
diff --git a/testlib/src/main/resources/scala/scalafmt/basic.dirty b/testlib/src/main/resources/scala/scalafmt/basic.dirty
index 2844c84555..3f106c0126 100644
--- a/testlib/src/main/resources/scala/scalafmt/basic.dirty
+++ b/testlib/src/main/resources/scala/scalafmt/basic.dirty
@@ -1,4 +1,4 @@
-@ foobar("annot", {
+@foobar ("annot", {
   val x = 2
   val y = 2 // y=2
   x + y
diff --git a/testlib/src/main/resources/scala/scalafmt/scalafmt.fileoverride.conf b/testlib/src/main/resources/scala/scalafmt/scalafmt.fileoverride.conf
new file mode 100644
index 0000000000..e4bd1f3a44
--- /dev/null
+++ b/testlib/src/main/resources/scala/scalafmt/scalafmt.fileoverride.conf
@@ -0,0 +1,9 @@
+version = 3.7.3
+runner.dialect = scala213
+style = defaultWithAlign # For pretty alignment.
+maxColumn = 200          # For my mega-wide display
+fileOverride {
+  "glob:**/scala/scalafmt/**" {
+    maxColumn = 20           # For my teensy narrow display
+  }
+}
diff --git a/testlib/src/test/java/com/diffplug/spotless/scala/ScalaFmtStepTest.java b/testlib/src/test/java/com/diffplug/spotless/scala/ScalaFmtStepTest.java
index c28046e148..48b277566e 100644
--- a/testlib/src/test/java/com/diffplug/spotless/scala/ScalaFmtStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/scala/ScalaFmtStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,6 +40,13 @@ void behaviorCustomConfig() {
 				.testResource("scala/scalafmt/basic.dirty", "scala/scalafmt/basic.cleanWithCustomConf_3.0.0");
 	}
 
+	@Test
+	void behaviorFileOverride() {
+		FormatterStep step = ScalaFmtStep.create(ScalaFmtStep.DEFAULT_VERSION, TestProvisioner.mavenCentral(), createTestFile("scala/scalafmt/scalafmt.fileoverride.conf"));
+		StepHarness.forStep(step)
+				.testResource("scala/scalafmt/basic.dirty", "scala/scalafmt/basic.cleanWithCustomConf_3.0.0");
+	}
+
 	@Test
 	void behaviorDefaultConfigVersion_3_0_0() {
 		FormatterStep step = ScalaFmtStep.create("3.0.0", TestProvisioner.mavenCentral(), null);

From bbe2c80a12fd041932fc77476d54cc47d19636c8 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 22 May 2024 23:51:43 -0700
Subject: [PATCH 1590/2068] Make `ScalafmtFormatterFunc` use the correct
 `FormatterFunc.NeedsFile`.

---
 .../spotless/glue/scalafmt/ScalafmtFormatterFunc.java | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/lib/src/scalafmt/java/com/diffplug/spotless/glue/scalafmt/ScalafmtFormatterFunc.java b/lib/src/scalafmt/java/com/diffplug/spotless/glue/scalafmt/ScalafmtFormatterFunc.java
index c01f7463d8..350d5f866f 100644
--- a/lib/src/scalafmt/java/com/diffplug/spotless/glue/scalafmt/ScalafmtFormatterFunc.java
+++ b/lib/src/scalafmt/java/com/diffplug/spotless/glue/scalafmt/ScalafmtFormatterFunc.java
@@ -29,7 +29,7 @@
 
 import scala.collection.immutable.Set$;
 
-public class ScalafmtFormatterFunc implements FormatterFunc {
+public class ScalafmtFormatterFunc implements FormatterFunc.NeedsFile {
 	private final ScalafmtConfig config;
 
 	public ScalafmtFormatterFunc(FileSignature configSignature) throws Exception {
@@ -48,12 +48,7 @@ public ScalafmtFormatterFunc(FileSignature configSignature) throws Exception {
 	}
 
 	@Override
-	public String apply(String input) {
-		return Scalafmt.format(input, config, Set$.MODULE$.empty()).get();
-	}
-
-	@Override
-	public String apply(String input, File file) {
-		return Scalafmt.format(input, config, Set$.MODULE$.empty(), file.getAbsolutePath()).get();
+	public String applyWithFile(String unix, File file) throws Exception {
+		return Scalafmt.format(unix, config, Set$.MODULE$.empty()).get();
 	}
 }

From 565112ae86d693123a5b95c30ec16b4673db36b0 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 23 May 2024 00:06:12 -0700
Subject: [PATCH 1591/2068] Remove missing bits of @Deprecated.

---
 .../com/diffplug/spotless/JreVersion.java     |  28 -----
 .../spotless/generic/PipeStepPairTest.java    | 116 ------------------
 2 files changed, 144 deletions(-)
 delete mode 100644 testlib/src/main/java/com/diffplug/spotless/JreVersion.java
 delete mode 100644 testlib/src/test/java/com/diffplug/spotless/generic/PipeStepPairTest.java

diff --git a/testlib/src/main/java/com/diffplug/spotless/JreVersion.java b/testlib/src/main/java/com/diffplug/spotless/JreVersion.java
deleted file mode 100644
index 829945896b..0000000000
--- a/testlib/src/main/java/com/diffplug/spotless/JreVersion.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2016-2021 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless;
-
-public class JreVersion {
-	private JreVersion() {}
-
-	/**
-	 * @return the major version of this VM, e.g. 8, 9, 10, 11, 13, etc.
-	 * @deprecated Use {@link com.diffplug.spotless.Jvm#version()} instead.
-	 */
-	public static int thisVm() {
-		return Jvm.version();
-	}
-}
diff --git a/testlib/src/test/java/com/diffplug/spotless/generic/PipeStepPairTest.java b/testlib/src/test/java/com/diffplug/spotless/generic/PipeStepPairTest.java
deleted file mode 100644
index b648432b92..0000000000
--- a/testlib/src/test/java/com/diffplug/spotless/generic/PipeStepPairTest.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright 2020-2023 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.generic;
-
-import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.Locale;
-
-import org.junit.jupiter.api.Test;
-
-import com.diffplug.common.base.StringPrinter;
-import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.StepHarness;
-
-class PipeStepPairTest {
-	@Test
-	void single() {
-		PipeStepPair pair = PipeStepPair.named("underTest").openClose("spotless:off", "spotless:on").buildPair();
-		FormatterStep lowercase = FormatterStep.createNeverUpToDate("lowercase", str -> str.toLowerCase(Locale.ROOT));
-		StepHarness harness = StepHarness.forSteps(pair.in(), lowercase, pair.out());
-		harness.test(
-				StringPrinter.buildStringFromLines(
-						"A B C",
-						"spotless:off",
-						"D E F",
-						"spotless:on",
-						"G H I"),
-				StringPrinter.buildStringFromLines(
-						"a b c",
-						"spotless:off",
-						"D E F",
-						"spotless:on",
-						"g h i"));
-	}
-
-	@Test
-	void multiple() {
-		PipeStepPair pair = PipeStepPair.named("underTest").openClose("spotless:off", "spotless:on").buildPair();
-		FormatterStep lowercase = FormatterStep.createNeverUpToDate("lowercase", str -> str.toLowerCase(Locale.ROOT));
-		StepHarness harness = StepHarness.forSteps(pair.in(), lowercase, pair.out());
-		harness.test(
-				StringPrinter.buildStringFromLines(
-						"A B C",
-						"spotless:off",
-						"D E F",
-						"spotless:on",
-						"G H I",
-						"spotless:off J K L spotless:on",
-						"M N O",
-						"P Q R",
-						"S T U spotless:off V W",
-						" X ",
-						" Y spotless:on Z",
-						"1 2 3"),
-				StringPrinter.buildStringFromLines(
-						"a b c",
-						"spotless:off",
-						"D E F",
-						"spotless:on",
-						"g h i",
-						"spotless:off J K L spotless:on",
-						"m n o",
-						"p q r",
-						"s t u spotless:off V W",
-						" X ",
-						" Y spotless:on z",
-						"1 2 3"));
-	}
-
-	@Test
-	void broken() {
-		PipeStepPair pair = PipeStepPair.named("underTest").openClose("spotless:off", "spotless:on").buildPair();
-		FormatterStep uppercase = FormatterStep.createNeverUpToDate("uppercase", str -> str.toUpperCase(Locale.ROOT));
-		StepHarness harness = StepHarness.forSteps(pair.in(), uppercase, pair.out());
-		// this fails because uppercase turns spotless:off into SPOTLESS:OFF, etc
-		harness.testExceptionMsg(StringPrinter.buildStringFromLines(
-				"A B C",
-				"spotless:off",
-				"D E F",
-				"spotless:on",
-				"G H I")).isEqualTo("An intermediate step removed a match of spotless:off spotless:on");
-	}
-
-	@Test
-	void andApply() {
-		FormatterStep lowercase = FormatterStep.createNeverUpToDate("lowercase", str -> str.toLowerCase(Locale.ROOT));
-		FormatterStep lowercaseSometimes = PipeStepPair.named("lowercaseSometimes").openClose("<lower>", "</lower>")
-				.buildStepWhichAppliesSubSteps(Paths.get(""), Arrays.asList(lowercase));
-		StepHarness.forSteps(lowercaseSometimes).test(
-				StringPrinter.buildStringFromLines(
-						"A B C",
-						"<lower>",
-						"D E F",
-						"</lower>",
-						"G H I"),
-				StringPrinter.buildStringFromLines(
-						"A B C",
-						"<lower>",
-						"d e f",
-						"</lower>",
-						"G H I"));
-	}
-}

From a1d3aaeb847cb13003e25963c2370f4ea5cb7aec Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 23 May 2024 00:11:52 -0700
Subject: [PATCH 1592/2068] Remove all the deprecated rome stuff.

---
 .../diffplug/spotless/rome/BiomeFlavor.java   |  14 +-
 .../gradle/spotless/FormatExtension.java      |  83 -----
 .../gradle/spotless/JavascriptExtension.java  |  54 +--
 .../gradle/spotless/JsonExtension.java        |  54 +--
 .../gradle/spotless/TypescriptExtension.java  |  54 +--
 .../gradle/spotless/RomeIntegrationTest.java  | 343 ------------------
 .../spotless/maven/generic/Format.java        |  12 +-
 .../diffplug/spotless/maven/generic/Rome.java |  59 ---
 .../spotless/maven/javascript/Javascript.java |   7 +-
 .../spotless/maven/javascript/RomeJs.java     |  35 --
 .../diffplug/spotless/maven/json/Json.java    |   7 +-
 .../spotless/maven/json/RomeJson.java         |  35 --
 .../spotless/maven/typescript/RomeTs.java     |  35 --
 .../spotless/maven/typescript/Typescript.java |   7 +-
 .../spotless/maven/rome/RomeMavenTest.java    | 203 -----------
 .../diffplug/spotless/rome/RomeStepTest.java  | 248 -------------
 16 files changed, 9 insertions(+), 1241 deletions(-)
 delete mode 100644 plugin-gradle/src/test/java/com/diffplug/gradle/spotless/RomeIntegrationTest.java
 delete mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Rome.java
 delete mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java
 delete mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/json/RomeJson.java
 delete mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/RomeTs.java
 delete mode 100644 plugin-maven/src/test/java/com/diffplug/spotless/maven/rome/RomeMavenTest.java

diff --git a/lib/src/main/java/com/diffplug/spotless/rome/BiomeFlavor.java b/lib/src/main/java/com/diffplug/spotless/rome/BiomeFlavor.java
index dbfd43eee9..33ca62d67a 100644
--- a/lib/src/main/java/com/diffplug/spotless/rome/BiomeFlavor.java
+++ b/lib/src/main/java/com/diffplug/spotless/rome/BiomeFlavor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,17 +24,7 @@
 public enum BiomeFlavor {
 	/** The new forked Biome project. */
 	BIOME("biome", "1.2.0", "biome.json", "biome-%s-%s-%s",
-			"https://github.com/biomejs/biome/releases/download/cli%%2Fv%s/biome-%s"),
-
-	/**
-	 * The old deprecated Rome project.
-	 *
-	 * @deprecated Will be removed once the old Rome project is not supported
-	 *             anymore.
-	 */
-	@Deprecated
-	ROME("rome", "12.0.0", "rome.json", "rome-%s-%s-%s",
-			"https://github.com/rome/tools/releases/download/cli%%2Fv%s/rome-%s");
+			"https://github.com/biomejs/biome/releases/download/cli%%2Fv%s/biome-%s");
 
 	private final String configName;
 	private final String defaultVersion;
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index 08d6088d60..76296130df 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -779,65 +779,6 @@ protected BiomeGeneric getThis() {
 		}
 	}
 
-	/**
-	 * Generic Rome formatter step that detects the language of the input file from
-	 * the file name. It should be specified as a formatter step for a generic
-	 * <code>format{ ... }</code>.
-	 *
-	 * @deprecated Rome has transitioned to Biome. This will be removed shortly.
-	 */
-	@Deprecated
-	public class RomeGeneric extends RomeStepConfig<RomeGeneric> {
-		@Nullable
-		String language;
-
-		/**
-		 * Creates a new Rome config that downloads the Rome executable for the given
-		 * version from the network.
-		 *
-		 * @param version Rome version to use. The default version is used when
-		 *                <code>null</code>.
-		 */
-		public RomeGeneric(String version) {
-			super(getProject(), FormatExtension.this::replaceStep, BiomeFlavor.ROME, version);
-		}
-
-		/**
-		 * Sets the language (syntax) of the input files to format. When
-		 * <code>null</code> or the empty string, the language is detected automatically
-		 * from the file name. Currently the following languages are supported by Rome:
-		 * <ul>
-		 * <li>js (JavaScript)</li>
-		 * <li>jsx (JavaScript + JSX)</li>
-		 * <li>js? (JavaScript or JavaScript + JSX, depending on the file
-		 * extension)</li>
-		 * <li>ts (TypeScript)</li>
-		 * <li>tsx (TypeScript + JSX)</li>
-		 * <li>ts? (TypeScript or TypeScript + JSX, depending on the file
-		 * extension)</li>
-		 * <li>json (JSON)</li>
-		 * </ul>
-		 *
-		 * @param language The language of the files to format.
-		 * @return This step for further configuration.
-		 */
-		public RomeGeneric language(String language) {
-			this.language = language;
-			replaceStep();
-			return this;
-		}
-
-		@Override
-		protected String getLanguage() {
-			return language;
-		}
-
-		@Override
-		protected RomeGeneric getThis() {
-			return this;
-		}
-	}
-
 	/** Uses the default version of prettier. */
 	public PrettierConfig prettier() {
 		return prettier(PrettierFormatterStep.defaultDevDependencies());
@@ -871,30 +812,6 @@ public RomeStepConfig<?> biome(String version) {
 		return biomeConfig;
 	}
 
-	/**
-	 * Defaults to downloading the default Rome version from the network. To work
-	 * offline, you can specify the path to the Rome executable via
-	 * {@code rome().pathToExe(...)}.
-	 *
-	 * @deprecated Use {@link #biome(String)}.
-	 */
-	@Deprecated
-	public RomeStepConfig<?> rome() {
-		return rome(null);
-	}
-
-	/**
-	 * Downloads the given Rome version from the network.
-	 *
-	 * @deprecated Use {@link #biome(String)}.
-	 */
-	@Deprecated
-	public RomeStepConfig<?> rome(String version) {
-		var romeConfig = new RomeGeneric(version);
-		addStep(romeConfig.createStep());
-		return romeConfig;
-	}
-
 	/** Uses the default version of clang-format. */
 	public ClangFormatConfig clangFormat() {
 		return clangFormat(ClangFormatStep.defaultVersion());
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
index b14bd29ab8..63bbb17c1e 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -154,30 +154,6 @@ public BiomeJs biome(String version) {
 		return biomeConfig;
 	}
 
-	/**
-	 * Defaults to downloading the default Rome version from the network. To work
-	 * offline, you can specify the path to the Rome executable via
-	 * {@code rome().pathToExe(...)}.
-	 *
-	 * @deprecated Use {@link #biome()}.
-	 */
-	@Deprecated
-	public RomeJs rome() {
-		return rome(null);
-	}
-
-	/**
-	 * Downloads the given Rome version from the network.
-	 *
-	 * @deprecated Use {@link #biome(String)}.
-	 */
-	@Deprecated
-	public RomeJs rome(String version) {
-		var romeConfig = new RomeJs(version);
-		addStep(romeConfig.createStep());
-		return romeConfig;
-	}
-
 	private static final String DEFAULT_PRETTIER_JS_PARSER = "babel";
 	private static final ImmutableList<String> PRETTIER_JS_PARSERS = ImmutableList.of(DEFAULT_PRETTIER_JS_PARSER,
 			"babel-flow", "flow");
@@ -207,34 +183,6 @@ protected BiomeJs getThis() {
 		}
 	}
 
-	/**
-	 * Rome formatter step for JavaScript.
-	 *
-	 * @deprecated Rome has transitioned to Biome. This will be removed shortly.
-	 */
-	@Deprecated
-	public class RomeJs extends RomeStepConfig<RomeJs> {
-		/**
-		 * Creates a new Rome formatter step config for formatting JavaScript files.
-		 * Unless overwritten, the given Rome version is downloaded from the network.
-		 *
-		 * @param version Rome version to use.
-		 */
-		public RomeJs(String version) {
-			super(getProject(), JavascriptExtension.this::replaceStep, BiomeFlavor.ROME, version);
-		}
-
-		@Override
-		protected String getLanguage() {
-			return "js?";
-		}
-
-		@Override
-		protected RomeJs getThis() {
-			return this;
-		}
-	}
-
 	/**
 	 * Overrides the parser to be set to a js parser.
 	 */
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
index 441e25b93d..38bd97c496 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -76,30 +76,6 @@ public BiomeJson biome(String version) {
 		return biomeConfig;
 	}
 
-	/**
-	 * Defaults to downloading the default Rome version from the network. To work
-	 * offline, you can specify the path to the Rome executable via
-	 * {@code rome().pathToExe(...)}.
-	 *
-	 * @deprecated Use {@link #biome()}.
-	 */
-	@Deprecated
-	public RomeJson rome() {
-		return rome(null);
-	}
-
-	/**
-	 * Downloads the given Rome version from the network.
-	 *
-	 * @deprecated Use {@link #biome(String)}.
-	 */
-	@Deprecated
-	public RomeJson rome(String version) {
-		var romeConfig = new RomeJson(version);
-		addStep(romeConfig.createStep());
-		return romeConfig;
-	}
-
 	public JsonPatchConfig jsonPatch(List<Map<String, Object>> patch) {
 		return new JsonPatchConfig(patch);
 	}
@@ -231,34 +207,6 @@ protected BiomeJson getThis() {
 		}
 	}
 
-	/**
-	 * Rome formatter step for JSON.
-	 *
-	 * @deprecated Rome has transitioned to Biome. This will be removed shortly.
-	 */
-	@Deprecated
-	public class RomeJson extends RomeStepConfig<RomeJson> {
-		/**
-		 * Creates a new Rome formatter step config for formatting JSON files. Unless
-		 * overwritten, the given Rome version is downloaded from the network.
-		 *
-		 * @param version Rome version to use.
-		 */
-		public RomeJson(String version) {
-			super(getProject(), JsonExtension.this::replaceStep, BiomeFlavor.ROME, version);
-		}
-
-		@Override
-		protected String getLanguage() {
-			return "json";
-		}
-
-		@Override
-		protected RomeJson getThis() {
-			return this;
-		}
-	}
-
 	public class JsonPatchConfig {
 		private String zjsonPatchVersion;
 		private List<Map<String, Object>> patch;
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
index 190a2f8e20..be74bc8905 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -243,30 +243,6 @@ public BiomeTs biome(String version) {
 		return biomeConfig;
 	}
 
-	/**
-	 * Defaults to downloading the default Rome version from the network. To work
-	 * offline, you can specify the path to the Rome executable via
-	 * {@code rome().pathToExe(...)}.
-	 *
-	 * @deprecated Use {@link #biome()}.
-	 */
-	@Deprecated
-	public RomeTs rome() {
-		return rome(null);
-	}
-
-	/**
-	 * Downloads the given Rome version from the network.
-	 *
-	 * @deprecated Use {@link #biome(String)}.
-	 */
-	@Deprecated
-	public RomeTs rome(String version) {
-		var romeConfig = new RomeTs(version);
-		addStep(romeConfig.createStep());
-		return romeConfig;
-	}
-
 	/**
 	 * Biome formatter step for TypeScript.
 	 */
@@ -292,34 +268,6 @@ protected BiomeTs getThis() {
 		}
 	}
 
-	/**
-	 * Rome formatter step for TypeScript.
-	 *
-	 * @deprecated Rome has transitioned to Biome. This will be removed shortly.
-	 */
-	@Deprecated
-	public class RomeTs extends RomeStepConfig<RomeTs> {
-		/**
-		 * Creates a new Rome formatter step config for formatting TypeScript files.
-		 * Unless overwritten, the given Rome version is downloaded from the network.
-		 *
-		 * @param version Rome version to use.
-		 */
-		public RomeTs(String version) {
-			super(getProject(), TypescriptExtension.this::replaceStep, BiomeFlavor.ROME, version);
-		}
-
-		@Override
-		protected String getLanguage() {
-			return "ts?";
-		}
-
-		@Override
-		protected RomeTs getThis() {
-			return this;
-		}
-	}
-
 	@Override
 	protected void setupTask(SpotlessTask task) {
 		if (target == null) {
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/RomeIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/RomeIntegrationTest.java
deleted file mode 100644
index e9f33f64ac..0000000000
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/RomeIntegrationTest.java
+++ /dev/null
@@ -1,343 +0,0 @@
-/*
- * Copyright 2023-2024 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.gradle.spotless;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.io.IOException;
-
-import org.junit.jupiter.api.Test;
-import org.owasp.encoder.Encode;
-
-class RomeIntegrationTest extends GradleIntegrationHarness {
-	/**
-	 * Tests that rome can be used as a generic formatting step.
-	 *
-	 * @throws Exception When a test failure occurs.
-	 */
-	@Test
-	void asGenericStep() throws IOException {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    format 'myrome', {",
-				"        target '**/*.js'",
-				"        rome('12.0.0')",
-				"    }",
-				"}");
-		setFile("rome_test.js").toResource("rome/js/fileBefore.js");
-
-		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
-		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
-		assertFile("rome_test.js").sameAsResource("rome/js/fileAfter.js");
-	}
-
-	/**
-	 * Tests that rome can be used as a JavaScript formatting step.
-	 *
-	 * @throws Exception When a test failure occurs.
-	 */
-	@Test
-	void asJavaScriptStep() throws Exception {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    javascript {",
-				"        target '**/*.js'",
-				"        rome('12.0.0')",
-				"    }",
-				"}");
-		setFile("rome_test.js").toResource("rome/js/fileBefore.js");
-
-		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
-		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
-		assertFile("rome_test.js").sameAsResource("rome/js/fileAfter.js");
-	}
-
-	/**
-	 * Tests that rome can be used as a JSON formatting step.
-	 *
-	 * @throws Exception When a test failure occurs.
-	 */
-	@Test
-	void asJsonStep() throws Exception {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    json {",
-				"        target '**/*.json'",
-				"        rome('12.0.0')",
-				"    }",
-				"}");
-		setFile("rome_test.json").toResource("rome/json/fileBefore.json");
-
-		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
-		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
-		assertFile("rome_test.json").sameAsResource("rome/json/fileAfter.json");
-	}
-
-	/**
-	 * Tests that rome can be used as a TypeScript formatting step.
-	 *
-	 * @throws Exception When a test failure occurs.
-	 */
-	@Test
-	void asTypeScriptStep() throws Exception {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    typescript {",
-				"        target '**/*.ts'",
-				"        rome('12.0.0')",
-				"    }",
-				"}");
-		setFile("rome_test.ts").toResource("rome/ts/fileBefore.ts");
-
-		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
-		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
-		assertFile("rome_test.ts").sameAsResource("rome/ts/fileAfter.ts");
-	}
-
-	/**
-	 * Tests that the language can be specified for the generic format step.
-	 *
-	 * @throws Exception When a test failure occurs.
-	 */
-	@Test
-	void canSetLanguageForGenericStep() throws Exception {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    format 'myrome', {",
-				"        target '**/*.nosj'",
-				"        rome('12.0.0').language('json')",
-				"    }",
-				"}");
-		setFile("rome_test.nosj").toResource("rome/json/fileBefore.json");
-
-		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
-		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
-		assertFile("rome_test.nosj").sameAsResource("rome/json/fileAfter.json");
-	}
-
-	/**
-	 * Tests that an absolute config path can be specified.
-	 *
-	 * @throws Exception When a test failure occurs.
-	 */
-	@Test
-	void configPathAbsolute() throws Exception {
-		var path = newFile("configs").getAbsolutePath();
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    format 'myrome', {",
-				"        target '**/*.js'",
-				"        rome('12.0.0').configPath('" + Encode.forJava(path) + "')",
-				"    }",
-				"}");
-		setFile("rome_test.js").toResource("rome/js/longLineBefore.js");
-		setFile("configs/rome.json").toResource("rome/config/line-width-120.json");
-
-		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
-		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
-		assertFile("rome_test.js").sameAsResource("rome/js/longLineAfter120.js");
-	}
-
-	/**
-	 * Tests that a path to the directory with the rome.json config file can be
-	 * specified. Uses a config file with a line width of 120.
-	 *
-	 * @throws Exception When a test failure occurs.
-	 */
-	@Test
-	void configPathLineWidth120() throws Exception {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    format 'myrome', {",
-				"        target '**/*.js'",
-				"        rome('12.0.0').configPath('configs')",
-				"    }",
-				"}");
-		setFile("rome_test.js").toResource("rome/js/longLineBefore.js");
-		setFile("configs/rome.json").toResource("rome/config/line-width-120.json");
-
-		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
-		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
-		assertFile("rome_test.js").sameAsResource("rome/js/longLineAfter120.js");
-	}
-
-	/**
-	 * Tests that a path to the directory with the rome.json config file can be
-	 * specified. Uses a config file with a line width of 80.
-	 *
-	 * @throws Exception When a test failure occurs.
-	 */
-	@Test
-	void configPathLineWidth80() throws Exception {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    format 'myrome', {",
-				"        target '**/*.js'",
-				"        rome('12.0.0').configPath('configs')",
-				"    }",
-				"}");
-		setFile("rome_test.js").toResource("rome/js/longLineBefore.js");
-		setFile("configs/rome.json").toResource("rome/config/line-width-80.json");
-
-		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
-		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
-		assertFile("rome_test.js").sameAsResource("rome/js/longLineAfter80.js");
-	}
-
-	/**
-	 * Tests that the download directory can be an absolute path.
-	 *
-	 * @throws Exception When a test failure occurs.
-	 */
-	@Test
-	void downloadDirAbsolute() throws Exception {
-		var path = newFile("target/bin/rome").getAbsoluteFile().toString();
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    format 'myrome', {",
-				"        target '**/*.js'",
-				"        rome('12.0.0').downloadDir('" + Encode.forJava(path) + "')",
-				"    }",
-				"}");
-		setFile("rome_test.js").toResource("rome/js/fileBefore.js");
-		assertTrue(!newFile("target/bin/rome").exists() || newFile("target/bin/rome").list().length == 0);
-
-		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
-		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
-		assertFile("rome_test.js").sameAsResource("rome/js/fileAfter.js");
-		assertEquals(2, newFile("target/bin/rome").list().length);
-	}
-
-	/**
-	 * Tests that the download directory can be changed to a path relative to the
-	 * project's base directory.
-	 *
-	 * @throws Exception When a test failure occurs.
-	 */
-	@Test
-	void downloadDirRelative() throws Exception {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    format 'myrome', {",
-				"        target '**/*.js'",
-				"        rome('12.0.0').downloadDir('target/bin/rome')",
-				"    }",
-				"}");
-		setFile("rome_test.js").toResource("rome/js/fileBefore.js");
-		assertTrue(!newFile("target/bin/rome").exists() || newFile("target/bin/rome").list().length == 0);
-
-		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
-		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
-		assertFile("rome_test.js").sameAsResource("rome/js/fileAfter.js");
-		assertEquals(2, newFile("target/bin/rome").list().length);
-	}
-
-	/**
-	 * Tests that the build fails when given Biome executable does not exist.
-	 *
-	 * @throws Exception When a test failure occurs.
-	 */
-	@Test
-	void failureWhenExeNotFound() throws Exception {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    format 'myrome', {",
-				"        target '**/*.js'",
-				"        rome('12.0.0').pathToExe('rome/is/missing')",
-				"    }",
-				"}");
-		setFile("rome_test.js").toResource("rome/js/fileBefore.js");
-
-		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").buildAndFail();
-		assertThat(spotlessApply.getOutput()).contains("Build failed with an exception");
-		assertFile("rome_test.js").sameAsResource("rome/js/fileBefore.js");
-		assertThat(spotlessApply.getOutput()).contains("Execution failed for task ':spotlessMyrome'");
-		assertThat(spotlessApply.getOutput()).contains("Biome executable does not exist");
-	}
-
-	/**
-	 * Tests that the build fails when the input file could not be parsed.
-	 *
-	 * @throws Exception When a test failure occurs.
-	 */
-	@Test
-	void failureWhenNotParseable() throws Exception {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    format 'myrome', {",
-				"        target '**/*.js'",
-				"        rome('12.0.0').language('json')",
-				"    }",
-				"}");
-		setFile("rome_test.js").toResource("rome/js/fileBefore.js");
-
-		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").buildAndFail();
-		assertThat(spotlessApply.getOutput()).contains("spotlessMyrome FAILED");
-		assertFile("rome_test.js").sameAsResource("rome/js/fileBefore.js");
-		assertThat(spotlessApply.getOutput()).contains("Format with errors is disabled.");
-		assertThat(spotlessApply.getOutput()).contains("Step 'rome' found problem in 'rome_test.js'");
-	}
-}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Format.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Format.java
index ce7db9b926..ccdef479cf 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Format.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Format.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,14 +48,4 @@ public String licenseHeaderDelimiter() {
 	public void addBiome(Biome biome) {
 		addStepFactory(biome);
 	}
-
-	/**
-	 * Adds a step to this format that format code with the Rome formatter.
-	 * @param rome Rome configuration to use.
-	 * @deprecated Rome has transitioned to Biome. Use {@link #addBiome(Biome)}.
-	 */
-	@Deprecated
-	public void addRome(Rome rome) {
-		addStepFactory(rome);
-	}
 }
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Rome.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Rome.java
deleted file mode 100644
index 53080fe546..0000000000
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Rome.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2016-2023 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.maven.generic;
-
-import org.apache.maven.plugins.annotations.Parameter;
-
-import com.diffplug.spotless.maven.rome.AbstractRome;
-import com.diffplug.spotless.rome.BiomeFlavor;
-
-/**
- * See {@link Biome}.
- * @deprecated Rome has transitioned to Biome. This will be removed shortly.
- */
-public class Rome extends AbstractRome {
-	public Rome() {
-		super(BiomeFlavor.ROME);
-	}
-
-	/**
-	 * Gets the language (syntax) of the input files to format. When
-	 * <code>null</code> or the empty string, the language is detected automatically
-	 * from the file name. Currently the following languages are supported by Rome:
-	 * <ul>
-	 * <ul>
-	 * <li>js (JavaScript)</li>
-	 * <li>jsx (JavaScript + JSX)</li>
-	 * <li>js? (JavaScript or JavaScript + JSX, depending on the file
-	 * extension)</li>
-	 * <li>ts (TypeScript)</li>
-	 * <li>tsx (TypeScript + JSX)</li>
-	 * <li>ts? (TypeScript or TypeScript + JSX, depending on the file
-	 * extension)</li>
-	 * <li>json (JSON)</li>
-	 * </ul>
-	 * </ul>
-	 *
-	 * @return The language of the input files.
-	 */
-	@Parameter
-	private String language;
-
-	@Override
-	protected String getLanguage() {
-		return language;
-	}
-}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/Javascript.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/Javascript.java
index 3f0a3f959c..dc2949ae68 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/Javascript.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/Javascript.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,9 +45,4 @@ public void addEslint(EslintJs eslint) {
 	public void addBiome(BiomeJs biome) {
 		addStepFactory(biome);
 	}
-
-	@Deprecated
-	public void addRome(RomeJs rome) {
-		addStepFactory(rome);
-	}
 }
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java
deleted file mode 100644
index 405809c7a7..0000000000
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/RomeJs.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2016-2023 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.maven.javascript;
-
-import com.diffplug.spotless.maven.rome.AbstractRome;
-import com.diffplug.spotless.rome.BiomeFlavor;
-
-/**
- * Rome formatter step for JavaScript.
- * @deprecated Rome has transitioned to Biome. This will be removed shortly.
- */
-@Deprecated
-public class RomeJs extends AbstractRome {
-	public RomeJs() {
-		super(BiomeFlavor.ROME);
-	}
-
-	@Override
-	protected String getLanguage() {
-		return "js?";
-	}
-}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java
index 8baf379a5e..80767f41f3 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Json.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,11 +54,6 @@ public void addBiome(BiomeJson biome) {
 		addStepFactory(biome);
 	}
 
-	@Deprecated
-	public void addRome(RomeJson rome) {
-		addStepFactory(rome);
-	}
-
 	public void addJsonPatch(JsonPatch jsonPatch) {
 		addStepFactory(jsonPatch);
 	}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/RomeJson.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/RomeJson.java
deleted file mode 100644
index 2959d5a055..0000000000
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/RomeJson.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2016-2023 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.maven.json;
-
-import com.diffplug.spotless.maven.rome.AbstractRome;
-import com.diffplug.spotless.rome.BiomeFlavor;
-
-/**
- * Rome formatter step for JSON.
- * @deprecated Rome has transitioned to Biome. This will be removed shortly.
- */
-@Deprecated
-public class RomeJson extends AbstractRome {
-	public RomeJson() {
-		super(BiomeFlavor.ROME);
-	}
-
-	@Override
-	protected String getLanguage() {
-		return "json";
-	}
-}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/RomeTs.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/RomeTs.java
deleted file mode 100644
index f6ea80581d..0000000000
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/RomeTs.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2016-2023 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.maven.typescript;
-
-import com.diffplug.spotless.maven.rome.AbstractRome;
-import com.diffplug.spotless.rome.BiomeFlavor;
-
-/**
- * Rome formatter step for TypeScript.
- * @deprecated Rome has transitioned to Biome. This will be removed shortly.
- */
-@Deprecated
-public class RomeTs extends AbstractRome {
-	public RomeTs() {
-		super(BiomeFlavor.ROME);
-	}
-
-	@Override
-	protected String getLanguage() {
-		return "ts?";
-	}
-}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Typescript.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Typescript.java
index af25b8c773..2646ca05b0 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Typescript.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/Typescript.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,9 +49,4 @@ public void addEslint(EslintTs eslint) {
 	public void addBiome(BiomeTs biome) {
 		addStepFactory(biome);
 	}
-
-	@Deprecated
-	public void addRome(RomeTs rome) {
-		addStepFactory(rome);
-	}
 }
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/rome/RomeMavenTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/rome/RomeMavenTest.java
deleted file mode 100644
index f6a8107be1..0000000000
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/rome/RomeMavenTest.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright 2023 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.maven.rome;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.owasp.encoder.Encode.forXml;
-
-import org.junit.jupiter.api.Test;
-
-import com.diffplug.spotless.maven.MavenIntegrationHarness;
-
-@Deprecated
-class RomeMavenTest extends MavenIntegrationHarness {
-	/**
-	 * Tests that rome can be used as a generic formatting step.
-	 *
-	 * @throws Exception When a test failure occurs.
-	 */
-	@Test
-	void asGenericStep() throws Exception {
-		writePomWithRomeSteps("**/*.js", "<rome><version>12.0.0</version></rome>");
-		setFile("rome_test.js").toResource("rome/js/fileBefore.js");
-		mavenRunner().withArguments("spotless:apply").runNoError();
-		assertFile("rome_test.js").sameAsResource("rome/js/fileAfter.js");
-	}
-
-	/**
-	 * Tests that rome can be used as a JavaScript formatting step.
-	 *
-	 * @throws Exception When a test failure occurs.
-	 */
-	@Test
-	void asJavaScriptStep() throws Exception {
-		writePomWithJavascriptSteps("**/*.js", "<rome><version>12.0.0</version></rome>");
-		setFile("rome_test.js").toResource("rome/js/fileBefore.js");
-		mavenRunner().withArguments("spotless:apply").runNoError();
-		assertFile("rome_test.js").sameAsResource("rome/js/fileAfter.js");
-	}
-
-	/**
-	 * Tests that rome can be used as a JSON formatting step.
-	 *
-	 * @throws Exception When a test failure occurs.
-	 */
-	@Test
-	void asJsonStep() throws Exception {
-		writePomWithJsonSteps("**/*.json", "<rome><version>12.0.0</version></rome>");
-		setFile("rome_test.json").toResource("rome/json/fileBefore.json");
-		mavenRunner().withArguments("spotless:apply").runNoError();
-		assertFile("rome_test.json").sameAsResource("rome/json/fileAfter.json");
-	}
-
-	/**
-	 * Tests that rome can be used as a TypeScript formatting step.
-	 *
-	 * @throws Exception When a test failure occurs.
-	 */
-	@Test
-	void asTypeScriptStep() throws Exception {
-		writePomWithTypescriptSteps("**/*.ts", "<rome><version>12.0.0</version></rome>");
-		setFile("rome_test.ts").toResource("rome/ts/fileBefore.ts");
-		mavenRunner().withArguments("spotless:apply").runNoError();
-		assertFile("rome_test.ts").sameAsResource("rome/ts/fileAfter.ts");
-	}
-
-	/**
-	 * Tests that the language can be specified for the generic format step.
-	 *
-	 * @throws Exception When a test failure occurs.
-	 */
-	@Test
-	void canSetLanguageForGenericStep() throws Exception {
-		writePomWithRomeSteps("**/*.nosj", "<rome><version>12.0.0</version><language>json</language></rome>");
-		setFile("rome_test.nosj").toResource("rome/json/fileBefore.json");
-		mavenRunner().withArguments("spotless:apply").runNoError();
-		assertFile("rome_test.nosj").sameAsResource("rome/json/fileAfter.json");
-	}
-
-	/**
-	 * Tests that an absolute config path can be specified.
-	 *
-	 * @throws Exception When a test failure occurs.
-	 */
-	@Test
-	void configPathAbsolute() throws Exception {
-		var path = newFile("configs").getAbsolutePath();
-		writePomWithRomeSteps("**/*.js",
-				"<rome><version>12.0.0</version><configPath>" + forXml(path) + "</configPath></rome>");
-		setFile("rome_test.js").toResource("rome/js/longLineBefore.js");
-		setFile("configs/rome.json").toResource("rome/config/line-width-120.json");
-		mavenRunner().withArguments("spotless:apply").runNoError();
-		assertFile("rome_test.js").sameAsResource("rome/js/longLineAfter120.js");
-	}
-
-	/**
-	 * Tests that a path to the directory with the rome.json config file can be
-	 * specified. Uses a config file with a line width of 120.
-	 *
-	 * @throws Exception When a test failure occurs.
-	 */
-	@Test
-	void configPathLineWidth120() throws Exception {
-		writePomWithRomeSteps("**/*.js", "<rome><version>12.0.0</version><configPath>configs</configPath></rome>");
-		setFile("rome_test.js").toResource("rome/js/longLineBefore.js");
-		setFile("configs/rome.json").toResource("rome/config/line-width-120.json");
-		mavenRunner().withArguments("spotless:apply").runNoError();
-		assertFile("rome_test.js").sameAsResource("rome/js/longLineAfter120.js");
-	}
-
-	/**
-	 * Tests that a path to the directory with the rome.json config file can be
-	 * specified. Uses a config file with a line width of 80.
-	 *
-	 * @throws Exception When a test failure occurs.
-	 */
-	@Test
-	void configPathLineWidth80() throws Exception {
-		writePomWithRomeSteps("**/*.js", "<rome><version>12.0.0</version><configPath>configs</configPath></rome>");
-		setFile("rome_test.js").toResource("rome/js/longLineBefore.js");
-		setFile("configs/rome.json").toResource("rome/config/line-width-80.json");
-		mavenRunner().withArguments("spotless:apply").runNoError();
-		assertFile("rome_test.js").sameAsResource("rome/js/longLineAfter80.js");
-	}
-
-	/**
-	 * Tests that the download directory can be an absolute path.
-	 *
-	 * @throws Exception When a test failure occurs.
-	 */
-	@Test
-	void downloadDirAbsolute() throws Exception {
-		var path = newFile("target/bin/rome").getAbsoluteFile().toString();
-		writePomWithRomeSteps("**/*.js",
-				"<rome><version>12.0.0</version><downloadDir>" + forXml(path) + "</downloadDir></rome>");
-		setFile("rome_test.js").toResource("rome/js/fileBefore.js");
-		assertTrue(!newFile("target/bin/rome").exists() || newFile("target/bin/rome").list().length == 0);
-		mavenRunner().withArguments("spotless:apply").runNoError();
-		assertFile("rome_test.js").sameAsResource("rome/js/fileAfter.js");
-		assertEquals(2, newFile("target/bin/rome").list().length);
-	}
-
-	/**
-	 * Tests that the download directory can be changed to a path relative to the
-	 * project's base directory.
-	 *
-	 * @throws Exception When a test failure occurs.
-	 */
-	@Test
-	void downloadDirRelative() throws Exception {
-		writePomWithRomeSteps("**/*.js",
-				"<rome><version>12.0.0</version><downloadDir>target/bin/rome</downloadDir></rome>");
-		setFile("rome_test.js").toResource("rome/js/fileBefore.js");
-		assertTrue(!newFile("target/bin/rome").exists() || newFile("target/bin/rome").list().length == 0);
-		mavenRunner().withArguments("spotless:apply").runNoError();
-		assertFile("rome_test.js").sameAsResource("rome/js/fileAfter.js");
-		assertEquals(2, newFile("target/bin/rome").list().length);
-	}
-
-	/**
-	 * Tests that the build fails when the input file could not be parsed.
-	 *
-	 * @throws Exception When a test failure occurs.
-	 */
-	@Test
-	void failureWhenExeNotFound() throws Exception {
-		writePomWithRomeSteps("**/*.js", "<rome><version>12.0.0</version><pathToExe>rome/is/missing</pathToExe></rome>");
-		setFile("rome_test.js").toResource("rome/js/fileBefore.js");
-		var result = mavenRunner().withArguments("spotless:apply").runHasError();
-		assertFile("rome_test.js").sameAsResource("rome/js/fileBefore.js");
-		assertThat(result.stdOutUtf8()).contains("Biome executable does not exist");
-	}
-
-	/**
-	 * Tests that the build fails when the input file could not be parsed.
-	 *
-	 * @throws Exception When a test failure occurs.
-	 */
-	@Test
-	void failureWhenNotParseable() throws Exception {
-		writePomWithRomeSteps("**/*.js", "<rome><version>12.0.0</version><language>json</language></rome>");
-		setFile("rome_test.js").toResource("rome/js/fileBefore.js");
-		var result = mavenRunner().withArguments("spotless:apply").runHasError();
-		assertFile("rome_test.js").sameAsResource("rome/js/fileBefore.js");
-		assertThat(result.stdOutUtf8()).contains("Format with errors is disabled.");
-		assertThat(result.stdOutUtf8()).contains("Unable to format file");
-		assertThat(result.stdOutUtf8()).contains("Step 'rome' found problem in 'rome_test.js'");
-	}
-}
diff --git a/testlib/src/test/java/com/diffplug/spotless/rome/RomeStepTest.java b/testlib/src/test/java/com/diffplug/spotless/rome/RomeStepTest.java
index 8ab92e90e0..87d547a329 100644
--- a/testlib/src/test/java/com/diffplug/spotless/rome/RomeStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/rome/RomeStepTest.java
@@ -38,254 +38,6 @@ static void createDownloadDir() throws IOException {
 		downloadDir = userHome.resolve(".gradle").resolve("rome-dl-test").toAbsolutePath().normalize().toString();
 	}
 
-	@Nested
-	@Deprecated
-	class Rome {
-		/**
-		 * Tests that files can be formatted without setting the input language
-		 * explicitly.
-		 */
-		@Nested
-		class AutoDetectLanguage {
-			/**
-			 * Tests that a *.cjs file can be formatted without setting the input language
-			 * explicitly.
-			 */
-			@Test
-			void testAutoDetectCjs() {
-				var step = RomeStep.withExeDownload(BiomeFlavor.ROME, "12.0.0", downloadDir.toString()).create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
-				stepHarness.testResource("rome/js/fileBefore.cjs", "rome/js/fileAfter.cjs");
-			}
-
-			/**
-			 * Tests that a *.cts file can be formatted without setting the input language
-			 * explicitly.
-			 */
-			@Test
-			void testAutoDetectCts() {
-				var step = RomeStep.withExeDownload(BiomeFlavor.ROME, "12.0.0", downloadDir.toString()).create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
-				stepHarness.testResource("rome/ts/fileBefore.cts", "rome/ts/fileAfter.cts");
-			}
-
-			/**
-			 * Tests that a *.js file can be formatted without setting the input language
-			 * explicitly.
-			 */
-			@Test
-			void testAutoDetectJs() {
-				var step = RomeStep.withExeDownload(BiomeFlavor.ROME, "12.0.0", downloadDir.toString()).create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
-				stepHarness.testResource("rome/js/fileBefore.js", "rome/js/fileAfter.js");
-			}
-
-			/**
-			 * Tests that a *.js file can be formatted without setting the input language
-			 * explicitly.
-			 */
-			@Test
-			void testAutoDetectJson() {
-				var step = RomeStep.withExeDownload(BiomeFlavor.ROME, "12.0.0", downloadDir.toString()).create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
-				stepHarness.testResource("rome/json/fileBefore.json", "rome/json/fileAfter.json");
-			}
-
-			/**
-			 * Tests that a *.jsx file can be formatted without setting the input language
-			 * explicitly.
-			 */
-			@Test
-			void testAutoDetectJsx() {
-				var step = RomeStep.withExeDownload(BiomeFlavor.ROME, "12.0.0", downloadDir.toString()).create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
-				stepHarness.testResource("rome/js/fileBefore.jsx", "rome/js/fileAfter.jsx");
-			}
-
-			/**
-			 * Tests that a *.mjs file can be formatted without setting the input language
-			 * explicitly.
-			 */
-			@Test
-			void testAutoDetectMjs() {
-				var step = RomeStep.withExeDownload(BiomeFlavor.ROME, "12.0.0", downloadDir.toString()).create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
-				stepHarness.testResource("rome/js/fileBefore.mjs", "rome/js/fileAfter.mjs");
-			}
-
-			/**
-			 * Tests that a *.mts file can be formatted without setting the input language
-			 * explicitly.
-			 */
-			@Test
-			void testAutoDetectMts() {
-				var step = RomeStep.withExeDownload(BiomeFlavor.ROME, "12.0.0", downloadDir.toString()).create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
-				stepHarness.testResource("rome/ts/fileBefore.mts", "rome/ts/fileAfter.mts");
-			}
-
-			/**
-			 * Tests that a *.ts file can be formatted without setting the input language
-			 * explicitly.
-			 */
-			@Test
-			void testAutoDetectTs() {
-				var step = RomeStep.withExeDownload(BiomeFlavor.ROME, "12.0.0", downloadDir.toString()).create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
-				stepHarness.testResource("rome/ts/fileBefore.ts", "rome/ts/fileAfter.ts");
-			}
-
-			/**
-			 * Tests that a *.tsx file can be formatted without setting the input language
-			 * explicitly.
-			 */
-			@Test
-			void testAutoDetectTsx() {
-				var step = RomeStep.withExeDownload(BiomeFlavor.ROME, "12.0.0", downloadDir.toString()).create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
-				stepHarness.testResource("rome/ts/fileBefore.tsx", "rome/ts/fileAfter.tsx");
-			}
-		}
-
-		@Nested
-		class ConfigFile {
-			/**
-			 * Test formatting with the line width in the config file set to 120.
-			 */
-			@Test
-			void testLineWidth120() {
-				var path = createRomeConfig("rome/config/line-width-120.json");
-				var step = RomeStep.withExeDownload(BiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withConfigPath(path).create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
-				stepHarness.testResource("rome/js/longLineBefore.js", "rome/js/longLineAfter120.js");
-			}
-
-			/**
-			 * Test formatting with the line width in the config file set to 120.
-			 */
-			@Test
-			void testLineWidth80() {
-				var path = createRomeConfig("rome/config/line-width-80.json");
-				var step = RomeStep.withExeDownload(BiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withConfigPath(path).create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
-				stepHarness.testResource("rome/js/longLineBefore.js", "rome/js/longLineAfter80.js");
-			}
-
-			private String createRomeConfig(String name) {
-				var config = createTestFile(name).toPath();
-				var dir = config.getParent();
-				var rome = dir.resolve("rome.json");
-				ThrowingEx.run(() -> Files.copy(config, rome));
-				return dir.toString();
-			}
-		}
-
-		/**
-		 * Tests that files can be formatted when setting the input language explicitly.
-		 */
-		@Nested
-		class ExplicitLanguage {
-			/**
-			 * Tests that a *.cjs file can be formatted when setting the input language
-			 * explicitly.
-			 */
-			@Test
-			void testAutoDetectCjs() {
-				var step = RomeStep.withExeDownload(BiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withLanguage("js").create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
-				stepHarness.testResource("rome/js/fileBefore.cjs", "rome/js/fileAfter.cjs");
-			}
-
-			/**
-			 * Tests that a *.cts file can be formatted when setting the input language
-			 * explicitly.
-			 */
-			@Test
-			void testAutoDetectCts() {
-				var step = RomeStep.withExeDownload(BiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withLanguage("ts").create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
-				stepHarness.testResource("rome/ts/fileBefore.cts", "rome/ts/fileAfter.cts");
-			}
-
-			/**
-			 * Tests that a *.js file can be formatted when setting the input language
-			 * explicitly.
-			 */
-			@Test
-			void testAutoDetectJs() {
-				var step = RomeStep.withExeDownload(BiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withLanguage("js").create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
-				stepHarness.testResource("rome/js/fileBefore.js", "rome/js/fileAfter.js");
-			}
-
-			/**
-			 * Tests that a *.json file can be formatted when setting the input language
-			 * explicitly.
-			 */
-			@Test
-			void testAutoDetectJson() {
-				var step = RomeStep.withExeDownload(BiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withLanguage("json").create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
-				stepHarness.testResource("rome/json/fileBefore.json", "rome/json/fileAfter.json");
-			}
-
-			/**
-			 * Tests that a *.jsx file can be formatted when setting the input language
-			 * explicitly.
-			 */
-			@Test
-			void testAutoDetectJsx() {
-				var step = RomeStep.withExeDownload(BiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withLanguage("jsx").create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
-				stepHarness.testResource("rome/js/fileBefore.jsx", "rome/js/fileAfter.jsx");
-			}
-
-			/**
-			 * Tests that a *.mjs file can be formatted without setting the input language
-			 * explicitly.
-			 */
-			@Test
-			void testAutoDetectMjs() {
-				var step = RomeStep.withExeDownload(BiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withLanguage("js").create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
-				stepHarness.testResource("rome/js/fileBefore.mjs", "rome/js/fileAfter.mjs");
-			}
-
-			/**
-			 * Tests that a *.mts file can be formatted when setting the input language
-			 * explicitly.
-			 */
-			@Test
-			void testAutoDetectMts() {
-				var step = RomeStep.withExeDownload(BiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withLanguage("ts").create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
-				stepHarness.testResource("rome/ts/fileBefore.mts", "rome/ts/fileAfter.mts");
-			}
-
-			/**
-			 * Tests that a *.ts file can be formatted when setting the input language
-			 * explicitly.
-			 */
-			@Test
-			void testAutoDetectTs() {
-				var step = RomeStep.withExeDownload(BiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withLanguage("ts").create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
-				stepHarness.testResource("rome/ts/fileBefore.ts", "rome/ts/fileAfter.ts");
-			}
-
-			/**
-			 * Tests that a *.tsx file can be formatted when setting the input language
-			 * explicitly.
-			 */
-			@Test
-			void testAutoDetectTsx() {
-				var step = RomeStep.withExeDownload(BiomeFlavor.ROME, "12.0.0", downloadDir.toString()).withLanguage("tsx").create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
-				stepHarness.testResource("rome/ts/fileBefore.tsx", "rome/ts/fileAfter.tsx");
-			}
-		}
-	}
-
 	@Nested
 	class Biome {
 		/**

From e10f3979883659a8e7324ccc999d9b639e25350a Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 23 May 2024 00:13:07 -0700
Subject: [PATCH 1593/2068] Remove Rome from the readmes.

---
 plugin-gradle/README.md | 6 ------
 plugin-maven/README.md  | 6 ------
 2 files changed, 12 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 4542c69763..819ff3d42a 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -1299,12 +1299,6 @@ a formatter that for the frontend written in Rust, which has a native binary, do
 is pretty fast. It can currently format JavaScript, TypeScript, JSX, and JSON, and may support
 [more frontend languages](https://biomejs.dev/internals/language-support/) such as CSS in the future.
 
-Note: Biome [was formerly called Rome](https://biomejs.dev/blog/annoucing-biome/). Configurations with
-the old `<rome>` tag and `rome(...)` function are still supported for the time being. This will be removed
-in a future version, you should migrate to the new `<biome>` tag or `biome(...)` function. The configuration
-remains the same, you only need to update the version. If you are using a custom `rome.json` configuration file,
-you need to rename it to `biome.json`.
-
 You can use Biome in any language-specific format for supported languages, but
 usually you will be creating a generic format.
 
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index f003980705..782d685b67 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -1332,12 +1332,6 @@ a formatter that for the frontend written in Rust, which has a native binary, do
 is pretty fast. It can currently format JavaScript, TypeScript, JSX, and JSON, and may support
 [more frontend languages](https://biomejs.dev/internals/language-support/) such as CSS in the future.
 
-Note: Biome [was formerly called Rome](https://biomejs.dev/blog/annoucing-biome/). Configurations with
-the old `<rome>` tag and `rome(...)` function are still supported for the time being. This will be removed
-in a future version, you should migrate to the new `<biome>` tag or `biome(...)` function. The configuration
-remains the same, you only need to update the version. If you are using a custom `rome.json` configuration file,
-you need to rename it to `biome.json`.
-
 You can use Biome in any language-specific format for supported languages, but
 usually you will be creating a generic format.
 

From e17fc4903795a71b262b2ea65171b28f7e904ea9 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 23 May 2024 00:19:40 -0700
Subject: [PATCH 1594/2068] Rename remaining rome stuff to biome.

---
 .../{rome => biome}/Architecture.java         |  8 +-
 .../BiomeExecutableDownloader.java}           | 10 +--
 .../spotless/{rome => biome}/BiomeFlavor.java |  2 +-
 .../RomeStep.java => biome/BiomeStep.java}    | 24 ++---
 .../diffplug/spotless/{rome => biome}/OS.java |  8 +-
 .../spotless/{rome => biome}/Platform.java    |  4 +-
 ...meStepConfig.java => BiomeStepConfig.java} | 16 ++--
 .../gradle/spotless/FormatExtension.java      | 12 +--
 .../gradle/spotless/JavascriptExtension.java  |  4 +-
 .../gradle/spotless/JsonExtension.java        |  4 +-
 .../gradle/spotless/TypescriptExtension.java  |  4 +-
 .../AbstractBiome.java}                       | 18 ++--
 .../spotless/maven/generic/Biome.java         |  7 +-
 .../spotless/maven/javascript/BiomeJs.java    |  8 +-
 .../spotless/maven/json/BiomeJson.java        |  8 +-
 .../spotless/maven/typescript/BiomeTs.java    |  8 +-
 .../BiomeStepTest.java}                       | 90 +++++++++----------
 17 files changed, 117 insertions(+), 118 deletions(-)
 rename lib/src/main/java/com/diffplug/spotless/{rome => biome}/Architecture.java (90%)
 rename lib/src/main/java/com/diffplug/spotless/{rome/RomeExecutableDownloader.java => biome/BiomeExecutableDownloader.java} (98%)
 rename lib/src/main/java/com/diffplug/spotless/{rome => biome}/BiomeFlavor.java (98%)
 rename lib/src/main/java/com/diffplug/spotless/{rome/RomeStep.java => biome/BiomeStep.java} (95%)
 rename lib/src/main/java/com/diffplug/spotless/{rome => biome}/OS.java (88%)
 rename lib/src/main/java/com/diffplug/spotless/{rome => biome}/Platform.java (97%)
 rename plugin-gradle/src/main/java/com/diffplug/gradle/spotless/{RomeStepConfig.java => BiomeStepConfig.java} (95%)
 rename plugin-maven/src/main/java/com/diffplug/spotless/maven/{rome/AbstractRome.java => generic/AbstractBiome.java} (93%)
 rename testlib/src/test/java/com/diffplug/spotless/{rome/RomeStepTest.java => biome/BiomeStepTest.java} (63%)

diff --git a/lib/src/main/java/com/diffplug/spotless/rome/Architecture.java b/lib/src/main/java/com/diffplug/spotless/biome/Architecture.java
similarity index 90%
rename from lib/src/main/java/com/diffplug/spotless/rome/Architecture.java
rename to lib/src/main/java/com/diffplug/spotless/biome/Architecture.java
index 9ceaeb8632..29511842e2 100644
--- a/lib/src/main/java/com/diffplug/spotless/rome/Architecture.java
+++ b/lib/src/main/java/com/diffplug/spotless/biome/Architecture.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.diffplug.spotless.rome;
+package com.diffplug.spotless.biome;
 
 /**
  * Enumeration of possible computer architectures.
@@ -34,11 +34,11 @@ public static Architecture guess() {
 		var version = System.getProperty("os.version");
 
 		if (arch == null || arch.isBlank()) {
-			throw new IllegalStateException("No OS information is available, specify the Rome executable manually");
+			throw new IllegalStateException("No OS information is available, specify the Biome executable manually");
 		}
 
 		var msg = "Unsupported architecture " + arch + "/" + version
-				+ ", specify the path to the Rome executable manually";
+				+ ", specify the path to the Biome executable manually";
 
 		if (arch.equals("ppc64le")) {
 			throw new IllegalStateException(msg);
diff --git a/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java b/lib/src/main/java/com/diffplug/spotless/biome/BiomeExecutableDownloader.java
similarity index 98%
rename from lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java
rename to lib/src/main/java/com/diffplug/spotless/biome/BiomeExecutableDownloader.java
index 052f72def4..c01d11a20c 100644
--- a/lib/src/main/java/com/diffplug/spotless/rome/RomeExecutableDownloader.java
+++ b/lib/src/main/java/com/diffplug/spotless/biome/BiomeExecutableDownloader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.diffplug.spotless.rome;
+package com.diffplug.spotless.biome;
 
 import java.io.IOException;
 import java.math.BigInteger;
@@ -41,8 +41,8 @@
  * Downloader for the Biome executable:
  * <a href="https://github.com/biomejs/biome">https://github.com/biomejs/biome</a>.
  */
-final class RomeExecutableDownloader {
-	private static final Logger logger = LoggerFactory.getLogger(RomeExecutableDownloader.class);
+final class BiomeExecutableDownloader {
+	private static final Logger logger = LoggerFactory.getLogger(BiomeExecutableDownloader.class);
 
 	/**
 	 * The checksum algorithm to use for checking the integrity of downloaded files.
@@ -80,7 +80,7 @@ final class RomeExecutableDownloader {
 	 * @param flavor Flavor of Biome to use.
 	 * @param downloadDir Directory where to store the downloaded executable.
 	 */
-	public RomeExecutableDownloader(BiomeFlavor flavor, Path downloadDir) {
+	public BiomeExecutableDownloader(BiomeFlavor flavor, Path downloadDir) {
 		this.flavor = flavor;
 		this.downloadDir = downloadDir;
 	}
diff --git a/lib/src/main/java/com/diffplug/spotless/rome/BiomeFlavor.java b/lib/src/main/java/com/diffplug/spotless/biome/BiomeFlavor.java
similarity index 98%
rename from lib/src/main/java/com/diffplug/spotless/rome/BiomeFlavor.java
rename to lib/src/main/java/com/diffplug/spotless/biome/BiomeFlavor.java
index 33ca62d67a..bcb065edea 100644
--- a/lib/src/main/java/com/diffplug/spotless/rome/BiomeFlavor.java
+++ b/lib/src/main/java/com/diffplug/spotless/biome/BiomeFlavor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.diffplug.spotless.rome;
+package com.diffplug.spotless.biome;
 
 /**
  * The flavor of Biome to use. Exists for compatibility reason, may be removed
diff --git a/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java b/lib/src/main/java/com/diffplug/spotless/biome/BiomeStep.java
similarity index 95%
rename from lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java
rename to lib/src/main/java/com/diffplug/spotless/biome/BiomeStep.java
index de5b3e80ee..2db9e8cb2a 100644
--- a/lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/biome/BiomeStep.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.diffplug.spotless.rome;
+package com.diffplug.spotless.biome;
 
 import java.io.File;
 import java.io.IOException;
@@ -40,11 +40,11 @@
 /**
  * formatter step that formats JavaScript and TypeScript code with Biome:
  * <a href= "https://github.com/biomejs/biome">https://github.com/biomejs/biome</a>.
- * It delegates to the Biome executable. The Rome executable is downloaded from
+ * It delegates to the Biome executable. The Biome executable is downloaded from
  * the network when no executable path is provided explicitly.
  */
-public class RomeStep {
-	private static final Logger logger = LoggerFactory.getLogger(RomeStep.class);
+public class BiomeStep {
+	private static final Logger logger = LoggerFactory.getLogger(BiomeStep.class);
 
 	/**
 	 * Path to the directory with the {@code biome.json} config file, can be
@@ -113,8 +113,8 @@ public String name() {
 	 * @param downloadDir Directory where to place the downloaded executable.
 	 * @return A new Biome step that download the executable from the network.
 	 */
-	public static RomeStep withExeDownload(BiomeFlavor flavor, String version, String downloadDir) {
-		return new RomeStep(flavor, version, null, downloadDir);
+	public static BiomeStep withExeDownload(BiomeFlavor flavor, String version, String downloadDir) {
+		return new BiomeStep(flavor, version, null, downloadDir);
 	}
 
 	/**
@@ -125,8 +125,8 @@ public static RomeStep withExeDownload(BiomeFlavor flavor, String version, Strin
 	 * @param pathToExe Path to the Biome executable to use.
 	 * @return A new Biome step that format with the given executable.
 	 */
-	public static RomeStep withExePath(BiomeFlavor flavor, String pathToExe) {
-		return new RomeStep(flavor, null, pathToExe, null);
+	public static BiomeStep withExePath(BiomeFlavor flavor, String pathToExe) {
+		return new BiomeStep(flavor, null, pathToExe, null);
 	}
 
 	/**
@@ -230,7 +230,7 @@ private static void validateBiomeExecutable(String resolvedPathToExe) {
 	 * @param pathToExe Path to the Biome executable to use.
 	 * @param downloadDir Directory where to place the downloaded executable.
 	 */
-	private RomeStep(BiomeFlavor flavor, String version, String pathToExe, String downloadDir) {
+	private BiomeStep(BiomeFlavor flavor, String version, String pathToExe, String downloadDir) {
 		this.flavor = flavor;
 		this.version = version != null && !version.isBlank() ? version : defaultVersion(flavor);
 		this.pathToExe = pathToExe;
@@ -255,7 +255,7 @@ public FormatterStep create() {
 	 *                   a file named {@code biome.json}.
 	 * @return This builder instance for chaining method calls.
 	 */
-	public RomeStep withConfigPath(String configPath) {
+	public BiomeStep withConfigPath(String configPath) {
 		this.configPath = configPath;
 		return this;
 	}
@@ -280,7 +280,7 @@ public RomeStep withConfigPath(String configPath) {
 	 * @param language The language of the files to format.
 	 * @return This builder instance for chaining method calls.
 	 */
-	public RomeStep withLanguage(String language) {
+	public BiomeStep withLanguage(String language) {
 		this.language = language;
 		return this;
 	}
@@ -333,7 +333,7 @@ private String resolveExe() throws IOException, InterruptedException {
 				return pathToExe;
 			}
 		} else {
-			var downloader = new RomeExecutableDownloader(flavor, Paths.get(downloadDir));
+			var downloader = new BiomeExecutableDownloader(flavor, Paths.get(downloadDir));
 			var downloaded = downloader.ensureDownloaded(version).toString();
 			makeExecutable(downloaded);
 			return downloaded;
diff --git a/lib/src/main/java/com/diffplug/spotless/rome/OS.java b/lib/src/main/java/com/diffplug/spotless/biome/OS.java
similarity index 88%
rename from lib/src/main/java/com/diffplug/spotless/rome/OS.java
rename to lib/src/main/java/com/diffplug/spotless/biome/OS.java
index 44c87d9ece..ab0ba4b8db 100644
--- a/lib/src/main/java/com/diffplug/spotless/rome/OS.java
+++ b/lib/src/main/java/com/diffplug/spotless/biome/OS.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.diffplug.spotless.rome;
+package com.diffplug.spotless.biome;
 
 import java.util.Locale;
 
@@ -38,12 +38,12 @@ enum OS {
 	public static OS guess() {
 		var osName = System.getProperty("os.name");
 		if (osName == null || osName.isBlank()) {
-			throw new IllegalStateException("No OS information is available, specify the Rome executable manually");
+			throw new IllegalStateException("No OS information is available, specify the Biome executable manually");
 		}
 		var osNameUpper = osName.toUpperCase(Locale.ROOT);
 		if (osNameUpper.contains("SUNOS") || osName.contains("AIX")) {
 			throw new IllegalStateException(
-					"Unsupported OS " + osName + ", specify the path to the Rome executable manually");
+					"Unsupported OS " + osName + ", specify the path to the Biome executable manually");
 		}
 		if (osNameUpper.contains("WINDOWS")) {
 			return OS.WINDOWS;
diff --git a/lib/src/main/java/com/diffplug/spotless/rome/Platform.java b/lib/src/main/java/com/diffplug/spotless/biome/Platform.java
similarity index 97%
rename from lib/src/main/java/com/diffplug/spotless/rome/Platform.java
rename to lib/src/main/java/com/diffplug/spotless/biome/Platform.java
index c50608830a..590e303d98 100644
--- a/lib/src/main/java/com/diffplug/spotless/rome/Platform.java
+++ b/lib/src/main/java/com/diffplug/spotless/biome/Platform.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.diffplug.spotless.rome;
+package com.diffplug.spotless.biome;
 
 /**
  * Represents a platform where code is run, consisting of an operating system
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RomeStepConfig.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BiomeStepConfig.java
similarity index 95%
rename from plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RomeStepConfig.java
rename to plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BiomeStepConfig.java
index 98c4000a8b..d66048a7b0 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RomeStepConfig.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BiomeStepConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,10 +28,10 @@
 import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
 
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.rome.BiomeFlavor;
-import com.diffplug.spotless.rome.RomeStep;
+import com.diffplug.spotless.biome.BiomeFlavor;
+import com.diffplug.spotless.biome.BiomeStep;
 
-public abstract class RomeStepConfig<Self extends RomeStepConfig<Self>> {
+public abstract class BiomeStepConfig<Self extends BiomeStepConfig<Self>> {
 	/**
 	 * Optional path to the directory with configuration file for Biome. The file
 	 * must be named {@code biome.json}. When none is given, the default
@@ -95,7 +95,7 @@ public abstract class RomeStepConfig<Self extends RomeStepConfig<Self>> {
 	@Nullable
 	private String version;
 
-	protected RomeStepConfig(Project project, Consumer<FormatterStep> replaceStep, BiomeFlavor flavor,
+	protected BiomeStepConfig(Project project, Consumer<FormatterStep> replaceStep, BiomeFlavor flavor,
 			String version) {
 		this.project = requireNonNull(project);
 		this.replaceStep = requireNonNull(replaceStep);
@@ -234,13 +234,13 @@ private File findDataDir() {
 	 *
 	 * @return A builder for a Biome step.
 	 */
-	private RomeStep newBuilder() {
+	private BiomeStep newBuilder() {
 		if (pathToExe != null) {
 			var resolvedPathToExe = resolvePathToExe();
-			return RomeStep.withExePath(flavor, resolvedPathToExe);
+			return BiomeStep.withExePath(flavor, resolvedPathToExe);
 		} else {
 			var downloadDir = resolveDownloadDir();
-			return RomeStep.withExeDownload(flavor, version, downloadDir);
+			return BiomeStep.withExeDownload(flavor, version, downloadDir);
 		}
 	}
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index 76296130df..94e5298b66 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -53,6 +53,7 @@
 import com.diffplug.spotless.LineEnding;
 import com.diffplug.spotless.OnMatch;
 import com.diffplug.spotless.Provisioner;
+import com.diffplug.spotless.biome.BiomeFlavor;
 import com.diffplug.spotless.cpp.ClangFormatStep;
 import com.diffplug.spotless.extra.EclipseBasedStepBuilder;
 import com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep;
@@ -67,7 +68,6 @@
 import com.diffplug.spotless.generic.TrimTrailingWhitespaceStep;
 import com.diffplug.spotless.npm.NpmPathResolver;
 import com.diffplug.spotless.npm.PrettierFormatterStep;
-import com.diffplug.spotless.rome.BiomeFlavor;
 
 import groovy.lang.Closure;
 
@@ -728,15 +728,15 @@ protected FormatterStep createStep() {
 	 * the file name. It should be specified as a formatter step for a generic
 	 * <code>format{ ... }</code>.
 	 */
-	public class BiomeGeneric extends RomeStepConfig<BiomeGeneric> {
+	public class BiomeGeneric extends BiomeStepConfig<BiomeGeneric> {
 		@Nullable
 		String language;
 
 		/**
-		 * Creates a new Rome config that downloads the Rome executable for the given
+		 * Creates a new Biome config that downloads the Biome executable for the given
 		 * version from the network.
 		 *
-		 * @param version Rome version to use. The default version is used when
+		 * @param version Biome version to use. The default version is used when
 		 *                <code>null</code>.
 		 */
 		public BiomeGeneric(String version) {
@@ -801,12 +801,12 @@ public PrettierConfig prettier(Map<String, String> devDependencies) {
 	 * offline, you can specify the path to the Biome executable via
 	 * {@code biome().pathToExe(...)}.
 	 */
-	public RomeStepConfig<?> biome() {
+	public BiomeStepConfig<?> biome() {
 		return biome(null);
 	}
 
 	/** Downloads the given Biome version from the network. */
-	public RomeStepConfig<?> biome(String version) {
+	public BiomeStepConfig<?> biome(String version) {
 		var biomeConfig = new BiomeGeneric(version);
 		addStep(biomeConfig.createStep());
 		return biomeConfig;
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
index 63bbb17c1e..5532045bc2 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
@@ -30,11 +30,11 @@
 
 import com.diffplug.common.collect.ImmutableList;
 import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.biome.BiomeFlavor;
 import com.diffplug.spotless.npm.EslintConfig;
 import com.diffplug.spotless.npm.EslintFormatterStep;
 import com.diffplug.spotless.npm.NpmPathResolver;
 import com.diffplug.spotless.npm.PrettierFormatterStep;
-import com.diffplug.spotless.rome.BiomeFlavor;
 
 public class JavascriptExtension extends FormatExtension {
 
@@ -161,7 +161,7 @@ public BiomeJs biome(String version) {
 	/**
 	 * Biome formatter step for JavaScript.
 	 */
-	public class BiomeJs extends RomeStepConfig<BiomeJs> {
+	public class BiomeJs extends BiomeStepConfig<BiomeJs> {
 		/**
 		 * Creates a new Biome formatter step config for formatting JavaScript files.
 		 * Unless overwritten, the given Biome version is downloaded from the network.
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
index 38bd97c496..80e207d6da 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
@@ -22,12 +22,12 @@
 import javax.inject.Inject;
 
 import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.biome.BiomeFlavor;
 import com.diffplug.spotless.json.JacksonJsonConfig;
 import com.diffplug.spotless.json.JacksonJsonStep;
 import com.diffplug.spotless.json.JsonPatchStep;
 import com.diffplug.spotless.json.JsonSimpleStep;
 import com.diffplug.spotless.json.gson.GsonStep;
-import com.diffplug.spotless.rome.BiomeFlavor;
 
 public class JsonExtension extends FormatExtension {
 	private static final int DEFAULT_INDENTATION = 4;
@@ -185,7 +185,7 @@ protected final FormatterStep createStep() {
 	/**
 	 * Biome formatter step for JSON.
 	 */
-	public class BiomeJson extends RomeStepConfig<BiomeJson> {
+	public class BiomeJson extends BiomeStepConfig<BiomeJson> {
 		/**
 		 * Creates a new Biome formatter step config for formatting JSON files. Unless
 		 * overwritten, the given Biome version is downloaded from the network.
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
index be74bc8905..39e050d51e 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
@@ -30,6 +30,7 @@
 
 import com.diffplug.gradle.spotless.JavascriptExtension.EslintBaseConfig;
 import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.biome.BiomeFlavor;
 import com.diffplug.spotless.npm.EslintConfig;
 import com.diffplug.spotless.npm.EslintFormatterStep;
 import com.diffplug.spotless.npm.EslintTypescriptConfig;
@@ -38,7 +39,6 @@
 import com.diffplug.spotless.npm.TsConfigFileType;
 import com.diffplug.spotless.npm.TsFmtFormatterStep;
 import com.diffplug.spotless.npm.TypedTsFmtConfigFile;
-import com.diffplug.spotless.rome.BiomeFlavor;
 
 public class TypescriptExtension extends FormatExtension {
 
@@ -246,7 +246,7 @@ public BiomeTs biome(String version) {
 	/**
 	 * Biome formatter step for TypeScript.
 	 */
-	public class BiomeTs extends RomeStepConfig<BiomeTs> {
+	public class BiomeTs extends BiomeStepConfig<BiomeTs> {
 		/**
 		 * Creates a new Biome formatter step config for formatting TypeScript files.
 		 * Unless overwritten, the given Biome version is downloaded from the network.
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/rome/AbstractRome.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/AbstractBiome.java
similarity index 93%
rename from plugin-maven/src/main/java/com/diffplug/spotless/maven/rome/AbstractRome.java
rename to plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/AbstractBiome.java
index da66bf37a0..7bc502edf1 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/rome/AbstractRome.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/AbstractBiome.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.diffplug.spotless.maven.rome;
+package com.diffplug.spotless.maven.generic;
 
 import java.nio.file.Paths;
 
 import org.apache.maven.plugins.annotations.Parameter;
 
 import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.biome.BiomeFlavor;
+import com.diffplug.spotless.biome.BiomeStep;
 import com.diffplug.spotless.maven.FormatterStepConfig;
 import com.diffplug.spotless.maven.FormatterStepFactory;
-import com.diffplug.spotless.rome.BiomeFlavor;
-import com.diffplug.spotless.rome.RomeStep;
 
 /**
  * Factory for creating the Biome formatter step that can format format code in
@@ -32,11 +32,11 @@
  * "https://github.com/biomejs/biome">https://github.com/biomejs/biome</a>. It
  * delegates to the Biome CLI executable.
  */
-public abstract class AbstractRome implements FormatterStepFactory {
+public abstract class AbstractBiome implements FormatterStepFactory {
 	/** Biome flavor to use. */
 	private BiomeFlavor flavor;
 
-	protected AbstractRome(BiomeFlavor flavor) {
+	protected AbstractBiome(BiomeFlavor flavor) {
 		this.flavor = flavor;
 	}
 
@@ -133,13 +133,13 @@ public FormatterStep newFormatterStep(FormatterStepConfig config) {
 	 *               the currently executed project.
 	 * @return A builder for a Biome step.
 	 */
-	private RomeStep newBuilder(FormatterStepConfig config) {
+	private BiomeStep newBuilder(FormatterStepConfig config) {
 		if (pathToExe != null) {
 			var resolvedExePath = resolveExePath(config);
-			return RomeStep.withExePath(flavor, resolvedExePath);
+			return BiomeStep.withExePath(flavor, resolvedExePath);
 		} else {
 			var downloadDir = resolveDownloadDir(config);
-			return RomeStep.withExeDownload(flavor, version, downloadDir);
+			return BiomeStep.withExeDownload(flavor, version, downloadDir);
 		}
 	}
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Biome.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Biome.java
index e096a14734..133e21c302 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Biome.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Biome.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,15 +17,14 @@
 
 import org.apache.maven.plugins.annotations.Parameter;
 
-import com.diffplug.spotless.maven.rome.AbstractRome;
-import com.diffplug.spotless.rome.BiomeFlavor;
+import com.diffplug.spotless.biome.BiomeFlavor;
 
 /**
  * Generic Biome formatter step that detects the language of the input file from
  * the file name. It should be specified as a formatter step for a generic
  * {@code <format>}.
  */
-public class Biome extends AbstractRome {
+public class Biome extends AbstractBiome {
 	public Biome() {
 		super(BiomeFlavor.BIOME);
 	}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/BiomeJs.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/BiomeJs.java
index 4d52f4cc80..b610a5b63b 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/BiomeJs.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/BiomeJs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,13 +15,13 @@
  */
 package com.diffplug.spotless.maven.javascript;
 
-import com.diffplug.spotless.maven.rome.AbstractRome;
-import com.diffplug.spotless.rome.BiomeFlavor;
+import com.diffplug.spotless.biome.BiomeFlavor;
+import com.diffplug.spotless.maven.generic.AbstractBiome;
 
 /**
  * Biome formatter step for JavaScript.
  */
-public class BiomeJs extends AbstractRome {
+public class BiomeJs extends AbstractBiome {
 	public BiomeJs() {
 		super(BiomeFlavor.BIOME);
 	}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/BiomeJson.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/BiomeJson.java
index a8d329d725..f52b490d69 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/BiomeJson.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/BiomeJson.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,13 +15,13 @@
  */
 package com.diffplug.spotless.maven.json;
 
-import com.diffplug.spotless.maven.rome.AbstractRome;
-import com.diffplug.spotless.rome.BiomeFlavor;
+import com.diffplug.spotless.biome.BiomeFlavor;
+import com.diffplug.spotless.maven.generic.AbstractBiome;
 
 /**
  * Biome formatter step for JSON.
  */
-public class BiomeJson extends AbstractRome {
+public class BiomeJson extends AbstractBiome {
 	public BiomeJson() {
 		super(BiomeFlavor.BIOME);
 	}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/BiomeTs.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/BiomeTs.java
index a99e633a42..e9f84d9edb 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/BiomeTs.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/typescript/BiomeTs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,13 +15,13 @@
  */
 package com.diffplug.spotless.maven.typescript;
 
-import com.diffplug.spotless.maven.rome.AbstractRome;
-import com.diffplug.spotless.rome.BiomeFlavor;
+import com.diffplug.spotless.biome.BiomeFlavor;
+import com.diffplug.spotless.maven.generic.AbstractBiome;
 
 /**
  * Biome formatter step for TypeScript.
  */
-public class BiomeTs extends AbstractRome {
+public class BiomeTs extends AbstractBiome {
 	public BiomeTs() {
 		super(BiomeFlavor.BIOME);
 	}
diff --git a/testlib/src/test/java/com/diffplug/spotless/rome/RomeStepTest.java b/testlib/src/test/java/com/diffplug/spotless/biome/BiomeStepTest.java
similarity index 63%
rename from testlib/src/test/java/com/diffplug/spotless/rome/RomeStepTest.java
rename to testlib/src/test/java/com/diffplug/spotless/biome/BiomeStepTest.java
index 87d547a329..0ad2f68783 100644
--- a/testlib/src/test/java/com/diffplug/spotless/rome/RomeStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/biome/BiomeStepTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.diffplug.spotless.rome;
+package com.diffplug.spotless.biome;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -28,12 +28,12 @@
 import com.diffplug.spotless.StepHarnessWithFile;
 import com.diffplug.spotless.ThrowingEx;
 
-class RomeStepTest extends ResourceHarness {
+class BiomeStepTest extends ResourceHarness {
 	private static String downloadDir;
 
 	@BeforeAll
 	static void createDownloadDir() throws IOException {
-		// We do not want to download Rome each time we execute a test
+		// We do not want to download Biome each time we execute a test
 		var userHome = Paths.get(StandardSystemProperty.USER_HOME.value());
 		downloadDir = userHome.resolve(".gradle").resolve("rome-dl-test").toAbsolutePath().normalize().toString();
 	}
@@ -52,8 +52,8 @@ class AutoDetectLanguage {
 			 */
 			@Test
 			void testAutoDetectCjs() {
-				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 				stepHarness.testResource("biome/js/fileBefore.cjs", "biome/js/fileAfter.cjs");
 			}
 
@@ -63,8 +63,8 @@ void testAutoDetectCjs() {
 			 */
 			@Test
 			void testAutoDetectCts() {
-				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 				stepHarness.testResource("biome/ts/fileBefore.cts", "biome/ts/fileAfter.cts");
 			}
 
@@ -74,8 +74,8 @@ void testAutoDetectCts() {
 			 */
 			@Test
 			void testAutoDetectJs() {
-				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 				stepHarness.testResource("biome/js/fileBefore.js", "biome/js/fileAfter.js");
 			}
 
@@ -85,8 +85,8 @@ void testAutoDetectJs() {
 			 */
 			@Test
 			void testAutoDetectJson() {
-				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 				stepHarness.testResource("biome/json/fileBefore.json", "biome/json/fileAfter.json");
 			}
 
@@ -96,8 +96,8 @@ void testAutoDetectJson() {
 			 */
 			@Test
 			void testAutoDetectJsx() {
-				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 				stepHarness.testResource("biome/js/fileBefore.jsx", "biome/js/fileAfter.jsx");
 			}
 
@@ -107,8 +107,8 @@ void testAutoDetectJsx() {
 			 */
 			@Test
 			void testAutoDetectMjs() {
-				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 				stepHarness.testResource("biome/js/fileBefore.mjs", "biome/js/fileAfter.mjs");
 			}
 
@@ -118,8 +118,8 @@ void testAutoDetectMjs() {
 			 */
 			@Test
 			void testAutoDetectMts() {
-				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 				stepHarness.testResource("biome/ts/fileBefore.mts", "biome/ts/fileAfter.mts");
 			}
 
@@ -129,8 +129,8 @@ void testAutoDetectMts() {
 			 */
 			@Test
 			void testAutoDetectTs() {
-				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 				stepHarness.testResource("biome/ts/fileBefore.ts", "biome/ts/fileAfter.ts");
 			}
 
@@ -140,8 +140,8 @@ void testAutoDetectTs() {
 			 */
 			@Test
 			void testAutoDetectTsx() {
-				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 				stepHarness.testResource("biome/ts/fileBefore.tsx", "biome/ts/fileAfter.tsx");
 			}
 
@@ -153,8 +153,8 @@ void testAutoDetectTsx() {
 			 */
 			@Test
 			void preservesIgnoredFiles() {
-				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.5.0", downloadDir.toString()).create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.5.0", downloadDir.toString()).create();
+				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 				stepHarness.testResource("biome/json/package.json", "biome/json/packageAfter.json");
 			}
 		}
@@ -167,8 +167,8 @@ class ConfigFile {
 			@Test
 			void testLineWidth120() {
 				var path = createBiomeConfig("biome/config/line-width-120.json");
-				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withConfigPath(path).create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withConfigPath(path).create();
+				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 				stepHarness.testResource("biome/js/longLineBefore.js", "biome/js/longLineAfter120.js");
 			}
 
@@ -178,8 +178,8 @@ void testLineWidth120() {
 			@Test
 			void testLineWidth80() {
 				var path = createBiomeConfig("biome/config/line-width-80.json");
-				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withConfigPath(path).create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withConfigPath(path).create();
+				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 				stepHarness.testResource("biome/js/longLineBefore.js", "biome/js/longLineAfter80.js");
 			}
 
@@ -203,8 +203,8 @@ class ExplicitLanguage {
 			 */
 			@Test
 			void testAutoDetectCjs() {
-				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("js").create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("js").create();
+				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 				stepHarness.testResource("biome/js/fileBefore.cjs", "biome/js/fileAfter.cjs");
 			}
 
@@ -214,8 +214,8 @@ void testAutoDetectCjs() {
 			 */
 			@Test
 			void testAutoDetectCts() {
-				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("ts").create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("ts").create();
+				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 				stepHarness.testResource("biome/ts/fileBefore.cts", "biome/ts/fileAfter.cts");
 			}
 
@@ -225,8 +225,8 @@ void testAutoDetectCts() {
 			 */
 			@Test
 			void testAutoDetectJs() {
-				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("js").create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("js").create();
+				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 				stepHarness.testResource("biome/js/fileBefore.js", "biome/js/fileAfter.js");
 			}
 
@@ -236,8 +236,8 @@ void testAutoDetectJs() {
 			 */
 			@Test
 			void testAutoDetectJson() {
-				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("json").create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("json").create();
+				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 				stepHarness.testResource("biome/json/fileBefore.json", "biome/json/fileAfter.json");
 			}
 
@@ -247,8 +247,8 @@ void testAutoDetectJson() {
 			 */
 			@Test
 			void testAutoDetectJsx() {
-				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("jsx").create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("jsx").create();
+				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 				stepHarness.testResource("biome/js/fileBefore.jsx", "biome/js/fileAfter.jsx");
 			}
 
@@ -258,8 +258,8 @@ void testAutoDetectJsx() {
 			 */
 			@Test
 			void testAutoDetectMjs() {
-				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("js").create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("js").create();
+				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 				stepHarness.testResource("biome/js/fileBefore.mjs", "biome/js/fileAfter.mjs");
 			}
 
@@ -269,8 +269,8 @@ void testAutoDetectMjs() {
 			 */
 			@Test
 			void testAutoDetectMts() {
-				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("ts").create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("ts").create();
+				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 				stepHarness.testResource("biome/ts/fileBefore.mts", "biome/ts/fileAfter.mts");
 			}
 
@@ -280,8 +280,8 @@ void testAutoDetectMts() {
 			 */
 			@Test
 			void testAutoDetectTs() {
-				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("ts").create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("ts").create();
+				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 				stepHarness.testResource("biome/ts/fileBefore.ts", "biome/ts/fileAfter.ts");
 			}
 
@@ -291,8 +291,8 @@ void testAutoDetectTs() {
 			 */
 			@Test
 			void testAutoDetectTsx() {
-				var step = RomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("tsx").create();
-				var stepHarness = StepHarnessWithFile.forStep(RomeStepTest.this, step);
+				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("tsx").create();
+				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 				stepHarness.testResource("biome/ts/fileBefore.tsx", "biome/ts/fileAfter.tsx");
 			}
 		}

From 4caa0294ed92ea085ef212b5339f5acde4746c42 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 23 May 2024 00:23:11 -0700
Subject: [PATCH 1595/2068] Remove rome's testfiles.

---
 .../main/resources/rome/config/line-width-120.json  | 11 -----------
 .../main/resources/rome/config/line-width-80.json   | 11 -----------
 testlib/src/main/resources/rome/js/fileAfter.cjs    |  3 ---
 testlib/src/main/resources/rome/js/fileAfter.js     |  3 ---
 testlib/src/main/resources/rome/js/fileAfter.jsx    |  3 ---
 testlib/src/main/resources/rome/js/fileAfter.mjs    |  3 ---
 testlib/src/main/resources/rome/js/fileBefore.cjs   |  3 ---
 testlib/src/main/resources/rome/js/fileBefore.js    |  3 ---
 testlib/src/main/resources/rome/js/fileBefore.jsx   |  4 ----
 testlib/src/main/resources/rome/js/fileBefore.mjs   |  3 ---
 .../src/main/resources/rome/js/longLineAfter120.js  |  1 -
 .../src/main/resources/rome/js/longLineAfter80.js   | 13 -------------
 .../src/main/resources/rome/js/longLineBefore.js    |  1 -
 testlib/src/main/resources/rome/json/fileAfter.json |  5 -----
 .../src/main/resources/rome/json/fileBefore.json    |  7 -------
 testlib/src/main/resources/rome/ts/fileAfter.cts    |  4 ----
 testlib/src/main/resources/rome/ts/fileAfter.mts    |  4 ----
 testlib/src/main/resources/rome/ts/fileAfter.ts     |  4 ----
 testlib/src/main/resources/rome/ts/fileAfter.tsx    |  7 -------
 testlib/src/main/resources/rome/ts/fileBefore.cts   |  4 ----
 testlib/src/main/resources/rome/ts/fileBefore.mts   |  5 -----
 testlib/src/main/resources/rome/ts/fileBefore.ts    |  5 -----
 testlib/src/main/resources/rome/ts/fileBefore.tsx   |  8 --------
 23 files changed, 115 deletions(-)
 delete mode 100644 testlib/src/main/resources/rome/config/line-width-120.json
 delete mode 100644 testlib/src/main/resources/rome/config/line-width-80.json
 delete mode 100644 testlib/src/main/resources/rome/js/fileAfter.cjs
 delete mode 100644 testlib/src/main/resources/rome/js/fileAfter.js
 delete mode 100644 testlib/src/main/resources/rome/js/fileAfter.jsx
 delete mode 100644 testlib/src/main/resources/rome/js/fileAfter.mjs
 delete mode 100644 testlib/src/main/resources/rome/js/fileBefore.cjs
 delete mode 100644 testlib/src/main/resources/rome/js/fileBefore.js
 delete mode 100644 testlib/src/main/resources/rome/js/fileBefore.jsx
 delete mode 100644 testlib/src/main/resources/rome/js/fileBefore.mjs
 delete mode 100644 testlib/src/main/resources/rome/js/longLineAfter120.js
 delete mode 100644 testlib/src/main/resources/rome/js/longLineAfter80.js
 delete mode 100644 testlib/src/main/resources/rome/js/longLineBefore.js
 delete mode 100644 testlib/src/main/resources/rome/json/fileAfter.json
 delete mode 100644 testlib/src/main/resources/rome/json/fileBefore.json
 delete mode 100644 testlib/src/main/resources/rome/ts/fileAfter.cts
 delete mode 100644 testlib/src/main/resources/rome/ts/fileAfter.mts
 delete mode 100644 testlib/src/main/resources/rome/ts/fileAfter.ts
 delete mode 100644 testlib/src/main/resources/rome/ts/fileAfter.tsx
 delete mode 100644 testlib/src/main/resources/rome/ts/fileBefore.cts
 delete mode 100644 testlib/src/main/resources/rome/ts/fileBefore.mts
 delete mode 100644 testlib/src/main/resources/rome/ts/fileBefore.ts
 delete mode 100644 testlib/src/main/resources/rome/ts/fileBefore.tsx

diff --git a/testlib/src/main/resources/rome/config/line-width-120.json b/testlib/src/main/resources/rome/config/line-width-120.json
deleted file mode 100644
index 8f14afa3f8..0000000000
--- a/testlib/src/main/resources/rome/config/line-width-120.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "formatter": {
-      "enabled": true,
-      "indentStyle": "tab",
-      "lineWidth": 120,
-      "formatWithErrors": false
-    },
-    "linter": {
-      "enabled": false
-    }
-  }
\ No newline at end of file
diff --git a/testlib/src/main/resources/rome/config/line-width-80.json b/testlib/src/main/resources/rome/config/line-width-80.json
deleted file mode 100644
index 5ec998bd97..0000000000
--- a/testlib/src/main/resources/rome/config/line-width-80.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "formatter": {
-      "enabled": true,
-      "indentStyle": "tab",
-      "lineWidth": 80,
-      "formatWithErrors": false
-    },
-    "linter": {
-      "enabled": false
-    }
-  }
\ No newline at end of file
diff --git a/testlib/src/main/resources/rome/js/fileAfter.cjs b/testlib/src/main/resources/rome/js/fileAfter.cjs
deleted file mode 100644
index defc9c85eb..0000000000
--- a/testlib/src/main/resources/rome/js/fileAfter.cjs
+++ /dev/null
@@ -1,3 +0,0 @@
-function foo(name = "World") {
-	return "Hello " + name;
-}
diff --git a/testlib/src/main/resources/rome/js/fileAfter.js b/testlib/src/main/resources/rome/js/fileAfter.js
deleted file mode 100644
index defc9c85eb..0000000000
--- a/testlib/src/main/resources/rome/js/fileAfter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-function foo(name = "World") {
-	return "Hello " + name;
-}
diff --git a/testlib/src/main/resources/rome/js/fileAfter.jsx b/testlib/src/main/resources/rome/js/fileAfter.jsx
deleted file mode 100644
index 313aceb6ed..0000000000
--- a/testlib/src/main/resources/rome/js/fileAfter.jsx
+++ /dev/null
@@ -1,3 +0,0 @@
-export function Panel(cfg = {}) {
-	return <div className={cfg.classname}>{1 + 2}</div>;
-}
diff --git a/testlib/src/main/resources/rome/js/fileAfter.mjs b/testlib/src/main/resources/rome/js/fileAfter.mjs
deleted file mode 100644
index defc9c85eb..0000000000
--- a/testlib/src/main/resources/rome/js/fileAfter.mjs
+++ /dev/null
@@ -1,3 +0,0 @@
-function foo(name = "World") {
-	return "Hello " + name;
-}
diff --git a/testlib/src/main/resources/rome/js/fileBefore.cjs b/testlib/src/main/resources/rome/js/fileBefore.cjs
deleted file mode 100644
index 92539ba751..0000000000
--- a/testlib/src/main/resources/rome/js/fileBefore.cjs
+++ /dev/null
@@ -1,3 +0,0 @@
-function foo ( name="World"){
-                  return "Hello "+name  ;
-    }
\ No newline at end of file
diff --git a/testlib/src/main/resources/rome/js/fileBefore.js b/testlib/src/main/resources/rome/js/fileBefore.js
deleted file mode 100644
index 92539ba751..0000000000
--- a/testlib/src/main/resources/rome/js/fileBefore.js
+++ /dev/null
@@ -1,3 +0,0 @@
-function foo ( name="World"){
-                  return "Hello "+name  ;
-    }
\ No newline at end of file
diff --git a/testlib/src/main/resources/rome/js/fileBefore.jsx b/testlib/src/main/resources/rome/js/fileBefore.jsx
deleted file mode 100644
index 8e5d9834bc..0000000000
--- a/testlib/src/main/resources/rome/js/fileBefore.jsx
+++ /dev/null
@@ -1,4 +0,0 @@
-export function Panel ( cfg={}){
-                  return (<div className={cfg.classname}>{1+2}</div>
-                  )  ;
-    }
\ No newline at end of file
diff --git a/testlib/src/main/resources/rome/js/fileBefore.mjs b/testlib/src/main/resources/rome/js/fileBefore.mjs
deleted file mode 100644
index 92539ba751..0000000000
--- a/testlib/src/main/resources/rome/js/fileBefore.mjs
+++ /dev/null
@@ -1,3 +0,0 @@
-function foo ( name="World"){
-                  return "Hello "+name  ;
-    }
\ No newline at end of file
diff --git a/testlib/src/main/resources/rome/js/longLineAfter120.js b/testlib/src/main/resources/rome/js/longLineAfter120.js
deleted file mode 100644
index 68addc4b65..0000000000
--- a/testlib/src/main/resources/rome/js/longLineAfter120.js
+++ /dev/null
@@ -1 +0,0 @@
-const x = ["Hello", "World", "How", "Are", "You", "Doing", "Today", "Such", "A", "Wondrous", "Sunshine"];
diff --git a/testlib/src/main/resources/rome/js/longLineAfter80.js b/testlib/src/main/resources/rome/js/longLineAfter80.js
deleted file mode 100644
index dbdbd157e9..0000000000
--- a/testlib/src/main/resources/rome/js/longLineAfter80.js
+++ /dev/null
@@ -1,13 +0,0 @@
-const x = [
-	"Hello",
-	"World",
-	"How",
-	"Are",
-	"You",
-	"Doing",
-	"Today",
-	"Such",
-	"A",
-	"Wondrous",
-	"Sunshine",
-];
diff --git a/testlib/src/main/resources/rome/js/longLineBefore.js b/testlib/src/main/resources/rome/js/longLineBefore.js
deleted file mode 100644
index fd59e429c2..0000000000
--- a/testlib/src/main/resources/rome/js/longLineBefore.js
+++ /dev/null
@@ -1 +0,0 @@
-const x = ["Hello", "World", "How", "Are", "You", "Doing", "Today", "Such", "A", "Wondrous", "Sunshine"];
\ No newline at end of file
diff --git a/testlib/src/main/resources/rome/json/fileAfter.json b/testlib/src/main/resources/rome/json/fileAfter.json
deleted file mode 100644
index 468dac3297..0000000000
--- a/testlib/src/main/resources/rome/json/fileAfter.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	"a": [1, 2, 3],
-	"b": 9,
-	"c": null
-}
diff --git a/testlib/src/main/resources/rome/json/fileBefore.json b/testlib/src/main/resources/rome/json/fileBefore.json
deleted file mode 100644
index 77182284c7..0000000000
--- a/testlib/src/main/resources/rome/json/fileBefore.json
+++ /dev/null
@@ -1,7 +0,0 @@
-   {
-    "a":[1,2,3
-
-],
-      "b":9,
-    "c"   : null
-   }
\ No newline at end of file
diff --git a/testlib/src/main/resources/rome/ts/fileAfter.cts b/testlib/src/main/resources/rome/ts/fileAfter.cts
deleted file mode 100644
index f854953234..0000000000
--- a/testlib/src/main/resources/rome/ts/fileAfter.cts
+++ /dev/null
@@ -1,4 +0,0 @@
-type Name = "World" | "Maven" | "Gradle";
-const foo = <T>(name: Name = "World", v: T): string => {
-	return "Hello " + name;
-};
diff --git a/testlib/src/main/resources/rome/ts/fileAfter.mts b/testlib/src/main/resources/rome/ts/fileAfter.mts
deleted file mode 100644
index e6563e3030..0000000000
--- a/testlib/src/main/resources/rome/ts/fileAfter.mts
+++ /dev/null
@@ -1,4 +0,0 @@
-export type Name = "World" | "Maven" | "Gradle";
-export const foo = <T>(name: Name = "World", v: T): string => {
-	return "Hello " + name;
-};
diff --git a/testlib/src/main/resources/rome/ts/fileAfter.ts b/testlib/src/main/resources/rome/ts/fileAfter.ts
deleted file mode 100644
index e6563e3030..0000000000
--- a/testlib/src/main/resources/rome/ts/fileAfter.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export type Name = "World" | "Maven" | "Gradle";
-export const foo = <T>(name: Name = "World", v: T): string => {
-	return "Hello " + name;
-};
diff --git a/testlib/src/main/resources/rome/ts/fileAfter.tsx b/testlib/src/main/resources/rome/ts/fileAfter.tsx
deleted file mode 100644
index 15ef316142..0000000000
--- a/testlib/src/main/resources/rome/ts/fileAfter.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-export interface Cfg<T> {
-	classname: string;
-	message: T;
-}
-const Panel = <T,>(cfg: Cfg<T>): JSX.Element => {
-	return <div className={cfg.classname}>{String(cfg.message)}</div>;
-};
diff --git a/testlib/src/main/resources/rome/ts/fileBefore.cts b/testlib/src/main/resources/rome/ts/fileBefore.cts
deleted file mode 100644
index d4304287c0..0000000000
--- a/testlib/src/main/resources/rome/ts/fileBefore.cts
+++ /dev/null
@@ -1,4 +0,0 @@
-type Name = "World"   | "Maven"|"Gradle";
-const    foo = <T>(   name:   Name="World", v: T): string => {
-                        return "Hello " + name;
-  }
\ No newline at end of file
diff --git a/testlib/src/main/resources/rome/ts/fileBefore.mts b/testlib/src/main/resources/rome/ts/fileBefore.mts
deleted file mode 100644
index 96837762a3..0000000000
--- a/testlib/src/main/resources/rome/ts/fileBefore.mts
+++ /dev/null
@@ -1,5 +0,0 @@
-export
- type Name = "World"   | "Maven"|"Gradle";
-export const    foo = <T>(   name:   Name="World", v: T): string => {
-                        return "Hello " + name;
-  }
\ No newline at end of file
diff --git a/testlib/src/main/resources/rome/ts/fileBefore.ts b/testlib/src/main/resources/rome/ts/fileBefore.ts
deleted file mode 100644
index 96837762a3..0000000000
--- a/testlib/src/main/resources/rome/ts/fileBefore.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export
- type Name = "World"   | "Maven"|"Gradle";
-export const    foo = <T>(   name:   Name="World", v: T): string => {
-                        return "Hello " + name;
-  }
\ No newline at end of file
diff --git a/testlib/src/main/resources/rome/ts/fileBefore.tsx b/testlib/src/main/resources/rome/ts/fileBefore.tsx
deleted file mode 100644
index 38f24f8440..0000000000
--- a/testlib/src/main/resources/rome/ts/fileBefore.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-export interface Cfg<T >{
-classname:string,
-message:T,
-}
-const Panel = <T,> ( cfg:Cfg<T>):JSX.Element  =>{
-                  return (<div className={cfg.classname}>{String(cfg.message)}</div>
-                  )  ;
-    }
\ No newline at end of file

From c811d8d437b4d77b5789f99107f372b830f59afe Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 23 May 2024 00:29:08 -0700
Subject: [PATCH 1596/2068] Update changelog (and fix section order).

---
 CHANGES.md               | 9 +++++----
 plugin-gradle/CHANGES.md | 7 ++++---
 plugin-maven/CHANGES.md  | 7 ++++---
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 3ad46fb24c..5eb084f98b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,6 +13,11 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * `FileSignature.Promised` and `JarState.Promised` to facilitate round-trip serialization for the Gradle configuration cache. ([#1945](https://github.com/diffplug/spotless/pull/1945)) 
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
+### Fixed
+* Ignore system git config when running tests ([#1990](https://github.com/diffplug/spotless/issues/1990))
+* Correctly provide EditorConfig property types for Ktlint ([#2052](https://github.com/diffplug/spotless/issues/2052))
+* Made ShadowCopy (`npmInstallCache`) more robust by re-creating the cache dir if it goes missing ([#1984](https://github.com/diffplug/spotless/issues/1984),[2096](https://github.com/diffplug/spotless/pull/2096))
+* scalafmt.conf fileOverride section now works correctly ([#1854](https://github.com/diffplug/spotless/pull/1854))
 ### Changes
 * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
 * Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049))
@@ -23,10 +28,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Removed
 * **BREAKING** Remove `JarState.getMavenCoordinate(String prefix)`. ([#1945](https://github.com/diffplug/spotless/pull/1945))
 * **BREAKING** Replace `PipeStepPair` with `FenceStep`. ([#1954](https://github.com/diffplug/spotless/pull/1954))
-### Fixed
-* Ignore system git config when running tests ([#1990](https://github.com/diffplug/spotless/issues/1990))
-* Correctly provide EditorConfig property types for Ktlint ([#2052](https://github.com/diffplug/spotless/issues/2052))
-* Made ShadowCopy (`npmInstallCache`) more robust by re-creating the cache dir if it goes missing ([#1984](https://github.com/diffplug/spotless/issues/1984),[2096](https://github.com/diffplug/spotless/pull/2096))
 
 ## [2.45.0] - 2024-01-23
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index fe543d8014..acbe0231f9 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,12 +3,16 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Added
+* Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
+* Add support for formatting and sorting Maven POMs ([#2082](https://github.com/diffplug/spotless/issues/2082))
 ### Fixed
 * Full no-asterisk support for configuration cache ([#2088](https://github.com/diffplug/spotless/pull/2088) closes [#1274](https://github.com/diffplug/spotless/issues/1274) and [#987](https://github.com/diffplug/spotless/issues/987)).
 * Ignore system git config when running tests ([#1990](https://github.com/diffplug/spotless/issues/1990))
 * Correctly provide EditorConfig property types for Ktlint ([#2052](https://github.com/diffplug/spotless/issues/2052))
 * Fixed memory leak introduced in 6.21.0 ([#2067](https://github.com/diffplug/spotless/issues/2067))
 * Made ShadowCopy (`npmInstallCache`) more robust by re-creating the cache dir if it goes missing ([#1984](https://github.com/diffplug/spotless/issues/1984),[2096](https://github.com/diffplug/spotless/pull/2096))
+* scalafmt.conf fileOverride section now works correctly ([#1854](https://github.com/diffplug/spotless/pull/1854))
 ### Changes
 * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
 * Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049))
@@ -16,9 +20,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))
 * Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078))
 * Bump default `sortpom` version to latest `3.4.1` -> `4.0.0` and support versions back to `3.2.1`. ([#2115](https://github.com/diffplug/spotless/pull/2115))
-### Added
-* Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
-* Add support for formatting and sorting Maven POMs ([#2082](https://github.com/diffplug/spotless/issues/2082))
 
 ## [6.25.0] - 2024-01-23
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index bd0b6ca7c5..f71dda5b39 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,10 +3,14 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
+* Skip execution in M2E (incremental) builds by default ([#1814](https://github.com/diffplug/spotless/issues/1814), [#2037](https://github.com/diffplug/spotless/issues/2037))
 ### Fixed
 * Ignore system git config when running tests ([#1990](https://github.com/diffplug/spotless/issues/1990))
 * Correctly provide EditorConfig property types for Ktlint ([#2052](https://github.com/diffplug/spotless/issues/2052))
 * Made ShadowCopy (`npmInstallCache`) more robust by re-creating the cache dir if it goes missing ([#1984](https://github.com/diffplug/spotless/issues/1984),[2096](https://github.com/diffplug/spotless/pull/2096))
+* scalafmt.conf fileOverride section now works correctly ([#1854](https://github.com/diffplug/spotless/pull/1854))
 ### Changes
 * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
 * Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049))
@@ -14,9 +18,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))
 * Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078))
 * Bump default `sortpom` version to latest `3.4.1` -> `4.0.0` and support versions back to `3.2.1`. ([#2115](https://github.com/diffplug/spotless/pull/2115))
-### Added
-* Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
-* Skip execution in M2E (incremental) builds by default ([#1814](https://github.com/diffplug/spotless/issues/1814), [#2037](https://github.com/diffplug/spotless/issues/2037)) 
 
 ## [2.43.0] - 2024-01-23
 ### Added

From 1bea53f3710aa707d8b47297656ff3eda52740e9 Mon Sep 17 00:00:00 2001
From: SimY4 <alex.simkin@outlook.com>
Date: Thu, 23 May 2024 19:28:00 +1000
Subject: [PATCH 1597/2068] Merge fixes.

fix formatting.
---
 .../diffplug/spotless/glue/scalafmt/ScalafmtFormatterFunc.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/scalafmt/java/com/diffplug/spotless/glue/scalafmt/ScalafmtFormatterFunc.java b/lib/src/scalafmt/java/com/diffplug/spotless/glue/scalafmt/ScalafmtFormatterFunc.java
index 350d5f866f..6217ab6186 100644
--- a/lib/src/scalafmt/java/com/diffplug/spotless/glue/scalafmt/ScalafmtFormatterFunc.java
+++ b/lib/src/scalafmt/java/com/diffplug/spotless/glue/scalafmt/ScalafmtFormatterFunc.java
@@ -49,6 +49,6 @@ public ScalafmtFormatterFunc(FileSignature configSignature) throws Exception {
 
 	@Override
 	public String applyWithFile(String unix, File file) throws Exception {
-		return Scalafmt.format(unix, config, Set$.MODULE$.empty()).get();
+		return Scalafmt.format(unix, config, Set$.MODULE$.empty(), file.getAbsolutePath()).get();
 	}
 }

From f0d3b2ccb8e1f1844b7c501e95c1aa6e04ea3c31 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 23 May 2024 12:52:44 -0700
Subject: [PATCH 1598/2068] Update changelog.

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 2 ++
 plugin-maven/CHANGES.md  | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 5eb084f98b..2cc048e8a6 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -28,6 +28,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Removed
 * **BREAKING** Remove `JarState.getMavenCoordinate(String prefix)`. ([#1945](https://github.com/diffplug/spotless/pull/1945))
 * **BREAKING** Replace `PipeStepPair` with `FenceStep`. ([#1954](https://github.com/diffplug/spotless/pull/1954))
+* **BREAKING** Fully removed `Rome`, use `Biome` instead. ([#2119](https://github.com/diffplug/spotless/pull/2119))
 
 ## [2.45.0] - 2024-01-23
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index acbe0231f9..27ec728993 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -20,6 +20,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))
 * Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078))
 * Bump default `sortpom` version to latest `3.4.1` -> `4.0.0` and support versions back to `3.2.1`. ([#2115](https://github.com/diffplug/spotless/pull/2115))
+### Removed
+* **BREAKING** Fully removed `Rome`, use `Biome` instead. ([#2119](https://github.com/diffplug/spotless/pull/2119))
 
 ## [6.25.0] - 2024-01-23
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index f71dda5b39..c5162b39a2 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -18,6 +18,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))
 * Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078))
 * Bump default `sortpom` version to latest `3.4.1` -> `4.0.0` and support versions back to `3.2.1`. ([#2115](https://github.com/diffplug/spotless/pull/2115))
+### Removed
+* **BREAKING** Fully removed `Rome`, use `Biome` instead. ([#2119](https://github.com/diffplug/spotless/pull/2119))
 
 ## [2.43.0] - 2024-01-23
 ### Added

From 5a7f533e6f90e26999fc369bd3eab559e25e15c0 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 23 May 2024 14:46:09 -0700
Subject: [PATCH 1599/2068] Bump zjsonpatch to latest.

---
 CHANGES.md                                                      | 2 ++
 lib/src/main/java/com/diffplug/spotless/json/JsonPatchStep.java | 2 +-
 plugin-gradle/CHANGES.md                                        | 1 +
 plugin-maven/CHANGES.md                                         | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 5eb084f98b..a5f3697c97 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -25,6 +25,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))
 * Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078))
 * Bump default `sortpom` version to latest `3.4.1` -> `4.0.0` and support versions back to `3.2.1`. ([#2115](https://github.com/diffplug/spotless/pull/2115))
+* Bump default `zjsonpatch` version to latest `0.4.14` -> `0.4.16`. ([#1969](https://github.com/diffplug/spotless/pull/1969))
+
 ### Removed
 * **BREAKING** Remove `JarState.getMavenCoordinate(String prefix)`. ([#1945](https://github.com/diffplug/spotless/pull/1945))
 * **BREAKING** Replace `PipeStepPair` with `FenceStep`. ([#1954](https://github.com/diffplug/spotless/pull/1954))
diff --git a/lib/src/main/java/com/diffplug/spotless/json/JsonPatchStep.java b/lib/src/main/java/com/diffplug/spotless/json/JsonPatchStep.java
index 5082f07472..5050dbba10 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/JsonPatchStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/JsonPatchStep.java
@@ -32,7 +32,7 @@
 public class JsonPatchStep implements java.io.Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String MAVEN_COORDINATE = "com.flipkart.zjsonpatch:zjsonpatch";
-	private static final String DEFAULT_VERSION = "0.4.14";
+	private static final String DEFAULT_VERSION = "0.4.16";
 	public static final String NAME = "apply-json-patch";
 
 	private final JarState.Promised jarState;
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index acbe0231f9..0052074134 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -20,6 +20,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))
 * Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078))
 * Bump default `sortpom` version to latest `3.4.1` -> `4.0.0` and support versions back to `3.2.1`. ([#2115](https://github.com/diffplug/spotless/pull/2115))
+* Bump default `zjsonpatch` version to latest `0.4.14` -> `0.4.16`. ([#1969](https://github.com/diffplug/spotless/pull/1969))
 
 ## [6.25.0] - 2024-01-23
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index f71dda5b39..784aa1a1b6 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -18,6 +18,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))
 * Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078))
 * Bump default `sortpom` version to latest `3.4.1` -> `4.0.0` and support versions back to `3.2.1`. ([#2115](https://github.com/diffplug/spotless/pull/2115))
+* Bump default `zjsonpatch` version to latest `0.4.14` -> `0.4.16`. ([#1969](https://github.com/diffplug/spotless/pull/1969))
 
 ## [2.43.0] - 2024-01-23
 ### Added

From 19d8b9fb89acc1aa0a4a044306a0f3147aa68995 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 23 May 2024 22:00:33 +0000
Subject: [PATCH 1600/2068] Update dependency org.junit.jupiter:junit-jupiter
 to v5.10.2

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 222012d500..0bc62fde7a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -29,6 +29,6 @@ VER_SLF4J=[1.6,2.0[
 # Used in multiple places
 VER_DURIAN=1.2.0
 VER_JGIT=6.7.0.202309050840-r
-VER_JUNIT=5.10.1
+VER_JUNIT=5.10.2
 VER_ASSERTJ=3.24.2
 VER_MOCKITO=5.8.0

From 97a8a83f54da1c8c4355e62268f8ae0b93d21454 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 23 May 2024 15:01:41 -0700
Subject: [PATCH 1601/2068] Bump changeslogs.

---
 CHANGES.md                                                      | 2 +-
 .../main/java/com/diffplug/spotless/json/JacksonJsonStep.java   | 2 +-
 plugin-gradle/CHANGES.md                                        | 1 +
 plugin-maven/CHANGES.md                                         | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index a5f3697c97..c627a1f74f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -19,6 +19,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Made ShadowCopy (`npmInstallCache`) more robust by re-creating the cache dir if it goes missing ([#1984](https://github.com/diffplug/spotless/issues/1984),[2096](https://github.com/diffplug/spotless/pull/2096))
 * scalafmt.conf fileOverride section now works correctly ([#1854](https://github.com/diffplug/spotless/pull/1854))
 ### Changes
+* Bump default `jackson` version to latest `2.14.2` -> `2.17.1`. ([#1685](https://github.com/diffplug/spotless/pull/1685))
 * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
 * Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049))
 * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
@@ -26,7 +27,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078))
 * Bump default `sortpom` version to latest `3.4.1` -> `4.0.0` and support versions back to `3.2.1`. ([#2115](https://github.com/diffplug/spotless/pull/2115))
 * Bump default `zjsonpatch` version to latest `0.4.14` -> `0.4.16`. ([#1969](https://github.com/diffplug/spotless/pull/1969))
-
 ### Removed
 * **BREAKING** Remove `JarState.getMavenCoordinate(String prefix)`. ([#1945](https://github.com/diffplug/spotless/pull/1945))
 * **BREAKING** Replace `PipeStepPair` with `FenceStep`. ([#1954](https://github.com/diffplug/spotless/pull/1954))
diff --git a/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java b/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java
index ebc081a759..080bb735d5 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java
@@ -32,7 +32,7 @@
 public class JacksonJsonStep implements java.io.Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String MAVEN_COORDINATE = "com.fasterxml.jackson.core:jackson-databind:";
-	private static final String DEFAULT_VERSION = "2.14.2";
+	private static final String DEFAULT_VERSION = "2.17.1";
 	public static final String NAME = "jacksonJson";
 
 	private final JarState.Promised jarState;
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 0052074134..392706246e 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -14,6 +14,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Made ShadowCopy (`npmInstallCache`) more robust by re-creating the cache dir if it goes missing ([#1984](https://github.com/diffplug/spotless/issues/1984),[2096](https://github.com/diffplug/spotless/pull/2096))
 * scalafmt.conf fileOverride section now works correctly ([#1854](https://github.com/diffplug/spotless/pull/1854))
 ### Changes
+* Bump default `jackson` version to latest `2.14.2` -> `2.17.1`. ([#1685](https://github.com/diffplug/spotless/pull/1685))
 * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
 * Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049))
 * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 784aa1a1b6..025bab6387 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Made ShadowCopy (`npmInstallCache`) more robust by re-creating the cache dir if it goes missing ([#1984](https://github.com/diffplug/spotless/issues/1984),[2096](https://github.com/diffplug/spotless/pull/2096))
 * scalafmt.conf fileOverride section now works correctly ([#1854](https://github.com/diffplug/spotless/pull/1854))
 ### Changes
+* Bump default `jackson` version to latest `2.14.2` -> `2.17.1`. ([#1685](https://github.com/diffplug/spotless/pull/1685))
 * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
 * Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049))
 * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))

From 276559f19e2a19d9cce28e2a08dceabb578b2f4c Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 23 May 2024 15:32:48 -0700
Subject: [PATCH 1602/2068] Bump scalafmt 3.7.3 -> 3.8.1

---
 CHANGES.md                                                   | 5 +++--
 .../main/java/com/diffplug/spotless/scala/ScalaFmtStep.java  | 2 +-
 plugin-gradle/CHANGES.md                                     | 5 +++--
 plugin-maven/CHANGES.md                                      | 5 +++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index def950e58a..aa342ff466 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -21,9 +21,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changes
 * Bump default `jackson` version to latest `2.14.2` -> `2.17.1`. ([#1685](https://github.com/diffplug/spotless/pull/1685))
 * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
-* Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049))
-* Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
 * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))
+* Bump default `scalafmt` version to latest `3.7.3` -> `3.8.1`. ([#1730](https://github.com/diffplug/spotless/pull/1730))
+* Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
+* Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049))
 * Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078))
 * Bump default `sortpom` version to latest `3.4.1` -> `4.0.0` and support versions back to `3.2.1`. ([#2115](https://github.com/diffplug/spotless/pull/2115))
 * Bump default `zjsonpatch` version to latest `0.4.14` -> `0.4.16`. ([#1969](https://github.com/diffplug/spotless/pull/1969))
diff --git a/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java b/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java
index eea96d236f..9cb5852b94 100644
--- a/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java
@@ -33,7 +33,7 @@
 public class ScalaFmtStep implements java.io.Serializable {
 	private static final long serialVersionUID = 1L;
 
-	static final String DEFAULT_VERSION = "3.7.3";
+	static final String DEFAULT_VERSION = "3.8.1";
 
 	private static final String DEFAULT_SCALA_MAJOR_VERSION = "2.13";
 	private static final String NAME = "scalafmt";
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 0541e942f5..182ec36c8e 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -16,9 +16,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changes
 * Bump default `jackson` version to latest `2.14.2` -> `2.17.1`. ([#1685](https://github.com/diffplug/spotless/pull/1685))
 * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
-* Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049))
-* Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
 * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))
+* Bump default `scalafmt` version to latest `3.7.3` -> `3.8.1`. ([#1730](https://github.com/diffplug/spotless/pull/1730))
+* Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
+* Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049))
 * Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078))
 * Bump default `sortpom` version to latest `3.4.1` -> `4.0.0` and support versions back to `3.2.1`. ([#2115](https://github.com/diffplug/spotless/pull/2115))
 * Bump default `zjsonpatch` version to latest `0.4.14` -> `0.4.16`. ([#1969](https://github.com/diffplug/spotless/pull/1969))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index dfe4daec1d..4eb2d8a205 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -14,9 +14,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changes
 * Bump default `jackson` version to latest `2.14.2` -> `2.17.1`. ([#1685](https://github.com/diffplug/spotless/pull/1685))
 * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
-* Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049))
-* Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
 * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))
+* Bump default `scalafmt` version to latest `3.7.3` -> `3.8.1`. ([#1730](https://github.com/diffplug/spotless/pull/1730))
+* Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
+* Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049))
 * Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078))
 * Bump default `sortpom` version to latest `3.4.1` -> `4.0.0` and support versions back to `3.2.1`. ([#2115](https://github.com/diffplug/spotless/pull/2115))
 * Bump default `zjsonpatch` version to latest `0.4.14` -> `0.4.16`. ([#1969](https://github.com/diffplug/spotless/pull/1969))

From 81b1c94bb29e5c36f92c6426f3a4adc3960ff107 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 23 May 2024 15:49:51 -0700
Subject: [PATCH 1603/2068] Fix new expected values in the new version of
 jackson.

---
 .../json/sortByKeysAfter_Jackson.json         | 32 +++++++++----------
 ...sAfter_Jackson_spaceAfterKeySeparator.json | 32 +++++++++----------
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/testlib/src/main/resources/json/sortByKeysAfter_Jackson.json b/testlib/src/main/resources/json/sortByKeysAfter_Jackson.json
index 003b2ba66f..25ce5dd094 100644
--- a/testlib/src/main/resources/json/sortByKeysAfter_Jackson.json
+++ b/testlib/src/main/resources/json/sortByKeysAfter_Jackson.json
@@ -1,19 +1,19 @@
 {
-  "A": 1,
-  "X": 2,
-  "_arraysNotSorted": [ 3, 2, 1 ],
-  "_objectsInArraysAreSorted": [ {
-    "a": 1,
-    "b": 2
+  "A" : 1,
+  "X" : 2,
+  "_arraysNotSorted" : [ 3, 2, 1 ],
+  "_objectsInArraysAreSorted" : [ {
+    "a" : 1,
+    "b" : 2
   } ],
-  "a": 3,
-  "c": 4,
-  "x": 5,
-  "z": {
-    "A": 1,
-    "X": 2,
-    "a": 3,
-    "c": 4,
-    "x": 5
+  "a" : 3,
+  "c" : 4,
+  "x" : 5,
+  "z" : {
+    "A" : 1,
+    "X" : 2,
+    "a" : 3,
+    "c" : 4,
+    "x" : 5
   }
-}
+}
\ No newline at end of file
diff --git a/testlib/src/main/resources/json/sortByKeysAfter_Jackson_spaceAfterKeySeparator.json b/testlib/src/main/resources/json/sortByKeysAfter_Jackson_spaceAfterKeySeparator.json
index 003b2ba66f..25ce5dd094 100644
--- a/testlib/src/main/resources/json/sortByKeysAfter_Jackson_spaceAfterKeySeparator.json
+++ b/testlib/src/main/resources/json/sortByKeysAfter_Jackson_spaceAfterKeySeparator.json
@@ -1,19 +1,19 @@
 {
-  "A": 1,
-  "X": 2,
-  "_arraysNotSorted": [ 3, 2, 1 ],
-  "_objectsInArraysAreSorted": [ {
-    "a": 1,
-    "b": 2
+  "A" : 1,
+  "X" : 2,
+  "_arraysNotSorted" : [ 3, 2, 1 ],
+  "_objectsInArraysAreSorted" : [ {
+    "a" : 1,
+    "b" : 2
   } ],
-  "a": 3,
-  "c": 4,
-  "x": 5,
-  "z": {
-    "A": 1,
-    "X": 2,
-    "a": 3,
-    "c": 4,
-    "x": 5
+  "a" : 3,
+  "c" : 4,
+  "x" : 5,
+  "z" : {
+    "A" : 1,
+    "X" : 2,
+    "a" : 3,
+    "c" : 4,
+    "x" : 5
   }
-}
+}
\ No newline at end of file

From edfe678d1c8a2cf827b32744bcb94cd25cbc39de Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 23 May 2024 23:11:25 +0000
Subject: [PATCH 1604/2068] Update plugin com.github.spotbugs to v6.0.15

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 29d208c029..e31f853cb2 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,7 +12,7 @@ plugins {
 	// https://github.com/gradle-nexus/publish-plugin/releases
 	id 'io.github.gradle-nexus.publish-plugin' version '2.0.0-rc-1' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
-	id 'com.github.spotbugs' version '6.0.2' apply false
+	id 'com.github.spotbugs' version '6.0.15' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
 	id 'com.diffplug.spotless-changelog' version '3.0.2' apply false
 	// https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md

From ede8f2d742fbdb2a19aeda81b1f8b1c6f4a05dcf Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 23 May 2024 16:32:28 -0700
Subject: [PATCH 1605/2068] Update scalafmt conf files.

---
 testlib/src/main/resources/scala/scalafmt/scalafmt.conf         | 2 +-
 .../main/resources/scala/scalafmt/scalafmt.fileoverride.conf    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/testlib/src/main/resources/scala/scalafmt/scalafmt.conf b/testlib/src/main/resources/scala/scalafmt/scalafmt.conf
index edea864af1..a34fa2be05 100644
--- a/testlib/src/main/resources/scala/scalafmt/scalafmt.conf
+++ b/testlib/src/main/resources/scala/scalafmt/scalafmt.conf
@@ -1,4 +1,4 @@
-version = 3.7.3
+version = 3.8.1
 runner.dialect = scala213
 style = defaultWithAlign # For pretty alignment.
 maxColumn = 20           # For my teensy narrow display
diff --git a/testlib/src/main/resources/scala/scalafmt/scalafmt.fileoverride.conf b/testlib/src/main/resources/scala/scalafmt/scalafmt.fileoverride.conf
index e4bd1f3a44..ae2f12f789 100644
--- a/testlib/src/main/resources/scala/scalafmt/scalafmt.fileoverride.conf
+++ b/testlib/src/main/resources/scala/scalafmt/scalafmt.fileoverride.conf
@@ -1,4 +1,4 @@
-version = 3.7.3
+version = 3.8.1
 runner.dialect = scala213
 style = defaultWithAlign # For pretty alignment.
 maxColumn = 200          # For my mega-wide display

From 7a6aa01f37ffb80d7dfcf9b44b95f38a26eb01e1 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 23 May 2024 23:36:27 +0000
Subject: [PATCH 1606/2068] Update plugin com.gradle.develocity to v3.17.4

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index e31f853cb2..3ca1251395 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -20,7 +20,7 @@ plugins {
 	// https://github.com/davidburstrom/version-compatibility-gradle-plugin/tags
 	id 'io.github.davidburstrom.version-compatibility' version '0.5.0' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.develocity
-	id 'com.gradle.develocity' version '3.17'
+	id 'com.gradle.develocity' version '3.17.4'
 	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
 	id 'dev.equo.ide' version '1.7.5' apply false
 }

From ca5e40404e0c7e713c9358ea62558892c048dce4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 24 May 2024 00:04:45 +0000
Subject: [PATCH 1607/2068] Update plugin
 de.benediktritter.maven-plugin-development to v0.4.3

---
 plugin-maven/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-maven/build.gradle b/plugin-maven/build.gradle
index f2f85f0383..f8206e5096 100644
--- a/plugin-maven/build.gradle
+++ b/plugin-maven/build.gradle
@@ -3,7 +3,7 @@ import de.benediktritter.maven.plugin.development.task.GenerateMavenPluginDescri
 
 plugins {
 	// https://www.benediktritter.de/maven-plugin-development/#release-history
-	id 'de.benediktritter.maven-plugin-development' version '0.4.2'
+	id 'de.benediktritter.maven-plugin-development' version '0.4.3'
 }
 
 apply from: rootProject.file('gradle/changelog.gradle')

From 6c1a52b5e91f6071286572c227058fa782e56eac Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 23 May 2024 17:29:14 -0700
Subject: [PATCH 1608/2068] Bump equo elsewhere.

---
 .../java/com/diffplug/spotless/extra/EquoBasedStepBuilder.java  | 2 +-
 settings.gradle                                                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 e2b3661d9b..781202a9b3 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
@@ -114,7 +114,7 @@ public FormatterStep build() {
 			}
 			var classpath = new ArrayList<File>();
 			var mavenDeps = new ArrayList<String>();
-			mavenDeps.add("dev.equo.ide:solstice:1.7.5");
+			mavenDeps.add("dev.equo.ide:solstice:1.7.6");
 			mavenDeps.add("com.diffplug.durian:durian-swt.os:4.2.0");
 			mavenDeps.addAll(query.getJarsOnMavenCentral());
 			classpath.addAll(mavenProvisioner.provisionWithTransitives(false, mavenDeps));
diff --git a/settings.gradle b/settings.gradle
index 24e757bdc2..08f68be9c8 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -22,7 +22,7 @@ plugins {
 	// https://plugins.gradle.org/plugin/com.gradle.enterprise
 	id 'com.gradle.enterprise' version '3.16'
 	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
-	id 'dev.equo.ide' version '1.7.5' apply false
+	id 'dev.equo.ide' version '1.7.6' apply false
 }
 
 dependencyResolutionManagement {

From 2987f59c04988b282fe9f4e9303700db87d0d684 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 23 May 2024 17:59:51 -0700
Subject: [PATCH 1609/2068] Bump gherkin fully to 9.0

---
 CHANGES.md                                                      | 1 +
 lib/build.gradle                                                | 2 +-
 .../java/com/diffplug/spotless/gherkin/GherkinUtilsStep.java    | 2 +-
 plugin-gradle/CHANGES.md                                        | 1 +
 plugin-gradle/README.md                                         | 2 +-
 plugin-maven/CHANGES.md                                         | 1 +
 plugin-maven/README.md                                          | 2 +-
 .../src/main/resources/gherkin/complex_backgroundAfter.feature  | 2 +-
 testlib/src/main/resources/gherkin/descriptionsAfter.feature    | 2 +-
 9 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index aa342ff466..2853c2069e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -19,6 +19,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Made ShadowCopy (`npmInstallCache`) more robust by re-creating the cache dir if it goes missing ([#1984](https://github.com/diffplug/spotless/issues/1984),[2096](https://github.com/diffplug/spotless/pull/2096))
 * scalafmt.conf fileOverride section now works correctly ([#1854](https://github.com/diffplug/spotless/pull/1854))
 ### Changes
+* Bump default `gherkin-utils` version to latest `8.0.2` -> `9.0.0`. ([#1703](https://github.com/diffplug/spotless/pull/1703))
 * Bump default `jackson` version to latest `2.14.2` -> `2.17.1`. ([#1685](https://github.com/diffplug/spotless/pull/1685))
 * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
 * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))
diff --git a/lib/build.gradle b/lib/build.gradle
index fa0fcc0c55..15f135d00c 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -90,7 +90,7 @@ dependencies {
 	// flexmark
 	flexmarkCompileOnly 'com.vladsch.flexmark:flexmark-all:0.64.0'
 	// gherkin
-	gherkinCompileOnly 'io.cucumber:gherkin-utils:8.0.6'
+	gherkinCompileOnly 'io.cucumber:gherkin-utils:9.0.0'
 	gherkinCompileOnly 'org.slf4j:slf4j-api:2.0.0'
 	// googleJavaFormat
 	googleJavaFormatCompileOnly 'com.google.googlejavaformat:google-java-format:1.19.2'
diff --git a/lib/src/main/java/com/diffplug/spotless/gherkin/GherkinUtilsStep.java b/lib/src/main/java/com/diffplug/spotless/gherkin/GherkinUtilsStep.java
index b606789052..6cb35ad8da 100644
--- a/lib/src/main/java/com/diffplug/spotless/gherkin/GherkinUtilsStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/gherkin/GherkinUtilsStep.java
@@ -28,7 +28,7 @@
 public class GherkinUtilsStep implements java.io.Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String MAVEN_COORDINATE = "io.cucumber:gherkin-utils:";
-	private static final String DEFAULT_VERSION = "8.0.2";
+	private static final String DEFAULT_VERSION = "9.0.0";
 	public static final String NAME = "gherkinUtils";
 
 	private final JarState.Promised jarState;
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 182ec36c8e..3a3a0d2fd9 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -14,6 +14,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Made ShadowCopy (`npmInstallCache`) more robust by re-creating the cache dir if it goes missing ([#1984](https://github.com/diffplug/spotless/issues/1984),[2096](https://github.com/diffplug/spotless/pull/2096))
 * scalafmt.conf fileOverride section now works correctly ([#1854](https://github.com/diffplug/spotless/pull/1854))
 ### Changes
+* Bump default `gherkin-utils` version to latest `8.0.2` -> `9.0.0`. ([#1703](https://github.com/diffplug/spotless/pull/1703))
 * Bump default `jackson` version to latest `2.14.2` -> `2.17.1`. ([#1685](https://github.com/diffplug/spotless/pull/1685))
 * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
 * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 819ff3d42a..d6a88134f8 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -1097,7 +1097,7 @@ spotless {
   gherkin {
     target 'src/**/*.feature'     // required to be set explicitly
     gherkinUtils()
-      .version('8.0.2')           // optional: custom version of 'io.cucumber:gherkin-utils'
+      .version('9.0.0')           // optional: custom version of 'io.cucumber:gherkin-utils'
   }
 }
 ```
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 4eb2d8a205..d1cf10dd9e 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Made ShadowCopy (`npmInstallCache`) more robust by re-creating the cache dir if it goes missing ([#1984](https://github.com/diffplug/spotless/issues/1984),[2096](https://github.com/diffplug/spotless/pull/2096))
 * scalafmt.conf fileOverride section now works correctly ([#1854](https://github.com/diffplug/spotless/pull/1854))
 ### Changes
+* Bump default `gherkin-utils` version to latest `8.0.2` -> `9.0.0`. ([#1703](https://github.com/diffplug/spotless/pull/1703))
 * Bump default `jackson` version to latest `2.14.2` -> `2.17.1`. ([#1685](https://github.com/diffplug/spotless/pull/1685))
 * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
 * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 782d685b67..d9c63b5eb4 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -1082,7 +1082,7 @@ Uses a Gherkin pretty-printer that optionally allows configuring the number of s
 
 ```xml
 <gherkinUtils>
-  <version>8.0.2</version>                 <!-- optional: Custom version of 'io.cucumber:gherkin-utils' -->
+  <version>9.0.0</version>                 <!-- optional: Custom version of 'io.cucumber:gherkin-utils' -->
 </gherkinUtils>
 ```
 
diff --git a/testlib/src/main/resources/gherkin/complex_backgroundAfter.feature b/testlib/src/main/resources/gherkin/complex_backgroundAfter.feature
index 5a9553d98d..eb4d4de89a 100644
--- a/testlib/src/main/resources/gherkin/complex_backgroundAfter.feature
+++ b/testlib/src/main/resources/gherkin/complex_backgroundAfter.feature
@@ -12,7 +12,7 @@ Feature: Complex background
 
   Rule: My Rule
 
-    Background: 
+    Background:
       Given a rule background step
 
     Scenario: with examples
diff --git a/testlib/src/main/resources/gherkin/descriptionsAfter.feature b/testlib/src/main/resources/gherkin/descriptionsAfter.feature
index 9c0eb7e303..897133527d 100644
--- a/testlib/src/main/resources/gherkin/descriptionsAfter.feature
+++ b/testlib/src/main/resources/gherkin/descriptionsAfter.feature
@@ -29,7 +29,7 @@ This is a description without indentation
   This description
   has a comment after
 
-    # this is a comment
+  # this is a comment
     Given the minimalism
 
   Scenario: comment right after description

From 3952f2f3b39b7e3e4900d7d42e916de3bce62222 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 24 May 2024 01:02:31 +0000
Subject: [PATCH 1610/2068] Update plugin io.github.gradle-nexus.publish-plugin
 to v2.0.0

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index cad0c8efc3..b1543d611e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -10,7 +10,7 @@ plugins {
 	// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
 	id 'com.gradle.plugin-publish' version '1.2.1' apply false
 	// https://github.com/gradle-nexus/publish-plugin/releases
-	id 'io.github.gradle-nexus.publish-plugin' version '2.0.0-rc-1' apply false
+	id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
 	id 'com.github.spotbugs' version '6.0.15' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md

From 06cd9b8e8b88869615063d59901b5ec996533faf Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 24 May 2024 01:03:22 +0000
Subject: [PATCH 1611/2068] Update dependency com.facebook:ktfmt to v0.49

---
 lib/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 8de0bd2cd0..32f477854e 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -101,7 +101,7 @@ dependencies {
 	jacksonCompileOnly "com.fasterxml.jackson.core:jackson-databind:$VER_JACKSON"
 	jacksonCompileOnly "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$VER_JACKSON"
 	// ktfmt
-	ktfmtCompileOnly "com.facebook:ktfmt:0.47"
+	ktfmtCompileOnly "com.facebook:ktfmt:0.49"
 	ktfmtCompileOnly("com.google.googlejavaformat:google-java-format") {
 		version {
 			strictly '1.7' // for JDK 8 compatibility

From 90922e7033446b1ff32a642c6757a9e4574f2368 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 23 May 2024 18:33:56 -0700
Subject: [PATCH 1612/2068] Bump default ktfmt to 0.49.

---
 lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
index cee8c379e5..69fb36fdb1 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
@@ -36,7 +36,7 @@
  */
 public class KtfmtStep implements java.io.Serializable {
 	private static final long serialVersionUID = 1L;
-	private static final String DEFAULT_VERSION = "0.47";
+	private static final String DEFAULT_VERSION = "0.49";
 	private static final String NAME = "ktfmt";
 	private static final String MAVEN_COORDINATE = "com.facebook:ktfmt:";
 

From 086b878354d50cafc5c93e99d1eb2bebdc031f55 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 23 May 2024 18:35:44 -0700
Subject: [PATCH 1613/2068] Update changelogs.

---
 CHANGES.md               | 6 ++----
 plugin-gradle/CHANGES.md | 6 ++----
 plugin-maven/CHANGES.md  | 6 ++----
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 2853c2069e..f04f8ef124 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -21,13 +21,11 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changes
 * Bump default `gherkin-utils` version to latest `8.0.2` -> `9.0.0`. ([#1703](https://github.com/diffplug/spotless/pull/1703))
 * Bump default `jackson` version to latest `2.14.2` -> `2.17.1`. ([#1685](https://github.com/diffplug/spotless/pull/1685))
-* Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
+* Bump default `ktfmt` version to latest `0.46` -> `0.49`. ([#2045](https://github.com/diffplug/spotless/pull/2045), [#2127](https://github.com/diffplug/spotless/pull/2127))
 * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))
 * Bump default `scalafmt` version to latest `3.7.3` -> `3.8.1`. ([#1730](https://github.com/diffplug/spotless/pull/1730))
 * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
-* Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049))
-* Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078))
-* Bump default `sortpom` version to latest `3.4.1` -> `4.0.0` and support versions back to `3.2.1`. ([#2115](https://github.com/diffplug/spotless/pull/2115))
+* Bump default `sortpom` version to latest `3.2.1` -> `4.0.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049), [#2078](https://github.com/diffplug/spotless/pull/2078), [#2115](https://github.com/diffplug/spotless/pull/2115))
 * Bump default `zjsonpatch` version to latest `0.4.14` -> `0.4.16`. ([#1969](https://github.com/diffplug/spotless/pull/1969))
 ### Removed
 * **BREAKING** Remove `JarState.getMavenCoordinate(String prefix)`. ([#1945](https://github.com/diffplug/spotless/pull/1945))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 3a3a0d2fd9..2f3491448c 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -16,13 +16,11 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changes
 * Bump default `gherkin-utils` version to latest `8.0.2` -> `9.0.0`. ([#1703](https://github.com/diffplug/spotless/pull/1703))
 * Bump default `jackson` version to latest `2.14.2` -> `2.17.1`. ([#1685](https://github.com/diffplug/spotless/pull/1685))
-* Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
+* Bump default `ktfmt` version to latest `0.46` -> `0.49`. ([#2045](https://github.com/diffplug/spotless/pull/2045), [#2127](https://github.com/diffplug/spotless/pull/2127))
 * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))
 * Bump default `scalafmt` version to latest `3.7.3` -> `3.8.1`. ([#1730](https://github.com/diffplug/spotless/pull/1730))
 * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
-* Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049))
-* Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078))
-* Bump default `sortpom` version to latest `3.4.1` -> `4.0.0` and support versions back to `3.2.1`. ([#2115](https://github.com/diffplug/spotless/pull/2115))
+* Bump default `sortpom` version to latest `3.2.1` -> `4.0.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049), [#2078](https://github.com/diffplug/spotless/pull/2078), [#2115](https://github.com/diffplug/spotless/pull/2115))
 * Bump default `zjsonpatch` version to latest `0.4.14` -> `0.4.16`. ([#1969](https://github.com/diffplug/spotless/pull/1969))
 ### Removed
 * **BREAKING** Fully removed `Rome`, use `Biome` instead. ([#2119](https://github.com/diffplug/spotless/pull/2119))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index d1cf10dd9e..f3073218c1 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -14,13 +14,11 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changes
 * Bump default `gherkin-utils` version to latest `8.0.2` -> `9.0.0`. ([#1703](https://github.com/diffplug/spotless/pull/1703))
 * Bump default `jackson` version to latest `2.14.2` -> `2.17.1`. ([#1685](https://github.com/diffplug/spotless/pull/1685))
-* Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
+* Bump default `ktfmt` version to latest `0.46` -> `0.49`. ([#2045](https://github.com/diffplug/spotless/pull/2045), [#2127](https://github.com/diffplug/spotless/pull/2127))
 * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))
 * Bump default `scalafmt` version to latest `3.7.3` -> `3.8.1`. ([#1730](https://github.com/diffplug/spotless/pull/1730))
 * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
-* Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049))
-* Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078))
-* Bump default `sortpom` version to latest `3.4.1` -> `4.0.0` and support versions back to `3.2.1`. ([#2115](https://github.com/diffplug/spotless/pull/2115))
+* Bump default `sortpom` version to latest `3.2.1` -> `4.0.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049), [#2078](https://github.com/diffplug/spotless/pull/2078), [#2115](https://github.com/diffplug/spotless/pull/2115))
 * Bump default `zjsonpatch` version to latest `0.4.14` -> `0.4.16`. ([#1969](https://github.com/diffplug/spotless/pull/1969))
 ### Removed
 * **BREAKING** Fully removed `Rome`, use `Biome` instead. ([#2119](https://github.com/diffplug/spotless/pull/2119))

From d285a74a7eba49bf6a1f3e8457a74cbf6faeaff2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 24 May 2024 03:30:00 +0000
Subject: [PATCH 1614/2068] Update dependency
 com.google.googlejavaformat:google-java-format to v1.22.0

---
 lib/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index ddde01ea59..783f99d288 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -93,7 +93,7 @@ dependencies {
 	gherkinCompileOnly 'io.cucumber:gherkin-utils:9.0.0'
 	gherkinCompileOnly 'org.slf4j:slf4j-api:2.0.0'
 	// googleJavaFormat
-	googleJavaFormatCompileOnly 'com.google.googlejavaformat:google-java-format:1.19.2'
+	googleJavaFormatCompileOnly 'com.google.googlejavaformat:google-java-format:1.22.0'
 	// gson
 	gsonCompileOnly 'com.google.code.gson:gson:2.10.1'
 	// jackson

From 20da351ad94714e52cd71e1ce9384850d67a4918 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 23 May 2024 22:42:31 -0700
Subject: [PATCH 1615/2068] Bump runtime suggested version.

---
 .../java/com/diffplug/spotless/java/GoogleJavaFormatStep.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
index 1378ec5c90..8d05e85c61 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
@@ -121,7 +121,7 @@ private static FormatterStep createInternally(String groupArtifact, String versi
 			.addMin(11, "1.8") // we only support google-java-format >= 1.8 due to api changes
 			.addMin(16, "1.10.0") // java 16 requires at least 1.10.0 due to jdk api changes in JavaTokenizer
 			.addMin(21, "1.17.0") // java 21 requires at least 1.17.0 due to https://github.com/google/google-java-format/issues/898
-			.add(11, "1.19.2"); // default version
+			.add(11, "1.22.0"); // default version
 
 	public static String defaultGroupArtifact() {
 		return MAVEN_COORDINATE;

From d0cd5eec92fde6e8aad730294482cc498c5d8417 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 23 May 2024 22:42:42 -0700
Subject: [PATCH 1616/2068] Bump testfiles for 1.22.0's new style.

---
 .../src/main/resources/java/googlejavaformat/TextBlock.clean   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/testlib/src/main/resources/java/googlejavaformat/TextBlock.clean b/testlib/src/main/resources/java/googlejavaformat/TextBlock.clean
index 8ee77fbf7a..bd558ffd96 100644
--- a/testlib/src/main/resources/java/googlejavaformat/TextBlock.clean
+++ b/testlib/src/main/resources/java/googlejavaformat/TextBlock.clean
@@ -3,7 +3,8 @@ import mylib.UsedB;
 
 public class Java {
   public static void main(String[] args) {
-    var a = """
+    var a =
+        """
       Howdy
       Partner!
       """;

From 5864acc656cb21d50022bddf095d9155d3186466 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 23 May 2024 22:42:52 -0700
Subject: [PATCH 1617/2068] Bump changelogs.

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 1 +
 plugin-maven/CHANGES.md  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index f04f8ef124..dbeb53a0a2 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -20,6 +20,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * scalafmt.conf fileOverride section now works correctly ([#1854](https://github.com/diffplug/spotless/pull/1854))
 ### Changes
 * Bump default `gherkin-utils` version to latest `8.0.2` -> `9.0.0`. ([#1703](https://github.com/diffplug/spotless/pull/1703))
+* Bump default `google-java-format` version to latest `1.19.2` -> `1.22.0`. ([#2129](https://github.com/diffplug/spotless/pull/2129))
 * Bump default `jackson` version to latest `2.14.2` -> `2.17.1`. ([#1685](https://github.com/diffplug/spotless/pull/1685))
 * Bump default `ktfmt` version to latest `0.46` -> `0.49`. ([#2045](https://github.com/diffplug/spotless/pull/2045), [#2127](https://github.com/diffplug/spotless/pull/2127))
 * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 2f3491448c..bccb62dcb1 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -15,6 +15,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * scalafmt.conf fileOverride section now works correctly ([#1854](https://github.com/diffplug/spotless/pull/1854))
 ### Changes
 * Bump default `gherkin-utils` version to latest `8.0.2` -> `9.0.0`. ([#1703](https://github.com/diffplug/spotless/pull/1703))
+* Bump default `google-java-format` version to latest `1.19.2` -> `1.22.0`. ([#2129](https://github.com/diffplug/spotless/pull/2129))
 * Bump default `jackson` version to latest `2.14.2` -> `2.17.1`. ([#1685](https://github.com/diffplug/spotless/pull/1685))
 * Bump default `ktfmt` version to latest `0.46` -> `0.49`. ([#2045](https://github.com/diffplug/spotless/pull/2045), [#2127](https://github.com/diffplug/spotless/pull/2127))
 * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index f3073218c1..557e011ac4 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -13,6 +13,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * scalafmt.conf fileOverride section now works correctly ([#1854](https://github.com/diffplug/spotless/pull/1854))
 ### Changes
 * Bump default `gherkin-utils` version to latest `8.0.2` -> `9.0.0`. ([#1703](https://github.com/diffplug/spotless/pull/1703))
+* Bump default `google-java-format` version to latest `1.19.2` -> `1.22.0`. ([#2129](https://github.com/diffplug/spotless/pull/2129))
 * Bump default `jackson` version to latest `2.14.2` -> `2.17.1`. ([#1685](https://github.com/diffplug/spotless/pull/1685))
 * Bump default `ktfmt` version to latest `0.46` -> `0.49`. ([#2045](https://github.com/diffplug/spotless/pull/2045), [#2127](https://github.com/diffplug/spotless/pull/2127))
 * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))

From 8884414736efce584c23d547e989bbc221407c7a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 24 May 2024 05:55:44 +0000
Subject: [PATCH 1618/2068] Update dependency gradle to v8.7

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 43462 -> 43453 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 gradlew.bat                              |  20 ++++++++++----------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index d64cd4917707c1f8861d8cb53dd15194d4248596..e6441136f3d4ba8a0da8d277868979cfbc8ad796 100644
GIT binary patch
delta 34118
zcmY(qRX`kF)3u#IAjsf0xCD212@LM;?(PI<f(@>NyAue(f;$XO2=4Cg1P$=#e%|lo
zKk1`B>Q#GH)wNd-&cJofz}3=WfYndTeo)CyX{fOHsQjGa<{e=jamMNwjda<PyWE6-
zP~B#x7leo3nD`qQ)CqpqLwL&Nv*c_uf@6ZzDxH4Kk*=_Q!1=S4w`ejm#xafRiVQ9K
zD|NMG<SxpdU<&W$m3qe4z`XCn(ZbVn07Ju^@)#`N!0VN6<~T~KDoO4tX0Wnd#9^aG
zzw_kBWvKv8AX+m002<gC-eNM-rZnBB9F6nP%6MQjX4aHBE}ky4v9DAk%X3G|ZVInC
z0sH3o9G@FVA`%%F8RyEFms&lE|8}H=IL>tD={CN3>GNchOE9OGPIqr)3v>RcKWR3Z
zF-guIMjE2UF0Wqk1)21791y#}ciBI*bAenY*B<S7Lsj7;64caBml7(9sSP$#!4bz5
zfe$Y|L&2pF$!`g2EFBw-(C>MW_)AeSuM5}vz_~`+1i!Lo?XAEq{TlK5-efNFgHr6o
zD>^vB&%3ZGEWMS>`?tu!@66|uiDvS5`?bF=gIq3rkK(j<_TybyoaDHg8;Y#`;>tXI
z=tXo~e9{U!*hqTe#nZjW4z0mP8A9UUv1}C#R*@yu9G3k;`Me0-BA2&Aw6f`{Ozan2
z8c8Cs#dA-7V)ZwcGKH}jW!Ja&VaUc@mu5a@CObzNot?b{f+~+212lwF;!QKI16FDS
zodx>XN$sk9;t;)maB^s6sr^L32EbMV(uvW%or=|0@U6cU<cnXKOZI@-_2b|FP!$}s
zAe;S8Mg2+heB}qk71p?*lsuXu#LR?_0T)ujf|bz~>kE`_!<=LHLlRGJx@gQI=B(nn
z-GEjDE}*8>3U$n(t^(b^C$q<Dz5^v_5fDC=_*60>STI;}6q&ypp?-2rGpqg7b}pyT
zOARu2x><t9J4jOACSe7Cla*>0HB{&D(d3sp`+}ka+Pca5glh|c=M)Ujn_$ly^X6&u
z%Q4Y*LtB_>i6(YR!?{Os-(^J`(70lZ&Hp1I^?t@~SFL1!m0x6j|NM!-JTDk)%Q^R<
z@e?23FD&9_W{Bgtr&CG&*Oer3Z(Bu2EbV3T9FeQ|-vo5pwzwQ%g&=zFS7b{n6T2ZQ
z*!H(=z<{D9@c`K<z${~)Mo?=i!8kgh3^kh#gZ+tgX&gTG!eX0?^?c|0?IsnpYDup`
zE@9&nF#>mHO&DbUIzpg`+r5207}4D=_P$ONIc5lsFgn)UB-oUE#{r+|uHc^hzv_df
zV`n<Uy?gf){vC8%ni$H6BLQ|&nNh_JVuc@V<M{j`fPiV3mmYOH;{D(UIYmW$_M(id
zfz>8&qry%jXQ33}Bjqcim~BY1?KZ}x453Oh7G@fA(}+m(f$)TY%7n=MeLi{jJ7LMB
zt(mE*vFnep?YpkT_&WPV9*f>uSi#n#@STJmV&SLZnlLsWYI@y+Bs=gzcqche=&<e&
zH!*BfX&4XuI(sK|M6EWNz&xj!)?<o^!;`2$ksx0>cBH2WL)dkR!a95*Ri)JH_4c*-
zl4pPLl^as5_y&6RDE@@7342DNyF&GLJez#eMJjI}#pZN{Y8io{l*D+|f_Y&RQPia@
zNDL;SBERA|B#cjlNC@V<BMj^PW+*!uB6Kia#Q_k#D<Kdw%NW0h5PShX-Ateg=^YLq
zPqOC>U{2csOvB8$HzU$01Q?y)KEfos>W46VMh>P~oQC8k=26-Ku)@C|n^zDP!hO}Y
z_tF}0@*Ds!JMt>?4y|l3?`v#5*oV-=vL7}zehMON^=s1%q+n=^^Z{^mTs7}*->#YL
z)x-~SWE{e?YCarwU$=cS>VzmUh?Q&7?#Xrcce+jeZ|%0!l|H_=D_`77hBfd4Zqk&!
zq-Dnt_?5*$Wsw8zGd@?woEtfYZ2|9L8b>TO6>oMh%`B7iBb)-aCefM~q|S2Cc0t9T
zlu-ZXmM0wd$!gd-dTtik{bqyx32%f;`XUvbUWWJmpHfk8^PQIEsByJm+@+-aj4J#D
z4#Br3pO6z1eIC>X^yKk|<Bgti^oqrbEGF$Jw^;w14UYT$*kTROuXlF!RjFMV72W^U
zoMllbg+6ow&xKMI7=%s{uAdU)(;XWPXi7!aAo)eS$$~Y>PeVwX_4B+IYJyJyc3B`4
zPrM#raacGIzVOexcVB;fcsxS=s<vwC^XKnl?x{xO@E;np^jTyr6HSfEb6qXiZr9dg
z)?Uhot!j3J`wuMIE#*geg>1e&V;Xe$tw&KQ`YaCkHTKe*Al#velxV{3wxx}`7@isG
zp6{+s)CG%HF#JBAQ_jM%zCX5X;J%-*%&jVI?6KpYyzGbq7qf;&hFprh?E5Wyo=bZ)
z8YNycvMNGp1836!-?nihm6jI`^C`EeGryoNZO1AFTQhzFJOA%Q{X(sMYlzABt!&f{
zoDENSuoJQIg5Q#@BUsNJX2h>jkdx4<+ipUymWKFr;w+s>$laIIkfP6nU}r+?J9bZg
zUIxz>RX$kX=C4m(zh-Eg$BsJ4OL&_J38PbHW&7JmR27%efAkqqdvf)Am)VF$+U3WR
z-E#I9H6^)zHLKCs7|Zs<7Bo9VCS3@CDQ;{UTczoEprCKL3ZZW!ffmZFkcWU-V|_M2
zUA9~8tE9<5`59W-UgUmDFp11YlORl3mS3*2#ZHjv{*-1#uMV_oVTy{PY(}AqZv#wF
zJVks)%N6LaHF$$<6p8S8Lqn+5&t}DmLKiC~lE{jPZ39oj{wR&fe*LX-z0m}9ZnZ{U
z>3-5Bh{KKN^n5i!M79Aw5eY=`6fG#aW1_ZG;fw7JM69qk^*(rmO{|Z6rXy?l=K=#_
zE-zd*P|(sskasO(cZ5L~_{Mz&Y@@@Q)5_8l<6vB$<SnmTz>@226O+pDvkFaK8b>%2
zfMtgJ@+cN@w>3)(_uR;s8$sGONbYvoEZ3-)zZk4!`tNzd<0lwt{RAgplo*f@Z)uO`
zzd`ljSqKfHJOLx<Pf6T=jN-Y)-G`fh^*;28D6YUz?Jn$Qe<sb8Bqa)nI_IHAx#i9Y
z$j}`a&gQX1Vaa!Ea{Z|{=AEw)&>ya4_}T`k5Ok1Mpo#MSqf~&ia3uIy{zyuaF}pV6
z)@$ZG5LYh8Gge*LqM_|GiT1*J*uKes=Oku_gMj&;FS`*sfpM+ygN&yOla-^WtIU#$
zuw(_-?DS?6DY7IbON7J)p^IM?N>7x^3)(7wR4PZJu(teex%l>zKAUSNL@~{czc}bR
z)I{Xz<Lxhu3=iQUmF>XqZBU3a;7UQ~PvAx8g-3q-9AEd}1JrlfS8NdPc+!=HJ6Bs(
zCG!0;e0z-22(Uzw>hkEmC&<fdEY_MO4!XLJs6(n80jtDO!nnCLqs#Y_I0IE~UCPp@
zM_JDqY7&S(Y&QK^-o&47T#3E|`NAlIxvHf3kny;RvvXG3GAWOcnn~MYcAb70=&uwJ
zkt37-cyED3`=cXw-}?~Jre&#~t1kA3Jz_#Bn#jD975Ham#lXmn@!Xe|z!$O^A|8Ja
zxE40Kw#qS@4?x}td&6F5(NIU<?GmP1&i-wkqanUS(~JutQ=}J2g$roe>xj?{0p|kc
zM}MMXCF%RLLa#5jG`+}{pDL3M&|%3BlwOi?dq!)KUdv5__zR>u^o|QkYiqr(m3HxF
z6J*DyN#Jpooc$ok=b7{UAVM@<lCUruKn!C)jTs?G3tF=X?02t9ti$}%_-&Apkmnno
z%fbj!k#YwEr={VibqP-VP5rAcB3fluUzRfi(z01WI?#!N!mLc);E?^+GEin57qXIO
zg8kNfR~-pWXV>nwGsr6kozSddwulf5g1{B=0#2)zv!zLXQup^BZ4sv*sEsn)+MA?t
zEL<g?Ek3W6nR6!O+b*MM+O~eGu_sDZwCnE-jqq7Mvt4JiAYMi&B_$Kb75}|i#Oq?4
z^@)_zxi_9dEszN`mdX;tu;@!Yj!NQXjGcs`B*6!}Q`Xp8$`LBVWzdw?k{MZ=kF0i6
z0u$CdmQDt$g$6JM?JyEA2oW1N)I#|wQ>)}3*R?4(J~CpeSJPM!oZ~8<cg4cY=X|VM
z=^|PC37b4k-X|34t*R-GX&L@u*U|J4q?K3(MG@qFTXx0}+s2jwB%hz+*7-k{2(QHj
zQmM#6vaQDzB)m!b_6aC`nE*p#lagJ>;8s_=@6o`IA%{aEA9!GELRvOuncE`s7sH91
zmF=+T!Q6%){?lJn3`5}oW31(^Of|$r%`~gT{eimT7R~*Mg@x+tWM3KE>=Q>nkMG$U
za7r>Yz2LEaA|PsMafvJ(Y>Xzha?=>#B!sYfVob4k5Orb$INFdL@U0(J8Hj&kgWUlO
zPm+R07E+oq^4f4#HvEPANGWLL_!uF{nkHYE&BCH%l1FL_r(Nj@M)*VOD5S42Gk-yT
z^23oAMvpA57H(fkDGMx86Z}rtQhR^L!T2iS!<mO!Z%ty;Vm%l(OCwBkU1^sK>788E
z+^${W1V}J_NwdwdxpXAW8}#6o1(Uu|vhJvubFvQIH1bDl4J4iDJ+181KuDuHwvM?`
z%1@Tnq+7>p{O&p=@QT}4wT;HCb@i)&7int<0#bj8j0sfN3s6|a(l7Bj#7$hxX@~iP
z1HF8RFH}irky&eCN4T94VyK<n?6cO6O!>qGywEGY{Gt0Xl-`|dOU&{Q;Ao;sL>C6N
zXx1y^RZSaL-pG|JN;j9ADjo^XR}gce#seM4QB1?S`L*aB&QlbBIRegMnTkTCks7JU
z<0(b+^Q?HN1&$M1l&I@>HMS;!&bb()a}hhJzsmB?I`poqTrSoO>m_JE5U4=?o;OV6
zBZjt;*%1P>%2{UL=;a4(aI>PRk|mr&F^=v6Fr&xMj8fRCXE5Z2qdre&;$_RNid5!S
zm^XiLK25G6_j4dWkFqjtU7#s;b8h?BYFxV?OE?c~&ME`n`$ix_`mb^AWr+{<eR?ie
zu^n7F<r|0}4&z!1h-oy{4Bz+F69}Q`VpCh(8k$5~F}&!BM0MdLg4qhh@bV;%4Rw1m
zzqF@FV8+w9w|_OPDgrx*NZebP^m@hq4m*)5tuF1+`%o#G^#zx@w5ZsxZaUE7jzw;N
zhD*<Wl`rn3nq7+Ag+JpPe%(D1QRTS`qM+;}+_^&I$1>M9{^^Rl;~KREplwy2q;&xe
zUR0SjHzKVYzuqQ84w$NKVPGVHL_4I)Uw<$uL2-Ml#+5r2X{LLqc*p13<F6YTV#kWf
zqG&w9QQdWL4?_d~CQnBI;?0D)Qg}{>{;w#E*Kwb*1D|v?e;(<>vl@VjnFB^^Y;;b3
z=R@(uRj6D}-h6CCOxAdqn~_SG=bN%^9(Ac?zfRkO5x2VM0+@_qk?MDXvf<z0O)%s7
zMAFU0$m3HcbC#~2Hc64da@3O%^-=j9undudUI{}zbhknzUL#akDQiL_v_tyrinjEO
zI(3QAK0&1x_y)uNn}57R#|)d${jFV)^rH-I`D9H?s`)o)uI9hKceIT0a|7|+J9G4R
z?^G4wKj6MYf*wobKriuVpvC#r;9ThcHk6^a^xn2ODvRhy6<dTeve8{i!Cu=iTXW7{
z{?H_E?=z!{hGvD8B;Y6V{)tUgB~RL}OZbPv*z!^?TUpHIl7qWjaL~c+st5S>=@q_*
z3IM@)er6-OXyE1Z4sU3{8$Y$>8NcnU-nkyWD&2ZaqX1JF_JYL8y}>@V8A5%lX#U3E
zet5PJM`z79q9u5v(OE~{by|Jzlw2<0h`hKpOefhw=fgLTY9M8h+?37k@TWpzAb2Fc
zQMf^aVf!yXlK?@5d-re}!fuAWu0t57ZKSSacwRGJ$0uC}ZgxCTw>cjRk*xCt%w&hh
zoeiIgdz__&u~8s|_TZsGvJ7sjvBW<(C@}Y%#l_ID2&C`0;Eg2Z+pk;IK}4T@W6X5H
z`s?ayU-iF+aNr5--T-^~K~p;}D<LJ~4Vm)-6?_|)BF5gW4JSY7&(G|Av&E;#AyyV$
zSunlmXPqL`WNNYmTNMzV20flD83AxG;E^Ec8R;(;vdTi$02nI6(4u&=rI7r^2x}@}
zb^h(s^Hv9AwRzcBrk1j8D%Js|d7yM)>(*GWOAYDV9JEw!w8ZYzS3;W6*_`#aZw&9J
ziXhBKU3~zd$kKzCAP-=t&cFDeQR*_e*(excIUxKuD@;-twSlP6>wWQU)$|H3Cy+`=
z-#7OW!ZlYzZxkdQpfqVDFU3V2B_-eJS)Fi{fLtRz!K{~7TR~XilNCu=Z;{GIf9KYz
zf3h=Jo+1#_s>z$lc~e)l93h&RqW1VHYN;Yjwg#Qi0yzjN^M4cuL>Ew`_-_wRhi*!f
zLK6vTpgo^Bz?8AsU%#n}^EGigkG3FXen3M;hm#C38P@Zs4{!QZPAU=m7ZV&xKI<yS
zef9C7IM#)bKApw^nm2P0xPH)?)BN&sFvRw*IK$#0AfO}b<r{uW7o8y}SN)F@&yQm%
zn~nNb7d)eJ2BHvG2FG3z@j=payQlcc`;O$D3XPT3JFukw8Xr%@g@bkhB?@#$+AOw(
z(|@nqsNM;#gS0yC1MWhDA!W&4Ru~!5ks5Q~Pml#jZyfXEak(Em<WRqk+Ush$9swq)
zmPM%H4#Ov0YvR0-8rrI^layyN^pm(_yZ9(@AnNKHRrR<^fYJvzs{G9-d<-PIeZxic
zI!fz70I#*sa*eAVT<99Vxgy-<y1w@xbY}slZ7CHAcKSW+wgZc7BMb2FfqhW}?;;BY
zP!O(w$5_aUKLF$CVvI<PnooNWjt084FOTmh7FT(=9D-a~XGZP;^5(x4>_HWNt90Ef
zxClm)ZY?S|n**2cNYy-xBlLAVZ=~+!|7y`(fh+M$#4zl&T^gV8ZaG(RBD!`3?9xcK
zp2+aD(T%QIgrLx5au&TjG1AazI;`8m{K7^!@m>uGCSR;Ut{&?t%3AsF{>0Cm(Kf)2
z?4?|J+!BUg*P~C{?m<lX{_VAm$p$7Sy5n4)MhYq@8YJpQU2G)^4Cs_N!H_NDI5wLC
zuxU!+I__)7xJYF^Pf|zP9)c{~jt|)Y(3ss;D?4|k?Aspv4X!02;`uMjy{H&7#%Q@o
z<nV(d4I5h&#m8g~O!r&@N38SW3XQ`EjZh!<u+JXC85$B2rn?)m6Y00}q3o2FWUH%+
zxkU_~@oBdV%UzT$+qN=8G&dY}bCZ=N#`=O2mzStcgw{uTG7hdoSCO(-*C<hlyRW_D
zI1Ra`6kd?oLFBA13(Fk<4zU<VtAK2o$FG2w@>wPQ#)gDMmro20YVNsVx5oWQMkzQ?
zsQ<ZZLyAH1!oNzFM}TfglR)=rWx*=M9GIjB?ZFULc>%Y>%7_wkJqnSMuZjB9lBM(o
zWut|B7w48cn}4buUBbdPBW_J@H7g=szrKEpb|aE>!4rLm+sO9K%iI75y~2HkUo^iw
zJ3se$8$|W>3}?JU@3h@M^HEFNmvCp|+$-0M?RQ8SMoZ@38%!tz8f8-Ptb@106heiJ
z^Bx!`0=I<O1KwEC{Zqa_WBh?i$W#4Fd46V<qLHAqFT^%K_=ff(6##B-Ub(l(@oz>m
z1!NUhO=9ICM*+||b3a7w*Y#5*Q}K^ar+oMMtekF0JnO>hzHqZKH0&PZ^^M(j;vwf_
z@^|VMBpcw8;4E-9J{<clOdQ-gLs}yNpT|>(u7sHSyZpQbS&N{VQ%ZCh{c1UA5;?R}
z+52*X_tkDQ(s~#-6`z4|Y}3N#a&dgP4S_^tsV=oZ<Y0d)Rr;arA(GJ}DlJV*pmcys
z*Mk;Dg{B7HD(oM1AgV$?pZ(feakO5tAV~SCs_W%F(?;(4m+NEoby{|2mc0XI>r4A1
zaSoPN1czE(UIBrC_r$0HM?RyBGe#lTBL4~JW#A`P^#0wuK)C-2$B6TvM<GJr3h=;Q
z>i@@%K@JAT_IB^T7Zfqc8?<ppV&KJMBtJ-oMFyu3aJ37qp`YqlHwSWDi``;8R3fKH
z;())3jrugRTov;`f2|96Ol0~`tdom%2YtK*BEp7dW){Z1+eUuiY^^+%IXC`kb4D<x
zHzFJB;p^zZ4`bRwAwzCEy&SFu3-$>{wHcSVG_?{(wUG%zhCm=%qP~EqeqKI$9UivF
zv+5IUOs|%@ypo6b+i=xsZ=^G1yeWe)z6IX-EC`F=(|_GCNbHbNp(CZ*lpSu5n`FRA
zhnrc4w+Vh?r>her@Ba_jv0Omp#-H7avZb=j_A~B%V0&FNi#!S8cwn0(Gg-Gi_LMI{
zCg=<XfJ{>g@m{W@u?GQ|yp^yENd;M=W2s-k7Gw2Z(tsD5fTGF{iZ%Ccgjy6O!AB4x
z%&=6jB7^}pyftW2YQpOY1w@%wZy%}-l0qJlOSKZXnN2wo3|hujU+-U~blRF!^;Tan
z0w;Srh0|Q~6*tXf!5-rCD)OYE(%S|^WTpa1KHtpHZ{!;KdcM^#g8Z^+LkbiBHt85m
z;2xv#83lWB(kplfgqv@ZNDcHizwi4-8+WHA$U-HBN<XXr0~J?$Lai#_;trL)VA8+1
zU!;TqE~}9XS7A@|JfNqKkGav_MPU#1&?e(-M~ysHg+5_(nK1v-W}9=?Zer5AMLpDA
zz5CzT^brYv;fMsP%wz!?lZWTP?W}8@vv2IuVI?tan0C9Y`-Wjik0PN~x7}xCz5j)1
zoSKG<CGs%hfuQ;WLC{xnn)TVIkPvvNhsVT7>qsZ`hKcUI3zV3d1ngJP-AMRET*A{>
zb2A>Fk|L|WYV;Eu4>{a6ESi2r3aZL7x}eRc?cf|~bP)6b7%BnsR{Sa>K^0obn?yiJ
zCVvaZ&;d_6WEk${F1SN0{_`(#TuOOH1as&#&xN~+JDzX(D-WU_nLEI}T_VaeLA=bc
zl_UZS$nu#C1yH}YV>N2^9^zye{rDrn(rS99>Fh&jtNY7PP15q%g=RGnxACdCov47=
zwf^<OLlg}xVjt0)p-rbBn7T~vS^5_Drk~dEL?fU{>9zfJaL{y`R#~tvVL#*<`=`Qe
zj_@Me$6sIK=LMFbBrJps7vdaf_HeX?eC+P^{AgSvbEn?n<}NDWiQGQG4^ZOc|GskK
z$Ve2_n8gQ-KZ=s(f`_X!+vM5)4+QmOP()2Fe#IL2toZBf+)8gTVgDSTN1CkP<}!j7
z0SEl>PBg{MnPHkj4wj$mZ?m5x!1ePVEYI(L_sb0OZ*=M%yQb?L{UL(2_*CTVbRxBe
z@{)COwTK1}!*CK0Vi4~AB;HF(MmQf|dsoy(eiQ><S&flYs}X=qI6%JhOL}c}8ReE6
z>WTKcEQlnKOri5xYsqi61Y=I4kzAjn5~{IWrz_l))|<ryzIgBfLDnKw3JSt*BE7Yk
z@<X1~%_3&{c@EWKT@&!_5{hgsv0*uWq^Ag5&!#`hO30t*Ey!ZHlK~#2TL+u093@m<
zmh@mPLF@+cbRf2&AOJqqsB1zg;bVL&+4p#cS%+M6!rPy}l*roS@+s2E+JcG2%rRTv
z2!(JA6$64oDKq`kHYO({m<UUf<`TtSFw}vw1zYukXby+c34(E)w*pi_qs3N7vw>Ls
zvq7xgQs?Xx@`N?f7+3XKLyD~6DRJw*uj*j?yvT3}a;(j_?YOe%hUFcPGWRVBXzpMJ
zM43g6DLFqS9tcTLSg=^&N-y0dXL816v&-nqC0iXdg7kV|PY+js`<tQ)jQ;9->F8dm
z2PuHw&k+8*&9SPQ6f!^5q0&AH(i+z3I7a?8O+S5`g)>}fG|BM&ZnmL;rk)|u{1!aZ
zEZHpAMmK_v$GbrrWNP|^2^s*!0waLW=-h5PZa-4jWYUt(<b#|Bsx3P3#+uA4`mmgX
z9Kz|`zO$@)@d{sIynMxFy0ta)_!*pZfTlj%)9Ee4zRt~F_6}gJArZ1%_&ds}7FnKN
zT=p-*f9G3aBCWvVUn3v-@ZXvQrHP}1zTx3P<Jhsl2HrSYxUcBQibO?|u3Wl@z}_;u
z86>Hr@EA(m3Mc3^uDxwt-me^55FMA9^>hpp26MhqjLg#^Y7OIJ5%ZLdNx&uDgIIqc
zZRZl|n6TyV)0^DDyVtw*jlWkDY&Gw4q;k!UwqSL6&sW$B*5Rc?&)dt29bDB*b6IBY
z6SY6Unsf6AOQdEf=P1inu6(6hVZ0~v-<>;LAlcQ2u?wRWj5VczBT$Op#8IhppP-1t
zfz5H59Aa~yh7EN;BXJsLyjkjqARS5iIhDVPj<=4AJb}m6M@n{xYj3qsR*Q8;h<IbJ
zd)uk&8m`?q_q1NS{$84>VxDyC4vLI;;?^eENOb5QARj#nII5l$MtBCI@5u~(ylFi$
zw6-+$<K_|-Wlyt+M0?(Bv&pcNNg0svOYzThtqKx!i*Dc5NZvH&F*N23|J~!vMN;d~
z^=H()7fOiv1)6`d`Xlx->$XQ}Ca>FWT>q{k)g{Ml(Yv=6aDfe?m<nPFf#(N8Laf1%
zeJ4>|5|kbGtWS}fKWI+})F6`x@||0oJ<?@*&=4(53;s&f1=p}VJ=CsEx0>^(g|+xi
zqlPdy5;`g*i*C=Q(aGeDw!eQg&w>UUj^{o?PrlFI=34qAU2u@BgwrBiaM8zoDTFJ<
zh7nWpv>dr?q;4ZA?}V}|7qWz4W?6#S&m>hs4IwvCBe@-C>+oohsQZ^JC*RfDRm!?y
zS4$7oxcI|##ga*y5hV>J4a%HHl^t$pjY%caL%-FlRb<$A$E!ws?8hf0@(4HdgQ!@>
zds{&g$ocr9W4I84TMa9-(&^_B*&R%^=@?Ntxi|Ejnh;z=!|uVj&3fiTngDPg=0=P2
zB)3#%HetD84ayj??qrxsd<YW&s^_fNRPJu1Lu~ooseFw$wVknfo;k}<f4``0v~+Y_
zKU_m+@|S(3^pR^^<>9nqrBem(8^_u_UY{1@R_vK-0H9N7lBX5K(^O2=0#TtUUGSz{
z%g>qU8#a$DyZ~EMa|8*@`GOhCW3%DN%xuS91T7~iXRr)SG`%=Lfu%U~Z_<B8YLfje
zenkDPv?7UMn^wh-#5zYOX60}ftn+_;r9>`1b=lSi?qpD4$vLh$?HU6t0MydaowUpb
zQr{>_${AMesCEffZo`}K0^~x>RY_ZIG{(r39MP>@=aiM@C;K)jUcfQV8#?SDvq>9D
zI{XeKM%$$XP5`7p3K0T}x;qn)VMo>2t}Ib(6zui;k}<<~KibAb%p)**e>ln<=qyWU
zrRDy|UXFi9y~PdEFIAXejLA{K)6<)Q`?;Q5!KsuEw({!#Rl8*5_F{TP?u|5(Hijv(
ztAA^I5+$A*+*e0V0R~fc{ET-RAS3suZ}TRk3r)xqj~g_hxB`qIK5z(5wxYboz%46G
zq{izIz^5xW1Vq#%lhXaZL&)FJWp0VZNO%2&ADd?+J%K$fM#T_Eke1{dQsx48dUPUY
zLS+DWMJeUSjYL453f@HpRGU6Dv)rw+-c6xB>(=p4U%}<qNSa;?l%-Qbgo6H=D;<Ac
z37*~61%G;Rk9zKyD{WraYx|9VK1aeUEagvgL(r)WImH;+hu8m^8fk3iQO!R?vp|AU
z#xX(31o5DGMHtXZ9zytcGdR#e9xm`5)!T;H26%a+**oa@WGMf=BFxg~`r&GAS7$4y
z^2|*EV<Mt4fFFPU)O>_p>z^I@Ow9`nkUG21?cMIh9}hN?R-d)*6%pr6d@mcb*ixr7
z)>Lo<&2F}~>WT1ybm^9UO{6P9;m+fU^06_$o9gBWL9_}EMZFD=rLJ~&e?fhDnJNBI
zKM=-WR6g7HY5tHf=V~6~QIQ~rakNv<yXlZw2~R->csamU8m28YE=z8+G7K=h%)l6k
zmCpiDInKL6*e#)#Pt;ANmjf`8h-nEt&d}(SBZMI_A{BI#ck-_V7nx)K9_D9K<wX2&
ztb`!H<{xu+%$XOK7#l;ig9boZT>-p@?Zh81#b@{wS?wCcJ%og)8RF*-0z+~)6f#T`
zWqF7_CBcnn=S-1QykC*F0YTsKMVG49BuKQBH%WuDkEy%E?*x&tt%0m>>5^HCOq|ux
zuvFB)JPR-<R9*qK#QvOEy<g2y->W|%$24eEC^AtG3Gp4qdK%pjRijF5Sg3X}uaKEE
z-L5p5aVR!NTM8T`4|2QA@hXiLXRcJveWZ%YeFfV%mO5q#($TJ`*U>hicS+CMj%Ip#
zivoL;dd*araeJK9EA<(tihD50FHWbITBgF9<S1F59NBB@-km2xgxh^jmVKRZHCzb@
zldh9O@Tx{jgxfxH#W4wy6M0z_-aTt2G@3|Yp>E<33A+eMr2;cgI3Gg6<-2o|_g9|>
zv5}i93<J?21Jwu60De+%9&8yD$M-==IBwP;d{BC=F44-LGWWplT_ESz4ovU#BL|G}
zcmR56^)_SYTt?AM`r&<V0_9alA|EwbVwM(BT3!TE$hsCu`Gm;Rg~8}C&9f4B^0>2(
zYf<!;V`YfO6gj*4fZkUAr?-F@aA9;z9|jbBgt=33h^ojL5J7|FUPfqa-W2^EN+IwG
zyucPVo58FAeHt$Nq*Z0Lz|^v35)f<vIMOX%n{Czoseg>TE9?4#nQhP@a|zm#9FST2
z!y+p3B;p>KkUzH!K;GkBW}bWssz)9b>Ulg^)EDca;jDl+q=243BddS$hY^fC6lbpM
z(q_bo4V8~e<Zs<b7cyyni#U}G!!KTEURDqc{bMpk?5mA1@g$Y$Wx|caEJ@!TvSwmW
zqw6$6_V9}M--vO-=^ZBsJr^(lCyvX*KI4W@0G*bBPEKAYRH$kkkjj{cPznS-d|ZUy
zJ?>VeA?0LFD6ZtKcmOH^75#q$E<Zzyhezvuj?3@d%!~X4ws-!zRzAK#UFhVU?-K@7
z2G)}Z&^k%kMrWcDJ1~9s%Y7B4b*Q5pIQJtR#E8_m=dCI`iz(ByzI1@)w#x&yV;Dmb
zBR*c4ZqzdV6%u1E<qjcp>o%a&qvE8Zsqg=$p}u^|>DSWUP5i{6)LAYF4E2DfGZuMJ
zMwxxmkxQf}Q$V3&2w|$`9_SQS^2NVbTHh;atB>=A%!}k-f4*i$X8m}Ni^ppZXk<vI
zv4b?e{$fL=4CN|)0GXH{ZZE#0qrw?r2yJZjI_c{zf+uDL9gwdN)`!v>5_oYF>Gq(&
z0wy{LjJOu}69}~#UFPc;$7ka+=gl(FZCy4xEsk);+he>Nnl>hb5Ud-lj!CNicgd^2
z_Qgr_-&S7*#nLAI7r()P$`x~fy)+y=W~6aNh_humoZr7MWGSWJPLk}$#<b0qDKzby
zfsF}6hSD25(h&SI*1V<_%OA=AVAytldFr(qeYf$b2GB9jc!!oXb+YO|A>w_1n%(@?
z3FnHf1lbxKJbQ9c&i<$(wd{tUTX6DAKs@cXIOBv~!9i{wD@*|kwfX~sjKASrNFGvN
zrFc=!0Bb^OhR2f`%hrp2ibv#KUxl)Np1aixD9{^o=)*U%n%rTHX?FSWL^UGpHpY@7
z<FJKJ-x}kSNUZ~J=(sQmm|=Hgx6NDTIwxW%&M+qtaTFkwf2nmoB#ib#d`3q#i8x4D
z8SO1)?2${?@9$aGnmIq+`mJ>74U}KoIRwxI#>)Pn4($A`nw1%-D}`sGRZD8Z#lF$6
zOeA5)+W2qvA%m^|$WluUU-O+KtMqd;Pd58?qZj})MbxYGO<{z9U&t4D{S2G>e+J9K
ztFZ?}ya>SVOLp9hpW)}G%kTrg*KXXXsLkGdgHb+R-ZXqdkdQC0_)`?6mqo8(EU#d(
zy;u&aVPe6C=YgCRPV!mJ6R6kdY*`e+VGM~`VtC>{k27!9vAZT)x2~AiX5|m1Rq}_=
z;A9LX^nd$l-9&2%4s~p5r6ad-siV`HtxKF}l&xGSYJmP=z!?Mlwmwef$EQq~7;#OE
z)U5eS6dB~~1pkj#9(}T3j!((8Uf%!W49FfUAozijoxInUE7z`~U3Y^}xc3xp){#9D
z<^Tz2xw}@o@fdUZ@hnW#dX6gDOj4R8dV}Dw`u!h@*K)-NrxT8%2`T}EvOImNF_N1S
zy?uo6_ZS>Qga4Xme3j#aX+1qdFFE{NT0Wfusa$^;eL5xGE_66!5_N8!Z~jCAH2=${
z*goHjl|z|kbmIE{cl-PloSTtD+2=CDm~ZHRgXJ8~1(g4W=1c3=2eF#3tah7ho`zm4
z05P&?nyqq$nC?iJ-nK_iBo=u5l#|Ka3H7{UZ&O`~t-=triw=SE7ynzMAE{Mv-{7E_
zViZtA(0^wD{iCCcg@c{54Ro@U5p1QZq_XlEGtdBAQ9@nT?(zLO0#)q55G8_Ug~Xnu
zR-^1~hp|cy&52iogG@o?-^AD8Jb^;@&Ea5jEicDlze6%>?u$-eE};bQ`T6@(bED0J
zKYtdc?%9*<<$2LCBzVx9CA4<AoGdF)iT9-BV}&@WMK}bKMAdQBHB9zIg~33D9XqBR
zD>YV|q-qg*-{yQ;|0=KIgI6~z0DKTtajw2Oms3<u6JfE3d!7x4=<@msnH0k~j9dW|
zZtZ80d$e)`WiYJI%5C4$o_@ZG+NLyWNO7P{Rii0d%$QNbSHy)#lwN8boUCoV3)k>L
zn{C%{P`duw!(F@*P)lFy11|Z&x`E2<=$Ln38>UR~z6~za(3r;45k<v>QK_^QTX%!s
zNzoIFFH8|Y>YVrUL5#mgA-Jh>j7)n<Zx96$&fzU>)5}iVM4%_@^GSwEIBA2g-;43*
z*)i7u*xc8jo2z8&=8t7qo|B-rsGw)b8UXnu`RgE4u!(J8yIJi(5m3~aYsADcfZ!GG
zzqa7p=sg<o&$HnFk3_PIDT7^R*l|Uy*ErkWh5p!iw%95SEqgx*(#2u}$;yHXwBY|t
z$vJDd#N!Akn_xau{*4y#!iM@tZOc&Rc)@cg)>`V_KjiqI*LA-=T;uiNRB;BZZ)~88
z`C%p8%hIev2rxS12@doqsrjgMg3{<L-IS7j<nG-26~xHYI&`%4j=)ZUR_2Nwyo&s*
zJ_0X{=sXdnBCoNzt%@LBIlEx@{+A&hsZt3nyF&Gtc)9fXv28Q&PU0uzxK5QDQ^0tT
z@ll2`vK+vydWK?7I0;u%diXOvNZ*YxV6uZ=wi~x}imLLs*Slf$SL&G~13D2Praj;n
z{D>A&N8A?%Ui5vSHh7!iC^ltF&HqG~;=16=h0{ygy^@HxixUb1XYcR36SB}}o3nxu
z_IpEmGh_CK<+sUh@2zbK9MqO!S5cao=8LSQg0Zv4?ju%ww^mvc0WU$q@!oo#2bv24
z+?c}14L2vlDn%Y0!t*z=$*a!`*|uAVu&NO!z_arim$=btpUPR5XGCG0U3YU`v>yMr
z^zmTdcEa<e${0lJ(<4$dGj^YwOU!gy-6u%trv^j}K^#M&{&D1UGEa2nS)OMS>!APX
zYF>^Q-TP11;{VgtMqC}7>B^2gN-3KYl33gS-p%f!X<_Hr?`rG8{jb9jmuQA9U;BeG
zHj6Pk(UB5c6zwX%SNi*Py*)gk^?+729$bAN-EUd*RKN7{CM4`Q65a1qF*-QWACA&m
zrT)B(M}yih{2r!Tiv5Y&O&=H_OtaHUz96Npo_k0eN|!*s2mLe!Zkuv>^E8Xa43ZwH
zO<I&Nur7C^JWb9`H||S7lnGT!zTpho2vN69_#Qs?kjYy$`Q0!HKi(a7WFX@;&MNY~
zax>I058AZznYGrRJ+`*GmZzMi6yliFmGMge6^j?|PN%ARns!Eg$ufpcLc#1Ns!1@1
zvC7N8M$mRgnixwEtX{ypBS^n`k@t2cCh#_6L6WtQb8E~*Vu+Rr)YsKZRX~hzLG*BE
zaeU#LPo?RLm(Wzltk79Jd1Y$|6<Tz#Ab3VOQL!oqnu8!3Ev#T)CDpRjo9fjjgw)N!
zErQj*AF93?w7h)pV7lh%{nq{Sh43S}4qRhV$tBKz2Q3F#YC0?apCV-cr-&g)Ta?xA
zc-})no|s-UajuvdSqa3zR2cl82_%nvGFwn23tfy0+-dPTJzZ8#!t6MWix9bj!?+yg
zn$~Be?akwbUV?z=Y{qc>aWz1)wf1K1RtqS;qyQMy@H@B805vQ%wfSJB?m&&=^m4i*
z<RSh9mC|UV(AH!)v4!3^(;(w}isKaD1$r>YVH`zTTFbFtNFkAI`Khe4e^CdGZw;O0
zqkQe2|NG_y6D%h(|EZNf&77_!NU%0y={^E=*gKGQ=)LdKPM3zUlM@otH2X07Awv8o
zY8Y7a1^&Yy%b%m{mNQ5sWNMTIq96Wtr>a(hL>Qi&F(ckgKkyvM0IH<_<ah`2Jtc4H
zzJ5Z$n<rF%>}v~Fv-GqDa<PYPnU!!je;%S69V23AFX{jR^q$cSK5eU!uzK5~_gTvx
z=xC#ygr;Z7l0l}tE!ut;$3u!G=k}WM8nnSovw+>pig=3*ZMOx!%cYY)SKzo7ECyem
z9Mj3C)tCYM?C9YIlt1?zTJXNOo&oVxu&uXKJs7i+j8p*Qvu2PAnY}b`KStdpi`trk
ztAO}T8eOC%x)mu+4ps8sYZ=vYJp16SVWEEgQyFKSfWQ@O5id6GfL`|2<}hMXLPszS
zgK><z_7D{#_0cM38i3?q!q=1kU*<f=E!5q~OGR+n-!$_a1@<av6z8(-tT0T>NWOoR
zBRyKeUPevpqKKShD|MZ`R;~#PdNMB3LWjqFKNvH9k+;(`;-pyXM55?qaji#nl~K8m
z_MifoM*W*X9CQiXAOH{cZcP0;Bn10E1)T@62Um>et2ci!J2$5-_HPy(AGif+BJpJ^
ziHWynC_%-NlrFY+(f7HyVvbDIM$5ci_i3?22ZkF>Y8RPBhgx-7k3M2>6m5R24C|~I
z&RPh9xpMGzhN4b<n_$TKj6;x$6eSY#J<6z8-<<eXD{YGtPeh(eK>ii*ryWaN^d(`0
zTOADlU)g`1p+SVMNLztd)c+;XjXox(VHQwqzu>FROvf0`s&|NEv26}(TAe;@=FpZq
zaVs6mp>W0rM3Qg*6x5f_bPJd!6dQGmh?&v0rpBNfS$DW-{4L7#_~-eA@7<2BsZV=X
zo<jFL%Bl|~iN=_%v|5Y<#Gpc-_nu`zPSa3B)eyzNRYkS_S7#Vl4Sx`|M*FHkF=-_)
z(qT@$sP8*6(;+2_2GrUtq?WVOz@%!47omewB^Cj*+)_Y7c8o#IQ%W|Wg+5PNnR*6U
zqsrE$&lE5UYNkcwa9IkWJQ`K6q;9o~nXTNNt4ypA@SdwPa*k(~yPsQD9A`rvY6hIQ
zbB3Wq3J(Ip%Spgn<@)Zq04$gB8>w){3aATmLZOQrs>uzDkXOD=IiX;Ue*B(^4RF%H
zeaZ^*MWn4tBDj(wj114r(`)P96EHq4th-;tWiHhkp2rDlrklX}I@ib-nel0slFoQO
zOeTc<hn5|jpM}{BL^>;Rh7sMIebO`1%u)=GlEj+7HU;c|Nj>2j)J-kpR)s3#+9AiB
zd$hAk6;3pu9(GCR#)#>aCGPYq%r&i02$<m+xZvsp>0L9=7Al<uiMgWi00$%C&<=p;
z&DJ&!X-+7DOQ<NGx053X=x&OTuveGw;P#7I963O-cntp%n;x3upG6$bSZdIscXKZz
zE26w-ESTe#dx<IxxgOyxd~k92x!}?e7=&}7EIUABcs@v7J^4#tE1Z2`vYo|Zfx#?M
zXxRQAUwIpnrd%x;d2(+0wHKQb5LXCF5FM|~=&cF?)N_xB4Bl|JpPd+>IGY<wi6MrB
zwuAQco(edmX)&f$!qgzbDk@I5RR!7e{<pl6;0q^D9rH)D+xQ^qUHFjiVuuZ(dNLoE
zk610d0D=8c-t>dlUO5%eH&M!ZWD&6^NBAj0Y<LF!W8hneCvn#&X!jeuMxFNL9R6gV
ziYL0E$zuPwu-dNyWbfxdM|kfI7dtb9QzzTE{}sJ=aTD#{Kb((+@c&OeMaT<*ofYbx
z;1%phK@uKkWduA*1(PK@!{WoV6$&w4_0RR0*51~cnd9Q6WRU~~+iD70xHZv5yb^q9
zSl{&Z2jJC&)zq%KFf=>9ZDcPg@r@8Y&-}e!aq0S(`}NuQ({;aigCPnq75U9cBH&Y7
ze)W0aD>muAepOKgm7uPg3Dz7G%)nEqTUm_&^^3(>+eEI;$ia`m<pPp!PnmJ$ax-Ni
zriP82FsWaes>>m0QHEkTt^<h|Kl{fGlDwG;CQ*b4lzdo-V$nC8<LA?4QJ%$e&M1jF
zj4MPd95jth&|E!zZ*d9v(}1-nH2c9uw}SWz(o)!u-C;JXs?Old?KmR?ZVapLr)~kt
z-!pxZ2T4qAqb;DH9;hiuAcN#25{6pE|B@nn@LY@;@6X}9ZRu6|3F2X?Musq<a_n+z
zJMV<b3!3d+o(r5xln5wq$mvr`E9}w25J;Qi>=cx^JsBC68#H(3zc~Z$E9I)oSrF$3
zUClHXhMBZ|^1ikm3nL$Z@v|JRhud*IhOvx!6X<(YSX(9LG#yYuZeB{=7-MyPF;?_8
zy2i3iVKG2q!=JHN>~!#Bl{cwa6-yB@b<;8LSj}`f9pw7#x3yTD>C=>1S@H)~(n_K4
z2-yr{2?|1b#lS`qG@+823j;&UE5|2+EdU4nVw5=m>o_gj#K>>(*t=xI7{R)lJhLU{
z4IO6!x@1f$aDVIE@1a0lraN9!(j~_uGlks)!&davUFRNYHflp<|ENwAxsp~4Hun$Q
z$w>@YzXp#VX~)ZP8`_b_sTg(Gt7?oXJW%^Pf0UW%YM+OGjKS}X`yO~{7WH6nX8S6Z
ztl!5AnM2Lo*_}ZLvo%?iV;D2z>#qdpMx*xY2*GGlRzmHCom`VedAoR=(A1nO)Y>;5
zCK-~a;#g5yDgf7_phlkM@)C8s!xOu)N2UnQhif-v5kL$*t=X}L9EyBRq$V(sI{90>
z=ghTPGswRVbTW@dS2H|)QYTY&I$ljbpNPTc_T|FEJkSW7MV!JM4I(ksRqQ8)V5>}v
z2Sf^Z9_v;dKSp_orZm09jb8;C(vzFFJgoYuWRc|Tt_&3k({wPKiD|*m!<X$9n>+<d
zfwbu(US!ljdxEAm@8L<A)Zh;j$1@#3i1Hba7~+=OxccBV?z(KQ^KiX-VG5F8{s<bz
zFTJ%sXJxQmw1gpd<`@dDaxW+0z@mAqX^!9bM3;Rg{vJ$y`jrFPf<taTjgOUiGo`tq
zU8^ynJ_vtmGeduy1>za$(l*!gNRo{xtmqjy1=kGzFkTH=Nc>EL@1Um0BiN1)wBO$i
z6rG={bRcT|%A3s3xh!Bw?=L&_-X+6}L9i~xRj2}-)7fsoq0|;;PS%mcn%_#oV#kAp
zGw^23c8<Fs8D%<c4(Nre;Oy43eq_*f8CVI6Y}O$7=4|A%Bh)_#+dgnF@9B?PZV+FK
z@D@b4V?}Hxb;mfT&3=fp%aQ_W<BpQFv8~7WceKD?ShRTE&*xP)Rp+|r%gOH<b#|`R
zpMk-?U*1{fo}21TS!!|lrVyo(<X*MXXY2ANSehq$FQcbg%rc;PQLx;F?K=D0V>_0~
ze}v9(p};6HM0+qF5^^>BBEI3<e#!JG>d=2<KmW5$FDhY04Ol??L%ZUPasCO+Pj|h!
zL*;#e7cVT$<F2gg5E8<=1=Y;hH6lJKfJK6P>DW&O#|(;wg}?3?uO=w+{*)+^l_-gE
zSw8GV=4_%U4*OU^hibDV38{Qb7P#Y8zh@BM9pEM_o2FuFc2LWrW2jRRB<+IE)G=Vx
zuu?cp2-`hgqlsn|$nx@I%TC!`>bX^G00_oKboOGGXLgyLKXoo$^@L7v;GWqfUFw3<
zekKMWo0LR;TaFY}T<F_}BWybmURg`OY9TP`)1kkA_VfNgEb>t4!O$3MU@pqcw!0w0
zA}SnJ6Lb597|P5W8$OsEHTku2Kw<?~p>9y4V=hx*K%iSn!#LW9W#~OiWf^dXEP$^2
zaok=UyGwy3GRp)bm6Gqr>8-4h@3=2`Eto2|JE6Sufh?%U6;ut1v1d@#EfcQP2chCt
z+mB{Bk5~()7G>wM3KYf7Xh?LGbwg1uWLotmc_}Z_o;XOUDyfU?{9atAT$={v82^w9
z(MW$gINHt4xB3{bdbhRR%T}L?M<kc`={1@bX$@c}pX`50EN?1djSoIxW|Rhd4u^_G
z>cK?!zkLK3(e>zKyei(yq%Nsijm~LV|9mll-XHavFcc$teX7v);H>=oN-+E_Q{c|!
zp<Ol>JV~-9AH}jxf6IF!PxrB9is{_9s@PYth^`pb%DkwghLdAyDREz(csf9)HcVRq
z+2Vn~>{(S&_;bq_qA{v7XbU?yR7;~JrLfo;g$Lkm#ufO1P`QW_`zWW+4+7xzQZnO$
z5&GyJs4-VGb5MEDBc5=zxZh9xEVoY(|2yRv&!T7LAlIs@tw+4n?v1T8M>;hBv}2n)
zcqi+>M*U@uY>4N3eDSAH2Rg@dsl!1py>kO39GMP#qOHipL~*cCac2_vH^6x@xmO|E
zkWeyvl@P$2Iy*mCgVF+b{&|FY*5Ygi82<omgvyGTqv|QTz=sN}TZ6>37i)9YW#Fp&
z?TJTQW+7U)xCE*`Nsx^yaiJ0KSW}}jc-ub)8Z8x(|K7G>`&l<bpFP+cS)jO`N_V-8
zyz*&criMW3Tge5_hcWP_V8=SvD0*^&JQ8c;z^ZkOK$H-b5$|gm$@;EfT;;o$;h7dL
z>{Y&~W=q#^4Gf{}aJ%6kLXsmv6cr=Hi*uB`V26;dr<aSR^xo%$9+~>4C$WrPnHO>g
zg1@A%DvIWPDtXzll39kY6#%j;aN7grYJP9AlJgs3FnC?crv$wC7S4_Z?<_s0j;MmE
z75yQGul2=bY%`l__1X3jxju2$Ws%hNv75ywfAqjgFO7wFsFDOW^)q2%VIF~WhwEW0
z45z^+r+}sJ{q+>X-w(}OiD(!*&cy4X&yM`!L0Fe+_RUfs@=J{AH#K~gArqT=#DcGE
z<spTPWq%oqdho$J0xh~6Q=^v}j=vBe*gL+|ud>!FwY(h&+&811rVCVoOuK)Z<-$EX
zp`TzcUQC256@YWZ*GkE@P_et4D@qpM92fWA6c$MV=^qTu7&g)U?O~-fUR&xFqNiY1
zRd=|zUs_rmFZhKI|H}dcKhy%Okl(#y#QuMi81zsY56Y@757xBQqDNkd+XhLQhp2BB
zBF^aJ<Yyh7pM5zBvii~t`R`{~RErSl{}-#Xjol7q<MNou@wjO9-e0+&FnPZ^6y4Ll
zv-4#qZasZI63$>__D676wLu|yYo6jNJNw^B+Ce;DYK!f$!dNs1*?D^97u^jKS++7S
z5qE%zG#HY-SMUn^_yru=T6v`)CM%K<>_Z>tPe|js`c<|y7<QPU`KuA=GRt?21}m$3
z)egm^_v+KsYdG<vt|ej|@=R$E;WS|)lq&hvDYqCWcNQVq*yoxejj)Sgjj^Yjl?NcX
zDFDlAtM@eY^eKCIx3Bn3tvI+`G-P!;moJ^4fysp(P&5s?@p7p>?qol&)C=>uLWkg5
zmzNcSAG_sL)E9or;i+O}tY^70@h7+=bG1;YDlX{<4zF_?{)K5B&?^tKZ6<$SD%@>F
zY0cl2H7)%zKeDX%Eo7`ky^mzS)s;842cP{_;dzFuyd~Npb4u!bwkkhf8-^C2e3`<?
zuCMcKb49Z{nlgrGOONk{-i&aq@>q8>MuPhgiv0VxHxvrN9_`rJv&GX0fWz-L-Jg^B
zrTsm>)-~j0F1sV=^V?UUi{L2cp%YwpvHwwLaSsCIrGI#({{QfbgDxLKsUC6w@m?y}
zg?l=7aMX-RnMxvLn_4oSB|9t;)Qf2%m-GKo_07?N1l^ahJ+W<L;$&i*6MJG?J+W=u
zwrv{|+x8@xWb=KyXLo=7Po1iIr>f8C>h5~=-o1BJzV@5HBTB-ACNpsHnGt6_ku37M
z{vIEB^tR=--4SEg{jfF=gEogtGwi&A$mwk7E+SV$$ZuU}#F3Y7t}o{!w<wD={LS;b
zZLz-;o0$Q>4LJh8v4PW%8HfUK@dta#l*z@w*9Xzz(i)r#WXi`r1D#oBPtNM7M?Hkq
zhhS1)ea5(6VY45|)tCTr*@yc$^Zc!<pn44UDZ+IBYjAJ`-ggM&;kb0pvO!s`m^2xQ
zD2Cg>zQzsNXU?aRN6mh7zVu~i=qTrX^>de+f6HYfDsW@6PBlw0CsDBcOWUmt&st>Z
zYNJEsRCP1#g0+Htb=wITvexBY@fOpAmR7<uCg}62o&UsLHP(Phe;7?`HXB?HKdlV$
z;n1V`+Y7~g)l@mcyIJ}uTJ!G<@eKpC>?szQNR~nM)?sPWIj)0)jG-EF8U@nnBaQZy
z)ImpVYQL>lBejMDjlxA$#G4%y+^_>N;}r@Zoe2|u-9-x@vvD^ZWnV>Gm=pZa7REAf
zOnomhCxBaGZgT+4kiE%aS&lH2sI1mSCM<%)Cr*Sli;#!aXcUb&@Z|H<WEuC{@x3F<
zcu=w}m*tw?_*4~yqRvV|o9ns5GNSy=_8IwkLCEw54?sk2a(<Mdh^0{u1T=9t*NInH
zFsLj&_yjHc6;)bz9kl9!kgEUg^82nn>j{VPsJyClqD%>hy`Y7<pRj7bPY9jQyVGWO
zS%<st>z(GAS<aP)Y1uSg%`b@4p69s=<%Tt{igr8{?&jG%;a(i_%-UCF>s8Mqas3!D
zSQE83*%uctlD|p%4)v`arra4y>yP5m25V*_+n)Ry1v>z_Fz!TV6t+N?x?#iH$q=m=
z8&X{uW%LVRO87dVl=$Y*>dabJVq{o|Kx`7(D2$5DVX&}XGbg|Ua(*5b=;5qzW<SoC
zzQ#?BPpCI=6I*c_i^sgOQ>9;|w>m{hIO(Tu-z(ey8H=EMluJNyK4BJmGpX~ZM2O61
zk*O7js{-MBqwq>Urf0igN+6soGGc!Y?SP6hiX<gKeOf#K(fq=b1cjQoa=0h1Uc|1x
zrs@w%$10Lm8HWHTQsEqE(JV%p5=DhOaEnmC%>uJzZ1V4WZqE*?h;PG84gvG~dd<ZH
zbY$=c6i~~+P41czFCy_EI$dg`c<Pyn!p1u1+?ktG?l^rT?wPQ2A8drLUBX$i@QPw|
zqn``t@{_q6YANM!8WD%c{DkVuIAOr;O55VmO-cSXNNJ&(*COQc4ZZm^4K%c3mN$0E
zrov1s*jjy;dRKW=-Unr5Q~DZR{;p;L#!x#C2mnbI-cg1JPiV8@_y)_H7BEWiz!+s)
z0{psz93NN}c(aYN&3g{jLeCy{0X^`+?aBhSW*V;^{S7@L=6)4l+Fy-5Vm@KCM_5?x
z(92sH+oi*?$hATGUM-)1KM)NSn*XULvnqVli`x(wEF2!vUY3O~qogY>s6~484!kPM
zMP87IP?dhdc;%|cS&LxY*Ib6P3%p|9)E3IgRmhhwtUR3eRK6iZ_6fiGW}jnL4(I|t
ze`2yLvmuY42lNwO6>I#Son3$R4NOoP*WUm1R4jl#agtSLE}fSu-Z>{+*?<Ox|0|h?
ziVAXEejmb)TNIL)WMKcfBnN%2`pTyl?}<6Yv7aXa$?4(@S45I<K83!~!85D$T^sNt
z#G2I?J>pQIn7`s3LAz<sUxT1J#To$wq)LLuvyHUwXZGnH5bA&W>F#1pSxCAo?clr9
z9PUj#REq28*ZkJnxs$aK%8^5?P<_Q!#Z?%JH0FKVF;&zH3F#J^fz|a<d2t+(J$r8k
z@gS5dPqSn!bSO@C%)Xy-d?WBwvVYS>hl$Ycs~kFij_XP;U<`Fca<h#1CHf8w@jZxi
z4E}>DYyXYPM~&jEe1Xj1n;wyRdD;lmnq&FEro=;+Z$=v-&fYM9eK*S_D&oTXFW#b0
zRY}Y7R#bLzTfg9i7{s?=P9~qjA?$-U2p5;0?gPPu`1JY|*?*8IPO!eX>oiX=O#F!A
zl`S%e5Y(csR1f)I(iKMf-;5%_rPP7h&}5Fc(<tM)r%wv3LCm#xoQU~A@B|1<`oLmM
zFJo+&#d1H1oV@`@@judX4nHzi7~-Q3%iaTZO>8byKUH1*d7?9%QC<dVX!I)~1Vf#}
zwN9HFJ-qutr_)&Ld#X9pYCw5!Ln<R5Cw|Z|F-c$v`hl=tR{-56UrGfK9_2*yyZ@fO
z8nZ1uLsgGiL>|4aADj3L8yuo6GOv#%HDgU3bN(UHw1+(99&Om%f!DY(RYSf4&Uny%
zH}*&rEXc$W5+eyeEg|I|E-HnkIO0!$1sV7Z&NXxiCZJ@`kH4eEi5}q~!Vv5qQq{MI
zi4^`GYoUN-7Q(jy^SKXL4$G4K+FQXR)B}ee=pS0RyK=YC8c2bGnMA~rrOh&jd3_AT
zxVaq37w^-;OU3+C`Kko-Z%l_2FC^maa=Ae0Fm@PEtXEg@cX*oka1Lt&h@jES<6<l#
z+$g2<Asf=9S1fdM-Zf&z(e6fWKei}lbCaFL*0(Jmb1OHeueb>?o1Oi1C9>}7+U(Ve
zQ$=8RlzcnfCd59CsJ=gG^A!2Bb_PY~K2sSau{)?Ge03G7US&qrgV!3NUi>UHWZ*lo
zS;~0--vn{ot+7UWMV{a(X3rZ8Z06Ps3$-sd|CWE(Y#l`swvcDbMjuReGsoA`rmZ`^
z=AaArdbeU0EtwnOuzq@u5P1rlZ<sl{`#t>jH#gNgh6HIhG(>dX%4m{_!&DNTQE)8=
zXD-vcpcSi|DSm3aUMnrV;DQY?svz?9*#GT$NXb~Hem=24iy>7<t7QQV*?t4jd6F$+
zoVdvlUnbR4c30FRg<e9<@PVR%rHqJUA;fJYA($o}&dnWgkF9ZP7&B+X`n^IHYt(Lf
z2F5n3wJiK|+9K0rQqBtOu&~*tu?)dBq^i>xj367(!#RjnrHtrP-Q`T2W*PEvAR-=j
ztY2|#<|JvHNVnM-tNdoS_yRSo=yFqukTZmB$|>Vclj)o=Y<JL-iyAg07VsydL3{X*
z%2mLNnQsQbJh5(AD4t{|q}=<Sep&lQi`=uoh?ZK7-3Ggm7(e$G$$!eV5RX%BIxMx_
zcZ~)&tjIxU_5Hcg)fpWZ(znGWsvo-$Kg%Yi^j*N+;M7L5ByQ~FpSX7CHVVaMYgQ$F
zLE#|7`dM0nng{OAF}Qcjup5gR2}Yw<aDD&b!H-Me0}~kt6{J6Shasi;%3^mM=_Fj;
zCJmpL_-hPyxj$4N{M|RVj$&&&ZX8z~2^&gzl4o!r2Z8|PlPVdE08_x)A!qpcu0#xY
zXnk?%F^@+%cB0BC7MsbX<)>zC9!ph8)ZOH5X=%Aq|9gNgc}^KFVLht!Lyw54v5u&D
zW%vT%z`H{Ax>Ry+bD&QjHQke_wEA;oj(&E!s4|OURButQKSc7Ar-<s}yde;WAK~$P
z^Gqnxrogbi{lG5aFCO5?K&xA8mnwDs7h<9^6YcR8q^0TexEaqnTnUG7d`^9oo$h?D
zKq5j>PzIiFa8F@ezkaY2J9&PH+VI1!G+{JgsQ7%da*_Gr!exT*<Bi+ppC%q~o7ojT
zw%-XGzS*XV$!)J(aAPAYRAt79+7J$~+w?BI2Q1s93#u0$U9&Ct=DGGT|JFamN<I30
zezX;tHfoBvUeBbp68x?km4lTPls>OgJld)b-?cd)xI+|v_C`h(Cg`N~oj0`SQPTma
z{@vc8L^D-rBXwS#00jT#@=-n1H-C3hvg61r2jx#<RRl|hqSXC@053(FHh{sXK3n-p
z<$eTP-2N28_#nt+&me>ok&cr#BV~9JdPaVihyrGq*lb>bm$H6rIoc}ifaSn6mTD9%
z$FRJxbNozOo6y}!OUci1VBv-7{TYZ4GkOM@46Y9?8%mSH9?l&lU59)T#Fjg(h%6I}
z?ib<r4n}!XkXC&NufL;-hcHF&UUVnNQHeZ=Wv<~uyVX-uR$QEL_l&SGi$i}9x_ul>
zZ(xb8Rwr+vv>@$h{WglT2lL`#V=-9tP^c)cjvnz(g|VL^h8^CPVv12dE(o}WQ@0OP
z^2-&ssBXP^#Oh`X<d4_zj?ko>5@F+~$PCB6kK-T7sFUK|>$lNDSkvAy%{y2qgq-&v
zv}^&gm`wiYztWgMS<{^qQKYNV=>CQaOeglAY~EZvr}n~tW=yg)_+fzqF%~+*V_$3h
z2hDW`e$qR;QMg?(w<b_xzz9GLD(1{PR-OZ8-*QD}x+s!v>KE>%H_6ASS@6bkOi-m-
zg6B7AzD;gBS1%OD7|47a%3BykN{w}P!Wn-nQOfpKUpx8Mk{$IO62D!%U9$kr!e%T>
zlqQih?3(U&5%r!KZFZPd<X|#ogu*zbQE07H>bwZ0laAJCj!c&pEFVzrH&_&i<N3C?
zo@%)1zi#=6wREw)wQ(6!5<Zb2Qvw`@PmV*Wp>5m68Y_*J+-Qjlnz}Q{3oAD)`d14H
zKUGmbwC|beC9Mtp>SbL~NVrlctU3WBpHz(UeIa~_{u^_4OaHs_LQt>bUwcyD`_Bbh
zC=x|1vSjL)JvVHLw|xKynEvq2m)7O-6qdmjht7pZ*z|o%NA17v$9H*(5D5(MXiNo1
z72Tv}QASqr$!mY58s_Q{hHa9MY+QZ`2zX-FT@Kd?`8pczcV^9IeOKDG4WKqiP7N|S
z+O977=VQTk8k5dafK`vd(4?_3pBdB?YG9*Z=R@y|$S+d%1sJf-Ka++I&v9hH)h#}}
zw-MjQWJ?ME<7PR(G<1#*Z-&M?%=yzhQw$Lki(R+Pq$X~Q!9BO=fP9FyCIS8zE3n04
z8ScD%XmJnIv=pMTgt6VSxBXOZucndRE@7^aU0wefJYueY(Cb%?%0rz)zWEnsNsKhQ
z+&o6d^x=R;Pt7fUa_`JVb1HPHYbXg{Jvux|atQ^bV#_|>7QZNC<m56gmQTDz)Sv34
znQxO@_?jSZ-}u2#aunxbjO?K=1UNC4B}tiiM9CZDpDyu{zkOqqjq!7q99sz6e|N}H
zPQo%$KE#d!)5wiR%<;fHk2yH4+dlwL2Rr23RY5vDJ>~P^IKUThB6{kvz2pr2*Cyxj
zy37Nri8za8J!@Iw9rbt~#^<9zOaM8LOi$kPBcAGqPq-DB^-93Qeup{9@9&=zV6KQN
zL)ic5S%n1!F(7b>MQ973$~<0|9MY-G!?wk?j-cQhMQlM2n{&7JoTBGsP;=fC6CBJn
zxlpk^%x=B16rfb-W9pYV#9IRHQL9VG4?Uh>pN>2}0-MST2AB2pQjf*rT+TLCX-+&m
z9I{ic2ogXoh=HwdI#igr(JC>>NUP|M>SA?-ux<2&>Jyx>Iko!B<3vS}{g*dKqxYW7
z0i`&U#*v)jot+keO#G&wowD!VvD(j`Z9a*-_RALKn0b(KnZ37d#Db7royLhBW~*7o
zRa`=1fo9C4dgq;;R)JpP++a9^{xd)8``^fPW9!a%MCDYJc;3yicPs8IiQM>DhUX*;
zeIrxE#JRrr|D$@bKgOm4C9D+e!_hQKj3LC`Js)|Aijx=J!rlgnpKeF>b+QlKhI^4*
zf%Of^RmkW|xU|p#Lad44Y5LvIU<E*FXDgB**mKwp2!mq`hNR)=z0QQMaupuiAd7N|
zo&AY$ODOt<Q38Y^Ii6uZyvYkO%G!LUYf+Tw(6oPEJFUo(I+rIZ?v_|(9>IR>VGH8G
zz7ZEIREG%UOy4)C!$muX6StM4@Fsh&Goa}cj10RL(#>oGtr6<bK`a)SgxmFZVL)U~
z49v!>h~7tZDDQ_J>h)VmYlKK>9ns8w4tdx6LdN5xJQ9t-A<deKX4bX$^Jb$>BtTf_
zf1dKVv!mhhQFSN=ggf(#$)FtN-okyT&o6Ms+*u72Uf$5?4)78EErTECzweDUbbU))
zc*tt+9J~Pt%!M352Y5b`Mwrjn^Orp+)L_U1ORHJ}OUsB78YPcIRh4p5jzoDB7B*fb
z4v`bouQeCAW#z9b1?4(M3dcwNn2F2plwC^RVHl#h&b-8n#5^o+Ll20OlJ^gOYiK2<
z;MQuR!t!>`i}CAOa4a+Rh5IL|@kh4EdEL*O=3oGx4asg?XCTcUOQnmHs^6nLu6WcI
zSt9q7nl*?2TIikKNb?3JZBo$cW6)b#;ZKzi+(~D-%0Ec+QW=bZZm@w|prGiThO3dy
zU#TQ;RYQ+xU~*@Zj;Rf~z~iL8Da`RT!Z)b3ILBhnIl@VX9K0PSj5owH#*FJXX3vZ=
zg_Zyn^G&l!WR6wN9GWvt)sM?g2^CA8&F#&t2z<OchUXqZRy~h=2dtIHh}9X16StjX
zE*X$O$hrKjDx*fT_Kdt~%HxH)(Q<=+n-bsLpy;hW_+>3_MiluRqvNbV{Me6yZ&X-_
zd6#Xdh%+6tCmSNTdCBusV<OLU^zAuj3oC#*62FAg&jRV{eA?56gCxRYk9nH%WWtia
z(L;^ByCp%<7za*^^B&PIjiYnY$Gom{Mk62$4uvORBiduv?$8V_-U*iYK!Is}K=K4!
zRqXL>kRwJ_A~<^Nd6~MNOvS;YDix<nmp2CFVZb7>M43`|8e_bmc*UWi7TLA})`T_F
ztk&Nd=dgFUss#Ol$LXTRzP9l1JOSvAws~^X%(`ct$?2Im?UNpXjBec_-+8YK%rq#P
zT9=h8&gCtgx?<LJXBIGvqMB)2=D#1(E#`Gft|z7B(M_Jurie!W@A&*CdPfK%1_($Q
z&41z76E^&SjZfwJd{?_|K()<UmsT?~p*FNKwP__D#d_feWy|Ge{Dz}bgKej%s3<xl
zL=(7@V%Z6Ls;(9_^N&q~-}$9{nVk@Q(D|jMzcY@#rP>=Oj$Yr2j<c`drr*4eGwnY6
zpou_hH7hY!9S)PMQgqe-l!Y{7*V&uqvM#Fq)W)d?^1IAL-DK&GVzdmu_H<-MCk_GM
zy&hTx7mWj(2fxj^o94>I3`VVuZ`lH>*N+*K11CD&>>F)?(`yr~54vHJftY*z?EorK
zm`euBK<$(!XO%6-1=m>qqp6F`S@Pe3;pK5URT$8!Dd|;`eOWdmn916Ut5;iXWQoXE
z0qtwxlH=m_NONP3EY2eW{Qwr-X1V3;5tV;g7tlL4BRilT#Y&~o_!f;*hWxWmvA;Pg
zRb^Y$#PipnVlLXQIzKCuQP9IER0Ai4jZp+STb1Xq0w(nVn<3j(<#!vuc?7eJEZC<-
zPhM7ObhgabN2`pm($tu^MaBkRLzx&jdh;>BP|^$TyD1UHt9Qvr<czlD@G+^h_RO(*
zD$4@5T5mOOg&QM%!B(9nVM{bT<4ry`1>{ZcBs^l!JI4~d-Py$P5QOYO&8eQOFe)&G
zZm+?jOJioGs7MkkQBCzJSFJV6DiCav#kmdxc@IJ9j5m#&1)dhJt`y8{T!uxpBZ>&z
zD^V~%GEaODak5qGj|@cA7HSH{#jHW;Q0KRdTp@PJO#Q1gGI=((a1o%X*{knz&_`ym
zkRLikN^fQ%Gy1|~6%h^vx>ToJ(#aJDxoD8qyOD{CPbSvR*bC>Nm+mkw>6mD0mlD0X
zGepCc<fcI8GR5U|Yh-F^k<?4h>S_x7+6X7dH;%e`aIfPr-NXSqlu&?$Br1R}3lSF2
zWOXDtG;v#EVLSQ!>4323VX-<G6zshc*}#z*<OCtlCr=7_9N%0P@aw0NW3NYMY?UTk
zv23GF46nFqpVnQb;X)T9o|+e;#c6DHFd+rvvY`*?nmy>|E#qb+x%IxzUBDI~N23x?
zXUHfTTV#_f9T$-2FPG@t)rpc9u9!@h^!4=fL<UA2Sb|t&Ay-N0cvK7#l<pL<Ge|wZ
z<{l=m(jmt{aK61fo4#z+N%`p~HEyEO)J*8(AY!addNzdFY|eI)Y^jThWjX-+2s1gI
zR-J}6pgw5eaN{`!XN-3n?FAT?R1z;uAYmO-(xK(CQ<gbE!uo-ct({xjk-*(K3=4b2
zuZ;EzSTEFKBtAl-Y8l=R*0oyp4c|8Hu<A_TRga2_IR3O)Z#Sv=f)G{j@$4)Q>^kg9
zVv%&KY3!?bU*V4X)wNT%Chr;YK()=~lc%$auOB_|oH`H)Xot@1cmk{^qdt&1C55>k
zYnIkdoiAYW41<U-q!=TqI<2ry9=m3D#)D^9-z8@sblghCY~vfX?X5t$KPF5bE#--%
zE5hxIRaHx0Xj9^l7<qXiyd@3`cU<of!XEaJ1U@*tv-q;5CI7%jj1+;qoyl(u34Kyx
zTwi$K?X7Phe&4^6RRa`$h5KJCs<~Ar*~m>zrRBfqR?9r^cpWIEqfS;|R#bIs4$cqA
zoq~$yl8h{IXTSdSdH?;`ky6i%+Oc?HvwH+IS`%_a!d#CqQob9OTNIuhUnOQsX;nl_
z;1w99qO9lAb|guQ9?p4*9TmIZ5{su!h?v-jpOuShq!{AuHUYtmZ%brpgHl$BKLK_L
z6q5vZodM$)RE^NNO>{ZWPb%Ce111V4wIX}?DHA=uzTu0$1h8zy!SID~m5t)(ov$!6
zB^@fP#vpx3enbrbX=<eanFKywoTJQhG@2(niq0oP7<R5Z?3qzMSy}E7WYo#&>vzol
zj^Bg7V$Qa53#3Lptz<6Dz=!f+FvUBVIBtYPN{(%t(EcveSuxi3DI>XQ*<e7R(p~Iw
z59+#M)uYI&a@UPC1IMUQX*f(>$HX~O{KLK5Dh{H2ir87E^!(ye{9H&2U4kFxtKHkw
zZPOTIa*29KbXx-U4hj&iH<9Z@0wh8B6+>qQJn{>F0mGnrj|0_{nwN}Vw_C!rm0!dC
z>iRlEf}<+z<vi^;1*|;$>&?Z4o3?C>QrLBhXP!MV0L#CgF{>;ydIBd5A{bd-S+VFn
zLqq4a*HD%65IqQ5BxNz~vOGU=JJv|NG{OcW%2PU~MEfy6(bl#^TfT7+az5M-I`i&l
z#g!HUfN}j#adA-21x7jbP6F;`99c8Qt|`_@u@fbhZF+Wkmr;IdVHj+F=pDb4MY?fU
znDe##Hn)<n&2RRZwLB>{D}<>vVhYL#)+6p9eAT3T$?;-~bZU%l7MpPNh_mPc(h@79
z;LPOXk>e3nmIxl9lno5cI5G@Q!pE&hQ`s{$Ae4JhTebeTsj*|!6%0;g=wH?B1-p{P
z`In#EP12q6=xXU)LiD+mLidPrYGHaKbe5%|vzApq9(PI6I5XjlGf<_uyy59iw8W;k
zdLZ|8R8RWDc`#)n2?~}@5)vvksY9UaLW`FM=2s|<qH#E;S20;V52?wL&5dX{o72+Z
z0FywvdTk{!EC;eL4ha(sv&@IG+>vyg>Remm=QGthdNL87$nR&TKB*LB%*B}|HkG64
zZ|O4=Yq?Zwl>_KgIG@<Nm24#{ff*;8vIRUT2g{<33$-hCA*Ib8=7nT4{VJ-HH4MLV
zIT25bC`h^*$P3+Yx*l|$yU`O)`Mbhv0n7XuDy|BiR*M8CJI><8i{Zw#P3q_CVT7Dt
zoMwoI)BkpQj8u(m!>1dfOwin(50}VNiLA>A2OG&TBXcP=H(3I;!Wd<ZETqW($r$}b
zQAfz<3tM=bQ%n$55j+bugZnrB#mmMWnY_~$z$Liaj`bJ38rjM<FDunrR#<^_1JENt
zu+3j^HqtsLHiNherQg9BtTZ6*`5u=2BqRzR-k~&QM}H%8Wtp~yT(x{XA+v{;Lk0T_
z8ZN}a;s?PGwtWpK@H2sUmlJ{<9{&n|P#c&W@4~v-%@c<EWQ?t#KLSmY9bDL{#7T?~
z76PxY&TkxgEcPdAIhcw*XW%cHKY+7+aX(-B-5MrXK50f+^TJP!RT6=!f<geMB`%Fd
zpZqq;(7VECXEvcw|AQDRe)aU3W}r0&1CN{y>PFe?r_e{%>bc6(Zk?6~Ew&;#ZxBJ|
zAd1(sAHqlo_*rP;nTk)kAORe3cF<p$fDY|A3iAZP$ueYIxQXJ+7w98(0U(!3@$IXC
zkArCaQGgWCTUEiE#Ljn4e2+xH8Lo+U&pRkmvSNL+lo$iGII$|wCe1zIC^v<yjtGc?
zbPEkKJ&O*&`bDbHgA@N}y7EOuEceoYIA&k#uEVgi3I3Y=_BkG)yv^|q$IgyV_I#%x
zis#68f%rr`5{z^U5Xvbb15OyZ7n3z;MKelR1ZnQZ?|9dO1LM(y5^1HBHewj8z0X6b
z5ns&>&tj>m&LsvB)`-y9#$4XU=Dd^+CzvoAz%9216#f0cS`;kERxrtjbl^7pmO;_y
zYBGOL7R1ne7%F9<i~hqkED!wXO5LBBco|+$qCFci6|!-WQ>M2~0a7Srciz=MeaMU~
zV%Y#m_KV$XReYHtsraWL<vKnB$+Zz-Psj~gMs%tLbl;djUW;H;u25)lZ~Qm%4FzzV
zfs~u@z?ywI*zMsCG+$x}k+Zt=z;A=9uoFZ0uyjL?unMSF6p`V2w|s^vq37hCdK<*M
zQG4HE?XU*W1jw^vfg9M{L@tofUxN*3g2Z~iPTJR8y3WBJ(gUv}lBzRwS|l?`_FLLt
zDW+p@*L9!&Q{&Zrmi{U_bUOaiNV1ZE_G|QIq57EotA?e^B=gl*)4mnUB{ID2*hS?K
z97*K-A4~i4U^!JB&H{YCj!coICIVY)QNpfeE&d15$&n^iL%ZPcjxr-(h$wToAxn2L
zPRdYf%644lF&Ct8opZ&DwcltfV$?3&sTTr>rdJItLtRiRo98T3J|x~(a>~)#>JHDJ
z|4j!VO^qWQfCm9-$N29SpHUqvz62%#%98;2FNIF<r)HDZh-H_}MwGugFOnYSqd%Sy
zI=YaMecE)Ud_fxgSR<n-(O`=`i9bA1ZwT6qs+cI!LFWB2FCcvPar+8o0PX}9gN%GU
z#oIy=fF~{NHiEcjJAgRPrJ{92E7!?|80I39UP!TZA$bl-0B38>*?c9hZ7GAu$q>=0
zX_igPSK8Et(fmD)V=CvbtA-V(wS?z6WV|RX2`g=w=4D)+H|F_N(^ON!jHf72<2nCJ
z^$hEygTAq7URR{Vq$)BsmFKTZ+i1i(D@SJuTGBN<J^d%g3-SsRr1Zq23^Y<XMk33u
z0YpIow(yh?q_G$W1G9T?O`wbI_&XbT=@+$4lm9L~7k=bD&%`F5G=A^k_|g(QrA7|R
zlKb%Fw^<1ppNM&?|K#tNLnJ^+TYlwL9RC;8+T<k(qy{d2CuhNoF@jMeCRv$p@)2rZ
z>3W8<ub;IgTVJz1Un@p7$E&xFXkfS;|BBLRtyYXByIi)rTxM@Bn`|z3wO{>{JpJ^J
zkF=gBTz|P;Xxo1NIypGzJq8GK^#4tl)S%8$PP6E8c|GkkQ)vZ1OiB%mH#@hO1Z%Hp
zv%2~Mlar^}7TRN-SscvQ*xVv+i1g8CwybQHCi3k;o$K@bmB%^-U8dILX)7b~#iPu@
z&D&W7YY2M3v`s(lNm2#^dCRFd;UYMUw1Rh2mto8laH1m`n0u;>okp5XmbsShOhQwo
z@EYOehg-KNab)Rieib?m&NXls+&31)MB&H-zj_WmJsGjc1sCSOz0!2Cm1vV?y@kkQ
z<1k6O$hvTQnGD*esux*aD3lEm$mUi0td0NiOtz3?7}h;Bt*vIC{tDBr@D)9rjhP^<
zY*uKu^BiuSO%)&FL>C?Ng!HYZHLy`R>`rgq+lJh<d&y2bxU%x2bp&;{EY>dXfo|df
zmkzpQf{6o9%^|7Yb<H9Djj73&=!H<l1fR%V0gHumtd=k;shCSDzmr2~L?7>5v{Tu&
zsP*Y~<#jK$S_}uEisRC;=y{zbq`4Owc@JyvB->nPzb#&vcMKi5n66PVV{Aub>*>q8
z=@u7jYA4Ziw2{fSED#t4QLD7Rt`au^y(Ggp3y(UcwIKtI(OMi@GHxs!bj$v~j(FZK
zbdcP^gExtXQqQ8^Q#rHy1&W8q!@^aL><u!}aGR8PHJwu92JD4JDlbnay+X<Ycn<ki
zD^80O2}kCVUWjex%^O<n@=mW<38)Qu_YK#S=N;)9mm7XNJJECSa=DJ$G|#yLf3~L@
z-HW4z+Cyl}+dB?P4cDZq;7|41V@~U!6UPdEGIJj(3NaGsZl6`hnAr?OX*FX_ttOXb
zsH?UN_o>g1v2R45T(KErWB)1rB@rU`#n&-?g2Ti~xXCrexrLgajgzNy=N9|A6K=RZ
zc3yk>w5sz1zsg~tO~-Ie?%Aplh#)l3`s632mi#CCl^75%i6IY;dzpuxu+2fliEjQn
z&=~U+@fV4>{Fp=kk0oQIvBdqS#yY`Z+>Z|T&K{d;v3}=JqzKx05XU3M&@D<Xziu0j
z$T_QZ!o|grC*e9F1-Dp?WgCQfrKo7wqcyX&!TI}mTs|pg4*U1gOy^7sU?zi1GJ1ue
z?TkG+pTl*xn`gl>5!uPTGydasyeZ5=1~IX-?HlM@AGB9|Mzb{{Dt@bUU8{KUPU@EX
zv0fpQNvG~nD2WiOe{Vn=hE^rQD(5m+!$rs%s{w9;yg9oxRhqi0)rwsd245)igLmv*
zJb@Xlet$+)oS1Ra#qTB@U|lix{Y4lGW-$5*4xOLY{9v9&RK<|K!fTd0wCKYZ)h&2f
zEMcTCd+bj&YVmc#>&|?F!3?br3ChoMPTA{RH@NF(jmGMB2fMyW(<0jUT=8QFYD7-%
zS0ydgp%;?W=>{V9>BOf=p$q5U511~Q0-|C!85)W0ov7eb35%XV;3mdUI@f5|x5C)R
z$t?xLFZOv}A(ZjjSbF+8&%@RChpRvo>)sy>-IO8A@>i1A+8bZd^5J#(lgNH&A=V4V
z*HUa0{zT{u-_FF$978RziwA@@*XkV{<-CE1N=Z!_!7;wq*xt3t((m+^$SZKaPim3K
zO|Gq*w5r&7iqiQ!03SY{@*LKDkzhkHe*TzQaYAkz&jNxf^&A_-40(aGs53&}$dlKz
zsel3=FvHqdeIf!UYwL&Mg3w_H?utbE_(PL9B|VAyaOo8k4qb>EvNYHrVmj^ocJQTf
zL%4vl{qgmJf#@uWL@)WiB>Lm>?ivwB%uO|)i~;#--nFx4Kr6{TruZU0N_t_zqkg`?
zwPFK|WiC4sI%o1H%$!1ANyq6_0OSPQJybh^vFriV=`S;kSsYkExZwB{68$dTODWJQ
z@N57kBhwN(y~OHW_M}rX2W13cl@*i_tjW`TMfa~Y;I}1hzApXgWqag@(*@(|EMOg-
z^qMk(s~dL#ps>>`oWZD=i1XI3(;gs7q#^Uj&L`gVu#4zn$i!BIHMoOZG!YoPO^=Gu
z5`X-(KoSsHL77c<7^Y*IM2bI!dzg5j>;I@2-EeB$LgW|;csQTM&Z|R)q>yEjk@Sw%
z6FQk*&zHWzcXalUJSoa&pgH24n`wKkg=2^ta$b1`(BBpBT2Ah9yQF&<s0t#=CvrrS
zhID}v^bURD{xYt-7G^$r)TW*tHPfwa<MygGIW`SIzn~^mpOlkddrC2QnaKRX^i|}+
ztb9<mhSg<Qxk*l=ZE}+5_uD(mzp&OPh211AXsFW}kd_5%1?CrhNsJe#*Y<ZlnvU3i
z9FSrFY?Dr^Z=A0b%B#l7!s~@FV})h2QE2dq9XU8D;k$CT$b*|~B+ozO*7MGpG-4l_
zHB>Kh+3jTaSE|=vChGz2_R^{$C;D`Ua(_=|OO11uLm;+3k%kO19EA`U065i;fRBoH
z{Hq$cgHKRFPf0#%L?$*KeS@FDD;_TfJ#dwP7zzO5F>xntH(ONK{4)#jYUDQr6N(N<
zp<gr$yEF+Bh<8VMyl!Z~38n3=ExaSY0h2rbMXGGeh?xbO6ZTOM{<7x2ScCLhXP2Ft
z)INnh8dDXY+c;~$2FxS>+fAS9l9)^c4Ss8628Zq5AzMq4zc(In_yJSXAT57Dtl}@=
zvZoD7iq0cx7*#I{{r9m{%~g6@Hdr|*njKBb_5}mobCv=&X^`D9?;x6cHwRcwnlO^h
zl;MiKr#LaoB*PEL<dy!vtQo2cB(_!Lx!l45orL*11H7TM(b>m8+8%btnC)b^E12!^
zMmVA!z>59e7n+^!P{PA?f9M^2FjKVw1%x~<`RY5FcXJE)AE}MTopGFDkyEjGiE|C6
z(ad%<3?v*?p;LJGopSEY18HPu2*}U!Nm|rfewc6(&y(&}B#j85d-5PeQ{}zg>>Rvl
zDQ3H4E%q_P&kjuAQ>!0bqgAj){vzHpnn+h(AjQ6GO9v**l0|aCsCyXVE@uh?DU;Em
zE*+7EU9tDH````D`|rM6WUlzBf1e{ht8$62#ilA6Dcw)qAzSRwu{czZJAcKv8w(Q6
zx)b$aq*=E=b5(UH-5*u)3iFlD;XQyklZrwHy}+=h6=aKtTriguHP@Inf+H@q32_LL
z2tX|+X}4dMYB;*EW9~^5bydv)_!<%q#%Ocyh=1>FwL{rtZ?#2Scp{Q55%Fd-LgLU$
zM2u#|F{%vi%+O2^<ba$kF;<;;Rt95z5<wHL5K(j+Q8k$UbpgxRp3j{Mp^w)B^HfYf
zDA0hRMhNbE2=Vj2YiL~z1)_|?;fh9jerBnuTe?P4hal2R4f7=m$Q(~VOU_C<;|0{Z
z3|u!g6zg=FOiT;#Yow7zlAZMlBeju5?i6<U#@UV0Bb~8OCe{A7Ccmu?Gyqdhjg(s#
z+lg05=w;`87GW>~uK3)?$6<Ii6i|CibK0rXDvO^#;fkTXF9V{wZfQL2cW5uAO1K21
zyr@nFcEG^iu`2#R9oGU;Lq1G%agZl2%SOI7JXztK#Z;$;)Lz*}ur422VHM7@=-v?f
zBlBe`7E*iZpFhhLUcSr4=IECR7@1F_Ml2FfW0MO&eq+fQw8MX@4v0dY1>>9cc7_}F
zWU72eFrzZ~x3ZIBH;~EMtD%51o*bnW;&QuzwWd$<Sv0&$GkytlNUOK6=cE?4aMBme
z1h#{t_Gn%>ds=O>Ev807cu%>Ac^ZK&7bCN;Ftk#eeQL4pG0p!W{Ri@tGw>nhIo`rC
zi!Z6?70nYr<u`@synlh-MYS0<B^dq282OT7OFjP<^MkKg!2Li61nIAG$0&EsmPTPr
zR)}<%a~xy;pP3@S-zf2+&bEh1;6wodY7P24J|Iev;5LQ+!5jDK@1Jw&i1XSXY*mE}
zt$!>Nf92V{Y_i(a4DG=5>RktP=?%GcHEx?aKN$@{w{uj#Cqev$bXefo?yC6KI%Rol
z%~$974WCymg;BBhd9Mv}_MeNro_8IB4!evgo*je4h?B-CAkEW-Wr-Q_V9~ef(znU&
z{f-OHnj>@lZH(EcUb2TpOkc70@1BPiY0B#++1EPY5|UU?&^Vpw|C`k4ZWiB-3oAQM
zgmG%M`2qDw5BMY|tG++34My2fE|^kvMSp(d+~P(Vk*d+RW1833i_bX^RYbg9tDtX`
zox?y^YYfs-#fX|y7i(FN7js)66jN!`p9^r7oildEU#6J1(415H3h>W*p(p9@dI|c7
z&c*Aqzksg}o`D@i+o@WIw&jjvL!(`)JglV5zwMn)praO2M05H&CDeps0Wq8(8AkuE
zPm|8MB6f0kOzg(gw}k>rzhQyo#<#sVdht~Wdk`y`=%0!jbd1&>Kxed8lS{Xq?Zw>*
zU5;dM1tt``JH+A9@>H%-9f=<q<+LVr{M#T<q^Cnc-&?xMZN&ijTkf8?0<(syaVN;&
z(C3Efq5EyyrE~N$#X}_S8c^@i6}!4ZVjtXj?-J{FtLW*bQ{65S1G|KSG!!l69P$zC
z{siN1*3l-kL=tqVq$_mWRT&v!^(EH-d>EnW)UkRJe0+e^iqm0C5Z5?iEn#lbp}Xso
ztleC}hl&*yPFcoCZ@s<vLB4vKL);?UQ8SNsN-4lT7E(h++9yfu0i+RG?zQZ`Vyu!N
z2csF4b4_|Yj8d3fGl192T|jkwza^`sMg!wyzjg4YT*3%R=hCis_KugR){yZ{69#*3
zK<)AFqpKOIQ3(`3fk3V+JNe31%APK*Q^d*1qjD!07S=F+NAlE*3L1Zbd=12fPr9W#
zjsGg@L~A0y+Dv6%JO9(Ta*Ah3uR3g(3z}G`82M)ekyTxF_;RCYSlBdkw<IaMsMQ?e
zbsMfyKpLJ)Okmnzl2(R+c-sy1Ki;aKK-sU-FR6hwy#IRr72%A4)qj-ug11pmglUA^
zU@_5Gw6!(Wdy$iHzby;~7AhGdig(Mkgk1LPjq5QFk0S4Cl+LBU^bzgEux96pNv;KN
zUR+$IJ#$~DWu^%Nz(1&3Se2cJg9EwK1ih4HlD~*P+AU9y9Gh^R$@}B0u-*gkxP!N`
zI`OEtCMx2=OXR>gvvjBA_Ew6msFml$cfLQY_(=h03WS_z+Leeh$M3#-?f9YT^Q($z
z+pgaEv$r<Ugeur|SR*p$+UFDnLL;xoN-%!T43feTdR&aK^iX*=YkAhKCcZGH6=Hc`
zK<f-)!~rlB=sV5y>Ia*9wST`WHASQio=9IaVS7l<87%;83~X*`{BX#@>>p=k`@FYo
ze!K5_h8hOc`m0mK0p}LxsguM}w=9vw6Ku8y@RNrXSRPh&S`t4UQY=e-B8~3YCt1Fc
zU$CtRW%hbcy{6K{>v0F*X<`rXVM3a{!muAeG$zBf`a(^l${EA9w3>J{<NHaZSe3Dx
zY8Dg(e$l6m2U+$Er9e(r#AcIf<kD?-fMtOH$;$Ez#?uh-p(moA2-$e?HZ?d3`gHO^
zLs#=xyRr;&%j-2s;@q4VtWbGT-(B6wwnV|+r>aPwJT?mKVN2ba+v)Mp*~gQ_+Ws6=
zy@D?85!U@VY0z9T=E9LMbe$?7_KIg)-R$tD)9NqIt84fb{B;f7C)n+B8)Cvo*F0t!
zva6LeeC}AK4gL#d#<LpOpPalt`s^?A%fPT!zdEW(FA^EFVBGD5=s#;p_o>N_HvvD&
z0;mdU3@7%d5>h(xX-NBmJAOChtb(pX-qUtR<NGf~8Y({*{Qd2}r;MLZ_vin>LF5f$
z`X<bri1=?cM=8<+71}cIK~u!^Xc=hLQi+++$ZeGh>?Kpu?ENMc88>O&ym_$Jc7LZ>
z#73|xJ|aa@l}PawS4Mpt9n)38w#q^P1w2N|rYKdcG;<tU5_YID!TW~j<gG_D0?bfZ
zAx5SYdUR0;(Qp~TWf)<@H*?|jqIg?jv>nb!_nHMZA_09L!j)pBK~e+j?tb-_A`wF8
zIyh>&%v=|n?+~h}%i1#^9UqZ?E9W!qJ0d0EHmioSt@%v7FzF`eM$X==#oaPESHBm@
zYzTXVo*y|C0~l_)|NF|F(If~YWJVkQAEMf5IbH{}#>PZpbXZU;+b^P8L<V=zh^PmD
zL`7&OcUEqxV0p9pX<02z-THUDhdvEGk97J;t-GBJ<nF(C?^w$|%4@|~DP~oZlYgIl
zuI+NRKR*sNKvHH6R=w{`+FIkv?XA>WmlmDJ%Zu)4CajvRL!g_Faph`g0hpA2)D0|h
zYy0h5+<vXcbvZ!}-Ti2$yE64n^Sfk2I--2XL&qjovG)2_V|^=LBv9V~JglT}?G{~<
z!pmh?-EZ?Hnt@nUC6p23YL!L4k^U?vrZo%<4hyajBFhPn!n$|mWN_#4En32u<1zn!
zu-nPRAo(%8b6>@4T81(s0D=crojdj|dYa{Y=<2zKp@xl&{sHO;#|!uTHtTey25f1U
z#=Nyz{rJy#@SPk3_U|aALcg%vEjwIqSO$LZI59<YMW2T5A_lwnC?F0LTE49h#h(4+
z5@#;o=aOg6Ty^S7NeNEi8BQv>^;Mu~Swb53L+>oxWiN7J{;P*(2b@ao*aU~}-_j10
z@fQiaWnb}fRrHhNKrxKmi{aC#34<Ne?5f?i(t}|X_E14g4c;<RChmG6j68+0n_%a=
z5|bnIjoCZq*qma>BRP(a#0K>-J8D+v_2!~(V-6J%M@L{s?fU5ChwFfqn)2$siOUKw
z?SmIRlbE8ot5P^z0J&G+rQ5}H=JE{FNsg`^jab7g-c}o`s{JS{-#}CRdW@hO`HfEp
z1eR0<hko%0^tlAD{Bs=wlKM5<olTH(jMXi+3-x##vBp{A3eZRJrKN8uvd%5RzMT#n
z68`b?pf9bXk0(J)&vOsl{d9K0)2Cr%Vk3VloUq}n%`ke311Pl4;%DuDh2;4Z>DsN!
zt5xmsYt{Uu;ZM`CgW)VYk=!$}N;w+Ct$Wf!*Z-7}@pA62F^1e$Ojz9O5H;TyT&rV(
zr#<BLuF>IBM8<W03YGL3%?f^4_AqtJpyj#h&p$VI3rl`I`^taW$jxAML<$(BdMwx_
zlLmr$vOaoI0IA<o)>te~-2t2;kv2xm&z%tt3pyt|s#vg2EOx1XkfsB<u=a#QAHFyw
zH^#er(Fasy7e*uyj*LRn;;cw)`8HoCa<6waLzyN|B}26Z?f#|l5{!Lo7xhOuO!}qW
zbC^9ND3VwU&(zUs<yvQCMiiM!;ElHzg2J~V^hj}-Lfwl~SrFWideTJ|+XrQuCDiS<
z)vM6eQf~V@yT)+mzn`+@eTvHTgxq*XAn*5~P%Kpv#89KZUu>*RM;D>ab$W-D6#Jdf
zJ3{yD;P4=pFNk2GL$g~+5x;f9m*U2!ovWMK^U5`mAgBRhGpu)e`?#4vsE1aofu)iT
zDm;aQIK6pNd8MMt@}h|t9c$)FT7PLDvu3e)y`otVe1SU4U=o@d!gn(DB9kC>Ac1wJ
z?`{Hq$Q!rGb9h&VL#z+BKsLciCttdLJe9EmZF)J)c1MdVCrxg~EM80<OYrqK%FS_O
zx}L#|X%K3tWqV@0vzDsnnR3Yz?SjfReMeOp#n1B7DSod$5n^}wbM_)dHEDu_nV)?R
z!c3rf)Of{=$5uKL#I@V1Ws|Z5fZ4NpoMn{Vt{-gR^QY-}n)k?MJLe+(H*DLi@ubuD
zJ>_b3k{ur=jVjrVhDK1GTjd3&t#ORvC0Q_&m|n>&TF1C_>k^8&ylR7oz#rG?mE%V|
zepj0BlD|o?p8~LK_to`GINhGyW{{jZ{xqaO*SPvH)BYy1eH22DL_Kkn28N!0z3fzj
z_+xZ3{ph_Tgkd)D$OjREak$O{F~mODA_D`5VsoobVnpxI<L#y)dT{XZ@6C1AwZkx=
z#&n}Q%H5?TjCQfym&hus3U5BHHIrCx1lCD^^tf!XhezUxy8nw6bXYs))PhzY)EbV~
z3_uarYiYvr3Pwc2$wF1I24aXT5%LN$)?(Q8ezWWgqA6SimfTwJTLp0QrC{lEbrWx)
zJ;3xJ%h9biZ#RRkBdua)Y&WiYHVQr56z{shOIS=w&x(H=87V2*HYE2h0gb!qf{Jvq
z^Y==~Gp_|z$%Yc`0s9OhhH~H)!fwAop3O+L?QQ&)<5x(4oOcNSU`gIBbPz$19h8Vi
z=x{Sq{n8pR)3(2lByb(h#PyQT+r6_RQ~eScAm}hch0nJiuE6tB&ns}cLsxs|ui(=>
zV0F_79%JB!?@jPs=cY73FhGuT!<K$a=G|53e{10$p+byZeKD{oLj89mh@LC}=%NX0
z;*KNX7R-K^!*zxK691T$=ETKR3FMLcQe#X=<6^Ubhq;0af0G`<fK*adOjW173pl<B
z01`*u%;G66RFIDk4yL`Xeck?Ec|CUlA6<`FzY$xfm|b6;?e52Vf1?xaS(4T=peR5I
z`?V%dkA|C!r{l_7!OGwBXtbID_FDLfk@nuPBO#I2YcSR_(&2p~ezLTg$*hJyS9id*
zIVqsN$5(G<j!-p(3x6BVMb~3eT}-TWte&t8Hw$UAjb%!=vt3(V#FxL>?fpVX1W=Wm
zK5}i7(Pfh4o|Z{Ur=Y>bM1BDo2OdXBB(4Y#Z!61A8C6;7`6v-(P{ou1mAETEV?Nt<
zMY&?ucJcJ$NyK0Zf@b;U#3ad?#dp`>zmN<gr`{4O%cMrKxJwRla^p0?!O?&AEgD?v
z+o$qCnnug51;!OM^et<=@e!eMXwUGFJXwg~`R((9W1ml^g2V_H^M~P?j;4e#lHGTQ
z@o$?Z;gOHRYcLSD_PBHaO);T6r9aGw>n=H1&-<Xr>H`Y+)ai-TfyZJX@O&nRB*7j$
zDQF!q#a7VHL3z#Hc?Ca!MRbg<t0CM<jNd$9g{^<cPIWj4e6fx|J;XcBe<*U<nwT?=
z|2dLWm#eObkDu9iqDM9n+dIe!&FvDUWehAEb@;_47iOsYhZJ1`$c&IWG&}fV$2)}H
z$Ag?+n{DXVCqvJ=xR_!Y(QY$HsT4GoXpk@2mNXrU7sE_1ouq{duV;<HzGQ?qpd*wp
z@ZzwS=W7<)0Hr(b4ettbWO2^GYSwO|sWaRtx#Mtwp4TWZlPkdry}8Q423of>L`daF
zW#;L$yiQP|5VvgvRLluk3>-1cS+7MQ1)DC&DpYyS9j;!Rt$HdXK1}tG3G_)ZwXvGH
zG;PB^f@CFrbEK4>3gTVj73~Tny+~k_pEHt|^<lR`mlNFIi9z2bxO*+RL86KeAWH4$
zU4VsFpeQG~WVDSof1UN^o@%PJAewV!QpQH-VHGj;=}0vP`eH{TpWLIqcJqm)jkN53
z<II)B6VMc5@{*J}uF{>eLw{?6NbG&`Ng9diB9XsMr(ztNC!{FhW8Hi!)TI`(Q|F*b
z-z;#*c1T~kN67omP(l7)ZuTlxaC_XI(K8$VPfAzj?R**AMb0*p@$^PsN!LB@RYQ4U
zA^xYY9sX4+;7gY%$i%ddfvneGfzbE4ZTJT5Vk3&1`?ULTy28&D#A&{dr5ZlZH&NTz
zdfZr%Rw*Ukmgu@$C5$}QLOyb|PMA5syQns?iN@F|VFEvFPK321mTW^uv?GGNH6rnM
zR9a2vB`}Y++T3Wumy$6<!67?cC%>`W)_c0PS*L;;0J^(T7<)`s{}lZVp`e)fM^?{$
zLbNw>N&6aw5Hlf_M)h8=)x0$*)V-w-Pw5Kh+EY{^$?#{v)_Y{9p5K{DjLnJ(Z<ay_
zQ|zCgJ7Z<@f^IyT#!w8xRb(NaD!Nm0u%yH}t?$zg)w^&IK4Z`0m)_RSq1QCUJEibT
z7kQvMAXo4U!zLzUk>Ucyk*y(6D8wHB8=>Y)fb_Pw0v)Xybk`Sw@hNEaHP$-n`DtYP
ziJyiauEXtuMpWyQjg$gdJR?e+=8w+=5GO-OT8pRaVFP1k^vI|I&agGjN-O*bJEK!M
z`kt^POhUexh+PA&@And|vk-*MirW?>qB(f<fb}iMf`M1*cE2&^ns<lAgNbe9%8FD$
zwjvM|R2me}U1H(R)#ASROdqw^rZnHr0&f97^OKn&Qj^OAr-J8;B23)_uUb<>%y{ux
z*d44UXxQOs+C`e-x4KSWhPg-!gO~kavIL8X3?!Ac2ih-dkK~Ua2qlcs1b-AIWg*8u
z0QvL~51vS$LnmJSO<hpkIr+#{?3T{F9>nV4JUCUzg&4;bSsR5r_=FD@y|)Y2R_--e
zMWJ;~*r<i!;TA2bZ)HKh8;KT9<ZHJ@A^xz#EfNXNM<Iaxvn=m=sJYOJ@7H!t#H3v1
zI%NsU5_wkr0!QqEEvXG^6jST`^S>=vJssF5_*n?wF0DO_>Mja=g+HvT=Yd^uBU|aw
zRixHUQJX0Pgt-nFV+8&|;-n<aRd<Z#DH?k4n__AwYiBH~b*I+O${aSV!V6<4WmU!Y
zsadZ+r7y_;@eome8lEH+W|l)H7<g)uB&cK=<NbeH>>!jNUj!8Y_YzH*%M!-_uWt6&
z|Ec+lAD``i^do;u_?<(RpzsYZVJ8~}|NjUFgXltofbjhf!v&208g^#0<NyCEi~Rq?
z$PwqiMoc*zc>h-x?`z8cInq!9kfVwJ|HQ;VK>p_-fn@(3q?e51Keq(=U-7C0#as-q
z8Or}Ps07>O2@AAXz_%3bTOh{tKm#uRe}Sqr=w6-Wz$FCdfF3qNabEaj`-OfipxaL-
zPh2R*l&%ZbcV?lv4C3+t2DAVSFaRo20^W_n4|0t(_*`?KmmUHG2sNZ*CRZ<Vl7Sz}
z4RnAGishdzC)X@en*4i_sx;)tVg`me7}2q6vh`wr8N?~M3=EDah6vkFwplEVbilC{
zEBNTu$^DB(nS>lCFIyZbJqLdBCj)~%if)g|4NJr(8!R!E0iBbm$;`m;1n2@(8*E%B
zH!g{hK|WK?1jUfM9zX?hlV#l%!6^p$$P+~rg}OdKg|d^Ed4WTY1$1J@WWHr$Os_(L
z;-Zu1FJqhR4LrCUl<W{I<bh|WpctYa0aa`ugIHt3z@UVpXlgD<(WK=XGQjmCkmV!5
z;MYY_v#}DQ2DB;%lGYKUcMJ>)C~E7gA!^wtA6YIh10In9rX@LGSjnTPtLp+gPGp6u
z3}{?J1!yT~?FwqT;O_-1%37f#4ek&DL){N}MX3RbNfRb-T;U^wXhx#De&QssA$lu~
mWkA_K7-+yz9tH*t6hj_Qg(_m7JaeTomk=)l!_+yTk^le-`GmOu

delta 34176
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
SGW6ptSs!X7{rG*o_g?|vpSEZK

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1af9e0930b..b82aa23a4f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew.bat b/gradlew.bat
index 93e3f59f13..25da30dbde 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

From db33853d016476d0eec20b1890cd548b72887890 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 24 May 2024 05:58:06 +0000
Subject: [PATCH 1619/2068] Update dependency org.assertj:assertj-core to
 v3.25.3

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 0bc62fde7a..55fb82ee63 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -30,5 +30,5 @@ VER_SLF4J=[1.6,2.0[
 VER_DURIAN=1.2.0
 VER_JGIT=6.7.0.202309050840-r
 VER_JUNIT=5.10.2
-VER_ASSERTJ=3.24.2
+VER_ASSERTJ=3.25.3
 VER_MOCKITO=5.8.0

From e35ec296c352225ffc3101ede1b1c4d2004382d1 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 24 May 2024 06:15:49 +0000
Subject: [PATCH 1620/2068] Update dependency org.mockito:mockito-core to
 v5.12.0

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 55fb82ee63..7ea945b933 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -31,4 +31,4 @@ VER_DURIAN=1.2.0
 VER_JGIT=6.7.0.202309050840-r
 VER_JUNIT=5.10.2
 VER_ASSERTJ=3.25.3
-VER_MOCKITO=5.8.0
+VER_MOCKITO=5.12.0

From eef27247d80846ec85bdc99bc3da49cd21dc5455 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 24 May 2024 10:12:44 +0000
Subject: [PATCH 1621/2068] Update plugin com.diffplug.spotless to v6.25.0

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index b1543d611e..942ac646ae 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-	id 'com.diffplug.spotless' version '6.23.3' apply false
+	id 'com.diffplug.spotless' version '6.25.0' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
 	id 'com.gradle.plugin-publish' version '1.2.1' apply false
 	// https://github.com/gradle-nexus/publish-plugin/releases

From c0221afa90b363e5b695039660d42485062ce22f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 24 May 2024 10:12:48 +0000
Subject: [PATCH 1622/2068] Update github/codeql-action action to v3

---
 .github/workflows/codeql-analysis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 7fb9daff0d..5e41395eb0 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -50,7 +50,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -61,7 +61,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -75,4 +75,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

From c97cdc39bb2d9901d3d417356bbb199f629d3c3d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 24 May 2024 13:41:08 +0000
Subject: [PATCH 1623/2068] Update gradle/wrapper-validation-action action to
 v3

---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index d8be29afda..8d5a16db70 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -20,4 +20,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: gradle/wrapper-validation-action@v3

From ea2ad711140f65ebe14888a6e19f282f3ccefea4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 26 May 2024 13:16:44 +0000
Subject: [PATCH 1624/2068] Update dependency org.assertj:assertj-core to
 v3.26.0

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 7ea945b933..5d0c627d65 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -30,5 +30,5 @@ VER_SLF4J=[1.6,2.0[
 VER_DURIAN=1.2.0
 VER_JGIT=6.7.0.202309050840-r
 VER_JUNIT=5.10.2
-VER_ASSERTJ=3.25.3
+VER_ASSERTJ=3.26.0
 VER_MOCKITO=5.12.0

From cf6c76f83003c290dbbaaadf4d83dba14550e158 Mon Sep 17 00:00:00 2001
From: Olivier Genez <olivier.genez@gmail.com>
Date: Tue, 28 May 2024 10:46:36 +1000
Subject: [PATCH 1625/2068] Check if ktlint_code_style is set in .editorconfig
 before overriding it

ktlint_code_style gets unconditionally overridden to its default value
(intellij_idea) when the editorConfigOverride map is non-empty but does
not define it. As a result, it gets overridden even if it's actually
defined in the .editorconfig file.

This change checks if ktlint_code_style is already defined in
.editorconfig before overriding it to its default value.

Fixes https://github.com/diffplug/spotless/issues/2142.
---
 .../compat/KtLintCompat1Dot0Dot0Adapter.java  | 23 +++++++++++--------
 .../gradle/spotless/KotlinExtensionTest.java  | 21 ++++++++++++++++-
 2 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java b/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
index 1790f9475c..a6e631718d 100644
--- a/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
+++ b/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
@@ -93,20 +93,21 @@ public String format(
 				.flatMap(loader -> loader.get().getRuleProviders().stream())
 				.collect(Collectors.toUnmodifiableSet());
 
-		EditorConfigOverride editorConfigOverride;
-		if (editorConfigOverrideMap.isEmpty()) {
-			editorConfigOverride = EditorConfigOverride.Companion.getEMPTY_EDITOR_CONFIG_OVERRIDE();
-		} else {
-			editorConfigOverride = createEditorConfigOverride(allRuleProviders.stream().map(
-					RuleProvider::createNewRuleInstance).collect(Collectors.toList()),
-					editorConfigOverrideMap);
-		}
 		EditorConfigDefaults editorConfig;
 		if (editorConfigPath == null || !Files.exists(editorConfigPath)) {
 			editorConfig = EditorConfigDefaults.Companion.getEMPTY_EDITOR_CONFIG_DEFAULTS();
 		} else {
 			editorConfig = EditorConfigDefaults.Companion.load(editorConfigPath, RuleProviderKt.propertyTypes(allRuleProviders));
 		}
+		EditorConfigOverride editorConfigOverride;
+		if (editorConfigOverrideMap.isEmpty()) {
+			editorConfigOverride = EditorConfigOverride.Companion.getEMPTY_EDITOR_CONFIG_OVERRIDE();
+		} else {
+			editorConfigOverride = createEditorConfigOverride(
+					editorConfig,
+					allRuleProviders.stream().map(RuleProvider::createNewRuleInstance).collect(Collectors.toList()),
+					editorConfigOverrideMap);
+		}
 
 		return new KtLintRuleEngine(
 				allRuleProviders,
@@ -120,7 +121,7 @@ public String format(
 	/**
 	 * Create EditorConfigOverride from user provided parameters.
 	 */
-	private static EditorConfigOverride createEditorConfigOverride(final List<Rule> rules, Map<String, Object> editorConfigOverrideMap) {
+	private static EditorConfigOverride createEditorConfigOverride(final EditorConfigDefaults editorConfig, final List<Rule> rules, Map<String, Object> editorConfigOverrideMap) {
 		// Get properties from rules in the rule sets
 		Stream<EditorConfigProperty<?>> ruleProperties = rules.stream()
 				.flatMap(rule -> rule.getUsesEditorConfigProperties().stream());
@@ -132,7 +133,9 @@ private static EditorConfigOverride createEditorConfigOverride(final List<Rule>
 				.collect(Collectors.toMap(EditorConfigProperty::getName, property -> property));
 
 		// The default style had been changed from intellij_idea to ktlint_official in version 1.0.0
-		if (!editorConfigOverrideMap.containsKey("ktlint_code_style")) {
+		boolean isCodeStyleDefinedInEditorConfig = editorConfig.getValue().getSections().stream()
+				.anyMatch(section -> section.getProperties().containsKey("ktlint_code_style"));
+		if (!isCodeStyleDefinedInEditorConfig && !editorConfigOverrideMap.containsKey("ktlint_code_style")) {
 			editorConfigOverrideMap.put("ktlint_code_style", "intellij_idea");
 		}
 
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
index 1e96d34574..9720276e15 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -127,6 +127,25 @@ void testReadCodeStyleFromEditorConfigFile() throws IOException {
 		checkKtlintOfficialStyle();
 	}
 
+	@Test
+	void testEditorConfigOverrideWithUnsetCodeStyleDoesNotOverrideEditorConfigCodeStyleWithDefault() throws IOException {
+		setFile(".editorconfig").toResource("kotlin/ktlint/ktlint_official/.editorconfig");
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    kotlin {",
+				"        ktlint().editorConfigOverride([",
+				"	         ktlint_test_key: true,",
+				"        ])",
+				"    }",
+				"}");
+		checkKtlintOfficialStyle();
+	}
+
 	@Test
 	void testSetEditorConfigCanOverrideEditorConfigFile() throws IOException {
 		setFile(".editorconfig").toResource("kotlin/ktlint/intellij_idea/.editorconfig");

From 5b9e12388bc97cac36dbf1db7453caa718638622 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Tue, 28 May 2024 17:56:29 +0400
Subject: [PATCH 1626/2068] Upgrade Spotless, and provide File to Cleanthat for
 better error logging

---
 CHANGES.md                                       |  1 +
 lib/build.gradle                                 |  2 +-
 .../glue/java/JavaCleanthatRefactorerFunc.java   | 16 ++++++++++------
 .../spotless/java/CleanthatJavaStep.java         |  2 +-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index dbeb53a0a2..0fdba74748 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -28,6 +28,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
 * Bump default `sortpom` version to latest `3.2.1` -> `4.0.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049), [#2078](https://github.com/diffplug/spotless/pull/2078), [#2115](https://github.com/diffplug/spotless/pull/2115))
 * Bump default `zjsonpatch` version to latest `0.4.14` -> `0.4.16`. ([#1969](https://github.com/diffplug/spotless/pull/1969))
+* Bump default `cleanthat` version to latest `2.17` -> `2.20`. ([#1725](https://github.com/diffplug/spotless/pull/1725))
 ### Removed
 * **BREAKING** Remove `JarState.getMavenCoordinate(String prefix)`. ([#1945](https://github.com/diffplug/spotless/pull/1945))
 * **BREAKING** Replace `PipeStepPair` with `FenceStep`. ([#1954](https://github.com/diffplug/spotless/pull/1954))
diff --git a/lib/build.gradle b/lib/build.gradle
index 783f99d288..c82c648e07 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -80,7 +80,7 @@ dependencies {
 
 	// GLUE CODE (alphabetic order please)
 	// cleanthat
-	String VER_CLEANTHAT='2.17'
+	String VER_CLEANTHAT='2.20'
 	cleanthatCompileOnly "io.github.solven-eu.cleanthat:java:$VER_CLEANTHAT"
 	compatCleanthat2Dot1CompileAndTestOnly "io.github.solven-eu.cleanthat:java:$VER_CLEANTHAT"
 	// diktat old supported version 1.x
diff --git a/lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java b/lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java
index 1137604264..abf55ba936 100644
--- a/lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java
+++ b/lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 package com.diffplug.spotless.glue.java;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collections;
@@ -31,12 +32,13 @@
 import eu.solven.cleanthat.engine.java.refactorer.JavaRefactorer;
 import eu.solven.cleanthat.engine.java.refactorer.JavaRefactorerProperties;
 import eu.solven.cleanthat.formatter.LineEnding;
+import eu.solven.cleanthat.formatter.PathAndContent;
 
 /**
  * The glue for CleanThat: it is build over the version in build.gradle, but at runtime it will be executed over
  * the version loaded in JarState, which is by default defined in com.diffplug.spotless.java.CleanthatJavaStep#JVM_SUPPORT
  */
-public class JavaCleanthatRefactorerFunc implements FormatterFunc {
+public class JavaCleanthatRefactorerFunc implements FormatterFunc.NeedsFile {
 	private static final Logger LOGGER = LoggerFactory.getLogger(JavaCleanthatRefactorerFunc.class);
 
 	private String jdkVersion;
@@ -56,20 +58,20 @@ public JavaCleanthatRefactorerFunc() {
 	}
 
 	@Override
-	public String apply(String input) throws Exception {
+	public String applyWithFile(String unix, File file) throws Exception {
 		// https://stackoverflow.com/questions/1771679/difference-between-threads-context-class-loader-and-normal-classloader
 		ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader();
 		try {
 			// Ensure CleanThat main Thread has its custom classLoader while executing its refactoring
 			Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
-			return doApply(input);
+			return doApply(unix, file);
 		} finally {
 			// Restore the originalClassLoader
 			Thread.currentThread().setContextClassLoader(originalClassLoader);
 		}
 	}
 
-	private String doApply(String input) throws InterruptedException, IOException {
+	private String doApply(String input, File file) throws IOException {
 		// call some API that uses reflection without taking ClassLoader param
 		CleanthatEngineProperties engineProperties = CleanthatEngineProperties.builder().engineVersion(jdkVersion).build();
 
@@ -88,7 +90,9 @@ private String doApply(String input) throws InterruptedException, IOException {
 		LOGGER.debug("Processing sourceJdk={} included={} excluded={}", jdkVersion, included, excluded, includeDraft);
 		LOGGER.debug("Available mutators: {}", JavaRefactorer.getAllIncluded());
 
-		return refactorer.doFormat(input);
+		PathAndContent pathAndContent = new PathAndContent(file.toPath(), input);
+
+		return refactorer.doFormat(pathAndContent);
 	}
 
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
index 0408ba6749..7d39cd9f1c 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
@@ -40,7 +40,7 @@ public final class CleanthatJavaStep implements java.io.Serializable {
 	/**
 	 * CleanThat changelog is available at <a href="https://github.com/solven-eu/cleanthat/blob/master/CHANGES.MD">here</a>.
 	 */
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "2.16");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "2.20");
 
 	private final JarState.Promised jarState;
 	private final String version;

From 6c0d270f8455aa0b266dffa4731b6b1b5ffe6eea Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Wed, 29 May 2024 12:18:23 +0400
Subject: [PATCH 1627/2068] Fix CHANGES.MD, Fix
 JVM_SUPPORT.suggestLaterVersionOnError for NeedsFile management

---
 CHANGES.md                                    |  2 +-
 .../spotless/java/CleanthatJavaStep.java      | 22 ++++++++-
 plugin-gradle/CHANGES.md                      |  1 +
 plugin-maven/CHANGES.md                       |  1 +
 .../java/CleanthatJavaFormatStepTest.java     | 46 +++++++++++++++++++
 5 files changed, 69 insertions(+), 3 deletions(-)
 create mode 100644 testlib/src/test/java/com/diffplug/spotless/java/CleanthatJavaFormatStepTest.java

diff --git a/CHANGES.md b/CHANGES.md
index 0fdba74748..94d69df336 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -28,7 +28,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
 * Bump default `sortpom` version to latest `3.2.1` -> `4.0.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049), [#2078](https://github.com/diffplug/spotless/pull/2078), [#2115](https://github.com/diffplug/spotless/pull/2115))
 * Bump default `zjsonpatch` version to latest `0.4.14` -> `0.4.16`. ([#1969](https://github.com/diffplug/spotless/pull/1969))
-* Bump default `cleanthat` version to latest `2.17` -> `2.20`. ([#1725](https://github.com/diffplug/spotless/pull/1725))
+* Bump default `cleanthat` version to latest `2.16` -> `2.20`. ([#1725](https://github.com/diffplug/spotless/pull/1725))
 ### Removed
 * **BREAKING** Remove `JarState.getMavenCoordinate(String prefix)`. ([#1945](https://github.com/diffplug/spotless/pull/1945))
 * **BREAKING** Replace `PipeStepPair` with `FenceStep`. ([#1954](https://github.com/diffplug/spotless/pull/1954))
diff --git a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
index 7d39cd9f1c..42c90c2ec6 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
@@ -15,12 +15,14 @@
  */
 package com.diffplug.spotless.java;
 
+import java.io.File;
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.util.List;
 import java.util.Objects;
 
+import com.diffplug.spotless.Formatter;
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
@@ -166,12 +168,28 @@ FormatterFunc createFormat() {
 				Constructor<?> formatterConstructor = formatterClazz.getConstructor(String.class, List.class, List.class, boolean.class);
 
 				formatter = formatterConstructor.newInstance(sourceJdkVersion, included, excluded, includeDraft);
-				formatterMethod = formatterClazz.getMethod("apply", String.class);
+				formatterMethod = formatterClazz.getMethod("apply", String.class, File.class);
 			} catch (ReflectiveOperationException e) {
 				throw new IllegalStateException("Issue executing the formatter", e);
 			}
 
-			return JVM_SUPPORT.suggestLaterVersionOnError(version, input -> (String) formatterMethod.invoke(formatter, input));
+			FormatterFunc formatterFunc = new FormatterFunc() {
+				@Override
+				public String apply(String input) throws Exception {
+					return apply(input, Formatter.NO_FILE_SENTINEL);
+				}
+
+				@Override
+				public String apply(String input, File file) throws Exception {
+					if (file.isAbsolute()) {
+						// Cleanthat expects a relative file as input (relative to the root of the repository)
+						file = new File(".", file.getPath());
+					}
+					return (String) formatterMethod.invoke(formatter, input, file);
+				}
+			};
+
+			return JVM_SUPPORT.suggestLaterVersionOnError(version, formatterFunc);
 		}
 	}
 }
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index bccb62dcb1..d00a5f89e0 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -23,6 +23,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
 * Bump default `sortpom` version to latest `3.2.1` -> `4.0.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049), [#2078](https://github.com/diffplug/spotless/pull/2078), [#2115](https://github.com/diffplug/spotless/pull/2115))
 * Bump default `zjsonpatch` version to latest `0.4.14` -> `0.4.16`. ([#1969](https://github.com/diffplug/spotless/pull/1969))
+* Bump default `cleanthat` version to latest `2.16` -> `2.20`. ([#1725](https://github.com/diffplug/spotless/pull/1725))
 ### Removed
 * **BREAKING** Fully removed `Rome`, use `Biome` instead. ([#2119](https://github.com/diffplug/spotless/pull/2119))
 
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 557e011ac4..2ee226208b 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -21,6 +21,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
 * Bump default `sortpom` version to latest `3.2.1` -> `4.0.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049), [#2078](https://github.com/diffplug/spotless/pull/2078), [#2115](https://github.com/diffplug/spotless/pull/2115))
 * Bump default `zjsonpatch` version to latest `0.4.14` -> `0.4.16`. ([#1969](https://github.com/diffplug/spotless/pull/1969))
+* Bump default `cleanthat` version to latest `2.16` -> `2.20`. ([#1725](https://github.com/diffplug/spotless/pull/1725))
 ### Removed
 * **BREAKING** Fully removed `Rome`, use `Biome` instead. ([#2119](https://github.com/diffplug/spotless/pull/2119))
 
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/CleanthatJavaFormatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/CleanthatJavaFormatStepTest.java
new file mode 100644
index 0000000000..36a060ecd4
--- /dev/null
+++ b/testlib/src/test/java/com/diffplug/spotless/java/CleanthatJavaFormatStepTest.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2016-2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.java;
+
+import org.junit.jupiter.api.Test;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.ResourceHarness;
+import com.diffplug.spotless.StepHarnessWithFile;
+import com.diffplug.spotless.TestProvisioner;
+
+class CleanthatJavaFormatStepTest extends ResourceHarness {
+
+	@Test
+	void testDefault() {
+		FormatterStep step = CleanthatJavaStep.create(TestProvisioner.mavenCentral());
+		try (StepHarnessWithFile harness = StepHarnessWithFile.forStep(this, step)) {
+			harness.testResource("java/cleanthat/MultipleMutators.dirty.test", "java/cleanthat/MultipleMutators.dirty.test");
+		}
+	}
+
+	@Test
+	void test11IncludeDraft() {
+		FormatterStep step = CleanthatJavaStep.create("io.github.solven-eu.cleanthat:java",
+				CleanthatJavaStep.defaultVersion(),
+				"11",
+				CleanthatJavaStep.defaultMutators(), CleanthatJavaStep.defaultExcludedMutators(), true, TestProvisioner.mavenCentral());
+		try (StepHarnessWithFile harness = StepHarnessWithFile.forStep(this, step)) {
+			harness.testResource("java/cleanthat/MultipleMutators.dirty.test", "java/cleanthat/MultipleMutators.clean.onlyOptionalIsPresent.test");
+		}
+	}
+
+}

From 1a3df0071b3076d733c3ab28d6beab92f91be2fa Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Wed, 29 May 2024 12:34:45 +0400
Subject: [PATCH 1628/2068] Fix spotbugs

---
 .../spotless/java/CleanthatJavaStep.java      | 41 ++++++++++++-------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
index 42c90c2ec6..b12b880883 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
@@ -158,6 +158,31 @@ private static final class State implements Serializable {
 			this.includeDraft = includeDraft;
 		}
 
+		private static class JvmSupportFormatterFunc implements FormatterFunc {
+
+			final Object formatter;
+			final Method formatterMethod;
+
+			private JvmSupportFormatterFunc(Object formatter, Method formatterMethod) {
+				this.formatter = formatter;
+				this.formatterMethod = formatterMethod;
+			}
+
+			@Override
+			public String apply(String input) throws Exception {
+				return apply(input, Formatter.NO_FILE_SENTINEL);
+			}
+
+			@Override
+			public String apply(String input, File file) throws Exception {
+				if (file.isAbsolute()) {
+					// Cleanthat expects a relative file as input (relative to the root of the repository)
+					file = new File(".", file.getPath());
+				}
+				return (String) formatterMethod.invoke(formatter, input, file);
+			}
+		}
+
 		FormatterFunc createFormat() {
 			ClassLoader classLoader = jarState.getClassLoader();
 
@@ -173,21 +198,7 @@ FormatterFunc createFormat() {
 				throw new IllegalStateException("Issue executing the formatter", e);
 			}
 
-			FormatterFunc formatterFunc = new FormatterFunc() {
-				@Override
-				public String apply(String input) throws Exception {
-					return apply(input, Formatter.NO_FILE_SENTINEL);
-				}
-
-				@Override
-				public String apply(String input, File file) throws Exception {
-					if (file.isAbsolute()) {
-						// Cleanthat expects a relative file as input (relative to the root of the repository)
-						file = new File(".", file.getPath());
-					}
-					return (String) formatterMethod.invoke(formatter, input, file);
-				}
-			};
+			FormatterFunc formatterFunc = new JvmSupportFormatterFunc(formatter, formatterMethod);
 
 			return JVM_SUPPORT.suggestLaterVersionOnError(version, formatterFunc);
 		}

From 78eada4df20694091bcae76f47217055616a1a74 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@gmail.com>
Date: Wed, 29 May 2024 13:44:21 +0400
Subject: [PATCH 1629/2068] Change logic to generate relative path

---
 .../java/com/diffplug/spotless/java/CleanthatJavaStep.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
index b12b880883..875e358831 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
@@ -19,6 +19,7 @@
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
+import java.nio.file.Path;
 import java.util.List;
 import java.util.Objects;
 
@@ -177,7 +178,8 @@ public String apply(String input) throws Exception {
 			public String apply(String input, File file) throws Exception {
 				if (file.isAbsolute()) {
 					// Cleanthat expects a relative file as input (relative to the root of the repository)
-					file = new File(".", file.getPath());
+					Path absolutePath = file.toPath();
+					file = absolutePath.subpath(1, absolutePath.getNameCount()).toFile();
 				}
 				return (String) formatterMethod.invoke(formatter, input, file);
 			}

From 0be12f5aab17b6bd56609da019896c36c5c1d9ea Mon Sep 17 00:00:00 2001
From: Olivier Genez <olivier.genez@gmail.com>
Date: Wed, 29 May 2024 22:34:36 +1000
Subject: [PATCH 1630/2068] Default EditorConfig path to ".editorconfig" in
 plugin-maven ktlint step

The default path was never set, which means that .editorconfig was never
picked up if not explicitly set.
---
 .../com/diffplug/spotless/maven/kotlin/Ktlint.java  |  9 ++++++++-
 .../diffplug/spotless/maven/kotlin/KtlintTest.java  | 13 ++++++++++---
 ...erimentalEditorConfigOverride.intellijIdea.clean |  5 +++++
 3 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 testlib/src/main/resources/kotlin/ktlint/experimentalEditorConfigOverride.intellijIdea.clean

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
index 2459a52828..f90ed25089 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 package com.diffplug.spotless.maven.kotlin;
 
+import java.io.File;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -43,6 +44,12 @@ public class Ktlint implements FormatterStepFactory {
 	public FormatterStep newFormatterStep(final FormatterStepConfig stepConfig) {
 		String ktlintVersion = version != null ? version : KtLintStep.defaultVersion();
 		FileSignature configPath = null;
+		if (editorConfigPath == null) {
+			File defaultEditorConfig = new File(".editorconfig");
+			if (defaultEditorConfig.exists()) {
+				editorConfigPath = defaultEditorConfig.getPath();
+			}
+		}
 		if (editorConfigPath != null) {
 			configPath = ThrowingEx.get(() -> FileSignature.signAsList(stepConfig.getFileLocator().locateFile(editorConfigPath)));
 		}
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
index fe5b0e1b57..aa03aeae76 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,9 +50,9 @@ void testKtlintEditorConfigOverride() throws Exception {
 
 	@Test
 	void testReadCodeStyleFromEditorConfigFile() throws Exception {
-		setFile(".editorconfig").toResource("kotlin/ktlint/ktlint_official/.editorconfig");
+		setFile(".editorconfig").toResource("kotlin/ktlint/intellij_idea/.editorconfig");
 		writePomWithKotlinSteps("<ktlint/>");
-		checkKtlintOfficialStyle();
+		checkIntellijIdeaStyle();
 	}
 
 	@Test
@@ -87,4 +87,11 @@ private void checkKtlintOfficialStyle() throws Exception {
 		mavenRunner().withArguments("spotless:apply").runNoError();
 		assertFile(path).sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.ktlintOfficial.clean");
 	}
+
+	private void checkIntellijIdeaStyle() throws Exception {
+		String path = "src/main/kotlin/Main.kt";
+		setFile(path).toResource("kotlin/ktlint/experimentalEditorConfigOverride.dirty");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile(path).sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.intellijIdea.clean");
+	}
 }
diff --git a/testlib/src/main/resources/kotlin/ktlint/experimentalEditorConfigOverride.intellijIdea.clean b/testlib/src/main/resources/kotlin/ktlint/experimentalEditorConfigOverride.intellijIdea.clean
new file mode 100644
index 0000000000..532177d038
--- /dev/null
+++ b/testlib/src/main/resources/kotlin/ktlint/experimentalEditorConfigOverride.intellijIdea.clean
@@ -0,0 +1,5 @@
+fun main() {
+    val list = listOf(
+        "hello",
+    )
+}

From ccf141e05fb46bab8046bf8b898e6ffd3161d2b2 Mon Sep 17 00:00:00 2001
From: Olivier Genez <olivier.genez@gmail.com>
Date: Wed, 29 May 2024 22:49:29 +1000
Subject: [PATCH 1631/2068] Add ktlint test to plugin-maven

This verifies that the previous fix which checks if ktlint_code_style is
already defined in .editorconfig before overriding it works as expected
in plugin-maven.
---
 .../diffplug/spotless/maven/kotlin/KtlintTest.java    | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
index aa03aeae76..0ad716dd35 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
@@ -55,6 +55,17 @@ void testReadCodeStyleFromEditorConfigFile() throws Exception {
 		checkIntellijIdeaStyle();
 	}
 
+	@Test
+	void testEditorConfigOverrideWithUnsetCodeStyleDoesNotOverrideEditorConfigCodeStyleWithDefault() throws Exception {
+		setFile(".editorconfig").toResource("kotlin/ktlint/ktlint_official/.editorconfig");
+		writePomWithKotlinSteps("<ktlint>\n" +
+				"  <editorConfigOverride>\n" +
+				"    <ktlint_test_key>true</ktlint_test_key>\n" +
+				"  </editorConfigOverride>\n" +
+				"</ktlint>");
+		checkKtlintOfficialStyle();
+	}
+
 	@Test
 	void testSetEditorConfigCanOverrideEditorConfigFile() throws Exception {
 		setFile(".editorconfig").toResource("kotlin/ktlint/intellij_idea/.editorconfig");

From 145321473f4d85c1aa7fa69cc4165ea9b92753bb Mon Sep 17 00:00:00 2001
From: Olivier Genez <olivier.genez@gmail.com>
Date: Wed, 29 May 2024 22:55:59 +1000
Subject: [PATCH 1632/2068] Update CHANGES.md files

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 1 +
 plugin-maven/CHANGES.md  | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index dbeb53a0a2..e7b4594edc 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -14,6 +14,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * `FileSignature.Promised` and `JarState.Promised` to facilitate round-trip serialization for the Gradle configuration cache. ([#1945](https://github.com/diffplug/spotless/pull/1945)) 
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
 ### Fixed
+* Check if ktlint_code_style is set in .editorconfig before overriding it ([#2142])
 * Ignore system git config when running tests ([#1990](https://github.com/diffplug/spotless/issues/1990))
 * Correctly provide EditorConfig property types for Ktlint ([#2052](https://github.com/diffplug/spotless/issues/2052))
 * Made ShadowCopy (`npmInstallCache`) more robust by re-creating the cache dir if it goes missing ([#1984](https://github.com/diffplug/spotless/issues/1984),[2096](https://github.com/diffplug/spotless/pull/2096))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index bccb62dcb1..a55f78385d 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -7,6 +7,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
 * Add support for formatting and sorting Maven POMs ([#2082](https://github.com/diffplug/spotless/issues/2082))
 ### Fixed
+* Check if ktlint_code_style is set in .editorconfig before overriding it ([#2142])
 * Full no-asterisk support for configuration cache ([#2088](https://github.com/diffplug/spotless/pull/2088) closes [#1274](https://github.com/diffplug/spotless/issues/1274) and [#987](https://github.com/diffplug/spotless/issues/987)).
 * Ignore system git config when running tests ([#1990](https://github.com/diffplug/spotless/issues/1990))
 * Correctly provide EditorConfig property types for Ktlint ([#2052](https://github.com/diffplug/spotless/issues/2052))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 557e011ac4..3d9da8349f 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -7,6 +7,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
 * Skip execution in M2E (incremental) builds by default ([#1814](https://github.com/diffplug/spotless/issues/1814), [#2037](https://github.com/diffplug/spotless/issues/2037))
 ### Fixed
+* Check if ktlint_code_style is set in .editorconfig before overriding it ([#2142])
+* Default EditorConfig path to ".editorconfig" [#2143]
 * Ignore system git config when running tests ([#1990](https://github.com/diffplug/spotless/issues/1990))
 * Correctly provide EditorConfig property types for Ktlint ([#2052](https://github.com/diffplug/spotless/issues/2052))
 * Made ShadowCopy (`npmInstallCache`) more robust by re-creating the cache dir if it goes missing ([#1984](https://github.com/diffplug/spotless/issues/1984),[2096](https://github.com/diffplug/spotless/pull/2096))

From f0ff576d8faf05f98f9bc579bce9b69bb61facdd Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 24 May 2024 18:21:57 -0700
Subject: [PATCH 1633/2068] Fix serialization problems in custom steps.

---
 .../diffplug/spotless/SerializedFunction.java |  4 ++++
 .../gradle/spotless/FormatExtension.java      | 19 +++++++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/SerializedFunction.java b/lib/src/main/java/com/diffplug/spotless/SerializedFunction.java
index d4d36edfb4..fd3a7d9ab6 100644
--- a/lib/src/main/java/com/diffplug/spotless/SerializedFunction.java
+++ b/lib/src/main/java/com/diffplug/spotless/SerializedFunction.java
@@ -22,4 +22,8 @@ public interface SerializedFunction<T, R> extends Serializable, ThrowingEx.Funct
 	static <T> SerializedFunction<T, T> identity() {
 		return t -> t;
 	}
+
+	static <T, R> SerializedFunction<T, R> alwaysReturns(R value) {
+		return unused -> value;
+	}
 }
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index 94e5298b66..6d8d85e2f4 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -53,6 +53,7 @@
 import com.diffplug.spotless.LineEnding;
 import com.diffplug.spotless.OnMatch;
 import com.diffplug.spotless.Provisioner;
+import com.diffplug.spotless.SerializedFunction;
 import com.diffplug.spotless.biome.BiomeFlavor;
 import com.diffplug.spotless.cpp.ClangFormatStep;
 import com.diffplug.spotless.extra.EclipseBasedStepBuilder;
@@ -427,7 +428,21 @@ protected Integer calculateState() throws Exception {
 	 */
 	public void custom(String name, Closure<String> formatter) {
 		requireNonNull(formatter, "formatter");
-		custom(name, formatter::call);
+		Closure<String> dehydrated = formatter.dehydrate();
+		custom(name, new ClosureFormatterFunc(dehydrated));
+	}
+
+	static class ClosureFormatterFunc implements FormatterFunc, Serializable {
+		private final Closure<String> closure;
+
+		ClosureFormatterFunc(Closure<String> closure) {
+			this.closure = closure;
+		}
+
+		@Override
+		public String apply(String unixNewlines) {
+			return closure.call(unixNewlines);
+		}
 	}
 
 	/**
@@ -436,7 +451,7 @@ public void custom(String name, Closure<String> formatter) {
 	 */
 	public void custom(String name, FormatterFunc formatter) {
 		requireNonNull(formatter, "formatter");
-		addStep(FormatterStep.createLazy(name, () -> globalState, unusedState -> formatter));
+		addStep(FormatterStep.createLazy(name, () -> globalState, SerializedFunction.alwaysReturns(formatter)));
 	}
 
 	/** Highly efficient find-replace char sequence. */

From 7441bad5c15d1182609d335bdfbbdc9f45be9e3a Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 24 May 2024 22:50:27 -0700
Subject: [PATCH 1634/2068] Make `SerializedFunction.alwaysReturns` more
 reliable.

---
 .../diffplug/spotless/SerializedFunction.java    | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/SerializedFunction.java b/lib/src/main/java/com/diffplug/spotless/SerializedFunction.java
index fd3a7d9ab6..7cadb120d6 100644
--- a/lib/src/main/java/com/diffplug/spotless/SerializedFunction.java
+++ b/lib/src/main/java/com/diffplug/spotless/SerializedFunction.java
@@ -24,6 +24,20 @@ static <T> SerializedFunction<T, T> identity() {
 	}
 
 	static <T, R> SerializedFunction<T, R> alwaysReturns(R value) {
-		return unused -> value;
+		return new AlwaysReturns(value);
+	}
+
+	class AlwaysReturns<T, R> implements SerializedFunction<T, R> {
+		private static final long serialVersionUID = 1L;
+		private final R value;
+
+		AlwaysReturns(R value) {
+			this.value = value;
+		}
+
+		@Override
+		public R apply(T t) {
+			return value;
+		}
 	}
 }

From 154ca2733fb31000753c51fbef161d0b70952b2f Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 28 May 2024 23:30:58 -0700
Subject: [PATCH 1635/2068] Simplify LicenseHeaderStep.

---
 .../spotless/generic/LicenseHeaderStep.java        | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java b/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
index 6d04c25962..06d7a7653c 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -120,14 +120,12 @@ public LicenseHeaderStep withSkipLinesMatching(@Nullable String skipLinesMatchin
 	}
 
 	public FormatterStep build() {
-		FormatterStep formatterStep = null;
-
+		FormatterStep formatterStep;
 		if (yearMode.get() == YearMode.SET_FROM_GIT) {
-			formatterStep = FormatterStep.createNeverUpToDateLazy(name, () -> {
+			formatterStep = FormatterStep.createLazy(name, () -> {
 				boolean updateYear = false; // doesn't matter
-				Runtime runtime = new Runtime(headerLazy.get(), delimiter, yearSeparator, updateYear, skipLinesMatching);
-				return FormatterFunc.needsFile(runtime::setLicenseHeaderYearsFromGitHistory);
-			});
+				return new Runtime(headerLazy.get(), delimiter, yearSeparator, updateYear, skipLinesMatching);
+			}, step -> FormatterFunc.needsFile(step::format));
 		} else {
 			formatterStep = FormatterStep.createLazy(name, () -> {
 				// by default, we should update the year if the user is using ratchetFrom
@@ -146,11 +144,9 @@ public FormatterStep build() {
 				return new Runtime(headerLazy.get(), delimiter, yearSeparator, updateYear, skipLinesMatching);
 			}, step -> FormatterFunc.needsFile(step::format));
 		}
-
 		if (contentPattern == null) {
 			return formatterStep;
 		}
-
 		return formatterStep.filterByContent(OnMatch.INCLUDE, contentPattern);
 	}
 

From 7ea3958581c024e557f082058ca75ad0b3951390 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 29 May 2024 09:20:52 -0700
Subject: [PATCH 1636/2068] Remove unnecessary `NeverUpToDate` steps

---
 .../gradle/spotless/DiffMessageFormatterTest.java         | 8 ++------
 .../java/com/diffplug/gradle/spotless/FormatTaskTest.java | 4 ++--
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/DiffMessageFormatterTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/DiffMessageFormatterTest.java
index af724ab961..24b2a8504d 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/DiffMessageFormatterTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/DiffMessageFormatterTest.java
@@ -21,7 +21,6 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.regex.Pattern;
 
 import org.assertj.core.api.Assertions;
 import org.gradle.api.Project;
@@ -31,11 +30,11 @@
 
 import com.diffplug.common.base.StringPrinter;
 import com.diffplug.spotless.FileSignature;
-import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.LineEnding;
 import com.diffplug.spotless.ResourceHarness;
 import com.diffplug.spotless.TestProvisioner;
 import com.diffplug.spotless.extra.integration.DiffMessageFormatter;
+import com.diffplug.spotless.generic.TrimTrailingWhitespaceStep;
 
 class DiffMessageFormatterTest extends ResourceHarness {
 
@@ -151,10 +150,7 @@ void customRunToFixMessage() throws Exception {
 	@Test
 	void whitespaceProblem() throws Exception {
 		Bundle spotless = create(setFile("testFile").toContent("A \nB\t\nC  \n"));
-		spotless.task.setSteps(List.of(FormatterStep.createNeverUpToDate("trimTrailing", input -> {
-			Pattern pattern = Pattern.compile("[ \t]+$", Pattern.UNIX_LINES | Pattern.MULTILINE);
-			return pattern.matcher(input).replaceAll("");
-		})));
+		spotless.task.setSteps(List.of(TrimTrailingWhitespaceStep.create()));
 		assertCheckFailure(spotless,
 				"    testFile",
 				"        @@ -1,3 +1,3 @@",
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/FormatTaskTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/FormatTaskTest.java
index 92f6818f3e..99509d51a4 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/FormatTaskTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/FormatTaskTest.java
@@ -24,10 +24,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.LineEnding;
 import com.diffplug.spotless.ResourceHarness;
 import com.diffplug.spotless.TestProvisioner;
+import com.diffplug.spotless.generic.ReplaceStep;
 
 class FormatTaskTest extends ResourceHarness {
 	private SpotlessTaskImpl spotlessTask;
@@ -62,7 +62,7 @@ void testStep() throws Exception {
 		File outputFile = new File(spotlessTask.getOutputDirectory(), "testFile");
 		spotlessTask.setTarget(Collections.singleton(testFile));
 
-		spotlessTask.setSteps(List.of(FormatterStep.createNeverUpToDate("double-p", content -> content.replace("pp", "p"))));
+		spotlessTask.setSteps(List.of(ReplaceStep.create("double-p", "pp", "p")));
 		Tasks.execute(spotlessTask);
 
 		assertFile(outputFile).hasContent("aple");

From 6d4e268260a24db6dce54b3c25bdbb7b4c9b13fc Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 29 May 2024 09:29:48 -0700
Subject: [PATCH 1637/2068] Move `NeverUpToDateStep` out of `lib` and into
 `testlib` only.

---
 .../com/diffplug/spotless/FormatterStep.java  |  8 +-
 .../gradle/spotless/PaddedCellTaskTest.java   |  3 +-
 .../incremental/PluginFingerprintTest.java    |  5 +-
 .../diffplug/spotless/NeverUpToDateStep.java  | 89 +++++++++++++++++++
 .../com/diffplug/spotless/PaddedCellTest.java |  4 +-
 5 files changed, 100 insertions(+), 9 deletions(-)
 create mode 100644 testlib/src/main/java/com/diffplug/spotless/NeverUpToDateStep.java

diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
index 070e502a0c..d1209c9aea 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
@@ -151,8 +151,8 @@ static <RoundtripState extends Serializable, EqualityState extends Serializable>
 	static <State extends Serializable> FormatterStep createLazy(
 			String name,
 			ThrowingEx.Supplier<State> stateSupplier,
-			ThrowingEx.Function<State, FormatterFunc> stateToFormatter) {
-		return new FormatterStepImpl.Standard<>(name, stateSupplier, stateToFormatter);
+			SerializedFunction<State, FormatterFunc> stateToFormatter) {
+		return createLazy(name, stateSupplier, SerializedFunction.identity(), stateToFormatter);
 	}
 
 	/**
@@ -168,7 +168,7 @@ static <State extends Serializable> FormatterStep createLazy(
 	static <State extends Serializable> FormatterStep create(
 			String name,
 			State state,
-			ThrowingEx.Function<State, FormatterFunc> stateToFormatter) {
+			SerializedFunction<State, FormatterFunc> stateToFormatter) {
 		Objects.requireNonNull(state, "state");
 		return createLazy(name, () -> state, stateToFormatter);
 	}
@@ -185,7 +185,7 @@ static <State extends Serializable> FormatterStep create(
 	static FormatterStep createNeverUpToDateLazy(
 			String name,
 			ThrowingEx.Supplier<FormatterFunc> functionSupplier) {
-		return new FormatterStepImpl.NeverUpToDate(name, functionSupplier);
+		return new NeverUpToDateStep(name, functionSupplier);
 	}
 
 	/**
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PaddedCellTaskTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PaddedCellTaskTest.java
index 7dc5581f5b..b0d70b51d1 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PaddedCellTaskTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PaddedCellTaskTest.java
@@ -34,6 +34,7 @@
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.LineEnding;
+import com.diffplug.spotless.NeverUpToDateStep;
 import com.diffplug.spotless.ResourceHarness;
 import com.diffplug.spotless.TestProvisioner;
 
@@ -56,7 +57,7 @@ public BuildServiceParameters.None getParameters() {
 		Bundle(String name, FormatterFunc function) throws IOException {
 			this.name = name;
 			file = setFile("src/test." + name).toContent("CCC");
-			FormatterStep step = FormatterStep.createNeverUpToDate(name, function);
+			FormatterStep step = NeverUpToDateStep.create(name, function);
 			source = createFormatTask(name, step);
 			check = createCheckTask(name, source);
 			apply = createApplyTask(name, source);
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/PluginFingerprintTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/PluginFingerprintTest.java
index ae61dec331..cbe4ece7af 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/PluginFingerprintTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/PluginFingerprintTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 DiffPlug
+ * Copyright 2021-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,6 +39,7 @@
 import com.diffplug.spotless.Formatter;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.LineEnding;
+import com.diffplug.spotless.NeverUpToDateStep;
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
 
 class PluginFingerprintTest extends MavenIntegrationHarness {
@@ -162,7 +163,7 @@ private static Model readPom(String xml) throws Exception {
 	}
 
 	private static FormatterStep formatterStep(String name) {
-		return FormatterStep.createNeverUpToDate(name, input -> input);
+		return NeverUpToDateStep.create(name, input -> input);
 	}
 
 	private static Formatter formatter(FormatterStep... steps) {
diff --git a/testlib/src/main/java/com/diffplug/spotless/NeverUpToDateStep.java b/testlib/src/main/java/com/diffplug/spotless/NeverUpToDateStep.java
new file mode 100644
index 0000000000..6ff45a706b
--- /dev/null
+++ b/testlib/src/main/java/com/diffplug/spotless/NeverUpToDateStep.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless;
+
+import java.io.File;
+import java.util.Objects;
+
+/**
+ * Formatter which is equal to itself, but not to any other Formatter.
+ */
+public class NeverUpToDateStep implements FormatterStep {
+	/**
+	 * @param name
+	 *             The name of the formatter step
+	 * @param functionSupplier
+	 *             A supplier which will lazily generate the function
+	 *             used by the formatter step
+	 * @return A FormatterStep which will never report that it is up-to-date, because
+	 *         it is not equal to the serialized representation of itself.
+	 */
+	public static FormatterStep createLazy(
+			String name,
+			ThrowingEx.Supplier<FormatterFunc> functionSupplier) {
+		return new NeverUpToDateStep(name, functionSupplier);
+	}
+
+	/**
+	 * @param name
+	 *             The name of the formatter step
+	 * @param function
+	 *             The function used by the formatter step
+	 * @return A FormatterStep which will never report that it is up-to-date, because
+	 *         it is not equal to the serialized representation of itself.
+	 */
+	public static FormatterStep create(
+			String name,
+			FormatterFunc function) {
+		Objects.requireNonNull(function, "function");
+		return createLazy(name, () -> function);
+	}
+
+	private static final long serialVersionUID = 1L;
+
+	private final String name;
+	private final ThrowingEx.Supplier<FormatterFunc> formatterSupplier;
+	private transient FormatterFunc formatter; // initialized lazily
+
+	NeverUpToDateStep(String name, ThrowingEx.Supplier<FormatterFunc> formatterSupplier) {
+		this.name = name;
+		this.formatterSupplier = Objects.requireNonNull(formatterSupplier, "formatterSupplier");
+	}
+
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	@Override
+	public String format(String rawUnix, File file) throws Exception {
+		if (formatter == null) {
+			formatter = formatterSupplier.get();
+			if (formatter instanceof FormatterFunc.Closeable) {
+				throw new AssertionError("NeverUpToDate does not support FormatterFunc.Closeable.  See https://github.com/diffplug/spotless/pull/284");
+			}
+		}
+		return formatter.apply(rawUnix, file);
+	}
+
+	@Override
+	public void close() throws Exception {
+		if (formatter instanceof FormatterFunc.Closeable) {
+			((FormatterFunc.Closeable) formatter).close();
+			formatter = null;
+		}
+	}
+}
diff --git a/testlib/src/test/java/com/diffplug/spotless/PaddedCellTest.java b/testlib/src/test/java/com/diffplug/spotless/PaddedCellTest.java
index dae41678a4..f9825c61f6 100644
--- a/testlib/src/test/java/com/diffplug/spotless/PaddedCellTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/PaddedCellTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@ private void wellBehaved(FormatterFunc step, String input, PaddedCell.Type expec
 
 	private void testCase(FormatterFunc step, String input, PaddedCell.Type expectedOutputType, String expectedSteps, String canonical, boolean misbehaved) throws IOException {
 		List<FormatterStep> formatterSteps = new ArrayList<>();
-		formatterSteps.add(FormatterStep.createNeverUpToDate("step", step));
+		formatterSteps.add(NeverUpToDateStep.create("step", step));
 		try (Formatter formatter = Formatter.builder()
 				.lineEndingsPolicy(LineEnding.UNIX.createPolicy())
 				.encoding(StandardCharsets.UTF_8)

From b1bb96562efb2392021f24844e214b879b06ab06 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 29 May 2024 09:44:46 -0700
Subject: [PATCH 1638/2068] Make `NeverUpToDateStep` actually roundtrip
 serializable for our tests.

---
 .../gradle/spotless/PaddedCellTaskTest.java   |  4 +-
 .../incremental/PluginFingerprintTest.java    |  3 +-
 .../diffplug/spotless/NeverUpToDateStep.java  | 37 +++----------------
 .../com/diffplug/spotless/PaddedCellTest.java |  6 +--
 4 files changed, 13 insertions(+), 37 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PaddedCellTaskTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PaddedCellTaskTest.java
index b0d70b51d1..5d68db2492 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PaddedCellTaskTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PaddedCellTaskTest.java
@@ -31,11 +31,11 @@
 
 import com.diffplug.common.base.StringPrinter;
 import com.diffplug.spotless.FileSignature;
-import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.LineEnding;
 import com.diffplug.spotless.NeverUpToDateStep;
 import com.diffplug.spotless.ResourceHarness;
+import com.diffplug.spotless.SerializedFunction;
 import com.diffplug.spotless.TestProvisioner;
 
 class PaddedCellTaskTest extends ResourceHarness {
@@ -54,7 +54,7 @@ public BuildServiceParameters.None getParameters() {
 		SpotlessCheck check;
 		SpotlessApply apply;
 
-		Bundle(String name, FormatterFunc function) throws IOException {
+		Bundle(String name, SerializedFunction<String, String> function) throws IOException {
 			this.name = name;
 			file = setFile("src/test." + name).toContent("CCC");
 			FormatterStep step = NeverUpToDateStep.create(name, function);
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/PluginFingerprintTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/PluginFingerprintTest.java
index cbe4ece7af..4257e5595c 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/PluginFingerprintTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/PluginFingerprintTest.java
@@ -40,6 +40,7 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.LineEnding;
 import com.diffplug.spotless.NeverUpToDateStep;
+import com.diffplug.spotless.SerializedFunction;
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
 
 class PluginFingerprintTest extends MavenIntegrationHarness {
@@ -163,7 +164,7 @@ private static Model readPom(String xml) throws Exception {
 	}
 
 	private static FormatterStep formatterStep(String name) {
-		return NeverUpToDateStep.create(name, input -> input);
+		return NeverUpToDateStep.create(name, SerializedFunction.identity());
 	}
 
 	private static Formatter formatter(FormatterStep... steps) {
diff --git a/testlib/src/main/java/com/diffplug/spotless/NeverUpToDateStep.java b/testlib/src/main/java/com/diffplug/spotless/NeverUpToDateStep.java
index 6ff45a706b..53da84f4d8 100644
--- a/testlib/src/main/java/com/diffplug/spotless/NeverUpToDateStep.java
+++ b/testlib/src/main/java/com/diffplug/spotless/NeverUpToDateStep.java
@@ -16,27 +16,11 @@
 package com.diffplug.spotless;
 
 import java.io.File;
-import java.util.Objects;
 
 /**
  * Formatter which is equal to itself, but not to any other Formatter.
  */
 public class NeverUpToDateStep implements FormatterStep {
-	/**
-	 * @param name
-	 *             The name of the formatter step
-	 * @param functionSupplier
-	 *             A supplier which will lazily generate the function
-	 *             used by the formatter step
-	 * @return A FormatterStep which will never report that it is up-to-date, because
-	 *         it is not equal to the serialized representation of itself.
-	 */
-	public static FormatterStep createLazy(
-			String name,
-			ThrowingEx.Supplier<FormatterFunc> functionSupplier) {
-		return new NeverUpToDateStep(name, functionSupplier);
-	}
-
 	/**
 	 * @param name
 	 *             The name of the formatter step
@@ -47,20 +31,18 @@ public static FormatterStep createLazy(
 	 */
 	public static FormatterStep create(
 			String name,
-			FormatterFunc function) {
-		Objects.requireNonNull(function, "function");
-		return createLazy(name, () -> function);
+			SerializedFunction<String, String> function) {
+		return new NeverUpToDateStep(name, function);
 	}
 
 	private static final long serialVersionUID = 1L;
 
 	private final String name;
-	private final ThrowingEx.Supplier<FormatterFunc> formatterSupplier;
-	private transient FormatterFunc formatter; // initialized lazily
+	private final SerializedFunction<String, String> formatter; // initialized lazily
 
-	NeverUpToDateStep(String name, ThrowingEx.Supplier<FormatterFunc> formatterSupplier) {
+	NeverUpToDateStep(String name, SerializedFunction<String, String> formatter) {
 		this.name = name;
-		this.formatterSupplier = Objects.requireNonNull(formatterSupplier, "formatterSupplier");
+		this.formatter = formatter;
 	}
 
 	@Override
@@ -70,20 +52,13 @@ public String getName() {
 
 	@Override
 	public String format(String rawUnix, File file) throws Exception {
-		if (formatter == null) {
-			formatter = formatterSupplier.get();
-			if (formatter instanceof FormatterFunc.Closeable) {
-				throw new AssertionError("NeverUpToDate does not support FormatterFunc.Closeable.  See https://github.com/diffplug/spotless/pull/284");
-			}
-		}
-		return formatter.apply(rawUnix, file);
+		return formatter.apply(rawUnix);
 	}
 
 	@Override
 	public void close() throws Exception {
 		if (formatter instanceof FormatterFunc.Closeable) {
 			((FormatterFunc.Closeable) formatter).close();
-			formatter = null;
 		}
 	}
 }
diff --git a/testlib/src/test/java/com/diffplug/spotless/PaddedCellTest.java b/testlib/src/test/java/com/diffplug/spotless/PaddedCellTest.java
index f9825c61f6..28fc6a0710 100644
--- a/testlib/src/test/java/com/diffplug/spotless/PaddedCellTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/PaddedCellTest.java
@@ -37,15 +37,15 @@ class PaddedCellTest {
 	@TempDir
 	File rootFolder;
 
-	private void misbehaved(FormatterFunc step, String input, PaddedCell.Type expectedOutputType, String steps, String canonical) throws IOException {
+	private void misbehaved(SerializedFunction<String, String> step, String input, PaddedCell.Type expectedOutputType, String steps, String canonical) throws IOException {
 		testCase(step, input, expectedOutputType, steps, canonical, true);
 	}
 
-	private void wellBehaved(FormatterFunc step, String input, PaddedCell.Type expectedOutputType, String canonical) throws IOException {
+	private void wellBehaved(SerializedFunction<String, String> step, String input, PaddedCell.Type expectedOutputType, String canonical) throws IOException {
 		testCase(step, input, expectedOutputType, canonical, canonical, false);
 	}
 
-	private void testCase(FormatterFunc step, String input, PaddedCell.Type expectedOutputType, String expectedSteps, String canonical, boolean misbehaved) throws IOException {
+	private void testCase(SerializedFunction<String, String> step, String input, PaddedCell.Type expectedOutputType, String expectedSteps, String canonical, boolean misbehaved) throws IOException {
 		List<FormatterStep> formatterSteps = new ArrayList<>();
 		formatterSteps.add(NeverUpToDateStep.create("step", step));
 		try (Formatter formatter = Formatter.builder()

From c2b2227510807d819e8cc6ac4eca23b2d81fa4f1 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 29 May 2024 09:53:35 -0700
Subject: [PATCH 1639/2068] Remove `NeverUpToDate` methods from the lib of
 `FormatterStep`.

---
 .../com/diffplug/spotless/FormatterStep.java  | 30 -------------------
 1 file changed, 30 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
index d1209c9aea..98933af1c2 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
@@ -172,34 +172,4 @@ static <State extends Serializable> FormatterStep create(
 		Objects.requireNonNull(state, "state");
 		return createLazy(name, () -> state, stateToFormatter);
 	}
-
-	/**
-	 * @param name
-	 *             The name of the formatter step
-	 * @param functionSupplier
-	 *             A supplier which will lazily generate the function
-	 *             used by the formatter step
-	 * @return A FormatterStep which will never report that it is up-to-date, because
-	 *         it is not equal to the serialized representation of itself.
-	 */
-	static FormatterStep createNeverUpToDateLazy(
-			String name,
-			ThrowingEx.Supplier<FormatterFunc> functionSupplier) {
-		return new NeverUpToDateStep(name, functionSupplier);
-	}
-
-	/**
-	 * @param name
-	 *             The name of the formatter step
-	 * @param function
-	 *             The function used by the formatter step
-	 * @return A FormatterStep which will never report that it is up-to-date, because
-	 *         it is not equal to the serialized representation of itself.
-	 */
-	static FormatterStep createNeverUpToDate(
-			String name,
-			FormatterFunc function) {
-		Objects.requireNonNull(function, "function");
-		return createNeverUpToDateLazy(name, () -> function);
-	}
 }

From f6449b4055c08cd060edc4667cf4d878965eb3e3 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 29 May 2024 09:59:13 -0700
Subject: [PATCH 1640/2068] Update changelog.

---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index dbeb53a0a2..31e1229bea 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -29,6 +29,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `sortpom` version to latest `3.2.1` -> `4.0.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049), [#2078](https://github.com/diffplug/spotless/pull/2078), [#2115](https://github.com/diffplug/spotless/pull/2115))
 * Bump default `zjsonpatch` version to latest `0.4.14` -> `0.4.16`. ([#1969](https://github.com/diffplug/spotless/pull/1969))
 ### Removed
+* **BREAKING** Remove `FormatterStep.createNeverUpToDate` methods, they are available only in `testlib`. ([#2145](https://github.com/diffplug/spotless/pull/2145))
 * **BREAKING** Remove `JarState.getMavenCoordinate(String prefix)`. ([#1945](https://github.com/diffplug/spotless/pull/1945))
 * **BREAKING** Replace `PipeStepPair` with `FenceStep`. ([#1954](https://github.com/diffplug/spotless/pull/1954))
 * **BREAKING** Fully removed `Rome`, use `Biome` instead. ([#2119](https://github.com/diffplug/spotless/pull/2119))

From 285f94ce33a948be7376c82e24f627f980e5d194 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 29 May 2024 10:09:49 -0700
Subject: [PATCH 1641/2068] Thankyou Spotbugs for catching this!

---
 .../diffplug/spotless/generic/LicenseHeaderStep.java | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java b/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
index 06d7a7653c..941c1c376f 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java
@@ -40,6 +40,7 @@
 import com.diffplug.spotless.LineEnding;
 import com.diffplug.spotless.OnMatch;
 import com.diffplug.spotless.SerializableFileFilter;
+import com.diffplug.spotless.SerializedFunction;
 import com.diffplug.spotless.ThrowingEx;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -119,13 +120,22 @@ public LicenseHeaderStep withSkipLinesMatching(@Nullable String skipLinesMatchin
 		return new LicenseHeaderStep(name, contentPattern, headerLazy, delimiter, yearSeparator, yearMode, skipLinesMatching);
 	}
 
+	private static class SetLicenseHeaderYearsFromGitHistory implements SerializedFunction<Runtime, FormatterFunc> {
+		private static final long serialVersionUID = 1L;
+
+		@Override
+		public FormatterFunc apply(Runtime input) throws Exception {
+			return FormatterFunc.needsFile(input::setLicenseHeaderYearsFromGitHistory);
+		}
+	}
+
 	public FormatterStep build() {
 		FormatterStep formatterStep;
 		if (yearMode.get() == YearMode.SET_FROM_GIT) {
 			formatterStep = FormatterStep.createLazy(name, () -> {
 				boolean updateYear = false; // doesn't matter
 				return new Runtime(headerLazy.get(), delimiter, yearSeparator, updateYear, skipLinesMatching);
-			}, step -> FormatterFunc.needsFile(step::format));
+			}, new SetLicenseHeaderYearsFromGitHistory());
 		} else {
 			formatterStep = FormatterStep.createLazy(name, () -> {
 				// by default, we should update the year if the user is using ratchetFrom

From 386874ccf1c6c992f2b539ec483660cc8d4df80a Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 29 May 2024 10:36:26 -0700
Subject: [PATCH 1642/2068] Accidentally bonked this during a merge conflict
 resolution.

---
 lib/src/main/java/com/diffplug/spotless/FormatterStep.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
index 98933af1c2..5974151fba 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
@@ -151,8 +151,8 @@ static <RoundtripState extends Serializable, EqualityState extends Serializable>
 	static <State extends Serializable> FormatterStep createLazy(
 			String name,
 			ThrowingEx.Supplier<State> stateSupplier,
-			SerializedFunction<State, FormatterFunc> stateToFormatter) {
-		return createLazy(name, stateSupplier, SerializedFunction.identity(), stateToFormatter);
+			ThrowingEx.Function<State, FormatterFunc> stateToFormatter) {
+		return new FormatterStepImpl.Standard<>(name, stateSupplier, stateToFormatter);
 	}
 
 	/**
@@ -168,7 +168,7 @@ static <State extends Serializable> FormatterStep createLazy(
 	static <State extends Serializable> FormatterStep create(
 			String name,
 			State state,
-			SerializedFunction<State, FormatterFunc> stateToFormatter) {
+			ThrowingEx.Function<State, FormatterFunc> stateToFormatter) {
 		Objects.requireNonNull(state, "state");
 		return createLazy(name, () -> state, stateToFormatter);
 	}

From e37a5678252941953213462019257c0a0a3ffcd1 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 29 May 2024 10:38:38 -0700
Subject: [PATCH 1643/2068] Reorder changelog.

---
 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 a4ded36a66..04722f1c2b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -19,6 +19,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Made ShadowCopy (`npmInstallCache`) more robust by re-creating the cache dir if it goes missing ([#1984](https://github.com/diffplug/spotless/issues/1984),[2096](https://github.com/diffplug/spotless/pull/2096))
 * scalafmt.conf fileOverride section now works correctly ([#1854](https://github.com/diffplug/spotless/pull/1854))
 ### Changes
+* Bump default `cleanthat` version to latest `2.16` -> `2.20`. ([#1725](https://github.com/diffplug/spotless/pull/1725))
 * Bump default `gherkin-utils` version to latest `8.0.2` -> `9.0.0`. ([#1703](https://github.com/diffplug/spotless/pull/1703))
 * Bump default `google-java-format` version to latest `1.19.2` -> `1.22.0`. ([#2129](https://github.com/diffplug/spotless/pull/2129))
 * Bump default `jackson` version to latest `2.14.2` -> `2.17.1`. ([#1685](https://github.com/diffplug/spotless/pull/1685))
@@ -28,7 +29,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
 * Bump default `sortpom` version to latest `3.2.1` -> `4.0.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049), [#2078](https://github.com/diffplug/spotless/pull/2078), [#2115](https://github.com/diffplug/spotless/pull/2115))
 * Bump default `zjsonpatch` version to latest `0.4.14` -> `0.4.16`. ([#1969](https://github.com/diffplug/spotless/pull/1969))
-* Bump default `cleanthat` version to latest `2.16` -> `2.20`. ([#1725](https://github.com/diffplug/spotless/pull/1725))
 ### Removed
 * **BREAKING** Remove `FormatterStep.createNeverUpToDate` methods, they are available only in `testlib`. ([#2145](https://github.com/diffplug/spotless/pull/2145))
 * **BREAKING** Remove `JarState.getMavenCoordinate(String prefix)`. ([#1945](https://github.com/diffplug/spotless/pull/1945))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index d00a5f89e0..666221af89 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -14,6 +14,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Made ShadowCopy (`npmInstallCache`) more robust by re-creating the cache dir if it goes missing ([#1984](https://github.com/diffplug/spotless/issues/1984),[2096](https://github.com/diffplug/spotless/pull/2096))
 * scalafmt.conf fileOverride section now works correctly ([#1854](https://github.com/diffplug/spotless/pull/1854))
 ### Changes
+* Bump default `cleanthat` version to latest `2.16` -> `2.20`. ([#1725](https://github.com/diffplug/spotless/pull/1725))
 * Bump default `gherkin-utils` version to latest `8.0.2` -> `9.0.0`. ([#1703](https://github.com/diffplug/spotless/pull/1703))
 * Bump default `google-java-format` version to latest `1.19.2` -> `1.22.0`. ([#2129](https://github.com/diffplug/spotless/pull/2129))
 * Bump default `jackson` version to latest `2.14.2` -> `2.17.1`. ([#1685](https://github.com/diffplug/spotless/pull/1685))
@@ -23,7 +24,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
 * Bump default `sortpom` version to latest `3.2.1` -> `4.0.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049), [#2078](https://github.com/diffplug/spotless/pull/2078), [#2115](https://github.com/diffplug/spotless/pull/2115))
 * Bump default `zjsonpatch` version to latest `0.4.14` -> `0.4.16`. ([#1969](https://github.com/diffplug/spotless/pull/1969))
-* Bump default `cleanthat` version to latest `2.16` -> `2.20`. ([#1725](https://github.com/diffplug/spotless/pull/1725))
 ### Removed
 * **BREAKING** Fully removed `Rome`, use `Biome` instead. ([#2119](https://github.com/diffplug/spotless/pull/2119))
 
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 2ee226208b..f3ba81d5bd 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Made ShadowCopy (`npmInstallCache`) more robust by re-creating the cache dir if it goes missing ([#1984](https://github.com/diffplug/spotless/issues/1984),[2096](https://github.com/diffplug/spotless/pull/2096))
 * scalafmt.conf fileOverride section now works correctly ([#1854](https://github.com/diffplug/spotless/pull/1854))
 ### Changes
+* Bump default `cleanthat` version to latest `2.16` -> `2.20`. ([#1725](https://github.com/diffplug/spotless/pull/1725))
 * Bump default `gherkin-utils` version to latest `8.0.2` -> `9.0.0`. ([#1703](https://github.com/diffplug/spotless/pull/1703))
 * Bump default `google-java-format` version to latest `1.19.2` -> `1.22.0`. ([#2129](https://github.com/diffplug/spotless/pull/2129))
 * Bump default `jackson` version to latest `2.14.2` -> `2.17.1`. ([#1685](https://github.com/diffplug/spotless/pull/1685))
@@ -21,7 +22,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
 * Bump default `sortpom` version to latest `3.2.1` -> `4.0.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049), [#2078](https://github.com/diffplug/spotless/pull/2078), [#2115](https://github.com/diffplug/spotless/pull/2115))
 * Bump default `zjsonpatch` version to latest `0.4.14` -> `0.4.16`. ([#1969](https://github.com/diffplug/spotless/pull/1969))
-* Bump default `cleanthat` version to latest `2.16` -> `2.20`. ([#1725](https://github.com/diffplug/spotless/pull/1725))
 ### Removed
 * **BREAKING** Fully removed `Rome`, use `Biome` instead. ([#2119](https://github.com/diffplug/spotless/pull/2119))
 

From 4c23f57a1d59cfc7b9dda5c5d20a1a45be5dea60 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 23 May 2024 22:49:21 -0700
Subject: [PATCH 1644/2068] Remove transients from `NpmFormatterStepStateBase`
 by embedding `NpmPathResolver` and making it serializable.

---
 .../spotless/npm/EslintFormatterStep.java     |  5 ++-
 .../npm/NpmFormatterStepLocations.java        | 31 ++++++-------------
 .../npm/NpmFormatterStepStateBase.java        | 14 +++------
 .../spotless/npm/NpmPathResolver.java         |  5 +--
 .../spotless/npm/PrettierFormatterStep.java   |  5 ++-
 .../spotless/npm/TsFmtFormatterStep.java      |  5 ++-
 6 files changed, 22 insertions(+), 43 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
index cee51b8518..6cb8c43695 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -102,8 +102,7 @@ private static class State extends NpmFormatterStepStateBase implements Serializ
 							projectDir,
 							buildDir,
 							cacheDir,
-							npmPathResolver::resolveNpmExecutable,
-							npmPathResolver::resolveNodeExecutable));
+							npmPathResolver));
 			this.origEslintConfig = requireNonNull(eslintConfig.verify());
 			this.eslintConfigInUse = eslintConfig;
 		}
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepLocations.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepLocations.java
index 67763e59ec..4df5736dd9 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepLocations.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepLocations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,36 +19,23 @@
 
 import java.io.File;
 import java.io.Serializable;
-import java.util.function.Supplier;
 
 import javax.annotation.Nonnull;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
 class NpmFormatterStepLocations implements Serializable {
 
 	private static final long serialVersionUID = -1055408537924029969L;
-	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
-	private final transient File projectDir;
-
-	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
-	private final transient File buildDir;
-
-	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
-	private final transient File cacheDir;
-
-	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
-	private final transient Supplier<File> npmExecutable;
 
-	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
-	private final transient Supplier<File> nodeExecutable;
+	private final File projectDir;
+	private final File buildDir;
+	private final File cacheDir;
+	private final NpmPathResolver resolver;
 
-	public NpmFormatterStepLocations(@Nonnull File projectDir, @Nonnull File buildDir, File cacheDir, @Nonnull Supplier<File> npmExecutable, @Nonnull Supplier<File> nodeExecutable) {
+	public NpmFormatterStepLocations(@Nonnull File projectDir, @Nonnull File buildDir, File cacheDir, @Nonnull NpmPathResolver resolver) {
 		this.projectDir = requireNonNull(projectDir);
 		this.buildDir = requireNonNull(buildDir);
 		this.cacheDir = cacheDir;
-		this.npmExecutable = requireNonNull(npmExecutable);
-		this.nodeExecutable = requireNonNull(nodeExecutable);
+		this.resolver = requireNonNull(resolver);
 	}
 
 	public File projectDir() {
@@ -64,10 +51,10 @@ public File cacheDir() {
 	}
 
 	public File npmExecutable() {
-		return npmExecutable.get();
+		return resolver.resolveNpmExecutable();
 	}
 
 	public File nodeExecutable() {
-		return nodeExecutable.get();
+		return resolver.resolveNodeExecutable();
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
index 3f262c813c..cb3d9c8f78 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,8 +35,6 @@
 import com.diffplug.spotless.ProcessRunner.LongRunningProcess;
 import com.diffplug.spotless.ThrowingEx;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
 abstract class NpmFormatterStepStateBase implements Serializable {
 
 	private static final Logger logger = LoggerFactory.getLogger(NpmFormatterStepStateBase.class);
@@ -45,15 +43,11 @@ abstract class NpmFormatterStepStateBase implements Serializable {
 
 	private static final long serialVersionUID = 1460749955865959948L;
 
-	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
-	protected final transient NodeServerLayout nodeServerLayout;
-
-	public final NpmFormatterStepLocations locations;
-
-	private final NpmConfig npmConfig;
-
 	private final String stepName;
+	private final NpmConfig npmConfig;
 
+	public final NpmFormatterStepLocations locations;
+	protected final transient NodeServerLayout nodeServerLayout;
 	private final transient NodeServeApp nodeServeApp;
 
 	protected NpmFormatterStepStateBase(String stepName, NpmConfig npmConfig, NpmFormatterStepLocations locations) throws IOException {
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmPathResolver.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmPathResolver.java
index 1a7db1c9b8..6a1779f3f2 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmPathResolver.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmPathResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 DiffPlug
+ * Copyright 2020-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,11 @@
 package com.diffplug.spotless.npm;
 
 import java.io.File;
+import java.io.Serializable;
 import java.util.List;
 import java.util.Optional;
 
-public class NpmPathResolver {
+public class NpmPathResolver implements Serializable {
 
 	private final File explicitNpmExecutable;
 
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
index 72fecded1f..c42f5416ef 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -79,8 +79,7 @@ private static class State extends NpmFormatterStepStateBase implements Serializ
 							projectDir,
 							buildDir,
 							cacheDir,
-							npmPathResolver::resolveNpmExecutable,
-							npmPathResolver::resolveNodeExecutable));
+							npmPathResolver));
 			this.prettierConfig = requireNonNull(prettierConfig);
 		}
 
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java
index 6b55610be0..79e4c34471 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -83,8 +83,7 @@ public State(String stepName, Map<String, String> versions, File projectDir, Fil
 							projectDir,
 							buildDir,
 							cacheDir,
-							npmPathResolver::resolveNpmExecutable,
-							npmPathResolver::resolveNodeExecutable));
+							npmPathResolver));
 			this.buildDir = requireNonNull(buildDir);
 			this.configFile = configFile;
 			this.inlineTsFmtSettings = inlineTsFmtSettings == null ? new TreeMap<>() : new TreeMap<>(inlineTsFmtSettings);

From a6e711d5de580584fa4a01cbae863599015e7499 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 23 May 2024 23:03:11 -0700
Subject: [PATCH 1645/2068] Extract `Runtime` into its own thing, so that
 Prettier can roundtrip through serialization.

---
 .../npm/NpmFormatterStepStateBase.java        | 108 ++++++++++--------
 .../spotless/npm/PrettierFormatterStep.java   |   2 +-
 2 files changed, 60 insertions(+), 50 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
index cb3d9c8f78..31fa0428e5 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
@@ -47,75 +47,85 @@ abstract class NpmFormatterStepStateBase implements Serializable {
 	private final NpmConfig npmConfig;
 
 	public final NpmFormatterStepLocations locations;
-	protected final transient NodeServerLayout nodeServerLayout;
-	private final transient NodeServeApp nodeServeApp;
 
 	protected NpmFormatterStepStateBase(String stepName, NpmConfig npmConfig, NpmFormatterStepLocations locations) throws IOException {
 		this.stepName = requireNonNull(stepName);
 		this.npmConfig = requireNonNull(npmConfig);
 		this.locations = locations;
-		this.nodeServerLayout = new NodeServerLayout(locations.buildDir(), npmConfig.getPackageJsonContent());
-		this.nodeServeApp = new NodeServeApp(nodeServerLayout, npmConfig, locations);
 	}
 
-	protected void prepareNodeServerLayout() throws IOException {
-		nodeServeApp.prepareNodeAppLayout();
+	public Runtime toRuntime() {
+		return new Runtime(this);
 	}
 
-	protected void prepareNodeServer() throws IOException {
-		nodeServeApp.npmInstall();
-	}
+	public static class Runtime {
+		private final NodeServerLayout nodeServerLayout;
+		private final NodeServeApp nodeServeApp;
 
-	protected void assertNodeServerDirReady() throws IOException {
-		if (needsPrepareNodeServerLayout()) {
-			// reinstall if missing
-			prepareNodeServerLayout();
+		Runtime(NpmFormatterStepStateBase parent) {
+			this.nodeServerLayout = new NodeServerLayout(parent.locations.buildDir(), parent.npmConfig.getPackageJsonContent());
+			this.nodeServeApp = new NodeServeApp(nodeServerLayout, parent.npmConfig, parent.locations);
 		}
-		if (needsPrepareNodeServer()) {
-			// run npm install if node_modules is missing
-			prepareNodeServer();
+
+		protected void prepareNodeServerLayout() throws IOException {
+			nodeServeApp.prepareNodeAppLayout();
 		}
-	}
 
-	protected boolean needsPrepareNodeServer() {
-		return nodeServeApp.needsNpmInstall();
-	}
+		protected void prepareNodeServer() throws IOException {
+			nodeServeApp.npmInstall();
+		}
 
-	protected boolean needsPrepareNodeServerLayout() {
-		return nodeServeApp.needsPrepareNodeAppLayout();
-	}
+		protected void assertNodeServerDirReady() throws IOException {
+			if (needsPrepareNodeServerLayout()) {
+				// reinstall if missing
+				prepareNodeServerLayout();
+			}
+			if (needsPrepareNodeServer()) {
+				// run npm install if node_modules is missing
+				prepareNodeServer();
+			}
+		}
+
+		protected boolean needsPrepareNodeServer() {
+			return nodeServeApp.needsNpmInstall();
+		}
 
-	protected ServerProcessInfo npmRunServer() throws ServerStartException, IOException {
-		assertNodeServerDirReady();
-		LongRunningProcess server = null;
-		try {
-			// The npm process will output the randomly selected port of the http server process to 'server.port' file
-			// so in order to be safe, remove such a file if it exists before starting.
-			final File serverPortFile = new File(this.nodeServerLayout.nodeModulesDir(), "server.port");
-			NpmResourceHelper.deleteFileIfExists(serverPortFile);
-			// start the http server in node
-			server = nodeServeApp.startNpmServeProcess();
-
-			// await the readiness of the http server - wait for at most 60 seconds
+		protected boolean needsPrepareNodeServerLayout() {
+			return nodeServeApp.needsPrepareNodeAppLayout();
+		}
+
+		protected ServerProcessInfo npmRunServer() throws ServerStartException, IOException {
+			assertNodeServerDirReady();
+			LongRunningProcess server = null;
 			try {
-				NpmResourceHelper.awaitReadableFile(serverPortFile, Duration.ofSeconds(60));
-			} catch (TimeoutException timeoutException) {
-				// forcibly end the server process
+				// The npm process will output the randomly selected port of the http server process to 'server.port' file
+				// so in order to be safe, remove such a file if it exists before starting.
+				final File serverPortFile = new File(this.nodeServerLayout.nodeModulesDir(), "server.port");
+				NpmResourceHelper.deleteFileIfExists(serverPortFile);
+				// start the http server in node
+				server = nodeServeApp.startNpmServeProcess();
+
+				// await the readiness of the http server - wait for at most 60 seconds
 				try {
-					if (server.isAlive()) {
-						server.destroyForcibly();
-						server.waitFor();
+					NpmResourceHelper.awaitReadableFile(serverPortFile, Duration.ofSeconds(60));
+				} catch (TimeoutException timeoutException) {
+					// forcibly end the server process
+					try {
+						if (server.isAlive()) {
+							server.destroyForcibly();
+							server.waitFor();
+						}
+					} catch (Throwable t) {
+						// ignore
 					}
-				} catch (Throwable t) {
-					// ignore
+					throw timeoutException;
 				}
-				throw timeoutException;
+				// read the server.port file for resulting port and remember the port for later formatting calls
+				String serverPort = NpmResourceHelper.readUtf8StringFromFile(serverPortFile).trim();
+				return new ServerProcessInfo(server, serverPort, serverPortFile);
+			} catch (IOException | TimeoutException e) {
+				throw new ServerStartException("Starting server failed." + (server != null ? "\n\nProcess result:\n" + ThrowingEx.get(server::result) : ""), e);
 			}
-			// read the server.port file for resulting port and remember the port for later formatting calls
-			String serverPort = NpmResourceHelper.readUtf8StringFromFile(serverPortFile).trim();
-			return new ServerProcessInfo(server, serverPort, serverPortFile);
-		} catch (IOException | TimeoutException e) {
-			throw new ServerStartException("Starting server failed." + (server != null ? "\n\nProcess result:\n" + ThrowingEx.get(server::result) : ""), e);
 		}
 	}
 
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
index c42f5416ef..27a1002df5 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
@@ -88,7 +88,7 @@ private static class State extends NpmFormatterStepStateBase implements Serializ
 		public FormatterFunc createFormatterFunc() {
 			try {
 				logger.info("creating formatter function (starting server)");
-				ServerProcessInfo prettierRestServer = npmRunServer();
+				ServerProcessInfo prettierRestServer = toRuntime().npmRunServer();
 				PrettierRestService restService = new PrettierRestService(prettierRestServer.getBaseUrl());
 				String prettierConfigOptions = restService.resolveConfig(this.prettierConfig.getPrettierConfigPath(), this.prettierConfig.getOptions());
 				return Closeable.ofDangerous(() -> endServer(restService, prettierRestServer), new PrettierFilePathPassingFormatterFunc(prettierConfigOptions, restService));

From f63d90960d8b02f25c66c42b04b3cb3f69e56f39 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 23 May 2024 23:11:01 -0700
Subject: [PATCH 1646/2068] Prettier's configuration now roundtrips without any
 problem.

---
 .../diffplug/spotless/npm/PrettierConfig.java | 24 +++-----------
 .../npm/PrettierFormatterStepTest.java        | 31 +++++++++++++++++++
 2 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/PrettierConfig.java b/lib/src/main/java/com/diffplug/spotless/npm/PrettierConfig.java
index 328cb25a4e..8a51910205 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/PrettierConfig.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/PrettierConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 package com.diffplug.spotless.npm;
 
 import java.io.File;
-import java.io.IOException;
 import java.io.Serializable;
 import java.util.Map;
 import java.util.TreeMap;
@@ -24,36 +23,23 @@
 import javax.annotation.Nullable;
 
 import com.diffplug.spotless.FileSignature;
-import com.diffplug.spotless.ThrowingEx;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 public class PrettierConfig implements Serializable {
 
 	private static final long serialVersionUID = -8709340269833126583L;
 
-	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
-	@Nullable
-	private final transient File prettierConfigPath;
-
-	@SuppressWarnings("unused")
-	private final FileSignature prettierConfigPathSignature;
+	private final FileSignature.Promised prettierConfigPathSignature;
 
 	private final TreeMap<String, Object> options;
 
 	public PrettierConfig(@Nullable File prettierConfigPath, @Nullable Map<String, Object> options) {
-		try {
-			this.prettierConfigPath = prettierConfigPath;
-			this.prettierConfigPathSignature = prettierConfigPath != null ? FileSignature.signAsList(this.prettierConfigPath) : FileSignature.signAsList();
-			this.options = options == null ? new TreeMap<>() : new TreeMap<>(options);
-		} catch (IOException e) {
-			throw ThrowingEx.asRuntime(e);
-		}
+		this.prettierConfigPathSignature = prettierConfigPath == null ? null : FileSignature.promise(prettierConfigPath);
+		this.options = options == null ? new TreeMap<>() : new TreeMap<>(options);
 	}
 
 	@Nullable
 	public File getPrettierConfigPath() {
-		return prettierConfigPath;
+		return prettierConfigPathSignature == null ? null : prettierConfigPathSignature.get().getOnlyFile();
 	}
 
 	public Map<String, Object> getOptions() {
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
index 769d91bc01..1c761ef52d 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
@@ -19,6 +19,9 @@
 import java.util.Collections;
 import java.util.Map;
 
+import com.diffplug.spotless.SerializableEqualityTester;
+import com.diffplug.spotless.java.GoogleJavaFormatStep;
+
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -189,4 +192,32 @@ private String major(String semVer) {
 			return semVer.split("\\.")[0];
 		}
 	}
+
+	@Test
+	void equality() {
+		new SerializableEqualityTester() {
+			String groupArtifact = GoogleJavaFormatStep.defaultGroupArtifact();
+			String version = "1.11.0";
+			String style = "";
+			boolean reflowLongStrings = false;
+
+			@Override
+			protected void setupTest(API api) {
+				// same version == same
+				api.areDifferentThan();
+				// change the groupArtifact, and it's different
+				groupArtifact = "io.opil:google-java-format";
+				api.areDifferentThan();
+			}
+
+			@Override
+			protected FormatterStep create() {
+				return PrettierFormatterStep.create(Map.of(), TestProvisioner.mavenCentral(), 					projectDir(),
+					buildDir(),
+					null,
+					npmPathResolver(),
+					);
+			}
+		}.testEquals();
+	}
 }

From 78b51087d5c4e332190f20724008a7bfef4b96dd Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 24 May 2024 08:56:58 -0700
Subject: [PATCH 1647/2068] Test prettier's equality checks.

---
 .../npm/NpmFormatterStepCommonTests.java      | 12 +++----
 .../npm/PrettierFormatterStepTest.java        | 32 +++++++++----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/NpmFormatterStepCommonTests.java b/testlib/src/test/java/com/diffplug/spotless/npm/NpmFormatterStepCommonTests.java
index 5eff34ef29..2672785453 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/NpmFormatterStepCommonTests.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/NpmFormatterStepCommonTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,10 @@
 package com.diffplug.spotless.npm;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.Collections;
 
 import com.diffplug.spotless.ResourceHarness;
+import com.diffplug.spotless.ThrowingEx;
 
 public abstract class NpmFormatterStepCommonTests extends ResourceHarness {
 
@@ -41,18 +41,18 @@ private File npmrc() {
 
 	private File buildDir = null;
 
-	protected File buildDir() throws IOException {
+	protected File buildDir() {
 		if (this.buildDir == null) {
-			this.buildDir = newFolder("build-dir");
+			this.buildDir = ThrowingEx.get(() -> newFolder("build-dir"));
 		}
 		return this.buildDir;
 	}
 
 	private File projectDir = null;
 
-	protected File projectDir() throws IOException {
+	protected File projectDir() {
 		if (this.projectDir == null) {
-			this.projectDir = newFolder("project-dir");
+			this.projectDir = ThrowingEx.get(() -> newFolder("project-dir"));
 		}
 		return this.projectDir;
 	}
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
index 1c761ef52d..fb92eb9d39 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,9 +19,6 @@
 import java.util.Collections;
 import java.util.Map;
 
-import com.diffplug.spotless.SerializableEqualityTester;
-import com.diffplug.spotless.java.GoogleJavaFormatStep;
-
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -29,14 +26,14 @@
 
 import com.diffplug.common.collect.ImmutableMap;
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.ResourceHarness;
+import com.diffplug.spotless.SerializableEqualityTester;
 import com.diffplug.spotless.StepHarness;
 import com.diffplug.spotless.StepHarnessWithFile;
 import com.diffplug.spotless.TestProvisioner;
 import com.diffplug.spotless.tag.NpmTest;
 
 @NpmTest
-class PrettierFormatterStepTest extends ResourceHarness {
+class PrettierFormatterStepTest extends NpmFormatterStepCommonTests {
 
 	private static final String PRETTIER_VERSION_2 = PrettierFormatterStep.DEFAULT_VERSION;
 
@@ -196,27 +193,30 @@ private String major(String semVer) {
 	@Test
 	void equality() {
 		new SerializableEqualityTester() {
-			String groupArtifact = GoogleJavaFormatStep.defaultGroupArtifact();
-			String version = "1.11.0";
-			String style = "";
-			boolean reflowLongStrings = false;
+			String prettierVersion = "3.0.0";
+			PrettierConfig config = new PrettierConfig(null, Map.of("parser", "typescript"));
 
 			@Override
 			protected void setupTest(API api) {
 				// same version == same
 				api.areDifferentThan();
 				// change the groupArtifact, and it's different
-				groupArtifact = "io.opil:google-java-format";
+				prettierVersion = "2.8.8";
+				api.areDifferentThan();
+				config = new PrettierConfig(null, Map.of("parser", "css"));
 				api.areDifferentThan();
 			}
 
 			@Override
 			protected FormatterStep create() {
-				return PrettierFormatterStep.create(Map.of(), TestProvisioner.mavenCentral(), 					projectDir(),
-					buildDir(),
-					null,
-					npmPathResolver(),
-					);
+				return PrettierFormatterStep.create(
+						ImmutableMap.of("prettier", prettierVersion),
+						TestProvisioner.mavenCentral(),
+						projectDir(),
+						buildDir(),
+						null,
+						npmPathResolver(),
+						config); // should select parser based on this name
 			}
 		}.testEquals();
 	}

From 783ee73edfaf3fb125d7e9d4ebce61fa59b1c8c3 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 24 May 2024 15:26:23 -0700
Subject: [PATCH 1648/2068] Port Eslint to be compatible with serialization
 roundtrip.

---
 .../diffplug/spotless/npm/EslintConfig.java   | 29 ++++---------------
 .../spotless/npm/EslintFormatterStep.java     | 16 ++++------
 .../spotless/npm/EslintTypescriptConfig.java  | 26 ++++-------------
 .../npm/NpmFormatterStepStateBase.java        | 11 +++++++
 4 files changed, 28 insertions(+), 54 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintConfig.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintConfig.java
index 3499b3face..e63d8ec7c6 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/EslintConfig.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,37 +16,20 @@
 package com.diffplug.spotless.npm;
 
 import java.io.File;
-import java.io.IOException;
 import java.io.Serializable;
 
 import javax.annotation.Nullable;
 
 import com.diffplug.spotless.FileSignature;
-import com.diffplug.spotless.ThrowingEx;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 public class EslintConfig implements Serializable {
-
-	private static final long serialVersionUID = -6196834313082791248L;
-
-	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
-	@Nullable
-	private final transient File eslintConfigPath;
-
 	@SuppressWarnings("unused")
-	private final FileSignature eslintConfigPathSignature;
-
+	private final FileSignature.Promised eslintConfigPathSignature;
 	private final String eslintConfigJs;
 
 	public EslintConfig(@Nullable File eslintConfigPath, @Nullable String eslintConfigJs) {
-		try {
-			this.eslintConfigPath = eslintConfigPath;
-			this.eslintConfigPathSignature = eslintConfigPath != null ? FileSignature.signAsList(this.eslintConfigPath) : FileSignature.signAsList();
-			this.eslintConfigJs = eslintConfigJs;
-		} catch (IOException e) {
-			throw ThrowingEx.asRuntime(e);
-		}
+		this.eslintConfigPathSignature = eslintConfigPath == null ? null : FileSignature.promise(eslintConfigPath);
+		this.eslintConfigJs = eslintConfigJs;
 	}
 
 	public EslintConfig withEslintConfigPath(@Nullable File eslintConfigPath) {
@@ -55,7 +38,7 @@ public EslintConfig withEslintConfigPath(@Nullable File eslintConfigPath) {
 
 	@Nullable
 	public File getEslintConfigPath() {
-		return eslintConfigPath;
+		return eslintConfigPathSignature == null ? null : eslintConfigPathSignature.get().getOnlyFile();
 	}
 
 	@Nullable
@@ -64,7 +47,7 @@ public String getEslintConfigJs() {
 	}
 
 	public EslintConfig verify() {
-		if (eslintConfigPath == null && eslintConfigJs == null) {
+		if (eslintConfigPathSignature == null && eslintConfigJs == null) {
 			throw new IllegalArgumentException("ESLint must be configured using either a configFile or a configJs - but both are null.");
 		}
 		return this;
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
index 6cb8c43695..115ec5992c 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
@@ -39,8 +39,6 @@
 import com.diffplug.spotless.ThrowingEx;
 import com.diffplug.spotless.npm.EslintRestService.FormatOption;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
 public class EslintFormatterStep {
 
 	private static final Logger logger = LoggerFactory.getLogger(EslintFormatterStep.class);
@@ -82,11 +80,8 @@ public static FormatterStep create(Map<String, String> devDependencies, Provisio
 
 	private static class State extends NpmFormatterStepStateBase implements Serializable {
 
-		private static final long serialVersionUID = -539537027004745812L;
 		private final EslintConfig origEslintConfig;
-
-		@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
-		private transient EslintConfig eslintConfigInUse;
+		private EslintConfig eslintConfigInUse;
 
 		State(String stepName, Map<String, String> devDependencies, File projectDir, File buildDir, File cacheDir, NpmPathResolver npmPathResolver, EslintConfig eslintConfig) throws IOException {
 			super(stepName,
@@ -108,8 +103,8 @@ private static class State extends NpmFormatterStepStateBase implements Serializ
 		}
 
 		@Override
-		protected void prepareNodeServerLayout() throws IOException {
-			super.prepareNodeServerLayout();
+		protected void prepareNodeServerLayout(NodeServerLayout nodeServerLayout) throws IOException {
+			super.prepareNodeServerLayout(nodeServerLayout);
 			if (origEslintConfig.getEslintConfigPath() != null) {
 				// If any config files are provided, we need to make sure they are at the same location as the node modules
 				// as eslint will try to resolve plugin/config names relatively to the config file location and some
@@ -125,9 +120,10 @@ protected void prepareNodeServerLayout() throws IOException {
 		public FormatterFunc createFormatterFunc() {
 			try {
 				logger.info("Creating formatter function (starting server)");
-				ServerProcessInfo eslintRestServer = npmRunServer();
+				Runtime runtime = toRuntime();
+				ServerProcessInfo eslintRestServer = runtime.npmRunServer();
 				EslintRestService restService = new EslintRestService(eslintRestServer.getBaseUrl());
-				return Closeable.ofDangerous(() -> endServer(restService, eslintRestServer), new EslintFilePathPassingFormatterFunc(locations.projectDir(), nodeServerLayout.nodeModulesDir(), eslintConfigInUse, restService));
+				return Closeable.ofDangerous(() -> endServer(restService, eslintRestServer), new EslintFilePathPassingFormatterFunc(locations.projectDir(), runtime.nodeServerLayout().nodeModulesDir(), eslintConfigInUse, restService));
 			} catch (IOException e) {
 				throw ThrowingEx.asRuntime(e);
 			}
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintTypescriptConfig.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintTypescriptConfig.java
index ea3e2046b3..0ff5fd25a6 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/EslintTypescriptConfig.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintTypescriptConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 DiffPlug
+ * Copyright 2022-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,43 +16,27 @@
 package com.diffplug.spotless.npm;
 
 import java.io.File;
-import java.io.IOException;
 
 import javax.annotation.Nullable;
 
 import com.diffplug.spotless.FileSignature;
-import com.diffplug.spotless.ThrowingEx;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 public class EslintTypescriptConfig extends EslintConfig {
-
-	private static final long serialVersionUID = -126864670181617006L;
-
-	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
-	@Nullable
-	private final transient File typescriptConfigPath;
-
 	@SuppressWarnings("unused")
-	private final FileSignature typescriptConfigPathSignature;
+	private final FileSignature.Promised typescriptConfigPathSignature;
 
 	public EslintTypescriptConfig(@Nullable File eslintConfigPath, @Nullable String eslintConfigJs, @Nullable File typescriptConfigPath) {
 		super(eslintConfigPath, eslintConfigJs);
-		try {
-			this.typescriptConfigPath = typescriptConfigPath;
-			this.typescriptConfigPathSignature = typescriptConfigPath != null ? FileSignature.signAsList(this.typescriptConfigPath) : FileSignature.signAsList();
-		} catch (IOException e) {
-			throw ThrowingEx.asRuntime(e);
-		}
+		this.typescriptConfigPathSignature = typescriptConfigPath != null ? FileSignature.promise(typescriptConfigPath) : null;
 	}
 
 	@Override
 	public EslintConfig withEslintConfigPath(@Nullable File eslintConfigPath) {
-		return new EslintTypescriptConfig(eslintConfigPath, this.getEslintConfigJs(), this.typescriptConfigPath);
+		return new EslintTypescriptConfig(eslintConfigPath, this.getEslintConfigJs(), getTypescriptConfigPath());
 	}
 
 	@Nullable
 	public File getTypescriptConfigPath() {
-		return typescriptConfigPath;
+		return typescriptConfigPathSignature == null ? null : this.typescriptConfigPathSignature.get().getOnlyFile();
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
index 31fa0428e5..3ec06e0434 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
@@ -58,17 +58,28 @@ public Runtime toRuntime() {
 		return new Runtime(this);
 	}
 
+	protected void prepareNodeServerLayout(NodeServerLayout layout) throws IOException {
+
+	}
+
 	public static class Runtime {
+		private final NpmFormatterStepStateBase parent;
 		private final NodeServerLayout nodeServerLayout;
 		private final NodeServeApp nodeServeApp;
 
 		Runtime(NpmFormatterStepStateBase parent) {
+			this.parent = parent;
 			this.nodeServerLayout = new NodeServerLayout(parent.locations.buildDir(), parent.npmConfig.getPackageJsonContent());
 			this.nodeServeApp = new NodeServeApp(nodeServerLayout, parent.npmConfig, parent.locations);
 		}
 
+		public NodeServerLayout nodeServerLayout() {
+			return nodeServerLayout;
+		}
+
 		protected void prepareNodeServerLayout() throws IOException {
 			nodeServeApp.prepareNodeAppLayout();
+			parent.prepareNodeServerLayout(nodeServerLayout);
 		}
 
 		protected void prepareNodeServer() throws IOException {

From 819fed50c105aead7fd313ade21d1ad0f3b0b33d Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 24 May 2024 15:30:36 -0700
Subject: [PATCH 1649/2068] Fixup TsFmtFormatterStep for roundtripping.

---
 .../spotless/npm/TsFmtFormatterStep.java        |  2 +-
 .../spotless/npm/TypedTsFmtConfigFile.java      | 17 +----------------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java
index 79e4c34471..b171b0ca7f 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java
@@ -94,7 +94,7 @@ public State(String stepName, Map<String, String> versions, File projectDir, Fil
 		public FormatterFunc createFormatterFunc() {
 			try {
 				Map<String, Object> tsFmtOptions = unifyOptions();
-				ServerProcessInfo tsfmtRestServer = npmRunServer();
+				ServerProcessInfo tsfmtRestServer = toRuntime().npmRunServer();
 				TsFmtRestService restService = new TsFmtRestService(tsfmtRestServer.getBaseUrl());
 				return Closeable.ofDangerous(() -> endServer(restService, tsfmtRestServer), input -> restService.format(input, tsFmtOptions));
 			} catch (IOException e) {
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/TypedTsFmtConfigFile.java b/lib/src/main/java/com/diffplug/spotless/npm/TypedTsFmtConfigFile.java
index 75257711f6..c9b80394a8 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/TypedTsFmtConfigFile.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/TypedTsFmtConfigFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,15 +18,9 @@
 import static java.util.Objects.requireNonNull;
 
 import java.io.File;
-import java.io.IOException;
 import java.io.Serializable;
 import java.util.Locale;
 
-import com.diffplug.spotless.FileSignature;
-import com.diffplug.spotless.ThrowingEx;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
 public class TypedTsFmtConfigFile implements Serializable {
 
 	private static final long serialVersionUID = -4442310349275775501L;
@@ -35,18 +29,9 @@ public class TypedTsFmtConfigFile implements Serializable {
 
 	private final File configFile;
 
-	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
-	@SuppressWarnings("unused")
-	private final FileSignature configFileSignature;
-
 	public TypedTsFmtConfigFile(TsConfigFileType configFileType, File configFile) {
 		this.configFileType = requireNonNull(configFileType);
 		this.configFile = requireNonNull(configFile);
-		try {
-			this.configFileSignature = FileSignature.signAsList(configFile);
-		} catch (IOException e) {
-			throw ThrowingEx.asRuntime(e);
-		}
 	}
 
 	TsConfigFileType configFileType() {

From 1d936f11e7f1dce123333e6f2ca4756b490b39af Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 29 May 2024 10:17:27 -0700
Subject: [PATCH 1650/2068] Add missing `FileSignature.promise` method.

---
 lib/src/main/java/com/diffplug/spotless/FileSignature.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/src/main/java/com/diffplug/spotless/FileSignature.java b/lib/src/main/java/com/diffplug/spotless/FileSignature.java
index 10bba7a716..3d37ec2983 100644
--- a/lib/src/main/java/com/diffplug/spotless/FileSignature.java
+++ b/lib/src/main/java/com/diffplug/spotless/FileSignature.java
@@ -125,6 +125,10 @@ public static Promised promise(Iterable<File> files) {
 		return new Promised(MoreIterables.toNullHostileList(files), null);
 	}
 
+	public static Promised promise(File file) {
+		return new Promised(List.of(file), null);
+	}
+
 	/** Returns all of the files in this signature, throwing an exception if there are more or less than 1 file. */
 	public Collection<File> files() {
 		return Collections.unmodifiableList(files);

From a80b71cf00d2ba96fdf4cfb2b6cac13cc1ee9e03 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 29 May 2024 10:19:34 -0700
Subject: [PATCH 1651/2068] Add missing serialVersionUID.

---
 lib/src/main/java/com/diffplug/spotless/npm/EslintConfig.java   | 2 ++
 .../java/com/diffplug/spotless/npm/EslintFormatterStep.java     | 1 +
 .../java/com/diffplug/spotless/npm/EslintTypescriptConfig.java  | 2 ++
 .../main/java/com/diffplug/spotless/npm/NpmPathResolver.java    | 1 +
 4 files changed, 6 insertions(+)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintConfig.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintConfig.java
index e63d8ec7c6..8db9cf07af 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/EslintConfig.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintConfig.java
@@ -23,6 +23,8 @@
 import com.diffplug.spotless.FileSignature;
 
 public class EslintConfig implements Serializable {
+	private static final long serialVersionUID = 1L;
+
 	@SuppressWarnings("unused")
 	private final FileSignature.Promised eslintConfigPathSignature;
 	private final String eslintConfigJs;
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
index 115ec5992c..70beaf91ca 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
@@ -79,6 +79,7 @@ public static FormatterStep create(Map<String, String> devDependencies, Provisio
 	}
 
 	private static class State extends NpmFormatterStepStateBase implements Serializable {
+		private static final long serialVersionUID = 1L;
 
 		private final EslintConfig origEslintConfig;
 		private EslintConfig eslintConfigInUse;
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintTypescriptConfig.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintTypescriptConfig.java
index 0ff5fd25a6..42dec6837a 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/EslintTypescriptConfig.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintTypescriptConfig.java
@@ -22,6 +22,8 @@
 import com.diffplug.spotless.FileSignature;
 
 public class EslintTypescriptConfig extends EslintConfig {
+	private static final long serialVersionUID = 2L;
+
 	@SuppressWarnings("unused")
 	private final FileSignature.Promised typescriptConfigPathSignature;
 
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmPathResolver.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmPathResolver.java
index 6a1779f3f2..317c2a479b 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmPathResolver.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmPathResolver.java
@@ -21,6 +21,7 @@
 import java.util.Optional;
 
 public class NpmPathResolver implements Serializable {
+	private static final long serialVersionUID = 1L;
 
 	private final File explicitNpmExecutable;
 

From 15670fa05ac2b69d4e8bd47ea58e140e8debc8a3 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 29 May 2024 10:51:33 -0700
Subject: [PATCH 1652/2068] Route all the `FormatterStep.create` through
 `FormatterStepSerializationRoundtrip`.

---
 .../java/com/diffplug/spotless/Formatter.java |   6 +
 .../com/diffplug/spotless/FormatterFunc.java  |   4 +-
 .../com/diffplug/spotless/FormatterStep.java  |  28 +---
 .../diffplug/spotless/FormatterStepImpl.java  | 133 ------------------
 4 files changed, 11 insertions(+), 160 deletions(-)
 delete mode 100644 lib/src/main/java/com/diffplug/spotless/FormatterStepImpl.java

diff --git a/lib/src/main/java/com/diffplug/spotless/Formatter.java b/lib/src/main/java/com/diffplug/spotless/Formatter.java
index 9400989ddf..b5cd5f81fc 100644
--- a/lib/src/main/java/com/diffplug/spotless/Formatter.java
+++ b/lib/src/main/java/com/diffplug/spotless/Formatter.java
@@ -312,4 +312,10 @@ public void close() {
 
 	/** This Sentinel reference may be used to pass string content to a Formatter or FormatterStep when there is no actual File to format */
 	public static final File NO_FILE_SENTINEL = new File("NO_FILE_SENTINEL");
+
+	static void checkNotSentinel(File file) {
+		if (file == Formatter.NO_FILE_SENTINEL) {
+			throw new IllegalArgumentException("This step requires the underlying file. If this is a test, use StepHarnessWithFile");
+		}
+	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java b/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java
index 7aee828b0d..800a553225 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java
@@ -115,7 +115,7 @@ public void close() {
 
 				@Override
 				public String apply(String unix, File file) throws Exception {
-					FormatterStepImpl.checkNotSentinel(file);
+					Formatter.checkNotSentinel(file);
 					return function.apply(resource, unix, file);
 				}
 
@@ -144,7 +144,7 @@ interface NeedsFile extends FormatterFunc {
 
 		@Override
 		default String apply(String unix, File file) throws Exception {
-			FormatterStepImpl.checkNotSentinel(file);
+			Formatter.checkNotSentinel(file);
 			return applyWithFile(unix, file);
 		}
 
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
index 5974151fba..2a5a7d2b2f 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
@@ -70,28 +70,6 @@ default FormatterStep filterByFile(SerializableFileFilter filter) {
 		return new FilterByFileFormatterStep(this, filter);
 	}
 
-	/**
-	 * Implements a FormatterStep in a strict way which guarantees correct and lazy implementation
-	 * of up-to-date checks.  This maximizes performance for cases where the FormatterStep is not
-	 * actually needed (e.g. don't load eclipse setting file unless this step is actually running)
-	 * while also ensuring that Gradle can detect changes in a step's settings to determine that
-	 * it needs to rerun a format.
-	 */
-	abstract class Strict<State extends Serializable> extends LazyForwardingEquality<State> implements FormatterStep {
-		private static final long serialVersionUID = 1L;
-
-		/**
-		 * Implements the formatting function strictly in terms
-		 * of the input data and the result of {@link #calculateState()}.
-		 */
-		protected abstract String format(State state, String rawUnix, File file) throws Exception;
-
-		@Override
-		public final String format(String rawUnix, File file) throws Exception {
-			return format(state(), rawUnix, file);
-		}
-	}
-
 	/**
 	 * @param name
 	 *             The name of the formatter step.
@@ -151,8 +129,8 @@ static <RoundtripState extends Serializable, EqualityState extends Serializable>
 	static <State extends Serializable> FormatterStep createLazy(
 			String name,
 			ThrowingEx.Supplier<State> stateSupplier,
-			ThrowingEx.Function<State, FormatterFunc> stateToFormatter) {
-		return new FormatterStepImpl.Standard<>(name, stateSupplier, stateToFormatter);
+			SerializedFunction<State, FormatterFunc> stateToFormatter) {
+		return createLazy(name, stateSupplier, SerializedFunction.identity(), stateToFormatter);
 	}
 
 	/**
@@ -168,7 +146,7 @@ static <State extends Serializable> FormatterStep createLazy(
 	static <State extends Serializable> FormatterStep create(
 			String name,
 			State state,
-			ThrowingEx.Function<State, FormatterFunc> stateToFormatter) {
+			SerializedFunction<State, FormatterFunc> stateToFormatter) {
 		Objects.requireNonNull(state, "state");
 		return createLazy(name, () -> state, stateToFormatter);
 	}
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStepImpl.java b/lib/src/main/java/com/diffplug/spotless/FormatterStepImpl.java
deleted file mode 100644
index 8e2982d6db..0000000000
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStepImpl.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright 2016-2024 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless;
-
-import java.io.File;
-import java.io.Serializable;
-import java.util.Objects;
-import java.util.Random;
-
-import com.diffplug.spotless.FormatterStep.Strict;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
-/**
- * Standard implementation of FormatExtension which cleanly enforces
- * separation of serializable configuration and a pure format function.
- * <p>
- * Not an inner-class of FormatterStep so that it can stay entirely private
- * from the API.
- */
-@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
-abstract class FormatterStepImpl<State extends Serializable> extends Strict<State> {
-	private static final long serialVersionUID = 1L;
-
-	/** Transient because only the state matters. */
-	final transient String name;
-
-	/** Transient because only the state matters. */
-	transient ThrowingEx.Supplier<State> stateSupplier;
-
-	FormatterStepImpl(String name, ThrowingEx.Supplier<State> stateSupplier) {
-		this.name = Objects.requireNonNull(name);
-		this.stateSupplier = Objects.requireNonNull(stateSupplier);
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	@Override
-	protected State calculateState() throws Exception {
-		// LazyForwardingEquality guarantees that this will only be called once, and keeping toFormat
-		// causes a memory leak, see https://github.com/diffplug/spotless/issues/1194
-		State state = stateSupplier.get();
-		stateSupplier = null;
-		return state;
-	}
-
-	static final class Standard<State extends Serializable> extends FormatterStepImpl<State> {
-		private static final long serialVersionUID = 1L;
-
-		final transient ThrowingEx.Function<State, FormatterFunc> stateToFormatter;
-		transient FormatterFunc formatter; // initialized lazily
-
-		Standard(String name, ThrowingEx.Supplier<State> stateSupplier, ThrowingEx.Function<State, FormatterFunc> stateToFormatter) {
-			super(name, stateSupplier);
-			this.stateToFormatter = Objects.requireNonNull(stateToFormatter);
-		}
-
-		@Override
-		protected String format(State state, String rawUnix, File file) throws Exception {
-			Objects.requireNonNull(state, "state");
-			Objects.requireNonNull(rawUnix, "rawUnix");
-			Objects.requireNonNull(file, "file");
-			if (formatter == null) {
-				formatter = stateToFormatter.apply(state());
-			}
-			return formatter.apply(rawUnix, file);
-		}
-
-		@Override
-		public void close() throws Exception {
-			if (formatter instanceof FormatterFunc.Closeable) {
-				((FormatterFunc.Closeable) formatter).close();
-				formatter = null;
-			}
-		}
-	}
-
-	/** Formatter which is equal to itself, but not to any other Formatter. */
-	static class NeverUpToDate extends FormatterStepImpl<Integer> {
-		private static final long serialVersionUID = 1L;
-
-		private static final Random RANDOM = new Random();
-
-		final transient ThrowingEx.Supplier<FormatterFunc> formatterSupplier;
-		transient FormatterFunc formatter; // initialized lazily
-
-		NeverUpToDate(String name, ThrowingEx.Supplier<FormatterFunc> formatterSupplier) {
-			super(name, RANDOM::nextInt);
-			this.formatterSupplier = Objects.requireNonNull(formatterSupplier, "formatterSupplier");
-		}
-
-		@Override
-		protected String format(Integer state, String rawUnix, File file) throws Exception {
-			if (formatter == null) {
-				formatter = formatterSupplier.get();
-				if (formatter instanceof FormatterFunc.Closeable) {
-					throw new AssertionError("NeverUpToDate does not support FormatterFunc.Closeable.  See https://github.com/diffplug/spotless/pull/284");
-				}
-			}
-			return formatter.apply(rawUnix, file);
-		}
-
-		@Override
-		public void close() throws Exception {
-			if (formatter instanceof FormatterFunc.Closeable) {
-				((FormatterFunc.Closeable) formatter).close();
-				formatter = null;
-			}
-		}
-	}
-
-	static void checkNotSentinel(File file) {
-		if (file == Formatter.NO_FILE_SENTINEL) {
-			throw new IllegalArgumentException("This step requires the underlying file. If this is a test, use StepHarnessWithFile");
-		}
-	}
-}

From 116124d75412401cd31e4b8940a96eefccc0a6fd Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 23 May 2024 16:19:42 -0700
Subject: [PATCH 1653/2068] Fixup FenceStepTest so that we don't need so much
 `forStepNoRoundtrip`.

---
 .../spotless/generic/FenceStepTest.java       | 70 +++++++++----------
 1 file changed, 32 insertions(+), 38 deletions(-)

diff --git a/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java b/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java
index 682855755e..697a199fd2 100644
--- a/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java
@@ -16,16 +16,11 @@
 package com.diffplug.spotless.generic;
 
 import java.io.File;
-import java.io.Serializable;
 import java.util.Arrays;
-import java.util.Objects;
-
-import javax.annotation.Nullable;
 
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.common.base.StringPrinter;
-import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.ResourceHarness;
 import com.diffplug.spotless.StepHarness;
@@ -34,8 +29,8 @@ class FenceStepTest extends ResourceHarness {
 	@Test
 	void single() {
 		FormatterStep fence = FenceStep.named("fence").openClose("spotless:off", "spotless:on")
-				.preserveWithin(Arrays.asList(createNeverUpToDateSerializable("lowercase", String::toLowerCase)));
-		StepHarness harness = StepHarness.forStepNoRoundtrip(fence);
+				.preserveWithin(Arrays.asList(ToCaseStep.lower()));
+		StepHarness harness = StepHarness.forStep(fence);
 		harness.test(
 				StringPrinter.buildStringFromLines(
 						"A B C",
@@ -54,8 +49,8 @@ void single() {
 	@Test
 	void multiple() {
 		FormatterStep fence = FenceStep.named("fence").openClose("spotless:off", "spotless:on")
-				.preserveWithin(Arrays.asList(createNeverUpToDateSerializable("lowercase", String::toLowerCase)));
-		StepHarness harness = StepHarness.forStepNoRoundtrip(fence);
+				.preserveWithin(Arrays.asList(ToCaseStep.lower()));
+		StepHarness harness = StepHarness.forStep(fence);
 		harness.test(
 				StringPrinter.buildStringFromLines(
 						"A B C",
@@ -88,7 +83,7 @@ void multiple() {
 	@Test
 	void broken() {
 		FormatterStep fence = FenceStep.named("fence").openClose("spotless:off", "spotless:on")
-				.preserveWithin(Arrays.asList(createNeverUpToDateSerializable("uppercase", String::toUpperCase)));
+				.preserveWithin(Arrays.asList(ToCaseStep.upper()));
 		// this fails because uppercase turns spotless:off into SPOTLESS:OFF, etc
 		StepHarness.forStepNoRoundtrip(fence).testExceptionMsg(StringPrinter.buildStringFromLines("A B C",
 				"spotless:off",
@@ -100,8 +95,8 @@ void broken() {
 	@Test
 	void andApply() {
 		FormatterStep fence = FenceStep.named("fence").openClose("<lower>", "</lower>")
-				.applyWithin(Arrays.asList(createNeverUpToDateSerializable("lowercase", String::toLowerCase)));
-		StepHarness.forStepNoRoundtrip(fence).test(
+				.applyWithin(Arrays.asList(ToCaseStep.lower()));
+		StepHarness.forStep(fence).test(
 				StringPrinter.buildStringFromLines(
 						"A B C",
 						"<lower>",
@@ -116,46 +111,45 @@ void andApply() {
 						"G H I"));
 	}
 
-	/**
-	 * @param name
-	 *             The name of the formatter step
-	 * @param function
-	 *             The function used by the formatter step
-	 * @return A FormatterStep which will never report that it is up-to-date, because
-	 *         it is not equal to the serialized representation of itself.
-	 */
-	static <T extends FormatterFunc & Serializable> FormatterStep createNeverUpToDateSerializable(
-			String name,
-			T function) {
-		Objects.requireNonNull(function, "function");
-		return new NeverUpToDateSerializable(name, function);
-	}
+	static class ToCaseStep implements FormatterStep {
+		static ToCaseStep upper() {
+			return new ToCaseStep(true);
+		}
 
-	static class NeverUpToDateSerializable<T extends FormatterFunc & Serializable> implements FormatterStep, Serializable {
-		private final String name;
-		private final T formatterFunc;
+		static ToCaseStep lower() {
+			return new ToCaseStep(false);
+		}
+
+		private final boolean uppercase;
 
-		private NeverUpToDateSerializable(String name, T formatterFunc) {
-			this.name = name;
-			this.formatterFunc = formatterFunc;
+		ToCaseStep(boolean uppercase) {
+			this.uppercase = uppercase;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return uppercase ? "uppercase" : "lowercase";
 		}
 
-		@Nullable
+		@org.jetbrains.annotations.Nullable
 		@Override
 		public String format(String rawUnix, File file) throws Exception {
-			return formatterFunc.apply(rawUnix, file);
+			return uppercase ? rawUnix.toUpperCase() : rawUnix.toLowerCase();
 		}
 
 		@Override
 		public void close() throws Exception {
-			if (formatterFunc instanceof FormatterFunc.Closeable) {
-				((FormatterFunc.Closeable) formatterFunc).close();
-			}
+
+		}
+
+		@Override
+		public int hashCode() {
+			return getName().hashCode();
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			return obj instanceof ToCaseStep && getName().equals(((ToCaseStep) obj).getName());
 		}
 	}
 }

From 8bef1adf591683b4c1bf325d875bb4f29dde23bc Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 29 May 2024 11:04:41 -0700
Subject: [PATCH 1654/2068] TODO: add warning that custom steps require Gradle
 8.0+

---
 .../spotless/BumpThisNumberIfACustomStepChangesTest.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BumpThisNumberIfACustomStepChangesTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BumpThisNumberIfACustomStepChangesTest.java
index f959226032..e24c0175d0 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BumpThisNumberIfACustomStepChangesTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BumpThisNumberIfACustomStepChangesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,9 +17,14 @@
 
 import java.io.IOException;
 
+import org.gradle.testkit.runner.GradleRunner;
 import org.junit.jupiter.api.Test;
 
 class BumpThisNumberIfACustomStepChangesTest extends GradleIntegrationHarness {
+	@Override
+	protected GradleRunner gradleRunner() throws IOException {
+		return super.gradleRunner().withGradleVersion("8.0");
+	}
 
 	private void writeBuildFile(String toInsert) throws IOException {
 		setFile("build.gradle").toLines(

From 83850bfe8e1f5bfc0419c15fd6f841ebcfc0cf04 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 29 May 2024 11:40:10 -0700
Subject: [PATCH 1655/2068] Resolved TODO: custom steps only allowed on Gradle
 8+

---
 plugin-gradle/CHANGES.md                             |  2 ++
 .../diffplug/gradle/spotless/FormatExtension.java    |  7 +++++++
 .../com/diffplug/gradle/spotless/SpotlessPlugin.java |  3 ++-
 .../gradle/spotless/SpotlessPluginRedirect.java      | 10 +++++++---
 .../BumpThisNumberIfACustomStepChangesTest.java      |  6 ------
 .../gradle/spotless/GitRatchetGradleTest.java        |  2 +-
 .../gradle/spotless/GradleIntegrationHarness.java    | 12 +++++++++---
 7 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 666221af89..99160a6011 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -4,6 +4,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
+* Full, no-asterisk support of Gradle configuration cache. ([#1274](https://github.com/diffplug/spotless/issues/1274), giving up on [#987](https://github.com/diffplug/spotless/issues/987))
+  * In order to use `custom`, you must now use Gradle 8.0+. 
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
 * Add support for formatting and sorting Maven POMs ([#2082](https://github.com/diffplug/spotless/issues/2082))
 ### Fixed
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index 6d8d85e2f4..b589074915 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -16,6 +16,7 @@
 package com.diffplug.gradle.spotless;
 
 import static com.diffplug.gradle.spotless.PluginGradlePreconditions.requireElementsNonNull;
+import static com.diffplug.gradle.spotless.SpotlessPluginRedirect.badSemver;
 import static java.util.Objects.requireNonNull;
 
 import java.io.File;
@@ -451,6 +452,12 @@ public String apply(String unixNewlines) {
 	 */
 	public void custom(String name, FormatterFunc formatter) {
 		requireNonNull(formatter, "formatter");
+		if (badSemver(getProject()) < badSemver(SpotlessPlugin.VER_GRADLE_minVersionForCustom)) {
+			throw new GradleException("The 'custom' method is only available if you are using Gradle "
+					+ SpotlessPlugin.VER_GRADLE_minVersionForCustom
+					+ " or newer, this is "
+					+ getProject().getGradle().getGradleVersion());
+		}
 		addStep(FormatterStep.createLazy(name, () -> globalState, SerializedFunction.alwaysReturns(formatter)));
 	}
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPlugin.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPlugin.java
index 0043e2b274..407f98dd0d 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPlugin.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,6 +28,7 @@ public class SpotlessPlugin implements Plugin<Project> {
 	static final String SPOTLESS_MODERN = "spotlessModern";
 	static final String VER_GRADLE_min = "6.1.1";
 	static final String VER_GRADLE_javaPluginExtension = "7.1";
+	static final String VER_GRADLE_minVersionForCustom = "8.0";
 	private static final int MINIMUM_JRE = 11;
 
 	@Override
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPluginRedirect.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPluginRedirect.java
index bca8ea7c70..9668042400 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPluginRedirect.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPluginRedirect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 DiffPlug
+ * Copyright 2020-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,11 @@
 public class SpotlessPluginRedirect implements Plugin<Project> {
 	private static final Pattern BAD_SEMVER = Pattern.compile("(\\d+)\\.(\\d+)");
 
-	private static int badSemver(String input) {
+	static int badSemver(Project project) {
+		return badSemver(project.getGradle().getGradleVersion());
+	}
+
+	static int badSemver(String input) {
 		Matcher matcher = BAD_SEMVER.matcher(input);
 		if (!matcher.find() || matcher.start() != 0) {
 			throw new IllegalArgumentException("Version must start with " + BAD_SEMVER.pattern());
@@ -46,7 +50,7 @@ private static int badSemver(int major, int minor) {
 
 	static boolean gradleIsTooOld(Project project) {
 		if (gradleIsTooOld == null) {
-			gradleIsTooOld = badSemver(project.getGradle().getGradleVersion()) < badSemver(SpotlessPlugin.VER_GRADLE_min);
+			gradleIsTooOld = badSemver(project) < badSemver(SpotlessPlugin.VER_GRADLE_min);
 		}
 		return gradleIsTooOld.booleanValue();
 	}
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BumpThisNumberIfACustomStepChangesTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BumpThisNumberIfACustomStepChangesTest.java
index e24c0175d0..28351bd9b7 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BumpThisNumberIfACustomStepChangesTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BumpThisNumberIfACustomStepChangesTest.java
@@ -17,15 +17,9 @@
 
 import java.io.IOException;
 
-import org.gradle.testkit.runner.GradleRunner;
 import org.junit.jupiter.api.Test;
 
 class BumpThisNumberIfACustomStepChangesTest extends GradleIntegrationHarness {
-	@Override
-	protected GradleRunner gradleRunner() throws IOException {
-		return super.gradleRunner().withGradleVersion("8.0");
-	}
-
 	private void writeBuildFile(String toInsert) throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GitRatchetGradleTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GitRatchetGradleTest.java
index 388bbbb8d1..d63efd9e57 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GitRatchetGradleTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GitRatchetGradleTest.java
@@ -53,7 +53,7 @@ private Git initRepo() throws IllegalStateException, GitAPIException, IOExceptio
 
 	@Override
 	protected GradleRunner gradleRunner() throws IOException {
-		return super.gradleRunner().withGradleVersion(GradleVersionSupport.CONFIGURATION_CACHE.version);
+		return super.gradleRunner().withGradleVersion(GradleVersionSupport.CUSTOM_STEPS.version);
 	}
 
 	@ParameterizedTest
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
index 417bc23b52..8ef71ec020 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@
 
 public class GradleIntegrationHarness extends ResourceHarness {
 	public enum GradleVersionSupport {
-		JRE_11("5.0"), MINIMUM(SpotlessPlugin.VER_GRADLE_min),
+		JRE_11("5.0"), MINIMUM(SpotlessPlugin.VER_GRADLE_min), CUSTOM_STEPS(SpotlessPlugin.VER_GRADLE_minVersionForCustom),
 		// technically, this API exists in 6.5, but the flags for it change in 6.6, so we build to that
 		CONFIGURATION_CACHE("6.6"),
 		// https://docs.gradle.org/7.5/userguide/configuration_cache.html#config_cache:stable
@@ -116,8 +116,14 @@ void gitAttributes() throws IOException {
 	}
 
 	protected GradleRunner gradleRunner() throws IOException {
+		GradleVersionSupport version;
+		if (newFile("build.gradle").exists() && read("build.gradle").contains("custom")) {
+			version = GradleVersionSupport.CUSTOM_STEPS;
+		} else {
+			version = GradleVersionSupport.MINIMUM;
+		}
 		return GradleRunner.create()
-				.withGradleVersion(GradleVersionSupport.MINIMUM.version)
+				.withGradleVersion(version.version)
 				.withProjectDir(rootFolder())
 				.withTestKitDir(getTestKitDir())
 				.withPluginClasspath();

From cffb2f474547e57483baea3fc767ed2937279f12 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 23 May 2024 16:54:43 -0700
Subject: [PATCH 1656/2068] StepHarness should operate on the post-roundtripped
 set, not the pre-roundtripped.

---
 .../src/main/java/com/diffplug/spotless/StepHarnessBase.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
index 656057cd4e..d86021ef99 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
@@ -27,14 +27,15 @@ enum RoundTrip {
 	private final Formatter formatter;
 
 	protected StepHarnessBase(Formatter formatter, RoundTrip roundTrip) {
-		this.formatter = Objects.requireNonNull(formatter);
 		if (roundTrip == RoundTrip.DONT_ROUNDTRIP) {
+			this.formatter = Objects.requireNonNull(formatter);
 			return;
 		}
 		Formatter roundTripped = SerializableEqualityTester.reserialize(formatter);
 		if (roundTrip == RoundTrip.ASSERT_EQUAL) {
 			Assertions.assertThat(roundTripped).isEqualTo(formatter);
 		}
+		this.formatter = roundTripped;
 	}
 
 	protected Formatter formatter() {

From 50429a8dff941e0852fd7b8231763dd3ef68f398 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 23 May 2024 16:06:11 -0700
Subject: [PATCH 1657/2068] Fix round-tripping  of NativeCmdStep.

---
 .../spotless/generic/NativeCmdStep.java       | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/generic/NativeCmdStep.java b/lib/src/main/java/com/diffplug/spotless/generic/NativeCmdStep.java
index 31b30fe56f..3e58c9dbae 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/NativeCmdStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/NativeCmdStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2021-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,24 +35,37 @@ private NativeCmdStep() {}
 	public static FormatterStep create(String name, File pathToExe, List<String> arguments) {
 		Objects.requireNonNull(name, "name");
 		Objects.requireNonNull(pathToExe, "pathToExe");
-		return FormatterStep.createLazy(name, () -> new State(FileSignature.signAsList(pathToExe), arguments), State::toFunc);
+		return FormatterStep.createLazy(name, () -> new State(FileSignature.promise(pathToExe), arguments), State::toRuntime, Runtime::toFunc);
 	}
 
 	static class State implements Serializable {
-		private static final long serialVersionUID = 1L;
+		private static final long serialVersionUID = 2L;
+		final FileSignature.Promised pathToExe;
+		final List<String> arguments;
 
-		final FileSignature pathToExe;
+		State(FileSignature.Promised pathToExe, List<String> arguments) {
+			this.pathToExe = pathToExe;
+			this.arguments = arguments;
+		}
+
+		Runtime toRuntime() {
+			return new Runtime(pathToExe.get().getOnlyFile(), arguments);
+		}
+	}
 
+	static class Runtime implements Serializable {
+		private static final long serialVersionUID = 2L;
+		final File pathToExe;
 		final List<String> arguments;
 
-		State(FileSignature pathToExe, List<String> arguments) {
+		Runtime(File pathToExe, List<String> arguments) {
 			this.pathToExe = pathToExe;
 			this.arguments = arguments;
 		}
 
 		String format(ProcessRunner runner, String input) throws IOException, InterruptedException {
 			List<String> argumentsWithPathToExe = new ArrayList<>();
-			argumentsWithPathToExe.add(pathToExe.getOnlyFile().getAbsolutePath());
+			argumentsWithPathToExe.add(pathToExe.getAbsolutePath());
 			if (arguments != null) {
 				argumentsWithPathToExe.addAll(arguments);
 			}

From 92664ebf87d950c702e9f03b3ea7d673f4f396b5 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 4 Apr 2024 10:35:37 -0700
Subject: [PATCH 1658/2068] Fix round-tripping of DBeaver step.

---
 .../spotless/sql/DBeaverSQLFormatterStep.java | 27 ++++++-------------
 .../sql/DBeaverSQLFormatterStepTest.java      | 10 +++----
 2 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/sql/DBeaverSQLFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/sql/DBeaverSQLFormatterStep.java
index fece2ea0fd..e9c7a59e54 100644
--- a/lib/src/main/java/com/diffplug/spotless/sql/DBeaverSQLFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/sql/DBeaverSQLFormatterStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 package com.diffplug.spotless.sql;
 
 import java.io.File;
-import java.io.Serializable;
 
 import com.diffplug.spotless.FileSignature;
 import com.diffplug.spotless.FormatterFunc;
@@ -32,24 +31,14 @@ public class DBeaverSQLFormatterStep {
 	private DBeaverSQLFormatterStep() {}
 
 	public static FormatterStep create(Iterable<File> files) {
-		return FormatterStep.createLazy(NAME,
-				() -> new State(files),
-				State::createFormat);
+		return FormatterStep.create(NAME, FileSignature.promise(files),
+				FileSignature.Promised::get,
+				DBeaverSQLFormatterStep::createFormat);
 	}
 
-	static final class State implements Serializable {
-		private static final long serialVersionUID = 1L;
-
-		final FileSignature settingsSignature;
-
-		State(final Iterable<File> settingsFiles) throws Exception {
-			this.settingsSignature = FileSignature.signAsList(settingsFiles);
-		}
-
-		FormatterFunc createFormat() throws Exception {
-			FormatterProperties preferences = FormatterProperties.from(settingsSignature.files());
-			DBeaverSQLFormatter dbeaverSqlFormatter = new DBeaverSQLFormatter(preferences.getProperties());
-			return dbeaverSqlFormatter::format;
-		}
+	private static FormatterFunc createFormat(FileSignature settings) {
+		FormatterProperties preferences = FormatterProperties.from(settings.files());
+		DBeaverSQLFormatter dbeaverSqlFormatter = new DBeaverSQLFormatter(preferences.getProperties());
+		return dbeaverSqlFormatter::format;
 	}
 }
diff --git a/testlib/src/test/java/com/diffplug/spotless/sql/DBeaverSQLFormatterStepTest.java b/testlib/src/test/java/com/diffplug/spotless/sql/DBeaverSQLFormatterStepTest.java
index 58b0115b9c..648ddc6669 100644
--- a/testlib/src/test/java/com/diffplug/spotless/sql/DBeaverSQLFormatterStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/sql/DBeaverSQLFormatterStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@
 class DBeaverSQLFormatterStepTest extends ResourceHarness {
 
 	@Test
-	void behavior() throws Exception {
+	void behavior() {
 		FormatterStep step = DBeaverSQLFormatterStep.create(Collections.emptySet());
 		StepHarness.forStep(step)
 				.testResource("sql/dbeaver/full.dirty", "sql/dbeaver/full.clean")
@@ -40,21 +40,21 @@ void behavior() throws Exception {
 	}
 
 	@Test
-	void behaviorWithConfigFile() throws Exception {
+	void behaviorWithConfigFile() {
 		FormatterStep step = DBeaverSQLFormatterStep.create(createTestFiles("sql/dbeaver/sqlConfig.properties"));
 		StepHarness.forStep(step)
 				.testResource("sql/dbeaver/create.dirty", "sql/dbeaver/create.clean");
 	}
 
 	@Test
-	void behaviorWithAlternativeConfigFile() throws Exception {
+	void behaviorWithAlternativeConfigFile() {
 		FormatterStep step = DBeaverSQLFormatterStep.create(createTestFiles("sql/dbeaver/sqlConfig2.properties"));
 		StepHarness.forStep(step)
 				.testResource("sql/dbeaver/create.dirty", "sql/dbeaver/create.clean.alternative");
 	}
 
 	@Test
-	void equality() throws Exception {
+	void equality() {
 		List<File> sqlConfig1 = createTestFiles("sql/dbeaver/sqlConfig.properties");
 		List<File> sqlConfig2 = createTestFiles("sql/dbeaver/sqlConfig2.properties");
 		new SerializableEqualityTester() {

From 5473eb1d0fc99c2790607205b84b51aa9d5a10b3 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 29 May 2024 15:15:14 -0700
Subject: [PATCH 1659/2068] Add proper roundtrip behavior to the `ForeignExe`
 steps.

---
 .../spotless/cpp/ClangFormatStep.java         | 12 ++++----
 .../diffplug/spotless/go/GofmtFormatStep.java | 28 +++++++++++++++----
 .../diffplug/spotless/python/BlackStep.java   | 12 ++++----
 .../diffplug/spotless/shell/ShfmtStep.java    | 28 +++++++++++++++----
 4 files changed, 56 insertions(+), 24 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/cpp/ClangFormatStep.java b/lib/src/main/java/com/diffplug/spotless/cpp/ClangFormatStep.java
index 345ac723c3..64a43bf439 100644
--- a/lib/src/main/java/com/diffplug/spotless/cpp/ClangFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/cpp/ClangFormatStep.java
@@ -64,10 +64,10 @@ public ClangFormatStep withPathToExe(String pathToExe) {
 	}
 
 	public FormatterStep create() {
-		return FormatterStep.createLazy(name(), this::createState, RoundtripState::state, State::toFunc);
+		return FormatterStep.createLazy(name(), this::createRoundtrip, RoundtripState::toEquality, EqualityState::toFunc);
 	}
 
-	private RoundtripState createState() throws IOException, InterruptedException {
+	private RoundtripState createRoundtrip() throws IOException, InterruptedException {
 		String howToInstall = "" +
 				"You can download clang-format from https://releases.llvm.org and " +
 				"then point Spotless to it with {@code pathToExe('/path/to/clang-format')} " +
@@ -98,13 +98,13 @@ static class RoundtripState implements Serializable {
 			this.exe = exe;
 		}
 
-		private State state() {
-			return new State(version, style, exe);
+		private EqualityState toEquality() {
+			return new EqualityState(version, style, exe);
 		}
 	}
 
 	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
-	static class State implements Serializable {
+	static class EqualityState implements Serializable {
 		private static final long serialVersionUID = -1825662356883926318L;
 		// used for up-to-date checks and caching
 		final String version;
@@ -113,7 +113,7 @@ static class State implements Serializable {
 		// used for executing
 		private transient @Nullable List<String> args;
 
-		State(String version, @Nullable String style, ForeignExe pathToExe) {
+		EqualityState(String version, @Nullable String style, ForeignExe pathToExe) {
 			this.version = version;
 			this.style = style;
 			this.exe = Objects.requireNonNull(pathToExe);
diff --git a/lib/src/main/java/com/diffplug/spotless/go/GofmtFormatStep.java b/lib/src/main/java/com/diffplug/spotless/go/GofmtFormatStep.java
index 18e388cf5b..ffdc17cd21 100644
--- a/lib/src/main/java/com/diffplug/spotless/go/GofmtFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/go/GofmtFormatStep.java
@@ -63,10 +63,10 @@ public GofmtFormatStep withGoExecutable(String pathToExe) {
 	}
 
 	public FormatterStep create() {
-		return FormatterStep.createLazy(name(), this::createState, GofmtFormatStep.State::toFunc);
+		return FormatterStep.createLazy(name(), this::createRountrip, RoundtripState::toEquality, EqualityState::toFunc);
 	}
 
-	private State createState() throws IOException, InterruptedException {
+	private RoundtripState createRountrip() throws IOException, InterruptedException {
 		String howToInstall = "gofmt is a part of standard go distribution. If spotless can't discover it automatically, " +
 				"you can point Spotless to the go binary with {@code pathToExe('/path/to/go')}";
 		final ForeignExe exe = ForeignExe.nameAndVersion("go", version)
@@ -76,18 +76,34 @@ private State createState() throws IOException, InterruptedException {
 				.fixWrongVersion(
 						"You can tell Spotless to use the version you already have with {@code gofmt('{versionFound}')}" +
 								"or you can install the currently specified Go version, {version}.\n" + howToInstall);
-		return new State(this, exe);
+		return new RoundtripState(version, exe);
+	}
+
+	static class RoundtripState implements Serializable {
+		private static final long serialVersionUID = 1L;
+
+		final String version;
+		final ForeignExe exe;
+
+		RoundtripState(String version, ForeignExe exe) {
+			this.version = version;
+			this.exe = exe;
+		}
+
+		private EqualityState toEquality() {
+			return new EqualityState(version, exe);
+		}
 	}
 
 	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
-	static class State implements Serializable {
+	static class EqualityState implements Serializable {
 		private static final long serialVersionUID = -1825662355363926318L;
 		// used for up-to-date checks and caching
 		final String version;
 		final transient ForeignExe exe;
 
-		public State(GofmtFormatStep step, ForeignExe goExecutable) {
-			this.version = step.version;
+		public EqualityState(String version, ForeignExe goExecutable) {
+			this.version = version;
 			this.exe = Objects.requireNonNull(goExecutable);
 		}
 
diff --git a/lib/src/main/java/com/diffplug/spotless/python/BlackStep.java b/lib/src/main/java/com/diffplug/spotless/python/BlackStep.java
index 9fe26cdae8..46d00caab2 100644
--- a/lib/src/main/java/com/diffplug/spotless/python/BlackStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/python/BlackStep.java
@@ -56,10 +56,10 @@ public BlackStep withPathToExe(String pathToExe) {
 	}
 
 	public FormatterStep create() {
-		return FormatterStep.createLazy(name(), this::createState, RoundtripState::state, State::toFunc);
+		return FormatterStep.createLazy(name(), this::createRoundtrip, RoundtripState::toEquality, EqualityState::toFunc);
 	}
 
-	private RoundtripState createState() {
+	private RoundtripState createRoundtrip() {
 		String trackingIssue = "\n  github issue to handle this better: https://github.com/diffplug/spotless/issues/674";
 		ForeignExe exeAbsPath = ForeignExe.nameAndVersion("black", version)
 				.pathToExe(pathToExe)
@@ -80,13 +80,13 @@ static class RoundtripState implements Serializable {
 			this.exe = exe;
 		}
 
-		private State state() {
-			return new State(version, exe);
+		private EqualityState toEquality() {
+			return new EqualityState(version, exe);
 		}
 	}
 
 	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
-	static class State implements Serializable {
+	static class EqualityState implements Serializable {
 		private static final long serialVersionUID = -1825662356883926318L;
 		// used for up-to-date checks and caching
 		final String version;
@@ -94,7 +94,7 @@ static class State implements Serializable {
 		// used for executing
 		private transient @Nullable String[] args;
 
-		State(String version, ForeignExe exeAbsPath) {
+		EqualityState(String version, ForeignExe exeAbsPath) {
 			this.version = version;
 			this.exe = Objects.requireNonNull(exeAbsPath);
 		}
diff --git a/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java b/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java
index 6fd83aac80..6630bf32a1 100644
--- a/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java
@@ -60,10 +60,10 @@ public ShfmtStep withPathToExe(String pathToExe) {
 	}
 
 	public FormatterStep create() {
-		return FormatterStep.createLazy(name(), this::createState, State::toFunc);
+		return FormatterStep.createLazy(name(), this::createRoundtrip, RoundtripState::toEquality, EqualityState::toFunc);
 	}
 
-	private State createState() throws IOException, InterruptedException {
+	private RoundtripState createRoundtrip() throws IOException, InterruptedException {
 		String howToInstall = "" +
 				"You can download shfmt from https://github.com/mvdan/sh and " +
 				"then point Spotless to it with {@code pathToExe('/path/to/shfmt')} " +
@@ -79,11 +79,27 @@ private State createState() throws IOException, InterruptedException {
 				.fixWrongVersion(
 						"You can tell Spotless to use the version you already have with {@code shfmt('{versionFound}')}" +
 								"or you can download the currently specified version, {version}.\n" + howToInstall);
-		return new State(this, exe);
+		return new RoundtripState(version, exe);
+	}
+
+	static class RoundtripState implements Serializable {
+		private static final long serialVersionUID = 1L;
+
+		final String version;
+		final ForeignExe exe;
+
+		RoundtripState(String version, ForeignExe exe) {
+			this.version = version;
+			this.exe = exe;
+		}
+
+		private EqualityState toEquality() {
+			return new EqualityState(version, exe);
+		}
 	}
 
 	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
-	static class State implements Serializable {
+	static class EqualityState implements Serializable {
 		private static final long serialVersionUID = -1825662356883926318L;
 
 		// used for up-to-date checks and caching
@@ -93,8 +109,8 @@ static class State implements Serializable {
 		// used for executing
 		private transient @Nullable List<String> args;
 
-		State(ShfmtStep step, ForeignExe pathToExe) {
-			this.version = step.version;
+		EqualityState(String version, ForeignExe pathToExe) {
+			this.version = version;
 			this.exe = Objects.requireNonNull(pathToExe);
 		}
 

From 48e744d8cfcaf5121e5920802d0400a22ebefbb3 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 29 May 2024 13:51:51 -0700
Subject: [PATCH 1660/2068] Remove crufty and internally-unused methods from
 `Formatter`.

---
 CHANGES.md                                    |  1 +
 .../java/com/diffplug/spotless/Formatter.java | 65 -------------------
 2 files changed, 1 insertion(+), 65 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 04722f1c2b..716166ee39 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -34,6 +34,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * **BREAKING** Remove `JarState.getMavenCoordinate(String prefix)`. ([#1945](https://github.com/diffplug/spotless/pull/1945))
 * **BREAKING** Replace `PipeStepPair` with `FenceStep`. ([#1954](https://github.com/diffplug/spotless/pull/1954))
 * **BREAKING** Fully removed `Rome`, use `Biome` instead. ([#2119](https://github.com/diffplug/spotless/pull/2119))
+* **BREAKING** Removed `isClean`, `applyTo`, and `applyToAndReturnResultIfDirty` from `Formatter` because users should instead use `PaddedCell.check()`.
 
 ## [2.45.0] - 2024-01-23
 ### Added
diff --git a/lib/src/main/java/com/diffplug/spotless/Formatter.java b/lib/src/main/java/com/diffplug/spotless/Formatter.java
index b5cd5f81fc..4dea2e3d3d 100644
--- a/lib/src/main/java/com/diffplug/spotless/Formatter.java
+++ b/lib/src/main/java/com/diffplug/spotless/Formatter.java
@@ -24,17 +24,12 @@
 import java.io.ObjectStreamException;
 import java.io.Serializable;
 import java.nio.charset.Charset;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.nio.file.StandardOpenOption;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 
-import javax.annotation.Nullable;
-
 /** Formatter which performs the full formatting. */
 public final class Formatter implements Serializable, AutoCloseable {
 	private static final long serialVersionUID = 1L;
@@ -159,66 +154,6 @@ public Formatter build() {
 		}
 	}
 
-	/** Returns true iff the given file's formatting is up-to-date. */
-	public boolean isClean(File file) throws IOException {
-		Objects.requireNonNull(file);
-
-		String raw = new String(Files.readAllBytes(file.toPath()), encoding);
-		String unix = LineEnding.toUnix(raw);
-
-		// check the newlines (we can find these problems without even running the steps)
-		int totalNewLines = (int) unix.codePoints().filter(val -> val == '\n').count();
-		int windowsNewLines = raw.length() - unix.length();
-		if (lineEndingsPolicy.isUnix(file)) {
-			if (windowsNewLines != 0) {
-				return false;
-			}
-		} else {
-			if (windowsNewLines != totalNewLines) {
-				return false;
-			}
-		}
-
-		// check the other formats
-		String formatted = compute(unix, file);
-
-		// return true iff the formatted string equals the unix one
-		return formatted.equals(unix);
-	}
-
-	/** Applies formatting to the given file. */
-	public void applyTo(File file) throws IOException {
-		applyToAndReturnResultIfDirty(file);
-	}
-
-	/**
-	 * Applies formatting to the given file.
-	 * <p>
-	 * Returns null if the file was already clean, or the
-	 * formatted result with unix newlines if it was not.
-	 */
-	public @Nullable String applyToAndReturnResultIfDirty(File file) throws IOException {
-		Objects.requireNonNull(file);
-
-		byte[] rawBytes = Files.readAllBytes(file.toPath());
-		String raw = new String(rawBytes, encoding);
-		String rawUnix = LineEnding.toUnix(raw);
-
-		// enforce the format
-		String formattedUnix = compute(rawUnix, file);
-		// enforce the line endings
-		String formatted = computeLineEndings(formattedUnix, file);
-
-		// write out the file iff it has changed
-		byte[] formattedBytes = formatted.getBytes(encoding);
-		if (!Arrays.equals(rawBytes, formattedBytes)) {
-			Files.write(file.toPath(), formattedBytes, StandardOpenOption.TRUNCATE_EXISTING);
-			return formattedUnix;
-		} else {
-			return null;
-		}
-	}
-
 	/** Applies the appropriate line endings to the given unix content. */
 	public String computeLineEndings(String unix, File file) {
 		Objects.requireNonNull(unix, "unix");

From 5843830a142677cf9888e171008d8d498cd451e1 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 29 May 2024 13:52:32 -0700
Subject: [PATCH 1661/2068] Moved `PaddedCell.DirtyState` to its own top-level
 class with new methods.

---
 CHANGES.md                                    |   1 +
 .../com/diffplug/spotless/DirtyState.java     | 141 ++++++++++++++++++
 .../com/diffplug/spotless/PaddedCell.java     | 111 +-------------
 .../com/diffplug/gradle/spotless/IdeHook.java |   6 +-
 .../gradle/spotless/SpotlessTaskImpl.java     |  10 +-
 .../com/diffplug/spotless/maven/IdeHook.java  |   6 +-
 .../spotless/maven/SpotlessApplyMojo.java     |   6 +-
 .../spotless/maven/SpotlessCheckMojo.java     |   4 +-
 8 files changed, 159 insertions(+), 126 deletions(-)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/DirtyState.java

diff --git a/CHANGES.md b/CHANGES.md
index 716166ee39..1de166cd2b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -34,6 +34,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * **BREAKING** Remove `JarState.getMavenCoordinate(String prefix)`. ([#1945](https://github.com/diffplug/spotless/pull/1945))
 * **BREAKING** Replace `PipeStepPair` with `FenceStep`. ([#1954](https://github.com/diffplug/spotless/pull/1954))
 * **BREAKING** Fully removed `Rome`, use `Biome` instead. ([#2119](https://github.com/diffplug/spotless/pull/2119))
+* **BREAKING** Moved `PaddedCell.DirtyState` to its own top-level class with new methods.
 * **BREAKING** Removed `isClean`, `applyTo`, and `applyToAndReturnResultIfDirty` from `Formatter` because users should instead use `PaddedCell.check()`.
 
 ## [2.45.0] - 2024-01-23
diff --git a/lib/src/main/java/com/diffplug/spotless/DirtyState.java b/lib/src/main/java/com/diffplug/spotless/DirtyState.java
new file mode 100644
index 0000000000..3d133927c6
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/DirtyState.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright 2022-2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.util.Arrays;
+
+import javax.annotation.Nullable;
+
+/**
+ * The clean/dirty state of a single file.  Intended use:
+ * - {@link #isClean()} means that the file is is clean, and there's nothing else to say
+ * - {@link #didNotConverge()} means that we were unable to determine a clean state
+ * - once you've tested the above conditions and you know that it's a dirty file with a converged state,
+ * then you can call {@link #writeCanonicalTo(OutputStream)} to get the canonical form of the given file.
+ */
+public class DirtyState {
+	@Nullable
+	private final byte[] canonicalBytes;
+
+	DirtyState(@Nullable byte[] canonicalBytes) {
+		this.canonicalBytes = canonicalBytes;
+	}
+
+	public boolean isClean() {
+		return this == isClean;
+	}
+
+	public boolean didNotConverge() {
+		return this == didNotConverge;
+	}
+
+	private byte[] canonicalBytes() {
+		if (canonicalBytes == null) {
+			throw new IllegalStateException("First make sure that {@code !isClean()} and {@code !didNotConverge()}");
+		}
+		return canonicalBytes;
+	}
+
+	public void writeCanonicalTo(File file) throws IOException {
+		Files.write(file.toPath(), canonicalBytes());
+	}
+
+	public void writeCanonicalTo(OutputStream out) throws IOException {
+		out.write(canonicalBytes());
+	}
+
+	/** Returns the DirtyState which corresponds to {@code isClean()}. */
+	public static DirtyState clean() {
+		return isClean;
+	}
+
+	static final DirtyState didNotConverge = new DirtyState(null);
+	static final DirtyState isClean = new DirtyState(null);
+
+	public static Calculation of(Formatter formatter, File file) throws IOException {
+		return of(formatter, file, Files.readAllBytes(file.toPath()));
+	}
+
+	public static Calculation of(Formatter formatter, File file, byte[] rawBytes) {
+		return new Calculation(formatter, file, rawBytes);
+	}
+
+	public static class Calculation {
+		private final Formatter formatter;
+		private final File file;
+		private final byte[] rawBytes;
+		private final String raw;
+
+		private Calculation(Formatter formatter, File file, byte[] rawBytes) {
+			this.formatter = formatter;
+			this.file = file;
+			this.rawBytes = rawBytes;
+			this.raw = new String(rawBytes, formatter.getEncoding());
+			// check that all characters were encodable
+			String encodingError = EncodingErrorMsg.msg(raw, rawBytes, formatter.getEncoding());
+			if (encodingError != null) {
+				throw new IllegalArgumentException(encodingError);
+			}
+		}
+
+		/**
+		 * Calculates whether the given file is dirty according to a PaddedCell invocation of the given formatter.
+		 * DirtyState includes the clean state of the file, as well as a warning if we were not able to apply the formatter
+		 * due to diverging idempotence.
+		 */
+		public DirtyState calculateDirtyState() {
+			String rawUnix = LineEnding.toUnix(raw);
+
+			// enforce the format
+			String formattedUnix = formatter.compute(rawUnix, file);
+			// convert the line endings if necessary
+			String formatted = formatter.computeLineEndings(formattedUnix, file);
+
+			// if F(input) == input, then the formatter is well-behaving and the input is clean
+			byte[] formattedBytes = formatted.getBytes(formatter.getEncoding());
+			if (Arrays.equals(rawBytes, formattedBytes)) {
+				return isClean;
+			}
+
+			// F(input) != input, so we'll do a padded check
+			String doubleFormattedUnix = formatter.compute(formattedUnix, file);
+			if (doubleFormattedUnix.equals(formattedUnix)) {
+				// most dirty files are idempotent-dirty, so this is a quick-short circuit for that common case
+				return new DirtyState(formattedBytes);
+			}
+
+			PaddedCell cell = PaddedCell.check(formatter, file, rawUnix);
+			if (!cell.isResolvable()) {
+				return didNotConverge;
+			}
+
+			// get the canonical bytes
+			String canonicalUnix = cell.canonical();
+			String canonical = formatter.computeLineEndings(canonicalUnix, file);
+			byte[] canonicalBytes = canonical.getBytes(formatter.getEncoding());
+			if (!Arrays.equals(rawBytes, canonicalBytes)) {
+				// and write them to disk if needed
+				return new DirtyState(canonicalBytes);
+			} else {
+				return isClean;
+			}
+		}
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/PaddedCell.java b/lib/src/main/java/com/diffplug/spotless/PaddedCell.java
index 910fa940d3..b0cb64ae90 100644
--- a/lib/src/main/java/com/diffplug/spotless/PaddedCell.java
+++ b/lib/src/main/java/com/diffplug/spotless/PaddedCell.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,19 +18,14 @@
 import static com.diffplug.spotless.LibPreconditions.requireElementsNonNull;
 
 import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
 import java.nio.file.Files;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
 import java.util.function.Function;
 
-import javax.annotation.Nullable;
-
 /**
  * Models the result of applying a {@link Formatter} on a given {@link File}
  * while characterizing various failure modes (slow convergence, cycles, and divergence).
@@ -176,108 +171,4 @@ public String userMessage() {
 		}
 		// @formatter:on
 	}
-
-	/**
-	 * Calculates whether the given file is dirty according to a PaddedCell invocation of the given formatter.
-	 * DirtyState includes the clean state of the file, as well as a warning if we were not able to apply the formatter
-	 * due to diverging idempotence.
-	 */
-	public static DirtyState calculateDirtyState(Formatter formatter, File file) throws IOException {
-		Objects.requireNonNull(formatter, "formatter");
-		Objects.requireNonNull(file, "file");
-
-		byte[] rawBytes = Files.readAllBytes(file.toPath());
-		return calculateDirtyState(formatter, file, rawBytes);
-	}
-
-	public static DirtyState calculateDirtyState(Formatter formatter, File file, byte[] rawBytes) throws IOException {
-		String raw = new String(rawBytes, formatter.getEncoding());
-		// check that all characters were encodable
-		String encodingError = EncodingErrorMsg.msg(raw, rawBytes, formatter.getEncoding());
-		if (encodingError != null) {
-			throw new IllegalArgumentException(encodingError);
-		}
-		String rawUnix = LineEnding.toUnix(raw);
-
-		// enforce the format
-		String formattedUnix = formatter.compute(rawUnix, file);
-		// convert the line endings if necessary
-		String formatted = formatter.computeLineEndings(formattedUnix, file);
-
-		// if F(input) == input, then the formatter is well-behaving and the input is clean
-		byte[] formattedBytes = formatted.getBytes(formatter.getEncoding());
-		if (Arrays.equals(rawBytes, formattedBytes)) {
-			return isClean;
-		}
-
-		// F(input) != input, so we'll do a padded check
-		String doubleFormattedUnix = formatter.compute(formattedUnix, file);
-		if (doubleFormattedUnix.equals(formattedUnix)) {
-			// most dirty files are idempotent-dirty, so this is a quick-short circuit for that common case
-			return new DirtyState(formattedBytes);
-		}
-
-		PaddedCell cell = PaddedCell.check(formatter, file, rawUnix);
-		if (!cell.isResolvable()) {
-			return didNotConverge;
-		}
-
-		// get the canonical bytes
-		String canonicalUnix = cell.canonical();
-		String canonical = formatter.computeLineEndings(canonicalUnix, file);
-		byte[] canonicalBytes = canonical.getBytes(formatter.getEncoding());
-		if (!Arrays.equals(rawBytes, canonicalBytes)) {
-			// and write them to disk if needed
-			return new DirtyState(canonicalBytes);
-		} else {
-			return isClean;
-		}
-	}
-
-	/**
-	 * The clean/dirty state of a single file.  Intended use:
-	 * - {@link #isClean()} means that the file is clean, and there's nothing else to say
-	 * - {@link #didNotConverge()} means that we were unable to determine a clean state
-	 * - once you've tested the above conditions and you know that it's a dirty file with a converged state,
-	 *   then you can call {@link #writeCanonicalTo(OutputStream)} to get the canonical form of the given file.
-	 */
-	public static class DirtyState {
-		@Nullable
-		private final byte[] canonicalBytes;
-
-		private DirtyState(@Nullable byte[] canonicalBytes) {
-			this.canonicalBytes = canonicalBytes;
-		}
-
-		public boolean isClean() {
-			return this == isClean;
-		}
-
-		public boolean didNotConverge() {
-			return this == didNotConverge;
-		}
-
-		private byte[] canonicalBytes() {
-			if (canonicalBytes == null) {
-				throw new IllegalStateException("First make sure that {@code !isClean()} and {@code !didNotConverge()}");
-			}
-			return canonicalBytes;
-		}
-
-		public void writeCanonicalTo(File file) throws IOException {
-			Files.write(file.toPath(), canonicalBytes());
-		}
-
-		public void writeCanonicalTo(OutputStream out) throws IOException {
-			out.write(canonicalBytes());
-		}
-	}
-
-	/** Returns the DirtyState which corresponds to {@code isClean()}. */
-	public static DirtyState isClean() {
-		return isClean;
-	}
-
-	private static final DirtyState didNotConverge = new DirtyState(null);
-	private static final DirtyState isClean = new DirtyState(null);
 }
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/IdeHook.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/IdeHook.java
index 8d24e2230e..4c198dd42c 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/IdeHook.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/IdeHook.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,8 +21,8 @@
 
 import com.diffplug.common.base.Errors;
 import com.diffplug.common.io.ByteStreams;
+import com.diffplug.spotless.DirtyState;
 import com.diffplug.spotless.Formatter;
-import com.diffplug.spotless.PaddedCell;
 
 class IdeHook {
 	final static String PROPERTY = "spotlessIdeHook";
@@ -55,7 +55,7 @@ static void performHook(SpotlessTaskImpl spotlessTask) {
 				} else {
 					bytes = Files.readAllBytes(file.toPath());
 				}
-				PaddedCell.DirtyState dirty = PaddedCell.calculateDirtyState(formatter, file, bytes);
+				DirtyState dirty = DirtyState.of(formatter, file, bytes).calculateDirtyState();
 				if (dirty.isClean()) {
 					dumpIsClean();
 				} else if (dirty.didNotConverge()) {
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
index 04951a4577..cc694942c1 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,8 +37,8 @@
 
 import com.diffplug.common.annotations.VisibleForTesting;
 import com.diffplug.common.base.StringPrinter;
+import com.diffplug.spotless.DirtyState;
 import com.diffplug.spotless.Formatter;
-import com.diffplug.spotless.PaddedCell;
 import com.diffplug.spotless.extra.GitRatchet;
 
 @CacheableTask
@@ -97,12 +97,12 @@ public void performAction(InputChanges inputs) throws Exception {
 	void processInputFile(@Nullable GitRatchet ratchet, Formatter formatter, File input) throws IOException {
 		File output = getOutputFile(input);
 		getLogger().debug("Applying format to {} and writing to {}", input, output);
-		PaddedCell.DirtyState dirtyState;
+		DirtyState dirtyState;
 		if (ratchet != null && ratchet.isClean(getProjectDir().get().getAsFile(), getRootTreeSha(), input)) {
-			dirtyState = PaddedCell.isClean();
+			dirtyState = DirtyState.clean();
 		} else {
 			try {
-				dirtyState = PaddedCell.calculateDirtyState(formatter, input);
+				dirtyState = DirtyState.of(formatter, input).calculateDirtyState();
 			} catch (IOException e) {
 				throw new IOException("Issue processing file: " + input, e);
 			} catch (RuntimeException e) {
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/IdeHook.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/IdeHook.java
index 0001046871..5289af4756 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/IdeHook.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/IdeHook.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,8 +21,8 @@
 
 import com.diffplug.common.base.Errors;
 import com.diffplug.common.io.ByteStreams;
+import com.diffplug.spotless.DirtyState;
 import com.diffplug.spotless.Formatter;
-import com.diffplug.spotless.PaddedCell;
 
 class IdeHook {
 
@@ -49,7 +49,7 @@ static void performHook(Iterable<File> projectFiles, Formatter formatter, String
 			} else {
 				bytes = Files.readAllBytes(file.toPath());
 			}
-			PaddedCell.DirtyState dirty = PaddedCell.calculateDirtyState(formatter, file, bytes);
+			DirtyState dirty = DirtyState.of(formatter, file, bytes).calculateDirtyState();
 			if (dirty.isClean()) {
 				dumpIsClean();
 			} else if (dirty.didNotConverge()) {
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
index 07cc2cbc85..317c61f80c 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,8 +22,8 @@
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 
+import com.diffplug.spotless.DirtyState;
 import com.diffplug.spotless.Formatter;
-import com.diffplug.spotless.PaddedCell;
 import com.diffplug.spotless.maven.incremental.UpToDateChecker;
 
 /**
@@ -60,7 +60,7 @@ protected void process(Iterable<File> files, Formatter formatter, UpToDateChecke
 			}
 
 			try {
-				PaddedCell.DirtyState dirtyState = PaddedCell.calculateDirtyState(formatter, file);
+				DirtyState dirtyState = DirtyState.of(formatter, file).calculateDirtyState();
 				if (!dirtyState.isClean() && !dirtyState.didNotConverge()) {
 					getLog().info(String.format("Writing clean file: %s", file));
 					dirtyState.writeCanonicalTo(file);
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java
index b326767c3c..22d91de1cf 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java
@@ -27,8 +27,8 @@
 import org.apache.maven.plugins.annotations.Parameter;
 import org.sonatype.plexus.build.incremental.BuildContext;
 
+import com.diffplug.spotless.DirtyState;
 import com.diffplug.spotless.Formatter;
-import com.diffplug.spotless.PaddedCell;
 import com.diffplug.spotless.extra.integration.DiffMessageFormatter;
 import com.diffplug.spotless.maven.incremental.UpToDateChecker;
 
@@ -78,7 +78,7 @@ protected void process(Iterable<File> files, Formatter formatter, UpToDateChecke
 			}
 			buildContext.removeMessages(file);
 			try {
-				PaddedCell.DirtyState dirtyState = PaddedCell.calculateDirtyState(formatter, file);
+				DirtyState dirtyState = DirtyState.of(formatter, file).calculateDirtyState();
 				if (!dirtyState.isClean() && !dirtyState.didNotConverge()) {
 					problemFiles.add(file);
 					if (buildContext.isIncremental()) {

From 856ab9fc3fc014b946d0b37cbd6835c9c39d68e5 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 1 Jan 2023 22:38:11 -0800
Subject: [PATCH 1662/2068] Removed `rootDir` property `Formatter` and its
 builder because it was only used to annnotate errors, which will now done by
 the lint phase.

---
 .../integration/DiffMessageFormatter.java     | 16 +++++----
 .../java/com/diffplug/spotless/Formatter.java | 33 +++----------------
 .../diffplug/spotless/generic/FenceStep.java  |  2 --
 .../gradle/spotless/SpotlessTask.java         |  1 -
 .../spotless/maven/AbstractSpotlessMojo.java  |  2 +-
 .../spotless/maven/FormatterFactory.java      |  1 -
 .../spotless/maven/SpotlessCheckMojo.java     |  4 +--
 .../maven/incremental/NoopCheckerTest.java    |  6 +---
 .../incremental/PluginFingerprintTest.java    |  4 ---
 .../com/diffplug/spotless/StepHarness.java    |  4 ---
 .../spotless/StepHarnessWithFile.java         |  1 -
 .../com/diffplug/spotless/FormatterTest.java  | 26 +--------------
 .../com/diffplug/spotless/PaddedCellTest.java |  1 -
 13 files changed, 19 insertions(+), 82 deletions(-)

diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/integration/DiffMessageFormatter.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/integration/DiffMessageFormatter.java
index 9294055a4f..a0d056bc0a 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/integration/DiffMessageFormatter.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/integration/DiffMessageFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -58,15 +58,17 @@ interface CleanProvider {
 	}
 
 	private static class CleanProviderFormatter implements CleanProvider {
+		private final Path rootDir;
 		private final Formatter formatter;
 
-		CleanProviderFormatter(Formatter formatter) {
+		CleanProviderFormatter(Path rootDir, Formatter formatter) {
+			this.rootDir = Objects.requireNonNull(rootDir);
 			this.formatter = Objects.requireNonNull(formatter);
 		}
 
 		@Override
 		public Path getRootDir() {
-			return formatter.getRootDir();
+			return rootDir;
 		}
 
 		@Override
@@ -123,8 +125,8 @@ public Builder runToFix(String runToFix) {
 			return this;
 		}
 
-		public Builder formatter(Formatter formatter) {
-			this.formatter = new CleanProviderFormatter(formatter);
+		public Builder formatter(Path rootDir, Formatter formatter) {
+			this.formatter = new CleanProviderFormatter(rootDir, formatter);
 			return this;
 		}
 
@@ -244,8 +246,8 @@ private String diff(File file) throws IOException {
 	 * look like if formatted using the given formatter. Does not end with any newline
 	 * sequence (\n, \r, \r\n). The key of the map entry is the 0-based line where the first difference occurred.
 	 */
-	public static Map.Entry<Integer, String> diff(Formatter formatter, File file) throws IOException {
-		return diff(new CleanProviderFormatter(formatter), file);
+	public static Map.Entry<Integer, String> diff(Path rootDir, Formatter formatter, File file) throws IOException {
+		return diff(new CleanProviderFormatter(rootDir, formatter), file);
 	}
 
 	private static Map.Entry<Integer, String> diff(CleanProvider formatter, File file) throws IOException {
diff --git a/lib/src/main/java/com/diffplug/spotless/Formatter.java b/lib/src/main/java/com/diffplug/spotless/Formatter.java
index 4dea2e3d3d..bcc131f0a8 100644
--- a/lib/src/main/java/com/diffplug/spotless/Formatter.java
+++ b/lib/src/main/java/com/diffplug/spotless/Formatter.java
@@ -24,8 +24,6 @@
 import java.io.ObjectStreamException;
 import java.io.Serializable;
 import java.nio.charset.Charset;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -38,15 +36,12 @@ public final class Formatter implements Serializable, AutoCloseable {
 	private String name;
 	private LineEnding.Policy lineEndingsPolicy;
 	private Charset encoding;
-	private Path rootDir;
 	private List<FormatterStep> steps;
 	private FormatExceptionPolicy exceptionPolicy;
 
-	private Formatter(String name, LineEnding.Policy lineEndingsPolicy, Charset encoding, Path rootDirectory, List<FormatterStep> steps, FormatExceptionPolicy exceptionPolicy) {
-		this.name = name;
+	private Formatter(LineEnding.Policy lineEndingsPolicy, Charset encoding, List<FormatterStep> steps, FormatExceptionPolicy exceptionPolicy) {
 		this.lineEndingsPolicy = Objects.requireNonNull(lineEndingsPolicy, "lineEndingsPolicy");
 		this.encoding = Objects.requireNonNull(encoding, "encoding");
-		this.rootDir = Objects.requireNonNull(rootDirectory, "rootDir");
 		this.steps = requireElementsNonNull(new ArrayList<>(steps));
 		this.exceptionPolicy = Objects.requireNonNull(exceptionPolicy, "exceptionPolicy");
 	}
@@ -56,7 +51,6 @@ private void writeObject(ObjectOutputStream out) throws IOException {
 		out.writeObject(name);
 		out.writeObject(lineEndingsPolicy);
 		out.writeObject(encoding.name());
-		out.writeObject(rootDir.toString());
 		out.writeObject(steps);
 		out.writeObject(exceptionPolicy);
 	}
@@ -67,7 +61,6 @@ private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundE
 		name = (String) in.readObject();
 		lineEndingsPolicy = (LineEnding.Policy) in.readObject();
 		encoding = Charset.forName((String) in.readObject());
-		rootDir = Paths.get((String) in.readObject());
 		steps = (List<FormatterStep>) in.readObject();
 		exceptionPolicy = (FormatExceptionPolicy) in.readObject();
 	}
@@ -90,10 +83,6 @@ public Charset getEncoding() {
 		return encoding;
 	}
 
-	public Path getRootDir() {
-		return rootDir;
-	}
-
 	public List<FormatterStep> getSteps() {
 		return steps;
 	}
@@ -112,7 +101,6 @@ public static class Builder {
 		// required parameters
 		private LineEnding.Policy lineEndingsPolicy;
 		private Charset encoding;
-		private Path rootDir;
 		private List<FormatterStep> steps;
 		private FormatExceptionPolicy exceptionPolicy;
 
@@ -133,11 +121,6 @@ public Builder encoding(Charset encoding) {
 			return this;
 		}
 
-		public Builder rootDir(Path rootDir) {
-			this.rootDir = rootDir;
-			return this;
-		}
-
 		public Builder steps(List<FormatterStep> steps) {
 			this.steps = steps;
 			return this;
@@ -149,7 +132,7 @@ public Builder exceptionPolicy(FormatExceptionPolicy exceptionPolicy) {
 		}
 
 		public Formatter build() {
-			return new Formatter(name, lineEndingsPolicy, encoding, rootDir, steps,
+			return new Formatter(lineEndingsPolicy, encoding, steps,
 					exceptionPolicy == null ? FormatExceptionPolicy.failOnlyOnError() : exceptionPolicy);
 		}
 	}
@@ -188,13 +171,9 @@ public String compute(String unix, File file) {
 					unix = LineEnding.toUnix(formatted);
 				}
 			} catch (Throwable e) {
-				if (file == NO_FILE_SENTINEL) {
-					exceptionPolicy.handleError(e, step, "");
-				} else {
-					// Path may be forged from a different FileSystem than Filesystem.default
-					String relativePath = rootDir.relativize(rootDir.getFileSystem().getPath(file.getPath())).toString();
-					exceptionPolicy.handleError(e, step, relativePath);
-				}
+				// TODO: this is not accurate, but it won't matter when add support for linting
+				String relativePath = file.toString();
+				exceptionPolicy.handleError(e, step, relativePath);
 			}
 		}
 		return unix;
@@ -207,7 +186,6 @@ public int hashCode() {
 		result = prime * result + name.hashCode();
 		result = prime * result + encoding.hashCode();
 		result = prime * result + lineEndingsPolicy.hashCode();
-		result = prime * result + rootDir.hashCode();
 		result = prime * result + steps.hashCode();
 		result = prime * result + exceptionPolicy.hashCode();
 		return result;
@@ -228,7 +206,6 @@ public boolean equals(Object obj) {
 		return name.equals(other.name) &&
 				encoding.equals(other.encoding) &&
 				lineEndingsPolicy.equals(other.lineEndingsPolicy) &&
-				rootDir.equals(other.rootDir) &&
 				steps.equals(other.steps) &&
 				exceptionPolicy.equals(other.exceptionPolicy);
 	}
diff --git a/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java b/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
index 1db94d0885..9ce34675f8 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
@@ -18,7 +18,6 @@
 import java.io.File;
 import java.io.Serializable;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -177,7 +176,6 @@ protected Formatter buildFormatter() {
 					.encoding(StandardCharsets.UTF_8) // can be any UTF, doesn't matter
 					.lineEndingsPolicy(LineEnding.UNIX.createPolicy()) // just internal, won't conflict with user
 					.steps(steps)
-					.rootDir(Path.of("")) // TODO: error messages will be suboptimal for now, but it will get fixed when we ship linting
 					.build();
 		}
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
index f930685baf..9a0962ec09 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
@@ -178,7 +178,6 @@ Formatter buildFormatter() {
 				.name(formatName())
 				.lineEndingsPolicy(getLineEndingsPolicy().get())
 				.encoding(Charset.forName(encoding))
-				.rootDir(getProjectDir().get().getAsFile().toPath())
 				.steps(steps)
 				.exceptionPolicy(exceptionPolicy)
 				.build();
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
index 9f4d0e01bc..68b8571182 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
@@ -121,7 +121,7 @@ public abstract class AbstractSpotlessMojo extends AbstractMojo {
 	private List<RemoteRepository> repositories;
 
 	@Parameter(defaultValue = "${project.basedir}", required = true, readonly = true)
-	private File baseDir;
+	protected File baseDir;
 
 	@Parameter(defaultValue = "${project.build.directory}", required = true, readonly = true)
 	private File buildDir;
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java
index 6393c65858..01d765f95b 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java
@@ -107,7 +107,6 @@ public final Formatter newFormatter(Supplier<Iterable<File>> filesToFormat, Form
 				.lineEndingsPolicy(formatterLineEndingPolicy)
 				.exceptionPolicy(new FormatExceptionPolicyStrict())
 				.steps(formatterSteps)
-				.rootDir(config.getFileLocator().getBaseDir().toPath())
 				.build();
 	}
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java
index 22d91de1cf..07a8e0eda4 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java
@@ -82,7 +82,7 @@ protected void process(Iterable<File> files, Formatter formatter, UpToDateChecke
 				if (!dirtyState.isClean() && !dirtyState.didNotConverge()) {
 					problemFiles.add(file);
 					if (buildContext.isIncremental()) {
-						Map.Entry<Integer, String> diffEntry = DiffMessageFormatter.diff(formatter, file);
+						Map.Entry<Integer, String> diffEntry = DiffMessageFormatter.diff(baseDir.toPath(), formatter, file);
 						buildContext.addMessage(file, diffEntry.getKey() + 1, 0, INCREMENTAL_MESSAGE_PREFIX + diffEntry.getValue(), m2eIncrementalBuildMessageSeverity.getSeverity(), null);
 					}
 					counter.cleaned();
@@ -106,7 +106,7 @@ protected void process(Iterable<File> files, Formatter formatter, UpToDateChecke
 		if (!problemFiles.isEmpty()) {
 			throw new MojoExecutionException(DiffMessageFormatter.builder()
 					.runToFix("Run 'mvn spotless:apply' to fix these violations.")
-					.formatter(formatter)
+					.formatter(baseDir.toPath(), formatter)
 					.problemFiles(problemFiles)
 					.getMessage());
 		}
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/NoopCheckerTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/NoopCheckerTest.java
index 404b5e2191..4025d5b271 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/NoopCheckerTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/NoopCheckerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 DiffPlug
+ * Copyright 2021-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,6 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 
 import org.apache.maven.model.Build;
 import org.apache.maven.model.Plugin;
@@ -37,7 +36,6 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import com.diffplug.spotless.FormatExceptionPolicyStrict;
 import com.diffplug.spotless.Formatter;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.LineEnding;
@@ -116,11 +114,9 @@ private MavenProject buildMavenProject() throws IOException {
 
 	private static Formatter dummyFormatter() {
 		return Formatter.builder()
-				.rootDir(Paths.get(""))
 				.lineEndingsPolicy(LineEnding.UNIX.createPolicy())
 				.encoding(UTF_8)
 				.steps(singletonList(mock(FormatterStep.class, withSettings().serializable())))
-				.exceptionPolicy(new FormatExceptionPolicyStrict())
 				.build();
 	}
 }
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/PluginFingerprintTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/PluginFingerprintTest.java
index 4257e5595c..a0d55da86e 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/PluginFingerprintTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/PluginFingerprintTest.java
@@ -21,7 +21,6 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.io.ByteArrayInputStream;
-import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -35,7 +34,6 @@
 import org.codehaus.plexus.util.xml.XmlStreamReader;
 import org.junit.jupiter.api.Test;
 
-import com.diffplug.spotless.FormatExceptionPolicyStrict;
 import com.diffplug.spotless.Formatter;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.LineEnding;
@@ -173,11 +171,9 @@ private static Formatter formatter(FormatterStep... steps) {
 
 	private static Formatter formatter(LineEnding lineEnding, FormatterStep... steps) {
 		return Formatter.builder()
-				.rootDir(Paths.get(""))
 				.lineEndingsPolicy(lineEnding.createPolicy())
 				.encoding(UTF_8)
 				.steps(Arrays.asList(steps))
-				.exceptionPolicy(new FormatExceptionPolicyStrict())
 				.build();
 	}
 }
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarness.java b/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
index 6bec145f66..f4f95ca502 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
@@ -19,7 +19,6 @@
 
 import java.io.File;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Paths;
 import java.util.Arrays;
 
 import org.assertj.core.api.AbstractStringAssert;
@@ -42,8 +41,6 @@ public static StepHarness forSteps(FormatterStep... steps) {
 				.steps(Arrays.asList(steps))
 				.lineEndingsPolicy(LineEnding.UNIX.createPolicy())
 				.encoding(StandardCharsets.UTF_8)
-				.rootDir(Paths.get(""))
-				.exceptionPolicy(new FormatExceptionPolicyStrict())
 				.build());
 	}
 
@@ -57,7 +54,6 @@ public static StepHarness forStepNoRoundtrip(FormatterStep step) {
 				.steps(Arrays.asList(step))
 				.lineEndingsPolicy(LineEnding.UNIX.createPolicy())
 				.encoding(StandardCharsets.UTF_8)
-				.rootDir(Paths.get(""))
 				.exceptionPolicy(new FormatExceptionPolicyStrict())
 				.build(), RoundTrip.DONT_ROUNDTRIP);
 	}
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java b/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java
index 871da6f385..38bc8ce074 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java
@@ -41,7 +41,6 @@ public static StepHarnessWithFile forStep(ResourceHarness harness, FormatterStep
 				.encoding(StandardCharsets.UTF_8)
 				.lineEndingsPolicy(LineEnding.UNIX.createPolicy())
 				.steps(Collections.singletonList(step))
-				.rootDir(harness.rootFolder().toPath())
 				.exceptionPolicy(new FormatExceptionPolicyStrict())
 				.build());
 	}
diff --git a/testlib/src/test/java/com/diffplug/spotless/FormatterTest.java b/testlib/src/test/java/com/diffplug/spotless/FormatterTest.java
index 314507bd8d..3d3eb03c59 100644
--- a/testlib/src/test/java/com/diffplug/spotless/FormatterTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/FormatterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,9 +47,7 @@ void equality() {
 		new SerializableEqualityTester() {
 			private LineEnding.Policy lineEndingsPolicy = LineEnding.UNIX.createPolicy();
 			private Charset encoding = StandardCharsets.UTF_8;
-			private Path rootDir = Paths.get(StandardSystemProperty.USER_DIR.value());
 			private List<FormatterStep> steps = new ArrayList<>();
-			private FormatExceptionPolicy exceptionPolicy = FormatExceptionPolicy.failOnlyOnError();
 
 			@Override
 			protected void setupTest(API api) throws Exception {
@@ -61,25 +59,8 @@ protected void setupTest(API api) throws Exception {
 				encoding = StandardCharsets.UTF_16;
 				api.areDifferentThan();
 
-				rootDir = rootDir.getParent();
-				api.areDifferentThan();
-
 				steps.add(EndWithNewlineStep.create());
 				api.areDifferentThan();
-
-				{
-					FormatExceptionPolicyStrict standard = new FormatExceptionPolicyStrict();
-					standard.excludePath("path");
-					exceptionPolicy = standard;
-					api.areDifferentThan();
-				}
-
-				{
-					FormatExceptionPolicyStrict standard = new FormatExceptionPolicyStrict();
-					standard.excludeStep("step");
-					exceptionPolicy = standard;
-					api.areDifferentThan();
-				}
 			}
 
 			@Override
@@ -87,9 +68,7 @@ protected Formatter create() {
 				return Formatter.builder()
 						.lineEndingsPolicy(lineEndingsPolicy)
 						.encoding(encoding)
-						.rootDir(rootDir)
 						.steps(steps)
-						.exceptionPolicy(exceptionPolicy)
 						.build();
 			}
 		}.testEquals();
@@ -112,7 +91,6 @@ public void testExceptionWithEmptyPath() throws Exception {
 		Formatter formatter = Formatter.builder()
 				.lineEndingsPolicy(lineEndingsPolicy)
 				.encoding(encoding)
-				.rootDir(rootDir)
 				.steps(steps)
 				.exceptionPolicy(exceptionPolicy)
 				.build();
@@ -137,7 +115,6 @@ public void testExceptionWithSentinelNoFileOnDisk() throws Exception {
 		Formatter formatter = Formatter.builder()
 				.lineEndingsPolicy(lineEndingsPolicy)
 				.encoding(encoding)
-				.rootDir(rootDir)
 				.steps(steps)
 				.exceptionPolicy(exceptionPolicy)
 				.build();
@@ -177,7 +154,6 @@ public void testExceptionWithRootDirIsNotFileSystem() throws Exception {
 		Formatter formatter = Formatter.builder()
 				.lineEndingsPolicy(lineEndingsPolicy)
 				.encoding(encoding)
-				.rootDir(rootDir)
 				.steps(steps)
 				.exceptionPolicy(exceptionPolicy)
 				.build();
diff --git a/testlib/src/test/java/com/diffplug/spotless/PaddedCellTest.java b/testlib/src/test/java/com/diffplug/spotless/PaddedCellTest.java
index 28fc6a0710..2820aadeef 100644
--- a/testlib/src/test/java/com/diffplug/spotless/PaddedCellTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/PaddedCellTest.java
@@ -51,7 +51,6 @@ private void testCase(SerializedFunction<String, String> step, String input, Pad
 		try (Formatter formatter = Formatter.builder()
 				.lineEndingsPolicy(LineEnding.UNIX.createPolicy())
 				.encoding(StandardCharsets.UTF_8)
-				.rootDir(rootFolder.toPath())
 				.steps(formatterSteps).build()) {
 
 			File file = new File(rootFolder, "input");

From b7f559a9fe7bc7d33cc6176b3df9a379eaed2bf6 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 29 May 2024 14:56:22 -0700
Subject: [PATCH 1663/2068] Mark the tests which are broken as part of the lint
 refactor.

---
 ...GrEclipseFormatterStepSpecialCaseTest.java |  6 +++-
 .../spotless/tag/ForLintRefactor.java         | 30 +++++++++++++++++++
 .../com/diffplug/spotless/FormatterTest.java  | 24 ---------------
 .../gherkin/GherkinUtilsStepTest.java         |  7 ++++-
 .../spotless/json/JsonSimpleStepTest.java     |  8 ++++-
 .../spotless/json/gson/GsonStepTest.java      |  6 +++-
 6 files changed, 53 insertions(+), 28 deletions(-)
 create mode 100644 testlib/src/main/java/com/diffplug/spotless/tag/ForLintRefactor.java

diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepSpecialCaseTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepSpecialCaseTest.java
index 0702881ef9..8064633a4e 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepSpecialCaseTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepSpecialCaseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,12 @@
 package com.diffplug.spotless.extra.groovy;
 
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.StepHarness;
 import com.diffplug.spotless.TestProvisioner;
+import com.diffplug.spotless.tag.ForLintRefactor;
 
 public class GrEclipseFormatterStepSpecialCaseTest {
 	/**
@@ -29,6 +31,8 @@ public class GrEclipseFormatterStepSpecialCaseTest {
 	 *  works: ${parm == null ? "" : "<tag>parm</tag>"}
 	 */
 	@Test
+	@Disabled
+	@ForLintRefactor
 	public void issue_1657() {
 		Assertions.assertThrows(RuntimeException.class, () -> {
 			StepHarness.forStep(GrEclipseFormatterStep.createBuilder(TestProvisioner.mavenCentral()).build())
diff --git a/testlib/src/main/java/com/diffplug/spotless/tag/ForLintRefactor.java b/testlib/src/main/java/com/diffplug/spotless/tag/ForLintRefactor.java
new file mode 100644
index 0000000000..a6ac9b090b
--- /dev/null
+++ b/testlib/src/main/java/com/diffplug/spotless/tag/ForLintRefactor.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2021-2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.tag;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import org.junit.jupiter.api.Tag;
+
+@Target({TYPE, METHOD})
+@Retention(RUNTIME)
+@Tag("black")
+public @interface ForLintRefactor {}
diff --git a/testlib/src/test/java/com/diffplug/spotless/FormatterTest.java b/testlib/src/test/java/com/diffplug/spotless/FormatterTest.java
index 3d3eb03c59..8114d75cab 100644
--- a/testlib/src/test/java/com/diffplug/spotless/FormatterTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/FormatterTest.java
@@ -74,30 +74,6 @@ protected Formatter create() {
 		}.testEquals();
 	}
 
-	// new File("") as filePath is known to fail
-	@Test
-	public void testExceptionWithEmptyPath() throws Exception {
-		LineEnding.Policy lineEndingsPolicy = LineEnding.UNIX.createPolicy();
-		Charset encoding = StandardCharsets.UTF_8;
-		FormatExceptionPolicy exceptionPolicy = FormatExceptionPolicy.failOnlyOnError();
-
-		Path rootDir = Paths.get(StandardSystemProperty.USER_DIR.value());
-
-		FormatterStep step = Mockito.mock(FormatterStep.class);
-		Mockito.when(step.getName()).thenReturn("someFailingStep");
-		Mockito.when(step.format(Mockito.anyString(), Mockito.any(File.class))).thenThrow(new IllegalArgumentException("someReason"));
-		List<FormatterStep> steps = Collections.singletonList(step);
-
-		Formatter formatter = Formatter.builder()
-				.lineEndingsPolicy(lineEndingsPolicy)
-				.encoding(encoding)
-				.steps(steps)
-				.exceptionPolicy(exceptionPolicy)
-				.build();
-
-		Assertions.assertThrows(IllegalArgumentException.class, () -> formatter.compute("someFileContent", new File("")));
-	}
-
 	// If there is no File actually holding the content, one may rely on Formatter.NO_FILE_ON_DISK
 	@Test
 	public void testExceptionWithSentinelNoFileOnDisk() throws Exception {
diff --git a/testlib/src/test/java/com/diffplug/spotless/gherkin/GherkinUtilsStepTest.java b/testlib/src/test/java/com/diffplug/spotless/gherkin/GherkinUtilsStepTest.java
index 6bc478027b..5ffaa029ae 100644
--- a/testlib/src/test/java/com/diffplug/spotless/gherkin/GherkinUtilsStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/gherkin/GherkinUtilsStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 DiffPlug
+ * Copyright 2021-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@
 import com.diffplug.spotless.SerializableEqualityTester;
 import com.diffplug.spotless.StepHarness;
 import com.diffplug.spotless.TestProvisioner;
+import com.diffplug.spotless.tag.ForLintRefactor;
 
 public class GherkinUtilsStepTest {
 
@@ -59,6 +60,8 @@ public void handlesRuleWithTag() throws Exception {
 	}
 
 	@Test
+	@Disabled
+	@ForLintRefactor
 	public void handlesInvalidGherkin() {
 		assertThatThrownBy(() -> doWithResource(stepHarness, "invalidGherkin"))
 				.isInstanceOf(IllegalArgumentException.class)
@@ -66,6 +69,8 @@ public void handlesInvalidGherkin() {
 	}
 
 	@Test
+	@Disabled
+	@ForLintRefactor
 	public void handlesNotGherkin() {
 		assertThatThrownBy(() -> doWithResource(stepHarness, "notGherkin"))
 				.isInstanceOf(IllegalArgumentException.class)
diff --git a/testlib/src/test/java/com/diffplug/spotless/json/JsonSimpleStepTest.java b/testlib/src/test/java/com/diffplug/spotless/json/JsonSimpleStepTest.java
index 19edc1a8e8..5d7c08f129 100644
--- a/testlib/src/test/java/com/diffplug/spotless/json/JsonSimpleStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/json/JsonSimpleStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 DiffPlug
+ * Copyright 2021-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,12 +17,14 @@
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.SerializableEqualityTester;
 import com.diffplug.spotless.StepHarness;
 import com.diffplug.spotless.TestProvisioner;
+import com.diffplug.spotless.tag.ForLintRefactor;
 
 class JsonSimpleStepTest {
 
@@ -72,12 +74,16 @@ void handlesObjectWithNull() {
 	}
 
 	@Test
+	@Disabled
+	@ForLintRefactor
 	void handlesInvalidJson() {
 		stepHarness.testResourceExceptionMsg("json/invalidJsonBefore.json")
 				.contains("Expected a ',' or '}' at 9 [character 0 line 3]");
 	}
 
 	@Test
+	@Disabled
+	@ForLintRefactor
 	void handlesNotJson() {
 		stepHarness.testResourceExceptionMsg("json/notJsonBefore.json")
 				.contains("Unable to determine JSON type, expected a '{' or '[' but found '#'");
diff --git a/testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java b/testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java
index 3f4d2a84e0..29c65f8493 100644
--- a/testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 DiffPlug
+ * Copyright 2022-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 import java.io.File;
 
 import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.FormatterStep;
@@ -25,6 +26,7 @@
 import com.diffplug.spotless.StepHarness;
 import com.diffplug.spotless.TestProvisioner;
 import com.diffplug.spotless.json.JsonFormatterStepCommonTests;
+import com.diffplug.spotless.tag.ForLintRefactor;
 
 public class GsonStepTest extends JsonFormatterStepCommonTests {
 
@@ -41,6 +43,8 @@ void handlesObjectWithNull() {
 	}
 
 	@Test
+	@Disabled
+	@ForLintRefactor
 	void handlesInvalidJson() {
 		getStepHarness().testResourceExceptionMsg("json/invalidJsonBefore.json").isEqualTo("End of input at line 3 column 1 path $.a");
 	}

From 7bd9c5954a3786f58194c007f000b898c4244422 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 29 May 2024 14:58:43 -0700
Subject: [PATCH 1664/2068] Remove the name property from Formatter, and route
 it in a different way.

---
 .../java/com/diffplug/spotless/Formatter.java | 18 +---------
 .../gradle/spotless/SpotlessTask.java         |  1 -
 .../spotless/maven/AbstractSpotlessMojo.java  | 13 ++++---
 .../spotless/maven/FormatterFactory.java      |  2 --
 .../spotless/maven/FormattersHolder.java      | 36 +++++++++----------
 .../spotless/maven/SpotlessApplyMojo.java     |  6 ++--
 .../spotless/maven/SpotlessCheckMojo.java     |  6 ++--
 .../spotless/StepHarnessWithFile.java         |  1 -
 8 files changed, 29 insertions(+), 54 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/Formatter.java b/lib/src/main/java/com/diffplug/spotless/Formatter.java
index bcc131f0a8..40f363a786 100644
--- a/lib/src/main/java/com/diffplug/spotless/Formatter.java
+++ b/lib/src/main/java/com/diffplug/spotless/Formatter.java
@@ -33,7 +33,6 @@ public final class Formatter implements Serializable, AutoCloseable {
 	private static final long serialVersionUID = 1L;
 
 	// The name is used for logging purpose. It does not convey any applicative purpose
-	private String name;
 	private LineEnding.Policy lineEndingsPolicy;
 	private Charset encoding;
 	private List<FormatterStep> steps;
@@ -48,7 +47,6 @@ private Formatter(LineEnding.Policy lineEndingsPolicy, Charset encoding, List<Fo
 
 	// override serialize output
 	private void writeObject(ObjectOutputStream out) throws IOException {
-		out.writeObject(name);
 		out.writeObject(lineEndingsPolicy);
 		out.writeObject(encoding.name());
 		out.writeObject(steps);
@@ -58,7 +56,6 @@ private void writeObject(ObjectOutputStream out) throws IOException {
 	// override serialize input
 	@SuppressWarnings("unchecked")
 	private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
-		name = (String) in.readObject();
 		lineEndingsPolicy = (LineEnding.Policy) in.readObject();
 		encoding = Charset.forName((String) in.readObject());
 		steps = (List<FormatterStep>) in.readObject();
@@ -71,10 +68,6 @@ private void readObjectNoData() throws ObjectStreamException {
 		throw new UnsupportedOperationException();
 	}
 
-	public String getName() {
-		return name;
-	}
-
 	public LineEnding.Policy getLineEndingsPolicy() {
 		return lineEndingsPolicy;
 	}
@@ -96,8 +89,6 @@ public static Formatter.Builder builder() {
 	}
 
 	public static class Builder {
-		// optional parameters
-		private String name = "unnamed";
 		// required parameters
 		private LineEnding.Policy lineEndingsPolicy;
 		private Charset encoding;
@@ -106,11 +97,6 @@ public static class Builder {
 
 		private Builder() {}
 
-		public Builder name(String name) {
-			this.name = name;
-			return this;
-		}
-
 		public Builder lineEndingsPolicy(LineEnding.Policy lineEndingsPolicy) {
 			this.lineEndingsPolicy = lineEndingsPolicy;
 			return this;
@@ -183,7 +169,6 @@ public String compute(String unix, File file) {
 	public int hashCode() {
 		final int prime = 31;
 		int result = 1;
-		result = prime * result + name.hashCode();
 		result = prime * result + encoding.hashCode();
 		result = prime * result + lineEndingsPolicy.hashCode();
 		result = prime * result + steps.hashCode();
@@ -203,8 +188,7 @@ public boolean equals(Object obj) {
 			return false;
 		}
 		Formatter other = (Formatter) obj;
-		return name.equals(other.name) &&
-				encoding.equals(other.encoding) &&
+		return encoding.equals(other.encoding) &&
 				lineEndingsPolicy.equals(other.lineEndingsPolicy) &&
 				steps.equals(other.steps) &&
 				exceptionPolicy.equals(other.exceptionPolicy);
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
index 9a0962ec09..de8f77904b 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
@@ -175,7 +175,6 @@ String formatName() {
 
 	Formatter buildFormatter() {
 		return Formatter.builder()
-				.name(formatName())
 				.lineEndingsPolicy(getLineEndingsPolicy().get())
 				.encoding(Charset.forName(encoding))
 				.steps(steps)
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
index 68b8571182..f3d940d30c 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
@@ -27,7 +27,6 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
@@ -208,7 +207,7 @@ public abstract class AbstractSpotlessMojo extends AbstractMojo {
 	@Parameter(defaultValue = "false")
 	protected boolean m2eEnableForIncrementalBuild;
 
-	protected abstract void process(Iterable<File> files, Formatter formatter, UpToDateChecker upToDateChecker) throws MojoExecutionException;
+	protected abstract void process(String name, Iterable<File> files, Formatter formatter, UpToDateChecker upToDateChecker) throws MojoExecutionException;
 
 	private static final int MINIMUM_JRE = 11;
 
@@ -237,11 +236,11 @@ public final void execute() throws MojoExecutionException {
 		}
 
 		try (FormattersHolder formattersHolder = FormattersHolder.create(formatterFactoryToFiles, config);
-				UpToDateChecker upToDateChecker = createUpToDateChecker(formattersHolder.getFormatters())) {
-			for (Entry<Formatter, Supplier<Iterable<File>>> entry : formattersHolder.getFormattersWithFiles().entrySet()) {
-				Formatter formatter = entry.getKey();
-				Iterable<File> files = entry.getValue().get();
-				process(files, formatter, upToDateChecker);
+				UpToDateChecker upToDateChecker = createUpToDateChecker(formattersHolder.openFormatters.values())) {
+			for (FormatterFactory factory : formattersHolder.openFormatters.keySet()) {
+				Formatter formatter = formattersHolder.openFormatters.get(factory);
+				Iterable<File> files = formattersHolder.factoryToFiles.get(factory).get();
+				process(formattersHolder.nameFor(factory), files, formatter, upToDateChecker);
 			}
 		} catch (PluginException e) {
 			throw e.asMojoExecutionException();
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java
index 01d765f95b..57e20d9b7c 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java
@@ -100,9 +100,7 @@ public final Formatter newFormatter(Supplier<Iterable<File>> filesToFormat, Form
 			formatterSteps = List.of(toggle.createFence().preserveWithin(formatterStepsBeforeToggle));
 		}
 
-		String formatterName = this.getClass().getSimpleName();
 		return Formatter.builder()
-				.name(formatterName)
 				.encoding(formatterEncoding)
 				.lineEndingsPolicy(formatterLineEndingPolicy)
 				.exceptionPolicy(new FormatExceptionPolicyStrict())
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormattersHolder.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormattersHolder.java
index 873321f9df..9b279c8845 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormattersHolder.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormattersHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 DiffPlug
+ * Copyright 2021-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,62 +16,58 @@
 package com.diffplug.spotless.maven;
 
 import java.io.File;
+import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Set;
 import java.util.function.Supplier;
 
 import com.diffplug.spotless.Formatter;
 
 class FormattersHolder implements AutoCloseable {
+	final Map<FormatterFactory, Formatter> openFormatters;
+	final Map<FormatterFactory, Supplier<Iterable<File>>> factoryToFiles;
 
-	private final Map<Formatter, Supplier<Iterable<File>>> formatterToFiles;
+	FormattersHolder(Map<FormatterFactory, Formatter> openFormatters, Map<FormatterFactory, Supplier<Iterable<File>>> factoryToFiles) {
+		this.openFormatters = openFormatters;
+		this.factoryToFiles = factoryToFiles;
+	}
 
-	FormattersHolder(Map<Formatter, Supplier<Iterable<File>>> formatterToFiles) {
-		this.formatterToFiles = formatterToFiles;
+	public String nameFor(FormatterFactory factory) {
+		return factory.getClass().getSimpleName();
 	}
 
 	static FormattersHolder create(Map<FormatterFactory, Supplier<Iterable<File>>> formatterFactoryToFiles, FormatterConfig config) {
-		Map<Formatter, Supplier<Iterable<File>>> formatterToFiles = new LinkedHashMap<>();
+		Map<FormatterFactory, Formatter> openFormatters = new LinkedHashMap<>();
 		try {
 			for (Entry<FormatterFactory, Supplier<Iterable<File>>> entry : formatterFactoryToFiles.entrySet()) {
 				FormatterFactory formatterFactory = entry.getKey();
 				Supplier<Iterable<File>> files = entry.getValue();
-
 				Formatter formatter = formatterFactory.newFormatter(files, config);
-				formatterToFiles.put(formatter, files);
+				openFormatters.put(formatterFactory, formatter);
 			}
 		} catch (RuntimeException openError) {
 			try {
-				close(formatterToFiles.keySet());
+				close(openFormatters.values());
 			} catch (Exception closeError) {
 				openError.addSuppressed(closeError);
 			}
 			throw openError;
 		}
 
-		return new FormattersHolder(formatterToFiles);
-	}
-
-	Iterable<Formatter> getFormatters() {
-		return formatterToFiles.keySet();
-	}
-
-	Map<Formatter, Supplier<Iterable<File>>> getFormattersWithFiles() {
-		return formatterToFiles;
+		return new FormattersHolder(openFormatters, formatterFactoryToFiles);
 	}
 
 	@Override
 	public void close() {
 		try {
-			close(formatterToFiles.keySet());
+			close(openFormatters.values());
 		} catch (Exception e) {
 			throw new RuntimeException("Unable to close formatters", e);
 		}
 	}
 
-	private static void close(Set<Formatter> formatters) throws Exception {
+	private static void close(Collection<Formatter> formatters) throws Exception {
 		Exception error = null;
 		for (Formatter formatter : formatters) {
 			try {
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
index 317c61f80c..0d67ed8c9f 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
@@ -42,7 +42,7 @@ public class SpotlessApplyMojo extends AbstractSpotlessMojo {
 	private boolean spotlessIdeHookUseStdOut;
 
 	@Override
-	protected void process(Iterable<File> files, Formatter formatter, UpToDateChecker upToDateChecker) throws MojoExecutionException {
+	protected void process(String name, Iterable<File> files, Formatter formatter, UpToDateChecker upToDateChecker) throws MojoExecutionException {
 		if (isIdeHook()) {
 			IdeHook.performHook(files, formatter, spotlessIdeHook, spotlessIdeHookUseStdIn, spotlessIdeHookUseStdOut);
 			return;
@@ -79,9 +79,9 @@ protected void process(Iterable<File> files, Formatter formatter, UpToDateChecke
 		// We print the number of considered files which is useful when ratchetFrom is setup
 		if (counter.getTotal() > 0) {
 			getLog().info(String.format("Spotless.%s is keeping %s files clean - %s were changed to be clean, %s were already clean, %s were skipped because caching determined they were already clean",
-					formatter.getName(), counter.getTotal(), counter.getCleaned(), counter.getCheckedButAlreadyClean(), counter.getSkippedAsCleanCache()));
+					name, counter.getTotal(), counter.getCleaned(), counter.getCheckedButAlreadyClean(), counter.getSkippedAsCleanCache()));
 		} else {
-			getLog().debug(String.format("Spotless.%s has no target files. Examine your `<includes>`: https://github.com/diffplug/spotless/tree/main/plugin-maven#quickstart", formatter.getName()));
+			getLog().debug(String.format("Spotless.%s has no target files. Examine your `<includes>`: https://github.com/diffplug/spotless/tree/main/plugin-maven#quickstart", name));
 		}
 	}
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java
index 07a8e0eda4..183f20ef9e 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java
@@ -64,7 +64,7 @@ public int getSeverity() {
 	private MessageSeverity m2eIncrementalBuildMessageSeverity;
 
 	@Override
-	protected void process(Iterable<File> files, Formatter formatter, UpToDateChecker upToDateChecker) throws MojoExecutionException {
+	protected void process(String name, Iterable<File> files, Formatter formatter, UpToDateChecker upToDateChecker) throws MojoExecutionException {
 		ImpactedFilesTracker counter = new ImpactedFilesTracker();
 
 		List<File> problemFiles = new ArrayList<>();
@@ -98,9 +98,9 @@ protected void process(Iterable<File> files, Formatter formatter, UpToDateChecke
 		// We print the number of considered files which is useful when ratchetFrom is setup
 		if (counter.getTotal() > 0) {
 			getLog().info(String.format("Spotless.%s is keeping %s files clean - %s needs changes to be clean, %s were already clean, %s were skipped because caching determined they were already clean",
-					formatter.getName(), counter.getTotal(), counter.getCleaned(), counter.getCheckedButAlreadyClean(), counter.getSkippedAsCleanCache()));
+					name, counter.getTotal(), counter.getCleaned(), counter.getCheckedButAlreadyClean(), counter.getSkippedAsCleanCache()));
 		} else {
-			getLog().debug(String.format("Spotless.%s has no target files. Examine your `<includes>`: https://github.com/diffplug/spotless/tree/main/plugin-maven#quickstart", formatter.getName()));
+			getLog().debug(String.format("Spotless.%s has no target files. Examine your `<includes>`: https://github.com/diffplug/spotless/tree/main/plugin-maven#quickstart", name));
 		}
 
 		if (!problemFiles.isEmpty()) {
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java b/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java
index 38bc8ce074..ba2322f4cc 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java
@@ -37,7 +37,6 @@ private StepHarnessWithFile(ResourceHarness harness, Formatter formatter, RoundT
 	/** Creates a harness for testing steps which do depend on the file. */
 	public static StepHarnessWithFile forStep(ResourceHarness harness, FormatterStep step) {
 		return forFormatter(harness, Formatter.builder()
-				.name(step.getName())
 				.encoding(StandardCharsets.UTF_8)
 				.lineEndingsPolicy(LineEnding.UNIX.createPolicy())
 				.steps(Collections.singletonList(step))

From c6cfb6ddc88a6404edba0d44f8e742f31f6b922f Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 1 Jan 2023 22:51:03 -0800
Subject: [PATCH 1665/2068] Remove the `FormatExceptionPolicy` from the
 `Formatter` because it will become part of linting.

---
 .../java/com/diffplug/spotless/Formatter.java | 32 ++++++-------------
 .../gradle/spotless/SpotlessTask.java         |  1 -
 .../spotless/maven/FormatterFactory.java      |  2 --
 .../com/diffplug/spotless/StepHarness.java    |  1 -
 .../spotless/StepHarnessWithFile.java         |  1 -
 .../com/diffplug/spotless/FormatterTest.java  |  8 -----
 6 files changed, 9 insertions(+), 36 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/Formatter.java b/lib/src/main/java/com/diffplug/spotless/Formatter.java
index 40f363a786..1e2e44fe3a 100644
--- a/lib/src/main/java/com/diffplug/spotless/Formatter.java
+++ b/lib/src/main/java/com/diffplug/spotless/Formatter.java
@@ -36,13 +36,11 @@ public final class Formatter implements Serializable, AutoCloseable {
 	private LineEnding.Policy lineEndingsPolicy;
 	private Charset encoding;
 	private List<FormatterStep> steps;
-	private FormatExceptionPolicy exceptionPolicy;
 
-	private Formatter(LineEnding.Policy lineEndingsPolicy, Charset encoding, List<FormatterStep> steps, FormatExceptionPolicy exceptionPolicy) {
+	private Formatter(LineEnding.Policy lineEndingsPolicy, Charset encoding, List<FormatterStep> steps) {
 		this.lineEndingsPolicy = Objects.requireNonNull(lineEndingsPolicy, "lineEndingsPolicy");
 		this.encoding = Objects.requireNonNull(encoding, "encoding");
 		this.steps = requireElementsNonNull(new ArrayList<>(steps));
-		this.exceptionPolicy = Objects.requireNonNull(exceptionPolicy, "exceptionPolicy");
 	}
 
 	// override serialize output
@@ -50,7 +48,6 @@ private void writeObject(ObjectOutputStream out) throws IOException {
 		out.writeObject(lineEndingsPolicy);
 		out.writeObject(encoding.name());
 		out.writeObject(steps);
-		out.writeObject(exceptionPolicy);
 	}
 
 	// override serialize input
@@ -59,7 +56,6 @@ private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundE
 		lineEndingsPolicy = (LineEnding.Policy) in.readObject();
 		encoding = Charset.forName((String) in.readObject());
 		steps = (List<FormatterStep>) in.readObject();
-		exceptionPolicy = (FormatExceptionPolicy) in.readObject();
 	}
 
 	// override serialize input
@@ -80,10 +76,6 @@ public List<FormatterStep> getSteps() {
 		return steps;
 	}
 
-	public FormatExceptionPolicy getExceptionPolicy() {
-		return exceptionPolicy;
-	}
-
 	public static Formatter.Builder builder() {
 		return new Formatter.Builder();
 	}
@@ -93,7 +85,6 @@ public static class Builder {
 		private LineEnding.Policy lineEndingsPolicy;
 		private Charset encoding;
 		private List<FormatterStep> steps;
-		private FormatExceptionPolicy exceptionPolicy;
 
 		private Builder() {}
 
@@ -112,14 +103,8 @@ public Builder steps(List<FormatterStep> steps) {
 			return this;
 		}
 
-		public Builder exceptionPolicy(FormatExceptionPolicy exceptionPolicy) {
-			this.exceptionPolicy = exceptionPolicy;
-			return this;
-		}
-
 		public Formatter build() {
-			return new Formatter(lineEndingsPolicy, encoding, steps,
-					exceptionPolicy == null ? FormatExceptionPolicy.failOnlyOnError() : exceptionPolicy);
+			return new Formatter(lineEndingsPolicy, encoding, steps);
 		}
 	}
 
@@ -157,9 +142,12 @@ public String compute(String unix, File file) {
 					unix = LineEnding.toUnix(formatted);
 				}
 			} catch (Throwable e) {
-				// TODO: this is not accurate, but it won't matter when add support for linting
-				String relativePath = file.toString();
-				exceptionPolicy.handleError(e, step, relativePath);
+				// TODO: this is bad, but it won't matter when add support for linting
+				if (e instanceof RuntimeException) {
+					throw (RuntimeException) e;
+				} else {
+					throw new RuntimeException(e);
+				}
 			}
 		}
 		return unix;
@@ -172,7 +160,6 @@ public int hashCode() {
 		result = prime * result + encoding.hashCode();
 		result = prime * result + lineEndingsPolicy.hashCode();
 		result = prime * result + steps.hashCode();
-		result = prime * result + exceptionPolicy.hashCode();
 		return result;
 	}
 
@@ -190,8 +177,7 @@ public boolean equals(Object obj) {
 		Formatter other = (Formatter) obj;
 		return encoding.equals(other.encoding) &&
 				lineEndingsPolicy.equals(other.lineEndingsPolicy) &&
-				steps.equals(other.steps) &&
-				exceptionPolicy.equals(other.exceptionPolicy);
+				steps.equals(other.steps);
 	}
 
 	@SuppressWarnings("rawtypes")
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
index de8f77904b..19d81eb947 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
@@ -178,7 +178,6 @@ Formatter buildFormatter() {
 				.lineEndingsPolicy(getLineEndingsPolicy().get())
 				.encoding(Charset.forName(encoding))
 				.steps(steps)
-				.exceptionPolicy(exceptionPolicy)
 				.build();
 	}
 }
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java
index 57e20d9b7c..8c2236bf35 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java
@@ -32,7 +32,6 @@
 import org.apache.maven.project.MavenProject;
 
 import com.diffplug.common.collect.Sets;
-import com.diffplug.spotless.FormatExceptionPolicyStrict;
 import com.diffplug.spotless.Formatter;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.LineEnding;
@@ -103,7 +102,6 @@ public final Formatter newFormatter(Supplier<Iterable<File>> filesToFormat, Form
 		return Formatter.builder()
 				.encoding(formatterEncoding)
 				.lineEndingsPolicy(formatterLineEndingPolicy)
-				.exceptionPolicy(new FormatExceptionPolicyStrict())
 				.steps(formatterSteps)
 				.build();
 	}
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarness.java b/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
index f4f95ca502..ae59a8d176 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
@@ -54,7 +54,6 @@ public static StepHarness forStepNoRoundtrip(FormatterStep step) {
 				.steps(Arrays.asList(step))
 				.lineEndingsPolicy(LineEnding.UNIX.createPolicy())
 				.encoding(StandardCharsets.UTF_8)
-				.exceptionPolicy(new FormatExceptionPolicyStrict())
 				.build(), RoundTrip.DONT_ROUNDTRIP);
 	}
 
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java b/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java
index ba2322f4cc..bf537cf030 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java
@@ -40,7 +40,6 @@ public static StepHarnessWithFile forStep(ResourceHarness harness, FormatterStep
 				.encoding(StandardCharsets.UTF_8)
 				.lineEndingsPolicy(LineEnding.UNIX.createPolicy())
 				.steps(Collections.singletonList(step))
-				.exceptionPolicy(new FormatExceptionPolicyStrict())
 				.build());
 	}
 
diff --git a/testlib/src/test/java/com/diffplug/spotless/FormatterTest.java b/testlib/src/test/java/com/diffplug/spotless/FormatterTest.java
index 8114d75cab..139244e7da 100644
--- a/testlib/src/test/java/com/diffplug/spotless/FormatterTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/FormatterTest.java
@@ -21,7 +21,6 @@
 import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -30,7 +29,6 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
-import com.diffplug.common.base.StandardSystemProperty;
 import com.diffplug.spotless.generic.EndWithNewlineStep;
 
 class FormatterTest {
@@ -79,9 +77,6 @@ protected Formatter create() {
 	public void testExceptionWithSentinelNoFileOnDisk() throws Exception {
 		LineEnding.Policy lineEndingsPolicy = LineEnding.UNIX.createPolicy();
 		Charset encoding = StandardCharsets.UTF_8;
-		FormatExceptionPolicy exceptionPolicy = FormatExceptionPolicy.failOnlyOnError();
-
-		Path rootDir = Paths.get(StandardSystemProperty.USER_DIR.value());
 
 		FormatterStep step = Mockito.mock(FormatterStep.class);
 		Mockito.when(step.getName()).thenReturn("someFailingStep");
@@ -92,7 +87,6 @@ public void testExceptionWithSentinelNoFileOnDisk() throws Exception {
 				.lineEndingsPolicy(lineEndingsPolicy)
 				.encoding(encoding)
 				.steps(steps)
-				.exceptionPolicy(exceptionPolicy)
 				.build();
 
 		formatter.compute("someFileContent", Formatter.NO_FILE_SENTINEL);
@@ -103,7 +97,6 @@ public void testExceptionWithSentinelNoFileOnDisk() throws Exception {
 	public void testExceptionWithRootDirIsNotFileSystem() throws Exception {
 		LineEnding.Policy lineEndingsPolicy = LineEnding.UNIX.createPolicy();
 		Charset encoding = StandardCharsets.UTF_8;
-		FormatExceptionPolicy exceptionPolicy = FormatExceptionPolicy.failOnlyOnError();
 
 		Path rootDir = Mockito.mock(Path.class);
 		FileSystem customFileSystem = Mockito.mock(FileSystem.class);
@@ -131,7 +124,6 @@ public void testExceptionWithRootDirIsNotFileSystem() throws Exception {
 				.lineEndingsPolicy(lineEndingsPolicy)
 				.encoding(encoding)
 				.steps(steps)
-				.exceptionPolicy(exceptionPolicy)
 				.build();
 
 		formatter.compute("someFileContent", new File("/some/folder/some.file"));

From baf0f11a95f1bcea40d2b07c9843574cbfeef7cf Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 29 May 2024 15:37:44 -0700
Subject: [PATCH 1666/2068] And now the tests that do and don't work have
 shuffled once again.

---
 ...GrEclipseFormatterStepSpecialCaseTest.java |  4 --
 .../gradle/spotless/BiomeIntegrationTest.java |  5 ++
 .../spotless/ErrorShouldRethrowTest.java      |  6 +-
 .../gradle/spotless/KotlinExtensionTest.java  |  7 +-
 .../spotless/maven/biome/BiomeMavenTest.java  |  4 ++
 .../com/diffplug/spotless/FormatterTest.java  | 64 -------------------
 .../gherkin/GherkinUtilsStepTest.java         |  5 --
 .../spotless/json/JsonSimpleStepTest.java     |  6 --
 .../spotless/json/gson/GsonStepTest.java      |  4 --
 9 files changed, 20 insertions(+), 85 deletions(-)

diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepSpecialCaseTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepSpecialCaseTest.java
index 8064633a4e..e5159a4498 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepSpecialCaseTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepSpecialCaseTest.java
@@ -16,12 +16,10 @@
 package com.diffplug.spotless.extra.groovy;
 
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.StepHarness;
 import com.diffplug.spotless.TestProvisioner;
-import com.diffplug.spotless.tag.ForLintRefactor;
 
 public class GrEclipseFormatterStepSpecialCaseTest {
 	/**
@@ -31,8 +29,6 @@ public class GrEclipseFormatterStepSpecialCaseTest {
 	 *  works: ${parm == null ? "" : "<tag>parm</tag>"}
 	 */
 	@Test
-	@Disabled
-	@ForLintRefactor
 	public void issue_1657() {
 		Assertions.assertThrows(RuntimeException.class, () -> {
 			StepHarness.forStep(GrEclipseFormatterStep.createBuilder(TestProvisioner.mavenCentral()).build())
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java
index ba39af1705..aff28664c5 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java
@@ -21,9 +21,12 @@
 
 import java.io.IOException;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.owasp.encoder.Encode;
 
+import com.diffplug.spotless.tag.ForLintRefactor;
+
 class BiomeIntegrationTest extends GradleIntegrationHarness {
 	/**
 	 * Tests that biome can be used as a generic formatting step.
@@ -320,6 +323,8 @@ void failureWhenExeNotFound() throws Exception {
 	 * @throws Exception When a test failure occurs.
 	 */
 	@Test
+	@Disabled
+	@ForLintRefactor
 	void failureWhenNotParseable() throws Exception {
 		setFile("build.gradle").toLines(
 				"plugins {",
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrowTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrowTest.java
index d1ced01609..d8e9cbd2fa 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrowTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrowTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,13 +23,17 @@
 import org.assertj.core.api.Assertions;
 import org.gradle.testkit.runner.BuildResult;
 import org.gradle.testkit.runner.TaskOutcome;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.common.base.CharMatcher;
 import com.diffplug.common.base.Splitter;
 import com.diffplug.spotless.LineEnding;
+import com.diffplug.spotless.tag.ForLintRefactor;
 
 /** Tests the desired behavior from https://github.com/diffplug/spotless/issues/46. */
+@Disabled
+@ForLintRefactor
 class ErrorShouldRethrowTest extends GradleIntegrationHarness {
 	private void writeBuild(String... toInsert) throws IOException {
 		List<String> lines = new ArrayList<>();
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
index 1e96d34574..aa82c371f3 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,11 @@
 import java.io.File;
 import java.io.IOException;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+import com.diffplug.spotless.tag.ForLintRefactor;
+
 class KotlinExtensionTest extends GradleIntegrationHarness {
 	private static final String HEADER = "// License Header";
 	private static final String HEADER_WITH_YEAR = "// License Header $YEAR";
@@ -147,6 +150,8 @@ void testSetEditorConfigCanOverrideEditorConfigFile() throws IOException {
 	}
 
 	@Test
+	@Disabled
+	@ForLintRefactor
 	void withCustomRuleSetApply() throws IOException {
 		setFile("build.gradle.kts").toLines(
 				"plugins {",
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/biome/BiomeMavenTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/biome/BiomeMavenTest.java
index ff763c3cf8..24ce1d09b7 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/biome/BiomeMavenTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/biome/BiomeMavenTest.java
@@ -20,9 +20,11 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.owasp.encoder.Encode.forXml;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
+import com.diffplug.spotless.tag.ForLintRefactor;
 
 class BiomeMavenTest extends MavenIntegrationHarness {
 	/**
@@ -190,6 +192,8 @@ void failureWhenExeNotFound() throws Exception {
 	 * @throws Exception When a test failure occurs.
 	 */
 	@Test
+	@Disabled
+	@ForLintRefactor
 	void failureWhenNotParseable() throws Exception {
 		writePomWithBiomeSteps("**/*.js", "<biome><version>1.2.0</version><language>json</language></biome>");
 		setFile("biome_test.js").toResource("biome/js/fileBefore.js");
diff --git a/testlib/src/test/java/com/diffplug/spotless/FormatterTest.java b/testlib/src/test/java/com/diffplug/spotless/FormatterTest.java
index 139244e7da..cbd219b33d 100644
--- a/testlib/src/test/java/com/diffplug/spotless/FormatterTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/FormatterTest.java
@@ -15,19 +15,13 @@
  */
 package com.diffplug.spotless;
 
-import java.io.File;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.FileSystem;
-import java.nio.file.FileSystems;
-import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
 
 import com.diffplug.spotless.generic.EndWithNewlineStep;
 
@@ -71,62 +65,4 @@ protected Formatter create() {
 			}
 		}.testEquals();
 	}
-
-	// If there is no File actually holding the content, one may rely on Formatter.NO_FILE_ON_DISK
-	@Test
-	public void testExceptionWithSentinelNoFileOnDisk() throws Exception {
-		LineEnding.Policy lineEndingsPolicy = LineEnding.UNIX.createPolicy();
-		Charset encoding = StandardCharsets.UTF_8;
-
-		FormatterStep step = Mockito.mock(FormatterStep.class);
-		Mockito.when(step.getName()).thenReturn("someFailingStep");
-		Mockito.when(step.format(Mockito.anyString(), Mockito.any(File.class))).thenThrow(new IllegalArgumentException("someReason"));
-		List<FormatterStep> steps = Collections.singletonList(step);
-
-		Formatter formatter = Formatter.builder()
-				.lineEndingsPolicy(lineEndingsPolicy)
-				.encoding(encoding)
-				.steps(steps)
-				.build();
-
-		formatter.compute("someFileContent", Formatter.NO_FILE_SENTINEL);
-	}
-
-	// rootDir may be a path not from the default FileSystem
-	@Test
-	public void testExceptionWithRootDirIsNotFileSystem() throws Exception {
-		LineEnding.Policy lineEndingsPolicy = LineEnding.UNIX.createPolicy();
-		Charset encoding = StandardCharsets.UTF_8;
-
-		Path rootDir = Mockito.mock(Path.class);
-		FileSystem customFileSystem = Mockito.mock(FileSystem.class);
-		Mockito.when(rootDir.getFileSystem()).thenReturn(customFileSystem);
-
-		Path pathFromFile = Mockito.mock(Path.class);
-		Mockito.when(customFileSystem.getPath(Mockito.anyString())).thenReturn(pathFromFile);
-
-		Path relativized = Mockito.mock(Path.class);
-		Mockito.when(rootDir.relativize(Mockito.any(Path.class))).then(invok -> {
-			Path filePath = invok.getArgument(0);
-			if (filePath.getFileSystem() == FileSystems.getDefault()) {
-				throw new IllegalArgumentException("Can not relativize through different FileSystems");
-			}
-
-			return relativized;
-		});
-
-		FormatterStep step = Mockito.mock(FormatterStep.class);
-		Mockito.when(step.getName()).thenReturn("someFailingStep");
-		Mockito.when(step.format(Mockito.anyString(), Mockito.any(File.class))).thenThrow(new IllegalArgumentException("someReason"));
-		List<FormatterStep> steps = Collections.singletonList(step);
-
-		Formatter formatter = Formatter.builder()
-				.lineEndingsPolicy(lineEndingsPolicy)
-				.encoding(encoding)
-				.steps(steps)
-				.build();
-
-		formatter.compute("someFileContent", new File("/some/folder/some.file"));
-	}
-
 }
diff --git a/testlib/src/test/java/com/diffplug/spotless/gherkin/GherkinUtilsStepTest.java b/testlib/src/test/java/com/diffplug/spotless/gherkin/GherkinUtilsStepTest.java
index 5ffaa029ae..02099a5fe8 100644
--- a/testlib/src/test/java/com/diffplug/spotless/gherkin/GherkinUtilsStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/gherkin/GherkinUtilsStepTest.java
@@ -24,7 +24,6 @@
 import com.diffplug.spotless.SerializableEqualityTester;
 import com.diffplug.spotless.StepHarness;
 import com.diffplug.spotless.TestProvisioner;
-import com.diffplug.spotless.tag.ForLintRefactor;
 
 public class GherkinUtilsStepTest {
 
@@ -60,8 +59,6 @@ public void handlesRuleWithTag() throws Exception {
 	}
 
 	@Test
-	@Disabled
-	@ForLintRefactor
 	public void handlesInvalidGherkin() {
 		assertThatThrownBy(() -> doWithResource(stepHarness, "invalidGherkin"))
 				.isInstanceOf(IllegalArgumentException.class)
@@ -69,8 +66,6 @@ public void handlesInvalidGherkin() {
 	}
 
 	@Test
-	@Disabled
-	@ForLintRefactor
 	public void handlesNotGherkin() {
 		assertThatThrownBy(() -> doWithResource(stepHarness, "notGherkin"))
 				.isInstanceOf(IllegalArgumentException.class)
diff --git a/testlib/src/test/java/com/diffplug/spotless/json/JsonSimpleStepTest.java b/testlib/src/test/java/com/diffplug/spotless/json/JsonSimpleStepTest.java
index 5d7c08f129..e81c9d7284 100644
--- a/testlib/src/test/java/com/diffplug/spotless/json/JsonSimpleStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/json/JsonSimpleStepTest.java
@@ -17,14 +17,12 @@
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.SerializableEqualityTester;
 import com.diffplug.spotless.StepHarness;
 import com.diffplug.spotless.TestProvisioner;
-import com.diffplug.spotless.tag.ForLintRefactor;
 
 class JsonSimpleStepTest {
 
@@ -74,16 +72,12 @@ void handlesObjectWithNull() {
 	}
 
 	@Test
-	@Disabled
-	@ForLintRefactor
 	void handlesInvalidJson() {
 		stepHarness.testResourceExceptionMsg("json/invalidJsonBefore.json")
 				.contains("Expected a ',' or '}' at 9 [character 0 line 3]");
 	}
 
 	@Test
-	@Disabled
-	@ForLintRefactor
 	void handlesNotJson() {
 		stepHarness.testResourceExceptionMsg("json/notJsonBefore.json")
 				.contains("Unable to determine JSON type, expected a '{' or '[' but found '#'");
diff --git a/testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java b/testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java
index 29c65f8493..9513c88a5c 100644
--- a/testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java
@@ -18,7 +18,6 @@
 import java.io.File;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.FormatterStep;
@@ -26,7 +25,6 @@
 import com.diffplug.spotless.StepHarness;
 import com.diffplug.spotless.TestProvisioner;
 import com.diffplug.spotless.json.JsonFormatterStepCommonTests;
-import com.diffplug.spotless.tag.ForLintRefactor;
 
 public class GsonStepTest extends JsonFormatterStepCommonTests {
 
@@ -43,8 +41,6 @@ void handlesObjectWithNull() {
 	}
 
 	@Test
-	@Disabled
-	@ForLintRefactor
 	void handlesInvalidJson() {
 		getStepHarness().testResourceExceptionMsg("json/invalidJsonBefore.json").isEqualTo("End of input at line 3 column 1 path $.a");
 	}

From 9347888f4d8eb7d6f6aacdd6d3abfff18f837023 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 29 May 2024 15:56:10 -0700
Subject: [PATCH 1667/2068] Reduce the size of the diff.

---
 .../com/diffplug/spotless/gherkin/GherkinUtilsStepTest.java     | 2 +-
 .../java/com/diffplug/spotless/json/JsonSimpleStepTest.java     | 2 +-
 .../test/java/com/diffplug/spotless/json/gson/GsonStepTest.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/testlib/src/test/java/com/diffplug/spotless/gherkin/GherkinUtilsStepTest.java b/testlib/src/test/java/com/diffplug/spotless/gherkin/GherkinUtilsStepTest.java
index 02099a5fe8..6bc478027b 100644
--- a/testlib/src/test/java/com/diffplug/spotless/gherkin/GherkinUtilsStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/gherkin/GherkinUtilsStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 DiffPlug
+ * Copyright 2021-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/testlib/src/test/java/com/diffplug/spotless/json/JsonSimpleStepTest.java b/testlib/src/test/java/com/diffplug/spotless/json/JsonSimpleStepTest.java
index e81c9d7284..19edc1a8e8 100644
--- a/testlib/src/test/java/com/diffplug/spotless/json/JsonSimpleStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/json/JsonSimpleStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 DiffPlug
+ * Copyright 2021-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java b/testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java
index 9513c88a5c..3f4d2a84e0 100644
--- a/testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 DiffPlug
+ * Copyright 2022-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 9afa6dd722669820df7d5aca7a403279f2c55359 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 30 May 2024 14:52:44 -0700
Subject: [PATCH 1668/2068] Handy tool for making encoding formats that don't
 have any forbidden characters.

---
 .../diffplug/spotless/ExceptionPerStep.java   | 101 ++++++++
 .../FilterByContentPatternFormatterStep.java  |  18 +-
 .../spotless/FilterByFileFormatterStep.java   |  14 +-
 .../java/com/diffplug/spotless/Formatter.java |  30 ++-
 .../com/diffplug/spotless/FormatterFunc.java  |  26 ++
 .../com/diffplug/spotless/FormatterStep.java  |  17 ++
 ...atterStepEqualityOnStateSerialization.java |   9 +
 .../main/java/com/diffplug/spotless/Lint.java | 242 ++++++++++++++++++
 .../spotless/PerCharacterEscaper.java         | 152 +++++++++++
 .../com/diffplug/spotless/ThrowingEx.java     |  13 +-
 .../java/com/diffplug/spotless/LintTest.java  |  47 ++++
 .../spotless/PerCharacterEscaperTest.java     |  65 +++++
 12 files changed, 720 insertions(+), 14 deletions(-)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/ExceptionPerStep.java
 create mode 100644 lib/src/main/java/com/diffplug/spotless/Lint.java
 create mode 100644 lib/src/main/java/com/diffplug/spotless/PerCharacterEscaper.java
 create mode 100644 testlib/src/test/java/com/diffplug/spotless/LintTest.java
 create mode 100644 testlib/src/test/java/com/diffplug/spotless/PerCharacterEscaperTest.java

diff --git a/lib/src/main/java/com/diffplug/spotless/ExceptionPerStep.java b/lib/src/main/java/com/diffplug/spotless/ExceptionPerStep.java
new file mode 100644
index 0000000000..7bf7fe2011
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/ExceptionPerStep.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless;
+
+import java.util.AbstractList;
+
+import javax.annotation.Nullable;
+
+/**
+ * Fixed-size list which maintains a list of exceptions, one per step of the formatter.
+ * Usually this list will be empty or have only a single value, so it is optimized for stack allocation in those cases.
+ */
+class ExceptionPerStep extends AbstractList<Throwable> {
+	private final int size;
+	private @Nullable Throwable exception;
+	private int exceptionIdx;
+	private @Nullable Throwable[] multipleExceptions = null;
+
+	ExceptionPerStep(Formatter formatter) {
+		this.size = formatter.getSteps().size();
+	}
+
+	@Override
+	public @Nullable Throwable set(int index, Throwable exception) {
+		if (index < 0 || index >= size) {
+			throw new IndexOutOfBoundsException("Index: " + index + ", Size: " + size);
+		}
+		if (this.exception == null) {
+			this.exceptionIdx = index;
+			this.exception = exception;
+			return null;
+		} else if (this.multipleExceptions != null) {
+			Throwable previousValue = multipleExceptions[index];
+			multipleExceptions[index] = exception;
+			return previousValue;
+		} else {
+			if (index == exceptionIdx) {
+				Throwable previousValue = this.exception;
+				this.exception = exception;
+				return previousValue;
+			} else {
+				multipleExceptions = new Throwable[size];
+				multipleExceptions[exceptionIdx] = this.exception;
+				multipleExceptions[index] = exception;
+				return null;
+			}
+		}
+	}
+
+	@Override
+	public Throwable get(int index) {
+		if (multipleExceptions != null) {
+			return multipleExceptions[index];
+		} else if (exceptionIdx == index) {
+			return exception;
+		} else {
+			return null;
+		}
+	}
+
+	private int indexOfFirstException() {
+		if (multipleExceptions != null) {
+			for (int i = 0; i < multipleExceptions.length; i++) {
+				if (multipleExceptions[i] != null) {
+					return i;
+				}
+			}
+			return -1;
+		} else if (exception != null) {
+			return exceptionIdx;
+		} else {
+			return -1;
+		}
+	}
+
+	@Override
+	public int size() {
+		return size;
+	}
+
+	/** Rethrows the first exception in the list. */
+	public void rethrowFirstIfPresent() {
+		int firstException = indexOfFirstException();
+		if (firstException != -1) {
+			throw ThrowingEx.asRuntimeRethrowError(get(firstException));
+		}
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/FilterByContentPatternFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/FilterByContentPatternFormatterStep.java
index 4cc336e101..bcc444ad57 100644
--- a/lib/src/main/java/com/diffplug/spotless/FilterByContentPatternFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/FilterByContentPatternFormatterStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 package com.diffplug.spotless;
 
 import java.io.File;
+import java.util.List;
 import java.util.Objects;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import javax.annotation.Nullable;
@@ -36,14 +36,24 @@ final class FilterByContentPatternFormatterStep extends DelegateFormatterStep {
 	public @Nullable String format(String raw, File file) throws Exception {
 		Objects.requireNonNull(raw, "raw");
 		Objects.requireNonNull(file, "file");
-		Matcher matcher = contentPattern.matcher(raw);
-		if (matcher.find() == (onMatch == OnMatch.INCLUDE)) {
+		if (contentPattern.matcher(raw).find() == (onMatch == OnMatch.INCLUDE)) {
 			return delegateStep.format(raw, file);
 		} else {
 			return raw;
 		}
 	}
 
+	@Override
+	public List<Lint> lint(String raw, File file) throws Exception {
+		Objects.requireNonNull(raw, "raw");
+		Objects.requireNonNull(file, "file");
+		if (contentPattern.matcher(raw).find() == (onMatch == OnMatch.INCLUDE)) {
+			return delegateStep.lint(raw, file);
+		} else {
+			return List.of();
+		}
+	}
+
 	@Override
 	public boolean equals(Object o) {
 		if (this == o) {
diff --git a/lib/src/main/java/com/diffplug/spotless/FilterByFileFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/FilterByFileFormatterStep.java
index 04a06a4673..bc5ddf6053 100644
--- a/lib/src/main/java/com/diffplug/spotless/FilterByFileFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/FilterByFileFormatterStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 package com.diffplug.spotless;
 
 import java.io.File;
+import java.util.List;
 import java.util.Objects;
 
 import javax.annotation.Nullable;
@@ -39,6 +40,17 @@ final class FilterByFileFormatterStep extends DelegateFormatterStep {
 		}
 	}
 
+	@Override
+	public List<Lint> lint(String content, File file) throws Exception {
+		Objects.requireNonNull(content, "content");
+		Objects.requireNonNull(file, "file");
+		if (filter.accept(file)) {
+			return delegateStep.lint(content, file);
+		} else {
+			return List.of();
+		}
+	}
+
 	@Override
 	public boolean equals(Object o) {
 		if (this == o) {
diff --git a/lib/src/main/java/com/diffplug/spotless/Formatter.java b/lib/src/main/java/com/diffplug/spotless/Formatter.java
index 1e2e44fe3a..5db20942f5 100644
--- a/lib/src/main/java/com/diffplug/spotless/Formatter.java
+++ b/lib/src/main/java/com/diffplug/spotless/Formatter.java
@@ -26,6 +26,7 @@
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.ListIterator;
 import java.util.Objects;
 
 /** Formatter which performs the full formatting. */
@@ -127,12 +128,28 @@ public String computeLineEndings(String unix, File file) {
 	 * is guaranteed to also have unix line endings.
 	 */
 	public String compute(String unix, File file) {
+		ExceptionPerStep exceptionPerStep = new ExceptionPerStep(this);
+		String result = compute(unix, file, exceptionPerStep);
+		exceptionPerStep.rethrowFirstIfPresent();
+		return result;
+	}
+
+	/**
+	 * Returns the result of calling all of the FormatterSteps, while also
+	 * tracking any exceptions which are thrown.
+	 * <p>
+	 * The input must have unix line endings, and the output
+	 * is guaranteed to also have unix line endings.
+	 * <p>
+	 */
+	String compute(String unix, File file, ExceptionPerStep exceptionPerStep) {
 		Objects.requireNonNull(unix, "unix");
 		Objects.requireNonNull(file, "file");
 
-		for (FormatterStep step : steps) {
+		ListIterator<FormatterStep> iter = steps.listIterator();
+		while (iter.hasNext()) {
 			try {
-				String formatted = step.format(unix, file);
+				String formatted = iter.next().format(unix, file);
 				if (formatted == null) {
 					// This probably means it was a step that only checks
 					// for errors and doesn't actually have any fixes.
@@ -142,12 +159,9 @@ public String compute(String unix, File file) {
 					unix = LineEnding.toUnix(formatted);
 				}
 			} catch (Throwable e) {
-				// TODO: this is bad, but it won't matter when add support for linting
-				if (e instanceof RuntimeException) {
-					throw (RuntimeException) e;
-				} else {
-					throw new RuntimeException(e);
-				}
+				// store the exception which was thrown, and stop execution so we don't alter line numbers
+				exceptionPerStep.set(iter.previousIndex(), e);
+				return unix;
 			}
 		}
 		return unix;
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java b/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java
index 800a553225..5e6c44b335 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java
@@ -16,6 +16,7 @@
 package com.diffplug.spotless;
 
 import java.io.File;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -32,6 +33,14 @@ default String apply(String unix, File file) throws Exception {
 		return apply(unix);
 	}
 
+	/**
+	 * Calculates a list of lints against the given content.
+	 * By default, that's just an throwables thrown by the lint.
+	 */
+	default List<Lint> lint(String content, File file) throws Exception {
+		return List.of();
+	}
+
 	/**
 	 * {@code Function<String, String>} and {@code BiFunction<String, File, String>} whose implementation
 	 * requires a resource which should be released when the function is no longer needed.
@@ -74,6 +83,14 @@ public String apply(String unix) throws Exception {
 		@FunctionalInterface
 		interface ResourceFunc<T extends AutoCloseable> {
 			String apply(T resource, String unix) throws Exception;
+
+			/**
+			 * Calculates a list of lints against the given content.
+			 * By default, that's just an throwables thrown by the lint.
+			 */
+			default List<Lint> lint(T resource, String unix) throws Exception {
+				return List.of();
+			}
 		}
 
 		/** Creates a {@link FormatterFunc.Closeable} which uses the given resource to execute the format function. */
@@ -101,6 +118,10 @@ public String apply(String unix) throws Exception {
 		@FunctionalInterface
 		interface ResourceFuncNeedsFile<T extends AutoCloseable> {
 			String apply(T resource, String unix, File file) throws Exception;
+
+			default List<Lint> lint(T resource, String content, File file) throws Exception {
+				return List.of();
+			}
 		}
 
 		/** Creates a {@link FormatterFunc.Closeable} which uses the given resource to execute the file-dependent format function. */
@@ -123,6 +144,11 @@ public String apply(String unix, File file) throws Exception {
 				public String apply(String unix) throws Exception {
 					return apply(unix, Formatter.NO_FILE_SENTINEL);
 				}
+
+				@Override
+				public List<Lint> lint(String content, File file) throws Exception {
+					return function.lint(resource, content, file);
+				}
 			};
 		}
 	}
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
index 2a5a7d2b2f..870ef0ee18 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
@@ -17,6 +17,7 @@
 
 import java.io.File;
 import java.io.Serializable;
+import java.util.List;
 import java.util.Objects;
 
 import javax.annotation.Nullable;
@@ -46,6 +47,22 @@ public interface FormatterStep extends Serializable, AutoCloseable {
 	@Nullable
 	String format(String rawUnix, File file) throws Exception;
 
+	/**
+	 * Returns a list of lints against the given file content
+	 *
+	 * @param content
+	 *            the content to check
+	 * @param file
+	 *            the file which {@code content} was obtained from; never null. Pass an empty file using
+	 *            {@code new File("")} if and only if no file is actually associated with {@code content}
+	 * @return a list of lints
+	 * @throws Exception if the formatter step experiences a problem
+	 */
+	@Nullable
+	default List<Lint> lint(String content, File file) throws Exception {
+		return List.of();
+	}
+
 	/**
 	 * Returns a new {@code FormatterStep} which, observing the value of {@code formatIfMatches},
 	 * will only apply, or not, its changes to files which pass the given filter.
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStepEqualityOnStateSerialization.java b/lib/src/main/java/com/diffplug/spotless/FormatterStepEqualityOnStateSerialization.java
index 52bf9fc760..e42e0cb4f9 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStepEqualityOnStateSerialization.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStepEqualityOnStateSerialization.java
@@ -18,6 +18,7 @@
 import java.io.File;
 import java.io.Serializable;
 import java.util.Arrays;
+import java.util.List;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
@@ -48,6 +49,14 @@ public String format(String rawUnix, File file) throws Exception {
 		return formatter.apply(rawUnix, file);
 	}
 
+	@Override
+	public List<Lint> lint(String content, File file) throws Exception {
+		if (formatter == null) {
+			formatter = stateToFormatter(state());
+		}
+		return formatter.lint(content, file);
+	}
+
 	@Override
 	public boolean equals(Object o) {
 		if (o == null) {
diff --git a/lib/src/main/java/com/diffplug/spotless/Lint.java b/lib/src/main/java/com/diffplug/spotless/Lint.java
new file mode 100644
index 0000000000..bc6d026330
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/Lint.java
@@ -0,0 +1,242 @@
+/*
+ * Copyright 2022-2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Models a linted line or line range. Note that there is no concept of severity level - responsibility
+ * for severity and confidence are pushed down to the configuration of the lint tool. If a lint makes it
+ * to Spotless, then it is by definition.
+ */
+public final class Lint implements Serializable {
+	/** Any exception which implements this interface will have its lints extracted and reported cleanly to the user. */
+	public interface Has {
+		List<Lint> getLints();
+	}
+
+	/** An exception for shortcutting execution to report a lint to the user. */
+	public static class ShortcutException extends RuntimeException implements Has {
+		public ShortcutException(Lint... lints) {
+			this(Arrays.asList(lints));
+		}
+
+		private final List<Lint> lints;
+
+		public ShortcutException(Collection<Lint> lints) {
+			this.lints = List.copyOf(lints);
+		}
+
+		@Override
+		public List<Lint> getLints() {
+			return lints;
+		}
+	}
+
+	private static final long serialVersionUID = 1L;
+
+	private int lineStart, lineEnd; // 1-indexed, inclusive
+	private String code; // e.g. CN_IDIOM https://spotbugs.readthedocs.io/en/stable/bugDescriptions.html#cn-class-implements-cloneable-but-does-not-define-or-use-clone-method-cn-idiom
+	private String msg;
+
+	private Lint(int lineStart, int lineEnd, String lintCode, String lintMsg) {
+		this.lineStart = lineStart;
+		this.lineEnd = lineEnd;
+		this.code = LineEnding.toUnix(lintCode);
+		this.msg = LineEnding.toUnix(lintMsg);
+	}
+
+	public static Lint create(String code, String msg, int lineStart, int lineEnd) {
+		if (lineEnd < lineStart) {
+			throw new IllegalArgumentException("lineEnd must be >= lineStart: lineStart=" + lineStart + " lineEnd=" + lineEnd);
+		}
+		return new Lint(lineStart, lineEnd, code, msg);
+	}
+
+	public static Lint create(String code, String msg, int line) {
+		return new Lint(line, line, code, msg);
+	}
+
+	public int getLineStart() {
+		return lineStart;
+	}
+
+	public int getLineEnd() {
+		return lineEnd;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public String getMsg() {
+		return msg;
+	}
+
+	@Override
+	public String toString() {
+		if (lineStart == lineEnd) {
+			return lineStart + ": (" + code + ") " + msg;
+		} else {
+			return lineStart + "-" + lineEnd + ": (" + code + ") " + msg;
+		}
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o)
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
+		Lint lint = (Lint) o;
+		return lineStart == lint.lineStart && lineEnd == lint.lineEnd && Objects.equals(code, lint.code) && Objects.equals(msg, lint.msg);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(lineStart, lineEnd, code, msg);
+	}
+
+	/** Guaranteed to have no newlines, but also guarantees to preserve all newlines and parenthesis in code and msg. */
+	String asOneLine() {
+		StringBuilder buffer = new StringBuilder();
+		buffer.append(Integer.toString(lineStart));
+		if (lineStart != lineEnd) {
+			buffer.append('-');
+			buffer.append(Integer.toString(lineEnd));
+		}
+		buffer.append(OPEN);
+		buffer.append(safeParensAndNewlines.escape(code));
+		buffer.append(CLOSE);
+		buffer.append(safeParensAndNewlines.escape(msg));
+		return buffer.toString();
+	}
+
+	private static final String OPEN = ": (";
+	private static final String CLOSE = ") ";
+
+	static Lint fromOneLine(String content) {
+		int codeOpen = content.indexOf(OPEN);
+		int codeClose = content.indexOf(CLOSE, codeOpen);
+
+		int lineStart, lineEnd;
+		String lineNumber = content.substring(0, codeOpen);
+		int idxDash = lineNumber.indexOf('-');
+		if (idxDash == -1) {
+			lineStart = Integer.parseInt(lineNumber);
+			lineEnd = lineStart;
+		} else {
+			lineStart = Integer.parseInt(lineNumber.substring(0, idxDash));
+			lineEnd = Integer.parseInt(lineNumber.substring(idxDash + 1));
+		}
+
+		String code = safeParensAndNewlines.unescape(content.substring(codeOpen + OPEN.length(), codeClose));
+		String msg = safeParensAndNewlines.unescape(content.substring(codeClose + CLOSE.length()));
+		return Lint.create(code, msg, lineStart, lineEnd);
+	}
+
+	/** Call .escape to get a string which is guaranteed to have no parenthesis or newlines, and you can call unescape to get the original back. */
+	static final PerCharacterEscaper safeParensAndNewlines = PerCharacterEscaper.specifiedEscape("\\\\\nn(₍)₎");
+
+	/** Converts a list of lints to a String, format is not guaranteed to be consistent from version to version of Spotless. */
+	public static String toString(List<Lint> lints) {
+		StringBuilder builder = new StringBuilder();
+		for (Lint lint : lints) {
+			builder.append(lint.asOneLine());
+			builder.append('\n');
+		}
+		return builder.toString();
+	}
+
+	/** Converts a list of lints to a String, format is not guaranteed to be consistent from version to version of Spotless. */
+	public static List<Lint> fromString(String content) {
+		List<Lint> lints = new ArrayList<>();
+		String[] lines = content.split("\n");
+		for (String line : lines) {
+			line = line.trim();
+			if (!line.isEmpty()) {
+				lints.add(fromOneLine(line));
+			}
+		}
+		return lints;
+	}
+
+	public static List<Lint> fromFile(File file) throws IOException {
+		byte[] content = Files.readAllBytes(file.toPath());
+		return fromString(new String(content, StandardCharsets.UTF_8));
+	}
+
+	public static void toFile(List<Lint> lints, File file) throws IOException {
+		Path path = file.toPath();
+		Path parent = path.getParent();
+		if (parent == null) {
+			throw new IllegalArgumentException("file has no parent dir");
+		}
+		Files.createDirectories(parent);
+		byte[] content = toString(lints).getBytes(StandardCharsets.UTF_8);
+		Files.write(path, content);
+	}
+
+	/** Attempts to parse a line number from the given exception. */
+	static Lint createFromThrowable(FormatterStep step, String content, Throwable e) {
+		Throwable current = e;
+		while (current != null) {
+			String message = current.getMessage();
+			int lineNumber = lineNumberFor(message);
+			if (lineNumber != -1) {
+				return Lint.create(step.getName(), msgFrom(message), lineNumber);
+			}
+			current = current.getCause();
+		}
+		int numNewlines = (int) content.codePoints().filter(c -> c == '\n').count();
+		return Lint.create(step.getName(), ThrowingEx.stacktrace(e), 1, 1 + numNewlines);
+	}
+
+	private static int lineNumberFor(String message) {
+		if (message == null) {
+			return -1;
+		}
+		int firstColon = message.indexOf(':');
+		if (firstColon == -1) {
+			return -1;
+		}
+		String candidateNum = message.substring(0, firstColon);
+		try {
+			return Integer.parseInt(candidateNum);
+		} catch (NumberFormatException e) {
+			return -1;
+		}
+	}
+
+	private static String msgFrom(String message) {
+		for (int i = 0; i < message.length(); ++i) {
+			if (Character.isLetter(message.charAt(i))) {
+				return message.substring(i);
+			}
+		}
+		return "";
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/PerCharacterEscaper.java b/lib/src/main/java/com/diffplug/spotless/PerCharacterEscaper.java
new file mode 100644
index 0000000000..3138e3e781
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/PerCharacterEscaper.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright 2016-2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless;
+
+class PerCharacterEscaper {
+	/**
+	 * If your escape policy is "'a1b2c3d", it means this:
+	 *
+	 * ```
+	 * abc->abc
+	 * 123->'b'c'd
+	 * I won't->I won'at
+	 * ```
+	 */
+	public static PerCharacterEscaper specifiedEscape(String escapePolicy) {
+		int[] codePoints = escapePolicy.codePoints().toArray();
+		if (codePoints.length % 2 != 0) {
+			throw new IllegalArgumentException();
+		}
+		int escapeCodePoint = codePoints[0];
+		int[] escapedCodePoints = new int[codePoints.length / 2];
+		int[] escapedByCodePoints = new int[codePoints.length / 2];
+		for (int i = 0; i < escapedCodePoints.length; ++i) {
+			escapedCodePoints[i] = codePoints[2 * i];
+			escapedByCodePoints[i] = codePoints[2 * i + 1];
+		}
+		return new PerCharacterEscaper(escapeCodePoint, escapedCodePoints, escapedByCodePoints);
+	}
+
+	private final int escapeCodePoint;
+	private final int[] escapedCodePoints;
+	private final int[] escapedByCodePoints;
+
+	/** The first character in the string will be uses as the escape character, and all characters will be escaped. */
+	private PerCharacterEscaper(int escapeCodePoint, int[] escapedCodePoints, int[] escapedByCodePoints) {
+		this.escapeCodePoint = escapeCodePoint;
+		this.escapedCodePoints = escapedCodePoints;
+		this.escapedByCodePoints = escapedByCodePoints;
+	}
+
+	public boolean needsEscaping(String input) {
+		return firstOffsetNeedingEscape(input) != -1;
+	}
+
+	private int firstOffsetNeedingEscape(String input) {
+		final int length = input.length();
+		int firstOffsetNeedingEscape = -1;
+		outer: for (int offset = 0; offset < length;) {
+			int codepoint = input.codePointAt(offset);
+			for (int escaped : escapedCodePoints) {
+				if (codepoint == escaped) {
+					firstOffsetNeedingEscape = offset;
+					break outer;
+				}
+			}
+			offset += Character.charCount(codepoint);
+		}
+		return firstOffsetNeedingEscape;
+	}
+
+	public String escape(String input) {
+		final int noEscapes = firstOffsetNeedingEscape(input);
+		if (noEscapes == -1) {
+			return input;
+		} else {
+			final int length = input.length();
+			final int needsEscapes = length - noEscapes;
+			StringBuilder builder = new StringBuilder(noEscapes + 4 + (needsEscapes * 5 / 4));
+			builder.append(input, 0, noEscapes);
+			for (int offset = noEscapes; offset < length;) {
+				final int codepoint = input.codePointAt(offset);
+				offset += Character.charCount(codepoint);
+				int idx = indexOf(escapedCodePoints, codepoint);
+				if (idx == -1) {
+					builder.appendCodePoint(codepoint);
+				} else {
+					builder.appendCodePoint(escapeCodePoint);
+					builder.appendCodePoint(escapedByCodePoints[idx]);
+				}
+			}
+			return builder.toString();
+		}
+	}
+
+	private int firstOffsetNeedingUnescape(String input) {
+		final int length = input.length();
+		int firstOffsetNeedingEscape = -1;
+		for (int offset = 0; offset < length;) {
+			int codepoint = input.codePointAt(offset);
+			if (codepoint == escapeCodePoint) {
+				firstOffsetNeedingEscape = offset;
+				break;
+			}
+			offset += Character.charCount(codepoint);
+		}
+		return firstOffsetNeedingEscape;
+	}
+
+	public String unescape(String input) {
+		final int noEscapes = firstOffsetNeedingUnescape(input);
+		if (noEscapes == -1) {
+			return input;
+		} else {
+			final int length = input.length();
+			final int needsEscapes = length - noEscapes;
+			StringBuilder builder = new StringBuilder(noEscapes + 4 + (needsEscapes * 5 / 4));
+			builder.append(input, 0, noEscapes);
+			for (int offset = noEscapes; offset < length;) {
+				int codepoint = input.codePointAt(offset);
+				offset += Character.charCount(codepoint);
+				// if we need to escape something, escape it
+				if (codepoint == escapeCodePoint) {
+					if (offset < length) {
+						codepoint = input.codePointAt(offset);
+						int idx = indexOf(escapedByCodePoints, codepoint);
+						if (idx != -1) {
+							codepoint = escapedCodePoints[idx];
+						}
+						offset += Character.charCount(codepoint);
+					} else {
+						throw new IllegalArgumentException("Escape character '" + new String(new int[]{escapeCodePoint}, 0, 1) + "' can't be the last character in a string.");
+					}
+				}
+				// we didn't escape it, append it raw
+				builder.appendCodePoint(codepoint);
+			}
+			return builder.toString();
+		}
+	}
+
+	private static int indexOf(int[] array, int value) {
+		for (int i = 0; i < array.length; ++i) {
+			if (array[i] == value) {
+				return i;
+			}
+		}
+		return -1;
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/ThrowingEx.java b/lib/src/main/java/com/diffplug/spotless/ThrowingEx.java
index 6eb573b5d8..7e017e0989 100644
--- a/lib/src/main/java/com/diffplug/spotless/ThrowingEx.java
+++ b/lib/src/main/java/com/diffplug/spotless/ThrowingEx.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,9 @@
  */
 package com.diffplug.spotless;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
 /**
  * Basic functional interfaces which throw exception, along with
  * static helper methods for calling them.
@@ -142,4 +145,12 @@ public WrappedAsRuntimeException(Throwable e) {
 			super(e);
 		}
 	}
+
+	public static String stacktrace(Throwable e) {
+		StringWriter out = new StringWriter();
+		PrintWriter writer = new PrintWriter(out);
+		e.printStackTrace(writer);
+		writer.flush();
+		return out.toString();
+	}
 }
diff --git a/testlib/src/test/java/com/diffplug/spotless/LintTest.java b/testlib/src/test/java/com/diffplug/spotless/LintTest.java
new file mode 100644
index 0000000000..d8fcfba873
--- /dev/null
+++ b/testlib/src/test/java/com/diffplug/spotless/LintTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2022-2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class LintTest {
+	@Test
+	public void examples() {
+		roundtrip(Lint.create("code", "msg", 5));
+		roundtrip(Lint.create("code", "msg", 5, 7));
+		roundtrip(Lint.create("(code)", "msg\nwith\nnewlines", 5, 7));
+	}
+
+	private void roundtrip(Lint lint) {
+		Lint roundTripped = Lint.fromOneLine(lint.asOneLine());
+		Assertions.assertEquals(lint.asOneLine(), roundTripped.asOneLine());
+	}
+
+	@Test
+	public void perCharacterEscaper() {
+		roundtrip("abcn123", "abcn123");
+		roundtrip("abc\\123", "abc\\\\123");
+		roundtrip("abc(123)", "abc\\₍123\\₎");
+		roundtrip("abc\n123", "abc\\n123");
+		roundtrip("abc\nn123", "abc\\nn123");
+	}
+
+	private void roundtrip(String unescaped, String escaped) {
+		Assertions.assertEquals(escaped, Lint.safeParensAndNewlines.escape(unescaped));
+		Assertions.assertEquals(unescaped, Lint.safeParensAndNewlines.unescape(escaped));
+	}
+}
diff --git a/testlib/src/test/java/com/diffplug/spotless/PerCharacterEscaperTest.java b/testlib/src/test/java/com/diffplug/spotless/PerCharacterEscaperTest.java
new file mode 100644
index 0000000000..aa450ee43a
--- /dev/null
+++ b/testlib/src/test/java/com/diffplug/spotless/PerCharacterEscaperTest.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2016-2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class PerCharacterEscaperTest {
+	@Test
+	public void examples() {
+		roundtrip("abcn123", "abcn123");
+		roundtrip("abc/123", "abc//123");
+		roundtrip("abc(123)", "abc/₍123/₎");
+		roundtrip("abc\n123", "abc/n123");
+		roundtrip("abc\nn123", "abc/nn123");
+	}
+
+	private void roundtrip(String unescaped, String escaped) {
+		Assertions.assertEquals(escaped, Lint.safeParensAndNewlines.escape(unescaped));
+		Assertions.assertEquals(unescaped, Lint.safeParensAndNewlines.unescape(escaped));
+	}
+
+	@Test
+	public void performanceOptimizationSpecific() {
+		PerCharacterEscaper escaper = PerCharacterEscaper.specifiedEscape("`a1b2c3d");
+		// if nothing gets changed, it should return the exact same value
+		String abc = "abc";
+		Assertions.assertSame(abc, escaper.escape(abc));
+		Assertions.assertSame(abc, escaper.unescape(abc));
+
+		// otherwise it should have the normal behavior
+		Assertions.assertEquals("`b", escaper.escape("1"));
+		Assertions.assertEquals("`a", escaper.escape("`"));
+		Assertions.assertEquals("abc`b`c`d`adef", escaper.escape("abc123`def"));
+
+		// in both directions
+		Assertions.assertEquals("1", escaper.unescape("`b"));
+		Assertions.assertEquals("`", escaper.unescape("`a"));
+		Assertions.assertEquals("abc123`def", escaper.unescape("abc`1`2`3``def"));
+	}
+
+	@Test
+	public void cornerCasesSpecific() {
+		PerCharacterEscaper escaper = PerCharacterEscaper.specifiedEscape("`a1b2c3d");
+		// cornercase - escape character without follow-on will throw an error
+		org.assertj.core.api.Assertions.assertThatThrownBy(() -> escaper.unescape("`"))
+				.isInstanceOf(IllegalArgumentException.class)
+				.hasMessage("Escape character '`' can't be the last character in a string.");
+		// escape character followed by non-escape character is fine
+		Assertions.assertEquals("e", escaper.unescape("`e"));
+	}
+}

From 319fc79e6ef26a1793225b99955eb1e221ff8b6f Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 30 May 2024 15:28:15 -0700
Subject: [PATCH 1669/2068] Revert "Handy tool for making encoding formats that
 don't have any forbidden characters."

This reverts commit 9afa6dd722669820df7d5aca7a403279f2c55359.
---
 .../diffplug/spotless/ExceptionPerStep.java   | 101 --------
 .../FilterByContentPatternFormatterStep.java  |  18 +-
 .../spotless/FilterByFileFormatterStep.java   |  14 +-
 .../java/com/diffplug/spotless/Formatter.java |  30 +--
 .../com/diffplug/spotless/FormatterFunc.java  |  26 --
 .../com/diffplug/spotless/FormatterStep.java  |  17 --
 ...atterStepEqualityOnStateSerialization.java |   9 -
 .../main/java/com/diffplug/spotless/Lint.java | 242 ------------------
 .../spotless/PerCharacterEscaper.java         | 152 -----------
 .../com/diffplug/spotless/ThrowingEx.java     |  13 +-
 .../java/com/diffplug/spotless/LintTest.java  |  47 ----
 .../spotless/PerCharacterEscaperTest.java     |  65 -----
 12 files changed, 14 insertions(+), 720 deletions(-)
 delete mode 100644 lib/src/main/java/com/diffplug/spotless/ExceptionPerStep.java
 delete mode 100644 lib/src/main/java/com/diffplug/spotless/Lint.java
 delete mode 100644 lib/src/main/java/com/diffplug/spotless/PerCharacterEscaper.java
 delete mode 100644 testlib/src/test/java/com/diffplug/spotless/LintTest.java
 delete mode 100644 testlib/src/test/java/com/diffplug/spotless/PerCharacterEscaperTest.java

diff --git a/lib/src/main/java/com/diffplug/spotless/ExceptionPerStep.java b/lib/src/main/java/com/diffplug/spotless/ExceptionPerStep.java
deleted file mode 100644
index 7bf7fe2011..0000000000
--- a/lib/src/main/java/com/diffplug/spotless/ExceptionPerStep.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright 2024 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless;
-
-import java.util.AbstractList;
-
-import javax.annotation.Nullable;
-
-/**
- * Fixed-size list which maintains a list of exceptions, one per step of the formatter.
- * Usually this list will be empty or have only a single value, so it is optimized for stack allocation in those cases.
- */
-class ExceptionPerStep extends AbstractList<Throwable> {
-	private final int size;
-	private @Nullable Throwable exception;
-	private int exceptionIdx;
-	private @Nullable Throwable[] multipleExceptions = null;
-
-	ExceptionPerStep(Formatter formatter) {
-		this.size = formatter.getSteps().size();
-	}
-
-	@Override
-	public @Nullable Throwable set(int index, Throwable exception) {
-		if (index < 0 || index >= size) {
-			throw new IndexOutOfBoundsException("Index: " + index + ", Size: " + size);
-		}
-		if (this.exception == null) {
-			this.exceptionIdx = index;
-			this.exception = exception;
-			return null;
-		} else if (this.multipleExceptions != null) {
-			Throwable previousValue = multipleExceptions[index];
-			multipleExceptions[index] = exception;
-			return previousValue;
-		} else {
-			if (index == exceptionIdx) {
-				Throwable previousValue = this.exception;
-				this.exception = exception;
-				return previousValue;
-			} else {
-				multipleExceptions = new Throwable[size];
-				multipleExceptions[exceptionIdx] = this.exception;
-				multipleExceptions[index] = exception;
-				return null;
-			}
-		}
-	}
-
-	@Override
-	public Throwable get(int index) {
-		if (multipleExceptions != null) {
-			return multipleExceptions[index];
-		} else if (exceptionIdx == index) {
-			return exception;
-		} else {
-			return null;
-		}
-	}
-
-	private int indexOfFirstException() {
-		if (multipleExceptions != null) {
-			for (int i = 0; i < multipleExceptions.length; i++) {
-				if (multipleExceptions[i] != null) {
-					return i;
-				}
-			}
-			return -1;
-		} else if (exception != null) {
-			return exceptionIdx;
-		} else {
-			return -1;
-		}
-	}
-
-	@Override
-	public int size() {
-		return size;
-	}
-
-	/** Rethrows the first exception in the list. */
-	public void rethrowFirstIfPresent() {
-		int firstException = indexOfFirstException();
-		if (firstException != -1) {
-			throw ThrowingEx.asRuntimeRethrowError(get(firstException));
-		}
-	}
-}
diff --git a/lib/src/main/java/com/diffplug/spotless/FilterByContentPatternFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/FilterByContentPatternFormatterStep.java
index bcc444ad57..4cc336e101 100644
--- a/lib/src/main/java/com/diffplug/spotless/FilterByContentPatternFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/FilterByContentPatternFormatterStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 package com.diffplug.spotless;
 
 import java.io.File;
-import java.util.List;
 import java.util.Objects;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import javax.annotation.Nullable;
@@ -36,24 +36,14 @@ final class FilterByContentPatternFormatterStep extends DelegateFormatterStep {
 	public @Nullable String format(String raw, File file) throws Exception {
 		Objects.requireNonNull(raw, "raw");
 		Objects.requireNonNull(file, "file");
-		if (contentPattern.matcher(raw).find() == (onMatch == OnMatch.INCLUDE)) {
+		Matcher matcher = contentPattern.matcher(raw);
+		if (matcher.find() == (onMatch == OnMatch.INCLUDE)) {
 			return delegateStep.format(raw, file);
 		} else {
 			return raw;
 		}
 	}
 
-	@Override
-	public List<Lint> lint(String raw, File file) throws Exception {
-		Objects.requireNonNull(raw, "raw");
-		Objects.requireNonNull(file, "file");
-		if (contentPattern.matcher(raw).find() == (onMatch == OnMatch.INCLUDE)) {
-			return delegateStep.lint(raw, file);
-		} else {
-			return List.of();
-		}
-	}
-
 	@Override
 	public boolean equals(Object o) {
 		if (this == o) {
diff --git a/lib/src/main/java/com/diffplug/spotless/FilterByFileFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/FilterByFileFormatterStep.java
index bc5ddf6053..04a06a4673 100644
--- a/lib/src/main/java/com/diffplug/spotless/FilterByFileFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/FilterByFileFormatterStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 package com.diffplug.spotless;
 
 import java.io.File;
-import java.util.List;
 import java.util.Objects;
 
 import javax.annotation.Nullable;
@@ -40,17 +39,6 @@ final class FilterByFileFormatterStep extends DelegateFormatterStep {
 		}
 	}
 
-	@Override
-	public List<Lint> lint(String content, File file) throws Exception {
-		Objects.requireNonNull(content, "content");
-		Objects.requireNonNull(file, "file");
-		if (filter.accept(file)) {
-			return delegateStep.lint(content, file);
-		} else {
-			return List.of();
-		}
-	}
-
 	@Override
 	public boolean equals(Object o) {
 		if (this == o) {
diff --git a/lib/src/main/java/com/diffplug/spotless/Formatter.java b/lib/src/main/java/com/diffplug/spotless/Formatter.java
index 5db20942f5..1e2e44fe3a 100644
--- a/lib/src/main/java/com/diffplug/spotless/Formatter.java
+++ b/lib/src/main/java/com/diffplug/spotless/Formatter.java
@@ -26,7 +26,6 @@
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.ListIterator;
 import java.util.Objects;
 
 /** Formatter which performs the full formatting. */
@@ -128,28 +127,12 @@ public String computeLineEndings(String unix, File file) {
 	 * is guaranteed to also have unix line endings.
 	 */
 	public String compute(String unix, File file) {
-		ExceptionPerStep exceptionPerStep = new ExceptionPerStep(this);
-		String result = compute(unix, file, exceptionPerStep);
-		exceptionPerStep.rethrowFirstIfPresent();
-		return result;
-	}
-
-	/**
-	 * Returns the result of calling all of the FormatterSteps, while also
-	 * tracking any exceptions which are thrown.
-	 * <p>
-	 * The input must have unix line endings, and the output
-	 * is guaranteed to also have unix line endings.
-	 * <p>
-	 */
-	String compute(String unix, File file, ExceptionPerStep exceptionPerStep) {
 		Objects.requireNonNull(unix, "unix");
 		Objects.requireNonNull(file, "file");
 
-		ListIterator<FormatterStep> iter = steps.listIterator();
-		while (iter.hasNext()) {
+		for (FormatterStep step : steps) {
 			try {
-				String formatted = iter.next().format(unix, file);
+				String formatted = step.format(unix, file);
 				if (formatted == null) {
 					// This probably means it was a step that only checks
 					// for errors and doesn't actually have any fixes.
@@ -159,9 +142,12 @@ String compute(String unix, File file, ExceptionPerStep exceptionPerStep) {
 					unix = LineEnding.toUnix(formatted);
 				}
 			} catch (Throwable e) {
-				// store the exception which was thrown, and stop execution so we don't alter line numbers
-				exceptionPerStep.set(iter.previousIndex(), e);
-				return unix;
+				// TODO: this is bad, but it won't matter when add support for linting
+				if (e instanceof RuntimeException) {
+					throw (RuntimeException) e;
+				} else {
+					throw new RuntimeException(e);
+				}
 			}
 		}
 		return unix;
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java b/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java
index 5e6c44b335..800a553225 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java
@@ -16,7 +16,6 @@
 package com.diffplug.spotless;
 
 import java.io.File;
-import java.util.List;
 import java.util.Objects;
 
 /**
@@ -33,14 +32,6 @@ default String apply(String unix, File file) throws Exception {
 		return apply(unix);
 	}
 
-	/**
-	 * Calculates a list of lints against the given content.
-	 * By default, that's just an throwables thrown by the lint.
-	 */
-	default List<Lint> lint(String content, File file) throws Exception {
-		return List.of();
-	}
-
 	/**
 	 * {@code Function<String, String>} and {@code BiFunction<String, File, String>} whose implementation
 	 * requires a resource which should be released when the function is no longer needed.
@@ -83,14 +74,6 @@ public String apply(String unix) throws Exception {
 		@FunctionalInterface
 		interface ResourceFunc<T extends AutoCloseable> {
 			String apply(T resource, String unix) throws Exception;
-
-			/**
-			 * Calculates a list of lints against the given content.
-			 * By default, that's just an throwables thrown by the lint.
-			 */
-			default List<Lint> lint(T resource, String unix) throws Exception {
-				return List.of();
-			}
 		}
 
 		/** Creates a {@link FormatterFunc.Closeable} which uses the given resource to execute the format function. */
@@ -118,10 +101,6 @@ public String apply(String unix) throws Exception {
 		@FunctionalInterface
 		interface ResourceFuncNeedsFile<T extends AutoCloseable> {
 			String apply(T resource, String unix, File file) throws Exception;
-
-			default List<Lint> lint(T resource, String content, File file) throws Exception {
-				return List.of();
-			}
 		}
 
 		/** Creates a {@link FormatterFunc.Closeable} which uses the given resource to execute the file-dependent format function. */
@@ -144,11 +123,6 @@ public String apply(String unix, File file) throws Exception {
 				public String apply(String unix) throws Exception {
 					return apply(unix, Formatter.NO_FILE_SENTINEL);
 				}
-
-				@Override
-				public List<Lint> lint(String content, File file) throws Exception {
-					return function.lint(resource, content, file);
-				}
 			};
 		}
 	}
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
index 870ef0ee18..2a5a7d2b2f 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
@@ -17,7 +17,6 @@
 
 import java.io.File;
 import java.io.Serializable;
-import java.util.List;
 import java.util.Objects;
 
 import javax.annotation.Nullable;
@@ -47,22 +46,6 @@ public interface FormatterStep extends Serializable, AutoCloseable {
 	@Nullable
 	String format(String rawUnix, File file) throws Exception;
 
-	/**
-	 * Returns a list of lints against the given file content
-	 *
-	 * @param content
-	 *            the content to check
-	 * @param file
-	 *            the file which {@code content} was obtained from; never null. Pass an empty file using
-	 *            {@code new File("")} if and only if no file is actually associated with {@code content}
-	 * @return a list of lints
-	 * @throws Exception if the formatter step experiences a problem
-	 */
-	@Nullable
-	default List<Lint> lint(String content, File file) throws Exception {
-		return List.of();
-	}
-
 	/**
 	 * Returns a new {@code FormatterStep} which, observing the value of {@code formatIfMatches},
 	 * will only apply, or not, its changes to files which pass the given filter.
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStepEqualityOnStateSerialization.java b/lib/src/main/java/com/diffplug/spotless/FormatterStepEqualityOnStateSerialization.java
index e42e0cb4f9..52bf9fc760 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStepEqualityOnStateSerialization.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStepEqualityOnStateSerialization.java
@@ -18,7 +18,6 @@
 import java.io.File;
 import java.io.Serializable;
 import java.util.Arrays;
-import java.util.List;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
@@ -49,14 +48,6 @@ public String format(String rawUnix, File file) throws Exception {
 		return formatter.apply(rawUnix, file);
 	}
 
-	@Override
-	public List<Lint> lint(String content, File file) throws Exception {
-		if (formatter == null) {
-			formatter = stateToFormatter(state());
-		}
-		return formatter.lint(content, file);
-	}
-
 	@Override
 	public boolean equals(Object o) {
 		if (o == null) {
diff --git a/lib/src/main/java/com/diffplug/spotless/Lint.java b/lib/src/main/java/com/diffplug/spotless/Lint.java
deleted file mode 100644
index bc6d026330..0000000000
--- a/lib/src/main/java/com/diffplug/spotless/Lint.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * Copyright 2022-2024 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.Serializable;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * Models a linted line or line range. Note that there is no concept of severity level - responsibility
- * for severity and confidence are pushed down to the configuration of the lint tool. If a lint makes it
- * to Spotless, then it is by definition.
- */
-public final class Lint implements Serializable {
-	/** Any exception which implements this interface will have its lints extracted and reported cleanly to the user. */
-	public interface Has {
-		List<Lint> getLints();
-	}
-
-	/** An exception for shortcutting execution to report a lint to the user. */
-	public static class ShortcutException extends RuntimeException implements Has {
-		public ShortcutException(Lint... lints) {
-			this(Arrays.asList(lints));
-		}
-
-		private final List<Lint> lints;
-
-		public ShortcutException(Collection<Lint> lints) {
-			this.lints = List.copyOf(lints);
-		}
-
-		@Override
-		public List<Lint> getLints() {
-			return lints;
-		}
-	}
-
-	private static final long serialVersionUID = 1L;
-
-	private int lineStart, lineEnd; // 1-indexed, inclusive
-	private String code; // e.g. CN_IDIOM https://spotbugs.readthedocs.io/en/stable/bugDescriptions.html#cn-class-implements-cloneable-but-does-not-define-or-use-clone-method-cn-idiom
-	private String msg;
-
-	private Lint(int lineStart, int lineEnd, String lintCode, String lintMsg) {
-		this.lineStart = lineStart;
-		this.lineEnd = lineEnd;
-		this.code = LineEnding.toUnix(lintCode);
-		this.msg = LineEnding.toUnix(lintMsg);
-	}
-
-	public static Lint create(String code, String msg, int lineStart, int lineEnd) {
-		if (lineEnd < lineStart) {
-			throw new IllegalArgumentException("lineEnd must be >= lineStart: lineStart=" + lineStart + " lineEnd=" + lineEnd);
-		}
-		return new Lint(lineStart, lineEnd, code, msg);
-	}
-
-	public static Lint create(String code, String msg, int line) {
-		return new Lint(line, line, code, msg);
-	}
-
-	public int getLineStart() {
-		return lineStart;
-	}
-
-	public int getLineEnd() {
-		return lineEnd;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public String getMsg() {
-		return msg;
-	}
-
-	@Override
-	public String toString() {
-		if (lineStart == lineEnd) {
-			return lineStart + ": (" + code + ") " + msg;
-		} else {
-			return lineStart + "-" + lineEnd + ": (" + code + ") " + msg;
-		}
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if (this == o)
-			return true;
-		if (o == null || getClass() != o.getClass())
-			return false;
-		Lint lint = (Lint) o;
-		return lineStart == lint.lineStart && lineEnd == lint.lineEnd && Objects.equals(code, lint.code) && Objects.equals(msg, lint.msg);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(lineStart, lineEnd, code, msg);
-	}
-
-	/** Guaranteed to have no newlines, but also guarantees to preserve all newlines and parenthesis in code and msg. */
-	String asOneLine() {
-		StringBuilder buffer = new StringBuilder();
-		buffer.append(Integer.toString(lineStart));
-		if (lineStart != lineEnd) {
-			buffer.append('-');
-			buffer.append(Integer.toString(lineEnd));
-		}
-		buffer.append(OPEN);
-		buffer.append(safeParensAndNewlines.escape(code));
-		buffer.append(CLOSE);
-		buffer.append(safeParensAndNewlines.escape(msg));
-		return buffer.toString();
-	}
-
-	private static final String OPEN = ": (";
-	private static final String CLOSE = ") ";
-
-	static Lint fromOneLine(String content) {
-		int codeOpen = content.indexOf(OPEN);
-		int codeClose = content.indexOf(CLOSE, codeOpen);
-
-		int lineStart, lineEnd;
-		String lineNumber = content.substring(0, codeOpen);
-		int idxDash = lineNumber.indexOf('-');
-		if (idxDash == -1) {
-			lineStart = Integer.parseInt(lineNumber);
-			lineEnd = lineStart;
-		} else {
-			lineStart = Integer.parseInt(lineNumber.substring(0, idxDash));
-			lineEnd = Integer.parseInt(lineNumber.substring(idxDash + 1));
-		}
-
-		String code = safeParensAndNewlines.unescape(content.substring(codeOpen + OPEN.length(), codeClose));
-		String msg = safeParensAndNewlines.unescape(content.substring(codeClose + CLOSE.length()));
-		return Lint.create(code, msg, lineStart, lineEnd);
-	}
-
-	/** Call .escape to get a string which is guaranteed to have no parenthesis or newlines, and you can call unescape to get the original back. */
-	static final PerCharacterEscaper safeParensAndNewlines = PerCharacterEscaper.specifiedEscape("\\\\\nn(₍)₎");
-
-	/** Converts a list of lints to a String, format is not guaranteed to be consistent from version to version of Spotless. */
-	public static String toString(List<Lint> lints) {
-		StringBuilder builder = new StringBuilder();
-		for (Lint lint : lints) {
-			builder.append(lint.asOneLine());
-			builder.append('\n');
-		}
-		return builder.toString();
-	}
-
-	/** Converts a list of lints to a String, format is not guaranteed to be consistent from version to version of Spotless. */
-	public static List<Lint> fromString(String content) {
-		List<Lint> lints = new ArrayList<>();
-		String[] lines = content.split("\n");
-		for (String line : lines) {
-			line = line.trim();
-			if (!line.isEmpty()) {
-				lints.add(fromOneLine(line));
-			}
-		}
-		return lints;
-	}
-
-	public static List<Lint> fromFile(File file) throws IOException {
-		byte[] content = Files.readAllBytes(file.toPath());
-		return fromString(new String(content, StandardCharsets.UTF_8));
-	}
-
-	public static void toFile(List<Lint> lints, File file) throws IOException {
-		Path path = file.toPath();
-		Path parent = path.getParent();
-		if (parent == null) {
-			throw new IllegalArgumentException("file has no parent dir");
-		}
-		Files.createDirectories(parent);
-		byte[] content = toString(lints).getBytes(StandardCharsets.UTF_8);
-		Files.write(path, content);
-	}
-
-	/** Attempts to parse a line number from the given exception. */
-	static Lint createFromThrowable(FormatterStep step, String content, Throwable e) {
-		Throwable current = e;
-		while (current != null) {
-			String message = current.getMessage();
-			int lineNumber = lineNumberFor(message);
-			if (lineNumber != -1) {
-				return Lint.create(step.getName(), msgFrom(message), lineNumber);
-			}
-			current = current.getCause();
-		}
-		int numNewlines = (int) content.codePoints().filter(c -> c == '\n').count();
-		return Lint.create(step.getName(), ThrowingEx.stacktrace(e), 1, 1 + numNewlines);
-	}
-
-	private static int lineNumberFor(String message) {
-		if (message == null) {
-			return -1;
-		}
-		int firstColon = message.indexOf(':');
-		if (firstColon == -1) {
-			return -1;
-		}
-		String candidateNum = message.substring(0, firstColon);
-		try {
-			return Integer.parseInt(candidateNum);
-		} catch (NumberFormatException e) {
-			return -1;
-		}
-	}
-
-	private static String msgFrom(String message) {
-		for (int i = 0; i < message.length(); ++i) {
-			if (Character.isLetter(message.charAt(i))) {
-				return message.substring(i);
-			}
-		}
-		return "";
-	}
-}
diff --git a/lib/src/main/java/com/diffplug/spotless/PerCharacterEscaper.java b/lib/src/main/java/com/diffplug/spotless/PerCharacterEscaper.java
deleted file mode 100644
index 3138e3e781..0000000000
--- a/lib/src/main/java/com/diffplug/spotless/PerCharacterEscaper.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright 2016-2024 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless;
-
-class PerCharacterEscaper {
-	/**
-	 * If your escape policy is "'a1b2c3d", it means this:
-	 *
-	 * ```
-	 * abc->abc
-	 * 123->'b'c'd
-	 * I won't->I won'at
-	 * ```
-	 */
-	public static PerCharacterEscaper specifiedEscape(String escapePolicy) {
-		int[] codePoints = escapePolicy.codePoints().toArray();
-		if (codePoints.length % 2 != 0) {
-			throw new IllegalArgumentException();
-		}
-		int escapeCodePoint = codePoints[0];
-		int[] escapedCodePoints = new int[codePoints.length / 2];
-		int[] escapedByCodePoints = new int[codePoints.length / 2];
-		for (int i = 0; i < escapedCodePoints.length; ++i) {
-			escapedCodePoints[i] = codePoints[2 * i];
-			escapedByCodePoints[i] = codePoints[2 * i + 1];
-		}
-		return new PerCharacterEscaper(escapeCodePoint, escapedCodePoints, escapedByCodePoints);
-	}
-
-	private final int escapeCodePoint;
-	private final int[] escapedCodePoints;
-	private final int[] escapedByCodePoints;
-
-	/** The first character in the string will be uses as the escape character, and all characters will be escaped. */
-	private PerCharacterEscaper(int escapeCodePoint, int[] escapedCodePoints, int[] escapedByCodePoints) {
-		this.escapeCodePoint = escapeCodePoint;
-		this.escapedCodePoints = escapedCodePoints;
-		this.escapedByCodePoints = escapedByCodePoints;
-	}
-
-	public boolean needsEscaping(String input) {
-		return firstOffsetNeedingEscape(input) != -1;
-	}
-
-	private int firstOffsetNeedingEscape(String input) {
-		final int length = input.length();
-		int firstOffsetNeedingEscape = -1;
-		outer: for (int offset = 0; offset < length;) {
-			int codepoint = input.codePointAt(offset);
-			for (int escaped : escapedCodePoints) {
-				if (codepoint == escaped) {
-					firstOffsetNeedingEscape = offset;
-					break outer;
-				}
-			}
-			offset += Character.charCount(codepoint);
-		}
-		return firstOffsetNeedingEscape;
-	}
-
-	public String escape(String input) {
-		final int noEscapes = firstOffsetNeedingEscape(input);
-		if (noEscapes == -1) {
-			return input;
-		} else {
-			final int length = input.length();
-			final int needsEscapes = length - noEscapes;
-			StringBuilder builder = new StringBuilder(noEscapes + 4 + (needsEscapes * 5 / 4));
-			builder.append(input, 0, noEscapes);
-			for (int offset = noEscapes; offset < length;) {
-				final int codepoint = input.codePointAt(offset);
-				offset += Character.charCount(codepoint);
-				int idx = indexOf(escapedCodePoints, codepoint);
-				if (idx == -1) {
-					builder.appendCodePoint(codepoint);
-				} else {
-					builder.appendCodePoint(escapeCodePoint);
-					builder.appendCodePoint(escapedByCodePoints[idx]);
-				}
-			}
-			return builder.toString();
-		}
-	}
-
-	private int firstOffsetNeedingUnescape(String input) {
-		final int length = input.length();
-		int firstOffsetNeedingEscape = -1;
-		for (int offset = 0; offset < length;) {
-			int codepoint = input.codePointAt(offset);
-			if (codepoint == escapeCodePoint) {
-				firstOffsetNeedingEscape = offset;
-				break;
-			}
-			offset += Character.charCount(codepoint);
-		}
-		return firstOffsetNeedingEscape;
-	}
-
-	public String unescape(String input) {
-		final int noEscapes = firstOffsetNeedingUnescape(input);
-		if (noEscapes == -1) {
-			return input;
-		} else {
-			final int length = input.length();
-			final int needsEscapes = length - noEscapes;
-			StringBuilder builder = new StringBuilder(noEscapes + 4 + (needsEscapes * 5 / 4));
-			builder.append(input, 0, noEscapes);
-			for (int offset = noEscapes; offset < length;) {
-				int codepoint = input.codePointAt(offset);
-				offset += Character.charCount(codepoint);
-				// if we need to escape something, escape it
-				if (codepoint == escapeCodePoint) {
-					if (offset < length) {
-						codepoint = input.codePointAt(offset);
-						int idx = indexOf(escapedByCodePoints, codepoint);
-						if (idx != -1) {
-							codepoint = escapedCodePoints[idx];
-						}
-						offset += Character.charCount(codepoint);
-					} else {
-						throw new IllegalArgumentException("Escape character '" + new String(new int[]{escapeCodePoint}, 0, 1) + "' can't be the last character in a string.");
-					}
-				}
-				// we didn't escape it, append it raw
-				builder.appendCodePoint(codepoint);
-			}
-			return builder.toString();
-		}
-	}
-
-	private static int indexOf(int[] array, int value) {
-		for (int i = 0; i < array.length; ++i) {
-			if (array[i] == value) {
-				return i;
-			}
-		}
-		return -1;
-	}
-}
diff --git a/lib/src/main/java/com/diffplug/spotless/ThrowingEx.java b/lib/src/main/java/com/diffplug/spotless/ThrowingEx.java
index 7e017e0989..6eb573b5d8 100644
--- a/lib/src/main/java/com/diffplug/spotless/ThrowingEx.java
+++ b/lib/src/main/java/com/diffplug/spotless/ThrowingEx.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,9 +15,6 @@
  */
 package com.diffplug.spotless;
 
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
 /**
  * Basic functional interfaces which throw exception, along with
  * static helper methods for calling them.
@@ -145,12 +142,4 @@ public WrappedAsRuntimeException(Throwable e) {
 			super(e);
 		}
 	}
-
-	public static String stacktrace(Throwable e) {
-		StringWriter out = new StringWriter();
-		PrintWriter writer = new PrintWriter(out);
-		e.printStackTrace(writer);
-		writer.flush();
-		return out.toString();
-	}
 }
diff --git a/testlib/src/test/java/com/diffplug/spotless/LintTest.java b/testlib/src/test/java/com/diffplug/spotless/LintTest.java
deleted file mode 100644
index d8fcfba873..0000000000
--- a/testlib/src/test/java/com/diffplug/spotless/LintTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2022-2024 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-public class LintTest {
-	@Test
-	public void examples() {
-		roundtrip(Lint.create("code", "msg", 5));
-		roundtrip(Lint.create("code", "msg", 5, 7));
-		roundtrip(Lint.create("(code)", "msg\nwith\nnewlines", 5, 7));
-	}
-
-	private void roundtrip(Lint lint) {
-		Lint roundTripped = Lint.fromOneLine(lint.asOneLine());
-		Assertions.assertEquals(lint.asOneLine(), roundTripped.asOneLine());
-	}
-
-	@Test
-	public void perCharacterEscaper() {
-		roundtrip("abcn123", "abcn123");
-		roundtrip("abc\\123", "abc\\\\123");
-		roundtrip("abc(123)", "abc\\₍123\\₎");
-		roundtrip("abc\n123", "abc\\n123");
-		roundtrip("abc\nn123", "abc\\nn123");
-	}
-
-	private void roundtrip(String unescaped, String escaped) {
-		Assertions.assertEquals(escaped, Lint.safeParensAndNewlines.escape(unescaped));
-		Assertions.assertEquals(unescaped, Lint.safeParensAndNewlines.unescape(escaped));
-	}
-}
diff --git a/testlib/src/test/java/com/diffplug/spotless/PerCharacterEscaperTest.java b/testlib/src/test/java/com/diffplug/spotless/PerCharacterEscaperTest.java
deleted file mode 100644
index aa450ee43a..0000000000
--- a/testlib/src/test/java/com/diffplug/spotless/PerCharacterEscaperTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2016-2024 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-public class PerCharacterEscaperTest {
-	@Test
-	public void examples() {
-		roundtrip("abcn123", "abcn123");
-		roundtrip("abc/123", "abc//123");
-		roundtrip("abc(123)", "abc/₍123/₎");
-		roundtrip("abc\n123", "abc/n123");
-		roundtrip("abc\nn123", "abc/nn123");
-	}
-
-	private void roundtrip(String unescaped, String escaped) {
-		Assertions.assertEquals(escaped, Lint.safeParensAndNewlines.escape(unescaped));
-		Assertions.assertEquals(unescaped, Lint.safeParensAndNewlines.unescape(escaped));
-	}
-
-	@Test
-	public void performanceOptimizationSpecific() {
-		PerCharacterEscaper escaper = PerCharacterEscaper.specifiedEscape("`a1b2c3d");
-		// if nothing gets changed, it should return the exact same value
-		String abc = "abc";
-		Assertions.assertSame(abc, escaper.escape(abc));
-		Assertions.assertSame(abc, escaper.unescape(abc));
-
-		// otherwise it should have the normal behavior
-		Assertions.assertEquals("`b", escaper.escape("1"));
-		Assertions.assertEquals("`a", escaper.escape("`"));
-		Assertions.assertEquals("abc`b`c`d`adef", escaper.escape("abc123`def"));
-
-		// in both directions
-		Assertions.assertEquals("1", escaper.unescape("`b"));
-		Assertions.assertEquals("`", escaper.unescape("`a"));
-		Assertions.assertEquals("abc123`def", escaper.unescape("abc`1`2`3``def"));
-	}
-
-	@Test
-	public void cornerCasesSpecific() {
-		PerCharacterEscaper escaper = PerCharacterEscaper.specifiedEscape("`a1b2c3d");
-		// cornercase - escape character without follow-on will throw an error
-		org.assertj.core.api.Assertions.assertThatThrownBy(() -> escaper.unescape("`"))
-				.isInstanceOf(IllegalArgumentException.class)
-				.hasMessage("Escape character '`' can't be the last character in a string.");
-		// escape character followed by non-escape character is fine
-		Assertions.assertEquals("e", escaper.unescape("`e"));
-	}
-}

From 777fd5cfdab4904919806cc87637f70d1eb70fa3 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 30 May 2024 15:53:40 -0700
Subject: [PATCH 1670/2068] Add a `Lint` class, along with `ShortcutException`
 for sending them.

---
 .../main/java/com/diffplug/spotless/Lint.java | 156 ++++++++++++++++++
 .../com/diffplug/spotless/ThrowingEx.java     |  13 +-
 2 files changed, 168 insertions(+), 1 deletion(-)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/Lint.java

diff --git a/lib/src/main/java/com/diffplug/spotless/Lint.java b/lib/src/main/java/com/diffplug/spotless/Lint.java
new file mode 100644
index 0000000000..81fcefc964
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/Lint.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright 2022-2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless;
+
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Models a linted line or line range. Note that there is no concept of severity level - responsibility
+ * for severity and confidence are pushed down to the configuration of the lint tool. If a lint makes it
+ * to Spotless, then it is by definition.
+ */
+public final class Lint implements Serializable {
+	/** Any exception which implements this interface will have its lints extracted and reported cleanly to the user. */
+	public interface Has {
+		List<Lint> getLints();
+	}
+
+	/** An exception for shortcutting execution to report a lint to the user. */
+	public static class ShortcutException extends RuntimeException implements Has {
+		public ShortcutException(Lint... lints) {
+			this(Arrays.asList(lints));
+		}
+
+		private final List<Lint> lints;
+
+		public ShortcutException(Collection<Lint> lints) {
+			this.lints = List.copyOf(lints);
+		}
+
+		@Override
+		public List<Lint> getLints() {
+			return lints;
+		}
+	}
+
+	private static final long serialVersionUID = 1L;
+
+	private int lineStart, lineEnd; // 1-indexed, inclusive
+	private String code; // e.g. CN_IDIOM https://spotbugs.readthedocs.io/en/stable/bugDescriptions.html#cn-class-implements-cloneable-but-does-not-define-or-use-clone-method-cn-idiom
+	private String msg;
+
+	private Lint(int lineStart, int lineEnd, String lintCode, String lintMsg) {
+		this.lineStart = lineStart;
+		this.lineEnd = lineEnd;
+		this.code = LineEnding.toUnix(lintCode);
+		this.msg = LineEnding.toUnix(lintMsg);
+	}
+
+	public static Lint create(String code, String msg, int lineStart, int lineEnd) {
+		if (lineEnd < lineStart) {
+			throw new IllegalArgumentException("lineEnd must be >= lineStart: lineStart=" + lineStart + " lineEnd=" + lineEnd);
+		}
+		return new Lint(lineStart, lineEnd, code, msg);
+	}
+
+	public static Lint create(String code, String msg, int line) {
+		return new Lint(line, line, code, msg);
+	}
+
+	public int getLineStart() {
+		return lineStart;
+	}
+
+	public int getLineEnd() {
+		return lineEnd;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public String getMsg() {
+		return msg;
+	}
+
+	@Override
+	public String toString() {
+		if (lineStart == lineEnd) {
+			return lineStart + ": (" + code + ") " + msg;
+		} else {
+			return lineStart + "-" + lineEnd + ": (" + code + ") " + msg;
+		}
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o)
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
+		Lint lint = (Lint) o;
+		return lineStart == lint.lineStart && lineEnd == lint.lineEnd && Objects.equals(code, lint.code) && Objects.equals(msg, lint.msg);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(lineStart, lineEnd, code, msg);
+	}
+
+	/** Attempts to parse a line number from the given exception. */
+	static Lint createFromThrowable(FormatterStep step, String content, Throwable e) {
+		Throwable current = e;
+		while (current != null) {
+			String message = current.getMessage();
+			int lineNumber = lineNumberFor(message);
+			if (lineNumber != -1) {
+				return Lint.create(step.getName(), msgFrom(message), lineNumber);
+			}
+			current = current.getCause();
+		}
+		int numNewlines = (int) content.codePoints().filter(c -> c == '\n').count();
+		return Lint.create(step.getName(), ThrowingEx.stacktrace(e), 1, 1 + numNewlines);
+	}
+
+	private static int lineNumberFor(String message) {
+		if (message == null) {
+			return -1;
+		}
+		int firstColon = message.indexOf(':');
+		if (firstColon == -1) {
+			return -1;
+		}
+		String candidateNum = message.substring(0, firstColon);
+		try {
+			return Integer.parseInt(candidateNum);
+		} catch (NumberFormatException e) {
+			return -1;
+		}
+	}
+
+	private static String msgFrom(String message) {
+		for (int i = 0; i < message.length(); ++i) {
+			if (Character.isLetter(message.charAt(i))) {
+				return message.substring(i);
+			}
+		}
+		return "";
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/ThrowingEx.java b/lib/src/main/java/com/diffplug/spotless/ThrowingEx.java
index 6eb573b5d8..7e017e0989 100644
--- a/lib/src/main/java/com/diffplug/spotless/ThrowingEx.java
+++ b/lib/src/main/java/com/diffplug/spotless/ThrowingEx.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,9 @@
  */
 package com.diffplug.spotless;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
 /**
  * Basic functional interfaces which throw exception, along with
  * static helper methods for calling them.
@@ -142,4 +145,12 @@ public WrappedAsRuntimeException(Throwable e) {
 			super(e);
 		}
 	}
+
+	public static String stacktrace(Throwable e) {
+		StringWriter out = new StringWriter();
+		PrintWriter writer = new PrintWriter(out);
+		e.printStackTrace(writer);
+		writer.flush();
+		return out.toString();
+	}
 }

From 322d5bf76c24f2807acc82fcb026838fc3d190e0 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 30 May 2024 15:54:26 -0700
Subject: [PATCH 1671/2068] Add a `lint` method to the core interfaces:
 `Formatter[Step|Func]`

---
 .../com/diffplug/spotless/FormatterFunc.java  | 26 +++++++++++++++++++
 .../com/diffplug/spotless/FormatterStep.java  | 17 ++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java b/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java
index 800a553225..5e6c44b335 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java
@@ -16,6 +16,7 @@
 package com.diffplug.spotless;
 
 import java.io.File;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -32,6 +33,14 @@ default String apply(String unix, File file) throws Exception {
 		return apply(unix);
 	}
 
+	/**
+	 * Calculates a list of lints against the given content.
+	 * By default, that's just an throwables thrown by the lint.
+	 */
+	default List<Lint> lint(String content, File file) throws Exception {
+		return List.of();
+	}
+
 	/**
 	 * {@code Function<String, String>} and {@code BiFunction<String, File, String>} whose implementation
 	 * requires a resource which should be released when the function is no longer needed.
@@ -74,6 +83,14 @@ public String apply(String unix) throws Exception {
 		@FunctionalInterface
 		interface ResourceFunc<T extends AutoCloseable> {
 			String apply(T resource, String unix) throws Exception;
+
+			/**
+			 * Calculates a list of lints against the given content.
+			 * By default, that's just an throwables thrown by the lint.
+			 */
+			default List<Lint> lint(T resource, String unix) throws Exception {
+				return List.of();
+			}
 		}
 
 		/** Creates a {@link FormatterFunc.Closeable} which uses the given resource to execute the format function. */
@@ -101,6 +118,10 @@ public String apply(String unix) throws Exception {
 		@FunctionalInterface
 		interface ResourceFuncNeedsFile<T extends AutoCloseable> {
 			String apply(T resource, String unix, File file) throws Exception;
+
+			default List<Lint> lint(T resource, String content, File file) throws Exception {
+				return List.of();
+			}
 		}
 
 		/** Creates a {@link FormatterFunc.Closeable} which uses the given resource to execute the file-dependent format function. */
@@ -123,6 +144,11 @@ public String apply(String unix, File file) throws Exception {
 				public String apply(String unix) throws Exception {
 					return apply(unix, Formatter.NO_FILE_SENTINEL);
 				}
+
+				@Override
+				public List<Lint> lint(String content, File file) throws Exception {
+					return function.lint(resource, content, file);
+				}
 			};
 		}
 	}
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
index 2a5a7d2b2f..870ef0ee18 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
@@ -17,6 +17,7 @@
 
 import java.io.File;
 import java.io.Serializable;
+import java.util.List;
 import java.util.Objects;
 
 import javax.annotation.Nullable;
@@ -46,6 +47,22 @@ public interface FormatterStep extends Serializable, AutoCloseable {
 	@Nullable
 	String format(String rawUnix, File file) throws Exception;
 
+	/**
+	 * Returns a list of lints against the given file content
+	 *
+	 * @param content
+	 *            the content to check
+	 * @param file
+	 *            the file which {@code content} was obtained from; never null. Pass an empty file using
+	 *            {@code new File("")} if and only if no file is actually associated with {@code content}
+	 * @return a list of lints
+	 * @throws Exception if the formatter step experiences a problem
+	 */
+	@Nullable
+	default List<Lint> lint(String content, File file) throws Exception {
+		return List.of();
+	}
+
 	/**
 	 * Returns a new {@code FormatterStep} which, observing the value of {@code formatIfMatches},
 	 * will only apply, or not, its changes to files which pass the given filter.

From c9f52d5f7e4eed7c38fd01683fd7dbbc6ae79f83 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 30 May 2024 15:54:57 -0700
Subject: [PATCH 1672/2068] Pipe linting through the core FormatterStep
 implementations.

---
 .../FilterByContentPatternFormatterStep.java   | 18 ++++++++++++++----
 .../spotless/FilterByFileFormatterStep.java    | 14 +++++++++++++-
 ...matterStepEqualityOnStateSerialization.java |  9 +++++++++
 3 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/FilterByContentPatternFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/FilterByContentPatternFormatterStep.java
index 4cc336e101..bcc444ad57 100644
--- a/lib/src/main/java/com/diffplug/spotless/FilterByContentPatternFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/FilterByContentPatternFormatterStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 package com.diffplug.spotless;
 
 import java.io.File;
+import java.util.List;
 import java.util.Objects;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import javax.annotation.Nullable;
@@ -36,14 +36,24 @@ final class FilterByContentPatternFormatterStep extends DelegateFormatterStep {
 	public @Nullable String format(String raw, File file) throws Exception {
 		Objects.requireNonNull(raw, "raw");
 		Objects.requireNonNull(file, "file");
-		Matcher matcher = contentPattern.matcher(raw);
-		if (matcher.find() == (onMatch == OnMatch.INCLUDE)) {
+		if (contentPattern.matcher(raw).find() == (onMatch == OnMatch.INCLUDE)) {
 			return delegateStep.format(raw, file);
 		} else {
 			return raw;
 		}
 	}
 
+	@Override
+	public List<Lint> lint(String raw, File file) throws Exception {
+		Objects.requireNonNull(raw, "raw");
+		Objects.requireNonNull(file, "file");
+		if (contentPattern.matcher(raw).find() == (onMatch == OnMatch.INCLUDE)) {
+			return delegateStep.lint(raw, file);
+		} else {
+			return List.of();
+		}
+	}
+
 	@Override
 	public boolean equals(Object o) {
 		if (this == o) {
diff --git a/lib/src/main/java/com/diffplug/spotless/FilterByFileFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/FilterByFileFormatterStep.java
index 04a06a4673..bc5ddf6053 100644
--- a/lib/src/main/java/com/diffplug/spotless/FilterByFileFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/FilterByFileFormatterStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 package com.diffplug.spotless;
 
 import java.io.File;
+import java.util.List;
 import java.util.Objects;
 
 import javax.annotation.Nullable;
@@ -39,6 +40,17 @@ final class FilterByFileFormatterStep extends DelegateFormatterStep {
 		}
 	}
 
+	@Override
+	public List<Lint> lint(String content, File file) throws Exception {
+		Objects.requireNonNull(content, "content");
+		Objects.requireNonNull(file, "file");
+		if (filter.accept(file)) {
+			return delegateStep.lint(content, file);
+		} else {
+			return List.of();
+		}
+	}
+
 	@Override
 	public boolean equals(Object o) {
 		if (this == o) {
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStepEqualityOnStateSerialization.java b/lib/src/main/java/com/diffplug/spotless/FormatterStepEqualityOnStateSerialization.java
index 52bf9fc760..e42e0cb4f9 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStepEqualityOnStateSerialization.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStepEqualityOnStateSerialization.java
@@ -18,6 +18,7 @@
 import java.io.File;
 import java.io.Serializable;
 import java.util.Arrays;
+import java.util.List;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
@@ -48,6 +49,14 @@ public String format(String rawUnix, File file) throws Exception {
 		return formatter.apply(rawUnix, file);
 	}
 
+	@Override
+	public List<Lint> lint(String content, File file) throws Exception {
+		if (formatter == null) {
+			formatter = stateToFormatter(state());
+		}
+		return formatter.lint(content, file);
+	}
+
 	@Override
 	public boolean equals(Object o) {
 		if (o == null) {

From b57bf24a1f0dc4501a9d91885884eda5229a4102 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 30 May 2024 15:56:40 -0700
Subject: [PATCH 1673/2068] Formatter can now capture exceptions per-formatter,
 rethrows if you don't call it in the "special" way.

---
 .../diffplug/spotless/ExceptionPerStep.java   | 101 ++++++++++++++++++
 .../java/com/diffplug/spotless/Formatter.java |  30 ++++--
 2 files changed, 123 insertions(+), 8 deletions(-)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/ExceptionPerStep.java

diff --git a/lib/src/main/java/com/diffplug/spotless/ExceptionPerStep.java b/lib/src/main/java/com/diffplug/spotless/ExceptionPerStep.java
new file mode 100644
index 0000000000..7bf7fe2011
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/ExceptionPerStep.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless;
+
+import java.util.AbstractList;
+
+import javax.annotation.Nullable;
+
+/**
+ * Fixed-size list which maintains a list of exceptions, one per step of the formatter.
+ * Usually this list will be empty or have only a single value, so it is optimized for stack allocation in those cases.
+ */
+class ExceptionPerStep extends AbstractList<Throwable> {
+	private final int size;
+	private @Nullable Throwable exception;
+	private int exceptionIdx;
+	private @Nullable Throwable[] multipleExceptions = null;
+
+	ExceptionPerStep(Formatter formatter) {
+		this.size = formatter.getSteps().size();
+	}
+
+	@Override
+	public @Nullable Throwable set(int index, Throwable exception) {
+		if (index < 0 || index >= size) {
+			throw new IndexOutOfBoundsException("Index: " + index + ", Size: " + size);
+		}
+		if (this.exception == null) {
+			this.exceptionIdx = index;
+			this.exception = exception;
+			return null;
+		} else if (this.multipleExceptions != null) {
+			Throwable previousValue = multipleExceptions[index];
+			multipleExceptions[index] = exception;
+			return previousValue;
+		} else {
+			if (index == exceptionIdx) {
+				Throwable previousValue = this.exception;
+				this.exception = exception;
+				return previousValue;
+			} else {
+				multipleExceptions = new Throwable[size];
+				multipleExceptions[exceptionIdx] = this.exception;
+				multipleExceptions[index] = exception;
+				return null;
+			}
+		}
+	}
+
+	@Override
+	public Throwable get(int index) {
+		if (multipleExceptions != null) {
+			return multipleExceptions[index];
+		} else if (exceptionIdx == index) {
+			return exception;
+		} else {
+			return null;
+		}
+	}
+
+	private int indexOfFirstException() {
+		if (multipleExceptions != null) {
+			for (int i = 0; i < multipleExceptions.length; i++) {
+				if (multipleExceptions[i] != null) {
+					return i;
+				}
+			}
+			return -1;
+		} else if (exception != null) {
+			return exceptionIdx;
+		} else {
+			return -1;
+		}
+	}
+
+	@Override
+	public int size() {
+		return size;
+	}
+
+	/** Rethrows the first exception in the list. */
+	public void rethrowFirstIfPresent() {
+		int firstException = indexOfFirstException();
+		if (firstException != -1) {
+			throw ThrowingEx.asRuntimeRethrowError(get(firstException));
+		}
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/Formatter.java b/lib/src/main/java/com/diffplug/spotless/Formatter.java
index 1e2e44fe3a..5db20942f5 100644
--- a/lib/src/main/java/com/diffplug/spotless/Formatter.java
+++ b/lib/src/main/java/com/diffplug/spotless/Formatter.java
@@ -26,6 +26,7 @@
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.ListIterator;
 import java.util.Objects;
 
 /** Formatter which performs the full formatting. */
@@ -127,12 +128,28 @@ public String computeLineEndings(String unix, File file) {
 	 * is guaranteed to also have unix line endings.
 	 */
 	public String compute(String unix, File file) {
+		ExceptionPerStep exceptionPerStep = new ExceptionPerStep(this);
+		String result = compute(unix, file, exceptionPerStep);
+		exceptionPerStep.rethrowFirstIfPresent();
+		return result;
+	}
+
+	/**
+	 * Returns the result of calling all of the FormatterSteps, while also
+	 * tracking any exceptions which are thrown.
+	 * <p>
+	 * The input must have unix line endings, and the output
+	 * is guaranteed to also have unix line endings.
+	 * <p>
+	 */
+	String compute(String unix, File file, ExceptionPerStep exceptionPerStep) {
 		Objects.requireNonNull(unix, "unix");
 		Objects.requireNonNull(file, "file");
 
-		for (FormatterStep step : steps) {
+		ListIterator<FormatterStep> iter = steps.listIterator();
+		while (iter.hasNext()) {
 			try {
-				String formatted = step.format(unix, file);
+				String formatted = iter.next().format(unix, file);
 				if (formatted == null) {
 					// This probably means it was a step that only checks
 					// for errors and doesn't actually have any fixes.
@@ -142,12 +159,9 @@ public String compute(String unix, File file) {
 					unix = LineEnding.toUnix(formatted);
 				}
 			} catch (Throwable e) {
-				// TODO: this is bad, but it won't matter when add support for linting
-				if (e instanceof RuntimeException) {
-					throw (RuntimeException) e;
-				} else {
-					throw new RuntimeException(e);
-				}
+				// store the exception which was thrown, and stop execution so we don't alter line numbers
+				exceptionPerStep.set(iter.previousIndex(), e);
+				return unix;
 			}
 		}
 		return unix;

From a94dce9f9b0e62d832f3d033603844a8884fa906 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 30 May 2024 16:01:47 -0700
Subject: [PATCH 1674/2068] Pipe the lints through `FenceStep`, preliminary.

---
 .../diffplug/spotless/generic/FenceStep.java  | 30 ++++++++++++-------
 .../spotless/generic/FenceStepTest.java       |  4 +++
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java b/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
index 9ce34675f8..3cb0e3f047 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
@@ -27,9 +27,9 @@
 import javax.annotation.Nullable;
 
 import com.diffplug.spotless.Formatter;
-import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.LineEnding;
+import com.diffplug.spotless.Lint;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
@@ -101,7 +101,7 @@ static class ApplyWithin extends BaseStep {
 		}
 
 		@Override
-		public String apply(Formatter formatter, String unix, File file) throws Exception {
+		protected String applySubclass(Formatter formatter, String unix, File file) {
 			List<String> groups = groupsZeroed();
 			Matcher matcher = regex.matcher(unix);
 			while (matcher.find()) {
@@ -130,7 +130,7 @@ private void storeGroups(String unix) {
 		}
 
 		@Override
-		public String apply(Formatter formatter, String unix, File file) throws Exception {
+		protected String applySubclass(Formatter formatter, String unix, File file) {
 			storeGroups(unix);
 			String formatted = formatter.compute(unix, file);
 			return assembleGroups(formatted);
@@ -138,7 +138,7 @@ public String apply(Formatter formatter, String unix, File file) throws Exceptio
 	}
 
 	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
-	public static abstract class BaseStep implements Serializable, FormatterStep, FormatterFunc.Closeable.ResourceFuncNeedsFile<Formatter> {
+	private static abstract class BaseStep implements Serializable, FormatterStep {
 		final String name;
 		private static final long serialVersionUID = -2301848328356559915L;
 		final Pattern regex;
@@ -198,8 +198,8 @@ protected String assembleGroups(String unix) {
 				return builder.toString();
 			} else {
 				// these will be needed to generate Lints later on
-				// int startLine = 1 + (int) builder.toString().codePoints().filter(c -> c == '\n').count();
-				// int endLine = 1 + (int) unix.codePoints().filter(c -> c == '\n').count();
+				int startLine = 1 + (int) builder.toString().codePoints().filter(c -> c == '\n').count();
+				int endLine = 1 + (int) unix.codePoints().filter(c -> c == '\n').count();
 
 				// throw an error with either the full regex, or the nicer open/close pair
 				Matcher openClose = Pattern.compile("\\\\Q([\\s\\S]*?)\\\\E" + "\\Q([\\s\\S]*?)\\E" + "\\\\Q([\\s\\S]*?)\\\\E")
@@ -210,7 +210,9 @@ protected String assembleGroups(String unix) {
 				} else {
 					pattern = regex.pattern();
 				}
-				throw new Error("An intermediate step removed a match of " + pattern);
+				throw new Lint.ShortcutException(Lint.create("fenceRemoved",
+						"An intermediate step removed a match of " + pattern,
+						startLine, endLine));
 			}
 		}
 
@@ -221,15 +223,21 @@ public String getName() {
 
 		private transient Formatter formatter;
 
-		@Nullable
-		@Override
-		public String format(String rawUnix, File file) throws Exception {
+		private String apply(String rawUnix, File file) throws Exception {
 			if (formatter == null) {
 				formatter = buildFormatter();
 			}
-			return this.apply(formatter, rawUnix, file);
+			return applySubclass(formatter, rawUnix, file);
 		}
 
+		@Nullable
+		@Override
+		public String format(String rawUnix, File file) throws Exception {
+			return apply(rawUnix, file);
+		}
+
+		protected abstract String applySubclass(Formatter formatter, String unix, File file) throws Exception;
+
 		@Override
 		public boolean equals(Object o) {
 			if (this == o)
diff --git a/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java b/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java
index 697a199fd2..ea9755a804 100644
--- a/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java
@@ -18,12 +18,14 @@
 import java.io.File;
 import java.util.Arrays;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.common.base.StringPrinter;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.ResourceHarness;
 import com.diffplug.spotless.StepHarness;
+import com.diffplug.spotless.tag.ForLintRefactor;
 
 class FenceStepTest extends ResourceHarness {
 	@Test
@@ -80,6 +82,8 @@ void multiple() {
 						"1 2 3"));
 	}
 
+	@Disabled
+	@ForLintRefactor
 	@Test
 	void broken() {
 		FormatterStep fence = FenceStep.named("fence").openClose("spotless:off", "spotless:on")

From c2249299c6fad4753a3113ff2c30a144150abfbc Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 30 May 2024 16:04:10 -0700
Subject: [PATCH 1675/2068] Remove all of `FormatExceptionPolicy` except
 `Strict`, which remains for easy API conversion.

---
 .../spotless/FormatExceptionPolicy.java       | 39 -------------------
 .../spotless/FormatExceptionPolicyStrict.java | 11 +++---
 ...ptionPolicyLegacy.java => LintPolicy.java} | 16 +-------
 .../gradle/spotless/SpotlessTask.java         |  7 ++--
 4 files changed, 10 insertions(+), 63 deletions(-)
 delete mode 100644 lib/src/main/java/com/diffplug/spotless/FormatExceptionPolicy.java
 rename lib/src/main/java/com/diffplug/spotless/{FormatExceptionPolicyLegacy.java => LintPolicy.java} (71%)

diff --git a/lib/src/main/java/com/diffplug/spotless/FormatExceptionPolicy.java b/lib/src/main/java/com/diffplug/spotless/FormatExceptionPolicy.java
deleted file mode 100644
index 50f49e41db..0000000000
--- a/lib/src/main/java/com/diffplug/spotless/FormatExceptionPolicy.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2016-2023 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless;
-
-import java.io.Serializable;
-
-/** A policy for handling exceptions in the format. */
-public interface FormatExceptionPolicy extends Serializable, NoLambda {
-	/** Called for every error in the formatter. */
-	public void handleError(Throwable e, FormatterStep step, String relativePath);
-
-	/**
-	 * Returns a byte array representation of everything inside this {@code FormatExceptionPolicy}.
-	 * <p>
-	 * The main purpose of this method is to ensure one can't instantiate this class with lambda
-	 * expressions, which are notoriously difficult to serialize and deserialize properly.
-	 */
-	public byte[] toBytes();
-
-	/**
-	 * A policy which rethrows subclasses of {@code Error} and logs other kinds of Exception.
-	 */
-	public static FormatExceptionPolicy failOnlyOnError() {
-		return new FormatExceptionPolicyLegacy();
-	}
-}
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatExceptionPolicyStrict.java b/lib/src/main/java/com/diffplug/spotless/FormatExceptionPolicyStrict.java
index 6fd8371928..9bafc946ef 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatExceptionPolicyStrict.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatExceptionPolicyStrict.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
  * A policy for handling exceptions in the format.  Any exceptions will
  * halt the build except for a specifically excluded path or step.
  */
-public class FormatExceptionPolicyStrict extends NoLambda.EqualityBasedOnSerialization implements FormatExceptionPolicy {
+public class FormatExceptionPolicyStrict extends NoLambda.EqualityBasedOnSerialization {
 	private static final long serialVersionUID = 1L;
 
 	private final Set<String> excludeSteps = new TreeSet<>();
@@ -39,18 +39,17 @@ public void excludePath(String relativePath) {
 		excludePaths.add(Objects.requireNonNull(relativePath));
 	}
 
-	@Override
 	public void handleError(Throwable e, FormatterStep step, String relativePath) {
 		Objects.requireNonNull(e, "e");
 		Objects.requireNonNull(step, "step");
 		Objects.requireNonNull(relativePath, "relativePath");
 		if (excludeSteps.contains(step.getName())) {
-			FormatExceptionPolicyLegacy.warning(e, step, relativePath);
+			LintPolicy.warning(e, step, relativePath);
 		} else {
 			if (excludePaths.contains(relativePath)) {
-				FormatExceptionPolicyLegacy.warning(e, step, relativePath);
+				LintPolicy.warning(e, step, relativePath);
 			} else {
-				FormatExceptionPolicyLegacy.error(e, step, relativePath);
+				LintPolicy.error(e, step, relativePath);
 				throw ThrowingEx.asRuntimeRethrowError(e);
 			}
 		}
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatExceptionPolicyLegacy.java b/lib/src/main/java/com/diffplug/spotless/LintPolicy.java
similarity index 71%
rename from lib/src/main/java/com/diffplug/spotless/FormatExceptionPolicyLegacy.java
rename to lib/src/main/java/com/diffplug/spotless/LintPolicy.java
index 93ca5d05b6..d4477bd822 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatExceptionPolicyLegacy.java
+++ b/lib/src/main/java/com/diffplug/spotless/LintPolicy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,21 +18,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-class FormatExceptionPolicyLegacy extends NoLambda.EqualityBasedOnSerialization implements FormatExceptionPolicy {
-	private static final long serialVersionUID = 1L;
-
+class LintPolicy {
 	private static final Logger logger = LoggerFactory.getLogger(Formatter.class);
 
-	@Override
-	public void handleError(Throwable e, FormatterStep step, String relativePath) {
-		if (e instanceof Error) {
-			error(e, step, relativePath);
-			throw ((Error) e);
-		} else {
-			warning(e, step, relativePath);
-		}
-	}
-
 	static void error(Throwable e, FormatterStep step, String relativePath) {
 		logger.error("Step '{}' found problem in '{}':\n{}", step.getName(), relativePath, e.getMessage(), e);
 	}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
index 19d81eb947..881e266eed 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
@@ -37,7 +37,6 @@
 import org.gradle.api.tasks.PathSensitivity;
 import org.gradle.work.Incremental;
 
-import com.diffplug.spotless.FormatExceptionPolicy;
 import com.diffplug.spotless.FormatExceptionPolicyStrict;
 import com.diffplug.spotless.Formatter;
 import com.diffplug.spotless.FormatterStep;
@@ -115,14 +114,14 @@ public ObjectId getRatchetSha() {
 		return subtreeSha;
 	}
 
-	protected FormatExceptionPolicy exceptionPolicy = new FormatExceptionPolicyStrict();
+	protected FormatExceptionPolicyStrict exceptionPolicy = new FormatExceptionPolicyStrict();
 
-	public void setExceptionPolicy(FormatExceptionPolicy exceptionPolicy) {
+	public void setExceptionPolicy(FormatExceptionPolicyStrict exceptionPolicy) {
 		this.exceptionPolicy = Objects.requireNonNull(exceptionPolicy);
 	}
 
 	@Input
-	public FormatExceptionPolicy getExceptionPolicy() {
+	public FormatExceptionPolicyStrict getExceptionPolicy() {
 		return exceptionPolicy;
 	}
 

From b01e9e902031b86e72272dc2cd320df37b4d0126 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 30 May 2024 16:24:03 -0700
Subject: [PATCH 1676/2068] Rename `ExceptionPerStep` to `ValuePerStep`, and
 bring `Formatter` closer to the old behavior.

---
 .../diffplug/spotless/ExceptionPerStep.java   | 101 ------------------
 .../java/com/diffplug/spotless/Formatter.java |  13 ++-
 .../com/diffplug/spotless/ValuePerStep.java   |  93 ++++++++++++++++
 3 files changed, 101 insertions(+), 106 deletions(-)
 delete mode 100644 lib/src/main/java/com/diffplug/spotless/ExceptionPerStep.java
 create mode 100644 lib/src/main/java/com/diffplug/spotless/ValuePerStep.java

diff --git a/lib/src/main/java/com/diffplug/spotless/ExceptionPerStep.java b/lib/src/main/java/com/diffplug/spotless/ExceptionPerStep.java
deleted file mode 100644
index 7bf7fe2011..0000000000
--- a/lib/src/main/java/com/diffplug/spotless/ExceptionPerStep.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright 2024 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless;
-
-import java.util.AbstractList;
-
-import javax.annotation.Nullable;
-
-/**
- * Fixed-size list which maintains a list of exceptions, one per step of the formatter.
- * Usually this list will be empty or have only a single value, so it is optimized for stack allocation in those cases.
- */
-class ExceptionPerStep extends AbstractList<Throwable> {
-	private final int size;
-	private @Nullable Throwable exception;
-	private int exceptionIdx;
-	private @Nullable Throwable[] multipleExceptions = null;
-
-	ExceptionPerStep(Formatter formatter) {
-		this.size = formatter.getSteps().size();
-	}
-
-	@Override
-	public @Nullable Throwable set(int index, Throwable exception) {
-		if (index < 0 || index >= size) {
-			throw new IndexOutOfBoundsException("Index: " + index + ", Size: " + size);
-		}
-		if (this.exception == null) {
-			this.exceptionIdx = index;
-			this.exception = exception;
-			return null;
-		} else if (this.multipleExceptions != null) {
-			Throwable previousValue = multipleExceptions[index];
-			multipleExceptions[index] = exception;
-			return previousValue;
-		} else {
-			if (index == exceptionIdx) {
-				Throwable previousValue = this.exception;
-				this.exception = exception;
-				return previousValue;
-			} else {
-				multipleExceptions = new Throwable[size];
-				multipleExceptions[exceptionIdx] = this.exception;
-				multipleExceptions[index] = exception;
-				return null;
-			}
-		}
-	}
-
-	@Override
-	public Throwable get(int index) {
-		if (multipleExceptions != null) {
-			return multipleExceptions[index];
-		} else if (exceptionIdx == index) {
-			return exception;
-		} else {
-			return null;
-		}
-	}
-
-	private int indexOfFirstException() {
-		if (multipleExceptions != null) {
-			for (int i = 0; i < multipleExceptions.length; i++) {
-				if (multipleExceptions[i] != null) {
-					return i;
-				}
-			}
-			return -1;
-		} else if (exception != null) {
-			return exceptionIdx;
-		} else {
-			return -1;
-		}
-	}
-
-	@Override
-	public int size() {
-		return size;
-	}
-
-	/** Rethrows the first exception in the list. */
-	public void rethrowFirstIfPresent() {
-		int firstException = indexOfFirstException();
-		if (firstException != -1) {
-			throw ThrowingEx.asRuntimeRethrowError(get(firstException));
-		}
-	}
-}
diff --git a/lib/src/main/java/com/diffplug/spotless/Formatter.java b/lib/src/main/java/com/diffplug/spotless/Formatter.java
index 5db20942f5..0159d147e6 100644
--- a/lib/src/main/java/com/diffplug/spotless/Formatter.java
+++ b/lib/src/main/java/com/diffplug/spotless/Formatter.java
@@ -128,9 +128,13 @@ public String computeLineEndings(String unix, File file) {
 	 * is guaranteed to also have unix line endings.
 	 */
 	public String compute(String unix, File file) {
-		ExceptionPerStep exceptionPerStep = new ExceptionPerStep(this);
+		ValuePerStep<Throwable> exceptionPerStep = new ValuePerStep<>(this);
 		String result = compute(unix, file, exceptionPerStep);
-		exceptionPerStep.rethrowFirstIfPresent();
+		int firstExceptionIndex = exceptionPerStep.indexOfFirstValue();
+		if (firstExceptionIndex != -1) {
+			LintPolicy.error(exceptionPerStep.get(firstExceptionIndex), steps.get(firstExceptionIndex), file.getAbsolutePath());
+			throw ThrowingEx.asRuntimeRethrowError(exceptionPerStep.get(firstExceptionIndex));
+		}
 		return result;
 	}
 
@@ -142,7 +146,7 @@ public String compute(String unix, File file) {
 	 * is guaranteed to also have unix line endings.
 	 * <p>
 	 */
-	String compute(String unix, File file, ExceptionPerStep exceptionPerStep) {
+	String compute(String unix, File file, ValuePerStep<Throwable> exceptionPerStep) {
 		Objects.requireNonNull(unix, "unix");
 		Objects.requireNonNull(file, "file");
 
@@ -159,9 +163,8 @@ String compute(String unix, File file, ExceptionPerStep exceptionPerStep) {
 					unix = LineEnding.toUnix(formatted);
 				}
 			} catch (Throwable e) {
-				// store the exception which was thrown, and stop execution so we don't alter line numbers
+				// store the exception which was thrown and keep going
 				exceptionPerStep.set(iter.previousIndex(), e);
-				return unix;
 			}
 		}
 		return unix;
diff --git a/lib/src/main/java/com/diffplug/spotless/ValuePerStep.java b/lib/src/main/java/com/diffplug/spotless/ValuePerStep.java
new file mode 100644
index 0000000000..cfc40337b5
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/ValuePerStep.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless;
+
+import java.util.AbstractList;
+
+import javax.annotation.Nullable;
+
+/**
+ * Fixed-size list which maintains a list of exceptions, one per step of the formatter.
+ * Usually this list will be empty or have only a single value, so it is optimized for stack allocation in those cases.
+ */
+class ValuePerStep<T> extends AbstractList<T> {
+	private final int size;
+	private @Nullable T value;
+	private int valueIdx;
+	private @Nullable Object[] multipleValues = null;
+
+	ValuePerStep(Formatter formatter) {
+		this.size = formatter.getSteps().size();
+	}
+
+	@Override
+	public @Nullable T set(int index, T exception) {
+		if (index < 0 || index >= size) {
+			throw new IndexOutOfBoundsException("Index: " + index + ", Size: " + size);
+		}
+		if (this.value == null) {
+			this.valueIdx = index;
+			this.value = exception;
+			return null;
+		} else if (this.multipleValues != null) {
+			T previousValue = (T) multipleValues[index];
+			multipleValues[index] = exception;
+			return previousValue;
+		} else {
+			if (index == valueIdx) {
+				T previousValue = this.value;
+				this.value = exception;
+				return previousValue;
+			} else {
+				multipleValues = new Object[size];
+				multipleValues[valueIdx] = this.value;
+				multipleValues[index] = exception;
+				return null;
+			}
+		}
+	}
+
+	@Override
+	public T get(int index) {
+		if (multipleValues != null) {
+			return (T) multipleValues[index];
+		} else if (valueIdx == index) {
+			return value;
+		} else {
+			return null;
+		}
+	}
+
+	public int indexOfFirstValue() {
+		if (multipleValues != null) {
+			for (int i = 0; i < multipleValues.length; i++) {
+				if (multipleValues[i] != null) {
+					return i;
+				}
+			}
+			return -1;
+		} else if (value != null) {
+			return valueIdx;
+		} else {
+			return -1;
+		}
+	}
+
+	@Override
+	public int size() {
+		return size;
+	}
+}

From fe92d05135e0796b89c4d8193a7bfc3be272f7ee Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 30 May 2024 18:15:47 -0700
Subject: [PATCH 1677/2068] Update `Formatter` and `ValuePerStep` so that
 something (perhaps null) gets stored into every slot of `ValuePerStep` per
 invocation.

---
 .../java/com/diffplug/spotless/Formatter.java | 36 ++++++++++++-------
 .../com/diffplug/spotless/ValuePerStep.java   |  3 ++
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/Formatter.java b/lib/src/main/java/com/diffplug/spotless/Formatter.java
index 0159d147e6..bbb5b85f6e 100644
--- a/lib/src/main/java/com/diffplug/spotless/Formatter.java
+++ b/lib/src/main/java/com/diffplug/spotless/Formatter.java
@@ -26,7 +26,6 @@
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.ListIterator;
 import java.util.Objects;
 
 /** Formatter which performs the full formatting. */
@@ -129,11 +128,13 @@ public String computeLineEndings(String unix, File file) {
 	 */
 	public String compute(String unix, File file) {
 		ValuePerStep<Throwable> exceptionPerStep = new ValuePerStep<>(this);
-		String result = compute(unix, file, exceptionPerStep);
-		int firstExceptionIndex = exceptionPerStep.indexOfFirstValue();
-		if (firstExceptionIndex != -1) {
-			LintPolicy.error(exceptionPerStep.get(firstExceptionIndex), steps.get(firstExceptionIndex), file.getAbsolutePath());
-			throw ThrowingEx.asRuntimeRethrowError(exceptionPerStep.get(firstExceptionIndex));
+		String result = computeWithLint(unix, file, exceptionPerStep);
+		for (int i = 0; i < steps.size(); ++i) {
+			Throwable exception = exceptionPerStep.get(i);
+			if (exception != null && exception != LintState.formatStepCausedNoChange()) {
+				LintPolicy.error(exception, steps.get(i), file.getAbsolutePath());
+				throw ThrowingEx.asRuntimeRethrowError(exception);
+			}
 		}
 		return result;
 	}
@@ -145,27 +146,38 @@ public String compute(String unix, File file) {
 	 * The input must have unix line endings, and the output
 	 * is guaranteed to also have unix line endings.
 	 * <p>
+	 * It doesn't matter what is inside `ValuePerStep`, the value at every index will be overwritten
+	 * when the method returns.
 	 */
-	String compute(String unix, File file, ValuePerStep<Throwable> exceptionPerStep) {
+	String computeWithLint(String unix, File file, ValuePerStep<Throwable> exceptionPerStep) {
 		Objects.requireNonNull(unix, "unix");
 		Objects.requireNonNull(file, "file");
 
-		ListIterator<FormatterStep> iter = steps.listIterator();
-		while (iter.hasNext()) {
+		for (int i = 0; i < steps.size(); ++i) {
+			FormatterStep step = steps.get(i);
+			Throwable storeForStep;
 			try {
-				String formatted = iter.next().format(unix, file);
+				String formatted = step.format(unix, file);
 				if (formatted == null) {
 					// This probably means it was a step that only checks
 					// for errors and doesn't actually have any fixes.
 					// No exception was thrown so we can just continue.
+					storeForStep = LintState.formatStepCausedNoChange();
 				} else {
 					// Should already be unix-only, but some steps might misbehave.
-					unix = LineEnding.toUnix(formatted);
+					String clean = LineEnding.toUnix(formatted);
+					if (clean.equals(unix)) {
+						storeForStep = LintState.formatStepCausedNoChange();
+					} else {
+						storeForStep = null;
+						unix = LineEnding.toUnix(formatted);
+					}
 				}
 			} catch (Throwable e) {
 				// store the exception which was thrown and keep going
-				exceptionPerStep.set(iter.previousIndex(), e);
+				storeForStep = e;
 			}
+			exceptionPerStep.set(i, storeForStep);
 		}
 		return unix;
 	}
diff --git a/lib/src/main/java/com/diffplug/spotless/ValuePerStep.java b/lib/src/main/java/com/diffplug/spotless/ValuePerStep.java
index cfc40337b5..653a8f0400 100644
--- a/lib/src/main/java/com/diffplug/spotless/ValuePerStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/ValuePerStep.java
@@ -51,6 +51,9 @@ class ValuePerStep<T> extends AbstractList<T> {
 				T previousValue = this.value;
 				this.value = exception;
 				return previousValue;
+			} else if (value == null) {
+				// everything is assumed null anyway so we don't need to do anything
+				return null;
 			} else {
 				multipleValues = new Object[size];
 				multipleValues[valueIdx] = this.value;

From f3be100afdf6c342bbbadbff0aa55f9c92df4c27 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 30 May 2024 18:34:03 -0700
Subject: [PATCH 1678/2068] Introduce LintState which efficiently reads lint
 data from both `format` calls and `lint` calls.

---
 .../com/diffplug/spotless/DirtyState.java     |  19 ++-
 .../java/com/diffplug/spotless/LintState.java | 135 ++++++++++++++++++
 .../com/diffplug/spotless/PaddedCell.java     |  20 +--
 3 files changed, 159 insertions(+), 15 deletions(-)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/LintState.java

diff --git a/lib/src/main/java/com/diffplug/spotless/DirtyState.java b/lib/src/main/java/com/diffplug/spotless/DirtyState.java
index 3d133927c6..058147535e 100644
--- a/lib/src/main/java/com/diffplug/spotless/DirtyState.java
+++ b/lib/src/main/java/com/diffplug/spotless/DirtyState.java
@@ -46,7 +46,7 @@ public boolean didNotConverge() {
 		return this == didNotConverge;
 	}
 
-	private byte[] canonicalBytes() {
+	byte[] canonicalBytes() {
 		if (canonicalBytes == null) {
 			throw new IllegalStateException("First make sure that {@code !isClean()} and {@code !didNotConverge()}");
 		}
@@ -81,7 +81,7 @@ public static class Calculation {
 		private final Formatter formatter;
 		private final File file;
 		private final byte[] rawBytes;
-		private final String raw;
+		final String raw;
 
 		private Calculation(Formatter formatter, File file, byte[] rawBytes) {
 			this.formatter = formatter;
@@ -101,10 +101,19 @@ private Calculation(Formatter formatter, File file, byte[] rawBytes) {
 		 * due to diverging idempotence.
 		 */
 		public DirtyState calculateDirtyState() {
+			return calculateDirtyState(new ValuePerStep<>(formatter));
+		}
+
+		/**
+		 * Calculates whether the given file is dirty according to a PaddedCell invocation of the given formatter.
+		 * DirtyState includes the clean state of the file, as well as a warning if we were not able to apply the formatter
+		 * due to diverging idempotence.
+		 */
+		DirtyState calculateDirtyState(ValuePerStep<Throwable> exceptionPerStep) {
 			String rawUnix = LineEnding.toUnix(raw);
 
 			// enforce the format
-			String formattedUnix = formatter.compute(rawUnix, file);
+			String formattedUnix = formatter.computeWithLint(rawUnix, file, exceptionPerStep);
 			// convert the line endings if necessary
 			String formatted = formatter.computeLineEndings(formattedUnix, file);
 
@@ -115,13 +124,13 @@ public DirtyState calculateDirtyState() {
 			}
 
 			// F(input) != input, so we'll do a padded check
-			String doubleFormattedUnix = formatter.compute(formattedUnix, file);
+			String doubleFormattedUnix = formatter.computeWithLint(formattedUnix, file, exceptionPerStep);
 			if (doubleFormattedUnix.equals(formattedUnix)) {
 				// most dirty files are idempotent-dirty, so this is a quick-short circuit for that common case
 				return new DirtyState(formattedBytes);
 			}
 
-			PaddedCell cell = PaddedCell.check(formatter, file, rawUnix);
+			PaddedCell cell = PaddedCell.check(formatter, file, rawUnix, exceptionPerStep);
 			if (!cell.isResolvable()) {
 				return didNotConverge;
 			}
diff --git a/lib/src/main/java/com/diffplug/spotless/LintState.java b/lib/src/main/java/com/diffplug/spotless/LintState.java
new file mode 100644
index 0000000000..8a6a8b2544
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/LintState.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Nullable;
+
+public class LintState {
+	private final DirtyState dirtyState;
+	private final @Nullable List<List<Lint>> lintsPerStep;
+
+	private LintState(DirtyState dirtyState, @Nullable List<List<Lint>> lintsPerStep) {
+		this.dirtyState = dirtyState;
+		this.lintsPerStep = lintsPerStep;
+	}
+
+	public DirtyState getDirtyState() {
+		return dirtyState;
+	}
+
+	public boolean isHasLints() {
+		return lintsPerStep != null;
+	}
+
+	public Map<FormatterStep, List<Lint>> getLints(Formatter formatter) {
+		if (lintsPerStep == null) {
+			throw new IllegalStateException("Check `isHasLints` first!");
+		}
+		if (lintsPerStep.size() != formatter.getSteps().size()) {
+			throw new IllegalStateException("LintState was created with a different formatter!");
+		}
+		Map<FormatterStep, List<Lint>> result = new LinkedHashMap<>();
+		for (int i = 0; i < lintsPerStep.size(); i++) {
+			List<Lint> lints = lintsPerStep.get(i);
+			if (lints != null) {
+				result.put(formatter.getSteps().get(i), lints);
+			}
+		}
+		return result;
+	}
+
+	public static LintState of(Formatter formatter, File file) throws IOException {
+		return of(formatter, file, Files.readAllBytes(file.toPath()));
+	}
+
+	public static LintState of(Formatter formatter, File file, byte[] rawBytes) {
+		var exceptions = new ValuePerStep<Throwable>(formatter);
+		var dirtyCalculation = DirtyState.of(formatter, file, rawBytes);
+		var dirty = dirtyCalculation.calculateDirtyState(exceptions);
+
+		String toLint = LineEnding.toUnix(dirty.isClean() || dirty.didNotConverge() ? dirtyCalculation.raw : new String(dirty.canonicalBytes(), formatter.getEncoding()));
+
+		var lints = new ValuePerStep<List<Lint>>(formatter);
+		// if a step did not throw an exception, then it gets to check for lints if it wants
+		for (int i = 0; i < formatter.getSteps().size(); i++) {
+			FormatterStep step = formatter.getSteps().get(i);
+			Throwable exception = exceptions.get(i);
+			if (exception == null || exception == formatStepCausedNoChange()) {
+				try {
+					var lintsForStep = step.lint(toLint, file);
+					if (lintsForStep != null && !lintsForStep.isEmpty()) {
+						lints.set(i, lintsForStep);
+					}
+				} catch (Exception e) {
+					lints.set(i, List.of(Lint.createFromThrowable(step, toLint, e)));
+				}
+			}
+		}
+		// for steps that did throw an exception, we will turn those into lints
+		// we try to reuse the exception if possible, but that is only possible if other steps
+		// didn't change the formatted value. so we start at the end, and note when the string
+		// gets changed by a step. if it does, we rerun the steps to get an exception with accurate line numbers.
+		boolean nothingHasChangedSinceLast = true;
+		for (int i = formatter.getSteps().size() - 1; i >= 0; i--) {
+			FormatterStep step = formatter.getSteps().get(i);
+			Throwable exception = exceptions.get(i);
+			if (exception != null && exception != formatStepCausedNoChange()) {
+				nothingHasChangedSinceLast = false;
+			}
+			Throwable exceptionForLint;
+			if (nothingHasChangedSinceLast) {
+				exceptionForLint = exceptions.get(i);
+			} else {
+				// steps changed the content, so we need to rerun to get an exception with accurate line numbers
+				try {
+					step.format(toLint, file);
+					exceptionForLint = null; // the exception "went away" because it got fixed by a later step
+				} catch (Throwable e) {
+					exceptionForLint = e;
+				}
+			}
+			List<Lint> lintsForStep;
+			if (exceptionForLint instanceof Lint.Has) {
+				lintsForStep = ((Lint.Has) exceptionForLint).getLints();
+			} else if (exceptionForLint != null) {
+				lintsForStep = List.of(Lint.createFromThrowable(step, toLint, exceptionForLint));
+			} else {
+				lintsForStep = List.of();
+			}
+			if (!lintsForStep.isEmpty()) {
+				lints.set(i, lintsForStep);
+			}
+		}
+		return new LintState(dirty, lints.indexOfFirstValue() == -1 ? null : lints);
+	}
+
+	static Throwable formatStepCausedNoChange() {
+		return FormatterCausedNoChange.INSTANCE;
+	}
+
+	private static class FormatterCausedNoChange extends Exception {
+		private static final long serialVersionUID = 1L;
+
+		static final FormatterCausedNoChange INSTANCE = new FormatterCausedNoChange();
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/PaddedCell.java b/lib/src/main/java/com/diffplug/spotless/PaddedCell.java
index b0cb64ae90..5ec7ef1cad 100644
--- a/lib/src/main/java/com/diffplug/spotless/PaddedCell.java
+++ b/lib/src/main/java/com/diffplug/spotless/PaddedCell.java
@@ -86,29 +86,29 @@ public static PaddedCell check(Formatter formatter, File file) {
 		byte[] rawBytes = ThrowingEx.get(() -> Files.readAllBytes(file.toPath()));
 		String raw = new String(rawBytes, formatter.getEncoding());
 		String original = LineEnding.toUnix(raw);
-		return check(formatter, file, original, MAX_CYCLE);
+		return check(formatter, file, original, MAX_CYCLE, new ValuePerStep<>(formatter));
 	}
 
 	public static PaddedCell check(Formatter formatter, File file, String originalUnix) {
-		return check(
-				Objects.requireNonNull(formatter, "formatter"),
-				Objects.requireNonNull(file, "file"),
-				Objects.requireNonNull(originalUnix, "originalUnix"),
-				MAX_CYCLE);
+		return check(formatter, file, originalUnix, new ValuePerStep<>(formatter));
+	}
+
+	public static PaddedCell check(Formatter formatter, File file, String originalUnix, ValuePerStep<Throwable> exceptionPerStep) {
+		return check(formatter, file, originalUnix, MAX_CYCLE, exceptionPerStep);
 	}
 
 	private static final int MAX_CYCLE = 10;
 
-	private static PaddedCell check(Formatter formatter, File file, String original, int maxLength) {
+	private static PaddedCell check(Formatter formatter, File file, String original, int maxLength, ValuePerStep<Throwable> exceptionPerStep) {
 		if (maxLength < 2) {
 			throw new IllegalArgumentException("maxLength must be at least 2");
 		}
-		String appliedOnce = formatter.compute(original, file);
+		String appliedOnce = formatter.computeWithLint(original, file, exceptionPerStep);
 		if (appliedOnce.equals(original)) {
 			return Type.CONVERGE.create(file, Collections.singletonList(appliedOnce));
 		}
 
-		String appliedTwice = formatter.compute(appliedOnce, file);
+		String appliedTwice = formatter.computeWithLint(appliedOnce, file, exceptionPerStep);
 		if (appliedOnce.equals(appliedTwice)) {
 			return Type.CONVERGE.create(file, Collections.singletonList(appliedOnce));
 		}
@@ -118,7 +118,7 @@ private static PaddedCell check(Formatter formatter, File file, String original,
 		appliedN.add(appliedTwice);
 		String input = appliedTwice;
 		while (appliedN.size() < maxLength) {
-			String output = formatter.compute(input, file);
+			String output = formatter.computeWithLint(input, file, exceptionPerStep);
 			if (output.equals(input)) {
 				return Type.CONVERGE.create(file, appliedN);
 			} else {

From 5c424579c8f3cf125fd34f3c1895f279b4c84200 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 30 May 2024 18:41:59 -0700
Subject: [PATCH 1679/2068] Restore the "legacy" error printing for both
 `Formatter` and `DirtyState`.

---
 .../main/java/com/diffplug/spotless/DirtyState.java  |  5 ++++-
 .../main/java/com/diffplug/spotless/Formatter.java   |  8 +-------
 .../main/java/com/diffplug/spotless/LintPolicy.java  | 12 ++++++++++++
 .../gradle/spotless/BiomeIntegrationTest.java        |  5 -----
 .../gradle/spotless/ErrorShouldRethrowTest.java      |  6 ++++--
 .../gradle/spotless/KotlinExtensionTest.java         |  5 -----
 .../spotless/maven/biome/BiomeMavenTest.java         |  4 ----
 7 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/DirtyState.java b/lib/src/main/java/com/diffplug/spotless/DirtyState.java
index 058147535e..fbbbc284b4 100644
--- a/lib/src/main/java/com/diffplug/spotless/DirtyState.java
+++ b/lib/src/main/java/com/diffplug/spotless/DirtyState.java
@@ -101,7 +101,10 @@ private Calculation(Formatter formatter, File file, byte[] rawBytes) {
 		 * due to diverging idempotence.
 		 */
 		public DirtyState calculateDirtyState() {
-			return calculateDirtyState(new ValuePerStep<>(formatter));
+			ValuePerStep<Throwable> exceptionPerStep = new ValuePerStep<>(formatter);
+			DirtyState result = calculateDirtyState(exceptionPerStep);
+			LintPolicy.legacyBehavior(formatter, file, exceptionPerStep);
+			return result;
 		}
 
 		/**
diff --git a/lib/src/main/java/com/diffplug/spotless/Formatter.java b/lib/src/main/java/com/diffplug/spotless/Formatter.java
index bbb5b85f6e..5160f674c2 100644
--- a/lib/src/main/java/com/diffplug/spotless/Formatter.java
+++ b/lib/src/main/java/com/diffplug/spotless/Formatter.java
@@ -129,13 +129,7 @@ public String computeLineEndings(String unix, File file) {
 	public String compute(String unix, File file) {
 		ValuePerStep<Throwable> exceptionPerStep = new ValuePerStep<>(this);
 		String result = computeWithLint(unix, file, exceptionPerStep);
-		for (int i = 0; i < steps.size(); ++i) {
-			Throwable exception = exceptionPerStep.get(i);
-			if (exception != null && exception != LintState.formatStepCausedNoChange()) {
-				LintPolicy.error(exception, steps.get(i), file.getAbsolutePath());
-				throw ThrowingEx.asRuntimeRethrowError(exception);
-			}
-		}
+		LintPolicy.legacyBehavior(this, file, exceptionPerStep);
 		return result;
 	}
 
diff --git a/lib/src/main/java/com/diffplug/spotless/LintPolicy.java b/lib/src/main/java/com/diffplug/spotless/LintPolicy.java
index d4477bd822..0b28c36884 100644
--- a/lib/src/main/java/com/diffplug/spotless/LintPolicy.java
+++ b/lib/src/main/java/com/diffplug/spotless/LintPolicy.java
@@ -15,6 +15,8 @@
  */
 package com.diffplug.spotless;
 
+import java.io.File;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -28,4 +30,14 @@ static void error(Throwable e, FormatterStep step, String relativePath) {
 	static void warning(Throwable e, FormatterStep step, String relativePath) {
 		logger.warn("Unable to apply step '{}' to '{}'", step.getName(), relativePath, e);
 	}
+
+	static void legacyBehavior(Formatter formatter, File file, ValuePerStep<Throwable> exceptionPerStep) {
+		for (int i = 0; i < formatter.getSteps().size(); ++i) {
+			Throwable exception = exceptionPerStep.get(i);
+			if (exception != null && exception != LintState.formatStepCausedNoChange()) {
+				LintPolicy.error(exception, formatter.getSteps().get(i), file.getName());
+				throw ThrowingEx.asRuntimeRethrowError(exception);
+			}
+		}
+	}
 }
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java
index aff28664c5..ba39af1705 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java
@@ -21,12 +21,9 @@
 
 import java.io.IOException;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.owasp.encoder.Encode;
 
-import com.diffplug.spotless.tag.ForLintRefactor;
-
 class BiomeIntegrationTest extends GradleIntegrationHarness {
 	/**
 	 * Tests that biome can be used as a generic formatting step.
@@ -323,8 +320,6 @@ void failureWhenExeNotFound() throws Exception {
 	 * @throws Exception When a test failure occurs.
 	 */
 	@Test
-	@Disabled
-	@ForLintRefactor
 	void failureWhenNotParseable() throws Exception {
 		setFile("build.gradle").toLines(
 				"plugins {",
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrowTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrowTest.java
index d8e9cbd2fa..5dd435fd1a 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrowTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrowTest.java
@@ -32,8 +32,6 @@
 import com.diffplug.spotless.tag.ForLintRefactor;
 
 /** Tests the desired behavior from https://github.com/diffplug/spotless/issues/46. */
-@Disabled
-@ForLintRefactor
 class ErrorShouldRethrowTest extends GradleIntegrationHarness {
 	private void writeBuild(String... toInsert) throws IOException {
 		List<String> lines = new ArrayList<>();
@@ -86,6 +84,8 @@ void unlessEnforceCheckIsFalse() throws Exception {
 		runWithSuccess("> Task :processResources NO-SOURCE");
 	}
 
+	@Disabled
+	@ForLintRefactor
 	@Test
 	void unlessExemptedByStep() throws Exception {
 		writeBuild(
@@ -97,6 +97,8 @@ void unlessExemptedByStep() throws Exception {
 				"Unable to apply step 'no swearing' to 'README.md'");
 	}
 
+	@Disabled
+	@ForLintRefactor
 	@Test
 	void unlessExemptedByPath() throws Exception {
 		writeBuild(
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
index aa82c371f3..cf8f9cc739 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
@@ -20,11 +20,8 @@
 import java.io.File;
 import java.io.IOException;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-import com.diffplug.spotless.tag.ForLintRefactor;
-
 class KotlinExtensionTest extends GradleIntegrationHarness {
 	private static final String HEADER = "// License Header";
 	private static final String HEADER_WITH_YEAR = "// License Header $YEAR";
@@ -150,8 +147,6 @@ void testSetEditorConfigCanOverrideEditorConfigFile() throws IOException {
 	}
 
 	@Test
-	@Disabled
-	@ForLintRefactor
 	void withCustomRuleSetApply() throws IOException {
 		setFile("build.gradle.kts").toLines(
 				"plugins {",
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/biome/BiomeMavenTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/biome/BiomeMavenTest.java
index 24ce1d09b7..ff763c3cf8 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/biome/BiomeMavenTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/biome/BiomeMavenTest.java
@@ -20,11 +20,9 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.owasp.encoder.Encode.forXml;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
-import com.diffplug.spotless.tag.ForLintRefactor;
 
 class BiomeMavenTest extends MavenIntegrationHarness {
 	/**
@@ -192,8 +190,6 @@ void failureWhenExeNotFound() throws Exception {
 	 * @throws Exception When a test failure occurs.
 	 */
 	@Test
-	@Disabled
-	@ForLintRefactor
 	void failureWhenNotParseable() throws Exception {
 		writePomWithBiomeSteps("**/*.js", "<biome><version>1.2.0</version><language>json</language></biome>");
 		setFile("biome_test.js").toResource("biome/js/fileBefore.js");

From 2effcbda9f0bb8e5d2cd6fcc60740f5f44b1aa62 Mon Sep 17 00:00:00 2001
From: OlivierGenez <olivier@genez.name>
Date: Fri, 31 May 2024 23:11:47 +1000
Subject: [PATCH 1680/2068] Fix CHANGES.md files links

Co-authored-by: Zongle Wang <wangzongler@gmail.com>
---
 CHANGES.md               | 2 +-
 plugin-gradle/CHANGES.md | 2 +-
 plugin-maven/CHANGES.md  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index e7b4594edc..c0d6abde75 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -14,7 +14,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * `FileSignature.Promised` and `JarState.Promised` to facilitate round-trip serialization for the Gradle configuration cache. ([#1945](https://github.com/diffplug/spotless/pull/1945)) 
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
 ### Fixed
-* Check if ktlint_code_style is set in .editorconfig before overriding it ([#2142])
+* Check if ktlint_code_style is set in .editorconfig before overriding it ([#2143](https://github.com/diffplug/spotless/issues/2143))
 * Ignore system git config when running tests ([#1990](https://github.com/diffplug/spotless/issues/1990))
 * Correctly provide EditorConfig property types for Ktlint ([#2052](https://github.com/diffplug/spotless/issues/2052))
 * Made ShadowCopy (`npmInstallCache`) more robust by re-creating the cache dir if it goes missing ([#1984](https://github.com/diffplug/spotless/issues/1984),[2096](https://github.com/diffplug/spotless/pull/2096))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index a55f78385d..e8d0461798 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -7,7 +7,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
 * Add support for formatting and sorting Maven POMs ([#2082](https://github.com/diffplug/spotless/issues/2082))
 ### Fixed
-* Check if ktlint_code_style is set in .editorconfig before overriding it ([#2142])
+* Check if ktlint_code_style is set in .editorconfig before overriding it ([#2143](https://github.com/diffplug/spotless/issues/2143))
 * Full no-asterisk support for configuration cache ([#2088](https://github.com/diffplug/spotless/pull/2088) closes [#1274](https://github.com/diffplug/spotless/issues/1274) and [#987](https://github.com/diffplug/spotless/issues/987)).
 * Ignore system git config when running tests ([#1990](https://github.com/diffplug/spotless/issues/1990))
 * Correctly provide EditorConfig property types for Ktlint ([#2052](https://github.com/diffplug/spotless/issues/2052))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 3d9da8349f..1308c36768 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -7,8 +7,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
 * Skip execution in M2E (incremental) builds by default ([#1814](https://github.com/diffplug/spotless/issues/1814), [#2037](https://github.com/diffplug/spotless/issues/2037))
 ### Fixed
-* Check if ktlint_code_style is set in .editorconfig before overriding it ([#2142])
-* Default EditorConfig path to ".editorconfig" [#2143]
+* Check if ktlint_code_style is set in .editorconfig before overriding it ([#2143](https://github.com/diffplug/spotless/issues/2143))
+* Default EditorConfig path to ".editorconfig" ([#2143](https://github.com/diffplug/spotless/issues/2143))
 * Ignore system git config when running tests ([#1990](https://github.com/diffplug/spotless/issues/1990))
 * Correctly provide EditorConfig property types for Ktlint ([#2052](https://github.com/diffplug/spotless/issues/2052))
 * Made ShadowCopy (`npmInstallCache`) more robust by re-creating the cache dir if it goes missing ([#1984](https://github.com/diffplug/spotless/issues/1984),[2096](https://github.com/diffplug/spotless/pull/2096))

From d467545ff597af3184cde7061d0b7a3bc5f504bc Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 31 May 2024 10:34:47 -0700
Subject: [PATCH 1681/2068] Fix spotbugs.

---
 .../java/com/diffplug/spotless/ValuePerStep.java    | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/ValuePerStep.java b/lib/src/main/java/com/diffplug/spotless/ValuePerStep.java
index 653a8f0400..314bdc7e60 100644
--- a/lib/src/main/java/com/diffplug/spotless/ValuePerStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/ValuePerStep.java
@@ -34,30 +34,27 @@ class ValuePerStep<T> extends AbstractList<T> {
 	}
 
 	@Override
-	public @Nullable T set(int index, T exception) {
+	public @Nullable T set(int index, T newValue) {
 		if (index < 0 || index >= size) {
 			throw new IndexOutOfBoundsException("Index: " + index + ", Size: " + size);
 		}
 		if (this.value == null) {
 			this.valueIdx = index;
-			this.value = exception;
+			this.value = newValue;
 			return null;
 		} else if (this.multipleValues != null) {
 			T previousValue = (T) multipleValues[index];
-			multipleValues[index] = exception;
+			multipleValues[index] = newValue;
 			return previousValue;
 		} else {
 			if (index == valueIdx) {
 				T previousValue = this.value;
-				this.value = exception;
+				this.value = newValue;
 				return previousValue;
-			} else if (value == null) {
-				// everything is assumed null anyway so we don't need to do anything
-				return null;
 			} else {
 				multipleValues = new Object[size];
 				multipleValues[valueIdx] = this.value;
-				multipleValues[index] = exception;
+				multipleValues[index] = newValue;
 				return null;
 			}
 		}

From 46ae8a2d25bd9168630602bb39208e74b12660e1 Mon Sep 17 00:00:00 2001
From: Megan Ketelaar <mketelaar@hubspot.com>
Date: Fri, 31 May 2024 13:54:07 -0400
Subject: [PATCH 1682/2068] Reimplement NPM caching to fix concurrency

---
 .../com/diffplug/spotless/npm/ShadowCopy.java | 96 +++++++++----------
 .../diffplug/spotless/npm/ShadowCopyTest.java | 17 ----
 2 files changed, 47 insertions(+), 66 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/ShadowCopy.java b/lib/src/main/java/com/diffplug/spotless/npm/ShadowCopy.java
index 0241d0cbcc..43019f09d4 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/ShadowCopy.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/ShadowCopy.java
@@ -17,6 +17,8 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.AtomicMoveNotSupportedException;
+import java.nio.file.DirectoryNotEmptyException;
 import java.nio.file.FileAlreadyExistsException;
 import java.nio.file.FileSystemException;
 import java.nio.file.FileVisitResult;
@@ -24,9 +26,8 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.SimpleFileVisitor;
+import java.nio.file.StandardCopyOption;
 import java.nio.file.attribute.BasicFileAttributes;
-import java.time.Duration;
-import java.util.concurrent.TimeoutException;
 import java.util.function.Supplier;
 
 import javax.annotation.Nonnull;
@@ -55,19 +56,47 @@ private File shadowCopyRoot() {
 	}
 
 	public void addEntry(String key, File orig) {
-		// prevent concurrent adding of entry with same key
-		if (!reserveSubFolder(key)) {
-			logger.debug("Shadow copy entry already in progress: {}. Awaiting finalization.", key);
+		File target = entry(key, orig.getName());
+		if (target.exists()) {
+			logger.debug("Shadow copy entry already exists, not overwriting: {}", key);
+		} else {
 			try {
-				NpmResourceHelper.awaitFileDeleted(markerFilePath(key).toFile(), Duration.ofSeconds(120));
-			} catch (TimeoutException e) {
-				throw new RuntimeException(e);
+				storeEntry(key, orig, target);
+			} catch (Throwable ex) {
+				// Log but don't fail
+				logger.warn("Unable to store cache entry for {}", key, ex);
 			}
 		}
+	}
+
+	private void storeEntry(String key, File orig, File target) throws IOException {
+		// Create a temp directory in the same directory as target
+		Files.createDirectories(target.toPath().getParent());
+		Path tempDirectory = Files.createTempDirectory(target.toPath().getParent(), key);
+		logger.debug("Will store entry {} to temporary directory {}, which is a sibling of the ultimate target {}", orig, tempDirectory, target);
+
 		try {
-			storeEntry(key, orig);
+			// Copy orig to temp dir
+			Files.walkFileTree(orig.toPath(), new CopyDirectoryRecursively(tempDirectory, orig.toPath()));
+			try {
+				logger.debug("Finished storing entry {}. Atomically moving temporary directory {} into final place {}", key, tempDirectory, target);
+				// Atomically rename the completed cache entry into place
+				Files.move(tempDirectory, target.toPath(), StandardCopyOption.ATOMIC_MOVE);
+			} catch (FileAlreadyExistsException | DirectoryNotEmptyException e) {
+				// Someone already beat us to it
+				logger.debug("Shadow copy entry now exists, not overwriting: {}", key);
+			} catch (AtomicMoveNotSupportedException e) {
+				logger.warn("The filesystem at {} does not support atomic moves. Spotless cannot safely cache on such a system due to race conditions. Caching has been skipped.", target.toPath().getParent(), e);
+			}
 		} finally {
-			cleanupReservation(key);
+			// Best effort to clean up
+			if (Files.exists(tempDirectory)) {
+				try {
+					Files.walkFileTree(tempDirectory, new DeleteDirectoryRecursively());
+				} catch (Throwable ex) {
+					logger.warn("Ignoring error while cleaning up temporary copy", ex);
+				}
+			}
 		}
 	}
 
@@ -75,42 +104,10 @@ public File getEntry(String key, String fileName) {
 		return entry(key, fileName);
 	}
 
-	private void storeEntry(String key, File orig) {
-		File target = entry(key, orig.getName());
-		if (target.exists()) {
-			logger.debug("Shadow copy entry already exists: {}", key);
-			// delete directory "target" recursively
-			// https://stackoverflow.com/questions/3775694/deleting-folder-from-java
-			ThrowingEx.run(() -> Files.walkFileTree(target.toPath(), new DeleteDirectoryRecursively()));
-		}
-		// copy directory "orig" to "target" using hard links if possible or a plain copy otherwise
-		ThrowingEx.run(() -> Files.walkFileTree(orig.toPath(), new CopyDirectoryRecursively(target, orig)));
-	}
-
-	private void cleanupReservation(String key) {
-		ThrowingEx.run(() -> Files.delete(markerFilePath(key)));
-	}
-
-	private Path markerFilePath(String key) {
-		return Paths.get(shadowCopyRoot().getAbsolutePath(), key + ".marker");
-	}
-
 	private File entry(String key, String origName) {
 		return Paths.get(shadowCopyRoot().getAbsolutePath(), key, origName).toFile();
 	}
 
-	private boolean reserveSubFolder(String key) {
-		// put a marker file named "key".marker in "shadowCopyRoot" to make sure no other process is using it or return false if it already exists
-		try {
-			Files.createFile(Paths.get(shadowCopyRoot().getAbsolutePath(), key + ".marker"));
-			return true;
-		} catch (FileAlreadyExistsException e) {
-			return false;
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
 	public File copyEntryInto(String key, String origName, File targetParentFolder) {
 		File target = Paths.get(targetParentFolder.getAbsolutePath(), origName).toFile();
 		if (target.exists()) {
@@ -118,7 +115,7 @@ public File copyEntryInto(String key, String origName, File targetParentFolder)
 			ThrowingEx.run(() -> Files.walkFileTree(target.toPath(), new DeleteDirectoryRecursively()));
 		}
 		// copy directory "orig" to "target" using hard links if possible or a plain copy otherwise
-		ThrowingEx.run(() -> Files.walkFileTree(entry(key, origName).toPath(), new CopyDirectoryRecursively(target, entry(key, origName))));
+		ThrowingEx.run(() -> Files.walkFileTree(entry(key, origName).toPath(), new CopyDirectoryRecursively(target.toPath(), entry(key, origName).toPath())));
 		return target;
 	}
 
@@ -127,12 +124,12 @@ public boolean entryExists(String key, String origName) {
 	}
 
 	private static class CopyDirectoryRecursively extends SimpleFileVisitor<Path> {
-		private final File target;
-		private final File orig;
+		private final Path target;
+		private final Path orig;
 
 		private boolean tryHardLink = true;
 
-		public CopyDirectoryRecursively(File target, File orig) {
+		public CopyDirectoryRecursively(Path target, Path orig) {
 			this.target = target;
 			this.orig = orig;
 		}
@@ -140,7 +137,7 @@ public CopyDirectoryRecursively(File target, File orig) {
 		@Override
 		public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
 			// create directory on target
-			Files.createDirectories(target.toPath().resolve(orig.toPath().relativize(dir)));
+			Files.createDirectories(target.resolve(orig.relativize(dir)));
 			return super.preVisitDirectory(dir, attrs);
 		}
 
@@ -149,7 +146,7 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO
 			// first try to hardlink, if that fails, copy
 			if (tryHardLink) {
 				try {
-					Files.createLink(target.toPath().resolve(orig.toPath().relativize(file)), file);
+					Files.createLink(target.resolve(orig.relativize(file)), file);
 					return super.visitFile(file, attrs);
 				} catch (UnsupportedOperationException | SecurityException | FileSystemException e) {
 					logger.debug("Shadow copy entry does not support hard links: {}. Switching to 'copy'.", file, e);
@@ -160,11 +157,12 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO
 				}
 			}
 			// copy file to target
-			Files.copy(file, target.toPath().resolve(orig.toPath().relativize(file)));
+			Files.copy(file, target.resolve(orig.relativize(file)));
 			return super.visitFile(file, attrs);
 		}
 	}
 
+	// https://stackoverflow.com/questions/3775694/deleting-folder-from-java
 	private static class DeleteDirectoryRecursively extends SimpleFileVisitor<Path> {
 		@Override
 		public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/ShadowCopyTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/ShadowCopyTest.java
index 297fa1d5bd..969095c2f0 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/ShadowCopyTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/ShadowCopyTest.java
@@ -96,23 +96,6 @@ void changingAFolderAfterAddingItDoesNotChangeTheShadowCopy() throws IOException
 		Assertions.assertThat(shadowCopy.listFiles()[0].getName()).isNotEqualTo(folderWithRandomFile.listFiles()[0].getName());
 	}
 
-	@Test
-	void addingTheSameEntryTwiceResultsInSecondEntryBeingRetained() throws IOException {
-		File folderWithRandomFile = newFolderWithRandomFile();
-		shadowCopy.addEntry("someEntry", folderWithRandomFile);
-
-		// now change the orig
-		Files.delete(folderWithRandomFile.listFiles()[0].toPath());
-		File newRandomFile = new File(folderWithRandomFile, "replacedFile.txt");
-		writeRandomStringOfLengthToFile(newRandomFile, 100);
-
-		// and then add the same entry with new content again and check that they now are the same again
-		shadowCopy.addEntry("someEntry", folderWithRandomFile);
-		File shadowCopyFile = shadowCopy.getEntry("someEntry", folderWithRandomFile.getName());
-		Assertions.assertThat(shadowCopyFile.listFiles()).hasSize(folderWithRandomFile.listFiles().length);
-		assertAllFilesAreEqualButNotSameAbsolutePath(folderWithRandomFile, shadowCopyFile);
-	}
-
 	@Test
 	void aFolderCanBeCopiedUsingShadowCopy() throws IOException {
 		File folderWithRandomFile = newFolderWithRandomFile();

From 94e22de569815f6894cc39698b9b03a5f3fce2e2 Mon Sep 17 00:00:00 2001
From: Megan Ketelaar <mketelaar@hubspot.com>
Date: Fri, 31 May 2024 14:37:55 -0400
Subject: [PATCH 1683/2068] Add CHANGES entries

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 1 +
 plugin-maven/CHANGES.md  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 04722f1c2b..8f54fef846 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -18,6 +18,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Correctly provide EditorConfig property types for Ktlint ([#2052](https://github.com/diffplug/spotless/issues/2052))
 * Made ShadowCopy (`npmInstallCache`) more robust by re-creating the cache dir if it goes missing ([#1984](https://github.com/diffplug/spotless/issues/1984),[2096](https://github.com/diffplug/spotless/pull/2096))
 * scalafmt.conf fileOverride section now works correctly ([#1854](https://github.com/diffplug/spotless/pull/1854))
+* Reworked ShadowCopy (`npmInstallCache`) to use atomic filesystem operations, resolving several race conditions that could arise ([#2151](https://github.com/diffplug/spotless/pull/2151))
 ### Changes
 * Bump default `cleanthat` version to latest `2.16` -> `2.20`. ([#1725](https://github.com/diffplug/spotless/pull/1725))
 * Bump default `gherkin-utils` version to latest `8.0.2` -> `9.0.0`. ([#1703](https://github.com/diffplug/spotless/pull/1703))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 99160a6011..6d09875fcd 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -15,6 +15,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Fixed memory leak introduced in 6.21.0 ([#2067](https://github.com/diffplug/spotless/issues/2067))
 * Made ShadowCopy (`npmInstallCache`) more robust by re-creating the cache dir if it goes missing ([#1984](https://github.com/diffplug/spotless/issues/1984),[2096](https://github.com/diffplug/spotless/pull/2096))
 * scalafmt.conf fileOverride section now works correctly ([#1854](https://github.com/diffplug/spotless/pull/1854))
+* Reworked ShadowCopy (`npmInstallCache`) to use atomic filesystem operations, resolving several race conditions that could arise ([#2151](https://github.com/diffplug/spotless/pull/2151))
 ### Changes
 * Bump default `cleanthat` version to latest `2.16` -> `2.20`. ([#1725](https://github.com/diffplug/spotless/pull/1725))
 * Bump default `gherkin-utils` version to latest `8.0.2` -> `9.0.0`. ([#1703](https://github.com/diffplug/spotless/pull/1703))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index f3ba81d5bd..8c67aaeed2 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -11,6 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Correctly provide EditorConfig property types for Ktlint ([#2052](https://github.com/diffplug/spotless/issues/2052))
 * Made ShadowCopy (`npmInstallCache`) more robust by re-creating the cache dir if it goes missing ([#1984](https://github.com/diffplug/spotless/issues/1984),[2096](https://github.com/diffplug/spotless/pull/2096))
 * scalafmt.conf fileOverride section now works correctly ([#1854](https://github.com/diffplug/spotless/pull/1854))
+* Reworked ShadowCopy (`npmInstallCache`) to use atomic filesystem operations, resolving several race conditions that could arise ([#2151](https://github.com/diffplug/spotless/pull/2151))
 ### Changes
 * Bump default `cleanthat` version to latest `2.16` -> `2.20`. ([#1725](https://github.com/diffplug/spotless/pull/1725))
 * Bump default `gherkin-utils` version to latest `8.0.2` -> `9.0.0`. ([#1703](https://github.com/diffplug/spotless/pull/1703))

From 4e1ab83788bc7f0bab917f6fa2db9bbd37a598a3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 31 May 2024 23:54:43 +0000
Subject: [PATCH 1684/2068] Update dependency gradle to v8.8

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 gradlew                                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b82aa23a4f..a4413138c9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 1aa94a4269..b740cf1339 100755
--- a/gradlew
+++ b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

From f33f8bebcf46c4f9518a7cfa1989e0b051ec4211 Mon Sep 17 00:00:00 2001
From: Olivier Genez <olivier.genez@gmail.com>
Date: Sat, 1 Jun 2024 11:29:33 +1000
Subject: [PATCH 1685/2068] Revert unneeded changes to KtlintTest

---
 .../diffplug/spotless/maven/kotlin/KtlintTest.java    | 11 ++---------
 ...xperimentalEditorConfigOverride.intellijIdea.clean |  5 -----
 2 files changed, 2 insertions(+), 14 deletions(-)
 delete mode 100644 testlib/src/main/resources/kotlin/ktlint/experimentalEditorConfigOverride.intellijIdea.clean

diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
index 0ad716dd35..5586335449 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
@@ -50,9 +50,9 @@ void testKtlintEditorConfigOverride() throws Exception {
 
 	@Test
 	void testReadCodeStyleFromEditorConfigFile() throws Exception {
-		setFile(".editorconfig").toResource("kotlin/ktlint/intellij_idea/.editorconfig");
+		setFile(".editorconfig").toResource("kotlin/ktlint/ktlint_official/.editorconfig");
 		writePomWithKotlinSteps("<ktlint/>");
-		checkIntellijIdeaStyle();
+		checkKtlintOfficialStyle();
 	}
 
 	@Test
@@ -98,11 +98,4 @@ private void checkKtlintOfficialStyle() throws Exception {
 		mavenRunner().withArguments("spotless:apply").runNoError();
 		assertFile(path).sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.ktlintOfficial.clean");
 	}
-
-	private void checkIntellijIdeaStyle() throws Exception {
-		String path = "src/main/kotlin/Main.kt";
-		setFile(path).toResource("kotlin/ktlint/experimentalEditorConfigOverride.dirty");
-		mavenRunner().withArguments("spotless:apply").runNoError();
-		assertFile(path).sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.intellijIdea.clean");
-	}
 }
diff --git a/testlib/src/main/resources/kotlin/ktlint/experimentalEditorConfigOverride.intellijIdea.clean b/testlib/src/main/resources/kotlin/ktlint/experimentalEditorConfigOverride.intellijIdea.clean
deleted file mode 100644
index 532177d038..0000000000
--- a/testlib/src/main/resources/kotlin/ktlint/experimentalEditorConfigOverride.intellijIdea.clean
+++ /dev/null
@@ -1,5 +0,0 @@
-fun main() {
-    val list = listOf(
-        "hello",
-    )
-}

From e07c7461e313853cc014b9f1c655889aef6cc82a Mon Sep 17 00:00:00 2001
From: azam <azamshul@gmail.com>
Date: Sat, 1 Jun 2024 17:52:16 +0900
Subject: [PATCH 1686/2068] Fix stdin pipe closed exception on Windows

---
 .../com/diffplug/spotless/ProcessRunner.java  |   1 -
 .../gradle/spotless/BufIntegrationTest.java   |  18 +-
 .../resources/protobuf/buf/buf_large.proto    | 229 ++++++++++++++++++
 .../protobuf/buf/buf_large.proto.clean        | 229 ++++++++++++++++++
 4 files changed, 475 insertions(+), 2 deletions(-)
 create mode 100644 testlib/src/main/resources/protobuf/buf/buf_large.proto
 create mode 100644 testlib/src/main/resources/protobuf/buf/buf_large.proto.clean

diff --git a/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java b/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
index 48307d7d3a..f110207e30 100644
--- a/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
+++ b/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
@@ -163,7 +163,6 @@ public LongRunningProcess start(@Nullable File cwd, @Nullable Map<String, String
 		}
 		// write stdin
 		process.getOutputStream().write(stdin);
-		process.getOutputStream().close();
 		return new LongRunningProcess(process, args, outputFut, errorFut);
 	}
 
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BufIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BufIntegrationTest.java
index b91512c7ed..be26cc8e71 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BufIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BufIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 DiffPlug
+ * Copyright 2022-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,22 @@
 
 @BufTest
 class BufIntegrationTest extends GradleIntegrationHarness {
+	@Test
+	void bufLarge() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"  id 'com.diffplug.spotless'",
+				"}",
+				"spotless {",
+				"  protobuf {",
+				"    buf()",
+				"  }",
+				"}");
+		setFile("buf.proto").toResource("protobuf/buf/buf_large.proto");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("buf.proto").sameAsResource("protobuf/buf/buf_large.proto.clean");
+	}
+
 	@Test
 	void buf() throws IOException {
 		setFile("build.gradle").toLines(
diff --git a/testlib/src/main/resources/protobuf/buf/buf_large.proto b/testlib/src/main/resources/protobuf/buf/buf_large.proto
new file mode 100644
index 0000000000..01a638d726
--- /dev/null
+++ b/testlib/src/main/resources/protobuf/buf/buf_large.proto
@@ -0,0 +1,229 @@
+syntax = "proto3";
+
+package com.diffplug.gradle.spotless.buf.proto;
+
+option java_multiple_files = true;
+
+message Message {
+  string message = 1;
+}
+
+service Services {
+rpc Echo(Message) returns (Message);
+}
+
+message Message01 {
+  string message1 = 1;
+  string message2 = 2;
+  string message3 = 3;
+  string message4 = 4;
+  string message5 = 5;
+  string message6 = 6;
+  string message7 = 7;
+  string message8 = 8;
+  string message9 = 9;
+}
+
+message Message02 {
+  string message1 = 1;
+  string message2 = 2;
+  string message3 = 3;
+  string message4 = 4;
+  string message5 = 5;
+  string message6 = 6;
+  string message7 = 7;
+  string message8 = 8;
+  string message9 = 9;
+}
+
+message Message03 {
+  string message1 = 1;
+  string message2 = 2;
+  string message3 = 3;
+  string message4 = 4;
+  string message5 = 5;
+  string message6 = 6;
+  string message7 = 7;
+  string message8 = 8;
+  string message9 = 9;
+}
+
+message Message04 {
+  string message1 = 1;
+  string message2 = 2;
+  string message3 = 3;
+  string message4 = 4;
+  string message5 = 5;
+  string message6 = 6;
+  string message7 = 7;
+  string message8 = 8;
+  string message9 = 9;
+}
+
+message Message05 {
+  string message1 = 1;
+  string message2 = 2;
+  string message3 = 3;
+  string message4 = 4;
+  string message5 = 5;
+  string message6 = 6;
+  string message7 = 7;
+  string message8 = 8;
+  string message9 = 9;
+}
+
+message Message06 {
+  string message1 = 1;
+  string message2 = 2;
+  string message3 = 3;
+  string message4 = 4;
+  string message5 = 5;
+  string message6 = 6;
+  string message7 = 7;
+  string message8 = 8;
+  string message9 = 9;
+}
+
+message Message07 {
+  string message1 = 1;
+  string message2 = 2;
+  string message3 = 3;
+  string message4 = 4;
+  string message5 = 5;
+  string message6 = 6;
+  string message7 = 7;
+  string message8 = 8;
+  string message9 = 9;
+}
+
+message Message08 {
+  string message1 = 1;
+  string message2 = 2;
+  string message3 = 3;
+  string message4 = 4;
+  string message5 = 5;
+  string message6 = 6;
+  string message7 = 7;
+  string message8 = 8;
+  string message9 = 9;
+}
+
+message Message09 {
+  string message1 = 1;
+  string message2 = 2;
+  string message3 = 3;
+  string message4 = 4;
+  string message5 = 5;
+  string message6 = 6;
+  string message7 = 7;
+  string message8 = 8;
+  string message9 = 9;
+}
+
+message Message10 {
+  string message1 = 1;
+  string message2 = 2;
+  string message3 = 3;
+  string message4 = 4;
+  string message5 = 5;
+  string message6 = 6;
+  string message7 = 7;
+  string message8 = 8;
+  string message9 = 9;
+}
+
+message Message11 {
+  string message1 = 1;
+  string message2 = 2;
+  string message3 = 3;
+  string message4 = 4;
+  string message5 = 5;
+  string message6 = 6;
+  string message7 = 7;
+  string message8 = 8;
+  string message9 = 9;
+}
+
+message Message12 {
+  string message1 = 1;
+  string message2 = 2;
+  string message3 = 3;
+  string message4 = 4;
+  string message5 = 5;
+  string message6 = 6;
+  string message7 = 7;
+  string message8 = 8;
+  string message9 = 9;
+}
+
+message Message13 {
+  string message1 = 1;
+  string message2 = 2;
+  string message3 = 3;
+  string message4 = 4;
+  string message5 = 5;
+  string message6 = 6;
+  string message7 = 7;
+  string message8 = 8;
+  string message9 = 9;
+}
+
+message Message14 {
+  string message1 = 1;
+  string message2 = 2;
+  string message3 = 3;
+  string message4 = 4;
+  string message5 = 5;
+  string message6 = 6;
+  string message7 = 7;
+  string message8 = 8;
+  string message9 = 9;
+}
+
+message Message15 {
+  string message1 = 1;
+  string message2 = 2;
+  string message3 = 3;
+  string message4 = 4;
+  string message5 = 5;
+  string message6 = 6;
+  string message7 = 7;
+  string message8 = 8;
+  string message9 = 9;
+}
+
+message Message16 {
+  string message1 = 1;
+  string message2 = 2;
+  string message3 = 3;
+  string message4 = 4;
+  string message5 = 5;
+  string message6 = 6;
+  string message7 = 7;
+  string message8 = 8;
+  string message9 = 9;
+}
+
+message Message17 {
+  string message1 = 1;
+  string message2 = 2;
+  string message3 = 3;
+  string message4 = 4;
+  string message5 = 5;
+  string message6 = 6;
+  string message7 = 7;
+  string message8 = 8;
+  string message9 = 9;
+}
+
+message Message18 {
+  string message1 = 1;
+  string message2 = 2;
+  string message3 = 3;
+  string message4 = 4;
+  string message5 = 5;
+  string message6 = 6;
+  string message7 = 7;
+  string message8 = 8;
+string message9 = 9;
+}
diff --git a/testlib/src/main/resources/protobuf/buf/buf_large.proto.clean b/testlib/src/main/resources/protobuf/buf/buf_large.proto.clean
new file mode 100644
index 0000000000..c4218adfc8
--- /dev/null
+++ b/testlib/src/main/resources/protobuf/buf/buf_large.proto.clean
@@ -0,0 +1,229 @@
+syntax = "proto3";
+
+package com.diffplug.gradle.spotless.buf.proto;
+
+option java_multiple_files = true;
+
+message Message {
+  string message = 1;
+}
+
+service Services {
+  rpc Echo(Message) returns (Message);
+}
+
+message Message01 {
+  string message1 = 1;
+  string message2 = 2;
+  string message3 = 3;
+  string message4 = 4;
+  string message5 = 5;
+  string message6 = 6;
+  string message7 = 7;
+  string message8 = 8;
+  string message9 = 9;
+}
+
+message Message02 {
+  string message1 = 1;
+  string message2 = 2;
+  string message3 = 3;
+  string message4 = 4;
+  string message5 = 5;
+  string message6 = 6;
+  string message7 = 7;
+  string message8 = 8;
+  string message9 = 9;
+}
+
+message Message03 {
+  string message1 = 1;
+  string message2 = 2;
+  string message3 = 3;
+  string message4 = 4;
+  string message5 = 5;
+  string message6 = 6;
+  string message7 = 7;
+  string message8 = 8;
+  string message9 = 9;
+}
+
+message Message04 {
+  string message1 = 1;
+  string message2 = 2;
+  string message3 = 3;
+  string message4 = 4;
+  string message5 = 5;
+  string message6 = 6;
+  string message7 = 7;
+  string message8 = 8;
+  string message9 = 9;
+}
+
+message Message05 {
+  string message1 = 1;
+  string message2 = 2;
+  string message3 = 3;
+  string message4 = 4;
+  string message5 = 5;
+  string message6 = 6;
+  string message7 = 7;
+  string message8 = 8;
+  string message9 = 9;
+}
+
+message Message06 {
+  string message1 = 1;
+  string message2 = 2;
+  string message3 = 3;
+  string message4 = 4;
+  string message5 = 5;
+  string message6 = 6;
+  string message7 = 7;
+  string message8 = 8;
+  string message9 = 9;
+}
+
+message Message07 {
+  string message1 = 1;
+  string message2 = 2;
+  string message3 = 3;
+  string message4 = 4;
+  string message5 = 5;
+  string message6 = 6;
+  string message7 = 7;
+  string message8 = 8;
+  string message9 = 9;
+}
+
+message Message08 {
+  string message1 = 1;
+  string message2 = 2;
+  string message3 = 3;
+  string message4 = 4;
+  string message5 = 5;
+  string message6 = 6;
+  string message7 = 7;
+  string message8 = 8;
+  string message9 = 9;
+}
+
+message Message09 {
+  string message1 = 1;
+  string message2 = 2;
+  string message3 = 3;
+  string message4 = 4;
+  string message5 = 5;
+  string message6 = 6;
+  string message7 = 7;
+  string message8 = 8;
+  string message9 = 9;
+}
+
+message Message10 {
+  string message1 = 1;
+  string message2 = 2;
+  string message3 = 3;
+  string message4 = 4;
+  string message5 = 5;
+  string message6 = 6;
+  string message7 = 7;
+  string message8 = 8;
+  string message9 = 9;
+}
+
+message Message11 {
+  string message1 = 1;
+  string message2 = 2;
+  string message3 = 3;
+  string message4 = 4;
+  string message5 = 5;
+  string message6 = 6;
+  string message7 = 7;
+  string message8 = 8;
+  string message9 = 9;
+}
+
+message Message12 {
+  string message1 = 1;
+  string message2 = 2;
+  string message3 = 3;
+  string message4 = 4;
+  string message5 = 5;
+  string message6 = 6;
+  string message7 = 7;
+  string message8 = 8;
+  string message9 = 9;
+}
+
+message Message13 {
+  string message1 = 1;
+  string message2 = 2;
+  string message3 = 3;
+  string message4 = 4;
+  string message5 = 5;
+  string message6 = 6;
+  string message7 = 7;
+  string message8 = 8;
+  string message9 = 9;
+}
+
+message Message14 {
+  string message1 = 1;
+  string message2 = 2;
+  string message3 = 3;
+  string message4 = 4;
+  string message5 = 5;
+  string message6 = 6;
+  string message7 = 7;
+  string message8 = 8;
+  string message9 = 9;
+}
+
+message Message15 {
+  string message1 = 1;
+  string message2 = 2;
+  string message3 = 3;
+  string message4 = 4;
+  string message5 = 5;
+  string message6 = 6;
+  string message7 = 7;
+  string message8 = 8;
+  string message9 = 9;
+}
+
+message Message16 {
+  string message1 = 1;
+  string message2 = 2;
+  string message3 = 3;
+  string message4 = 4;
+  string message5 = 5;
+  string message6 = 6;
+  string message7 = 7;
+  string message8 = 8;
+  string message9 = 9;
+}
+
+message Message17 {
+  string message1 = 1;
+  string message2 = 2;
+  string message3 = 3;
+  string message4 = 4;
+  string message5 = 5;
+  string message6 = 6;
+  string message7 = 7;
+  string message8 = 8;
+  string message9 = 9;
+}
+
+message Message18 {
+  string message1 = 1;
+  string message2 = 2;
+  string message3 = 3;
+  string message4 = 4;
+  string message5 = 5;
+  string message6 = 6;
+  string message7 = 7;
+  string message8 = 8;
+  string message9 = 9;
+}

From 3d238450bad2faee914098e2c2ab61fe2457c464 Mon Sep 17 00:00:00 2001
From: azam <azamshul@gmail.com>
Date: Sat, 1 Jun 2024 18:08:56 +0900
Subject: [PATCH 1687/2068] Add to entries for #2147 to CHANGES.md files

---
 CHANGES.md               | 3 ++-
 plugin-gradle/CHANGES.md | 3 ++-
 plugin-maven/CHANGES.md  | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 04722f1c2b..272c46e181 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,13 +11,14 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* `FileSignature.Promised` and `JarState.Promised` to facilitate round-trip serialization for the Gradle configuration cache. ([#1945](https://github.com/diffplug/spotless/pull/1945)) 
+* `FileSignature.Promised` and `JarState.Promised` to facilitate round-trip serialization for the Gradle configuration cache. ([#1945](https://github.com/diffplug/spotless/pull/1945))
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
 ### Fixed
 * Ignore system git config when running tests ([#1990](https://github.com/diffplug/spotless/issues/1990))
 * Correctly provide EditorConfig property types for Ktlint ([#2052](https://github.com/diffplug/spotless/issues/2052))
 * Made ShadowCopy (`npmInstallCache`) more robust by re-creating the cache dir if it goes missing ([#1984](https://github.com/diffplug/spotless/issues/1984),[2096](https://github.com/diffplug/spotless/pull/2096))
 * scalafmt.conf fileOverride section now works correctly ([#1854](https://github.com/diffplug/spotless/pull/1854))
+* Fix stdin pipe is being closed exception on Windows for large .proto files ([#2147](https://github.com/diffplug/spotless/issues/2147))
 ### Changes
 * Bump default `cleanthat` version to latest `2.16` -> `2.20`. ([#1725](https://github.com/diffplug/spotless/pull/1725))
 * Bump default `gherkin-utils` version to latest `8.0.2` -> `9.0.0`. ([#1703](https://github.com/diffplug/spotless/pull/1703))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 99160a6011..2b57790090 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,7 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Full, no-asterisk support of Gradle configuration cache. ([#1274](https://github.com/diffplug/spotless/issues/1274), giving up on [#987](https://github.com/diffplug/spotless/issues/987))
-  * In order to use `custom`, you must now use Gradle 8.0+. 
+  * In order to use `custom`, you must now use Gradle 8.0+.
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
 * Add support for formatting and sorting Maven POMs ([#2082](https://github.com/diffplug/spotless/issues/2082))
 ### Fixed
@@ -15,6 +15,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Fixed memory leak introduced in 6.21.0 ([#2067](https://github.com/diffplug/spotless/issues/2067))
 * Made ShadowCopy (`npmInstallCache`) more robust by re-creating the cache dir if it goes missing ([#1984](https://github.com/diffplug/spotless/issues/1984),[2096](https://github.com/diffplug/spotless/pull/2096))
 * scalafmt.conf fileOverride section now works correctly ([#1854](https://github.com/diffplug/spotless/pull/1854))
+* Fix stdin pipe is being closed exception on Windows for large .proto files ([#2147](https://github.com/diffplug/spotless/issues/2147))
 ### Changes
 * Bump default `cleanthat` version to latest `2.16` -> `2.20`. ([#1725](https://github.com/diffplug/spotless/pull/1725))
 * Bump default `gherkin-utils` version to latest `8.0.2` -> `9.0.0`. ([#1703](https://github.com/diffplug/spotless/pull/1703))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index f3ba81d5bd..eedad0ba70 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -11,6 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Correctly provide EditorConfig property types for Ktlint ([#2052](https://github.com/diffplug/spotless/issues/2052))
 * Made ShadowCopy (`npmInstallCache`) more robust by re-creating the cache dir if it goes missing ([#1984](https://github.com/diffplug/spotless/issues/1984),[2096](https://github.com/diffplug/spotless/pull/2096))
 * scalafmt.conf fileOverride section now works correctly ([#1854](https://github.com/diffplug/spotless/pull/1854))
+* Fix stdin pipe is being closed exception on Windows for large .proto files ([#2147](https://github.com/diffplug/spotless/issues/2147))
 ### Changes
 * Bump default `cleanthat` version to latest `2.16` -> `2.20`. ([#1725](https://github.com/diffplug/spotless/pull/1725))
 * Bump default `gherkin-utils` version to latest `8.0.2` -> `9.0.0`. ([#1703](https://github.com/diffplug/spotless/pull/1703))

From 397a7fd51313670216fcccaa9cebc64837f416ec Mon Sep 17 00:00:00 2001
From: Olivier Genez <olivier.genez@gmail.com>
Date: Mon, 3 Jun 2024 13:03:51 +1000
Subject: [PATCH 1688/2068] Apply minor Ktlint implementation refactor

---
 .../java/com/diffplug/spotless/maven/kotlin/Ktlint.java  | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
index f90ed25089..a54e0d9764 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
@@ -31,6 +31,8 @@
 import com.diffplug.spotless.maven.FormatterStepFactory;
 
 public class Ktlint implements FormatterStepFactory {
+	private static final File defaultEditorConfig = new File(".editorconfig");
+
 	@Parameter
 	private String version;
 	@Parameter
@@ -44,11 +46,8 @@ public class Ktlint implements FormatterStepFactory {
 	public FormatterStep newFormatterStep(final FormatterStepConfig stepConfig) {
 		String ktlintVersion = version != null ? version : KtLintStep.defaultVersion();
 		FileSignature configPath = null;
-		if (editorConfigPath == null) {
-			File defaultEditorConfig = new File(".editorconfig");
-			if (defaultEditorConfig.exists()) {
-				editorConfigPath = defaultEditorConfig.getPath();
-			}
+		if (editorConfigPath == null && defaultEditorConfig.exists()) {
+			editorConfigPath = defaultEditorConfig.getPath();
 		}
 		if (editorConfigPath != null) {
 			configPath = ThrowingEx.get(() -> FileSignature.signAsList(stepConfig.getFileLocator().locateFile(editorConfigPath)));

From 700114fb372a1a7acc6d81b91826420ecc845e50 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 3 Jun 2024 23:48:45 -0700
Subject: [PATCH 1689/2068] Add Selfie, and configure it to not use triple
 quote literals.

---
 gradle.properties                             |  1 +
 testlib/build.gradle                          |  2 ++
 .../src/main/java/selfie/SelfieSettings.java  | 26 +++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 testlib/src/main/java/selfie/SelfieSettings.java

diff --git a/gradle.properties b/gradle.properties
index 5d0c627d65..e328419de3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -32,3 +32,4 @@ VER_JGIT=6.7.0.202309050840-r
 VER_JUNIT=5.10.2
 VER_ASSERTJ=3.26.0
 VER_MOCKITO=5.12.0
+VER_SELFIE=2.2.0
diff --git a/testlib/build.gradle b/testlib/build.gradle
index 38e598369e..2364ea770d 100644
--- a/testlib/build.gradle
+++ b/testlib/build.gradle
@@ -13,6 +13,8 @@ dependencies {
 	api "org.junit.jupiter:junit-jupiter:${VER_JUNIT}"
 	api "org.assertj:assertj-core:${VER_ASSERTJ}"
 	api "org.mockito:mockito-core:$VER_MOCKITO"
+	api "com.diffplug.selfie:selfie-lib:${VER_SELFIE}"
+	api "com.diffplug.selfie:selfie-runner-junit5:${VER_SELFIE}"
 	runtimeOnly "org.junit.platform:junit-platform-launcher"
 
 	implementation "com.diffplug.durian:durian-io:${VER_DURIAN}"
diff --git a/testlib/src/main/java/selfie/SelfieSettings.java b/testlib/src/main/java/selfie/SelfieSettings.java
new file mode 100644
index 0000000000..4a60c15dd0
--- /dev/null
+++ b/testlib/src/main/java/selfie/SelfieSettings.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package selfie;
+
+import com.diffplug.selfie.junit5.SelfieSettingsAPI;
+
+/** https://selfie.dev/jvm/get-started#quickstart */
+public class SelfieSettings extends SelfieSettingsAPI {
+	@Override
+	public boolean getJavaDontUseTripleQuoteLiterals() {
+		return true;
+	}
+}

From ffc911ebf8f3fd9474b2a894aad7802c30897343 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 3 Jun 2024 23:54:03 -0700
Subject: [PATCH 1690/2068] Add a way to test for lints, and use that to bring
 back FenceStepTest.broken

---
 .../java/com/diffplug/spotless/LintState.java | 26 +++++++++++++++++++
 .../com/diffplug/spotless/StepHarness.java    | 10 +++++++
 .../spotless/generic/FenceStepTest.java       | 10 +++----
 3 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/LintState.java b/lib/src/main/java/com/diffplug/spotless/LintState.java
index 8a6a8b2544..a0e01088ae 100644
--- a/lib/src/main/java/com/diffplug/spotless/LintState.java
+++ b/lib/src/main/java/com/diffplug/spotless/LintState.java
@@ -58,6 +58,32 @@ public Map<FormatterStep, List<Lint>> getLints(Formatter formatter) {
 		return result;
 	}
 
+	public String asString(File file, Formatter formatter) {
+		if (!isHasLints()) {
+			return "(none)";
+		} else {
+			StringBuilder result = new StringBuilder();
+			for (int i = 0; i < lintsPerStep.size(); i++) {
+				List<Lint> lints = lintsPerStep.get(i);
+				if (lints != null) {
+					FormatterStep step = formatter.getSteps().get(i);
+					for (Lint lint : lints) {
+						result.append(file.getName()).append(":").append(lint.getLineStart());
+						if (lint.getLineEnd() != lint.getLineStart()) {
+							result.append("-").append(lint.getLineEnd());
+						}
+						result.append(" ");
+						result.append(step.getName()).append("(").append(lint.getCode()).append(") ");
+						result.append(lint.getMsg());
+						result.append("\n");
+					}
+				}
+			}
+			result.setLength(result.length() - 1);
+			return result.toString();
+		}
+	}
+
 	public static LintState of(Formatter formatter, File file) throws IOException {
 		return of(formatter, file, Files.readAllBytes(file.toPath()));
 	}
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarness.java b/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
index ae59a8d176..4f7f6b5c27 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
@@ -24,6 +24,9 @@
 import org.assertj.core.api.AbstractStringAssert;
 import org.assertj.core.api.Assertions;
 
+import com.diffplug.selfie.Selfie;
+import com.diffplug.selfie.StringSelfie;
+
 /** An api for testing a {@code FormatterStep} that doesn't depend on the File path. DO NOT ADD FILE SUPPORT TO THIS, use {@link StepHarnessWithFile} if you need that. */
 public class StepHarness extends StepHarnessBase {
 	private StepHarness(Formatter formatter, RoundTrip roundTrip) {
@@ -111,4 +114,11 @@ public AbstractStringAssert<?> testExceptionMsg(String before) {
 			}
 		}
 	}
+
+	public StringSelfie expectLintsOf(String before) {
+		LintState state = LintState.of(formatter(), Formatter.NO_FILE_SENTINEL, before.getBytes(formatter().getEncoding()));
+		String assertAgainst = state.asString(Formatter.NO_FILE_SENTINEL, formatter());
+		String cleaned = assertAgainst.replace("NO_FILE_SENTINEL:", "");
+		return Selfie.expectSelfie(cleaned);
+	}
 }
diff --git a/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java b/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java
index ea9755a804..3d9d2ed0fc 100644
--- a/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java
@@ -18,14 +18,12 @@
 import java.io.File;
 import java.util.Arrays;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.common.base.StringPrinter;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.ResourceHarness;
 import com.diffplug.spotless.StepHarness;
-import com.diffplug.spotless.tag.ForLintRefactor;
 
 class FenceStepTest extends ResourceHarness {
 	@Test
@@ -82,18 +80,16 @@ void multiple() {
 						"1 2 3"));
 	}
 
-	@Disabled
-	@ForLintRefactor
 	@Test
 	void broken() {
 		FormatterStep fence = FenceStep.named("fence").openClose("spotless:off", "spotless:on")
-				.preserveWithin(Arrays.asList(ToCaseStep.upper()));
+				.preserveWithin(Arrays.asList(ReplaceStep.create("replace", "spotless:on", "REMOVED")));
 		// this fails because uppercase turns spotless:off into SPOTLESS:OFF, etc
-		StepHarness.forStepNoRoundtrip(fence).testExceptionMsg(StringPrinter.buildStringFromLines("A B C",
+		StepHarness.forStep(fence).expectLintsOf(StringPrinter.buildStringFromLines("A B C",
 				"spotless:off",
 				"D E F",
 				"spotless:on",
-				"G H I")).isEqualTo("An intermediate step removed a match of spotless:off spotless:on");
+				"G H I")).toBe("1-6 fence(fenceRemoved) An intermediate step removed a match of spotless:off spotless:on");
 	}
 
 	@Test

From 224a0417f53cc1ac8afcb1c8acabf9556e56947a Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 3 Jun 2024 23:57:48 -0700
Subject: [PATCH 1691/2068] spotlessApply

---
 lib/src/main/java/com/diffplug/spotless/ProcessRunner.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java b/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
index f110207e30..70ea30bdeb 100644
--- a/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
+++ b/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 DiffPlug
+ * Copyright 2020-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From abf887d1ddc042b07bce0d2b0df6fa9a706accb5 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 4 Jun 2024 00:00:23 -0700
Subject: [PATCH 1692/2068] Spotbugs fixup.

---
 lib/src/main/java/com/diffplug/spotless/npm/ShadowCopy.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/ShadowCopy.java b/lib/src/main/java/com/diffplug/spotless/npm/ShadowCopy.java
index 43019f09d4..3182d81fbb 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/ShadowCopy.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/ShadowCopy.java
@@ -37,6 +37,8 @@
 
 import com.diffplug.spotless.ThrowingEx;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 class ShadowCopy {
 
 	private static final Logger logger = LoggerFactory.getLogger(ShadowCopy.class);
@@ -69,6 +71,7 @@ public void addEntry(String key, File orig) {
 		}
 	}
 
+	@SuppressFBWarnings("NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE")
 	private void storeEntry(String key, File orig, File target) throws IOException {
 		// Create a temp directory in the same directory as target
 		Files.createDirectories(target.toPath().getParent());

From 4777a9ad876836e5061deca30c3f4867f2d3bd0a Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 4 Jun 2024 15:23:20 +0800
Subject: [PATCH 1693/2068] Simplify EditorConfigDefaults loading in
 KtLintCompat1Dot0Dot0Adapter

The nullability and file content have been checked in EditorConfigDefaultsLoader, seems we have no more need to inspect again.

See https://github.com/pinterest/ktlint/blob/a510eedc69f7431bcd3af2162db8e53a588f4435/ktlint-rule-engine/src/main/kotlin/com/pinterest/ktlint/rule/engine/internal/EditorConfigDefaultsLoader.kt#L34-L42
---
 .../glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java  | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java b/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
index a6e631718d..0e97cdd12d 100644
--- a/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
+++ b/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
@@ -15,7 +15,6 @@
  */
 package com.diffplug.spotless.glue.ktlint.compat;
 
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
@@ -93,12 +92,7 @@ public String format(
 				.flatMap(loader -> loader.get().getRuleProviders().stream())
 				.collect(Collectors.toUnmodifiableSet());
 
-		EditorConfigDefaults editorConfig;
-		if (editorConfigPath == null || !Files.exists(editorConfigPath)) {
-			editorConfig = EditorConfigDefaults.Companion.getEMPTY_EDITOR_CONFIG_DEFAULTS();
-		} else {
-			editorConfig = EditorConfigDefaults.Companion.load(editorConfigPath, RuleProviderKt.propertyTypes(allRuleProviders));
-		}
+		EditorConfigDefaults editorConfig = EditorConfigDefaults.Companion.load(editorConfigPath, RuleProviderKt.propertyTypes(allRuleProviders));
 		EditorConfigOverride editorConfigOverride;
 		if (editorConfigOverrideMap.isEmpty()) {
 			editorConfigOverride = EditorConfigOverride.Companion.getEMPTY_EDITOR_CONFIG_OVERRIDE();

From bd113c2930ddcf05ca33ab5954bc73b4d2724c35 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 4 Jun 2024 00:43:07 -0700
Subject: [PATCH 1694/2068] Try flushing instead of closing.

---
 lib/src/main/java/com/diffplug/spotless/ProcessRunner.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java b/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
index 70ea30bdeb..30ffd79de3 100644
--- a/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
+++ b/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
@@ -163,6 +163,7 @@ public LongRunningProcess start(@Nullable File cwd, @Nullable Map<String, String
 		}
 		// write stdin
 		process.getOutputStream().write(stdin);
+		process.getOutputStream().flush();
 		return new LongRunningProcess(process, args, outputFut, errorFut);
 	}
 

From df9f4675112d27e187ed0e40a0cb0d821392ac8e Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 4 Jun 2024 01:08:00 -0700
Subject: [PATCH 1695/2068] flush before closing.

---
 lib/src/main/java/com/diffplug/spotless/ProcessRunner.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java b/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
index 30ffd79de3..e7755f75bd 100644
--- a/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
+++ b/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
@@ -164,6 +164,7 @@ public LongRunningProcess start(@Nullable File cwd, @Nullable Map<String, String
 		// write stdin
 		process.getOutputStream().write(stdin);
 		process.getOutputStream().flush();
+		process.getOutputStream().close();
 		return new LongRunningProcess(process, args, outputFut, errorFut);
 	}
 

From 5f159a038a8ffedff88240840ca8b0abbc353a51 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 4 Jun 2024 01:20:22 -0700
Subject: [PATCH 1696/2068] No reason for DirtyState.Calculation to be public
 API.

---
 lib/src/main/java/com/diffplug/spotless/DirtyState.java   | 8 ++++----
 .../main/java/com/diffplug/gradle/spotless/IdeHook.java   | 2 +-
 .../com/diffplug/gradle/spotless/SpotlessTaskImpl.java    | 2 +-
 .../main/java/com/diffplug/spotless/maven/IdeHook.java    | 2 +-
 .../com/diffplug/spotless/maven/SpotlessApplyMojo.java    | 2 +-
 .../com/diffplug/spotless/maven/SpotlessCheckMojo.java    | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/DirtyState.java b/lib/src/main/java/com/diffplug/spotless/DirtyState.java
index 3d133927c6..e8667dd12d 100644
--- a/lib/src/main/java/com/diffplug/spotless/DirtyState.java
+++ b/lib/src/main/java/com/diffplug/spotless/DirtyState.java
@@ -69,15 +69,15 @@ public static DirtyState clean() {
 	static final DirtyState didNotConverge = new DirtyState(null);
 	static final DirtyState isClean = new DirtyState(null);
 
-	public static Calculation of(Formatter formatter, File file) throws IOException {
+	public static DirtyState of(Formatter formatter, File file) throws IOException {
 		return of(formatter, file, Files.readAllBytes(file.toPath()));
 	}
 
-	public static Calculation of(Formatter formatter, File file, byte[] rawBytes) {
-		return new Calculation(formatter, file, rawBytes);
+	public static DirtyState of(Formatter formatter, File file, byte[] rawBytes) {
+		return new Calculation(formatter, file, rawBytes).calculateDirtyState();
 	}
 
-	public static class Calculation {
+	private static class Calculation {
 		private final Formatter formatter;
 		private final File file;
 		private final byte[] rawBytes;
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/IdeHook.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/IdeHook.java
index 4c198dd42c..cc767ce111 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/IdeHook.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/IdeHook.java
@@ -55,7 +55,7 @@ static void performHook(SpotlessTaskImpl spotlessTask) {
 				} else {
 					bytes = Files.readAllBytes(file.toPath());
 				}
-				DirtyState dirty = DirtyState.of(formatter, file, bytes).calculateDirtyState();
+				DirtyState dirty = DirtyState.of(formatter, file, bytes);
 				if (dirty.isClean()) {
 					dumpIsClean();
 				} else if (dirty.didNotConverge()) {
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
index cc694942c1..b7586f742b 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
@@ -102,7 +102,7 @@ void processInputFile(@Nullable GitRatchet ratchet, Formatter formatter, File in
 			dirtyState = DirtyState.clean();
 		} else {
 			try {
-				dirtyState = DirtyState.of(formatter, input).calculateDirtyState();
+				dirtyState = DirtyState.of(formatter, input);
 			} catch (IOException e) {
 				throw new IOException("Issue processing file: " + input, e);
 			} catch (RuntimeException e) {
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/IdeHook.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/IdeHook.java
index 5289af4756..6b7750c060 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/IdeHook.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/IdeHook.java
@@ -49,7 +49,7 @@ static void performHook(Iterable<File> projectFiles, Formatter formatter, String
 			} else {
 				bytes = Files.readAllBytes(file.toPath());
 			}
-			DirtyState dirty = DirtyState.of(formatter, file, bytes).calculateDirtyState();
+			DirtyState dirty = DirtyState.of(formatter, file, bytes);
 			if (dirty.isClean()) {
 				dumpIsClean();
 			} else if (dirty.didNotConverge()) {
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
index 0d67ed8c9f..820d89352c 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
@@ -60,7 +60,7 @@ protected void process(String name, Iterable<File> files, Formatter formatter, U
 			}
 
 			try {
-				DirtyState dirtyState = DirtyState.of(formatter, file).calculateDirtyState();
+				DirtyState dirtyState = DirtyState.of(formatter, file);
 				if (!dirtyState.isClean() && !dirtyState.didNotConverge()) {
 					getLog().info(String.format("Writing clean file: %s", file));
 					dirtyState.writeCanonicalTo(file);
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java
index 183f20ef9e..116a24dcf4 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessCheckMojo.java
@@ -78,7 +78,7 @@ protected void process(String name, Iterable<File> files, Formatter formatter, U
 			}
 			buildContext.removeMessages(file);
 			try {
-				DirtyState dirtyState = DirtyState.of(formatter, file).calculateDirtyState();
+				DirtyState dirtyState = DirtyState.of(formatter, file);
 				if (!dirtyState.isClean() && !dirtyState.didNotConverge()) {
 					problemFiles.add(file);
 					if (buildContext.isIncremental()) {

From baea8c943a16dadcaa9252d267b53a8473e97b76 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 4 Jun 2024 01:21:40 -0700
Subject: [PATCH 1697/2068] In fact there wasn't any reason for the
 DirtyState.Calculation class to exist at all.

---
 .../com/diffplug/spotless/DirtyState.java     | 97 ++++++++-----------
 1 file changed, 38 insertions(+), 59 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/DirtyState.java b/lib/src/main/java/com/diffplug/spotless/DirtyState.java
index e8667dd12d..39d5da47d6 100644
--- a/lib/src/main/java/com/diffplug/spotless/DirtyState.java
+++ b/lib/src/main/java/com/diffplug/spotless/DirtyState.java
@@ -74,68 +74,47 @@ public static DirtyState of(Formatter formatter, File file) throws IOException {
 	}
 
 	public static DirtyState of(Formatter formatter, File file, byte[] rawBytes) {
-		return new Calculation(formatter, file, rawBytes).calculateDirtyState();
-	}
+		String raw = new String(rawBytes, formatter.getEncoding());
+		// check that all characters were encodable
+		String encodingError = EncodingErrorMsg.msg(raw, rawBytes, formatter.getEncoding());
+		if (encodingError != null) {
+			throw new IllegalArgumentException(encodingError);
+		}
+
+		String rawUnix = LineEnding.toUnix(raw);
+
+		// enforce the format
+		String formattedUnix = formatter.compute(rawUnix, file);
+		// convert the line endings if necessary
+		String formatted = formatter.computeLineEndings(formattedUnix, file);
+
+		// if F(input) == input, then the formatter is well-behaving and the input is clean
+		byte[] formattedBytes = formatted.getBytes(formatter.getEncoding());
+		if (Arrays.equals(rawBytes, formattedBytes)) {
+			return isClean;
+		}
+
+		// F(input) != input, so we'll do a padded check
+		String doubleFormattedUnix = formatter.compute(formattedUnix, file);
+		if (doubleFormattedUnix.equals(formattedUnix)) {
+			// most dirty files are idempotent-dirty, so this is a quick-short circuit for that common case
+			return new DirtyState(formattedBytes);
+		}
 
-	private static class Calculation {
-		private final Formatter formatter;
-		private final File file;
-		private final byte[] rawBytes;
-		private final String raw;
-
-		private Calculation(Formatter formatter, File file, byte[] rawBytes) {
-			this.formatter = formatter;
-			this.file = file;
-			this.rawBytes = rawBytes;
-			this.raw = new String(rawBytes, formatter.getEncoding());
-			// check that all characters were encodable
-			String encodingError = EncodingErrorMsg.msg(raw, rawBytes, formatter.getEncoding());
-			if (encodingError != null) {
-				throw new IllegalArgumentException(encodingError);
-			}
+		PaddedCell cell = PaddedCell.check(formatter, file, rawUnix);
+		if (!cell.isResolvable()) {
+			return didNotConverge;
 		}
 
-		/**
-		 * Calculates whether the given file is dirty according to a PaddedCell invocation of the given formatter.
-		 * DirtyState includes the clean state of the file, as well as a warning if we were not able to apply the formatter
-		 * due to diverging idempotence.
-		 */
-		public DirtyState calculateDirtyState() {
-			String rawUnix = LineEnding.toUnix(raw);
-
-			// enforce the format
-			String formattedUnix = formatter.compute(rawUnix, file);
-			// convert the line endings if necessary
-			String formatted = formatter.computeLineEndings(formattedUnix, file);
-
-			// if F(input) == input, then the formatter is well-behaving and the input is clean
-			byte[] formattedBytes = formatted.getBytes(formatter.getEncoding());
-			if (Arrays.equals(rawBytes, formattedBytes)) {
-				return isClean;
-			}
-
-			// F(input) != input, so we'll do a padded check
-			String doubleFormattedUnix = formatter.compute(formattedUnix, file);
-			if (doubleFormattedUnix.equals(formattedUnix)) {
-				// most dirty files are idempotent-dirty, so this is a quick-short circuit for that common case
-				return new DirtyState(formattedBytes);
-			}
-
-			PaddedCell cell = PaddedCell.check(formatter, file, rawUnix);
-			if (!cell.isResolvable()) {
-				return didNotConverge;
-			}
-
-			// get the canonical bytes
-			String canonicalUnix = cell.canonical();
-			String canonical = formatter.computeLineEndings(canonicalUnix, file);
-			byte[] canonicalBytes = canonical.getBytes(formatter.getEncoding());
-			if (!Arrays.equals(rawBytes, canonicalBytes)) {
-				// and write them to disk if needed
-				return new DirtyState(canonicalBytes);
-			} else {
-				return isClean;
-			}
+		// get the canonical bytes
+		String canonicalUnix = cell.canonical();
+		String canonical = formatter.computeLineEndings(canonicalUnix, file);
+		byte[] canonicalBytes = canonical.getBytes(formatter.getEncoding());
+		if (!Arrays.equals(rawBytes, canonicalBytes)) {
+			// and write them to disk if needed
+			return new DirtyState(canonicalBytes);
+		} else {
+			return isClean;
 		}
 	}
 }

From 4f5bf5195e24541b354392bb76454fdefe50b094 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 4 Jun 2024 01:32:45 -0700
Subject: [PATCH 1698/2068] Update contributor docs a bit.

---
 CONTRIBUTING.md | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 27e6221e76..c4945b70f3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -10,21 +10,20 @@ In order to use and combine `FormatterStep`, you first create a `Formatter`, whi
 
 - an encoding
 - a list of `FormatterStep`
-- a line endings policy (`LineEnding.GIT_ATTRIBUTES` is almost always the best choice)
+- a line endings policy (`LineEnding.GIT_ATTRIBUTES_FAST_ALLSAME` is almost always the best choice)
 
-Once you have an instance of `Formatter`, you can call `boolean isClean(File)`, or `void applyTo(File)` to either check or apply formatting to a file.  Spotless will then:
+Once you have an instance of `Formatter`, you can call `DirtyState.of(Formatter, File)`. Under the hood, Spotless will:
 
 - parse the raw bytes into a String according to the encoding
 - normalize its line endings to `\n`
 - pass the unix string to each `FormatterStep` one after the other
+- check for idempotence problems, and repeatedly apply the steps until the [result is stable](PADDEDCELL.md). 
 - apply line endings according to the policy
 
 You can also use lower-level methods like `String compute(String unix, File file)` if you'd like to do lower-level processing.
 
 All `FormatterStep` implement `Serializable`, `equals`, and `hashCode`, so build systems that support up-to-date checks can easily and correctly determine if any actions need to be taken.
 
-Spotless also provides `PaddedCell`, which makes it easy to diagnose and correct idempotence problems.
-
 ## Project layout
 
 For the folders below in monospace text, they are published on MavenCentral at the coordinate `com.diffplug.spotless:spotless-${FOLDER_NAME}`.  The other folders are dev infrastructure.
@@ -39,15 +38,16 @@ For the folders below in monospace text, they are published on MavenCentral at t
 
 ## How to add a new FormatterStep
 
-The easiest way to create a FormatterStep is `FormatterStep createNeverUpToDate(String name, FormatterFunc function)`, which you can use like this:
+The easiest way to create a FormatterStep is to just create `class FooStep implements FormatterStep`. It has one abstract method which is the formatting function, and you're ready to tinker. To work with the build plugins, this class will need to
 
-```java
-FormatterStep identityStep = FormatterStep.createNeverUpToDate("identity", unixStr -> unixStr)
-```
+- implement equality and hashcode
+- support lossless roundtrip serialization
+
+You can use `StepHarness` (if you don't care about the `File` argument) or `StepHarnessWithFile` to test. The harness will roundtrip serialize your step, check that it's equal to itself, and then perform all tests on the roundtripped step.
 
-This creates a step which will fail up-to-date checks (it is equal only to itself), and will use the function you passed in to do the formatting pass.
+## Implementing equality in terms of serialization
 
-To create a step which can handle up-to-date checks properly, use the method `<State extends Serializable> FormatterStep create(String name, State state, Function<State, FormatterFunc> stateToFormatter)`.  Here's an example:
+Spotless has infrastructure which uses the serialized form of your step to implement equality for you. Here is an example:
 
 ```java
 public final class ReplaceStep {
@@ -62,10 +62,10 @@ public final class ReplaceStep {
   private static final class State implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    private final CharSequence target;
-    private final CharSequence replacement;
+    private final String target;
+    private final String replacement;
 
-    State(CharSequence target, CharSequence replacement) {
+    State(String target, String replacement) {
       this.target = target;
       this.replacement = replacement;
     }
@@ -82,8 +82,6 @@ The `FormatterStep` created above implements `equals` and `hashCode` based on th
 Oftentimes, a rule's state will be expensive to compute. `EclipseFormatterStep`, for example, depends on a formatting file.  Ideally, we would like to only pay the cost of the I/O needed to load that file if we have to - we'd like to create the FormatterStep now but load its state lazily at the last possible moment.  For this purpose, each of the `FormatterStep.create` methods has a lazy counterpart.  Here are their signatures:
 
 ```java
-FormatterStep createNeverUpToDate    (String name, FormatterFunc function                  )
-FormatterStep createNeverUpToDateLazy(String name, Supplier<FormatterFunc> functionSupplier)
 FormatterStep create    (String name, State state                  , Function<State, FormatterFunc> stateToFormatter)
 FormatterStep createLazy(String name, Supplier<State> stateSupplier, Function<State, FormatterFunc> stateToFormatter)
 ```
@@ -101,7 +99,7 @@ Here's a checklist for creating a new step for Spotless:
 
 ### Serialization roundtrip
 
-In order to support Gradle's configuration cache, all `FormatterStep` must be round-trip serializable. This is a bit tricky because step equality is based on the serialized form of the state, and `transient` is used to take absolute paths out of the equality check. To make this work, roundtrip compatible steps actually have *two* states:
+In order to support Gradle's configuration cache, all `FormatterStep` must be round-trip serializable. This is a bit tricky because step equality is based on the serialized form of the state, and `transient` can be used to take absolute paths out of the equality check. To make this work, roundtrip compatible steps can actually have *two* states:
 
 - `RoundtripState` which must be roundtrip serializable but has no equality constraints
   - `FileSignature.Promised` for settings files and `JarState.Promised` for the classpath 

From 33444a7b771a1de9ea7c4cfc961c9a72f742e7e1 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 4 Jun 2024 01:34:11 -0700
Subject: [PATCH 1699/2068] Update changelog.

---
 CHANGES.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 1de166cd2b..8b3b11609f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -34,8 +34,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * **BREAKING** Remove `JarState.getMavenCoordinate(String prefix)`. ([#1945](https://github.com/diffplug/spotless/pull/1945))
 * **BREAKING** Replace `PipeStepPair` with `FenceStep`. ([#1954](https://github.com/diffplug/spotless/pull/1954))
 * **BREAKING** Fully removed `Rome`, use `Biome` instead. ([#2119](https://github.com/diffplug/spotless/pull/2119))
-* **BREAKING** Moved `PaddedCell.DirtyState` to its own top-level class with new methods.
-* **BREAKING** Removed `isClean`, `applyTo`, and `applyToAndReturnResultIfDirty` from `Formatter` because users should instead use `PaddedCell.check()`.
+* **BREAKING** Moved `PaddedCell.DirtyState` to its own top-level class with new methods. ([#2148](https://github.com/diffplug/spotless/pull/2148))
+  * **BREAKING** Removed `isClean`, `applyTo`, and `applyToAndReturnResultIfDirty` from `Formatter` because users should instead use `DirtyState`.
 
 ## [2.45.0] - 2024-01-23
 ### Added

From 87117b83093ad9562afd577afbcedc1376368b1d Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 4 Jun 2024 01:41:01 -0700
Subject: [PATCH 1700/2068] Prepare to publish `BETA1` releases.

---
 gradle/changelog.gradle | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/gradle/changelog.gradle b/gradle/changelog.gradle
index 83c16f474e..2cad156a63 100644
--- a/gradle/changelog.gradle
+++ b/gradle/changelog.gradle
@@ -3,8 +3,6 @@ if (project.name == 'plugin-gradle') {
 	kind = 'gradle'
 } else if (project.name == 'plugin-maven') {
 	kind = 'maven'
-} else if (project.name.startsWith('eclipse')) {
-	kind = 'ext-' + project.name
 } else {
 	assert project == rootProject
 	kind = 'lib'
@@ -20,11 +18,13 @@ spotlessChangelog {
 	branch        'release'
 	tagPrefix     "${kind}/"
 	commitMessage "Published ${kind}/{{version}}" // {{version}} will be replaced
-}
 
-if (gradle.startParameter.projectProperties.get('com.diffplug.spotless.include.ext.nop2') == 'true') {
-	tasks.named('changelogPrint') {
-		enabled = kind.startsWith('ext-')
+	if (kind == 'gradle') {
+		forceNextVersion '7.0.0.BETA1'
+	} else if (kind == 'maven') {
+		forceNextVersion '2.44.0.BETA1'
+	} else {
+		forceNextVersion '3.0.0.BETA1'
 	}
 }
 

From 788b9dd683586fe2f5474ff49a62a1e4882931b0 Mon Sep 17 00:00:00 2001
From: runner <runner@fv-az1530-906>
Date: Tue, 4 Jun 2024 08:44:49 +0000
Subject: [PATCH 1701/2068] Published lib/3.0.0.BETA1

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 7a83c3f2b7..40e3fa9289 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [3.0.0.BETA1] - 2024-06-04
 ### Added
 * `FileSignature.Promised` and `JarState.Promised` to facilitate round-trip serialization for the Gradle configuration cache. ([#1945](https://github.com/diffplug/spotless/pull/1945))
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))

From e68396f91c5db6ae953ac5524e1657eea04726dc Mon Sep 17 00:00:00 2001
From: runner <runner@fv-az1530-906>
Date: Tue, 4 Jun 2024 08:46:35 +0000
Subject: [PATCH 1702/2068] Published gradle/7.0.0.BETA1

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 60 ++++++++++++++++++++--------------------
 2 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 42b6392975..7ae0258d6f 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [7.0.0.BETA1] - 2024-06-04
 ### Added
 * Full, no-asterisk support of Gradle configuration cache. ([#1274](https://github.com/diffplug/spotless/issues/1274), giving up on [#987](https://github.com/diffplug/spotless/issues/987))
   * In order to use `custom`, you must now use Gradle 8.0+.
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index d6a88134f8..117974ba10 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -14,9 +14,9 @@ output = [
   ].join('\n');
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
-[![Changelog](https://img.shields.io/badge/changelog-6.25.0-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-7.0.0.BETA1-blue.svg)](CHANGES.md)
 [![MavenCentral](https://img.shields.io/badge/mavencentral-here-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/index.html)
 
 [![VS Code plugin](https://img.shields.io/badge/IDE-VS_Code-blueviolet.svg)](https://marketplace.visualstudio.com/items?itemName=richardwillis.vscode-spotless-gradle)
 [![IntelliJ plugin](https://img.shields.io/badge/IDE-IntelliJ-blueviolet.svg)](https://plugins.jetbrains.com/plugin/18321-spotless-gradle)
@@ -130,10 +130,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -146,7 +146,7 @@ Spotless requires JRE 11+ and Gradle 6.1.1 or newer.
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -309,8 +309,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -365,8 +365,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -446,7 +446,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -478,7 +478,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -510,7 +510,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -546,7 +546,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ### buf
 
-`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
+`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
 
 **WARNING** this step **must** be the first step in the chain, steps before it will be ignored. Thumbs up [this issue](https://github.com/bufbuild/buf/issues/1035) for a resolution, see [here](https://github.com/diffplug/spotless/pull/1208#discussion_r1264439669) for more details on the problem.
 
@@ -578,7 +578,7 @@ buf {
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -599,7 +599,7 @@ spotless {
 
 ## Flexmark
 
-`com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/FlexmarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java)
+`com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/FlexmarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java)
 
 [homepage](https://github.com/vsch/flexmark-java). Flexmark is a flexible Commonmark/Markdown parser that can be used to format Markdown files. It supports different [flavors of Markdown](https://github.com/vsch/flexmark-java#markdown-processor-emulation) and [many formatting options](https://github.com/vsch/flexmark-java/wiki/Markdown-Formatter#options).
 
@@ -618,7 +618,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -643,7 +643,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -681,7 +681,7 @@ sql.formatter.indent.size=4
 
 ## Maven POM
 
-`com.diffplug.gradle.spotless.PomExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/PomExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PomExtension.java)
+`com.diffplug.gradle.spotless.PomExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/PomExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PomExtension.java)
 
 ```gradle
 spotless {
@@ -730,7 +730,7 @@ spotless {
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -824,7 +824,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## Javascript
 
-- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
+- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
 
 ```gradle
 spotless {
@@ -887,7 +887,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -1007,7 +1007,7 @@ spotless {
 
 ## YAML
 
-- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
+- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
 
 ```gradle
 spotless {
@@ -1039,7 +1039,7 @@ spotless {
 
 ## Shell
 
-`com.diffplug.gradle.spotless.ShellExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/ShellExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ShellExtension.java)
+`com.diffplug.gradle.spotless.ShellExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/ShellExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ShellExtension.java)
 
 ```gradle
 spotless {
@@ -1075,7 +1075,7 @@ shfmt().pathToExe('/opt/homebrew/bin/shfmt')
 
 ## Gherkin
 
-- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
+- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
 
 ```gradle
 spotless {
@@ -1487,7 +1487,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -1567,9 +1567,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -1602,11 +1602,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.25.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From 4699244995f652d33a5a6b5376f15c7b87e56d91 Mon Sep 17 00:00:00 2001
From: runner <runner@fv-az1530-906>
Date: Tue, 4 Jun 2024 08:48:29 +0000
Subject: [PATCH 1703/2068] Published maven/2.44.0.BETA1

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 50fd82e9b6..e1d6cd7631 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.44.0.BETA1] - 2024-06-04
 ### Added
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
 * Skip execution in M2E (incremental) builds by default ([#1814](https://github.com/diffplug/spotless/issues/1814), [#2037](https://github.com/diffplug/spotless/issues/2037))
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index d9c63b5eb4..12efe3d5bd 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -8,8 +8,8 @@ output = [
   ].join('\n');
 -->
 [![MavenCentral](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Changelog](https://img.shields.io/badge/changelog-2.43.0-blue.svg)](CHANGES.md)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.43.0/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.44.0.BETA1-blue.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.44.0.BETA1/index.html)
 <!---freshmark /shields -->
 
 <!---freshmark javadoc

From 6bbe556f0f52b4b9f6fe9d28176e41cd53b6f49e Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 4 Jun 2024 02:00:08 -0700
Subject: [PATCH 1704/2068] Deal with `DirtyState.Calculation` is gone.

---
 .../java/com/diffplug/spotless/DirtyState.java    | 15 +++++++++++----
 .../java/com/diffplug/spotless/LintState.java     |  6 +++---
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/DirtyState.java b/lib/src/main/java/com/diffplug/spotless/DirtyState.java
index 706b8f14d4..a4f737a701 100644
--- a/lib/src/main/java/com/diffplug/spotless/DirtyState.java
+++ b/lib/src/main/java/com/diffplug/spotless/DirtyState.java
@@ -74,7 +74,14 @@ public static DirtyState of(Formatter formatter, File file) throws IOException {
 	}
 
 	public static DirtyState of(Formatter formatter, File file, byte[] rawBytes) {
-		String raw = new String(rawBytes, formatter.getEncoding());
+		return of(formatter, file, rawBytes, new String(rawBytes, formatter.getEncoding()));
+	}
+
+	public static DirtyState of(Formatter formatter, File file, byte[] rawBytes, String raw) {
+		return of(formatter, file, rawBytes, raw, new ValuePerStep<>(formatter));
+	}
+
+	public static DirtyState of(Formatter formatter, File file, byte[] rawBytes, String raw, ValuePerStep<Throwable> exceptionPerStep) {
 		// check that all characters were encodable
 		String encodingError = EncodingErrorMsg.msg(raw, rawBytes, formatter.getEncoding());
 		if (encodingError != null) {
@@ -84,7 +91,7 @@ public static DirtyState of(Formatter formatter, File file, byte[] rawBytes) {
 		String rawUnix = LineEnding.toUnix(raw);
 
 		// enforce the format
-		String formattedUnix = formatter.compute(rawUnix, file);
+		String formattedUnix = formatter.computeWithLint(rawUnix, file, exceptionPerStep);
 		// convert the line endings if necessary
 		String formatted = formatter.computeLineEndings(formattedUnix, file);
 
@@ -95,13 +102,13 @@ public static DirtyState of(Formatter formatter, File file, byte[] rawBytes) {
 		}
 
 		// F(input) != input, so we'll do a padded check
-		String doubleFormattedUnix = formatter.compute(formattedUnix, file);
+		String doubleFormattedUnix = formatter.computeWithLint(formattedUnix, file, exceptionPerStep);
 		if (doubleFormattedUnix.equals(formattedUnix)) {
 			// most dirty files are idempotent-dirty, so this is a quick-short circuit for that common case
 			return new DirtyState(formattedBytes);
 		}
 
-		PaddedCell cell = PaddedCell.check(formatter, file, rawUnix);
+		PaddedCell cell = PaddedCell.check(formatter, file, rawUnix, exceptionPerStep);
 		if (!cell.isResolvable()) {
 			return didNotConverge;
 		}
diff --git a/lib/src/main/java/com/diffplug/spotless/LintState.java b/lib/src/main/java/com/diffplug/spotless/LintState.java
index a0e01088ae..95254a923e 100644
--- a/lib/src/main/java/com/diffplug/spotless/LintState.java
+++ b/lib/src/main/java/com/diffplug/spotless/LintState.java
@@ -90,10 +90,10 @@ public static LintState of(Formatter formatter, File file) throws IOException {
 
 	public static LintState of(Formatter formatter, File file, byte[] rawBytes) {
 		var exceptions = new ValuePerStep<Throwable>(formatter);
-		var dirtyCalculation = DirtyState.of(formatter, file, rawBytes);
-		var dirty = dirtyCalculation.calculateDirtyState(exceptions);
+		var raw = new String(rawBytes, formatter.getEncoding());
+		var dirty = DirtyState.of(formatter, file, rawBytes, raw, exceptions);
 
-		String toLint = LineEnding.toUnix(dirty.isClean() || dirty.didNotConverge() ? dirtyCalculation.raw : new String(dirty.canonicalBytes(), formatter.getEncoding()));
+		String toLint = LineEnding.toUnix(dirty.isClean() || dirty.didNotConverge() ? raw : new String(dirty.canonicalBytes(), formatter.getEncoding()));
 
 		var lints = new ValuePerStep<List<Lint>>(formatter);
 		// if a step did not throw an exception, then it gets to check for lints if it wants

From ed1460df435122489cb4127bffd6a46c2ba29696 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 4 Jun 2024 17:14:12 +0800
Subject: [PATCH 1705/2068] Get rid of obtaining Gradle versions from projects

---
 .../gradle/spotless/FormatExtension.java      |  6 +++--
 .../gradle/spotless/SpotlessPlugin.java       |  5 +++--
 .../spotless/SpotlessPluginRedirect.java      | 22 ++++++++-----------
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index b589074915..27b81ccef5 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -17,6 +17,7 @@
 
 import static com.diffplug.gradle.spotless.PluginGradlePreconditions.requireElementsNonNull;
 import static com.diffplug.gradle.spotless.SpotlessPluginRedirect.badSemver;
+import static com.diffplug.gradle.spotless.SpotlessPluginRedirect.badSemverOfGradle;
 import static java.util.Objects.requireNonNull;
 
 import java.io.File;
@@ -45,6 +46,7 @@
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.plugins.BasePlugin;
 import org.gradle.api.tasks.TaskProvider;
+import org.gradle.util.GradleVersion;
 
 import com.diffplug.common.base.Preconditions;
 import com.diffplug.spotless.FormatExceptionPolicyStrict;
@@ -452,11 +454,11 @@ public String apply(String unixNewlines) {
 	 */
 	public void custom(String name, FormatterFunc formatter) {
 		requireNonNull(formatter, "formatter");
-		if (badSemver(getProject()) < badSemver(SpotlessPlugin.VER_GRADLE_minVersionForCustom)) {
+		if (badSemverOfGradle() < badSemver(SpotlessPlugin.VER_GRADLE_minVersionForCustom)) {
 			throw new GradleException("The 'custom' method is only available if you are using Gradle "
 					+ SpotlessPlugin.VER_GRADLE_minVersionForCustom
 					+ " or newer, this is "
-					+ getProject().getGradle().getGradleVersion());
+					+ GradleVersion.current().getVersion());
 		}
 		addStep(FormatterStep.createLazy(name, () -> globalState, SerializedFunction.alwaysReturns(formatter)));
 	}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPlugin.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPlugin.java
index 407f98dd0d..8b58e3eaca 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPlugin.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPlugin.java
@@ -20,6 +20,7 @@
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.plugins.BasePlugin;
+import org.gradle.util.GradleVersion;
 
 import com.diffplug.spotless.Jvm;
 import com.diffplug.spotless.SpotlessCache;
@@ -33,8 +34,8 @@ public class SpotlessPlugin implements Plugin<Project> {
 
 	@Override
 	public void apply(Project project) {
-		if (SpotlessPluginRedirect.gradleIsTooOld(project)) {
-			throw new GradleException("Spotless requires Gradle " + VER_GRADLE_min + " or newer, this was " + project.getGradle().getGradleVersion());
+		if (SpotlessPluginRedirect.gradleIsTooOld()) {
+			throw new GradleException("Spotless requires Gradle " + VER_GRADLE_min + " or newer, this was " + GradleVersion.current().getVersion());
 		}
 		if (Jvm.version() < MINIMUM_JRE) {
 			throw new GradleException("Spotless requires JRE " + MINIMUM_JRE + " or newer, this was " + JavaVersion.current() + ".\n"
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPluginRedirect.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPluginRedirect.java
index 9668042400..801390be2f 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPluginRedirect.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPluginRedirect.java
@@ -21,16 +21,13 @@
 import org.gradle.api.GradleException;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
+import org.gradle.util.GradleVersion;
 
 import com.diffplug.common.base.StringPrinter;
 
 public class SpotlessPluginRedirect implements Plugin<Project> {
 	private static final Pattern BAD_SEMVER = Pattern.compile("(\\d+)\\.(\\d+)");
 
-	static int badSemver(Project project) {
-		return badSemver(project.getGradle().getGradleVersion());
-	}
-
 	static int badSemver(String input) {
 		Matcher matcher = BAD_SEMVER.matcher(input);
 		if (!matcher.find() || matcher.start() != 0) {
@@ -41,18 +38,17 @@ static int badSemver(String input) {
 		return badSemver(Integer.parseInt(major), Integer.parseInt(minor));
 	}
 
+	static int badSemverOfGradle() {
+		return badSemver(GradleVersion.current().getVersion());
+	}
+
 	/** Ambiguous after 2147.483647.blah-blah */
 	private static int badSemver(int major, int minor) {
 		return major * 1_000_000 + minor;
 	}
 
-	static Boolean gradleIsTooOld;
-
-	static boolean gradleIsTooOld(Project project) {
-		if (gradleIsTooOld == null) {
-			gradleIsTooOld = badSemver(project) < badSemver(SpotlessPlugin.VER_GRADLE_min);
-		}
-		return gradleIsTooOld.booleanValue();
+	static boolean gradleIsTooOld() {
+		return badSemverOfGradle() < badSemver(SpotlessPlugin.VER_GRADLE_min);
 	}
 
 	@Override
@@ -76,8 +72,8 @@ public void apply(Project project) {
 				"",
 				"If you like the idea behind 'ratchetFrom', you should checkout spotless-changelog",
 				"https://github.com/diffplug/spotless-changelog");
-		if (gradleIsTooOld(project)) {
-			errorMsg = errorMsg.replace("To migrate:\n", "To migrate:\n- Upgrade Gradle to " + SpotlessPlugin.VER_GRADLE_min + " or newer (you're on " + project.getGradle().getGradleVersion() + ")\n");
+		if (gradleIsTooOld()) {
+			errorMsg = errorMsg.replace("To migrate:\n", "To migrate:\n- Upgrade Gradle to " + SpotlessPlugin.VER_GRADLE_min + " or newer (you're on " + GradleVersion.current().getVersion() + ")\n");
 		}
 		throw new GradleException(errorMsg);
 	}

From 2b1fb03a521672eb6bee2fc013615b1a199c3b72 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Wed, 5 Jun 2024 16:13:29 +0800
Subject: [PATCH 1706/2068] Shorten Serializable imports

---
 .../com/diffplug/spotless/extra/EclipseBasedStepBuilder.java  | 2 +-
 .../com/diffplug/spotless/extra/EquoBasedStepBuilder.java     | 2 +-
 .../com/diffplug/spotless/antlr4/Antlr4FormatterStep.java     | 2 +-
 .../main/java/com/diffplug/spotless/generic/IndentStep.java   | 4 +++-
 .../main/java/com/diffplug/spotless/generic/Jsr223Step.java   | 2 +-
 .../java/com/diffplug/spotless/gherkin/GherkinUtilsStep.java  | 2 +-
 .../com/diffplug/spotless/groovy/RemoveSemicolonsStep.java    | 2 +-
 .../java/com/diffplug/spotless/java/CleanthatJavaStep.java    | 2 +-
 .../com/diffplug/spotless/java/FormatAnnotationsStep.java     | 2 +-
 .../java/com/diffplug/spotless/java/GoogleJavaFormatStep.java | 2 +-
 .../main/java/com/diffplug/spotless/java/ImportOrderStep.java | 2 +-
 .../com/diffplug/spotless/java/PalantirJavaFormatStep.java    | 2 +-
 .../com/diffplug/spotless/java/RemoveUnusedImportsStep.java   | 3 ++-
 .../main/java/com/diffplug/spotless/json/JacksonJsonStep.java | 2 +-
 .../main/java/com/diffplug/spotless/json/JsonPatchStep.java   | 2 +-
 .../main/java/com/diffplug/spotless/json/JsonSimpleStep.java  | 2 +-
 .../main/java/com/diffplug/spotless/json/gson/GsonStep.java   | 2 +-
 .../main/java/com/diffplug/spotless/kotlin/DiktatStep.java    | 2 +-
 .../main/java/com/diffplug/spotless/kotlin/KtLintStep.java    | 2 +-
 lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java | 2 +-
 .../java/com/diffplug/spotless/markdown/FlexmarkStep.java     | 2 +-
 .../java/com/diffplug/spotless/markdown/FreshMarkStep.java    | 2 +-
 lib/src/main/java/com/diffplug/spotless/pom/SortPomStep.java  | 2 +-
 .../main/java/com/diffplug/spotless/scala/ScalaFmtStep.java   | 2 +-
 .../main/java/com/diffplug/spotless/yaml/JacksonYamlStep.java | 2 +-
 25 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/EclipseBasedStepBuilder.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/EclipseBasedStepBuilder.java
index c7460dc1fe..0dff3f6898 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/EclipseBasedStepBuilder.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/EclipseBasedStepBuilder.java
@@ -126,7 +126,7 @@ public void setPreferences(Iterable<File> settingsFiles) {
 		this.settingsFiles = settingsFiles;
 	}
 
-	static class EclipseStep implements java.io.Serializable {
+	static class EclipseStep implements Serializable {
 		private static final long serialVersionUID = 1;
 		private final String semanticVersion;
 		private final String formatterStepExt;
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 49ba1816ad..0bcdb5f36d 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
@@ -143,7 +143,7 @@ private P2Model createModelWithMirrors() {
 		return model;
 	}
 
-	static class EquoStep implements java.io.Serializable {
+	static class EquoStep implements Serializable {
 		private static final long serialVersionUID = 1;
 		private final String semanticVersion;
 		private final FileSignature.Promised settingsPromise;
diff --git a/lib/src/main/java/com/diffplug/spotless/antlr4/Antlr4FormatterStep.java b/lib/src/main/java/com/diffplug/spotless/antlr4/Antlr4FormatterStep.java
index 9405a401d1..e62ac29332 100644
--- a/lib/src/main/java/com/diffplug/spotless/antlr4/Antlr4FormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/antlr4/Antlr4FormatterStep.java
@@ -25,7 +25,7 @@
 import com.diffplug.spotless.Provisioner;
 import com.diffplug.spotless.ThrowingEx;
 
-public class Antlr4FormatterStep implements java.io.Serializable {
+public class Antlr4FormatterStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String MAVEN_COORDINATE = "com.khubla.antlr4formatter:antlr4-formatter:";
 	private static final String DEFAULT_VERSION = "1.2.1";
diff --git a/lib/src/main/java/com/diffplug/spotless/generic/IndentStep.java b/lib/src/main/java/com/diffplug/spotless/generic/IndentStep.java
index e4e2f84ca8..91155b1a79 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/IndentStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/IndentStep.java
@@ -15,12 +15,14 @@
  */
 package com.diffplug.spotless.generic;
 
+import java.io.Serializable;
+
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.SerializedFunction;
 
 /** Simple step which checks for consistent indentation characters. */
-public final class IndentStep implements java.io.Serializable {
+public final class IndentStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	final Type type;
diff --git a/lib/src/main/java/com/diffplug/spotless/generic/Jsr223Step.java b/lib/src/main/java/com/diffplug/spotless/generic/Jsr223Step.java
index 2e67e5a465..572bf13b95 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/Jsr223Step.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/Jsr223Step.java
@@ -28,7 +28,7 @@
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
 
-public final class Jsr223Step implements java.io.Serializable {
+public final class Jsr223Step implements Serializable {
 	private static final long serialVersionUID = 1L;
 	@Nullable
 	private final JarState.Promised jarState;
diff --git a/lib/src/main/java/com/diffplug/spotless/gherkin/GherkinUtilsStep.java b/lib/src/main/java/com/diffplug/spotless/gherkin/GherkinUtilsStep.java
index 6cb35ad8da..63cdd7a786 100644
--- a/lib/src/main/java/com/diffplug/spotless/gherkin/GherkinUtilsStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/gherkin/GherkinUtilsStep.java
@@ -25,7 +25,7 @@
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
 
-public class GherkinUtilsStep implements java.io.Serializable {
+public class GherkinUtilsStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String MAVEN_COORDINATE = "io.cucumber:gherkin-utils:";
 	private static final String DEFAULT_VERSION = "9.0.0";
diff --git a/lib/src/main/java/com/diffplug/spotless/groovy/RemoveSemicolonsStep.java b/lib/src/main/java/com/diffplug/spotless/groovy/RemoveSemicolonsStep.java
index 0f1582c305..6dc3185ef6 100644
--- a/lib/src/main/java/com/diffplug/spotless/groovy/RemoveSemicolonsStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/groovy/RemoveSemicolonsStep.java
@@ -27,7 +27,7 @@
  *
  * @author Jose Luis Badano
  */
-public final class RemoveSemicolonsStep implements java.io.Serializable {
+public final class RemoveSemicolonsStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String NAME = "Remove unnecessary semicolons";
 
diff --git a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
index 875e358831..95d1c72760 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
@@ -36,7 +36,7 @@
  * @author Benoit Lacelle
  */
 // https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep
-public final class CleanthatJavaStep implements java.io.Serializable {
+public final class CleanthatJavaStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String NAME = "cleanthat";
 	private static final String MAVEN_COORDINATE = "io.github.solven-eu.cleanthat:java";
diff --git a/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java b/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java
index f557e0cb60..c418ab8f36 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java
@@ -37,7 +37,7 @@
  * <p>
  * Note: A type annotation is an annotation that is meta-annotated with {@code @Target({ElementType.TYPE_USE})}.
  */
-public final class FormatAnnotationsStep implements java.io.Serializable {
+public final class FormatAnnotationsStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	/**
diff --git a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
index 8d05e85c61..b26f098cd5 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
@@ -26,7 +26,7 @@
 import com.diffplug.spotless.Provisioner;
 
 /** Wraps up <a href="https://github.com/google/google-java-format">google-java-format</a> as a FormatterStep. */
-public class GoogleJavaFormatStep implements java.io.Serializable {
+public class GoogleJavaFormatStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String DEFAULT_STYLE = "GOOGLE";
 	private static final boolean DEFAULT_REFLOW_LONG_STRINGS = false;
diff --git a/lib/src/main/java/com/diffplug/spotless/java/ImportOrderStep.java b/lib/src/main/java/com/diffplug/spotless/java/ImportOrderStep.java
index 60f16caf2b..1e2c8a81c8 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/ImportOrderStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/ImportOrderStep.java
@@ -42,7 +42,7 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
-public final class ImportOrderStep implements java.io.Serializable {
+public final class ImportOrderStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final boolean WILDCARDS_LAST_DEFAULT = false;
 	private static final boolean SEMANTIC_SORT_DEFAULT = false;
diff --git a/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
index e27e8a78d5..3b7d7c17a9 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
@@ -23,7 +23,7 @@
 
 /** Wraps up <a href="https://github.com/palantir/palantir-java-format">palantir-java-format</a> fork of
  * <a href="https://github.com/google/google-java-format">google-java-format</a> as a FormatterStep. */
-public class PalantirJavaFormatStep implements java.io.Serializable {
+public class PalantirJavaFormatStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final boolean DEFAULT_FORMAT_JAVADOC = false;
 	private static final String DEFAULT_STYLE = "PALANTIR";
diff --git a/lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java b/lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java
index 01a4cc730a..65a5b3216a 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java
@@ -15,6 +15,7 @@
  */
 package com.diffplug.spotless.java;
 
+import java.io.Serializable;
 import java.util.List;
 import java.util.Objects;
 
@@ -22,7 +23,7 @@
 import com.diffplug.spotless.Provisioner;
 
 /** Uses google-java-format or cleanthat.UnnecessaryImport, but only to remove unused imports. */
-public class RemoveUnusedImportsStep implements java.io.Serializable {
+public class RemoveUnusedImportsStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String NAME = "removeUnusedImports";
 
diff --git a/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java b/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java
index 080bb735d5..f1a2b9ad93 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java
@@ -29,7 +29,7 @@
  * Simple YAML formatter which reformats the file according to Jackson YAMLFactory.
  */
 // https://stackoverflow.com/questions/14515994/convert-json-string-to-pretty-print-json-output-using-jackson
-public class JacksonJsonStep implements java.io.Serializable {
+public class JacksonJsonStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String MAVEN_COORDINATE = "com.fasterxml.jackson.core:jackson-databind:";
 	private static final String DEFAULT_VERSION = "2.17.1";
diff --git a/lib/src/main/java/com/diffplug/spotless/json/JsonPatchStep.java b/lib/src/main/java/com/diffplug/spotless/json/JsonPatchStep.java
index 5050dbba10..2589e986a2 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/JsonPatchStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/JsonPatchStep.java
@@ -29,7 +29,7 @@
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
 
-public class JsonPatchStep implements java.io.Serializable {
+public class JsonPatchStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String MAVEN_COORDINATE = "com.flipkart.zjsonpatch:zjsonpatch";
 	private static final String DEFAULT_VERSION = "0.4.16";
diff --git a/lib/src/main/java/com/diffplug/spotless/json/JsonSimpleStep.java b/lib/src/main/java/com/diffplug/spotless/json/JsonSimpleStep.java
index 2f1d1e7ea3..c42bf3cf9c 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/JsonSimpleStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/JsonSimpleStep.java
@@ -29,7 +29,7 @@
 /**
  * Simple JSON formatter which reformats the file according to the org.json library's default pretty-printing, but has no ability to customise more than the indentation size.
  */
-public final class JsonSimpleStep implements java.io.Serializable {
+public final class JsonSimpleStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String MAVEN_COORDINATE = "org.json:json:";
 	private static final String DEFAULT_VERSION = "20210307";
diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
index b61910913d..d84aae5a57 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
@@ -25,7 +25,7 @@
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
 
-public class GsonStep implements java.io.Serializable {
+public class GsonStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String MAVEN_COORDINATES = "com.google.code.gson:gson";
 	private static final String INCOMPATIBLE_ERROR_MESSAGE = "There was a problem interacting with Gson; maybe you set an incompatible version?";
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
index 215b1c290b..425786d64e 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
@@ -26,7 +26,7 @@
 import com.diffplug.spotless.*;
 
 /** Wraps up <a href="https://github.com/cqfn/diKTat">diktat</a> as a FormatterStep. */
-public class DiktatStep implements java.io.Serializable {
+public class DiktatStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private final JarState.Promised jarState;
 	private final String versionDiktat;
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index 0f154e1ef8..5728eefa66 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -34,7 +34,7 @@
 import com.diffplug.spotless.Provisioner;
 
 /** Wraps up <a href="https://github.com/pinterest/ktlint">ktlint</a> as a FormatterStep. */
-public class KtLintStep implements java.io.Serializable {
+public class KtLintStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String DEFAULT_VERSION = "1.2.1";
 	private static final String NAME = "ktlint";
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
index 69fb36fdb1..cf76d5f8ae 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
@@ -34,7 +34,7 @@
 /**
  * Wraps up <a href="https://github.com/facebookincubator/ktfmt">ktfmt</a> as a FormatterStep.
  */
-public class KtfmtStep implements java.io.Serializable {
+public class KtfmtStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String DEFAULT_VERSION = "0.49";
 	private static final String NAME = "ktfmt";
diff --git a/lib/src/main/java/com/diffplug/spotless/markdown/FlexmarkStep.java b/lib/src/main/java/com/diffplug/spotless/markdown/FlexmarkStep.java
index 64b09b7fbd..359e5b5de0 100644
--- a/lib/src/main/java/com/diffplug/spotless/markdown/FlexmarkStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/markdown/FlexmarkStep.java
@@ -25,7 +25,7 @@
 import com.diffplug.spotless.Provisioner;
 
 /** A step for <a href="https://github.com/vsch/flexmark-java">flexmark-java</a>. */
-public class FlexmarkStep implements java.io.Serializable {
+public class FlexmarkStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String DEFAULT_VERSION = "0.64.8";
 	private static final String MAVEN_COORDINATE = "com.vladsch.flexmark:flexmark-all:";
diff --git a/lib/src/main/java/com/diffplug/spotless/markdown/FreshMarkStep.java b/lib/src/main/java/com/diffplug/spotless/markdown/FreshMarkStep.java
index 123b860eb7..4786474657 100644
--- a/lib/src/main/java/com/diffplug/spotless/markdown/FreshMarkStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/markdown/FreshMarkStep.java
@@ -37,7 +37,7 @@
 import com.diffplug.spotless.Provisioner;
 
 /** A step for <a href="https://github.com/diffplug/freshmark">FreshMark</a>. */
-public class FreshMarkStep implements java.io.Serializable {
+public class FreshMarkStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	private static final String DEFAULT_VERSION = "1.3.1";
diff --git a/lib/src/main/java/com/diffplug/spotless/pom/SortPomStep.java b/lib/src/main/java/com/diffplug/spotless/pom/SortPomStep.java
index 21468db7f9..b082c021c4 100644
--- a/lib/src/main/java/com/diffplug/spotless/pom/SortPomStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/pom/SortPomStep.java
@@ -24,7 +24,7 @@
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
 
-public class SortPomStep implements java.io.Serializable {
+public class SortPomStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String MAVEN_COORDINATE = "com.github.ekryd.sortpom:sortpom-sorter:";
 	public static final String NAME = "sortPom";
diff --git a/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java b/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java
index 9cb5852b94..9a2ec248ee 100644
--- a/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java
@@ -30,7 +30,7 @@
 import com.diffplug.spotless.Provisioner;
 
 /** Wraps up <a href="https://github.com/scalameta/scalafmt">scalafmt</a> as a FormatterStep. */
-public class ScalaFmtStep implements java.io.Serializable {
+public class ScalaFmtStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	static final String DEFAULT_VERSION = "3.8.1";
diff --git a/lib/src/main/java/com/diffplug/spotless/yaml/JacksonYamlStep.java b/lib/src/main/java/com/diffplug/spotless/yaml/JacksonYamlStep.java
index 03515800f8..45c961b2e6 100644
--- a/lib/src/main/java/com/diffplug/spotless/yaml/JacksonYamlStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/yaml/JacksonYamlStep.java
@@ -30,7 +30,7 @@
  */
 // https://stackoverflow.com/questions/14515994/convert-json-string-to-pretty-print-json-output-using-jackson
 // https://stackoverflow.com/questions/60891174/i-want-to-load-a-yaml-file-possibly-edit-the-data-and-then-dump-it-again-how
-public class JacksonYamlStep implements java.io.Serializable {
+public class JacksonYamlStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String MAVEN_COORDINATE = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:";
 	private static final String DEFAULT_VERSION = "2.14.1";

From d41e6bce77048aba12b09822cf541bd940d07950 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Wed, 5 Jun 2024 16:15:28 +0800
Subject: [PATCH 1707/2068] Bump self used Spotless plugin to 7.0.0.BETA1

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 942ac646ae..478549f7ab 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-	id 'com.diffplug.spotless' version '6.25.0' apply false
+	id 'com.diffplug.spotless' version '7.0.0.BETA1' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
 	id 'com.gradle.plugin-publish' version '1.2.1' apply false
 	// https://github.com/gradle-nexus/publish-plugin/releases

From 7145a101976a9a8d124b3172e407fc850e1a2d30 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Wed, 5 Jun 2024 16:29:14 +0800
Subject: [PATCH 1708/2068] Add Java 22 into test matrix

---
 .github/workflows/ci.yml                                     | 2 +-
 .../diffplug/gradle/spotless/GradleIntegrationHarness.java   | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5e015ed123..4c9f399035 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -43,7 +43,7 @@ jobs:
       matrix:
         kind: [maven, gradle]
         # Test on the latest Java version once Gradle & Maven support it.
-        jre: [11, 17, 21]
+        jre: [11, 17, 21, 22]
         os: [ubuntu-latest]
         include:
           # test windows at the diagonals of the above matrix
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
index 8ef71ec020..0084893274 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
@@ -54,8 +54,11 @@ public enum GradleVersionSupport {
 		GradleVersionSupport(String version) {
 			String minVersionForRunningJRE;
 			switch (Jvm.version()) {
-			case 22:
+			case 23:
 				// TODO: https://docs.gradle.org/current/userguide/compatibility.html
+			case 22:
+				minVersionForRunningJRE = "8.8";
+				break;
 			case 21:
 				minVersionForRunningJRE = "8.5";
 				break;

From 8c3fe820cf61366b42e9d14ce947232e4aae2d75 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2024 21:43:33 +0000
Subject: [PATCH 1709/2068] Update plugin com.github.spotbugs to v6.0.16

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 478549f7ab..f9353248b9 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,7 +12,7 @@ plugins {
 	// https://github.com/gradle-nexus/publish-plugin/releases
 	id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
-	id 'com.github.spotbugs' version '6.0.15' apply false
+	id 'com.github.spotbugs' version '6.0.16' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
 	id 'com.diffplug.spotless-changelog' version '3.0.2' apply false
 	// https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md

From 3412497e243ff8ca385bcf571204779641ce84b2 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 11 Jun 2024 11:50:39 +0800
Subject: [PATCH 1710/2068] Bump Ktlint to 1.3.0

https://github.com/pinterest/ktlint/releases/tag/1.3.0
---
 CHANGES.md                                                     | 2 ++
 lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java | 2 +-
 plugin-gradle/CHANGES.md                                       | 2 ++
 plugin-maven/CHANGES.md                                        | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 40e3fa9289..81e67e1416 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Changes
+* Bump default `ktlint` version to latest `1.2.1` -> `1.3.0`. ([#2165](https://github.com/diffplug/spotless/pull/2165))
 
 ## [3.0.0.BETA1] - 2024-06-04
 ### Added
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index 5728eefa66..991d082257 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -36,7 +36,7 @@
 /** Wraps up <a href="https://github.com/pinterest/ktlint">ktlint</a> as a FormatterStep. */
 public class KtLintStep implements Serializable {
 	private static final long serialVersionUID = 1L;
-	private static final String DEFAULT_VERSION = "1.2.1";
+	private static final String DEFAULT_VERSION = "1.3.0";
 	private static final String NAME = "ktlint";
 	private static final String MAVEN_COORDINATE_0_DOT = "com.pinterest:ktlint:";
 	private static final String MAVEN_COORDINATE_1_DOT = "com.pinterest.ktlint:ktlint-cli:";
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 7ae0258d6f..b09160fd73 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Changes
+* Bump default `ktlint` version to latest `1.2.1` -> `1.3.0`. ([#2165](https://github.com/diffplug/spotless/pull/2165))
 
 ## [7.0.0.BETA1] - 2024-06-04
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index e1d6cd7631..886dfdf753 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Changes
+* Bump default `ktlint` version to latest `1.2.1` -> `1.3.0`. ([#2165](https://github.com/diffplug/spotless/pull/2165))
 
 ## [2.44.0.BETA1] - 2024-06-04
 ### Added

From fa442e2f43bc54c52c24d76369340975ffd35494 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 16 Jun 2024 09:44:48 +0800
Subject: [PATCH 1711/2068] Update plugin com.github.spotbugs to v6.0.17
 (#2174)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index f9353248b9..8e661b0b29 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,7 +12,7 @@ plugins {
 	// https://github.com/gradle-nexus/publish-plugin/releases
 	id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
-	id 'com.github.spotbugs' version '6.0.16' apply false
+	id 'com.github.spotbugs' version '6.0.17' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
 	id 'com.diffplug.spotless-changelog' version '3.0.2' apply false
 	// https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md

From 025d6449bcc05831f8d4a1e85f165ef9955edbe9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 16 Jun 2024 09:45:05 +0800
Subject: [PATCH 1712/2068] Update plugin com.gradle.develocity to v3.17.5
 (#2170)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 8e661b0b29..2ab37dbad8 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -20,7 +20,7 @@ plugins {
 	// https://github.com/davidburstrom/version-compatibility-gradle-plugin/tags
 	id 'io.github.davidburstrom.version-compatibility' version '0.5.0' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.develocity
-	id 'com.gradle.develocity' version '3.17.4'
+	id 'com.gradle.develocity' version '3.17.5'
 	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
 	id 'dev.equo.ide' version '1.7.6' apply false
 }

From f6694ece6025cd0fc9f05a3104f72ac447b99ec9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nivaldo=20Bondan=C3=A7a?= <hick209@gmail.com>
Date: Tue, 18 Jun 2024 09:31:56 -0400
Subject: [PATCH 1713/2068] Fix compatibility issue introduced by ktfmt 0.51
 (#2172)

Co-authored-by: Goooler <wangzongler@gmail.com>
---
 CHANGES.md                                    |   4 +
 lib/build.gradle                              |   2 +-
 .../glue/ktfmt/KtfmtFormatterFunc.java        |  42 +---
 .../spotless/glue/ktfmt/KtfmtStyle.java       |   4 +-
 .../diffplug/spotless/kotlin/KtfmtStep.java   | 210 +++++++++++++-----
 plugin-gradle/CHANGES.md                      |   4 +
 plugin-gradle/README.md                       |  12 +-
 .../gradle/spotless/BaseKotlinExtension.java  |  10 +-
 .../gradle/spotless/KotlinExtensionTest.java  |   4 +-
 plugin-maven/CHANGES.md                       |   4 +
 plugin-maven/README.md                        |  10 +-
 .../diffplug/spotless/maven/kotlin/Ktfmt.java |   6 +-
 .../spotless/maven/kotlin/KtfmtTest.java      |   6 +-
 testlib/build.gradle                          |   5 +-
 .../spotless/kotlin/KtfmtStepTest.java        |  24 +-
 15 files changed, 245 insertions(+), 102 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 81e67e1416..68764ad9bf 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changes
 * Bump default `ktlint` version to latest `1.2.1` -> `1.3.0`. ([#2165](https://github.com/diffplug/spotless/pull/2165))
+* Bump default `ktfmt` version to latest `0.49` -> `0.51`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
+* Renamed property `ktfmt` option `removeUnusedImport` -> `removeUnusedImports` to match `ktfmt`.  ([#2172](https://github.com/diffplug/spotless/pull/2172))
+### Fixed
+* Fix compatibility issue introduced by `ktfmt` `0.51`. ([#2172](https://github.com/diffplug/spotless/issues/2172))
 
 ## [3.0.0.BETA1] - 2024-06-04
 ### Added
diff --git a/lib/build.gradle b/lib/build.gradle
index c82c648e07..24dddfe396 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -101,7 +101,7 @@ dependencies {
 	jacksonCompileOnly "com.fasterxml.jackson.core:jackson-databind:$VER_JACKSON"
 	jacksonCompileOnly "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$VER_JACKSON"
 	// ktfmt
-	ktfmtCompileOnly "com.facebook:ktfmt:0.49"
+	ktfmtCompileOnly "com.facebook:ktfmt:0.51"
 	ktfmtCompileOnly("com.google.googlejavaformat:google-java-format") {
 		version {
 			strictly '1.7' // for JDK 8 compatibility
diff --git a/lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtFormatterFunc.java b/lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtFormatterFunc.java
index 1d191c05d5..50925a5a5d 100644
--- a/lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtFormatterFunc.java
+++ b/lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtFormatterFunc.java
@@ -15,8 +15,6 @@
  */
 package com.diffplug.spotless.glue.ktfmt;
 
-import java.lang.reflect.Method;
-
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
@@ -34,7 +32,7 @@ public final class KtfmtFormatterFunc implements FormatterFunc {
 	private final KtfmtFormattingOptions ktfmtFormattingOptions;
 
 	public KtfmtFormatterFunc() {
-		this(KtfmtStyle.DEFAULT, null);
+		this(KtfmtStyle.META, null);
 	}
 
 	public KtfmtFormatterFunc(@Nonnull KtfmtStyle style) {
@@ -42,7 +40,7 @@ public KtfmtFormatterFunc(@Nonnull KtfmtStyle style) {
 	}
 
 	public KtfmtFormatterFunc(@Nullable KtfmtFormattingOptions ktfmtFormattingOptions) {
-		this(KtfmtStyle.DEFAULT, ktfmtFormattingOptions);
+		this(KtfmtStyle.META, ktfmtFormattingOptions);
 	}
 
 	public KtfmtFormatterFunc(@Nonnull KtfmtStyle style, @Nullable KtfmtFormattingOptions ktfmtFormattingOptions) {
@@ -59,11 +57,8 @@ public String apply(@Nonnull String input) throws Exception {
 	private FormattingOptions createFormattingOptions() throws Exception {
 		FormattingOptions formattingOptions;
 		switch (style) {
-		case DEFAULT:
-			formattingOptions = new FormattingOptions();
-			break;
-		case DROPBOX:
-			formattingOptions = Formatter.DROPBOX_FORMAT;
+		case META:
+			formattingOptions = Formatter.META_FORMAT;
 			break;
 		case GOOGLE:
 			formattingOptions = Formatter.GOOGLE_FORMAT;
@@ -72,30 +67,17 @@ private FormattingOptions createFormattingOptions() throws Exception {
 			formattingOptions = Formatter.KOTLINLANG_FORMAT;
 			break;
 		default:
-			throw new IllegalStateException("Unknown formatting option");
+			throw new IllegalStateException("Unknown formatting option " + style);
 		}
 
 		if (ktfmtFormattingOptions != null) {
-			try {
-				formattingOptions = formattingOptions.copy(
-						formattingOptions.getStyle(),
-						ktfmtFormattingOptions.getMaxWidth().orElse(formattingOptions.getMaxWidth()),
-						ktfmtFormattingOptions.getBlockIndent().orElse(formattingOptions.getBlockIndent()),
-						ktfmtFormattingOptions.getContinuationIndent().orElse(formattingOptions.getContinuationIndent()),
-						ktfmtFormattingOptions.getRemoveUnusedImport().orElse(formattingOptions.getRemoveUnusedImports()),
-						formattingOptions.getDebuggingPrintOpsAfterFormatting(),
-						formattingOptions.getManageTrailingCommas());
-			} catch (NoSuchMethodError e) {
-				//noinspection JavaReflectionMemberAccess, ABI change from ktfmt 0.47
-				Method copyMethod = formattingOptions.getClass().getMethod("copy", FormattingOptions.Style.class, int.class, int.class, int.class, boolean.class, boolean.class);
-				formattingOptions = (FormattingOptions) copyMethod.invoke(formattingOptions,
-						formattingOptions.getStyle(),
-						ktfmtFormattingOptions.getMaxWidth().orElse(formattingOptions.getMaxWidth()),
-						ktfmtFormattingOptions.getBlockIndent().orElse(formattingOptions.getBlockIndent()),
-						ktfmtFormattingOptions.getContinuationIndent().orElse(formattingOptions.getContinuationIndent()),
-						ktfmtFormattingOptions.getRemoveUnusedImport().orElse(formattingOptions.getRemoveUnusedImports()),
-						formattingOptions.getDebuggingPrintOpsAfterFormatting());
-			}
+			formattingOptions = formattingOptions.copy(
+					ktfmtFormattingOptions.getMaxWidth().orElse(formattingOptions.getMaxWidth()),
+					ktfmtFormattingOptions.getBlockIndent().orElse(formattingOptions.getBlockIndent()),
+					ktfmtFormattingOptions.getContinuationIndent().orElse(formattingOptions.getContinuationIndent()),
+					formattingOptions.getManageTrailingCommas(),
+					ktfmtFormattingOptions.getRemoveUnusedImport().orElse(formattingOptions.getRemoveUnusedImports()),
+					formattingOptions.getDebuggingPrintOpsAfterFormatting());
 		}
 
 		return formattingOptions;
diff --git a/lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtStyle.java b/lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtStyle.java
index 34b81175ec..47aea7eedd 100644
--- a/lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtStyle.java
+++ b/lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtStyle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 DiffPlug
+ * Copyright 2022-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,5 +16,5 @@
 package com.diffplug.spotless.glue.ktfmt;
 
 public enum KtfmtStyle {
-	DEFAULT, DROPBOX, GOOGLE, KOTLIN_LANG
+	META, GOOGLE, KOTLIN_LANG
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
index cf76d5f8ae..5e1cd7f00a 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
@@ -16,12 +16,15 @@
 package com.diffplug.spotless.kotlin;
 
 import static com.diffplug.spotless.kotlin.KtfmtStep.Style.DEFAULT;
+import static com.diffplug.spotless.kotlin.KtfmtStep.Style.DROPBOX;
+import static com.diffplug.spotless.kotlin.KtfmtStep.Style.META;
 
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Objects;
+import java.util.Optional;
 
 import javax.annotation.Nullable;
 
@@ -32,11 +35,11 @@
 import com.diffplug.spotless.ThrowingEx;
 
 /**
- * Wraps up <a href="https://github.com/facebookincubator/ktfmt">ktfmt</a> as a FormatterStep.
+ * Wraps up <a href="https://github.com/facebook/ktfmt">ktfmt</a> as a FormatterStep.
  */
 public class KtfmtStep implements Serializable {
 	private static final long serialVersionUID = 1L;
-	private static final String DEFAULT_VERSION = "0.49";
+	private static final String DEFAULT_VERSION = "0.51";
 	private static final String NAME = "ktfmt";
 	private static final String MAVEN_COORDINATE = "com.facebook:ktfmt:";
 
@@ -64,17 +67,32 @@ private KtfmtStep(String version,
 	/**
 	 * Used to allow multiple style option through formatting options and since when is each of them available.
 	 *
-	 * @see <a href="https://github.com/facebookincubator/ktfmt/blob/38486b0fb2edcabeba5540fcb69c6f1fa336c331/core/src/main/java/com/facebook/ktfmt/Formatter.kt#L47-L80">ktfmt source</a>
+	 * @see <a href="https://github.com/facebook/ktfmt/blob/v0.51/core/src/main/java/com/facebook/ktfmt/format/Formatter.kt#L45-L68">ktfmt source</a>
 	 */
 	public enum Style {
-		DEFAULT("DEFAULT_FORMAT", "0.0"), DROPBOX("DROPBOX_FORMAT", "0.11"), GOOGLE("GOOGLE_FORMAT", "0.21"), KOTLINLANG("KOTLINLANG_FORMAT", "0.21");
+		// @formatter:off
+		DEFAULT("DEFAULT_FORMAT", "0.0", "0.50"),
+		META("META_FORMAT", "0.51"),
+		DROPBOX("DROPBOX_FORMAT", "0.16", "0.50"),
+		GOOGLE("GOOGLE_FORMAT", "0.19"),
+		KOTLINLANG("KOTLINLANG_FORMAT", "0.21"),
+		;
+		// @formatter:on
 
 		final private String format;
 		final private String since;
+		final private @Nullable String until;
 
 		Style(String format, String since) {
 			this.format = format;
 			this.since = since;
+			this.until = null;
+		}
+
+		Style(String format, String since, @Nullable String until) {
+			this.format = format;
+			this.since = since;
+			this.until = until;
 		}
 
 		String getFormat() {
@@ -84,6 +102,12 @@ String getFormat() {
 		String getSince() {
 			return since;
 		}
+
+		/** Last version (inclusive) that supports this style */
+		@Nullable
+		String getUntil() {
+			return until;
+		}
 	}
 
 	public static class KtfmtFormattingOptions implements Serializable {
@@ -100,7 +124,7 @@ public static class KtfmtFormattingOptions implements Serializable {
 		private Integer continuationIndent = null;
 
 		@Nullable
-		private Boolean removeUnusedImport = null;
+		private Boolean removeUnusedImports = null;
 
 		public KtfmtFormattingOptions() {}
 
@@ -108,11 +132,11 @@ public KtfmtFormattingOptions(
 				@Nullable Integer maxWidth,
 				@Nullable Integer blockIndent,
 				@Nullable Integer continuationIndent,
-				@Nullable Boolean removeUnusedImport) {
+				@Nullable Boolean removeUnusedImports) {
 			this.maxWidth = maxWidth;
 			this.blockIndent = blockIndent;
 			this.continuationIndent = continuationIndent;
-			this.removeUnusedImport = removeUnusedImport;
+			this.removeUnusedImports = removeUnusedImports;
 		}
 
 		public void setMaxWidth(int maxWidth) {
@@ -127,18 +151,11 @@ public void setContinuationIndent(int continuationIndent) {
 			this.continuationIndent = continuationIndent;
 		}
 
-		public void setRemoveUnusedImport(boolean removeUnusedImport) {
-			this.removeUnusedImport = removeUnusedImport;
+		public void setRemoveUnusedImports(boolean removeUnusedImports) {
+			this.removeUnusedImports = removeUnusedImports;
 		}
 	}
 
-	/**
-	 * The <code>format</code> method is available in the link below.
-	 *
-	 * @see <a href="https://github.com/facebookincubator/ktfmt/blob/38486b0fb2edcabeba5540fcb69c6f1fa336c331/core/src/main/java/com/facebook/ktfmt/Formatter.kt#L82-L99">ktfmt source</a>
-	 */
-	static final String FORMATTER_METHOD = "format";
-
 	/** Creates a step which formats everything - code, import order, and unused imports. */
 	public static FormatterStep create(Provisioner provisioner) {
 		return create(defaultVersion(), provisioner);
@@ -169,7 +186,6 @@ private State equalityState() {
 
 	private static final class State implements Serializable {
 		private static final long serialVersionUID = 1L;
-		private static final String PACKAGE = "com.facebook.ktfmt";
 		private final String version;
 		@Nullable
 		private final Style style;
@@ -185,16 +201,15 @@ private static final class State implements Serializable {
 			this.options = options;
 			this.style = style;
 			this.jarState = jarState;
+			validateStyle();
+			validateOptions();
 		}
 
 		FormatterFunc createFormat() throws Exception {
 			final ClassLoader classLoader = jarState.getClassLoader();
 
-			if (BadSemver.version(version) < BadSemver.version(0, 32)) {
-				if (options != null) {
-					throw new IllegalStateException("Ktfmt formatting options supported for version 0.32 and later");
-				}
-				return getFormatterFuncFallback(style != null ? style : DEFAULT, classLoader);
+			if (BadSemver.version(version) < BadSemver.version(0, 51)) {
+				return new KtfmtFormatterFuncCompat(version, style, options, classLoader).getFormatterFunc();
 			}
 
 			final Class<?> formatterFuncClass = classLoader.loadClass("com.diffplug.spotless.glue.ktfmt.KtfmtFormatterFunc");
@@ -215,7 +230,7 @@ FormatterFunc createFormat() throws Exception {
 			final Constructor<?> optionsConstructor = ktfmtFormattingOptionsClass.getConstructor(
 					Integer.class, Integer.class, Integer.class, Boolean.class);
 			final Object ktfmtFormattingOptions = optionsConstructor.newInstance(
-					options.maxWidth, options.blockIndent, options.continuationIndent, options.removeUnusedImport);
+					options.maxWidth, options.blockIndent, options.continuationIndent, options.removeUnusedImports);
 			if (style == null) {
 				final Constructor<?> constructor = formatterFuncClass.getConstructor(ktfmtFormattingOptionsClass);
 				return (FormatterFunc) constructor.newInstance(ktfmtFormattingOptions);
@@ -225,16 +240,42 @@ FormatterFunc createFormat() throws Exception {
 			return (FormatterFunc) constructor.newInstance(ktfmtStyle, ktfmtFormattingOptions);
 		}
 
+		private void validateOptions() {
+			if (BadSemver.version(version) < BadSemver.version(0, 11)) {
+				if (options != null) {
+					throw new IllegalStateException("Ktfmt formatting options supported for version 0.11 and later");
+				}
+				return;
+			}
+
+			if (BadSemver.version(version) < BadSemver.version(0, 17)) {
+				if (options != null && options.removeUnusedImports != null) {
+					throw new IllegalStateException("Ktfmt formatting option `removeUnusedImports` supported for version 0.17 and later");
+				}
+			}
+		}
+
+		private void validateStyle() {
+			if (style == null) {
+				return;
+			}
+
+			if (BadSemver.version(version) < BadSemver.version(style.since)) {
+				throw new IllegalStateException(String.format("The style %s is available from version %s (current version: %s)", style.name(), style.since, version));
+			}
+			if (style.until != null && BadSemver.version(version) > BadSemver.version(style.until)) {
+				throw new IllegalStateException(String.format("The style %s is no longer available from version %s (current version: %s)", style.name(), style.until, version));
+			}
+		}
+
 		/**
 		 * @param style
 		 * @return com.diffplug.spotless.glue.ktfmt.KtfmtStyle enum value name
 		 */
 		private String getKtfmtStyleOption(Style style) {
 			switch (style) {
-			case DEFAULT:
-				return "DEFAULT";
-			case DROPBOX:
-				return "DROPBOX";
+			case META:
+				return "META";
 			case GOOGLE:
 				return "GOOGLE";
 			case KOTLINLANG:
@@ -243,48 +284,117 @@ private String getKtfmtStyleOption(Style style) {
 				throw new IllegalStateException("Unsupported style: " + style);
 			}
 		}
+	}
+
+	private static final class KtfmtFormatterFuncCompat {
+		private static final String PACKAGE = "com.facebook.ktfmt";
+
+		/**
+		 * The <code>format</code> method is available in the link below.
+		 *
+		 * @see <a href="https://github.com/facebook/ktfmt/blob/v0.51/core/src/main/java/com/facebook/ktfmt/format/Formatter.kt#L78-L94">ktfmt source</a>
+		 */
+		static final String FORMATTER_METHOD = "format";
+
+		private final String version;
+		private final Style style;
+		private final KtfmtFormattingOptions options;
+		private final ClassLoader classLoader;
+
+		public KtfmtFormatterFuncCompat(String currentVersion, @Nullable Style style, @Nullable KtfmtFormattingOptions options, ClassLoader classLoader) {
+			this.version = currentVersion;
+			this.style = style;
+			this.options = options;
+			this.classLoader = classLoader;
+		}
 
-		private FormatterFunc getFormatterFuncFallback(Style style, ClassLoader classLoader) {
+		public FormatterFunc getFormatterFunc() {
 			return input -> {
 				try {
-					if (style == DEFAULT) {
-						Method formatterMethod = getFormatterClazz(classLoader).getMethod(FORMATTER_METHOD, String.class);
-						return (String) formatterMethod.invoke(getFormatterClazz(classLoader), input);
-					} else {
-						Method formatterMethod = getFormatterClazz(classLoader).getMethod(FORMATTER_METHOD,
-								getFormattingOptionsClazz(classLoader),
-								String.class);
-						Object formattingOptions = getCustomFormattingOptions(classLoader, style);
-						return (String) formatterMethod.invoke(getFormatterClazz(classLoader), formattingOptions, input);
-					}
+					return applyFormat(input);
 				} catch (InvocationTargetException e) {
 					throw ThrowingEx.unwrapCause(e);
 				}
 			};
 		}
 
-		private Object getCustomFormattingOptions(ClassLoader classLoader, Style style) throws Exception {
-			if (BadSemver.version(version) < BadSemver.version(style.since)) {
-				throw new IllegalStateException(String.format("The style %s is available from version %s (current version: %s)", style.name(), style.since, version));
+		protected String applyFormat(String input) throws Exception {
+			Class<?> formatterClass = getFormatterClazz();
+			if (style == null && options == null || style == DEFAULT) {
+				Method formatterMethod = formatterClass.getMethod(FORMATTER_METHOD, String.class);
+				return (String) formatterMethod.invoke(formatterClass, input);
+			} else {
+				Method formatterMethod = formatterClass.getMethod(FORMATTER_METHOD, getFormattingOptionsClazz(), String.class);
+				Object formattingOptions = getCustomFormattingOptions(formatterClass);
+				return (String) formatterMethod.invoke(formatterClass, formattingOptions, input);
+			}
+		}
+
+		private Object getCustomFormattingOptions(Class<?> formatterClass) throws Exception {
+			Object formattingOptions = getFormattingOptionsFromStyle(formatterClass);
+			Class<?> formattingOptionsClass = formattingOptions.getClass();
+
+			if (options != null) {
+				if (BadSemver.version(version) < BadSemver.version(0, 17)) {
+					formattingOptions = formattingOptions.getClass().getConstructor(int.class, int.class, int.class).newInstance(
+							/* maxWidth = */ Optional.ofNullable(options.maxWidth).orElse((Integer) formattingOptionsClass.getMethod("getMaxWidth").invoke(formattingOptions)),
+							/* blockIndent = */ Optional.ofNullable(options.blockIndent).orElse((Integer) formattingOptionsClass.getMethod("getBlockIndent").invoke(formattingOptions)),
+							/* continuationIndent = */ Optional.ofNullable(options.continuationIndent).orElse((Integer) formattingOptionsClass.getMethod("getContinuationIndent").invoke(formattingOptions)));
+				} else if (BadSemver.version(version) < BadSemver.version(0, 19)) {
+					formattingOptions = formattingOptions.getClass().getConstructor(int.class, int.class, int.class, boolean.class, boolean.class).newInstance(
+							/* maxWidth = */ Optional.ofNullable(options.maxWidth).orElse((Integer) formattingOptionsClass.getMethod("getMaxWidth").invoke(formattingOptions)),
+							/* blockIndent = */ Optional.ofNullable(options.blockIndent).orElse((Integer) formattingOptionsClass.getMethod("getBlockIndent").invoke(formattingOptions)),
+							/* continuationIndent = */ Optional.ofNullable(options.continuationIndent).orElse((Integer) formattingOptionsClass.getMethod("getContinuationIndent").invoke(formattingOptions)),
+							/* removeUnusedImports = */ Optional.ofNullable(options.removeUnusedImports).orElse((Boolean) formattingOptionsClass.getMethod("getRemoveUnusedImports").invoke(formattingOptions)),
+							/* debuggingPrintOpsAfterFormatting = */ (Boolean) formattingOptionsClass.getMethod("getDebuggingPrintOpsAfterFormatting").invoke(formattingOptions));
+				} else if (BadSemver.version(version) < BadSemver.version(0, 47)) {
+					Class<?> styleClass = classLoader.loadClass(formattingOptionsClass.getName() + "$Style");
+					formattingOptions = formattingOptions.getClass().getConstructor(styleClass, int.class, int.class, int.class, boolean.class, boolean.class).newInstance(
+							/* style = */ formattingOptionsClass.getMethod("getStyle").invoke(formattingOptions),
+							/* maxWidth = */ Optional.ofNullable(options.maxWidth).orElse((Integer) formattingOptionsClass.getMethod("getMaxWidth").invoke(formattingOptions)),
+							/* blockIndent = */ Optional.ofNullable(options.blockIndent).orElse((Integer) formattingOptionsClass.getMethod("getBlockIndent").invoke(formattingOptions)),
+							/* continuationIndent = */ Optional.ofNullable(options.continuationIndent).orElse((Integer) formattingOptionsClass.getMethod("getContinuationIndent").invoke(formattingOptions)),
+							/* removeUnusedImports = */ Optional.ofNullable(options.removeUnusedImports).orElse((Boolean) formattingOptionsClass.getMethod("getRemoveUnusedImports").invoke(formattingOptions)),
+							/* debuggingPrintOpsAfterFormatting = */ (Boolean) formattingOptionsClass.getMethod("getDebuggingPrintOpsAfterFormatting").invoke(formattingOptions));
+				} else {
+					Class<?> styleClass = classLoader.loadClass(formattingOptionsClass.getName() + "$Style");
+					formattingOptions = formattingOptions.getClass().getConstructor(styleClass, int.class, int.class, int.class, boolean.class, boolean.class, boolean.class).newInstance(
+							/* style = */ formattingOptionsClass.getMethod("getStyle").invoke(formattingOptions),
+							/* maxWidth = */ Optional.ofNullable(options.maxWidth).orElse((Integer) formattingOptionsClass.getMethod("getMaxWidth").invoke(formattingOptions)),
+							/* blockIndent = */ Optional.ofNullable(options.blockIndent).orElse((Integer) formattingOptionsClass.getMethod("getBlockIndent").invoke(formattingOptions)),
+							/* continuationIndent = */ Optional.ofNullable(options.continuationIndent).orElse((Integer) formattingOptionsClass.getMethod("getContinuationIndent").invoke(formattingOptions)),
+							/* removeUnusedImports = */ Optional.ofNullable(options.removeUnusedImports).orElse((Boolean) formattingOptionsClass.getMethod("getRemoveUnusedImports").invoke(formattingOptions)),
+							/* debuggingPrintOpsAfterFormatting = */ (Boolean) formattingOptionsClass.getMethod("getDebuggingPrintOpsAfterFormatting").invoke(formattingOptions),
+							/* manageTrailingCommas */ (Boolean) formattingOptionsClass.getMethod("getManageTrailingCommas").invoke(formattingOptions));
+				}
 			}
 
-			try {
-				// ktfmt v0.19 and later
-				return getFormatterClazz(classLoader).getField(style.getFormat()).get(null);
-			} catch (NoSuchFieldException ignored) {}
+			return formattingOptions;
+		}
 
-			// fallback to old, pre-0.19 ktfmt interface.
-			if (style == Style.DEFAULT || style == Style.DROPBOX) {
+		private Object getFormattingOptionsFromStyle(Class<?> formatterClass) throws Exception {
+			Style style = this.style;
+			if (style == null) {
+				if (BadSemver.version(version) < BadSemver.version(0, 51)) {
+					style = DEFAULT;
+				} else {
+					style = META;
+				}
+			}
+			if (BadSemver.version(version) < BadSemver.version(0, 19)) {
+				if (style != DROPBOX) {
+					throw new IllegalStateException("Invalid style " + style + " for version " + version);
+				}
 				Class<?> formattingOptionsCompanionClazz = classLoader.loadClass(PACKAGE + ".FormattingOptions$Companion");
 				Object companion = formattingOptionsCompanionClazz.getConstructors()[0].newInstance((Object) null);
 				Method formattingOptionsMethod = formattingOptionsCompanionClazz.getDeclaredMethod("dropboxStyle");
 				return formattingOptionsMethod.invoke(companion);
 			} else {
-				throw new IllegalStateException("Versions pre-0.19 can only use Default and Dropbox styles");
+				return formatterClass.getField(style.getFormat()).get(null);
 			}
 		}
 
-		private Class<?> getFormatterClazz(ClassLoader classLoader) throws Exception {
+		private Class<?> getFormatterClazz() throws Exception {
 			Class<?> formatterClazz;
 			if (BadSemver.version(version) >= BadSemver.version(0, 31)) {
 				formatterClazz = classLoader.loadClass(PACKAGE + ".format.Formatter");
@@ -294,7 +404,7 @@ private Class<?> getFormatterClazz(ClassLoader classLoader) throws Exception {
 			return formatterClazz;
 		}
 
-		private Class<?> getFormattingOptionsClazz(ClassLoader classLoader) throws Exception {
+		private Class<?> getFormattingOptionsClazz() throws Exception {
 			Class<?> formattingOptionsClazz;
 			if (BadSemver.version(version) >= BadSemver.version(0, 31)) {
 				formattingOptionsClazz = classLoader.loadClass(PACKAGE + ".format.FormattingOptions");
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index b09160fd73..2968e11403 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,6 +5,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changes
 * Bump default `ktlint` version to latest `1.2.1` -> `1.3.0`. ([#2165](https://github.com/diffplug/spotless/pull/2165))
+* Bump default `ktfmt` version to latest `0.49` -> `0.51`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
+* Renamed property `ktfmt` option `removeUnusedImport` -> `removeUnusedImports` to match `ktfmt`.  ([#2172](https://github.com/diffplug/spotless/pull/2172))
+### Fixed
+* Fix compatibility issue introduced by `ktfmt` `0.51`. ([#2172](https://github.com/diffplug/spotless/issues/2172))
 
 ## [7.0.0.BETA1] - 2024-06-04
 ### Added
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 117974ba10..e10a333e8c 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -388,12 +388,20 @@ spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
 
 ### ktfmt
 
-[homepage](https://github.com/facebookincubator/ktfmt). [changelog](https://github.com/facebookincubator/ktfmt/releases).
+[homepage](https://github.com/facebook/ktfmt). [changelog](https://github.com/facebook/ktfmt/releases).
 
 ```kotlin
 spotless {
   kotlin {
-    ktfmt('0.30').dropboxStyle() // version and dropbox style are optional
+    // version, style and all configurations here are optional
+    ktfmt("0.51").googleStyle().configure {
+      it.setMaxWidth(80)
+      it.setBlockIndent(4)
+      it.setContinuationIndent(4)
+      it.setRemoveUnusedImports(false)
+    }
+  }
+}
 ```
 
 <a name="applying-ktlint-to-kotlin-files"></a>
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java
index 4be814a470..8d9a36c804 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,13 +56,13 @@ public KtlintConfig ktlint(String version) throws IOException {
 		return new KtlintConfig(version, Collections.emptyMap(), Collections.emptyList());
 	}
 
-	/** Uses the <a href="https://github.com/facebookincubator/ktfmt">ktfmt</a> jar to format source code. */
+	/** Uses the <a href="https://github.com/facebook/ktfmt">ktfmt</a> jar to format source code. */
 	public KtfmtConfig ktfmt() {
 		return ktfmt(KtfmtStep.defaultVersion());
 	}
 
 	/**
-	 * Uses the given version of <a href="https://github.com/facebookincubator/ktfmt">ktfmt</a> and applies the dropbox style
+	 * Uses the given version of <a href="https://github.com/facebook/ktfmt">ktfmt</a> and applies the dropbox style
 	 * option to format source code.
 	 */
 	public KtfmtConfig ktfmt(String version) {
@@ -109,6 +109,10 @@ private KtfmtConfig(String version) {
 			addStep(createStep());
 		}
 
+		public ConfigurableStyle metaStyle() {
+			return style(KtfmtStep.Style.META);
+		}
+
 		public ConfigurableStyle dropboxStyle() {
 			return style(KtfmtStep.Style.DROPBOX);
 		}
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
index 9720276e15..c2293ab76d 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
@@ -54,11 +54,11 @@ void integrationKtfmtDropboxStyleWithPublicApi() throws IOException {
 				"repositories { mavenCentral() }",
 				"spotless {",
 				"    kotlin {",
-				"        ktfmt().dropboxStyle().configure {",
+				"        ktfmt(\"0.50\").dropboxStyle().configure {",
 				"            it.setMaxWidth(4)",
 				"            it.setBlockIndent(4)",
 				"            it.setContinuationIndent(4)",
-				"            it.setRemoveUnusedImport(false)",
+				"            it.setRemoveUnusedImports(false)",
 				"        }",
 				"    }",
 				"}");
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 886dfdf753..d5b511d4c3 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,6 +5,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changes
 * Bump default `ktlint` version to latest `1.2.1` -> `1.3.0`. ([#2165](https://github.com/diffplug/spotless/pull/2165))
+* Bump default `ktfmt` version to latest `0.49` -> `0.51`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
+* Renamed property `ktfmt` option `removeUnusedImport` -> `removeUnusedImports` to match `ktfmt`.  ([#2172](https://github.com/diffplug/spotless/pull/2172))
+### Fixed
+* Fix compatibility issue introduced by `ktfmt` `0.51`. ([#2172](https://github.com/diffplug/spotless/issues/2172))
 
 ## [2.44.0.BETA1] - 2024-06-04
 ### Added
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 12efe3d5bd..5ba1ae7db8 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -392,12 +392,16 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ### ktfmt
 
-[homepage](https://github.com/facebookincubator/ktfmt). [changelog](https://github.com/facebookincubator/ktfmt/releases). [code](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktfmt.java).
+[homepage](https://github.com/facebook/ktfmt). [changelog](https://github.com/facebook/ktfmt/releases). [code](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktfmt.java).
 
 ```xml
 <ktfmt>
-  <version>0.39</version> <!-- optional -->
-  <style>DEFAULT</style> <!-- optional, other options are DROPBOX, GOOGLE and KOTLINLANG -->
+  <version>0.51</version> <!-- optional -->
+  <style>KOTLINLANG</style> <!-- optional, options are META (default), GOOGLE and KOTLINLANG -->
+  <maxWidth>120</maxWidth> <!-- optional -->
+  <blockIndent>4</blockIndent> <!-- optional -->
+  <continuationIndent>8</continuationIndent> <!-- optional -->
+  <removeUnusedImports>false</removeUnusedImports> <!-- optional -->
 </ktfmt>
 ```
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktfmt.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktfmt.java
index b917d33a44..7bd420f1ee 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktfmt.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktfmt.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,13 +42,13 @@ public class Ktfmt implements FormatterStepFactory {
 	private Integer continuationIndent;
 
 	@Parameter
-	private Boolean removeUnusedImport;
+	private Boolean removeUnusedImports;
 
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig config) {
 		String version = this.version != null ? this.version : KtfmtStep.defaultVersion();
 		Style style = this.style != null ? Style.valueOf(this.style) : null;
-		KtfmtFormattingOptions options = new KtfmtFormattingOptions(maxWidth, blockIndent, continuationIndent, removeUnusedImport);
+		KtfmtFormattingOptions options = new KtfmtFormattingOptions(maxWidth, blockIndent, continuationIndent, removeUnusedImports);
 		return KtfmtStep.create(version, config.getProvisioner(), style, options);
 	}
 }
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtfmtTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtfmtTest.java
index e452c5d56b..48b43bfcb1 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtfmtTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtfmtTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@ void testContinuation() throws Exception {
 
 	@Test
 	void testKtfmtStyle() throws Exception {
-		writePomWithKotlinSteps("<ktfmt><style>DROPBOX</style></ktfmt>");
+		writePomWithKotlinSteps("<ktfmt><version>0.50</version><style>DROPBOX</style></ktfmt>");
 
 		setFile("src/main/kotlin/main.kt").toResource("kotlin/ktfmt/basic.dirty");
 		mavenRunner().withArguments("spotless:apply").runNoError();
@@ -65,7 +65,7 @@ void testKtfmtWithMaxWidthOption() throws Exception {
 
 	@Test
 	void testKtfmtStyleWithMaxWidthOption() throws Exception {
-		writePomWithKotlinSteps("<ktfmt><style>DROPBOX</style><maxWidth>120</maxWidth></ktfmt>");
+		writePomWithKotlinSteps("<ktfmt><version>0.17</version><style>DROPBOX</style><maxWidth>120</maxWidth></ktfmt>");
 
 		setFile("src/main/kotlin/main.kt").toResource("kotlin/ktfmt/max-width.dirty");
 		mavenRunner().withArguments("spotless:apply").runNoError();
diff --git a/testlib/build.gradle b/testlib/build.gradle
index 38e598369e..08e735bced 100644
--- a/testlib/build.gradle
+++ b/testlib/build.gradle
@@ -30,9 +30,10 @@ spotbugs {
 apply from: rootProject.file('gradle/special-tests.gradle')
 tasks.withType(Test).configureEach {
 	if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_16)) {
-		// for Antlr4FormatterStepTest and KtLintStepTest
+		// for Antlr4FormatterStepTest, KtfmtStepTest, and KtLintStepTest
 		def args = [
-			'--add-opens=java.base/java.lang=ALL-UNNAMED'
+			'--add-opens=java.base/java.lang=ALL-UNNAMED',
+			'--add-opens=java.base/java.util=ALL-UNNAMED',
 		]
 		jvmArgs args
 	}
diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java
index e9458c9d39..f4f6e0b651 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java
@@ -34,9 +34,31 @@ void behaviorWithOptions() {
 		StepHarness.forStep(step).testResource("kotlin/ktfmt/basic.dirty", "kotlin/ktfmt/basic.clean");
 	}
 
+	@Test
+	void dropboxStyle_0_16() throws Exception {
+		KtfmtStep.KtfmtFormattingOptions options = new KtfmtStep.KtfmtFormattingOptions();
+		FormatterStep step = KtfmtStep.create("0.16", TestProvisioner.mavenCentral(), KtfmtStep.Style.DROPBOX, options);
+		StepHarness.forStep(step).testResource("kotlin/ktfmt/basic.dirty", "kotlin/ktfmt/basic-dropboxstyle.clean");
+	}
+
 	@Test
 	void dropboxStyle_0_18() throws Exception {
-		FormatterStep step = KtfmtStep.create("0.18", TestProvisioner.mavenCentral(), KtfmtStep.Style.DROPBOX, null);
+		KtfmtStep.KtfmtFormattingOptions options = new KtfmtStep.KtfmtFormattingOptions();
+		FormatterStep step = KtfmtStep.create("0.18", TestProvisioner.mavenCentral(), KtfmtStep.Style.DROPBOX, options);
+		StepHarness.forStep(step).testResource("kotlin/ktfmt/basic.dirty", "kotlin/ktfmt/basic-dropboxstyle.clean");
+	}
+
+	@Test
+	void dropboxStyle_0_22() throws Exception {
+		KtfmtStep.KtfmtFormattingOptions options = new KtfmtStep.KtfmtFormattingOptions();
+		FormatterStep step = KtfmtStep.create("0.22", TestProvisioner.mavenCentral(), KtfmtStep.Style.DROPBOX, options);
+		StepHarness.forStep(step).testResource("kotlin/ktfmt/basic.dirty", "kotlin/ktfmt/basic-dropboxstyle.clean");
+	}
+
+	@Test
+	void dropboxStyle_0_50() throws Exception {
+		KtfmtStep.KtfmtFormattingOptions options = new KtfmtStep.KtfmtFormattingOptions();
+		FormatterStep step = KtfmtStep.create("0.50", TestProvisioner.mavenCentral(), KtfmtStep.Style.DROPBOX, options);
 		StepHarness.forStep(step).testResource("kotlin/ktfmt/basic.dirty", "kotlin/ktfmt/basic-dropboxstyle.clean");
 	}
 

From 3bce98efbf50ebab3aaba1957616ddfd0985bff8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nivaldo=20Bondan=C3=A7a?= <hick209@gmail.com>
Date: Tue, 18 Jun 2024 19:04:06 -0400
Subject: [PATCH 1714/2068] Add option to configure management of trailing
 commas in ktfmt (#2177)

---
 CHANGES.md                                    |  2 ++
 .../glue/ktfmt/KtfmtFormatterFunc.java        |  4 +--
 .../glue/ktfmt/KtfmtFormattingOptions.java    | 30 ++++++++++++++-----
 .../diffplug/spotless/kotlin/KtfmtStep.java   | 17 ++++++++---
 plugin-gradle/CHANGES.md                      |  2 ++
 plugin-gradle/README.md                       |  1 +
 .../gradle/spotless/KotlinExtensionTest.java  |  1 +
 plugin-maven/CHANGES.md                       |  2 ++
 plugin-maven/README.md                        |  1 +
 .../diffplug/spotless/maven/kotlin/Ktfmt.java |  5 +++-
 .../spotless/maven/kotlin/KtfmtTest.java      |  9 ++++++
 .../kotlin/ktfmt/trailing-commas.clean        | 11 +++++++
 .../kotlin/ktfmt/trailing-commas.dirty        |  8 +++++
 .../spotless/kotlin/KtfmtStepTest.java        |  8 +++++
 14 files changed, 86 insertions(+), 15 deletions(-)
 create mode 100644 testlib/src/main/resources/kotlin/ktfmt/trailing-commas.clean
 create mode 100644 testlib/src/main/resources/kotlin/ktfmt/trailing-commas.dirty

diff --git a/CHANGES.md b/CHANGES.md
index 68764ad9bf..cb6341da7e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -16,6 +16,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Renamed property `ktfmt` option `removeUnusedImport` -> `removeUnusedImports` to match `ktfmt`.  ([#2172](https://github.com/diffplug/spotless/pull/2172))
 ### Fixed
 * Fix compatibility issue introduced by `ktfmt` `0.51`. ([#2172](https://github.com/diffplug/spotless/issues/2172))
+### Added
+* Added option `manageTrailingCommas` to `ktfmt`.  ([#2177](https://github.com/diffplug/spotless/pull/2177))
 
 ## [3.0.0.BETA1] - 2024-06-04
 ### Added
diff --git a/lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtFormatterFunc.java b/lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtFormatterFunc.java
index 50925a5a5d..bb4c9050bd 100644
--- a/lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtFormatterFunc.java
+++ b/lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtFormatterFunc.java
@@ -75,8 +75,8 @@ private FormattingOptions createFormattingOptions() throws Exception {
 					ktfmtFormattingOptions.getMaxWidth().orElse(formattingOptions.getMaxWidth()),
 					ktfmtFormattingOptions.getBlockIndent().orElse(formattingOptions.getBlockIndent()),
 					ktfmtFormattingOptions.getContinuationIndent().orElse(formattingOptions.getContinuationIndent()),
-					formattingOptions.getManageTrailingCommas(),
-					ktfmtFormattingOptions.getRemoveUnusedImport().orElse(formattingOptions.getRemoveUnusedImports()),
+					ktfmtFormattingOptions.getManageTrailingCommas().orElse(formattingOptions.getManageTrailingCommas()),
+					ktfmtFormattingOptions.getRemoveUnusedImports().orElse(formattingOptions.getRemoveUnusedImports()),
 					formattingOptions.getDebuggingPrintOpsAfterFormatting());
 		}
 
diff --git a/lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtFormattingOptions.java b/lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtFormattingOptions.java
index ff8e522aae..0a810152b6 100644
--- a/lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtFormattingOptions.java
+++ b/lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtFormattingOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 DiffPlug
+ * Copyright 2022-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,17 +32,22 @@ public final class KtfmtFormattingOptions {
 	private Integer continuationIndent;
 
 	@Nullable
-	private Boolean removeUnusedImport;
+	private Boolean removeUnusedImports;
+
+	@Nullable
+	private Boolean manageTrailingCommas;
 
 	public KtfmtFormattingOptions(
 			@Nullable Integer maxWidth,
 			@Nullable Integer blockIndent,
 			@Nullable Integer continuationIndent,
-			@Nullable Boolean removeUnusedImport) {
+			@Nullable Boolean removeUnusedImports,
+			@Nullable Boolean manageTrailingCommas) {
 		this.maxWidth = maxWidth;
 		this.blockIndent = blockIndent;
 		this.continuationIndent = continuationIndent;
-		this.removeUnusedImport = removeUnusedImport;
+		this.removeUnusedImports = removeUnusedImports;
+		this.manageTrailingCommas = manageTrailingCommas;
 	}
 
 	@Nonnull
@@ -61,8 +66,13 @@ public Optional<Integer> getContinuationIndent() {
 	}
 
 	@Nonnull
-	public Optional<Boolean> getRemoveUnusedImport() {
-		return Optional.ofNullable(removeUnusedImport);
+	public Optional<Boolean> getRemoveUnusedImports() {
+		return Optional.ofNullable(removeUnusedImports);
+	}
+
+	@Nonnull
+	public Optional<Boolean> getManageTrailingCommas() {
+		return Optional.ofNullable(manageTrailingCommas);
 	}
 
 	public void setMaxWidth(int maxWidth) {
@@ -86,7 +96,11 @@ public void setContinuationIndent(int continuationIndent) {
 		this.continuationIndent = continuationIndent;
 	}
 
-	public void setRemoveUnusedImport(boolean removeUnusedImport) {
-		this.removeUnusedImport = removeUnusedImport;
+	public void setRemoveUnusedImports(boolean removeUnusedImports) {
+		this.removeUnusedImports = removeUnusedImports;
+	}
+
+	public void setManageTrailingCommas(boolean manageTrailingCommas) {
+		this.manageTrailingCommas = manageTrailingCommas;
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
index 5e1cd7f00a..7f69be302f 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
@@ -126,17 +126,22 @@ public static class KtfmtFormattingOptions implements Serializable {
 		@Nullable
 		private Boolean removeUnusedImports = null;
 
+		@Nullable
+		private Boolean manageTrailingCommas = null;
+
 		public KtfmtFormattingOptions() {}
 
 		public KtfmtFormattingOptions(
 				@Nullable Integer maxWidth,
 				@Nullable Integer blockIndent,
 				@Nullable Integer continuationIndent,
-				@Nullable Boolean removeUnusedImports) {
+				@Nullable Boolean removeUnusedImports,
+				@Nullable Boolean manageTrailingCommas) {
 			this.maxWidth = maxWidth;
 			this.blockIndent = blockIndent;
 			this.continuationIndent = continuationIndent;
 			this.removeUnusedImports = removeUnusedImports;
+			this.manageTrailingCommas = manageTrailingCommas;
 		}
 
 		public void setMaxWidth(int maxWidth) {
@@ -154,6 +159,10 @@ public void setContinuationIndent(int continuationIndent) {
 		public void setRemoveUnusedImports(boolean removeUnusedImports) {
 			this.removeUnusedImports = removeUnusedImports;
 		}
+
+		public void setManageTrailingCommas(boolean manageTrailingCommas) {
+			this.manageTrailingCommas = manageTrailingCommas;
+		}
 	}
 
 	/** Creates a step which formats everything - code, import order, and unused imports. */
@@ -228,9 +237,9 @@ FormatterFunc createFormat() throws Exception {
 			}
 
 			final Constructor<?> optionsConstructor = ktfmtFormattingOptionsClass.getConstructor(
-					Integer.class, Integer.class, Integer.class, Boolean.class);
+					Integer.class, Integer.class, Integer.class, Boolean.class, Boolean.class);
 			final Object ktfmtFormattingOptions = optionsConstructor.newInstance(
-					options.maxWidth, options.blockIndent, options.continuationIndent, options.removeUnusedImports);
+					options.maxWidth, options.blockIndent, options.continuationIndent, options.removeUnusedImports, options.manageTrailingCommas);
 			if (style == null) {
 				final Constructor<?> constructor = formatterFuncClass.getConstructor(ktfmtFormattingOptionsClass);
 				return (FormatterFunc) constructor.newInstance(ktfmtFormattingOptions);
@@ -365,7 +374,7 @@ private Object getCustomFormattingOptions(Class<?> formatterClass) throws Except
 							/* continuationIndent = */ Optional.ofNullable(options.continuationIndent).orElse((Integer) formattingOptionsClass.getMethod("getContinuationIndent").invoke(formattingOptions)),
 							/* removeUnusedImports = */ Optional.ofNullable(options.removeUnusedImports).orElse((Boolean) formattingOptionsClass.getMethod("getRemoveUnusedImports").invoke(formattingOptions)),
 							/* debuggingPrintOpsAfterFormatting = */ (Boolean) formattingOptionsClass.getMethod("getDebuggingPrintOpsAfterFormatting").invoke(formattingOptions),
-							/* manageTrailingCommas */ (Boolean) formattingOptionsClass.getMethod("getManageTrailingCommas").invoke(formattingOptions));
+							/* manageTrailingCommas */ Optional.ofNullable(options.manageTrailingCommas).orElse((Boolean) formattingOptionsClass.getMethod("getManageTrailingCommas").invoke(formattingOptions)));
 				}
 			}
 
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 2968e11403..78cb7da04e 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -9,6 +9,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Renamed property `ktfmt` option `removeUnusedImport` -> `removeUnusedImports` to match `ktfmt`.  ([#2172](https://github.com/diffplug/spotless/pull/2172))
 ### Fixed
 * Fix compatibility issue introduced by `ktfmt` `0.51`. ([#2172](https://github.com/diffplug/spotless/issues/2172))
+### Added
+* Added option `manageTrailingCommas` to `ktfmt`.  ([#2177](https://github.com/diffplug/spotless/pull/2177))
 
 ## [7.0.0.BETA1] - 2024-06-04
 ### Added
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index e10a333e8c..0696ced59e 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -399,6 +399,7 @@ spotless {
       it.setBlockIndent(4)
       it.setContinuationIndent(4)
       it.setRemoveUnusedImports(false)
+      it.setManageTrailingCommas(false)
     }
   }
 }
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
index c2293ab76d..ff39cea174 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
@@ -59,6 +59,7 @@ void integrationKtfmtDropboxStyleWithPublicApi() throws IOException {
 				"            it.setBlockIndent(4)",
 				"            it.setContinuationIndent(4)",
 				"            it.setRemoveUnusedImports(false)",
+				"            it.setManageTrailingCommas(false)",
 				"        }",
 				"    }",
 				"}");
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index d5b511d4c3..756afea7e7 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -9,6 +9,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Renamed property `ktfmt` option `removeUnusedImport` -> `removeUnusedImports` to match `ktfmt`.  ([#2172](https://github.com/diffplug/spotless/pull/2172))
 ### Fixed
 * Fix compatibility issue introduced by `ktfmt` `0.51`. ([#2172](https://github.com/diffplug/spotless/issues/2172))
+### Added
+* Added option `manageTrailingCommas` to `ktfmt`.  ([#2177](https://github.com/diffplug/spotless/pull/2177))
 
 ## [2.44.0.BETA1] - 2024-06-04
 ### Added
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 5ba1ae7db8..9404792220 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -402,6 +402,7 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
   <blockIndent>4</blockIndent> <!-- optional -->
   <continuationIndent>8</continuationIndent> <!-- optional -->
   <removeUnusedImports>false</removeUnusedImports> <!-- optional -->
+  <manageTrailingCommas>true</manageTrailingCommas> <!-- optional -->
 </ktfmt>
 ```
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktfmt.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktfmt.java
index 7bd420f1ee..4c5c4628d3 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktfmt.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktfmt.java
@@ -44,11 +44,14 @@ public class Ktfmt implements FormatterStepFactory {
 	@Parameter
 	private Boolean removeUnusedImports;
 
+	@Parameter
+	private Boolean manageTrailingCommas;
+
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig config) {
 		String version = this.version != null ? this.version : KtfmtStep.defaultVersion();
 		Style style = this.style != null ? Style.valueOf(this.style) : null;
-		KtfmtFormattingOptions options = new KtfmtFormattingOptions(maxWidth, blockIndent, continuationIndent, removeUnusedImports);
+		KtfmtFormattingOptions options = new KtfmtFormattingOptions(maxWidth, blockIndent, continuationIndent, removeUnusedImports, manageTrailingCommas);
 		return KtfmtStep.create(version, config.getProvisioner(), style, options);
 	}
 }
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtfmtTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtfmtTest.java
index 48b43bfcb1..68d99c8186 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtfmtTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtfmtTest.java
@@ -71,4 +71,13 @@ void testKtfmtStyleWithMaxWidthOption() throws Exception {
 		mavenRunner().withArguments("spotless:apply").runNoError();
 		assertFile("src/main/kotlin/main.kt").sameAsResource("kotlin/ktfmt/max-width-dropbox.clean");
 	}
+
+	@Test
+	void testKtfmtWithManageTrailingCommasOption() throws Exception {
+		writePomWithKotlinSteps("<ktfmt><version>0.49</version><style>DROPBOX</style><manageTrailingCommas>true</manageTrailingCommas></ktfmt>");
+
+		setFile("src/main/kotlin/main.kt").toResource("kotlin/ktfmt/trailing-commas.dirty");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("src/main/kotlin/main.kt").sameAsResource("kotlin/ktfmt/trailing-commas.clean");
+	}
 }
diff --git a/testlib/src/main/resources/kotlin/ktfmt/trailing-commas.clean b/testlib/src/main/resources/kotlin/ktfmt/trailing-commas.clean
new file mode 100644
index 0000000000..3e874ac974
--- /dev/null
+++ b/testlib/src/main/resources/kotlin/ktfmt/trailing-commas.clean
@@ -0,0 +1,11 @@
+import a.*
+
+fun foo(
+    paramA: String,
+    paramB: Int,
+    anotherParamIsHere: Float,
+    myLongParamNameIsHere: CustomType,
+    lastParam: Boolean,
+) = Unit
+
+fun bar(myLongParamNameIsHereButDoesNotWrap: Int) = Unit
diff --git a/testlib/src/main/resources/kotlin/ktfmt/trailing-commas.dirty b/testlib/src/main/resources/kotlin/ktfmt/trailing-commas.dirty
new file mode 100644
index 0000000000..ea6e7b2de2
--- /dev/null
+++ b/testlib/src/main/resources/kotlin/ktfmt/trailing-commas.dirty
@@ -0,0 +1,8 @@
+import a.*
+
+fun foo(paramA: String,paramB : Int , anotherParamIsHere: Float ,myLongParamNameIsHere: CustomType
+,lastParam: Boolean ) = Unit
+
+fun bar(
+    myLongParamNameIsHereButDoesNotWrap: Int,
+) = Unit
\ No newline at end of file
diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java
index f4f6e0b651..56687d0578 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtfmtStepTest.java
@@ -62,6 +62,14 @@ void dropboxStyle_0_50() throws Exception {
 		StepHarness.forStep(step).testResource("kotlin/ktfmt/basic.dirty", "kotlin/ktfmt/basic-dropboxstyle.clean");
 	}
 
+	@Test
+	void behaviorWithTrailingCommas() throws Exception {
+		KtfmtStep.KtfmtFormattingOptions options = new KtfmtStep.KtfmtFormattingOptions();
+		options.setManageTrailingCommas(true);
+		FormatterStep step = KtfmtStep.create("0.49", TestProvisioner.mavenCentral(), KtfmtStep.Style.DROPBOX, options);
+		StepHarness.forStep(step).testResource("kotlin/ktfmt/trailing-commas.dirty", "kotlin/ktfmt/trailing-commas.clean");
+	}
+
 	@Test
 	void equality() throws Exception {
 		new SerializableEqualityTester() {

From c08739abf56388223c6b312ff4706276bddd90c1 Mon Sep 17 00:00:00 2001
From: Zongle Wang <wangzongler@gmail.com>
Date: Tue, 18 Jun 2024 19:20:27 -0400
Subject: [PATCH 1715/2068] Tweak changelogs for ktfmt (#2178)

Follow up
- 3bce98efbf50ebab3aaba1957616ddfd0985bff8
- f6694ece6025cd0fc9f05a3104f72ac447b99ec9
---
 CHANGES.md               | 4 ++--
 plugin-gradle/CHANGES.md | 4 ++--
 plugin-maven/CHANGES.md  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index cb6341da7e..0ab7b8a737 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,11 +13,11 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changes
 * Bump default `ktlint` version to latest `1.2.1` -> `1.3.0`. ([#2165](https://github.com/diffplug/spotless/pull/2165))
 * Bump default `ktfmt` version to latest `0.49` -> `0.51`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
-* Renamed property `ktfmt` option `removeUnusedImport` -> `removeUnusedImports` to match `ktfmt`.  ([#2172](https://github.com/diffplug/spotless/pull/2172))
+* Rename property `ktfmt` option `removeUnusedImport` -> `removeUnusedImports` to match `ktfmt`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
 ### Fixed
 * Fix compatibility issue introduced by `ktfmt` `0.51`. ([#2172](https://github.com/diffplug/spotless/issues/2172))
 ### Added
-* Added option `manageTrailingCommas` to `ktfmt`.  ([#2177](https://github.com/diffplug/spotless/pull/2177))
+* Add option `manageTrailingCommas` to `ktfmt`. ([#2177](https://github.com/diffplug/spotless/pull/2177))
 
 ## [3.0.0.BETA1] - 2024-06-04
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 78cb7da04e..12616a7fe1 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -6,11 +6,11 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changes
 * Bump default `ktlint` version to latest `1.2.1` -> `1.3.0`. ([#2165](https://github.com/diffplug/spotless/pull/2165))
 * Bump default `ktfmt` version to latest `0.49` -> `0.51`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
-* Renamed property `ktfmt` option `removeUnusedImport` -> `removeUnusedImports` to match `ktfmt`.  ([#2172](https://github.com/diffplug/spotless/pull/2172))
+* Rename property `ktfmt` option `removeUnusedImport` -> `removeUnusedImports` to match `ktfmt`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
 ### Fixed
 * Fix compatibility issue introduced by `ktfmt` `0.51`. ([#2172](https://github.com/diffplug/spotless/issues/2172))
 ### Added
-* Added option `manageTrailingCommas` to `ktfmt`.  ([#2177](https://github.com/diffplug/spotless/pull/2177))
+* Add option `manageTrailingCommas` to `ktfmt`. ([#2177](https://github.com/diffplug/spotless/pull/2177))
 
 ## [7.0.0.BETA1] - 2024-06-04
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 756afea7e7..5a13575032 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -6,11 +6,11 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changes
 * Bump default `ktlint` version to latest `1.2.1` -> `1.3.0`. ([#2165](https://github.com/diffplug/spotless/pull/2165))
 * Bump default `ktfmt` version to latest `0.49` -> `0.51`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
-* Renamed property `ktfmt` option `removeUnusedImport` -> `removeUnusedImports` to match `ktfmt`.  ([#2172](https://github.com/diffplug/spotless/pull/2172))
+* Rename property `ktfmt` option `removeUnusedImport` -> `removeUnusedImports` to match `ktfmt`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
 ### Fixed
 * Fix compatibility issue introduced by `ktfmt` `0.51`. ([#2172](https://github.com/diffplug/spotless/issues/2172))
 ### Added
-* Added option `manageTrailingCommas` to `ktfmt`.  ([#2177](https://github.com/diffplug/spotless/pull/2177))
+* Add option `manageTrailingCommas` to `ktfmt`. ([#2177](https://github.com/diffplug/spotless/pull/2177))
 
 ## [2.44.0.BETA1] - 2024-06-04
 ### Added

From 3895af5a28cb67ac6621dc0d49adc60a8405f3c9 Mon Sep 17 00:00:00 2001
From: Jochen Berger <fooberger@gmail.com>
Date: Thu, 20 Jun 2024 11:29:01 +0200
Subject: [PATCH 1716/2068] Update Eclipse-based formatters to latest version

---
 CHANGES.md                                                    | 3 +++
 .../diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java  | 4 ++--
 .../spotless/extra/groovy/GrEclipseFormatterStep.java         | 4 ++--
 .../diffplug/spotless/extra/java/EclipseJdtFormatterStep.java | 4 ++--
 plugin-gradle/CHANGES.md                                      | 3 +++
 plugin-maven/CHANGES.md                                       | 3 +++
 6 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 0ab7b8a737..843680e8aa 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -14,6 +14,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktlint` version to latest `1.2.1` -> `1.3.0`. ([#2165](https://github.com/diffplug/spotless/pull/2165))
 * Bump default `ktfmt` version to latest `0.49` -> `0.51`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
 * Rename property `ktfmt` option `removeUnusedImport` -> `removeUnusedImports` to match `ktfmt`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
+* Bump default `eclipse` version to latest `4.29` -> `4.32`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
+* Bump default `greclipse` version to latest `4.49` -> `4.31`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
+* Bump default `cdt` version to latest `11.3` -> `11.6`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
 ### Fixed
 * Fix compatibility issue introduced by `ktfmt` `0.51`. ([#2172](https://github.com/diffplug/spotless/issues/2172))
 ### Added
diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java
index 569dc05e54..8f4660b686 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@ public final class EclipseCdtFormatterStep {
 	private EclipseCdtFormatterStep() {}
 
 	private static final String NAME = "eclipse cdt formatter";
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "10.7").add(17, "11.3");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "10.7").add(17, "11.6");
 
 	public static String defaultVersion() {
 		return JVM_SUPPORT.getRecommendedFormatterVersion();
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 0a38ff5e64..815c132ccd 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@ public final class GrEclipseFormatterStep {
 	private GrEclipseFormatterStep() {}
 
 	private static final String NAME = "eclipse groovy formatter";
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "4.26").add(17, "4.29");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "4.26").add(17, "4.31");
 
 	public static String defaultVersion() {
 		return JVM_SUPPORT.getRecommendedFormatterVersion();
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 fc477ed881..b7a53bde0c 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ public final class EclipseJdtFormatterStep {
 	private EclipseJdtFormatterStep() {}
 
 	private static final String NAME = "eclipse jdt formatter";
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "4.26").add(17, "4.29");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "4.26").add(17, "4.32");
 
 	public static String defaultVersion() {
 		return JVM_SUPPORT.getRecommendedFormatterVersion();
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 12616a7fe1..5a6501de14 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -7,6 +7,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktlint` version to latest `1.2.1` -> `1.3.0`. ([#2165](https://github.com/diffplug/spotless/pull/2165))
 * Bump default `ktfmt` version to latest `0.49` -> `0.51`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
 * Rename property `ktfmt` option `removeUnusedImport` -> `removeUnusedImports` to match `ktfmt`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
+* Bump default `eclipse` version to latest `4.29` -> `4.32`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
+* Bump default `greclipse` version to latest `4.49` -> `4.31`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
+* Bump default `cdt` version to latest `11.3` -> `11.6`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
 ### Fixed
 * Fix compatibility issue introduced by `ktfmt` `0.51`. ([#2172](https://github.com/diffplug/spotless/issues/2172))
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 5a13575032..68e902f19d 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -7,6 +7,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktlint` version to latest `1.2.1` -> `1.3.0`. ([#2165](https://github.com/diffplug/spotless/pull/2165))
 * Bump default `ktfmt` version to latest `0.49` -> `0.51`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
 * Rename property `ktfmt` option `removeUnusedImport` -> `removeUnusedImports` to match `ktfmt`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
+* Bump default `eclipse` version to latest `4.29` -> `4.32`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
+* Bump default `greclipse` version to latest `4.49` -> `4.31`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
+* Bump default `cdt` version to latest `11.3` -> `11.6`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
 ### Fixed
 * Fix compatibility issue introduced by `ktfmt` `0.51`. ([#2172](https://github.com/diffplug/spotless/issues/2172))
 ### Added

From 7555daa7c9713794c70e7418896509b10b8eebb9 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Fri, 21 Jun 2024 10:59:17 +0800
Subject: [PATCH 1717/2068] Tweak maxParallelForks

Now GHA upgrades to 4-core runners, we can tweak this option a bit.

Follow up d090d4b896809004f7031ae79f87b2f7ddbd6b04.
---
 gradle/special-tests.gradle | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/gradle/special-tests.gradle b/gradle/special-tests.gradle
index 8721f1e22d..5bf7e7d10a 100644
--- a/gradle/special-tests.gradle
+++ b/gradle/special-tests.gradle
@@ -17,13 +17,10 @@ tasks.withType(Test).configureEach {
 			maxRetries = 2
 			maxFailures = 10
 		}
-
-		// There are only 2 cores in each GitHub Action Runner, we use all of them here.
-		maxParallelForks = Runtime.getRuntime().availableProcessors()
-	} else {
-		// https://docs.gradle.org/8.4/userguide/performance.html#execute_tests_in_parallel
-		maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) ?: 1
 	}
+
+	// https://docs.gradle.org/8.8/userguide/performance.html#execute_tests_in_parallel
+	maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) ?: 1
 }
 tasks.named('test').configure {
 	useJUnitPlatform {

From 888204193d6d937ef7b00b1a351b64dc3b66d452 Mon Sep 17 00:00:00 2001
From: jochenberger <fooberger@gmail.com>
Date: Fri, 21 Jun 2024 08:58:03 +0200
Subject: [PATCH 1718/2068] Fix version numbers in changelogs (#2182)

---
 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 843680e8aa..b6daeb77f1 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,7 +15,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktfmt` version to latest `0.49` -> `0.51`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
 * Rename property `ktfmt` option `removeUnusedImport` -> `removeUnusedImports` to match `ktfmt`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
 * Bump default `eclipse` version to latest `4.29` -> `4.32`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
-* Bump default `greclipse` version to latest `4.49` -> `4.31`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
+* Bump default `greclipse` version to latest `4.29` -> `4.31`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
 * Bump default `cdt` version to latest `11.3` -> `11.6`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
 ### Fixed
 * Fix compatibility issue introduced by `ktfmt` `0.51`. ([#2172](https://github.com/diffplug/spotless/issues/2172))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 5a6501de14..f0459ea885 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -8,7 +8,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktfmt` version to latest `0.49` -> `0.51`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
 * Rename property `ktfmt` option `removeUnusedImport` -> `removeUnusedImports` to match `ktfmt`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
 * Bump default `eclipse` version to latest `4.29` -> `4.32`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
-* Bump default `greclipse` version to latest `4.49` -> `4.31`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
+* Bump default `greclipse` version to latest `4.29` -> `4.31`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
 * Bump default `cdt` version to latest `11.3` -> `11.6`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
 ### Fixed
 * Fix compatibility issue introduced by `ktfmt` `0.51`. ([#2172](https://github.com/diffplug/spotless/issues/2172))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 68e902f19d..21becc4f4a 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -8,7 +8,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktfmt` version to latest `0.49` -> `0.51`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
 * Rename property `ktfmt` option `removeUnusedImport` -> `removeUnusedImports` to match `ktfmt`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
 * Bump default `eclipse` version to latest `4.29` -> `4.32`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
-* Bump default `greclipse` version to latest `4.49` -> `4.31`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
+* Bump default `greclipse` version to latest `4.29` -> `4.31`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
 * Bump default `cdt` version to latest `11.3` -> `11.6`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
 ### Fixed
 * Fix compatibility issue introduced by `ktfmt` `0.51`. ([#2172](https://github.com/diffplug/spotless/issues/2172))

From 059523c133cdf69a06ba909cee0b5a6d6dc7d07c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 23 Jun 2024 14:04:24 +0800
Subject: [PATCH 1719/2068] Update plugin com.github.spotbugs to v6.0.18
 (#2184)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 2ab37dbad8..c105dcffd9 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,7 +12,7 @@ plugins {
 	// https://github.com/gradle-nexus/publish-plugin/releases
 	id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
-	id 'com.github.spotbugs' version '6.0.17' apply false
+	id 'com.github.spotbugs' version '6.0.18' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
 	id 'com.diffplug.spotless-changelog' version '3.0.2' apply false
 	// https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md

From 29913cfa83d6eeb1edaf2290ccdc90fb571af25d Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Wed, 26 Jun 2024 07:13:55 +0200
Subject: [PATCH 1720/2068] Support toning down sortPom

---
 .../java/com/diffplug/spotless/pom/SortPomCfg.java   |  2 ++
 .../spotless/glue/pom/SortPomFormatterFunc.java      | 12 ++++++++++--
 .../com/diffplug/spotless/maven/pom/SortPom.java     |  4 ++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/pom/SortPomCfg.java b/lib/src/main/java/com/diffplug/spotless/pom/SortPomCfg.java
index 656b6f16f4..08a0308178 100644
--- a/lib/src/main/java/com/diffplug/spotless/pom/SortPomCfg.java
+++ b/lib/src/main/java/com/diffplug/spotless/pom/SortPomCfg.java
@@ -45,6 +45,8 @@ public class SortPomCfg implements Serializable {
 
 	public String predefinedSortOrder = "recommended_2008_06";
 
+	public boolean quiet = false;
+
 	public String sortOrderFile = null;
 
 	public String sortDependencies = null;
diff --git a/lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java b/lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java
index d1ab469af0..f5abef6614 100644
--- a/lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java
+++ b/lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java
@@ -85,12 +85,18 @@ public String apply(String input) throws Exception {
 				.setSortEntities(cfg.sortDependencies, cfg.sortDependencyExclusions, cfg.sortDependencyManagement,
 						cfg.sortPlugins, cfg.sortProperties, cfg.sortModules, cfg.sortExecutions)
 				.setIgnoreLineSeparators(false);
-		sortPom.setup(new MySortPomLogger(), builder.build());
+		sortPom.setup(new MySortPomLogger(cfg.quiet), builder.build());
 		sortPom.sortPom();
 		return Files.readString(pom.toPath(), Charset.forName(cfg.encoding));
 	}
 
 	private static class MySortPomLogger implements SortPomLogger {
+		private final boolean quiet;
+
+		public MySortPomLogger(boolean quiet) {
+			this.quiet = quiet;
+		}
+
 		@Override
 		public void warn(String content) {
 			logger.warn(content);
@@ -98,7 +104,9 @@ public void warn(String content) {
 
 		@Override
 		public void info(String content) {
-			logger.info(content);
+			if (!quiet) {
+				logger.info(content);
+			}
 		}
 
 		@Override
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/pom/SortPom.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/pom/SortPom.java
index 8b0df8a7b0..eba179cb1e 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/pom/SortPom.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/pom/SortPom.java
@@ -62,6 +62,9 @@ public class SortPom implements FormatterStepFactory {
 	@Parameter
 	String predefinedSortOrder = defaultValues.predefinedSortOrder;
 
+	@Parameter
+	boolean quiet = defaultValues.quiet;
+
 	@Parameter
 	String sortOrderFile = defaultValues.sortOrderFile;
 
@@ -101,6 +104,7 @@ public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 		cfg.indentSchemaLocation = indentSchemaLocation;
 		cfg.indentAttribute = indentAttribute;
 		cfg.predefinedSortOrder = predefinedSortOrder;
+		cfg.quiet = quiet;
 		cfg.sortOrderFile = sortOrderFile;
 		cfg.sortDependencies = sortDependencies;
 		cfg.sortDependencyManagement = sortDependencyManagement;

From 0ca23f3f86cec227081728e230b3b4ff2c5963a5 Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Wed, 26 Jun 2024 07:19:50 +0200
Subject: [PATCH 1721/2068] Also support gradle plugin

---
 .../main/java/com/diffplug/gradle/spotless/PomExtension.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PomExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PomExtension.java
index 4474a36385..4fd92c1f02 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PomExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PomExtension.java
@@ -117,6 +117,11 @@ public SortPomGradleConfig predefinedSortOrder(String predefinedSortOrder) {
 			return this;
 		}
 
+		public SortPomGradleConfig quiet(boolean quiet) {
+			cfg.quiet = quiet;
+			return this;
+		}
+
 		public SortPomGradleConfig sortOrderFile(String sortOrderFile) {
 			cfg.sortOrderFile = sortOrderFile;
 			return this;

From 74f041d4505beccfc245ddbb17b67cef8d97faaa Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Wed, 26 Jun 2024 07:20:00 +0200
Subject: [PATCH 1722/2068] Add changes

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 1 +
 plugin-maven/CHANGES.md  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index b6daeb77f1..2b7f4afbad 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,6 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Changes
+* Support toning down sortPom logging. ([#2185](https://github.com/diffplug/spotless/pull/2185))
 * Bump default `ktlint` version to latest `1.2.1` -> `1.3.0`. ([#2165](https://github.com/diffplug/spotless/pull/2165))
 * Bump default `ktfmt` version to latest `0.49` -> `0.51`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
 * Rename property `ktfmt` option `removeUnusedImport` -> `removeUnusedImports` to match `ktfmt`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index f0459ea885..16a3aad061 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -4,6 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Changes
+* Support toning down sortPom logging. ([#2185](https://github.com/diffplug/spotless/pull/2185))
 * Bump default `ktlint` version to latest `1.2.1` -> `1.3.0`. ([#2165](https://github.com/diffplug/spotless/pull/2165))
 * Bump default `ktfmt` version to latest `0.49` -> `0.51`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
 * Rename property `ktfmt` option `removeUnusedImport` -> `removeUnusedImports` to match `ktfmt`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 21becc4f4a..ef568d75f6 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -4,6 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Changes
+* Support toning down sortPom logging. ([#2185](https://github.com/diffplug/spotless/pull/2185))
 * Bump default `ktlint` version to latest `1.2.1` -> `1.3.0`. ([#2165](https://github.com/diffplug/spotless/pull/2165))
 * Bump default `ktfmt` version to latest `0.49` -> `0.51`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
 * Rename property `ktfmt` option `removeUnusedImport` -> `removeUnusedImports` to match `ktfmt`. ([#2172](https://github.com/diffplug/spotless/pull/2172))

From 572e7ef659a04db72b04560ee4e33a6ba9c7fdd0 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 28 Jun 2024 08:27:12 +0800
Subject: [PATCH 1723/2068] Update dependency org.junit.jupiter:junit-jupiter
 to v5.10.3 (#2188)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 5d0c627d65..95b70dad25 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -29,6 +29,6 @@ VER_SLF4J=[1.6,2.0[
 # Used in multiple places
 VER_DURIAN=1.2.0
 VER_JGIT=6.7.0.202309050840-r
-VER_JUNIT=5.10.2
+VER_JUNIT=5.10.3
 VER_ASSERTJ=3.26.0
 VER_MOCKITO=5.12.0

From da21785768c728f5d6e824a52063cf4be7c43906 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 28 Jun 2024 00:31:59 +0000
Subject: [PATCH 1724/2068] Update dependency org.eclipse.jgit:org.eclipse.jgit
 to v6.10.0.202406032230-r

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 95b70dad25..6b8fe6725e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -28,7 +28,7 @@ VER_SLF4J=[1.6,2.0[
 
 # Used in multiple places
 VER_DURIAN=1.2.0
-VER_JGIT=6.7.0.202309050840-r
+VER_JGIT=6.10.0.202406032230-r
 VER_JUNIT=5.10.3
 VER_ASSERTJ=3.26.0
 VER_MOCKITO=5.12.0

From 376812d4bfa49de1635ecd136a5b75cbee9a8d78 Mon Sep 17 00:00:00 2001
From: jochenberger <fooberger@gmail.com>
Date: Mon, 1 Jul 2024 09:31:46 +0200
Subject: [PATCH 1725/2068] Update default Greclipse version (#2190)

---
 CHANGES.md                                                      | 2 +-
 .../diffplug/spotless/extra/groovy/GrEclipseFormatterStep.java  | 2 +-
 plugin-gradle/CHANGES.md                                        | 2 +-
 plugin-maven/CHANGES.md                                         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index b6daeb77f1..77e8e109d8 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,7 +15,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktfmt` version to latest `0.49` -> `0.51`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
 * Rename property `ktfmt` option `removeUnusedImport` -> `removeUnusedImports` to match `ktfmt`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
 * Bump default `eclipse` version to latest `4.29` -> `4.32`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
-* Bump default `greclipse` version to latest `4.29` -> `4.31`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
+* Bump default `greclipse` version to latest `4.29` -> `4.32`. ([#2179](https://github.com/diffplug/spotless/pull/2179), [#2190](https://github.com/diffplug/spotless/pull/2190))
 * Bump default `cdt` version to latest `11.3` -> `11.6`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
 ### Fixed
 * Fix compatibility issue introduced by `ktfmt` `0.51`. ([#2172](https://github.com/diffplug/spotless/issues/2172))
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 815c132ccd..4e0a98effd 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
@@ -32,7 +32,7 @@ public final class GrEclipseFormatterStep {
 	private GrEclipseFormatterStep() {}
 
 	private static final String NAME = "eclipse groovy formatter";
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "4.26").add(17, "4.31");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "4.26").add(17, "4.32");
 
 	public static String defaultVersion() {
 		return JVM_SUPPORT.getRecommendedFormatterVersion();
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index f0459ea885..91c9f03661 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -8,7 +8,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktfmt` version to latest `0.49` -> `0.51`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
 * Rename property `ktfmt` option `removeUnusedImport` -> `removeUnusedImports` to match `ktfmt`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
 * Bump default `eclipse` version to latest `4.29` -> `4.32`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
-* Bump default `greclipse` version to latest `4.29` -> `4.31`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
+* Bump default `greclipse` version to latest `4.29` -> `4.32`. ([#2179](https://github.com/diffplug/spotless/pull/2179), [#2190](https://github.com/diffplug/spotless/pull/2190))
 * Bump default `cdt` version to latest `11.3` -> `11.6`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
 ### Fixed
 * Fix compatibility issue introduced by `ktfmt` `0.51`. ([#2172](https://github.com/diffplug/spotless/issues/2172))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 21becc4f4a..c2c490aeee 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -8,7 +8,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktfmt` version to latest `0.49` -> `0.51`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
 * Rename property `ktfmt` option `removeUnusedImport` -> `removeUnusedImports` to match `ktfmt`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
 * Bump default `eclipse` version to latest `4.29` -> `4.32`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
-* Bump default `greclipse` version to latest `4.29` -> `4.31`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
+* Bump default `greclipse` version to latest `4.29` -> `4.32`. ([#2179](https://github.com/diffplug/spotless/pull/2179), [#2190](https://github.com/diffplug/spotless/pull/2190))
 * Bump default `cdt` version to latest `11.3` -> `11.6`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
 ### Fixed
 * Fix compatibility issue introduced by `ktfmt` `0.51`. ([#2172](https://github.com/diffplug/spotless/issues/2172))

From 862be65c7afd44e2818a6a65367ad2b0841dc258 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Mon, 1 Jul 2024 17:27:35 +0800
Subject: [PATCH 1726/2068] Rename all Changes sections to Changed

Refs: https://keepachangelog.com/en/1.1.0
---
 CHANGES.md               | 52 ++++++++++++++++++++--------------------
 plugin-gradle/CHANGES.md | 48 ++++++++++++++++++-------------------
 plugin-maven/CHANGES.md  | 52 ++++++++++++++++++++--------------------
 3 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index b6daeb77f1..2a25cc9400 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,7 +10,7 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
-### Changes
+### Changed
 * Bump default `ktlint` version to latest `1.2.1` -> `1.3.0`. ([#2165](https://github.com/diffplug/spotless/pull/2165))
 * Bump default `ktfmt` version to latest `0.49` -> `0.51`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
 * Rename property `ktfmt` option `removeUnusedImport` -> `removeUnusedImports` to match `ktfmt`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
@@ -34,7 +34,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * scalafmt.conf fileOverride section now works correctly ([#1854](https://github.com/diffplug/spotless/pull/1854))
 * Fix stdin pipe is being closed exception on Windows for large .proto files ([#2147](https://github.com/diffplug/spotless/issues/2147))
 * Reworked ShadowCopy (`npmInstallCache`) to use atomic filesystem operations, resolving several race conditions that could arise ([#2151](https://github.com/diffplug/spotless/pull/2151))
-### Changes
+### Changed
 * Bump default `cleanthat` version to latest `2.16` -> `2.20`. ([#1725](https://github.com/diffplug/spotless/pull/1725))
 * Bump default `gherkin-utils` version to latest `8.0.2` -> `9.0.0`. ([#1703](https://github.com/diffplug/spotless/pull/1703))
 * Bump default `google-java-format` version to latest `1.19.2` -> `1.22.0`. ([#2129](https://github.com/diffplug/spotless/pull/2129))
@@ -63,7 +63,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Fix empty files with biome >= 1.5.0 when formatting files that are in the ignore list of the biome configuration file. ([#1989](https://github.com/diffplug/spotless/pull/1989) fixes [#1987](https://github.com/diffplug/spotless/issues/1987))
 * Fix a regression in BufStep where the same arguments were being provided to every `buf` invocation. ([#1976](https://github.com/diffplug/spotless/issues/1976))
-### Changes
+### Changed
 * Use palantir-java-format 2.39.0 on Java 21. ([#1948](https://github.com/diffplug/spotless/pull/1948))
 * Bump default `ktlint` version to latest `1.0.1` -> `1.1.1`. ([#1973](https://github.com/diffplug/spotless/pull/1973))
 * Bump default `googleJavaFormat` version to latest `1.18.1` -> `1.19.2`. ([#1971](https://github.com/diffplug/spotless/pull/1971))
@@ -72,7 +72,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [2.43.1] - 2023-12-04
 ### Fixed
 * Eclipse-based steps which contained any jars with a `+` in their path were broken, now fixed. ([#1860](https://github.com/diffplug/spotless/issues/1860#issuecomment-1826113332))
-### Changes
+### Changed
 * Bump default `palantir-java-format` version to latest `2.28.0` -> `2.38.0` on Java 21. ([#1920](https://github.com/diffplug/spotless/pull/1920))
 * Bump default `googleJavaFormat` version to latest `1.17.0` -> `1.18.1`. ([#1920](https://github.com/diffplug/spotless/pull/1920))
 * Bump default `ktfmt` version to latest `0.44` -> `0.46`. ([#1927](https://github.com/diffplug/spotless/pull/1927))
@@ -85,7 +85,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Support custom rule sets for Ktlint. ([#1896](https://github.com/diffplug/spotless/pull/1896))
 ### Fixed
 * Fix Eclipse JDT on some settings files. ([#1864](https://github.com/diffplug/spotless/pull/1864) fixes [#1638](https://github.com/diffplug/spotless/issues/1638))
-### Changes
+### Changed
 * Bump default `ktlint` version to latest `1.0.0` -> `1.0.1`. ([#1855](https://github.com/diffplug/spotless/pull/1855))
 * Add a Step to remove semicolons from Groovy files. ([#1881](https://github.com/diffplug/spotless/pull/1881))
 
@@ -100,7 +100,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Fix support for plugins when using Prettier version `3.0.0` and newer. ([#1802](https://github.com/diffplug/spotless/pull/1802))
 * Fix configuration cache issue around `external process started '/usr/bin/git --version'`. ([#1806](https://github.com/diffplug/spotless/issues/1806))
-### Changes
+### Changed
 * Bump default `flexmark` version to latest `0.64.0` -> `0.64.8`. ([#1801](https://github.com/diffplug/spotless/pull/1801))
 * Bump default `ktlint` version to latest `0.50.0` -> `1.0.0`. ([#1808](https://github.com/diffplug/spotless/pull/1808))
 
@@ -112,7 +112,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Use latest versions of popular style guides for `eslint` tests to fix failing `useEslintXoStandardRules` test. ([#1761](https://github.com/diffplug/spotless/pull/1761), [#1756](https://github.com/diffplug/spotless/issues/1756))
 * Add support for `prettier` version `3.0.0` and newer. ([#1760](https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
 * Fix npm install calls when npm cache is not up-to-date. ([#1760](https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))
-### Changes
+### Changed
 * Bump default `eslint` version to latest `8.31.0` -> `8.45.0` ([#1761](https://github.com/diffplug/spotless/pull/1761))
 * Bump default `prettier` version to latest (v2) `2.8.1` -> `2.8.8`. ([#1760](https://github.com/diffplug/spotless/pull/1760))
 * Bump default `greclipse` version to latest `4.27` -> `4.28`. ([#1775](https://github.com/diffplug/spotless/pull/1775))
@@ -123,7 +123,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * `enum OnMatch { INCLUDE, EXCLUDE }` so that `FormatterStep.filterByContent` can not only include based on the pattern but also exclude. ([#1749](https://github.com/diffplug/spotless/pull/1749))
 ### Fixed
 * Update documented default `semanticSort` to `false`. ([#1728](https://github.com/diffplug/spotless/pull/1728))
-### Changes
+### Changed
 * Bump default `cleanthat` version to latest `2.13` -> `2.17`. ([#1734](https://github.com/diffplug/spotless/pull/1734))
 * Bump default `ktlint` version to latest `0.49.1` -> `0.50.0`. ([#1741](https://github.com/diffplug/spotless/issues/1741))
   * Dropped support for `ktlint 0.47.x` following our policy of supporting two breaking changes at a time.
@@ -138,7 +138,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Fixed a regression which changed the import sorting order in `googleJavaFormat` introduced in `2.38.0`. ([#1680](https://github.com/diffplug/spotless/pull/1680))
 * Equo-based formatters now work on platforms unsupported by Eclipse such as PowerPC (fixes [durian-swt#20](https://github.com/diffplug/durian-swt/issues/20))
 * When P2 download fails, indicate the responsible formatter. ([#1698](https://github.com/diffplug/spotless/issues/1698))
-### Changes
+### Changed
 * Equo-based formatters now download metadata to `~/.m2/repository/dev/equo/p2-data` rather than `~/.equo`, and for CI machines without a home directory the p2 data goes to `$GRADLE_USER_HOME/caches/p2-data`. ([#1714](https://github.com/diffplug/spotless/pull/1714))
 * Bump default `googleJavaFormat` version to latest `1.16.0` -> `1.17.0`. ([#1710](https://github.com/diffplug/spotless/pull/1710))
 * Bump default `ktfmt` version to latest `0.43` -> `0.44`. ([#1691](https://github.com/diffplug/spotless/pull/1691))
@@ -151,7 +151,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Support configuration of mirrors for P2 repositories in `EquoBasedStepBuilder` ([#1629](https://github.com/diffplug/spotless/issues/1629)).
 * The `style` option in Palantir Java Format ([#1654](https://github.com/diffplug/spotless/pull/1654)).
 * Added formatter for Gherkin feature files ([#1649](https://github.com/diffplug/spotless/issues/1649)).
-### Changes
+### Changed
 * **POTENTIALLY BREAKING** Converted `googleJavaFormat` to a compile-only dependency and drop support for versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
 * Bump default `cleanthat` version to latest `2.6` -> `2.13`. ([#1589](https://github.com/diffplug/spotless/pull/1589) and [#1661](https://github.com/diffplug/spotless/pull/1661))
 * Bump default `diktat` version `1.2.4.2` -> `1.2.5`. ([#1631](https://github.com/diffplug/spotless/pull/1631))
@@ -166,7 +166,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [2.37.0] - 2023-03-13
 ### Added
 * You can now put the filename into a license header template with `$FILE`. ([#1605](https://github.com/diffplug/spotless/pull/1605) fixes [#1147](https://github.com/diffplug/spotless/issues/1147))
-### Changes
+### Changed
 * We are now opting in to Gradle's new stable configuration cache. ([#1591](https://github.com/diffplug/spotless/pull/1591))
 * Adopt [Equo Solstice OSGi and p2 shim](https://github.com/equodev/equo-ide/tree/main/solstice) to update all Eclipse-based plugins. ([#1524](https://github.com/diffplug/spotless/pull/1524))
   * Eclipse JDT now supports `4.9` through `4.26`. Also we now recommend dropping the last `.0`, e.g. `4.26` instead of `4.26.0`, you'll get warnings to help you switch.
@@ -181,7 +181,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * `npm`-based formatters now support caching of `node_modules` directory ([#1590](https://github.com/diffplug/spotless/pull/1590))
 ### Fixed
 * `JacksonJsonFormatterFunc` handles json files with an Array as root. ([#1585](https://github.com/diffplug/spotless/pull/1585))
-### Changes
+### Changed
 * Bump default `cleanthat` version to latest `2.1` -> `2.6` ([#1569](https://github.com/diffplug/spotless/pull/1569) and [#1574](https://github.com/diffplug/spotless/pull/1574))
 * Reduce logging-noise created by `npm`-based formatters ([#1590](https://github.com/diffplug/spotless/pull/1590) fixes [#1582](https://github.com/diffplug/spotless/issues/1582))
 
@@ -192,12 +192,12 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Allow multiple instances of the same npm-based formatter to be used by separating their `node_modules` directories. ([#1565](https://github.com/diffplug/spotless/pull/1565))
 * `ktfmt` default style uses correct continuation indent. ([#1562](https://github.com/diffplug/spotless/pull/1562))
-### Changes
+### Changed
 * Bump default `ktfmt` version to latest `0.42` -> `0.43` ([#1561](https://github.com/diffplug/spotless/pull/1561))
 * Bump default `jackson` version to latest `2.14.1` -> `2.14.2` ([#1536](https://github.com/diffplug/spotless/pull/1536))
 
 ## [2.34.1] - 2023-02-05
-### Changes
+### Changed
 * **POTENTIALLY BREAKING** Bump bytecode from Java 8 to 11 ([#1530](https://github.com/diffplug/spotless/pull/1530) part 2 of [#1337](https://github.com/diffplug/spotless/issues/1337))
 ### Fixed
 * **POTENTIALLY BREAKING** `sortByKeys` for JSON formatting now takes into account objects inside arrays ([#1546](https://github.com/diffplug/spotless/pull/1546))
@@ -215,7 +215,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Allow to specify node executable for node-based formatters using `nodeExecutable` parameter ([#1500](https://github.com/diffplug/spotless/pull/1500))
 ### Fixed
 * The default list of type annotations used by `formatAnnotations` has had 8 more annotations from the Checker Framework added [#1494](https://github.com/diffplug/spotless/pull/1494)
-### Changes
+### Changed
 * **POTENTIALLY BREAKING** Bump minimum JRE from 8 to 11, next release likely to bump bytecode to Java 11 ([#1514](https://github.com/diffplug/spotless/pull/1514) part 1 of [#1337](https://github.com/diffplug/spotless/issues/1337))
 * Rename `YamlJacksonStep` into `JacksonYamlStep` while normalizing Jackson usage ([#1492](https://github.com/diffplug/spotless/pull/1492))
 * Convert `gson` integration to use a compile-only source set ([#1510](https://github.com/diffplug/spotless/pull/1510)).
@@ -238,7 +238,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Support `ktlint` 0.48+ new rule disabling syntax ([#1456](https://github.com/diffplug/spotless/pull/1456)) fixes ([#1444](https://github.com/diffplug/spotless/issues/1444))
 * Fix subgroups leading catch all matcher.
-### Changes
+### Changed
 * Bump default version for `prettier` from `2.0.5` to `2.8.1` ([#1453](https://github.com/diffplug/spotless/pull/1453))
 * Bump the dev version of Gradle from `7.5.1` to `7.6` ([#1409](https://github.com/diffplug/spotless/pull/1409))
   * We also removed the no-longer-required dependency `org.codehaus.groovy:groovy-xml`
@@ -255,7 +255,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Improve memory usage when using git ratchet ([#1426](https://github.com/diffplug/spotless/pull/1426))
 * Support `ktlint` 0.48+ ([#1432](https://github.com/diffplug/spotless/pull/1432)) fixes ([#1430](https://github.com/diffplug/spotless/issues/1430))
-### Changes
+### Changed
 * Bump default `ktlint` version to latest `0.47.1` -> `0.48.0` ([#1432](https://github.com/diffplug/spotless/pull/1432))
 * Bump default `ktfmt` version to latest `0.41` -> `0.42` ([#1421](https://github.com/diffplug/spotless/pull/1421))
 
@@ -266,7 +266,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Don't treat `@Value` as a type annotation [#1367](https://github.com/diffplug/spotless/pull/1367)
 * Support `ktlint_disabled_rules` in `ktlint` 0.47.x [#1378](https://github.com/diffplug/spotless/pull/1378)
 * Share git repositories across projects when using ratchet ([#1426](https://github.com/diffplug/spotless/pull/1426))
-### Changes
+### Changed
 * Bump default `ktfmt` version to latest `0.40` -> `0.41` ([#1340](https://github.com/diffplug/spotless/pull/1340))
 * Bump default `scalafmt` version to latest `3.5.9` -> `3.6.1` ([#1373](https://github.com/diffplug/spotless/pull/1373))
 * Bump default `diktat` version to latest `1.2.3` -> `1.2.4.2` ([#1393](https://github.com/diffplug/spotless/pull/1393))
@@ -275,7 +275,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [2.30.0] - 2022-09-14
 ### Added
 * `formatAnnotations()` step to correct formatting of Java type annotations.  It puts type annotations on the same line as the type that they qualify.  Run it after a Java formatting step, such as `googleJavaFormat()`. ([#1275](https://github.com/diffplug/spotless/pull/1275))
-### Changes
+### Changed
 * Bump default `ktfmt` version to latest `0.39` -> `0.40` ([#1312](https://github.com/diffplug/spotless/pull/1312))
 * Bump default `ktlint` version to latest `0.46.1` -> `0.47.1` ([#1303](https://github.com/diffplug/spotless/pull/1303))
   * Also restored support for older versions of ktlint back to `0.31.0`
@@ -284,14 +284,14 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * `scalafmt` integration now has a configuration option `majorScalaVersion` that allows you to configure the Scala version that gets resolved from the Maven artifact ([#1283](https://github.com/diffplug/spotless/pull/1283))
   * Converted `scalafmt` integration to use a compile-only source set (fixes [#524](https://github.com/diffplug/spotless/issues/524))
-### Changes
+### Changed
 * Add the `ktlint` rule in error messages when `ktlint` fails to apply a fix ([#1279](https://github.com/diffplug/spotless/pull/1279))
 * Bump default `scalafmt` to latest `3.0.8` -> `3.5.9` (removed support for pre-`3.0.0`) ([#1283](https://github.com/diffplug/spotless/pull/1283))
 
 ## [2.28.1] - 2022-08-10
 ### Fixed
 * Fix Clang not knowing the filename and changing the format ([#1268](https://github.com/diffplug/spotless/pull/1268) fixes [#1267](https://github.com/diffplug/spotless/issues/1267)).
-### Changes
+### Changed
 * Bump default `diktat` version to latest `1.2.1` -> `1.2.3` ([#1266](https://github.com/diffplug/spotless/pull/1266))
 
 ## [2.28.0] - 2022-07-28
@@ -302,7 +302,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [2.27.0] - 2022-06-30
 ### Added
 * Support for `MAC_CLASSIC` (`\r`) line ending ([#1243](https://github.com/diffplug/spotless/pull/1243) fixes [#1196](https://github.com/diffplug/spotless/issues/1196))
-### Changes
+### Changed
 * Bump default `ktlint` version to latest `0.45.2` -> `0.46.1` ([#1239](https://github.com/diffplug/spotless/issues/1239))
   * Minimum supported version also bumped to `0.46.0` (we have abandoned strong backward compatibility for `ktlint`, from here on out Spotless will only support the most-recent breaking change).
 * Bump default `diktat` version to latest `1.1.0` -> `1.2.1` ([#1246](https://github.com/diffplug/spotless/pull/1246))
@@ -327,17 +327,17 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Update the `black` version regex to fix `19.10b0` and earlier. (fixes [#1195](https://github.com/diffplug/spotless/issues/1195), regression introduced in `2.25.0`)
 * `GitAttributesLineEndings$RelocatablePolicy` and `FormatterStepImpl` now null-out their initialization lambdas after their state has been calculated, which allows GC to collect variables which were incidentally captured but not needed in the calculated state. ([#1198](https://github.com/diffplug/spotless/pull/1198))
-### Changes
+### Changed
 * Bump default `ktfmt` version to latest `0.36` -> `0.37`. ([#1200](https://github.com/diffplug/spotless/pull/1200))
 
 ## [2.25.2] - 2022-05-03
-### Changes
+### Changed
 * Bump default `diktat` version to latest `1.0.1` -> `1.1.0`. ([#1190](https://github.com/diffplug/spotless/pull/1190))
   * Converted `diktat` integration to use a compile-only source set. (fixes [#524](https://github.com/diffplug/spotless/issues/524))
   * Use the full path to a file in `diktat` integration. (fixes [#1189](https://github.com/diffplug/spotless/issues/1189))
 
 ## [2.25.1] - 2022-04-27
-### Changes
+### Changed
 * Bump default `ktfmt` version to latest `0.35` -> `0.36`. ([#1183](https://github.com/diffplug/spotless/issues/1183))
 * Bump default `google-java-format` version to latest `1.13.0` -> `1.15.0`.
   * ~~This means it is no longer necessary to use the `--add-exports` workaround (fixes [#834](https://github.com/diffplug/spotless/issues/834)).~~ `--add-exports` workaround is still needed.
@@ -348,7 +348,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Fixed support for Python Black's new version reporting. ([#1170](https://github.com/diffplug/spotless/issues/1170))
 * Error messages for unexpected file encoding now works on Java 8. (fixes [#1081](https://github.com/diffplug/spotless/issues/1081))
-### Changes
+### Changed
 * Bump default `black` version to latest `19.10b0` -> `22.3.0`. ([#1170](https://github.com/diffplug/spotless/issues/1170))
 * Bump default `ktfmt` version to latest `0.34` -> `0.35`. ([#1159](https://github.com/diffplug/spotless/pull/1159))
 * Bump default `ktlint` version to latest `0.43.2` -> `0.45.2`. ([#1177](https://github.com/diffplug/spotless/pull/1177))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index f0459ea885..b95b133979 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,7 +3,7 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
-### Changes
+### Changed
 * Bump default `ktlint` version to latest `1.2.1` -> `1.3.0`. ([#2165](https://github.com/diffplug/spotless/pull/2165))
 * Bump default `ktfmt` version to latest `0.49` -> `0.51`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
 * Rename property `ktfmt` option `removeUnusedImport` -> `removeUnusedImports` to match `ktfmt`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
@@ -31,7 +31,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * scalafmt.conf fileOverride section now works correctly ([#1854](https://github.com/diffplug/spotless/pull/1854))
 * Fix stdin pipe is being closed exception on Windows for large .proto files ([#2147](https://github.com/diffplug/spotless/issues/2147))
 * Reworked ShadowCopy (`npmInstallCache`) to use atomic filesystem operations, resolving several race conditions that could arise ([#2151](https://github.com/diffplug/spotless/pull/2151))
-### Changes
+### Changed
 * Bump default `cleanthat` version to latest `2.16` -> `2.20`. ([#1725](https://github.com/diffplug/spotless/pull/1725))
 * Bump default `gherkin-utils` version to latest `8.0.2` -> `9.0.0`. ([#1703](https://github.com/diffplug/spotless/pull/1703))
 * Bump default `google-java-format` version to latest `1.19.2` -> `1.22.0`. ([#2129](https://github.com/diffplug/spotless/pull/2129))
@@ -56,7 +56,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Fix empty files with biome >= 1.5.0 when formatting files that are in the ignore list of the biome configuration file. ([#1989](https://github.com/diffplug/spotless/pull/1989) fixes [#1987](https://github.com/diffplug/spotless/issues/1987))
 * Fix a regression in BufStep where the same arguments were being provided to every `buf` invocation. ([#1976](https://github.com/diffplug/spotless/issues/1976))
-### Changes
+### Changed
 * Use palantir-java-format 2.39.0 on Java 21. ([#1948](https://github.com/diffplug/spotless/pull/1948))
 * Bump default `ktlint` version to latest `1.0.1` -> `1.1.1`. ([#1973](https://github.com/diffplug/spotless/pull/1973))
 * Bump default `googleJavaFormat` version to latest `1.18.1` -> `1.19.2`. ([#1971](https://github.com/diffplug/spotless/pull/1971))
@@ -69,7 +69,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Eclipse-based steps which contained any jars with a `+` in their path were broken, now fixed. ([#1860](https://github.com/diffplug/spotless/issues/1860#issuecomment-1826113332))
 * Make `KtfmtConfig.ConfigurableStyle#configure` public. ([#1926](https://github.com/diffplug/spotless/pull/1926))
-### Changes
+### Changed
 * Bump default `palantir-java-format` version to latest `2.28.0` -> `2.38.0` on Java 21. ([#1920](https://github.com/diffplug/spotless/pull/1920))
 * Bump default `googleJavaFormat` version to latest `1.17.0` -> `1.18.1`. ([#1920](https://github.com/diffplug/spotless/pull/1920))
 * Bump default `ktfmt` version to latest `0.44` -> `0.46`. ([#1927](https://github.com/diffplug/spotless/pull/1927))
@@ -92,7 +92,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Fix `GoogleJavaFormatConfig.reorderImports` not working. ([#1872](https://github.com/diffplug/spotless/issues/1872))
 * Fix Eclipse JDT on some settings files. ([#1864](https://github.com/diffplug/spotless/pull/1864) fixes [#1638](https://github.com/diffplug/spotless/issues/1638))
 * Check if EditorConfig file exist for Ktlint in KotlinGradleExtension. ([#1889](https://github.com/diffplug/spotless/pull/1889))
-### Changes
+### Changed
 * Bump default `ktlint` version to latest `1.0.0` -> `1.0.1`. ([#1855](https://github.com/diffplug/spotless/pull/1855))
 * Add a Step to remove semicolons from Groovy files. ([#1881](https://github.com/diffplug/spotless/pull/1881))
 * **POSSIBLY BREAKING** `userData` method has been removed from Ktlint step in ([#1891](https://github.com/diffplug/spotless/pull/1891)), you may use `editorConfigOverride` instead.
@@ -108,7 +108,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
   the version accordingly. ([#1804](https://github.com/diffplug/spotless/issues/1804)).
 ### Fixed
 * Fixed support for plugins when using Prettier version `3.0.0` and newer. ([#1802](https://github.com/diffplug/spotless/pull/1802))
-### Changes
+### Changed
 * Bump default `ktlint` version to latest `0.50.0` -> `1.0.0`. ([#1808](https://github.com/diffplug/spotless/pull/1808))
 * **POSSIBLY BREAKING** the default line endings are now `GIT_ATTRIBUTES_FAST_ALLSAME` instead of `GIT_ATTRIBUTES`. ([#1838](https://github.com/diffplug/spotless/pull/1838))
   * If all the files within a format have the same line endings, then there is no change in behavior.
@@ -124,7 +124,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Fix configuration cache failure when using LineEnding.GIT_ATTRIBUTES ([#1644](https://github.com/diffplug/spotless/issues/1644))
 * Fix configuration cache failure when formatting proto files with Buf. ([#1779](https://github.com/diffplug/spotless/pull/1779))
 * Check if EditorConfig file exist for Ktlint. ([#1788](https://github.com/diffplug/spotless/pull/1788))
-### Changes
+### Changed
 * Bump default `eslint` version to latest `8.31.0` -> `8.45.0` ([#1761](https://github.com/diffplug/spotless/pull/1761))
 * Bump default `prettier` version to latest (v2) `2.8.1` -> `2.8.8`. ([#1760](https://github.com/diffplug/spotless/pull/1760))
 * Bump default `greclipse` version to latest `4.27` -> `4.28`. ([#1775](https://github.com/diffplug/spotless/pull/1775))
@@ -143,7 +143,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
     }
   }
   ```
-### Changes
+### Changed
 * Bump default `cleanthat` version to latest `2.13` -> `2.17`. ([#1734](https://github.com/diffplug/spotless/pull/1734))
 * Bump default `ktlint` version to latest `0.49.1` -> `0.50.0`. ([#1741](https://github.com/diffplug/spotless/issues/1741))
   * Dropped support for `ktlint 0.47.x` following our policy of supporting two breaking changes at a time.
@@ -158,7 +158,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Fixed a regression which changed the import sorting order in `googleJavaFormat` introduced in `6.18.0`. ([#1680](https://github.com/diffplug/spotless/pull/1680))
 * Equo-based formatters now work on platforms unsupported by Eclipse such as PowerPC (fixes [durian-swt#20](https://github.com/diffplug/durian-swt/issues/20))
 * When P2 download fails, indicate the responsible formatter. ([#1698](https://github.com/diffplug/spotless/issues/1698))
-### Changes
+### Changed
 * Equo-based formatters now download metadata to `~/.m2/repository/dev/equo/p2-data` rather than `~/.equo`, and for CI machines without a home directory the p2 data goes to `$GRADLE_USER_HOME/caches/p2-data`. ([#1714](https://github.com/diffplug/spotless/pull/1714))
 * Bump default `googleJavaFormat` version to latest `1.16.0` -> `1.17.0`. ([#1710](https://github.com/diffplug/spotless/pull/1710))
 * Bump default `ktfmt` version to latest `0.43` -> `0.44`. ([#1691](https://github.com/diffplug/spotless/pull/1691))
@@ -183,7 +183,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * The `style` option in Palantir Java Format ([#1654](https://github.com/diffplug/spotless/pull/1654)).
 ### Fixed
 * Stop using deprecated conventions when used in Gradle >= `7.1`. ([#1618](https://github.com/diffplug/spotless/pull/1618))
-### Changes
+### Changed
 * **POTENTIALLY BREAKING** Drop support for `googleJavaFormat` versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
 * Bump default `cleanthat` version to latest `2.6` -> `2.13`. ([#1589](https://github.com/diffplug/spotless/pull/1589) and [#1661](https://github.com/diffplug/spotless/pull/1661))
 * Bump default `diktat` version `1.2.4.2` -> `1.2.5`. ([#1631](https://github.com/diffplug/spotless/pull/1631))
@@ -199,7 +199,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * You can now put the filename into a license header template with `$FILE`. ([#1605](https://github.com/diffplug/spotless/pull/1605) fixes [#1147](https://github.com/diffplug/spotless/issues/1147))
 * `licenseHeader` default pattern for Java files is updated to `(package|import|public|class|module) `. ([#1614](https://github.com/diffplug/spotless/pull/1614))
-### Changes
+### Changed
 * All Eclipse formatters are now based on [Equo Solstice OSGi and p2 shim](https://github.com/equodev/equo-ide/tree/main/solstice). ([#1524](https://github.com/diffplug/spotless/pull/1524))
   * Eclipse JDT bumped default to `4.26` from `4.21`, oldest supported is `4.9`.
     * We now recommend dropping the last `.0`, e.g. `4.26` instead of `4.26.0`, you'll get warnings to help you switch.
@@ -215,7 +215,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * `json { jackson()` can now handle `Array` as a root element. ([#1585](https://github.com/diffplug/spotless/pull/1585))
 * Reduce logging-noise created by `npm`-based formatters ([#1590](https://github.com/diffplug/spotless/pull/1590) fixes [#1582](https://github.com/diffplug/spotless/issues/1582))
-### Changes
+### Changed
 * Bump default `cleanthat` version to latest `2.1` -> `2.6`. ([#1569](https://github.com/diffplug/spotless/pull/1569) and [#1574](https://github.com/diffplug/spotless/pull/1574))
 
 ## [6.15.0] - 2023-02-10
@@ -225,7 +225,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Allow multiple instances of the same npm-based formatter to be used simultaneously. E.g. use prettier for typescript
   *and* Java (using the community prettier-plugin-java) without messing up their respective `node_module` dependencies. ([#1565](https://github.com/diffplug/spotless/pull/1565))
 * `ktfmt` default style uses correct continuation indent. ([#1562](https://github.com/diffplug/spotless/pull/1562))
-### Changes
+### Changed
 * Bump default `ktfmt` version to latest `0.42` -> `0.43` ([#1561](https://github.com/diffplug/spotless/pull/1561))
 * Bump default `jackson` version to latest `2.14.1` -> `2.14.2` ([#1536](https://github.com/diffplug/spotless/pull/1536))
 
@@ -242,7 +242,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * **POTENTIALLY BREAKING** Generate the correct qualifiedRuleId for Ktlint 0.48.x [#1495](https://github.com/diffplug/spotless/pull/1495)
 * The default list of type annotations used by `formatAnnotations` has had 8 more annotations from the Checker Framework added [#1494](https://github.com/diffplug/spotless/pull/1494)
-### Changes
+### Changed
 * **POTENTIALLY BREAKING** Bump minimum JRE from 8 to 11 ([#1514](https://github.com/diffplug/spotless/pull/1514) part 1 of [#1337](https://github.com/diffplug/spotless/issues/1337))
   * You can bump your build JRE without bumping your requirements ([docs](https://docs.gradle.org/current/userguide/building_java_projects.html#sec:java_cross_compilation)).
 * Prettier will now suggest to install plugins if a parser cannot be inferred from the file extension ([#1511](https://github.com/diffplug/spotless/pull/1511))
@@ -266,7 +266,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Prevent tool configurations from being resolved outside project ([#1447](https://github.com/diffplug/spotless/pull/1447) fixes [#1215](https://github.com/diffplug/spotless/issues/1215))
 * Support `ktlint` 0.48+ new rule disabling syntax ([#1456](https://github.com/diffplug/spotless/pull/1456)) fixes ([#1444](https://github.com/diffplug/spotless/issues/1444))
 * Fix subgroups leading catch all matcher.
-### Changes
+### Changed
 * Bump default `ktlint` version to latest `0.47.1` -> `0.48.1` ([#1456](https://github.com/diffplug/spotless/pull/1456))
 * Bump default version for `prettier` from `2.0.5` to `2.8.1` ([#1453](https://github.com/diffplug/spotless/pull/1453))
 
@@ -274,7 +274,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Improve memory usage when using git ratchet ([#1426](https://github.com/diffplug/spotless/pull/1426))
 * Support `ktlint` 0.48+ ([#1432](https://github.com/diffplug/spotless/pull/1432)) fixes ([#1430](https://github.com/diffplug/spotless/issues/1430))
-### Changes
+### Changed
 * Bump default `ktlint` version to latest `0.47.1` -> `0.48.0` ([#1432](https://github.com/diffplug/spotless/pull/1432))
 * Bump default `ktfmt` version to latest `0.41` -> `0.42` ([#1421](https://github.com/diffplug/spotless/pull/1421))
 
@@ -284,7 +284,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Don't treat `@Value` as a type annotation [#1367](https://github.com/diffplug/spotless/pull/1367)
 * Support `ktlint_disabled_rules` in `ktlint` 0.47.x [#1378](https://github.com/diffplug/spotless/pull/1378)
-### Changes
+### Changed
 * Bump default `ktfmt` version to latest `0.40` -> `0.41` ([#1340](https://github.com/diffplug/spotless/pull/1340))
 * Bump default `scalafmt` version to latest `3.5.9` -> `3.6.1` ([#1373](https://github.com/diffplug/spotless/pull/1373))
 * Bump default `diktat` version to latest `1.2.3` -> `1.2.4.2` ([#1393](https://github.com/diffplug/spotless/pull/1393))
@@ -293,7 +293,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [6.11.0] - 2022-09-14
 ### Added
 * `formatAnnotations()` step to correct formatting of Java type annotations.  It puts type annotations on the same line as the type that they qualify.  Run it after a Java formatting step, such as `googleJavaFormat()`. ([#1275](https://github.com/diffplug/spotless/pull/1275))
-### Changes
+### Changed
 * Bump default `ktfmt` version to latest `0.39` -> `0.40` ([#1312](https://github.com/diffplug/spotless/pull/1312))
 * Bump default `ktlint` version to latest `0.46.1` -> `0.47.1` ([#1303](https://github.com/diffplug/spotless/pull/1303))
   * Also restored support for older versions of ktlint back to `0.31.0`
@@ -301,14 +301,14 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [6.10.0] - 2022-08-23
 ### Added
 * `scalafmt` integration now has a configuration option `majorScalaVersion` that allows you to configure the Scala version that gets resolved from the Maven artifact ([#1283](https://github.com/diffplug/spotless/pull/1283))
-### Changes
+### Changed
 * Add the `ktlint` rule in error messages when `ktlint` fails to apply a fix ([#1279](https://github.com/diffplug/spotless/pull/1279))
 * Bump default `scalafmt` to latest `3.0.8` -> `3.5.9` (removed support for pre-`3.0.0`) ([#1283](https://github.com/diffplug/spotless/pull/1283))
 
 ## [6.9.1] - 2022-08-10
 ### Fixed
 * Fix Clang not knowing the filename and changing the format ([#1268](https://github.com/diffplug/spotless/pull/1268) fixes [#1267](https://github.com/diffplug/spotless/issues/1267)).
-### Changes
+### Changed
 * Bump default `diktat` version to latest `1.2.1` -> `1.2.3` ([#1266](https://github.com/diffplug/spotless/pull/1266))
 
 ## [6.9.0] - 2022-07-28
@@ -321,7 +321,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [6.8.0] - 2022-06-30
 ### Added
 * Support for `MAC_CLASSIC` (`\r`) line ending ([#1243](https://github.com/diffplug/spotless/pull/1243) fixes [#1196](https://github.com/diffplug/spotless/issues/1196))
-### Changes
+### Changed
 * Bump default `ktlint` version to latest `0.45.2` -> `0.46.1` ([#1239](https://github.com/diffplug/spotless/issues/1239))
   * Minimum supported version also bumped to `0.46.0` (we have abandoned strong backward compatibility for `ktlint`, from here on out Spotless will only support the most-recent breaking change).
 * Bump default `diktat` version to latest `1.1.0` -> `1.2.1` ([#1246](https://github.com/diffplug/spotless/pull/1246))
@@ -355,17 +355,17 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Update the `black` version regex to fix `19.10b0` and earlier. (fixes [#1195](https://github.com/diffplug/spotless/issues/1195), regression introduced in `6.5.0`)
 * Improved daemon memory consumption ([#1198](https://github.com/diffplug/spotless/pull/1198) fixes [#1194](https://github.com/diffplug/spotless/issues/1194))
-### Changes
+### Changed
 * Bump default `ktfmt` version to latest `0.36` -> `0.37`. ([#1200](https://github.com/diffplug/spotless/pull/1200))
 
 ## [6.5.2] - 2022-05-03
-### Changes
+### Changed
 * Bump default `diktat` version to latest `1.0.1` -> `1.1.0`. ([#1190](https://github.com/diffplug/spotless/pull/1190))
   * Converted `diktat` integration to use a compile-only source set. (fixes [#524](https://github.com/diffplug/spotless/issues/524))
   * Use the full path to a file in `diktat` integration. (fixes [#1189](https://github.com/diffplug/spotless/issues/1189))
 
 ## [6.5.1] - 2022-04-27
-### Changes
+### Changed
 * Bump default `ktfmt` version to latest `0.35` -> `0.36`. ([#1183](https://github.com/diffplug/spotless/issues/1183))
 * Bump default `google-java-format` version to latest `1.13.0` -> `1.15.0`.
   * ~~This means it is no longer necessary to use the `--add-exports` workaround (fixes [#834](https://github.com/diffplug/spotless/issues/834)).~~ `--add-exports` workaround is still needed.
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 21becc4f4a..195036e66d 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,7 +3,7 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
-### Changes
+### Changed
 * Bump default `ktlint` version to latest `1.2.1` -> `1.3.0`. ([#2165](https://github.com/diffplug/spotless/pull/2165))
 * Bump default `ktfmt` version to latest `0.49` -> `0.51`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
 * Rename property `ktfmt` option `removeUnusedImport` -> `removeUnusedImports` to match `ktfmt`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
@@ -28,7 +28,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * scalafmt.conf fileOverride section now works correctly ([#1854](https://github.com/diffplug/spotless/pull/1854))
 * Fix stdin pipe is being closed exception on Windows for large .proto files ([#2147](https://github.com/diffplug/spotless/issues/2147))
 * Reworked ShadowCopy (`npmInstallCache`) to use atomic filesystem operations, resolving several race conditions that could arise ([#2151](https://github.com/diffplug/spotless/pull/2151))
-### Changes
+### Changed
 * Bump default `cleanthat` version to latest `2.16` -> `2.20`. ([#1725](https://github.com/diffplug/spotless/pull/1725))
 * Bump default `gherkin-utils` version to latest `8.0.2` -> `9.0.0`. ([#1703](https://github.com/diffplug/spotless/pull/1703))
 * Bump default `google-java-format` version to latest `1.19.2` -> `1.22.0`. ([#2129](https://github.com/diffplug/spotless/pull/2129))
@@ -53,7 +53,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * M2E support: Emit file specific errors during incremental build. ([#1960](https://github.com/diffplug/spotless/issues/1960))
 ### Fixed
 * Fix empty files with biome >= 1.5.0 when formatting files that are in the ignore list of the biome configuration file. ([#1989](https://github.com/diffplug/spotless/pull/1989) fixes [#1987](https://github.com/diffplug/spotless/issues/1987))
-### Changes
+### Changed
 * Use palantir-java-format 2.39.0 on Java 21. ([#1948](https://github.com/diffplug/spotless/pull/1948))
 * Bump default `ktlint` version to latest `1.0.1` -> `1.1.1`. ([#1973](https://github.com/diffplug/spotless/pull/1973))
 * Bump default `googleJavaFormat` version to latest `1.18.1` -> `1.19.2`. ([#1971](https://github.com/diffplug/spotless/pull/1971))
@@ -63,7 +63,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Revert [#1846](https://github.com/diffplug/spotless/issues/1846) from 2.41.0 which causes the plugin to format generated sources in the `target` directory. ([#1928](https://github.com/diffplug/spotless/pull/1928))
 * Eclipse-based steps which contained any jars with a `+` in their path were broken, now fixed. ([#1860](https://github.com/diffplug/spotless/issues/1860#issuecomment-1826113332))
-### Changes
+### Changed
 * Bump default `palantir-java-format` version to latest `2.28.0` -> `2.38.0` on Java 21. ([#1920](https://github.com/diffplug/spotless/pull/1920))
 * Bump default `googleJavaFormat` version to latest `1.17.0` -> `1.18.1`. ([#1920](https://github.com/diffplug/spotless/pull/1920))
 * Bump default `ktfmt` version to latest `0.44` -> `0.46`. ([#1927](https://github.com/diffplug/spotless/pull/1927))
@@ -79,7 +79,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Fix crash when build dir is a softlink to another directory. ([#1859](https://github.com/diffplug/spotless/pull/1859))
 * Fix Eclipse JDT on some settings files. ([#1864](https://github.com/diffplug/spotless/pull/1864) fixes [#1638](https://github.com/diffplug/spotless/issues/1638))
-### Changes
+### Changed
 * Bump default `ktlint` version to latest `1.0.0` -> `1.0.1`. ([#1855](https://github.com/diffplug/spotless/pull/1855))
 * Add a Step to remove semicolons from Groovy files. ([#1881](https://github.com/diffplug/spotless/pull/1881))
 
@@ -106,7 +106,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
   The same configuration exists for `<greclipse>` and `<eclipseCdt>`.
 ### Fixed
 * Fixed support for plugins when using Prettier version `3.0.0` and newer. ([#1802](https://github.com/diffplug/spotless/pull/1802))
-### Changes
+### Changed
 * Bump default `flexmark` version to latest `0.64.0` -> `0.64.8`. ([#1801](https://github.com/diffplug/spotless/pull/1801))
 * Bump default `ktlint` version to latest `0.50.0` -> `1.0.0`. ([#1808](https://github.com/diffplug/spotless/pull/1808))
 * **POSSIBLY BREAKING** the default line endings are now `GIT_ATTRIBUTES_FAST_ALLSAME` instead of `GIT_ATTRIBUTES`. ([#1838](https://github.com/diffplug/spotless/pull/1838))
@@ -120,7 +120,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Add support for `prettier` version `3.0.0` and newer. ([#1760](https://github.com/diffplug/spotless/pull/1760), [#1751](https://github.com/diffplug/spotless/issues/1751))
 * Fix npm install calls when npm cache is not up-to-date. ([#1760](https://github.com/diffplug/spotless/pull/1760), [#1750](https://github.com/diffplug/spotless/issues/1750))
-### Changes
+### Changed
 * Bump default `eslint` version to latest `8.31.0` -> `8.45.0` ([#1761](https://github.com/diffplug/spotless/pull/1761))
 * Bump default `prettier` version to latest (v2) `2.8.1` -> `2.8.8`. ([#1760](https://github.com/diffplug/spotless/pull/1760))
 * Bump default `greclipse` version to latest `4.27` -> `4.28`. ([#1775](https://github.com/diffplug/spotless/pull/1775))
@@ -130,7 +130,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Support pass skip (`-Dspotless.skip=true`) from command-line. ([#1729](https://github.com/diffplug/spotless/pull/1729))
 ### Fixed
 * Update documented default `semanticSort` to `false`. ([#1728](https://github.com/diffplug/spotless/pull/1728))
-### Changes
+### Changed
 * Bump default `cleanthat` version to latest `2.13` -> `2.17`. ([#1734](https://github.com/diffplug/spotless/pull/1734))
 * Bump default `ktlint` version to latest `0.49.1` -> `0.50.0`. ([#1741](https://github.com/diffplug/spotless/issues/1741))
   * Dropped support for `ktlint 0.47.x` following our policy of supporting two breaking changes at a time.
@@ -145,7 +145,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Fixed a regression which changed the import sorting order in `googleJavaFormat` introduced in `2.36.0`. ([#1680](https://github.com/diffplug/spotless/pull/1680))
 * Equo-based formatters now work on platforms unsupported by Eclipse such as PowerPC (fixes [durian-swt#20](https://github.com/diffplug/durian-swt/issues/20))
 * When P2 download fails, indicate the responsible formatter. ([#1698](https://github.com/diffplug/spotless/issues/1698))
-### Changes
+### Changed
 * Equo-based formatters now download metadata to `~/.m2/repository/dev/equo/p2-data` rather than `~/.equo`, and for CI machines without a home directory the p2 data goes to `$GRADLE_USER_HOME/caches/p2-data`. ([#1714](https://github.com/diffplug/spotless/pull/1714))
 * Bump default `googleJavaFormat` version to latest `1.16.0` -> `1.17.0`. ([#1710](https://github.com/diffplug/spotless/pull/1710))
 * Bump default `ktfmt` version to latest `0.43` -> `0.44`. ([#1691](https://github.com/diffplug/spotless/pull/1691))
@@ -160,7 +160,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Added formatter for Gherkin feature files ([#1649](https://github.com/diffplug/spotless/issues/1649)).
 ### Fixed
 * Fix non deterministic computation of cache fingerprint when using multiple formatters. ([#1643](https://github.com/diffplug/spotless/pull/1643) fixes [#1642](https://github.com/diffplug/spotless/pull/1642))
-### Changes
+### Changed
 * **POTENTIALLY BREAKING** Drop support for `googleJavaFormat` versions &lt; `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
 * Bump default `cleanthat` version to latest `2.6` -> `2.13`. ([#1589](https://github.com/diffplug/spotless/pull/1589) and [#1661](https://github.com/diffplug/spotless/pull/1661))
 * Bump default `diktat` version `1.2.4.2` -> `1.2.5`. ([#1631](https://github.com/diffplug/spotless/pull/1631))
@@ -177,7 +177,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * You can now put the filename into a license header template with `$FILE`. ([#1605](https://github.com/diffplug/spotless/pull/1605) fixes [#1147](https://github.com/diffplug/spotless/issues/1147))
 ### Fixed
 * `licenseHeader` default pattern for Java files is updated to `(package|import|public|class|module) `. ([#1614](https://github.com/diffplug/spotless/pull/1614))
-### Changes
+### Changed
 * Enable incremental up-to-date checking by default. ([#1621](https://github.com/diffplug/spotless/pull/1621))
 * All Eclipse formatters are now based on [Equo Solstice OSGi and p2 shim](https://github.com/equodev/equo-ide/tree/main/solstice). ([#1524](https://github.com/diffplug/spotless/pull/1524))
   * Eclipse JDT bumped default to `4.26` from `4.21`, oldest supported is `4.9`.
@@ -194,7 +194,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * `<json><jackson>` can now handle `Array` as a root element. ([#1585](https://github.com/diffplug/spotless/pull/1585))
 * Reduce logging-noise created by `npm`-based formatters ([#1590](https://github.com/diffplug/spotless/pull/1590) fixes [#1582](https://github.com/diffplug/spotless/issues/1582))
-### Changes
+### Changed
 * Bump default `cleanthat` version to latest `2.1` -> `2.6` ([#1569](https://github.com/diffplug/spotless/pull/1569) and [#1574](https://github.com/diffplug/spotless/pull/1574))
 
 ## [2.33.0] - 2023-02-10
@@ -204,7 +204,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Allow multiple instances of the same npm-based formatter to be used simultaneously. E.g. use prettier for typescript
   *and* Java (using the community prettier-plugin-java) without messing up their respective `node_module` dependencies. ([#1565](https://github.com/diffplug/spotless/pull/1565))
 * `ktfmt` default style uses correct continuation indent. ([#1562](https://github.com/diffplug/spotless/pull/1562))
-### Changes
+### Changed
 * Bump default `ktfmt` version to latest `0.42` -> `0.43` ([#1561](https://github.com/diffplug/spotless/pull/1561))
 * Bump default `jackson` version to latest `2.14.1` -> `2.14.2` ([#1536](https://github.com/diffplug/spotless/pull/1536))
 
@@ -227,7 +227,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * The default list of type annotations used by `formatAnnotations` has had 8 more annotations from the Checker Framework added [#1494](https://github.com/diffplug/spotless/pull/1494)
 * **POTENTIALLY BREAKING** Generate the correct qualifiedRuleId for Ktlint 0.48.x [#1495](https://github.com/diffplug/spotless/pull/1495)
-### Changes
+### Changed
 * **POTENTIALLY BREAKING** Bump minimum JRE from 8 to 11 ([#1514](https://github.com/diffplug/spotless/pull/1514) part 1 of [#1337](https://github.com/diffplug/spotless/issues/1337))
   * You can bump your build JRE without bumping your requirements ([docs](https://maven.apache.org/plugins/maven-compiler-plugin/examples/set-compiler-source-and-target.html)).
 * Spotless' custom build was replaced by [`maven-plugin-development`](https://github.com/britter/maven-plugin-development). ([#1496](https://github.com/diffplug/spotless/pull/1496) fixes [#554](https://github.com/diffplug/spotless/issues/554))
@@ -250,7 +250,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Support `ktlint` 0.48+ new rule disabling syntax ([#1456](https://github.com/diffplug/spotless/pull/1456)) fixes ([#1444](https://github.com/diffplug/spotless/issues/1444))
 * Fix subgroups leading catch all matcher.
-### Changes
+### Changed
 * Bump default `ktlint` version to latest `0.47.1` -> `0.48.1` ([#1456](https://github.com/diffplug/spotless/pull/1456))
 * Reduce spurious invalidations of the up-to-date index file ([#1461](https://github.com/diffplug/spotless/pull/1461))
 * Bump default version for `prettier` from `2.0.5` to `2.8.1` ([#1453](https://github.com/diffplug/spotless/pull/1453))
@@ -261,7 +261,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Improve memory usage when using git ratchet ([#1426](https://github.com/diffplug/spotless/pull/1426))
 * Support `ktlint` 0.48+ ([#1432](https://github.com/diffplug/spotless/pull/1432)) fixes ([#1430](https://github.com/diffplug/spotless/issues/1430))
-### Changes
+### Changed
 * Bump default `ktlint` version to latest `0.47.1` -> `0.48.0` ([#1432](https://github.com/diffplug/spotless/pull/1432))
 * Bump default `ktfmt` version to latest `0.41` -> `0.42` ([#1421](https://github.com/diffplug/spotless/pull/1421))
 
@@ -272,7 +272,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Don't treat `@Value` as a type annotation [#1367](https://github.com/diffplug/spotless/pull/1367)
 * Support `ktlint_disabled_rules` in `ktlint` 0.47.x [#1378](https://github.com/diffplug/spotless/pull/1378)
 * Share git repositories across projects when using ratchet ([#1426](https://github.com/diffplug/spotless/pull/1426))
-### Changes
+### Changed
 * Bump default `ktfmt` version to latest `0.40` -> `0.41` ([#1340](https://github.com/diffplug/spotless/pull/1340))
 * Bump default `scalafmt` version to latest `3.5.9` -> `3.6.1` ([#1373](https://github.com/diffplug/spotless/pull/1373))
 * Bump default `diktat` version to latest `1.2.3` -> `1.2.4.2` ([#1393](https://github.com/diffplug/spotless/pull/1393))
@@ -293,7 +293,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [2.26.0] - 2022-09-14
 ### Added
 * `formatAnnotations` step to correct formatting of Java type annotations.  It puts type annotations on the same line as the type that they qualify.  Run it after a Java formatting step, such as `googleJavaFormat`. ([#1275](https://github.com/diffplug/spotless/pull/1275))
-### Changes
+### Changed
 * Bump default `ktfmt` version to latest `0.39` -> `0.40` ([#1312](https://github.com/diffplug/spotless/pull/1312))
 * Bump default `ktlint` version to latest `0.46.1` -> `0.47.1` ([#1303](https://github.com/diffplug/spotless/pull/1303))
   * Also restored support for older versions of ktlint back to `0.31.0`
@@ -301,14 +301,14 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [2.25.0] - 2022-08-23
 ### Added
 * `scalafmt` integration now has a configuration option `majorScalaVersion` that allows you to configure the Scala version that gets resolved from the Maven artifact ([#1283](https://github.com/diffplug/spotless/pull/1283))
-### Changes
+### Changed
 * Add the `ktlint` rule in error messages when `ktlint` fails to apply a fix ([#1279](https://github.com/diffplug/spotless/pull/1279))
 * Bump default `scalafmt` to latest `3.0.8` -> `3.5.9` (removed support for pre-`3.0.0`) ([#1283](https://github.com/diffplug/spotless/pull/1283))
 
 ## [2.24.1] - 2022-08-10
 ### Fixed
 * Fix Clang not knowing the filename and changing the format ([#1268](https://github.com/diffplug/spotless/pull/1268) fixes [#1267](https://github.com/diffplug/spotless/issues/1267)).
-### Changes
+### Changed
 * Bump default `diktat` version to latest `1.2.1` -> `1.2.3` ([#1266](https://github.com/diffplug/spotless/pull/1266))
 
 ## [2.24.0] - 2022-07-28
@@ -319,7 +319,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [2.23.0] - 2022-06-30
 ### Added
 * Support for `MAC_CLASSIC` (`\r`) line ending ([#1243](https://github.com/diffplug/spotless/pull/1243) fixes [#1196](https://github.com/diffplug/spotless/issues/1196))
-### Changes
+### Changed
 * Bump default `ktlint` version to latest `0.45.2` -> `0.46.1` ([#1239](https://github.com/diffplug/spotless/issues/1239))
   * Minimum supported version also bumped to `0.46.0` (we have abandoned strong backward compatibility for `ktlint`, from here on out Spotless will only support the most-recent breaking change).
 * Bump default `diktat` version to latest `1.1.0` -> `1.2.1` ([#1246](https://github.com/diffplug/spotless/pull/1246))
@@ -343,17 +343,17 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [2.22.5] - 2022-05-10
 ### Fixed
 * Update the `black` version regex to fix `19.10b0` and earlier. (fixes [#1195](https://github.com/diffplug/spotless/issues/1195), regression introduced in `2.22.2`)
-### Changes
+### Changed
 * Bump default `ktfmt` version to latest `0.36` -> `0.37`. ([#1200](https://github.com/diffplug/spotless/pull/1200))
 
 ## [2.22.4] - 2022-05-03
-### Changes
+### Changed
 * Bump default `diktat` version to latest `1.0.1` -> `1.1.0`. ([#1190](https://github.com/diffplug/spotless/pull/1190))
   * Converted `diktat` integration to use a compile-only source set. (fixes [#524](https://github.com/diffplug/spotless/issues/524))
   * Use the full path to a file in `diktat` integration. (fixes [#1189](https://github.com/diffplug/spotless/issues/1189))
 
 ## [2.22.3] - 2022-04-27
-### Changes
+### Changed
 * Bump default `ktfmt` version to latest `0.35` -> `0.36`. ([#1183](https://github.com/diffplug/spotless/issues/1183))
 * Bump default `google-java-format` version to latest `1.13.0` -> `1.15.0`.
   * ~~This means it is no longer necessary to use the `--add-exports` workaround (fixes [#834](https://github.com/diffplug/spotless/issues/834)).~~ `--add-exports` workaround is still needed.
@@ -362,7 +362,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Fixed support for Python Black's new version reporting. ([#1170](https://github.com/diffplug/spotless/issues/1170))
 * Error messages for unexpected file encoding now works on Java 8. (fixes [#1081](https://github.com/diffplug/spotless/issues/1081))
-### Changes
+### Changed
 * Bump default `black` version to latest `19.10b0` -> `22.3.0`. ([#1170](https://github.com/diffplug/spotless/issues/1170))
 * Bump default `ktfmt` version to latest `0.34` -> `0.35`. ([#1159](https://github.com/diffplug/spotless/pull/1159))
 * Bump default `ktlint` version to latest `0.43.2` -> `0.45.2`. ([#1177](https://github.com/diffplug/spotless/pull/1177))
@@ -649,7 +649,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * `<ktlint>` is now more robust when parsing version string for version-dependent implementation details, fixes [#668](https://github.com/diffplug/spotless/issues/668).
 
 ## [2.0.2] - 2020-08-10
-### Changes
+### Changed
 *  Bump default ktfmt from 0.13 to 0.16 ([#642](https://github.com/diffplug/spotless/pull/648)).
 
 ### Fixed

From cb88914eecbcf2ae28342b048fd49a94e13b3899 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 18 Jun 2024 13:38:17 +0000
Subject: [PATCH 1727/2068] Update dependency com.google.code.gson:gson to
 v2.11.0

---
 lib/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 24dddfe396..bc2b78973b 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -95,7 +95,7 @@ dependencies {
 	// googleJavaFormat
 	googleJavaFormatCompileOnly 'com.google.googlejavaformat:google-java-format:1.22.0'
 	// gson
-	gsonCompileOnly 'com.google.code.gson:gson:2.10.1'
+	gsonCompileOnly 'com.google.code.gson:gson:2.11.0'
 	// jackson
 	String VER_JACKSON='2.17.1'
 	jacksonCompileOnly "com.fasterxml.jackson.core:jackson-databind:$VER_JACKSON"

From 1e55d6c9e81b0e0a77bc9d26be769681ce4e0b26 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 18 Jun 2024 21:43:28 +0800
Subject: [PATCH 1728/2068] Unify gson versions to 2.11.0

---
 CHANGES.md                                                  | 1 +
 .../main/java/com/diffplug/spotless/json/gson/GsonStep.java | 1 +
 plugin-gradle/CHANGES.md                                    | 1 +
 .../java/com/diffplug/gradle/spotless/JsonExtension.java    | 3 +--
 plugin-maven/CHANGES.md                                     | 1 +
 .../main/java/com/diffplug/spotless/maven/json/Gson.java    | 6 ++----
 .../java/com/diffplug/spotless/json/gson/GsonStepTest.java  | 6 +++---
 7 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index d869bcc94a..3f70dc7f1d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -18,6 +18,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `eclipse` version to latest `4.29` -> `4.32`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
 * Bump default `greclipse` version to latest `4.29` -> `4.32`. ([#2179](https://github.com/diffplug/spotless/pull/2179), [#2190](https://github.com/diffplug/spotless/pull/2190))
 * Bump default `cdt` version to latest `11.3` -> `11.6`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
+* Bump default `gson` version to latest `2.10.1` -> `2.11.0`. ([#2128](https://github.com/diffplug/spotless/pull/2128))
 ### Fixed
 * Fix compatibility issue introduced by `ktfmt` `0.51`. ([#2172](https://github.com/diffplug/spotless/issues/2172))
 ### Added
diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
index d84aae5a57..a690b02b95 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
@@ -30,6 +30,7 @@ public class GsonStep implements Serializable {
 	private static final String MAVEN_COORDINATES = "com.google.code.gson:gson";
 	private static final String INCOMPATIBLE_ERROR_MESSAGE = "There was a problem interacting with Gson; maybe you set an incompatible version?";
 	public static final String NAME = "gson";
+	public static final String DEFAULT_VERSION = "2.11.0";
 
 	private final JarState.Promised jarState;
 	private final GsonConfig gsonConfig;
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 12bb07d399..37d27fc791 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -11,6 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `eclipse` version to latest `4.29` -> `4.32`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
 * Bump default `greclipse` version to latest `4.29` -> `4.32`. ([#2179](https://github.com/diffplug/spotless/pull/2179), [#2190](https://github.com/diffplug/spotless/pull/2190))
 * Bump default `cdt` version to latest `11.3` -> `11.6`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
+* Bump default `gson` version to latest `2.10.1` -> `2.11.0`. ([#2128](https://github.com/diffplug/spotless/pull/2128))
 ### Fixed
 * Fix compatibility issue introduced by `ktfmt` `0.51`. ([#2172](https://github.com/diffplug/spotless/issues/2172))
 ### Added
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
index 80e207d6da..47db97b2e6 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
@@ -31,7 +31,6 @@
 
 public class JsonExtension extends FormatExtension {
 	private static final int DEFAULT_INDENTATION = 4;
-	private static final String DEFAULT_GSON_VERSION = "2.10.1";
 	private static final String DEFAULT_ZJSONPATCH_VERSION = "0.4.14";
 	static final String NAME = "json";
 
@@ -112,7 +111,7 @@ public GsonConfig() {
 			this.indentSpaces = DEFAULT_INDENTATION;
 			this.sortByKeys = false;
 			this.escapeHtml = false;
-			this.version = DEFAULT_GSON_VERSION;
+			this.version = GsonStep.DEFAULT_VERSION;
 			addStep(createStep());
 		}
 
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 446f6c01ca..285169560f 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -11,6 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `eclipse` version to latest `4.29` -> `4.32`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
 * Bump default `greclipse` version to latest `4.29` -> `4.32`. ([#2179](https://github.com/diffplug/spotless/pull/2179), [#2190](https://github.com/diffplug/spotless/pull/2190))
 * Bump default `cdt` version to latest `11.3` -> `11.6`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
+* Bump default `gson` version to latest `2.10.1` -> `2.11.0`. ([#2128](https://github.com/diffplug/spotless/pull/2128))
 ### Fixed
 * Fix compatibility issue introduced by `ktfmt` `0.51`. ([#2172](https://github.com/diffplug/spotless/issues/2172))
 ### Added
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Gson.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Gson.java
index fb5a38e890..a76ddd396e 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Gson.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Gson.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,8 +24,6 @@
 import com.diffplug.spotless.maven.FormatterStepFactory;
 
 public class Gson implements FormatterStepFactory {
-	private static final String DEFAULT_GSON_VERSION = "2.10.1";
-
 	@Parameter
 	int indentSpaces = Json.DEFAULT_INDENTATION;
 
@@ -36,7 +34,7 @@ public class Gson implements FormatterStepFactory {
 	boolean escapeHtml = false;
 
 	@Parameter
-	String version = DEFAULT_GSON_VERSION;
+	String version = GsonStep.DEFAULT_VERSION;
 
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
diff --git a/testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java b/testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java
index 3f4d2a84e0..afe56a0a48 100644
--- a/testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 DiffPlug
+ * Copyright 2022-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
  */
 package com.diffplug.spotless.json.gson;
 
+import static com.diffplug.spotless.json.gson.GsonStep.DEFAULT_VERSION;
+
 import java.io.File;
 
 import org.assertj.core.api.Assertions;
@@ -28,8 +30,6 @@
 
 public class GsonStepTest extends JsonFormatterStepCommonTests {
 
-	private static final String DEFAULT_VERSION = "2.10.1";
-
 	@Test
 	void handlesComplexNestedObject() {
 		doWithResource("cucumberJsonSampleGson");

From 53a2c485e3592fce40df742a10d92dcb948e3a01 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 3 Jul 2024 08:49:14 -0700
Subject: [PATCH 1729/2068] Add a test to verify our assumptions about equality
 / hashCode / serialization for EclipseJdtFormatterStep.

---
 .../extra/java/EclipseJdtEqualityTest.java    | 64 +++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtEqualityTest.java

diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtEqualityTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtEqualityTest.java
new file mode 100644
index 0000000000..c842337b3e
--- /dev/null
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtEqualityTest.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.extra.java;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.List;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.ResourceHarness;
+import com.diffplug.spotless.TestProvisioner;
+import com.diffplug.spotless.ThrowingEx;
+
+public class EclipseJdtEqualityTest extends ResourceHarness {
+	@Test
+	public void test() throws Exception {
+		var settings1 = setFile("subfolder1/formatter.xml").toResource("java/eclipse/formatter.xml");
+		var settings2 = setFile("subfolder2/formatter.xml").toResource("java/eclipse/formatter.xml");
+		var step1 = withSettingsFile(settings1);
+		var step2 = withSettingsFile(settings2);
+
+		Assertions.assertTrue(step1.equals(step2));
+		Assertions.assertTrue(step1.hashCode() == step2.hashCode());
+
+		var serialized1 = toBytes(step1);
+		var serialized2 = toBytes(step2);
+		Assertions.assertFalse(serialized1.equals(serialized2));
+	}
+
+	private static FormatterStep withSettingsFile(File settingsFile) {
+		var builder = EclipseJdtFormatterStep.createBuilder(TestProvisioner.mavenCentral());
+		builder.setPreferences(List.of(settingsFile));
+		return builder.build();
+	}
+
+	private static byte[] toBytes(Serializable obj) {
+		ByteArrayOutputStream byteOutput = new ByteArrayOutputStream();
+		try (ObjectOutputStream objectOutput = new ObjectOutputStream(byteOutput)) {
+			objectOutput.writeObject(obj);
+		} catch (IOException e) {
+			throw ThrowingEx.asRuntime(e);
+		}
+		return byteOutput.toByteArray();
+	}
+}

From d6c68e6fda2948ef964d1be73e789c0013bccd40 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 6 Jul 2024 16:09:07 +0000
Subject: [PATCH 1730/2068] Update plugin com.diffplug.spotless-changelog to
 v3.1.2

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index c105dcffd9..3b65b34033 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -14,7 +14,7 @@ plugins {
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
 	id 'com.github.spotbugs' version '6.0.18' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
-	id 'com.diffplug.spotless-changelog' version '3.0.2' apply false
+	id 'com.diffplug.spotless-changelog' version '3.1.2' apply false
 	// https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md
 	id 'com.adarshr.test-logger' version '4.0.0' apply false
 	// https://github.com/davidburstrom/version-compatibility-gradle-plugin/tags

From cb9fb0a16295faa9227fd4acc6ebe31144b98502 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sun, 7 Jul 2024 08:58:55 +0800
Subject: [PATCH 1731/2068] Use GITHUB_TOKEN

---
 .github/workflows/deploy.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index d5106c79a3..e964372c93 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,4 +1,4 @@
-# GH_TOKEN
+# GITHUB_TOKEN
 # NEXUS_USER
 # NEXUS_PASS64 (base64 NOTE: `base64` and `openssl base64` failed, had to use Java
 #   byte[] data = "{{password}}".getBytes(StandardCharsets.UTF_8);
@@ -30,7 +30,7 @@ jobs:
     runs-on: ubuntu-latest
     name: deploy
     env:
-      gh_token: ${{ secrets.GH_TOKEN }}
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       ORG_GRADLE_PROJECT_nexus_user: ${{ secrets.NEXUS_USER }}
       ORG_GRADLE_PROJECT_nexus_pass64: ${{ secrets.NEXUS_PASS64 }}
       ORG_GRADLE_PROJECT_gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}

From 1b1a98b5fb904eaff3558794d7d09728dafeee27 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 7 Jul 2024 01:03:00 +0000
Subject: [PATCH 1732/2068] Update jackson to 2.17.2 (#2195)

* Update dependency com.fasterxml.jackson.dataformat:jackson-dataformat-yaml to v2.17.2

* Sync changes

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Goooler <wangzongler@gmail.com>
---
 CHANGES.md                                                      | 1 +
 lib/build.gradle                                                | 2 +-
 .../main/java/com/diffplug/spotless/json/JacksonJsonStep.java   | 2 +-
 plugin-gradle/CHANGES.md                                        | 1 +
 plugin-maven/CHANGES.md                                         | 1 +
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 3f70dc7f1d..819a8deeaa 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -19,6 +19,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `greclipse` version to latest `4.29` -> `4.32`. ([#2179](https://github.com/diffplug/spotless/pull/2179), [#2190](https://github.com/diffplug/spotless/pull/2190))
 * Bump default `cdt` version to latest `11.3` -> `11.6`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
 * Bump default `gson` version to latest `2.10.1` -> `2.11.0`. ([#2128](https://github.com/diffplug/spotless/pull/2128))
+* Bump default `jackson` version to latest `2.17.1` -> `2.17.2`. ([#2195](https://github.com/diffplug/spotless/pull/2195))
 ### Fixed
 * Fix compatibility issue introduced by `ktfmt` `0.51`. ([#2172](https://github.com/diffplug/spotless/issues/2172))
 ### Added
diff --git a/lib/build.gradle b/lib/build.gradle
index bc2b78973b..4396e4355a 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -97,7 +97,7 @@ dependencies {
 	// gson
 	gsonCompileOnly 'com.google.code.gson:gson:2.11.0'
 	// jackson
-	String VER_JACKSON='2.17.1'
+	String VER_JACKSON='2.17.2'
 	jacksonCompileOnly "com.fasterxml.jackson.core:jackson-databind:$VER_JACKSON"
 	jacksonCompileOnly "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$VER_JACKSON"
 	// ktfmt
diff --git a/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java b/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java
index f1a2b9ad93..223dc692e5 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java
@@ -32,7 +32,7 @@
 public class JacksonJsonStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String MAVEN_COORDINATE = "com.fasterxml.jackson.core:jackson-databind:";
-	private static final String DEFAULT_VERSION = "2.17.1";
+	private static final String DEFAULT_VERSION = "2.17.2";
 	public static final String NAME = "jacksonJson";
 
 	private final JarState.Promised jarState;
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 37d27fc791..11327be272 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -44,6 +44,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
 * Bump default `sortpom` version to latest `3.2.1` -> `4.0.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049), [#2078](https://github.com/diffplug/spotless/pull/2078), [#2115](https://github.com/diffplug/spotless/pull/2115))
 * Bump default `zjsonpatch` version to latest `0.4.14` -> `0.4.16`. ([#1969](https://github.com/diffplug/spotless/pull/1969))
+* Bump default `jackson` version to latest `2.17.1` -> `2.17.2`. ([#2195](https://github.com/diffplug/spotless/pull/2195))
 ### Removed
 * **BREAKING** Fully removed `Rome`, use `Biome` instead. ([#2119](https://github.com/diffplug/spotless/pull/2119))
 
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 285169560f..5151999412 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `greclipse` version to latest `4.29` -> `4.32`. ([#2179](https://github.com/diffplug/spotless/pull/2179), [#2190](https://github.com/diffplug/spotless/pull/2190))
 * Bump default `cdt` version to latest `11.3` -> `11.6`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
 * Bump default `gson` version to latest `2.10.1` -> `2.11.0`. ([#2128](https://github.com/diffplug/spotless/pull/2128))
+* Bump default `jackson` version to latest `2.17.1` -> `2.17.2`. ([#2195](https://github.com/diffplug/spotless/pull/2195))
 ### Fixed
 * Fix compatibility issue introduced by `ktfmt` `0.51`. ([#2172](https://github.com/diffplug/spotless/issues/2172))
 ### Added

From 533ffa6a616531d9255aa85e69dcc0480219c3f5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 8 Jul 2024 10:14:12 +0800
Subject: [PATCH 1733/2068] Update dependency
 com.github.spullara.mustache.java:compiler to v0.9.14 (#2197)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 plugin-maven/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-maven/build.gradle b/plugin-maven/build.gradle
index 022b7bc299..0d6dbdc236 100644
--- a/plugin-maven/build.gradle
+++ b/plugin-maven/build.gradle
@@ -50,7 +50,7 @@ dependencies {
 	testImplementation "org.assertj:assertj-core:${VER_ASSERTJ}"
 	testImplementation "org.mockito:mockito-core:${VER_MOCKITO}"
 	testImplementation "com.diffplug.durian:durian-io:${VER_DURIAN}"
-	testImplementation 'com.github.spullara.mustache.java:compiler:0.9.13'
+	testImplementation 'com.github.spullara.mustache.java:compiler:0.9.14'
 	testImplementation 'org.owasp.encoder:encoder:1.2.3'
 	testImplementation "org.apache.maven:maven-plugin-api:${VER_MAVEN_API}"
 	testImplementation "org.eclipse.aether:aether-api:${VER_ECLIPSE_AETHER}"

From 43b7f2062cb80787730f6dc258cbed088dafa2ea Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 8 Jul 2024 12:40:14 -0700
Subject: [PATCH 1734/2068] Bump versions from BETA1 to BETA2

---
 gradle/changelog.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle/changelog.gradle b/gradle/changelog.gradle
index 2cad156a63..beeb3235b9 100644
--- a/gradle/changelog.gradle
+++ b/gradle/changelog.gradle
@@ -20,11 +20,11 @@ spotlessChangelog {
 	commitMessage "Published ${kind}/{{version}}" // {{version}} will be replaced
 
 	if (kind == 'gradle') {
-		forceNextVersion '7.0.0.BETA1'
+		forceNextVersion '7.0.0.BETA2'
 	} else if (kind == 'maven') {
-		forceNextVersion '2.44.0.BETA1'
+		forceNextVersion '2.44.0.BETA2'
 	} else {
-		forceNextVersion '3.0.0.BETA1'
+		forceNextVersion '3.0.0.BETA2'
 	}
 }
 

From 57e25f274503842062c39765d5445877638bda8d Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 8 Jul 2024 12:54:01 -0700
Subject: [PATCH 1735/2068] Setup github releases uses spotlessChangelog.

---
 gradle/changelog.gradle | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gradle/changelog.gradle b/gradle/changelog.gradle
index beeb3235b9..cce1509a6c 100644
--- a/gradle/changelog.gradle
+++ b/gradle/changelog.gradle
@@ -1,11 +1,15 @@
 String kind
+String releaseTitle
 if (project.name == 'plugin-gradle') {
 	kind = 'gradle'
+	releaseTitle = 'Gradle Plugin'
 } else if (project.name == 'plugin-maven') {
 	kind = 'maven'
+	releaseTitle = 'Maven Plugin'
 } else {
 	assert project == rootProject
 	kind = 'lib'
+	releaseTitle = 'Lib'
 }
 
 // the root project and plugins have their own changelogs
@@ -18,6 +22,8 @@ spotlessChangelog {
 	branch        'release'
 	tagPrefix     "${kind}/"
 	commitMessage "Published ${kind}/{{version}}" // {{version}} will be replaced
+	tagMessage '{{changes}}'
+	runAfterPush "gh release create ${kind}/{{version}} --title '${releaseTitle} v{{version}}' --notes-from-tag"
 
 	if (kind == 'gradle') {
 		forceNextVersion '7.0.0.BETA2'

From 38bffffb9c226e43c3f51f5abc49f897770385be Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 8 Jul 2024 13:00:47 -0700
Subject: [PATCH 1736/2068] Automatically merge the `release` branch into
 `main` and push it.

---
 .github/workflows/deploy.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index e964372c93..a3f1a47c27 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -66,3 +66,6 @@ jobs:
         if: "${{ github.event.inputs.to_publish == 'lib' }}"
         run: |
           ./gradlew :changelogPush -Prelease=true --stacktrace --warning-mode all --no-configuration-cache
+      - run: git checkout main
+      - run: git merge release --ff-only
+      - run: git push origin main
\ No newline at end of file

From 4afe020dc708693cce2a240ac4ac9461dc27ca92 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 8 Jul 2024 13:01:42 -0700
Subject: [PATCH 1737/2068] Make sure that we have write permission in the
 deploy job.

---
 .github/workflows/deploy.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index a3f1a47c27..02b5b4c8c1 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -29,6 +29,8 @@ jobs:
   build:
     runs-on: ubuntu-latest
     name: deploy
+    permissions:
+      contents: write
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       ORG_GRADLE_PROJECT_nexus_user: ${{ secrets.NEXUS_USER }}

From ad70544f85d3b9ecd277741ae8754924ae14d785 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 8 Jul 2024 13:20:26 -0700
Subject: [PATCH 1738/2068] GITHUB_TOKEN comes for free.

---
 .github/workflows/deploy.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 02b5b4c8c1..1c1cca5bc0 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,4 +1,3 @@
-# GITHUB_TOKEN
 # NEXUS_USER
 # NEXUS_PASS64 (base64 NOTE: `base64` and `openssl base64` failed, had to use Java
 #   byte[] data = "{{password}}".getBytes(StandardCharsets.UTF_8);

From b71c14ca320bdd278867d000955a4f82366008f8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 08:43:08 +0800
Subject: [PATCH 1739/2068] Update dependency org.assertj:assertj-core to
 v3.26.3 (#2199)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 6b8fe6725e..454e9e7017 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -30,5 +30,5 @@ VER_SLF4J=[1.6,2.0[
 VER_DURIAN=1.2.0
 VER_JGIT=6.10.0.202406032230-r
 VER_JUNIT=5.10.3
-VER_ASSERTJ=3.26.0
+VER_ASSERTJ=3.26.3
 VER_MOCKITO=5.12.0

From eab3677fe9672ac6c9a51844327c5381bc265863 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 12 Jul 2024 08:20:37 +0800
Subject: [PATCH 1740/2068] Update dependency gradle to v8.9 (#2202)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/wrapper/gradle-wrapper.jar        | Bin 43453 -> 43504 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 gradlew                                  |   5 ++++-
 gradlew.bat                              |   2 ++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e6441136f3d4ba8a0da8d277868979cfbc8ad796..2c3521197d7c4586c843d1d3e9090525f1898cde 100644
GIT binary patch
delta 8703
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
Ojj7^59?Sdh$^Qpp*~F><

delta 8662
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a4413138c9..09523c0e54 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index b740cf1339..f5feea6d6b 100755
--- a/gradlew
+++ b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/gradlew.bat b/gradlew.bat
index 25da30dbde..9d21a21834 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

From 7691b42913dd375b5496abdec6691ba12235ce56 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 12 Jul 2024 09:11:01 +0800
Subject: [PATCH 1741/2068] Update plugin com.github.spotbugs to v6.0.19
 (#2203)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index c105dcffd9..7c4854a08d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,7 +12,7 @@ plugins {
 	// https://github.com/gradle-nexus/publish-plugin/releases
 	id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
-	id 'com.github.spotbugs' version '6.0.18' apply false
+	id 'com.github.spotbugs' version '6.0.19' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
 	id 'com.diffplug.spotless-changelog' version '3.0.2' apply false
 	// https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md

From aa6540d7c85699464f093d278779ba9979ab033c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 23 Jul 2024 11:22:31 +0800
Subject: [PATCH 1742/2068] Update plugin com.gradle.develocity to v3.17.6
 (#2208)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 7c4854a08d..d992728ea8 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -20,7 +20,7 @@ plugins {
 	// https://github.com/davidburstrom/version-compatibility-gradle-plugin/tags
 	id 'io.github.davidburstrom.version-compatibility' version '0.5.0' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.develocity
-	id 'com.gradle.develocity' version '3.17.5'
+	id 'com.gradle.develocity' version '3.17.6'
 	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
 	id 'dev.equo.ide' version '1.7.6' apply false
 }

From e045d75b12540677df34a8402ef1925ff0b93721 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2024 08:36:29 +0800
Subject: [PATCH 1743/2068] Update dependency
 io.github.solven-eu.cleanthat:java to v2.21 (#2210)

* Update dependency io.github.solven-eu.cleanthat:java to v2.21

* Sync changes

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Goooler <wangzongler@gmail.com>
---
 CHANGES.md                                                      | 1 +
 lib/build.gradle                                                | 2 +-
 .../main/java/com/diffplug/spotless/java/CleanthatJavaStep.java | 2 +-
 plugin-gradle/CHANGES.md                                        | 1 +
 plugin-maven/CHANGES.md                                         | 1 +
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 819a8deeaa..afa83385d2 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -20,6 +20,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `cdt` version to latest `11.3` -> `11.6`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
 * Bump default `gson` version to latest `2.10.1` -> `2.11.0`. ([#2128](https://github.com/diffplug/spotless/pull/2128))
 * Bump default `jackson` version to latest `2.17.1` -> `2.17.2`. ([#2195](https://github.com/diffplug/spotless/pull/2195))
+* Bump default `cleanthat` version to latest `2.20` -> `2.21`. ([#2210](https://github.com/diffplug/spotless/pull/2210))
 ### Fixed
 * Fix compatibility issue introduced by `ktfmt` `0.51`. ([#2172](https://github.com/diffplug/spotless/issues/2172))
 ### Added
diff --git a/lib/build.gradle b/lib/build.gradle
index 4396e4355a..5daf913d33 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -80,7 +80,7 @@ dependencies {
 
 	// GLUE CODE (alphabetic order please)
 	// cleanthat
-	String VER_CLEANTHAT='2.20'
+	String VER_CLEANTHAT='2.21'
 	cleanthatCompileOnly "io.github.solven-eu.cleanthat:java:$VER_CLEANTHAT"
 	compatCleanthat2Dot1CompileAndTestOnly "io.github.solven-eu.cleanthat:java:$VER_CLEANTHAT"
 	// diktat old supported version 1.x
diff --git a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
index 95d1c72760..f4dbc5eec7 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
@@ -43,7 +43,7 @@ public final class CleanthatJavaStep implements Serializable {
 	/**
 	 * CleanThat changelog is available at <a href="https://github.com/solven-eu/cleanthat/blob/master/CHANGES.MD">here</a>.
 	 */
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "2.20");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "2.21");
 
 	private final JarState.Promised jarState;
 	private final String version;
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 11327be272..9f629b68aa 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `greclipse` version to latest `4.29` -> `4.32`. ([#2179](https://github.com/diffplug/spotless/pull/2179), [#2190](https://github.com/diffplug/spotless/pull/2190))
 * Bump default `cdt` version to latest `11.3` -> `11.6`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
 * Bump default `gson` version to latest `2.10.1` -> `2.11.0`. ([#2128](https://github.com/diffplug/spotless/pull/2128))
+* Bump default `cleanthat` version to latest `2.20` -> `2.21`. ([#2210](https://github.com/diffplug/spotless/pull/2210))
 ### Fixed
 * Fix compatibility issue introduced by `ktfmt` `0.51`. ([#2172](https://github.com/diffplug/spotless/issues/2172))
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 5151999412..563349d43c 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -13,6 +13,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `cdt` version to latest `11.3` -> `11.6`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
 * Bump default `gson` version to latest `2.10.1` -> `2.11.0`. ([#2128](https://github.com/diffplug/spotless/pull/2128))
 * Bump default `jackson` version to latest `2.17.1` -> `2.17.2`. ([#2195](https://github.com/diffplug/spotless/pull/2195))
+* Bump default `cleanthat` version to latest `2.20` -> `2.21`. ([#2210](https://github.com/diffplug/spotless/pull/2210))
 ### Fixed
 * Fix compatibility issue introduced by `ktfmt` `0.51`. ([#2172](https://github.com/diffplug/spotless/issues/2172))
 ### Added

From aa1a6665ef08b7c93bfa3fd745ecb67b0631771a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 31 Jul 2024 08:58:16 +0800
Subject: [PATCH 1744/2068] Update dependency
 com.google.googlejavaformat:google-java-format to v1.23.0 (#2212)

* Update dependency com.google.googlejavaformat:google-java-format to v1.23.0

* Sync changes

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Goooler <wangzongler@gmail.com>
---
 CHANGES.md                                                      | 1 +
 lib/build.gradle                                                | 2 +-
 .../java/com/diffplug/spotless/java/GoogleJavaFormatStep.java   | 2 +-
 plugin-gradle/CHANGES.md                                        | 1 +
 plugin-maven/CHANGES.md                                         | 1 +
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index afa83385d2..3b26391d97 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -21,6 +21,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `gson` version to latest `2.10.1` -> `2.11.0`. ([#2128](https://github.com/diffplug/spotless/pull/2128))
 * Bump default `jackson` version to latest `2.17.1` -> `2.17.2`. ([#2195](https://github.com/diffplug/spotless/pull/2195))
 * Bump default `cleanthat` version to latest `2.20` -> `2.21`. ([#2210](https://github.com/diffplug/spotless/pull/2210))
+* Bump default `google-java-format` version to latest `1.22.0` -> `1.23.0`. ([#2212](https://github.com/diffplug/spotless/pull/2212))
 ### Fixed
 * Fix compatibility issue introduced by `ktfmt` `0.51`. ([#2172](https://github.com/diffplug/spotless/issues/2172))
 ### Added
diff --git a/lib/build.gradle b/lib/build.gradle
index 5daf913d33..1b9eaf4902 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -93,7 +93,7 @@ dependencies {
 	gherkinCompileOnly 'io.cucumber:gherkin-utils:9.0.0'
 	gherkinCompileOnly 'org.slf4j:slf4j-api:2.0.0'
 	// googleJavaFormat
-	googleJavaFormatCompileOnly 'com.google.googlejavaformat:google-java-format:1.22.0'
+	googleJavaFormatCompileOnly 'com.google.googlejavaformat:google-java-format:1.23.0'
 	// gson
 	gsonCompileOnly 'com.google.code.gson:gson:2.11.0'
 	// jackson
diff --git a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
index b26f098cd5..3a74bdcf85 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
@@ -121,7 +121,7 @@ private static FormatterStep createInternally(String groupArtifact, String versi
 			.addMin(11, "1.8") // we only support google-java-format >= 1.8 due to api changes
 			.addMin(16, "1.10.0") // java 16 requires at least 1.10.0 due to jdk api changes in JavaTokenizer
 			.addMin(21, "1.17.0") // java 21 requires at least 1.17.0 due to https://github.com/google/google-java-format/issues/898
-			.add(11, "1.22.0"); // default version
+			.add(11, "1.23.0"); // default version
 
 	public static String defaultGroupArtifact() {
 		return MAVEN_COORDINATE;
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 9f629b68aa..3973f2b356 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -13,6 +13,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `cdt` version to latest `11.3` -> `11.6`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
 * Bump default `gson` version to latest `2.10.1` -> `2.11.0`. ([#2128](https://github.com/diffplug/spotless/pull/2128))
 * Bump default `cleanthat` version to latest `2.20` -> `2.21`. ([#2210](https://github.com/diffplug/spotless/pull/2210))
+* Bump default `google-java-format` version to latest `1.22.0` -> `1.23.0`. ([#2212](https://github.com/diffplug/spotless/pull/2212))
 ### Fixed
 * Fix compatibility issue introduced by `ktfmt` `0.51`. ([#2172](https://github.com/diffplug/spotless/issues/2172))
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 563349d43c..d6e7824e4d 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -14,6 +14,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `gson` version to latest `2.10.1` -> `2.11.0`. ([#2128](https://github.com/diffplug/spotless/pull/2128))
 * Bump default `jackson` version to latest `2.17.1` -> `2.17.2`. ([#2195](https://github.com/diffplug/spotless/pull/2195))
 * Bump default `cleanthat` version to latest `2.20` -> `2.21`. ([#2210](https://github.com/diffplug/spotless/pull/2210))
+* Bump default `google-java-format` version to latest `1.22.0` -> `1.23.0`. ([#2212](https://github.com/diffplug/spotless/pull/2212))
 ### Fixed
 * Fix compatibility issue introduced by `ktfmt` `0.51`. ([#2172](https://github.com/diffplug/spotless/issues/2172))
 ### Added

From a05e21d34e82e6b570f8b622546e839781845b79 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 4 Aug 2024 01:31:42 +0000
Subject: [PATCH 1745/2068] Update gradle/actions action to v4 (#2216)

* Update gradle/actions action to v4

* Apply suggestions from code review

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Zongle Wang <wangzongler@gmail.com>
---
 .github/workflows/changelog-print.yml | 4 +---
 .github/workflows/ci.yml              | 8 ++------
 .github/workflows/deploy.yml          | 4 +---
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/changelog-print.yml b/.github/workflows/changelog-print.yml
index e9b15ce5fc..88be1f9332 100644
--- a/.github/workflows/changelog-print.yml
+++ b/.github/workflows/changelog-print.yml
@@ -16,7 +16,5 @@ jobs:
           java-version: 11
           distribution: 'temurin'
       - name: gradle caching
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          gradle-home-cache-cleanup: true
+        uses: gradle/actions/setup-gradle@v4
       - run: ./gradlew changelogPrint
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4c9f399035..ab3964d61c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,9 +29,7 @@ jobs:
           distribution: "temurin"
           java-version: 11
       - name: gradle caching
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          gradle-home-cache-cleanup: true
+        uses: gradle/actions/setup-gradle@v4
       - name: spotlessCheck
         run: ./gradlew spotlessCheck
       - name: assemble testClasses
@@ -71,9 +69,7 @@ jobs:
           distribution: "temurin"
           java-version: ${{ matrix.jre }}
       - name: gradle caching
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          gradle-home-cache-cleanup: true
+        uses: gradle/actions/setup-gradle@v4
       - name: build (maven-only)
         if: matrix.kind == 'maven'
         run: ./gradlew :plugin-maven:build -x spotlessCheck
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index d5106c79a3..a6948d6ed6 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -43,9 +43,7 @@ jobs:
           java-version: 11
           distribution: 'temurin'
       - name: gradle caching
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          gradle-home-cache-cleanup: true
+        uses: gradle/actions/setup-gradle@v4
       - name: git fetch origin main
         run: git fetch origin main
       - name: publish all

From 7a67233a4f7cb639774ca78f7dd0f0794bf860b5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 9 Aug 2024 02:18:32 +0000
Subject: [PATCH 1746/2068] Update dependency dev.equo.ide:solstice to v1.7.7

---
 lib-extra/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index 9ea3f29afe..a21f4a1f66 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -7,7 +7,7 @@ version = rootProject.spotlessChangelog.versionNext
 apply from: rootProject.file('gradle/java-setup.gradle')
 apply from: rootProject.file('gradle/java-publish.gradle')
 
-String VER_SOLSTICE = '1.7.6'
+String VER_SOLSTICE = '1.7.7'
 dependencies {
 	api projects.lib
 	// misc useful utilities

From 76c150648168420e7ed758d0da7196744b4a55c1 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 9 Aug 2024 08:43:57 +0000
Subject: [PATCH 1747/2068] Update plugin com.github.spotbugs to v6.0.20

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index d992728ea8..5c01d22a77 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,7 +12,7 @@ plugins {
 	// https://github.com/gradle-nexus/publish-plugin/releases
 	id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
-	id 'com.github.spotbugs' version '6.0.19' apply false
+	id 'com.github.spotbugs' version '6.0.20' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
 	id 'com.diffplug.spotless-changelog' version '3.0.2' apply false
 	// https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md

From 0b180d408d33f0cb78ea178104e75886b7bf8e2f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 10 Aug 2024 11:09:06 +0000
Subject: [PATCH 1748/2068] Update dependency org.slf4j:slf4j-api to v2.0.16

---
 lib/build.gradle | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 1b9eaf4902..ace50bf1c3 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -68,8 +68,8 @@ tasks.named("check").configure {
 }
 
 dependencies {
-	compileOnly 'org.slf4j:slf4j-api:2.0.0'
-	testCommonImplementation 'org.slf4j:slf4j-api:2.0.0'
+	compileOnly 'org.slf4j:slf4j-api:2.0.16'
+	testCommonImplementation 'org.slf4j:slf4j-api:2.0.16'
 
 	// zero runtime reqs is a hard requirements for spotless-lib
 	// if you need a dep, put it in lib-extra
@@ -91,7 +91,7 @@ dependencies {
 	flexmarkCompileOnly 'com.vladsch.flexmark:flexmark-all:0.64.8'
 	// gherkin
 	gherkinCompileOnly 'io.cucumber:gherkin-utils:9.0.0'
-	gherkinCompileOnly 'org.slf4j:slf4j-api:2.0.0'
+	gherkinCompileOnly 'org.slf4j:slf4j-api:2.0.16'
 	// googleJavaFormat
 	googleJavaFormatCompileOnly 'com.google.googlejavaformat:google-java-format:1.23.0'
 	// gson
@@ -114,22 +114,22 @@ dependencies {
 	// ktlint previous supported version
 	compatKtLint0Dot49Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-rule-engine:0.49.0'
 	compatKtLint0Dot49Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.49.0'
-	compatKtLint0Dot49Dot0CompileAndTestOnly 'org.slf4j:slf4j-api:2.0.0'
+	compatKtLint0Dot49Dot0CompileAndTestOnly 'org.slf4j:slf4j-api:2.0.16'
 	// ktlint previous supported version
 	compatKtLint0Dot50Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-rule-engine:0.50.0'
 	compatKtLint0Dot50Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.50.0'
-	compatKtLint0Dot50Dot0CompileAndTestOnly 'org.slf4j:slf4j-api:2.0.0'
+	compatKtLint0Dot50Dot0CompileAndTestOnly 'org.slf4j:slf4j-api:2.0.16'
 	// ktlint latest supported version
 	compatKtLint1Dot0Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-rule-engine:1.0.0'
 	compatKtLint1Dot0Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:1.0.0'
-	compatKtLint1Dot0Dot0CompileAndTestOnly 'org.slf4j:slf4j-api:2.0.0'
+	compatKtLint1Dot0Dot0CompileAndTestOnly 'org.slf4j:slf4j-api:2.0.16'
 	// palantirJavaFormat
 	palantirJavaFormatCompileOnly 'com.palantir.javaformat:palantir-java-format:1.1.0' 	// this version needs to stay compilable against Java 8 for CI Job testNpm
 	// scalafmt
 	scalafmtCompileOnly "org.scalameta:scalafmt-core_2.13:3.8.1"
 	// sortPom
 	sortPomCompileOnly 'com.github.ekryd.sortpom:sortpom-sorter:4.0.0'
-	sortPomCompileOnly 'org.slf4j:slf4j-api:2.0.12'
+	sortPomCompileOnly 'org.slf4j:slf4j-api:2.0.16'
 	// zjsonPatch
 	zjsonPatchCompileOnly 'com.flipkart.zjsonpatch:zjsonpatch:0.4.16'
 }

From 25352542de6862ebcd5e7414a7dde737c184741d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 14 Aug 2024 10:24:59 +0000
Subject: [PATCH 1749/2068] Update dependency org.junit.jupiter:junit-jupiter
 to v5.11.0

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 454e9e7017..af21c73045 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -29,6 +29,6 @@ VER_SLF4J=[1.6,2.0[
 # Used in multiple places
 VER_DURIAN=1.2.0
 VER_JGIT=6.10.0.202406032230-r
-VER_JUNIT=5.10.3
+VER_JUNIT=5.11.0
 VER_ASSERTJ=3.26.3
 VER_MOCKITO=5.12.0

From 6df9822f3928b5d4e9ad350aaaa9bd7b531f2f17 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 14 Aug 2024 13:48:38 +0000
Subject: [PATCH 1750/2068] Update dependency gradle to v8.10

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 43504 -> 43583 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 2c3521197d7c4586c843d1d3e9090525f1898cde..a4b76b9530d66f5e68d973ea569d8e19de379189 100644
GIT binary patch
delta 3990
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

delta 3889
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 09523c0e54..9355b41557 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

From a01433d00cbd1d880d9f544adbd625a23dc6382a Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Thu, 15 Aug 2024 10:34:05 +0800
Subject: [PATCH 1751/2068] Fix NPM tests

---
 .../npm/eslint/typescript/styleguide/xo/typescript.clean  | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/testlib/src/main/resources/npm/eslint/typescript/styleguide/xo/typescript.clean b/testlib/src/main/resources/npm/eslint/typescript/styleguide/xo/typescript.clean
index 5c43d7a746..c6608e646b 100644
--- a/testlib/src/main/resources/npm/eslint/typescript/styleguide/xo/typescript.clean
+++ b/testlib/src/main/resources/npm/eslint/typescript/styleguide/xo/typescript.clean
@@ -1,9 +1,7 @@
 export class MyController extends AbstractController implements DisposeAware, CallbackAware {
-	public myValue: string[];
+public myValue: string[];
 
-	constructor(private readonly myService: Service, name: string, private readonly field: any) {
-		super(name);
-	}
+constructor(private readonly myService:Service,name:string,private readonly field:any){ super(name);}
 
-	// ...
+// ...
 }

From 2536ec2cfec068ed474b74f3631201093d2392b7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 20 Aug 2024 10:41:32 +0000
Subject: [PATCH 1752/2068] Update dependency org.owasp.encoder:encoder to
 v1.3.1

---
 plugin-gradle/build.gradle | 2 +-
 plugin-maven/build.gradle  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin-gradle/build.gradle b/plugin-gradle/build.gradle
index 9f6ff31cc9..4f82f713bf 100644
--- a/plugin-gradle/build.gradle
+++ b/plugin-gradle/build.gradle
@@ -25,7 +25,7 @@ dependencies {
 	testImplementation "org.junit.jupiter:junit-jupiter:${VER_JUNIT}"
 	testImplementation "org.assertj:assertj-core:${VER_ASSERTJ}"
 	testImplementation "com.diffplug.durian:durian-testlib:${VER_DURIAN}"
-	testImplementation 'org.owasp.encoder:encoder:1.2.3'
+	testImplementation 'org.owasp.encoder:encoder:1.3.1'
 	testRuntimeOnly "org.junit.platform:junit-platform-launcher"
 }
 
diff --git a/plugin-maven/build.gradle b/plugin-maven/build.gradle
index 0d6dbdc236..9f7a04703b 100644
--- a/plugin-maven/build.gradle
+++ b/plugin-maven/build.gradle
@@ -51,7 +51,7 @@ dependencies {
 	testImplementation "org.mockito:mockito-core:${VER_MOCKITO}"
 	testImplementation "com.diffplug.durian:durian-io:${VER_DURIAN}"
 	testImplementation 'com.github.spullara.mustache.java:compiler:0.9.14'
-	testImplementation 'org.owasp.encoder:encoder:1.2.3'
+	testImplementation 'org.owasp.encoder:encoder:1.3.1'
 	testImplementation "org.apache.maven:maven-plugin-api:${VER_MAVEN_API}"
 	testImplementation "org.eclipse.aether:aether-api:${VER_ECLIPSE_AETHER}"
 	testImplementation "org.codehaus.plexus:plexus-resources:${VER_PLEXUS_RESOURCES}"

From 238f6c569dcc50e3460454d9602c9fc2a89289af Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 25 Aug 2024 08:30:15 -0700
Subject: [PATCH 1753/2068] FIx the rest of the NPM tests.

---
 .../npm/eslint/typescript/styleguide/xo/typescript.clean  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/testlib/src/main/resources/npm/eslint/typescript/styleguide/xo/typescript.clean b/testlib/src/main/resources/npm/eslint/typescript/styleguide/xo/typescript.clean
index c6608e646b..5c43d7a746 100644
--- a/testlib/src/main/resources/npm/eslint/typescript/styleguide/xo/typescript.clean
+++ b/testlib/src/main/resources/npm/eslint/typescript/styleguide/xo/typescript.clean
@@ -1,7 +1,9 @@
 export class MyController extends AbstractController implements DisposeAware, CallbackAware {
-public myValue: string[];
+	public myValue: string[];
 
-constructor(private readonly myService:Service,name:string,private readonly field:any){ super(name);}
+	constructor(private readonly myService: Service, name: string, private readonly field: any) {
+		super(name);
+	}
 
-// ...
+	// ...
 }

From 0f775c8b6d5bf81d07bb385699064c80bfad8c64 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 25 Aug 2024 08:37:24 -0700
Subject: [PATCH 1754/2068] Pin the eslint-config-xo to a fixed version, since
 it seems to be cached to different values in CI vs dev machines.

---
 .../main/java/com/diffplug/spotless/npm/EslintStyleGuide.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testlib/src/main/java/com/diffplug/spotless/npm/EslintStyleGuide.java b/testlib/src/main/java/com/diffplug/spotless/npm/EslintStyleGuide.java
index 874ae1905d..344a3c05f7 100644
--- a/testlib/src/main/java/com/diffplug/spotless/npm/EslintStyleGuide.java
+++ b/testlib/src/main/java/com/diffplug/spotless/npm/EslintStyleGuide.java
@@ -79,7 +79,7 @@ public enum EslintStyleGuide {
 		@Override
 		public @Nonnull Map<String, String> devDependencies() {
 			Map<String, String> dependencies = new LinkedHashMap<>();
-			dependencies.put("eslint-config-xo", "^0.43.1");
+			dependencies.put("eslint-config-xo", "0.43.1");
 			return dependencies;
 		}
 	};

From 89f8b87c826ed3b625dc94bb9bd32a169fd8b86e Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 25 Aug 2024 08:44:15 -0700
Subject: [PATCH 1755/2068] spotless.

---
 .../main/java/com/diffplug/spotless/npm/EslintStyleGuide.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testlib/src/main/java/com/diffplug/spotless/npm/EslintStyleGuide.java b/testlib/src/main/java/com/diffplug/spotless/npm/EslintStyleGuide.java
index 344a3c05f7..f0b1d98a7b 100644
--- a/testlib/src/main/java/com/diffplug/spotless/npm/EslintStyleGuide.java
+++ b/testlib/src/main/java/com/diffplug/spotless/npm/EslintStyleGuide.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From ce7c1dc4e3d154aec0e6d6ddff9ee1c0b3b34851 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 25 Aug 2024 08:53:12 -0700
Subject: [PATCH 1756/2068] Pin another fixed version.

---
 .../java/com/diffplug/spotless/npm/EslintFormatterStep.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
index 70beaf91ca..33b2ab37e8 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
@@ -45,7 +45,7 @@ public class EslintFormatterStep {
 
 	public static final String NAME = "eslint-format";
 
-	public static final String DEFAULT_ESLINT_VERSION = "^8.45.0";
+	public static final String DEFAULT_ESLINT_VERSION = "8.45.0";
 
 	public static Map<String, String> defaultDevDependenciesForTypescript() {
 		return defaultDevDependenciesTypescriptWithEslint(DEFAULT_ESLINT_VERSION);

From 8733425ba43715d648e554cc9e89b956ae7c3dd9 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 25 Aug 2024 09:06:36 -0700
Subject: [PATCH 1757/2068] Pin a later version.

---
 .../java/com/diffplug/spotless/npm/EslintFormatterStep.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
index 33b2ab37e8..05bbd1a522 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
@@ -45,7 +45,7 @@ public class EslintFormatterStep {
 
 	public static final String NAME = "eslint-format";
 
-	public static final String DEFAULT_ESLINT_VERSION = "8.45.0";
+	public static final String DEFAULT_ESLINT_VERSION = "8.57.0";
 
 	public static Map<String, String> defaultDevDependenciesForTypescript() {
 		return defaultDevDependenciesTypescriptWithEslint(DEFAULT_ESLINT_VERSION);

From c489e7e4058c93dfb9a14d0427fe4fc38affe249 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 25 Aug 2024 09:19:06 -0700
Subject: [PATCH 1758/2068] Revert all changes back to main.

---
 .../java/com/diffplug/spotless/npm/EslintFormatterStep.java   | 2 +-
 .../main/java/com/diffplug/spotless/npm/EslintStyleGuide.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
index 05bbd1a522..70beaf91ca 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
@@ -45,7 +45,7 @@ public class EslintFormatterStep {
 
 	public static final String NAME = "eslint-format";
 
-	public static final String DEFAULT_ESLINT_VERSION = "8.57.0";
+	public static final String DEFAULT_ESLINT_VERSION = "^8.45.0";
 
 	public static Map<String, String> defaultDevDependenciesForTypescript() {
 		return defaultDevDependenciesTypescriptWithEslint(DEFAULT_ESLINT_VERSION);
diff --git a/testlib/src/main/java/com/diffplug/spotless/npm/EslintStyleGuide.java b/testlib/src/main/java/com/diffplug/spotless/npm/EslintStyleGuide.java
index f0b1d98a7b..874ae1905d 100644
--- a/testlib/src/main/java/com/diffplug/spotless/npm/EslintStyleGuide.java
+++ b/testlib/src/main/java/com/diffplug/spotless/npm/EslintStyleGuide.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 DiffPlug
+ * Copyright 2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -79,7 +79,7 @@ public enum EslintStyleGuide {
 		@Override
 		public @Nonnull Map<String, String> devDependencies() {
 			Map<String, String> dependencies = new LinkedHashMap<>();
-			dependencies.put("eslint-config-xo", "0.43.1");
+			dependencies.put("eslint-config-xo", "^0.43.1");
 			return dependencies;
 		}
 	};

From 3a3f44107ef235df4444e1cfcccaa1f150163d06 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 25 Aug 2024 09:21:47 -0700
Subject: [PATCH 1759/2068] Remove tests for the `xo` js formatter, it's
 consuming too much time.

---
 .../diffplug/spotless/npm/EslintFormatterStepTest.java | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
index ab54b11bee..da00e37d35 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java
@@ -41,11 +41,10 @@ class EslintJavascriptFormattingStepTest extends NpmFormatterStepCommonTests {
 				"custom_rules", EslintFormatterStep.defaultDevDependenciesForTypescript(),
 				"styleguide/airbnb", EslintStyleGuide.JS_AIRBNB.mergedWith(EslintFormatterStep.defaultDevDependencies()),
 				"styleguide/google", EslintStyleGuide.JS_GOOGLE.mergedWith(EslintFormatterStep.defaultDevDependencies()),
-				"styleguide/standard", EslintStyleGuide.JS_STANDARD.mergedWith(EslintFormatterStep.defaultDevDependencies()),
-				"styleguide/xo", EslintStyleGuide.JS_XO.mergedWith(EslintFormatterStep.defaultDevDependencies()));
+				"styleguide/standard", EslintStyleGuide.JS_STANDARD.mergedWith(EslintFormatterStep.defaultDevDependencies()));
 
 		@ParameterizedTest(name = "{index}: eslint can be applied using ruleset {0}")
-		@ValueSource(strings = {"custom_rules", "styleguide/airbnb", "styleguide/google", "styleguide/standard", "styleguide/xo"})
+		@ValueSource(strings = {"custom_rules", "styleguide/airbnb", "styleguide/google", "styleguide/standard"})
 		void formattingUsingRulesetsFile(String ruleSetName) throws Exception {
 			String filedir = "npm/eslint/javascript/" + ruleSetName + "/";
 
@@ -79,11 +78,10 @@ class EslintTypescriptFormattingStepTest extends NpmFormatterStepCommonTests {
 
 		private final Map<String, Map<String, String>> devDependenciesForRuleset = ImmutableMap.of(
 				"custom_rules", EslintFormatterStep.defaultDevDependenciesForTypescript(),
-				"styleguide/standard_with_typescript", EslintStyleGuide.TS_STANDARD_WITH_TYPESCRIPT.mergedWith(EslintFormatterStep.defaultDevDependenciesForTypescript()),
-				"styleguide/xo", EslintStyleGuide.TS_XO_TYPESCRIPT.mergedWith(EslintFormatterStep.defaultDevDependenciesForTypescript()));
+				"styleguide/standard_with_typescript", EslintStyleGuide.TS_STANDARD_WITH_TYPESCRIPT.mergedWith(EslintFormatterStep.defaultDevDependenciesForTypescript()));
 
 		@ParameterizedTest(name = "{index}: eslint can be applied using ruleset {0}")
-		@ValueSource(strings = {"custom_rules", "styleguide/standard_with_typescript", "styleguide/xo"})
+		@ValueSource(strings = {"custom_rules", "styleguide/standard_with_typescript"})
 		void formattingUsingRulesetsFile(String ruleSetName) throws Exception {
 			String filedir = "npm/eslint/typescript/" + ruleSetName + "/";
 

From 8b97df84bcc6fa8d4ce217956af0ecb8abe86739 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 25 Aug 2024 09:32:21 -0700
Subject: [PATCH 1760/2068] Ignore the two remaining xo tests.

---
 .../com/diffplug/gradle/spotless/TypescriptExtensionTest.java | 4 +++-
 .../spotless/maven/typescript/TypescriptFormatStepTest.java   | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TypescriptExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TypescriptExtensionTest.java
index 9b4ec8372e..0882d0f944 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TypescriptExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/TypescriptExtensionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 
 import java.io.IOException;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.npm.EslintFormatterStep;
@@ -169,6 +170,7 @@ void useEslint() throws IOException {
 	}
 
 	@Test
+	@Disabled
 	void useEslintXoStandardRules() throws IOException {
 		setFile(".eslintrc.js").toResource("npm/eslint/typescript/styleguide/xo/.eslintrc.js");
 		setFile("tsconfig.json").toResource("npm/eslint/typescript/styleguide/xo/tsconfig.json");
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/typescript/TypescriptFormatStepTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/typescript/TypescriptFormatStepTest.java
index a09111d30d..afda22e06b 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/typescript/TypescriptFormatStepTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/typescript/TypescriptFormatStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 
 import java.io.IOException;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.ProcessRunner;
@@ -210,6 +211,7 @@ void eslintStyleguideStandardWithTypescript() throws Exception {
 	}
 
 	@Test
+	@Disabled
 	void eslintStyleguideXo() throws Exception {
 		writePomWithTypescriptSteps(
 				TEST_FILE_PATH,

From 492b4d086f1d2a05dceab3e358c1b8b43466a15b Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 25 Aug 2024 12:19:27 -0700
Subject: [PATCH 1761/2068] Complete the bump to Equo 1.7.7

---
 .../java/com/diffplug/spotless/extra/EquoBasedStepBuilder.java  | 2 +-
 settings.gradle                                                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 0bcdb5f36d..ca941680c3 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
@@ -107,7 +107,7 @@ public FormatterStep build() {
 			}
 			var classpath = new ArrayList<File>();
 			var mavenDeps = new ArrayList<String>();
-			mavenDeps.add("dev.equo.ide:solstice:1.7.6");
+			mavenDeps.add("dev.equo.ide:solstice:1.7.7");
 			mavenDeps.add("com.diffplug.durian:durian-swt.os:4.2.0");
 			mavenDeps.addAll(query.getJarsOnMavenCentral());
 			classpath.addAll(mavenProvisioner.provisionWithTransitives(false, mavenDeps));
diff --git a/settings.gradle b/settings.gradle
index 5c01d22a77..6025e3ee84 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -22,7 +22,7 @@ plugins {
 	// https://plugins.gradle.org/plugin/com.gradle.develocity
 	id 'com.gradle.develocity' version '3.17.6'
 	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
-	id 'dev.equo.ide' version '1.7.6' apply false
+	id 'dev.equo.ide' version '1.7.7' apply false
 }
 
 dependencyResolutionManagement {

From aaf7f893a309dfd6baee1253e10e8be3ec1556b4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 25 Aug 2024 19:20:56 +0000
Subject: [PATCH 1762/2068] Update dependency com.facebook:ktfmt to v0.52

---
 lib/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 1b9eaf4902..724275e0bd 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -101,7 +101,7 @@ dependencies {
 	jacksonCompileOnly "com.fasterxml.jackson.core:jackson-databind:$VER_JACKSON"
 	jacksonCompileOnly "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$VER_JACKSON"
 	// ktfmt
-	ktfmtCompileOnly "com.facebook:ktfmt:0.51"
+	ktfmtCompileOnly "com.facebook:ktfmt:0.52"
 	ktfmtCompileOnly("com.google.googlejavaformat:google-java-format") {
 		version {
 			strictly '1.7' // for JDK 8 compatibility

From e844c2f5db1917ba7dd45df60375d207132c59fe Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 25 Aug 2024 12:25:00 -0700
Subject: [PATCH 1763/2068] Bump changelogs.

---
 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 3b26391d97..d76d536f31 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,7 +13,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changed
 * Support toning down sortPom logging. ([#2185](https://github.com/diffplug/spotless/pull/2185))
 * Bump default `ktlint` version to latest `1.2.1` -> `1.3.0`. ([#2165](https://github.com/diffplug/spotless/pull/2165))
-* Bump default `ktfmt` version to latest `0.49` -> `0.51`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
+* Bump default `ktfmt` version to latest `0.49` -> `0.52`. ([#2172](https://github.com/diffplug/spotless/pull/2172), [#2231](https://github.com/diffplug/spotless/pull/2231))
 * Rename property `ktfmt` option `removeUnusedImport` -> `removeUnusedImports` to match `ktfmt`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
 * Bump default `eclipse` version to latest `4.29` -> `4.32`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
 * Bump default `greclipse` version to latest `4.29` -> `4.32`. ([#2179](https://github.com/diffplug/spotless/pull/2179), [#2190](https://github.com/diffplug/spotless/pull/2190))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 3973f2b356..78e3fc13c7 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -6,7 +6,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changed
 * Support toning down sortPom logging. ([#2185](https://github.com/diffplug/spotless/pull/2185))
 * Bump default `ktlint` version to latest `1.2.1` -> `1.3.0`. ([#2165](https://github.com/diffplug/spotless/pull/2165))
-* Bump default `ktfmt` version to latest `0.49` -> `0.51`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
+* Bump default `ktfmt` version to latest `0.49` -> `0.52`. ([#2172](https://github.com/diffplug/spotless/pull/2172), [#2231](https://github.com/diffplug/spotless/pull/2231))
 * Rename property `ktfmt` option `removeUnusedImport` -> `removeUnusedImports` to match `ktfmt`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
 * Bump default `eclipse` version to latest `4.29` -> `4.32`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
 * Bump default `greclipse` version to latest `4.29` -> `4.32`. ([#2179](https://github.com/diffplug/spotless/pull/2179), [#2190](https://github.com/diffplug/spotless/pull/2190))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index d6e7824e4d..efd8b50e7b 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -6,7 +6,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changed
 * Support toning down sortPom logging. ([#2185](https://github.com/diffplug/spotless/pull/2185))
 * Bump default `ktlint` version to latest `1.2.1` -> `1.3.0`. ([#2165](https://github.com/diffplug/spotless/pull/2165))
-* Bump default `ktfmt` version to latest `0.49` -> `0.51`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
+* Bump default `ktfmt` version to latest `0.49` -> `0.52`. ([#2172](https://github.com/diffplug/spotless/pull/2172), [#2231](https://github.com/diffplug/spotless/pull/2231))
 * Rename property `ktfmt` option `removeUnusedImport` -> `removeUnusedImports` to match `ktfmt`. ([#2172](https://github.com/diffplug/spotless/pull/2172))
 * Bump default `eclipse` version to latest `4.29` -> `4.32`. ([#2179](https://github.com/diffplug/spotless/pull/2179))
 * Bump default `greclipse` version to latest `4.29` -> `4.32`. ([#2179](https://github.com/diffplug/spotless/pull/2179), [#2190](https://github.com/diffplug/spotless/pull/2190))

From d329f58a44e94a0f90e20287fe6f6b86afdfc754 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 25 Aug 2024 12:25:14 -0700
Subject: [PATCH 1764/2068] Bump default ktfmt 0.51 -> 0.52

---
 lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
index 7f69be302f..fcb4397c3b 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
@@ -39,7 +39,7 @@
  */
 public class KtfmtStep implements Serializable {
 	private static final long serialVersionUID = 1L;
-	private static final String DEFAULT_VERSION = "0.51";
+	private static final String DEFAULT_VERSION = "0.52";
 	private static final String NAME = "ktfmt";
 	private static final String MAVEN_COORDINATE = "com.facebook:ktfmt:";
 

From 2a90f534112bc3614b9e0537c5cec5bb620b7dda Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 25 Aug 2024 19:27:33 +0000
Subject: [PATCH 1765/2068] Update plugin com.gradle.develocity to v3.18

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 5c01d22a77..3f59297473 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -20,7 +20,7 @@ plugins {
 	// https://github.com/davidburstrom/version-compatibility-gradle-plugin/tags
 	id 'io.github.davidburstrom.version-compatibility' version '0.5.0' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.develocity
-	id 'com.gradle.develocity' version '3.17.6'
+	id 'com.gradle.develocity' version '3.18'
 	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
 	id 'dev.equo.ide' version '1.7.6' apply false
 }

From 8d28afb758f9c843726ac08fc73e7f0831b87769 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 25 Aug 2024 12:52:16 -0700
Subject: [PATCH 1766/2068] Fix from knowledge in cli/cli#9299

---
 gradle/changelog.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/changelog.gradle b/gradle/changelog.gradle
index cce1509a6c..61813f9797 100644
--- a/gradle/changelog.gradle
+++ b/gradle/changelog.gradle
@@ -22,7 +22,7 @@ spotlessChangelog {
 	branch        'release'
 	tagPrefix     "${kind}/"
 	commitMessage "Published ${kind}/{{version}}" // {{version}} will be replaced
-	tagMessage '{{changes}}'
+	tagMessage "${kind} v{{version}}\n\n{{changes}}"
 	runAfterPush "gh release create ${kind}/{{version}} --title '${releaseTitle} v{{version}}' --notes-from-tag"
 
 	if (kind == 'gradle') {

From 7d01332d39a1d090d198265bd01af73ef2d75c97 Mon Sep 17 00:00:00 2001
From: runner <runner@fv-az1208-367>
Date: Sun, 25 Aug 2024 20:29:51 +0000
Subject: [PATCH 1767/2068] Published lib/3.0.0.BETA2

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index d76d536f31..827a7a827d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [3.0.0.BETA2] - 2024-08-25
 ### Changed
 * Support toning down sortPom logging. ([#2185](https://github.com/diffplug/spotless/pull/2185))
 * Bump default `ktlint` version to latest `1.2.1` -> `1.3.0`. ([#2165](https://github.com/diffplug/spotless/pull/2165))

From ff40edcb51ae10f77c4e20638b8918f761177112 Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az2036-211.iv4ntxrv1cnexhy5pcnegwfxga.cx.internal.cloudapp.net>
Date: Sun, 25 Aug 2024 20:44:55 +0000
Subject: [PATCH 1768/2068] Published gradle/7.0.0.BETA2

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 60 ++++++++++++++++++++--------------------
 2 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 78e3fc13c7..2091901799 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [7.0.0.BETA2] - 2024-08-25
 ### Changed
 * Support toning down sortPom logging. ([#2185](https://github.com/diffplug/spotless/pull/2185))
 * Bump default `ktlint` version to latest `1.2.1` -> `1.3.0`. ([#2165](https://github.com/diffplug/spotless/pull/2165))
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 0696ced59e..2395b1294c 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -14,9 +14,9 @@ output = [
   ].join('\n');
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
-[![Changelog](https://img.shields.io/badge/changelog-7.0.0.BETA1-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-7.0.0.BETA2-blue.svg)](CHANGES.md)
 [![MavenCentral](https://img.shields.io/badge/mavencentral-here-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/index.html)
 
 [![VS Code plugin](https://img.shields.io/badge/IDE-VS_Code-blueviolet.svg)](https://marketplace.visualstudio.com/items?itemName=richardwillis.vscode-spotless-gradle)
 [![IntelliJ plugin](https://img.shields.io/badge/IDE-IntelliJ-blueviolet.svg)](https://plugins.jetbrains.com/plugin/18321-spotless-gradle)
@@ -130,10 +130,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -146,7 +146,7 @@ Spotless requires JRE 11+ and Gradle 6.1.1 or newer.
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -309,8 +309,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -365,8 +365,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -455,7 +455,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -487,7 +487,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -519,7 +519,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -555,7 +555,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ### buf
 
-`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
+`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
 
 **WARNING** this step **must** be the first step in the chain, steps before it will be ignored. Thumbs up [this issue](https://github.com/bufbuild/buf/issues/1035) for a resolution, see [here](https://github.com/diffplug/spotless/pull/1208#discussion_r1264439669) for more details on the problem.
 
@@ -587,7 +587,7 @@ buf {
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -608,7 +608,7 @@ spotless {
 
 ## Flexmark
 
-`com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/FlexmarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java)
+`com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/FlexmarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java)
 
 [homepage](https://github.com/vsch/flexmark-java). Flexmark is a flexible Commonmark/Markdown parser that can be used to format Markdown files. It supports different [flavors of Markdown](https://github.com/vsch/flexmark-java#markdown-processor-emulation) and [many formatting options](https://github.com/vsch/flexmark-java/wiki/Markdown-Formatter#options).
 
@@ -627,7 +627,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -652,7 +652,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -690,7 +690,7 @@ sql.formatter.indent.size=4
 
 ## Maven POM
 
-`com.diffplug.gradle.spotless.PomExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/PomExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PomExtension.java)
+`com.diffplug.gradle.spotless.PomExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/PomExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PomExtension.java)
 
 ```gradle
 spotless {
@@ -739,7 +739,7 @@ spotless {
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -833,7 +833,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## Javascript
 
-- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
+- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
 
 ```gradle
 spotless {
@@ -896,7 +896,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -1016,7 +1016,7 @@ spotless {
 
 ## YAML
 
-- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
+- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
 
 ```gradle
 spotless {
@@ -1048,7 +1048,7 @@ spotless {
 
 ## Shell
 
-`com.diffplug.gradle.spotless.ShellExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/ShellExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ShellExtension.java)
+`com.diffplug.gradle.spotless.ShellExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/ShellExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ShellExtension.java)
 
 ```gradle
 spotless {
@@ -1084,7 +1084,7 @@ shfmt().pathToExe('/opt/homebrew/bin/shfmt')
 
 ## Gherkin
 
-- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
+- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
 
 ```gradle
 spotless {
@@ -1496,7 +1496,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -1576,9 +1576,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -1611,11 +1611,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA1/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From a829618fdcec7f06fb31143423cd58ffa8fb2e17 Mon Sep 17 00:00:00 2001
From: runner <runner@fv-az1756-204>
Date: Sun, 25 Aug 2024 21:09:13 +0000
Subject: [PATCH 1769/2068] Published maven/2.44.0.BETA2

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index efd8b50e7b..67e356e5ab 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.44.0.BETA2] - 2024-08-25
 ### Changed
 * Support toning down sortPom logging. ([#2185](https://github.com/diffplug/spotless/pull/2185))
 * Bump default `ktlint` version to latest `1.2.1` -> `1.3.0`. ([#2165](https://github.com/diffplug/spotless/pull/2165))
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 9404792220..621b0d8936 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -8,8 +8,8 @@ output = [
   ].join('\n');
 -->
 [![MavenCentral](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Changelog](https://img.shields.io/badge/changelog-2.44.0.BETA1-blue.svg)](CHANGES.md)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.44.0.BETA1/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.44.0.BETA2-blue.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.44.0.BETA2/index.html)
 <!---freshmark /shields -->
 
 <!---freshmark javadoc

From f2c6eb502ae6ec251c32dd6f1433eeea3892b3e6 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 25 Aug 2024 14:53:55 -0700
Subject: [PATCH 1770/2068] Can't do the `main` fast-forward because it's a
 protected branch, NBD.

---
 .github/workflows/deploy.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index a537310923..82f01dd4a4 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -65,6 +65,3 @@ jobs:
         if: "${{ github.event.inputs.to_publish == 'lib' }}"
         run: |
           ./gradlew :changelogPush -Prelease=true --stacktrace --warning-mode all --no-configuration-cache
-      - run: git checkout main
-      - run: git merge release --ff-only
-      - run: git push origin main
\ No newline at end of file

From 8e6f6d26af29b976c7d277d16ae0f49103cbafc0 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 25 Aug 2024 15:20:43 -0700
Subject: [PATCH 1771/2068] Improve JDT docs, #2227.

---
 plugin-gradle/README.md | 2 +-
 plugin-maven/README.md  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 2395b1294c..89eeaeecd7 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -227,7 +227,7 @@ spotless {
 
 ### eclipse jdt
 
-[homepage](https://www.eclipse.org/downloads/packages/). [compatible versions](https://github.com/diffplug/spotless/tree/main/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter). See [here](../ECLIPSE_SCREENSHOTS.md) for screenshots that demonstrate how to get and install the config file mentioned below.
+[homepage](https://download.eclipse.org/eclipse/downloads/). See [here](../ECLIPSE_SCREENSHOTS.md) for screenshots that demonstrate how to get and install the config file mentioned below.
 
 ```gradle
 spotless {
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 621b0d8936..c0e5e8bed7 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -255,7 +255,7 @@ any other maven phase (i.e. compile) then it can be configured as below;
 
 ### eclipse jdt
 
-[homepage](https://www.eclipse.org/downloads/packages/). [compatible versions](https://github.com/diffplug/spotless/tree/main/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter). [code](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Eclipse.java). See [here](../ECLIPSE_SCREENSHOTS.md) for screenshots that demonstrate how to get and install the config file mentioned below.
+[homepage](https://download.eclipse.org/eclipse/downloads/). [code](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Eclipse.java). See [here](../ECLIPSE_SCREENSHOTS.md) for screenshots that demonstrate how to get and install the config file mentioned below.
 
 ```xml
 <eclipse>

From 36ddb332864433e09626e33e34f38c540b6b82ff Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 25 Aug 2024 15:57:15 -0700
Subject: [PATCH 1772/2068] Make sure all links are clickable, closes #2099.

---
 plugin-maven/README.md | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index c0e5e8bed7..48eeea7efc 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -232,7 +232,7 @@ any other maven phase (i.e. compile) then it can be configured as below;
 
 ```xml
 <googleJavaFormat>
-  <version>1.8</version>                      <!-- optional, 1.8 is the minimum supported version for Java 11-->
+  <version>1.8</version>                      <!-- optional, 1.8 is the minimum supported version for Java 11 -->
   <style>GOOGLE</style>                       <!-- or AOSP (optional) -->
   <reflowLongStrings>true</reflowLongStrings> <!-- optional -->
   <formatJavadoc>false</formatJavadoc>        <!-- optional -->
@@ -660,9 +660,9 @@ All configuration settings are optional, they are described in detail [here](htt
 
   <lineSeparator>${line.separator}</lineSeparator> <!-- line separator to use -->
 
-  <expandEmptyElements>true</expandEmptyElements> <!-- Should empty elements be expanded-->
+  <expandEmptyElements>true</expandEmptyElements> <!-- Should empty elements be expanded -->
 
-  <spaceBeforeCloseEmptyElement>false</spaceBeforeCloseEmptyElement> <!-- Should a space be added inside self-closing elements-->
+  <spaceBeforeCloseEmptyElement>false</spaceBeforeCloseEmptyElement> <!-- Should a space be added inside self-closing elements -->
 
   <keepBlankLines>true</keepBlankLines> <!-- Keep empty lines -->
 
@@ -676,15 +676,15 @@ All configuration settings are optional, they are described in detail [here](htt
 
   <indentAttribute></indentAttribute> <!-- Should the xml attributes be indented -->
 
-  <predefinedSortOrder>recommended_2008_06</predefinedSortOrder> <!-- Sort order of elements: https://github.com/Ekryd/sortpom/wiki/PredefinedSortOrderProfiles-->
+  <predefinedSortOrder>recommended_2008_06</predefinedSortOrder> <!-- Sort order of elements: https://github.com/Ekryd/sortpom/wiki/PredefinedSortOrderProfiles -->
 
   <sortOrderFile></sortOrderFile> <!-- Custom sort order of elements: https://raw.githubusercontent.com/Ekryd/sortpom/master/sorter/src/main/resources/custom_1.xml -->
 
-  <sortDependencies></sortDependencies> <!-- Sort dependencies: https://github.com/Ekryd/sortpom/wiki/SortDependencies-->
+  <sortDependencies></sortDependencies> <!-- Sort dependencies: https://github.com/Ekryd/sortpom/wiki/SortDependencies -->
 
-  <sortDependencyManagement></sortDependencyManagement> <!-- Sort dependency management: https://github.com/Ekryd/sortpom/wiki/SortDependencies-->
+  <sortDependencyManagement></sortDependencyManagement> <!-- Sort dependency management: https://github.com/Ekryd/sortpom/wiki/SortDependencies -->
 
-  <sortDependencyExclusions></sortDependencyExclusions> <!-- Sort dependency exclusions: https://github.com/Ekryd/sortpom/wiki/SortDependencies-->
+  <sortDependencyExclusions></sortDependencyExclusions> <!-- Sort dependency exclusions: https://github.com/Ekryd/sortpom/wiki/SortDependencies -->
 
   <sortPlugins></sortPlugins> <!-- Sort plugins: https://github.com/Ekryd/sortpom/wiki/SortPlugins -->
 
@@ -1505,7 +1505,7 @@ The following languages are currently recognized:
 
 <jsr223> <!-- specify replacements using JSR223 scripting -->
   <name>Greetings to Mars</name>
-  <dependency>org.codehaus.groovy:groovy-jsr223:3.0.9</dependency> <!-- optional, maven dependency, containing the jsr223 compatible scripting engine-->
+  <dependency>org.codehaus.groovy:groovy-jsr223:3.0.9</dependency> <!-- optional, maven dependency, containing the jsr223 compatible scripting engine -->
   <engine>groovy</engine> <!-- nashorn is provided by JDK 8-14, other engines can be loaded from the given dependency -->
   <script>source.replace('World','Mars');</script> <!-- the source variable contains the unformatted code, the returned value of the script is the formatted code -->
 </jsr223>
@@ -1513,7 +1513,7 @@ The following languages are currently recognized:
 <nativeCmd> <!-- run a native binary -->
   <name>Greetings to Mars from sed</name>
   <pathToExe>/usr/bin/sed</pathToExe> <!-- path to the binary, unformatted code is send via StdIn, formatted code is expected on StdOut -->
-  <arguments> <!-- optional, list with arguments for the binary call-->
+  <arguments> <!-- optional, list with arguments for the binary call -->
     <argument>s/World/Mars/g</argument>
   </arguments>
 </nativeCmd>

From 4552da0f3535e0ac74ffe3ec7f3e813621c5d023 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 26 Aug 2024 08:30:51 +0800
Subject: [PATCH 1773/2068] Update plugin com.diffplug.spotless to v7.0.0.BETA2
 (#2234)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 024080384e..f6dc67a448 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-	id 'com.diffplug.spotless' version '7.0.0.BETA1' apply false
+	id 'com.diffplug.spotless' version '7.0.0.BETA2' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
 	id 'com.gradle.plugin-publish' version '1.2.1' apply false
 	// https://github.com/gradle-nexus/publish-plugin/releases

From 13a9548ad5f99b9538fc343606b3ab13de51f3b7 Mon Sep 17 00:00:00 2001
From: Kevin Leturc <kevinleturc@users.noreply.github.com>
Date: Wed, 28 Aug 2024 00:48:51 +0200
Subject: [PATCH 1774/2068] Leverage Maven local repository for p2 cache
 directory in Eclipse step

---
 .../diffplug/spotless/extra/EquoBasedStepBuilder.java  |  9 +++++++++
 .../diffplug/spotless/maven/AbstractSpotlessMojo.java  |  1 +
 .../com/diffplug/spotless/maven/FormatterFactory.java  |  6 ++++++
 .../diffplug/spotless/maven/FormatterStepFactory.java  |  6 ++++++
 .../java/com/diffplug/spotless/maven/java/Eclipse.java | 10 ++++++++++
 5 files changed, 32 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 ca941680c3..cba5beb945 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
@@ -37,6 +37,7 @@
 import com.diffplug.spotless.SerializedFunction;
 
 import dev.equo.solstice.NestedJars;
+import dev.equo.solstice.p2.CacheLocations;
 import dev.equo.solstice.p2.P2ClientCache;
 import dev.equo.solstice.p2.P2Model;
 import dev.equo.solstice.p2.P2QueryCache;
@@ -52,6 +53,7 @@ public abstract class EquoBasedStepBuilder {
 	private String formatterVersion;
 	private Iterable<File> settingsFiles = new ArrayList<>();
 	private Map<String, String> p2Mirrors = Map.of();
+	private File cacheDirectory;
 
 	/** Initialize valid default configuration, taking latest version */
 	public EquoBasedStepBuilder(String formatterName, Provisioner mavenProvisioner, @Nullable String defaultVersion, SerializedFunction<State, FormatterFunc> stateToFormatter) {
@@ -77,6 +79,10 @@ public void setP2Mirrors(Collection<P2Mirror> p2Mirrors) {
 		this.p2Mirrors = p2Mirrors.stream().collect(toMap(P2Mirror::getPrefix, P2Mirror::getUrl));
 	}
 
+	public void setCacheDirectory(File cacheDirectory) {
+		this.cacheDirectory = cacheDirectory;
+	}
+
 	protected abstract P2Model model(String version);
 
 	protected void addPlatformRepo(P2Model model, String version) {
@@ -101,6 +107,9 @@ public FormatterStep build() {
 		var roundtrippableState = new EquoStep(formatterVersion, FileSignature.promise(settingsFiles), JarState.promise(() -> {
 			P2QueryResult query;
 			try {
+				if (null != cacheDirectory) {
+					CacheLocations.override_p2data = cacheDirectory.toPath().resolve("dev/equo/p2-data").toFile();
+				}
 				query = createModelWithMirrors().query(P2ClientCache.PREFER_OFFLINE, P2QueryCache.ALLOW);
 			} catch (Exception x) {
 				throw new IOException("Failed to load " + formatterName + ": " + x, x);
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
index 9f4d0e01bc..004c680e02 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
@@ -379,6 +379,7 @@ private FileLocator getFileLocator() {
 	private List<FormatterFactory> getFormatterFactories() {
 		return Stream.concat(formats.stream(), Stream.of(groovy, java, scala, kotlin, cpp, typescript, javascript, antlr4, pom, sql, python, markdown, json, shell, yaml, gherkin, go))
 				.filter(Objects::nonNull)
+				.map(factory -> factory.init(repositorySystemSession))
 				.collect(toList());
 	}
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java
index 6393c65858..5ff3d68aab 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java
@@ -30,6 +30,7 @@
 
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
+import org.eclipse.aether.RepositorySystemSession;
 
 import com.diffplug.common.collect.Sets;
 import com.diffplug.spotless.FormatExceptionPolicyStrict;
@@ -197,4 +198,9 @@ private static boolean formatterStepOverriden(FormatterStepFactory global, List<
 		return allConfigured.stream()
 				.anyMatch(configured -> configured.getClass() == global.getClass());
 	}
+
+	public FormatterFactory init(RepositorySystemSession repositorySystemSession) {
+		stepFactories.forEach(factory -> factory.init(repositorySystemSession));
+		return this;
+	}
 }
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterStepFactory.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterStepFactory.java
index 119aa56961..4d8f718e61 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterStepFactory.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterStepFactory.java
@@ -15,9 +15,15 @@
  */
 package com.diffplug.spotless.maven;
 
+import org.eclipse.aether.RepositorySystemSession;
+
 import com.diffplug.spotless.FormatterStep;
 
 public interface FormatterStepFactory {
 
 	FormatterStep newFormatterStep(FormatterStepConfig config);
+
+	default void init(RepositorySystemSession repositorySystemSession) {
+		// nothing
+	}
 }
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Eclipse.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Eclipse.java
index 8d5869cc8e..c4c97ecf09 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Eclipse.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Eclipse.java
@@ -21,6 +21,7 @@
 import java.util.List;
 
 import org.apache.maven.plugins.annotations.Parameter;
+import org.eclipse.aether.RepositorySystemSession;
 
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.extra.EquoBasedStepBuilder;
@@ -40,6 +41,8 @@ public class Eclipse implements FormatterStepFactory {
 	@Parameter
 	private List<P2Mirror> p2Mirrors = new ArrayList<>();
 
+	private File cacheDirectory;
+
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 		EquoBasedStepBuilder eclipseConfig = EclipseJdtFormatterStep.createBuilder(stepConfig.getProvisioner());
@@ -49,6 +52,13 @@ public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 			eclipseConfig.setPreferences(Arrays.asList(settingsFile));
 		}
 		eclipseConfig.setP2Mirrors(p2Mirrors);
+		if (null != cacheDirectory) {
+			eclipseConfig.setCacheDirectory(cacheDirectory);
+		}
 		return eclipseConfig.build();
 	}
+
+	public void init(RepositorySystemSession repositorySystemSession) {
+		this.cacheDirectory = repositorySystemSession.getLocalRepository().getBasedir();
+	}
 }

From f3155312d0fbe4c660bbac8f991bfc40fe769daa Mon Sep 17 00:00:00 2001
From: Kevin Leturc <kevinleturc@users.noreply.github.com>
Date: Wed, 28 Aug 2024 10:05:24 +0200
Subject: [PATCH 1775/2068] Update CHANGES.md files

---
 CHANGES.md              | 2 ++
 plugin-maven/CHANGES.md | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 827a7a827d..e01d6abb37 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Changed
+* Support configuring the Equo P2 cache. ([#2238](https://github.com/diffplug/spotless/pull/2238))
 
 ## [3.0.0.BETA2] - 2024-08-25
 ### Changed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 67e356e5ab..9e43685b36 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Changed
+* Leverage local repository for Equo P2 cache. ([#2238](https://github.com/diffplug/spotless/pull/2238))
 
 ## [2.44.0.BETA2] - 2024-08-25
 ### Changed

From 64acece5b3290f25468f1ca1ca7b0877d879419c Mon Sep 17 00:00:00 2001
From: "Kartikaya Gupta (kats)" <staktrace@users.noreply.github.com>
Date: Wed, 28 Aug 2024 10:31:48 -0400
Subject: [PATCH 1776/2068] Fix 404 error in changelog (#2239)

---
 plugin-gradle/CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 2091901799..f33abfc3f4 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -873,7 +873,7 @@ spotless {
 
 ## [3.30.0] - 2020-05-11
 ### Added
-* `-PspotlessIdeHook` which makes the VS Code extension faster and more reliable.  See [`IDE_INTEGRATION.md`](IDE_INTEGRATION.md) for more details. ([#568](https://github.com/diffplug/spotless/pull/568))
+* `-PspotlessIdeHook` which makes the VS Code extension faster and more reliable.  See [`IDE_HOOK.md`](IDE_HOOK.md) for more details. ([#568](https://github.com/diffplug/spotless/pull/568))
 
 ## [3.29.0] - 2020-05-05
 ### Added

From 5591a355f44c4bc949d23e5196c3e0f3283b3bcb Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 28 Aug 2024 23:03:54 +0800
Subject: [PATCH 1777/2068] Update dependency org.mockito:mockito-core to
 v5.13.0 (#2237)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index af21c73045..70312f53d2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -31,4 +31,4 @@ VER_DURIAN=1.2.0
 VER_JGIT=6.10.0.202406032230-r
 VER_JUNIT=5.11.0
 VER_ASSERTJ=3.26.3
-VER_MOCKITO=5.12.0
+VER_MOCKITO=5.13.0

From e0bd567f49b9d2e23727e2a2f69fc24d5ea33e82 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 28 Aug 2024 09:53:54 -0700
Subject: [PATCH 1778/2068] We don't need to workaround
 https://github.com/cli/cli/issues/9299 anymore.

---
 gradle/changelog.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/changelog.gradle b/gradle/changelog.gradle
index 61813f9797..5ec1dec22d 100644
--- a/gradle/changelog.gradle
+++ b/gradle/changelog.gradle
@@ -22,7 +22,7 @@ spotlessChangelog {
 	branch        'release'
 	tagPrefix     "${kind}/"
 	commitMessage "Published ${kind}/{{version}}" // {{version}} will be replaced
-	tagMessage "${kind} v{{version}}\n\n{{changes}}"
+	tagMessage "{{changes}}"
 	runAfterPush "gh release create ${kind}/{{version}} --title '${releaseTitle} v{{version}}' --notes-from-tag"
 
 	if (kind == 'gradle') {

From 72f23d837cb88f5f105db1dd5d77f7c6fb547c6f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 29 Aug 2024 14:58:34 +0000
Subject: [PATCH 1779/2068] Update plugin com.gradle.plugin-publish to v1.2.2

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index f6dc67a448..d60beca31c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -8,7 +8,7 @@ pluginManagement {
 plugins {
 	id 'com.diffplug.spotless' version '7.0.0.BETA2' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
-	id 'com.gradle.plugin-publish' version '1.2.1' apply false
+	id 'com.gradle.plugin-publish' version '1.2.2' apply false
 	// https://github.com/gradle-nexus/publish-plugin/releases
 	id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases

From d0524167780a950df98826a9c1a0dd0312bda20a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 30 Aug 2024 09:19:19 +0800
Subject: [PATCH 1780/2068] Update plugin com.github.spotbugs to v6.0.21
 (#2244)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index d60beca31c..f5f48de132 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,7 +12,7 @@ plugins {
 	// https://github.com/gradle-nexus/publish-plugin/releases
 	id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
-	id 'com.github.spotbugs' version '6.0.20' apply false
+	id 'com.github.spotbugs' version '6.0.21' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
 	id 'com.diffplug.spotless-changelog' version '3.1.2' apply false
 	// https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md

From 482295d0183e4a02e5716fd983521f4cf16358fc Mon Sep 17 00:00:00 2001
From: Kevin Leturc <kevinleturc@users.noreply.github.com>
Date: Mon, 2 Sep 2024 13:37:42 +0200
Subject: [PATCH 1781/2068] Fix validation tests

---
 .../java/com/diffplug/spotless/maven/FormatterStepFactory.java  | 2 +-
 .../src/main/java/com/diffplug/spotless/maven/java/Eclipse.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterStepFactory.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterStepFactory.java
index 4d8f718e61..4642f17de5 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterStepFactory.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterStepFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Eclipse.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Eclipse.java
index c4c97ecf09..9e3b41dbc0 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Eclipse.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Eclipse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From fa90f44777df24818b22fa9001c9c4e7bd596658 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Martin?= <f.martin@fastmail.com>
Date: Tue, 3 Sep 2024 03:33:03 +0200
Subject: [PATCH 1782/2068] Fix incorrect target usage with `kotlinGradle` in
 docs (#2247)

As `kotlinGradle` will only be used in `build.gradle.kts`, the Kotlin syntax must be used.
---
 plugin-gradle/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 89eeaeecd7..9d9d0451fc 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -380,7 +380,7 @@ spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
     licenseHeader '/* (C)$YEAR */' // or licenseHeaderFile
   }
   kotlinGradle {
-    target '*.gradle.kts' // default target for kotlinGradle
+    target('*.gradle.kts') // default target for kotlinGradle
     ktlint() // or ktfmt() or prettier()
   }
 }

From 0bf8293b0f48d5b54c735460d503da993699be25 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 5 Sep 2024 14:19:32 +0800
Subject: [PATCH 1783/2068] Update plugin com.github.spotbugs to v6.0.22
 (#2248)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index f5f48de132..d7bf3e86bc 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,7 +12,7 @@ plugins {
 	// https://github.com/gradle-nexus/publish-plugin/releases
 	id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
-	id 'com.github.spotbugs' version '6.0.21' apply false
+	id 'com.github.spotbugs' version '6.0.22' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
 	id 'com.diffplug.spotless-changelog' version '3.1.2' apply false
 	// https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md

From afef109e943cae082432508dd404bb054bd8a9d5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 10 Sep 2024 09:09:08 +0800
Subject: [PATCH 1784/2068] Update dependency gradle to v8.10.1 (#2252)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9355b41557..0aaefbcaf0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

From b9aba11a9655476ad98f7ce46524267d21d41f8f Mon Sep 17 00:00:00 2001
From: Evgeny Mandrikov <138671+Godin@users.noreply.github.com>
Date: Tue, 10 Sep 2024 03:11:08 +0200
Subject: [PATCH 1785/2068] Fix typo (#2254)

---
 plugin-gradle/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 9d9d0451fc..9f430b4e48 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -237,7 +237,7 @@ spotless {
     eclipse('4.26').configFile('eclipse-prefs.xml')
     // if the access to the p2 repositories is restricted, mirrors can be
     // specified using a URI prefix map as follows:
-    echlise().withP2Mirrors(['https://download.eclipse.org/eclipse/updates/4.29/':'https://some.internal.mirror/4-29-updates-p2/'])
+    eclipse().withP2Mirrors(['https://download.eclipse.org/eclipse/updates/4.29/':'https://some.internal.mirror/4-29-updates-p2/'])
        
 ```
 

From 4d406b027410e850c63d07dc3039ea280de8abdb Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 11 Sep 2024 09:14:03 +0800
Subject: [PATCH 1786/2068] Update plugin com.gradle.develocity to v3.18.1
 (#2256)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index d7bf3e86bc..54218f3c6d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -20,7 +20,7 @@ plugins {
 	// https://github.com/davidburstrom/version-compatibility-gradle-plugin/tags
 	id 'io.github.davidburstrom.version-compatibility' version '0.5.0' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.develocity
-	id 'com.gradle.develocity' version '3.18'
+	id 'com.gradle.develocity' version '3.18.1'
 	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
 	id 'dev.equo.ide' version '1.7.7' apply false
 }

From 1b79196f5d5728e47e986d511fde644069632370 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 12 Sep 2024 09:21:23 +0800
Subject: [PATCH 1787/2068] Update plugin com.gradle.plugin-publish to v1.3.0
 (#2258)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 54218f3c6d..a5b300a558 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -8,7 +8,7 @@ pluginManagement {
 plugins {
 	id 'com.diffplug.spotless' version '7.0.0.BETA2' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
-	id 'com.gradle.plugin-publish' version '1.2.2' apply false
+	id 'com.gradle.plugin-publish' version '1.3.0' apply false
 	// https://github.com/gradle-nexus/publish-plugin/releases
 	id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases

From 569f969f3b7385957e2c8f72044d4a3ba4986543 Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <awa@xima.de>
Date: Thu, 12 Sep 2024 18:19:17 +0100
Subject: [PATCH 1788/2068] Adjustments for biome CSS support

As of 1.9.0, biome formatting support for CSS is now stable.

Biome now supports formatting / linting CSS. Spotless already supports this as a generic
formatting step. I made a few adjustments to make CSS support explicit:

* Added a note to the readme.
* Updated the JavaDocs for the Maven / Gradle formatting steps
* Added a generic CSS step with biome as a formatter
---
 CONTRIBUTING.md                               |   6 +-
 .../diffplug/spotless/biome/BiomeStep.java    |  12 +-
 plugin-gradle/CHANGES.md                      |   3 +
 plugin-gradle/README.md                       |  18 +
 .../gradle/spotless/BiomeStepConfig.java      |   4 +-
 .../gradle/spotless/CssExtension.java         |  89 +++
 .../gradle/spotless/FormatExtension.java      |   2 +
 .../gradle/spotless/SpotlessExtension.java    |   6 +
 .../gradle/spotless/BiomeIntegrationTest.java |  60 +-
 plugin-maven/CHANGES.md                       |   3 +
 plugin-maven/README.md                        |  28 +-
 .../spotless/maven/AbstractSpotlessMojo.java  |   6 +-
 .../diffplug/spotless/maven/css/BiomeCss.java |  33 +
 .../com/diffplug/spotless/maven/css/Css.java  |  42 ++
 .../spotless/maven/generic/AbstractBiome.java |   2 +
 .../spotless/maven/generic/Biome.java         |   6 +-
 .../maven/MavenIntegrationHarness.java        |   4 +
 .../spotless/maven/biome/BiomeMavenTest.java  |  33 +
 .../resources/biome/config/css-enabled.json   |  19 +
 .../main/resources/biome/css/fileAfter.css    |   7 +
 .../main/resources/biome/css/fileBefore.css   |  12 +
 .../resources/biome/jsonc/fileAfter.jsonc     |   6 +
 .../resources/biome/jsonc/fileBefore.jsonc    |   8 +
 .../spotless/biome/BiomeStepTest.java         | 563 ++++++++++--------
 24 files changed, 711 insertions(+), 261 deletions(-)
 create mode 100644 plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CssExtension.java
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/css/BiomeCss.java
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/css/Css.java
 create mode 100644 testlib/src/main/resources/biome/config/css-enabled.json
 create mode 100644 testlib/src/main/resources/biome/css/fileAfter.css
 create mode 100644 testlib/src/main/resources/biome/css/fileBefore.css
 create mode 100644 testlib/src/main/resources/biome/jsonc/fileAfter.jsonc
 create mode 100644 testlib/src/main/resources/biome/jsonc/fileBefore.jsonc

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 27e6221e76..5ce03c49ce 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -164,13 +164,13 @@ concerning what you are working on:
 
 ```shell
 # Run only from test from the "lib" project
-gradlew :testlib:test --tests com.diffplug.spotless.generic.IndentStepTest
+./gradlew :testlib:test --tests com.diffplug.spotless.generic.IndentStepTest
 
 # Run only one test from the "plugin-maven" project
-gradlew :plugin-maven:test --tests com.diffplug.spotless.maven.pom.SortPomMavenTest
+./gradlew :plugin-maven:test --tests com.diffplug.spotless.maven.pom.SortPomMavenTest
 
 # Run only one test from the "plugin-gradle" project
-gradlew :plugin-gradle:test --tests com.diffplug.gradle.spotless.FreshMarkExtensionTest
+./gradlew :plugin-gradle:test --tests com.diffplug.gradle.spotless.FreshMarkExtensionTest
 ```
 
 ## Check and format code
diff --git a/lib/src/main/java/com/diffplug/spotless/biome/BiomeStep.java b/lib/src/main/java/com/diffplug/spotless/biome/BiomeStep.java
index 2db9e8cb2a..09a42ae4a0 100644
--- a/lib/src/main/java/com/diffplug/spotless/biome/BiomeStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/biome/BiomeStep.java
@@ -55,7 +55,7 @@ public class BiomeStep {
 	/**
 	 * The language (syntax) of the input files to format. When <code>null</code> or
 	 * the empty string, the language is detected automatically from the file name.
-	 * Currently the following languages are supported by Biome:
+	 * Currently, the following languages are supported by Biome:
 	 * <ul>
 	 * <li>js (JavaScript)</li>
 	 * <li>jsx (JavaScript + JSX)</li>
@@ -65,7 +65,9 @@ public class BiomeStep {
 	 * <li>tsx (TypeScript + JSX)</li>
 	 * <li>ts? (TypeScript or TypeScript + JSX, depending on the file
 	 * extension)</li>
+	 * <li>css (CSS, requires biome &gt;= 1.9.0)</li>
 	 * <li>json (JSON)</li>
+	 * <li>jsonc (JSON + comments)</li>
 	 * </ul>
 	 */
 	private String language;
@@ -274,7 +276,9 @@ public BiomeStep withConfigPath(String configPath) {
 	 * <li>tsx (TypeScript + JSX)</li>
 	 * <li>ts? (TypeScript or TypeScript + JSX, depending on the file
 	 * extension)</li>
+	 * <li>css (CSS, requires biome &gt;= 1.9.0)</li>
 	 * <li>json (JSON)</li>
+	 * <li>jsonc (JSON + comments)</li>
 	 * </ul>
 	 *
 	 * @param language The language of the files to format.
@@ -450,7 +454,7 @@ private String format(ProcessRunner runner, String input, File file) throws IOEx
 		 * expected language / syntax. Biome always determined the language from the file
 		 * extension. This method returns the file name for the desired language when a
 		 * language was requested explicitly, or the file name of the input file for
-		 * auto detection.
+		 * auto-detection.
 		 *
 		 * @param file File to be formatted.
 		 * @return The file name to pass to the Biome executable.
@@ -479,6 +483,10 @@ private String resolveFileName(File file) {
 				return "tsx".equals(ext) ? name : "file.tsx";
 			case "json":
 				return "json".equals(ext) ? name : "file.json";
+			case "jsonc":
+				return "jsonc".equals(ext) ? name : "file.jsonc";
+			case "css":
+				return "css".equals(ext) ? name : "file.css";
 			// so that we can support new languages such as css or yaml when Biome adds
 			// support for them without having to change the code
 			default:
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index f33abfc3f4..1aa612e7e5 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]
 
+* Add explicit support for CSS via biome. Formatting CSS via biome was already supported as a general
+  formatting step. Biome supports formatting CSS as of 1.8.0 (experimental, opt-in) and 1.9.0 (stable).
+
 ## [7.0.0.BETA2] - 2024-08-25
 ### Changed
 * Support toning down sortPom logging. ([#2185](https://github.com/diffplug/spotless/pull/2185))
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 9f430b4e48..370ff36141 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -1111,6 +1111,22 @@ spotless {
 }
 ```
 
+## CSS
+
+`com.diffplug.gradle.spotless.CssExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/CssExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CssExtension.java)
+
+```gradle
+spotless {
+  css {
+    target 'css/**/*.css' // default: '**/*.css'
+
+    biome('1.8.3')  // has its own section below
+  }
+}
+```
+
+Note regarding biome: Biome supports formatting CSS as of 1.8.0 (experimental, opt-in) and 1.9.0 (stable).
+
 ## Prettier
 
 [homepage](https://prettier.io/). [changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md). [official plugins](https://prettier.io/docs/en/plugins.html#official-plugins). [community plugins](https://prettier.io/docs/en/plugins.html#community-plugins). Prettier is a formatter that can format almost every anything - JavaScript, JSX, Angular, Vue, Flow, TypeScript, CSS, Less, SCSS, HTML, JSON, GraphQL, Markdown (including GFM and MDX), and YAML.  It can format even more [using plugins](https://prettier.io/docs/en/plugins.html) (PHP, Ruby, Swift, XML, Apex, Elm, Java (!!), Kotlin, pgSQL, .properties, solidity, svelte, toml, shellscript, ...).
@@ -1311,6 +1327,8 @@ is pretty fast. It can currently format JavaScript, TypeScript, JSX, and JSON, a
 You can use Biome in any language-specific format for supported languages, but
 usually you will be creating a generic format.
 
+Note regarding biome: Biome supports formatting CSS as of 1.8.0 (experimental, opt-in) and 1.9.0 (stable).
+
 ```gradle
 spotless {
   format 'styling', {
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BiomeStepConfig.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BiomeStepConfig.java
index d66048a7b0..e26ece6a18 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BiomeStepConfig.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BiomeStepConfig.java
@@ -170,7 +170,7 @@ protected FormatterStep createStep() {
 	/**
 	 * Gets the language (syntax) of the input files to format. When
 	 * <code>null</code> or the empty string, the language is detected automatically
-	 * from the file name. Currently the following languages are supported by Biome:
+	 * from the file name. Currently, the following languages are supported by Biome:
 	 * <ul>
 	 * <li>js (JavaScript)</li>
 	 * <li>jsx (JavaScript + JSX)</li>
@@ -180,7 +180,9 @@ protected FormatterStep createStep() {
 	 * <li>tsx (TypeScript + JSX)</li>
 	 * <li>ts? (TypeScript or TypeScript + JSX, depending on the file
 	 * extension)</li>
+	 * <li>css (CSS, requires biome &gt;= 1.9.0)</li>
 	 * <li>json (JSON)</li>
+	 * <li>jsonc (JSON + comments)</li>
 	 * </ul>
 	 *
 	 * @return The language of the input files.
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CssExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CssExtension.java
new file mode 100644
index 0000000000..f3dd15ccb3
--- /dev/null
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CssExtension.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.gradle.spotless;
+
+import javax.inject.Inject;
+
+import com.diffplug.spotless.biome.BiomeFlavor;
+
+/** Gradle step for formatting CSS files. */
+public class CssExtension extends FormatExtension {
+	private static final String CSS_FILE_EXTENSION = "**/*.css";
+
+	static final String NAME = "css";
+
+	@Inject
+	public CssExtension(SpotlessExtension spotless) {
+		super(spotless);
+	}
+
+	/** If the user hasn't specified files, assume all CSS files should be checked. */
+	@Override
+	protected void setupTask(SpotlessTask task) {
+		if (target == null) {
+			target = parseTarget(CSS_FILE_EXTENSION);
+		}
+		super.setupTask(task);
+	}
+
+	/**
+	 * Adds the default version of the biome formatter.
+	 * Defaults to downloading the default Biome version from the network. To work
+	 * offline, you can specify the path to the Biome executable via
+	 * {@code biome().pathToExe(...)}.
+	 */
+	public BiomeCss biome() {
+		return biome(null);
+	}
+
+	/**
+	 * Adds the given version of the biome formatter.
+	 * Defaults to downloading the default Biome version from the network. To work
+	 * offline, you can specify the path to the Biome executable via
+	 * {@code biome().pathToExe(...)}.
+	 * @param version Biome version to use.
+	 */
+	public BiomeCss biome(String version) {
+		var biomeConfig = new BiomeCss(version);
+		addStep(biomeConfig.createStep());
+		return biomeConfig;
+	}
+
+	/**
+	 * Biome formatter step for CSS.
+	 */
+	public class BiomeCss extends BiomeStepConfig<BiomeCss> {
+		/**
+		 * Creates a new Biome formatter step config for formatting CSS files. Unless
+		 * overwritten, the given Biome version is downloaded from the network.
+		 *
+		 * @param version Biome version to use.
+		 */
+		public BiomeCss(String version) {
+			super(getProject(), CssExtension.this::replaceStep, BiomeFlavor.BIOME, version);
+		}
+
+		@Override
+		protected String getLanguage() {
+			return "css";
+		}
+
+		@Override
+		protected BiomeCss getThis() {
+			return this;
+		}
+	}
+}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index 27b81ccef5..ac1b3c42a5 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -780,7 +780,9 @@ public BiomeGeneric(String version) {
 		 * <li>tsx (TypeScript + JSX)</li>
 		 * <li>ts? (TypeScript or TypeScript + JSX, depending on the file
 		 * extension)</li>
+		 * <li>css (CSS, requires biome &gt;= 1.9.0)</li>
 		 * <li>json (JSON)</li>
+		 * <li>jsonc (JSON + comments)</li>
 		 * </ul>
 		 *
 		 * @param language The language of the files to format.
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
index 276bdadcfd..e883953eaa 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
@@ -231,6 +231,12 @@ public void go(Action<GoExtension> closure) {
 		format(GoExtension.NAME, GoExtension.class, closure);
 	}
 
+	/** Configures the special CSS-specific extension. */
+	public void css(Action<CssExtension> closure) {
+		requireNonNull(closure);
+		format(CssExtension.NAME, CssExtension.class, closure);
+	}
+
 	/** Configures the special POM-specific extension. */
 	public void pom(Action<PomExtension> closure) {
 		requireNonNull(closure);
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java
index ba39af1705..1456f9d793 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java
@@ -19,19 +19,73 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.io.IOException;
-
 import org.junit.jupiter.api.Test;
 import org.owasp.encoder.Encode;
 
+/**
+ * Tests for the Biome formatter used via the Gradle spotless plugin.
+ */
 class BiomeIntegrationTest extends GradleIntegrationHarness {
+	/**
+	 * Tests that biome can be used as a JSON formatting step, using biome 1.8.3 which
+	 * requires opt-in.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void asCssStepExperimental() throws Exception {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    css {",
+				"        target '**/*.css'",
+				"        biome('1.8.3').configPath('configs')",
+				"    }",
+				"}");
+		setFile("biome_test.css").toResource("biome/css/fileBefore.css");
+		setFile("configs/biome.json").toResource("biome/config/css-enabled.json");
+
+		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		assertFile("biome_test.css").sameAsResource("biome/css/fileAfter.css");
+	}
+
+	/**
+	 * Tests that biome can be used as a JSON formatting step, using biome 1.9.0 which
+	 * does not require opt-in.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void asCssStepStable() throws Exception {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    css {",
+				"        target '**/*.css'",
+				"        biome('1.9.0')",
+				"    }",
+				"}");
+		setFile("biome_test.css").toResource("biome/css/fileBefore.css");
+
+		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		assertFile("biome_test.css").sameAsResource("biome/css/fileAfter.css");
+	}
+
 	/**
 	 * Tests that biome can be used as a generic formatting step.
 	 *
 	 * @throws Exception When a test failure occurs.
 	 */
 	@Test
-	void asGenericStep() throws IOException {
+	void asGenericStep() throws Exception {
 		setFile("build.gradle").toLines(
 				"plugins {",
 				"    id 'com.diffplug.spotless'",
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 67e356e5ab..53a191d943 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]
 
+* Add explicit support for CSS via biome. Formatting CSS via biome was already supported as a general
+  formatting step. Biome supports formatting CSS as of 1.8.0 (experimental, opt-in) and 1.9.0 (stable). 
+
 ## [2.44.0.BETA2] - 2024-08-25
 ### Changed
 * Support toning down sortPom logging. ([#2185](https://github.com/diffplug/spotless/pull/2185))
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 48eeea7efc..130d9c20df 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -1118,6 +1118,30 @@ Standard Go formatter, part of Go distribution.
 </gofmt>
 ```
 
+## CSS
+
+[code](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/css/Css.java). [available steps](https://github.com/diffplug/spotless/tree/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/css).
+
+```xml
+<configuration>
+  <css>
+    <!-- These are the defaults, you can override if you want -->
+    <includes>
+      <include>src/main/css/**/*.css</include>
+      <include>src/test/css/**/*.css</include>
+    </includes>
+
+    <biome />          <!-- has its own section below -->
+
+    <licenseHeader>
+      <content>/* (C)$YEAR */</content>  <!-- or <file>${project.basedir}/license-header</file> -->
+    </licenseHeader>
+  </css>
+</configuration>
+```
+
+Note regarding biome: Biome supports formatting CSS as of 1.8.0 (experimental, opt-in) and 1.9.0 (stable).
+
 ## Prettier
 
 [homepage](https://prettier.io/). [changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md). [official plugins](https://prettier.io/docs/en/plugins.html#official-plugins). [community plugins](https://prettier.io/docs/en/plugins.html#community-plugins). Prettier is a formatter that can format almost every anything - JavaScript, JSX, Angular, Vue, Flow, TypeScript, CSS, Less, SCSS, HTML, JSON, GraphQL, Markdown (including GFM and MDX), and YAML.  It can format even more [using plugins](https://prettier.io/docs/en/plugins.html) (PHP, Ruby, Swift, XML, Apex, Elm, Java (!!), Kotlin, pgSQL, .properties, solidity, svelte, toml, shellscript, ...).
@@ -1340,6 +1364,8 @@ is pretty fast. It can currently format JavaScript, TypeScript, JSX, and JSON, a
 You can use Biome in any language-specific format for supported languages, but
 usually you will be creating a generic format.
 
+Note regarding CSS: Biome supports formatting CSS as of 1.8.0 (experimental, opt-in) and 1.9.0 (stable).
+
 ```xml
 <configuration>
   <formats>
@@ -1355,7 +1381,7 @@ usually you will be creating a generic format.
         <!-- (optional) Path to the directory with the biome.json conig file -->
         <configPath>${project.basedir}/path/to/config/dir</configPath>
 
-        <!-- (optional) Biome will auto detect the language based on the file extension. -->
+        <!-- (optional) Biome will auto-detect the language based on the file extension. -->
         <!-- See below for possible values. -->
         <language>ts</language>
       </prettier>
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
index 9f4d0e01bc..5028c86775 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
@@ -59,6 +59,7 @@
 import com.diffplug.spotless.generic.LicenseHeaderStep;
 import com.diffplug.spotless.maven.antlr4.Antlr4;
 import com.diffplug.spotless.maven.cpp.Cpp;
+import com.diffplug.spotless.maven.css.Css;
 import com.diffplug.spotless.maven.generic.Format;
 import com.diffplug.spotless.maven.generic.LicenseHeader;
 import com.diffplug.spotless.maven.gherkin.Gherkin;
@@ -141,6 +142,9 @@ public abstract class AbstractSpotlessMojo extends AbstractMojo {
 	@Parameter
 	private List<Format> formats = Collections.emptyList();
 
+	@Parameter
+	private Css css;
+
 	@Parameter
 	private Groovy groovy;
 
@@ -377,7 +381,7 @@ private FileLocator getFileLocator() {
 	}
 
 	private List<FormatterFactory> getFormatterFactories() {
-		return Stream.concat(formats.stream(), Stream.of(groovy, java, scala, kotlin, cpp, typescript, javascript, antlr4, pom, sql, python, markdown, json, shell, yaml, gherkin, go))
+		return Stream.concat(formats.stream(), Stream.of(groovy, java, scala, kotlin, cpp, css, typescript, javascript, antlr4, pom, sql, python, markdown, json, shell, yaml, gherkin, go))
 				.filter(Objects::nonNull)
 				.collect(toList());
 	}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/css/BiomeCss.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/css/BiomeCss.java
new file mode 100644
index 0000000000..ca96f47cfe
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/css/BiomeCss.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2016-2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.css;
+
+import com.diffplug.spotless.biome.BiomeFlavor;
+import com.diffplug.spotless.maven.generic.AbstractBiome;
+
+/**
+ * Biome formatter step for CSS.
+ */
+public class BiomeCss extends AbstractBiome {
+	public BiomeCss() {
+		super(BiomeFlavor.BIOME);
+	}
+
+	@Override
+	protected String getLanguage() {
+		return "css";
+	}
+}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/css/Css.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/css/Css.java
new file mode 100644
index 0000000000..4d465d8939
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/css/Css.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2023-2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.css;
+
+import java.util.Collections;
+import java.util.Set;
+
+import org.apache.maven.project.MavenProject;
+
+import com.diffplug.spotless.maven.FormatterFactory;
+
+/**
+ * A {@link FormatterFactory} implementation that corresponds to {@code <css>...</css>} configuration element.
+ */
+public class Css extends FormatterFactory {
+	@Override
+	public Set<String> defaultIncludes(MavenProject project) {
+		return Collections.emptySet();
+	}
+
+	@Override
+	public String licenseHeaderDelimiter() {
+		return null;
+	}
+
+	public void addBiome(BiomeCss biome) {
+		addStepFactory(biome);
+	}
+}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/AbstractBiome.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/AbstractBiome.java
index 7bc502edf1..f1473adf45 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/AbstractBiome.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/AbstractBiome.java
@@ -117,7 +117,9 @@ public FormatterStep newFormatterStep(FormatterStepConfig config) {
 	 * <li>tsx (TypeScript + JSX)</li>
 	 * <li>ts? (TypeScript or TypeScript + JSX, depending on the file
 	 * extension)</li>
+	 * <li>css (CSS, requires biome &gt;= 1.9.0)</li>
 	 * <li>json (JSON)</li>
+	 * <li>jsonc (JSON + comments)</li>
 	 * </ul>
 	 *
 	 * @return The language of the input files.
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Biome.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Biome.java
index 133e21c302..99cede1065 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Biome.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Biome.java
@@ -32,8 +32,7 @@ public Biome() {
 	/**
 	 * Gets the language (syntax) of the input files to format. When
 	 * <code>null</code> or the empty string, the language is detected automatically
-	 * from the file name. Currently the following languages are supported by Biome:
-	 * <ul>
+	 * from the file name. Currently, the following languages are supported by Biome:
 	 * <ul>
 	 * <li>js (JavaScript)</li>
 	 * <li>jsx (JavaScript + JSX)</li>
@@ -43,8 +42,9 @@ public Biome() {
 	 * <li>tsx (TypeScript + JSX)</li>
 	 * <li>ts? (TypeScript or TypeScript + JSX, depending on the file
 	 * extension)</li>
+	 * <li>css (CSS, requires biome &gt;= 1.9.0)</li>
 	 * <li>json (JSON)</li>
-	 * </ul>
+	 * <li>jsonc (JSON + comments)</li>
 	 * </ul>
 	 *
 	 * @return The language of the input files.
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
index 9e2e70c60f..9dbdf52339 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
@@ -179,6 +179,10 @@ protected void writePomWithJsonSteps(String... steps) throws IOException {
 		writePom(groupWithSteps("json", including("**/*.json"), steps));
 	}
 
+	protected void writePomWithCssSteps(String... steps) throws IOException {
+		writePom(groupWithSteps("css", including("**/*.css"), steps));
+	}
+
 	protected void writePomWithShellSteps(String... steps) throws IOException {
 		writePom(groupWithSteps("shell", including("**/*.sh"), steps));
 	}
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/biome/BiomeMavenTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/biome/BiomeMavenTest.java
index ff763c3cf8..5bb7424ef9 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/biome/BiomeMavenTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/biome/BiomeMavenTest.java
@@ -24,7 +24,40 @@
 
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
 
+/**
+ * Tests for the Biome formatter used via the Maven spotless plugin.
+ */
 class BiomeMavenTest extends MavenIntegrationHarness {
+	/**
+	 * Tests that biome can be used as a CSS formatting step, using biome 1.8.3
+	 * which requires opt-in.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void asCssStepExperimental() throws Exception {
+		writePomWithCssSteps("**/*.css", "<biome><version>1.8.3</version><configPath>configs</configPath></biome>");
+		setFile("biome_test.css").toResource("biome/css/fileBefore.css");
+		setFile("configs/biome.json").toResource("biome/config/css-enabled.json");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("biome_test.css").sameAsResource("biome/css/fileAfter.css");
+	}
+
+	/**
+	 * Tests that biome can be used as a CSS formatting step, with biome 1.9.0
+	 * which does not require opt-in.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void asCssStepStable() throws Exception {
+		writePomWithCssSteps("**/*.js", "<biome><version>1.9.0</version></biome>");
+		setFile("biome_test.css").toResource("biome/css/fileBefore.css");
+		var res = mavenRunner().withArguments("spotless:apply").runNoError();
+		System.out.println(res.stdOutUtf8());
+		assertFile("biome_test.css").sameAsResource("biome/css/fileAfter.css");
+	}
+
 	/**
 	 * Tests that Biome can be used as a generic formatting step.
 	 *
diff --git a/testlib/src/main/resources/biome/config/css-enabled.json b/testlib/src/main/resources/biome/config/css-enabled.json
new file mode 100644
index 0000000000..692de05fe6
--- /dev/null
+++ b/testlib/src/main/resources/biome/config/css-enabled.json
@@ -0,0 +1,19 @@
+{
+    "css": {
+      "linter": {
+        "enabled": true
+      },
+      "formatter": {
+        "enabled": true
+      }
+    },
+    "formatter": {
+      "enabled": true,
+      "indentStyle": "tab",
+      "lineWidth": 80,
+      "formatWithErrors": false
+    },
+    "linter": {
+      "enabled": false
+    }
+  }
\ No newline at end of file
diff --git a/testlib/src/main/resources/biome/css/fileAfter.css b/testlib/src/main/resources/biome/css/fileAfter.css
new file mode 100644
index 0000000000..0fc2cd37a2
--- /dev/null
+++ b/testlib/src/main/resources/biome/css/fileAfter.css
@@ -0,0 +1,7 @@
+.foobar {
+	color: red;
+	font-weight: bold;
+	&.foobar--large {
+		font-size: 20px;
+	}
+}
diff --git a/testlib/src/main/resources/biome/css/fileBefore.css b/testlib/src/main/resources/biome/css/fileBefore.css
new file mode 100644
index 0000000000..cfa88da947
--- /dev/null
+++ b/testlib/src/main/resources/biome/css/fileBefore.css
@@ -0,0 +1,12 @@
+        .foobar {             color:red;font-weight: bold;
+&.foobar--large {
+
+
+
+        font-size: 20px;
+
+
+    }
+
+
+        }
\ No newline at end of file
diff --git a/testlib/src/main/resources/biome/jsonc/fileAfter.jsonc b/testlib/src/main/resources/biome/jsonc/fileAfter.jsonc
new file mode 100644
index 0000000000..439d19ba1f
--- /dev/null
+++ b/testlib/src/main/resources/biome/jsonc/fileAfter.jsonc
@@ -0,0 +1,6 @@
+{
+	// some comment
+	"a": [1, 2, 3],
+	"b": 9,
+	"c": null
+}
diff --git a/testlib/src/main/resources/biome/jsonc/fileBefore.jsonc b/testlib/src/main/resources/biome/jsonc/fileBefore.jsonc
new file mode 100644
index 0000000000..d7a2ca689f
--- /dev/null
+++ b/testlib/src/main/resources/biome/jsonc/fileBefore.jsonc
@@ -0,0 +1,8 @@
+   {
+     // some comment
+    "a":[1,2,3
+
+],
+      "b":9,
+    "c"   : null
+   }
\ No newline at end of file
diff --git a/testlib/src/test/java/com/diffplug/spotless/biome/BiomeStepTest.java b/testlib/src/test/java/com/diffplug/spotless/biome/BiomeStepTest.java
index 0ad2f68783..87c4d6e91f 100644
--- a/testlib/src/test/java/com/diffplug/spotless/biome/BiomeStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/biome/BiomeStepTest.java
@@ -28,6 +28,9 @@
 import com.diffplug.spotless.StepHarnessWithFile;
 import com.diffplug.spotless.ThrowingEx;
 
+/**
+ * Tests for formatting files via the {@link BiomeStep}.
+ */
 class BiomeStepTest extends ResourceHarness {
 	private static String downloadDir;
 
@@ -38,263 +41,329 @@ static void createDownloadDir() throws IOException {
 		downloadDir = userHome.resolve(".gradle").resolve("rome-dl-test").toAbsolutePath().normalize().toString();
 	}
 
+	/**
+	 * Tests that files can be formatted without setting the input language
+	 * explicitly.
+	 */
 	@Nested
-	class Biome {
+	class AutoDetectLanguage {
+		/**
+		 * Tests that a *.cjs file can be formatted without setting the input language
+		 * explicitly.
+		 */
+		@Test
+		void testAutoDetectCjs() {
+			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
+			stepHarness.testResource("biome/js/fileBefore.cjs", "biome/js/fileAfter.cjs");
+		}
+
+		/**
+		 * Tests that a *.cts file can be formatted without setting the input language
+		 * explicitly.
+		 */
+		@Test
+		void testAutoDetectCts() {
+			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
+			stepHarness.testResource("biome/ts/fileBefore.cts", "biome/ts/fileAfter.cts");
+		}
+
+		/**
+		 * Tests that a *.css file can be formatted without setting the input language
+		 * explicitly, using biome 1.8.3 which does require opt-in.
+		 */
+		@Test
+		void testAutoDetectCssExperimental() {
+			var path = createBiomeConfig("biome/config/css-enabled.json");
+			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.8.3", downloadDir.toString()).withConfigPath(path).create();
+			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
+			stepHarness.testResource("biome/css/fileBefore.css", "biome/css/fileAfter.css");
+		}
+
+		/**
+		 * Tests that a *.css file can be formatted without setting the input language
+		 * explicitly, using biome 1.9.0 which does not require opt-in.
+		 */
+		@Test
+		void testAutoDetectCssStable() {
+			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.9.0", downloadDir.toString()).create();
+			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
+			stepHarness.testResource("biome/css/fileBefore.css", "biome/css/fileAfter.css");
+		}
+
+		/**
+		 * Tests that a *.js file can be formatted without setting the input language
+		 * explicitly.
+		 */
+		@Test
+		void testAutoDetectJs() {
+			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
+			stepHarness.testResource("biome/js/fileBefore.js", "biome/js/fileAfter.js");
+		}
+
 		/**
-		 * Tests that files can be formatted without setting the input language
+		 * Tests that a *.js file can be formatted without setting the input language
 		 * explicitly.
 		 */
-		@Nested
-		class AutoDetectLanguage {
-			/**
-			 * Tests that a *.cjs file can be formatted without setting the input language
-			 * explicitly.
-			 */
-			@Test
-			void testAutoDetectCjs() {
-				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
-				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
-				stepHarness.testResource("biome/js/fileBefore.cjs", "biome/js/fileAfter.cjs");
-			}
-
-			/**
-			 * Tests that a *.cts file can be formatted without setting the input language
-			 * explicitly.
-			 */
-			@Test
-			void testAutoDetectCts() {
-				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
-				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
-				stepHarness.testResource("biome/ts/fileBefore.cts", "biome/ts/fileAfter.cts");
-			}
-
-			/**
-			 * Tests that a *.js file can be formatted without setting the input language
-			 * explicitly.
-			 */
-			@Test
-			void testAutoDetectJs() {
-				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
-				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
-				stepHarness.testResource("biome/js/fileBefore.js", "biome/js/fileAfter.js");
-			}
-
-			/**
-			 * Tests that a *.js file can be formatted without setting the input language
-			 * explicitly.
-			 */
-			@Test
-			void testAutoDetectJson() {
-				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
-				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
-				stepHarness.testResource("biome/json/fileBefore.json", "biome/json/fileAfter.json");
-			}
-
-			/**
-			 * Tests that a *.jsx file can be formatted without setting the input language
-			 * explicitly.
-			 */
-			@Test
-			void testAutoDetectJsx() {
-				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
-				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
-				stepHarness.testResource("biome/js/fileBefore.jsx", "biome/js/fileAfter.jsx");
-			}
-
-			/**
-			 * Tests that a *.mjs file can be formatted without setting the input language
-			 * explicitly.
-			 */
-			@Test
-			void testAutoDetectMjs() {
-				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
-				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
-				stepHarness.testResource("biome/js/fileBefore.mjs", "biome/js/fileAfter.mjs");
-			}
-
-			/**
-			 * Tests that a *.mts file can be formatted without setting the input language
-			 * explicitly.
-			 */
-			@Test
-			void testAutoDetectMts() {
-				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
-				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
-				stepHarness.testResource("biome/ts/fileBefore.mts", "biome/ts/fileAfter.mts");
-			}
-
-			/**
-			 * Tests that a *.ts file can be formatted without setting the input language
-			 * explicitly.
-			 */
-			@Test
-			void testAutoDetectTs() {
-				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
-				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
-				stepHarness.testResource("biome/ts/fileBefore.ts", "biome/ts/fileAfter.ts");
-			}
-
-			/**
-			 * Tests that a *.tsx file can be formatted without setting the input language
-			 * explicitly.
-			 */
-			@Test
-			void testAutoDetectTsx() {
-				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
-				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
-				stepHarness.testResource("biome/ts/fileBefore.tsx", "biome/ts/fileAfter.tsx");
-			}
-
-			/**
-			 * Biome is hard-coded to ignore certain files, such as package.json. Since version 1.5.0,
-			 * the biome CLI does not output any formatted code anymore, whereas previously it printed
-			 * the input as-is. This tests checks that when the biome formatter outputs an empty string,
-			 * the contents of the file to format are used instead.
-			 */
-			@Test
-			void preservesIgnoredFiles() {
-				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.5.0", downloadDir.toString()).create();
-				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
-				stepHarness.testResource("biome/json/package.json", "biome/json/packageAfter.json");
-			}
+		@Test
+		void testAutoDetectJson() {
+			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
+			stepHarness.testResource("biome/json/fileBefore.json", "biome/json/fileAfter.json");
 		}
 
-		@Nested
-		class ConfigFile {
-			/**
-			 * Test formatting with the line width in the config file set to 120.
-			 */
-			@Test
-			void testLineWidth120() {
-				var path = createBiomeConfig("biome/config/line-width-120.json");
-				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withConfigPath(path).create();
-				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
-				stepHarness.testResource("biome/js/longLineBefore.js", "biome/js/longLineAfter120.js");
-			}
-
-			/**
-			 * Test formatting with the line width in the config file set to 120.
-			 */
-			@Test
-			void testLineWidth80() {
-				var path = createBiomeConfig("biome/config/line-width-80.json");
-				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withConfigPath(path).create();
-				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
-				stepHarness.testResource("biome/js/longLineBefore.js", "biome/js/longLineAfter80.js");
-			}
-
-			private String createBiomeConfig(String name) {
-				var config = createTestFile(name).toPath();
-				var dir = config.getParent();
-				var rome = dir.resolve("biome.json");
-				ThrowingEx.run(() -> Files.copy(config, rome));
-				return dir.toString();
-			}
+		/**
+		 * Tests that a *.jsonc file can be formatted without setting the input language
+		 * explicitly.
+		 */
+		@Test
+		void testAutoDetectJsonc() {
+			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
+			stepHarness.testResource("biome/jsonc/fileBefore.jsonc", "biome/jsonc/fileAfter.jsonc");
 		}
 
 		/**
-		 * Tests that files can be formatted when setting the input language explicitly.
+		 * Tests that a *.jsx file can be formatted without setting the input language
+		 * explicitly.
 		 */
-		@Nested
-		class ExplicitLanguage {
-			/**
-			 * Tests that a *.cjs file can be formatted when setting the input language
-			 * explicitly.
-			 */
-			@Test
-			void testAutoDetectCjs() {
-				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("js").create();
-				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
-				stepHarness.testResource("biome/js/fileBefore.cjs", "biome/js/fileAfter.cjs");
-			}
-
-			/**
-			 * Tests that a *.cts file can be formatted when setting the input language
-			 * explicitly.
-			 */
-			@Test
-			void testAutoDetectCts() {
-				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("ts").create();
-				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
-				stepHarness.testResource("biome/ts/fileBefore.cts", "biome/ts/fileAfter.cts");
-			}
-
-			/**
-			 * Tests that a *.js file can be formatted when setting the input language
-			 * explicitly.
-			 */
-			@Test
-			void testAutoDetectJs() {
-				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("js").create();
-				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
-				stepHarness.testResource("biome/js/fileBefore.js", "biome/js/fileAfter.js");
-			}
-
-			/**
-			 * Tests that a *.json file can be formatted when setting the input language
-			 * explicitly.
-			 */
-			@Test
-			void testAutoDetectJson() {
-				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("json").create();
-				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
-				stepHarness.testResource("biome/json/fileBefore.json", "biome/json/fileAfter.json");
-			}
-
-			/**
-			 * Tests that a *.jsx file can be formatted when setting the input language
-			 * explicitly.
-			 */
-			@Test
-			void testAutoDetectJsx() {
-				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("jsx").create();
-				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
-				stepHarness.testResource("biome/js/fileBefore.jsx", "biome/js/fileAfter.jsx");
-			}
-
-			/**
-			 * Tests that a *.mjs file can be formatted without setting the input language
-			 * explicitly.
-			 */
-			@Test
-			void testAutoDetectMjs() {
-				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("js").create();
-				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
-				stepHarness.testResource("biome/js/fileBefore.mjs", "biome/js/fileAfter.mjs");
-			}
-
-			/**
-			 * Tests that a *.mts file can be formatted when setting the input language
-			 * explicitly.
-			 */
-			@Test
-			void testAutoDetectMts() {
-				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("ts").create();
-				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
-				stepHarness.testResource("biome/ts/fileBefore.mts", "biome/ts/fileAfter.mts");
-			}
-
-			/**
-			 * Tests that a *.ts file can be formatted when setting the input language
-			 * explicitly.
-			 */
-			@Test
-			void testAutoDetectTs() {
-				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("ts").create();
-				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
-				stepHarness.testResource("biome/ts/fileBefore.ts", "biome/ts/fileAfter.ts");
-			}
-
-			/**
-			 * Tests that a *.tsx file can be formatted when setting the input language
-			 * explicitly.
-			 */
-			@Test
-			void testAutoDetectTsx() {
-				var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("tsx").create();
-				var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
-				stepHarness.testResource("biome/ts/fileBefore.tsx", "biome/ts/fileAfter.tsx");
-			}
+		@Test
+		void testAutoDetectJsx() {
+			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
+			stepHarness.testResource("biome/js/fileBefore.jsx", "biome/js/fileAfter.jsx");
 		}
+
+		/**
+		 * Tests that a *.mjs file can be formatted without setting the input language
+		 * explicitly.
+		 */
+		@Test
+		void testAutoDetectMjs() {
+			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
+			stepHarness.testResource("biome/js/fileBefore.mjs", "biome/js/fileAfter.mjs");
+		}
+
+		/**
+		 * Tests that a *.mts file can be formatted without setting the input language
+		 * explicitly.
+		 */
+		@Test
+		void testAutoDetectMts() {
+			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
+			stepHarness.testResource("biome/ts/fileBefore.mts", "biome/ts/fileAfter.mts");
+		}
+
+		/**
+		 * Tests that a *.ts file can be formatted without setting the input language
+		 * explicitly.
+		 */
+		@Test
+		void testAutoDetectTs() {
+			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
+			stepHarness.testResource("biome/ts/fileBefore.ts", "biome/ts/fileAfter.ts");
+		}
+
+		/**
+		 * Tests that a *.tsx file can be formatted without setting the input language
+		 * explicitly.
+		 */
+		@Test
+		void testAutoDetectTsx() {
+			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
+			stepHarness.testResource("biome/ts/fileBefore.tsx", "biome/ts/fileAfter.tsx");
+		}
+
+		/**
+		 * Biome is hard-coded to ignore certain files, such as package.json. Since version 1.5.0,
+		 * the biome CLI does not output any formatted code anymore, whereas previously it printed
+		 * the input as-is. This tests checks that when the biome formatter outputs an empty string,
+		 * the contents of the file to format are used instead.
+		 */
+		@Test
+		void preservesIgnoredFiles() {
+			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.5.0", downloadDir.toString()).create();
+			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
+			stepHarness.testResource("biome/json/package.json", "biome/json/packageAfter.json");
+		}
+	}
+
+	@Nested
+	class ConfigFile {
+		/**
+		 * Test formatting with the line width in the config file set to 120.
+		 */
+		@Test
+		void testLineWidth120() {
+			var path = createBiomeConfig("biome/config/line-width-120.json");
+			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withConfigPath(path).create();
+			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
+			stepHarness.testResource("biome/js/longLineBefore.js", "biome/js/longLineAfter120.js");
+		}
+
+		/**
+		 * Test formatting with the line width in the config file set to 120.
+		 */
+		@Test
+		void testLineWidth80() {
+			var path = createBiomeConfig("biome/config/line-width-80.json");
+			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withConfigPath(path).create();
+			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
+			stepHarness.testResource("biome/js/longLineBefore.js", "biome/js/longLineAfter80.js");
+		}
+
+	}
+
+	/**
+	 * Tests that files can be formatted when setting the input language explicitly.
+	 */
+	@Nested
+	class ExplicitLanguage {
+		/**
+		 * Tests that a *.cjs file can be formatted when setting the input language
+		 * explicitly.
+		 */
+		@Test
+		void testSetLanguageCjs() {
+			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("js").create();
+			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
+			stepHarness.testResource("biome/js/fileBefore.cjs", "biome/js/fileAfter.cjs");
+		}
+
+		/**
+		 * Tests that a *.css file can be formatted when setting the input language
+		 * explicitly, using biome 1.8.3 which does require opt-in.
+		 */
+		@Test
+		void testSetLanguageCssExperimental() {
+			var path = createBiomeConfig("biome/config/css-enabled.json");
+			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.8.3", downloadDir.toString()).withConfigPath(path).withLanguage("css").create();
+			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
+			stepHarness.testResource("biome/css/fileBefore.css", "biome/css/fileAfter.css");
+		}
+
+		/**
+		 * Tests that a *.css file can be formatted when setting the input language
+		 * explicitly, using biome 1.9.0 which does not require opt-in.
+		 */
+		@Test
+		void testSetLanguageCssStable() {
+			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.9.0", downloadDir.toString()).withLanguage("css").create();
+			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
+			stepHarness.testResource("biome/css/fileBefore.css", "biome/css/fileAfter.css");
+		}
+
+		/**
+		 * Tests that a *.cts file can be formatted when setting the input language
+		 * explicitly.
+		 */
+		@Test
+		void testSetLanguageCts() {
+			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("ts").create();
+			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
+			stepHarness.testResource("biome/ts/fileBefore.cts", "biome/ts/fileAfter.cts");
+		}
+
+		/**
+		 * Tests that a *.js file can be formatted when setting the input language
+		 * explicitly.
+		 */
+		@Test
+		void testSetLanguageJs() {
+			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("js").create();
+			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
+			stepHarness.testResource("biome/js/fileBefore.js", "biome/js/fileAfter.js");
+		}
+
+		/**
+		 * Tests that a *.json file can be formatted when setting the input language
+		 * explicitly.
+		 */
+		@Test
+		void testSetLanguageJson() {
+			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("json").create();
+			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
+			stepHarness.testResource("biome/json/fileBefore.json", "biome/json/fileAfter.json");
+		}
+
+		/**
+		 * Tests that a *.jsonc file can be formatted when setting the input language
+		 * explicitly.
+		 */
+		@Test
+		void testSetLanguageJsonc() {
+			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("jsonc").create();
+			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
+			stepHarness.testResource("biome/jsonc/fileBefore.jsonc", "biome/jsonc/fileAfter.jsonc");
+		}
+
+		/**
+		 * Tests that a *.jsx file can be formatted when setting the input language
+		 * explicitly.
+		 */
+		@Test
+		void testSetLanguageJsx() {
+			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("jsx").create();
+			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
+			stepHarness.testResource("biome/js/fileBefore.jsx", "biome/js/fileAfter.jsx");
+		}
+
+		/**
+		 * Tests that a *.mjs file can be formatted without setting the input language
+		 * explicitly.
+		 */
+		@Test
+		void testSetLanguageMjs() {
+			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("js").create();
+			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
+			stepHarness.testResource("biome/js/fileBefore.mjs", "biome/js/fileAfter.mjs");
+		}
+
+		/**
+		 * Tests that a *.mts file can be formatted when setting the input language
+		 * explicitly.
+		 */
+		@Test
+		void testSetLanguageMts() {
+			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("ts").create();
+			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
+			stepHarness.testResource("biome/ts/fileBefore.mts", "biome/ts/fileAfter.mts");
+		}
+
+		/**
+		 * Tests that a *.ts file can be formatted when setting the input language
+		 * explicitly.
+		 */
+		@Test
+		void testSetLanguageTs() {
+			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("ts").create();
+			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
+			stepHarness.testResource("biome/ts/fileBefore.ts", "biome/ts/fileAfter.ts");
+		}
+
+		/**
+		 * Tests that a *.tsx file can be formatted when setting the input language
+		 * explicitly.
+		 */
+		@Test
+		void testSetLanguageTsx() {
+			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("tsx").create();
+			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
+			stepHarness.testResource("biome/ts/fileBefore.tsx", "biome/ts/fileAfter.tsx");
+		}
+	}
+
+	private String createBiomeConfig(String name) {
+		var config = createTestFile(name).toPath();
+		var dir = config.getParent();
+		var rome = dir.resolve("biome.json");
+		ThrowingEx.run(() -> Files.copy(config, rome));
+		return dir.toString();
 	}
 }

From 0146ad95019f0452a59b74e8c6b5b5c0f0caf784 Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <awa@xima.de>
Date: Thu, 12 Sep 2024 18:56:40 +0100
Subject: [PATCH 1789/2068] Updates CHANGES.md

---
 CHANGES.md               | 3 +++
 plugin-gradle/CHANGES.md | 1 +
 plugin-maven/CHANGES.md  | 3 ++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 827a7a827d..2c48d19920 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]
 
+* Add explicit support for JSONC / CSS via biome, via the file extensions `.css` and `.jsonc`. 
+  ([#2259](https://github.com/diffplug/spotless/pull/2259))
+
 ## [3.0.0.BETA2] - 2024-08-25
 ### Changed
 * Support toning down sortPom logging. ([#2185](https://github.com/diffplug/spotless/pull/2185))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 1aa612e7e5..18c1ee997a 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -6,6 +6,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 * Add explicit support for CSS via biome. Formatting CSS via biome was already supported as a general
   formatting step. Biome supports formatting CSS as of 1.8.0 (experimental, opt-in) and 1.9.0 (stable).
+  ([#2259](https://github.com/diffplug/spotless/pull/2259))
 
 ## [7.0.0.BETA2] - 2024-08-25
 ### Changed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 53a191d943..8a9069ea7b 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,7 +5,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 
 * Add explicit support for CSS via biome. Formatting CSS via biome was already supported as a general
-  formatting step. Biome supports formatting CSS as of 1.8.0 (experimental, opt-in) and 1.9.0 (stable). 
+  formatting step. Biome supports formatting CSS as of 1.8.0 (experimental, opt-in) and 1.9.0 (stable).
+  ([#2259](https://github.com/diffplug/spotless/pull/2259))
 
 ## [2.44.0.BETA2] - 2024-08-25
 ### Changed

From 0980fa84ff58c80fe8ac175139c7a588f53dd117 Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <awa@xima.de>
Date: Thu, 12 Sep 2024 19:57:37 +0100
Subject: [PATCH 1790/2068] Use Gradle user home directory for downloading
 biome, fixes #2187

Use the Gradle user home directory by default for the download directory for the biome executable.
Previously, the plugin tried to use Maven's home directory, which is not always accessible by a Gradle plugin.
According to the [Gradle docs](https://docs.gradle.org/current/kotlin-dsl/gradle/org.gradle.api.invocation/-gradle/get-gradle-user-home-dir.html),
the user home directory

> is used to cache downloaded resources, compiled build scripts and so on.

From that description, it seems to me to be the proper location for the biome executable.
---
 plugin-gradle/CHANGES.md                      |  3 +++
 .../gradle/spotless/BiomeStepConfig.java      | 25 ++++---------------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index f33abfc3f4..0418889077 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]
 
+* Use the Gradle user home directory by default for the download directory for the biome executable. Previously, the
+  plugin tried to use Maven's home directory, which is not always accessible by a Gradle plugin. ([#2187](https://github.com/diffplug/spotless/issues/2187))
+
 ## [7.0.0.BETA2] - 2024-08-25
 ### Changed
 * Support toning down sortPom logging. ([#2185](https://github.com/diffplug/spotless/pull/2185))
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BiomeStepConfig.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BiomeStepConfig.java
index d66048a7b0..2d6c0484b6 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BiomeStepConfig.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BiomeStepConfig.java
@@ -18,14 +18,12 @@
 import static java.util.Objects.requireNonNull;
 
 import java.io.File;
-import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.function.Consumer;
 
 import javax.annotation.Nullable;
 
 import org.gradle.api.Project;
-import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
 
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.biome.BiomeFlavor;
@@ -208,23 +206,10 @@ protected void replaceStep() {
 	 * @return The directory for storing shared data.
 	 */
 	private File findDataDir() {
-		var currentRepo = project.getRepositories().stream().filter(r -> r instanceof MavenArtifactRepository)
-				.map(r -> (MavenArtifactRepository) r).filter(r -> "file".equals(r.getUrl().getScheme())).findAny()
-				.orElse(null);
-		// Temporarily add mavenLocal() repository to get its file URL
-		var localRepo = currentRepo != null ? (MavenArtifactRepository) currentRepo
-				: project.getRepositories().mavenLocal();
-		try {
-			// e.g. ~/.m2/repository/
-			var repoPath = Path.of(localRepo.getUrl());
-			var dataPath = repoPath.resolve("com").resolve("diffplug").resolve("spotless").resolve("spotless-data");
-			return dataPath.toAbsolutePath().toFile();
-		} finally {
-			// Remove mavenLocal() repository again if it was not part of the project
-			if (currentRepo == null) {
-				project.getRepositories().remove(localRepo);
-			}
-		}
+		// e.g. ~/.gradle/
+		var userHomeDir = project.getGradle().getGradleUserHomeDir().toPath();
+		var dataPath = userHomeDir.resolve("com").resolve("diffplug").resolve("spotless").resolve("spotless-data");
+		return dataPath.toAbsolutePath().toFile();
 	}
 
 	/**
@@ -247,7 +232,7 @@ private BiomeStep newBuilder() {
 	/**
 	 * Resolves the path to the Biome executable. When the path is only a file name,
 	 * do not perform any resolution and interpret it as a command that must be on
-	 * the user's path. Otherwise resolve the executable path against the project's
+	 * the user's path. Otherwise, resolve the executable path against the project's
 	 * base directory.
 	 *
 	 * @return The resolved path to the Biome executable.

From 7986a9834e1e2a63ed3132ee88e02a080a70a4ad Mon Sep 17 00:00:00 2001
From: Florian Kleedorfer <florian.kleedorfer@austria.fm>
Date: Tue, 10 Sep 2024 21:21:04 +0200
Subject: [PATCH 1791/2068] RDF Formatter Contribution

---
 .../java/com/diffplug/spotless/Formatter.java |    2 -
 .../spotless/rdf/RdfFormatterConfig.java      |  112 ++
 .../spotless/rdf/RdfFormatterFunc.java        |  148 ++
 .../spotless/rdf/RdfFormatterStep.java        |  120 ++
 .../spotless/rdf/ReflectionHelper.java        |  386 ++++
 .../spotless/maven/AbstractSpotlessMojo.java  |    7 +-
 .../spotless/maven/SpotlessApplyMojo.java     |    2 +-
 .../com/diffplug/spotless/maven/rdf/Rdf.java  |   39 +
 .../spotless/maven/rdf/RdfFormat.java         |   55 +
 .../diffplug/spotless/ResourceHarness.java    |   40 +
 .../expected/v1.2.12-default/shacl-shacl.ttl  |  432 +++++
 .../ttl/expected/v1.2.12-default/shacl.ttl    | 1346 +++++++++++++
 .../expected/v1.2.12-style01/shacl-shacl.ttl  |  431 +++++
 .../ttl/expected/v1.2.12-style01/shacl.ttl    | 1346 +++++++++++++
 .../resources/rdf/ttl/input/shacl-shacl.ttl   |  410 ++++
 .../main/resources/rdf/ttl/input/shacl.ttl    | 1665 +++++++++++++++++
 .../spotless/rdf/RdfFormatterTest.java        |  129 ++
 17 files changed, 6666 insertions(+), 4 deletions(-)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterConfig.java
 create mode 100644 lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterFunc.java
 create mode 100644 lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterStep.java
 create mode 100644 lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/rdf/Rdf.java
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/rdf/RdfFormat.java
 create mode 100644 testlib/src/main/resources/rdf/ttl/expected/v1.2.12-default/shacl-shacl.ttl
 create mode 100644 testlib/src/main/resources/rdf/ttl/expected/v1.2.12-default/shacl.ttl
 create mode 100644 testlib/src/main/resources/rdf/ttl/expected/v1.2.12-style01/shacl-shacl.ttl
 create mode 100644 testlib/src/main/resources/rdf/ttl/expected/v1.2.12-style01/shacl.ttl
 create mode 100644 testlib/src/main/resources/rdf/ttl/input/shacl-shacl.ttl
 create mode 100644 testlib/src/main/resources/rdf/ttl/input/shacl.ttl
 create mode 100644 testlib/src/test/java/com/diffplug/spotless/rdf/RdfFormatterTest.java

diff --git a/lib/src/main/java/com/diffplug/spotless/Formatter.java b/lib/src/main/java/com/diffplug/spotless/Formatter.java
index b5cd5f81fc..ce083e826a 100644
--- a/lib/src/main/java/com/diffplug/spotless/Formatter.java
+++ b/lib/src/main/java/com/diffplug/spotless/Formatter.java
@@ -165,7 +165,6 @@ public boolean isClean(File file) throws IOException {
 
 		String raw = new String(Files.readAllBytes(file.toPath()), encoding);
 		String unix = LineEnding.toUnix(raw);
-
 		// check the newlines (we can find these problems without even running the steps)
 		int totalNewLines = (int) unix.codePoints().filter(val -> val == '\n').count();
 		int windowsNewLines = raw.length() - unix.length();
@@ -181,7 +180,6 @@ public boolean isClean(File file) throws IOException {
 
 		// check the other formats
 		String formatted = compute(unix, file);
-
 		// return true iff the formatted string equals the unix one
 		return formatted.equals(unix);
 	}
diff --git a/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterConfig.java b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterConfig.java
new file mode 100644
index 0000000000..99b2bba936
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterConfig.java
@@ -0,0 +1,112 @@
+package com.diffplug.spotless.rdf;
+
+import java.io.Serializable;
+import java.lang.reflect.Field;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Objects;
+
+public class RdfFormatterConfig implements Serializable{
+	private static final long serialVersionId = 1L;
+	private boolean failOnWarning = true;
+	private boolean useTurtleFormatter = true;
+	private String turtleFormatterVersion = RdfFormatterStep.LATEST_TURTLE_FORMATTER_VERSION;
+	private boolean verify = true;
+
+	public RdfFormatterConfig() {
+	}
+
+	public void setFailOnWarning(boolean failOnWarning) {
+		this.failOnWarning = failOnWarning;
+	}
+
+	public boolean isFailOnWarning() {
+		return failOnWarning;
+	}
+
+	public boolean isVerify() {
+		return verify;
+	}
+
+	public void setVerify(boolean verify) {
+		this.verify = verify;
+	}
+
+	public static Builder builder(){
+		return new Builder();
+	}
+
+	public boolean isUseTurtleFormatter() {
+		return useTurtleFormatter;
+	}
+
+	public void setUseTurtleFormatter(boolean useTurtleFormatter) {
+		this.useTurtleFormatter = useTurtleFormatter;
+	}
+
+	public String getTurtleFormatterVersion() {
+		return turtleFormatterVersion;
+	}
+
+	public void setTurtleFormatterVersion(String turtleFormatterVersion) {
+		this.turtleFormatterVersion = turtleFormatterVersion;
+	}
+
+	public static class Builder {
+		RdfFormatterConfig config = new RdfFormatterConfig();
+
+		public Builder() {
+		}
+
+		public Builder failOnWarning(){
+			return this.failOnWarning(true);
+		}
+
+		public Builder failOnWarning(boolean fail){
+			this.config.setFailOnWarning(fail);
+			return this;
+		}
+
+		public Builder useTurtleFormatter(){
+			return this.useTurtleFormatter(true);
+		}
+
+		public Builder useTurtleFormatter(boolean useTurtleFormatter){
+			this.config.setUseTurtleFormatter(useTurtleFormatter);
+			return this;
+		}
+
+		public Builder turtleFormatterVersion(String version){
+			this.config.turtleFormatterVersion = version;
+			return this;
+		}
+
+		public RdfFormatterConfig build(){
+			return config;
+		}
+
+		public Builder verify(boolean verify) {
+			this.config.verify = verify;
+			return this;
+		}
+
+		public Builder verify() {
+			this.config.verify = true;
+			return this;
+		}
+	}
+
+	@Override public boolean equals(Object o) {
+		if (this == o)
+			return true;
+		if (!(o instanceof RdfFormatterConfig))
+			return false;
+		RdfFormatterConfig that = (RdfFormatterConfig) o;
+		return isFailOnWarning() == that.isFailOnWarning() && isUseTurtleFormatter() == that.isUseTurtleFormatter()
+			&& Objects.equals(turtleFormatterVersion, that.turtleFormatterVersion);
+	}
+
+	@Override public int hashCode() {
+		return Objects.hash(isFailOnWarning(), isUseTurtleFormatter(), turtleFormatterVersion);
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterFunc.java b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterFunc.java
new file mode 100644
index 0000000000..dc6ebfbb20
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterFunc.java
@@ -0,0 +1,148 @@
+package com.diffplug.spotless.rdf;
+
+import com.diffplug.spotless.FormatExceptionPolicy;
+import com.diffplug.spotless.FormatExceptionPolicyStrict;
+import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.LineEnding;
+import com.diffplug.spotless.SerializedFunction;
+
+import java.io.File;
+import java.lang.reflect.InvocationTargetException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class RdfFormatterFunc implements FormatterFunc {
+
+	private static final Set<String> TURTLE_EXTENSIONS = Set.of("ttl", "turtle");
+	private static final Set<String> TRIG_EXTENSIONS = Set.of("trig");
+	private static final Set<String> NTRIPLES_EXTENSIONS = Set.of("n-triples", "ntriples", "nt");
+	private static final Set<String> NQUADS_EXTENSIONS = Set.of("n-quads", "nquads", "nq");
+
+	private final RdfFormatterStep.State state;
+	private final FormatExceptionPolicy exceptionPolicy = new FormatExceptionPolicyStrict();
+
+	public RdfFormatterFunc(RdfFormatterStep.State state) {
+		this.state = state;
+	}
+
+	@Override public String apply(String input) throws Exception {
+		throw new UnsupportedOperationException("We need to know the filename so we can guess the RDF format. Use apply(String, File) instead!");
+	}
+
+	@Override public String apply(String rawUnix, File file) throws Exception {
+		String filename = file.getName().toLowerCase();
+		int lastDot = filename.lastIndexOf('.');
+		if (lastDot < 0) {
+			throw new IllegalArgumentException(
+				String.format("File %s has no file extension, cannot determine RDF format", file.getAbsolutePath()));
+		}
+		if (lastDot + 1 >= filename.length()) {
+			throw new IllegalArgumentException(
+				String.format("File %s has no file extension, cannot determine RDF format", file.getAbsolutePath()));
+		}
+		String extension = filename.substring(lastDot + 1);
+		ReflectionHelper reflectionHelper = new ReflectionHelper(state);
+		try {
+			if (TURTLE_EXTENSIONS.contains(extension)) {
+				return formatTurtle(rawUnix, file, reflectionHelper);
+			}
+			if (TRIG_EXTENSIONS.contains(extension)) {
+				return formatTrig(rawUnix, file);
+			}
+			if (NTRIPLES_EXTENSIONS.contains(extension)) {
+				return formatNTriples(rawUnix, file);
+			}
+			if (NQUADS_EXTENSIONS.contains(extension)) {
+				return formatNQuads(rawUnix, file);
+			}
+			throw new IllegalArgumentException(String.format("Cannot handle file with extension %s", extension));
+		} catch (InvocationTargetException e) {
+			throw new RuntimeException("Error formatting file " + file.getPath(), e.getCause());
+		} catch (Exception e) {
+			throw new RuntimeException("Error formatting file " + file.getPath(), e);
+		}
+	}
+
+	private String formatNQuads(String rawUnix, File file) {
+		throw new UnsupportedOperationException("NQUADS formatting not supported yet");
+	}
+
+	private String formatNTriples(String rawUnix, File file) {
+		throw new UnsupportedOperationException("NTRIPLES formatting not supported yet");
+	}
+
+	private String formatTrig(String rawUnix, File file) {
+		throw new UnsupportedOperationException("TRIG formatting not supported yet");
+	}
+
+	private String formatTurtle(String rawUnix, File file, ReflectionHelper reflectionHelper)
+		throws NoSuchMethodException, InvocationTargetException, IllegalAccessException,
+		NoSuchFieldException, InstantiationException {
+		String formatted;
+		Object lang = reflectionHelper.getLang("TTL");
+		if (state.getConfig().isUseTurtleFormatter()) {
+			formatted = reflectionHelper.formatWithTurtleFormatter(rawUnix);
+		} else {
+			Object model = reflectionHelper.parseToModel(rawUnix, file, lang);
+			formatted = reflectionHelper.formatWithJena(model, reflectionHelper.getRDFFormat("TURTLE_PRETTY"));
+		}
+		if (state.getConfig().isVerify()) {
+			veryfyResult(rawUnix, file, reflectionHelper, lang, formatted);
+		}
+		return LineEnding.toUnix(formatted);
+	}
+
+	private static void veryfyResult(String rawUnix, File file, ReflectionHelper reflectionHelper, Object lang,
+		String formatted) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+		Object modelBefore = reflectionHelper.parseToModel(rawUnix, file, lang);
+		Object modelAfter = reflectionHelper.parseToModel(formatted, file, lang);
+		if (!reflectionHelper.areModelsIsomorphic(modelBefore, modelAfter)){
+			long beforeSize = reflectionHelper.modelSize(modelBefore);
+			long afterSize = reflectionHelper.modelSize(modelAfter);
+			String diffResult = "[no diff information available]";
+			if (beforeSize != afterSize){
+				diffResult=String.format("< %,d triples", beforeSize);
+				diffResult += String.format("> %,d triples", afterSize);
+			} else {
+				List<Object> onlyInBeforeModel = new ArrayList<>();
+				List<Object> onlyInAfterModel = new ArrayList<>();
+				Object statementIterator = reflectionHelper.listModelStatements(modelBefore);
+				while(reflectionHelper.hasNext(statementIterator)){
+					Object statement = reflectionHelper.next(statementIterator);
+					if (!reflectionHelper.containsBlankNode(statement)) {
+						//don't compare statements with blank nodes. If the difference is there, that's just too bad
+						if (!reflectionHelper.containsStatement(modelAfter, statement)){
+							onlyInBeforeModel.add(statement);
+						}
+					}
+				}
+				statementIterator = reflectionHelper.listModelStatements(modelAfter);
+				while(reflectionHelper.hasNext(statementIterator)){
+					Object statement = reflectionHelper.next(statementIterator);
+					if (!reflectionHelper.containsBlankNode(statement)) {
+						//don't compare statements with blank nodes. If the difference is there, that's just too bad
+						if (!reflectionHelper.containsStatement(modelBefore, statement)){
+							onlyInAfterModel.add(statement);
+						}
+					}
+				}
+				if (! (onlyInBeforeModel.isEmpty() && onlyInAfterModel.isEmpty())) {
+					diffResult = onlyInBeforeModel.stream().map(s -> String.format("< %s", s))
+						.collect(Collectors.joining("\n"));
+					diffResult += "\n" + onlyInAfterModel.stream().map(s -> String.format("> %s", s)).collect(Collectors.joining("\n"));
+				} else {
+					diffResult = "The only differences are in statements with blank nodes - not shown here";
+				}
+			}
+			throw new IllegalStateException(
+				"Formatted RDF is not isomorphic with original, which means that formatting changed the data.\n"
+				+ "This could be a bug in the formatting system leading to data corruption and should be reported. \n"
+				+ "If you are not scared to lose data, you can disable this check by setting the config option 'verify' to 'false'"
+				+ "\n\nDiff:\n"
+			+ diffResult);
+		}
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterStep.java
new file mode 100644
index 0000000000..de8ee295cb
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterStep.java
@@ -0,0 +1,120 @@
+package com.diffplug.spotless.rdf;
+
+import java.io.File;
+import java.io.Serializable;
+import java.io.StringWriter;
+import java.lang.invoke.MethodHandles;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.TreeMap;
+import java.util.stream.Collectors;
+
+import javax.annotation.Nullable;
+
+import com.diffplug.spotless.FormatExceptionPolicy;
+import com.diffplug.spotless.FormatExceptionPolicyStrict;
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.JarState;
+import com.diffplug.spotless.LineEnding;
+import com.diffplug.spotless.OnMatch;
+import com.diffplug.spotless.Provisioner;
+import com.diffplug.spotless.SerializableFileFilter;
+import com.diffplug.spotless.npm.TsFmtFormatterStep;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class RdfFormatterStep implements Serializable{
+	public static final String LATEST_TURTLE_FORMATTER_VERSION = "1.2.12";
+	public static long serialVersionUID = 1L;
+	private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+	private static final String TURTLE_FORMATTER_COORDINATES = "de.atextor:turtle-formatter" ;
+
+	private final JarState.Promised jarState;
+	private final Map<String, String> turtleFormatterStyle;
+	private final RdfFormatterConfig config;
+
+	public static FormatterStep create(RdfFormatterConfig config, Map<String, String> turtleOptions, Provisioner provisioner)
+		throws ClassNotFoundException {
+		JarState.Promised jarState;
+		jarState = JarState.promise(() -> JarState.from(TURTLE_FORMATTER_COORDINATES + ":" + config.getTurtleFormatterVersion(), provisioner));
+		RdfFormatterStep step = new RdfFormatterStep(jarState, config, turtleOptions);
+		return FormatterStep.create("RdfFormatter", step, RdfFormatterStep::state, RdfFormatterStep::formatterFunc);
+	}
+
+	public static State state(RdfFormatterStep step){
+		return new State(step.config, step.turtleFormatterStyle, step.jarState.get());
+	}
+
+	public static RdfFormatterFunc formatterFunc(State state) {
+		return new RdfFormatterFunc(state);
+	}
+
+
+	public RdfFormatterStep(JarState.Promised jarState, RdfFormatterConfig config,
+		Map<String, String> turtleFormatterStyle) {
+		this.jarState = jarState;
+		this.turtleFormatterStyle = turtleFormatterStyle;
+		this.config = config;
+	}
+
+
+	static class State implements Serializable {
+		public static final long serialVersionUID = 1L;
+
+		private final RdfFormatterConfig config;
+
+		private final Map<String, String> turtleFormatterStyle;
+
+		private final JarState jarState;
+
+		public State(RdfFormatterConfig config, Map<String, String> turtleFormatterStyle,
+			JarState jarState) {
+			this.config = config;
+			this.turtleFormatterStyle = new TreeMap<>(turtleFormatterStyle == null ? Map.of() : turtleFormatterStyle);
+			this.jarState = jarState;
+		}
+
+		public RdfFormatterConfig getConfig() {
+			return config;
+		}
+
+		public Map<String, String> getTurtleFormatterStyle() {
+			return turtleFormatterStyle;
+		}
+
+		public JarState getJarState() {
+			return jarState;
+		}
+
+		@Override public boolean equals(Object o) {
+			if (this == o)
+				return true;
+			if (!(o instanceof State))
+				return false;
+			State state = (State) o;
+			return Objects.equals(getConfig(), state.getConfig()) && Objects.equals(
+				getTurtleFormatterStyle(), state.getTurtleFormatterStyle()) && Objects.equals(
+				getJarState(), state.getJarState());
+		}
+
+		@Override public int hashCode() {
+			return Objects.hash(getConfig(), getTurtleFormatterStyle(), getJarState());
+		}
+	}
+
+}
+
diff --git a/lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java b/lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java
new file mode 100644
index 0000000000..4cd975758a
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java
@@ -0,0 +1,386 @@
+package com.diffplug.spotless.rdf;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.StringWriter;
+import java.lang.invoke.MethodHandles;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.text.NumberFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.stream.Collectors;
+
+public class ReflectionHelper {
+	private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+	private final RdfFormatterStep.State state;
+	private final ClassLoader classLoader;
+	private final Class<?> JenaRdfDataMgrClass;
+	private final Class<?> JenaRdfParserClass;
+	private final Class<?> JenaRdfParserBuilderClass;
+	private final Class<?> JenaErrorHandlerClass;
+	private final Class<?> JenaModelClass;
+	private final Class<?> JenaStmtIteratorClass;
+	private final Class<?> JenaStatementClass;
+	private final Class<?> JenaRDFNodeClass;
+	private final Class<?> JenaResourceClass;
+	private final Class<?> JenaModelFactoryClass;
+	private final Class<?> JenaLangClass;
+	private final Class<?> JenaRDFFormatClass;
+	private final Class<?> TurtleFormatFormattingStyleClass;
+	private final Class<?> TurtleFormatFormattingStyleBuilderClass;
+	private final Class<?> TurtleFormatFormatterClass;
+
+	public ReflectionHelper(RdfFormatterStep.State state) throws ClassNotFoundException {
+		this.state = state;
+		this.classLoader = state.getJarState().getClassLoader();
+		this.JenaRdfDataMgrClass = classLoader.loadClass("org.apache.jena.riot.RDFDataMgr");
+		this.JenaRdfParserClass = classLoader.loadClass("org.apache.jena.riot.RDFParser");
+		this.JenaRdfParserBuilderClass = classLoader.loadClass("org.apache.jena.riot.RDFParserBuilder");
+		this.JenaErrorHandlerClass = classLoader.loadClass("org.apache.jena.riot.system.ErrorHandler");
+		this.JenaModelClass = classLoader.loadClass("org.apache.jena.rdf.model.Model");
+		this.JenaStmtIteratorClass = classLoader.loadClass("org.apache.jena.rdf.model.StmtIterator");
+		this.JenaRDFNodeClass = classLoader.loadClass("org.apache.jena.rdf.model.RDFNode");
+		this.JenaResourceClass = classLoader.loadClass("org.apache.jena.rdf.model.Resource");
+		this.JenaStatementClass = classLoader.loadClass("org.apache.jena.rdf.model.Statement");
+		this.JenaModelFactoryClass = classLoader.loadClass("org.apache.jena.rdf.model.ModelFactory");
+		this.JenaLangClass = classLoader.loadClass("org.apache.jena.riot.Lang");
+		this.JenaRDFFormatClass = classLoader.loadClass("org.apache.jena.riot.RDFFormat");
+		this.TurtleFormatFormatterClass = classLoader.loadClass("de.atextor.turtle.formatter.TurtleFormatter");
+		this.TurtleFormatFormattingStyleClass = classLoader.loadClass("de.atextor.turtle.formatter.FormattingStyle");
+		Class<?>[] innerClasses = TurtleFormatFormattingStyleClass.getDeclaredClasses();
+		this.TurtleFormatFormattingStyleBuilderClass = Arrays.stream(innerClasses)
+			.filter(c -> c.getSimpleName().equals("FormattingStyleBuilder")).findFirst().get();
+	}
+
+	public Object getLang(String lang) throws NoSuchFieldException, IllegalAccessException {
+		return this.JenaLangClass.getDeclaredField(lang).get(this.JenaLangClass);
+	}
+
+	public Object getModel() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+		return JenaModelFactoryClass.getMethod("createDefaultModel").invoke(JenaModelFactoryClass);
+	}
+
+	public Object getErrorHandler(File file) {
+		return Proxy.newProxyInstance(this.classLoader,
+			new Class<?>[] { JenaErrorHandlerClass }, new DynamicErrorInvocationHandler(file)
+		);
+	}
+
+	public Object listModelStatements(Object modelBefore)
+		throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+		Method listStatements = JenaModelClass.getMethod("listStatements");
+		return listStatements.invoke(modelBefore);
+	}
+
+	public boolean hasNext(Object statementIterator)
+		throws InvocationTargetException, IllegalAccessException, NoSuchMethodException {
+		Method hasNext = JenaStmtIteratorClass.getMethod("hasNext");
+		return (boolean) hasNext.invoke(statementIterator);
+	}
+
+	public Object next(Object statementIterator)
+		throws InvocationTargetException, IllegalAccessException, NoSuchMethodException {
+		Method hasNext = JenaStmtIteratorClass.getMethod("next");
+		return hasNext.invoke(statementIterator);
+	}
+
+	public boolean containsBlankNode(Object statement)
+		throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+		Method getSubject = JenaStatementClass.getMethod("getSubject");
+		Object subject = getSubject.invoke(statement);
+		Method isAnon = JenaRDFNodeClass.getMethod("isAnon");
+		if ((boolean) isAnon.invoke(subject)){
+			return true;
+		}
+		Method getPredicate = JenaStatementClass.getMethod("getPredicate");
+		Object predicate = getPredicate.invoke(statement);
+		if ((boolean) isAnon.invoke(predicate)){
+			return true;
+		}
+		Method getObject = JenaStatementClass.getMethod("getObject");
+		Object object = getObject.invoke(statement);
+		if ((boolean) isAnon.invoke(object)) {
+			return true;
+		}
+		return false;
+	}
+
+	public boolean containsStatement(Object model, Object statement)
+		throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+		Method contains = JenaModelClass.getMethod("contains", JenaStatementClass);
+		return (boolean) contains.invoke(model, statement);
+	}
+
+	private class DynamicErrorInvocationHandler implements InvocationHandler {
+		private final String filePath;
+
+		public DynamicErrorInvocationHandler(File file) {
+			if (state.getConfig().isFailOnWarning()) {
+				this.filePath = null;
+			} else {
+				this.filePath = file.getPath();
+			}
+		}
+
+		@Override public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+			String message = (String) args[0];
+			long line = (long) args[1];
+			long col = (long) args[2];
+			String severity = method.getName();
+			if (severity.equals("warning") && !state.getConfig().isFailOnWarning()) {
+				logger.warn("{}({},{}): {}", this.filePath, line, col, message);
+			} else {
+				throw new RuntimeException(
+					String.format("line %d, col %d: %s (severity: %s)", line, col, message, severity));
+			}
+			return null;
+		}
+	}
+
+	public Object getParser(Object lang, Object errorHandler, String rawUnix)
+		throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+		Object parserBuilder = JenaRdfParserClass.getMethod("create").invoke(JenaRdfParserClass);
+		parserBuilder = JenaRdfParserBuilderClass.getMethod("errorHandler", JenaErrorHandlerClass)
+			.invoke(parserBuilder, errorHandler);
+		parserBuilder = JenaRdfParserBuilderClass.getMethod("forceLang", JenaLangClass).invoke(parserBuilder, lang);
+		parserBuilder = JenaRdfParserBuilderClass.getMethod("strict", Boolean.TYPE).invoke(parserBuilder, true);
+		parserBuilder = JenaRdfParserBuilderClass.getMethod("checking", Boolean.TYPE).invoke(parserBuilder, true);
+		parserBuilder = JenaRdfParserBuilderClass.getMethod("fromString", String.class).invoke(parserBuilder, rawUnix);
+		return JenaRdfParserBuilderClass.getMethod("build").invoke(parserBuilder);
+	}
+
+	public void parseModel(Object parser, Object model)
+		throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+		JenaRdfParserClass.getMethod("parse", JenaModelClass).invoke(parser, model);
+	}
+
+	public String formatWithJena(Object model, Object rdfFormat)
+		throws NoSuchMethodException, NoSuchFieldException, InvocationTargetException, IllegalAccessException {
+		StringWriter sw = new StringWriter();
+		JenaRdfDataMgrClass
+			.getMethod("write", StringWriter.class, JenaModelClass, JenaRDFFormatClass)
+			.invoke(JenaRdfDataMgrClass, sw, model, rdfFormat);
+		return sw.toString();
+	}
+
+	public String formatWithTurtleFormatter(Object model)
+		throws NoSuchMethodException, InvocationTargetException, IllegalAccessException, InstantiationException {
+		Object style = turtleFormatterStyle();
+		Object formatter = turtleFormatter(style);
+		return (String) TurtleFormatFormatterClass.getMethod("apply", JenaModelClass).invoke(formatter, model);
+	}
+
+	private Object turtleFormatterStyle() throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+		Object builder = TurtleFormatFormattingStyleClass.getMethod("builder").invoke(TurtleFormatFormatterClass);
+		for (String optionName : state.getTurtleFormatterStyle().keySet()) {
+			Method method = getBuilderMethod(optionName);
+			callBuilderMethod(builder, method, state.getTurtleFormatterStyle().get(optionName));
+		}
+		Object style = TurtleFormatFormattingStyleBuilderClass.getMethod("build").invoke(builder);
+		return style;
+	}
+
+	public String formatWithTurtleFormatter(String ttlContent)
+		throws NoSuchMethodException, InvocationTargetException, IllegalAccessException, InstantiationException {
+		Object style = turtleFormatterStyle();
+		Object formatter = turtleFormatter(style);
+		return (String) TurtleFormatFormatterClass.getMethod("applyToContent", String.class).invoke(formatter, ttlContent);
+	}
+
+	private Object turtleFormatter(Object style)
+		throws InstantiationException, IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+		Object formatter = TurtleFormatFormatterClass.getConstructor(TurtleFormatFormattingStyleClass)
+			.newInstance(style);
+		return formatter;
+	}
+
+	private void callBuilderMethod(Object builder, Method method, String parameterValueAsString)
+		throws InvocationTargetException, IllegalAccessException, NoSuchMethodException {
+		Class<?> param = method.getParameterTypes()[0];
+		if (param.isEnum()) {
+			List<?> selectedEnumValueList = Arrays.stream(param.getEnumConstants()).filter(e -> {
+				try {
+					return e.getClass().getMethod("name").invoke(e).equals(parameterValueAsString);
+				} catch (IllegalAccessException ex) {
+					throw new RuntimeException(ex);
+				} catch (InvocationTargetException ex) {
+					throw new RuntimeException(ex);
+				} catch (NoSuchMethodException ex) {
+					throw new RuntimeException(ex);
+				}
+			}).collect(
+				Collectors.toList());
+			if (selectedEnumValueList.isEmpty()) {
+				throw new IllegalArgumentException(
+					String.format("Cannot set config option %s to value %s: value must be one of %s",
+						method.getName(),
+						parameterValueAsString,
+						Arrays.stream(param.getEnumConstants()).map(e -> {
+							try {
+								return (String) e.getClass().getMethod("name").invoke(e);
+							} catch (IllegalAccessException ex) {
+								throw new RuntimeException(ex);
+							} catch (InvocationTargetException ex) {
+								throw new RuntimeException(ex);
+							} catch (NoSuchMethodException ex) {
+								throw new RuntimeException(ex);
+							}
+						}).collect(
+							Collectors.joining(",", "[", "]"))
+					));
+			} else if (selectedEnumValueList.size() > 1) {
+				throw new IllegalArgumentException(
+					String.format("Found more than 1 enum value for name %s, that should never happen",
+						parameterValueAsString));
+			}
+			method.invoke(builder, selectedEnumValueList.get(0));
+		} else if (param.equals(NumberFormat.class)){
+			method.invoke(builder, new DecimalFormat(parameterValueAsString , DecimalFormatSymbols.getInstance(Locale.US)));
+		} else if (param.equals(Boolean.class) || param.equals(Boolean.TYPE)) {
+			method.invoke(builder, Boolean.parseBoolean(parameterValueAsString));
+		}  else if (param.equals(String.class)) {
+			method.invoke(builder, parameterValueAsString);
+		}  else if (param.equals(Integer.class)) {
+			method.invoke(builder, Integer.parseInt(parameterValueAsString));
+		}  else if (param.equals(Double.class)) {
+			method.invoke(builder, Double.parseDouble(parameterValueAsString));
+		}  else if (param.equals(Long.class)) {
+			method.invoke(builder, Long.parseLong(parameterValueAsString));
+		}  else if (param.equals(Float.class)) {
+			method.invoke(builder, Float.parseFloat(parameterValueAsString));
+		}  else {
+			throw new IllegalArgumentException(String.format(
+				"Cannot handle turtle-formatter config option %s: parameters of type %s are not implemented in the spotless plugin yet",
+				method.getName(), param.getName()));
+		}
+	}
+
+	private Method getBuilderMethod(String optionName) {
+		Method[] allMethods = TurtleFormatFormattingStyleBuilderClass.getDeclaredMethods();
+		List<Method> methods = Arrays.stream(allMethods).filter(m -> m.getName().equals(optionName))
+			.collect(
+				Collectors.toList());
+		if (methods.isEmpty()) {
+			List<Method> candidates = Arrays.stream(allMethods).filter(m -> m.getParameterCount() == 1)
+				.sorted(Comparator.comparing(Method::getName)).collect(
+				Collectors.toList());
+			throw new RuntimeException(
+				String.format("Unrecognized configuration parameter name: %s. Candidates are:\n%s", optionName, candidates.stream().map(Method::getName).collect(
+					Collectors.joining("\n\t","\t",""))));
+		}
+		if (methods.size() > 1) {
+			throw new RuntimeException(
+				String.format("More than one builder method found for configuration parameter name: %s",
+					optionName));
+		}
+		Method method = methods.get(0);
+		if (method.getParameterCount() != 1) {
+			throw new RuntimeException(
+				String.format("Method with unexpected parameter count %s found for configuration parameter name: %s",
+					method.getParameterCount(),
+					optionName));
+		}
+		return method;
+	}
+
+	public Object getRDFFormat(String rdfFormat) throws NoSuchFieldException, IllegalAccessException {
+		return JenaRDFFormatClass.getDeclaredField(rdfFormat).get(JenaRDFFormatClass);
+	}
+
+	public Object sortedModel(Object model) {
+		return Proxy.newProxyInstance(classLoader, new Class[] { JenaModelClass },
+			new SortedModelInvocationHandler(this, model));
+	}
+
+	public Object parseToModel(String rawUnix, File file, Object lang)
+		throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+		Object model = getModel();
+		Object errorHandler = getErrorHandler(file);
+		Object parser = getParser(lang, errorHandler, rawUnix);
+		parseModel(parser, model);
+		return model;
+	}
+
+	public boolean areModelsIsomorphic(Object leftModel, Object rightModel)
+		throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+		Method isIsomorphicWith = JenaModelClass.getMethod("isIsomorphicWith", JenaModelClass);
+		return (boolean) isIsomorphicWith.invoke(leftModel, rightModel);
+	}
+
+	public long modelSize(Object model) throws InvocationTargetException, IllegalAccessException, NoSuchMethodException {
+		Method size = JenaModelClass.getMethod("size");
+		return (long) size.invoke(model);
+	}
+
+	private class SortedModelInvocationHandler implements InvocationHandler {
+		private ReflectionHelper reflectionHelper;
+		private Object jenaModel;
+
+		public SortedModelInvocationHandler(ReflectionHelper reflectionHelper, Object jenaModel) {
+			this.reflectionHelper = reflectionHelper;
+			this.jenaModel = jenaModel;
+		}
+
+		@Override public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+			if (method.getName().equals("listSubjects") && method.getParameterCount() == 0) {
+				Object resIterator = method.invoke(jenaModel);
+				List resources = new ArrayList<>();
+				while (hasNext(resIterator)) {
+					resources.add(next(resIterator));
+				}
+				resources.sort(Comparator.comparing(x -> {
+					try {
+						return (String) x.getClass().getMethod("getURI").invoke(x);
+					} catch (IllegalAccessException e) {
+						throw new RuntimeException(e);
+					} catch (InvocationTargetException e) {
+						throw new RuntimeException(e);
+					} catch (NoSuchMethodException e) {
+						throw new RuntimeException(e);
+					}
+				}).thenComparing(x -> {
+					Object anonId = null;
+					try {
+						anonId = x.getClass().getMethod("getAnonId").invoke(x);
+					} catch (IllegalAccessException e) {
+						throw new RuntimeException(e);
+					} catch (InvocationTargetException e) {
+						throw new RuntimeException(e);
+					} catch (NoSuchMethodException e) {
+						throw new RuntimeException(e);
+					}
+					if (anonId != null) {
+						return anonId.toString();
+					}
+					return null;
+				}));
+				return reflectionHelper.classLoader.loadClass("org.apache.jena.rdf.model.impl.ResIteratorImpl")
+					.getConstructor(
+						Iterator.class, Object.class).newInstance(resources.iterator(), null);
+			}
+			return method.invoke(jenaModel);
+		}
+
+		boolean hasNext(Object it) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+			return (boolean) it.getClass().getMethod("hasNext").invoke(it);
+		}
+
+		Object next(Object it) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+			return it.getClass().getMethod("next").invoke(it);
+		}
+
+
+	}
+}
+
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
index 9f4d0e01bc..4f258fa2ab 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
@@ -38,6 +38,8 @@
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
+import com.diffplug.spotless.maven.rdf.Rdf;
+
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.annotations.Component;
@@ -192,6 +194,9 @@ public abstract class AbstractSpotlessMojo extends AbstractMojo {
 	@Parameter
 	private Go go;
 
+	@Parameter
+	private Rdf rdf;
+
 	@Parameter(property = "spotlessFiles")
 	private String filePatterns;
 
@@ -377,7 +382,7 @@ private FileLocator getFileLocator() {
 	}
 
 	private List<FormatterFactory> getFormatterFactories() {
-		return Stream.concat(formats.stream(), Stream.of(groovy, java, scala, kotlin, cpp, typescript, javascript, antlr4, pom, sql, python, markdown, json, shell, yaml, gherkin, go))
+		return Stream.concat(formats.stream(), Stream.of(groovy, java, scala, kotlin, cpp, typescript, javascript, antlr4, pom, sql, python, markdown, json, shell, yaml, gherkin, go, rdf))
 				.filter(Objects::nonNull)
 				.collect(toList());
 	}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
index 07cc2cbc85..34ccebd72e 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
@@ -62,7 +62,7 @@ protected void process(Iterable<File> files, Formatter formatter, UpToDateChecke
 			try {
 				PaddedCell.DirtyState dirtyState = PaddedCell.calculateDirtyState(formatter, file);
 				if (!dirtyState.isClean() && !dirtyState.didNotConverge()) {
-					getLog().info(String.format("Writing clean file: %s", file));
+					getLog().info(String.format("clean file: %s", file));
 					dirtyState.writeCanonicalTo(file);
 					buildContext.refresh(file);
 					counter.cleaned();
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/rdf/Rdf.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/rdf/Rdf.java
new file mode 100644
index 0000000000..d92e09aa58
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/rdf/Rdf.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.rdf;
+
+import java.util.Collections;
+import java.util.Set;
+
+import org.apache.maven.project.MavenProject;
+
+import com.diffplug.spotless.maven.FormatterFactory;
+
+public class Rdf extends FormatterFactory {
+	@Override
+	public Set<String> defaultIncludes(MavenProject project) {
+		return Collections.emptySet();
+	}
+
+	@Override
+	public String licenseHeaderDelimiter() {
+		return null;
+	}
+
+	public void addFormat(RdfFormat rdfFormat) {
+		addStepFactory(rdfFormat);
+	}
+}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/rdf/RdfFormat.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/rdf/RdfFormat.java
new file mode 100644
index 0000000000..0ab121590e
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/rdf/RdfFormat.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.rdf;
+
+import java.util.Map;
+
+import org.apache.maven.plugins.annotations.Parameter;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.maven.FormatterStepConfig;
+import com.diffplug.spotless.maven.FormatterStepFactory;
+import com.diffplug.spotless.rdf.RdfFormatterConfig;
+import com.diffplug.spotless.rdf.RdfFormatterStep;
+
+public class RdfFormat implements FormatterStepFactory {
+   @Parameter
+   String turtleFormatterVersion = RdfFormatterStep.LATEST_TURTLE_FORMATTER_VERSION;
+
+   @Parameter
+   boolean failOnWarning = true;
+
+   @Parameter
+   boolean verify = true;
+
+   @Parameter
+   Map<String, String> turtle;
+
+	@Override
+	public FormatterStep newFormatterStep(FormatterStepConfig config) {
+		RdfFormatterConfig formatterConfig = RdfFormatterConfig
+			.builder()
+				.failOnWarning(failOnWarning)
+			.verify(verify)
+				.build();
+		try {
+			return RdfFormatterStep.create(formatterConfig,
+				turtle, config.getProvisioner());
+		} catch (Exception e) {
+			throw new RuntimeException("Error creating RDF formatter step", e);
+		}
+	}
+}
diff --git a/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java b/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java
index 0304889e1f..dd28cd9224 100644
--- a/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java
+++ b/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java
@@ -17,8 +17,11 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.net.URL;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
@@ -68,6 +71,43 @@ protected File newFolder(String subpath) throws IOException {
 		return targetDir;
 	}
 
+	/**
+	 * List the resources found in the specified path (directory) on the classpath
+	 * @param path - absolute path using unix-style file separators (if it is relative, it will be made absolute before class path scanning)
+	 * @return the list of resources in that directory on the classpath, unix-style file separators
+	 * @throws IOException
+	 */
+	protected List<String> listTestResources(String path) throws IOException {
+		// add leading slash if required, otherwise resources won't be found
+		if (!path.startsWith("/")){
+			path = path + "/";
+		}
+		List<String> filenames = new ArrayList<>();
+
+			try(InputStream in = ResourceHarness.class.getResourceAsStream(path)){
+				if (in == null) {
+					if (new File(path).isAbsolute()) {
+						throw new RuntimeException(String.format("Resource not found in classpath: '%s'", path));
+					} else {
+						throw new RuntimeException(String.format("Resource not found in classpath: '%s' - did you mean '/%1$s'?",path));
+					}
+				}
+				try(BufferedReader br = new BufferedReader(new InputStreamReader(in))) {
+					String resource;
+					while ((resource = br.readLine()) != null) {
+						filenames.add(resource);
+					}
+				}
+			}
+		return filenames;
+	}
+
+
+
+	protected String relativeToRoot(String path) {
+		return new File(path).toPath().relativize(rootFolder().toPath()).toString();
+	}
+
 	protected String read(String path) throws IOException {
 		return read(newFile(path).toPath(), StandardCharsets.UTF_8);
 	}
diff --git a/testlib/src/main/resources/rdf/ttl/expected/v1.2.12-default/shacl-shacl.ttl b/testlib/src/main/resources/rdf/ttl/expected/v1.2.12-default/shacl-shacl.ttl
new file mode 100644
index 0000000000..5dff7d1980
--- /dev/null
+++ b/testlib/src/main/resources/rdf/ttl/expected/v1.2.12-default/shacl-shacl.ttl
@@ -0,0 +1,432 @@
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix sh: <http://www.w3.org/ns/shacl#> .
+@prefix shsh: <http://www.w3.org/ns/shacl-shacl#> .
+
+shsh: rdfs:label "SHACL for SHACL"@en ;
+  rdfs:comment "This shapes graph can be used to validate SHACL shapes graphs against a subset of the syntax rules."@en ;
+  sh:declare [
+    sh:namespace "http://www.w3.org/ns/shacl-shacl#" ;
+    sh:prefix "shsh" ;
+  ] .
+
+shsh:EntailmentShape a sh:NodeShape ;
+  sh:nodeKind sh:IRI ;
+  sh:targetObjectsOf sh:entailment .
+
+shsh:ListNodeShape a sh:NodeShape ;
+  rdfs:label "List node shape"@en ;
+  rdfs:comment "Defines constraints on what it means for a node to be a node within a well-formed RDF list. Note that this does not check whether the rdf:rest items are also well-formed lists as this would lead to unsupported recursion."@en ;
+  sh:or ( [
+    sh:hasValue ( ) ;
+    sh:property [
+      sh:maxCount 0 ;
+      sh:path rdf:first ;
+    ] ;
+    sh:property [
+      sh:maxCount 0 ;
+      sh:path rdf:rest ;
+    ] ;
+  ] [
+    sh:not [
+      sh:hasValue ( ) ;
+    ] ;
+    sh:property [
+      sh:maxCount 1 ;
+      sh:minCount 1 ;
+      sh:path rdf:first ;
+    ] ;
+    sh:property [
+      sh:maxCount 1 ;
+      sh:minCount 1 ;
+      sh:path rdf:rest ;
+    ] ;
+  ] ) .
+
+shsh:ListShape a sh:NodeShape ;
+  rdfs:label "List shape"@en ;
+  rdfs:comment "A shape describing well-formed RDF lists. Currently does not check for non-recursion. This could be expressed using SHACL-SPARQL."@en ;
+  rdfs:seeAlso <https://www.w3.org/TR/shacl/#syntax-rule-SHACL-list> ;
+  sh:property [
+    rdfs:comment "Each list member (including this node) must be have the shape shsh:ListNodeShape."@en ;
+    sh:hasValue ( ) ;
+    sh:node shsh:ListNodeShape ;
+    sh:path [
+      sh:zeroOrMorePath rdf:rest ;
+    ] ;
+  ] .
+
+shsh:NodeShapeShape a sh:NodeShape ;
+  sh:property [
+    sh:maxCount 0 ;
+    sh:path sh:path ;
+  ] ;
+  sh:property [
+    sh:maxCount 0 ;
+    sh:path sh:lessThan ;
+  ] ;
+  sh:property [
+    sh:maxCount 0 ;
+    sh:path sh:lessThanOrEquals ;
+  ] ;
+  sh:property [
+    sh:maxCount 0 ;
+    sh:path sh:maxCount ;
+  ] ;
+  sh:property [
+    sh:maxCount 0 ;
+    sh:path sh:minCount ;
+  ] ;
+  sh:property [
+    sh:maxCount 0 ;
+    sh:path sh:qualifiedValueShape ;
+  ] ;
+  sh:property [
+    sh:maxCount 0 ;
+    sh:path sh:uniqueLang ;
+  ] ;
+  sh:targetObjectsOf sh:node .
+
+shsh:PathListWithAtLeast2Members a sh:NodeShape ;
+  sh:node shsh:ListShape ;
+  sh:property [
+    sh:minCount 2 ;
+    sh:path [
+      sh:oneOrMorePath rdf:rest ;
+    ] ;
+  ] .
+
+shsh:PathNodeShape sh:xone ( [
+    sh:nodeKind sh:IRI ;
+  ] [
+    sh:node shsh:PathListWithAtLeast2Members ;
+    sh:nodeKind sh:BlankNode ;
+  ] [
+    sh:closed true ;
+    sh:nodeKind sh:BlankNode ;
+    sh:property [
+      sh:maxCount 1 ;
+      sh:minCount 1 ;
+      sh:node shsh:PathListWithAtLeast2Members ;
+      sh:path sh:alternativePath ;
+    ] ;
+  ] [
+    sh:closed true ;
+    sh:nodeKind sh:BlankNode ;
+    sh:property [
+      sh:maxCount 1 ;
+      sh:minCount 1 ;
+      sh:path sh:inversePath ;
+    ] ;
+  ] [
+    sh:closed true ;
+    sh:nodeKind sh:BlankNode ;
+    sh:property [
+      sh:maxCount 1 ;
+      sh:minCount 1 ;
+      sh:path sh:zeroOrMorePath ;
+    ] ;
+  ] [
+    sh:closed true ;
+    sh:nodeKind sh:BlankNode ;
+    sh:property [
+      sh:maxCount 1 ;
+      sh:minCount 1 ;
+      sh:path sh:oneOrMorePath ;
+    ] ;
+  ] [
+    sh:closed true ;
+    sh:nodeKind sh:BlankNode ;
+    sh:property [
+      sh:maxCount 1 ;
+      sh:minCount 1 ;
+      sh:path sh:zeroOrOnePath ;
+    ] ;
+  ] ) .
+
+shsh:PathShape a sh:NodeShape ;
+  rdfs:label "Path shape"@en ;
+  rdfs:comment "A shape that can be used to validate the syntax rules of well-formed SHACL paths."@en ;
+  rdfs:seeAlso <https://www.w3.org/TR/shacl/#property-paths> ;
+  sh:property [
+    sh:node shsh:PathNodeShape ;
+    sh:path [
+      sh:zeroOrMorePath [
+        sh:alternativePath ( ( [
+          sh:zeroOrMorePath rdf:rest ;
+        ] rdf:first ) ( sh:alternativePath [
+          sh:zeroOrMorePath rdf:rest ;
+        ] rdf:first ) sh:inversePath sh:zeroOrMorePath sh:oneOrMorePath sh:zeroOrOnePath ) ;
+      ] ;
+    ] ;
+  ] .
+
+shsh:PropertyShapeShape a sh:NodeShape ;
+  sh:property [
+    sh:maxCount 1 ;
+    sh:minCount 1 ;
+    sh:node shsh:PathShape ;
+    sh:path sh:path ;
+  ] ;
+  sh:targetObjectsOf sh:property .
+
+shsh:ShapeShape a sh:NodeShape ;
+  rdfs:label "Shape shape"@en ;
+  rdfs:comment "A shape that can be used to validate syntax rules for other shapes."@en ;
+  sh:or ( [
+    sh:not [
+      sh:class rdfs:Class ;
+      sh:or ( [
+        sh:class sh:NodeShape ;
+      ] [
+        sh:class sh:PropertyShape ;
+      ] ) ;
+    ] ;
+  ] [
+    sh:nodeKind sh:IRI ;
+  ] ) ;
+  sh:property [
+    sh:nodeKind sh:IRIOrLiteral ;
+    sh:path sh:targetNode ;
+  ] ;
+  sh:property [
+    sh:nodeKind sh:IRI ;
+    sh:path sh:targetClass ;
+  ] ;
+  sh:property [
+    sh:nodeKind sh:IRI ;
+    sh:path sh:targetSubjectsOf ;
+  ] ;
+  sh:property [
+    sh:nodeKind sh:IRI ;
+    sh:path sh:targetObjectsOf ;
+  ] ;
+  sh:property [
+    sh:maxCount 1 ;
+    sh:nodeKind sh:IRI ;
+    sh:path sh:severity ;
+  ] ;
+  sh:property [
+    sh:or ( [
+      sh:datatype xsd:string ;
+    ] [
+      sh:datatype rdf:langString ;
+    ] ) ;
+    sh:path sh:message ;
+  ] ;
+  sh:property [
+    sh:in ( true false ) ;
+    sh:maxCount 1 ;
+    sh:path sh:deactivated ;
+  ] ;
+  sh:property [
+    sh:node shsh:ListShape ;
+    sh:path sh:and ;
+  ] ;
+  sh:property [
+    sh:nodeKind sh:IRI ;
+    sh:path sh:class ;
+  ] ;
+  sh:property [
+    sh:datatype xsd:boolean ;
+    sh:maxCount 1 ;
+    sh:path sh:closed ;
+  ] ;
+  sh:property [
+    sh:maxCount 1 ;
+    sh:node shsh:ListShape ;
+    sh:path sh:ignoredProperties ;
+  ] ;
+  sh:property [
+    sh:nodeKind sh:IRI ;
+    sh:path ( sh:ignoredProperties [
+      sh:zeroOrMorePath rdf:rest ;
+    ] rdf:first ) ;
+  ] ;
+  sh:property [
+    sh:maxCount 1 ;
+    sh:nodeKind sh:IRI ;
+    sh:path sh:datatype ;
+  ] ;
+  sh:property [
+    sh:nodeKind sh:IRI ;
+    sh:path sh:disjoint ;
+  ] ;
+  sh:property [
+    sh:nodeKind sh:IRI ;
+    sh:path sh:equals ;
+  ] ;
+  sh:property [
+    sh:maxCount 1 ;
+    sh:node shsh:ListShape ;
+    sh:path sh:in ;
+  ] ;
+  sh:property [
+    sh:maxCount 1 ;
+    sh:node shsh:ListShape ;
+    sh:path sh:languageIn ;
+  ] ;
+  sh:property [
+    sh:datatype xsd:string ;
+    sh:path ( sh:languageIn [
+      sh:zeroOrMorePath rdf:rest ;
+    ] rdf:first ) ;
+  ] ;
+  sh:property [
+    sh:nodeKind sh:IRI ;
+    sh:path sh:lessThan ;
+  ] ;
+  sh:property [
+    sh:nodeKind sh:IRI ;
+    sh:path sh:lessThanOrEquals ;
+  ] ;
+  sh:property [
+    sh:datatype xsd:integer ;
+    sh:maxCount 1 ;
+    sh:path sh:maxCount ;
+  ] ;
+  sh:property [
+    sh:maxCount 1 ;
+    sh:nodeKind sh:Literal ;
+    sh:path sh:maxExclusive ;
+  ] ;
+  sh:property [
+    sh:maxCount 1 ;
+    sh:nodeKind sh:Literal ;
+    sh:path sh:maxInclusive ;
+  ] ;
+  sh:property [
+    sh:datatype xsd:integer ;
+    sh:maxCount 1 ;
+    sh:path sh:maxLength ;
+  ] ;
+  sh:property [
+    sh:datatype xsd:integer ;
+    sh:maxCount 1 ;
+    sh:path sh:minCount ;
+  ] ;
+  sh:property [
+    sh:maxCount 1 ;
+    sh:nodeKind sh:Literal ;
+    sh:path sh:minExclusive ;
+  ] ;
+  sh:property [
+    sh:maxCount 1 ;
+    sh:nodeKind sh:Literal ;
+    sh:path sh:minInclusive ;
+  ] ;
+  sh:property [
+    sh:datatype xsd:integer ;
+    sh:maxCount 1 ;
+    sh:path sh:minLength ;
+  ] ;
+  sh:property [
+    sh:in ( sh:BlankNode sh:IRI sh:Literal sh:BlankNodeOrIRI sh:BlankNodeOrLiteral sh:IRIOrLiteral ) ;
+    sh:maxCount 1 ;
+    sh:path sh:nodeKind ;
+  ] ;
+  sh:property [
+    sh:node shsh:ListShape ;
+    sh:path sh:or ;
+  ] ;
+  sh:property [
+    sh:datatype xsd:string ;
+    sh:maxCount 1 ;
+    sh:path sh:pattern ;
+  ] ;
+  sh:property [
+    sh:datatype xsd:string ;
+    sh:maxCount 1 ;
+    sh:path sh:flags ;
+  ] ;
+  sh:property [
+    sh:datatype xsd:integer ;
+    sh:maxCount 1 ;
+    sh:path sh:qualifiedMaxCount ;
+  ] ;
+  sh:property [
+    sh:datatype xsd:integer ;
+    sh:maxCount 1 ;
+    sh:path sh:qualifiedMinCount ;
+  ] ;
+  sh:property [
+    sh:maxCount 1 ;
+    sh:path sh:qualifiedValueShape ;
+  ] ;
+  sh:property [
+    sh:datatype xsd:boolean ;
+    sh:maxCount 1 ;
+    sh:path sh:qualifiedValueShapesDisjoint ;
+  ] ;
+  sh:property [
+    sh:datatype xsd:boolean ;
+    sh:maxCount 1 ;
+    sh:path sh:uniqueLang ;
+  ] ;
+  sh:property [
+    sh:node shsh:ListShape ;
+    sh:path sh:xone ;
+  ] ;
+  sh:targetClass sh:NodeShape ;
+  sh:targetClass sh:PropertyShape ;
+  sh:targetObjectsOf sh:node ;
+  sh:targetObjectsOf sh:not ;
+  sh:targetObjectsOf sh:property ;
+  sh:targetObjectsOf sh:qualifiedValueShape ;
+  sh:targetSubjectsOf sh:and ;
+  sh:targetSubjectsOf sh:class ;
+  sh:targetSubjectsOf sh:closed ;
+  sh:targetSubjectsOf sh:datatype ;
+  sh:targetSubjectsOf sh:disjoint ;
+  sh:targetSubjectsOf sh:equals ;
+  sh:targetSubjectsOf sh:flags ;
+  sh:targetSubjectsOf sh:hasValue ;
+  sh:targetSubjectsOf sh:ignoredProperties ;
+  sh:targetSubjectsOf sh:in ;
+  sh:targetSubjectsOf sh:languageIn ;
+  sh:targetSubjectsOf sh:lessThan ;
+  sh:targetSubjectsOf sh:lessThanOrEquals ;
+  sh:targetSubjectsOf sh:maxCount ;
+  sh:targetSubjectsOf sh:maxExclusive ;
+  sh:targetSubjectsOf sh:maxInclusive ;
+  sh:targetSubjectsOf sh:maxLength ;
+  sh:targetSubjectsOf sh:minCount ;
+  sh:targetSubjectsOf sh:minExclusive ;
+  sh:targetSubjectsOf sh:minInclusive ;
+  sh:targetSubjectsOf sh:minLength ;
+  sh:targetSubjectsOf sh:node ;
+  sh:targetSubjectsOf sh:nodeKind ;
+  sh:targetSubjectsOf sh:not ;
+  sh:targetSubjectsOf sh:or ;
+  sh:targetSubjectsOf sh:pattern ;
+  sh:targetSubjectsOf sh:property ;
+  sh:targetSubjectsOf sh:qualifiedMaxCount ;
+  sh:targetSubjectsOf sh:qualifiedMinCount ;
+  sh:targetSubjectsOf sh:qualifiedValueShape ;
+  sh:targetSubjectsOf sh:qualifiedValueShapesDisjoint ;
+  sh:targetSubjectsOf sh:sparql ;
+  sh:targetSubjectsOf sh:targetClass ;
+  sh:targetSubjectsOf sh:targetNode ;
+  sh:targetSubjectsOf sh:targetObjectsOf ;
+  sh:targetSubjectsOf sh:targetSubjectsOf ;
+  sh:targetSubjectsOf sh:uniqueLang ;
+  sh:targetSubjectsOf sh:xone ;
+  sh:xone ( shsh:NodeShapeShape shsh:PropertyShapeShape ) .
+
+shsh:ShapesGraphShape a sh:NodeShape ;
+  sh:nodeKind sh:IRI ;
+  sh:targetObjectsOf sh:shapesGraph .
+
+shsh:ShapesListShape a sh:NodeShape ;
+  sh:property [
+    sh:node shsh:ShapeShape ;
+    sh:path ( [
+      sh:zeroOrMorePath rdf:rest ;
+    ] rdf:first ) ;
+  ] ;
+  sh:targetObjectsOf sh:and ;
+  sh:targetObjectsOf sh:or ;
+  sh:targetObjectsOf sh:xone .
+
+
diff --git a/testlib/src/main/resources/rdf/ttl/expected/v1.2.12-default/shacl.ttl b/testlib/src/main/resources/rdf/ttl/expected/v1.2.12-default/shacl.ttl
new file mode 100644
index 0000000000..0b6359813d
--- /dev/null
+++ b/testlib/src/main/resources/rdf/ttl/expected/v1.2.12-default/shacl.ttl
@@ -0,0 +1,1346 @@
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix owl: <http://www.w3.org/2002/07/owl#> .
+@prefix sh: <http://www.w3.org/ns/shacl#> .
+
+sh: a owl:Ontology ;
+  rdfs:label "W3C Shapes Constraint Language (SHACL) Vocabulary"@en ;
+  rdfs:comment "This vocabulary defines terms used in SHACL, the W3C Shapes Constraint Language."@en ;
+  sh:declare [
+    sh:namespace "http://www.w3.org/ns/shacl#" ;
+    sh:prefix "sh" ;
+  ] ;
+  sh:suggestedShapesGraph <http://www.w3.org/ns/shacl-shacl#> .
+
+sh:AbstractResult a rdfs:Class ;
+  rdfs:label "Abstract result"@en ;
+  rdfs:comment "The base class of validation results, typically not instantiated directly."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:subClassOf rdfs:Resource .
+
+sh:ConstraintComponent a rdfs:Class ;
+  rdfs:label "Constraint component"@en ;
+  rdfs:comment "The class of constraint components."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:subClassOf sh:Parameterizable .
+
+sh:Function a rdfs:Class ;
+  rdfs:label "Function"@en ;
+  rdfs:comment "The class of SHACL functions."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:subClassOf sh:Parameterizable .
+
+sh:JSConstraint a rdfs:Class ;
+  rdfs:label "JavaScript-based constraint"@en ;
+  rdfs:comment "The class of constraints backed by a JavaScript function."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:subClassOf sh:JSExecutable .
+
+sh:JSExecutable a rdfs:Class ;
+  rdfs:label "JavaScript executable"@en ;
+  rdfs:comment "Abstract base class of resources that declare an executable JavaScript."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:subClassOf rdfs:Resource .
+
+sh:JSFunction a rdfs:Class ;
+  rdfs:label "JavaScript function"@en ;
+  rdfs:comment "The class of SHACL functions that execute a JavaScript function when called."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:subClassOf sh:Function ;
+  rdfs:subClassOf sh:JSExecutable .
+
+sh:JSLibrary a rdfs:Class ;
+  rdfs:label "JavaScript library"@en ;
+  rdfs:comment "Represents a JavaScript library, typically identified by one or more URLs of files to include."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:subClassOf rdfs:Resource .
+
+sh:JSRule a rdfs:Class ;
+  rdfs:label "JavaScript rule"@en ;
+  rdfs:comment "The class of SHACL rules expressed using JavaScript."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:subClassOf sh:JSExecutable ;
+  rdfs:subClassOf sh:Rule .
+
+sh:JSTarget a rdfs:Class ;
+  rdfs:label "JavaScript target"@en ;
+  rdfs:comment "The class of targets that are based on JavaScript functions."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:subClassOf sh:JSExecutable ;
+  rdfs:subClassOf sh:Target .
+
+sh:JSTargetType a rdfs:Class ;
+  rdfs:label "JavaScript target type"@en ;
+  rdfs:comment "The (meta) class for parameterizable targets that are based on JavaScript functions."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:subClassOf sh:JSExecutable ;
+  rdfs:subClassOf sh:TargetType .
+
+sh:JSValidator a rdfs:Class ;
+  rdfs:label "JavaScript validator"@en ;
+  rdfs:comment "A SHACL validator based on JavaScript. This can be used to declare SHACL constraint components that perform JavaScript-based validation when used."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:subClassOf sh:JSExecutable ;
+  rdfs:subClassOf sh:Validator .
+
+sh:NodeKind a rdfs:Class ;
+  rdfs:label "Node kind"@en ;
+  rdfs:comment "The class of all node kinds, including sh:BlankNode, sh:IRI, sh:Literal or the combinations of these: sh:BlankNodeOrIRI, sh:BlankNodeOrLiteral, sh:IRIOrLiteral."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:subClassOf rdfs:Resource .
+
+sh:NodeShape a rdfs:Class ;
+  rdfs:label "Node shape"@en ;
+  rdfs:comment "A node shape is a shape that specifies constraint that need to be met with respect to focus nodes."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:subClassOf sh:Shape .
+
+sh:Parameter a rdfs:Class ;
+  rdfs:label "Parameter"@en ;
+  rdfs:comment "The class of parameter declarations, consisting of a path predicate and (possibly) information about allowed value type, cardinality and other characteristics."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:subClassOf sh:PropertyShape .
+
+sh:Parameterizable a rdfs:Class ;
+  rdfs:label "Parameterizable"@en ;
+  rdfs:comment "Superclass of components that can take parameters, especially functions and constraint components."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:subClassOf rdfs:Resource .
+
+sh:PrefixDeclaration a rdfs:Class ;
+  rdfs:label "Prefix declaration"@en ;
+  rdfs:comment "The class of prefix declarations, consisting of pairs of a prefix with a namespace."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:subClassOf rdfs:Resource .
+
+sh:PropertyGroup a rdfs:Class ;
+  rdfs:label "Property group"@en ;
+  rdfs:comment "Instances of this class represent groups of property shapes that belong together."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:subClassOf rdfs:Resource .
+
+sh:PropertyShape a rdfs:Class ;
+  rdfs:label "Property shape"@en ;
+  rdfs:comment "A property shape is a shape that specifies constraints on the values of a focus node for a given property or path."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:subClassOf sh:Shape .
+
+sh:ResultAnnotation a rdfs:Class ;
+  rdfs:label "Result annotation"@en ;
+  rdfs:comment "A class of result annotations, which define the rules to derive the values of a given annotation property as extra values for a validation result."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:subClassOf rdfs:Resource .
+
+sh:Rule a rdfs:Class ;
+  rdfs:label "Rule"@en ;
+  rdfs:comment "The class of SHACL rules. Never instantiated directly."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:subClassOf rdfs:Resource .
+
+sh:SPARQLAskExecutable a rdfs:Class ;
+  rdfs:label "SPARQL ASK executable"@en ;
+  rdfs:comment "The class of SPARQL executables that are based on an ASK query."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:subClassOf sh:SPARQLExecutable .
+
+sh:SPARQLAskValidator a rdfs:Class ;
+  rdfs:label "SPARQL ASK validator"@en ;
+  rdfs:comment "The class of validators based on SPARQL ASK queries. The queries are evaluated for each value node and are supposed to return true if the given node conforms."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:subClassOf sh:SPARQLAskExecutable ;
+  rdfs:subClassOf sh:Validator .
+
+sh:SPARQLConstraint a rdfs:Class ;
+  rdfs:label "SPARQL constraint"@en ;
+  rdfs:comment "The class of constraints based on SPARQL SELECT queries."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:subClassOf sh:SPARQLSelectExecutable .
+
+sh:SPARQLConstructExecutable a rdfs:Class ;
+  rdfs:label "SPARQL CONSTRUCT executable"@en ;
+  rdfs:comment "The class of SPARQL executables that are based on a CONSTRUCT query."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:subClassOf sh:SPARQLExecutable .
+
+sh:SPARQLExecutable a rdfs:Class ;
+  rdfs:label "SPARQL executable"@en ;
+  rdfs:comment "The class of resources that encapsulate a SPARQL query."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:subClassOf rdfs:Resource .
+
+sh:SPARQLFunction a rdfs:Class ;
+  rdfs:label "SPARQL function"@en ;
+  rdfs:comment "A function backed by a SPARQL query - either ASK or SELECT."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:subClassOf sh:Function ;
+  rdfs:subClassOf sh:SPARQLAskExecutable ;
+  rdfs:subClassOf sh:SPARQLSelectExecutable .
+
+sh:SPARQLRule a rdfs:Class ;
+  rdfs:label "SPARQL CONSTRUCT rule"@en ;
+  rdfs:comment "The class of SHACL rules based on SPARQL CONSTRUCT queries."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:subClassOf sh:Rule ;
+  rdfs:subClassOf sh:SPARQLConstructExecutable .
+
+sh:SPARQLSelectExecutable a rdfs:Class ;
+  rdfs:label "SPARQL SELECT executable"@en ;
+  rdfs:comment "The class of SPARQL executables based on a SELECT query."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:subClassOf sh:SPARQLExecutable .
+
+sh:SPARQLSelectValidator a rdfs:Class ;
+  rdfs:label "SPARQL SELECT validator"@en ;
+  rdfs:comment "The class of validators based on SPARQL SELECT queries. The queries are evaluated for each focus node and are supposed to produce bindings for all focus nodes that do not conform."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:subClassOf sh:SPARQLSelectExecutable ;
+  rdfs:subClassOf sh:Validator .
+
+sh:SPARQLTarget a rdfs:Class ;
+  rdfs:label "SPARQL target"@en ;
+  rdfs:comment "The class of targets that are based on SPARQL queries."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:subClassOf sh:SPARQLAskExecutable ;
+  rdfs:subClassOf sh:SPARQLSelectExecutable ;
+  rdfs:subClassOf sh:Target .
+
+sh:SPARQLTargetType a rdfs:Class ;
+  rdfs:label "SPARQL target type"@en ;
+  rdfs:comment "The (meta) class for parameterizable targets that are based on SPARQL queries."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:subClassOf sh:SPARQLAskExecutable ;
+  rdfs:subClassOf sh:SPARQLSelectExecutable ;
+  rdfs:subClassOf sh:TargetType .
+
+sh:SPARQLUpdateExecutable a rdfs:Class ;
+  rdfs:label "SPARQL UPDATE executable"@en ;
+  rdfs:comment "The class of SPARQL executables based on a SPARQL UPDATE."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:subClassOf sh:SPARQLExecutable .
+
+sh:Severity a rdfs:Class ;
+  rdfs:label "Severity"@en ;
+  rdfs:comment "The class of validation result severity levels, including violation and warning levels."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:subClassOf rdfs:Resource .
+
+sh:Shape a rdfs:Class ;
+  rdfs:label "Shape"@en ;
+  rdfs:comment "A shape is a collection of constraints that may be targeted for certain nodes."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:subClassOf rdfs:Resource .
+
+sh:Target a rdfs:Class ;
+  rdfs:label "Target"@en ;
+  rdfs:comment "The base class of targets such as those based on SPARQL queries."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:subClassOf rdfs:Resource .
+
+sh:TargetType a rdfs:Class ;
+  rdfs:label "Target type"@en ;
+  rdfs:comment "The (meta) class for parameterizable targets.\tInstances of this are instantiated as values of the sh:target property."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:subClassOf rdfs:Class ;
+  rdfs:subClassOf sh:Parameterizable .
+
+sh:TripleRule a rdfs:Class ;
+  rdfs:label "A rule based on triple (subject, predicate, object) pattern."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:subClassOf sh:Rule .
+
+sh:ValidationReport a rdfs:Class ;
+  rdfs:label "Validation report"@en ;
+  rdfs:comment "The class of SHACL validation reports."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:subClassOf rdfs:Resource .
+
+sh:ValidationResult a rdfs:Class ;
+  rdfs:label "Validation result"@en ;
+  rdfs:comment "The class of validation results."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:subClassOf sh:AbstractResult .
+
+sh:Validator a rdfs:Class ;
+  rdfs:label "Validator"@en ;
+  rdfs:comment "The class of validators, which provide instructions on how to process a constraint definition. This class serves as base class for the SPARQL-based validators and other possible implementations."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:subClassOf rdfs:Resource .
+
+sh:alternativePath a rdf:Property ;
+  rdfs:label "alternative path"@en ;
+  rdfs:comment "The (single) value of this property must be a list of path elements, representing the elements of alternative paths."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range rdf:List .
+
+sh:and a rdf:Property ;
+  rdfs:label "and"@en ;
+  rdfs:comment "RDF list of shapes to validate the value nodes against."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range rdf:List .
+
+sh:annotationProperty a rdf:Property ;
+  rdfs:label "annotation property"@en ;
+  rdfs:comment "The annotation property that shall be set."@en ;
+  rdfs:domain sh:ResultAnnotation ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range rdf:Property .
+
+sh:annotationValue a rdf:Property ;
+  rdfs:label "annotation value"@en ;
+  rdfs:comment "The (default) values of the annotation property."@en ;
+  rdfs:domain sh:ResultAnnotation ;
+  rdfs:isDefinedBy sh: .
+
+sh:annotationVarName a rdf:Property ;
+  rdfs:label "annotation variable name"@en ;
+  rdfs:comment "The name of the SPARQL variable from the SELECT clause that shall be used for the values."@en ;
+  rdfs:domain sh:ResultAnnotation ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range xsd:string .
+
+sh:ask a rdf:Property ;
+  rdfs:label "ask"@en ;
+  rdfs:comment "The SPARQL ASK query to execute."@en ;
+  rdfs:domain sh:SPARQLAskExecutable ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range xsd:string .
+
+sh:class a rdf:Property ;
+  rdfs:label "class"@en ;
+  rdfs:comment "The type that all value nodes must have."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range rdfs:Class .
+
+sh:closed a rdf:Property ;
+  rdfs:label "closed"@en ;
+  rdfs:comment "If set to true then the shape is closed."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range xsd:boolean .
+
+sh:condition a rdf:Property ;
+  rdfs:label "condition"@en ;
+  rdfs:comment "The shapes that the focus nodes need to conform to before a rule is executed on them."@en ;
+  rdfs:domain sh:Rule ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range sh:Shape .
+
+sh:conforms a rdf:Property ;
+  rdfs:label "conforms"@en ;
+  rdfs:comment "True if the validation did not produce any validation results, and false otherwise."@en ;
+  rdfs:domain sh:ValidationReport ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range xsd:boolean .
+
+sh:construct a rdf:Property ;
+  rdfs:label "construct"@en ;
+  rdfs:comment "The SPARQL CONSTRUCT query to execute."@en ;
+  rdfs:domain sh:SPARQLConstructExecutable ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range xsd:string .
+
+sh:datatype a rdf:Property ;
+  rdfs:label "datatype"@en ;
+  rdfs:comment "Specifies an RDF datatype that all value nodes must have."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range rdfs:Datatype .
+
+sh:deactivated a rdf:Property ;
+  rdfs:label "deactivated"@en ;
+  rdfs:comment "If set to true then all nodes conform to this."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range xsd:boolean .
+
+sh:declare a rdf:Property ;
+  rdfs:label "declare"@en ;
+  rdfs:comment "Links a resource with its namespace prefix declarations."@en ;
+  rdfs:domain owl:Ontology ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range sh:PrefixDeclaration .
+
+sh:defaultValue a rdf:Property ;
+  rdfs:label "default value"@en ;
+  rdfs:comment "A default value for a property, for example for user interface tools to pre-populate input fields."@en ;
+  rdfs:domain sh:PropertyShape ;
+  rdfs:isDefinedBy sh: .
+
+sh:description a rdf:Property ;
+  rdfs:label "description"@en ;
+  rdfs:comment "Human-readable descriptions for the property in the context of the surrounding shape."@en ;
+  rdfs:domain sh:PropertyShape ;
+  rdfs:isDefinedBy sh: .
+
+sh:detail a rdf:Property ;
+  rdfs:label "detail"@en ;
+  rdfs:comment "Links a result with other results that provide more details, for example to describe violations against nested shapes."@en ;
+  rdfs:domain sh:AbstractResult ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range sh:AbstractResult .
+
+sh:disjoint a rdf:Property ;
+  rdfs:label "disjoint"@en ;
+  rdfs:comment "Specifies a property where the set of values must be disjoint with the value nodes."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range rdf:Property .
+
+sh:entailment a rdf:Property ;
+  rdfs:label "entailment"@en ;
+  rdfs:comment "An entailment regime that indicates what kind of inferencing is required by a shapes graph."@en ;
+  rdfs:domain owl:Ontology ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range rdfs:Resource .
+
+sh:equals a rdf:Property ;
+  rdfs:label "equals"@en ;
+  rdfs:comment "Specifies a property that must have the same values as the value nodes."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range rdf:Property .
+
+sh:expression a rdf:Property ;
+  rdfs:label "expression"@en ;
+  rdfs:comment "The node expression that must return true for the value nodes."@en ;
+  rdfs:isDefinedBy sh: .
+
+sh:filterShape a rdf:Property ;
+  rdfs:label "filter shape"@en ;
+  rdfs:comment "The shape that all input nodes of the expression need to conform to."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range sh:Shape .
+
+sh:flags a rdf:Property ;
+  rdfs:label "flags"@en ;
+  rdfs:comment "An optional flag to be used with regular expression pattern matching."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range xsd:string .
+
+sh:focusNode a rdf:Property ;
+  rdfs:label "focus node"@en ;
+  rdfs:comment "The focus node that was validated when the result was produced."@en ;
+  rdfs:domain sh:AbstractResult ;
+  rdfs:isDefinedBy sh: .
+
+sh:group a rdf:Property ;
+  rdfs:label "group"@en ;
+  rdfs:comment "Can be used to link to a property group to indicate that a property shape belongs to a group of related property shapes."@en ;
+  rdfs:domain sh:PropertyShape ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range sh:PropertyGroup .
+
+sh:hasValue a rdf:Property ;
+  rdfs:label "has value"@en ;
+  rdfs:comment "Specifies a value that must be among the value nodes."@en ;
+  rdfs:isDefinedBy sh: .
+
+sh:ignoredProperties a rdf:Property ;
+  rdfs:label "ignored properties"@en ;
+  rdfs:comment "An optional RDF list of properties that are also permitted in addition to those explicitly enumerated via sh:property/sh:path."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range rdf:List .
+
+sh:in a rdf:Property ;
+  rdfs:label "in"@en ;
+  rdfs:comment "Specifies a list of allowed values so that each value node must be among the members of the given list."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range rdf:List .
+
+sh:intersection a rdf:Property ;
+  rdfs:label "intersection"@en ;
+  rdfs:comment "A list of node expressions that shall be intersected."@en ;
+  rdfs:isDefinedBy sh: .
+
+sh:inversePath a rdf:Property ;
+  rdfs:label "inverse path"@en ;
+  rdfs:comment "The (single) value of this property represents an inverse path (object to subject)."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range rdfs:Resource .
+
+sh:js a rdf:Property ;
+  rdfs:label "JavaScript constraint"@en ;
+  rdfs:comment "Constraints expressed in JavaScript." ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range sh:JSConstraint .
+
+sh:jsFunctionName a rdf:Property ;
+  rdfs:label "JavaScript function name"@en ;
+  rdfs:comment "The name of the JavaScript function to execute."@en ;
+  rdfs:domain sh:JSExecutable ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range xsd:string .
+
+sh:jsLibrary a rdf:Property ;
+  rdfs:label "JavaScript library"@en ;
+  rdfs:comment "Declares which JavaScript libraries are needed to execute this."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range sh:JSLibrary .
+
+sh:jsLibraryURL a rdf:Property ;
+  rdfs:label "JavaScript library URL"@en ;
+  rdfs:comment "Declares the URLs of a JavaScript library. This should be the absolute URL of a JavaScript file. Implementations may redirect those to local files."@en ;
+  rdfs:domain sh:JSLibrary ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range xsd:anyURI .
+
+sh:labelTemplate a rdf:Property ;
+  rdfs:label "label template"@en ;
+  rdfs:comment "Outlines how human-readable labels of instances of the associated Parameterizable shall be produced. The values can contain {?paramName} as placeholders for the actual values of the given parameter."@en ;
+  rdfs:domain sh:Parameterizable ;
+  rdfs:isDefinedBy sh: .
+
+sh:languageIn a rdf:Property ;
+  rdfs:label "language in"@en ;
+  rdfs:comment "Specifies a list of language tags that all value nodes must have."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range rdf:List .
+
+sh:lessThan a rdf:Property ;
+  rdfs:label "less than"@en ;
+  rdfs:comment "Specifies a property that must have smaller values than the value nodes."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range rdf:Property .
+
+sh:lessThanOrEquals a rdf:Property ;
+  rdfs:label "less than or equals"@en ;
+  rdfs:comment "Specifies a property that must have smaller or equal values than the value nodes."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range rdf:Property .
+
+sh:maxCount a rdf:Property ;
+  rdfs:label "max count"@en ;
+  rdfs:comment "Specifies the maximum number of values in the set of value nodes."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range xsd:integer .
+
+sh:maxExclusive a rdf:Property ;
+  rdfs:label "max exclusive"@en ;
+  rdfs:comment "Specifies the maximum exclusive value of each value node."@en ;
+  rdfs:isDefinedBy sh: .
+
+sh:maxInclusive a rdf:Property ;
+  rdfs:label "max inclusive"@en ;
+  rdfs:comment "Specifies the maximum inclusive value of each value node."@en ;
+  rdfs:isDefinedBy sh: .
+
+sh:maxLength a rdf:Property ;
+  rdfs:label "max length"@en ;
+  rdfs:comment "Specifies the maximum string length of each value node."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range xsd:integer .
+
+sh:message a rdf:Property ;
+  rdfs:label "message"@en ;
+  rdfs:comment "A human-readable message (possibly with placeholders for variables) explaining the cause of the result."@en ;
+  rdfs:isDefinedBy sh: .
+
+sh:minCount a rdf:Property ;
+  rdfs:label "min count"@en ;
+  rdfs:comment "Specifies the minimum number of values in the set of value nodes."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range xsd:integer .
+
+sh:minExclusive a rdf:Property ;
+  rdfs:label "min exclusive"@en ;
+  rdfs:comment "Specifies the minimum exclusive value of each value node."@en ;
+  rdfs:isDefinedBy sh: .
+
+sh:minInclusive a rdf:Property ;
+  rdfs:label "min inclusive"@en ;
+  rdfs:comment "Specifies the minimum inclusive value of each value node."@en ;
+  rdfs:isDefinedBy sh: .
+
+sh:minLength a rdf:Property ;
+  rdfs:label "min length"@en ;
+  rdfs:comment "Specifies the minimum string length of each value node."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range xsd:integer .
+
+sh:name a rdf:Property ;
+  rdfs:label "name"@en ;
+  rdfs:comment "Human-readable labels for the property in the context of the surrounding shape."@en ;
+  rdfs:domain sh:PropertyShape ;
+  rdfs:isDefinedBy sh: .
+
+sh:namespace a rdf:Property ;
+  rdfs:label "namespace"@en ;
+  rdfs:comment "The namespace associated with a prefix in a prefix declaration."@en ;
+  rdfs:domain sh:PrefixDeclaration ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range xsd:anyURI .
+
+sh:node a rdf:Property ;
+  rdfs:label "node"@en ;
+  rdfs:comment "Specifies the node shape that all value nodes must conform to."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range sh:NodeShape .
+
+sh:nodeKind a rdf:Property ;
+  rdfs:label "node kind"@en ;
+  rdfs:comment "Specifies the node kind (e.g. IRI or literal) each value node."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range sh:NodeKind .
+
+sh:nodeValidator a rdf:Property ;
+  rdfs:label "shape validator"@en ;
+  rdfs:comment "The validator(s) used to evaluate a constraint in the context of a node shape."@en ;
+  rdfs:domain sh:ConstraintComponent ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range sh:Validator .
+
+sh:nodes a rdf:Property ;
+  rdfs:label "nodes"@en ;
+  rdfs:comment "The node expression producing the input nodes of a filter shape expression."@en ;
+  rdfs:isDefinedBy sh: .
+
+sh:not a rdf:Property ;
+  rdfs:label "not"@en ;
+  rdfs:comment "Specifies a shape that the value nodes must not conform to."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range sh:Shape .
+
+sh:object a rdf:Property ;
+  rdfs:label "object"@en ;
+  rdfs:comment "An expression producing the nodes that shall be inferred as objects."@en ;
+  rdfs:domain sh:TripleRule ;
+  rdfs:isDefinedBy sh: .
+
+sh:oneOrMorePath a rdf:Property ;
+  rdfs:label "one or more path"@en ;
+  rdfs:comment "The (single) value of this property represents a path that is matched one or more times."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range rdfs:Resource .
+
+sh:optional a rdf:Property ;
+  rdfs:label "optional"@en ;
+  rdfs:comment "Indicates whether a parameter is optional."@en ;
+  rdfs:domain sh:Parameter ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range xsd:boolean .
+
+sh:or a rdf:Property ;
+  rdfs:label "or"@en ;
+  rdfs:comment "Specifies a list of shapes so that the value nodes must conform to at least one of the shapes."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range rdf:List .
+
+sh:order a rdf:Property ;
+  rdfs:label "order"@en ;
+  rdfs:comment "Specifies the relative order of this compared to its siblings. For example use 0 for the first, 1 for the second."@en ;
+  rdfs:isDefinedBy sh: .
+
+sh:parameter a rdf:Property ;
+  rdfs:label "parameter"@en ;
+  rdfs:comment "The parameters of a function or constraint component."@en ;
+  rdfs:domain sh:Parameterizable ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range sh:Parameter .
+
+sh:path a rdf:Property ;
+  rdfs:label "path"@en ;
+  rdfs:comment "Specifies the property path of a property shape."@en ;
+  rdfs:domain sh:PropertyShape ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range rdfs:Resource .
+
+sh:pattern a rdf:Property ;
+  rdfs:label "pattern"@en ;
+  rdfs:comment "Specifies a regular expression pattern that the string representations of the value nodes must match."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range xsd:string .
+
+sh:predicate a rdf:Property ;
+  rdfs:label "predicate"@en ;
+  rdfs:comment "An expression producing the properties that shall be inferred as predicates."@en ;
+  rdfs:domain sh:TripleRule ;
+  rdfs:isDefinedBy sh: .
+
+sh:prefix a rdf:Property ;
+  rdfs:label "prefix"@en ;
+  rdfs:comment "The prefix of a prefix declaration."@en ;
+  rdfs:domain sh:PrefixDeclaration ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range xsd:string .
+
+sh:prefixes a rdf:Property ;
+  rdfs:label "prefixes"@en ;
+  rdfs:comment "The prefixes that shall be applied before parsing the associated SPARQL query."@en ;
+  rdfs:domain sh:SPARQLExecutable ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range owl:Ontology .
+
+sh:property a rdf:Property ;
+  rdfs:label "property"@en ;
+  rdfs:comment "Links a shape to its property shapes."@en ;
+  rdfs:domain sh:Shape ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range sh:PropertyShape .
+
+sh:propertyValidator a rdf:Property ;
+  rdfs:label "property validator"@en ;
+  rdfs:comment "The validator(s) used to evaluate a constraint in the context of a property shape."@en ;
+  rdfs:domain sh:ConstraintComponent ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range sh:Validator .
+
+sh:qualifiedMaxCount a rdf:Property ;
+  rdfs:label "qualified max count"@en ;
+  rdfs:comment "The maximum number of value nodes that can conform to the shape."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range xsd:integer .
+
+sh:qualifiedMinCount a rdf:Property ;
+  rdfs:label "qualified min count"@en ;
+  rdfs:comment "The minimum number of value nodes that must conform to the shape."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range xsd:integer .
+
+sh:qualifiedValueShape a rdf:Property ;
+  rdfs:label "qualified value shape"@en ;
+  rdfs:comment "The shape that a specified number of values must conform to."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range sh:Shape .
+
+sh:qualifiedValueShapesDisjoint a rdf:Property ;
+  rdfs:label "qualified value shapes disjoint"@en ;
+  rdfs:comment "Can be used to mark the qualified value shape to be disjoint with its sibling shapes."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range xsd:boolean .
+
+sh:result a rdf:Property ;
+  rdfs:label "result"@en ;
+  rdfs:comment "The validation results contained in a validation report."@en ;
+  rdfs:domain sh:ValidationReport ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range sh:ValidationResult .
+
+sh:resultAnnotation a rdf:Property ;
+  rdfs:label "result annotation"@en ;
+  rdfs:comment "Links a SPARQL validator with zero or more sh:ResultAnnotation instances, defining how to derive additional result properties based on the variables of the SELECT query."@en ;
+  rdfs:domain sh:SPARQLSelectValidator ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range sh:ResultAnnotation .
+
+sh:resultMessage a rdf:Property ;
+  rdfs:label "result message"@en ;
+  rdfs:comment "Human-readable messages explaining the cause of the result."@en ;
+  rdfs:domain sh:AbstractResult ;
+  rdfs:isDefinedBy sh: .
+
+sh:resultPath a rdf:Property ;
+  rdfs:label "result path"@en ;
+  rdfs:comment "The path of a validation result, based on the path of the validated property shape."@en ;
+  rdfs:domain sh:AbstractResult ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range rdfs:Resource .
+
+sh:resultSeverity a rdf:Property ;
+  rdfs:label "result severity"@en ;
+  rdfs:comment "The severity of the result, e.g. warning."@en ;
+  rdfs:domain sh:AbstractResult ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range sh:Severity .
+
+sh:returnType a rdf:Property ;
+  rdfs:label "return type"@en ;
+  rdfs:comment "The expected type of values returned by the associated function."@en ;
+  rdfs:domain sh:Function ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range rdfs:Class .
+
+sh:rule a rdf:Property ;
+  rdfs:label "rule"@en ;
+  rdfs:comment "The rules linked to a shape."@en ;
+  rdfs:domain sh:Shape ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range sh:Rule .
+
+sh:select a rdf:Property ;
+  rdfs:label "select"@en ;
+  rdfs:comment "The SPARQL SELECT query to execute."@en ;
+  rdfs:domain sh:SPARQLSelectExecutable ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range xsd:string .
+
+sh:severity a rdf:Property ;
+  rdfs:label "severity"@en ;
+  rdfs:comment "Defines the severity that validation results produced by a shape must have. Defaults to sh:Violation."@en ;
+  rdfs:domain sh:Shape ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range sh:Severity .
+
+sh:shapesGraph a rdf:Property ;
+  rdfs:label "shapes graph"@en ;
+  rdfs:comment "Shapes graphs that should be used when validating this data graph."@en ;
+  rdfs:domain owl:Ontology ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range owl:Ontology .
+
+sh:shapesGraphWellFormed a rdf:Property ;
+  rdfs:label "shapes graph well-formed"@en ;
+  rdfs:comment "If true then the validation engine was certain that the shapes graph has passed all SHACL syntax requirements during the validation process."@en ;
+  rdfs:domain sh:ValidationReport ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range xsd:boolean .
+
+sh:sourceConstraint a rdf:Property ;
+  rdfs:label "source constraint"@en ;
+  rdfs:comment "The constraint that was validated when the result was produced."@en ;
+  rdfs:domain sh:AbstractResult ;
+  rdfs:isDefinedBy sh: .
+
+sh:sourceConstraintComponent a rdf:Property ;
+  rdfs:label "source constraint component"@en ;
+  rdfs:comment "The constraint component that is the source of the result."@en ;
+  rdfs:domain sh:AbstractResult ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range sh:ConstraintComponent .
+
+sh:sourceShape a rdf:Property ;
+  rdfs:label "source shape"@en ;
+  rdfs:comment "The shape that is was validated when the result was produced."@en ;
+  rdfs:domain sh:AbstractResult ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range sh:Shape .
+
+sh:sparql a rdf:Property ;
+  rdfs:label "constraint (in SPARQL)"@en ;
+  rdfs:comment "Links a shape with SPARQL constraints."@en ;
+  rdfs:domain sh:Shape ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range sh:SPARQLConstraint .
+
+sh:subject a rdf:Property ;
+  rdfs:label "subject"@en ;
+  rdfs:comment "An expression producing the resources that shall be inferred as subjects."@en ;
+  rdfs:domain sh:TripleRule ;
+  rdfs:isDefinedBy sh: .
+
+sh:suggestedShapesGraph a rdf:Property ;
+  rdfs:label "suggested shapes graph"@en ;
+  rdfs:comment "Suggested shapes graphs for this ontology. The values of this property may be used in the absence of specific sh:shapesGraph statements."@en ;
+  rdfs:domain owl:Ontology ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range owl:Ontology .
+
+sh:target a rdf:Property ;
+  rdfs:label "target"@en ;
+  rdfs:comment "Links a shape to a target specified by an extension language, for example instances of sh:SPARQLTarget."@en ;
+  rdfs:domain sh:Shape ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range sh:Target .
+
+sh:targetClass a rdf:Property ;
+  rdfs:label "target class"@en ;
+  rdfs:comment "Links a shape to a class, indicating that all instances of the class must conform to the shape."@en ;
+  rdfs:domain sh:Shape ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range rdfs:Class .
+
+sh:targetNode a rdf:Property ;
+  rdfs:label "target node"@en ;
+  rdfs:comment "Links a shape to individual nodes, indicating that these nodes must conform to the shape."@en ;
+  rdfs:domain sh:Shape ;
+  rdfs:isDefinedBy sh: .
+
+sh:targetObjectsOf a rdf:Property ;
+  rdfs:label "target objects of"@en ;
+  rdfs:comment "Links a shape to a property, indicating that all all objects of triples that have the given property as their predicate must conform to the shape."@en ;
+  rdfs:domain sh:Shape ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range rdf:Property .
+
+sh:targetSubjectsOf a rdf:Property ;
+  rdfs:label "target subjects of"@en ;
+  rdfs:comment "Links a shape to a property, indicating that all subjects of triples that have the given property as their predicate must conform to the shape."@en ;
+  rdfs:domain sh:Shape ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range rdf:Property .
+
+sh:union a rdf:Property ;
+  rdfs:label "union"@en ;
+  rdfs:comment "A list of node expressions that shall be used together."@en ;
+  rdfs:isDefinedBy sh: .
+
+sh:uniqueLang a rdf:Property ;
+  rdfs:label "unique languages"@en ;
+  rdfs:comment "Specifies whether all node values must have a unique (or no) language tag."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range xsd:boolean .
+
+sh:update a rdf:Property ;
+  rdfs:label "update"@en ;
+  rdfs:comment "The SPARQL UPDATE to execute."@en ;
+  rdfs:domain sh:SPARQLUpdateExecutable ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range xsd:string .
+
+sh:validator a rdf:Property ;
+  rdfs:label "validator"@en ;
+  rdfs:comment "The validator(s) used to evaluate constraints of either node or property shapes."@en ;
+  rdfs:domain sh:ConstraintComponent ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range sh:Validator .
+
+sh:value a rdf:Property ;
+  rdfs:label "value"@en ;
+  rdfs:comment "An RDF node that has caused the result."@en ;
+  rdfs:domain sh:AbstractResult ;
+  rdfs:isDefinedBy sh: .
+
+sh:xone a rdf:Property ;
+  rdfs:label "exactly one"@en ;
+  rdfs:comment "Specifies a list of shapes so that the value nodes must conform to exactly one of the shapes."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range rdf:List .
+
+sh:zeroOrMorePath a rdf:Property ;
+  rdfs:label "zero or more path"@en ;
+  rdfs:comment "The (single) value of this property represents a path that is matched zero or more times."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range rdfs:Resource .
+
+sh:zeroOrOnePath a rdf:Property ;
+  rdfs:label "zero or one path"@en ;
+  rdfs:comment "The (single) value of this property represents a path that is matched zero or one times."@en ;
+  rdfs:isDefinedBy sh: ;
+  rdfs:range rdfs:Resource .
+
+sh:AndConstraintComponent a sh:ConstraintComponent ;
+  rdfs:label "And constraint component"@en ;
+  rdfs:comment "A constraint component that can be used to test whether a value node conforms to all members of a provided list of shapes."@en ;
+  rdfs:isDefinedBy sh: ;
+  sh:parameter sh:AndConstraintComponent-and .
+
+sh:AndConstraintComponent-and a sh:Parameter ;
+  rdfs:isDefinedBy sh: ;
+  sh:path sh:and .
+
+sh:BlankNode a sh:NodeKind ;
+  rdfs:label "Blank node"@en ;
+  rdfs:comment "The node kind of all blank nodes."@en ;
+  rdfs:isDefinedBy sh: .
+
+sh:BlankNodeOrIRI a sh:NodeKind ;
+  rdfs:label "Blank node or IRI"@en ;
+  rdfs:comment "The node kind of all blank nodes or IRIs."@en ;
+  rdfs:isDefinedBy sh: .
+
+sh:BlankNodeOrLiteral a sh:NodeKind ;
+  rdfs:label "Blank node or literal"@en ;
+  rdfs:comment "The node kind of all blank nodes or literals."@en ;
+  rdfs:isDefinedBy sh: .
+
+sh:ClassConstraintComponent a sh:ConstraintComponent ;
+  rdfs:label "Class constraint component"@en ;
+  rdfs:comment "A constraint component that can be used to verify that each value node is an instance of a given type."@en ;
+  rdfs:isDefinedBy sh: ;
+  sh:parameter sh:ClassConstraintComponent-class .
+
+sh:ClassConstraintComponent-class a sh:Parameter ;
+  rdfs:isDefinedBy sh: ;
+  sh:nodeKind sh:IRI ;
+  sh:path sh:class .
+
+sh:ClosedConstraintComponent a sh:ConstraintComponent ;
+  rdfs:label "Closed constraint component"@en ;
+  rdfs:comment "A constraint component that can be used to indicate that focus nodes must only have values for those properties that have been explicitly enumerated via sh:property/sh:path."@en ;
+  rdfs:isDefinedBy sh: ;
+  sh:parameter sh:ClosedConstraintComponent-closed ;
+  sh:parameter sh:ClosedConstraintComponent-ignoredProperties .
+
+sh:ClosedConstraintComponent-closed a sh:Parameter ;
+  rdfs:isDefinedBy sh: ;
+  sh:datatype xsd:boolean ;
+  sh:path sh:closed .
+
+sh:ClosedConstraintComponent-ignoredProperties a sh:Parameter ;
+  rdfs:isDefinedBy sh: ;
+  sh:optional true ;
+  sh:path sh:ignoredProperties .
+
+sh:DatatypeConstraintComponent a sh:ConstraintComponent ;
+  rdfs:label "Datatype constraint component"@en ;
+  rdfs:comment "A constraint component that can be used to restrict the datatype of all value nodes."@en ;
+  rdfs:isDefinedBy sh: ;
+  sh:parameter sh:DatatypeConstraintComponent-datatype .
+
+sh:DatatypeConstraintComponent-datatype a sh:Parameter ;
+  rdfs:isDefinedBy sh: ;
+  sh:maxCount 1 ;
+  sh:nodeKind sh:IRI ;
+  sh:path sh:datatype .
+
+sh:DisjointConstraintComponent a sh:ConstraintComponent ;
+  rdfs:label "Disjoint constraint component"@en ;
+  rdfs:comment "A constraint component that can be used to verify that the set of value nodes is disjoint with the the set of nodes that have the focus node as subject and the value of a given property as predicate."@en ;
+  rdfs:isDefinedBy sh: ;
+  sh:parameter sh:DisjointConstraintComponent-disjoint .
+
+sh:DisjointConstraintComponent-disjoint a sh:Parameter ;
+  rdfs:isDefinedBy sh: ;
+  sh:nodeKind sh:IRI ;
+  sh:path sh:disjoint .
+
+sh:EqualsConstraintComponent a sh:ConstraintComponent ;
+  rdfs:label "Equals constraint component"@en ;
+  rdfs:comment "A constraint component that can be used to verify that the set of value nodes is equal to the set of nodes that have the focus node as subject and the value of a given property as predicate."@en ;
+  rdfs:isDefinedBy sh: ;
+  sh:parameter sh:EqualsConstraintComponent-equals .
+
+sh:EqualsConstraintComponent-equals a sh:Parameter ;
+  rdfs:isDefinedBy sh: ;
+  sh:nodeKind sh:IRI ;
+  sh:path sh:equals .
+
+sh:ExpressionConstraintComponent a sh:ConstraintComponent ;
+  rdfs:label "Expression constraint component"@en ;
+  rdfs:comment "A constraint component that can be used to verify that a given node expression produces true for all value nodes."@en ;
+  rdfs:isDefinedBy sh: ;
+  sh:parameter sh:ExpressionConstraintComponent-expression .
+
+sh:ExpressionConstraintComponent-expression a sh:Parameter ;
+  rdfs:isDefinedBy sh: ;
+  sh:path sh:expression .
+
+sh:HasValueConstraintComponent a sh:ConstraintComponent ;
+  rdfs:label "Has-value constraint component"@en ;
+  rdfs:comment "A constraint component that can be used to verify that one of the value nodes is a given RDF node."@en ;
+  rdfs:isDefinedBy sh: ;
+  sh:parameter sh:HasValueConstraintComponent-hasValue .
+
+sh:HasValueConstraintComponent-hasValue a sh:Parameter ;
+  rdfs:isDefinedBy sh: ;
+  sh:path sh:hasValue .
+
+sh:IRI a sh:NodeKind ;
+  rdfs:label "IRI"@en ;
+  rdfs:comment "The node kind of all IRIs."@en ;
+  rdfs:isDefinedBy sh: .
+
+sh:IRIOrLiteral a sh:NodeKind ;
+  rdfs:label "IRI or literal"@en ;
+  rdfs:comment "The node kind of all IRIs or literals."@en ;
+  rdfs:isDefinedBy sh: .
+
+sh:InConstraintComponent a sh:ConstraintComponent ;
+  rdfs:label "In constraint component"@en ;
+  rdfs:comment "A constraint component that can be used to exclusively enumerate the permitted value nodes."@en ;
+  rdfs:isDefinedBy sh: ;
+  sh:parameter sh:InConstraintComponent-in .
+
+sh:InConstraintComponent-in a sh:Parameter ;
+  rdfs:isDefinedBy sh: ;
+  sh:maxCount 1 ;
+  sh:path sh:in .
+
+sh:Info a sh:Severity ;
+  rdfs:label "Info"@en ;
+  rdfs:comment "The severity for an informational validation result."@en ;
+  rdfs:isDefinedBy sh: .
+
+sh:JSConstraint-js a sh:Parameter ;
+  rdfs:isDefinedBy sh: ;
+  sh:path sh:js .
+
+sh:JSConstraintComponent a sh:ConstraintComponent ;
+  rdfs:label "JavaScript constraint component"@en ;
+  rdfs:comment "A constraint component with the parameter sh:js linking to a sh:JSConstraint containing a sh:script."@en ;
+  rdfs:isDefinedBy sh: ;
+  sh:parameter sh:JSConstraint-js .
+
+sh:LanguageInConstraintComponent a sh:ConstraintComponent ;
+  rdfs:label "Language-in constraint component"@en ;
+  rdfs:comment "A constraint component that can be used to enumerate language tags that all value nodes must have."@en ;
+  rdfs:isDefinedBy sh: ;
+  sh:parameter sh:LanguageInConstraintComponent-languageIn .
+
+sh:LanguageInConstraintComponent-languageIn a sh:Parameter ;
+  rdfs:isDefinedBy sh: ;
+  sh:maxCount 1 ;
+  sh:path sh:languageIn .
+
+sh:LessThanConstraintComponent a sh:ConstraintComponent ;
+  rdfs:label "Less-than constraint component"@en ;
+  rdfs:comment "A constraint component that can be used to verify that each value node is smaller than all the nodes that have the focus node as subject and the value of a given property as predicate."@en ;
+  rdfs:isDefinedBy sh: ;
+  sh:parameter sh:LessThanConstraintComponent-lessThan .
+
+sh:LessThanConstraintComponent-lessThan a sh:Parameter ;
+  rdfs:isDefinedBy sh: ;
+  sh:nodeKind sh:IRI ;
+  sh:path sh:lessThan .
+
+sh:LessThanOrEqualsConstraintComponent a sh:ConstraintComponent ;
+  rdfs:label "less-than-or-equals constraint component"@en ;
+  rdfs:comment "A constraint component that can be used to verify that every value node is smaller than all the nodes that have the focus node as subject and the value of a given property as predicate."@en ;
+  rdfs:isDefinedBy sh: ;
+  sh:parameter sh:LessThanOrEqualsConstraintComponent-lessThanOrEquals .
+
+sh:LessThanOrEqualsConstraintComponent-lessThanOrEquals a sh:Parameter ;
+  rdfs:isDefinedBy sh: ;
+  sh:nodeKind sh:IRI ;
+  sh:path sh:lessThanOrEquals .
+
+sh:Literal a sh:NodeKind ;
+  rdfs:label "Literal"@en ;
+  rdfs:comment "The node kind of all literals."@en ;
+  rdfs:isDefinedBy sh: .
+
+sh:MaxCountConstraintComponent a sh:ConstraintComponent ;
+  rdfs:label "Max-count constraint component"@en ;
+  rdfs:comment "A constraint component that can be used to restrict the maximum number of value nodes."@en ;
+  rdfs:isDefinedBy sh: ;
+  sh:parameter sh:MaxCountConstraintComponent-maxCount .
+
+sh:MaxCountConstraintComponent-maxCount a sh:Parameter ;
+  rdfs:isDefinedBy sh: ;
+  sh:datatype xsd:integer ;
+  sh:maxCount 1 ;
+  sh:path sh:maxCount .
+
+sh:MaxExclusiveConstraintComponent a sh:ConstraintComponent ;
+  rdfs:label "Max-exclusive constraint component"@en ;
+  rdfs:comment "A constraint component that can be used to restrict the range of value nodes with a maximum exclusive value."@en ;
+  rdfs:isDefinedBy sh: ;
+  sh:parameter sh:MaxExclusiveConstraintComponent-maxExclusive .
+
+sh:MaxExclusiveConstraintComponent-maxExclusive a sh:Parameter ;
+  rdfs:isDefinedBy sh: ;
+  sh:maxCount 1 ;
+  sh:nodeKind sh:Literal ;
+  sh:path sh:maxExclusive .
+
+sh:MaxInclusiveConstraintComponent a sh:ConstraintComponent ;
+  rdfs:label "Max-inclusive constraint component"@en ;
+  rdfs:comment "A constraint component that can be used to restrict the range of value nodes with a maximum inclusive value."@en ;
+  rdfs:isDefinedBy sh: ;
+  sh:parameter sh:MaxInclusiveConstraintComponent-maxInclusive .
+
+sh:MaxInclusiveConstraintComponent-maxInclusive a sh:Parameter ;
+  rdfs:isDefinedBy sh: ;
+  sh:maxCount 1 ;
+  sh:nodeKind sh:Literal ;
+  sh:path sh:maxInclusive .
+
+sh:MaxLengthConstraintComponent a sh:ConstraintComponent ;
+  rdfs:label "Max-length constraint component"@en ;
+  rdfs:comment "A constraint component that can be used to restrict the maximum string length of value nodes."@en ;
+  rdfs:isDefinedBy sh: ;
+  sh:parameter sh:MaxLengthConstraintComponent-maxLength .
+
+sh:MaxLengthConstraintComponent-maxLength a sh:Parameter ;
+  rdfs:isDefinedBy sh: ;
+  sh:datatype xsd:integer ;
+  sh:maxCount 1 ;
+  sh:path sh:maxLength .
+
+sh:MinCountConstraintComponent a sh:ConstraintComponent ;
+  rdfs:label "Min-count constraint component"@en ;
+  rdfs:comment "A constraint component that can be used to restrict the minimum number of value nodes."@en ;
+  rdfs:isDefinedBy sh: ;
+  sh:parameter sh:MinCountConstraintComponent-minCount .
+
+sh:MinCountConstraintComponent-minCount a sh:Parameter ;
+  rdfs:isDefinedBy sh: ;
+  sh:datatype xsd:integer ;
+  sh:maxCount 1 ;
+  sh:path sh:minCount .
+
+sh:MinExclusiveConstraintComponent a sh:ConstraintComponent ;
+  rdfs:label "Min-exclusive constraint component"@en ;
+  rdfs:comment "A constraint component that can be used to restrict the range of value nodes with a minimum exclusive value."@en ;
+  rdfs:isDefinedBy sh: ;
+  sh:parameter sh:MinExclusiveConstraintComponent-minExclusive .
+
+sh:MinExclusiveConstraintComponent-minExclusive a sh:Parameter ;
+  rdfs:isDefinedBy sh: ;
+  sh:maxCount 1 ;
+  sh:nodeKind sh:Literal ;
+  sh:path sh:minExclusive .
+
+sh:MinInclusiveConstraintComponent a sh:ConstraintComponent ;
+  rdfs:label "Min-inclusive constraint component"@en ;
+  rdfs:comment "A constraint component that can be used to restrict the range of value nodes with a minimum inclusive value."@en ;
+  rdfs:isDefinedBy sh: ;
+  sh:parameter sh:MinInclusiveConstraintComponent-minInclusive .
+
+sh:MinInclusiveConstraintComponent-minInclusive a sh:Parameter ;
+  rdfs:isDefinedBy sh: ;
+  sh:maxCount 1 ;
+  sh:nodeKind sh:Literal ;
+  sh:path sh:minInclusive .
+
+sh:MinLengthConstraintComponent a sh:ConstraintComponent ;
+  rdfs:label "Min-length constraint component"@en ;
+  rdfs:comment "A constraint component that can be used to restrict the minimum string length of value nodes."@en ;
+  rdfs:isDefinedBy sh: ;
+  sh:parameter sh:MinLengthConstraintComponent-minLength .
+
+sh:MinLengthConstraintComponent-minLength a sh:Parameter ;
+  rdfs:isDefinedBy sh: ;
+  sh:datatype xsd:integer ;
+  sh:maxCount 1 ;
+  sh:path sh:minLength .
+
+sh:NodeConstraintComponent a sh:ConstraintComponent ;
+  rdfs:label "Node constraint component"@en ;
+  rdfs:comment "A constraint component that can be used to verify that all value nodes conform to the given node shape."@en ;
+  rdfs:isDefinedBy sh: ;
+  sh:parameter sh:NodeConstraintComponent-node .
+
+sh:NodeConstraintComponent-node a sh:Parameter ;
+  rdfs:isDefinedBy sh: ;
+  sh:path sh:node .
+
+sh:NodeKindConstraintComponent a sh:ConstraintComponent ;
+  rdfs:label "Node-kind constraint component"@en ;
+  rdfs:comment "A constraint component that can be used to restrict the RDF node kind of each value node."@en ;
+  rdfs:isDefinedBy sh: ;
+  sh:parameter sh:NodeKindConstraintComponent-nodeKind .
+
+sh:NodeKindConstraintComponent-nodeKind a sh:Parameter ;
+  rdfs:isDefinedBy sh: ;
+  sh:in ( sh:BlankNode sh:IRI sh:Literal sh:BlankNodeOrIRI sh:BlankNodeOrLiteral sh:IRIOrLiteral ) ;
+  sh:maxCount 1 ;
+  sh:path sh:nodeKind .
+
+sh:NotConstraintComponent a sh:ConstraintComponent ;
+  rdfs:label "Not constraint component"@en ;
+  rdfs:comment "A constraint component that can be used to verify that value nodes do not conform to a given shape."@en ;
+  rdfs:isDefinedBy sh: ;
+  sh:parameter sh:NotConstraintComponent-not .
+
+sh:NotConstraintComponent-not a sh:Parameter ;
+  rdfs:isDefinedBy sh: ;
+  sh:path sh:not .
+
+sh:OrConstraintComponent a sh:ConstraintComponent ;
+  rdfs:label "Or constraint component"@en ;
+  rdfs:comment "A constraint component that can be used to restrict the value nodes so that they conform to at least one out of several provided shapes."@en ;
+  rdfs:isDefinedBy sh: ;
+  sh:parameter sh:OrConstraintComponent-or .
+
+sh:OrConstraintComponent-or a sh:Parameter ;
+  rdfs:isDefinedBy sh: ;
+  sh:path sh:or .
+
+sh:PatternConstraintComponent a sh:ConstraintComponent ;
+  rdfs:label "Pattern constraint component"@en ;
+  rdfs:comment "A constraint component that can be used to verify that every value node matches a given regular expression."@en ;
+  rdfs:isDefinedBy sh: ;
+  sh:parameter sh:PatternConstraintComponent-flags ;
+  sh:parameter sh:PatternConstraintComponent-pattern .
+
+sh:PatternConstraintComponent-flags a sh:Parameter ;
+  rdfs:isDefinedBy sh: ;
+  sh:datatype xsd:string ;
+  sh:optional true ;
+  sh:path sh:flags .
+
+sh:PatternConstraintComponent-pattern a sh:Parameter ;
+  rdfs:isDefinedBy sh: ;
+  sh:datatype xsd:string ;
+  sh:path sh:pattern .
+
+sh:PropertyConstraintComponent a sh:ConstraintComponent ;
+  rdfs:label "Property constraint component"@en ;
+  rdfs:comment "A constraint component that can be used to verify that all value nodes conform to the given property shape."@en ;
+  rdfs:isDefinedBy sh: ;
+  sh:parameter sh:PropertyConstraintComponent-property .
+
+sh:PropertyConstraintComponent-property a sh:Parameter ;
+  rdfs:isDefinedBy sh: ;
+  sh:path sh:property .
+
+sh:QualifiedMaxCountConstraintComponent a sh:ConstraintComponent ;
+  rdfs:label "Qualified-max-count constraint component"@en ;
+  rdfs:comment "A constraint component that can be used to verify that a specified maximum number of value nodes conforms to a given shape."@en ;
+  rdfs:isDefinedBy sh: ;
+  sh:parameter sh:QualifiedMaxCountConstraintComponent-qualifiedMaxCount ;
+  sh:parameter sh:QualifiedMaxCountConstraintComponent-qualifiedValueShape ;
+  sh:parameter sh:QualifiedMaxCountConstraintComponent-qualifiedValueShapesDisjoint .
+
+sh:QualifiedMaxCountConstraintComponent-qualifiedMaxCount a sh:Parameter ;
+  rdfs:isDefinedBy sh: ;
+  sh:datatype xsd:integer ;
+  sh:path sh:qualifiedMaxCount .
+
+sh:QualifiedMaxCountConstraintComponent-qualifiedValueShape a sh:Parameter ;
+  rdfs:isDefinedBy sh: ;
+  sh:path sh:qualifiedValueShape .
+
+sh:QualifiedMaxCountConstraintComponent-qualifiedValueShapesDisjoint a sh:Parameter ;
+  rdfs:isDefinedBy sh: ;
+  sh:datatype xsd:boolean ;
+  sh:optional true ;
+  sh:path sh:qualifiedValueShapesDisjoint .
+
+sh:QualifiedMinCountConstraintComponent a sh:ConstraintComponent ;
+  rdfs:label "Qualified-min-count constraint component"@en ;
+  rdfs:comment "A constraint component that can be used to verify that a specified minimum number of value nodes conforms to a given shape."@en ;
+  rdfs:isDefinedBy sh: ;
+  sh:parameter sh:QualifiedMinCountConstraintComponent-qualifiedMinCount ;
+  sh:parameter sh:QualifiedMinCountConstraintComponent-qualifiedValueShape ;
+  sh:parameter sh:QualifiedMinCountConstraintComponent-qualifiedValueShapesDisjoint .
+
+sh:QualifiedMinCountConstraintComponent-qualifiedMinCount a sh:Parameter ;
+  rdfs:isDefinedBy sh: ;
+  sh:datatype xsd:integer ;
+  sh:path sh:qualifiedMinCount .
+
+sh:QualifiedMinCountConstraintComponent-qualifiedValueShape a sh:Parameter ;
+  rdfs:isDefinedBy sh: ;
+  sh:path sh:qualifiedValueShape .
+
+sh:QualifiedMinCountConstraintComponent-qualifiedValueShapesDisjoint a sh:Parameter ;
+  rdfs:isDefinedBy sh: ;
+  sh:datatype xsd:boolean ;
+  sh:optional true ;
+  sh:path sh:qualifiedValueShapesDisjoint .
+
+sh:SPARQLConstraintComponent a sh:ConstraintComponent ;
+  rdfs:label "SPARQL constraint component"@en ;
+  rdfs:comment "A constraint component that can be used to define constraints based on SPARQL queries."@en ;
+  rdfs:isDefinedBy sh: ;
+  sh:parameter sh:SPARQLConstraintComponent-sparql .
+
+sh:SPARQLConstraintComponent-sparql a sh:Parameter ;
+  rdfs:isDefinedBy sh: ;
+  sh:path sh:sparql .
+
+sh:UniqueLangConstraintComponent a sh:ConstraintComponent ;
+  rdfs:label "Unique-languages constraint component"@en ;
+  rdfs:comment "A constraint component that can be used to specify that no pair of value nodes may use the same language tag."@en ;
+  rdfs:isDefinedBy sh: ;
+  sh:parameter sh:UniqueLangConstraintComponent-uniqueLang .
+
+sh:UniqueLangConstraintComponent-uniqueLang a sh:Parameter ;
+  rdfs:isDefinedBy sh: ;
+  sh:datatype xsd:boolean ;
+  sh:maxCount 1 ;
+  sh:path sh:uniqueLang .
+
+sh:Violation a sh:Severity ;
+  rdfs:label "Violation"@en ;
+  rdfs:comment "The severity for a violation validation result."@en ;
+  rdfs:isDefinedBy sh: .
+
+sh:Warning a sh:Severity ;
+  rdfs:label "Warning"@en ;
+  rdfs:comment "The severity for a warning validation result."@en ;
+  rdfs:isDefinedBy sh: .
+
+sh:XoneConstraintComponent a sh:ConstraintComponent ;
+  rdfs:label "Exactly one constraint component"@en ;
+  rdfs:comment "A constraint component that can be used to restrict the value nodes so that they conform to exactly one out of several provided shapes."@en ;
+  rdfs:isDefinedBy sh: ;
+  sh:parameter sh:XoneConstraintComponent-xone .
+
+sh:XoneConstraintComponent-xone a sh:Parameter ;
+  rdfs:isDefinedBy sh: ;
+  sh:path sh:xone .
+
+sh:this a rdfs:Resource ;
+  rdfs:label "this"@en ;
+  rdfs:comment "A node expression that represents the current focus node."@en ;
+  rdfs:isDefinedBy sh: .
+
+
diff --git a/testlib/src/main/resources/rdf/ttl/expected/v1.2.12-style01/shacl-shacl.ttl b/testlib/src/main/resources/rdf/ttl/expected/v1.2.12-style01/shacl-shacl.ttl
new file mode 100644
index 0000000000..b728317864
--- /dev/null
+++ b/testlib/src/main/resources/rdf/ttl/expected/v1.2.12-style01/shacl-shacl.ttl
@@ -0,0 +1,431 @@
+@prefix     rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix    rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix     xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix      sh: <http://www.w3.org/ns/shacl#> .
+@prefix    shsh: <http://www.w3.org/ns/shacl-shacl#> .
+
+shsh: rdfs:label   "SHACL for SHACL"@en ;
+      rdfs:comment "This shapes graph can be used to validate SHACL shapes graphs against a subset of the syntax rules."@en ;
+      sh:declare [
+    sh:namespace "http://www.w3.org/ns/shacl-shacl#" ;
+    sh:prefix    "shsh" ;
+  ] .
+
+shsh:EntailmentShape a           sh:NodeShape ;
+                     sh:nodeKind        sh:IRI ;
+                     sh:targetObjectsOf sh:entailment .
+
+shsh:ListNodeShape a     sh:NodeShape ;
+                   rdfs:label   "List node shape"@en ;
+                   rdfs:comment "Defines constraints on what it means for a node to be a node within a well-formed RDF list. Note that this does not check whether the rdf:rest items are also well-formed lists as this would lead to unsupported recursion."@en ;
+                   sh:or ( [
+    sh:hasValue ( ) ;
+    sh:property [
+      sh:maxCount 0 ;
+      sh:path     rdf:first ;
+    ] ;
+    sh:property [
+      sh:maxCount 0 ;
+      sh:path     rdf:rest ;
+    ] ;
+  ] [
+    sh:not [
+      sh:hasValue ( ) ;
+    ] ;
+    sh:property [
+      sh:maxCount 1 ;
+      sh:minCount 1 ;
+      sh:path     rdf:first ;
+    ] ;
+    sh:property [
+      sh:maxCount 1 ;
+      sh:minCount 1 ;
+      sh:path     rdf:rest ;
+    ] ;
+  ] ) .
+
+shsh:ListShape a     sh:NodeShape ;
+               rdfs:label   "List shape"@en ;
+               rdfs:comment "A shape describing well-formed RDF lists. Currently does not check for non-recursion. This could be expressed using SHACL-SPARQL."@en ;
+               rdfs:seeAlso <https://www.w3.org/TR/shacl/#syntax-rule-SHACL-list> ;
+               sh:property [
+    rdfs:comment "Each list member (including this node) must be have the shape shsh:ListNodeShape."@en ;
+    sh:hasValue ( ) ;
+    sh:node      shsh:ListNodeShape ;
+    sh:path [
+      sh:zeroOrMorePath rdf:rest ;
+    ] ;
+  ] .
+
+shsh:NodeShapeShape a           sh:NodeShape ;
+                    sh:property [
+    sh:maxCount 0 ;
+    sh:path     sh:path ;
+  ] ;
+  sh:property [
+    sh:maxCount 0 ;
+    sh:path     sh:lessThan ;
+  ] ;
+  sh:property [
+    sh:maxCount 0 ;
+    sh:path     sh:lessThanOrEquals ;
+  ] ;
+  sh:property [
+    sh:maxCount 0 ;
+    sh:path     sh:maxCount ;
+  ] ;
+  sh:property [
+    sh:maxCount 0 ;
+    sh:path     sh:minCount ;
+  ] ;
+  sh:property [
+    sh:maxCount 0 ;
+    sh:path     sh:qualifiedValueShape ;
+  ] ;
+  sh:property [
+    sh:maxCount 0 ;
+    sh:path     sh:uniqueLang ;
+  ] ;
+                    sh:targetObjectsOf sh:node .
+
+shsh:PathListWithAtLeast2Members a    sh:NodeShape ;
+                                 sh:node     shsh:ListShape ;
+                                 sh:property [
+    sh:minCount 2 ;
+    sh:path [
+      sh:oneOrMorePath rdf:rest ;
+    ] ;
+  ] .
+
+shsh:PathNodeShape sh:xone ( [
+    sh:nodeKind sh:IRI ;
+  ] [
+    sh:node     shsh:PathListWithAtLeast2Members ;
+    sh:nodeKind sh:BlankNode ;
+  ] [
+    sh:closed   true ;
+    sh:nodeKind sh:BlankNode ;
+    sh:property [
+      sh:maxCount 1 ;
+      sh:minCount 1 ;
+      sh:node     shsh:PathListWithAtLeast2Members ;
+      sh:path     sh:alternativePath ;
+    ] ;
+  ] [
+    sh:closed   true ;
+    sh:nodeKind sh:BlankNode ;
+    sh:property [
+      sh:maxCount 1 ;
+      sh:minCount 1 ;
+      sh:path     sh:inversePath ;
+    ] ;
+  ] [
+    sh:closed   true ;
+    sh:nodeKind sh:BlankNode ;
+    sh:property [
+      sh:maxCount 1 ;
+      sh:minCount 1 ;
+      sh:path     sh:zeroOrMorePath ;
+    ] ;
+  ] [
+    sh:closed   true ;
+    sh:nodeKind sh:BlankNode ;
+    sh:property [
+      sh:maxCount 1 ;
+      sh:minCount 1 ;
+      sh:path     sh:oneOrMorePath ;
+    ] ;
+  ] [
+    sh:closed   true ;
+    sh:nodeKind sh:BlankNode ;
+    sh:property [
+      sh:maxCount 1 ;
+      sh:minCount 1 ;
+      sh:path     sh:zeroOrOnePath ;
+    ] ;
+  ] ) .
+
+shsh:PathShape a     sh:NodeShape ;
+               rdfs:label   "Path shape"@en ;
+               rdfs:comment "A shape that can be used to validate the syntax rules of well-formed SHACL paths."@en ;
+               rdfs:seeAlso <https://www.w3.org/TR/shacl/#property-paths> ;
+               sh:property [
+    sh:node shsh:PathNodeShape ;
+    sh:path [
+      sh:zeroOrMorePath [
+        sh:alternativePath ( ( [
+          sh:zeroOrMorePath rdf:rest ;
+        ] rdf:first ) ( sh:alternativePath [
+          sh:zeroOrMorePath rdf:rest ;
+        ] rdf:first ) sh:inversePath sh:zeroOrMorePath sh:oneOrMorePath sh:zeroOrOnePath ) ;
+      ] ;
+    ] ;
+  ] .
+
+shsh:PropertyShapeShape a           sh:NodeShape ;
+                        sh:property [
+    sh:maxCount 1 ;
+    sh:minCount 1 ;
+    sh:node     shsh:PathShape ;
+    sh:path     sh:path ;
+  ] ;
+                        sh:targetObjectsOf sh:property .
+
+shsh:ShapeShape a            sh:NodeShape ;
+                rdfs:label          "Shape shape"@en ;
+                rdfs:comment        "A shape that can be used to validate syntax rules for other shapes."@en ;
+                sh:or ( [
+    sh:not [
+      sh:class rdfs:Class ;
+      sh:or ( [
+        sh:class sh:NodeShape ;
+      ] [
+        sh:class sh:PropertyShape ;
+      ] ) ;
+    ] ;
+  ] [
+    sh:nodeKind sh:IRI ;
+  ] ) ;
+                sh:property [
+    sh:nodeKind sh:IRIOrLiteral ;
+    sh:path     sh:targetNode ;
+  ] ;
+  sh:property [
+    sh:nodeKind sh:IRI ;
+    sh:path     sh:targetClass ;
+  ] ;
+  sh:property [
+    sh:nodeKind sh:IRI ;
+    sh:path     sh:targetSubjectsOf ;
+  ] ;
+  sh:property [
+    sh:nodeKind sh:IRI ;
+    sh:path     sh:targetObjectsOf ;
+  ] ;
+  sh:property [
+    sh:maxCount 1 ;
+    sh:nodeKind sh:IRI ;
+    sh:path     sh:severity ;
+  ] ;
+  sh:property [
+    sh:or ( [
+      sh:datatype xsd:string ;
+    ] [
+      sh:datatype rdf:langString ;
+    ] ) ;
+    sh:path sh:message ;
+  ] ;
+  sh:property [
+    sh:in ( true false ) ;
+    sh:maxCount 1 ;
+    sh:path     sh:deactivated ;
+  ] ;
+  sh:property [
+    sh:node shsh:ListShape ;
+    sh:path sh:and ;
+  ] ;
+  sh:property [
+    sh:nodeKind sh:IRI ;
+    sh:path     sh:class ;
+  ] ;
+  sh:property [
+    sh:datatype xsd:boolean ;
+    sh:maxCount 1 ;
+    sh:path     sh:closed ;
+  ] ;
+  sh:property [
+    sh:maxCount 1 ;
+    sh:node     shsh:ListShape ;
+    sh:path     sh:ignoredProperties ;
+  ] ;
+  sh:property [
+    sh:nodeKind sh:IRI ;
+    sh:path ( sh:ignoredProperties [
+      sh:zeroOrMorePath rdf:rest ;
+    ] rdf:first ) ;
+  ] ;
+  sh:property [
+    sh:maxCount 1 ;
+    sh:nodeKind sh:IRI ;
+    sh:path     sh:datatype ;
+  ] ;
+  sh:property [
+    sh:nodeKind sh:IRI ;
+    sh:path     sh:disjoint ;
+  ] ;
+  sh:property [
+    sh:nodeKind sh:IRI ;
+    sh:path     sh:equals ;
+  ] ;
+  sh:property [
+    sh:maxCount 1 ;
+    sh:node     shsh:ListShape ;
+    sh:path     sh:in ;
+  ] ;
+  sh:property [
+    sh:maxCount 1 ;
+    sh:node     shsh:ListShape ;
+    sh:path     sh:languageIn ;
+  ] ;
+  sh:property [
+    sh:datatype xsd:string ;
+    sh:path ( sh:languageIn [
+      sh:zeroOrMorePath rdf:rest ;
+    ] rdf:first ) ;
+  ] ;
+  sh:property [
+    sh:nodeKind sh:IRI ;
+    sh:path     sh:lessThan ;
+  ] ;
+  sh:property [
+    sh:nodeKind sh:IRI ;
+    sh:path     sh:lessThanOrEquals ;
+  ] ;
+  sh:property [
+    sh:datatype xsd:integer ;
+    sh:maxCount 1 ;
+    sh:path     sh:maxCount ;
+  ] ;
+  sh:property [
+    sh:maxCount 1 ;
+    sh:nodeKind sh:Literal ;
+    sh:path     sh:maxExclusive ;
+  ] ;
+  sh:property [
+    sh:maxCount 1 ;
+    sh:nodeKind sh:Literal ;
+    sh:path     sh:maxInclusive ;
+  ] ;
+  sh:property [
+    sh:datatype xsd:integer ;
+    sh:maxCount 1 ;
+    sh:path     sh:maxLength ;
+  ] ;
+  sh:property [
+    sh:datatype xsd:integer ;
+    sh:maxCount 1 ;
+    sh:path     sh:minCount ;
+  ] ;
+  sh:property [
+    sh:maxCount 1 ;
+    sh:nodeKind sh:Literal ;
+    sh:path     sh:minExclusive ;
+  ] ;
+  sh:property [
+    sh:maxCount 1 ;
+    sh:nodeKind sh:Literal ;
+    sh:path     sh:minInclusive ;
+  ] ;
+  sh:property [
+    sh:datatype xsd:integer ;
+    sh:maxCount 1 ;
+    sh:path     sh:minLength ;
+  ] ;
+  sh:property [
+    sh:in ( sh:BlankNode sh:IRI sh:Literal sh:BlankNodeOrIRI sh:BlankNodeOrLiteral sh:IRIOrLiteral ) ;
+    sh:maxCount 1 ;
+    sh:path     sh:nodeKind ;
+  ] ;
+  sh:property [
+    sh:node shsh:ListShape ;
+    sh:path sh:or ;
+  ] ;
+  sh:property [
+    sh:datatype xsd:string ;
+    sh:maxCount 1 ;
+    sh:path     sh:pattern ;
+  ] ;
+  sh:property [
+    sh:datatype xsd:string ;
+    sh:maxCount 1 ;
+    sh:path     sh:flags ;
+  ] ;
+  sh:property [
+    sh:datatype xsd:integer ;
+    sh:maxCount 1 ;
+    sh:path     sh:qualifiedMaxCount ;
+  ] ;
+  sh:property [
+    sh:datatype xsd:integer ;
+    sh:maxCount 1 ;
+    sh:path     sh:qualifiedMinCount ;
+  ] ;
+  sh:property [
+    sh:maxCount 1 ;
+    sh:path     sh:qualifiedValueShape ;
+  ] ;
+  sh:property [
+    sh:datatype xsd:boolean ;
+    sh:maxCount 1 ;
+    sh:path     sh:qualifiedValueShapesDisjoint ;
+  ] ;
+  sh:property [
+    sh:datatype xsd:boolean ;
+    sh:maxCount 1 ;
+    sh:path     sh:uniqueLang ;
+  ] ;
+  sh:property [
+    sh:node shsh:ListShape ;
+    sh:path sh:xone ;
+  ] ;
+                sh:targetClass      sh:NodeShape ;
+  sh:targetClass      sh:PropertyShape ;
+                sh:targetObjectsOf  sh:node ;
+  sh:targetObjectsOf  sh:not ;
+  sh:targetObjectsOf  sh:property ;
+  sh:targetObjectsOf  sh:qualifiedValueShape ;
+                sh:targetSubjectsOf sh:and ;
+  sh:targetSubjectsOf sh:class ;
+  sh:targetSubjectsOf sh:closed ;
+  sh:targetSubjectsOf sh:datatype ;
+  sh:targetSubjectsOf sh:disjoint ;
+  sh:targetSubjectsOf sh:equals ;
+  sh:targetSubjectsOf sh:flags ;
+  sh:targetSubjectsOf sh:hasValue ;
+  sh:targetSubjectsOf sh:ignoredProperties ;
+  sh:targetSubjectsOf sh:in ;
+  sh:targetSubjectsOf sh:languageIn ;
+  sh:targetSubjectsOf sh:lessThan ;
+  sh:targetSubjectsOf sh:lessThanOrEquals ;
+  sh:targetSubjectsOf sh:maxCount ;
+  sh:targetSubjectsOf sh:maxExclusive ;
+  sh:targetSubjectsOf sh:maxInclusive ;
+  sh:targetSubjectsOf sh:maxLength ;
+  sh:targetSubjectsOf sh:minCount ;
+  sh:targetSubjectsOf sh:minExclusive ;
+  sh:targetSubjectsOf sh:minInclusive ;
+  sh:targetSubjectsOf sh:minLength ;
+  sh:targetSubjectsOf sh:node ;
+  sh:targetSubjectsOf sh:nodeKind ;
+  sh:targetSubjectsOf sh:not ;
+  sh:targetSubjectsOf sh:or ;
+  sh:targetSubjectsOf sh:pattern ;
+  sh:targetSubjectsOf sh:property ;
+  sh:targetSubjectsOf sh:qualifiedMaxCount ;
+  sh:targetSubjectsOf sh:qualifiedMinCount ;
+  sh:targetSubjectsOf sh:qualifiedValueShape ;
+  sh:targetSubjectsOf sh:qualifiedValueShapesDisjoint ;
+  sh:targetSubjectsOf sh:sparql ;
+  sh:targetSubjectsOf sh:targetClass ;
+  sh:targetSubjectsOf sh:targetNode ;
+  sh:targetSubjectsOf sh:targetObjectsOf ;
+  sh:targetSubjectsOf sh:targetSubjectsOf ;
+  sh:targetSubjectsOf sh:uniqueLang ;
+  sh:targetSubjectsOf sh:xone ;
+                sh:xone ( shsh:NodeShapeShape shsh:PropertyShapeShape ) .
+
+shsh:ShapesGraphShape a           sh:NodeShape ;
+                      sh:nodeKind        sh:IRI ;
+                      sh:targetObjectsOf sh:shapesGraph .
+
+shsh:ShapesListShape a           sh:NodeShape ;
+                     sh:property [
+    sh:node shsh:ShapeShape ;
+    sh:path ( [
+      sh:zeroOrMorePath rdf:rest ;
+    ] rdf:first ) ;
+  ] ;
+                     sh:targetObjectsOf sh:and ;
+  sh:targetObjectsOf sh:or ;
+  sh:targetObjectsOf sh:xone .
+
diff --git a/testlib/src/main/resources/rdf/ttl/expected/v1.2.12-style01/shacl.ttl b/testlib/src/main/resources/rdf/ttl/expected/v1.2.12-style01/shacl.ttl
new file mode 100644
index 0000000000..970975166a
--- /dev/null
+++ b/testlib/src/main/resources/rdf/ttl/expected/v1.2.12-style01/shacl.ttl
@@ -0,0 +1,1346 @@
+@prefix     rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix    rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix     xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix     owl: <http://www.w3.org/2002/07/owl#> .
+@prefix      sh: <http://www.w3.org/ns/shacl#> .
+
+sh: a                owl:Ontology ;
+    rdfs:label              "W3C Shapes Constraint Language (SHACL) Vocabulary"@en ;
+    rdfs:comment            "This vocabulary defines terms used in SHACL, the W3C Shapes Constraint Language."@en ;
+    sh:declare [
+    sh:namespace "http://www.w3.org/ns/shacl#" ;
+    sh:prefix    "sh" ;
+  ] ;
+    sh:suggestedShapesGraph <http://www.w3.org/ns/shacl-shacl#> .
+
+sh:AbstractResult a         rdfs:Class ;
+                  rdfs:label       "Abstract result"@en ;
+                  rdfs:comment     "The base class of validation results, typically not instantiated directly."@en ;
+                  rdfs:isDefinedBy sh: ;
+                  rdfs:subClassOf  rdfs:Resource .
+
+sh:ConstraintComponent a         rdfs:Class ;
+                       rdfs:label       "Constraint component"@en ;
+                       rdfs:comment     "The class of constraint components."@en ;
+                       rdfs:isDefinedBy sh: ;
+                       rdfs:subClassOf  sh:Parameterizable .
+
+sh:Function a         rdfs:Class ;
+            rdfs:label       "Function"@en ;
+            rdfs:comment     "The class of SHACL functions."@en ;
+            rdfs:isDefinedBy sh: ;
+            rdfs:subClassOf  sh:Parameterizable .
+
+sh:JSConstraint a         rdfs:Class ;
+                rdfs:label       "JavaScript-based constraint"@en ;
+                rdfs:comment     "The class of constraints backed by a JavaScript function."@en ;
+                rdfs:isDefinedBy sh: ;
+                rdfs:subClassOf  sh:JSExecutable .
+
+sh:JSExecutable a         rdfs:Class ;
+                rdfs:label       "JavaScript executable"@en ;
+                rdfs:comment     "Abstract base class of resources that declare an executable JavaScript."@en ;
+                rdfs:isDefinedBy sh: ;
+                rdfs:subClassOf  rdfs:Resource .
+
+sh:JSFunction a         rdfs:Class ;
+              rdfs:label       "JavaScript function"@en ;
+              rdfs:comment     "The class of SHACL functions that execute a JavaScript function when called."@en ;
+              rdfs:isDefinedBy sh: ;
+              rdfs:subClassOf  sh:Function ;
+  rdfs:subClassOf  sh:JSExecutable .
+
+sh:JSLibrary a         rdfs:Class ;
+             rdfs:label       "JavaScript library"@en ;
+             rdfs:comment     "Represents a JavaScript library, typically identified by one or more URLs of files to include."@en ;
+             rdfs:isDefinedBy sh: ;
+             rdfs:subClassOf  rdfs:Resource .
+
+sh:JSRule a         rdfs:Class ;
+          rdfs:label       "JavaScript rule"@en ;
+          rdfs:comment     "The class of SHACL rules expressed using JavaScript."@en ;
+          rdfs:isDefinedBy sh: ;
+          rdfs:subClassOf  sh:JSExecutable ;
+  rdfs:subClassOf  sh:Rule .
+
+sh:JSTarget a         rdfs:Class ;
+            rdfs:label       "JavaScript target"@en ;
+            rdfs:comment     "The class of targets that are based on JavaScript functions."@en ;
+            rdfs:isDefinedBy sh: ;
+            rdfs:subClassOf  sh:JSExecutable ;
+  rdfs:subClassOf  sh:Target .
+
+sh:JSTargetType a         rdfs:Class ;
+                rdfs:label       "JavaScript target type"@en ;
+                rdfs:comment     "The (meta) class for parameterizable targets that are based on JavaScript functions."@en ;
+                rdfs:isDefinedBy sh: ;
+                rdfs:subClassOf  sh:JSExecutable ;
+  rdfs:subClassOf  sh:TargetType .
+
+sh:JSValidator a         rdfs:Class ;
+               rdfs:label       "JavaScript validator"@en ;
+               rdfs:comment     "A SHACL validator based on JavaScript. This can be used to declare SHACL constraint components that perform JavaScript-based validation when used."@en ;
+               rdfs:isDefinedBy sh: ;
+               rdfs:subClassOf  sh:JSExecutable ;
+  rdfs:subClassOf  sh:Validator .
+
+sh:NodeKind a         rdfs:Class ;
+            rdfs:label       "Node kind"@en ;
+            rdfs:comment     "The class of all node kinds, including sh:BlankNode, sh:IRI, sh:Literal or the combinations of these: sh:BlankNodeOrIRI, sh:BlankNodeOrLiteral, sh:IRIOrLiteral."@en ;
+            rdfs:isDefinedBy sh: ;
+            rdfs:subClassOf  rdfs:Resource .
+
+sh:NodeShape a         rdfs:Class ;
+             rdfs:label       "Node shape"@en ;
+             rdfs:comment     "A node shape is a shape that specifies constraint that need to be met with respect to focus nodes."@en ;
+             rdfs:isDefinedBy sh: ;
+             rdfs:subClassOf  sh:Shape .
+
+sh:Parameter a         rdfs:Class ;
+             rdfs:label       "Parameter"@en ;
+             rdfs:comment     "The class of parameter declarations, consisting of a path predicate and (possibly) information about allowed value type, cardinality and other characteristics."@en ;
+             rdfs:isDefinedBy sh: ;
+             rdfs:subClassOf  sh:PropertyShape .
+
+sh:Parameterizable a         rdfs:Class ;
+                   rdfs:label       "Parameterizable"@en ;
+                   rdfs:comment     "Superclass of components that can take parameters, especially functions and constraint components."@en ;
+                   rdfs:isDefinedBy sh: ;
+                   rdfs:subClassOf  rdfs:Resource .
+
+sh:PrefixDeclaration a         rdfs:Class ;
+                     rdfs:label       "Prefix declaration"@en ;
+                     rdfs:comment     "The class of prefix declarations, consisting of pairs of a prefix with a namespace."@en ;
+                     rdfs:isDefinedBy sh: ;
+                     rdfs:subClassOf  rdfs:Resource .
+
+sh:PropertyGroup a         rdfs:Class ;
+                 rdfs:label       "Property group"@en ;
+                 rdfs:comment     "Instances of this class represent groups of property shapes that belong together."@en ;
+                 rdfs:isDefinedBy sh: ;
+                 rdfs:subClassOf  rdfs:Resource .
+
+sh:PropertyShape a         rdfs:Class ;
+                 rdfs:label       "Property shape"@en ;
+                 rdfs:comment     "A property shape is a shape that specifies constraints on the values of a focus node for a given property or path."@en ;
+                 rdfs:isDefinedBy sh: ;
+                 rdfs:subClassOf  sh:Shape .
+
+sh:ResultAnnotation a         rdfs:Class ;
+                    rdfs:label       "Result annotation"@en ;
+                    rdfs:comment     "A class of result annotations, which define the rules to derive the values of a given annotation property as extra values for a validation result."@en ;
+                    rdfs:isDefinedBy sh: ;
+                    rdfs:subClassOf  rdfs:Resource .
+
+sh:Rule a         rdfs:Class ;
+        rdfs:label       "Rule"@en ;
+        rdfs:comment     "The class of SHACL rules. Never instantiated directly."@en ;
+        rdfs:isDefinedBy sh: ;
+        rdfs:subClassOf  rdfs:Resource .
+
+sh:SPARQLAskExecutable a         rdfs:Class ;
+                       rdfs:label       "SPARQL ASK executable"@en ;
+                       rdfs:comment     "The class of SPARQL executables that are based on an ASK query."@en ;
+                       rdfs:isDefinedBy sh: ;
+                       rdfs:subClassOf  sh:SPARQLExecutable .
+
+sh:SPARQLAskValidator a         rdfs:Class ;
+                      rdfs:label       "SPARQL ASK validator"@en ;
+                      rdfs:comment     "The class of validators based on SPARQL ASK queries. The queries are evaluated for each value node and are supposed to return true if the given node conforms."@en ;
+                      rdfs:isDefinedBy sh: ;
+                      rdfs:subClassOf  sh:SPARQLAskExecutable ;
+  rdfs:subClassOf  sh:Validator .
+
+sh:SPARQLConstraint a         rdfs:Class ;
+                    rdfs:label       "SPARQL constraint"@en ;
+                    rdfs:comment     "The class of constraints based on SPARQL SELECT queries."@en ;
+                    rdfs:isDefinedBy sh: ;
+                    rdfs:subClassOf  sh:SPARQLSelectExecutable .
+
+sh:SPARQLConstructExecutable a         rdfs:Class ;
+                             rdfs:label       "SPARQL CONSTRUCT executable"@en ;
+                             rdfs:comment     "The class of SPARQL executables that are based on a CONSTRUCT query."@en ;
+                             rdfs:isDefinedBy sh: ;
+                             rdfs:subClassOf  sh:SPARQLExecutable .
+
+sh:SPARQLExecutable a         rdfs:Class ;
+                    rdfs:label       "SPARQL executable"@en ;
+                    rdfs:comment     "The class of resources that encapsulate a SPARQL query."@en ;
+                    rdfs:isDefinedBy sh: ;
+                    rdfs:subClassOf  rdfs:Resource .
+
+sh:SPARQLFunction a         rdfs:Class ;
+                  rdfs:label       "SPARQL function"@en ;
+                  rdfs:comment     "A function backed by a SPARQL query - either ASK or SELECT."@en ;
+                  rdfs:isDefinedBy sh: ;
+                  rdfs:subClassOf  sh:Function ;
+  rdfs:subClassOf  sh:SPARQLAskExecutable ;
+  rdfs:subClassOf  sh:SPARQLSelectExecutable .
+
+sh:SPARQLRule a         rdfs:Class ;
+              rdfs:label       "SPARQL CONSTRUCT rule"@en ;
+              rdfs:comment     "The class of SHACL rules based on SPARQL CONSTRUCT queries."@en ;
+              rdfs:isDefinedBy sh: ;
+              rdfs:subClassOf  sh:Rule ;
+  rdfs:subClassOf  sh:SPARQLConstructExecutable .
+
+sh:SPARQLSelectExecutable a         rdfs:Class ;
+                          rdfs:label       "SPARQL SELECT executable"@en ;
+                          rdfs:comment     "The class of SPARQL executables based on a SELECT query."@en ;
+                          rdfs:isDefinedBy sh: ;
+                          rdfs:subClassOf  sh:SPARQLExecutable .
+
+sh:SPARQLSelectValidator a         rdfs:Class ;
+                         rdfs:label       "SPARQL SELECT validator"@en ;
+                         rdfs:comment     "The class of validators based on SPARQL SELECT queries. The queries are evaluated for each focus node and are supposed to produce bindings for all focus nodes that do not conform."@en ;
+                         rdfs:isDefinedBy sh: ;
+                         rdfs:subClassOf  sh:SPARQLSelectExecutable ;
+  rdfs:subClassOf  sh:Validator .
+
+sh:SPARQLTarget a         rdfs:Class ;
+                rdfs:label       "SPARQL target"@en ;
+                rdfs:comment     "The class of targets that are based on SPARQL queries."@en ;
+                rdfs:isDefinedBy sh: ;
+                rdfs:subClassOf  sh:SPARQLAskExecutable ;
+  rdfs:subClassOf  sh:SPARQLSelectExecutable ;
+  rdfs:subClassOf  sh:Target .
+
+sh:SPARQLTargetType a         rdfs:Class ;
+                    rdfs:label       "SPARQL target type"@en ;
+                    rdfs:comment     "The (meta) class for parameterizable targets that are based on SPARQL queries."@en ;
+                    rdfs:isDefinedBy sh: ;
+                    rdfs:subClassOf  sh:SPARQLAskExecutable ;
+  rdfs:subClassOf  sh:SPARQLSelectExecutable ;
+  rdfs:subClassOf  sh:TargetType .
+
+sh:SPARQLUpdateExecutable a         rdfs:Class ;
+                          rdfs:label       "SPARQL UPDATE executable"@en ;
+                          rdfs:comment     "The class of SPARQL executables based on a SPARQL UPDATE."@en ;
+                          rdfs:isDefinedBy sh: ;
+                          rdfs:subClassOf  sh:SPARQLExecutable .
+
+sh:Severity a         rdfs:Class ;
+            rdfs:label       "Severity"@en ;
+            rdfs:comment     "The class of validation result severity levels, including violation and warning levels."@en ;
+            rdfs:isDefinedBy sh: ;
+            rdfs:subClassOf  rdfs:Resource .
+
+sh:Shape a         rdfs:Class ;
+         rdfs:label       "Shape"@en ;
+         rdfs:comment     "A shape is a collection of constraints that may be targeted for certain nodes."@en ;
+         rdfs:isDefinedBy sh: ;
+         rdfs:subClassOf  rdfs:Resource .
+
+sh:Target a         rdfs:Class ;
+          rdfs:label       "Target"@en ;
+          rdfs:comment     "The base class of targets such as those based on SPARQL queries."@en ;
+          rdfs:isDefinedBy sh: ;
+          rdfs:subClassOf  rdfs:Resource .
+
+sh:TargetType a         rdfs:Class ;
+              rdfs:label       "Target type"@en ;
+              rdfs:comment     "The (meta) class for parameterizable targets.\tInstances of this are instantiated as values of the sh:target property."@en ;
+              rdfs:isDefinedBy sh: ;
+              rdfs:subClassOf  rdfs:Class ;
+  rdfs:subClassOf  sh:Parameterizable .
+
+sh:TripleRule a         rdfs:Class ;
+              rdfs:label       "A rule based on triple (subject, predicate, object) pattern."@en ;
+              rdfs:isDefinedBy sh: ;
+              rdfs:subClassOf  sh:Rule .
+
+sh:ValidationReport a         rdfs:Class ;
+                    rdfs:label       "Validation report"@en ;
+                    rdfs:comment     "The class of SHACL validation reports."@en ;
+                    rdfs:isDefinedBy sh: ;
+                    rdfs:subClassOf  rdfs:Resource .
+
+sh:ValidationResult a         rdfs:Class ;
+                    rdfs:label       "Validation result"@en ;
+                    rdfs:comment     "The class of validation results."@en ;
+                    rdfs:isDefinedBy sh: ;
+                    rdfs:subClassOf  sh:AbstractResult .
+
+sh:Validator a         rdfs:Class ;
+             rdfs:label       "Validator"@en ;
+             rdfs:comment     "The class of validators, which provide instructions on how to process a constraint definition. This class serves as base class for the SPARQL-based validators and other possible implementations."@en ;
+             rdfs:isDefinedBy sh: ;
+             rdfs:subClassOf  rdfs:Resource .
+
+sh:alternativePath a         rdf:Property ;
+                   rdfs:label       "alternative path"@en ;
+                   rdfs:comment     "The (single) value of this property must be a list of path elements, representing the elements of alternative paths."@en ;
+                   rdfs:isDefinedBy sh: ;
+                   rdfs:range       rdf:List .
+
+sh:and a         rdf:Property ;
+       rdfs:label       "and"@en ;
+       rdfs:comment     "RDF list of shapes to validate the value nodes against."@en ;
+       rdfs:isDefinedBy sh: ;
+       rdfs:range       rdf:List .
+
+sh:annotationProperty a         rdf:Property ;
+                      rdfs:label       "annotation property"@en ;
+                      rdfs:comment     "The annotation property that shall be set."@en ;
+                      rdfs:domain      sh:ResultAnnotation ;
+                      rdfs:isDefinedBy sh: ;
+                      rdfs:range       rdf:Property .
+
+sh:annotationValue a         rdf:Property ;
+                   rdfs:label       "annotation value"@en ;
+                   rdfs:comment     "The (default) values of the annotation property."@en ;
+                   rdfs:domain      sh:ResultAnnotation ;
+                   rdfs:isDefinedBy sh: .
+
+sh:annotationVarName a         rdf:Property ;
+                     rdfs:label       "annotation variable name"@en ;
+                     rdfs:comment     "The name of the SPARQL variable from the SELECT clause that shall be used for the values."@en ;
+                     rdfs:domain      sh:ResultAnnotation ;
+                     rdfs:isDefinedBy sh: ;
+                     rdfs:range       xsd:string .
+
+sh:ask a         rdf:Property ;
+       rdfs:label       "ask"@en ;
+       rdfs:comment     "The SPARQL ASK query to execute."@en ;
+       rdfs:domain      sh:SPARQLAskExecutable ;
+       rdfs:isDefinedBy sh: ;
+       rdfs:range       xsd:string .
+
+sh:class a         rdf:Property ;
+         rdfs:label       "class"@en ;
+         rdfs:comment     "The type that all value nodes must have."@en ;
+         rdfs:isDefinedBy sh: ;
+         rdfs:range       rdfs:Class .
+
+sh:closed a         rdf:Property ;
+          rdfs:label       "closed"@en ;
+          rdfs:comment     "If set to true then the shape is closed."@en ;
+          rdfs:isDefinedBy sh: ;
+          rdfs:range       xsd:boolean .
+
+sh:condition a         rdf:Property ;
+             rdfs:label       "condition"@en ;
+             rdfs:comment     "The shapes that the focus nodes need to conform to before a rule is executed on them."@en ;
+             rdfs:domain      sh:Rule ;
+             rdfs:isDefinedBy sh: ;
+             rdfs:range       sh:Shape .
+
+sh:conforms a         rdf:Property ;
+            rdfs:label       "conforms"@en ;
+            rdfs:comment     "True if the validation did not produce any validation results, and false otherwise."@en ;
+            rdfs:domain      sh:ValidationReport ;
+            rdfs:isDefinedBy sh: ;
+            rdfs:range       xsd:boolean .
+
+sh:construct a         rdf:Property ;
+             rdfs:label       "construct"@en ;
+             rdfs:comment     "The SPARQL CONSTRUCT query to execute."@en ;
+             rdfs:domain      sh:SPARQLConstructExecutable ;
+             rdfs:isDefinedBy sh: ;
+             rdfs:range       xsd:string .
+
+sh:datatype a         rdf:Property ;
+            rdfs:label       "datatype"@en ;
+            rdfs:comment     "Specifies an RDF datatype that all value nodes must have."@en ;
+            rdfs:isDefinedBy sh: ;
+            rdfs:range       rdfs:Datatype .
+
+sh:deactivated a         rdf:Property ;
+               rdfs:label       "deactivated"@en ;
+               rdfs:comment     "If set to true then all nodes conform to this."@en ;
+               rdfs:isDefinedBy sh: ;
+               rdfs:range       xsd:boolean .
+
+sh:declare a         rdf:Property ;
+           rdfs:label       "declare"@en ;
+           rdfs:comment     "Links a resource with its namespace prefix declarations."@en ;
+           rdfs:domain      owl:Ontology ;
+           rdfs:isDefinedBy sh: ;
+           rdfs:range       sh:PrefixDeclaration .
+
+sh:defaultValue a         rdf:Property ;
+                rdfs:label       "default value"@en ;
+                rdfs:comment     "A default value for a property, for example for user interface tools to pre-populate input fields."@en ;
+                rdfs:domain      sh:PropertyShape ;
+                rdfs:isDefinedBy sh: .
+
+sh:description a         rdf:Property ;
+               rdfs:label       "description"@en ;
+               rdfs:comment     "Human-readable descriptions for the property in the context of the surrounding shape."@en ;
+               rdfs:domain      sh:PropertyShape ;
+               rdfs:isDefinedBy sh: .
+
+sh:detail a         rdf:Property ;
+          rdfs:label       "detail"@en ;
+          rdfs:comment     "Links a result with other results that provide more details, for example to describe violations against nested shapes."@en ;
+          rdfs:domain      sh:AbstractResult ;
+          rdfs:isDefinedBy sh: ;
+          rdfs:range       sh:AbstractResult .
+
+sh:disjoint a         rdf:Property ;
+            rdfs:label       "disjoint"@en ;
+            rdfs:comment     "Specifies a property where the set of values must be disjoint with the value nodes."@en ;
+            rdfs:isDefinedBy sh: ;
+            rdfs:range       rdf:Property .
+
+sh:entailment a         rdf:Property ;
+              rdfs:label       "entailment"@en ;
+              rdfs:comment     "An entailment regime that indicates what kind of inferencing is required by a shapes graph."@en ;
+              rdfs:domain      owl:Ontology ;
+              rdfs:isDefinedBy sh: ;
+              rdfs:range       rdfs:Resource .
+
+sh:equals a         rdf:Property ;
+          rdfs:label       "equals"@en ;
+          rdfs:comment     "Specifies a property that must have the same values as the value nodes."@en ;
+          rdfs:isDefinedBy sh: ;
+          rdfs:range       rdf:Property .
+
+sh:expression a         rdf:Property ;
+              rdfs:label       "expression"@en ;
+              rdfs:comment     "The node expression that must return true for the value nodes."@en ;
+              rdfs:isDefinedBy sh: .
+
+sh:filterShape a         rdf:Property ;
+               rdfs:label       "filter shape"@en ;
+               rdfs:comment     "The shape that all input nodes of the expression need to conform to."@en ;
+               rdfs:isDefinedBy sh: ;
+               rdfs:range       sh:Shape .
+
+sh:flags a         rdf:Property ;
+         rdfs:label       "flags"@en ;
+         rdfs:comment     "An optional flag to be used with regular expression pattern matching."@en ;
+         rdfs:isDefinedBy sh: ;
+         rdfs:range       xsd:string .
+
+sh:focusNode a         rdf:Property ;
+             rdfs:label       "focus node"@en ;
+             rdfs:comment     "The focus node that was validated when the result was produced."@en ;
+             rdfs:domain      sh:AbstractResult ;
+             rdfs:isDefinedBy sh: .
+
+sh:group a         rdf:Property ;
+         rdfs:label       "group"@en ;
+         rdfs:comment     "Can be used to link to a property group to indicate that a property shape belongs to a group of related property shapes."@en ;
+         rdfs:domain      sh:PropertyShape ;
+         rdfs:isDefinedBy sh: ;
+         rdfs:range       sh:PropertyGroup .
+
+sh:hasValue a         rdf:Property ;
+            rdfs:label       "has value"@en ;
+            rdfs:comment     "Specifies a value that must be among the value nodes."@en ;
+            rdfs:isDefinedBy sh: .
+
+sh:ignoredProperties a         rdf:Property ;
+                     rdfs:label       "ignored properties"@en ;
+                     rdfs:comment     "An optional RDF list of properties that are also permitted in addition to those explicitly enumerated via sh:property/sh:path."@en ;
+                     rdfs:isDefinedBy sh: ;
+                     rdfs:range       rdf:List .
+
+sh:in a         rdf:Property ;
+      rdfs:label       "in"@en ;
+      rdfs:comment     "Specifies a list of allowed values so that each value node must be among the members of the given list."@en ;
+      rdfs:isDefinedBy sh: ;
+      rdfs:range       rdf:List .
+
+sh:intersection a         rdf:Property ;
+                rdfs:label       "intersection"@en ;
+                rdfs:comment     "A list of node expressions that shall be intersected."@en ;
+                rdfs:isDefinedBy sh: .
+
+sh:inversePath a         rdf:Property ;
+               rdfs:label       "inverse path"@en ;
+               rdfs:comment     "The (single) value of this property represents an inverse path (object to subject)."@en ;
+               rdfs:isDefinedBy sh: ;
+               rdfs:range       rdfs:Resource .
+
+sh:js a         rdf:Property ;
+      rdfs:label       "JavaScript constraint"@en ;
+      rdfs:comment     "Constraints expressed in JavaScript." ;
+      rdfs:isDefinedBy sh: ;
+      rdfs:range       sh:JSConstraint .
+
+sh:jsFunctionName a         rdf:Property ;
+                  rdfs:label       "JavaScript function name"@en ;
+                  rdfs:comment     "The name of the JavaScript function to execute."@en ;
+                  rdfs:domain      sh:JSExecutable ;
+                  rdfs:isDefinedBy sh: ;
+                  rdfs:range       xsd:string .
+
+sh:jsLibrary a         rdf:Property ;
+             rdfs:label       "JavaScript library"@en ;
+             rdfs:comment     "Declares which JavaScript libraries are needed to execute this."@en ;
+             rdfs:isDefinedBy sh: ;
+             rdfs:range       sh:JSLibrary .
+
+sh:jsLibraryURL a         rdf:Property ;
+                rdfs:label       "JavaScript library URL"@en ;
+                rdfs:comment     "Declares the URLs of a JavaScript library. This should be the absolute URL of a JavaScript file. Implementations may redirect those to local files."@en ;
+                rdfs:domain      sh:JSLibrary ;
+                rdfs:isDefinedBy sh: ;
+                rdfs:range       xsd:anyURI .
+
+sh:labelTemplate a         rdf:Property ;
+                 rdfs:label       "label template"@en ;
+                 rdfs:comment     "Outlines how human-readable labels of instances of the associated Parameterizable shall be produced. The values can contain {?paramName} as placeholders for the actual values of the given parameter."@en ;
+                 rdfs:domain      sh:Parameterizable ;
+                 rdfs:isDefinedBy sh: .
+
+sh:languageIn a         rdf:Property ;
+              rdfs:label       "language in"@en ;
+              rdfs:comment     "Specifies a list of language tags that all value nodes must have."@en ;
+              rdfs:isDefinedBy sh: ;
+              rdfs:range       rdf:List .
+
+sh:lessThan a         rdf:Property ;
+            rdfs:label       "less than"@en ;
+            rdfs:comment     "Specifies a property that must have smaller values than the value nodes."@en ;
+            rdfs:isDefinedBy sh: ;
+            rdfs:range       rdf:Property .
+
+sh:lessThanOrEquals a         rdf:Property ;
+                    rdfs:label       "less than or equals"@en ;
+                    rdfs:comment     "Specifies a property that must have smaller or equal values than the value nodes."@en ;
+                    rdfs:isDefinedBy sh: ;
+                    rdfs:range       rdf:Property .
+
+sh:maxCount a         rdf:Property ;
+            rdfs:label       "max count"@en ;
+            rdfs:comment     "Specifies the maximum number of values in the set of value nodes."@en ;
+            rdfs:isDefinedBy sh: ;
+            rdfs:range       xsd:integer .
+
+sh:maxExclusive a         rdf:Property ;
+                rdfs:label       "max exclusive"@en ;
+                rdfs:comment     "Specifies the maximum exclusive value of each value node."@en ;
+                rdfs:isDefinedBy sh: .
+
+sh:maxInclusive a         rdf:Property ;
+                rdfs:label       "max inclusive"@en ;
+                rdfs:comment     "Specifies the maximum inclusive value of each value node."@en ;
+                rdfs:isDefinedBy sh: .
+
+sh:maxLength a         rdf:Property ;
+             rdfs:label       "max length"@en ;
+             rdfs:comment     "Specifies the maximum string length of each value node."@en ;
+             rdfs:isDefinedBy sh: ;
+             rdfs:range       xsd:integer .
+
+sh:message a         rdf:Property ;
+           rdfs:label       "message"@en ;
+           rdfs:comment     "A human-readable message (possibly with placeholders for variables) explaining the cause of the result."@en ;
+           rdfs:isDefinedBy sh: .
+
+sh:minCount a         rdf:Property ;
+            rdfs:label       "min count"@en ;
+            rdfs:comment     "Specifies the minimum number of values in the set of value nodes."@en ;
+            rdfs:isDefinedBy sh: ;
+            rdfs:range       xsd:integer .
+
+sh:minExclusive a         rdf:Property ;
+                rdfs:label       "min exclusive"@en ;
+                rdfs:comment     "Specifies the minimum exclusive value of each value node."@en ;
+                rdfs:isDefinedBy sh: .
+
+sh:minInclusive a         rdf:Property ;
+                rdfs:label       "min inclusive"@en ;
+                rdfs:comment     "Specifies the minimum inclusive value of each value node."@en ;
+                rdfs:isDefinedBy sh: .
+
+sh:minLength a         rdf:Property ;
+             rdfs:label       "min length"@en ;
+             rdfs:comment     "Specifies the minimum string length of each value node."@en ;
+             rdfs:isDefinedBy sh: ;
+             rdfs:range       xsd:integer .
+
+sh:name a         rdf:Property ;
+        rdfs:label       "name"@en ;
+        rdfs:comment     "Human-readable labels for the property in the context of the surrounding shape."@en ;
+        rdfs:domain      sh:PropertyShape ;
+        rdfs:isDefinedBy sh: .
+
+sh:namespace a         rdf:Property ;
+             rdfs:label       "namespace"@en ;
+             rdfs:comment     "The namespace associated with a prefix in a prefix declaration."@en ;
+             rdfs:domain      sh:PrefixDeclaration ;
+             rdfs:isDefinedBy sh: ;
+             rdfs:range       xsd:anyURI .
+
+sh:node a         rdf:Property ;
+        rdfs:label       "node"@en ;
+        rdfs:comment     "Specifies the node shape that all value nodes must conform to."@en ;
+        rdfs:isDefinedBy sh: ;
+        rdfs:range       sh:NodeShape .
+
+sh:nodeKind a         rdf:Property ;
+            rdfs:label       "node kind"@en ;
+            rdfs:comment     "Specifies the node kind (e.g. IRI or literal) each value node."@en ;
+            rdfs:isDefinedBy sh: ;
+            rdfs:range       sh:NodeKind .
+
+sh:nodeValidator a         rdf:Property ;
+                 rdfs:label       "shape validator"@en ;
+                 rdfs:comment     "The validator(s) used to evaluate a constraint in the context of a node shape."@en ;
+                 rdfs:domain      sh:ConstraintComponent ;
+                 rdfs:isDefinedBy sh: ;
+                 rdfs:range       sh:Validator .
+
+sh:nodes a         rdf:Property ;
+         rdfs:label       "nodes"@en ;
+         rdfs:comment     "The node expression producing the input nodes of a filter shape expression."@en ;
+         rdfs:isDefinedBy sh: .
+
+sh:not a         rdf:Property ;
+       rdfs:label       "not"@en ;
+       rdfs:comment     "Specifies a shape that the value nodes must not conform to."@en ;
+       rdfs:isDefinedBy sh: ;
+       rdfs:range       sh:Shape .
+
+sh:object a         rdf:Property ;
+          rdfs:label       "object"@en ;
+          rdfs:comment     "An expression producing the nodes that shall be inferred as objects."@en ;
+          rdfs:domain      sh:TripleRule ;
+          rdfs:isDefinedBy sh: .
+
+sh:oneOrMorePath a         rdf:Property ;
+                 rdfs:label       "one or more path"@en ;
+                 rdfs:comment     "The (single) value of this property represents a path that is matched one or more times."@en ;
+                 rdfs:isDefinedBy sh: ;
+                 rdfs:range       rdfs:Resource .
+
+sh:optional a         rdf:Property ;
+            rdfs:label       "optional"@en ;
+            rdfs:comment     "Indicates whether a parameter is optional."@en ;
+            rdfs:domain      sh:Parameter ;
+            rdfs:isDefinedBy sh: ;
+            rdfs:range       xsd:boolean .
+
+sh:or a         rdf:Property ;
+      rdfs:label       "or"@en ;
+      rdfs:comment     "Specifies a list of shapes so that the value nodes must conform to at least one of the shapes."@en ;
+      rdfs:isDefinedBy sh: ;
+      rdfs:range       rdf:List .
+
+sh:order a         rdf:Property ;
+         rdfs:label       "order"@en ;
+         rdfs:comment     "Specifies the relative order of this compared to its siblings. For example use 0 for the first, 1 for the second."@en ;
+         rdfs:isDefinedBy sh: .
+
+sh:parameter a         rdf:Property ;
+             rdfs:label       "parameter"@en ;
+             rdfs:comment     "The parameters of a function or constraint component."@en ;
+             rdfs:domain      sh:Parameterizable ;
+             rdfs:isDefinedBy sh: ;
+             rdfs:range       sh:Parameter .
+
+sh:path a         rdf:Property ;
+        rdfs:label       "path"@en ;
+        rdfs:comment     "Specifies the property path of a property shape."@en ;
+        rdfs:domain      sh:PropertyShape ;
+        rdfs:isDefinedBy sh: ;
+        rdfs:range       rdfs:Resource .
+
+sh:pattern a         rdf:Property ;
+           rdfs:label       "pattern"@en ;
+           rdfs:comment     "Specifies a regular expression pattern that the string representations of the value nodes must match."@en ;
+           rdfs:isDefinedBy sh: ;
+           rdfs:range       xsd:string .
+
+sh:predicate a         rdf:Property ;
+             rdfs:label       "predicate"@en ;
+             rdfs:comment     "An expression producing the properties that shall be inferred as predicates."@en ;
+             rdfs:domain      sh:TripleRule ;
+             rdfs:isDefinedBy sh: .
+
+sh:prefix a         rdf:Property ;
+          rdfs:label       "prefix"@en ;
+          rdfs:comment     "The prefix of a prefix declaration."@en ;
+          rdfs:domain      sh:PrefixDeclaration ;
+          rdfs:isDefinedBy sh: ;
+          rdfs:range       xsd:string .
+
+sh:prefixes a         rdf:Property ;
+            rdfs:label       "prefixes"@en ;
+            rdfs:comment     "The prefixes that shall be applied before parsing the associated SPARQL query."@en ;
+            rdfs:domain      sh:SPARQLExecutable ;
+            rdfs:isDefinedBy sh: ;
+            rdfs:range       owl:Ontology .
+
+sh:property a         rdf:Property ;
+            rdfs:label       "property"@en ;
+            rdfs:comment     "Links a shape to its property shapes."@en ;
+            rdfs:domain      sh:Shape ;
+            rdfs:isDefinedBy sh: ;
+            rdfs:range       sh:PropertyShape .
+
+sh:propertyValidator a         rdf:Property ;
+                     rdfs:label       "property validator"@en ;
+                     rdfs:comment     "The validator(s) used to evaluate a constraint in the context of a property shape."@en ;
+                     rdfs:domain      sh:ConstraintComponent ;
+                     rdfs:isDefinedBy sh: ;
+                     rdfs:range       sh:Validator .
+
+sh:qualifiedMaxCount a         rdf:Property ;
+                     rdfs:label       "qualified max count"@en ;
+                     rdfs:comment     "The maximum number of value nodes that can conform to the shape."@en ;
+                     rdfs:isDefinedBy sh: ;
+                     rdfs:range       xsd:integer .
+
+sh:qualifiedMinCount a         rdf:Property ;
+                     rdfs:label       "qualified min count"@en ;
+                     rdfs:comment     "The minimum number of value nodes that must conform to the shape."@en ;
+                     rdfs:isDefinedBy sh: ;
+                     rdfs:range       xsd:integer .
+
+sh:qualifiedValueShape a         rdf:Property ;
+                       rdfs:label       "qualified value shape"@en ;
+                       rdfs:comment     "The shape that a specified number of values must conform to."@en ;
+                       rdfs:isDefinedBy sh: ;
+                       rdfs:range       sh:Shape .
+
+sh:qualifiedValueShapesDisjoint a         rdf:Property ;
+                                rdfs:label       "qualified value shapes disjoint"@en ;
+                                rdfs:comment     "Can be used to mark the qualified value shape to be disjoint with its sibling shapes."@en ;
+                                rdfs:isDefinedBy sh: ;
+                                rdfs:range       xsd:boolean .
+
+sh:result a         rdf:Property ;
+          rdfs:label       "result"@en ;
+          rdfs:comment     "The validation results contained in a validation report."@en ;
+          rdfs:domain      sh:ValidationReport ;
+          rdfs:isDefinedBy sh: ;
+          rdfs:range       sh:ValidationResult .
+
+sh:resultAnnotation a         rdf:Property ;
+                    rdfs:label       "result annotation"@en ;
+                    rdfs:comment     "Links a SPARQL validator with zero or more sh:ResultAnnotation instances, defining how to derive additional result properties based on the variables of the SELECT query."@en ;
+                    rdfs:domain      sh:SPARQLSelectValidator ;
+                    rdfs:isDefinedBy sh: ;
+                    rdfs:range       sh:ResultAnnotation .
+
+sh:resultMessage a         rdf:Property ;
+                 rdfs:label       "result message"@en ;
+                 rdfs:comment     "Human-readable messages explaining the cause of the result."@en ;
+                 rdfs:domain      sh:AbstractResult ;
+                 rdfs:isDefinedBy sh: .
+
+sh:resultPath a         rdf:Property ;
+              rdfs:label       "result path"@en ;
+              rdfs:comment     "The path of a validation result, based on the path of the validated property shape."@en ;
+              rdfs:domain      sh:AbstractResult ;
+              rdfs:isDefinedBy sh: ;
+              rdfs:range       rdfs:Resource .
+
+sh:resultSeverity a         rdf:Property ;
+                  rdfs:label       "result severity"@en ;
+                  rdfs:comment     "The severity of the result, e.g. warning."@en ;
+                  rdfs:domain      sh:AbstractResult ;
+                  rdfs:isDefinedBy sh: ;
+                  rdfs:range       sh:Severity .
+
+sh:returnType a         rdf:Property ;
+              rdfs:label       "return type"@en ;
+              rdfs:comment     "The expected type of values returned by the associated function."@en ;
+              rdfs:domain      sh:Function ;
+              rdfs:isDefinedBy sh: ;
+              rdfs:range       rdfs:Class .
+
+sh:rule a         rdf:Property ;
+        rdfs:label       "rule"@en ;
+        rdfs:comment     "The rules linked to a shape."@en ;
+        rdfs:domain      sh:Shape ;
+        rdfs:isDefinedBy sh: ;
+        rdfs:range       sh:Rule .
+
+sh:select a         rdf:Property ;
+          rdfs:label       "select"@en ;
+          rdfs:comment     "The SPARQL SELECT query to execute."@en ;
+          rdfs:domain      sh:SPARQLSelectExecutable ;
+          rdfs:isDefinedBy sh: ;
+          rdfs:range       xsd:string .
+
+sh:severity a         rdf:Property ;
+            rdfs:label       "severity"@en ;
+            rdfs:comment     "Defines the severity that validation results produced by a shape must have. Defaults to sh:Violation."@en ;
+            rdfs:domain      sh:Shape ;
+            rdfs:isDefinedBy sh: ;
+            rdfs:range       sh:Severity .
+
+sh:shapesGraph a         rdf:Property ;
+               rdfs:label       "shapes graph"@en ;
+               rdfs:comment     "Shapes graphs that should be used when validating this data graph."@en ;
+               rdfs:domain      owl:Ontology ;
+               rdfs:isDefinedBy sh: ;
+               rdfs:range       owl:Ontology .
+
+sh:shapesGraphWellFormed a         rdf:Property ;
+                         rdfs:label       "shapes graph well-formed"@en ;
+                         rdfs:comment     "If true then the validation engine was certain that the shapes graph has passed all SHACL syntax requirements during the validation process."@en ;
+                         rdfs:domain      sh:ValidationReport ;
+                         rdfs:isDefinedBy sh: ;
+                         rdfs:range       xsd:boolean .
+
+sh:sourceConstraint a         rdf:Property ;
+                    rdfs:label       "source constraint"@en ;
+                    rdfs:comment     "The constraint that was validated when the result was produced."@en ;
+                    rdfs:domain      sh:AbstractResult ;
+                    rdfs:isDefinedBy sh: .
+
+sh:sourceConstraintComponent a         rdf:Property ;
+                             rdfs:label       "source constraint component"@en ;
+                             rdfs:comment     "The constraint component that is the source of the result."@en ;
+                             rdfs:domain      sh:AbstractResult ;
+                             rdfs:isDefinedBy sh: ;
+                             rdfs:range       sh:ConstraintComponent .
+
+sh:sourceShape a         rdf:Property ;
+               rdfs:label       "source shape"@en ;
+               rdfs:comment     "The shape that is was validated when the result was produced."@en ;
+               rdfs:domain      sh:AbstractResult ;
+               rdfs:isDefinedBy sh: ;
+               rdfs:range       sh:Shape .
+
+sh:sparql a         rdf:Property ;
+          rdfs:label       "constraint (in SPARQL)"@en ;
+          rdfs:comment     "Links a shape with SPARQL constraints."@en ;
+          rdfs:domain      sh:Shape ;
+          rdfs:isDefinedBy sh: ;
+          rdfs:range       sh:SPARQLConstraint .
+
+sh:subject a         rdf:Property ;
+           rdfs:label       "subject"@en ;
+           rdfs:comment     "An expression producing the resources that shall be inferred as subjects."@en ;
+           rdfs:domain      sh:TripleRule ;
+           rdfs:isDefinedBy sh: .
+
+sh:suggestedShapesGraph a         rdf:Property ;
+                        rdfs:label       "suggested shapes graph"@en ;
+                        rdfs:comment     "Suggested shapes graphs for this ontology. The values of this property may be used in the absence of specific sh:shapesGraph statements."@en ;
+                        rdfs:domain      owl:Ontology ;
+                        rdfs:isDefinedBy sh: ;
+                        rdfs:range       owl:Ontology .
+
+sh:target a         rdf:Property ;
+          rdfs:label       "target"@en ;
+          rdfs:comment     "Links a shape to a target specified by an extension language, for example instances of sh:SPARQLTarget."@en ;
+          rdfs:domain      sh:Shape ;
+          rdfs:isDefinedBy sh: ;
+          rdfs:range       sh:Target .
+
+sh:targetClass a         rdf:Property ;
+               rdfs:label       "target class"@en ;
+               rdfs:comment     "Links a shape to a class, indicating that all instances of the class must conform to the shape."@en ;
+               rdfs:domain      sh:Shape ;
+               rdfs:isDefinedBy sh: ;
+               rdfs:range       rdfs:Class .
+
+sh:targetNode a         rdf:Property ;
+              rdfs:label       "target node"@en ;
+              rdfs:comment     "Links a shape to individual nodes, indicating that these nodes must conform to the shape."@en ;
+              rdfs:domain      sh:Shape ;
+              rdfs:isDefinedBy sh: .
+
+sh:targetObjectsOf a         rdf:Property ;
+                   rdfs:label       "target objects of"@en ;
+                   rdfs:comment     "Links a shape to a property, indicating that all all objects of triples that have the given property as their predicate must conform to the shape."@en ;
+                   rdfs:domain      sh:Shape ;
+                   rdfs:isDefinedBy sh: ;
+                   rdfs:range       rdf:Property .
+
+sh:targetSubjectsOf a         rdf:Property ;
+                    rdfs:label       "target subjects of"@en ;
+                    rdfs:comment     "Links a shape to a property, indicating that all subjects of triples that have the given property as their predicate must conform to the shape."@en ;
+                    rdfs:domain      sh:Shape ;
+                    rdfs:isDefinedBy sh: ;
+                    rdfs:range       rdf:Property .
+
+sh:union a         rdf:Property ;
+         rdfs:label       "union"@en ;
+         rdfs:comment     "A list of node expressions that shall be used together."@en ;
+         rdfs:isDefinedBy sh: .
+
+sh:uniqueLang a         rdf:Property ;
+              rdfs:label       "unique languages"@en ;
+              rdfs:comment     "Specifies whether all node values must have a unique (or no) language tag."@en ;
+              rdfs:isDefinedBy sh: ;
+              rdfs:range       xsd:boolean .
+
+sh:update a         rdf:Property ;
+          rdfs:label       "update"@en ;
+          rdfs:comment     "The SPARQL UPDATE to execute."@en ;
+          rdfs:domain      sh:SPARQLUpdateExecutable ;
+          rdfs:isDefinedBy sh: ;
+          rdfs:range       xsd:string .
+
+sh:validator a         rdf:Property ;
+             rdfs:label       "validator"@en ;
+             rdfs:comment     "The validator(s) used to evaluate constraints of either node or property shapes."@en ;
+             rdfs:domain      sh:ConstraintComponent ;
+             rdfs:isDefinedBy sh: ;
+             rdfs:range       sh:Validator .
+
+sh:value a         rdf:Property ;
+         rdfs:label       "value"@en ;
+         rdfs:comment     "An RDF node that has caused the result."@en ;
+         rdfs:domain      sh:AbstractResult ;
+         rdfs:isDefinedBy sh: .
+
+sh:xone a         rdf:Property ;
+        rdfs:label       "exactly one"@en ;
+        rdfs:comment     "Specifies a list of shapes so that the value nodes must conform to exactly one of the shapes."@en ;
+        rdfs:isDefinedBy sh: ;
+        rdfs:range       rdf:List .
+
+sh:zeroOrMorePath a         rdf:Property ;
+                  rdfs:label       "zero or more path"@en ;
+                  rdfs:comment     "The (single) value of this property represents a path that is matched zero or more times."@en ;
+                  rdfs:isDefinedBy sh: ;
+                  rdfs:range       rdfs:Resource .
+
+sh:zeroOrOnePath a         rdf:Property ;
+                 rdfs:label       "zero or one path"@en ;
+                 rdfs:comment     "The (single) value of this property represents a path that is matched zero or one times."@en ;
+                 rdfs:isDefinedBy sh: ;
+                 rdfs:range       rdfs:Resource .
+
+sh:AndConstraintComponent a         sh:ConstraintComponent ;
+                          rdfs:label       "And constraint component"@en ;
+                          rdfs:comment     "A constraint component that can be used to test whether a value node conforms to all members of a provided list of shapes."@en ;
+                          rdfs:isDefinedBy sh: ;
+                          sh:parameter     sh:AndConstraintComponent-and .
+
+sh:AndConstraintComponent-and a         sh:Parameter ;
+                              rdfs:isDefinedBy sh: ;
+                              sh:path          sh:and .
+
+sh:BlankNode a         sh:NodeKind ;
+             rdfs:label       "Blank node"@en ;
+             rdfs:comment     "The node kind of all blank nodes."@en ;
+             rdfs:isDefinedBy sh: .
+
+sh:BlankNodeOrIRI a         sh:NodeKind ;
+                  rdfs:label       "Blank node or IRI"@en ;
+                  rdfs:comment     "The node kind of all blank nodes or IRIs."@en ;
+                  rdfs:isDefinedBy sh: .
+
+sh:BlankNodeOrLiteral a         sh:NodeKind ;
+                      rdfs:label       "Blank node or literal"@en ;
+                      rdfs:comment     "The node kind of all blank nodes or literals."@en ;
+                      rdfs:isDefinedBy sh: .
+
+sh:ClassConstraintComponent a         sh:ConstraintComponent ;
+                            rdfs:label       "Class constraint component"@en ;
+                            rdfs:comment     "A constraint component that can be used to verify that each value node is an instance of a given type."@en ;
+                            rdfs:isDefinedBy sh: ;
+                            sh:parameter     sh:ClassConstraintComponent-class .
+
+sh:ClassConstraintComponent-class a         sh:Parameter ;
+                                  rdfs:isDefinedBy sh: ;
+                                  sh:nodeKind      sh:IRI ;
+                                  sh:path          sh:class .
+
+sh:ClosedConstraintComponent a         sh:ConstraintComponent ;
+                             rdfs:label       "Closed constraint component"@en ;
+                             rdfs:comment     "A constraint component that can be used to indicate that focus nodes must only have values for those properties that have been explicitly enumerated via sh:property/sh:path."@en ;
+                             rdfs:isDefinedBy sh: ;
+                             sh:parameter     sh:ClosedConstraintComponent-closed ;
+  sh:parameter     sh:ClosedConstraintComponent-ignoredProperties .
+
+sh:ClosedConstraintComponent-closed a         sh:Parameter ;
+                                    rdfs:isDefinedBy sh: ;
+                                    sh:datatype      xsd:boolean ;
+                                    sh:path          sh:closed .
+
+sh:ClosedConstraintComponent-ignoredProperties a         sh:Parameter ;
+                                               rdfs:isDefinedBy sh: ;
+                                               sh:optional      true ;
+                                               sh:path          sh:ignoredProperties .
+
+sh:DatatypeConstraintComponent a         sh:ConstraintComponent ;
+                               rdfs:label       "Datatype constraint component"@en ;
+                               rdfs:comment     "A constraint component that can be used to restrict the datatype of all value nodes."@en ;
+                               rdfs:isDefinedBy sh: ;
+                               sh:parameter     sh:DatatypeConstraintComponent-datatype .
+
+sh:DatatypeConstraintComponent-datatype a         sh:Parameter ;
+                                        rdfs:isDefinedBy sh: ;
+                                        sh:maxCount      1 ;
+                                        sh:nodeKind      sh:IRI ;
+                                        sh:path          sh:datatype .
+
+sh:DisjointConstraintComponent a         sh:ConstraintComponent ;
+                               rdfs:label       "Disjoint constraint component"@en ;
+                               rdfs:comment     "A constraint component that can be used to verify that the set of value nodes is disjoint with the the set of nodes that have the focus node as subject and the value of a given property as predicate."@en ;
+                               rdfs:isDefinedBy sh: ;
+                               sh:parameter     sh:DisjointConstraintComponent-disjoint .
+
+sh:DisjointConstraintComponent-disjoint a         sh:Parameter ;
+                                        rdfs:isDefinedBy sh: ;
+                                        sh:nodeKind      sh:IRI ;
+                                        sh:path          sh:disjoint .
+
+sh:EqualsConstraintComponent a         sh:ConstraintComponent ;
+                             rdfs:label       "Equals constraint component"@en ;
+                             rdfs:comment     "A constraint component that can be used to verify that the set of value nodes is equal to the set of nodes that have the focus node as subject and the value of a given property as predicate."@en ;
+                             rdfs:isDefinedBy sh: ;
+                             sh:parameter     sh:EqualsConstraintComponent-equals .
+
+sh:EqualsConstraintComponent-equals a         sh:Parameter ;
+                                    rdfs:isDefinedBy sh: ;
+                                    sh:nodeKind      sh:IRI ;
+                                    sh:path          sh:equals .
+
+sh:ExpressionConstraintComponent a         sh:ConstraintComponent ;
+                                 rdfs:label       "Expression constraint component"@en ;
+                                 rdfs:comment     "A constraint component that can be used to verify that a given node expression produces true for all value nodes."@en ;
+                                 rdfs:isDefinedBy sh: ;
+                                 sh:parameter     sh:ExpressionConstraintComponent-expression .
+
+sh:ExpressionConstraintComponent-expression a         sh:Parameter ;
+                                            rdfs:isDefinedBy sh: ;
+                                            sh:path          sh:expression .
+
+sh:HasValueConstraintComponent a         sh:ConstraintComponent ;
+                               rdfs:label       "Has-value constraint component"@en ;
+                               rdfs:comment     "A constraint component that can be used to verify that one of the value nodes is a given RDF node."@en ;
+                               rdfs:isDefinedBy sh: ;
+                               sh:parameter     sh:HasValueConstraintComponent-hasValue .
+
+sh:HasValueConstraintComponent-hasValue a         sh:Parameter ;
+                                        rdfs:isDefinedBy sh: ;
+                                        sh:path          sh:hasValue .
+
+sh:IRI a         sh:NodeKind ;
+       rdfs:label       "IRI"@en ;
+       rdfs:comment     "The node kind of all IRIs."@en ;
+       rdfs:isDefinedBy sh: .
+
+sh:IRIOrLiteral a         sh:NodeKind ;
+                rdfs:label       "IRI or literal"@en ;
+                rdfs:comment     "The node kind of all IRIs or literals."@en ;
+                rdfs:isDefinedBy sh: .
+
+sh:InConstraintComponent a         sh:ConstraintComponent ;
+                         rdfs:label       "In constraint component"@en ;
+                         rdfs:comment     "A constraint component that can be used to exclusively enumerate the permitted value nodes."@en ;
+                         rdfs:isDefinedBy sh: ;
+                         sh:parameter     sh:InConstraintComponent-in .
+
+sh:InConstraintComponent-in a         sh:Parameter ;
+                            rdfs:isDefinedBy sh: ;
+                            sh:maxCount      1 ;
+                            sh:path          sh:in .
+
+sh:Info a         sh:Severity ;
+        rdfs:label       "Info"@en ;
+        rdfs:comment     "The severity for an informational validation result."@en ;
+        rdfs:isDefinedBy sh: .
+
+sh:JSConstraint-js a         sh:Parameter ;
+                   rdfs:isDefinedBy sh: ;
+                   sh:path          sh:js .
+
+sh:JSConstraintComponent a         sh:ConstraintComponent ;
+                         rdfs:label       "JavaScript constraint component"@en ;
+                         rdfs:comment     "A constraint component with the parameter sh:js linking to a sh:JSConstraint containing a sh:script."@en ;
+                         rdfs:isDefinedBy sh: ;
+                         sh:parameter     sh:JSConstraint-js .
+
+sh:LanguageInConstraintComponent a         sh:ConstraintComponent ;
+                                 rdfs:label       "Language-in constraint component"@en ;
+                                 rdfs:comment     "A constraint component that can be used to enumerate language tags that all value nodes must have."@en ;
+                                 rdfs:isDefinedBy sh: ;
+                                 sh:parameter     sh:LanguageInConstraintComponent-languageIn .
+
+sh:LanguageInConstraintComponent-languageIn a         sh:Parameter ;
+                                            rdfs:isDefinedBy sh: ;
+                                            sh:maxCount      1 ;
+                                            sh:path          sh:languageIn .
+
+sh:LessThanConstraintComponent a         sh:ConstraintComponent ;
+                               rdfs:label       "Less-than constraint component"@en ;
+                               rdfs:comment     "A constraint component that can be used to verify that each value node is smaller than all the nodes that have the focus node as subject and the value of a given property as predicate."@en ;
+                               rdfs:isDefinedBy sh: ;
+                               sh:parameter     sh:LessThanConstraintComponent-lessThan .
+
+sh:LessThanConstraintComponent-lessThan a         sh:Parameter ;
+                                        rdfs:isDefinedBy sh: ;
+                                        sh:nodeKind      sh:IRI ;
+                                        sh:path          sh:lessThan .
+
+sh:LessThanOrEqualsConstraintComponent a         sh:ConstraintComponent ;
+                                       rdfs:label       "less-than-or-equals constraint component"@en ;
+                                       rdfs:comment     "A constraint component that can be used to verify that every value node is smaller than all the nodes that have the focus node as subject and the value of a given property as predicate."@en ;
+                                       rdfs:isDefinedBy sh: ;
+                                       sh:parameter     sh:LessThanOrEqualsConstraintComponent-lessThanOrEquals .
+
+sh:LessThanOrEqualsConstraintComponent-lessThanOrEquals a         sh:Parameter ;
+                                                        rdfs:isDefinedBy sh: ;
+                                                        sh:nodeKind      sh:IRI ;
+                                                        sh:path          sh:lessThanOrEquals .
+
+sh:Literal a         sh:NodeKind ;
+           rdfs:label       "Literal"@en ;
+           rdfs:comment     "The node kind of all literals."@en ;
+           rdfs:isDefinedBy sh: .
+
+sh:MaxCountConstraintComponent a         sh:ConstraintComponent ;
+                               rdfs:label       "Max-count constraint component"@en ;
+                               rdfs:comment     "A constraint component that can be used to restrict the maximum number of value nodes."@en ;
+                               rdfs:isDefinedBy sh: ;
+                               sh:parameter     sh:MaxCountConstraintComponent-maxCount .
+
+sh:MaxCountConstraintComponent-maxCount a         sh:Parameter ;
+                                        rdfs:isDefinedBy sh: ;
+                                        sh:datatype      xsd:integer ;
+                                        sh:maxCount      1 ;
+                                        sh:path          sh:maxCount .
+
+sh:MaxExclusiveConstraintComponent a         sh:ConstraintComponent ;
+                                   rdfs:label       "Max-exclusive constraint component"@en ;
+                                   rdfs:comment     "A constraint component that can be used to restrict the range of value nodes with a maximum exclusive value."@en ;
+                                   rdfs:isDefinedBy sh: ;
+                                   sh:parameter     sh:MaxExclusiveConstraintComponent-maxExclusive .
+
+sh:MaxExclusiveConstraintComponent-maxExclusive a         sh:Parameter ;
+                                                rdfs:isDefinedBy sh: ;
+                                                sh:maxCount      1 ;
+                                                sh:nodeKind      sh:Literal ;
+                                                sh:path          sh:maxExclusive .
+
+sh:MaxInclusiveConstraintComponent a         sh:ConstraintComponent ;
+                                   rdfs:label       "Max-inclusive constraint component"@en ;
+                                   rdfs:comment     "A constraint component that can be used to restrict the range of value nodes with a maximum inclusive value."@en ;
+                                   rdfs:isDefinedBy sh: ;
+                                   sh:parameter     sh:MaxInclusiveConstraintComponent-maxInclusive .
+
+sh:MaxInclusiveConstraintComponent-maxInclusive a         sh:Parameter ;
+                                                rdfs:isDefinedBy sh: ;
+                                                sh:maxCount      1 ;
+                                                sh:nodeKind      sh:Literal ;
+                                                sh:path          sh:maxInclusive .
+
+sh:MaxLengthConstraintComponent a         sh:ConstraintComponent ;
+                                rdfs:label       "Max-length constraint component"@en ;
+                                rdfs:comment     "A constraint component that can be used to restrict the maximum string length of value nodes."@en ;
+                                rdfs:isDefinedBy sh: ;
+                                sh:parameter     sh:MaxLengthConstraintComponent-maxLength .
+
+sh:MaxLengthConstraintComponent-maxLength a         sh:Parameter ;
+                                          rdfs:isDefinedBy sh: ;
+                                          sh:datatype      xsd:integer ;
+                                          sh:maxCount      1 ;
+                                          sh:path          sh:maxLength .
+
+sh:MinCountConstraintComponent a         sh:ConstraintComponent ;
+                               rdfs:label       "Min-count constraint component"@en ;
+                               rdfs:comment     "A constraint component that can be used to restrict the minimum number of value nodes."@en ;
+                               rdfs:isDefinedBy sh: ;
+                               sh:parameter     sh:MinCountConstraintComponent-minCount .
+
+sh:MinCountConstraintComponent-minCount a         sh:Parameter ;
+                                        rdfs:isDefinedBy sh: ;
+                                        sh:datatype      xsd:integer ;
+                                        sh:maxCount      1 ;
+                                        sh:path          sh:minCount .
+
+sh:MinExclusiveConstraintComponent a         sh:ConstraintComponent ;
+                                   rdfs:label       "Min-exclusive constraint component"@en ;
+                                   rdfs:comment     "A constraint component that can be used to restrict the range of value nodes with a minimum exclusive value."@en ;
+                                   rdfs:isDefinedBy sh: ;
+                                   sh:parameter     sh:MinExclusiveConstraintComponent-minExclusive .
+
+sh:MinExclusiveConstraintComponent-minExclusive a         sh:Parameter ;
+                                                rdfs:isDefinedBy sh: ;
+                                                sh:maxCount      1 ;
+                                                sh:nodeKind      sh:Literal ;
+                                                sh:path          sh:minExclusive .
+
+sh:MinInclusiveConstraintComponent a         sh:ConstraintComponent ;
+                                   rdfs:label       "Min-inclusive constraint component"@en ;
+                                   rdfs:comment     "A constraint component that can be used to restrict the range of value nodes with a minimum inclusive value."@en ;
+                                   rdfs:isDefinedBy sh: ;
+                                   sh:parameter     sh:MinInclusiveConstraintComponent-minInclusive .
+
+sh:MinInclusiveConstraintComponent-minInclusive a         sh:Parameter ;
+                                                rdfs:isDefinedBy sh: ;
+                                                sh:maxCount      1 ;
+                                                sh:nodeKind      sh:Literal ;
+                                                sh:path          sh:minInclusive .
+
+sh:MinLengthConstraintComponent a         sh:ConstraintComponent ;
+                                rdfs:label       "Min-length constraint component"@en ;
+                                rdfs:comment     "A constraint component that can be used to restrict the minimum string length of value nodes."@en ;
+                                rdfs:isDefinedBy sh: ;
+                                sh:parameter     sh:MinLengthConstraintComponent-minLength .
+
+sh:MinLengthConstraintComponent-minLength a         sh:Parameter ;
+                                          rdfs:isDefinedBy sh: ;
+                                          sh:datatype      xsd:integer ;
+                                          sh:maxCount      1 ;
+                                          sh:path          sh:minLength .
+
+sh:NodeConstraintComponent a         sh:ConstraintComponent ;
+                           rdfs:label       "Node constraint component"@en ;
+                           rdfs:comment     "A constraint component that can be used to verify that all value nodes conform to the given node shape."@en ;
+                           rdfs:isDefinedBy sh: ;
+                           sh:parameter     sh:NodeConstraintComponent-node .
+
+sh:NodeConstraintComponent-node a         sh:Parameter ;
+                                rdfs:isDefinedBy sh: ;
+                                sh:path          sh:node .
+
+sh:NodeKindConstraintComponent a         sh:ConstraintComponent ;
+                               rdfs:label       "Node-kind constraint component"@en ;
+                               rdfs:comment     "A constraint component that can be used to restrict the RDF node kind of each value node."@en ;
+                               rdfs:isDefinedBy sh: ;
+                               sh:parameter     sh:NodeKindConstraintComponent-nodeKind .
+
+sh:NodeKindConstraintComponent-nodeKind a         sh:Parameter ;
+                                        rdfs:isDefinedBy sh: ;
+                                        sh:in ( sh:BlankNode sh:IRI sh:Literal sh:BlankNodeOrIRI
+    sh:BlankNodeOrLiteral sh:IRIOrLiteral ) ;
+                                        sh:maxCount      1 ;
+                                        sh:path          sh:nodeKind .
+
+sh:NotConstraintComponent a         sh:ConstraintComponent ;
+                          rdfs:label       "Not constraint component"@en ;
+                          rdfs:comment     "A constraint component that can be used to verify that value nodes do not conform to a given shape."@en ;
+                          rdfs:isDefinedBy sh: ;
+                          sh:parameter     sh:NotConstraintComponent-not .
+
+sh:NotConstraintComponent-not a         sh:Parameter ;
+                              rdfs:isDefinedBy sh: ;
+                              sh:path          sh:not .
+
+sh:OrConstraintComponent a         sh:ConstraintComponent ;
+                         rdfs:label       "Or constraint component"@en ;
+                         rdfs:comment     "A constraint component that can be used to restrict the value nodes so that they conform to at least one out of several provided shapes."@en ;
+                         rdfs:isDefinedBy sh: ;
+                         sh:parameter     sh:OrConstraintComponent-or .
+
+sh:OrConstraintComponent-or a         sh:Parameter ;
+                            rdfs:isDefinedBy sh: ;
+                            sh:path          sh:or .
+
+sh:PatternConstraintComponent a         sh:ConstraintComponent ;
+                              rdfs:label       "Pattern constraint component"@en ;
+                              rdfs:comment     "A constraint component that can be used to verify that every value node matches a given regular expression."@en ;
+                              rdfs:isDefinedBy sh: ;
+                              sh:parameter     sh:PatternConstraintComponent-flags ;
+  sh:parameter     sh:PatternConstraintComponent-pattern .
+
+sh:PatternConstraintComponent-flags a         sh:Parameter ;
+                                    rdfs:isDefinedBy sh: ;
+                                    sh:datatype      xsd:string ;
+                                    sh:optional      true ;
+                                    sh:path          sh:flags .
+
+sh:PatternConstraintComponent-pattern a         sh:Parameter ;
+                                      rdfs:isDefinedBy sh: ;
+                                      sh:datatype      xsd:string ;
+                                      sh:path          sh:pattern .
+
+sh:PropertyConstraintComponent a         sh:ConstraintComponent ;
+                               rdfs:label       "Property constraint component"@en ;
+                               rdfs:comment     "A constraint component that can be used to verify that all value nodes conform to the given property shape."@en ;
+                               rdfs:isDefinedBy sh: ;
+                               sh:parameter     sh:PropertyConstraintComponent-property .
+
+sh:PropertyConstraintComponent-property a         sh:Parameter ;
+                                        rdfs:isDefinedBy sh: ;
+                                        sh:path          sh:property .
+
+sh:QualifiedMaxCountConstraintComponent a         sh:ConstraintComponent ;
+                                        rdfs:label       "Qualified-max-count constraint component"@en ;
+                                        rdfs:comment     "A constraint component that can be used to verify that a specified maximum number of value nodes conforms to a given shape."@en ;
+                                        rdfs:isDefinedBy sh: ;
+                                        sh:parameter     sh:QualifiedMaxCountConstraintComponent-qualifiedMaxCount ;
+  sh:parameter     sh:QualifiedMaxCountConstraintComponent-qualifiedValueShape ;
+  sh:parameter     sh:QualifiedMaxCountConstraintComponent-qualifiedValueShapesDisjoint .
+
+sh:QualifiedMaxCountConstraintComponent-qualifiedMaxCount a         sh:Parameter ;
+                                                          rdfs:isDefinedBy sh: ;
+                                                          sh:datatype      xsd:integer ;
+                                                          sh:path          sh:qualifiedMaxCount .
+
+sh:QualifiedMaxCountConstraintComponent-qualifiedValueShape a         sh:Parameter ;
+                                                            rdfs:isDefinedBy sh: ;
+                                                            sh:path          sh:qualifiedValueShape .
+
+sh:QualifiedMaxCountConstraintComponent-qualifiedValueShapesDisjoint a         sh:Parameter ;
+                                                                     rdfs:isDefinedBy sh: ;
+                                                                     sh:datatype      xsd:boolean ;
+                                                                     sh:optional      true ;
+                                                                     sh:path          sh:qualifiedValueShapesDisjoint .
+
+sh:QualifiedMinCountConstraintComponent a         sh:ConstraintComponent ;
+                                        rdfs:label       "Qualified-min-count constraint component"@en ;
+                                        rdfs:comment     "A constraint component that can be used to verify that a specified minimum number of value nodes conforms to a given shape."@en ;
+                                        rdfs:isDefinedBy sh: ;
+                                        sh:parameter     sh:QualifiedMinCountConstraintComponent-qualifiedMinCount ;
+  sh:parameter     sh:QualifiedMinCountConstraintComponent-qualifiedValueShape ;
+  sh:parameter     sh:QualifiedMinCountConstraintComponent-qualifiedValueShapesDisjoint .
+
+sh:QualifiedMinCountConstraintComponent-qualifiedMinCount a         sh:Parameter ;
+                                                          rdfs:isDefinedBy sh: ;
+                                                          sh:datatype      xsd:integer ;
+                                                          sh:path          sh:qualifiedMinCount .
+
+sh:QualifiedMinCountConstraintComponent-qualifiedValueShape a         sh:Parameter ;
+                                                            rdfs:isDefinedBy sh: ;
+                                                            sh:path          sh:qualifiedValueShape .
+
+sh:QualifiedMinCountConstraintComponent-qualifiedValueShapesDisjoint a         sh:Parameter ;
+                                                                     rdfs:isDefinedBy sh: ;
+                                                                     sh:datatype      xsd:boolean ;
+                                                                     sh:optional      true ;
+                                                                     sh:path          sh:qualifiedValueShapesDisjoint .
+
+sh:SPARQLConstraintComponent a         sh:ConstraintComponent ;
+                             rdfs:label       "SPARQL constraint component"@en ;
+                             rdfs:comment     "A constraint component that can be used to define constraints based on SPARQL queries."@en ;
+                             rdfs:isDefinedBy sh: ;
+                             sh:parameter     sh:SPARQLConstraintComponent-sparql .
+
+sh:SPARQLConstraintComponent-sparql a         sh:Parameter ;
+                                    rdfs:isDefinedBy sh: ;
+                                    sh:path          sh:sparql .
+
+sh:UniqueLangConstraintComponent a         sh:ConstraintComponent ;
+                                 rdfs:label       "Unique-languages constraint component"@en ;
+                                 rdfs:comment     "A constraint component that can be used to specify that no pair of value nodes may use the same language tag."@en ;
+                                 rdfs:isDefinedBy sh: ;
+                                 sh:parameter     sh:UniqueLangConstraintComponent-uniqueLang .
+
+sh:UniqueLangConstraintComponent-uniqueLang a         sh:Parameter ;
+                                            rdfs:isDefinedBy sh: ;
+                                            sh:datatype      xsd:boolean ;
+                                            sh:maxCount      1 ;
+                                            sh:path          sh:uniqueLang .
+
+sh:Violation a         sh:Severity ;
+             rdfs:label       "Violation"@en ;
+             rdfs:comment     "The severity for a violation validation result."@en ;
+             rdfs:isDefinedBy sh: .
+
+sh:Warning a         sh:Severity ;
+           rdfs:label       "Warning"@en ;
+           rdfs:comment     "The severity for a warning validation result."@en ;
+           rdfs:isDefinedBy sh: .
+
+sh:XoneConstraintComponent a         sh:ConstraintComponent ;
+                           rdfs:label       "Exactly one constraint component"@en ;
+                           rdfs:comment     "A constraint component that can be used to restrict the value nodes so that they conform to exactly one out of several provided shapes."@en ;
+                           rdfs:isDefinedBy sh: ;
+                           sh:parameter     sh:XoneConstraintComponent-xone .
+
+sh:XoneConstraintComponent-xone a         sh:Parameter ;
+                                rdfs:isDefinedBy sh: ;
+                                sh:path          sh:xone .
+
+sh:this a         rdfs:Resource ;
+        rdfs:label       "this"@en ;
+        rdfs:comment     "A node expression that represents the current focus node."@en ;
+        rdfs:isDefinedBy sh: .
+
diff --git a/testlib/src/main/resources/rdf/ttl/input/shacl-shacl.ttl b/testlib/src/main/resources/rdf/ttl/input/shacl-shacl.ttl
new file mode 100644
index 0000000000..26e18590cc
--- /dev/null
+++ b/testlib/src/main/resources/rdf/ttl/input/shacl-shacl.ttl
@@ -0,0 +1,410 @@
+# baseURI: http://www.w3.org/ns/shacl-shacl#
+
+# A SHACL shapes graph to validate SHACL shapes graphs
+# Draft last edited 2017-04-04
+
+@prefix rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix sh:   <http://www.w3.org/ns/shacl#> .
+@prefix xsd:  <http://www.w3.org/2001/XMLSchema#> .
+
+@prefix shsh: <http://www.w3.org/ns/shacl-shacl#> .
+
+shsh:
+	rdfs:label "SHACL for SHACL"@en ;
+	rdfs:comment "This shapes graph can be used to validate SHACL shapes graphs against a subset of the syntax rules."@en ;
+	sh:declare [
+		sh:prefix "shsh" ;
+		sh:namespace "http://www.w3.org/ns/shacl-shacl#" ;
+	] .
+
+
+shsh:ListShape
+	a sh:NodeShape ;
+	rdfs:label "List shape"@en ;
+	rdfs:comment "A shape describing well-formed RDF lists. Currently does not check for non-recursion. This could be expressed using SHACL-SPARQL."@en ;
+	rdfs:seeAlso <https://www.w3.org/TR/shacl/#syntax-rule-SHACL-list> ;
+	sh:property [
+		sh:path [ sh:zeroOrMorePath rdf:rest ] ;
+		rdfs:comment "Each list member (including this node) must be have the shape shsh:ListNodeShape."@en ;
+		sh:hasValue rdf:nil ;
+		sh:node shsh:ListNodeShape ;
+	] .
+
+shsh:ListNodeShape
+	a sh:NodeShape ;
+	rdfs:label "List node shape"@en ;
+	rdfs:comment "Defines constraints on what it means for a node to be a node within a well-formed RDF list. Note that this does not check whether the rdf:rest items are also well-formed lists as this would lead to unsupported recursion."@en ;
+	sh:or ( [
+				sh:hasValue rdf:nil ;
+        		sh:property [
+					sh:path rdf:first ;
+					sh:maxCount 0 ;
+				] ;
+				sh:property [
+					sh:path rdf:rest ;
+					sh:maxCount 0 ;
+				] ;
+			]
+			[
+				sh:not [ sh:hasValue rdf:nil ] ;
+				sh:property [
+					sh:path rdf:first ;
+					sh:maxCount 1 ;
+					sh:minCount 1 ;
+				] ;
+				sh:property [
+					sh:path rdf:rest ;
+					sh:maxCount 1 ;
+					sh:minCount 1 ;
+				] ;
+			] ) .
+
+shsh:ShapeShape
+	a sh:NodeShape ;
+	rdfs:label "Shape shape"@en ;
+	rdfs:comment "A shape that can be used to validate syntax rules for other shapes."@en ;
+
+	# See https://www.w3.org/TR/shacl/#shapes for what counts as a shape
+	sh:targetClass sh:NodeShape ;
+	sh:targetClass sh:PropertyShape ;
+	sh:targetSubjectsOf sh:targetClass, sh:targetNode, sh:targetObjectsOf, sh:targetSubjectsOf ;
+	sh:targetSubjectsOf sh:and, sh:class, sh:closed, sh:datatype, sh:disjoint, sh:equals, sh:flags, sh:hasValue,
+		sh:ignoredProperties, sh:in, sh:languageIn, sh:lessThan, sh:lessThanOrEquals, sh:maxCount, sh:maxExclusive,
+		sh:maxInclusive, sh:maxLength, sh:minCount, sh:minExclusive, sh:minInclusive, sh:minLength, sh:node, sh:nodeKind,
+		sh:not, sh:or, sh:pattern, sh:property, sh:qualifiedMaxCount, sh:qualifiedMinCount, sh:qualifiedValueShape,
+		sh:qualifiedValueShape, sh:qualifiedValueShapesDisjoint, sh:qualifiedValueShapesDisjoint, sh:sparql, sh:uniqueLang, sh:xone ;
+
+	sh:targetObjectsOf sh:node ;        # node-node
+	sh:targetObjectsOf sh:not ;         # not-node
+	sh:targetObjectsOf sh:property ;    # property-node
+	sh:targetObjectsOf sh:qualifiedValueShape ; # qualifiedValueShape-node
+
+	# Shapes are either node shapes or property shapes
+	sh:xone ( shsh:NodeShapeShape shsh:PropertyShapeShape ) ;
+
+	sh:property [
+		sh:path sh:targetNode ;
+		sh:nodeKind	sh:IRIOrLiteral ;   # targetNode-nodeKind
+	] ;
+	sh:property [
+		sh:path sh:targetClass ;
+		sh:nodeKind sh:IRI ;            # targetClass-nodeKind
+	] ;
+	sh:property [
+		sh:path sh:targetSubjectsOf ;
+		sh:nodeKind sh:IRI ;            # targetSubjectsOf-nodeKind
+	] ;
+	sh:property [
+		sh:path sh:targetObjectsOf ;
+		sh:nodeKind sh:IRI ;            # targetObjectsOf-nodeKind
+	] ;
+	sh:or ( [ sh:not [
+				sh:class rdfs:Class ;
+				sh:or ( [ sh:class sh:NodeShape ] [ sh:class sh:PropertyShape ] )
+			] ]
+			[ sh:nodeKind sh:IRI ]
+		  ) ;                           # implicit-targetClass-nodeKind
+
+	sh:property [
+		sh:path sh:severity ;
+		sh:maxCount 1 ;                 # severity-maxCount
+		sh:nodeKind sh:IRI ;            # severity-nodeKind
+	] ;
+	sh:property [
+		sh:path sh:message ;
+		sh:or ( [ sh:datatype xsd:string ] [ sh:datatype rdf:langString ] ) ;   # message-datatype
+	] ;
+	sh:property [
+		sh:path sh:deactivated ;
+		sh:maxCount 1 ;                 # deactivated-maxCount
+		sh:in ( true false ) ;          # deactivated-datatype
+	] ;
+
+	sh:property [
+		sh:path sh:and ;
+		sh:node shsh:ListShape ;        # and-node
+	] ;
+	sh:property [
+		sh:path sh:class ;
+		sh:nodeKind sh:IRI ;            # class-nodeKind
+	] ;
+	sh:property [
+		sh:path sh:closed ;
+		sh:datatype xsd:boolean ;       # closed-datatype
+		sh:maxCount 1 ;                 # multiple-parameters
+	] ;
+	sh:property [
+		sh:path sh:ignoredProperties ;
+		sh:node shsh:ListShape ;        # ignoredProperties-node
+		sh:maxCount 1 ;                 # multiple-parameters
+	] ;
+	sh:property [
+		sh:path ( sh:ignoredProperties [ sh:zeroOrMorePath rdf:rest ] rdf:first ) ;
+		sh:nodeKind sh:IRI ;            # ignoredProperties-members-nodeKind
+	] ;
+	sh:property [
+		sh:path sh:datatype ;
+		sh:nodeKind sh:IRI ;            # datatype-nodeKind
+		sh:maxCount 1 ;                 # datatype-maxCount
+	] ;
+	sh:property [
+		sh:path sh:disjoint ;
+		sh:nodeKind sh:IRI ;            # disjoint-nodeKind
+	] ;
+	sh:property [
+		sh:path sh:equals ;
+		sh:nodeKind sh:IRI ;            # equals-nodeKind
+	] ;
+	sh:property [
+		sh:path sh:in ;
+		sh:maxCount 1 ;                 # in-maxCount
+		sh:node shsh:ListShape ;        # in-node
+	] ;
+	sh:property [
+		sh:path sh:languageIn ;
+		sh:maxCount 1 ;                 # languageIn-maxCount
+		sh:node shsh:ListShape ;        # languageIn-node
+	] ;
+	sh:property [
+		sh:path ( sh:languageIn [ sh:zeroOrMorePath rdf:rest ] rdf:first ) ;
+		sh:datatype xsd:string ;        # languageIn-members-datatype
+	] ;
+	sh:property [
+		sh:path sh:lessThan ;
+		sh:nodeKind sh:IRI ;            # lessThan-nodeKind
+	] ;
+	sh:property [
+		sh:path sh:lessThanOrEquals ;
+		sh:nodeKind sh:IRI ;            # lessThanOrEquals-nodeKind
+	] ;
+	sh:property [
+		sh:path sh:maxCount ;
+		sh:datatype xsd:integer ;       # maxCount-datatype
+		sh:maxCount 1 ;                 # maxCount-maxCount
+	] ;
+	sh:property [
+		sh:path sh:maxExclusive ;
+		sh:maxCount 1 ;                 # maxExclusive-maxCount
+		sh:nodeKind sh:Literal ;        # maxExclusive-nodeKind
+	] ;
+	sh:property [
+		sh:path sh:maxInclusive ;
+		sh:maxCount 1 ;                 # maxInclusive-maxCount
+		sh:nodeKind sh:Literal ;        # maxInclusive-nodeKind
+	] ;
+	sh:property [
+		sh:path sh:maxLength ;
+		sh:datatype xsd:integer ;       # maxLength-datatype
+		sh:maxCount 1 ;                 # maxLength-maxCount
+	] ;
+	sh:property [
+		sh:path sh:minCount ;
+		sh:datatype xsd:integer ;       # minCount-datatype
+		sh:maxCount 1 ;                 # minCount-maxCount
+	] ;
+	sh:property [
+		sh:path sh:minExclusive ;
+		sh:maxCount 1 ;                 # minExclusive-maxCount
+		sh:nodeKind sh:Literal ;        # minExclusive-nodeKind
+	] ;
+	sh:property [
+		sh:path sh:minInclusive ;
+		sh:maxCount 1 ;                 # minInclusive-maxCount
+		sh:nodeKind sh:Literal ;        # minInclusive-nodeKind
+	] ;
+	sh:property [
+		sh:path sh:minLength ;
+		sh:datatype xsd:integer ;       # minLength-datatype
+		sh:maxCount 1 ;                 # minLength-maxCount
+	] ;
+	sh:property [
+		sh:path sh:nodeKind ;
+		sh:in ( sh:BlankNode sh:IRI sh:Literal sh:BlankNodeOrIRI sh:BlankNodeOrLiteral sh:IRIOrLiteral ) ;	# nodeKind-in
+		sh:maxCount 1 ;                 # nodeKind-maxCount
+	] ;
+	sh:property [
+		sh:path sh:or ;
+		sh:node shsh:ListShape ;        # or-node
+	] ;
+	sh:property [
+		sh:path sh:pattern ;
+		sh:datatype xsd:string ;        # pattern-datatype
+		sh:maxCount 1 ;                 # multiple-parameters
+		# Not implemented: syntax rule pattern-regex
+	] ;
+	sh:property [
+		sh:path sh:flags ;
+		sh:datatype xsd:string ;        # flags-datatype
+		sh:maxCount 1 ;                 # multiple-parameters
+	] ;
+	sh:property [
+		sh:path sh:qualifiedMaxCount ;
+		sh:datatype xsd:integer ;       # qualifiedMaxCount-datatype
+		sh:maxCount 1 ;                 # multiple-parameters
+	] ;
+	sh:property [
+		sh:path sh:qualifiedMinCount ;
+		sh:datatype xsd:integer ;       # qualifiedMinCount-datatype
+		sh:maxCount 1 ;                 # multiple-parameters
+	] ;
+	sh:property [
+		sh:path sh:qualifiedValueShape ;
+		sh:maxCount 1 ;                 # multiple-parameters
+	] ;
+	sh:property [
+		sh:path sh:qualifiedValueShapesDisjoint ;
+		sh:datatype xsd:boolean ;       # qualifiedValueShapesDisjoint-datatype
+		sh:maxCount 1 ;                 # multiple-parameters
+	] ;
+	sh:property [
+		sh:path sh:uniqueLang ;
+		sh:datatype xsd:boolean ;       # uniqueLang-datatype
+		sh:maxCount 1 ;                 # uniqueLang-maxCount
+	] ;
+	sh:property [
+		sh:path sh:xone ;
+		sh:node shsh:ListShape ;        # xone-node
+	] .
+
+shsh:NodeShapeShape
+	a sh:NodeShape ;
+	sh:targetObjectsOf sh:node ;        # node-node
+	sh:property [
+		sh:path sh:path ;
+		sh:maxCount 0 ;                 # NodeShape-path-maxCount
+	] ;
+	sh:property [
+		sh:path sh:lessThan ;
+		sh:maxCount 0 ;                 # lessThan-scope
+	] ;
+	sh:property [
+		sh:path sh:lessThanOrEquals ;
+		sh:maxCount 0 ;                 # lessThanOrEquals-scope
+	] ;
+	sh:property [
+		sh:path sh:maxCount ;
+		sh:maxCount 0 ;                 # maxCount-scope
+	] ;
+	sh:property [
+		sh:path sh:minCount ;
+		sh:maxCount 0 ;                 # minCount-scope
+	] ;
+	sh:property [
+		sh:path sh:qualifiedValueShape ;
+		sh:maxCount 0 ;                 # qualifiedValueShape-scope
+	] ;
+	sh:property [
+		sh:path sh:uniqueLang ;
+		sh:maxCount 0 ;                 # uniqueLang-scope
+	] .
+
+shsh:PropertyShapeShape
+	a sh:NodeShape ;
+	sh:targetObjectsOf sh:property ;    # property-node
+	sh:property [
+		sh:path sh:path ;
+		sh:maxCount 1 ;                 # path-maxCount
+		sh:minCount 1 ;                 # PropertyShape-path-minCount
+		sh:node shsh:PathShape ;        # path-node
+	] .
+
+# Values of sh:and, sh:or and sh:xone must be lists of shapes
+shsh:ShapesListShape
+	a sh:NodeShape ;
+	sh:targetObjectsOf sh:and ;         # and-members-node
+	sh:targetObjectsOf sh:or ;          # or-members-node
+	sh:targetObjectsOf sh:xone ;        # xone-members-node
+	sh:property [
+		sh:path ( [ sh:zeroOrMorePath rdf:rest ] rdf:first ) ;
+		sh:node shsh:ShapeShape ;
+	] .
+
+
+# A path of blank node path syntax, used to simulate recursion
+_:PathPath
+	sh:alternativePath (
+		( [ sh:zeroOrMorePath rdf:rest ] rdf:first )
+		( sh:alternativePath [ sh:zeroOrMorePath rdf:rest ] rdf:first )
+		sh:inversePath
+		sh:zeroOrMorePath
+		sh:oneOrMorePath
+		sh:zeroOrOnePath
+	) .
+
+shsh:PathShape
+	a sh:NodeShape ;
+	rdfs:label "Path shape"@en ;
+	rdfs:comment "A shape that can be used to validate the syntax rules of well-formed SHACL paths."@en ;
+	rdfs:seeAlso <https://www.w3.org/TR/shacl/#property-paths> ;
+	sh:property [
+		sh:path [ sh:zeroOrMorePath _:PathPath ] ;
+		sh:node shsh:PathNodeShape ;
+	] .
+
+shsh:PathNodeShape
+	sh:xone (                           # path-metarule
+			[ sh:nodeKind sh:IRI ]          # 2.3.1.1: Predicate path
+			[ sh:nodeKind sh:BlankNode ;    # 2.3.1.2: Sequence path
+			  sh:node shsh:PathListWithAtLeast2Members ;
+			]
+			[ sh:nodeKind sh:BlankNode ;    # 2.3.1.3: Alternative path
+			  sh:closed true ;
+			  sh:property [
+			    sh:path sh:alternativePath ;
+			    sh:node shsh:PathListWithAtLeast2Members ;
+			    sh:minCount 1 ;
+			    sh:maxCount 1 ;
+			  ]
+			]
+			[ sh:nodeKind sh:BlankNode ;    # 2.3.1.4: Inverse path
+			  sh:closed true ;
+			  sh:property [
+			    sh:path sh:inversePath ;
+			    sh:minCount 1 ;
+			    sh:maxCount 1 ;
+			  ]
+			]
+			[ sh:nodeKind sh:BlankNode ;    # 2.3.1.5: Zero-or-more path
+			  sh:closed true ;
+			  sh:property [
+			    sh:path sh:zeroOrMorePath ;
+			    sh:minCount 1 ;
+			    sh:maxCount 1 ;
+			  ]
+			]
+			[ sh:nodeKind sh:BlankNode ;    # 2.3.1.6: One-or-more path
+			  sh:closed true ;
+			  sh:property [
+			    sh:path sh:oneOrMorePath ;
+			    sh:minCount 1 ;
+			    sh:maxCount 1 ;
+			  ]
+			]
+			[ sh:nodeKind sh:BlankNode ;    # 2.3.1.7: Zero-or-one path
+			  sh:closed true ;
+			  sh:property [
+			    sh:path sh:zeroOrOnePath ;
+			    sh:minCount 1 ;
+			    sh:maxCount 1 ;
+			  ]
+			]
+		) .
+
+shsh:PathListWithAtLeast2Members
+	a sh:NodeShape ;
+	sh:node shsh:ListShape ;
+	sh:property [
+		sh:path [ sh:oneOrMorePath rdf:rest ] ;
+		sh:minCount 2 ;    # 1 other list node plus rdf:nil
+	] .
+
+shsh:ShapesGraphShape
+	a sh:NodeShape ;
+	sh:targetObjectsOf sh:shapesGraph ;
+	sh:nodeKind sh:IRI .                # shapesGraph-nodeKind
+
+shsh:EntailmentShape
+	a sh:NodeShape ;
+	sh:targetObjectsOf sh:entailment ;
+	sh:nodeKind sh:IRI .                # entailment-nodeKind
diff --git a/testlib/src/main/resources/rdf/ttl/input/shacl.ttl b/testlib/src/main/resources/rdf/ttl/input/shacl.ttl
new file mode 100644
index 0000000000..4c0f2220df
--- /dev/null
+++ b/testlib/src/main/resources/rdf/ttl/input/shacl.ttl
@@ -0,0 +1,1665 @@
+# W3C Shapes Constraint Language (SHACL) Vocabulary
+# Version from 2017-07-20
+
+@prefix owl:  <http://www.w3.org/2002/07/owl#> .
+@prefix rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix xsd:  <http://www.w3.org/2001/XMLSchema#> .
+
+@prefix sh:   <http://www.w3.org/ns/shacl#> .
+
+sh:
+	a owl:Ontology ;
+	rdfs:label "W3C Shapes Constraint Language (SHACL) Vocabulary"@en ;
+	rdfs:comment "This vocabulary defines terms used in SHACL, the W3C Shapes Constraint Language."@en ;
+	sh:declare [
+		sh:prefix "sh" ;
+		sh:namespace "http://www.w3.org/ns/shacl#" ;
+	] ;
+	sh:suggestedShapesGraph <http://www.w3.org/ns/shacl-shacl#> .
+
+
+# Shapes vocabulary -----------------------------------------------------------
+
+sh:Shape
+	a rdfs:Class ;
+	rdfs:label "Shape"@en ;
+	rdfs:comment "A shape is a collection of constraints that may be targeted for certain nodes."@en ;
+	rdfs:subClassOf rdfs:Resource ;
+	rdfs:isDefinedBy sh: .
+
+sh:NodeShape
+	a rdfs:Class ;
+	rdfs:label "Node shape"@en ;
+	rdfs:comment "A node shape is a shape that specifies constraint that need to be met with respect to focus nodes."@en ;
+	rdfs:subClassOf sh:Shape ;
+	rdfs:isDefinedBy sh: .
+
+sh:PropertyShape
+	a rdfs:Class ;
+	rdfs:label "Property shape"@en ;
+	rdfs:comment "A property shape is a shape that specifies constraints on the values of a focus node for a given property or path."@en ;
+	rdfs:subClassOf sh:Shape ;
+	rdfs:isDefinedBy sh: .
+
+sh:deactivated
+	a rdf:Property ;
+	rdfs:label "deactivated"@en ;
+	rdfs:comment "If set to true then all nodes conform to this."@en ;
+	# rdfs:domain sh:Shape or sh:SPARQLConstraint
+	rdfs:range xsd:boolean ;
+	rdfs:isDefinedBy sh: .
+
+sh:targetClass
+	a rdf:Property ;
+	rdfs:label "target class"@en ;
+	rdfs:comment "Links a shape to a class, indicating that all instances of the class must conform to the shape."@en ;
+	rdfs:domain sh:Shape ;
+	rdfs:range rdfs:Class ;
+	rdfs:isDefinedBy sh: .
+
+sh:targetNode
+	a rdf:Property ;
+	rdfs:label "target node"@en ;
+	rdfs:comment "Links a shape to individual nodes, indicating that these nodes must conform to the shape."@en ;
+	rdfs:domain sh:Shape ;
+	rdfs:isDefinedBy sh: .
+
+sh:targetObjectsOf
+	a rdf:Property ;
+	rdfs:label "target objects of"@en ;
+	rdfs:comment "Links a shape to a property, indicating that all all objects of triples that have the given property as their predicate must conform to the shape."@en ;
+	rdfs:domain sh:Shape ;
+	rdfs:range rdf:Property ;
+	rdfs:isDefinedBy sh: .
+
+sh:targetSubjectsOf
+	a rdf:Property ;
+	rdfs:label "target subjects of"@en ;
+	rdfs:comment "Links a shape to a property, indicating that all subjects of triples that have the given property as their predicate must conform to the shape."@en ;
+	rdfs:domain sh:Shape ;
+	rdfs:range rdf:Property ;
+	rdfs:isDefinedBy sh: .
+
+sh:message
+	a rdf:Property ;
+	# domain: sh:Shape or sh:SPARQLConstraint or sh:SPARQLSelectValidator or sh:SPARQLAskValidator
+	# range: xsd:string or rdf:langString
+	rdfs:label "message"@en ;
+	rdfs:comment "A human-readable message (possibly with placeholders for variables) explaining the cause of the result."@en ;
+	rdfs:isDefinedBy sh: .
+
+sh:severity
+	a rdf:Property ;
+	rdfs:label "severity"@en ;
+	rdfs:comment "Defines the severity that validation results produced by a shape must have. Defaults to sh:Violation."@en ;
+	rdfs:domain sh:Shape ;
+	rdfs:range sh:Severity ;
+	rdfs:isDefinedBy sh: .
+
+
+# Node kind vocabulary --------------------------------------------------------
+
+sh:NodeKind
+	a rdfs:Class ;
+	rdfs:label "Node kind"@en ;
+	rdfs:comment "The class of all node kinds, including sh:BlankNode, sh:IRI, sh:Literal or the combinations of these: sh:BlankNodeOrIRI, sh:BlankNodeOrLiteral, sh:IRIOrLiteral."@en ;
+	rdfs:subClassOf rdfs:Resource ;
+	rdfs:isDefinedBy sh: .
+
+sh:BlankNode
+	a sh:NodeKind ;
+	rdfs:label "Blank node"@en ;
+	rdfs:comment "The node kind of all blank nodes."@en ;
+	rdfs:isDefinedBy sh: .
+
+sh:BlankNodeOrIRI
+	a sh:NodeKind ;
+	rdfs:label "Blank node or IRI"@en ;
+	rdfs:comment "The node kind of all blank nodes or IRIs."@en ;
+	rdfs:isDefinedBy sh: .
+
+sh:BlankNodeOrLiteral
+	a sh:NodeKind ;
+	rdfs:label "Blank node or literal"@en ;
+	rdfs:comment "The node kind of all blank nodes or literals."@en ;
+	rdfs:isDefinedBy sh: .
+
+sh:IRI
+	a sh:NodeKind ;
+	rdfs:label "IRI"@en ;
+	rdfs:comment "The node kind of all IRIs."@en ;
+	rdfs:isDefinedBy sh: .
+
+sh:IRIOrLiteral
+	a sh:NodeKind ;
+	rdfs:label "IRI or literal"@en ;
+	rdfs:comment "The node kind of all IRIs or literals."@en ;
+	rdfs:isDefinedBy sh: .
+
+sh:Literal
+	a sh:NodeKind ;
+	rdfs:label "Literal"@en ;
+	rdfs:comment "The node kind of all literals."@en ;
+	rdfs:isDefinedBy sh: .
+
+
+# Results vocabulary ----------------------------------------------------------
+
+sh:ValidationReport
+	a rdfs:Class ;
+	rdfs:label "Validation report"@en ;
+	rdfs:comment "The class of SHACL validation reports."@en ;
+	rdfs:subClassOf rdfs:Resource ;
+	rdfs:isDefinedBy sh: .
+
+sh:conforms
+	a rdf:Property ;
+	rdfs:label "conforms"@en ;
+	rdfs:comment "True if the validation did not produce any validation results, and false otherwise."@en ;
+	rdfs:domain sh:ValidationReport ;
+	rdfs:range xsd:boolean ;
+	rdfs:isDefinedBy sh: .
+
+sh:result
+	a rdf:Property ;
+	rdfs:label "result"@en ;
+	rdfs:comment "The validation results contained in a validation report."@en ;
+	rdfs:domain sh:ValidationReport ;
+	rdfs:range sh:ValidationResult ;
+	rdfs:isDefinedBy sh: .
+
+sh:shapesGraphWellFormed
+	a rdf:Property ;
+	rdfs:label "shapes graph well-formed"@en ;
+	rdfs:comment "If true then the validation engine was certain that the shapes graph has passed all SHACL syntax requirements during the validation process."@en ;
+	rdfs:domain sh:ValidationReport ;
+	rdfs:range xsd:boolean ;
+	rdfs:isDefinedBy sh: .
+
+sh:AbstractResult
+	a rdfs:Class ;
+	rdfs:label "Abstract result"@en ;
+	rdfs:comment "The base class of validation results, typically not instantiated directly."@en ;
+	rdfs:subClassOf rdfs:Resource ;
+	rdfs:isDefinedBy sh: .
+
+sh:ValidationResult
+	a rdfs:Class ;
+	rdfs:label "Validation result"@en ;
+	rdfs:comment "The class of validation results."@en ;
+	rdfs:subClassOf sh:AbstractResult ;
+	rdfs:isDefinedBy sh: .
+
+sh:Severity
+	a rdfs:Class ;
+	rdfs:label "Severity"@en ;
+	rdfs:comment "The class of validation result severity levels, including violation and warning levels."@en ;
+	rdfs:subClassOf rdfs:Resource ;
+	rdfs:isDefinedBy sh: .
+
+sh:Info
+	a sh:Severity ;
+	rdfs:label "Info"@en ;
+	rdfs:comment "The severity for an informational validation result."@en ;
+	rdfs:isDefinedBy sh: .
+
+sh:Violation
+	a sh:Severity ;
+	rdfs:label "Violation"@en ;
+	rdfs:comment "The severity for a violation validation result."@en ;
+	rdfs:isDefinedBy sh: .
+
+sh:Warning
+	a sh:Severity ;
+	rdfs:label "Warning"@en ;
+	rdfs:comment "The severity for a warning validation result."@en ;
+	rdfs:isDefinedBy sh: .
+
+sh:detail
+	a rdf:Property ;
+	rdfs:label "detail"@en ;
+	rdfs:comment "Links a result with other results that provide more details, for example to describe violations against nested shapes."@en ;
+	rdfs:domain sh:AbstractResult ;
+	rdfs:range sh:AbstractResult ;
+	rdfs:isDefinedBy sh: .
+
+sh:focusNode
+	a rdf:Property ;
+	rdfs:label "focus node"@en ;
+	rdfs:comment "The focus node that was validated when the result was produced."@en ;
+	rdfs:domain sh:AbstractResult ;
+	rdfs:isDefinedBy sh: .
+
+sh:resultMessage
+	a rdf:Property ;
+	rdfs:label "result message"@en ;
+	rdfs:comment "Human-readable messages explaining the cause of the result."@en ;
+	rdfs:domain sh:AbstractResult ;
+	# range: xsd:string or rdf:langString
+	rdfs:isDefinedBy sh: .
+
+sh:resultPath
+	a rdf:Property ;
+	rdfs:label "result path"@en ;
+	rdfs:comment "The path of a validation result, based on the path of the validated property shape."@en ;
+	rdfs:domain sh:AbstractResult ;
+	rdfs:range rdfs:Resource ;
+	rdfs:isDefinedBy sh: .
+
+sh:resultSeverity
+	a rdf:Property ;
+	rdfs:label "result severity"@en ;
+	rdfs:comment "The severity of the result, e.g. warning."@en ;
+	rdfs:domain sh:AbstractResult ;
+	rdfs:range sh:Severity ;
+	rdfs:isDefinedBy sh: .
+
+sh:sourceConstraint
+	a rdf:Property ;
+	rdfs:label "source constraint"@en ;
+	rdfs:comment "The constraint that was validated when the result was produced."@en ;
+	rdfs:domain sh:AbstractResult ;
+	rdfs:isDefinedBy sh: .
+
+sh:sourceShape
+	a rdf:Property ;
+	rdfs:label "source shape"@en ;
+	rdfs:comment "The shape that is was validated when the result was produced."@en ;
+	rdfs:domain sh:AbstractResult ;
+	rdfs:range sh:Shape ;
+	rdfs:isDefinedBy sh: .
+
+sh:sourceConstraintComponent
+	a rdf:Property ;
+	rdfs:label "source constraint component"@en ;
+	rdfs:comment "The constraint component that is the source of the result."@en ;
+	rdfs:domain sh:AbstractResult ;
+	rdfs:range sh:ConstraintComponent ;
+	rdfs:isDefinedBy sh: .
+
+sh:value
+	a rdf:Property ;
+	rdfs:label "value"@en ;
+	rdfs:comment "An RDF node that has caused the result."@en ;
+	rdfs:domain sh:AbstractResult ;
+	rdfs:isDefinedBy sh: .
+
+
+# Graph properties ------------------------------------------------------------
+
+sh:shapesGraph
+	a rdf:Property ;
+	rdfs:label "shapes graph"@en ;
+	rdfs:comment "Shapes graphs that should be used when validating this data graph."@en ;
+	rdfs:domain owl:Ontology ;
+	rdfs:range owl:Ontology ;
+	rdfs:isDefinedBy sh: .
+
+sh:suggestedShapesGraph
+	a rdf:Property ;
+	rdfs:label "suggested shapes graph"@en ;
+	rdfs:comment "Suggested shapes graphs for this ontology. The values of this property may be used in the absence of specific sh:shapesGraph statements."@en ;
+	rdfs:domain owl:Ontology ;
+	rdfs:range owl:Ontology ;
+	rdfs:isDefinedBy sh: .
+
+sh:entailment
+	a rdf:Property ;
+	rdfs:label "entailment"@en ;
+	rdfs:comment "An entailment regime that indicates what kind of inferencing is required by a shapes graph."@en ;
+	rdfs:domain owl:Ontology ;
+	rdfs:range rdfs:Resource ;
+	rdfs:isDefinedBy sh: .
+
+
+# Path vocabulary -------------------------------------------------------------
+
+sh:path
+	a rdf:Property ;
+	rdfs:label "path"@en ;
+	rdfs:comment "Specifies the property path of a property shape."@en ;
+	rdfs:domain sh:PropertyShape ;
+	rdfs:range rdfs:Resource ;
+	rdfs:isDefinedBy sh: .
+
+sh:inversePath
+	a rdf:Property ;
+	rdfs:label "inverse path"@en ;
+	rdfs:comment "The (single) value of this property represents an inverse path (object to subject)."@en ;
+	rdfs:range rdfs:Resource ;
+	rdfs:isDefinedBy sh: .
+
+sh:alternativePath
+	a rdf:Property ;
+	rdfs:label "alternative path"@en ;
+	rdfs:comment "The (single) value of this property must be a list of path elements, representing the elements of alternative paths."@en ;
+	rdfs:range rdf:List ;
+	rdfs:isDefinedBy sh: .
+
+sh:zeroOrMorePath
+	a rdf:Property ;
+	rdfs:label "zero or more path"@en ;
+	rdfs:comment "The (single) value of this property represents a path that is matched zero or more times."@en ;
+	rdfs:range rdfs:Resource ;
+	rdfs:isDefinedBy sh: .
+
+sh:oneOrMorePath
+	a rdf:Property ;
+	rdfs:label "one or more path"@en ;
+	rdfs:comment "The (single) value of this property represents a path that is matched one or more times."@en ;
+	rdfs:range rdfs:Resource ;
+	rdfs:isDefinedBy sh: .
+
+sh:zeroOrOnePath
+	a rdf:Property ;
+	rdfs:label "zero or one path"@en ;
+	rdfs:comment "The (single) value of this property represents a path that is matched zero or one times."@en ;
+	rdfs:range rdfs:Resource ;
+	rdfs:isDefinedBy sh: .
+
+
+# Parameters metamodel --------------------------------------------------------
+
+sh:Parameterizable
+	a rdfs:Class ;
+	rdfs:label "Parameterizable"@en ;
+	rdfs:comment "Superclass of components that can take parameters, especially functions and constraint components."@en ;
+	rdfs:subClassOf rdfs:Resource ;
+	rdfs:isDefinedBy sh: .
+
+sh:parameter
+	a rdf:Property ;
+	rdfs:label "parameter"@en ;
+	rdfs:comment "The parameters of a function or constraint component."@en ;
+	rdfs:domain sh:Parameterizable ;
+	rdfs:range sh:Parameter ;
+	rdfs:isDefinedBy sh: .
+
+sh:labelTemplate
+	a rdf:Property ;
+	rdfs:label "label template"@en ;
+	rdfs:comment "Outlines how human-readable labels of instances of the associated Parameterizable shall be produced. The values can contain {?paramName} as placeholders for the actual values of the given parameter."@en ;
+	rdfs:domain sh:Parameterizable ;
+	# range: xsd:string or rdf:langString
+	rdfs:isDefinedBy sh: .
+
+sh:Parameter
+	a rdfs:Class ;
+	rdfs:label "Parameter"@en ;
+	rdfs:comment "The class of parameter declarations, consisting of a path predicate and (possibly) information about allowed value type, cardinality and other characteristics."@en ;
+	rdfs:subClassOf sh:PropertyShape ;
+	rdfs:isDefinedBy sh: .
+
+sh:optional
+	a rdf:Property ;
+	rdfs:label "optional"@en ;
+	rdfs:comment "Indicates whether a parameter is optional."@en ;
+	rdfs:domain sh:Parameter ;
+	rdfs:range xsd:boolean ;
+	rdfs:isDefinedBy sh: .
+
+
+# Constraint components metamodel ---------------------------------------------
+
+sh:ConstraintComponent
+	a rdfs:Class ;
+	rdfs:label "Constraint component"@en ;
+	rdfs:comment "The class of constraint components."@en ;
+	rdfs:subClassOf sh:Parameterizable ;
+	rdfs:isDefinedBy sh: .
+
+sh:validator
+	a rdf:Property ;
+	rdfs:label "validator"@en ;
+	rdfs:comment "The validator(s) used to evaluate constraints of either node or property shapes."@en ;
+	rdfs:domain sh:ConstraintComponent ;
+	rdfs:range sh:Validator ;
+	rdfs:isDefinedBy sh: .
+
+sh:nodeValidator
+	a rdf:Property ;
+	rdfs:label "shape validator"@en ;
+	rdfs:comment "The validator(s) used to evaluate a constraint in the context of a node shape."@en ;
+	rdfs:domain sh:ConstraintComponent ;
+	rdfs:range sh:Validator ;
+	rdfs:isDefinedBy sh: .
+
+sh:propertyValidator
+	a rdf:Property ;
+	rdfs:label "property validator"@en ;
+	rdfs:comment "The validator(s) used to evaluate a constraint in the context of a property shape."@en ;
+	rdfs:domain sh:ConstraintComponent ;
+	rdfs:range sh:Validator ;
+	rdfs:isDefinedBy sh: .
+
+sh:Validator
+	a rdfs:Class ;
+	rdfs:label "Validator"@en ;
+	rdfs:comment "The class of validators, which provide instructions on how to process a constraint definition. This class serves as base class for the SPARQL-based validators and other possible implementations."@en ;
+	rdfs:subClassOf rdfs:Resource ;
+	rdfs:isDefinedBy sh: .
+
+sh:SPARQLAskValidator
+	a rdfs:Class ;
+	rdfs:label "SPARQL ASK validator"@en ;
+	rdfs:comment "The class of validators based on SPARQL ASK queries. The queries are evaluated for each value node and are supposed to return true if the given node conforms."@en ;
+	rdfs:subClassOf sh:Validator ;
+	rdfs:subClassOf sh:SPARQLAskExecutable ;
+	rdfs:isDefinedBy sh: .
+
+sh:SPARQLSelectValidator
+	a rdfs:Class ;
+	rdfs:label "SPARQL SELECT validator"@en ;
+	rdfs:comment "The class of validators based on SPARQL SELECT queries. The queries are evaluated for each focus node and are supposed to produce bindings for all focus nodes that do not conform."@en ;
+	rdfs:subClassOf sh:Validator ;
+	rdfs:subClassOf sh:SPARQLSelectExecutable ;
+	rdfs:isDefinedBy sh: .
+
+
+# Library of Core Constraint Components and their properties ------------------
+
+sh:AndConstraintComponent
+	a sh:ConstraintComponent ;
+	rdfs:label "And constraint component"@en ;
+	rdfs:comment "A constraint component that can be used to test whether a value node conforms to all members of a provided list of shapes."@en ;
+	sh:parameter sh:AndConstraintComponent-and ;
+	rdfs:isDefinedBy sh: .
+
+sh:AndConstraintComponent-and
+	a sh:Parameter ;
+	sh:path sh:and ;
+	rdfs:isDefinedBy sh: .
+
+sh:and
+	a rdf:Property ;
+	rdfs:label "and"@en ;
+	rdfs:comment "RDF list of shapes to validate the value nodes against."@en ;
+	rdfs:range rdf:List ;
+	rdfs:isDefinedBy sh: .
+
+
+sh:ClassConstraintComponent
+	a sh:ConstraintComponent ;
+	rdfs:label "Class constraint component"@en ;
+	rdfs:comment "A constraint component that can be used to verify that each value node is an instance of a given type."@en ;
+	sh:parameter sh:ClassConstraintComponent-class ;
+	rdfs:isDefinedBy sh: .
+
+sh:ClassConstraintComponent-class
+	a sh:Parameter ;
+	sh:path sh:class ;
+	sh:nodeKind sh:IRI ;
+	rdfs:isDefinedBy sh: .
+
+sh:class
+	a rdf:Property ;
+	rdfs:label "class"@en ;
+	rdfs:comment "The type that all value nodes must have."@en ;
+	rdfs:range rdfs:Class ;
+	rdfs:isDefinedBy sh: .
+
+
+sh:ClosedConstraintComponent
+	a sh:ConstraintComponent ;
+	rdfs:label "Closed constraint component"@en ;
+	rdfs:comment "A constraint component that can be used to indicate that focus nodes must only have values for those properties that have been explicitly enumerated via sh:property/sh:path."@en ;
+	sh:parameter sh:ClosedConstraintComponent-closed ;
+	sh:parameter sh:ClosedConstraintComponent-ignoredProperties ;
+	rdfs:isDefinedBy sh: .
+
+sh:ClosedConstraintComponent-closed
+	a sh:Parameter ;
+	sh:path sh:closed ;
+	sh:datatype xsd:boolean ;
+	rdfs:isDefinedBy sh: .
+
+sh:ClosedConstraintComponent-ignoredProperties
+	a sh:Parameter ;
+	sh:path sh:ignoredProperties ;
+	sh:optional true ;
+	rdfs:isDefinedBy sh: .
+
+sh:closed
+	a rdf:Property ;
+	rdfs:label "closed"@en ;
+	rdfs:comment "If set to true then the shape is closed."@en ;
+	rdfs:range xsd:boolean ;
+	rdfs:isDefinedBy sh: .
+
+sh:ignoredProperties
+	a rdf:Property ;
+	rdfs:label "ignored properties"@en ;
+	rdfs:comment "An optional RDF list of properties that are also permitted in addition to those explicitly enumerated via sh:property/sh:path."@en ;
+	rdfs:range rdf:List ;    # members: rdf:Property
+	rdfs:isDefinedBy sh: .
+
+
+sh:DatatypeConstraintComponent
+	a sh:ConstraintComponent ;
+	rdfs:label "Datatype constraint component"@en ;
+	rdfs:comment "A constraint component that can be used to restrict the datatype of all value nodes."@en ;
+	sh:parameter sh:DatatypeConstraintComponent-datatype ;
+	rdfs:isDefinedBy sh: .
+
+sh:DatatypeConstraintComponent-datatype
+	a sh:Parameter ;
+	sh:path sh:datatype ;
+	sh:nodeKind sh:IRI ;
+	sh:maxCount 1 ;
+	rdfs:isDefinedBy sh: .
+
+sh:datatype
+	a rdf:Property ;
+	rdfs:label "datatype"@en ;
+	rdfs:comment "Specifies an RDF datatype that all value nodes must have."@en ;
+	rdfs:range rdfs:Datatype ;
+	rdfs:isDefinedBy sh: .
+
+
+sh:DisjointConstraintComponent
+	a sh:ConstraintComponent ;
+	rdfs:label "Disjoint constraint component"@en ;
+	rdfs:comment "A constraint component that can be used to verify that the set of value nodes is disjoint with the the set of nodes that have the focus node as subject and the value of a given property as predicate."@en ;
+	sh:parameter sh:DisjointConstraintComponent-disjoint ;
+	rdfs:isDefinedBy sh: .
+
+sh:DisjointConstraintComponent-disjoint
+	a sh:Parameter ;
+	sh:path sh:disjoint ;
+	sh:nodeKind sh:IRI ;
+	rdfs:isDefinedBy sh: .
+
+sh:disjoint
+	a rdf:Property ;
+	rdfs:label "disjoint"@en ;
+	rdfs:comment "Specifies a property where the set of values must be disjoint with the value nodes."@en ;
+	rdfs:range rdf:Property ;
+	rdfs:isDefinedBy sh: .
+
+
+sh:EqualsConstraintComponent
+	a sh:ConstraintComponent ;
+	rdfs:label "Equals constraint component"@en ;
+	rdfs:comment "A constraint component that can be used to verify that the set of value nodes is equal to the set of nodes that have the focus node as subject and the value of a given property as predicate."@en ;
+	sh:parameter sh:EqualsConstraintComponent-equals ;
+	rdfs:isDefinedBy sh: .
+
+sh:EqualsConstraintComponent-equals
+	a sh:Parameter ;
+	sh:path sh:equals ;
+	sh:nodeKind sh:IRI ;
+	rdfs:isDefinedBy sh: .
+
+sh:equals
+	a rdf:Property ;
+	rdfs:label "equals"@en ;
+	rdfs:comment "Specifies a property that must have the same values as the value nodes."@en ;
+	rdfs:range rdf:Property ;
+	rdfs:isDefinedBy sh: .
+
+
+sh:HasValueConstraintComponent
+	a sh:ConstraintComponent ;
+	rdfs:label "Has-value constraint component"@en ;
+	rdfs:comment "A constraint component that can be used to verify that one of the value nodes is a given RDF node."@en ;
+	sh:parameter sh:HasValueConstraintComponent-hasValue ;
+	rdfs:isDefinedBy sh: .
+
+sh:HasValueConstraintComponent-hasValue
+	a sh:Parameter ;
+	sh:path sh:hasValue ;
+	rdfs:isDefinedBy sh: .
+
+sh:hasValue
+	a rdf:Property ;
+	rdfs:label "has value"@en ;
+	rdfs:comment "Specifies a value that must be among the value nodes."@en ;
+	rdfs:isDefinedBy sh: .
+
+
+sh:InConstraintComponent
+	a sh:ConstraintComponent ;
+	rdfs:label "In constraint component"@en ;
+	rdfs:comment "A constraint component that can be used to exclusively enumerate the permitted value nodes."@en ;
+	sh:parameter sh:InConstraintComponent-in ;
+	rdfs:isDefinedBy sh: .
+
+sh:InConstraintComponent-in
+	a sh:Parameter ;
+	sh:path sh:in ;
+	sh:maxCount 1 ;
+	rdfs:isDefinedBy sh: .
+
+sh:in
+	a rdf:Property ;
+	rdfs:label "in"@en ;
+	rdfs:comment "Specifies a list of allowed values so that each value node must be among the members of the given list."@en ;
+	rdfs:range rdf:List ;
+	rdfs:isDefinedBy sh: .
+
+
+sh:LanguageInConstraintComponent
+	a sh:ConstraintComponent ;
+	rdfs:label "Language-in constraint component"@en ;
+	rdfs:comment "A constraint component that can be used to enumerate language tags that all value nodes must have."@en ;
+	sh:parameter sh:LanguageInConstraintComponent-languageIn ;
+	rdfs:isDefinedBy sh: .
+
+sh:LanguageInConstraintComponent-languageIn
+	a sh:Parameter ;
+	sh:path sh:languageIn ;
+	sh:maxCount 1 ;
+	rdfs:isDefinedBy sh: .
+
+sh:languageIn
+	a rdf:Property ;
+	rdfs:label "language in"@en ;
+	rdfs:comment "Specifies a list of language tags that all value nodes must have."@en ;
+	rdfs:range rdf:List ;   # members: xsd:string
+	rdfs:isDefinedBy sh: .
+
+
+sh:LessThanConstraintComponent
+	a sh:ConstraintComponent ;
+	rdfs:label "Less-than constraint component"@en ;
+	rdfs:comment "A constraint component that can be used to verify that each value node is smaller than all the nodes that have the focus node as subject and the value of a given property as predicate."@en ;
+	sh:parameter sh:LessThanConstraintComponent-lessThan ;
+	rdfs:isDefinedBy sh: .
+
+sh:LessThanConstraintComponent-lessThan
+	a sh:Parameter ;
+	sh:path sh:lessThan ;
+	sh:nodeKind sh:IRI ;
+	rdfs:isDefinedBy sh: .
+
+sh:lessThan
+	a rdf:Property ;
+	rdfs:label "less than"@en ;
+	rdfs:comment "Specifies a property that must have smaller values than the value nodes."@en ;
+	rdfs:range rdf:Property ;
+	rdfs:isDefinedBy sh: .
+
+
+sh:LessThanOrEqualsConstraintComponent
+	a sh:ConstraintComponent ;
+	rdfs:label "less-than-or-equals constraint component"@en ;
+	rdfs:comment "A constraint component that can be used to verify that every value node is smaller than all the nodes that have the focus node as subject and the value of a given property as predicate."@en ;
+	sh:parameter sh:LessThanOrEqualsConstraintComponent-lessThanOrEquals ;
+	rdfs:isDefinedBy sh: .
+
+sh:LessThanOrEqualsConstraintComponent-lessThanOrEquals
+	a sh:Parameter ;
+	sh:path sh:lessThanOrEquals ;
+	sh:nodeKind sh:IRI ;
+	rdfs:isDefinedBy sh: .
+
+sh:lessThanOrEquals
+	a rdf:Property ;
+	rdfs:label "less than or equals"@en ;
+	rdfs:comment "Specifies a property that must have smaller or equal values than the value nodes."@en ;
+	rdfs:range rdf:Property ;
+	rdfs:isDefinedBy sh: .
+
+
+sh:MaxCountConstraintComponent
+	a sh:ConstraintComponent ;
+	rdfs:label "Max-count constraint component"@en ;
+	rdfs:comment "A constraint component that can be used to restrict the maximum number of value nodes."@en ;
+	sh:parameter sh:MaxCountConstraintComponent-maxCount ;
+	rdfs:isDefinedBy sh: .
+
+sh:MaxCountConstraintComponent-maxCount
+	a sh:Parameter ;
+	sh:path sh:maxCount ;
+	sh:datatype xsd:integer ;
+	sh:maxCount 1 ;
+	rdfs:isDefinedBy sh: .
+
+sh:maxCount
+	a rdf:Property ;
+	rdfs:label "max count"@en ;
+	rdfs:comment "Specifies the maximum number of values in the set of value nodes."@en ;
+	rdfs:range xsd:integer ;
+	rdfs:isDefinedBy sh: .
+
+
+sh:MaxExclusiveConstraintComponent
+	a sh:ConstraintComponent ;
+	rdfs:label "Max-exclusive constraint component"@en ;
+	rdfs:comment "A constraint component that can be used to restrict the range of value nodes with a maximum exclusive value."@en ;
+	sh:parameter sh:MaxExclusiveConstraintComponent-maxExclusive ;
+	rdfs:isDefinedBy sh: .
+
+sh:MaxExclusiveConstraintComponent-maxExclusive
+	a sh:Parameter ;
+	sh:path sh:maxExclusive ;
+	sh:maxCount 1 ;
+	sh:nodeKind sh:Literal ;
+	rdfs:isDefinedBy sh: .
+
+sh:maxExclusive
+	a rdf:Property ;
+	rdfs:label "max exclusive"@en ;
+	rdfs:comment "Specifies the maximum exclusive value of each value node."@en ;
+	rdfs:isDefinedBy sh: .
+
+
+sh:MaxInclusiveConstraintComponent
+	a sh:ConstraintComponent ;
+	rdfs:label "Max-inclusive constraint component"@en ;
+	rdfs:comment "A constraint component that can be used to restrict the range of value nodes with a maximum inclusive value."@en ;
+	sh:parameter sh:MaxInclusiveConstraintComponent-maxInclusive ;
+	rdfs:isDefinedBy sh: .
+
+sh:MaxInclusiveConstraintComponent-maxInclusive
+	a sh:Parameter ;
+	sh:path sh:maxInclusive ;
+	sh:maxCount 1 ;
+	sh:nodeKind sh:Literal ;
+	rdfs:isDefinedBy sh: .
+
+sh:maxInclusive
+	a rdf:Property ;
+	rdfs:label "max inclusive"@en ;
+	rdfs:comment "Specifies the maximum inclusive value of each value node."@en ;
+	rdfs:isDefinedBy sh: .
+
+
+sh:MaxLengthConstraintComponent
+	a sh:ConstraintComponent ;
+	rdfs:label "Max-length constraint component"@en ;
+	rdfs:comment "A constraint component that can be used to restrict the maximum string length of value nodes."@en ;
+	sh:parameter sh:MaxLengthConstraintComponent-maxLength ;
+	rdfs:isDefinedBy sh: .
+
+sh:MaxLengthConstraintComponent-maxLength
+	a sh:Parameter ;
+	sh:path sh:maxLength ;
+	sh:datatype xsd:integer ;
+	sh:maxCount 1 ;
+	rdfs:isDefinedBy sh: .
+
+sh:maxLength
+	a rdf:Property ;
+	rdfs:label "max length"@en ;
+	rdfs:comment "Specifies the maximum string length of each value node."@en ;
+	rdfs:range xsd:integer ;
+	rdfs:isDefinedBy sh: .
+
+
+sh:MinCountConstraintComponent
+	a sh:ConstraintComponent ;
+	rdfs:label "Min-count constraint component"@en ;
+	rdfs:comment "A constraint component that can be used to restrict the minimum number of value nodes."@en ;
+	sh:parameter sh:MinCountConstraintComponent-minCount ;
+	rdfs:isDefinedBy sh: .
+
+sh:MinCountConstraintComponent-minCount
+	a sh:Parameter ;
+	sh:path sh:minCount ;
+	sh:datatype xsd:integer ;
+	sh:maxCount 1 ;
+	rdfs:isDefinedBy sh: .
+
+sh:minCount
+	a rdf:Property ;
+	rdfs:label "min count"@en ;
+	rdfs:comment "Specifies the minimum number of values in the set of value nodes."@en ;
+	rdfs:range xsd:integer ;
+	rdfs:isDefinedBy sh: .
+
+
+sh:MinExclusiveConstraintComponent
+	a sh:ConstraintComponent ;
+	rdfs:label "Min-exclusive constraint component"@en ;
+	rdfs:comment "A constraint component that can be used to restrict the range of value nodes with a minimum exclusive value."@en ;
+	sh:parameter sh:MinExclusiveConstraintComponent-minExclusive ;
+	rdfs:isDefinedBy sh: .
+
+sh:MinExclusiveConstraintComponent-minExclusive
+	a sh:Parameter ;
+	sh:path sh:minExclusive ;
+	sh:maxCount 1 ;
+	sh:nodeKind sh:Literal ;
+	rdfs:isDefinedBy sh: .
+
+sh:minExclusive
+	a rdf:Property ;
+	rdfs:label "min exclusive"@en ;
+	rdfs:comment "Specifies the minimum exclusive value of each value node."@en ;
+	rdfs:isDefinedBy sh: .
+
+
+sh:MinInclusiveConstraintComponent
+	a sh:ConstraintComponent ;
+	rdfs:label "Min-inclusive constraint component"@en ;
+	rdfs:comment "A constraint component that can be used to restrict the range of value nodes with a minimum inclusive value."@en ;
+	sh:parameter sh:MinInclusiveConstraintComponent-minInclusive ;
+	rdfs:isDefinedBy sh: .
+
+sh:MinInclusiveConstraintComponent-minInclusive
+	a sh:Parameter ;
+	sh:path sh:minInclusive ;
+	sh:maxCount 1 ;
+	sh:nodeKind sh:Literal ;
+	rdfs:isDefinedBy sh: .
+
+sh:minInclusive
+	a rdf:Property ;
+	rdfs:label "min inclusive"@en ;
+	rdfs:comment "Specifies the minimum inclusive value of each value node."@en ;
+	rdfs:isDefinedBy sh: .
+
+
+sh:MinLengthConstraintComponent
+	a sh:ConstraintComponent ;
+	rdfs:label "Min-length constraint component"@en ;
+	rdfs:comment "A constraint component that can be used to restrict the minimum string length of value nodes."@en ;
+	sh:parameter sh:MinLengthConstraintComponent-minLength ;
+	rdfs:isDefinedBy sh: .
+
+sh:MinLengthConstraintComponent-minLength
+	a sh:Parameter ;
+	sh:path sh:minLength ;
+	sh:datatype xsd:integer ;
+	sh:maxCount 1 ;
+	rdfs:isDefinedBy sh: .
+
+sh:minLength
+	a rdf:Property ;
+	rdfs:label "min length"@en ;
+	rdfs:comment "Specifies the minimum string length of each value node."@en ;
+	rdfs:range xsd:integer ;
+	rdfs:isDefinedBy sh: .
+
+
+sh:NodeConstraintComponent
+	a sh:ConstraintComponent ;
+	rdfs:label "Node constraint component"@en ;
+	rdfs:comment "A constraint component that can be used to verify that all value nodes conform to the given node shape."@en ;
+	sh:parameter sh:NodeConstraintComponent-node ;
+	rdfs:isDefinedBy sh: .
+
+sh:NodeConstraintComponent-node
+	a sh:Parameter ;
+	sh:path sh:node ;
+	rdfs:isDefinedBy sh: .
+
+sh:node
+	a rdf:Property ;
+	rdfs:label "node"@en ;
+	rdfs:comment "Specifies the node shape that all value nodes must conform to."@en ;
+	rdfs:range sh:NodeShape ;
+	rdfs:isDefinedBy sh: .
+
+
+sh:NodeKindConstraintComponent
+	a sh:ConstraintComponent ;
+	rdfs:label "Node-kind constraint component"@en ;
+	rdfs:comment "A constraint component that can be used to restrict the RDF node kind of each value node."@en ;
+	sh:parameter sh:NodeKindConstraintComponent-nodeKind ;
+	rdfs:isDefinedBy sh: .
+
+sh:NodeKindConstraintComponent-nodeKind
+	a sh:Parameter ;
+	sh:path sh:nodeKind ;
+	sh:in ( sh:BlankNode sh:IRI sh:Literal sh:BlankNodeOrIRI sh:BlankNodeOrLiteral sh:IRIOrLiteral ) ;
+	sh:maxCount 1 ;
+	rdfs:isDefinedBy sh: .
+
+sh:nodeKind
+	a rdf:Property ;
+	rdfs:label "node kind"@en ;
+	rdfs:comment "Specifies the node kind (e.g. IRI or literal) each value node."@en ;
+	rdfs:range sh:NodeKind ;
+	rdfs:isDefinedBy sh: .
+
+
+sh:NotConstraintComponent
+	a sh:ConstraintComponent ;
+	rdfs:label "Not constraint component"@en ;
+	rdfs:comment "A constraint component that can be used to verify that value nodes do not conform to a given shape."@en ;
+	sh:parameter sh:NotConstraintComponent-not ;
+	rdfs:isDefinedBy sh: .
+
+sh:NotConstraintComponent-not
+	a sh:Parameter ;
+	sh:path sh:not ;
+	rdfs:isDefinedBy sh: .
+
+sh:not
+	a rdf:Property ;
+	rdfs:label "not"@en ;
+	rdfs:comment "Specifies a shape that the value nodes must not conform to."@en ;
+	rdfs:range sh:Shape ;
+	rdfs:isDefinedBy sh: .
+
+
+sh:OrConstraintComponent
+	a sh:ConstraintComponent ;
+	rdfs:label "Or constraint component"@en ;
+	rdfs:comment "A constraint component that can be used to restrict the value nodes so that they conform to at least one out of several provided shapes."@en ;
+	sh:parameter sh:OrConstraintComponent-or ;
+	rdfs:isDefinedBy sh: .
+
+sh:OrConstraintComponent-or
+	a sh:Parameter ;
+	sh:path sh:or ;
+	rdfs:isDefinedBy sh: .
+
+sh:or
+	a rdf:Property ;
+	rdfs:label "or"@en ;
+	rdfs:comment "Specifies a list of shapes so that the value nodes must conform to at least one of the shapes."@en ;
+	rdfs:range rdf:List ;    # members: sh:Shape ;
+	rdfs:isDefinedBy sh: .
+
+
+sh:PatternConstraintComponent
+	a sh:ConstraintComponent ;
+	rdfs:label "Pattern constraint component"@en ;
+	rdfs:comment "A constraint component that can be used to verify that every value node matches a given regular expression."@en ;
+	sh:parameter sh:PatternConstraintComponent-pattern ;
+	sh:parameter sh:PatternConstraintComponent-flags ;
+	rdfs:isDefinedBy sh: .
+
+sh:PatternConstraintComponent-pattern
+	a sh:Parameter ;
+	sh:path sh:pattern ;
+	sh:datatype xsd:string ;
+	rdfs:isDefinedBy sh: .
+
+sh:PatternConstraintComponent-flags
+	a sh:Parameter ;
+	sh:path sh:flags ;
+	sh:datatype xsd:string ;
+	sh:optional true ;
+	rdfs:isDefinedBy sh: .
+
+sh:flags
+	a rdf:Property ;
+	rdfs:label "flags"@en ;
+	rdfs:comment "An optional flag to be used with regular expression pattern matching."@en ;
+	rdfs:range xsd:string ;
+	rdfs:isDefinedBy sh: .
+
+sh:pattern
+	a rdf:Property ;
+	rdfs:label "pattern"@en ;
+	rdfs:comment "Specifies a regular expression pattern that the string representations of the value nodes must match."@en ;
+	rdfs:range xsd:string ;
+	rdfs:isDefinedBy sh: .
+
+
+sh:PropertyConstraintComponent
+	a sh:ConstraintComponent ;
+	rdfs:label "Property constraint component"@en ;
+	rdfs:comment "A constraint component that can be used to verify that all value nodes conform to the given property shape."@en ;
+	sh:parameter sh:PropertyConstraintComponent-property ;
+	rdfs:isDefinedBy sh: .
+
+sh:PropertyConstraintComponent-property
+	a sh:Parameter ;
+	sh:path sh:property ;
+	rdfs:isDefinedBy sh: .
+
+sh:property
+	a rdf:Property ;
+	rdfs:label "property"@en ;
+	rdfs:comment "Links a shape to its property shapes."@en ;
+	rdfs:domain sh:Shape ;
+	rdfs:range sh:PropertyShape ;
+	rdfs:isDefinedBy sh: .
+
+
+sh:QualifiedMaxCountConstraintComponent
+	a sh:ConstraintComponent ;
+	rdfs:label "Qualified-max-count constraint component"@en ;
+	rdfs:comment "A constraint component that can be used to verify that a specified maximum number of value nodes conforms to a given shape."@en ;
+	sh:parameter sh:QualifiedMaxCountConstraintComponent-qualifiedMaxCount ;
+	sh:parameter sh:QualifiedMaxCountConstraintComponent-qualifiedValueShape ;
+	sh:parameter sh:QualifiedMaxCountConstraintComponent-qualifiedValueShapesDisjoint ;
+	rdfs:isDefinedBy sh: .
+
+sh:QualifiedMaxCountConstraintComponent-qualifiedMaxCount
+	a sh:Parameter ;
+	sh:path sh:qualifiedMaxCount ;
+	sh:datatype xsd:integer ;
+	rdfs:isDefinedBy sh: .
+
+sh:QualifiedMaxCountConstraintComponent-qualifiedValueShape
+	a sh:Parameter ;
+	sh:path sh:qualifiedValueShape ;
+	rdfs:isDefinedBy sh: .
+
+sh:QualifiedMaxCountConstraintComponent-qualifiedValueShapesDisjoint
+	a sh:Parameter ;
+	sh:path sh:qualifiedValueShapesDisjoint ;
+	sh:datatype xsd:boolean ;
+	sh:optional true ;
+	rdfs:isDefinedBy sh: .
+
+
+sh:QualifiedMinCountConstraintComponent
+	a sh:ConstraintComponent ;
+	rdfs:label "Qualified-min-count constraint component"@en ;
+	rdfs:comment "A constraint component that can be used to verify that a specified minimum number of value nodes conforms to a given shape."@en ;
+	sh:parameter sh:QualifiedMinCountConstraintComponent-qualifiedMinCount ;
+	sh:parameter sh:QualifiedMinCountConstraintComponent-qualifiedValueShape ;
+	sh:parameter sh:QualifiedMinCountConstraintComponent-qualifiedValueShapesDisjoint ;
+	rdfs:isDefinedBy sh: .
+
+sh:QualifiedMinCountConstraintComponent-qualifiedMinCount
+	a sh:Parameter ;
+	sh:path sh:qualifiedMinCount ;
+	sh:datatype xsd:integer ;
+	rdfs:isDefinedBy sh: .
+
+sh:QualifiedMinCountConstraintComponent-qualifiedValueShape
+	a sh:Parameter ;
+	sh:path sh:qualifiedValueShape ;
+	rdfs:isDefinedBy sh: .
+
+sh:QualifiedMinCountConstraintComponent-qualifiedValueShapesDisjoint
+	a sh:Parameter ;
+	sh:path sh:qualifiedValueShapesDisjoint ;
+	sh:datatype xsd:boolean ;
+	sh:optional true ;
+	rdfs:isDefinedBy sh: .
+
+sh:qualifiedMaxCount
+	a rdf:Property ;
+	rdfs:label "qualified max count"@en ;
+	rdfs:comment "The maximum number of value nodes that can conform to the shape."@en ;
+	rdfs:range xsd:integer ;
+	rdfs:isDefinedBy sh: .
+
+sh:qualifiedMinCount
+	a rdf:Property ;
+	rdfs:label "qualified min count"@en ;
+	rdfs:comment "The minimum number of value nodes that must conform to the shape."@en ;
+	rdfs:range xsd:integer ;
+	rdfs:isDefinedBy sh: .
+
+sh:qualifiedValueShape
+	a rdf:Property ;
+	rdfs:label "qualified value shape"@en ;
+	rdfs:comment "The shape that a specified number of values must conform to."@en ;
+	rdfs:range sh:Shape ;
+	rdfs:isDefinedBy sh: .
+
+sh:qualifiedValueShapesDisjoint
+	a rdf:Property ;
+	rdfs:label "qualified value shapes disjoint"@en ;
+	rdfs:comment "Can be used to mark the qualified value shape to be disjoint with its sibling shapes."@en ;
+	rdfs:range xsd:boolean ;
+	rdfs:isDefinedBy sh: .
+
+
+sh:UniqueLangConstraintComponent
+	a sh:ConstraintComponent ;
+	rdfs:label "Unique-languages constraint component"@en ;
+	rdfs:comment "A constraint component that can be used to specify that no pair of value nodes may use the same language tag."@en ;
+	sh:parameter sh:UniqueLangConstraintComponent-uniqueLang ;
+	rdfs:isDefinedBy sh: .
+
+sh:UniqueLangConstraintComponent-uniqueLang
+	a sh:Parameter ;
+	sh:path sh:uniqueLang ;
+	sh:datatype xsd:boolean ;
+	sh:maxCount 1 ;
+	rdfs:isDefinedBy sh: .
+
+sh:uniqueLang
+	a rdf:Property ;
+	rdfs:label "unique languages"@en ;
+	rdfs:comment "Specifies whether all node values must have a unique (or no) language tag."@en ;
+	rdfs:range xsd:boolean ;
+	rdfs:isDefinedBy sh: .
+
+
+sh:XoneConstraintComponent
+	a sh:ConstraintComponent ;
+	rdfs:label "Exactly one constraint component"@en ;
+	rdfs:comment "A constraint component that can be used to restrict the value nodes so that they conform to exactly one out of several provided shapes."@en ;
+	sh:parameter sh:XoneConstraintComponent-xone ;
+	rdfs:isDefinedBy sh: .
+
+sh:XoneConstraintComponent-xone
+	a sh:Parameter ;
+	sh:path sh:xone ;
+	rdfs:isDefinedBy sh: .
+
+sh:xone
+	a rdf:Property ;
+	rdfs:label "exactly one"@en ;
+	rdfs:comment "Specifies a list of shapes so that the value nodes must conform to exactly one of the shapes."@en ;
+	rdfs:range rdf:List ;    # members: sh:Shape ;
+	rdfs:isDefinedBy sh: .
+
+
+# General SPARQL execution support --------------------------------------------
+
+sh:SPARQLExecutable
+	a rdfs:Class ;
+	rdfs:label "SPARQL executable"@en ;
+	rdfs:comment "The class of resources that encapsulate a SPARQL query."@en ;
+	rdfs:subClassOf rdfs:Resource ;
+	rdfs:isDefinedBy sh: .
+
+sh:SPARQLAskExecutable
+	a rdfs:Class ;
+	rdfs:label "SPARQL ASK executable"@en ;
+	rdfs:comment "The class of SPARQL executables that are based on an ASK query."@en ;
+	rdfs:subClassOf sh:SPARQLExecutable ;
+	rdfs:isDefinedBy sh: .
+
+sh:ask
+	a rdf:Property ;
+	rdfs:label "ask"@en ;
+	rdfs:comment "The SPARQL ASK query to execute."@en ;
+	rdfs:domain sh:SPARQLAskExecutable ;
+	rdfs:range xsd:string ;
+	rdfs:isDefinedBy sh: .
+
+sh:SPARQLConstructExecutable
+	a rdfs:Class ;
+	rdfs:label "SPARQL CONSTRUCT executable"@en ;
+	rdfs:comment "The class of SPARQL executables that are based on a CONSTRUCT query."@en ;
+	rdfs:subClassOf sh:SPARQLExecutable ;
+	rdfs:isDefinedBy sh: .
+
+sh:construct
+	a rdf:Property ;
+	rdfs:label "construct"@en ;
+	rdfs:comment "The SPARQL CONSTRUCT query to execute."@en ;
+	rdfs:domain sh:SPARQLConstructExecutable ;
+	rdfs:range xsd:string ;
+	rdfs:isDefinedBy sh: .
+
+sh:SPARQLSelectExecutable
+	a rdfs:Class ;
+	rdfs:label "SPARQL SELECT executable"@en ;
+	rdfs:comment "The class of SPARQL executables based on a SELECT query."@en ;
+	rdfs:subClassOf sh:SPARQLExecutable ;
+	rdfs:isDefinedBy sh: .
+
+sh:select
+	a rdf:Property ;
+	rdfs:label "select"@en ;
+	rdfs:comment "The SPARQL SELECT query to execute."@en ;
+	rdfs:range xsd:string ;
+	rdfs:domain sh:SPARQLSelectExecutable ;
+	rdfs:isDefinedBy sh: .
+
+sh:SPARQLUpdateExecutable
+	a rdfs:Class ;
+	rdfs:label "SPARQL UPDATE executable"@en ;
+	rdfs:comment "The class of SPARQL executables based on a SPARQL UPDATE."@en ;
+	rdfs:subClassOf sh:SPARQLExecutable ;
+	rdfs:isDefinedBy sh: .
+
+sh:update
+	a rdf:Property ;
+	rdfs:label "update"@en ;
+	rdfs:comment "The SPARQL UPDATE to execute."@en ;
+	rdfs:domain sh:SPARQLUpdateExecutable ;
+	rdfs:range xsd:string ;
+	rdfs:isDefinedBy sh: .
+
+sh:prefixes
+	a rdf:Property ;
+	rdfs:label "prefixes"@en ;
+	rdfs:comment "The prefixes that shall be applied before parsing the associated SPARQL query."@en ;
+	rdfs:domain sh:SPARQLExecutable ;
+	rdfs:range owl:Ontology ;
+	rdfs:isDefinedBy sh: .
+
+sh:PrefixDeclaration
+	a rdfs:Class ;
+	rdfs:label "Prefix declaration"@en ;
+	rdfs:comment "The class of prefix declarations, consisting of pairs of a prefix with a namespace."@en ;
+	rdfs:subClassOf rdfs:Resource ;
+	rdfs:isDefinedBy sh: .
+
+sh:declare
+	a rdf:Property ;
+	rdfs:label "declare"@en ;
+	rdfs:comment "Links a resource with its namespace prefix declarations."@en ;
+	rdfs:domain owl:Ontology ;
+	rdfs:range sh:PrefixDeclaration ;
+	rdfs:isDefinedBy sh: .
+
+sh:prefix
+	a rdf:Property ;
+	rdfs:label "prefix"@en ;
+	rdfs:comment "The prefix of a prefix declaration."@en ;
+	rdfs:domain sh:PrefixDeclaration ;
+	rdfs:range xsd:string ;
+	rdfs:isDefinedBy sh: .
+
+sh:namespace
+	a rdf:Property ;
+	rdfs:label "namespace"@en ;
+	rdfs:comment "The namespace associated with a prefix in a prefix declaration."@en ;
+	rdfs:domain sh:PrefixDeclaration ;
+	rdfs:range xsd:anyURI ;
+	rdfs:isDefinedBy sh: .
+
+
+# SPARQL-based Constraints support --------------------------------------------
+
+sh:SPARQLConstraintComponent
+	a sh:ConstraintComponent ;
+	rdfs:label "SPARQL constraint component"@en ;
+	rdfs:comment "A constraint component that can be used to define constraints based on SPARQL queries."@en ;
+	sh:parameter sh:SPARQLConstraintComponent-sparql ;
+	rdfs:isDefinedBy sh: .
+
+sh:SPARQLConstraintComponent-sparql
+	a sh:Parameter ;
+	sh:path sh:sparql ;
+	rdfs:isDefinedBy sh: .
+
+sh:sparql
+	a rdf:Property ;
+	rdfs:label "constraint (in SPARQL)"@en ;
+	rdfs:comment "Links a shape with SPARQL constraints."@en ;
+	rdfs:domain sh:Shape ;
+	rdfs:range sh:SPARQLConstraint ;
+	rdfs:isDefinedBy sh: .
+
+sh:SPARQLConstraint
+	a rdfs:Class ;
+	rdfs:label "SPARQL constraint"@en ;
+	rdfs:comment "The class of constraints based on SPARQL SELECT queries."@en ;
+	rdfs:subClassOf sh:SPARQLSelectExecutable ;
+	rdfs:isDefinedBy sh: .
+
+
+# Non-validating constraint properties ----------------------------------------
+
+sh:defaultValue
+	a rdf:Property ;
+	rdfs:label "default value"@en ;
+	rdfs:comment "A default value for a property, for example for user interface tools to pre-populate input fields."@en ;
+	rdfs:domain sh:PropertyShape ;
+	rdfs:isDefinedBy sh: .
+
+sh:description
+	a rdf:Property ;
+	rdfs:label "description"@en ;
+	rdfs:comment "Human-readable descriptions for the property in the context of the surrounding shape."@en ;
+	rdfs:domain sh:PropertyShape ;
+	# range: xsd:string or rdf:langString
+	rdfs:isDefinedBy sh: .
+
+sh:group
+	a rdf:Property ;
+	rdfs:label "group"@en ;
+	rdfs:comment "Can be used to link to a property group to indicate that a property shape belongs to a group of related property shapes."@en ;
+	rdfs:domain sh:PropertyShape ;
+	rdfs:range sh:PropertyGroup ;
+	rdfs:isDefinedBy sh: .
+
+sh:name
+	a rdf:Property ;
+	rdfs:label "name"@en ;
+	rdfs:comment "Human-readable labels for the property in the context of the surrounding shape."@en ;
+	rdfs:domain sh:PropertyShape ;
+	# range: xsd:string or rdf:langString
+	rdfs:isDefinedBy sh: .
+
+sh:order
+	a rdf:Property ;
+	rdfs:label "order"@en ;
+	rdfs:comment "Specifies the relative order of this compared to its siblings. For example use 0 for the first, 1 for the second."@en ;
+	# range: xsd:decimal or xsd:integer ;
+	rdfs:isDefinedBy sh: .
+
+sh:PropertyGroup
+	a rdfs:Class ;
+	rdfs:label "Property group"@en ;
+	rdfs:comment "Instances of this class represent groups of property shapes that belong together."@en ;
+	rdfs:subClassOf rdfs:Resource ;
+	rdfs:isDefinedBy sh: .
+
+
+# -----------------------------------------------------------------------------
+# SHACL ADVANCED FEATURES -----------------------------------------------------
+# -----------------------------------------------------------------------------
+
+
+# Advanced Target vocabulary --------------------------------------------------
+
+sh:target
+	a rdf:Property ;
+	rdfs:label "target"@en ;
+	rdfs:comment "Links a shape to a target specified by an extension language, for example instances of sh:SPARQLTarget."@en ;
+	rdfs:domain sh:Shape ;
+	rdfs:range sh:Target ;
+	rdfs:isDefinedBy sh: .
+
+sh:Target
+	a rdfs:Class ;
+	rdfs:label "Target"@en ;
+	rdfs:comment "The base class of targets such as those based on SPARQL queries."@en ;
+	rdfs:subClassOf rdfs:Resource ;
+	rdfs:isDefinedBy sh: .
+
+sh:TargetType
+	a rdfs:Class ;
+	rdfs:label "Target type"@en ;
+	rdfs:comment "The (meta) class for parameterizable targets.	Instances of this are instantiated as values of the sh:target property."@en ;
+	rdfs:subClassOf rdfs:Class ;
+	rdfs:subClassOf sh:Parameterizable ;
+	rdfs:isDefinedBy sh: .
+
+sh:SPARQLTarget
+	a rdfs:Class ;
+	rdfs:label "SPARQL target"@en ;
+	rdfs:comment "The class of targets that are based on SPARQL queries."@en ;
+	rdfs:subClassOf sh:Target ;
+	rdfs:subClassOf sh:SPARQLAskExecutable ;
+	rdfs:subClassOf sh:SPARQLSelectExecutable ;
+	rdfs:isDefinedBy sh: .
+
+sh:SPARQLTargetType
+	a rdfs:Class ;
+	rdfs:label "SPARQL target type"@en ;
+	rdfs:comment "The (meta) class for parameterizable targets that are based on SPARQL queries."@en ;
+	rdfs:subClassOf sh:TargetType ;
+	rdfs:subClassOf sh:SPARQLAskExecutable ;
+	rdfs:subClassOf sh:SPARQLSelectExecutable ;
+	rdfs:isDefinedBy sh: .
+
+
+# Functions Vocabulary --------------------------------------------------------
+
+sh:Function
+	a rdfs:Class ;
+	rdfs:label "Function"@en ;
+	rdfs:comment "The class of SHACL functions."@en ;
+	rdfs:subClassOf sh:Parameterizable ;
+	rdfs:isDefinedBy sh: .
+
+sh:returnType
+	a rdf:Property ;
+	rdfs:label "return type"@en ;
+	rdfs:comment "The expected type of values returned by the associated function."@en ;
+	rdfs:domain sh:Function ;
+	rdfs:range rdfs:Class ;
+	rdfs:isDefinedBy sh: .
+
+sh:SPARQLFunction
+	a rdfs:Class ;
+	rdfs:label "SPARQL function"@en ;
+	rdfs:comment "A function backed by a SPARQL query - either ASK or SELECT."@en ;
+	rdfs:subClassOf sh:Function ;
+	rdfs:subClassOf sh:SPARQLAskExecutable ;
+	rdfs:subClassOf sh:SPARQLSelectExecutable ;
+	rdfs:isDefinedBy sh: .
+
+
+# Result Annotations ----------------------------------------------------------
+
+sh:resultAnnotation
+	a rdf:Property ;
+	rdfs:label "result annotation"@en ;
+	rdfs:comment "Links a SPARQL validator with zero or more sh:ResultAnnotation instances, defining how to derive additional result properties based on the variables of the SELECT query."@en ;
+	rdfs:domain sh:SPARQLSelectValidator ;
+	rdfs:range sh:ResultAnnotation ;
+	rdfs:isDefinedBy sh: .
+
+sh:ResultAnnotation
+	a rdfs:Class ;
+	rdfs:label "Result annotation"@en ;
+	rdfs:comment "A class of result annotations, which define the rules to derive the values of a given annotation property as extra values for a validation result."@en ;
+	rdfs:subClassOf rdfs:Resource ;
+	rdfs:isDefinedBy sh: .
+
+sh:annotationProperty
+	a rdf:Property ;
+	rdfs:label "annotation property"@en ;
+	rdfs:comment "The annotation property that shall be set."@en ;
+	rdfs:domain sh:ResultAnnotation ;
+	rdfs:range rdf:Property ;
+	rdfs:isDefinedBy sh: .
+
+sh:annotationValue
+	a rdf:Property ;
+	rdfs:label "annotation value"@en ;
+	rdfs:comment "The (default) values of the annotation property."@en ;
+	rdfs:domain sh:ResultAnnotation ;
+	rdfs:isDefinedBy sh: .
+
+sh:annotationVarName
+	a rdf:Property ;
+	rdfs:label "annotation variable name"@en ;
+	rdfs:comment "The name of the SPARQL variable from the SELECT clause that shall be used for the values."@en ;
+	rdfs:domain sh:ResultAnnotation ;
+	rdfs:range xsd:string ;
+	rdfs:isDefinedBy sh: .
+
+
+# Node Expressions ------------------------------------------------------------
+
+sh:this
+	a rdfs:Resource ;
+	rdfs:label "this"@en ;
+	rdfs:comment "A node expression that represents the current focus node."@en ;
+	rdfs:isDefinedBy sh: .
+
+sh:filterShape
+	a rdf:Property ;
+	rdfs:label "filter shape"@en ;
+	rdfs:comment "The shape that all input nodes of the expression need to conform to."@en ;
+	rdfs:range sh:Shape ;
+	rdfs:isDefinedBy sh: .
+
+sh:nodes
+	a rdf:Property ;
+	rdfs:label "nodes"@en ;
+	rdfs:comment "The node expression producing the input nodes of a filter shape expression."@en ;
+	rdfs:isDefinedBy sh: .
+
+sh:intersection
+	a rdf:Property ;
+	rdfs:label "intersection"@en ;
+	rdfs:comment "A list of node expressions that shall be intersected."@en ;
+	rdfs:isDefinedBy sh: .
+
+sh:union
+	a rdf:Property ;
+	rdfs:label "union"@en ;
+	rdfs:comment "A list of node expressions that shall be used together."@en ;
+	rdfs:isDefinedBy sh: .
+
+
+# Expression Constraints ------------------------------------------------------
+
+sh:ExpressionConstraintComponent
+	a sh:ConstraintComponent ;
+	rdfs:label "Expression constraint component"@en ;
+	rdfs:comment "A constraint component that can be used to verify that a given node expression produces true for all value nodes."@en ;
+	sh:parameter sh:ExpressionConstraintComponent-expression ;
+	rdfs:isDefinedBy sh: .
+
+sh:ExpressionConstraintComponent-expression
+	a sh:Parameter ;
+	sh:path sh:expression ;
+	rdfs:isDefinedBy sh: .
+
+sh:expression
+	a rdf:Property ;
+	rdfs:label "expression"@en ;
+	rdfs:comment "The node expression that must return true for the value nodes."@en ;
+	rdfs:isDefinedBy sh: .
+
+
+# Rules -----------------------------------------------------------------------
+
+sh:Rule
+	a rdfs:Class ;
+	rdfs:label "Rule"@en ;
+	rdfs:comment "The class of SHACL rules. Never instantiated directly."@en ;
+	rdfs:subClassOf rdfs:Resource ;
+	rdfs:isDefinedBy sh: .
+
+sh:rule
+	a rdf:Property ;
+	rdfs:label "rule"@en ;
+	rdfs:comment "The rules linked to a shape."@en ;
+	rdfs:domain sh:Shape ;
+	rdfs:range sh:Rule ;
+	rdfs:isDefinedBy sh:  .
+
+sh:condition
+	a rdf:Property ;
+	rdfs:label "condition"@en ;
+	rdfs:comment "The shapes that the focus nodes need to conform to before a rule is executed on them."@en ;
+	rdfs:domain sh:Rule ;
+	rdfs:range sh:Shape ;
+	rdfs:isDefinedBy sh: .
+
+sh:TripleRule
+	a rdfs:Class ;
+	rdfs:label "A rule based on triple (subject, predicate, object) pattern."@en ;
+	rdfs:subClassOf sh:Rule ;
+	rdfs:isDefinedBy sh: .
+
+sh:subject
+	a rdf:Property ;
+	rdfs:label "subject"@en ;
+	rdfs:comment "An expression producing the resources that shall be inferred as subjects."@en ;
+	rdfs:domain sh:TripleRule ;
+	rdfs:isDefinedBy sh: .
+
+sh:predicate
+	a rdf:Property ;
+	rdfs:label "predicate"@en ;
+	rdfs:comment "An expression producing the properties that shall be inferred as predicates."@en ;
+	rdfs:domain sh:TripleRule ;
+	rdfs:isDefinedBy sh: .
+
+sh:object
+	a rdf:Property ;
+	rdfs:label "object"@en ;
+	rdfs:comment "An expression producing the nodes that shall be inferred as objects."@en ;
+	rdfs:domain sh:TripleRule ;
+	rdfs:isDefinedBy sh: .
+
+sh:SPARQLRule
+	a rdfs:Class ;
+	rdfs:label "SPARQL CONSTRUCT rule"@en ;
+	rdfs:comment "The class of SHACL rules based on SPARQL CONSTRUCT queries."@en ;
+	rdfs:subClassOf sh:Rule ;
+	rdfs:subClassOf sh:SPARQLConstructExecutable ;
+	rdfs:isDefinedBy sh: .
+
+
+# SHACL-JS --------------------------------------------------------------------
+
+sh:JSExecutable
+	a rdfs:Class ;
+	rdfs:label "JavaScript executable"@en ;
+	rdfs:comment "Abstract base class of resources that declare an executable JavaScript."@en ;
+	rdfs:subClassOf rdfs:Resource ;
+	rdfs:isDefinedBy sh: .
+
+sh:JSTarget
+	a rdfs:Class ;
+	rdfs:label "JavaScript target"@en ;
+	rdfs:comment "The class of targets that are based on JavaScript functions."@en ;
+	rdfs:subClassOf sh:Target ;
+	rdfs:subClassOf sh:JSExecutable ;
+	rdfs:isDefinedBy sh: .
+
+sh:JSTargetType
+	a rdfs:Class ;
+	rdfs:label "JavaScript target type"@en ;
+	rdfs:comment "The (meta) class for parameterizable targets that are based on JavaScript functions."@en ;
+	rdfs:subClassOf sh:TargetType ;
+	rdfs:subClassOf sh:JSExecutable ;
+	rdfs:isDefinedBy sh: .
+
+sh:JSConstraint
+	a rdfs:Class ;
+	rdfs:label "JavaScript-based constraint"@en ;
+	rdfs:comment "The class of constraints backed by a JavaScript function."@en ;
+	rdfs:subClassOf sh:JSExecutable ;
+	rdfs:isDefinedBy sh: .
+
+sh:JSConstraintComponent
+	a sh:ConstraintComponent ;
+	rdfs:label "JavaScript constraint component"@en ;
+	rdfs:comment "A constraint component with the parameter sh:js linking to a sh:JSConstraint containing a sh:script."@en ;
+  	sh:parameter sh:JSConstraint-js ;
+	rdfs:isDefinedBy sh: .
+
+sh:JSConstraint-js
+	a sh:Parameter ;
+	sh:path sh:js ;
+	rdfs:isDefinedBy sh: .
+
+sh:js
+	a rdf:Property ;
+	rdfs:label "JavaScript constraint"@en ;
+	rdfs:comment "Constraints expressed in JavaScript." ;
+  	rdfs:range sh:JSConstraint ;
+	rdfs:isDefinedBy sh: .
+
+sh:jsFunctionName
+	a rdf:Property ;
+	rdfs:label "JavaScript function name"@en ;
+	rdfs:comment "The name of the JavaScript function to execute."@en ;
+	rdfs:domain sh:JSExecutable ;
+	rdfs:range xsd:string ;
+	rdfs:isDefinedBy sh: .
+
+sh:jsLibrary
+	a rdf:Property ;
+	rdfs:label "JavaScript library"@en ;
+  	rdfs:comment "Declares which JavaScript libraries are needed to execute this."@en ;
+	rdfs:range sh:JSLibrary ;
+	rdfs:isDefinedBy sh: .
+
+sh:jsLibraryURL
+	a rdf:Property ;
+	rdfs:label "JavaScript library URL"@en ;
+	rdfs:comment "Declares the URLs of a JavaScript library. This should be the absolute URL of a JavaScript file. Implementations may redirect those to local files."@en ;
+	rdfs:domain sh:JSLibrary ;
+	rdfs:range xsd:anyURI ;
+	rdfs:isDefinedBy sh: .
+
+sh:JSFunction
+	a rdfs:Class ;
+  	rdfs:label "JavaScript function"@en ;
+	rdfs:comment "The class of SHACL functions that execute a JavaScript function when called."@en ;
+	rdfs:subClassOf sh:Function ;
+	rdfs:subClassOf sh:JSExecutable ;
+	rdfs:isDefinedBy sh: .
+
+sh:JSLibrary
+	a rdfs:Class ;
+	rdfs:label "JavaScript library"@en ;
+	rdfs:comment "Represents a JavaScript library, typically identified by one or more URLs of files to include."@en ;
+	rdfs:subClassOf rdfs:Resource ;
+	rdfs:isDefinedBy sh: .
+
+sh:JSRule
+	a rdfs:Class ;
+	rdfs:label "JavaScript rule"@en ;
+	rdfs:comment "The class of SHACL rules expressed using JavaScript."@en ;
+	rdfs:subClassOf sh:JSExecutable ;
+	rdfs:subClassOf sh:Rule ;
+	rdfs:isDefinedBy sh: .
+
+sh:JSValidator
+	a rdfs:Class ;
+  	rdfs:label "JavaScript validator"@en ;
+	rdfs:comment "A SHACL validator based on JavaScript. This can be used to declare SHACL constraint components that perform JavaScript-based validation when used."@en ;
+  	rdfs:subClassOf sh:JSExecutable ;
+  	rdfs:subClassOf sh:Validator ;
+  	rdfs:isDefinedBy sh: .
diff --git a/testlib/src/test/java/com/diffplug/spotless/rdf/RdfFormatterTest.java b/testlib/src/test/java/com/diffplug/spotless/rdf/RdfFormatterTest.java
new file mode 100644
index 0000000000..2bd66974e3
--- /dev/null
+++ b/testlib/src/test/java/com/diffplug/spotless/rdf/RdfFormatterTest.java
@@ -0,0 +1,129 @@
+package com.diffplug.spotless.rdf;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.invoke.MethodHandles;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.StepHarness;
+import com.diffplug.spotless.TestProvisioner;
+
+import org.jetbrains.annotations.NotNull;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.provider.Arguments;
+
+import com.diffplug.spotless.ResourceHarness;
+
+import org.opentest4j.AssertionFailedError;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class RdfFormatterTest extends ResourceHarness {
+
+	private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+	private static FormatterStep forTurtleFormatterVersion(String version) throws ClassNotFoundException {
+		return forTurtleFormatterVersionAndStyle(version, defaultStyle());
+	}
+
+	private static FormatterStep forTurtleFormatterVersionAndStyle(String version, Map<String, String> style) throws ClassNotFoundException {
+		return RdfFormatterStep.create(
+			RdfFormatterConfig.builder().turtleFormatterVersion(version).build(),
+			style,
+			TestProvisioner.mavenCentral());
+	}
+
+	public RdfFormatterTest() throws ClassNotFoundException {
+	}
+
+	@Test
+	void testTurtleFormatter_1_2_12_DefaultStyle() throws IOException, ClassNotFoundException {
+		String inputDir =	"/rdf/ttl/input/";
+		String expectedOutputDir = "/rdf/ttl/expected/v1.2.12-default/";
+		testBeforeAfterFolders(inputDir, expectedOutputDir, StepHarness.forStep(forTurtleFormatterVersion("1.2.12")));
+	}
+
+	@Test
+	void testTurtleFormatter_1_2_12_style01() throws IOException, ClassNotFoundException {
+		String inputDir =	"/rdf/ttl/input/";
+		String expectedOutputDir = "/rdf/ttl/expected/v1.2.12-style01/";
+		testBeforeAfterFolders(inputDir, expectedOutputDir, StepHarness.forStep(forTurtleFormatterVersionAndStyle("1.2.12", style01())));
+	}
+
+	private static @NotNull Map<String, String> defaultStyle(){
+		return Map.of();
+	}
+
+	private static @NotNull Map<String, String> style01() {
+		return Map.of(
+			"alignPrefixes", "RIGHT",
+			"alignPredicates","true",
+			"alignObjects", "true",
+			"insertFinalNewline", "false"
+		);
+	}
+
+	private void testBeforeAfterFolders(String beforeDir, String afterDir, StepHarness stepHarness) throws IOException {
+		List<Arguments> args = getBeforeAfterTestResources(beforeDir, afterDir);
+		for(Arguments arg: args){
+			String before = (String) arg.get()[0];
+			String after = (String) arg.get()[1];
+			try {
+				stepHarness.testResource(before, after);
+			} catch (AssertionFailedError e){
+				throw new AssertionFailedError(String.format("Test failed for input %s, expected output %s\n" + e.getMessage(), before, after), e.getCause());
+			}
+		}
+	}
+
+	private List<Arguments> getBeforeAfterTestResources(String beforeDir, String afterDir)
+		throws IOException {
+		List<Path> inputs = listTestResources(beforeDir)
+			.stream()
+			.map(s -> Path.of(beforeDir, s))
+			.collect(Collectors.toList());
+		List<Path> outputs = listTestResources(afterDir)
+			.stream()
+			.map(s -> Path.of(afterDir, s))
+			.collect(Collectors.toList());
+		List<Path> missingOutputs = inputs
+			.stream()
+			.filter(in -> outputs
+				.stream().noneMatch(out -> out.getFileName().equals(in.getFileName())))
+			.collect(Collectors.toList());
+		if (!missingOutputs.isEmpty()){
+			throw new IllegalStateException(String.format("'after' directory %s is missing files corresponding to these 'before' files: %s", beforeDir, missingOutputs));
+		}
+		List<Path> missingInputs = outputs
+			.stream()
+			.filter(o -> inputs
+				.stream().noneMatch(in -> in.getFileName().equals(o.getFileName())))
+			.collect(Collectors.toList());
+		if (!missingInputs.isEmpty()){
+			throw new IllegalStateException(String.format("'before' directory %s is missing files corresponding to these 'after' files: %s", afterDir, missingInputs));
+		}
+		List<Arguments> arguments = new ArrayList<>();
+		for(Path input : inputs){
+			Optional<Path> output = outputs.stream().filter(o -> o.getFileName().equals(input.getFileName())).findFirst();
+			if (output.isEmpty()) {
+				throw new IllegalStateException(String.format("'after' directory %s is missing file %s corresponding to 'before' file %s", afterDir, input.getFileName(), input));
+			}
+			arguments.add(Arguments.of(unixRelative(input), unixRelative(output.get())));
+		}
+		return arguments;
+	}
+
+	private static @NotNull String unixRelative(Path input) {
+		String path = input.toString().replaceAll("\\\\", "/");
+		while (path.startsWith("/")){
+			path = path.substring(1);
+		}
+		return path;
+	}
+}

From c6b971e098b1cd917e5ef9f4b413ce4d1e4c5a31 Mon Sep 17 00:00:00 2001
From: Florian Kleedorfer <florian.kleedorfer@austria.fm>
Date: Mon, 16 Sep 2024 15:25:27 +0200
Subject: [PATCH 1792/2068] Add license headers

---
 .../diffplug/spotless/rdf/RdfFormatterConfig.java | 15 +++++++++++++++
 .../diffplug/spotless/rdf/RdfFormatterFunc.java   | 15 +++++++++++++++
 .../diffplug/spotless/rdf/RdfFormatterStep.java   | 15 +++++++++++++++
 .../diffplug/spotless/rdf/ReflectionHelper.java   | 15 +++++++++++++++
 .../diffplug/spotless/rdf/RdfFormatterTest.java   | 15 +++++++++++++++
 5 files changed, 75 insertions(+)

diff --git a/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterConfig.java b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterConfig.java
index 99b2bba936..f061cc925c 100644
--- a/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterConfig.java
+++ b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterConfig.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.rdf;
 
 import java.io.Serializable;
diff --git a/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterFunc.java b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterFunc.java
index dc6ebfbb20..4512b6c7e1 100644
--- a/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterFunc.java
+++ b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterFunc.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.rdf;
 
 import com.diffplug.spotless.FormatExceptionPolicy;
diff --git a/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterStep.java
index de8ee295cb..841385a3df 100644
--- a/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterStep.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.rdf;
 
 import java.io.File;
diff --git a/lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java b/lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java
index 4cd975758a..83a2a8175b 100644
--- a/lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java
+++ b/lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.rdf;
 
 import org.slf4j.Logger;
diff --git a/testlib/src/test/java/com/diffplug/spotless/rdf/RdfFormatterTest.java b/testlib/src/test/java/com/diffplug/spotless/rdf/RdfFormatterTest.java
index 2bd66974e3..b7f397904c 100644
--- a/testlib/src/test/java/com/diffplug/spotless/rdf/RdfFormatterTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/rdf/RdfFormatterTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.rdf;
 
 import java.io.File;

From 94cd94dbc6eb3b7b7489509f3810a21e29619d50 Mon Sep 17 00:00:00 2001
From: Florian Kleedorfer <florian.kleedorfer@austria.fm>
Date: Mon, 16 Sep 2024 15:35:58 +0200
Subject: [PATCH 1793/2068] Add license headers

---
 CHANGES.md              | 3 ++-
 plugin-maven/CHANGES.md | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 827a7a827d..38a1a98dcb 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,7 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
-
+### Added
+* Support for `rdf` ([#2261](https://github.com/diffplug/spotless/pull/2261))
 ## [3.0.0.BETA2] - 2024-08-25
 ### Changed
 * Support toning down sortPom logging. ([#2185](https://github.com/diffplug/spotless/pull/2185))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 67e356e5ab..c3d63585f9 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,7 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
-
+### Added
+* Support for `rdf` ([#2261](https://github.com/diffplug/spotless/pull/2261))
 ## [2.44.0.BETA2] - 2024-08-25
 ### Changed
 * Support toning down sortPom logging. ([#2185](https://github.com/diffplug/spotless/pull/2185))

From 65b1310ab39abfea355c97835b6d183fa465465a Mon Sep 17 00:00:00 2001
From: Florian Kleedorfer <florian.kleedorfer@austria.fm>
Date: Sun, 22 Sep 2024 11:03:25 +0200
Subject: [PATCH 1794/2068] Fix turtleFormatterVersion usage and bump default

---
 .../main/java/com/diffplug/spotless/rdf/RdfFormatterStep.java  | 2 +-
 .../main/java/com/diffplug/spotless/maven/rdf/RdfFormat.java   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterStep.java
index 841385a3df..d26118331e 100644
--- a/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterStep.java
@@ -52,7 +52,7 @@
 import org.slf4j.LoggerFactory;
 
 public class RdfFormatterStep implements Serializable{
-	public static final String LATEST_TURTLE_FORMATTER_VERSION = "1.2.12";
+	public static final String LATEST_TURTLE_FORMATTER_VERSION = "1.2.13";
 	public static long serialVersionUID = 1L;
 	private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/rdf/RdfFormat.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/rdf/RdfFormat.java
index 0ab121590e..baf2a4ebf6 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/rdf/RdfFormat.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/rdf/RdfFormat.java
@@ -43,7 +43,8 @@ public FormatterStep newFormatterStep(FormatterStepConfig config) {
 		RdfFormatterConfig formatterConfig = RdfFormatterConfig
 			.builder()
 				.failOnWarning(failOnWarning)
-			.verify(verify)
+				.turtleFormatterVersion(turtleFormatterVersion)
+				.verify(verify)
 				.build();
 		try {
 			return RdfFormatterStep.create(formatterConfig,

From fba8aac1180d81626367e7b72fcbe161c8f0d061 Mon Sep 17 00:00:00 2001
From: Florian Kleedorfer <florian.kleedorfer@austria.fm>
Date: Sun, 22 Sep 2024 20:26:09 +0200
Subject: [PATCH 1795/2068] Slight code beautification

---
 .../com/diffplug/spotless/rdf/RdfFormatterConfig.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterConfig.java b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterConfig.java
index f061cc925c..41a5071371 100644
--- a/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterConfig.java
+++ b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterConfig.java
@@ -96,10 +96,6 @@ public Builder turtleFormatterVersion(String version){
 			return this;
 		}
 
-		public RdfFormatterConfig build(){
-			return config;
-		}
-
 		public Builder verify(boolean verify) {
 			this.config.verify = verify;
 			return this;
@@ -109,6 +105,10 @@ public Builder verify() {
 			this.config.verify = true;
 			return this;
 		}
+
+		public RdfFormatterConfig build(){
+			return config;
+		}
 	}
 
 	@Override public boolean equals(Object o) {

From 8405026c2d4dd4af6ccd7fb412a23897cfe43a8b Mon Sep 17 00:00:00 2001
From: Florian Kleedorfer <florian.kleedorfer@austria.fm>
Date: Mon, 23 Sep 2024 08:33:14 +0200
Subject: [PATCH 1796/2068] Improve diff calculation after failed RDF content
 verification

Comparing graph nodes using their `equals()` method is used under the hood by the isomorphicity check and therefore has to be used in the diff calcluation as well (otherwise the latter might not find any differences).

Special handling of blank nodes has been omitted as it is hard to find which ones are different and which ones are not, so we just print them all for now.
---
 .../spotless/rdf/RdfFormatterFunc.java        | 80 +++++++++++--------
 .../spotless/rdf/ReflectionHelper.java        | 72 ++++++++++++++---
 2 files changed, 109 insertions(+), 43 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterFunc.java b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterFunc.java
index 4512b6c7e1..c5baa49c07 100644
--- a/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterFunc.java
+++ b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterFunc.java
@@ -19,18 +19,19 @@
 import com.diffplug.spotless.FormatExceptionPolicyStrict;
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.LineEnding;
-import com.diffplug.spotless.SerializedFunction;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
+import java.lang.invoke.MethodHandles;
 import java.lang.reflect.InvocationTargetException;
-import java.nio.file.Path;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
 public class RdfFormatterFunc implements FormatterFunc {
-
+	private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 	private static final Set<String> TURTLE_EXTENSIONS = Set.of("ttl", "turtle");
 	private static final Set<String> TRIG_EXTENSIONS = Set.of("trig");
 	private static final Set<String> NTRIPLES_EXTENSIONS = Set.of("n-triples", "ntriples", "nt");
@@ -122,35 +123,7 @@ private static void veryfyResult(String rawUnix, File file, ReflectionHelper ref
 				diffResult=String.format("< %,d triples", beforeSize);
 				diffResult += String.format("> %,d triples", afterSize);
 			} else {
-				List<Object> onlyInBeforeModel = new ArrayList<>();
-				List<Object> onlyInAfterModel = new ArrayList<>();
-				Object statementIterator = reflectionHelper.listModelStatements(modelBefore);
-				while(reflectionHelper.hasNext(statementIterator)){
-					Object statement = reflectionHelper.next(statementIterator);
-					if (!reflectionHelper.containsBlankNode(statement)) {
-						//don't compare statements with blank nodes. If the difference is there, that's just too bad
-						if (!reflectionHelper.containsStatement(modelAfter, statement)){
-							onlyInBeforeModel.add(statement);
-						}
-					}
-				}
-				statementIterator = reflectionHelper.listModelStatements(modelAfter);
-				while(reflectionHelper.hasNext(statementIterator)){
-					Object statement = reflectionHelper.next(statementIterator);
-					if (!reflectionHelper.containsBlankNode(statement)) {
-						//don't compare statements with blank nodes. If the difference is there, that's just too bad
-						if (!reflectionHelper.containsStatement(modelBefore, statement)){
-							onlyInAfterModel.add(statement);
-						}
-					}
-				}
-				if (! (onlyInBeforeModel.isEmpty() && onlyInAfterModel.isEmpty())) {
-					diffResult = onlyInBeforeModel.stream().map(s -> String.format("< %s", s))
-						.collect(Collectors.joining("\n"));
-					diffResult += "\n" + onlyInAfterModel.stream().map(s -> String.format("> %s", s)).collect(Collectors.joining("\n"));
-				} else {
-					diffResult = "The only differences are in statements with blank nodes - not shown here";
-				}
+				diffResult = calculateDiff(reflectionHelper, modelBefore, modelAfter);
 			}
 			throw new IllegalStateException(
 				"Formatted RDF is not isomorphic with original, which means that formatting changed the data.\n"
@@ -160,4 +133,45 @@ private static void veryfyResult(String rawUnix, File file, ReflectionHelper ref
 			+ diffResult);
 		}
 	}
+
+	private static String calculateDiff(ReflectionHelper reflectionHelper, Object modelBefore, Object modelAfter)
+		throws InvocationTargetException, IllegalAccessException {
+		String diffResult;
+		Object graphBefore = reflectionHelper.getGraph(modelBefore);
+		Object graphAfter = reflectionHelper.getGraph(modelAfter);
+
+		List<Object> onlyInBeforeContent = reflectionHelper.streamGraph(graphBefore)
+			.filter(triple -> {
+				try {
+					return !reflectionHelper.graphContainsSameTerm(graphAfter, triple);
+				} catch (InvocationTargetException e) {
+					throw new RuntimeException(e);
+				} catch (IllegalAccessException e) {
+					throw new RuntimeException(e);
+				}
+			})
+			.collect(Collectors.toList());
+
+		List<Object> onlyInAfterContent = reflectionHelper.streamGraph(graphAfter)
+			.filter(triple -> {
+				try {
+					return !reflectionHelper.graphContainsSameTerm(graphBefore, triple);
+				} catch (InvocationTargetException e) {
+					throw new RuntimeException(e);
+				} catch (IllegalAccessException e) {
+					throw new RuntimeException(e);
+				}
+			})
+			.collect(Collectors.toList());
+		if (! (onlyInBeforeContent.isEmpty() && onlyInAfterContent.isEmpty())) {
+			diffResult = onlyInBeforeContent.stream().map(s -> String.format("< %s", s))
+				.collect(Collectors.joining("\n"));
+			diffResult += "\n" + onlyInAfterContent.stream().map(s -> String.format("> %s", s)).collect(Collectors.joining("\n"));
+		} else {
+			diffResult = "'before' and 'after' content differs, but we don't know why. This is probably a bug.";
+		}
+		return diffResult;
+	}
+
+
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java b/lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java
index 83a2a8175b..cb2392a859 100644
--- a/lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java
+++ b/lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java
@@ -35,6 +35,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class ReflectionHelper {
 	private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@@ -52,11 +53,25 @@ public class ReflectionHelper {
 	private final Class<?> JenaModelFactoryClass;
 	private final Class<?> JenaLangClass;
 	private final Class<?> JenaRDFFormatClass;
+	private final Class<?> JenaGraphClass;
+	private final Class<?> JenaNode;
+	private final Class<?> JenaTriple;
 	private final Class<?> TurtleFormatFormattingStyleClass;
 	private final Class<?> TurtleFormatFormattingStyleBuilderClass;
 	private final Class<?> TurtleFormatFormatterClass;
 
-	public ReflectionHelper(RdfFormatterStep.State state) throws ClassNotFoundException {
+	private final Method graphFindByNodes;
+	private final Method graphStream;
+	private final Method graphFindTriple;
+	private final Method contains;
+	private final Method getSubject;
+	private final Method getPredicate;
+	private final Method getObject;
+	private final Method isAnon;
+	private final Method getGraph;
+	private final Method tripleGetObject;
+
+	public ReflectionHelper(RdfFormatterStep.State state) throws ClassNotFoundException, NoSuchMethodException {
 		this.state = state;
 		this.classLoader = state.getJarState().getClassLoader();
 		this.JenaRdfDataMgrClass = classLoader.loadClass("org.apache.jena.riot.RDFDataMgr");
@@ -76,6 +91,19 @@ public ReflectionHelper(RdfFormatterStep.State state) throws ClassNotFoundExcept
 		Class<?>[] innerClasses = TurtleFormatFormattingStyleClass.getDeclaredClasses();
 		this.TurtleFormatFormattingStyleBuilderClass = Arrays.stream(innerClasses)
 			.filter(c -> c.getSimpleName().equals("FormattingStyleBuilder")).findFirst().get();
+		this.getSubject = JenaStatementClass.getMethod("getSubject");;
+		this.getPredicate = JenaStatementClass.getMethod("getPredicate");
+		this.getObject = JenaStatementClass.getMethod("getObject");
+		this.isAnon = JenaRDFNodeClass.getMethod("isAnon");
+		this.getGraph =JenaModelClass.getMethod(("getGraph"));
+		this.JenaGraphClass = classLoader.loadClass("org.apache.jena.graph.Graph");
+		this.JenaNode = classLoader.loadClass("org.apache.jena.graph.Node");
+		this.JenaTriple = classLoader.loadClass("org.apache.jena.graph.Triple");
+		this.graphFindByNodes = JenaGraphClass.getMethod("find", JenaNode, JenaNode,JenaNode);
+		this.graphFindTriple = JenaGraphClass.getMethod("find", JenaTriple);
+		this.graphStream = JenaGraphClass.getMethod("stream");
+		this.tripleGetObject = JenaTriple.getMethod("getObject");
+		this.contains =JenaGraphClass.getMethod("contains", JenaTriple);
 	}
 
 	public Object getLang(String lang) throws NoSuchFieldException, IllegalAccessException {
@@ -111,24 +139,17 @@ public Object next(Object statementIterator)
 	}
 
 	public boolean containsBlankNode(Object statement)
-		throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
-		Method getSubject = JenaStatementClass.getMethod("getSubject");
+		throws InvocationTargetException, IllegalAccessException {
 		Object subject = getSubject.invoke(statement);
-		Method isAnon = JenaRDFNodeClass.getMethod("isAnon");
 		if ((boolean) isAnon.invoke(subject)){
 			return true;
 		}
-		Method getPredicate = JenaStatementClass.getMethod("getPredicate");
 		Object predicate = getPredicate.invoke(statement);
 		if ((boolean) isAnon.invoke(predicate)){
 			return true;
 		}
-		Method getObject = JenaStatementClass.getMethod("getObject");
 		Object object = getObject.invoke(statement);
-		if ((boolean) isAnon.invoke(object)) {
-			return true;
-		}
-		return false;
+		return (boolean) isAnon.invoke(object);
 	}
 
 	public boolean containsStatement(Object model, Object statement)
@@ -137,6 +158,23 @@ public boolean containsStatement(Object model, Object statement)
 		return (boolean) contains.invoke(model, statement);
 	}
 
+	public boolean graphContainsSameTerm(Object graph, Object triple) throws InvocationTargetException, IllegalAccessException {
+		boolean found = (boolean) contains.invoke(graph, triple);
+		if (!found){
+			return false;
+		}
+		Iterator<Object> it  = (Iterator<Object>) graphFindTriple.invoke(graph, triple);
+		while(it.hasNext()){
+			Object foundTriple = it.next();
+			Object foundObject =  tripleGetObject.invoke(foundTriple);
+			Object searchedObject = tripleGetObject.invoke(triple);
+			if (!foundObject.equals(searchedObject)){
+				return false;
+			}
+		}
+		return true;
+	}
+
 	private class DynamicErrorInvocationHandler implements InvocationHandler {
 		private final String filePath;
 
@@ -156,6 +194,10 @@ public DynamicErrorInvocationHandler(File file) {
 			if (severity.equals("warning") && !state.getConfig().isFailOnWarning()) {
 				logger.warn("{}({},{}): {}", this.filePath, line, col, message);
 			} else {
+				if (severity.equals("warning")){
+					logger.error("Formatter fails because of a parser warning. To make the formatter succeed in"
+						+ "the presence of warnings, set the configuration parameter 'failOnWarning' to 'false' (default: 'true')");
+				}
 				throw new RuntimeException(
 					String.format("line %d, col %d: %s (severity: %s)", line, col, message, severity));
 			}
@@ -180,6 +222,16 @@ public void parseModel(Object parser, Object model)
 		JenaRdfParserClass.getMethod("parse", JenaModelClass).invoke(parser, model);
 	}
 
+	public Object getGraph(Object model) throws InvocationTargetException, IllegalAccessException {
+		return getGraph.invoke(model);
+	}
+
+	public Stream<Object> streamGraph(Object graph) throws InvocationTargetException, IllegalAccessException {
+		return (Stream<Object>) graphStream.invoke(graph);
+
+	}
+
+
 	public String formatWithJena(Object model, Object rdfFormat)
 		throws NoSuchMethodException, NoSuchFieldException, InvocationTargetException, IllegalAccessException {
 		StringWriter sw = new StringWriter();

From 996cf867528699f574ebeb26fb32fb28e050e5a4 Mon Sep 17 00:00:00 2001
From: Florian Kleedorfer <florian.kleedorfer@austria.fm>
Date: Mon, 23 Sep 2024 08:39:10 +0200
Subject: [PATCH 1797/2068] Format code

---
 .../spotless/rdf/RdfFormatterConfig.java      |  33 ++--
 .../spotless/rdf/RdfFormatterFunc.java        |  95 +++++-----
 .../spotless/rdf/RdfFormatterStep.java        |  53 ++----
 .../spotless/rdf/ReflectionHelper.java        | 173 +++++++++---------
 .../spotless/maven/AbstractSpotlessMojo.java  |   3 +-
 .../spotless/maven/SpotlessApplyMojo.java     |   2 +-
 .../spotless/maven/rdf/RdfFormat.java         |  20 +-
 .../diffplug/spotless/ResourceHarness.java    |  30 ++-
 .../spotless/rdf/RdfFormatterTest.java        |  79 ++++----
 9 files changed, 227 insertions(+), 261 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterConfig.java b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterConfig.java
index 41a5071371..ed05f9b9cf 100644
--- a/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterConfig.java
+++ b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterConfig.java
@@ -16,20 +16,16 @@
 package com.diffplug.spotless.rdf;
 
 import java.io.Serializable;
-import java.lang.reflect.Field;
-import java.util.Arrays;
-import java.util.Map;
 import java.util.Objects;
 
-public class RdfFormatterConfig implements Serializable{
+public class RdfFormatterConfig implements Serializable {
 	private static final long serialVersionId = 1L;
 	private boolean failOnWarning = true;
 	private boolean useTurtleFormatter = true;
 	private String turtleFormatterVersion = RdfFormatterStep.LATEST_TURTLE_FORMATTER_VERSION;
 	private boolean verify = true;
 
-	public RdfFormatterConfig() {
-	}
+	public RdfFormatterConfig() {}
 
 	public void setFailOnWarning(boolean failOnWarning) {
 		this.failOnWarning = failOnWarning;
@@ -47,7 +43,7 @@ public void setVerify(boolean verify) {
 		this.verify = verify;
 	}
 
-	public static Builder builder(){
+	public static Builder builder() {
 		return new Builder();
 	}
 
@@ -70,28 +66,27 @@ public void setTurtleFormatterVersion(String turtleFormatterVersion) {
 	public static class Builder {
 		RdfFormatterConfig config = new RdfFormatterConfig();
 
-		public Builder() {
-		}
+		public Builder() {}
 
-		public Builder failOnWarning(){
+		public Builder failOnWarning() {
 			return this.failOnWarning(true);
 		}
 
-		public Builder failOnWarning(boolean fail){
+		public Builder failOnWarning(boolean fail) {
 			this.config.setFailOnWarning(fail);
 			return this;
 		}
 
-		public Builder useTurtleFormatter(){
+		public Builder useTurtleFormatter() {
 			return this.useTurtleFormatter(true);
 		}
 
-		public Builder useTurtleFormatter(boolean useTurtleFormatter){
+		public Builder useTurtleFormatter(boolean useTurtleFormatter) {
 			this.config.setUseTurtleFormatter(useTurtleFormatter);
 			return this;
 		}
 
-		public Builder turtleFormatterVersion(String version){
+		public Builder turtleFormatterVersion(String version) {
 			this.config.turtleFormatterVersion = version;
 			return this;
 		}
@@ -106,22 +101,24 @@ public Builder verify() {
 			return this;
 		}
 
-		public RdfFormatterConfig build(){
+		public RdfFormatterConfig build() {
 			return config;
 		}
 	}
 
-	@Override public boolean equals(Object o) {
+	@Override
+	public boolean equals(Object o) {
 		if (this == o)
 			return true;
 		if (!(o instanceof RdfFormatterConfig))
 			return false;
 		RdfFormatterConfig that = (RdfFormatterConfig) o;
 		return isFailOnWarning() == that.isFailOnWarning() && isUseTurtleFormatter() == that.isUseTurtleFormatter()
-			&& Objects.equals(turtleFormatterVersion, that.turtleFormatterVersion);
+				&& Objects.equals(turtleFormatterVersion, that.turtleFormatterVersion);
 	}
 
-	@Override public int hashCode() {
+	@Override
+	public int hashCode() {
 		return Objects.hash(isFailOnWarning(), isUseTurtleFormatter(), turtleFormatterVersion);
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterFunc.java b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterFunc.java
index c5baa49c07..4964141a71 100644
--- a/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterFunc.java
+++ b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterFunc.java
@@ -15,14 +15,6 @@
  */
 package com.diffplug.spotless.rdf;
 
-import com.diffplug.spotless.FormatExceptionPolicy;
-import com.diffplug.spotless.FormatExceptionPolicyStrict;
-import com.diffplug.spotless.FormatterFunc;
-import com.diffplug.spotless.LineEnding;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.io.File;
 import java.lang.invoke.MethodHandles;
 import java.lang.reflect.InvocationTargetException;
@@ -30,6 +22,14 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.diffplug.spotless.FormatExceptionPolicy;
+import com.diffplug.spotless.FormatExceptionPolicyStrict;
+import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.LineEnding;
+
 public class RdfFormatterFunc implements FormatterFunc {
 	private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 	private static final Set<String> TURTLE_EXTENSIONS = Set.of("ttl", "turtle");
@@ -44,20 +44,22 @@ public RdfFormatterFunc(RdfFormatterStep.State state) {
 		this.state = state;
 	}
 
-	@Override public String apply(String input) throws Exception {
+	@Override
+	public String apply(String input) throws Exception {
 		throw new UnsupportedOperationException("We need to know the filename so we can guess the RDF format. Use apply(String, File) instead!");
 	}
 
-	@Override public String apply(String rawUnix, File file) throws Exception {
+	@Override
+	public String apply(String rawUnix, File file) throws Exception {
 		String filename = file.getName().toLowerCase();
 		int lastDot = filename.lastIndexOf('.');
 		if (lastDot < 0) {
 			throw new IllegalArgumentException(
-				String.format("File %s has no file extension, cannot determine RDF format", file.getAbsolutePath()));
+					String.format("File %s has no file extension, cannot determine RDF format", file.getAbsolutePath()));
 		}
 		if (lastDot + 1 >= filename.length()) {
 			throw new IllegalArgumentException(
-				String.format("File %s has no file extension, cannot determine RDF format", file.getAbsolutePath()));
+					String.format("File %s has no file extension, cannot determine RDF format", file.getAbsolutePath()));
 		}
 		String extension = filename.substring(lastDot + 1);
 		ReflectionHelper reflectionHelper = new ReflectionHelper(state);
@@ -95,8 +97,8 @@ private String formatTrig(String rawUnix, File file) {
 	}
 
 	private String formatTurtle(String rawUnix, File file, ReflectionHelper reflectionHelper)
-		throws NoSuchMethodException, InvocationTargetException, IllegalAccessException,
-		NoSuchFieldException, InstantiationException {
+			throws NoSuchMethodException, InvocationTargetException, IllegalAccessException,
+			NoSuchFieldException, InstantiationException {
 		String formatted;
 		Object lang = reflectionHelper.getLang("TTL");
 		if (state.getConfig().isUseTurtleFormatter()) {
@@ -112,60 +114,60 @@ private String formatTurtle(String rawUnix, File file, ReflectionHelper reflecti
 	}
 
 	private static void veryfyResult(String rawUnix, File file, ReflectionHelper reflectionHelper, Object lang,
-		String formatted) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+			String formatted) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
 		Object modelBefore = reflectionHelper.parseToModel(rawUnix, file, lang);
 		Object modelAfter = reflectionHelper.parseToModel(formatted, file, lang);
-		if (!reflectionHelper.areModelsIsomorphic(modelBefore, modelAfter)){
+		if (!reflectionHelper.areModelsIsomorphic(modelBefore, modelAfter)) {
 			long beforeSize = reflectionHelper.modelSize(modelBefore);
 			long afterSize = reflectionHelper.modelSize(modelAfter);
 			String diffResult = "[no diff information available]";
-			if (beforeSize != afterSize){
-				diffResult=String.format("< %,d triples", beforeSize);
+			if (beforeSize != afterSize) {
+				diffResult = String.format("< %,d triples", beforeSize);
 				diffResult += String.format("> %,d triples", afterSize);
 			} else {
 				diffResult = calculateDiff(reflectionHelper, modelBefore, modelAfter);
 			}
 			throw new IllegalStateException(
-				"Formatted RDF is not isomorphic with original, which means that formatting changed the data.\n"
-				+ "This could be a bug in the formatting system leading to data corruption and should be reported. \n"
-				+ "If you are not scared to lose data, you can disable this check by setting the config option 'verify' to 'false'"
-				+ "\n\nDiff:\n"
-			+ diffResult);
+					"Formatted RDF is not isomorphic with original, which means that formatting changed the data.\n"
+							+ "This could be a bug in the formatting system leading to data corruption and should be reported. \n"
+							+ "If you are not scared to lose data, you can disable this check by setting the config option 'verify' to 'false'"
+							+ "\n\nDiff:\n"
+							+ diffResult);
 		}
 	}
 
 	private static String calculateDiff(ReflectionHelper reflectionHelper, Object modelBefore, Object modelAfter)
-		throws InvocationTargetException, IllegalAccessException {
+			throws InvocationTargetException, IllegalAccessException {
 		String diffResult;
 		Object graphBefore = reflectionHelper.getGraph(modelBefore);
 		Object graphAfter = reflectionHelper.getGraph(modelAfter);
 
 		List<Object> onlyInBeforeContent = reflectionHelper.streamGraph(graphBefore)
-			.filter(triple -> {
-				try {
-					return !reflectionHelper.graphContainsSameTerm(graphAfter, triple);
-				} catch (InvocationTargetException e) {
-					throw new RuntimeException(e);
-				} catch (IllegalAccessException e) {
-					throw new RuntimeException(e);
-				}
-			})
-			.collect(Collectors.toList());
+				.filter(triple -> {
+					try {
+						return !reflectionHelper.graphContainsSameTerm(graphAfter, triple);
+					} catch (InvocationTargetException e) {
+						throw new RuntimeException(e);
+					} catch (IllegalAccessException e) {
+						throw new RuntimeException(e);
+					}
+				})
+				.collect(Collectors.toList());
 
 		List<Object> onlyInAfterContent = reflectionHelper.streamGraph(graphAfter)
-			.filter(triple -> {
-				try {
-					return !reflectionHelper.graphContainsSameTerm(graphBefore, triple);
-				} catch (InvocationTargetException e) {
-					throw new RuntimeException(e);
-				} catch (IllegalAccessException e) {
-					throw new RuntimeException(e);
-				}
-			})
-			.collect(Collectors.toList());
-		if (! (onlyInBeforeContent.isEmpty() && onlyInAfterContent.isEmpty())) {
+				.filter(triple -> {
+					try {
+						return !reflectionHelper.graphContainsSameTerm(graphBefore, triple);
+					} catch (InvocationTargetException e) {
+						throw new RuntimeException(e);
+					} catch (IllegalAccessException e) {
+						throw new RuntimeException(e);
+					}
+				})
+				.collect(Collectors.toList());
+		if (!(onlyInBeforeContent.isEmpty() && onlyInAfterContent.isEmpty())) {
 			diffResult = onlyInBeforeContent.stream().map(s -> String.format("< %s", s))
-				.collect(Collectors.joining("\n"));
+					.collect(Collectors.joining("\n"));
 			diffResult += "\n" + onlyInAfterContent.stream().map(s -> String.format("> %s", s)).collect(Collectors.joining("\n"));
 		} else {
 			diffResult = "'before' and 'after' content differs, but we don't know why. This is probably a bug.";
@@ -173,5 +175,4 @@ private static String calculateDiff(ReflectionHelper reflectionHelper, Object mo
 		return diffResult;
 	}
 
-
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterStep.java
index d26118331e..bc169da619 100644
--- a/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterStep.java
@@ -15,62 +15,39 @@
  */
 package com.diffplug.spotless.rdf;
 
-import java.io.File;
 import java.io.Serializable;
-import java.io.StringWriter;
 import java.lang.invoke.MethodHandles;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Set;
-import java.util.SortedMap;
 import java.util.TreeMap;
-import java.util.stream.Collectors;
 
-import javax.annotation.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import com.diffplug.spotless.FormatExceptionPolicy;
-import com.diffplug.spotless.FormatExceptionPolicyStrict;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
-import com.diffplug.spotless.LineEnding;
-import com.diffplug.spotless.OnMatch;
 import com.diffplug.spotless.Provisioner;
-import com.diffplug.spotless.SerializableFileFilter;
-import com.diffplug.spotless.npm.TsFmtFormatterStep;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-public class RdfFormatterStep implements Serializable{
+public class RdfFormatterStep implements Serializable {
 	public static final String LATEST_TURTLE_FORMATTER_VERSION = "1.2.13";
 	public static long serialVersionUID = 1L;
 	private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
-	private static final String TURTLE_FORMATTER_COORDINATES = "de.atextor:turtle-formatter" ;
+	private static final String TURTLE_FORMATTER_COORDINATES = "de.atextor:turtle-formatter";
 
 	private final JarState.Promised jarState;
 	private final Map<String, String> turtleFormatterStyle;
 	private final RdfFormatterConfig config;
 
 	public static FormatterStep create(RdfFormatterConfig config, Map<String, String> turtleOptions, Provisioner provisioner)
-		throws ClassNotFoundException {
+			throws ClassNotFoundException {
 		JarState.Promised jarState;
 		jarState = JarState.promise(() -> JarState.from(TURTLE_FORMATTER_COORDINATES + ":" + config.getTurtleFormatterVersion(), provisioner));
 		RdfFormatterStep step = new RdfFormatterStep(jarState, config, turtleOptions);
 		return FormatterStep.create("RdfFormatter", step, RdfFormatterStep::state, RdfFormatterStep::formatterFunc);
 	}
 
-	public static State state(RdfFormatterStep step){
+	public static State state(RdfFormatterStep step) {
 		return new State(step.config, step.turtleFormatterStyle, step.jarState.get());
 	}
 
@@ -78,15 +55,13 @@ public static RdfFormatterFunc formatterFunc(State state) {
 		return new RdfFormatterFunc(state);
 	}
 
-
 	public RdfFormatterStep(JarState.Promised jarState, RdfFormatterConfig config,
-		Map<String, String> turtleFormatterStyle) {
+			Map<String, String> turtleFormatterStyle) {
 		this.jarState = jarState;
 		this.turtleFormatterStyle = turtleFormatterStyle;
 		this.config = config;
 	}
 
-
 	static class State implements Serializable {
 		public static final long serialVersionUID = 1L;
 
@@ -97,7 +72,7 @@ static class State implements Serializable {
 		private final JarState jarState;
 
 		public State(RdfFormatterConfig config, Map<String, String> turtleFormatterStyle,
-			JarState jarState) {
+				JarState jarState) {
 			this.config = config;
 			this.turtleFormatterStyle = new TreeMap<>(turtleFormatterStyle == null ? Map.of() : turtleFormatterStyle);
 			this.jarState = jarState;
@@ -115,21 +90,23 @@ public JarState getJarState() {
 			return jarState;
 		}
 
-		@Override public boolean equals(Object o) {
+		@Override
+		public boolean equals(Object o) {
 			if (this == o)
 				return true;
 			if (!(o instanceof State))
 				return false;
 			State state = (State) o;
 			return Objects.equals(getConfig(), state.getConfig()) && Objects.equals(
-				getTurtleFormatterStyle(), state.getTurtleFormatterStyle()) && Objects.equals(
-				getJarState(), state.getJarState());
+					getTurtleFormatterStyle(), state.getTurtleFormatterStyle())
+					&& Objects.equals(
+							getJarState(), state.getJarState());
 		}
 
-		@Override public int hashCode() {
+		@Override
+		public int hashCode() {
 			return Objects.hash(getConfig(), getTurtleFormatterStyle(), getJarState());
 		}
 	}
 
 }
-
diff --git a/lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java b/lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java
index cb2392a859..899090a206 100644
--- a/lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java
+++ b/lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java
@@ -15,9 +15,6 @@
  */
 package com.diffplug.spotless.rdf;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.io.File;
 import java.io.StringWriter;
 import java.lang.invoke.MethodHandles;
@@ -37,6 +34,9 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class ReflectionHelper {
 	private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 	private final RdfFormatterStep.State state;
@@ -90,20 +90,21 @@ public ReflectionHelper(RdfFormatterStep.State state) throws ClassNotFoundExcept
 		this.TurtleFormatFormattingStyleClass = classLoader.loadClass("de.atextor.turtle.formatter.FormattingStyle");
 		Class<?>[] innerClasses = TurtleFormatFormattingStyleClass.getDeclaredClasses();
 		this.TurtleFormatFormattingStyleBuilderClass = Arrays.stream(innerClasses)
-			.filter(c -> c.getSimpleName().equals("FormattingStyleBuilder")).findFirst().get();
-		this.getSubject = JenaStatementClass.getMethod("getSubject");;
+				.filter(c -> c.getSimpleName().equals("FormattingStyleBuilder")).findFirst().get();
+		this.getSubject = JenaStatementClass.getMethod("getSubject");
+		;
 		this.getPredicate = JenaStatementClass.getMethod("getPredicate");
 		this.getObject = JenaStatementClass.getMethod("getObject");
 		this.isAnon = JenaRDFNodeClass.getMethod("isAnon");
-		this.getGraph =JenaModelClass.getMethod(("getGraph"));
+		this.getGraph = JenaModelClass.getMethod(("getGraph"));
 		this.JenaGraphClass = classLoader.loadClass("org.apache.jena.graph.Graph");
 		this.JenaNode = classLoader.loadClass("org.apache.jena.graph.Node");
 		this.JenaTriple = classLoader.loadClass("org.apache.jena.graph.Triple");
-		this.graphFindByNodes = JenaGraphClass.getMethod("find", JenaNode, JenaNode,JenaNode);
+		this.graphFindByNodes = JenaGraphClass.getMethod("find", JenaNode, JenaNode, JenaNode);
 		this.graphFindTriple = JenaGraphClass.getMethod("find", JenaTriple);
 		this.graphStream = JenaGraphClass.getMethod("stream");
 		this.tripleGetObject = JenaTriple.getMethod("getObject");
-		this.contains =JenaGraphClass.getMethod("contains", JenaTriple);
+		this.contains = JenaGraphClass.getMethod("contains", JenaTriple);
 	}
 
 	public Object getLang(String lang) throws NoSuchFieldException, IllegalAccessException {
@@ -116,36 +117,35 @@ public Object getModel() throws NoSuchMethodException, InvocationTargetException
 
 	public Object getErrorHandler(File file) {
 		return Proxy.newProxyInstance(this.classLoader,
-			new Class<?>[] { JenaErrorHandlerClass }, new DynamicErrorInvocationHandler(file)
-		);
+				new Class<?>[]{JenaErrorHandlerClass}, new DynamicErrorInvocationHandler(file));
 	}
 
 	public Object listModelStatements(Object modelBefore)
-		throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+			throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
 		Method listStatements = JenaModelClass.getMethod("listStatements");
 		return listStatements.invoke(modelBefore);
 	}
 
 	public boolean hasNext(Object statementIterator)
-		throws InvocationTargetException, IllegalAccessException, NoSuchMethodException {
+			throws InvocationTargetException, IllegalAccessException, NoSuchMethodException {
 		Method hasNext = JenaStmtIteratorClass.getMethod("hasNext");
 		return (boolean) hasNext.invoke(statementIterator);
 	}
 
 	public Object next(Object statementIterator)
-		throws InvocationTargetException, IllegalAccessException, NoSuchMethodException {
+			throws InvocationTargetException, IllegalAccessException, NoSuchMethodException {
 		Method hasNext = JenaStmtIteratorClass.getMethod("next");
 		return hasNext.invoke(statementIterator);
 	}
 
 	public boolean containsBlankNode(Object statement)
-		throws InvocationTargetException, IllegalAccessException {
+			throws InvocationTargetException, IllegalAccessException {
 		Object subject = getSubject.invoke(statement);
-		if ((boolean) isAnon.invoke(subject)){
+		if ((boolean) isAnon.invoke(subject)) {
 			return true;
 		}
 		Object predicate = getPredicate.invoke(statement);
-		if ((boolean) isAnon.invoke(predicate)){
+		if ((boolean) isAnon.invoke(predicate)) {
 			return true;
 		}
 		Object object = getObject.invoke(statement);
@@ -153,22 +153,22 @@ public boolean containsBlankNode(Object statement)
 	}
 
 	public boolean containsStatement(Object model, Object statement)
-		throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+			throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
 		Method contains = JenaModelClass.getMethod("contains", JenaStatementClass);
 		return (boolean) contains.invoke(model, statement);
 	}
 
 	public boolean graphContainsSameTerm(Object graph, Object triple) throws InvocationTargetException, IllegalAccessException {
 		boolean found = (boolean) contains.invoke(graph, triple);
-		if (!found){
+		if (!found) {
 			return false;
 		}
-		Iterator<Object> it  = (Iterator<Object>) graphFindTriple.invoke(graph, triple);
-		while(it.hasNext()){
+		Iterator<Object> it = (Iterator<Object>) graphFindTriple.invoke(graph, triple);
+		while (it.hasNext()) {
 			Object foundTriple = it.next();
-			Object foundObject =  tripleGetObject.invoke(foundTriple);
+			Object foundObject = tripleGetObject.invoke(foundTriple);
 			Object searchedObject = tripleGetObject.invoke(triple);
-			if (!foundObject.equals(searchedObject)){
+			if (!foundObject.equals(searchedObject)) {
 				return false;
 			}
 		}
@@ -186,7 +186,8 @@ public DynamicErrorInvocationHandler(File file) {
 			}
 		}
 
-		@Override public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+		@Override
+		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 			String message = (String) args[0];
 			long line = (long) args[1];
 			long col = (long) args[2];
@@ -194,22 +195,22 @@ public DynamicErrorInvocationHandler(File file) {
 			if (severity.equals("warning") && !state.getConfig().isFailOnWarning()) {
 				logger.warn("{}({},{}): {}", this.filePath, line, col, message);
 			} else {
-				if (severity.equals("warning")){
+				if (severity.equals("warning")) {
 					logger.error("Formatter fails because of a parser warning. To make the formatter succeed in"
-						+ "the presence of warnings, set the configuration parameter 'failOnWarning' to 'false' (default: 'true')");
+							+ "the presence of warnings, set the configuration parameter 'failOnWarning' to 'false' (default: 'true')");
 				}
 				throw new RuntimeException(
-					String.format("line %d, col %d: %s (severity: %s)", line, col, message, severity));
+						String.format("line %d, col %d: %s (severity: %s)", line, col, message, severity));
 			}
 			return null;
 		}
 	}
 
 	public Object getParser(Object lang, Object errorHandler, String rawUnix)
-		throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+			throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
 		Object parserBuilder = JenaRdfParserClass.getMethod("create").invoke(JenaRdfParserClass);
 		parserBuilder = JenaRdfParserBuilderClass.getMethod("errorHandler", JenaErrorHandlerClass)
-			.invoke(parserBuilder, errorHandler);
+				.invoke(parserBuilder, errorHandler);
 		parserBuilder = JenaRdfParserBuilderClass.getMethod("forceLang", JenaLangClass).invoke(parserBuilder, lang);
 		parserBuilder = JenaRdfParserBuilderClass.getMethod("strict", Boolean.TYPE).invoke(parserBuilder, true);
 		parserBuilder = JenaRdfParserBuilderClass.getMethod("checking", Boolean.TYPE).invoke(parserBuilder, true);
@@ -218,7 +219,7 @@ public Object getParser(Object lang, Object errorHandler, String rawUnix)
 	}
 
 	public void parseModel(Object parser, Object model)
-		throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+			throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
 		JenaRdfParserClass.getMethod("parse", JenaModelClass).invoke(parser, model);
 	}
 
@@ -231,18 +232,17 @@ public Stream<Object> streamGraph(Object graph) throws InvocationTargetException
 
 	}
 
-
 	public String formatWithJena(Object model, Object rdfFormat)
-		throws NoSuchMethodException, NoSuchFieldException, InvocationTargetException, IllegalAccessException {
+			throws NoSuchMethodException, NoSuchFieldException, InvocationTargetException, IllegalAccessException {
 		StringWriter sw = new StringWriter();
 		JenaRdfDataMgrClass
-			.getMethod("write", StringWriter.class, JenaModelClass, JenaRDFFormatClass)
-			.invoke(JenaRdfDataMgrClass, sw, model, rdfFormat);
+				.getMethod("write", StringWriter.class, JenaModelClass, JenaRDFFormatClass)
+				.invoke(JenaRdfDataMgrClass, sw, model, rdfFormat);
 		return sw.toString();
 	}
 
 	public String formatWithTurtleFormatter(Object model)
-		throws NoSuchMethodException, InvocationTargetException, IllegalAccessException, InstantiationException {
+			throws NoSuchMethodException, InvocationTargetException, IllegalAccessException, InstantiationException {
 		Object style = turtleFormatterStyle();
 		Object formatter = turtleFormatter(style);
 		return (String) TurtleFormatFormatterClass.getMethod("apply", JenaModelClass).invoke(formatter, model);
@@ -259,21 +259,21 @@ private Object turtleFormatterStyle() throws IllegalAccessException, InvocationT
 	}
 
 	public String formatWithTurtleFormatter(String ttlContent)
-		throws NoSuchMethodException, InvocationTargetException, IllegalAccessException, InstantiationException {
+			throws NoSuchMethodException, InvocationTargetException, IllegalAccessException, InstantiationException {
 		Object style = turtleFormatterStyle();
 		Object formatter = turtleFormatter(style);
 		return (String) TurtleFormatFormatterClass.getMethod("applyToContent", String.class).invoke(formatter, ttlContent);
 	}
 
 	private Object turtleFormatter(Object style)
-		throws InstantiationException, IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+			throws InstantiationException, IllegalAccessException, InvocationTargetException, NoSuchMethodException {
 		Object formatter = TurtleFormatFormatterClass.getConstructor(TurtleFormatFormattingStyleClass)
-			.newInstance(style);
+				.newInstance(style);
 		return formatter;
 	}
 
 	private void callBuilderMethod(Object builder, Method method, String parameterValueAsString)
-		throws InvocationTargetException, IllegalAccessException, NoSuchMethodException {
+			throws InvocationTargetException, IllegalAccessException, NoSuchMethodException {
 		Class<?> param = method.getParameterTypes()[0];
 		if (param.isEnum()) {
 			List<?> selectedEnumValueList = Arrays.stream(param.getEnumConstants()).filter(e -> {
@@ -287,76 +287,75 @@ private void callBuilderMethod(Object builder, Method method, String parameterVa
 					throw new RuntimeException(ex);
 				}
 			}).collect(
-				Collectors.toList());
+					Collectors.toList());
 			if (selectedEnumValueList.isEmpty()) {
 				throw new IllegalArgumentException(
-					String.format("Cannot set config option %s to value %s: value must be one of %s",
-						method.getName(),
-						parameterValueAsString,
-						Arrays.stream(param.getEnumConstants()).map(e -> {
-							try {
-								return (String) e.getClass().getMethod("name").invoke(e);
-							} catch (IllegalAccessException ex) {
-								throw new RuntimeException(ex);
-							} catch (InvocationTargetException ex) {
-								throw new RuntimeException(ex);
-							} catch (NoSuchMethodException ex) {
-								throw new RuntimeException(ex);
-							}
-						}).collect(
-							Collectors.joining(",", "[", "]"))
-					));
+						String.format("Cannot set config option %s to value %s: value must be one of %s",
+								method.getName(),
+								parameterValueAsString,
+								Arrays.stream(param.getEnumConstants()).map(e -> {
+									try {
+										return (String) e.getClass().getMethod("name").invoke(e);
+									} catch (IllegalAccessException ex) {
+										throw new RuntimeException(ex);
+									} catch (InvocationTargetException ex) {
+										throw new RuntimeException(ex);
+									} catch (NoSuchMethodException ex) {
+										throw new RuntimeException(ex);
+									}
+								}).collect(
+										Collectors.joining(",", "[", "]"))));
 			} else if (selectedEnumValueList.size() > 1) {
 				throw new IllegalArgumentException(
-					String.format("Found more than 1 enum value for name %s, that should never happen",
-						parameterValueAsString));
+						String.format("Found more than 1 enum value for name %s, that should never happen",
+								parameterValueAsString));
 			}
 			method.invoke(builder, selectedEnumValueList.get(0));
-		} else if (param.equals(NumberFormat.class)){
-			method.invoke(builder, new DecimalFormat(parameterValueAsString , DecimalFormatSymbols.getInstance(Locale.US)));
+		} else if (param.equals(NumberFormat.class)) {
+			method.invoke(builder, new DecimalFormat(parameterValueAsString, DecimalFormatSymbols.getInstance(Locale.US)));
 		} else if (param.equals(Boolean.class) || param.equals(Boolean.TYPE)) {
 			method.invoke(builder, Boolean.parseBoolean(parameterValueAsString));
-		}  else if (param.equals(String.class)) {
+		} else if (param.equals(String.class)) {
 			method.invoke(builder, parameterValueAsString);
-		}  else if (param.equals(Integer.class)) {
+		} else if (param.equals(Integer.class)) {
 			method.invoke(builder, Integer.parseInt(parameterValueAsString));
-		}  else if (param.equals(Double.class)) {
+		} else if (param.equals(Double.class)) {
 			method.invoke(builder, Double.parseDouble(parameterValueAsString));
-		}  else if (param.equals(Long.class)) {
+		} else if (param.equals(Long.class)) {
 			method.invoke(builder, Long.parseLong(parameterValueAsString));
-		}  else if (param.equals(Float.class)) {
+		} else if (param.equals(Float.class)) {
 			method.invoke(builder, Float.parseFloat(parameterValueAsString));
-		}  else {
+		} else {
 			throw new IllegalArgumentException(String.format(
-				"Cannot handle turtle-formatter config option %s: parameters of type %s are not implemented in the spotless plugin yet",
-				method.getName(), param.getName()));
+					"Cannot handle turtle-formatter config option %s: parameters of type %s are not implemented in the spotless plugin yet",
+					method.getName(), param.getName()));
 		}
 	}
 
 	private Method getBuilderMethod(String optionName) {
 		Method[] allMethods = TurtleFormatFormattingStyleBuilderClass.getDeclaredMethods();
 		List<Method> methods = Arrays.stream(allMethods).filter(m -> m.getName().equals(optionName))
-			.collect(
-				Collectors.toList());
+				.collect(
+						Collectors.toList());
 		if (methods.isEmpty()) {
 			List<Method> candidates = Arrays.stream(allMethods).filter(m -> m.getParameterCount() == 1)
-				.sorted(Comparator.comparing(Method::getName)).collect(
-				Collectors.toList());
+					.sorted(Comparator.comparing(Method::getName)).collect(
+							Collectors.toList());
 			throw new RuntimeException(
-				String.format("Unrecognized configuration parameter name: %s. Candidates are:\n%s", optionName, candidates.stream().map(Method::getName).collect(
-					Collectors.joining("\n\t","\t",""))));
+					String.format("Unrecognized configuration parameter name: %s. Candidates are:\n%s", optionName, candidates.stream().map(Method::getName).collect(
+							Collectors.joining("\n\t", "\t", ""))));
 		}
 		if (methods.size() > 1) {
 			throw new RuntimeException(
-				String.format("More than one builder method found for configuration parameter name: %s",
-					optionName));
+					String.format("More than one builder method found for configuration parameter name: %s",
+							optionName));
 		}
 		Method method = methods.get(0);
 		if (method.getParameterCount() != 1) {
 			throw new RuntimeException(
-				String.format("Method with unexpected parameter count %s found for configuration parameter name: %s",
-					method.getParameterCount(),
-					optionName));
+					String.format("Method with unexpected parameter count %s found for configuration parameter name: %s",
+							method.getParameterCount(),
+							optionName));
 		}
 		return method;
 	}
@@ -366,12 +365,12 @@ public Object getRDFFormat(String rdfFormat) throws NoSuchFieldException, Illega
 	}
 
 	public Object sortedModel(Object model) {
-		return Proxy.newProxyInstance(classLoader, new Class[] { JenaModelClass },
-			new SortedModelInvocationHandler(this, model));
+		return Proxy.newProxyInstance(classLoader, new Class[]{JenaModelClass},
+				new SortedModelInvocationHandler(this, model));
 	}
 
 	public Object parseToModel(String rawUnix, File file, Object lang)
-		throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+			throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
 		Object model = getModel();
 		Object errorHandler = getErrorHandler(file);
 		Object parser = getParser(lang, errorHandler, rawUnix);
@@ -380,7 +379,7 @@ public Object parseToModel(String rawUnix, File file, Object lang)
 	}
 
 	public boolean areModelsIsomorphic(Object leftModel, Object rightModel)
-		throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+			throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
 		Method isIsomorphicWith = JenaModelClass.getMethod("isIsomorphicWith", JenaModelClass);
 		return (boolean) isIsomorphicWith.invoke(leftModel, rightModel);
 	}
@@ -399,7 +398,8 @@ public SortedModelInvocationHandler(ReflectionHelper reflectionHelper, Object je
 			this.jenaModel = jenaModel;
 		}
 
-		@Override public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+		@Override
+		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 			if (method.getName().equals("listSubjects") && method.getParameterCount() == 0) {
 				Object resIterator = method.invoke(jenaModel);
 				List resources = new ArrayList<>();
@@ -433,8 +433,9 @@ public SortedModelInvocationHandler(ReflectionHelper reflectionHelper, Object je
 					return null;
 				}));
 				return reflectionHelper.classLoader.loadClass("org.apache.jena.rdf.model.impl.ResIteratorImpl")
-					.getConstructor(
-						Iterator.class, Object.class).newInstance(resources.iterator(), null);
+						.getConstructor(
+								Iterator.class, Object.class)
+						.newInstance(resources.iterator(), null);
 			}
 			return method.invoke(jenaModel);
 		}
@@ -447,7 +448,5 @@ Object next(Object it) throws NoSuchMethodException, InvocationTargetException,
 			return it.getClass().getMethod("next").invoke(it);
 		}
 
-
 	}
 }
-
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
index 4f258fa2ab..490223a674 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
@@ -38,8 +38,6 @@
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
-import com.diffplug.spotless.maven.rdf.Rdf;
-
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.annotations.Component;
@@ -75,6 +73,7 @@
 import com.diffplug.spotless.maven.markdown.Markdown;
 import com.diffplug.spotless.maven.pom.Pom;
 import com.diffplug.spotless.maven.python.Python;
+import com.diffplug.spotless.maven.rdf.Rdf;
 import com.diffplug.spotless.maven.scala.Scala;
 import com.diffplug.spotless.maven.shell.Shell;
 import com.diffplug.spotless.maven.sql.Sql;
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
index 34ccebd72e..d2537b1471 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessApplyMojo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/rdf/RdfFormat.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/rdf/RdfFormat.java
index baf2a4ebf6..67d865866c 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/rdf/RdfFormat.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/rdf/RdfFormat.java
@@ -26,29 +26,29 @@
 import com.diffplug.spotless.rdf.RdfFormatterStep;
 
 public class RdfFormat implements FormatterStepFactory {
-   @Parameter
-   String turtleFormatterVersion = RdfFormatterStep.LATEST_TURTLE_FORMATTER_VERSION;
+	@Parameter
+	String turtleFormatterVersion = RdfFormatterStep.LATEST_TURTLE_FORMATTER_VERSION;
 
-   @Parameter
-   boolean failOnWarning = true;
+	@Parameter
+	boolean failOnWarning = true;
 
-   @Parameter
-   boolean verify = true;
+	@Parameter
+	boolean verify = true;
 
-   @Parameter
-   Map<String, String> turtle;
+	@Parameter
+	Map<String, String> turtle;
 
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig config) {
 		RdfFormatterConfig formatterConfig = RdfFormatterConfig
-			.builder()
+				.builder()
 				.failOnWarning(failOnWarning)
 				.turtleFormatterVersion(turtleFormatterVersion)
 				.verify(verify)
 				.build();
 		try {
 			return RdfFormatterStep.create(formatterConfig,
-				turtle, config.getProvisioner());
+					turtle, config.getProvisioner());
 		} catch (Exception e) {
 			throw new RuntimeException("Error creating RDF formatter step", e);
 		}
diff --git a/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java b/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java
index dd28cd9224..dd67f20ba1 100644
--- a/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java
+++ b/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -79,31 +79,29 @@ protected File newFolder(String subpath) throws IOException {
 	 */
 	protected List<String> listTestResources(String path) throws IOException {
 		// add leading slash if required, otherwise resources won't be found
-		if (!path.startsWith("/")){
+		if (!path.startsWith("/")) {
 			path = path + "/";
 		}
 		List<String> filenames = new ArrayList<>();
 
-			try(InputStream in = ResourceHarness.class.getResourceAsStream(path)){
-				if (in == null) {
-					if (new File(path).isAbsolute()) {
-						throw new RuntimeException(String.format("Resource not found in classpath: '%s'", path));
-					} else {
-						throw new RuntimeException(String.format("Resource not found in classpath: '%s' - did you mean '/%1$s'?",path));
-					}
+		try (InputStream in = ResourceHarness.class.getResourceAsStream(path)) {
+			if (in == null) {
+				if (new File(path).isAbsolute()) {
+					throw new RuntimeException(String.format("Resource not found in classpath: '%s'", path));
+				} else {
+					throw new RuntimeException(String.format("Resource not found in classpath: '%s' - did you mean '/%1$s'?", path));
 				}
-				try(BufferedReader br = new BufferedReader(new InputStreamReader(in))) {
-					String resource;
-					while ((resource = br.readLine()) != null) {
-						filenames.add(resource);
-					}
+			}
+			try (BufferedReader br = new BufferedReader(new InputStreamReader(in))) {
+				String resource;
+				while ((resource = br.readLine()) != null) {
+					filenames.add(resource);
 				}
 			}
+		}
 		return filenames;
 	}
 
-
-
 	protected String relativeToRoot(String path) {
 		return new File(path).toPath().relativize(rootFolder().toPath()).toString();
 	}
diff --git a/testlib/src/test/java/com/diffplug/spotless/rdf/RdfFormatterTest.java b/testlib/src/test/java/com/diffplug/spotless/rdf/RdfFormatterTest.java
index b7f397904c..3e187270d8 100644
--- a/testlib/src/test/java/com/diffplug/spotless/rdf/RdfFormatterTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/rdf/RdfFormatterTest.java
@@ -15,7 +15,6 @@
  */
 package com.diffplug.spotless.rdf;
 
-import java.io.File;
 import java.io.IOException;
 import java.lang.invoke.MethodHandles;
 import java.nio.file.Path;
@@ -25,20 +24,18 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.StepHarness;
-import com.diffplug.spotless.TestProvisioner;
-
 import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.provider.Arguments;
-
-import com.diffplug.spotless.ResourceHarness;
-
 import org.opentest4j.AssertionFailedError;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.ResourceHarness;
+import com.diffplug.spotless.StepHarness;
+import com.diffplug.spotless.TestProvisioner;
+
 public class RdfFormatterTest extends ResourceHarness {
 
 	private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@@ -49,82 +46,80 @@ private static FormatterStep forTurtleFormatterVersion(String version) throws Cl
 
 	private static FormatterStep forTurtleFormatterVersionAndStyle(String version, Map<String, String> style) throws ClassNotFoundException {
 		return RdfFormatterStep.create(
-			RdfFormatterConfig.builder().turtleFormatterVersion(version).build(),
-			style,
-			TestProvisioner.mavenCentral());
+				RdfFormatterConfig.builder().turtleFormatterVersion(version).build(),
+				style,
+				TestProvisioner.mavenCentral());
 	}
 
-	public RdfFormatterTest() throws ClassNotFoundException {
-	}
+	public RdfFormatterTest() throws ClassNotFoundException {}
 
 	@Test
 	void testTurtleFormatter_1_2_12_DefaultStyle() throws IOException, ClassNotFoundException {
-		String inputDir =	"/rdf/ttl/input/";
+		String inputDir = "/rdf/ttl/input/";
 		String expectedOutputDir = "/rdf/ttl/expected/v1.2.12-default/";
 		testBeforeAfterFolders(inputDir, expectedOutputDir, StepHarness.forStep(forTurtleFormatterVersion("1.2.12")));
 	}
 
 	@Test
 	void testTurtleFormatter_1_2_12_style01() throws IOException, ClassNotFoundException {
-		String inputDir =	"/rdf/ttl/input/";
+		String inputDir = "/rdf/ttl/input/";
 		String expectedOutputDir = "/rdf/ttl/expected/v1.2.12-style01/";
 		testBeforeAfterFolders(inputDir, expectedOutputDir, StepHarness.forStep(forTurtleFormatterVersionAndStyle("1.2.12", style01())));
 	}
 
-	private static @NotNull Map<String, String> defaultStyle(){
+	private static @NotNull Map<String, String> defaultStyle() {
 		return Map.of();
 	}
 
 	private static @NotNull Map<String, String> style01() {
 		return Map.of(
-			"alignPrefixes", "RIGHT",
-			"alignPredicates","true",
-			"alignObjects", "true",
-			"insertFinalNewline", "false"
-		);
+				"alignPrefixes", "RIGHT",
+				"alignPredicates", "true",
+				"alignObjects", "true",
+				"insertFinalNewline", "false");
 	}
 
 	private void testBeforeAfterFolders(String beforeDir, String afterDir, StepHarness stepHarness) throws IOException {
 		List<Arguments> args = getBeforeAfterTestResources(beforeDir, afterDir);
-		for(Arguments arg: args){
+		for (Arguments arg : args) {
 			String before = (String) arg.get()[0];
 			String after = (String) arg.get()[1];
 			try {
 				stepHarness.testResource(before, after);
-			} catch (AssertionFailedError e){
+			} catch (AssertionFailedError e) {
 				throw new AssertionFailedError(String.format("Test failed for input %s, expected output %s\n" + e.getMessage(), before, after), e.getCause());
 			}
 		}
 	}
 
 	private List<Arguments> getBeforeAfterTestResources(String beforeDir, String afterDir)
-		throws IOException {
+			throws IOException {
 		List<Path> inputs = listTestResources(beforeDir)
-			.stream()
-			.map(s -> Path.of(beforeDir, s))
-			.collect(Collectors.toList());
+				.stream()
+				.map(s -> Path.of(beforeDir, s))
+				.collect(Collectors.toList());
 		List<Path> outputs = listTestResources(afterDir)
-			.stream()
-			.map(s -> Path.of(afterDir, s))
-			.collect(Collectors.toList());
+				.stream()
+				.map(s -> Path.of(afterDir, s))
+				.collect(Collectors.toList());
 		List<Path> missingOutputs = inputs
-			.stream()
-			.filter(in -> outputs
-				.stream().noneMatch(out -> out.getFileName().equals(in.getFileName())))
-			.collect(Collectors.toList());
-		if (!missingOutputs.isEmpty()){
+				.stream()
+				.filter(in -> outputs
+						.stream().noneMatch(out -> out.getFileName().equals(in.getFileName())))
+				.collect(Collectors.toList());
+		if (!missingOutputs.isEmpty()) {
 			throw new IllegalStateException(String.format("'after' directory %s is missing files corresponding to these 'before' files: %s", beforeDir, missingOutputs));
 		}
 		List<Path> missingInputs = outputs
-			.stream()
-			.filter(o -> inputs
-				.stream().noneMatch(in -> in.getFileName().equals(o.getFileName())))
-			.collect(Collectors.toList());
-		if (!missingInputs.isEmpty()){
+				.stream()
+				.filter(o -> inputs
+						.stream().noneMatch(in -> in.getFileName().equals(o.getFileName())))
+				.collect(Collectors.toList());
+		if (!missingInputs.isEmpty()) {
 			throw new IllegalStateException(String.format("'before' directory %s is missing files corresponding to these 'after' files: %s", afterDir, missingInputs));
 		}
 		List<Arguments> arguments = new ArrayList<>();
-		for(Path input : inputs){
+		for (Path input : inputs) {
 			Optional<Path> output = outputs.stream().filter(o -> o.getFileName().equals(input.getFileName())).findFirst();
 			if (output.isEmpty()) {
 				throw new IllegalStateException(String.format("'after' directory %s is missing file %s corresponding to 'before' file %s", afterDir, input.getFileName(), input));
@@ -136,7 +131,7 @@ private List<Arguments> getBeforeAfterTestResources(String beforeDir, String aft
 
 	private static @NotNull String unixRelative(Path input) {
 		String path = input.toString().replaceAll("\\\\", "/");
-		while (path.startsWith("/")){
+		while (path.startsWith("/")) {
 			path = path.substring(1);
 		}
 		return path;

From a1bc0b8c754ef7b721c5559bb391f914dcf6242a Mon Sep 17 00:00:00 2001
From: Florian Kleedorfer <florian.kleedorfer@austria.fm>
Date: Mon, 23 Sep 2024 09:17:04 +0200
Subject: [PATCH 1798/2068] Remove option to format TTL with jena

---
 .../spotless/rdf/RdfFormatterConfig.java      | 22 ++-----------------
 .../spotless/rdf/RdfFormatterFunc.java        |  7 +-----
 2 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterConfig.java b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterConfig.java
index ed05f9b9cf..d22d16f71a 100644
--- a/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterConfig.java
+++ b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterConfig.java
@@ -21,7 +21,6 @@
 public class RdfFormatterConfig implements Serializable {
 	private static final long serialVersionId = 1L;
 	private boolean failOnWarning = true;
-	private boolean useTurtleFormatter = true;
 	private String turtleFormatterVersion = RdfFormatterStep.LATEST_TURTLE_FORMATTER_VERSION;
 	private boolean verify = true;
 
@@ -47,14 +46,6 @@ public static Builder builder() {
 		return new Builder();
 	}
 
-	public boolean isUseTurtleFormatter() {
-		return useTurtleFormatter;
-	}
-
-	public void setUseTurtleFormatter(boolean useTurtleFormatter) {
-		this.useTurtleFormatter = useTurtleFormatter;
-	}
-
 	public String getTurtleFormatterVersion() {
 		return turtleFormatterVersion;
 	}
@@ -77,15 +68,6 @@ public Builder failOnWarning(boolean fail) {
 			return this;
 		}
 
-		public Builder useTurtleFormatter() {
-			return this.useTurtleFormatter(true);
-		}
-
-		public Builder useTurtleFormatter(boolean useTurtleFormatter) {
-			this.config.setUseTurtleFormatter(useTurtleFormatter);
-			return this;
-		}
-
 		public Builder turtleFormatterVersion(String version) {
 			this.config.turtleFormatterVersion = version;
 			return this;
@@ -113,12 +95,12 @@ public boolean equals(Object o) {
 		if (!(o instanceof RdfFormatterConfig))
 			return false;
 		RdfFormatterConfig that = (RdfFormatterConfig) o;
-		return isFailOnWarning() == that.isFailOnWarning() && isUseTurtleFormatter() == that.isUseTurtleFormatter()
+		return isFailOnWarning() == that.isFailOnWarning()
 				&& Objects.equals(turtleFormatterVersion, that.turtleFormatterVersion);
 	}
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(isFailOnWarning(), isUseTurtleFormatter(), turtleFormatterVersion);
+		return Objects.hash(isFailOnWarning(), turtleFormatterVersion);
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterFunc.java b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterFunc.java
index 4964141a71..9ee5a11bef 100644
--- a/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterFunc.java
+++ b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterFunc.java
@@ -101,12 +101,7 @@ private String formatTurtle(String rawUnix, File file, ReflectionHelper reflecti
 			NoSuchFieldException, InstantiationException {
 		String formatted;
 		Object lang = reflectionHelper.getLang("TTL");
-		if (state.getConfig().isUseTurtleFormatter()) {
-			formatted = reflectionHelper.formatWithTurtleFormatter(rawUnix);
-		} else {
-			Object model = reflectionHelper.parseToModel(rawUnix, file, lang);
-			formatted = reflectionHelper.formatWithJena(model, reflectionHelper.getRDFFormat("TURTLE_PRETTY"));
-		}
+		formatted = reflectionHelper.formatWithTurtleFormatter(rawUnix);
 		if (state.getConfig().isVerify()) {
 			veryfyResult(rawUnix, file, reflectionHelper, lang, formatted);
 		}

From fd3e9c1cac213869ede9ee21fcab59b6629501cc Mon Sep 17 00:00:00 2001
From: Florian Kleedorfer <florian.kleedorfer@austria.fm>
Date: Mon, 23 Sep 2024 11:50:33 +0200
Subject: [PATCH 1799/2068] Improve turtle-formatter configuration

---
 .../spotless/rdf/RdfFormatterFunc.java        |   7 +-
 .../spotless/rdf/RdfFormatterStep.java        |   4 +-
 .../spotless/rdf/ReflectionHelper.java        | 146 +++++++++++++++++-
 3 files changed, 146 insertions(+), 11 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterFunc.java b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterFunc.java
index 9ee5a11bef..b1d03974a1 100644
--- a/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterFunc.java
+++ b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterFunc.java
@@ -39,9 +39,12 @@ public class RdfFormatterFunc implements FormatterFunc {
 
 	private final RdfFormatterStep.State state;
 	private final FormatExceptionPolicy exceptionPolicy = new FormatExceptionPolicyStrict();
+	private final ReflectionHelper reflectionHelper;
 
-	public RdfFormatterFunc(RdfFormatterStep.State state) {
+	public RdfFormatterFunc(RdfFormatterStep.State state)
+			throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException {
 		this.state = state;
+		this.reflectionHelper = new ReflectionHelper(state);
 	}
 
 	@Override
@@ -62,7 +65,7 @@ public String apply(String rawUnix, File file) throws Exception {
 					String.format("File %s has no file extension, cannot determine RDF format", file.getAbsolutePath()));
 		}
 		String extension = filename.substring(lastDot + 1);
-		ReflectionHelper reflectionHelper = new ReflectionHelper(state);
+
 		try {
 			if (TURTLE_EXTENSIONS.contains(extension)) {
 				return formatTurtle(rawUnix, file, reflectionHelper);
diff --git a/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterStep.java
index bc169da619..d27800b65d 100644
--- a/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterStep.java
@@ -17,6 +17,7 @@
 
 import java.io.Serializable;
 import java.lang.invoke.MethodHandles;
+import java.lang.reflect.InvocationTargetException;
 import java.util.Map;
 import java.util.Objects;
 import java.util.TreeMap;
@@ -51,7 +52,8 @@ public static State state(RdfFormatterStep step) {
 		return new State(step.config, step.turtleFormatterStyle, step.jarState.get());
 	}
 
-	public static RdfFormatterFunc formatterFunc(State state) {
+	public static RdfFormatterFunc formatterFunc(State state)
+			throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException {
 		return new RdfFormatterFunc(state);
 	}
 
diff --git a/lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java b/lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java
index 899090a206..6c1347bb05 100644
--- a/lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java
+++ b/lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java
@@ -18,10 +18,14 @@
 import java.io.File;
 import java.io.StringWriter;
 import java.lang.invoke.MethodHandles;
+import java.lang.reflect.Field;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Proxy;
+import java.lang.reflect.Type;
+import java.net.URI;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.text.NumberFormat;
@@ -31,6 +35,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
+import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -50,6 +55,7 @@ public class ReflectionHelper {
 	private final Class<?> JenaStatementClass;
 	private final Class<?> JenaRDFNodeClass;
 	private final Class<?> JenaResourceClass;
+	private final Class<?> JenaPropertyClass;
 	private final Class<?> JenaModelFactoryClass;
 	private final Class<?> JenaLangClass;
 	private final Class<?> JenaRDFFormatClass;
@@ -59,6 +65,7 @@ public class ReflectionHelper {
 	private final Class<?> TurtleFormatFormattingStyleClass;
 	private final Class<?> TurtleFormatFormattingStyleBuilderClass;
 	private final Class<?> TurtleFormatFormatterClass;
+	private final Class<?> TurtleFormatKnownPrefix;
 
 	private final Method graphFindByNodes;
 	private final Method graphStream;
@@ -71,7 +78,11 @@ public class ReflectionHelper {
 	private final Method getGraph;
 	private final Method tripleGetObject;
 
-	public ReflectionHelper(RdfFormatterStep.State state) throws ClassNotFoundException, NoSuchMethodException {
+	private Object turtleFormatter = null;
+	private Object jenaModelInstance = null;
+
+	public ReflectionHelper(RdfFormatterStep.State state)
+			throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException {
 		this.state = state;
 		this.classLoader = state.getJarState().getClassLoader();
 		this.JenaRdfDataMgrClass = classLoader.loadClass("org.apache.jena.riot.RDFDataMgr");
@@ -82,6 +93,7 @@ public ReflectionHelper(RdfFormatterStep.State state) throws ClassNotFoundExcept
 		this.JenaStmtIteratorClass = classLoader.loadClass("org.apache.jena.rdf.model.StmtIterator");
 		this.JenaRDFNodeClass = classLoader.loadClass("org.apache.jena.rdf.model.RDFNode");
 		this.JenaResourceClass = classLoader.loadClass("org.apache.jena.rdf.model.Resource");
+		this.JenaPropertyClass = classLoader.loadClass("org.apache.jena.rdf.model.Property");
 		this.JenaStatementClass = classLoader.loadClass("org.apache.jena.rdf.model.Statement");
 		this.JenaModelFactoryClass = classLoader.loadClass("org.apache.jena.rdf.model.ModelFactory");
 		this.JenaLangClass = classLoader.loadClass("org.apache.jena.riot.Lang");
@@ -91,8 +103,8 @@ public ReflectionHelper(RdfFormatterStep.State state) throws ClassNotFoundExcept
 		Class<?>[] innerClasses = TurtleFormatFormattingStyleClass.getDeclaredClasses();
 		this.TurtleFormatFormattingStyleBuilderClass = Arrays.stream(innerClasses)
 				.filter(c -> c.getSimpleName().equals("FormattingStyleBuilder")).findFirst().get();
+		this.TurtleFormatKnownPrefix = Arrays.stream(innerClasses).filter(c -> c.getSimpleName().equals("KnownPrefix")).findFirst().get();
 		this.getSubject = JenaStatementClass.getMethod("getSubject");
-		;
 		this.getPredicate = JenaStatementClass.getMethod("getPredicate");
 		this.getObject = JenaStatementClass.getMethod("getObject");
 		this.isAnon = JenaRDFNodeClass.getMethod("isAnon");
@@ -105,6 +117,7 @@ public ReflectionHelper(RdfFormatterStep.State state) throws ClassNotFoundExcept
 		this.graphStream = JenaGraphClass.getMethod("stream");
 		this.tripleGetObject = JenaTriple.getMethod("getObject");
 		this.contains = JenaGraphClass.getMethod("contains", JenaTriple);
+		this.jenaModelInstance = JenaModelFactoryClass.getMethod("createDefaultModel").invoke(JenaModelFactoryClass);
 	}
 
 	public Object getLang(String lang) throws NoSuchFieldException, IllegalAccessException {
@@ -243,12 +256,20 @@ public String formatWithJena(Object model, Object rdfFormat)
 
 	public String formatWithTurtleFormatter(Object model)
 			throws NoSuchMethodException, InvocationTargetException, IllegalAccessException, InstantiationException {
-		Object style = turtleFormatterStyle();
-		Object formatter = turtleFormatter(style);
+		Object formatter = getTurtleFormatter();
 		return (String) TurtleFormatFormatterClass.getMethod("apply", JenaModelClass).invoke(formatter, model);
 	}
 
-	private Object turtleFormatterStyle() throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+	private synchronized Object getTurtleFormatter()
+			throws InvocationTargetException, IllegalAccessException, NoSuchMethodException, InstantiationException {
+		if (this.turtleFormatter == null) {
+			Object style = newTurtleFormatterStyle();
+			this.turtleFormatter = newTurtleFormatter(style);
+		}
+		return this.turtleFormatter;
+	}
+
+	private Object newTurtleFormatterStyle() throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
 		Object builder = TurtleFormatFormattingStyleClass.getMethod("builder").invoke(TurtleFormatFormatterClass);
 		for (String optionName : state.getTurtleFormatterStyle().keySet()) {
 			Method method = getBuilderMethod(optionName);
@@ -260,12 +281,12 @@ private Object turtleFormatterStyle() throws IllegalAccessException, InvocationT
 
 	public String formatWithTurtleFormatter(String ttlContent)
 			throws NoSuchMethodException, InvocationTargetException, IllegalAccessException, InstantiationException {
-		Object style = turtleFormatterStyle();
-		Object formatter = turtleFormatter(style);
+		Object style = newTurtleFormatterStyle();
+		Object formatter = newTurtleFormatter(style);
 		return (String) TurtleFormatFormatterClass.getMethod("applyToContent", String.class).invoke(formatter, ttlContent);
 	}
 
-	private Object turtleFormatter(Object style)
+	private Object newTurtleFormatter(Object style)
 			throws InstantiationException, IllegalAccessException, InvocationTargetException, NoSuchMethodException {
 		Object formatter = TurtleFormatFormatterClass.getConstructor(TurtleFormatFormattingStyleClass)
 				.newInstance(style);
@@ -325,6 +346,10 @@ private void callBuilderMethod(Object builder, Method method, String parameterVa
 			method.invoke(builder, Long.parseLong(parameterValueAsString));
 		} else if (param.equals(Float.class)) {
 			method.invoke(builder, Float.parseFloat(parameterValueAsString));
+		} else if (Set.class.isAssignableFrom(param)) {
+			method.invoke(builder, makeSetOf(((ParameterizedType) method.getGenericParameterTypes()[0]).getActualTypeArguments()[0], parameterValueAsString));
+		} else if (List.class.isAssignableFrom(param)) {
+			method.invoke(builder, makeListOf(((ParameterizedType) method.getGenericParameterTypes()[0]).getActualTypeArguments()[0], parameterValueAsString));
 		} else {
 			throw new IllegalArgumentException(String.format(
 					"Cannot handle turtle-formatter config option %s: parameters of type %s are not implemented in the spotless plugin yet",
@@ -332,6 +357,111 @@ private void callBuilderMethod(Object builder, Method method, String parameterVa
 		}
 	}
 
+	private Object makeListOf(Type type, String parameterValueAsString) {
+		String[] entries = split(parameterValueAsString);
+		List<Object> ret = Arrays.stream(entries).map(e -> {
+			try {
+				return instantiate(type, e);
+			} catch (NoSuchMethodException ex) {
+				throw new RuntimeException(ex);
+			} catch (InvocationTargetException ex) {
+				throw new RuntimeException(ex);
+			} catch (IllegalAccessException ex) {
+				throw new RuntimeException(ex);
+			}
+		}).collect(Collectors.toList());
+		return ret;
+	}
+
+	private Object makeSetOf(Type type, String parameterValueAsString) {
+		String[] entries = split(parameterValueAsString);
+		return Arrays.stream(entries).map(e -> {
+			try {
+				return instantiate(type, e);
+			} catch (NoSuchMethodException ex) {
+				throw new RuntimeException(ex);
+			} catch (InvocationTargetException ex) {
+				throw new RuntimeException(ex);
+			} catch (IllegalAccessException ex) {
+				throw new RuntimeException(ex);
+			}
+		}).collect(Collectors.toSet());
+	}
+
+	private Object instantiate(Type type, String stringRepresentation)
+			throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+		if (type.equals(String.class)) {
+			return stringRepresentation;
+		}
+		if (type.equals(JenaRDFNodeClass)) {
+			try {
+				String uri = tryToMakeUri(stringRepresentation);
+				return this.JenaModelClass.getMethod("createResource", String.class)
+						.invoke(this.jenaModelInstance, uri);
+			} catch (IllegalArgumentException e) {
+				return this.JenaModelClass.getMethod("createLiteral", String.class, String.class)
+						.invoke(this.jenaModelInstance, stringRepresentation, "");
+			}
+		}
+		if (type.equals(JenaResourceClass)) {
+			return this.JenaModelClass.getMethod("createResource", String.class).invoke(this.jenaModelInstance, tryToMakeUri(stringRepresentation));
+		}
+		if (type.equals(JenaPropertyClass)) {
+			String uri = tryToMakeUri(stringRepresentation);
+			if (uri != null) {
+				String localname = uri.replaceAll("^.+[#/]", "");
+				String namespace = uri.substring(0, uri.length() - localname.length());
+				return this.JenaModelClass.getMethod("createProperty", String.class, String.class)
+						.invoke(this.jenaModelInstance, namespace, localname);
+			}
+		}
+		if (type.equals(TurtleFormatKnownPrefix)) {
+			return getKnownPrefix(stringRepresentation);
+		}
+		throw new IllegalArgumentException(String.format("Cannot instantiate class %s from string representation %s", type, stringRepresentation));
+	}
+
+	private String tryToMakeUri(String stringRepresentation)
+			throws InvocationTargetException, IllegalAccessException, NoSuchMethodException {
+		if (stringRepresentation.matches("[^:/]+:[^:/]+")) {
+			int colonIndex = stringRepresentation.indexOf(':');
+			//could be a known prefix
+			String prefix = stringRepresentation.substring(0, colonIndex);
+			Object knownPrefix = getKnownPrefix(prefix);
+			String base = this.TurtleFormatKnownPrefix.getMethod("iri").invoke(knownPrefix).toString();
+			return base + stringRepresentation.substring(colonIndex + 1);
+		}
+		// try to parse a URI - throws an IllegalArgumentException if it is not a URI
+		URI uri = URI.create(stringRepresentation);
+		return uri.toString();
+	}
+
+	private Object getKnownPrefix(String stringRepresentation)
+			throws IllegalAccessException, NoSuchMethodException, InvocationTargetException {
+		Field[] fields = TurtleFormatFormattingStyleClass.getDeclaredFields();
+		List<String> options = new ArrayList<>();
+		for (int i = 0; i < fields.length; i++) {
+			Field field = fields[i];
+			if (field.getType().equals(TurtleFormatKnownPrefix)) {
+				Object knownPrefix = field.get(TurtleFormatFormattingStyleClass);
+				String prefix = (String) TurtleFormatKnownPrefix.getMethod("prefix").invoke(knownPrefix);
+				options.add(prefix);
+				if (stringRepresentation.equals(prefix)) {
+					return knownPrefix;
+				}
+			}
+		}
+		throw new IllegalArgumentException(String.format("Unable to find FormattingStyle.KnownPrefix for prefix '%s'. Options are: %s", stringRepresentation, options.stream().collect(
+				Collectors.joining(",\n\t", "\n\t", "\n"))));
+	}
+
+	private static String[] split(String parameterValueAsString) {
+		if (parameterValueAsString == null || parameterValueAsString.isBlank()) {
+			return new String[0];
+		}
+		return parameterValueAsString.split("\\s*(,|,\\s*\n|\n)\\s*");
+	}
+
 	private Method getBuilderMethod(String optionName) {
 		Method[] allMethods = TurtleFormatFormattingStyleBuilderClass.getDeclaredMethods();
 		List<Method> methods = Arrays.stream(allMethods).filter(m -> m.getName().equals(optionName))

From 66ff543cf1bfca62f653b49944cf81f610c636e7 Mon Sep 17 00:00:00 2001
From: Florian Kleedorfer <florian.kleedorfer@austria.fm>
Date: Mon, 23 Sep 2024 11:51:07 +0200
Subject: [PATCH 1800/2068] Update READMEs

---
 README.md              |  2 ++
 plugin-maven/README.md | 59 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+)

diff --git a/README.md b/README.md
index 9f295f96cb..a40b9edb0d 100644
--- a/README.md
+++ b/README.md
@@ -103,6 +103,7 @@ lib('npm.TsFmtFormatterStep')                    +'{{yes}}       | {{yes}}
 lib('pom.SortPomStep')                           +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('protobuf.BufStep')                          +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
 lib('python.BlackStep')                          +'{{yes}}       | {{no}}       | {{no}}       | {{no}}  |',
+lib('rdf.RdfFormatterStep')                      +'{{no}}        | {{yes}}      | {{no}}       | {{no}}  |',
 lib('scala.ScalaFmtStep')                        +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
 lib('shell.ShfmtStep')                           +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('sql.DBeaverSQLFormatterStep')               +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
@@ -157,6 +158,7 @@ lib('yaml.JacksonYamlStep')                      +'{{yes}}       | {{yes}}
 | [`pom.SortPomStep`](lib/src/main/java/com/diffplug/spotless/pom/SortPomStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`protobuf.BufStep`](lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
 | [`python.BlackStep`](lib/src/main/java/com/diffplug/spotless/python/BlackStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
+| [`rdf.RdfFormatterStep`](lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterStep.java) | :white_large_square:        | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`scala.ScalaFmtStep`](lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`shell.ShfmtStep`](lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`sql.DBeaverSQLFormatterStep`](lib/src/main/java/com/diffplug/spotless/sql/DBeaverSQLFormatterStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 48eeea7efc..40d6f35325 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -55,6 +55,7 @@ user@machine repo % mvn spotless:check
   - [YAML](#yaml)
   - [Gherkin](#gherkin)
   - [Go](#go)
+  - [RDF](#RDF)
   - Multiple languages
     - [Prettier](#prettier) ([plugins](#prettier-plugins), [npm detection](#npm-detection), [`.npmrc` detection](#npmrc-detection), [caching `npm install` results](#caching-results-of-npm-install))
     - [eclipse web tools platform](#eclipse-web-tools-platform)
@@ -1118,6 +1119,64 @@ Standard Go formatter, part of Go distribution.
 </gofmt>
 ```
 
+## RDF
+
+### Generic Options
+
+List of generic configuration `parameters (type/default)` 
+
+* `failOnWarning (boolean/true)`: The Jena parser produces three levels of problem reports: warning, error, and fatal. By default, 
+the build fails for any of them. You can ignore warnings using this parameter. They will still be logged in the plugin's 
+output.
+* `verify (boolean/true)`: If `true`, the content before and after formatting is parsed to an RDF model and compared for isomorphicity.   
+* `turtleFormatterVersion (string|RdfFormatterStep.LATEST_TURTLE_FORMATTER_VERSION)`: the version of turtle-formatter to use (see below).
+
+### Supported RDF formats: only TTL (at the moment)
+
+Formatting TTL is done using [turtle-formatter](https://github.com/atextor/turtle-formatter),
+which is highly configurable (have a look at the [Style Documentation](https://github.com/atextor/turtle-formatter?tab=readme-ov-file#customizing-the-style)) 
+and will handle blank nodes the way you'd hope.
+
+The style options can be configured via spotless. Wherever the style wants a URI (for example, for the `predicateOrder`, you can 
+use the abbreviated form if it is a `FormattingStyle.KnownPrefix` (currently `rdf`, `rdfs`, `xsd`, `owl`, `dcterms`)
+Error messages will give you hints. To configure the TTL formatting style, pass the configuration parameters under `<turtle>`
+
+### Examples
+Minimal:
+```xml
+<configuration>
+  <rdf>
+    <includes>
+      <include>**/*.ttl</include>
+    </includes>
+    <format/>
+  </rdf>
+</configuration>
+```
+Configuring some generic and TTL options:
+```xml
+<configuration>
+  <rdf>
+    <includes>
+      <include>**/*.ttl</include>
+    </includes>
+    <format>
+      <failOnWarning>false</failOnWarning>
+      <verify>false</verify>
+      <turtleFormatterVersion>1.2.13</turtleFormatterVersion>
+      <turtle>
+        <alignPrefixes>RIGHT</alignPrefixes>
+        <enableDoubleFormatting>true</enableDoubleFormatting>
+      </turtle>
+    </format>
+  </rdf>
+</configuration>
+```
+### Libraries and versions
+
+RDF parsing is done via [Apache Jena](https://jena.apache.org/) in the version that
+[turtle-formatter](https://github.com/atextor/turtle-formatter) depends on (not necessarily the latest).
+
 ## Prettier
 
 [homepage](https://prettier.io/). [changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md). [official plugins](https://prettier.io/docs/en/plugins.html#official-plugins). [community plugins](https://prettier.io/docs/en/plugins.html#community-plugins). Prettier is a formatter that can format almost every anything - JavaScript, JSX, Angular, Vue, Flow, TypeScript, CSS, Less, SCSS, HTML, JSON, GraphQL, Markdown (including GFM and MDX), and YAML.  It can format even more [using plugins](https://prettier.io/docs/en/plugins.html) (PHP, Ruby, Swift, XML, Apex, Elm, Java (!!), Kotlin, pgSQL, .properties, solidity, svelte, toml, shellscript, ...).

From 16a2621c0db3e954a94a0e0c3a59cf06d99a9978 Mon Sep 17 00:00:00 2001
From: Florian Kleedorfer <florian.kleedorfer@austria.fm>
Date: Mon, 23 Sep 2024 21:18:25 +0200
Subject: [PATCH 1801/2068] Fix all spotbugs warnings

---
 .../spotless/rdf/RdfFormatterConfig.java      |  2 +-
 .../spotless/rdf/RdfFormatterFunc.java        | 17 ++----
 .../spotless/rdf/RdfFormatterStep.java        |  7 +--
 .../spotless/rdf/ReflectionHelper.java        | 61 +++++--------------
 .../diffplug/spotless/ResourceHarness.java    |  2 +-
 5 files changed, 24 insertions(+), 65 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterConfig.java b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterConfig.java
index d22d16f71a..13c5bfcaa4 100644
--- a/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterConfig.java
+++ b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterConfig.java
@@ -19,7 +19,7 @@
 import java.util.Objects;
 
 public class RdfFormatterConfig implements Serializable {
-	private static final long serialVersionId = 1L;
+	private static final long serialVersionUID = 1L;
 	private boolean failOnWarning = true;
 	private String turtleFormatterVersion = RdfFormatterStep.LATEST_TURTLE_FORMATTER_VERSION;
 	private boolean verify = true;
diff --git a/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterFunc.java b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterFunc.java
index b1d03974a1..a241e204c0 100644
--- a/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterFunc.java
+++ b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterFunc.java
@@ -19,26 +19,23 @@
 import java.lang.invoke.MethodHandles;
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
+import java.util.Locale;
 import java.util.Set;
 import java.util.stream.Collectors;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.diffplug.spotless.FormatExceptionPolicy;
-import com.diffplug.spotless.FormatExceptionPolicyStrict;
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.LineEnding;
 
 public class RdfFormatterFunc implements FormatterFunc {
-	private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 	private static final Set<String> TURTLE_EXTENSIONS = Set.of("ttl", "turtle");
 	private static final Set<String> TRIG_EXTENSIONS = Set.of("trig");
 	private static final Set<String> NTRIPLES_EXTENSIONS = Set.of("n-triples", "ntriples", "nt");
 	private static final Set<String> NQUADS_EXTENSIONS = Set.of("n-quads", "nquads", "nq");
 
 	private final RdfFormatterStep.State state;
-	private final FormatExceptionPolicy exceptionPolicy = new FormatExceptionPolicyStrict();
 	private final ReflectionHelper reflectionHelper;
 
 	public RdfFormatterFunc(RdfFormatterStep.State state)
@@ -54,7 +51,7 @@ public String apply(String input) throws Exception {
 
 	@Override
 	public String apply(String rawUnix, File file) throws Exception {
-		String filename = file.getName().toLowerCase();
+		String filename = file.getName().toLowerCase(Locale.US);
 		int lastDot = filename.lastIndexOf('.');
 		if (lastDot < 0) {
 			throw new IllegalArgumentException(
@@ -118,7 +115,7 @@ private static void veryfyResult(String rawUnix, File file, ReflectionHelper ref
 		if (!reflectionHelper.areModelsIsomorphic(modelBefore, modelAfter)) {
 			long beforeSize = reflectionHelper.modelSize(modelBefore);
 			long afterSize = reflectionHelper.modelSize(modelAfter);
-			String diffResult = "[no diff information available]";
+			String diffResult;
 			if (beforeSize != afterSize) {
 				diffResult = String.format("< %,d triples", beforeSize);
 				diffResult += String.format("> %,d triples", afterSize);
@@ -144,9 +141,7 @@ private static String calculateDiff(ReflectionHelper reflectionHelper, Object mo
 				.filter(triple -> {
 					try {
 						return !reflectionHelper.graphContainsSameTerm(graphAfter, triple);
-					} catch (InvocationTargetException e) {
-						throw new RuntimeException(e);
-					} catch (IllegalAccessException e) {
+					} catch (InvocationTargetException | IllegalAccessException e) {
 						throw new RuntimeException(e);
 					}
 				})
@@ -156,9 +151,7 @@ private static String calculateDiff(ReflectionHelper reflectionHelper, Object mo
 				.filter(triple -> {
 					try {
 						return !reflectionHelper.graphContainsSameTerm(graphBefore, triple);
-					} catch (InvocationTargetException e) {
-						throw new RuntimeException(e);
-					} catch (IllegalAccessException e) {
+					} catch (InvocationTargetException | IllegalAccessException e) {
 						throw new RuntimeException(e);
 					}
 				})
diff --git a/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterStep.java
index d27800b65d..88dea769af 100644
--- a/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterStep.java
@@ -31,8 +31,7 @@
 
 public class RdfFormatterStep implements Serializable {
 	public static final String LATEST_TURTLE_FORMATTER_VERSION = "1.2.13";
-	public static long serialVersionUID = 1L;
-	private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+	private static final long serialVersionUID = 1L;
 
 	private static final String TURTLE_FORMATTER_COORDINATES = "de.atextor:turtle-formatter";
 
@@ -64,8 +63,8 @@ public RdfFormatterStep(JarState.Promised jarState, RdfFormatterConfig config,
 		this.config = config;
 	}
 
-	static class State implements Serializable {
-		public static final long serialVersionUID = 1L;
+	public static class State implements Serializable {
+		private static final long serialVersionUID = 1L;
 
 		private final RdfFormatterConfig config;
 
diff --git a/lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java b/lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java
index 6c1347bb05..1002569b20 100644
--- a/lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java
+++ b/lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java
@@ -60,14 +60,12 @@ public class ReflectionHelper {
 	private final Class<?> JenaLangClass;
 	private final Class<?> JenaRDFFormatClass;
 	private final Class<?> JenaGraphClass;
-	private final Class<?> JenaNode;
 	private final Class<?> JenaTriple;
 	private final Class<?> TurtleFormatFormattingStyleClass;
 	private final Class<?> TurtleFormatFormattingStyleBuilderClass;
 	private final Class<?> TurtleFormatFormatterClass;
 	private final Class<?> TurtleFormatKnownPrefix;
 
-	private final Method graphFindByNodes;
 	private final Method graphStream;
 	private final Method graphFindTriple;
 	private final Method contains;
@@ -110,9 +108,7 @@ public ReflectionHelper(RdfFormatterStep.State state)
 		this.isAnon = JenaRDFNodeClass.getMethod("isAnon");
 		this.getGraph = JenaModelClass.getMethod(("getGraph"));
 		this.JenaGraphClass = classLoader.loadClass("org.apache.jena.graph.Graph");
-		this.JenaNode = classLoader.loadClass("org.apache.jena.graph.Node");
 		this.JenaTriple = classLoader.loadClass("org.apache.jena.graph.Triple");
-		this.graphFindByNodes = JenaGraphClass.getMethod("find", JenaNode, JenaNode, JenaNode);
 		this.graphFindTriple = JenaGraphClass.getMethod("find", JenaTriple);
 		this.graphStream = JenaGraphClass.getMethod("stream");
 		this.tripleGetObject = JenaTriple.getMethod("getObject");
@@ -300,11 +296,7 @@ private void callBuilderMethod(Object builder, Method method, String parameterVa
 			List<?> selectedEnumValueList = Arrays.stream(param.getEnumConstants()).filter(e -> {
 				try {
 					return e.getClass().getMethod("name").invoke(e).equals(parameterValueAsString);
-				} catch (IllegalAccessException ex) {
-					throw new RuntimeException(ex);
-				} catch (InvocationTargetException ex) {
-					throw new RuntimeException(ex);
-				} catch (NoSuchMethodException ex) {
+				} catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException ex) {
 					throw new RuntimeException(ex);
 				}
 			}).collect(
@@ -317,11 +309,8 @@ private void callBuilderMethod(Object builder, Method method, String parameterVa
 								Arrays.stream(param.getEnumConstants()).map(e -> {
 									try {
 										return (String) e.getClass().getMethod("name").invoke(e);
-									} catch (IllegalAccessException ex) {
-										throw new RuntimeException(ex);
-									} catch (InvocationTargetException ex) {
-										throw new RuntimeException(ex);
-									} catch (NoSuchMethodException ex) {
+									} catch (IllegalAccessException | InvocationTargetException |
+											 NoSuchMethodException ex) {
 										throw new RuntimeException(ex);
 									}
 								}).collect(
@@ -362,11 +351,7 @@ private Object makeListOf(Type type, String parameterValueAsString) {
 		List<Object> ret = Arrays.stream(entries).map(e -> {
 			try {
 				return instantiate(type, e);
-			} catch (NoSuchMethodException ex) {
-				throw new RuntimeException(ex);
-			} catch (InvocationTargetException ex) {
-				throw new RuntimeException(ex);
-			} catch (IllegalAccessException ex) {
+			} catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException ex) {
 				throw new RuntimeException(ex);
 			}
 		}).collect(Collectors.toList());
@@ -378,11 +363,7 @@ private Object makeSetOf(Type type, String parameterValueAsString) {
 		return Arrays.stream(entries).map(e -> {
 			try {
 				return instantiate(type, e);
-			} catch (NoSuchMethodException ex) {
-				throw new RuntimeException(ex);
-			} catch (InvocationTargetException ex) {
-				throw new RuntimeException(ex);
-			} catch (IllegalAccessException ex) {
+			} catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException ex) {
 				throw new RuntimeException(ex);
 			}
 		}).collect(Collectors.toSet());
@@ -440,8 +421,7 @@ private Object getKnownPrefix(String stringRepresentation)
 			throws IllegalAccessException, NoSuchMethodException, InvocationTargetException {
 		Field[] fields = TurtleFormatFormattingStyleClass.getDeclaredFields();
 		List<String> options = new ArrayList<>();
-		for (int i = 0; i < fields.length; i++) {
-			Field field = fields[i];
+		for (Field field : fields) {
 			if (field.getType().equals(TurtleFormatKnownPrefix)) {
 				Object knownPrefix = field.get(TurtleFormatFormattingStyleClass);
 				String prefix = (String) TurtleFormatKnownPrefix.getMethod("prefix").invoke(knownPrefix);
@@ -472,7 +452,7 @@ private Method getBuilderMethod(String optionName) {
 					.sorted(Comparator.comparing(Method::getName)).collect(
 							Collectors.toList());
 			throw new RuntimeException(
-					String.format("Unrecognized configuration parameter name: %s. Candidates are:\n%s", optionName, candidates.stream().map(Method::getName).collect(
+					String.format("Unrecognized configuration parameter name: %s. Candidates are:%n%s", optionName, candidates.stream().map(Method::getName).collect(
 							Collectors.joining("\n\t", "\t", ""))));
 		}
 		if (methods.size() > 1) {
@@ -494,11 +474,6 @@ public Object getRDFFormat(String rdfFormat) throws NoSuchFieldException, Illega
 		return JenaRDFFormatClass.getDeclaredField(rdfFormat).get(JenaRDFFormatClass);
 	}
 
-	public Object sortedModel(Object model) {
-		return Proxy.newProxyInstance(classLoader, new Class[]{JenaModelClass},
-				new SortedModelInvocationHandler(this, model));
-	}
-
 	public Object parseToModel(String rawUnix, File file, Object lang)
 			throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
 		Object model = getModel();
@@ -519,9 +494,9 @@ public long modelSize(Object model) throws InvocationTargetException, IllegalAcc
 		return (long) size.invoke(model);
 	}
 
-	private class SortedModelInvocationHandler implements InvocationHandler {
-		private ReflectionHelper reflectionHelper;
-		private Object jenaModel;
+	private static class SortedModelInvocationHandler implements InvocationHandler {
+		private final ReflectionHelper reflectionHelper;
+		private final Object jenaModel;
 
 		public SortedModelInvocationHandler(ReflectionHelper reflectionHelper, Object jenaModel) {
 			this.reflectionHelper = reflectionHelper;
@@ -532,29 +507,21 @@ public SortedModelInvocationHandler(ReflectionHelper reflectionHelper, Object je
 		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 			if (method.getName().equals("listSubjects") && method.getParameterCount() == 0) {
 				Object resIterator = method.invoke(jenaModel);
-				List resources = new ArrayList<>();
+				List<Object> resources = new ArrayList<>();
 				while (hasNext(resIterator)) {
 					resources.add(next(resIterator));
 				}
 				resources.sort(Comparator.comparing(x -> {
 					try {
 						return (String) x.getClass().getMethod("getURI").invoke(x);
-					} catch (IllegalAccessException e) {
-						throw new RuntimeException(e);
-					} catch (InvocationTargetException e) {
-						throw new RuntimeException(e);
-					} catch (NoSuchMethodException e) {
+					} catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
 						throw new RuntimeException(e);
 					}
 				}).thenComparing(x -> {
-					Object anonId = null;
+					Object anonId;
 					try {
 						anonId = x.getClass().getMethod("getAnonId").invoke(x);
-					} catch (IllegalAccessException e) {
-						throw new RuntimeException(e);
-					} catch (InvocationTargetException e) {
-						throw new RuntimeException(e);
-					} catch (NoSuchMethodException e) {
+					} catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
 						throw new RuntimeException(e);
 					}
 					if (anonId != null) {
diff --git a/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java b/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java
index dd67f20ba1..93d08ea157 100644
--- a/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java
+++ b/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java
@@ -92,7 +92,7 @@ protected List<String> listTestResources(String path) throws IOException {
 					throw new RuntimeException(String.format("Resource not found in classpath: '%s' - did you mean '/%1$s'?", path));
 				}
 			}
-			try (BufferedReader br = new BufferedReader(new InputStreamReader(in))) {
+			try (BufferedReader br = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8))) {
 				String resource;
 				while ((resource = br.readLine()) != null) {
 					filenames.add(resource);

From 013d33258b6eb342d8598c648a03947a2eddaa15 Mon Sep 17 00:00:00 2001
From: Florian Kleedorfer <florian.kleedorfer@austria.fm>
Date: Mon, 23 Sep 2024 21:21:01 +0200
Subject: [PATCH 1802/2068] Apply spotless

---
 .../main/java/com/diffplug/spotless/rdf/RdfFormatterFunc.java | 4 ----
 .../main/java/com/diffplug/spotless/rdf/RdfFormatterStep.java | 4 ----
 .../main/java/com/diffplug/spotless/rdf/ReflectionHelper.java | 3 +--
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterFunc.java b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterFunc.java
index a241e204c0..03665b69a2 100644
--- a/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterFunc.java
+++ b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterFunc.java
@@ -16,16 +16,12 @@
 package com.diffplug.spotless.rdf;
 
 import java.io.File;
-import java.lang.invoke.MethodHandles;
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.LineEnding;
 
diff --git a/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterStep.java
index 88dea769af..a5ed70bfed 100644
--- a/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterStep.java
@@ -16,15 +16,11 @@
 package com.diffplug.spotless.rdf;
 
 import java.io.Serializable;
-import java.lang.invoke.MethodHandles;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Map;
 import java.util.Objects;
 import java.util.TreeMap;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
diff --git a/lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java b/lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java
index 1002569b20..472ea72cc5 100644
--- a/lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java
+++ b/lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java
@@ -309,8 +309,7 @@ private void callBuilderMethod(Object builder, Method method, String parameterVa
 								Arrays.stream(param.getEnumConstants()).map(e -> {
 									try {
 										return (String) e.getClass().getMethod("name").invoke(e);
-									} catch (IllegalAccessException | InvocationTargetException |
-											 NoSuchMethodException ex) {
+									} catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException ex) {
 										throw new RuntimeException(ex);
 									}
 								}).collect(

From 5031855c70ecc4fd244b629c00673f551ab9d37d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 23 Sep 2024 21:59:57 +0000
Subject: [PATCH 1803/2068] Update dependency dev.equo.ide:solstice to v1.8.0

---
 lib-extra/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index a21f4a1f66..9984ac696a 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -7,7 +7,7 @@ version = rootProject.spotlessChangelog.versionNext
 apply from: rootProject.file('gradle/java-setup.gradle')
 apply from: rootProject.file('gradle/java-publish.gradle')
 
-String VER_SOLSTICE = '1.7.7'
+String VER_SOLSTICE = '1.8.0'
 dependencies {
 	api projects.lib
 	// misc useful utilities

From 63f4c58661065bd85ae925413c5a45ad9b3d0b81 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 24 Sep 2024 02:16:07 +0000
Subject: [PATCH 1804/2068] Update dependency gradle to v8.10.2

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0aaefbcaf0..df97d72b8b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

From dad753e705821fc4e0557d531c8c31dcb2c28019 Mon Sep 17 00:00:00 2001
From: Florian Kleedorfer <florian.kleedorfer@austria.fm>
Date: Wed, 25 Sep 2024 09:13:59 +0200
Subject: [PATCH 1805/2068] Limit tests to JDK >=17

---
 .../com/diffplug/spotless/rdf/RdfFormatterTest.java  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/testlib/src/test/java/com/diffplug/spotless/rdf/RdfFormatterTest.java b/testlib/src/test/java/com/diffplug/spotless/rdf/RdfFormatterTest.java
index 3e187270d8..844b2cf36b 100644
--- a/testlib/src/test/java/com/diffplug/spotless/rdf/RdfFormatterTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/rdf/RdfFormatterTest.java
@@ -15,8 +15,9 @@
  */
 package com.diffplug.spotless.rdf;
 
+import static org.junit.jupiter.api.condition.JRE.JAVA_17;
+
 import java.io.IOException;
-import java.lang.invoke.MethodHandles;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
@@ -26,10 +27,9 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledForJreRange;
 import org.junit.jupiter.params.provider.Arguments;
 import org.opentest4j.AssertionFailedError;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.ResourceHarness;
@@ -38,8 +38,6 @@
 
 public class RdfFormatterTest extends ResourceHarness {
 
-	private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
 	private static FormatterStep forTurtleFormatterVersion(String version) throws ClassNotFoundException {
 		return forTurtleFormatterVersionAndStyle(version, defaultStyle());
 	}
@@ -51,9 +49,10 @@ private static FormatterStep forTurtleFormatterVersionAndStyle(String version, M
 				TestProvisioner.mavenCentral());
 	}
 
-	public RdfFormatterTest() throws ClassNotFoundException {}
+	public RdfFormatterTest() {}
 
 	@Test
+	@EnabledForJreRange(min = JAVA_17)
 	void testTurtleFormatter_1_2_12_DefaultStyle() throws IOException, ClassNotFoundException {
 		String inputDir = "/rdf/ttl/input/";
 		String expectedOutputDir = "/rdf/ttl/expected/v1.2.12-default/";
@@ -61,6 +60,7 @@ void testTurtleFormatter_1_2_12_DefaultStyle() throws IOException, ClassNotFound
 	}
 
 	@Test
+	@EnabledForJreRange(min = JAVA_17)
 	void testTurtleFormatter_1_2_12_style01() throws IOException, ClassNotFoundException {
 		String inputDir = "/rdf/ttl/input/";
 		String expectedOutputDir = "/rdf/ttl/expected/v1.2.12-style01/";

From d3dc743afaebb345a4dfe0785b2c92423d31e715 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 27 Sep 2024 21:47:10 +0800
Subject: [PATCH 1806/2068] Update dependency org.junit.jupiter:junit-jupiter
 to v5.11.1 (#2274)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 70312f53d2..3d0c59f5de 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -29,6 +29,6 @@ VER_SLF4J=[1.6,2.0[
 # Used in multiple places
 VER_DURIAN=1.2.0
 VER_JGIT=6.10.0.202406032230-r
-VER_JUNIT=5.11.0
+VER_JUNIT=5.11.1
 VER_ASSERTJ=3.26.3
 VER_MOCKITO=5.13.0

From 94ab96669fc579d2712a1c641479752d9323c71b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 27 Sep 2024 21:47:21 +0800
Subject: [PATCH 1807/2068] Update plugin com.github.spotbugs to v6.0.23
 (#2273)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index a5b300a558..e197cca331 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,7 +12,7 @@ plugins {
 	// https://github.com/gradle-nexus/publish-plugin/releases
 	id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
-	id 'com.github.spotbugs' version '6.0.22' apply false
+	id 'com.github.spotbugs' version '6.0.23' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
 	id 'com.diffplug.spotless-changelog' version '3.1.2' apply false
 	// https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md

From 428b4b3e40682a46e9149d28293ad8c9a73c54de Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 27 Sep 2024 18:08:57 +0000
Subject: [PATCH 1808/2068] Update dependency org.mockito:mockito-core to
 v5.14.0

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 3d0c59f5de..743993cf74 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -31,4 +31,4 @@ VER_DURIAN=1.2.0
 VER_JGIT=6.10.0.202406032230-r
 VER_JUNIT=5.11.1
 VER_ASSERTJ=3.26.3
-VER_MOCKITO=5.13.0
+VER_MOCKITO=5.14.0

From 9d85ff8736ea2c6ea0e00077719558de2d6eb6ac Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 27 Sep 2024 12:13:40 -0700
Subject: [PATCH 1809/2068] Make helper class package-private.

---
 .../main/java/com/diffplug/spotless/rdf/ReflectionHelper.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java b/lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java
index 472ea72cc5..435e9757af 100644
--- a/lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java
+++ b/lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java
@@ -42,7 +42,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ReflectionHelper {
+class ReflectionHelper {
 	private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 	private final RdfFormatterStep.State state;
 	private final ClassLoader classLoader;

From ce60f55244902ce399b43c2563806e0c5afdbb56 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 30 Sep 2024 13:38:51 +0000
Subject: [PATCH 1810/2068] Update dependency org.mockito:mockito-core to
 v5.14.1

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 743993cf74..2061a68922 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -31,4 +31,4 @@ VER_DURIAN=1.2.0
 VER_JGIT=6.10.0.202406032230-r
 VER_JUNIT=5.11.1
 VER_ASSERTJ=3.26.3
-VER_MOCKITO=5.14.0
+VER_MOCKITO=5.14.1

From 0ce58f861f91f9b145108f4aece563c8b7b331f4 Mon Sep 17 00:00:00 2001
From: chavdav <vivek.v.chavda@gmail.com>
Date: Mon, 30 Sep 2024 17:10:51 -0400
Subject: [PATCH 1811/2068] Fix real-world examples link in readme

---
 plugin-maven/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index ab9b5f659a..e9cb264279 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -69,7 +69,7 @@ user@machine repo % mvn spotless:check
   - [Disabling warnings and error messages](#disabling-warnings-and-error-messages)
   - [How do I preview what `mvn spotless:apply` will do?](#how-do-i-preview-what-mvn-spotlessapply-will-do)
   - [Can I apply Spotless to specific files?](#can-i-apply-spotless-to-specific-files)
-  - [Example configurations (from real-world projects)](#examples)
+  - [Example configurations (from real-world projects)](#example-configurations-from-real-world-projects)
 
 ***Contributions are welcome, see [the contributing guide](../CONTRIBUTING.md) for development info.***
 

From d00816f42aa5c6d1a1d1990b9dab77195f102b2d Mon Sep 17 00:00:00 2001
From: zashroof <a.saleh@celonis.com>
Date: Thu, 3 Oct 2024 19:20:50 -0400
Subject: [PATCH 1812/2068] Create protobuf formatterFactory for mvn

---
 .../spotless/maven/AbstractSpotlessMojo.java  |  6 ++-
 .../diffplug/spotless/maven/protobuf/Buf.java | 44 ++++++++++++++++
 .../spotless/maven/protobuf/Protobuf.java     | 52 +++++++++++++++++++
 .../maven/MavenIntegrationHarness.java        |  4 ++
 .../spotless/maven/protobuf/BufTest.java      | 52 +++++++++++++++++++
 5 files changed, 157 insertions(+), 1 deletion(-)
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/protobuf/Buf.java
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/protobuf/Protobuf.java
 create mode 100644 plugin-maven/src/test/java/com/diffplug/spotless/maven/protobuf/BufTest.java

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
index 9ac91e8db1..ac5d095a16 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
@@ -73,6 +73,7 @@
 import com.diffplug.spotless.maven.kotlin.Kotlin;
 import com.diffplug.spotless.maven.markdown.Markdown;
 import com.diffplug.spotless.maven.pom.Pom;
+import com.diffplug.spotless.maven.protobuf.Protobuf;
 import com.diffplug.spotless.maven.python.Python;
 import com.diffplug.spotless.maven.rdf.Rdf;
 import com.diffplug.spotless.maven.scala.Scala;
@@ -200,6 +201,9 @@ public abstract class AbstractSpotlessMojo extends AbstractMojo {
 	@Parameter
 	private Rdf rdf;
 
+	@Parameter
+	private Protobuf protobuf;
+
 	@Parameter(property = "spotlessFiles")
 	private String filePatterns;
 
@@ -385,7 +389,7 @@ private FileLocator getFileLocator() {
 	}
 
 	private List<FormatterFactory> getFormatterFactories() {
-		return Stream.concat(formats.stream(), Stream.of(groovy, java, scala, kotlin, cpp, css, typescript, javascript, antlr4, pom, sql, python, markdown, json, shell, yaml, gherkin, go, rdf))
+		return Stream.concat(formats.stream(), Stream.of(groovy, java, scala, kotlin, cpp, css, typescript, javascript, antlr4, pom, sql, python, markdown, json, shell, yaml, gherkin, go, rdf, protobuf))
 				.filter(Objects::nonNull)
 				.map(factory -> factory.init(repositorySystemSession))
 				.collect(toList());
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/protobuf/Buf.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/protobuf/Buf.java
new file mode 100644
index 0000000000..1d336d7639
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/protobuf/Buf.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2016-2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.protobuf;
+
+import org.apache.maven.plugins.annotations.Parameter;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.maven.FormatterStepConfig;
+import com.diffplug.spotless.maven.FormatterStepFactory;
+import com.diffplug.spotless.protobuf.BufStep;
+
+public class Buf implements FormatterStepFactory {
+
+	@Parameter
+	private String version;
+
+	@Parameter
+	private String pathToExe;
+
+	@Override
+	public FormatterStep newFormatterStep(FormatterStepConfig config) {
+		BufStep buf = BufStep.withVersion(version == null ? BufStep.defaultVersion() : version);
+
+		if (pathToExe != null) {
+			buf = buf.withPathToExe(pathToExe);
+		}
+
+		return buf.create();
+	}
+
+}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/protobuf/Protobuf.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/protobuf/Protobuf.java
new file mode 100644
index 0000000000..3362ea2ad3
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/protobuf/Protobuf.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2016-2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.protobuf;
+
+import static com.diffplug.spotless.protobuf.ProtobufConstants.LICENSE_HEADER_DELIMITER;
+
+import java.util.Set;
+
+import org.apache.maven.project.MavenProject;
+
+import com.diffplug.common.collect.ImmutableSet;
+import com.diffplug.spotless.maven.FormatterFactory;
+import com.diffplug.spotless.maven.generic.LicenseHeader;
+
+/**
+ * A {@link FormatterFactory} implementation that corresponds to {@code <protobuf>...</protobuf>}
+ * configuration element.
+ * <p>
+ * It defines a formatter for protobuf source files that can execute both language agnostic (e.g.
+ * {@link LicenseHeader}) and protobuf-specific (e.g. {@link Buf}) steps.
+ */
+public class Protobuf extends FormatterFactory {
+
+	private static final Set<String> DEFAULT_INCLUDES = ImmutableSet.of("**/*.proto");
+
+	@Override
+	public Set<String> defaultIncludes(MavenProject project) {
+		return DEFAULT_INCLUDES;
+	}
+
+	@Override
+	public String licenseHeaderDelimiter() {
+		return LICENSE_HEADER_DELIMITER;
+	}
+
+	public void addBuf(Buf buf) {
+		addStepFactory(buf);
+	}
+}
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
index 9dbdf52339..0d0582e180 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
@@ -171,6 +171,10 @@ protected void writePomWithPomSteps(String... steps) throws IOException {
 		writePom(groupWithSteps("pom", including("pom_test.xml"), steps));
 	}
 
+	protected void writePomWithProtobufSteps(String... steps) throws IOException {
+		writePom(groupWithSteps("protobuf", steps));
+	}
+
 	protected void writePomWithMarkdownSteps(String... steps) throws IOException {
 		writePom(groupWithSteps("markdown", including("**/*.md"), steps));
 	}
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/protobuf/BufTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/protobuf/BufTest.java
new file mode 100644
index 0000000000..86c6f519fb
--- /dev/null
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/protobuf/BufTest.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.protobuf;
+
+import org.junit.jupiter.api.Test;
+
+import com.diffplug.spotless.maven.MavenIntegrationHarness;
+
+class BufTest extends MavenIntegrationHarness {
+
+	@Test
+	void buf() throws Exception {
+		writePomWithProtobufSteps("<buf>", "</buf>");
+		setFile("buf.proto").toResource("protobuf/buf/buf.proto");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("buf.proto").sameAsResource("protobuf/buf/buf.proto.clean");
+	}
+
+	@Test
+	void bufLarge() throws Exception {
+		writePomWithProtobufSteps("<buf>", "</buf>");
+		setFile("buf.proto").toResource("protobuf/buf/buf_large.proto");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("buf.proto").sameAsResource("protobuf/buf/buf_large.proto.clean");
+	}
+
+	@Test
+	void bufWithLicense() throws Exception {
+		writePomWithProtobufSteps(
+				"<buf>",
+				"</buf>",
+				"<licenseHeader>",
+				" <content>/* (C) 2022 */</content>",
+				"</licenseHeader>");
+		setFile("buf.proto").toResource("protobuf/buf/license.proto");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("buf.proto").sameAsResource("protobuf/buf/license.proto.clean");
+	}
+}

From 2a17eab430b1f617482bff13f9f8ab6f0cd3729a Mon Sep 17 00:00:00 2001
From: zashroof <a.saleh@celonis.com>
Date: Thu, 3 Oct 2024 19:21:25 -0400
Subject: [PATCH 1813/2068] Update buf default version to 1.44.0

---
 lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java b/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java
index 4fc087ad7a..e623bd0b51 100644
--- a/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java
@@ -38,7 +38,7 @@ public static String name() {
 	}
 
 	public static String defaultVersion() {
-		return "1.24.0";
+		return "1.44.0";
 	}
 
 	private final String version;

From adc8475884a07d99dc0f44b3e94c41b30df42c1d Mon Sep 17 00:00:00 2001
From: zashroof <a.saleh@celonis.com>
Date: Thu, 3 Oct 2024 19:34:35 -0400
Subject: [PATCH 1814/2068] List changes in the PR to changes.md

---
 CHANGES.md              | 2 ++
 plugin-maven/CHANGES.md | 1 +
 2 files changed, 3 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index d0cf643323..6b7ff82093 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,10 +12,12 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Support for `rdf` ([#2261](https://github.com/diffplug/spotless/pull/2261))
+* Support for `buf` on maven plugin ([#2291](https://github.com/diffplug/spotless/pull/2291))
 ### Changed
 * Support configuring the Equo P2 cache. ([#2238](https://github.com/diffplug/spotless/pull/2238))
 * Add explicit support for JSONC / CSS via biome, via the file extensions `.css` and `.jsonc`. 
   ([#2259](https://github.com/diffplug/spotless/pull/2259))
+* Bump default `buff` version to latest `1.24.0` -> `1.44.0`. ([#2291](https://github.com/diffplug/spotless/pull/2291))
 
 ## [3.0.0.BETA2] - 2024-08-25
 ### Changed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index b4151a5e9f..e6b681c7bd 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Support for `rdf` ([#2261](https://github.com/diffplug/spotless/pull/2261))
+* Support for `buf` ([#2291](https://github.com/diffplug/spotless/pull/2291))
 ### Changed
 * Leverage local repository for Equo P2 cache. ([#2238](https://github.com/diffplug/spotless/pull/2238))
 * Add explicit support for CSS via biome. Formatting CSS via biome was already supported as a general

From b128617e57c5b1dcdf62370e6d77bd1dee3c1df2 Mon Sep 17 00:00:00 2001
From: zashroof <a.saleh@celonis.com>
Date: Thu, 3 Oct 2024 19:57:27 -0400
Subject: [PATCH 1815/2068] Update readme

---
 plugin-maven/README.md | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index e9cb264279..17dc8651e9 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -56,6 +56,7 @@ user@machine repo % mvn spotless:check
   - [Gherkin](#gherkin)
   - [Go](#go)
   - [RDF](#RDF)
+  - [Protobuf](#protobuf) ([buf](#buf))
   - Multiple languages
     - [Prettier](#prettier) ([plugins](#prettier-plugins), [npm detection](#npm-detection), [`.npmrc` detection](#npmrc-detection), [caching `npm install` results](#caching-results-of-npm-install))
     - [eclipse web tools platform](#eclipse-web-tools-platform)
@@ -1177,6 +1178,36 @@ Configuring some generic and TTL options:
 RDF parsing is done via [Apache Jena](https://jena.apache.org/) in the version that
 [turtle-formatter](https://github.com/atextor/turtle-formatter) depends on (not necessarily the latest).
 
+## Protobuf
+
+[code](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/protobuf/Protobuf.java). [available steps](https://github.com/diffplug/spotless/tree/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/protobuf).
+```xml
+<configuration>
+  <includes>  <!-- optiona: default is **/*.proto -->
+    <include>proto/*.proto<include>
+  <includes>
+
+  <excludes>  <!-- optiona: if you want to ignore auto generated protos -->
+    <include>target/**/<include>
+  <excludes>
+  
+  <protobuf>
+    <buf />  <!-- has its own section below -->
+  </css>
+</configuration>
+```
+
+### buf
+
+[homepage](https://buf.build/) [buf repo](https://github.com/bufbuild/buf).
+```xml
+ <buf>
+    <version>1.44.0</version>    <!-- optional -->
+    <pathToExe>/path/to/buf</pathToExe>  <!-- optional: if buf isn't in your path -->
+ </buf>        
+```
+
+
 ## CSS
 
 [code](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/css/Css.java). [available steps](https://github.com/diffplug/spotless/tree/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/css).

From a6717ef5c42a46eec4652b7af8365f4b53e322a1 Mon Sep 17 00:00:00 2001
From: Peter Nied <peternied@hotmail.com>
Date: Fri, 4 Oct 2024 16:38:32 +0000
Subject: [PATCH 1816/2068] Java import order, ignore duplicate group entries

While setting the java importOrder, if there are an duplicate item the array of
strings, the output is doubled which can be very confusing.  I've made an
update to ignore duplicate importOrder groups, e.g.
`importOrder('java|javax', '', '', 'java|bar')` would be interpreted as
 `importOrder('java|javax', '', 'bar')`.

Signed-off-by: Peter Nied <peternied@hotmail.com>
---
 CHANGES.md                                          |  2 ++
 .../diffplug/spotless/java/ImportSorterImpl.java    | 13 ++++++++-----
 plugin-gradle/CHANGES.md                            |  2 ++
 plugin-maven/CHANGES.md                             |  2 ++
 .../diffplug/spotless/java/ImportOrderStepTest.java |  8 +++++++-
 5 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index d0cf643323..9e91518bfb 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -16,6 +16,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Support configuring the Equo P2 cache. ([#2238](https://github.com/diffplug/spotless/pull/2238))
 * Add explicit support for JSONC / CSS via biome, via the file extensions `.css` and `.jsonc`. 
   ([#2259](https://github.com/diffplug/spotless/pull/2259))
+### Fixed
+* Java import order, ignore duplicate group entries
 
 ## [3.0.0.BETA2] - 2024-08-25
 ### Changed
diff --git a/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java b/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java
index 4d343d41d8..4393de95a3 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,6 +33,7 @@ final class ImportSorterImpl {
 	private static final String SUBGROUP_SEPARATOR = "|";
 
 	private final List<ImportsGroup> importsGroups;
+	private final Set<String> knownGroupings = new HashSet<>();
 	private final Map<String, List<String>> matchingImports = new HashMap<>();
 	private final List<String> notMatching = new ArrayList<>();
 	private final Set<String> allImportOrderItems = new HashSet<>();
@@ -44,10 +45,12 @@ private static class ImportsGroup {
 
 		private final List<String> subGroups;
 
-		public ImportsGroup(String importOrder) {
+		public ImportsGroup(String importOrder, Set<String> knownGroupings) {
 			this.subGroups = Stream.of(importOrder.split("\\" + SUBGROUP_SEPARATOR, -1))
 					.map(this::normalizeStatic)
+					.filter(group -> !knownGroupings.contains(group))
 					.collect(Collectors.toList());
+			knownGroupings.addAll(this.subGroups);
 		}
 
 		private String normalizeStatic(String subgroup) {
@@ -80,7 +83,7 @@ private List<String> sort(List<String> imports, String lineFormat) {
 
 	private ImportSorterImpl(List<String> importOrder, boolean wildcardsLast, boolean semanticSort,
 			Set<String> treatAsPackage, Set<String> treatAsClass) {
-		importsGroups = importOrder.stream().filter(Objects::nonNull).map(ImportsGroup::new).collect(Collectors.toList());
+		importsGroups = importOrder.stream().filter(Objects::nonNull).map(order -> new ImportsGroup(order, knownGroupings)).collect(Collectors.toList());
 		putStaticItemIfNotExists(importsGroups);
 		putCatchAllGroupIfNotExists(importsGroups);
 
@@ -107,13 +110,13 @@ private void putStaticItemIfNotExists(List<ImportsGroup> importsGroups) {
 				indexOfFirstStatic = i;
 			}
 		}
-		importsGroups.add(indexOfFirstStatic, new ImportsGroup(STATIC_KEYWORD));
+		importsGroups.add(indexOfFirstStatic, new ImportsGroup(STATIC_KEYWORD, this.knownGroupings));
 	}
 
 	private void putCatchAllGroupIfNotExists(List<ImportsGroup> importsGroups) {
 		boolean catchAllSubGroupExist = importsGroups.stream().anyMatch(group -> group.getSubGroups().contains(CATCH_ALL_SUBGROUP));
 		if (!catchAllSubGroupExist) {
-			importsGroups.add(new ImportsGroup(CATCH_ALL_SUBGROUP));
+			importsGroups.add(new ImportsGroup(CATCH_ALL_SUBGROUP, this.knownGroupings));
 		}
 	}
 
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 8c1c357c32..0e20fbc7c5 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -9,6 +9,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Add explicit support for CSS via biome. Formatting CSS via biome was already supported as a general
   formatting step. Biome supports formatting CSS as of 1.8.0 (experimental, opt-in) and 1.9.0 (stable).
   ([#2259](https://github.com/diffplug/spotless/pull/2259))
+### Fixed
+* Java import order, ignore duplicate group entries
 
 ## [7.0.0.BETA2] - 2024-08-25
 ### Changed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index b4151a5e9f..72dc1a6991 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -10,6 +10,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Add explicit support for CSS via biome. Formatting CSS via biome was already supported as a general
   formatting step. Biome supports formatting CSS as of 1.8.0 (experimental, opt-in) and 1.9.0 (stable).
   ([#2259](https://github.com/diffplug/spotless/pull/2259))
+### Fixed
+* Java import order, ignore duplicate group entries
 
 ## [2.44.0.BETA2] - 2024-08-25
 ### Changed
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/ImportOrderStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/ImportOrderStepTest.java
index 75cd984f08..47bdff89dd 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/ImportOrderStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/ImportOrderStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,6 +43,12 @@ void sortImportsFromArrayWithSubgroups() {
 		StepHarness.forStep(step).testResource("java/importsorter/JavaCodeUnsortedImportsSubgroups.test", "java/importsorter/JavaCodeSortedImportsSubgroups.test");
 	}
 
+	@Test
+	void sortImportsFromArrayWithDuplicateEntries() {
+		FormatterStep step = ImportOrderStep.forJava().createFrom("java|javax", "java", "org|\\#com", "\\#");
+		StepHarness.forStep(step).testResource("java/importsorter/JavaCodeUnsortedImportsSubgroups.test", "java/importsorter/JavaCodeSortedImportsSubgroups.test");
+	}
+
 	@Test
 	void sortImportsFromArrayWithSubgroupsLeadingCatchAll() {
 		FormatterStep step = ImportOrderStep.forJava().createFrom("\\#|");

From 85df4b21e58bb01dc06ed61897cbd441a9b7d9e0 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 6 Oct 2024 16:41:39 +0800
Subject: [PATCH 1817/2068] Update dependency org.junit.jupiter:junit-jupiter
 to v5.11.2 (#2292)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 2061a68922..16954d8a26 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -29,6 +29,6 @@ VER_SLF4J=[1.6,2.0[
 # Used in multiple places
 VER_DURIAN=1.2.0
 VER_JGIT=6.10.0.202406032230-r
-VER_JUNIT=5.11.1
+VER_JUNIT=5.11.2
 VER_ASSERTJ=3.26.3
 VER_MOCKITO=5.14.1

From 91b7b21aa537b2c994610c9fb865e1746cb67787 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 6 Oct 2024 16:41:52 +0800
Subject: [PATCH 1818/2068] Update plugin com.github.spotbugs to v6.0.24
 (#2287)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index e197cca331..e6a0e171f9 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,7 +12,7 @@ plugins {
 	// https://github.com/gradle-nexus/publish-plugin/releases
 	id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
-	id 'com.github.spotbugs' version '6.0.23' apply false
+	id 'com.github.spotbugs' version '6.0.24' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
 	id 'com.diffplug.spotless-changelog' version '3.1.2' apply false
 	// https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md

From 85a0bebc71dcf59f56f0ac31b8b2507294cff78d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 6 Oct 2024 17:02:06 +0800
Subject: [PATCH 1819/2068] Update jackson monorepo to v2.18.0 (#2279)

* Update jackson monorepo to v2.18.0

* Sync Jackson changes

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Goooler <wangzongler@gmail.com>
---
 CHANGES.md                                                     | 1 +
 lib/build.gradle                                               | 2 +-
 .../main/java/com/diffplug/spotless/json/JacksonJsonStep.java  | 2 +-
 plugin-gradle/CHANGES.md                                       | 3 ++-
 plugin-maven/CHANGES.md                                        | 1 +
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index d0cf643323..95ce8f24c1 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -16,6 +16,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Support configuring the Equo P2 cache. ([#2238](https://github.com/diffplug/spotless/pull/2238))
 * Add explicit support for JSONC / CSS via biome, via the file extensions `.css` and `.jsonc`. 
   ([#2259](https://github.com/diffplug/spotless/pull/2259))
+* Bump default `jackson` version to latest `2.17.2` -> `2.18.0`. ([#2279](https://github.com/diffplug/spotless/pull/2279))
 
 ## [3.0.0.BETA2] - 2024-08-25
 ### Changed
diff --git a/lib/build.gradle b/lib/build.gradle
index 930510995e..558e2da648 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -97,7 +97,7 @@ dependencies {
 	// gson
 	gsonCompileOnly 'com.google.code.gson:gson:2.11.0'
 	// jackson
-	String VER_JACKSON='2.17.2'
+	String VER_JACKSON='2.18.0'
 	jacksonCompileOnly "com.fasterxml.jackson.core:jackson-databind:$VER_JACKSON"
 	jacksonCompileOnly "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$VER_JACKSON"
 	// ktfmt
diff --git a/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java b/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java
index 223dc692e5..d6e50bf4c4 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java
@@ -32,7 +32,7 @@
 public class JacksonJsonStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String MAVEN_COORDINATE = "com.fasterxml.jackson.core:jackson-databind:";
-	private static final String DEFAULT_VERSION = "2.17.2";
+	private static final String DEFAULT_VERSION = "2.18.0";
 	public static final String NAME = "jacksonJson";
 
 	private final JarState.Promised jarState;
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 8c1c357c32..ec6f0aea9f 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,12 +3,13 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
-
+### Changed
 * Use the Gradle user home directory by default for the download directory for the biome executable. Previously, the
   plugin tried to use Maven's home directory, which is not always accessible by a Gradle plugin. ([#2187](https://github.com/diffplug/spotless/issues/2187))
 * Add explicit support for CSS via biome. Formatting CSS via biome was already supported as a general
   formatting step. Biome supports formatting CSS as of 1.8.0 (experimental, opt-in) and 1.9.0 (stable).
   ([#2259](https://github.com/diffplug/spotless/pull/2259))
+* Bump default `jackson` version to latest `2.17.2` -> `2.18.0`. ([#2279](https://github.com/diffplug/spotless/pull/2279))
 
 ## [7.0.0.BETA2] - 2024-08-25
 ### Changed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index b4151a5e9f..4328fc14e1 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -10,6 +10,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Add explicit support for CSS via biome. Formatting CSS via biome was already supported as a general
   formatting step. Biome supports formatting CSS as of 1.8.0 (experimental, opt-in) and 1.9.0 (stable).
   ([#2259](https://github.com/diffplug/spotless/pull/2259))
+* Bump default `jackson` version to latest `2.17.2` -> `2.18.0`. ([#2279](https://github.com/diffplug/spotless/pull/2279))
 
 ## [2.44.0.BETA2] - 2024-08-25
 ### Changed

From f460038ac3b69d4caa311c047b60a71c06cbd110 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 4 Oct 2024 18:19:57 +0000
Subject: [PATCH 1820/2068] Update dependency
 com.google.googlejavaformat:google-java-format to v1.24.0

---
 lib/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 558e2da648..b3478a8921 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -93,7 +93,7 @@ dependencies {
 	gherkinCompileOnly 'io.cucumber:gherkin-utils:9.0.0'
 	gherkinCompileOnly 'org.slf4j:slf4j-api:2.0.16'
 	// googleJavaFormat
-	googleJavaFormatCompileOnly 'com.google.googlejavaformat:google-java-format:1.23.0'
+	googleJavaFormatCompileOnly 'com.google.googlejavaformat:google-java-format:1.24.0'
 	// gson
 	gsonCompileOnly 'com.google.code.gson:gson:2.11.0'
 	// jackson

From dec561cab6e636bf38a52ea89b95baa0d461e071 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sun, 6 Oct 2024 16:39:09 +0800
Subject: [PATCH 1821/2068] Sync GJF versions

---
 CHANGES.md                                                      | 1 +
 .../java/com/diffplug/spotless/java/GoogleJavaFormatStep.java   | 2 +-
 plugin-gradle/CHANGES.md                                        | 1 +
 plugin-maven/CHANGES.md                                         | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 95ce8f24c1..94f092f528 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,6 +17,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Add explicit support for JSONC / CSS via biome, via the file extensions `.css` and `.jsonc`. 
   ([#2259](https://github.com/diffplug/spotless/pull/2259))
 * Bump default `jackson` version to latest `2.17.2` -> `2.18.0`. ([#2279](https://github.com/diffplug/spotless/pull/2279))
+* Bump default `google-java-format` version to latest `1.23.0` -> `1.24.0`. ([#2294](https://github.com/diffplug/spotless/pull/2294))
 
 ## [3.0.0.BETA2] - 2024-08-25
 ### Changed
diff --git a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
index 3a74bdcf85..a47a9ebca3 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
@@ -121,7 +121,7 @@ private static FormatterStep createInternally(String groupArtifact, String versi
 			.addMin(11, "1.8") // we only support google-java-format >= 1.8 due to api changes
 			.addMin(16, "1.10.0") // java 16 requires at least 1.10.0 due to jdk api changes in JavaTokenizer
 			.addMin(21, "1.17.0") // java 21 requires at least 1.17.0 due to https://github.com/google/google-java-format/issues/898
-			.add(11, "1.23.0"); // default version
+			.add(17, "1.24.0"); // default version
 
 	public static String defaultGroupArtifact() {
 		return MAVEN_COORDINATE;
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index ec6f0aea9f..03c669f380 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -10,6 +10,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
   formatting step. Biome supports formatting CSS as of 1.8.0 (experimental, opt-in) and 1.9.0 (stable).
   ([#2259](https://github.com/diffplug/spotless/pull/2259))
 * Bump default `jackson` version to latest `2.17.2` -> `2.18.0`. ([#2279](https://github.com/diffplug/spotless/pull/2279))
+* Bump default `google-java-format` version to latest `1.23.0` -> `1.24.0`. ([#2294](https://github.com/diffplug/spotless/pull/2294))
 
 ## [7.0.0.BETA2] - 2024-08-25
 ### Changed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 4328fc14e1..a1d8bf8638 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -11,6 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
   formatting step. Biome supports formatting CSS as of 1.8.0 (experimental, opt-in) and 1.9.0 (stable).
   ([#2259](https://github.com/diffplug/spotless/pull/2259))
 * Bump default `jackson` version to latest `2.17.2` -> `2.18.0`. ([#2279](https://github.com/diffplug/spotless/pull/2279))
+* Bump default `google-java-format` version to latest `1.23.0` -> `1.24.0`. ([#2294](https://github.com/diffplug/spotless/pull/2294))
 
 ## [2.44.0.BETA2] - 2024-08-25
 ### Changed

From 507be29d19f3537e698d7159b76b853ea7a0eb12 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 10 Oct 2024 15:26:40 -0700
Subject: [PATCH 1822/2068] Update all of solstice to 1.8.0.

---
 .../java/com/diffplug/spotless/extra/EquoBasedStepBuilder.java  | 2 +-
 settings.gradle                                                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 cba5beb945..4f54e1e1bc 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
@@ -116,7 +116,7 @@ public FormatterStep build() {
 			}
 			var classpath = new ArrayList<File>();
 			var mavenDeps = new ArrayList<String>();
-			mavenDeps.add("dev.equo.ide:solstice:1.7.7");
+			mavenDeps.add("dev.equo.ide:solstice:1.8.0");
 			mavenDeps.add("com.diffplug.durian:durian-swt.os:4.2.0");
 			mavenDeps.addAll(query.getJarsOnMavenCentral());
 			classpath.addAll(mavenProvisioner.provisionWithTransitives(false, mavenDeps));
diff --git a/settings.gradle b/settings.gradle
index a5b300a558..120319afc1 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -22,7 +22,7 @@ plugins {
 	// https://plugins.gradle.org/plugin/com.gradle.develocity
 	id 'com.gradle.develocity' version '3.18.1'
 	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
-	id 'dev.equo.ide' version '1.7.7' apply false
+	id 'dev.equo.ide' version '1.8.0' apply false
 }
 
 dependencyResolutionManagement {

From 98064d5b414da4d98e454f7321d74882994eaac6 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 10 Oct 2024 15:36:54 -0700
Subject: [PATCH 1823/2068] Oops, updated one too many.

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 120319afc1..a5b300a558 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -22,7 +22,7 @@ plugins {
 	// https://plugins.gradle.org/plugin/com.gradle.develocity
 	id 'com.gradle.develocity' version '3.18.1'
 	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
-	id 'dev.equo.ide' version '1.8.0' apply false
+	id 'dev.equo.ide' version '1.7.7' apply false
 }
 
 dependencyResolutionManagement {

From 8fb2cb89dfdd671ff0bf5b23d9a2d3c93e9b2c27 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 10 Oct 2024 15:44:54 -0700
Subject: [PATCH 1824/2068] Add PR links in the changelog.

---
 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 8ae3ef933c..02e14cc79a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -18,7 +18,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
   ([#2259](https://github.com/diffplug/spotless/pull/2259))
 * Bump default `jackson` version to latest `2.17.2` -> `2.18.0`. ([#2279](https://github.com/diffplug/spotless/pull/2279))
 ### Fixed
-* Java import order, ignore duplicate group entries
+* Java import order, ignore duplicate group entries. ([#2293](https://github.com/diffplug/spotless/pull/2293))
 
 ## [3.0.0.BETA2] - 2024-08-25
 ### Changed
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 2d51b0e236..e3550693f7 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -11,7 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
   ([#2259](https://github.com/diffplug/spotless/pull/2259))
 * Bump default `jackson` version to latest `2.17.2` -> `2.18.0`. ([#2279](https://github.com/diffplug/spotless/pull/2279))
 ### Fixed
-* Java import order, ignore duplicate group entries
+* Java import order, ignore duplicate group entries. ([#2293](https://github.com/diffplug/spotless/pull/2293))
 
 ## [7.0.0.BETA2] - 2024-08-25
 ### Changed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index f3c77858d1..452e1e79a8 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -12,7 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
   ([#2259](https://github.com/diffplug/spotless/pull/2259))
 * Bump default `jackson` version to latest `2.17.2` -> `2.18.0`. ([#2279](https://github.com/diffplug/spotless/pull/2279))
 ### Fixed
-* Java import order, ignore duplicate group entries
+* Java import order, ignore duplicate group entries. ([#2293](https://github.com/diffplug/spotless/pull/2293))
 
 ## [2.44.0.BETA2] - 2024-08-25
 ### Changed

From 06c954f3e1a27c26f766800c5c0bfec7ab936d07 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 10 Oct 2024 15:50:22 -0700
Subject: [PATCH 1825/2068] Rename `BufTest` to `BufMavenIntegrationTest` and
 mark its weird dependency requirements for CI.

---
 .../protobuf/{BufTest.java => BufMavenIntegrationTest.java}  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 rename plugin-maven/src/test/java/com/diffplug/spotless/maven/protobuf/{BufTest.java => BufMavenIntegrationTest.java} (93%)

diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/protobuf/BufTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/protobuf/BufMavenIntegrationTest.java
similarity index 93%
rename from plugin-maven/src/test/java/com/diffplug/spotless/maven/protobuf/BufTest.java
rename to plugin-maven/src/test/java/com/diffplug/spotless/maven/protobuf/BufMavenIntegrationTest.java
index 86c6f519fb..4f07c06772 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/protobuf/BufTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/protobuf/BufMavenIntegrationTest.java
@@ -18,9 +18,10 @@
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
+import com.diffplug.spotless.tag.BufTest;
 
-class BufTest extends MavenIntegrationHarness {
-
+@BufTest
+class BufMavenIntegrationTest extends MavenIntegrationHarness {
 	@Test
 	void buf() throws Exception {
 		writePomWithProtobufSteps("<buf>", "</buf>");

From 0c6523b7c5b687e7b359b5ad10ea7994e34b9f8e Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 10 Oct 2024 15:52:07 -0700
Subject: [PATCH 1826/2068] Some minor changelog bumps.

---
 CHANGES.md               | 2 +-
 plugin-gradle/CHANGES.md | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 6b7ff82093..06083011c9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,7 +17,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Support configuring the Equo P2 cache. ([#2238](https://github.com/diffplug/spotless/pull/2238))
 * Add explicit support for JSONC / CSS via biome, via the file extensions `.css` and `.jsonc`. 
   ([#2259](https://github.com/diffplug/spotless/pull/2259))
-* Bump default `buff` version to latest `1.24.0` -> `1.44.0`. ([#2291](https://github.com/diffplug/spotless/pull/2291))
+* Bump default `buf` version to latest `1.24.0` -> `1.44.0`. ([#2291](https://github.com/diffplug/spotless/pull/2291))
 
 ## [3.0.0.BETA2] - 2024-08-25
 ### Changed
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 8c1c357c32..baeecc64df 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,12 +3,14 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
-
+### Added
 * Use the Gradle user home directory by default for the download directory for the biome executable. Previously, the
   plugin tried to use Maven's home directory, which is not always accessible by a Gradle plugin. ([#2187](https://github.com/diffplug/spotless/issues/2187))
 * Add explicit support for CSS via biome. Formatting CSS via biome was already supported as a general
   formatting step. Biome supports formatting CSS as of 1.8.0 (experimental, opt-in) and 1.9.0 (stable).
   ([#2259](https://github.com/diffplug/spotless/pull/2259))
+### Changed
+* Bump default `buf` version to latest `1.24.0` -> `1.44.0`. ([#2291](https://github.com/diffplug/spotless/pull/2291))
 
 ## [7.0.0.BETA2] - 2024-08-25
 ### Changed

From 574b26057c7d92399bfdff94b2cb09b1a7edbff4 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 11 Oct 2024 09:47:02 -0700
Subject: [PATCH 1827/2068] This is the last version that works with Java 11,
 not the first to require Java 17.

---
 .../java/com/diffplug/spotless/java/GoogleJavaFormatStep.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
index a47a9ebca3..cdf44a2b28 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
@@ -121,7 +121,7 @@ private static FormatterStep createInternally(String groupArtifact, String versi
 			.addMin(11, "1.8") // we only support google-java-format >= 1.8 due to api changes
 			.addMin(16, "1.10.0") // java 16 requires at least 1.10.0 due to jdk api changes in JavaTokenizer
 			.addMin(21, "1.17.0") // java 21 requires at least 1.17.0 due to https://github.com/google/google-java-format/issues/898
-			.add(17, "1.24.0"); // default version
+			.add(11, "1.24.0"); // default version
 
 	public static String defaultGroupArtifact() {
 		return MAVEN_COORDINATE;

From e7a879d709e40604b53020a9eee64f177ed8e22e Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 11 Oct 2024 15:14:43 -0700
Subject: [PATCH 1828/2068] First shot at fixing the configuration cache /
 remote build cache conflict.

---
 .../spotless/ConfigurationCacheHack.java      | 87 +++++++++++++++++++
 .../java/com/diffplug/spotless/Formatter.java |  4 +
 .../FormatterStepSerializationRoundtrip.java  | 20 +++--
 .../gradle/spotless/SpotlessTask.java         | 22 +++--
 4 files changed, 121 insertions(+), 12 deletions(-)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/ConfigurationCacheHack.java

diff --git a/lib/src/main/java/com/diffplug/spotless/ConfigurationCacheHack.java b/lib/src/main/java/com/diffplug/spotless/ConfigurationCacheHack.java
new file mode 100644
index 0000000000..9962bd2a54
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/ConfigurationCacheHack.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless;
+
+import java.io.IOException;
+import java.util.AbstractList;
+import java.util.ArrayList;
+import java.util.Collection;
+
+/**
+ * Gradle requires three things:
+ * - Gradle defines cache equality based on your serialized representation
+ * - Combined with remote build cache, you cannot have any absolute paths in your serialized representation
+ * - Combined with configuration cache, you must be able to roundtrip yourself through serialization
+ *
+ * These requirements are at odds with each other, as described in these issues
+ * - Gradle issue to define custom equality https://github.com/gradle/gradle/issues/29816
+ * - Spotless plea for developer cache instead of configuration cache https://github.com/diffplug/spotless/issues/987
+ * - Spotless cache miss bug fixed by this class https://github.com/diffplug/spotless/issues/2168
+ *
+ * The point of this class is to create containers which can optimize the serialized representation for either
+ * - roundtrip integrity
+ * - equality
+ *
+ * It is a horrific hack, but it works, and it's the only way I can figure
+ * to make Spotless work with all of Gradle's cache systems.
+ */
+public class ConfigurationCacheHack {
+	static boolean SERIALIZE_FOR_ROUNDTRIP = false;
+
+	public enum OptimizeFor {
+		ROUNDTRIP, EQUALITY,
+	}
+
+	public static class StepList extends AbstractList<FormatterStep> {
+		private final boolean optimizeForEquality;
+		private transient ArrayList<FormatterStep> backingList = new ArrayList<>();
+
+		public StepList(OptimizeFor optimizeFor) {
+			this.optimizeForEquality = optimizeFor == OptimizeFor.EQUALITY;
+		}
+
+		@Override
+		public void clear() {
+			backingList.clear();
+		}
+
+		@Override
+		public boolean addAll(Collection<? extends FormatterStep> c) {
+			return backingList.addAll(c);
+		}
+
+		private void writeObject(java.io.ObjectOutputStream out) throws IOException {
+			out.defaultWriteObject();
+			SERIALIZE_FOR_ROUNDTRIP = !optimizeForEquality;
+			out.writeObject(backingList);
+		}
+
+		private void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException {
+			in.defaultReadObject();
+			backingList = (ArrayList<FormatterStep>) in.readObject();
+		}
+
+		@Override
+		public FormatterStep get(int index) {
+			return backingList.get(index);
+		}
+
+		@Override
+		public int size() {
+			return backingList.size();
+		}
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/Formatter.java b/lib/src/main/java/com/diffplug/spotless/Formatter.java
index ce083e826a..3f28d42df7 100644
--- a/lib/src/main/java/com/diffplug/spotless/Formatter.java
+++ b/lib/src/main/java/com/diffplug/spotless/Formatter.java
@@ -35,6 +35,8 @@
 
 import javax.annotation.Nullable;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 /** Formatter which performs the full formatting. */
 public final class Formatter implements Serializable, AutoCloseable {
 	private static final long serialVersionUID = 1L;
@@ -57,11 +59,13 @@ private Formatter(String name, LineEnding.Policy lineEndingsPolicy, Charset enco
 	}
 
 	// override serialize output
+	@SuppressFBWarnings("ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD")
 	private void writeObject(ObjectOutputStream out) throws IOException {
 		out.writeObject(name);
 		out.writeObject(lineEndingsPolicy);
 		out.writeObject(encoding.name());
 		out.writeObject(rootDir.toString());
+		ConfigurationCacheHack.SERIALIZE_FOR_ROUNDTRIP = true;
 		out.writeObject(steps);
 		out.writeObject(exceptionPolicy);
 	}
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java b/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java
index 3af89083fc..263826c9ca 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java
@@ -26,6 +26,7 @@ class FormatterStepSerializationRoundtrip<RoundtripState extends Serializable, E
 	private final String name;
 	private final transient ThrowingEx.Supplier<RoundtripState> initializer;
 	private @Nullable RoundtripState roundtripStateInternal;
+	private @Nullable EqualityState equalityStateInternal;
 	private final SerializedFunction<RoundtripState, EqualityState> equalityStateExtractor;
 	private final SerializedFunction<EqualityState, FormatterFunc> equalityStateToFormatter;
 
@@ -43,10 +44,13 @@ public String getName() {
 
 	@Override
 	protected EqualityState stateSupplier() throws Exception {
-		if (roundtripStateInternal == null) {
-			roundtripStateInternal = initializer.get();
+		if (equalityStateInternal == null) {
+			if (roundtripStateInternal == null) {
+				roundtripStateInternal = initializer.get();
+			}
+			equalityStateInternal = equalityStateExtractor.apply(roundtripStateInternal);
 		}
-		return equalityStateExtractor.apply(roundtripStateInternal);
+		return equalityStateInternal;
 	}
 
 	@Override
@@ -56,8 +60,14 @@ protected FormatterFunc stateToFormatter(EqualityState equalityState) throws Exc
 
 	// override serialize output
 	private void writeObject(java.io.ObjectOutputStream out) throws IOException {
-		if (roundtripStateInternal == null) {
-			roundtripStateInternal = ThrowingEx.get(initializer::get);
+		if (ConfigurationCacheHack.SERIALIZE_FOR_ROUNDTRIP) {
+			if (roundtripStateInternal == null) {
+				roundtripStateInternal = ThrowingEx.get(initializer::get);
+			}
+			equalityStateInternal = null;
+		} else {
+			equalityStateInternal = ThrowingEx.get(this::stateSupplier);
+			roundtripStateInternal = null;
 		}
 		out.defaultWriteObject();
 	}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
index f930685baf..5e2fce2713 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
@@ -17,7 +17,6 @@
 
 import java.io.File;
 import java.nio.charset.Charset;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
@@ -37,6 +36,7 @@
 import org.gradle.api.tasks.PathSensitivity;
 import org.gradle.work.Incremental;
 
+import com.diffplug.spotless.ConfigurationCacheHack;
 import com.diffplug.spotless.FormatExceptionPolicy;
 import com.diffplug.spotless.FormatExceptionPolicyStrict;
 import com.diffplug.spotless.Formatter;
@@ -150,17 +150,25 @@ public File getOutputDirectory() {
 		return outputDirectory;
 	}
 
-	protected final List<FormatterStep> steps = new ArrayList<>();
+	private final List<FormatterStep> stepsInternalRoundtrip = new ConfigurationCacheHack.StepList(ConfigurationCacheHack.OptimizeFor.ROUNDTRIP);
+	private final List<FormatterStep> stepsInternalEquality = new ConfigurationCacheHack.StepList(ConfigurationCacheHack.OptimizeFor.EQUALITY);
+
+	@Internal
+	public List<FormatterStep> getStepsInternalRoundtrip() {
+		return Collections.unmodifiableList(stepsInternalRoundtrip);
+	}
 
 	@Input
-	public List<FormatterStep> getSteps() {
-		return Collections.unmodifiableList(steps);
+	public List<FormatterStep> getStepsInternalEquality() {
+		return Collections.unmodifiableList(stepsInternalEquality);
 	}
 
 	public void setSteps(List<FormatterStep> steps) {
 		PluginGradlePreconditions.requireElementsNonNull(steps);
-		this.steps.clear();
-		this.steps.addAll(steps);
+		this.stepsInternalRoundtrip.clear();
+		this.stepsInternalEquality.clear();
+		this.stepsInternalRoundtrip.addAll(steps);
+		this.stepsInternalEquality.addAll(steps);
 	}
 
 	/** Returns the name of this format. */
@@ -179,7 +187,7 @@ Formatter buildFormatter() {
 				.lineEndingsPolicy(getLineEndingsPolicy().get())
 				.encoding(Charset.forName(encoding))
 				.rootDir(getProjectDir().get().getAsFile().toPath())
-				.steps(steps)
+				.steps(stepsInternalRoundtrip)
 				.exceptionPolicy(exceptionPolicy)
 				.build();
 	}

From 9881ea45039f078b04009d3e91a849bf3479e8ed Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 11 Oct 2024 16:19:42 -0700
Subject: [PATCH 1829/2068] Update changelogs.

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 6f6ce2bf31..fb0498eea5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,6 +13,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * Support for `rdf` ([#2261](https://github.com/diffplug/spotless/pull/2261))
 * Support for `buf` on maven plugin ([#2291](https://github.com/diffplug/spotless/pull/2291))
+* `ConfigurationCacheHack` so we can support Gradle's configuration cache and remote build cache at the same time. ([TODO]()fixes [#2168](https://github.com/diffplug/spotless/issues/2168))
 ### Changed
 * Support configuring the Equo P2 cache. ([#2238](https://github.com/diffplug/spotless/pull/2238))
 * Add explicit support for JSONC / CSS via biome, via the file extensions `.css` and `.jsonc`. 
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index fde6696b03..fdf29157b1 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -16,6 +16,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `jackson` version to latest `2.17.2` -> `2.18.0`. ([#2279](https://github.com/diffplug/spotless/pull/2279))
 ### Fixed
 * Java import order, ignore duplicate group entries. ([#2293](https://github.com/diffplug/spotless/pull/2293))
+* Remote build cache shouldn't have cache misses anymore. ([TODO]()fixes [#2168](https://github.com/diffplug/spotless/issues/2168))
 
 ## [7.0.0.BETA2] - 2024-08-25
 ### Changed

From babfb9bb4516126bd3a96c890f93945dd1bdd2cc Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 12 Oct 2024 10:28:38 +0800
Subject: [PATCH 1830/2068] Update dependency
 io.github.solven-eu.cleanthat:java to v2.22 (#2296)

* Update dependency io.github.solven-eu.cleanthat:java to v2.22

* Unify cleanthat version to 2.22

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Goooler <wangzongler@gmail.com>
---
 CHANGES.md                                                      | 1 +
 lib/build.gradle                                                | 2 +-
 .../main/java/com/diffplug/spotless/java/CleanthatJavaStep.java | 2 +-
 plugin-gradle/CHANGES.md                                        | 1 +
 plugin-maven/CHANGES.md                                         | 1 +
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 6f6ce2bf31..63fdc6e552 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -20,6 +20,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `buf` version to latest `1.24.0` -> `1.44.0`. ([#2291](https://github.com/diffplug/spotless/pull/2291))
 * Bump default `google-java-format` version to latest `1.23.0` -> `1.24.0`. ([#2294](https://github.com/diffplug/spotless/pull/2294))
 * Bump default `jackson` version to latest `2.17.2` -> `2.18.0`. ([#2279](https://github.com/diffplug/spotless/pull/2279))
+* Bump default `cleanthat` version to latest `2.21` -> `2.22`. ([#2296](https://github.com/diffplug/spotless/pull/2296))
 ### Fixed
 * Java import order, ignore duplicate group entries. ([#2293](https://github.com/diffplug/spotless/pull/2293))
 
diff --git a/lib/build.gradle b/lib/build.gradle
index b3478a8921..563e964e5f 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -80,7 +80,7 @@ dependencies {
 
 	// GLUE CODE (alphabetic order please)
 	// cleanthat
-	String VER_CLEANTHAT='2.21'
+	String VER_CLEANTHAT='2.22'
 	cleanthatCompileOnly "io.github.solven-eu.cleanthat:java:$VER_CLEANTHAT"
 	compatCleanthat2Dot1CompileAndTestOnly "io.github.solven-eu.cleanthat:java:$VER_CLEANTHAT"
 	// diktat old supported version 1.x
diff --git a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
index f4dbc5eec7..9584830988 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
@@ -43,7 +43,7 @@ public final class CleanthatJavaStep implements Serializable {
 	/**
 	 * CleanThat changelog is available at <a href="https://github.com/solven-eu/cleanthat/blob/master/CHANGES.MD">here</a>.
 	 */
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "2.21");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "2.22");
 
 	private final JarState.Promised jarState;
 	private final String version;
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index fde6696b03..d9446b5cec 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -14,6 +14,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `buf` version to latest `1.24.0` -> `1.44.0`. ([#2291](https://github.com/diffplug/spotless/pull/2291))
 * Bump default `google-java-format` version to latest `1.23.0` -> `1.24.0`. ([#2294](https://github.com/diffplug/spotless/pull/2294))
 * Bump default `jackson` version to latest `2.17.2` -> `2.18.0`. ([#2279](https://github.com/diffplug/spotless/pull/2279))
+* Bump default `cleanthat` version to latest `2.21` -> `2.22`. ([#2296](https://github.com/diffplug/spotless/pull/2296))
 ### Fixed
 * Java import order, ignore duplicate group entries. ([#2293](https://github.com/diffplug/spotless/pull/2293))
 
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index f0f3c5dcbd..109278140d 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -13,6 +13,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
   ([#2259](https://github.com/diffplug/spotless/pull/2259))
 * Bump default `google-java-format` version to latest `1.23.0` -> `1.24.0`. ([#2294](https://github.com/diffplug/spotless/pull/2294))
 * Bump default `jackson` version to latest `2.17.2` -> `2.18.0`. ([#2279](https://github.com/diffplug/spotless/pull/2279))
+* Bump default `cleanthat` version to latest `2.21` -> `2.22`. ([#2296](https://github.com/diffplug/spotless/pull/2296))
 ### Fixed
 * Java import order, ignore duplicate group entries. ([#2293](https://github.com/diffplug/spotless/pull/2293))
 

From 716722a982542edc4373304965c69c42632f398a Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sat, 12 Oct 2024 22:23:36 -0700
Subject: [PATCH 1831/2068] Give `FormatterStepSerializationRoundtrip` a
 special serialization format instead.

---
 .../spotless/ConfigurationCacheHack.java      | 74 ++++++++++-------
 .../java/com/diffplug/spotless/Formatter.java |  4 -
 .../FormatterStepSerializationRoundtrip.java  | 80 +++++++++++++------
 .../gradle/spotless/SpotlessTask.java         | 15 ++--
 4 files changed, 109 insertions(+), 64 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/ConfigurationCacheHack.java b/lib/src/main/java/com/diffplug/spotless/ConfigurationCacheHack.java
index 9962bd2a54..1544139a15 100644
--- a/lib/src/main/java/com/diffplug/spotless/ConfigurationCacheHack.java
+++ b/lib/src/main/java/com/diffplug/spotless/ConfigurationCacheHack.java
@@ -15,23 +15,29 @@
  */
 package com.diffplug.spotless;
 
-import java.io.IOException;
-import java.util.AbstractList;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * Gradle requires three things:
  * - Gradle defines cache equality based on your serialized representation
- * - Combined with remote build cache, you cannot have any absolute paths in your serialized representation
- * - Combined with configuration cache, you must be able to roundtrip yourself through serialization
+ * - Combined with remote build cache, you cannot have any absolute paths in
+ * your serialized representation
+ * - Combined with configuration cache, you must be able to roundtrip yourself
+ * through serialization
  *
  * These requirements are at odds with each other, as described in these issues
- * - Gradle issue to define custom equality https://github.com/gradle/gradle/issues/29816
- * - Spotless plea for developer cache instead of configuration cache https://github.com/diffplug/spotless/issues/987
- * - Spotless cache miss bug fixed by this class https://github.com/diffplug/spotless/issues/2168
+ * - Gradle issue to define custom equality
+ * https://github.com/gradle/gradle/issues/29816
+ * - Spotless plea for developer cache instead of configuration cache
+ * https://github.com/diffplug/spotless/issues/987
+ * - Spotless cache miss bug fixed by this class
+ * https://github.com/diffplug/spotless/issues/2168
  *
- * The point of this class is to create containers which can optimize the serialized representation for either
+ * The point of this class is to create containers which can optimize the
+ * serialized representation for either
  * - roundtrip integrity
  * - equality
  *
@@ -39,49 +45,59 @@
  * to make Spotless work with all of Gradle's cache systems.
  */
 public class ConfigurationCacheHack {
-	static boolean SERIALIZE_FOR_ROUNDTRIP = false;
-
 	public enum OptimizeFor {
 		ROUNDTRIP, EQUALITY,
 	}
 
-	public static class StepList extends AbstractList<FormatterStep> {
+	public static class StepList implements java.io.Serializable {
 		private final boolean optimizeForEquality;
-		private transient ArrayList<FormatterStep> backingList = new ArrayList<>();
+		private final ArrayList<Object> backingList = new ArrayList<>();
 
 		public StepList(OptimizeFor optimizeFor) {
 			this.optimizeForEquality = optimizeFor == OptimizeFor.EQUALITY;
 		}
 
-		@Override
 		public void clear() {
 			backingList.clear();
 		}
 
-		@Override
-		public boolean addAll(Collection<? extends FormatterStep> c) {
-			return backingList.addAll(c);
-		}
-
-		private void writeObject(java.io.ObjectOutputStream out) throws IOException {
-			out.defaultWriteObject();
-			SERIALIZE_FOR_ROUNDTRIP = !optimizeForEquality;
-			out.writeObject(backingList);
+		public void addAll(Collection<? extends FormatterStep> c) {
+			for (FormatterStep step : c) {
+				if (step instanceof FormatterStepSerializationRoundtrip) {
+					var clone = ((FormatterStepSerializationRoundtrip) step).hackClone(optimizeForEquality);
+					backingList.add(clone);
+				} else {
+					backingList.add(step);
+				}
+			}
 		}
 
-		private void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException {
-			in.defaultReadObject();
-			backingList = (ArrayList<FormatterStep>) in.readObject();
+		public List<FormatterStep> getSteps() {
+			var result = new ArrayList<FormatterStep>(backingList.size());
+			for (Object obj : backingList) {
+				if (obj instanceof FormatterStepSerializationRoundtrip.HackClone) {
+					result.add(((FormatterStepSerializationRoundtrip.HackClone) obj).rehydrate());
+				} else {
+					result.add((FormatterStep) obj);
+				}
+			}
+			return result;
 		}
 
 		@Override
-		public FormatterStep get(int index) {
-			return backingList.get(index);
+		public boolean equals(Object o) {
+			if (this == o)
+				return true;
+			if (o == null || getClass() != o.getClass())
+				return false;
+			StepList stepList = (StepList) o;
+			return optimizeForEquality == stepList.optimizeForEquality &&
+					backingList.equals(stepList.backingList);
 		}
 
 		@Override
-		public int size() {
-			return backingList.size();
+		public int hashCode() {
+			return Objects.hash(optimizeForEquality, backingList);
 		}
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/Formatter.java b/lib/src/main/java/com/diffplug/spotless/Formatter.java
index 3f28d42df7..ce083e826a 100644
--- a/lib/src/main/java/com/diffplug/spotless/Formatter.java
+++ b/lib/src/main/java/com/diffplug/spotless/Formatter.java
@@ -35,8 +35,6 @@
 
 import javax.annotation.Nullable;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
 /** Formatter which performs the full formatting. */
 public final class Formatter implements Serializable, AutoCloseable {
 	private static final long serialVersionUID = 1L;
@@ -59,13 +57,11 @@ private Formatter(String name, LineEnding.Policy lineEndingsPolicy, Charset enco
 	}
 
 	// override serialize output
-	@SuppressFBWarnings("ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD")
 	private void writeObject(ObjectOutputStream out) throws IOException {
 		out.writeObject(name);
 		out.writeObject(lineEndingsPolicy);
 		out.writeObject(encoding.name());
 		out.writeObject(rootDir.toString());
-		ConfigurationCacheHack.SERIALIZE_FOR_ROUNDTRIP = true;
 		out.writeObject(steps);
 		out.writeObject(exceptionPolicy);
 	}
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java b/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java
index 263826c9ca..6f123f2237 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java
@@ -16,12 +16,12 @@
 package com.diffplug.spotless;
 
 import java.io.IOException;
-import java.io.ObjectStreamException;
 import java.io.Serializable;
+import java.util.Objects;
 
 import edu.umd.cs.findbugs.annotations.Nullable;
 
-class FormatterStepSerializationRoundtrip<RoundtripState extends Serializable, EqualityState extends Serializable> extends FormatterStepEqualityOnStateSerialization<EqualityState> {
+final class FormatterStepSerializationRoundtrip<RoundtripState extends Serializable, EqualityState extends Serializable> extends FormatterStepEqualityOnStateSerialization<EqualityState> {
 	private static final long serialVersionUID = 1L;
 	private final String name;
 	private final transient ThrowingEx.Supplier<RoundtripState> initializer;
@@ -30,7 +30,7 @@ class FormatterStepSerializationRoundtrip<RoundtripState extends Serializable, E
 	private final SerializedFunction<RoundtripState, EqualityState> equalityStateExtractor;
 	private final SerializedFunction<EqualityState, FormatterFunc> equalityStateToFormatter;
 
-	public FormatterStepSerializationRoundtrip(String name, ThrowingEx.Supplier<RoundtripState> initializer, SerializedFunction<RoundtripState, EqualityState> equalityStateExtractor, SerializedFunction<EqualityState, FormatterFunc> equalityStateToFormatter) {
+	FormatterStepSerializationRoundtrip(String name, ThrowingEx.Supplier<RoundtripState> initializer, SerializedFunction<RoundtripState, EqualityState> equalityStateExtractor, SerializedFunction<EqualityState, FormatterFunc> equalityStateToFormatter) {
 		this.name = name;
 		this.initializer = initializer;
 		this.equalityStateExtractor = equalityStateExtractor;
@@ -42,13 +42,17 @@ public String getName() {
 		return name;
 	}
 
+	private RoundtripState roundtripStateSupplier() throws Exception {
+		if (roundtripStateInternal == null) {
+			roundtripStateInternal = initializer.get();
+		}
+		return roundtripStateInternal;
+	}
+
 	@Override
 	protected EqualityState stateSupplier() throws Exception {
 		if (equalityStateInternal == null) {
-			if (roundtripStateInternal == null) {
-				roundtripStateInternal = initializer.get();
-			}
-			equalityStateInternal = equalityStateExtractor.apply(roundtripStateInternal);
+			equalityStateInternal = equalityStateExtractor.apply(roundtripStateSupplier());
 		}
 		return equalityStateInternal;
 	}
@@ -58,25 +62,55 @@ protected FormatterFunc stateToFormatter(EqualityState equalityState) throws Exc
 		return equalityStateToFormatter.apply(equalityState);
 	}
 
-	// override serialize output
-	private void writeObject(java.io.ObjectOutputStream out) throws IOException {
-		if (ConfigurationCacheHack.SERIALIZE_FOR_ROUNDTRIP) {
-			if (roundtripStateInternal == null) {
-				roundtripStateInternal = ThrowingEx.get(initializer::get);
+	HackClone<?, ?> hackClone(boolean optimizeForEquality) {
+		return new HackClone<>(this, optimizeForEquality);
+	}
+
+	static class HackClone<RoundtripState extends Serializable, EqualityState extends Serializable> implements Serializable {
+		transient FormatterStepSerializationRoundtrip<?, ?> original;
+		boolean optimizeForEquality;
+		@Nullable
+		FormatterStepSerializationRoundtrip cleaned;
+
+		HackClone(@Nullable FormatterStepSerializationRoundtrip<RoundtripState, EqualityState> original, boolean optimizeForEquality) {
+			this.original = original;
+			this.optimizeForEquality = optimizeForEquality;
+		}
+
+		private void writeObject(java.io.ObjectOutputStream out) throws IOException {
+			if (cleaned == null) {
+				cleaned = new FormatterStepSerializationRoundtrip(original.name, null, original.equalityStateExtractor, original.equalityStateToFormatter);
+				if (optimizeForEquality) {
+					cleaned.equalityStateInternal = ThrowingEx.get(original::stateSupplier);
+				} else {
+					cleaned.roundtripStateInternal = ThrowingEx.get(original::roundtripStateSupplier);
+				}
 			}
-			equalityStateInternal = null;
-		} else {
-			equalityStateInternal = ThrowingEx.get(this::stateSupplier);
-			roundtripStateInternal = null;
+			out.defaultWriteObject();
 		}
-		out.defaultWriteObject();
-	}
 
-	private void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException {
-		in.defaultReadObject();
-	}
+		public FormatterStep rehydrate() {
+			try {
+				throw new Exception("rehydrate optimizeForEquality=" + optimizeForEquality + " orig=" + original + " cleaned=" + cleaned);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+			return original != null ? original : Objects.requireNonNull(cleaned, "how is clean null if this has been serialized?");
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o)
+				return true;
+			if (o == null || getClass() != o.getClass())
+				return false;
+			HackClone<?, ?> that = (HackClone<?, ?>) o;
+			return optimizeForEquality == that.optimizeForEquality && rehydrate().equals(that.rehydrate());
+		}
 
-	private void readObjectNoData() throws ObjectStreamException {
-		throw new UnsupportedOperationException();
+		@Override
+		public int hashCode() {
+			return rehydrate().hashCode() ^ Boolean.hashCode(optimizeForEquality);
+		}
 	}
 }
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
index 5e2fce2713..f54d4d20e7 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
@@ -17,7 +17,6 @@
 
 import java.io.File;
 import java.nio.charset.Charset;
-import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
@@ -150,17 +149,17 @@ public File getOutputDirectory() {
 		return outputDirectory;
 	}
 
-	private final List<FormatterStep> stepsInternalRoundtrip = new ConfigurationCacheHack.StepList(ConfigurationCacheHack.OptimizeFor.ROUNDTRIP);
-	private final List<FormatterStep> stepsInternalEquality = new ConfigurationCacheHack.StepList(ConfigurationCacheHack.OptimizeFor.EQUALITY);
+	private final ConfigurationCacheHack.StepList stepsInternalRoundtrip = new ConfigurationCacheHack.StepList(ConfigurationCacheHack.OptimizeFor.ROUNDTRIP);
+	private final ConfigurationCacheHack.StepList stepsInternalEquality = new ConfigurationCacheHack.StepList(ConfigurationCacheHack.OptimizeFor.EQUALITY);
 
 	@Internal
-	public List<FormatterStep> getStepsInternalRoundtrip() {
-		return Collections.unmodifiableList(stepsInternalRoundtrip);
+	public ConfigurationCacheHack.StepList getStepsInternalRoundtrip() {
+		return stepsInternalRoundtrip;
 	}
 
 	@Input
-	public List<FormatterStep> getStepsInternalEquality() {
-		return Collections.unmodifiableList(stepsInternalEquality);
+	public ConfigurationCacheHack.StepList getStepsInternalEquality() {
+		return stepsInternalEquality;
 	}
 
 	public void setSteps(List<FormatterStep> steps) {
@@ -187,7 +186,7 @@ Formatter buildFormatter() {
 				.lineEndingsPolicy(getLineEndingsPolicy().get())
 				.encoding(Charset.forName(encoding))
 				.rootDir(getProjectDir().get().getAsFile().toPath())
-				.steps(stepsInternalRoundtrip)
+				.steps(stepsInternalRoundtrip.getSteps())
 				.exceptionPolicy(exceptionPolicy)
 				.build();
 	}

From 90ca5bf7b1bb1db3224137d24d365093a72d14af Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sat, 12 Oct 2024 22:54:52 -0700
Subject: [PATCH 1832/2068] Cleanup.

---
 .../spotless/ConfigurationCacheHack.java      | 103 -----------------
 .../spotless/ConfigurationCacheHackList.java  | 107 ++++++++++++++++++
 .../FormatterStepSerializationRoundtrip.java  |  12 +-
 .../gradle/spotless/SpotlessTask.java         |  10 +-
 4 files changed, 119 insertions(+), 113 deletions(-)
 delete mode 100644 lib/src/main/java/com/diffplug/spotless/ConfigurationCacheHack.java
 create mode 100644 lib/src/main/java/com/diffplug/spotless/ConfigurationCacheHackList.java

diff --git a/lib/src/main/java/com/diffplug/spotless/ConfigurationCacheHack.java b/lib/src/main/java/com/diffplug/spotless/ConfigurationCacheHack.java
deleted file mode 100644
index 1544139a15..0000000000
--- a/lib/src/main/java/com/diffplug/spotless/ConfigurationCacheHack.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright 2024 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * Gradle requires three things:
- * - Gradle defines cache equality based on your serialized representation
- * - Combined with remote build cache, you cannot have any absolute paths in
- * your serialized representation
- * - Combined with configuration cache, you must be able to roundtrip yourself
- * through serialization
- *
- * These requirements are at odds with each other, as described in these issues
- * - Gradle issue to define custom equality
- * https://github.com/gradle/gradle/issues/29816
- * - Spotless plea for developer cache instead of configuration cache
- * https://github.com/diffplug/spotless/issues/987
- * - Spotless cache miss bug fixed by this class
- * https://github.com/diffplug/spotless/issues/2168
- *
- * The point of this class is to create containers which can optimize the
- * serialized representation for either
- * - roundtrip integrity
- * - equality
- *
- * It is a horrific hack, but it works, and it's the only way I can figure
- * to make Spotless work with all of Gradle's cache systems.
- */
-public class ConfigurationCacheHack {
-	public enum OptimizeFor {
-		ROUNDTRIP, EQUALITY,
-	}
-
-	public static class StepList implements java.io.Serializable {
-		private final boolean optimizeForEquality;
-		private final ArrayList<Object> backingList = new ArrayList<>();
-
-		public StepList(OptimizeFor optimizeFor) {
-			this.optimizeForEquality = optimizeFor == OptimizeFor.EQUALITY;
-		}
-
-		public void clear() {
-			backingList.clear();
-		}
-
-		public void addAll(Collection<? extends FormatterStep> c) {
-			for (FormatterStep step : c) {
-				if (step instanceof FormatterStepSerializationRoundtrip) {
-					var clone = ((FormatterStepSerializationRoundtrip) step).hackClone(optimizeForEquality);
-					backingList.add(clone);
-				} else {
-					backingList.add(step);
-				}
-			}
-		}
-
-		public List<FormatterStep> getSteps() {
-			var result = new ArrayList<FormatterStep>(backingList.size());
-			for (Object obj : backingList) {
-				if (obj instanceof FormatterStepSerializationRoundtrip.HackClone) {
-					result.add(((FormatterStepSerializationRoundtrip.HackClone) obj).rehydrate());
-				} else {
-					result.add((FormatterStep) obj);
-				}
-			}
-			return result;
-		}
-
-		@Override
-		public boolean equals(Object o) {
-			if (this == o)
-				return true;
-			if (o == null || getClass() != o.getClass())
-				return false;
-			StepList stepList = (StepList) o;
-			return optimizeForEquality == stepList.optimizeForEquality &&
-					backingList.equals(stepList.backingList);
-		}
-
-		@Override
-		public int hashCode() {
-			return Objects.hash(optimizeForEquality, backingList);
-		}
-	}
-}
diff --git a/lib/src/main/java/com/diffplug/spotless/ConfigurationCacheHackList.java b/lib/src/main/java/com/diffplug/spotless/ConfigurationCacheHackList.java
new file mode 100644
index 0000000000..ac2f344313
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/ConfigurationCacheHackList.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Gradle requires three things:
+ * - Gradle defines cache equality based on your serialized representation
+ * - Combined with remote build cache, you cannot have any absolute paths in
+ * your serialized representation
+ * - Combined with configuration cache, you must be able to roundtrip yourself
+ * through serialization
+ *
+ * These requirements are at odds with each other, as described in these issues
+ * - Gradle issue to define custom equality
+ * https://github.com/gradle/gradle/issues/29816
+ * - Spotless plea for developer cache instead of configuration cache
+ * https://github.com/diffplug/spotless/issues/987
+ * - Spotless cache miss bug fixed by this class
+ * https://github.com/diffplug/spotless/issues/2168
+ *
+ * This class is a `List<FormatterStep>` which can optimize the
+ * serialized representation for either
+ * - roundtrip integrity
+ * - OR
+ * - equality
+ *
+ * Because it is not possible to provide both at the same time.
+ * It is a horrific hack, but it works, and it's the only way I can figure
+ * to make Spotless work with all of Gradle's cache systems at once.
+ */
+public class ConfigurationCacheHackList implements java.io.Serializable {
+	private final boolean optimizeForEquality;
+	private final ArrayList<Object> backingList = new ArrayList<>();
+
+	public static ConfigurationCacheHackList forEquality() {
+		return new ConfigurationCacheHackList(true);
+	}
+
+	public static ConfigurationCacheHackList forRoundtrip() {
+		return new ConfigurationCacheHackList(false);
+	}
+
+	private ConfigurationCacheHackList(boolean optimizeForEquality) {
+		this.optimizeForEquality = optimizeForEquality;
+	}
+
+	public void clear() {
+		backingList.clear();
+	}
+
+	public void addAll(Collection<? extends FormatterStep> c) {
+		for (FormatterStep step : c) {
+			if (step instanceof FormatterStepSerializationRoundtrip) {
+				var clone = ((FormatterStepSerializationRoundtrip) step).hackClone(optimizeForEquality);
+				backingList.add(clone);
+			} else {
+				backingList.add(step);
+			}
+		}
+	}
+
+	public List<FormatterStep> getSteps() {
+		var result = new ArrayList<FormatterStep>(backingList.size());
+		for (Object obj : backingList) {
+			if (obj instanceof FormatterStepSerializationRoundtrip.HackClone) {
+				result.add(((FormatterStepSerializationRoundtrip.HackClone) obj).rehydrate());
+			} else {
+				result.add((FormatterStep) obj);
+			}
+		}
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o)
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
+		ConfigurationCacheHackList stepList = (ConfigurationCacheHackList) o;
+		return optimizeForEquality == stepList.optimizeForEquality &&
+				backingList.equals(stepList.backingList);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(optimizeForEquality, backingList);
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java b/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java
index 6f123f2237..edc8dd67c9 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java
@@ -66,6 +66,13 @@ protected FormatterFunc stateToFormatter(EqualityState equalityState) throws Exc
 		return new HackClone<>(this, optimizeForEquality);
 	}
 
+	/**
+	 * This class has one setting (optimizeForEquality) and two pieces of data
+	 * - the original step, which is marked transient so it gets discarded during serialization
+	 * - the cleaned step, which is lazily created during serialization, and the serialized form is optimized for either equality or roundtrip integrity
+	 *
+	 * It works in conjunction with ConfigurationCacheHackList to allow Spotless to work with all of Gradle's cache systems.
+	 */
 	static class HackClone<RoundtripState extends Serializable, EqualityState extends Serializable> implements Serializable {
 		transient FormatterStepSerializationRoundtrip<?, ?> original;
 		boolean optimizeForEquality;
@@ -90,11 +97,6 @@ private void writeObject(java.io.ObjectOutputStream out) throws IOException {
 		}
 
 		public FormatterStep rehydrate() {
-			try {
-				throw new Exception("rehydrate optimizeForEquality=" + optimizeForEquality + " orig=" + original + " cleaned=" + cleaned);
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
 			return original != null ? original : Objects.requireNonNull(cleaned, "how is clean null if this has been serialized?");
 		}
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
index f54d4d20e7..dc0ec744a8 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
@@ -35,7 +35,7 @@
 import org.gradle.api.tasks.PathSensitivity;
 import org.gradle.work.Incremental;
 
-import com.diffplug.spotless.ConfigurationCacheHack;
+import com.diffplug.spotless.ConfigurationCacheHackList;
 import com.diffplug.spotless.FormatExceptionPolicy;
 import com.diffplug.spotless.FormatExceptionPolicyStrict;
 import com.diffplug.spotless.Formatter;
@@ -149,16 +149,16 @@ public File getOutputDirectory() {
 		return outputDirectory;
 	}
 
-	private final ConfigurationCacheHack.StepList stepsInternalRoundtrip = new ConfigurationCacheHack.StepList(ConfigurationCacheHack.OptimizeFor.ROUNDTRIP);
-	private final ConfigurationCacheHack.StepList stepsInternalEquality = new ConfigurationCacheHack.StepList(ConfigurationCacheHack.OptimizeFor.EQUALITY);
+	private final ConfigurationCacheHackList stepsInternalRoundtrip = ConfigurationCacheHackList.forRoundtrip();
+	private final ConfigurationCacheHackList stepsInternalEquality = ConfigurationCacheHackList.forEquality();
 
 	@Internal
-	public ConfigurationCacheHack.StepList getStepsInternalRoundtrip() {
+	public ConfigurationCacheHackList getStepsInternalRoundtrip() {
 		return stepsInternalRoundtrip;
 	}
 
 	@Input
-	public ConfigurationCacheHack.StepList getStepsInternalEquality() {
+	public ConfigurationCacheHackList getStepsInternalEquality() {
 		return stepsInternalEquality;
 	}
 

From 90cb7bbe525047f9710e6735e55e6e014569a149 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 13 Oct 2024 00:39:59 -0700
Subject: [PATCH 1833/2068] Fix spotbugs.

---
 .../com/diffplug/spotless/ConfigurationCacheHackList.java    | 1 +
 .../spotless/FormatterStepSerializationRoundtrip.java        | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/lib/src/main/java/com/diffplug/spotless/ConfigurationCacheHackList.java b/lib/src/main/java/com/diffplug/spotless/ConfigurationCacheHackList.java
index ac2f344313..6bbc6ff2a6 100644
--- a/lib/src/main/java/com/diffplug/spotless/ConfigurationCacheHackList.java
+++ b/lib/src/main/java/com/diffplug/spotless/ConfigurationCacheHackList.java
@@ -47,6 +47,7 @@
  * to make Spotless work with all of Gradle's cache systems at once.
  */
 public class ConfigurationCacheHackList implements java.io.Serializable {
+	private static final long serialVersionUID = 1L;
 	private final boolean optimizeForEquality;
 	private final ArrayList<Object> backingList = new ArrayList<>();
 
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java b/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java
index edc8dd67c9..d2f0e4b5b5 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java
@@ -20,10 +20,12 @@
 import java.util.Objects;
 
 import edu.umd.cs.findbugs.annotations.Nullable;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 final class FormatterStepSerializationRoundtrip<RoundtripState extends Serializable, EqualityState extends Serializable> extends FormatterStepEqualityOnStateSerialization<EqualityState> {
 	private static final long serialVersionUID = 1L;
 	private final String name;
+	@SuppressFBWarnings(value = "SE_TRANSIENT_FIELD_NOT_RESTORED", justification = "HackClone")
 	private final transient ThrowingEx.Supplier<RoundtripState> initializer;
 	private @Nullable RoundtripState roundtripStateInternal;
 	private @Nullable EqualityState equalityStateInternal;
@@ -74,6 +76,8 @@ protected FormatterFunc stateToFormatter(EqualityState equalityState) throws Exc
 	 * It works in conjunction with ConfigurationCacheHackList to allow Spotless to work with all of Gradle's cache systems.
 	 */
 	static class HackClone<RoundtripState extends Serializable, EqualityState extends Serializable> implements Serializable {
+		private static final long serialVersionUID = 1L;
+		@SuppressFBWarnings(value = "SE_TRANSIENT_FIELD_NOT_RESTORED", justification = "HackClone")
 		transient FormatterStepSerializationRoundtrip<?, ?> original;
 		boolean optimizeForEquality;
 		@Nullable
@@ -84,6 +88,7 @@ static class HackClone<RoundtripState extends Serializable, EqualityState extend
 			this.optimizeForEquality = optimizeForEquality;
 		}
 
+		@SuppressFBWarnings(value = "NP_NONNULL_PARAM_VIOLATION", justification = "HackClone")
 		private void writeObject(java.io.ObjectOutputStream out) throws IOException {
 			if (cleaned == null) {
 				cleaned = new FormatterStepSerializationRoundtrip(original.name, null, original.equalityStateExtractor, original.equalityStateToFormatter);

From f524e9bd28bf6e24942013228c981be4309e7ca4 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 13 Oct 2024 01:21:29 -0700
Subject: [PATCH 1834/2068] We still need to trigger storing the roundtripState
 on writeObject.

---
 .../spotless/FormatterStepSerializationRoundtrip.java      | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java b/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java
index d2f0e4b5b5..81548bf759 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java
@@ -64,6 +64,13 @@ protected FormatterFunc stateToFormatter(EqualityState equalityState) throws Exc
 		return equalityStateToFormatter.apply(equalityState);
 	}
 
+	private void writeObject(java.io.ObjectOutputStream out) throws IOException {
+		if (roundtripStateInternal == null) {
+			roundtripStateInternal = ThrowingEx.get(this::roundtripStateSupplier);
+		}
+		out.defaultWriteObject();
+	}
+
 	HackClone<?, ?> hackClone(boolean optimizeForEquality) {
 		return new HackClone<>(this, optimizeForEquality);
 	}

From 06168eb5ab9e932aee31a0ac2ac25fee67f45475 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 15 Oct 2024 12:24:16 +0800
Subject: [PATCH 1835/2068] Update plugin com.github.spotbugs to v6.0.25
 (#2299)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index e6a0e171f9..5117d9ff1c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,7 +12,7 @@ plugins {
 	// https://github.com/gradle-nexus/publish-plugin/releases
 	id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
-	id 'com.github.spotbugs' version '6.0.24' apply false
+	id 'com.github.spotbugs' version '6.0.25' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
 	id 'com.diffplug.spotless-changelog' version '3.1.2' apply false
 	// https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md

From fe5b89f676544d6900c4d08ca49fabfa96e20e7a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 15 Oct 2024 13:56:17 +0000
Subject: [PATCH 1836/2068] Update dependency org.mockito:mockito-core to
 v5.14.2

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 16954d8a26..660a6a63a3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -31,4 +31,4 @@ VER_DURIAN=1.2.0
 VER_JGIT=6.10.0.202406032230-r
 VER_JUNIT=5.11.2
 VER_ASSERTJ=3.26.3
-VER_MOCKITO=5.14.1
+VER_MOCKITO=5.14.2

From c3252a28bf601c3bf8be69f69b85cce475f28165 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 15 Oct 2024 09:33:23 -0700
Subject: [PATCH 1837/2068] Fixup the writeObject for the new HackClone
 situation.

---
 .../diffplug/spotless/FormatterStepSerializationRoundtrip.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java b/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java
index 81548bf759..35167f04c6 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java
@@ -65,7 +65,7 @@ protected FormatterFunc stateToFormatter(EqualityState equalityState) throws Exc
 	}
 
 	private void writeObject(java.io.ObjectOutputStream out) throws IOException {
-		if (roundtripStateInternal == null) {
+		if (initializer != null && roundtripStateInternal == null) {
 			roundtripStateInternal = ThrowingEx.get(this::roundtripStateSupplier);
 		}
 		out.defaultWriteObject();

From 76c5bb36d932992309e25290a11298dfbaa532be Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 15 Oct 2024 09:46:41 -0700
Subject: [PATCH 1838/2068] Better comments / documentation.

---
 .../FormatterStepSerializationRoundtrip.java       | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java b/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java
index 35167f04c6..f7f95076c2 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java
@@ -65,8 +65,18 @@ protected FormatterFunc stateToFormatter(EqualityState equalityState) throws Exc
 	}
 
 	private void writeObject(java.io.ObjectOutputStream out) throws IOException {
-		if (initializer != null && roundtripStateInternal == null) {
-			roundtripStateInternal = ThrowingEx.get(this::roundtripStateSupplier);
+		if (initializer == null) {
+			// then this instance was created by Gradle's ConfigurationCacheHackList and the following will hold true
+			if (roundtripStateInternal == null && equalityStateInternal == null) {
+				throw new IllegalStateException("If the initializer was null, then one of roundtripStateInternal or equalityStateInternal should be non-null, and neither was");
+			}
+		} else {
+			// this was a normal instance, which means we need to encode to roundtripStateInternal (since the initializer might not be serializable)
+			// and there's no reason to keep equalityStateInternal since we can always recompute it
+			if (roundtripStateInternal == null) {
+				roundtripStateInternal = ThrowingEx.get(this::roundtripStateSupplier);
+			}
+			equalityStateInternal = null;
 		}
 		out.defaultWriteObject();
 	}

From bbf3abe3ffb8b0dc21059bbdcde0706a79d96b98 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 15 Oct 2024 10:00:42 -0700
Subject: [PATCH 1839/2068] Prepare to publish 7.0.0.BETA3

---
 gradle/changelog.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle/changelog.gradle b/gradle/changelog.gradle
index 5ec1dec22d..ecbf4c61b9 100644
--- a/gradle/changelog.gradle
+++ b/gradle/changelog.gradle
@@ -26,11 +26,11 @@ spotlessChangelog {
 	runAfterPush "gh release create ${kind}/{{version}} --title '${releaseTitle} v{{version}}' --notes-from-tag"
 
 	if (kind == 'gradle') {
-		forceNextVersion '7.0.0.BETA2'
+		forceNextVersion '7.0.0.BETA3'
 	} else if (kind == 'maven') {
-		forceNextVersion '2.44.0.BETA2'
+		forceNextVersion '2.44.0.BETA3'
 	} else {
-		forceNextVersion '3.0.0.BETA2'
+		forceNextVersion '3.0.0.BETA3'
 	}
 }
 

From 370c3cf57be365f5fc2b4f2147fae55185d79545 Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az1490-869.fv54ws4un3tuxk2tgyakhz5fka.ex.internal.cloudapp.net>
Date: Tue, 15 Oct 2024 17:03:49 +0000
Subject: [PATCH 1840/2068] Published lib/3.0.0.BETA3

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 59e030ca19..2fdec4e417 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [3.0.0.BETA3] - 2024-10-15
 ### Added
 * Support for `rdf` ([#2261](https://github.com/diffplug/spotless/pull/2261))
 * Support for `buf` on maven plugin ([#2291](https://github.com/diffplug/spotless/pull/2291))

From 1792735ef7fd95a50accc917c731e934a8ab0fa2 Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az1490-869.fv54ws4un3tuxk2tgyakhz5fka.ex.internal.cloudapp.net>
Date: Tue, 15 Oct 2024 17:05:41 +0000
Subject: [PATCH 1841/2068] Published gradle/7.0.0.BETA3

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 62 ++++++++++++++++++++--------------------
 2 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index ca759490a8..bc2a178278 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [7.0.0.BETA3] - 2024-10-15
 ### Added
 ### Changed
 * Use the Gradle user home directory by default for the download directory for the biome executable. Previously, the
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 370ff36141..bc7759439d 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -14,9 +14,9 @@ output = [
   ].join('\n');
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
-[![Changelog](https://img.shields.io/badge/changelog-7.0.0.BETA2-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-7.0.0.BETA3-blue.svg)](CHANGES.md)
 [![MavenCentral](https://img.shields.io/badge/mavencentral-here-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/index.html)
 
 [![VS Code plugin](https://img.shields.io/badge/IDE-VS_Code-blueviolet.svg)](https://marketplace.visualstudio.com/items?itemName=richardwillis.vscode-spotless-gradle)
 [![IntelliJ plugin](https://img.shields.io/badge/IDE-IntelliJ-blueviolet.svg)](https://plugins.jetbrains.com/plugin/18321-spotless-gradle)
@@ -130,10 +130,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -146,7 +146,7 @@ Spotless requires JRE 11+ and Gradle 6.1.1 or newer.
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -309,8 +309,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -365,8 +365,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -455,7 +455,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -487,7 +487,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -519,7 +519,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -555,7 +555,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ### buf
 
-`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
+`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
 
 **WARNING** this step **must** be the first step in the chain, steps before it will be ignored. Thumbs up [this issue](https://github.com/bufbuild/buf/issues/1035) for a resolution, see [here](https://github.com/diffplug/spotless/pull/1208#discussion_r1264439669) for more details on the problem.
 
@@ -587,7 +587,7 @@ buf {
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -608,7 +608,7 @@ spotless {
 
 ## Flexmark
 
-`com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/FlexmarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java)
+`com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FlexmarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java)
 
 [homepage](https://github.com/vsch/flexmark-java). Flexmark is a flexible Commonmark/Markdown parser that can be used to format Markdown files. It supports different [flavors of Markdown](https://github.com/vsch/flexmark-java#markdown-processor-emulation) and [many formatting options](https://github.com/vsch/flexmark-java/wiki/Markdown-Formatter#options).
 
@@ -627,7 +627,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -652,7 +652,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -690,7 +690,7 @@ sql.formatter.indent.size=4
 
 ## Maven POM
 
-`com.diffplug.gradle.spotless.PomExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/PomExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PomExtension.java)
+`com.diffplug.gradle.spotless.PomExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/PomExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PomExtension.java)
 
 ```gradle
 spotless {
@@ -739,7 +739,7 @@ spotless {
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -833,7 +833,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## Javascript
 
-- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
+- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
 
 ```gradle
 spotless {
@@ -896,7 +896,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -1016,7 +1016,7 @@ spotless {
 
 ## YAML
 
-- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
+- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
 
 ```gradle
 spotless {
@@ -1048,7 +1048,7 @@ spotless {
 
 ## Shell
 
-`com.diffplug.gradle.spotless.ShellExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/ShellExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ShellExtension.java)
+`com.diffplug.gradle.spotless.ShellExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/ShellExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ShellExtension.java)
 
 ```gradle
 spotless {
@@ -1084,7 +1084,7 @@ shfmt().pathToExe('/opt/homebrew/bin/shfmt')
 
 ## Gherkin
 
-- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
+- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
 
 ```gradle
 spotless {
@@ -1113,7 +1113,7 @@ spotless {
 
 ## CSS
 
-`com.diffplug.gradle.spotless.CssExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/CssExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CssExtension.java)
+`com.diffplug.gradle.spotless.CssExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/CssExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CssExtension.java)
 
 ```gradle
 spotless {
@@ -1514,7 +1514,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -1594,9 +1594,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -1629,11 +1629,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA2/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From 52312e32bf07d9b0e1ea2ff226cfb5a85a2dd5c1 Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az1490-869.fv54ws4un3tuxk2tgyakhz5fka.ex.internal.cloudapp.net>
Date: Tue, 15 Oct 2024 17:07:09 +0000
Subject: [PATCH 1842/2068] Published maven/2.44.0.BETA3

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 109278140d..4f11ab296a 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.44.0.BETA3] - 2024-10-15
 ### Added
 * Support for `rdf` ([#2261](https://github.com/diffplug/spotless/pull/2261))
 * Support for `buf` ([#2291](https://github.com/diffplug/spotless/pull/2291))
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 17dc8651e9..6b14c7717e 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -8,8 +8,8 @@ output = [
   ].join('\n');
 -->
 [![MavenCentral](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Changelog](https://img.shields.io/badge/changelog-2.44.0.BETA2-blue.svg)](CHANGES.md)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.44.0.BETA2/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.44.0.BETA3-blue.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.44.0.BETA3/index.html)
 <!---freshmark /shields -->
 
 <!---freshmark javadoc

From 7aac080646bd869220a7b44d965a6e79caddb061 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 15 Oct 2024 11:07:31 -0700
Subject: [PATCH 1843/2068] Missing PR# in the latest changelog.

---
 CHANGES.md               | 2 +-
 plugin-gradle/CHANGES.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 2fdec4e417..d8b90fa81b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,7 +15,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * Support for `rdf` ([#2261](https://github.com/diffplug/spotless/pull/2261))
 * Support for `buf` on maven plugin ([#2291](https://github.com/diffplug/spotless/pull/2291))
-* `ConfigurationCacheHack` so we can support Gradle's configuration cache and remote build cache at the same time. ([TODO]()fixes [#2168](https://github.com/diffplug/spotless/issues/2168))
+* `ConfigurationCacheHack` so we can support Gradle's configuration cache and remote build cache at the same time. ([#2298](https://github.com/diffplug/spotless/pull/2298) fixes [#2168](https://github.com/diffplug/spotless/issues/2168))
 ### Changed
 * Support configuring the Equo P2 cache. ([#2238](https://github.com/diffplug/spotless/pull/2238))
 * Add explicit support for JSONC / CSS via biome, via the file extensions `.css` and `.jsonc`. 
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index bc2a178278..fe3d1aa529 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -19,7 +19,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `cleanthat` version to latest `2.21` -> `2.22`. ([#2296](https://github.com/diffplug/spotless/pull/2296))
 ### Fixed
 * Java import order, ignore duplicate group entries. ([#2293](https://github.com/diffplug/spotless/pull/2293))
-* Remote build cache shouldn't have cache misses anymore. ([TODO]()fixes [#2168](https://github.com/diffplug/spotless/issues/2168))
+* Remote build cache shouldn't have cache misses anymore. ([#2298](https://github.com/diffplug/spotless/pull/2298) fixes [#2168](https://github.com/diffplug/spotless/issues/2168))
 
 ## [7.0.0.BETA2] - 2024-08-25
 ### Changed

From 5822660d42e6da2f440d85156fcc3f8cc7565475 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 15 Oct 2024 11:33:16 -0700
Subject: [PATCH 1844/2068] spotlessApply

---
 lib/src/main/java/com/diffplug/spotless/Formatter.java         | 3 +--
 .../com/diffplug/gradle/spotless/BiomeIntegrationTest.java     | 2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/Formatter.java b/lib/src/main/java/com/diffplug/spotless/Formatter.java
index ea9a38410b..4bc017a834 100644
--- a/lib/src/main/java/com/diffplug/spotless/Formatter.java
+++ b/lib/src/main/java/com/diffplug/spotless/Formatter.java
@@ -87,8 +87,7 @@ public static class Builder {
 		private Charset encoding;
 		private List<FormatterStep> steps;
 
-		private Builder() {
-		}
+		private Builder() {}
 
 		public Builder lineEndingsPolicy(LineEnding.Policy lineEndingsPolicy) {
 			this.lineEndingsPolicy = lineEndingsPolicy;
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java
index e3ae71392c..abf8d34fb0 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java
@@ -19,8 +19,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.io.IOException;
-
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.owasp.encoder.Encode;

From b6d4984b5208adc94add7831804d56e52a14e856 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 15 Oct 2024 18:37:17 +0000
Subject: [PATCH 1845/2068] Update plugin com.diffplug.spotless to v7.0.0.BETA3

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 5117d9ff1c..b5750e3b0d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-	id 'com.diffplug.spotless' version '7.0.0.BETA2' apply false
+	id 'com.diffplug.spotless' version '7.0.0.BETA3' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
 	id 'com.gradle.plugin-publish' version '1.3.0' apply false
 	// https://github.com/gradle-nexus/publish-plugin/releases

From d08f44202221c75b8df5cb1f4374f6b83d77b9b5 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 16 Oct 2024 15:17:02 -0700
Subject: [PATCH 1846/2068] Two maven tests which fail because errors are
 getting swallowed as lints.

---
 .../com/diffplug/spotless/maven/biome/BiomeMavenTest.java     | 4 ++++
 .../java/com/diffplug/spotless/maven/kotlin/KtlintTest.java   | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/biome/BiomeMavenTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/biome/BiomeMavenTest.java
index 5bb7424ef9..1e3d24da47 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/biome/BiomeMavenTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/biome/BiomeMavenTest.java
@@ -20,9 +20,11 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.owasp.encoder.Encode.forXml;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
+import com.diffplug.spotless.tag.ForLintRefactor;
 
 /**
  * Tests for the Biome formatter used via the Maven spotless plugin.
@@ -223,6 +225,8 @@ void failureWhenExeNotFound() throws Exception {
 	 * @throws Exception When a test failure occurs.
 	 */
 	@Test
+	@Disabled
+	@ForLintRefactor
 	void failureWhenNotParseable() throws Exception {
 		writePomWithBiomeSteps("**/*.js", "<biome><version>1.2.0</version><language>json</language></biome>");
 		setFile("biome_test.js").toResource("biome/js/fileBefore.js");
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
index 5586335449..2ece678533 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
@@ -17,10 +17,12 @@
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.ProcessRunner;
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
+import com.diffplug.spotless.tag.ForLintRefactor;
 
 class KtlintTest extends MavenIntegrationHarness {
 	@Test
@@ -78,6 +80,8 @@ void testSetEditorConfigCanOverrideEditorConfigFile() throws Exception {
 	}
 
 	@Test
+	@Disabled
+	@ForLintRefactor
 	void testWithCustomRuleSetApply() throws Exception {
 		writePomWithKotlinSteps("<ktlint>\n" +
 				"  <customRuleSets>\n" +

From 53e31f5325c35da619feec0c179334085a9a15fb Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 16 Oct 2024 15:29:43 -0700
Subject: [PATCH 1847/2068] Some gradle tests which fail because errors are
 getting swallowed as lints.

---
 .../com/diffplug/gradle/spotless/BiomeIntegrationTest.java   | 5 +++++
 .../com/diffplug/gradle/spotless/ErrorShouldRethrowTest.java | 4 ++++
 .../com/diffplug/gradle/spotless/KotlinExtensionTest.java    | 5 +++++
 3 files changed, 14 insertions(+)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java
index 8391a8757e..abf8d34fb0 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java
@@ -19,9 +19,12 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.owasp.encoder.Encode;
 
+import com.diffplug.spotless.tag.ForLintRefactor;
+
 class BiomeIntegrationTest extends GradleIntegrationHarness {
 	/**
 	 * Tests that biome can be used as a JSON formatting step, using biome 1.8.3
@@ -373,6 +376,8 @@ void failureWhenExeNotFound() throws Exception {
 	 * @throws Exception When a test failure occurs.
 	 */
 	@Test
+	@Disabled
+	@ForLintRefactor
 	void failureWhenNotParseable() throws Exception {
 		setFile("build.gradle").toLines(
 				"plugins {",
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrowTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrowTest.java
index 5dd435fd1a..5050ef93e4 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrowTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrowTest.java
@@ -62,6 +62,8 @@ void passesIfNoException() throws Exception {
 	}
 
 	@Test
+	@Disabled
+	@ForLintRefactor
 	void anyExceptionShouldFail() throws Exception {
 		writeBuild(
 				"    } // format",
@@ -111,6 +113,8 @@ void unlessExemptedByPath() throws Exception {
 	}
 
 	@Test
+	@Disabled
+	@ForLintRefactor
 	void failsIfNeitherStepNorFileExempted() throws Exception {
 		writeBuild(
 				"        ignoreErrorForStep 'nope'",
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
index ff39cea174..08a5f7279c 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
@@ -20,8 +20,11 @@
 import java.io.File;
 import java.io.IOException;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+import com.diffplug.spotless.tag.ForLintRefactor;
+
 class KotlinExtensionTest extends GradleIntegrationHarness {
 	private static final String HEADER = "// License Header";
 	private static final String HEADER_WITH_YEAR = "// License Header $YEAR";
@@ -167,6 +170,8 @@ void testSetEditorConfigCanOverrideEditorConfigFile() throws IOException {
 	}
 
 	@Test
+	@Disabled
+	@ForLintRefactor
 	void withCustomRuleSetApply() throws IOException {
 		setFile("build.gradle.kts").toLines(
 				"plugins {",

From 9af488072b69e97b129b5f01617f8a562fe785ed Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 16 Oct 2024 15:52:24 -0700
Subject: [PATCH 1848/2068] DirtyState now uses `LintPolicy.legacyBehavior`
 unless you passed in the `ValuePerStep` explicitly. That's enough to bring
 most of our tests back to life.

---
 lib/src/main/java/com/diffplug/spotless/DirtyState.java      | 5 ++++-
 .../com/diffplug/gradle/spotless/BiomeIntegrationTest.java   | 5 -----
 .../com/diffplug/gradle/spotless/KotlinExtensionTest.java    | 5 -----
 .../com/diffplug/spotless/maven/biome/BiomeMavenTest.java    | 4 ----
 .../java/com/diffplug/spotless/maven/kotlin/KtlintTest.java  | 4 ----
 5 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/DirtyState.java b/lib/src/main/java/com/diffplug/spotless/DirtyState.java
index a4f737a701..e3f2d8bcfe 100644
--- a/lib/src/main/java/com/diffplug/spotless/DirtyState.java
+++ b/lib/src/main/java/com/diffplug/spotless/DirtyState.java
@@ -78,7 +78,10 @@ public static DirtyState of(Formatter formatter, File file, byte[] rawBytes) {
 	}
 
 	public static DirtyState of(Formatter formatter, File file, byte[] rawBytes, String raw) {
-		return of(formatter, file, rawBytes, raw, new ValuePerStep<>(formatter));
+		var valuePerStep = new ValuePerStep<Throwable>(formatter);
+		DirtyState state = of(formatter, file, rawBytes, raw, valuePerStep);
+		LintPolicy.legacyBehavior(formatter, file, valuePerStep);
+		return state;
 	}
 
 	public static DirtyState of(Formatter formatter, File file, byte[] rawBytes, String raw, ValuePerStep<Throwable> exceptionPerStep) {
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java
index abf8d34fb0..8391a8757e 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java
@@ -19,12 +19,9 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.owasp.encoder.Encode;
 
-import com.diffplug.spotless.tag.ForLintRefactor;
-
 class BiomeIntegrationTest extends GradleIntegrationHarness {
 	/**
 	 * Tests that biome can be used as a JSON formatting step, using biome 1.8.3
@@ -376,8 +373,6 @@ void failureWhenExeNotFound() throws Exception {
 	 * @throws Exception When a test failure occurs.
 	 */
 	@Test
-	@Disabled
-	@ForLintRefactor
 	void failureWhenNotParseable() throws Exception {
 		setFile("build.gradle").toLines(
 				"plugins {",
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
index 08a5f7279c..ff39cea174 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
@@ -20,11 +20,8 @@
 import java.io.File;
 import java.io.IOException;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-import com.diffplug.spotless.tag.ForLintRefactor;
-
 class KotlinExtensionTest extends GradleIntegrationHarness {
 	private static final String HEADER = "// License Header";
 	private static final String HEADER_WITH_YEAR = "// License Header $YEAR";
@@ -170,8 +167,6 @@ void testSetEditorConfigCanOverrideEditorConfigFile() throws IOException {
 	}
 
 	@Test
-	@Disabled
-	@ForLintRefactor
 	void withCustomRuleSetApply() throws IOException {
 		setFile("build.gradle.kts").toLines(
 				"plugins {",
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/biome/BiomeMavenTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/biome/BiomeMavenTest.java
index 1e3d24da47..5bb7424ef9 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/biome/BiomeMavenTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/biome/BiomeMavenTest.java
@@ -20,11 +20,9 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.owasp.encoder.Encode.forXml;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
-import com.diffplug.spotless.tag.ForLintRefactor;
 
 /**
  * Tests for the Biome formatter used via the Maven spotless plugin.
@@ -225,8 +223,6 @@ void failureWhenExeNotFound() throws Exception {
 	 * @throws Exception When a test failure occurs.
 	 */
 	@Test
-	@Disabled
-	@ForLintRefactor
 	void failureWhenNotParseable() throws Exception {
 		writePomWithBiomeSteps("**/*.js", "<biome><version>1.2.0</version><language>json</language></biome>");
 		setFile("biome_test.js").toResource("biome/js/fileBefore.js");
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
index 2ece678533..5586335449 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
@@ -17,12 +17,10 @@
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.ProcessRunner;
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
-import com.diffplug.spotless.tag.ForLintRefactor;
 
 class KtlintTest extends MavenIntegrationHarness {
 	@Test
@@ -80,8 +78,6 @@ void testSetEditorConfigCanOverrideEditorConfigFile() throws Exception {
 	}
 
 	@Test
-	@Disabled
-	@ForLintRefactor
 	void testWithCustomRuleSetApply() throws Exception {
 		writePomWithKotlinSteps("<ktlint>\n" +
 				"  <customRuleSets>\n" +

From dfca397aabf8bc1da4d0c19d02fd0b7f15755377 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 16 Oct 2024 21:46:34 -0700
Subject: [PATCH 1849/2068] Rework SpotlessTask to use `LintState` so that we
 can know which step is failing and properly use the
 `FormatExceptionPolicyStrict`.

---
 .../com/diffplug/spotless/DirtyState.java     |  2 +-
 .../main/java/com/diffplug/spotless/Lint.java | 10 ++++
 .../java/com/diffplug/spotless/LintState.java | 13 ++++-
 .../gradle/spotless/FormatExtension.java      |  3 +-
 .../gradle/spotless/SpotlessTask.java         |  8 +++
 .../gradle/spotless/SpotlessTaskImpl.java     | 52 ++++++++++++-------
 .../spotless/ErrorShouldRethrowTest.java      | 21 ++------
 .../spotless/tag/ForLintRefactor.java         | 30 -----------
 8 files changed, 70 insertions(+), 69 deletions(-)
 delete mode 100644 testlib/src/main/java/com/diffplug/spotless/tag/ForLintRefactor.java

diff --git a/lib/src/main/java/com/diffplug/spotless/DirtyState.java b/lib/src/main/java/com/diffplug/spotless/DirtyState.java
index e3f2d8bcfe..964cd102e1 100644
--- a/lib/src/main/java/com/diffplug/spotless/DirtyState.java
+++ b/lib/src/main/java/com/diffplug/spotless/DirtyState.java
@@ -84,7 +84,7 @@ public static DirtyState of(Formatter formatter, File file, byte[] rawBytes, Str
 		return state;
 	}
 
-	public static DirtyState of(Formatter formatter, File file, byte[] rawBytes, String raw, ValuePerStep<Throwable> exceptionPerStep) {
+	static DirtyState of(Formatter formatter, File file, byte[] rawBytes, String raw, ValuePerStep<Throwable> exceptionPerStep) {
 		// check that all characters were encodable
 		String encodingError = EncodingErrorMsg.msg(raw, rawBytes, formatter.getEncoding());
 		if (encodingError != null) {
diff --git a/lib/src/main/java/com/diffplug/spotless/Lint.java b/lib/src/main/java/com/diffplug/spotless/Lint.java
index 81fcefc964..b35c0ea32f 100644
--- a/lib/src/main/java/com/diffplug/spotless/Lint.java
+++ b/lib/src/main/java/com/diffplug/spotless/Lint.java
@@ -27,6 +27,16 @@
  * to Spotless, then it is by definition.
  */
 public final class Lint implements Serializable {
+	/** Returns a runtime exception which, if thrown, will lint the entire file. */
+	public static ShortcutException entireFile(String code, String msg) {
+		return new ShortcutException(Lint.create(code, msg, -1));
+	}
+
+	/** Returns a runtime exception which, if thrown, will lint a specific line. */
+	public static ShortcutException atLine(int line, String code, String msg) {
+		return new ShortcutException(Lint.create(code, msg, line));
+	}
+
 	/** Any exception which implements this interface will have its lints extracted and reported cleanly to the user. */
 	public interface Has {
 		List<Lint> getLints();
diff --git a/lib/src/main/java/com/diffplug/spotless/LintState.java b/lib/src/main/java/com/diffplug/spotless/LintState.java
index 95254a923e..90b363c81a 100644
--- a/lib/src/main/java/com/diffplug/spotless/LintState.java
+++ b/lib/src/main/java/com/diffplug/spotless/LintState.java
@@ -41,6 +41,10 @@ public boolean isHasLints() {
 		return lintsPerStep != null;
 	}
 
+	public boolean isClean() {
+		return dirtyState.isClean() && !isHasLints();
+	}
+
 	public Map<FormatterStep, List<Lint>> getLints(Formatter formatter) {
 		if (lintsPerStep == null) {
 			throw new IllegalStateException("Check `isHasLints` first!");
@@ -137,7 +141,7 @@ public static LintState of(Formatter formatter, File file, byte[] rawBytes) {
 			List<Lint> lintsForStep;
 			if (exceptionForLint instanceof Lint.Has) {
 				lintsForStep = ((Lint.Has) exceptionForLint).getLints();
-			} else if (exceptionForLint != null) {
+			} else if (exceptionForLint != null && exceptionForLint != formatStepCausedNoChange()) {
 				lintsForStep = List.of(Lint.createFromThrowable(step, toLint, exceptionForLint));
 			} else {
 				lintsForStep = List.of();
@@ -149,6 +153,13 @@ public static LintState of(Formatter formatter, File file, byte[] rawBytes) {
 		return new LintState(dirty, lints.indexOfFirstValue() == -1 ? null : lints);
 	}
 
+	/** Returns the DirtyState which corresponds to {@code isClean()}. */
+	public static LintState clean() {
+		return isClean;
+	}
+
+	private static final LintState isClean = new LintState(DirtyState.clean(), null);
+
 	static Throwable formatStepCausedNoChange() {
 		return FormatterCausedNoChange.INSTANCE;
 	}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index ac1b3c42a5..2dfd44506d 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -339,7 +339,8 @@ private static void relativizeIfSubdir(List<String> relativePaths, File root, Fi
 		if (!destPath.startsWith(rootPath)) {
 			return null;
 		} else {
-			return destPath.substring(rootPath.length());
+			String relativized = destPath.substring(rootPath.length());
+			return relativized.startsWith("/") ? relativized.substring(1) : relativized;
 		}
 	}
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
index e1e729e852..005920b8a6 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
@@ -157,6 +157,14 @@ public File getOutputDirectory() {
 		return outputDirectory;
 	}
 
+	protected File lintDirectory = new File(getProject().getLayout().getBuildDirectory().getAsFile().get(),
+			"spotless-lint/" + getName());
+
+	@OutputDirectory
+	public File getLintDirectory() {
+		return lintDirectory;
+	}
+
 	private final ConfigurationCacheHackList stepsInternalRoundtrip = ConfigurationCacheHackList.forRoundtrip();
 	private final ConfigurationCacheHackList stepsInternalEquality = ConfigurationCacheHackList.forEquality();
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
index b7586f742b..1d8dd114bf 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
@@ -20,6 +20,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
+import java.util.List;
 
 import javax.annotation.Nullable;
 import javax.inject.Inject;
@@ -37,8 +38,8 @@
 
 import com.diffplug.common.annotations.VisibleForTesting;
 import com.diffplug.common.base.StringPrinter;
-import com.diffplug.spotless.DirtyState;
 import com.diffplug.spotless.Formatter;
+import com.diffplug.spotless.LintState;
 import com.diffplug.spotless.extra.GitRatchet;
 
 @CacheableTask
@@ -83,7 +84,7 @@ public void performAction(InputChanges inputs) throws Exception {
 			for (FileChange fileChange : inputs.getFileChanges(target)) {
 				File input = fileChange.getFile();
 				if (fileChange.getChangeType() == ChangeType.REMOVED) {
-					deletePreviousResult(input);
+					deletePreviousResults(input);
 				} else {
 					if (input.isFile()) {
 						processInputFile(ratchet, formatter, input);
@@ -95,24 +96,23 @@ public void performAction(InputChanges inputs) throws Exception {
 
 	@VisibleForTesting
 	void processInputFile(@Nullable GitRatchet ratchet, Formatter formatter, File input) throws IOException {
-		File output = getOutputFile(input);
+		File output = getOutputFileWithBaseDir(input, outputDirectory);
+		File lint = getOutputFileWithBaseDir(input, lintDirectory);
 		getLogger().debug("Applying format to {} and writing to {}", input, output);
-		DirtyState dirtyState;
+		LintState lintState;
 		if (ratchet != null && ratchet.isClean(getProjectDir().get().getAsFile(), getRootTreeSha(), input)) {
-			dirtyState = DirtyState.clean();
+			lintState = LintState.clean();
 		} else {
 			try {
-				dirtyState = DirtyState.of(formatter, input);
-			} catch (IOException e) {
-				throw new IOException("Issue processing file: " + input, e);
-			} catch (RuntimeException e) {
+				lintState = LintState.of(formatter, input);
+			} catch (Throwable e) {
 				throw new IllegalArgumentException("Issue processing file: " + input, e);
 			}
 		}
-		if (dirtyState.isClean()) {
+		if (lintState.getDirtyState().isClean()) {
 			// Remove previous output if it exists
 			Files.deleteIfExists(output.toPath());
-		} else if (dirtyState.didNotConverge()) {
+		} else if (lintState.getDirtyState().didNotConverge()) {
 			getLogger().warn("Skipping '{}' because it does not converge.  Run {@code spotlessDiagnose} to understand why", input);
 		} else {
 			Path parentDir = output.toPath().getParent();
@@ -124,20 +124,32 @@ void processInputFile(@Nullable GitRatchet ratchet, Formatter formatter, File in
 			Files.copy(input.toPath(), output.toPath(), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.COPY_ATTRIBUTES);
 
 			getLogger().info(String.format("Writing clean file: %s", output));
-			dirtyState.writeCanonicalTo(output);
+			lintState.getDirtyState().writeCanonicalTo(output);
+		}
+		if (lintState.isHasLints()) {
+			var lints = lintState.getLints(formatter);
+			var first = lints.entrySet().iterator().next();
+			getExceptionPolicy().handleError(new Throwable(first.getValue().get(0).toString()), first.getKey(), FormatExtension.relativize(getProjectDir().get().getAsFile(), input));
+			//			Files.createDirectories(lint.toPath().getParent());
+			//			Files.write(lint.toPath(), lintState.asString().getBytes());
+		} else {
+			Files.deleteIfExists(lint.toPath());
 		}
 	}
 
-	private void deletePreviousResult(File input) throws IOException {
-		File output = getOutputFile(input);
-		if (output.isDirectory()) {
-			getFs().delete(d -> d.delete(output));
-		} else {
-			Files.deleteIfExists(output.toPath());
+	private void deletePreviousResults(File input) throws IOException {
+		File output = getOutputFileWithBaseDir(input, outputDirectory);
+		File lint = getOutputFileWithBaseDir(input, lintDirectory);
+		for (File file : List.of(output, lint)) {
+			if (file.isDirectory()) {
+				getFs().delete(d -> d.delete(file));
+			} else {
+				Files.deleteIfExists(file.toPath());
+			}
 		}
 	}
 
-	private File getOutputFile(File input) {
+	private File getOutputFileWithBaseDir(File input, File baseDir) {
 		File projectDir = getProjectDir().get().getAsFile();
 		String outputFileName = FormatExtension.relativize(projectDir, input);
 		if (outputFileName == null) {
@@ -147,6 +159,6 @@ private File getOutputFile(File input) {
 				printer.println("       target: " + input.getAbsolutePath());
 			}));
 		}
-		return new File(outputDirectory, outputFileName);
+		return new File(baseDir, outputFileName);
 	}
 }
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrowTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrowTest.java
index 5050ef93e4..0d99c6bd5d 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrowTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrowTest.java
@@ -23,13 +23,11 @@
 import org.assertj.core.api.Assertions;
 import org.gradle.testkit.runner.BuildResult;
 import org.gradle.testkit.runner.TaskOutcome;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.common.base.CharMatcher;
 import com.diffplug.common.base.Splitter;
 import com.diffplug.spotless.LineEnding;
-import com.diffplug.spotless.tag.ForLintRefactor;
 
 /** Tests the desired behavior from https://github.com/diffplug/spotless/issues/46. */
 class ErrorShouldRethrowTest extends GradleIntegrationHarness {
@@ -45,7 +43,7 @@ private void writeBuild(String... toInsert) throws IOException {
 		lines.add("        target file('README.md')");
 		lines.add("        custom 'no swearing', {");
 		lines.add("             if (it.toLowerCase(Locale.ROOT).contains('fubar')) {");
-		lines.add("                 throw new RuntimeException('No swearing!');");
+		lines.add("                 throw com.diffplug.spotless.Lint.entireFile('swearing', 'No swearing!');");
 		lines.add("             }");
 		lines.add("        }");
 		lines.addAll(Arrays.asList(toInsert));
@@ -62,8 +60,6 @@ void passesIfNoException() throws Exception {
 	}
 
 	@Test
-	@Disabled
-	@ForLintRefactor
 	void anyExceptionShouldFail() throws Exception {
 		writeBuild(
 				"    } // format",
@@ -72,8 +68,8 @@ void anyExceptionShouldFail() throws Exception {
 		runWithFailure(
 				"> Task :spotlessMisc FAILED\n" +
 						"Step 'no swearing' found problem in 'README.md':\n" +
-						"No swearing!\n" +
-						"java.lang.RuntimeException: No swearing!");
+						"-1: (swearing) No swearing!\n" +
+						"java.lang.Throwable: -1: (swearing) No swearing!");
 	}
 
 	@Test
@@ -86,9 +82,6 @@ void unlessEnforceCheckIsFalse() throws Exception {
 		runWithSuccess("> Task :processResources NO-SOURCE");
 	}
 
-	@Disabled
-	@ForLintRefactor
-	@Test
 	void unlessExemptedByStep() throws Exception {
 		writeBuild(
 				"        ignoreErrorForStep 'no swearing'",
@@ -99,8 +92,6 @@ void unlessExemptedByStep() throws Exception {
 				"Unable to apply step 'no swearing' to 'README.md'");
 	}
 
-	@Disabled
-	@ForLintRefactor
 	@Test
 	void unlessExemptedByPath() throws Exception {
 		writeBuild(
@@ -113,8 +104,6 @@ void unlessExemptedByPath() throws Exception {
 	}
 
 	@Test
-	@Disabled
-	@ForLintRefactor
 	void failsIfNeitherStepNorFileExempted() throws Exception {
 		writeBuild(
 				"        ignoreErrorForStep 'nope'",
@@ -124,8 +113,8 @@ void failsIfNeitherStepNorFileExempted() throws Exception {
 		setFile("README.md").toContent("This code is fubar.");
 		runWithFailure("> Task :spotlessMisc FAILED\n" +
 				"Step 'no swearing' found problem in 'README.md':\n" +
-				"No swearing!\n" +
-				"java.lang.RuntimeException: No swearing!");
+				"-1: (swearing) No swearing!\n" +
+				"java.lang.Throwable: -1: (swearing) No swearing!");
 	}
 
 	private void runWithSuccess(String expectedToStartWith) throws Exception {
diff --git a/testlib/src/main/java/com/diffplug/spotless/tag/ForLintRefactor.java b/testlib/src/main/java/com/diffplug/spotless/tag/ForLintRefactor.java
deleted file mode 100644
index a6ac9b090b..0000000000
--- a/testlib/src/main/java/com/diffplug/spotless/tag/ForLintRefactor.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2021-2024 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.tag;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import org.junit.jupiter.api.Tag;
-
-@Target({TYPE, METHOD})
-@Retention(RUNTIME)
-@Tag("black")
-public @interface ForLintRefactor {}

From 29cba64047d47fd193d2cdcc91d7e54dfb157c0f Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 16 Oct 2024 21:54:32 -0700
Subject: [PATCH 1850/2068] We don't need to move lints to their own place
 *yet*.

---
 .../diffplug/gradle/spotless/SpotlessTask.java  |  8 --------
 .../gradle/spotless/SpotlessTaskImpl.java       | 17 ++++-------------
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
index 005920b8a6..e1e729e852 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
@@ -157,14 +157,6 @@ public File getOutputDirectory() {
 		return outputDirectory;
 	}
 
-	protected File lintDirectory = new File(getProject().getLayout().getBuildDirectory().getAsFile().get(),
-			"spotless-lint/" + getName());
-
-	@OutputDirectory
-	public File getLintDirectory() {
-		return lintDirectory;
-	}
-
 	private final ConfigurationCacheHackList stepsInternalRoundtrip = ConfigurationCacheHackList.forRoundtrip();
 	private final ConfigurationCacheHackList stepsInternalEquality = ConfigurationCacheHackList.forEquality();
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
index 1d8dd114bf..17cd6c08a1 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
@@ -20,7 +20,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
-import java.util.List;
 
 import javax.annotation.Nullable;
 import javax.inject.Inject;
@@ -97,7 +96,6 @@ public void performAction(InputChanges inputs) throws Exception {
 	@VisibleForTesting
 	void processInputFile(@Nullable GitRatchet ratchet, Formatter formatter, File input) throws IOException {
 		File output = getOutputFileWithBaseDir(input, outputDirectory);
-		File lint = getOutputFileWithBaseDir(input, lintDirectory);
 		getLogger().debug("Applying format to {} and writing to {}", input, output);
 		LintState lintState;
 		if (ratchet != null && ratchet.isClean(getProjectDir().get().getAsFile(), getRootTreeSha(), input)) {
@@ -130,22 +128,15 @@ void processInputFile(@Nullable GitRatchet ratchet, Formatter formatter, File in
 			var lints = lintState.getLints(formatter);
 			var first = lints.entrySet().iterator().next();
 			getExceptionPolicy().handleError(new Throwable(first.getValue().get(0).toString()), first.getKey(), FormatExtension.relativize(getProjectDir().get().getAsFile(), input));
-			//			Files.createDirectories(lint.toPath().getParent());
-			//			Files.write(lint.toPath(), lintState.asString().getBytes());
-		} else {
-			Files.deleteIfExists(lint.toPath());
 		}
 	}
 
 	private void deletePreviousResults(File input) throws IOException {
 		File output = getOutputFileWithBaseDir(input, outputDirectory);
-		File lint = getOutputFileWithBaseDir(input, lintDirectory);
-		for (File file : List.of(output, lint)) {
-			if (file.isDirectory()) {
-				getFs().delete(d -> d.delete(file));
-			} else {
-				Files.deleteIfExists(file.toPath());
-			}
+		if (output.isDirectory()) {
+			getFs().delete(d -> d.delete(output));
+		} else {
+			Files.deleteIfExists(output.toPath());
 		}
 	}
 

From 43cd94b5b577696311ccb71010fa015e10b59f90 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 16 Oct 2024 22:06:37 -0700
Subject: [PATCH 1851/2068] Make an explicit constant for a lint at an
 undefined line.

---
 .../main/java/com/diffplug/spotless/Lint.java | 19 +++++++++++++++----
 .../spotless/ErrorShouldRethrowTest.java      | 10 +++++-----
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/Lint.java b/lib/src/main/java/com/diffplug/spotless/Lint.java
index b35c0ea32f..4708c27a2c 100644
--- a/lib/src/main/java/com/diffplug/spotless/Lint.java
+++ b/lib/src/main/java/com/diffplug/spotless/Lint.java
@@ -27,9 +27,9 @@
  * to Spotless, then it is by definition.
  */
 public final class Lint implements Serializable {
-	/** Returns a runtime exception which, if thrown, will lint the entire file. */
-	public static ShortcutException entireFile(String code, String msg) {
-		return new ShortcutException(Lint.create(code, msg, -1));
+	/** Returns a runtime exception which, if thrown, will create a lint at an undefined line. */
+	public static ShortcutException atUndefinedLine(String code, String msg) {
+		return new ShortcutException(Lint.create(code, msg, LINE_UNDEFINED));
 	}
 
 	/** Returns a runtime exception which, if thrown, will lint a specific line. */
@@ -37,6 +37,11 @@ public static ShortcutException atLine(int line, String code, String msg) {
 		return new ShortcutException(Lint.create(code, msg, line));
 	}
 
+	/** Returns a runtime exception which, if thrown, will lint a specific line range. */
+	public static ShortcutException atLineRange(int lineStart, int lineEnd, String code, String msg) {
+		return new ShortcutException(Lint.create(code, msg, lineStart, lineEnd));
+	}
+
 	/** Any exception which implements this interface will have its lints extracted and reported cleanly to the user. */
 	public interface Has {
 		List<Lint> getLints();
@@ -103,7 +108,11 @@ public String getMsg() {
 	@Override
 	public String toString() {
 		if (lineStart == lineEnd) {
-			return lineStart + ": (" + code + ") " + msg;
+			if (lineStart == LINE_UNDEFINED) {
+				return "LINE_UNDEFINED: (" + code + ") " + msg;
+			} else {
+				return lineStart + ": (" + code + ") " + msg;
+			}
 		} else {
 			return lineStart + "-" + lineEnd + ": (" + code + ") " + msg;
 		}
@@ -163,4 +172,6 @@ private static String msgFrom(String message) {
 		}
 		return "";
 	}
+
+	public static final int LINE_UNDEFINED = -1;
 }
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrowTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrowTest.java
index 0d99c6bd5d..f425743bf0 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrowTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrowTest.java
@@ -43,7 +43,7 @@ private void writeBuild(String... toInsert) throws IOException {
 		lines.add("        target file('README.md')");
 		lines.add("        custom 'no swearing', {");
 		lines.add("             if (it.toLowerCase(Locale.ROOT).contains('fubar')) {");
-		lines.add("                 throw com.diffplug.spotless.Lint.entireFile('swearing', 'No swearing!');");
+		lines.add("                 throw com.diffplug.spotless.Lint.atUndefinedLine('swearing', 'No swearing!');");
 		lines.add("             }");
 		lines.add("        }");
 		lines.addAll(Arrays.asList(toInsert));
@@ -68,8 +68,8 @@ void anyExceptionShouldFail() throws Exception {
 		runWithFailure(
 				"> Task :spotlessMisc FAILED\n" +
 						"Step 'no swearing' found problem in 'README.md':\n" +
-						"-1: (swearing) No swearing!\n" +
-						"java.lang.Throwable: -1: (swearing) No swearing!");
+						"LINE_UNDEFINED: (swearing) No swearing!\n" +
+						"java.lang.Throwable: LINE_UNDEFINED: (swearing) No swearing!");
 	}
 
 	@Test
@@ -113,8 +113,8 @@ void failsIfNeitherStepNorFileExempted() throws Exception {
 		setFile("README.md").toContent("This code is fubar.");
 		runWithFailure("> Task :spotlessMisc FAILED\n" +
 				"Step 'no swearing' found problem in 'README.md':\n" +
-				"-1: (swearing) No swearing!\n" +
-				"java.lang.Throwable: -1: (swearing) No swearing!");
+				"LINE_UNDEFINED: (swearing) No swearing!\n" +
+				"java.lang.Throwable: LINE_UNDEFINED: (swearing) No swearing!");
 	}
 
 	private void runWithSuccess(String expectedToStartWith) throws Exception {

From 6619a769d2cd8b52c3d0f2fe1a8f43621ccc8221 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 16 Oct 2024 22:22:55 -0700
Subject: [PATCH 1852/2068] Fix windows.

---
 .../main/java/com/diffplug/gradle/spotless/FormatExtension.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index 2dfd44506d..efb3b45bdf 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -340,7 +340,7 @@ private static void relativizeIfSubdir(List<String> relativePaths, File root, Fi
 			return null;
 		} else {
 			String relativized = destPath.substring(rootPath.length());
-			return relativized.startsWith("/") ? relativized.substring(1) : relativized;
+			return relativized.startsWith("/") || relativized.startsWith("\\") ? relativized.substring(1) : relativized;
 		}
 	}
 

From a9bd0a60cac0f127188dbeec8d9ba2bafb996fed Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 16 Oct 2024 22:30:35 -0700
Subject: [PATCH 1853/2068] Update changelog.

---
 CHANGES.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 69bbaa1fd2..853601237b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,15 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* APIs to support linting. (implemented in [#2148](https://github.com/diffplug/spotless/pull/2148) and [#2149](https://github.com/diffplug/spotless/pull/2149))
+  * Spotless is still primarily a formatter, not a linter. But when formatting fails, it's more flexible to model those failures as lints so that the formatting can continue and ideally we can also capture the line numbers causing the failure.
+  * `Lint` models a single change. A `FormatterStep` can create a lint by:
+    * throwing an exception during formatting, ideally `throw Lint.atLine(127, "code", "Well what happened was...")`
+    * or by implementing the `List<Lint> lint(String content, File file)` method to create multiple of them
+### Changes
+* **BREAKING** Moved `PaddedCell.DirtyState` to its own top-level class with new methods. ([#2148](https://github.com/diffplug/spotless/pull/2148))
+  * **BREAKING** Removed `isClean`, `applyTo`, and `applyToAndReturnResultIfDirty` from `Formatter` because users should instead use `DirtyState`.
 
 ## [3.0.0.BETA3] - 2024-10-15
 ### Added

From 6c480d8030c6f049690d35ff096e3732ef021a89 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 16 Oct 2024 22:38:22 -0700
Subject: [PATCH 1854/2068] Add info to CONTRIBUTING

---
 CONTRIBUTING.md | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e667955542..0ee619f680 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -93,7 +93,6 @@ Here's a checklist for creating a new step for Spotless:
 - [ ] Class name ends in Step, `SomeNewStep`.
 - [ ] Class has a public static method named `create` that returns a `FormatterStep`.
 - [ ] Has a test class named `SomeNewStepTest` that uses `StepHarness` or `StepHarnessWithFile` to test the step.
-  - [ ] Start with `StepHarness.forStep(myStep).supportsRoundTrip(false)`, and then add round trip support as described in the next section. 
 - [ ] Test class has test methods to verify behavior.
 - [ ] Test class has a test method `equality()` which tests equality using `StepEqualityTester` (see existing methods for examples).
 
@@ -137,6 +136,15 @@ There are many great formatters (prettier, clang-format, black, etc.) which live
 
 Because of Spotless' up-to-date checking and [git ratcheting](https://github.com/diffplug/spotless/tree/main/plugin-gradle#ratchet), Spotless actually doesn't have to call formatters very often, so even an expensive shell call for every single invocation isn't that bad.  Anything that works is better than nothing, and we can always speed things up later if it feels too slow (but it probably won't).
 
+## Lints
+
+Spotless is primarily a formatter, not a linter. But, if something goes wrong during formatting, it's better to model that as a lint with line numbers rather than just a naked exception. There are two ways to go about this:
+
+- at any point during the formatting process, you can throw a `Lint.atLine(int line, ...)` exception. This will be caught and turned into a lint.
+- or you can override the `default List<Lint> lint(String content, File file)` method. This method will only run if the step did not already throw an exception.
+
+Don't go lint crazy! By default, all lints are build failures. Users have to suppress them explicitly if they want to continue.
+
 ## How to add a new plugin for a build system
 
 The gist of it is that you will have to:

From 8916121fd91780ac2d06d66b6edb0153907ffff1 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 16 Oct 2024 23:08:12 -0700
Subject: [PATCH 1855/2068] The KtLint formatters were reading from the `File`
 instead of the `String`, which clobbers the work of earlier steps.

---
 .../ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java |  5 +++--
 .../ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java | 12 ++++++++++--
 .../ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java | 12 ++++++++++--
 .../ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java  | 12 ++++++++++--
 .../glue/ktlint/compat/KtLintCompatAdapter.java      |  5 +++--
 .../spotless/glue/ktlint/KtlintFormatterFunc.java    |  5 +++--
 6 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
index 32ef497de8..78bd28f86b 100644
--- a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -74,6 +74,7 @@ public Unit invoke(LintError lint, Boolean corrected) {
 
 	@Override
 	public String format(
+			String unix,
 			Path path,
 			Path editorConfigPath,
 			Map<String, Object> editorConfigOverrideMap) {
@@ -105,7 +106,7 @@ public String format(
 				editorConfig,
 				editorConfigOverride,
 				false)
-				.format(path, formatterCallback);
+				.format(unix, path, formatterCallback);
 	}
 
 	/**
diff --git a/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java b/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
index 00c6744b4c..fcd456e648 100644
--- a/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
@@ -15,6 +15,7 @@
  */
 package com.diffplug.spotless.glue.ktlint.compat;
 
+import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.nio.file.Files;
@@ -121,9 +122,10 @@ public Unit invoke(LintError lint, Boolean corrected) {
 
 	@Override
 	public String format(
+			String unix,
 			Path path,
 			Path editorConfigPath,
-			Map<String, Object> editorConfigOverrideMap) {
+			Map<String, Object> editorConfigOverrideMap) throws NoSuchFieldException, IllegalAccessException {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		Set<RuleProvider> allRuleProviders = ServiceLoader.load(RuleSetProviderV3.class, RuleSetProviderV3.class.getClassLoader())
@@ -146,13 +148,19 @@ public String format(
 			editorConfig = EditorConfigDefaults.Companion.load(editorConfigPath, RuleProviderKt.propertyTypes(allRuleProviders));
 		}
 
+		// create Code and then set the content to match previous steps in the Spotless pipeline
+		Code code = Code.Companion.fromPath(path);
+		Field contentField = code.getClass().getDeclaredField("content");
+		contentField.setAccessible(true);
+		contentField.set(code, unix);
+
 		return new KtLintRuleEngine(
 				allRuleProviders,
 				editorConfig,
 				editorConfigOverride,
 				false,
 				path.getFileSystem())
-				.format(Code.Companion.fromPath(path), formatterCallback);
+				.format(code, formatterCallback);
 	}
 
 	/**
diff --git a/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java b/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
index b683b84ca1..ce6c3992ae 100644
--- a/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
@@ -15,6 +15,7 @@
  */
 package com.diffplug.spotless.glue.ktlint.compat;
 
+import java.lang.reflect.Field;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
@@ -83,9 +84,10 @@ public Unit invoke(LintError lint, Boolean corrected) {
 
 	@Override
 	public String format(
+			String unix,
 			Path path,
 			Path editorConfigPath,
-			Map<String, Object> editorConfigOverrideMap) {
+			Map<String, Object> editorConfigOverrideMap) throws NoSuchFieldException, IllegalAccessException {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		Set<RuleProvider> allRuleProviders = ServiceLoader.load(RuleSetProviderV3.class, RuleSetProviderV3.class.getClassLoader())
@@ -108,6 +110,12 @@ public String format(
 			editorConfig = EditorConfigDefaults.Companion.load(editorConfigPath, RuleProviderKt.propertyTypes(allRuleProviders));
 		}
 
+		// create Code and then set the content to match previous steps in the Spotless pipeline
+		Code code = Code.Companion.fromPath(path);
+		Field contentField = code.getClass().getDeclaredField("content");
+		contentField.setAccessible(true);
+		contentField.set(code, unix);
+
 		return new KtLintRuleEngine(
 				allRuleProviders,
 				editorConfig,
@@ -115,7 +123,7 @@ public String format(
 				true,
 				false,
 				path.getFileSystem())
-				.format(Code.Companion.fromPath(path), formatterCallback);
+				.format(code, formatterCallback);
 	}
 
 	/**
diff --git a/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java b/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
index 0e97cdd12d..cca90fb398 100644
--- a/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
+++ b/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
@@ -15,6 +15,7 @@
  */
 package com.diffplug.spotless.glue.ktlint.compat;
 
+import java.lang.reflect.Field;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
@@ -82,9 +83,10 @@ public Unit invoke(LintError lint, Boolean corrected) {
 
 	@Override
 	public String format(
+			String unix,
 			Path path,
 			Path editorConfigPath,
-			Map<String, Object> editorConfigOverrideMap) {
+			Map<String, Object> editorConfigOverrideMap) throws NoSuchFieldException, IllegalAccessException {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		Set<RuleProvider> allRuleProviders = ServiceLoader.load(RuleSetProviderV3.class, RuleSetProviderV3.class.getClassLoader())
@@ -103,13 +105,19 @@ public String format(
 					editorConfigOverrideMap);
 		}
 
+		// create Code and then set the content to match previous steps in the Spotless pipeline
+		Code code = Code.Companion.fromPath(path);
+		Field contentField = code.getClass().getDeclaredField("content");
+		contentField.setAccessible(true);
+		contentField.set(code, unix);
+
 		return new KtLintRuleEngine(
 				allRuleProviders,
 				editorConfig,
 				editorConfigOverride,
 				false,
 				path.getFileSystem())
-				.format(Code.Companion.fromPath(path), formatterCallback);
+				.format(code, formatterCallback);
 	}
 
 	/**
diff --git a/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java b/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
index 1bfa0da6da..70bfb56da3 100644
--- a/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
+++ b/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 DiffPlug
+ * Copyright 2022-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,8 @@
 public interface KtLintCompatAdapter {
 
 	String format(
+			String content,
 			Path path,
 			Path editorConfigPath,
-			Map<String, Object> editorConfigOverrideMap);
+			Map<String, Object> editorConfigOverrideMap) throws NoSuchFieldException, IllegalAccessException;
 }
diff --git a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
index b81e107609..a8e5bc32fc 100644
--- a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
+++ b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 DiffPlug
+ * Copyright 2021-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,12 +60,13 @@ public KtlintFormatterFunc(
 	}
 
 	@Override
-	public String applyWithFile(String unix, File file) {
+	public String applyWithFile(String unix, File file) throws NoSuchFieldException, IllegalAccessException {
 		Path absoluteEditorConfigPath = null;
 		if (editorConfigPath != null) {
 			absoluteEditorConfigPath = editorConfigPath.getOnlyFile().toPath();
 		}
 		return adapter.format(
+				unix,
 				file.toPath(),
 				absoluteEditorConfigPath,
 				editorConfigOverrideMap);

From 68e1ca9d14cc4762b1a8939c7339e6bd483e7220 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 16 Oct 2024 23:09:38 -0700
Subject: [PATCH 1856/2068] Update changelogs.

---
 CHANGES.md               | 2 ++
 plugin-gradle/CHANGES.md | 2 ++
 plugin-maven/CHANGES.md  | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 69bbaa1fd2..ca1f965898 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* `ktlint` steps now read from the `string` instead of the `file` so they don't clobber earlier steps. (fixes [#1599](https://github.com/diffplug/spotless/issues/1599))
 
 ## [3.0.0.BETA3] - 2024-10-15
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index fe3d1aa529..c5e2171005 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Fixed
+* `ktlint` steps now read from the `string` instead of the `file` so they don't clobber earlier steps. (fixes [#1599](https://github.com/diffplug/spotless/issues/1599))
 
 ## [7.0.0.BETA3] - 2024-10-15
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 4f11ab296a..4eb157e7d0 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* `ktlint` steps now read from the `string` instead of the `file` so they don't clobber earlier steps. (fixes [#1599](https://github.com/diffplug/spotless/issues/1599))
 
 ## [2.44.0.BETA3] - 2024-10-15
 ### Added

From a8ef33147f19c7928ab038ae04681b3057393e5f Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 16 Oct 2024 23:31:38 -0700
Subject: [PATCH 1857/2068] Fix spotbugs issues.

---
 .../compat/KtLintCompat0Dot49Dot0Adapter.java   |  8 ++------
 .../compat/KtLintCompat0Dot50Dot0Adapter.java   |  8 ++------
 .../compat/KtLintCompat1Dot0Dot0Adapter.java    |  8 ++------
 .../glue/ktlint/compat/KtLintCompatAdapter.java | 17 +++++++++++++++++
 .../KtLintCompat0Dot48Dot0AdapterTest.java      | 10 +++++-----
 .../KtLintCompat0Dot49Dot0AdapterTest.java      | 10 +++++-----
 .../KtLintCompat0Dot50Dot0AdapterTest.java      | 10 +++++-----
 .../KtLintCompat1Dot0Dot0AdapterTest.java       | 10 +++++-----
 8 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java b/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
index fcd456e648..f4c1e04af7 100644
--- a/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
@@ -15,7 +15,6 @@
  */
 package com.diffplug.spotless.glue.ktlint.compat;
 
-import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.nio.file.Files;
@@ -125,7 +124,7 @@ public String format(
 			String unix,
 			Path path,
 			Path editorConfigPath,
-			Map<String, Object> editorConfigOverrideMap) throws NoSuchFieldException, IllegalAccessException {
+			Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		Set<RuleProvider> allRuleProviders = ServiceLoader.load(RuleSetProviderV3.class, RuleSetProviderV3.class.getClassLoader())
@@ -150,10 +149,7 @@ public String format(
 
 		// create Code and then set the content to match previous steps in the Spotless pipeline
 		Code code = Code.Companion.fromPath(path);
-		Field contentField = code.getClass().getDeclaredField("content");
-		contentField.setAccessible(true);
-		contentField.set(code, unix);
-
+		KtLintCompatAdapter.setCodeContent(code, unix);
 		return new KtLintRuleEngine(
 				allRuleProviders,
 				editorConfig,
diff --git a/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java b/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
index ce6c3992ae..951b82704a 100644
--- a/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
@@ -15,7 +15,6 @@
  */
 package com.diffplug.spotless.glue.ktlint.compat;
 
-import java.lang.reflect.Field;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
@@ -87,7 +86,7 @@ public String format(
 			String unix,
 			Path path,
 			Path editorConfigPath,
-			Map<String, Object> editorConfigOverrideMap) throws NoSuchFieldException, IllegalAccessException {
+			Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		Set<RuleProvider> allRuleProviders = ServiceLoader.load(RuleSetProviderV3.class, RuleSetProviderV3.class.getClassLoader())
@@ -112,10 +111,7 @@ public String format(
 
 		// create Code and then set the content to match previous steps in the Spotless pipeline
 		Code code = Code.Companion.fromPath(path);
-		Field contentField = code.getClass().getDeclaredField("content");
-		contentField.setAccessible(true);
-		contentField.set(code, unix);
-
+		KtLintCompatAdapter.setCodeContent(code, unix);
 		return new KtLintRuleEngine(
 				allRuleProviders,
 				editorConfig,
diff --git a/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java b/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
index cca90fb398..86387d0d6b 100644
--- a/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
+++ b/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
@@ -15,7 +15,6 @@
  */
 package com.diffplug.spotless.glue.ktlint.compat;
 
-import java.lang.reflect.Field;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
@@ -86,7 +85,7 @@ public String format(
 			String unix,
 			Path path,
 			Path editorConfigPath,
-			Map<String, Object> editorConfigOverrideMap) throws NoSuchFieldException, IllegalAccessException {
+			Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		Set<RuleProvider> allRuleProviders = ServiceLoader.load(RuleSetProviderV3.class, RuleSetProviderV3.class.getClassLoader())
@@ -107,10 +106,7 @@ public String format(
 
 		// create Code and then set the content to match previous steps in the Spotless pipeline
 		Code code = Code.Companion.fromPath(path);
-		Field contentField = code.getClass().getDeclaredField("content");
-		contentField.setAccessible(true);
-		contentField.set(code, unix);
-
+		KtLintCompatAdapter.setCodeContent(code, unix);
 		return new KtLintRuleEngine(
 				allRuleProviders,
 				editorConfig,
diff --git a/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java b/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
index 70bfb56da3..0fcecb3f6c 100644
--- a/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
+++ b/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
@@ -15,7 +15,10 @@
  */
 package com.diffplug.spotless.glue.ktlint.compat;
 
+import java.lang.reflect.Field;
 import java.nio.file.Path;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.util.Map;
 
 public interface KtLintCompatAdapter {
@@ -25,4 +28,18 @@ String format(
 			Path path,
 			Path editorConfigPath,
 			Map<String, Object> editorConfigOverrideMap) throws NoSuchFieldException, IllegalAccessException;
+
+	static void setCodeContent(Object code, String content) {
+		AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
+			try {
+				Field contentField = code.getClass().getDeclaredField("content");
+				contentField.setAccessible(true);
+				contentField.set(code, content);
+			} catch (NoSuchFieldException | IllegalAccessException e) {
+				// Handle exceptions as needed
+				throw new RuntimeException("Failed to set content field", e);
+			}
+			return null;
+		});
+	}
 }
diff --git a/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java b/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java
index 17fe40fb9c..f9c19d69a7 100644
--- a/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java
+++ b/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,19 +33,19 @@ public class KtLintCompat0Dot48Dot0AdapterTest {
 	@Test
 	public void testDefaults(@TempDir Path path) throws IOException {
 		KtLintCompat0Dot48Dot0Adapter ktLintCompat0Dot48Dot0Adapter = new KtLintCompat0Dot48Dot0Adapter();
-		loadAndWriteText(path, "empty_class_body.kt");
+		var content = loadAndWriteText(path, "empty_class_body.kt");
 		final Path filePath = Paths.get(path.toString(), "empty_class_body.kt");
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 
-		String formatted = ktLintCompat0Dot48Dot0Adapter.format(filePath, null, editorConfigOverrideMap);
+		String formatted = ktLintCompat0Dot48Dot0Adapter.format(content, filePath, null, editorConfigOverrideMap);
 		assertEquals("class empty_class_body\n", formatted);
 	}
 
 	@Test
 	public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		KtLintCompat0Dot48Dot0Adapter ktLintCompat0Dot48Dot0Adapter = new KtLintCompat0Dot48Dot0Adapter();
-		loadAndWriteText(path, "fails_no_semicolons.kt");
+		var content = loadAndWriteText(path, "fails_no_semicolons.kt");
 		final Path filePath = Paths.get(path.toString(), "fails_no_semicolons.kt");
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
@@ -54,7 +54,7 @@ public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		// ktlint_filename is an invalid rule in ktlint 0.48.0
 		editorConfigOverrideMap.put("ktlint_filename", "disabled");
 
-		String formatted = ktLintCompat0Dot48Dot0Adapter.format(filePath, null, editorConfigOverrideMap);
+		String formatted = ktLintCompat0Dot48Dot0Adapter.format(content, filePath, null, editorConfigOverrideMap);
 		assertEquals("class fails_no_semicolons {\n\tval i = 0;\n}\n", formatted);
 	}
 
diff --git a/lib/src/testCompatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java b/lib/src/testCompatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java
index b34a83ebc3..27d085f7fd 100644
--- a/lib/src/testCompatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java
+++ b/lib/src/testCompatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,26 +33,26 @@ public class KtLintCompat0Dot49Dot0AdapterTest {
 	@Test
 	public void testDefaults(@TempDir Path path) throws IOException {
 		KtLintCompat0Dot49Dot0Adapter ktLintCompat0Dot49Dot0Adapter = new KtLintCompat0Dot49Dot0Adapter();
-		loadAndWriteText(path, "EmptyClassBody.kt");
+		var content = loadAndWriteText(path, "EmptyClassBody.kt");
 		final Path filePath = Paths.get(path.toString(), "EmptyClassBody.kt");
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 
-		String formatted = ktLintCompat0Dot49Dot0Adapter.format(filePath, null, editorConfigOverrideMap);
+		String formatted = ktLintCompat0Dot49Dot0Adapter.format(content, filePath, null, editorConfigOverrideMap);
 		assertEquals("class EmptyClassBody\n", formatted);
 	}
 
 	@Test
 	public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		KtLintCompat0Dot49Dot0Adapter ktLintCompat0Dot49Dot0Adapter = new KtLintCompat0Dot49Dot0Adapter();
-		loadAndWriteText(path, "FailsNoSemicolons.kt");
+		var content = loadAndWriteText(path, "FailsNoSemicolons.kt");
 		final Path filePath = Paths.get(path.toString(), "FailsNoSemicolons.kt");
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 		editorConfigOverrideMap.put("indent_style", "tab");
 		editorConfigOverrideMap.put("ktlint_standard_no-semi", "disabled");
 
-		String formatted = ktLintCompat0Dot49Dot0Adapter.format(filePath, null, editorConfigOverrideMap);
+		String formatted = ktLintCompat0Dot49Dot0Adapter.format(content, filePath, null, editorConfigOverrideMap);
 		assertEquals("class FailsNoSemicolons {\n\tval i = 0;\n}\n", formatted);
 	}
 
diff --git a/lib/src/testCompatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java b/lib/src/testCompatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java
index 0bb501a06e..27dce68f09 100644
--- a/lib/src/testCompatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java
+++ b/lib/src/testCompatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,26 +33,26 @@ public class KtLintCompat0Dot50Dot0AdapterTest {
 	@Test
 	public void testDefaults(@TempDir Path path) throws IOException {
 		KtLintCompat0Dot50Dot0Adapter KtLintCompat0Dot50Dot0Adapter = new KtLintCompat0Dot50Dot0Adapter();
-		loadAndWriteText(path, "EmptyClassBody.kt");
+		var content = loadAndWriteText(path, "EmptyClassBody.kt");
 		final Path filePath = Paths.get(path.toString(), "EmptyClassBody.kt");
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 
-		String formatted = KtLintCompat0Dot50Dot0Adapter.format(filePath, null, editorConfigOverrideMap);
+		String formatted = KtLintCompat0Dot50Dot0Adapter.format(content, filePath, null, editorConfigOverrideMap);
 		assertEquals("class EmptyClassBody\n", formatted);
 	}
 
 	@Test
 	public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		KtLintCompat0Dot50Dot0Adapter KtLintCompat0Dot50Dot0Adapter = new KtLintCompat0Dot50Dot0Adapter();
-		loadAndWriteText(path, "FailsNoSemicolons.kt");
+		var content = loadAndWriteText(path, "FailsNoSemicolons.kt");
 		final Path filePath = Paths.get(path.toString(), "FailsNoSemicolons.kt");
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 		editorConfigOverrideMap.put("indent_style", "tab");
 		editorConfigOverrideMap.put("ktlint_standard_no-semi", "disabled");
 
-		String formatted = KtLintCompat0Dot50Dot0Adapter.format(filePath, null, editorConfigOverrideMap);
+		String formatted = KtLintCompat0Dot50Dot0Adapter.format(content, filePath, null, editorConfigOverrideMap);
 		assertEquals("class FailsNoSemicolons {\n\tval i = 0;\n}\n", formatted);
 	}
 
diff --git a/lib/src/testCompatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java b/lib/src/testCompatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java
index 0f5f9cf16c..760aa89ae5 100644
--- a/lib/src/testCompatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java
+++ b/lib/src/testCompatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,26 +33,26 @@ public class KtLintCompat1Dot0Dot0AdapterTest {
 	@Test
 	public void testDefaults(@TempDir Path path) throws IOException {
 		KtLintCompat1Dot0Dot0Adapter KtLintCompat1Dot0Dot0Adapter = new KtLintCompat1Dot0Dot0Adapter();
-		loadAndWriteText(path, "EmptyClassBody.kt");
+		var content = loadAndWriteText(path, "EmptyClassBody.kt");
 		final Path filePath = Paths.get(path.toString(), "EmptyClassBody.kt");
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 
-		String formatted = KtLintCompat1Dot0Dot0Adapter.format(filePath, null, editorConfigOverrideMap);
+		String formatted = KtLintCompat1Dot0Dot0Adapter.format(content, filePath, null, editorConfigOverrideMap);
 		assertEquals("class EmptyClassBody\n", formatted);
 	}
 
 	@Test
 	public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		KtLintCompat1Dot0Dot0Adapter KtLintCompat1Dot0Dot0Adapter = new KtLintCompat1Dot0Dot0Adapter();
-		loadAndWriteText(path, "FailsNoSemicolons.kt");
+		var content = loadAndWriteText(path, "FailsNoSemicolons.kt");
 		final Path filePath = Paths.get(path.toString(), "FailsNoSemicolons.kt");
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 		editorConfigOverrideMap.put("indent_style", "tab");
 		editorConfigOverrideMap.put("ktlint_standard_no-semi", "disabled");
 
-		String formatted = KtLintCompat1Dot0Dot0Adapter.format(filePath, null, editorConfigOverrideMap);
+		String formatted = KtLintCompat1Dot0Dot0Adapter.format(content, filePath, null, editorConfigOverrideMap);
 		assertEquals("class FailsNoSemicolons {\n\tval i = 0;\n}\n", formatted);
 	}
 

From 875e4a7ab26fda3053e749dac23d86322ed7bb0d Mon Sep 17 00:00:00 2001
From: Konrad Windszus <kwin@apache.org>
Date: Thu, 17 Oct 2024 16:47:39 +0200
Subject: [PATCH 1858/2068] Add LineEnding.PRESERVE policy

WIP
---
 .../com/diffplug/spotless/LineEnding.java     | 52 ++++++++++++++++++-
 .../com/diffplug/spotless/LineEndingTest.java | 48 +++++++++++++++++
 2 files changed, 98 insertions(+), 2 deletions(-)
 create mode 100644 lib/src/test/java/com/diffplug/spotless/LineEndingTest.java

diff --git a/lib/src/main/java/com/diffplug/spotless/LineEnding.java b/lib/src/main/java/com/diffplug/spotless/LineEnding.java
index 74d9c80618..ba265cfb16 100644
--- a/lib/src/main/java/com/diffplug/spotless/LineEnding.java
+++ b/lib/src/main/java/com/diffplug/spotless/LineEnding.java
@@ -16,8 +16,12 @@
 package com.diffplug.spotless;
 
 import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.Reader;
 import java.io.Serializable;
 import java.lang.reflect.Method;
+import java.nio.charset.StandardCharsets;
 import java.util.Objects;
 import java.util.function.Supplier;
 
@@ -47,9 +51,11 @@ public Policy createPolicy() {
 	/** {@code \r\n} */
 	WINDOWS,
     /** {@code \n} */
-    UNIX,
+    UNIX,   
     /** {@code \r} */
-    MAC_CLASSIC;
+    MAC_CLASSIC,
+    /** preserve the line ending of the first line (no matter which format) */
+    PRESERVE;
 	// @formatter:on
 
 	/** Returns a {@link Policy} appropriate for files which are contained within the given rootFolder. */
@@ -81,6 +87,7 @@ public Policy createPolicy() {
 		case WINDOWS:			return WINDOWS_POLICY;
 		case UNIX:				return UNIX_POLICY;
 		case MAC_CLASSIC:		return MAC_CLASSIC_POLICY;
+		case PRESERVE:			return PRESERVE_POLICY;
 		default:	throw new UnsupportedOperationException(this + " is a path-specific line ending.");
 		}
 	}
@@ -100,9 +107,50 @@ public String getEndingFor(File file) {
 		}
 	}
 
+	static class PreserveLineEndingPolicy extends NoLambda.EqualityBasedOnSerialization implements Policy {
+        private static final long serialVersionUID = 2L;
+
+        @Override
+        public String getEndingFor(File file) {
+            // assume US-ASCII encoding (only line ending characters need to be decoded anyways)
+            try (Reader reader = new FileReader(file, StandardCharsets.US_ASCII)) {
+                return getEndingFor(reader);
+            } catch (IOException e) {
+                throw new IllegalArgumentException("Could not determine line ending of file: " + file, e);
+            }
+        }
+
+        static String getEndingFor(Reader reader) throws IOException {
+            char previousCharacter = 0;
+            char currentCharacter = 0;
+            int readResult;
+            while ((readResult = reader.read()) != -1) {
+                currentCharacter = (char)readResult;
+                if (currentCharacter == '\n') {
+                    if (previousCharacter == '\r') {
+                        return WINDOWS.str();
+                    } else {
+                        return UNIX.str();
+                    }
+                } else {
+                    if (previousCharacter == '\r') {
+                        return MAC_CLASSIC.str();
+                    }
+                }
+                previousCharacter = currentCharacter;
+            }
+            if (previousCharacter == '\r') {
+                return MAC_CLASSIC.str();
+            }
+            // assume UNIX line endings if no line ending was found
+            return UNIX.str();
+        }
+	}
+
 	private static final Policy WINDOWS_POLICY = new ConstantLineEndingPolicy(WINDOWS.str());
 	private static final Policy UNIX_POLICY = new ConstantLineEndingPolicy(UNIX.str());
     private static final Policy MAC_CLASSIC_POLICY = new ConstantLineEndingPolicy(MAC_CLASSIC.str());
+    private static final Policy PRESERVE_POLICY = new PreserveLineEndingPolicy();
 	private static final String _platformNative = System.getProperty("line.separator");
 	private static final Policy _platformNativePolicy = new ConstantLineEndingPolicy(_platformNative);
 	private static final boolean nativeIsWin = _platformNative.equals(WINDOWS.str());
diff --git a/lib/src/test/java/com/diffplug/spotless/LineEndingTest.java b/lib/src/test/java/com/diffplug/spotless/LineEndingTest.java
new file mode 100644
index 0000000000..0babe8be71
--- /dev/null
+++ b/lib/src/test/java/com/diffplug/spotless/LineEndingTest.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+class LineEndingTest {
+
+    @Test
+    void testGetEndingFor() throws IOException {
+        assertLineEnding("\r", "\r");
+        assertLineEnding("\r", "Test\r");
+        assertLineEnding("\r", "Test\rTest2\n");
+        
+        assertLineEnding("\n", "Test");
+        
+        assertLineEnding("\r\n", "\r\n");
+        assertLineEnding("\r\n", "Test\r\n");
+        assertLineEnding("\r\n", "Test\r\nTest2\n");
+
+        assertLineEnding("\n", "\n");
+        assertLineEnding("\n", "Test\n");
+        assertLineEnding("\n", "Test\nTest2\r");
+        assertLineEnding("\n", "\n\t");
+    }
+    
+    static void assertLineEnding(String ending, String input) throws IOException {
+        try (Reader reader = new StringReader(input)) {
+            Assertions.assertEquals(ending, LineEnding.PreserveLineEndingPolicy.getEndingFor(reader));
+        }
+    }
+}

From 5b0618e8b07cece68eb4207e0baa9b5a9194c1c5 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 17 Oct 2024 10:10:41 -0700
Subject: [PATCH 1859/2068] spotlessApply

---
 .../com/diffplug/spotless/LineEnding.java     |  4 +-
 .../com/diffplug/spotless/LineEndingTest.java | 48 ++++++++++---------
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/LineEnding.java b/lib/src/main/java/com/diffplug/spotless/LineEnding.java
index ba265cfb16..5b44b81889 100644
--- a/lib/src/main/java/com/diffplug/spotless/LineEnding.java
+++ b/lib/src/main/java/com/diffplug/spotless/LineEnding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,7 +51,7 @@ public Policy createPolicy() {
 	/** {@code \r\n} */
 	WINDOWS,
     /** {@code \n} */
-    UNIX,   
+    UNIX,
     /** {@code \r} */
     MAC_CLASSIC,
     /** preserve the line ending of the first line (no matter which format) */
diff --git a/lib/src/test/java/com/diffplug/spotless/LineEndingTest.java b/lib/src/test/java/com/diffplug/spotless/LineEndingTest.java
index 0babe8be71..e84d660758 100644
--- a/lib/src/test/java/com/diffplug/spotless/LineEndingTest.java
+++ b/lib/src/test/java/com/diffplug/spotless/LineEndingTest.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright 2024 DiffPlug
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -22,27 +24,27 @@
 
 class LineEndingTest {
 
-    @Test
-    void testGetEndingFor() throws IOException {
-        assertLineEnding("\r", "\r");
-        assertLineEnding("\r", "Test\r");
-        assertLineEnding("\r", "Test\rTest2\n");
-        
-        assertLineEnding("\n", "Test");
-        
-        assertLineEnding("\r\n", "\r\n");
-        assertLineEnding("\r\n", "Test\r\n");
-        assertLineEnding("\r\n", "Test\r\nTest2\n");
-
-        assertLineEnding("\n", "\n");
-        assertLineEnding("\n", "Test\n");
-        assertLineEnding("\n", "Test\nTest2\r");
-        assertLineEnding("\n", "\n\t");
-    }
-    
-    static void assertLineEnding(String ending, String input) throws IOException {
-        try (Reader reader = new StringReader(input)) {
-            Assertions.assertEquals(ending, LineEnding.PreserveLineEndingPolicy.getEndingFor(reader));
-        }
-    }
+	@Test
+	void testGetEndingFor() throws IOException {
+		assertLineEnding("\r", "\r");
+		assertLineEnding("\r", "Test\r");
+		assertLineEnding("\r", "Test\rTest2\n");
+
+		assertLineEnding("\n", "Test");
+
+		assertLineEnding("\r\n", "\r\n");
+		assertLineEnding("\r\n", "Test\r\n");
+		assertLineEnding("\r\n", "Test\r\nTest2\n");
+
+		assertLineEnding("\n", "\n");
+		assertLineEnding("\n", "Test\n");
+		assertLineEnding("\n", "Test\nTest2\r");
+		assertLineEnding("\n", "\n\t");
+	}
+
+	static void assertLineEnding(String ending, String input) throws IOException {
+		try (Reader reader = new StringReader(input)) {
+			Assertions.assertEquals(ending, LineEnding.PreserveLineEndingPolicy.getEndingFor(reader));
+		}
+	}
 }

From e170bf1d27b3ed4ee34259c5a433e7e08e95541c Mon Sep 17 00:00:00 2001
From: Konrad Windszus <konrad.windszus@netcentric.biz>
Date: Fri, 18 Oct 2024 14:55:12 +0200
Subject: [PATCH 1860/2068] Update changelog and readme

---
 CHANGES.md               | 3 +++
 plugin-gradle/CHANGES.md | 2 ++
 plugin-gradle/README.md  | 4 +++-
 plugin-maven/CHANGES.md  | 2 ++
 plugin-maven/README.md   | 4 +++-
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 69bbaa1fd2..983e4c6683 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,9 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* Support for line ending policy `PRESERVE` which just takes the first line ending of every given file as setting (no matter if `\n`, `\r\n` or `\r`) ([#2304](https://github.com/diffplug/spotless/pull/2304))
+
 
 ## [3.0.0.BETA3] - 2024-10-15
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index fe3d1aa529..dcac6bab3a 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Added
+* Support for line ending policy `PRESERVE` which just takes the first line ending of every given file as setting (no matter if `\n`, `\r\n` or `\r`) ([#2304](https://github.com/diffplug/spotless/pull/2304))
 
 ## [7.0.0.BETA3] - 2024-10-15
 ### Added
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index bc7759439d..c8cb7e4d6b 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -1577,10 +1577,12 @@ spotless {
     encoding 'Cp1252' // except java, which will be Cp1252
 ```
 
-Line endings can also be set globally or per-format using the `lineEndings` property.  Spotless supports four line ending modes: `UNIX`, `WINDOWS`, `MAC_CLASSIC`, `PLATFORM_NATIVE`, `GIT_ATTRIBUTES`, and `GIT_ATTRIBUTES_FAST_ALLSAME`.  The default value is `GIT_ATTRIBUTES_FAST_ALLSAME`, and *we highly recommend that you* ***do not change*** *this value*.  Git has opinions about line endings, and if Spotless and git disagree, then you're going to have a bad time. `FAST_ALLSAME` just means that Spotless can assume that every file being formatted has the same line endings ([more info](https://github.com/diffplug/spotless/pull/1838)).
+Line endings can also be set globally or per-format using the `lineEndings` property.  Spotless supports four line ending modes: `UNIX`, `WINDOWS`, `MAC_CLASSIC`, `PLATFORM_NATIVE`, `GIT_ATTRIBUTES`, `GIT_ATTRIBUTES_FAST_ALLSAME` and `PRESERVE`.  The default value is `GIT_ATTRIBUTES_FAST_ALLSAME`, and *we highly recommend that you* ***do not change*** *this value*.  Git has opinions about line endings, and if Spotless and git disagree, then you're going to have a bad time. `FAST_ALLSAME` just means that Spotless can assume that every file being formatted has the same line endings ([more info](https://github.com/diffplug/spotless/pull/1838)).
 
 You can easily set the line endings of different files using [a `.gitattributes` file](https://help.github.com/articles/dealing-with-line-endings/).  Here's an example `.gitattributes` which sets all files to unix newlines: `* text eol=lf`.
 
+Use `PRESERVE` in order to keep the existing line endings of a file. This policy enforces that all line endings equal the first one of the according file (no matter which line delimiter it is).
+
 <a name="custom"></a>
 <a name="custom-steps"></a>
 
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 4f11ab296a..b52e9b7a8f 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* Support for line ending policy `PRESERVE` which just takes the first line ending of every given file as setting (no matter if `\n`, `\r\n` or `\r`) ([#2304](https://github.com/diffplug/spotless/pull/2304))
 
 ## [2.44.0.BETA3] - 2024-10-15
 ### Added
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 6b14c7717e..91cf8acc51 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -1784,10 +1784,12 @@ Spotless uses UTF-8 by default, but you can use [any encoding which Java support
 </configuration>
 ```
 
-Line endings can also be set globally or per-format using the `lineEndings` property.  Spotless supports four line ending modes: `UNIX`, `WINDOWS`, `MAC_CLASSIC`, `PLATFORM_NATIVE`, `GIT_ATTRIBUTES`, and `GIT_ATTRIBUTES_FAST_ALLSAME`.  The default value is `GIT_ATTRIBUTES_FAST_ALLSAME`, and *we highly recommend that you* ***do not change*** *this value*.  Git has opinions about line endings, and if Spotless and git disagree, then you're going to have a bad time. `FAST_ALLSAME` just means that Spotless can assume that every file being formatted has the same line endings ([more info](https://github.com/diffplug/spotless/pull/1838)).
+Line endings can also be set globally or per-format using the `lineEndings` property.  Spotless supports four line ending modes: `UNIX`, `WINDOWS`, `MAC_CLASSIC`, `PLATFORM_NATIVE`, `GIT_ATTRIBUTES`, `GIT_ATTRIBUTES_FAST_ALLSAME` and `PRESERVE`.  The default value is `GIT_ATTRIBUTES_FAST_ALLSAME`, and *we highly recommend that you* ***do not change*** *this value*.  Git has opinions about line endings, and if Spotless and git disagree, then you're going to have a bad time. `FAST_ALLSAME` just means that Spotless can assume that every file being formatted has the same line endings ([more info](https://github.com/diffplug/spotless/pull/1838)).
 
 You can easily set the line endings of different files using [a `.gitattributes` file](https://help.github.com/articles/dealing-with-line-endings/).  Here's an example `.gitattributes` which sets all files to unix newlines: `* text eol=lf`.
 
+Use `PRESERVE` in order to keep the existing line endings of a file. This policy enforces that all line endings equal the first one of the according file (no matter which line delimiter it is).
+
 <a name="enforceCheck"></a>
 
 ## Disabling warnings and error messages

From ae31ea54a2e1cccc598f0f2da3601cf4e5901a8e Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 20 Oct 2024 08:55:56 -0700
Subject: [PATCH 1861/2068] Setup selfie.

---
 gradle/special-tests.gradle | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gradle/special-tests.gradle b/gradle/special-tests.gradle
index 5bf7e7d10a..650c04b84b 100644
--- a/gradle/special-tests.gradle
+++ b/gradle/special-tests.gradle
@@ -18,7 +18,14 @@ tasks.withType(Test).configureEach {
 			maxFailures = 10
 		}
 	}
-
+	// selfie https://selfie.dev/jvm/get-started#gradle
+	environment project.properties.subMap([
+		"selfie"
+	]) // optional, see "Overwrite everything" below
+	inputs.files(fileTree("src/test") {
+		// optional, improves up-to-date checking
+		include "**/*.ss"
+	})
 	// https://docs.gradle.org/8.8/userguide/performance.html#execute_tests_in_parallel
 	maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) ?: 1
 }

From 8300fda64127ab1718b3d8006c7dc8833a41ae44 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 20 Oct 2024 08:58:13 -0700
Subject: [PATCH 1862/2068] Fix ambiguities in the `Lint` class around treating
 it as data vs exception.

---
 .../main/java/com/diffplug/spotless/Lint.java | 127 ++++++++++--------
 1 file changed, 71 insertions(+), 56 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/Lint.java b/lib/src/main/java/com/diffplug/spotless/Lint.java
index 4708c27a2c..4384ed38ef 100644
--- a/lib/src/main/java/com/diffplug/spotless/Lint.java
+++ b/lib/src/main/java/com/diffplug/spotless/Lint.java
@@ -20,6 +20,8 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * Models a linted line or line range. Note that there is no concept of severity level - responsibility
@@ -27,19 +29,52 @@
  * to Spotless, then it is by definition.
  */
 public final class Lint implements Serializable {
-	/** Returns a runtime exception which, if thrown, will create a lint at an undefined line. */
-	public static ShortcutException atUndefinedLine(String code, String msg) {
-		return new ShortcutException(Lint.create(code, msg, LINE_UNDEFINED));
+	public static Lint atUndefinedLine(String ruleId, String detail) {
+		return new Lint(LINE_UNDEFINED, ruleId, detail);
 	}
 
-	/** Returns a runtime exception which, if thrown, will lint a specific line. */
-	public static ShortcutException atLine(int line, String code, String msg) {
-		return new ShortcutException(Lint.create(code, msg, line));
+	public static Lint atLine(int line, String ruleId, String detail) {
+		return new Lint(line, ruleId, detail);
 	}
 
-	/** Returns a runtime exception which, if thrown, will lint a specific line range. */
-	public static ShortcutException atLineRange(int lineStart, int lineEnd, String code, String msg) {
-		return new ShortcutException(Lint.create(code, msg, lineStart, lineEnd));
+	public static Lint atLineRange(int lineStart, int lineEnd, String ruleId, String detail) {
+		return new Lint(lineStart, lineEnd, ruleId, detail);
+	}
+
+	private static final long serialVersionUID = 1L;
+
+	private int lineStart, lineEnd; // 1-indexed, inclusive
+	private String ruleId; // e.g. CN_IDIOM https://spotbugs.readthedocs.io/en/stable/bugDescriptions.html#cn-class-implements-cloneable-but-does-not-define-or-use-clone-method-cn-idiom
+	private String detail;
+
+	private Lint(int lineStart, int lineEnd, String ruleId, String detail) {
+		if (lineEnd < lineStart) {
+			throw new IllegalArgumentException("lineEnd must be >= lineStart: lineStart=" + lineStart + " lineEnd=" + lineEnd);
+		}
+		this.lineStart = lineStart;
+		this.lineEnd = lineEnd;
+		this.ruleId = LineEnding.toUnix(ruleId);
+		this.detail = LineEnding.toUnix(detail);
+	}
+
+	private Lint(int line, String ruleId, String detail) {
+		this(line, line, ruleId, detail);
+	}
+
+	public int getLineStart() {
+		return lineStart;
+	}
+
+	public int getLineEnd() {
+		return lineEnd;
+	}
+
+	public String getRuleId() {
+		return ruleId;
+	}
+
+	public String getDetail() {
+		return detail;
 	}
 
 	/** Any exception which implements this interface will have its lints extracted and reported cleanly to the user. */
@@ -48,14 +83,15 @@ public interface Has {
 	}
 
 	/** An exception for shortcutting execution to report a lint to the user. */
-	public static class ShortcutException extends RuntimeException implements Has {
+	static class ShortcutException extends RuntimeException implements Has {
 		public ShortcutException(Lint... lints) {
 			this(Arrays.asList(lints));
 		}
 
 		private final List<Lint> lints;
 
-		public ShortcutException(Collection<Lint> lints) {
+		ShortcutException(Collection<Lint> lints) {
+			super(lints.iterator().next().detail);
 			this.lints = List.copyOf(lints);
 		}
 
@@ -65,56 +101,26 @@ public List<Lint> getLints() {
 		}
 	}
 
-	private static final long serialVersionUID = 1L;
-
-	private int lineStart, lineEnd; // 1-indexed, inclusive
-	private String code; // e.g. CN_IDIOM https://spotbugs.readthedocs.io/en/stable/bugDescriptions.html#cn-class-implements-cloneable-but-does-not-define-or-use-clone-method-cn-idiom
-	private String msg;
-
-	private Lint(int lineStart, int lineEnd, String lintCode, String lintMsg) {
-		this.lineStart = lineStart;
-		this.lineEnd = lineEnd;
-		this.code = LineEnding.toUnix(lintCode);
-		this.msg = LineEnding.toUnix(lintMsg);
+	/** Returns an exception which will wrap all of the given lints using {@link Has} */
+	public static RuntimeException shortcut(Collection<Lint> lints) {
+		return new ShortcutException(lints);
 	}
 
-	public static Lint create(String code, String msg, int lineStart, int lineEnd) {
-		if (lineEnd < lineStart) {
-			throw new IllegalArgumentException("lineEnd must be >= lineStart: lineStart=" + lineStart + " lineEnd=" + lineEnd);
-		}
-		return new Lint(lineStart, lineEnd, code, msg);
-	}
-
-	public static Lint create(String code, String msg, int line) {
-		return new Lint(line, line, code, msg);
-	}
-
-	public int getLineStart() {
-		return lineStart;
-	}
-
-	public int getLineEnd() {
-		return lineEnd;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public String getMsg() {
-		return msg;
+	/** Returns an exception which will wrap this lint using {@link Has} */
+	public RuntimeException shortcut() {
+		return new ShortcutException(this);
 	}
 
 	@Override
 	public String toString() {
 		if (lineStart == lineEnd) {
 			if (lineStart == LINE_UNDEFINED) {
-				return "LINE_UNDEFINED: (" + code + ") " + msg;
+				return "LINE_UNDEFINED: (" + ruleId + ") " + detail;
 			} else {
-				return lineStart + ": (" + code + ") " + msg;
+				return "L" + lineStart + ": (" + ruleId + ") " + detail;
 			}
 		} else {
-			return lineStart + "-" + lineEnd + ": (" + code + ") " + msg;
+			return "L" + lineStart + "-" + lineEnd + ": (" + ruleId + ") " + detail;
 		}
 	}
 
@@ -125,27 +131,36 @@ public boolean equals(Object o) {
 		if (o == null || getClass() != o.getClass())
 			return false;
 		Lint lint = (Lint) o;
-		return lineStart == lint.lineStart && lineEnd == lint.lineEnd && Objects.equals(code, lint.code) && Objects.equals(msg, lint.msg);
+		return lineStart == lint.lineStart && lineEnd == lint.lineEnd && Objects.equals(ruleId, lint.ruleId) && Objects.equals(detail, lint.detail);
 	}
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(lineStart, lineEnd, code, msg);
+		return Objects.hash(lineStart, lineEnd, ruleId, detail);
 	}
 
 	/** Attempts to parse a line number from the given exception. */
-	static Lint createFromThrowable(FormatterStep step, String content, Throwable e) {
+	static Lint createFromThrowable(FormatterStep step, Throwable e) {
 		Throwable current = e;
 		while (current != null) {
 			String message = current.getMessage();
 			int lineNumber = lineNumberFor(message);
 			if (lineNumber != -1) {
-				return Lint.create(step.getName(), msgFrom(message), lineNumber);
+				return new Lint(lineNumber, step.getName(), msgFrom(message));
 			}
 			current = current.getCause();
 		}
-		int numNewlines = (int) content.codePoints().filter(c -> c == '\n').count();
-		return Lint.create(step.getName(), ThrowingEx.stacktrace(e), 1, 1 + numNewlines);
+		String exceptionName = e.getClass().getName();
+		String detail = ThrowingEx.stacktrace(e);
+		if (detail.startsWith(exceptionName + ": ")) {
+			detail = detail.substring(exceptionName.length() + 2);
+		}
+		Matcher matcher = Pattern.compile("line (\\d+)").matcher(detail);
+		int line = LINE_UNDEFINED;
+		if (matcher.find()) {
+			line = Integer.parseInt(matcher.group(1));
+		}
+		return Lint.atLine(line, exceptionName, detail);
 	}
 
 	private static int lineNumberFor(String message) {

From 9658d411729c1b1ba46fa548204ec4d804dab36a Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 20 Oct 2024 08:58:23 -0700
Subject: [PATCH 1863/2068] Improve LintState's toString.

---
 .../java/com/diffplug/spotless/LintState.java | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/LintState.java b/lib/src/main/java/com/diffplug/spotless/LintState.java
index 90b363c81a..2fcf18ef6c 100644
--- a/lib/src/main/java/com/diffplug/spotless/LintState.java
+++ b/lib/src/main/java/com/diffplug/spotless/LintState.java
@@ -72,13 +72,19 @@ public String asString(File file, Formatter formatter) {
 				if (lints != null) {
 					FormatterStep step = formatter.getSteps().get(i);
 					for (Lint lint : lints) {
-						result.append(file.getName()).append(":").append(lint.getLineStart());
-						if (lint.getLineEnd() != lint.getLineStart()) {
-							result.append("-").append(lint.getLineEnd());
+						result.append(file.getName()).append(":");
+						if (lint.getLineStart() == Lint.LINE_UNDEFINED) {
+							result.append("LINE_UNDEFINED");
+						} else {
+							result.append("L");
+							result.append(lint.getLineStart());
+							if (lint.getLineEnd() != lint.getLineStart()) {
+								result.append("-").append(lint.getLineEnd());
+							}
 						}
 						result.append(" ");
-						result.append(step.getName()).append("(").append(lint.getCode()).append(") ");
-						result.append(lint.getMsg());
+						result.append(step.getName()).append("(").append(lint.getRuleId()).append(") ");
+						result.append(lint.getDetail());
 						result.append("\n");
 					}
 				}
@@ -111,7 +117,7 @@ public static LintState of(Formatter formatter, File file, byte[] rawBytes) {
 						lints.set(i, lintsForStep);
 					}
 				} catch (Exception e) {
-					lints.set(i, List.of(Lint.createFromThrowable(step, toLint, e)));
+					lints.set(i, List.of(Lint.createFromThrowable(step, e)));
 				}
 			}
 		}
@@ -142,7 +148,7 @@ public static LintState of(Formatter formatter, File file, byte[] rawBytes) {
 			if (exceptionForLint instanceof Lint.Has) {
 				lintsForStep = ((Lint.Has) exceptionForLint).getLints();
 			} else if (exceptionForLint != null && exceptionForLint != formatStepCausedNoChange()) {
-				lintsForStep = List.of(Lint.createFromThrowable(step, toLint, exceptionForLint));
+				lintsForStep = List.of(Lint.createFromThrowable(step, exceptionForLint));
 			} else {
 				lintsForStep = List.of();
 			}

From d00a4ab8984fb66e95ce7b71dcae9f7c320e5238 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 20 Oct 2024 08:58:57 -0700
Subject: [PATCH 1864/2068] Adapt gradle test for the API.

---
 .../com/diffplug/gradle/spotless/ErrorShouldRethrowTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrowTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrowTest.java
index f425743bf0..0c21a3644d 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrowTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrowTest.java
@@ -43,7 +43,7 @@ private void writeBuild(String... toInsert) throws IOException {
 		lines.add("        target file('README.md')");
 		lines.add("        custom 'no swearing', {");
 		lines.add("             if (it.toLowerCase(Locale.ROOT).contains('fubar')) {");
-		lines.add("                 throw com.diffplug.spotless.Lint.atUndefinedLine('swearing', 'No swearing!');");
+		lines.add("                 throw com.diffplug.spotless.Lint.atUndefinedLine('swearing', 'No swearing!').shortcut();");
 		lines.add("             }");
 		lines.add("        }");
 		lines.addAll(Arrays.asList(toInsert));

From 195bc165ce94a2a9086736b28fb2c3dd06740e03 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 20 Oct 2024 08:59:42 -0700
Subject: [PATCH 1865/2068] Remove `testResourceExceptionMsg` and replace with
 `expectLintsOfResource`.

---
 .../com/diffplug/spotless/StepHarness.java    | 43 +++++++------------
 .../spotless/StepHarnessWithFile.java         | 33 +++++---------
 2 files changed, 26 insertions(+), 50 deletions(-)

diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarness.java b/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
index 4f7f6b5c27..e45fd16a5b 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
@@ -21,9 +21,6 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 
-import org.assertj.core.api.AbstractStringAssert;
-import org.assertj.core.api.Assertions;
-
 import com.diffplug.selfie.Selfie;
 import com.diffplug.selfie.StringSelfie;
 
@@ -91,34 +88,26 @@ public StepHarness testResourceUnaffected(String resourceIdempotent) {
 		return testUnaffected(idempotentElement);
 	}
 
-	public AbstractStringAssert<?> testResourceExceptionMsg(String resourceBefore) {
-		return testExceptionMsg(ResourceHarness.getTestResource(resourceBefore));
-	}
-
-	public AbstractStringAssert<?> testExceptionMsg(String before) {
-		try {
-			formatter().compute(LineEnding.toUnix(before), Formatter.NO_FILE_SENTINEL);
-			throw new SecurityException("Expected exception");
-		} catch (Throwable e) {
-			if (e instanceof SecurityException) {
-				throw new AssertionError(e.getMessage());
-			} else {
-				Throwable rootCause = e;
-				while (rootCause.getCause() != null) {
-					if (rootCause instanceof IllegalStateException) {
-						break;
-					}
-					rootCause = rootCause.getCause();
-				}
-				return Assertions.assertThat(rootCause.getMessage());
-			}
-		}
+	public StringSelfie expectLintsOfResource(String before) {
+		return expectLintsOf(ResourceHarness.getTestResource(before));
 	}
 
 	public StringSelfie expectLintsOf(String before) {
 		LintState state = LintState.of(formatter(), Formatter.NO_FILE_SENTINEL, before.getBytes(formatter().getEncoding()));
-		String assertAgainst = state.asString(Formatter.NO_FILE_SENTINEL, formatter());
+		return expectLintsOf(state, formatter());
+	}
+
+	static StringSelfie expectLintsOf(LintState state, Formatter formatter) {
+		String assertAgainst = state.asString(Formatter.NO_FILE_SENTINEL, formatter);
 		String cleaned = assertAgainst.replace("NO_FILE_SENTINEL:", "");
-		return Selfie.expectSelfie(cleaned);
+
+		int numLines = 1;
+		int lineEnding = cleaned.indexOf('\n');
+		while (lineEnding != -1 && numLines < 10) {
+			++numLines;
+			lineEnding = cleaned.indexOf('\n', lineEnding + 1);
+		}
+		String toSnapshot = lineEnding == -1 ? cleaned : (cleaned.substring(0, lineEnding) + "\n(... and more)");
+		return Selfie.expectSelfie(toSnapshot);
 	}
 }
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java b/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java
index bf537cf030..f833939bbe 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java
@@ -18,12 +18,12 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.File;
+import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.Objects;
 
-import org.assertj.core.api.AbstractStringAssert;
-import org.assertj.core.api.Assertions;
+import com.diffplug.selfie.StringSelfie;
 
 /** An api for testing a {@code FormatterStep} that depends on the File path. */
 public class StepHarnessWithFile extends StepHarnessBase {
@@ -85,30 +85,17 @@ public StepHarnessWithFile testResourceUnaffected(String resourceIdempotent) {
 		return testUnaffected(file, contentBefore);
 	}
 
-	public AbstractStringAssert<?> testResourceExceptionMsg(String resourceBefore) {
-		return testResourceExceptionMsg(resourceBefore, resourceBefore);
+	public StringSelfie expectLintsOfResource(String resource) {
+		return expectLintsOfResource(resource, resource);
 	}
 
-	public AbstractStringAssert<?> testResourceExceptionMsg(String filename, String resourceBefore) {
-		String contentBefore = ResourceHarness.getTestResource(resourceBefore);
-		File file = harness.setFile(filename).toContent(contentBefore);
-		return testExceptionMsg(file, contentBefore);
-	}
-
-	public AbstractStringAssert<?> testExceptionMsg(File file, String before) {
+	public StringSelfie expectLintsOfResource(String filename, String resource) {
 		try {
-			formatter().compute(LineEnding.toUnix(before), file);
-			throw new SecurityException("Expected exception");
-		} catch (Throwable e) {
-			if (e instanceof SecurityException) {
-				throw new AssertionError(e.getMessage());
-			} else {
-				Throwable rootCause = e;
-				while (rootCause.getCause() != null) {
-					rootCause = rootCause.getCause();
-				}
-				return Assertions.assertThat(rootCause.getMessage());
-			}
+			File file = harness.setFile(filename).toResource(resource);
+			LintState state = LintState.of(formatter(), file);
+			return StepHarness.expectLintsOf(state, formatter());
+		} catch (IOException e) {
+			throw new AssertionError(e);
 		}
 	}
 }

From 7091b9766e83554337888addba9a57d613246fe5 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 20 Oct 2024 09:01:32 -0700
Subject: [PATCH 1866/2068] lintify DiktatStep

---
 .../compat/DiktatCompat1Dot2Dot5Adapter.java  |  6 +--
 .../compat/DiktatCompat2Dot0Dot0Adapter.java  |  4 +-
 .../glue/diktat/compat/DiktatReporting.java   | 41 +++++++++++++------
 .../glue/diktat/DiktatFormatterFunc.java      | 11 ++++-
 .../diffplug/spotless/kotlin/DiktatStep.java  |  3 +-
 .../spotless/kotlin/DiktatStepTest.java       | 17 +++-----
 6 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/lib/src/compatDiktat1Dot2Dot5/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat1Dot2Dot5Adapter.java b/lib/src/compatDiktat1Dot2Dot5/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat1Dot2Dot5Adapter.java
index 749d0a1f61..ff27e96d47 100644
--- a/lib/src/compatDiktat1Dot2Dot5/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat1Dot2Dot5Adapter.java
+++ b/lib/src/compatDiktat1Dot2Dot5/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat1Dot2Dot5Adapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -77,9 +77,7 @@ public String format(final File file, final String content, final boolean isScri
 				false,
 				new EditorConfigOverride(),
 				false));
-
-		DiktatReporting.reportIfRequired(errors, LintError::getLine, LintError::getCol, LintError::getDetail);
-
+		DiktatReporting.reportIfRequired(errors, LintError::getLine, LintError::getRuleId, LintError::getDetail);
 		return result;
 	}
 }
diff --git a/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java b/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java
index 5b264a46ed..b0625b82bb 100644
--- a/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java
+++ b/lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,7 +49,7 @@ public DiktatCompat2Dot0Dot0Adapter(@Nullable File configFile) {
 	public String format(File file, String content, boolean isScript) {
 		errors.clear();
 		String result = processor.fix(content, file.toPath(), formatterCallback);
-		DiktatReporting.reportIfRequired(errors, DiktatError::getLine, DiktatError::getCol, DiktatError::getDetail);
+		DiktatReporting.reportIfRequired(errors, DiktatError::getLine, DiktatError::getRuleId, DiktatError::getDetail);
 		return result;
 	}
 
diff --git a/lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatReporting.java b/lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatReporting.java
index fdc7e56614..b51c9508a6 100644
--- a/lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatReporting.java
+++ b/lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatReporting.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,28 +15,45 @@
  */
 package com.diffplug.spotless.glue.diktat.compat;
 
+import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Function;
 import java.util.function.ToIntFunction;
 
-interface DiktatReporting {
+public interface DiktatReporting {
+	class Lint implements Serializable {
+		private static final long serialVersionUID = 1L;
+		public final int line;
+		public final String ruleId;
+		public final String detail;
+
+		Lint(int line, String ruleId, String detail) {
+			this.line = line;
+			this.ruleId = ruleId;
+			this.detail = detail;
+		}
+	}
+
+	class LintException extends RuntimeException {
+		public final List<Lint> lints;
+
+		LintException(List<Lint> lints) {
+			this.lints = lints;
+		}
+	}
+
 	static <T> void reportIfRequired(
 			List<T> errors,
 			ToIntFunction<T> lineGetter,
-			ToIntFunction<T> columnGetter,
+			Function<T, String> codeGetter,
 			Function<T, String> detailGetter) {
 		if (!errors.isEmpty()) {
-			StringBuilder error = new StringBuilder();
-			error.append("There are ").append(errors.size()).append(" unfixed errors:");
+			var lints = new ArrayList<Lint>();
 			for (T er : errors) {
-				error.append(System.lineSeparator())
-						.append("Error on line: ").append(lineGetter.applyAsInt(er))
-						.append(", column: ").append(columnGetter.applyAsInt(er))
-						.append(" cannot be fixed automatically")
-						.append(System.lineSeparator())
-						.append(detailGetter.apply(er));
+				lints.add(new Lint(lineGetter.applyAsInt(er), codeGetter.apply(er), detailGetter.apply(er)));
 			}
-			throw new AssertionError(error);
+			throw new LintException(lints);
 		}
 	}
 }
diff --git a/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java b/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java
index 1f1c15c97d..700c84da45 100644
--- a/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java
+++ b/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 DiffPlug
+ * Copyright 2021-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,14 @@
 package com.diffplug.spotless.glue.diktat;
 
 import java.io.File;
+import java.util.stream.Collectors;
 
 import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.Lint;
 import com.diffplug.spotless.glue.diktat.compat.DiktatCompat1Dot2Dot5Adapter;
 import com.diffplug.spotless.glue.diktat.compat.DiktatCompat2Dot0Dot0Adapter;
 import com.diffplug.spotless.glue.diktat.compat.DiktatCompatAdapter;
+import com.diffplug.spotless.glue.diktat.compat.DiktatReporting;
 
 public class DiktatFormatterFunc implements FormatterFunc.NeedsFile {
 	private final DiktatCompatAdapter adapter;
@@ -40,6 +43,10 @@ public DiktatFormatterFunc(
 
 	@Override
 	public String applyWithFile(String unix, File file) {
-		return adapter.format(file, unix, isScript);
+		try {
+			return adapter.format(file, unix, isScript);
+		} catch (DiktatReporting.LintException e) {
+			throw Lint.shortcut(e.lints.stream().map(lint -> Lint.atLine(lint.line, lint.ruleId, lint.detail)).collect(Collectors.toList()));
+		}
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
index 425786d64e..daf101d9ce 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
@@ -16,7 +16,6 @@
 package com.diffplug.spotless.kotlin;
 
 import java.io.File;
-import java.io.IOException;
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
 import java.util.*;
@@ -95,7 +94,7 @@ static final class State implements Serializable {
 		private final boolean isScript;
 		private final @Nullable FileSignature config;
 
-		State(JarState jar, String versionDiktat, boolean isScript, @Nullable FileSignature config) throws IOException {
+		State(JarState jar, String versionDiktat, boolean isScript, @Nullable FileSignature config) {
 			this.jar = jar;
 			this.versionDiktat = versionDiktat;
 			this.isScript = isScript;
diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
index 9976fe0e84..82180045c6 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 DiffPlug
+ * Copyright 2021-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,15 +29,11 @@
 import com.diffplug.spotless.TestProvisioner;
 
 class DiktatStepTest extends ResourceHarness {
-
 	@Test
 	void behavior() {
 		FormatterStep step = DiktatStep.create(TestProvisioner.mavenCentral());
-		StepHarnessWithFile.forStep(this, step).testResourceExceptionMsg("kotlin/diktat/Unsolvable.kt").isEqualTo("There are 2 unfixed errors:" +
-				System.lineSeparator() + "Error on line: 12, column: 9 cannot be fixed automatically" +
-				System.lineSeparator() + "[DEBUG_PRINT] use a dedicated logging library: found println()" +
-				System.lineSeparator() + "Error on line: 13, column: 9 cannot be fixed automatically" +
-				System.lineSeparator() + "[DEBUG_PRINT] use a dedicated logging library: found println()");
+		StepHarnessWithFile.forStep(this, step).expectLintsOfResource("kotlin/diktat/Unsolvable.kt").toBe("L12 diktat(diktat-ruleset:debug-print) [DEBUG_PRINT] use a dedicated logging library: found println()",
+				"L13 diktat(diktat-ruleset:debug-print) [DEBUG_PRINT] use a dedicated logging library: found println()");
 	}
 
 	@Test
@@ -47,11 +43,8 @@ void behaviorConf() throws Exception {
 		FileSignature config = signAsList(conf);
 
 		FormatterStep step = DiktatStep.create("1.2.1", TestProvisioner.mavenCentral(), config);
-		StepHarnessWithFile.forStep(this, step).testResourceExceptionMsg("kotlin/diktat/Unsolvable.kt").isEqualTo("There are 2 unfixed errors:" +
-				System.lineSeparator() + "Error on line: 1, column: 1 cannot be fixed automatically" +
-				System.lineSeparator() + "[DEBUG_PRINT] use a dedicated logging library: found println()" +
-				System.lineSeparator() + "Error on line: 13, column: 9 cannot be fixed automatically" +
-				System.lineSeparator() + "[DEBUG_PRINT] use a dedicated logging library: found println()");
+		StepHarnessWithFile.forStep(this, step).expectLintsOfResource("kotlin/diktat/Unsolvable.kt").toBe("L1 diktat(diktat-ruleset:debug-print) [DEBUG_PRINT] use a dedicated logging library: found println()",
+				"L13 diktat(diktat-ruleset:debug-print) [DEBUG_PRINT] use a dedicated logging library: found println()");
 	}
 
 	@Test

From 99c370584f3eafe0796e2360a7da005215dff5b7 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 20 Oct 2024 09:03:38 -0700
Subject: [PATCH 1867/2068] lintify KtLintStep.

---
 .../ktlint/compat/KtLintCompatReporting.java  | 20 +++++++++++--
 .../glue/ktlint/KtlintFormatterFunc.java      | 15 ++++++----
 .../spotless/maven/kotlin/KtlintTest.java     |  5 ++--
 .../spotless/kotlin/KtLintStepTest.java       | 30 +++++--------------
 4 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatReporting.java b/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatReporting.java
index 7c1e0f6dd8..5b6fcc70bf 100644
--- a/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatReporting.java
+++ b/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatReporting.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 DiffPlug
+ * Copyright 2022-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,11 +15,25 @@
  */
 package com.diffplug.spotless.glue.ktlint.compat;
 
-final class KtLintCompatReporting {
+public final class KtLintCompatReporting {
 
 	private KtLintCompatReporting() {}
 
 	static void report(int line, int column, String ruleId, String detail) {
-		throw new AssertionError("Error on line: " + line + ", column: " + column + "\nrule: " + ruleId + "\n" + detail);
+		throw new KtlintSpotlessException(line, ruleId, detail);
+	}
+
+	public static class KtlintSpotlessException extends RuntimeException {
+		private static final long serialVersionUID = 1L;
+
+		public final int line;
+		public final String ruleId;
+		public final String detail;
+
+		KtlintSpotlessException(int line, String ruleId, String detail) {
+			this.line = line;
+			this.ruleId = ruleId;
+			this.detail = detail;
+		}
 	}
 }
diff --git a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
index a8e5bc32fc..a572d3a577 100644
--- a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
+++ b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
@@ -21,6 +21,7 @@
 
 import com.diffplug.spotless.FileSignature;
 import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.Lint;
 import com.diffplug.spotless.glue.ktlint.compat.*;
 
 public class KtlintFormatterFunc implements FormatterFunc.NeedsFile {
@@ -65,10 +66,14 @@ public String applyWithFile(String unix, File file) throws NoSuchFieldException,
 		if (editorConfigPath != null) {
 			absoluteEditorConfigPath = editorConfigPath.getOnlyFile().toPath();
 		}
-		return adapter.format(
-				unix,
-				file.toPath(),
-				absoluteEditorConfigPath,
-				editorConfigOverrideMap);
+		try {
+			return adapter.format(
+					unix,
+					file.toPath(),
+					absoluteEditorConfigPath,
+					editorConfigOverrideMap);
+		} catch (KtLintCompatReporting.KtlintSpotlessException e) {
+			throw Lint.atLine(e.line, e.ruleId, e.detail).shortcut();
+		}
 	}
 }
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
index 5586335449..0f02f331aa 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
@@ -15,8 +15,7 @@
  */
 package com.diffplug.spotless.maven.kotlin;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
+import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.ProcessRunner;
@@ -89,7 +88,7 @@ void testWithCustomRuleSetApply() throws Exception {
 				"</ktlint>");
 		setFile("src/main/kotlin/Main.kt").toResource("kotlin/ktlint/listScreen.dirty");
 		ProcessRunner.Result result = mavenRunner().withArguments("spotless:check").runHasError();
-		assertTrue(result.toString().contains("Composable functions that return Unit should start with an uppercase letter."));
+		Assertions.assertThat(result.toString()).contains("Composable functions that return Unit should start with an uppercase letter.");
 	}
 
 	private void checkKtlintOfficialStyle() throws Exception {
diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
index 02526b46e6..0d520b8b0c 100644
--- a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,9 +29,7 @@ void works0_48_0() {
 		FormatterStep step = KtLintStep.create("0.48.0", TestProvisioner.mavenCentral());
 		StepHarnessWithFile.forStep(this, step)
 				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic-old.clean")
-				.testResourceExceptionMsg("kotlin/ktlint/unsolvable.dirty").isEqualTo("Error on line: 1, column: 1\n" +
-						"rule: no-wildcard-imports\n" +
-						"Wildcard import");
+				.expectLintsOfResource("kotlin/ktlint/unsolvable.dirty").toBe("L1 ktlint(no-wildcard-imports) Wildcard import");
 	}
 
 	@Test
@@ -39,9 +37,7 @@ void works0_48_1() {
 		FormatterStep step = KtLintStep.create("0.48.1", TestProvisioner.mavenCentral());
 		StepHarnessWithFile.forStep(this, step)
 				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic-old.clean")
-				.testResourceExceptionMsg("kotlin/ktlint/unsolvable.dirty").isEqualTo("Error on line: 1, column: 1\n" +
-						"rule: no-wildcard-imports\n" +
-						"Wildcard import");
+				.expectLintsOfResource("kotlin/ktlint/unsolvable.dirty").toBe("L1 ktlint(no-wildcard-imports) Wildcard import");
 	}
 
 	@Test
@@ -49,9 +45,7 @@ void works0_49_0() {
 		FormatterStep step = KtLintStep.create("0.49.0", TestProvisioner.mavenCentral());
 		StepHarnessWithFile.forStep(this, step)
 				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic-old.clean")
-				.testResourceExceptionMsg("kotlin/ktlint/unsolvable.dirty").isEqualTo("Error on line: 1, column: 1\n" +
-						"rule: standard:no-wildcard-imports\n" +
-						"Wildcard import");
+				.expectLintsOfResource("kotlin/ktlint/unsolvable.dirty").toBe("L1 ktlint(standard:no-wildcard-imports) Wildcard import");
 	}
 
 	@Test
@@ -59,9 +53,7 @@ void works0_49_1() {
 		FormatterStep step = KtLintStep.create("0.49.1", TestProvisioner.mavenCentral());
 		StepHarnessWithFile.forStep(this, step)
 				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic-old.clean")
-				.testResourceExceptionMsg("kotlin/ktlint/unsolvable.dirty").isEqualTo("Error on line: 1, column: 1\n" +
-						"rule: standard:no-wildcard-imports\n" +
-						"Wildcard import");
+				.expectLintsOfResource("kotlin/ktlint/unsolvable.dirty").toBe("L1 ktlint(standard:no-wildcard-imports) Wildcard import");
 	}
 
 	@Test
@@ -69,9 +61,7 @@ void works0_50_0() {
 		FormatterStep step = KtLintStep.create("0.50.0", TestProvisioner.mavenCentral());
 		StepHarnessWithFile.forStep(this, step)
 				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean")
-				.testResourceExceptionMsg("kotlin/ktlint/unsolvable.dirty").isEqualTo("Error on line: 1, column: 1\n" +
-						"rule: standard:no-wildcard-imports\n" +
-						"Wildcard import");
+				.expectLintsOfResource("kotlin/ktlint/unsolvable.dirty").toBe("L1 ktlint(standard:no-wildcard-imports) Wildcard import");
 	}
 
 	@Test
@@ -79,9 +69,7 @@ void works1_0_0() {
 		FormatterStep step = KtLintStep.create("1.0.0", TestProvisioner.mavenCentral());
 		StepHarnessWithFile.forStep(this, step)
 				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean")
-				.testResourceExceptionMsg("kotlin/ktlint/unsolvable.dirty").isEqualTo("Error on line: 1, column: 1\n" +
-						"rule: standard:no-empty-file\n" +
-						"File 'unsolvable.dirty' should not be empty");
+				.expectLintsOfResource("kotlin/ktlint/unsolvable.dirty").toBe("L1 ktlint(standard:no-empty-file) File 'unsolvable.dirty' should not be empty");
 	}
 
 	@Test
@@ -89,9 +77,7 @@ void behavior() {
 		FormatterStep step = KtLintStep.create(TestProvisioner.mavenCentral());
 		StepHarnessWithFile.forStep(this, step)
 				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean")
-				.testResourceExceptionMsg("kotlin/ktlint/unsolvable.dirty").isEqualTo("Error on line: 1, column: 1\n" +
-						"rule: standard:no-empty-file\n" +
-						"File 'unsolvable.dirty' should not be empty");
+				.expectLintsOfResource("kotlin/ktlint/unsolvable.dirty").toBe("L1 ktlint(standard:no-empty-file) File 'unsolvable.dirty' should not be empty");
 	}
 
 	@Test

From 72e9ef7c394281562f31fa237e7e988d72180e85 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 20 Oct 2024 09:05:07 -0700
Subject: [PATCH 1868/2068] lintify GsonStep (tests only)

---
 .../spotless/glue/gson/GsonFormatterFunc.java |  6 +--
 .../spotless/json/gson/GsonStepTest.java      | 43 +++++++++++++++----
 2 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/lib/src/gson/java/com/diffplug/spotless/glue/gson/GsonFormatterFunc.java b/lib/src/gson/java/com/diffplug/spotless/glue/gson/GsonFormatterFunc.java
index 0ff5037cba..d1533d6b43 100644
--- a/lib/src/gson/java/com/diffplug/spotless/glue/gson/GsonFormatterFunc.java
+++ b/lib/src/gson/java/com/diffplug/spotless/glue/gson/GsonFormatterFunc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@
 
 public class GsonFormatterFunc implements FormatterFunc {
 
-	private static final String FAILED_TO_PARSE_ERROR_MESSAGE = "Unable to format JSON";
+	private static final String FAILED_TO_PARSE_ERROR_MESSAGE = "Unable to parse JSON";
 
 	private final Gson gson;
 	private final GsonConfig gsonConfig;
@@ -56,7 +56,7 @@ public String apply(String inputString) {
 		} else {
 			JsonElement jsonElement = gson.fromJson(inputString, JsonElement.class);
 			if (jsonElement == null) {
-				throw new AssertionError(FAILED_TO_PARSE_ERROR_MESSAGE);
+				throw new IllegalArgumentException(FAILED_TO_PARSE_ERROR_MESSAGE);
 			}
 			if (gsonConfig.isSortByKeys()) {
 				jsonElement = sortByKeys(jsonElement);
diff --git a/testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java b/testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java
index afe56a0a48..9ac053f827 100644
--- a/testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java
@@ -17,9 +17,6 @@
 
 import static com.diffplug.spotless.json.gson.GsonStep.DEFAULT_VERSION;
 
-import java.io.File;
-
-import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.FormatterStep;
@@ -42,12 +39,32 @@ void handlesObjectWithNull() {
 
 	@Test
 	void handlesInvalidJson() {
-		getStepHarness().testResourceExceptionMsg("json/invalidJsonBefore.json").isEqualTo("End of input at line 3 column 1 path $.a");
+		getStepHarness().expectLintsOfResource("json/invalidJsonBefore.json").toBe("L3 gson(com.google.gson.JsonSyntaxException) java.io.EOFException: End of input at line 3 column 1 path $.a",
+				"\tat com.google.gson.Gson.fromJson(Gson.java:1370)",
+				"\tat com.google.gson.Gson.fromJson(Gson.java:1262)",
+				"\tat com.google.gson.Gson.fromJson(Gson.java:1171)",
+				"\tat com.google.gson.Gson.fromJson(Gson.java:1107)",
+				"\tat com.diffplug.spotless.glue.gson.GsonFormatterFunc.apply(GsonFormatterFunc.java:57)",
+				"\tat com.diffplug.spotless.FormatterFunc.apply(FormatterFunc.java:33)",
+				"\tat com.diffplug.spotless.FormatterStepEqualityOnStateSerialization.format(FormatterStepEqualityOnStateSerialization.java:49)",
+				"\tat com.diffplug.spotless.LintState.of(LintState.java:141)",
+				"\tat com.diffplug.spotless.StepHarness.expectLintsOf(StepHarness.java:96)",
+				"(... and more)");
 	}
 
 	@Test
 	void handlesNotJson() {
-		getStepHarness().testResourceExceptionMsg("json/notJsonBefore.json").isEqualTo("Unable to format JSON");
+		getStepHarness().expectLintsOfResource("json/notJsonBefore.json").toBe("LINE_UNDEFINED gson(java.lang.IllegalArgumentException) Unable to parse JSON",
+				"\tat com.diffplug.spotless.glue.gson.GsonFormatterFunc.apply(GsonFormatterFunc.java:59)",
+				"\tat com.diffplug.spotless.FormatterFunc.apply(FormatterFunc.java:33)",
+				"\tat com.diffplug.spotless.FormatterStepEqualityOnStateSerialization.format(FormatterStepEqualityOnStateSerialization.java:49)",
+				"\tat com.diffplug.spotless.LintState.of(LintState.java:141)",
+				"\tat com.diffplug.spotless.StepHarness.expectLintsOf(StepHarness.java:96)",
+				"\tat com.diffplug.spotless.StepHarness.expectLintsOfResource(StepHarness.java:92)",
+				"\tat com.diffplug.spotless.json.gson.GsonStepTest.handlesNotJson(GsonStepTest.java:57)",
+				"\tat java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)",
+				"\tat java.base/java.lang.reflect.Method.invoke(Method.java:580)",
+				"(... and more)");
 	}
 
 	@Test
@@ -79,10 +96,18 @@ void writesRawHtmlWhenHtmlEscapeDisabled() {
 
 	@Test
 	void handlesVersionIncompatibility() {
-		FormatterStep step = GsonStep.create(new GsonConfig(false, false, INDENT, "1.7"), TestProvisioner.mavenCentral());
-		Assertions.assertThatThrownBy(() -> step.format("", new File("")))
-				.isInstanceOf(IllegalStateException.class)
-				.hasMessage("There was a problem interacting with Gson; maybe you set an incompatible version?");
+		StepHarness.forStep(GsonStep.create(new GsonConfig(false, false, INDENT, "1.7"), TestProvisioner.mavenCentral()))
+				.expectLintsOf("").toBe("LINE_UNDEFINED gson(java.lang.IllegalStateException) There was a problem interacting with Gson; maybe you set an incompatible version?",
+						"\tat com.diffplug.spotless.json.gson.GsonStep$State.toFormatter(GsonStep.java:73)",
+						"\tat com.diffplug.spotless.FormatterStepSerializationRoundtrip.stateToFormatter(FormatterStepSerializationRoundtrip.java:64)",
+						"\tat com.diffplug.spotless.FormatterStepEqualityOnStateSerialization.format(FormatterStepEqualityOnStateSerialization.java:47)",
+						"\tat com.diffplug.spotless.LintState.of(LintState.java:141)",
+						"\tat com.diffplug.spotless.StepHarness.expectLintsOf(StepHarness.java:96)",
+						"\tat com.diffplug.spotless.json.gson.GsonStepTest.handlesVersionIncompatibility(GsonStepTest.java:100)",
+						"\tat java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)",
+						"\tat java.base/java.lang.reflect.Method.invoke(Method.java:580)",
+						"\tat org.junit.platform.commons.util.ReflectionUtils.invokeMethod(ReflectionUtils.java:766)",
+						"(... and more)");
 	}
 
 	@Override

From cb9cbcdd5cfab927abc934ca33516f2288e7ab70 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 20 Oct 2024 09:05:40 -0700
Subject: [PATCH 1869/2068] lintify JsonStep (tests only)

---
 .../spotless/json/JsonSimpleStepTest.java     | 29 +++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/testlib/src/test/java/com/diffplug/spotless/json/JsonSimpleStepTest.java b/testlib/src/test/java/com/diffplug/spotless/json/JsonSimpleStepTest.java
index 19edc1a8e8..735ce77b53 100644
--- a/testlib/src/test/java/com/diffplug/spotless/json/JsonSimpleStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/json/JsonSimpleStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 DiffPlug
+ * Copyright 2021-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -73,14 +73,33 @@ void handlesObjectWithNull() {
 
 	@Test
 	void handlesInvalidJson() {
-		stepHarness.testResourceExceptionMsg("json/invalidJsonBefore.json")
-				.contains("Expected a ',' or '}' at 9 [character 0 line 3]");
+		stepHarness.expectLintsOfResource("json/invalidJsonBefore.json").toBe("L3 jsonSimple(java.lang.IllegalArgumentException) Unable to format JSON",
+				"\tat com.diffplug.spotless.json.JsonSimpleStep$State.format(JsonSimpleStep.java:109)",
+				"\tat com.diffplug.spotless.json.JsonSimpleStep$State.lambda$toFormatter$0(JsonSimpleStep.java:94)",
+				"\tat com.diffplug.spotless.FormatterFunc.apply(FormatterFunc.java:33)",
+				"\tat com.diffplug.spotless.FormatterStepEqualityOnStateSerialization.format(FormatterStepEqualityOnStateSerialization.java:49)",
+				"\tat com.diffplug.spotless.LintState.of(LintState.java:141)",
+				"\tat com.diffplug.spotless.StepHarness.expectLintsOf(StepHarness.java:96)",
+				"\tat com.diffplug.spotless.StepHarness.expectLintsOfResource(StepHarness.java:92)",
+				"\tat com.diffplug.spotless.json.JsonSimpleStepTest.handlesInvalidJson(JsonSimpleStepTest.java:76)",
+				"\tat java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)",
+				"(... and more)");
 	}
 
 	@Test
 	void handlesNotJson() {
-		stepHarness.testResourceExceptionMsg("json/notJsonBefore.json")
-				.contains("Unable to determine JSON type, expected a '{' or '[' but found '#'");
+		stepHarness.expectLintsOfResource("json/notJsonBefore.json")
+				.toBe("LINE_UNDEFINED jsonSimple(java.lang.IllegalArgumentException) Unable to determine JSON type, expected a '{' or '[' but found '#'",
+						"\tat com.diffplug.spotless.json.JsonSimpleStep$State.lambda$toFormatter$0(JsonSimpleStep.java:100)",
+						"\tat com.diffplug.spotless.FormatterFunc.apply(FormatterFunc.java:33)",
+						"\tat com.diffplug.spotless.FormatterStepEqualityOnStateSerialization.format(FormatterStepEqualityOnStateSerialization.java:49)",
+						"\tat com.diffplug.spotless.LintState.of(LintState.java:141)",
+						"\tat com.diffplug.spotless.StepHarness.expectLintsOf(StepHarness.java:96)",
+						"\tat com.diffplug.spotless.StepHarness.expectLintsOfResource(StepHarness.java:92)",
+						"\tat com.diffplug.spotless.json.JsonSimpleStepTest.handlesNotJson(JsonSimpleStepTest.java:91)",
+						"\tat java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)",
+						"\tat java.base/java.lang.reflect.Method.invoke(Method.java:580)",
+						"(... and more)");
 	}
 
 	@Test

From 873cc58d45a1259c32d14c8be12424b374bb84f2 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 20 Oct 2024 09:06:09 -0700
Subject: [PATCH 1870/2068] lintify PrettierFormatterStep (tests only)

---
 .../spotless/npm/PrettierFormatterStepTest.java    | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
index fb92eb9d39..ac146229db 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
@@ -136,8 +136,18 @@ void verifyPrettierErrorMessageIsRelayed() throws Exception {
 					npmPathResolver(),
 					new PrettierConfig(null, ImmutableMap.of("parser", "postcss")));
 			try (StepHarnessWithFile stepHarness = StepHarnessWithFile.forStep(this, formatterStep)) {
-				stepHarness.testResourceExceptionMsg("npm/prettier/filetypes/scss/scss.dirty").isEqualTo(
-						"Unexpected response status code at /prettier/format [HTTP 500] -- (Error while formatting: Error: Couldn't resolve parser \"postcss\")");
+				stepHarness.expectLintsOfResource("npm/prettier/filetypes/scss/scss.dirty")
+						.toBe("1-35 prettier-format(prettier-format) com.diffplug.spotless.npm.SimpleRestClient$SimpleRestResponseException: Unexpected response status code at /prettier/format [HTTP 500] -- (Error while formatting: Error: Couldn't resolve parser \"postcss\")",
+								"\tat com.diffplug.spotless.npm.SimpleRestClient.postJson(SimpleRestClient.java:72)",
+								"\tat com.diffplug.spotless.npm.SimpleRestClient.postJson(SimpleRestClient.java:46)",
+								"\tat com.diffplug.spotless.npm.PrettierRestService.format(PrettierRestService.java:46)",
+								"\tat com.diffplug.spotless.npm.PrettierFormatterStep$PrettierFilePathPassingFormatterFunc.applyWithFile(PrettierFormatterStep.java:125)",
+								"\tat com.diffplug.spotless.FormatterFunc$NeedsFile.apply(FormatterFunc.java:174)",
+								"\tat com.diffplug.spotless.FormatterFunc$Closeable$1.apply(FormatterFunc.java:73)",
+								"\tat com.diffplug.spotless.FormatterStepEqualityOnStateSerialization.format(FormatterStepEqualityOnStateSerialization.java:49)",
+								"\tat com.diffplug.spotless.LintState.of(LintState.java:135)",
+								"\tat com.diffplug.spotless.LintState.of(LintState.java:92)",
+								"(... and more)");
 			}
 		}
 	}

From 17767494542257721bbbe7dd779928f091dd1092 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 20 Oct 2024 09:06:29 -0700
Subject: [PATCH 1871/2068] lintify FenceStep (adjustment)

---
 .../main/java/com/diffplug/spotless/generic/FenceStep.java   | 5 ++---
 .../java/com/diffplug/spotless/generic/FenceStepTest.java    | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java b/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
index 3cb0e3f047..71b48159cd 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
@@ -210,9 +210,8 @@ protected String assembleGroups(String unix) {
 				} else {
 					pattern = regex.pattern();
 				}
-				throw new Lint.ShortcutException(Lint.create("fenceRemoved",
-						"An intermediate step removed a match of " + pattern,
-						startLine, endLine));
+				throw Lint.atLineRange(startLine, endLine, "fenceRemoved",
+						"An intermediate step removed a match of " + pattern).shortcut();
 			}
 		}
 
diff --git a/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java b/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java
index 3d9d2ed0fc..95b504c15f 100644
--- a/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java
@@ -89,7 +89,7 @@ void broken() {
 				"spotless:off",
 				"D E F",
 				"spotless:on",
-				"G H I")).toBe("1-6 fence(fenceRemoved) An intermediate step removed a match of spotless:off spotless:on");
+				"G H I")).toBe("L1-6 fence(fenceRemoved) An intermediate step removed a match of spotless:off spotless:on");
 	}
 
 	@Test

From 5e21a1120cfb7a8cfb4712d3c0dd8f624800e6de Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 20 Oct 2024 09:06:44 -0700
Subject: [PATCH 1872/2068] lintify the Jvm version infrastructure

---
 lib/src/main/java/com/diffplug/spotless/Jvm.java       |  6 ++++--
 .../src/test/java/com/diffplug/spotless/JvmTest.java   | 10 +++++-----
 .../spotless/java/GoogleJavaFormatStepTest.java        | 10 ++++++----
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/Jvm.java b/lib/src/main/java/com/diffplug/spotless/Jvm.java
index 880575c3b8..3e8339644a 100644
--- a/lib/src/main/java/com/diffplug/spotless/Jvm.java
+++ b/lib/src/main/java/com/diffplug/spotless/Jvm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -61,6 +61,8 @@ public static int version() {
 	 * @param <V> Version type of formatter
 	 */
 	public static class Support<V> {
+		static final String LINT_CODE = "jvm-version";
+
 		private final String fmtName;
 		private final Comparator<? super V> fmtVersionComparator;
 		private final NavigableMap<Integer, V> jvm2fmtMaxVersion;
@@ -139,7 +141,7 @@ public void assertFormatterSupported(V formatterVersion) {
 			Objects.requireNonNull(formatterVersion);
 			String error = buildUnsupportedFormatterMessage(formatterVersion);
 			if (!error.isEmpty()) {
-				throw new IllegalArgumentException(error);
+				throw Lint.atUndefinedLine(LINT_CODE, error).shortcut();
 			}
 		}
 
diff --git a/testlib/src/test/java/com/diffplug/spotless/JvmTest.java b/testlib/src/test/java/com/diffplug/spotless/JvmTest.java
index 1c966c51f4..801ca2ab24 100644
--- a/testlib/src/test/java/com/diffplug/spotless/JvmTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/JvmTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 DiffPlug
+ * Copyright 2021-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -94,9 +94,9 @@ void supportListsMinimumJvmIfOnlyHigherJvmSupported() {
 		assertNull(testSupport.getRecommendedFormatterVersion(), "No formatter version is supported");
 
 		for (String fmtVersion : Arrays.asList("1.2", "1.2.3", "1.2-SNAPSHOT", "1.2.3-SNAPSHOT")) {
-			String proposal = assertThrows(Exception.class, () -> {
+			String proposal = assertThrows(Lint.ShortcutException.class, () -> {
 				testSupport.assertFormatterSupported(fmtVersion);
-			}).getMessage();
+			}).getLints().get(0).getDetail();
 			assertThat(proposal).contains(String.format("on JVM %d", Jvm.version()));
 			assertThat(proposal).contains(String.format("%s %s requires JVM %d+", TEST_NAME, fmtVersion, higherJvmVersion));
 			assertThat(proposal).contains(String.format("try %s alternatives", TEST_NAME));
@@ -112,9 +112,9 @@ void supportListsMinimumJvmIfOnlyHigherJvmSupported() {
 		}
 
 		for (String fmtVersion : Arrays.asList("1.2.4", "2", "1.2.5-SNAPSHOT")) {
-			String proposal = assertThrows(Exception.class, () -> {
+			String proposal = assertThrows(Lint.ShortcutException.class, () -> {
 				testSupport.assertFormatterSupported(fmtVersion);
-			}).getMessage();
+			}).getLints().get(0).getDetail();
 			assertThat(proposal).contains(String.format("%s %s requires JVM %d+", TEST_NAME, fmtVersion, higherJvmVersion + 1));
 
 			proposal = assertThrows(Exception.class, () -> {
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java
index 4b157c536a..eee49d587f 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java
@@ -65,8 +65,9 @@ void behavior() throws Exception {
 	void versionBelowMinimumRequiredVersionIsNotAllowed() throws Exception {
 		FormatterStep step = GoogleJavaFormatStep.create("1.2", "AOSP", TestProvisioner.mavenCentral());
 		StepHarness.forStepNoRoundtrip(step)
-				.testResourceExceptionMsg("java/googlejavaformat/JavaCodeWithLicenseUnformatted.test")
-				.contains("you are using 1.2");
+				.expectLintsOfResource("java/googlejavaformat/JavaCodeWithLicenseUnformatted.test")
+				.toBe("LINE_UNDEFINED google-java-format(jvm-version) You are running Spotless on JVM 21. This requires google-java-format of at least 1.17.0 (you are using 1.2).",
+						"");
 	}
 
 	@Test
@@ -74,8 +75,9 @@ void versionBelowMinimumRequiredVersionIsNotAllowed() throws Exception {
 	void versionBelowOneDotTenIsNotAllowed() throws Exception {
 		FormatterStep step = GoogleJavaFormatStep.create("1.9", "AOSP", TestProvisioner.mavenCentral());
 		StepHarness.forStepNoRoundtrip(step)
-				.testResourceExceptionMsg("java/googlejavaformat/JavaCodeWithLicenseUnformatted.test")
-				.contains("you are using 1.9");
+				.expectLintsOfResource("java/googlejavaformat/JavaCodeWithLicenseUnformatted.test")
+				.toBe("LINE_UNDEFINED google-java-format(jvm-version) You are running Spotless on JVM 21. This requires google-java-format of at least 1.17.0 (you are using 1.9).",
+						"");
 	}
 
 	@Test

From 71c61e086dfcbfce2dca1f4adb7cc334a5a5febd Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 20 Oct 2024 09:28:03 -0700
Subject: [PATCH 1873/2068] Tweak the readme.

---
 plugin-gradle/README.md | 10 +++++++---
 plugin-maven/README.md  | 10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index c8cb7e4d6b..80fcafb7bb 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -1577,11 +1577,15 @@ spotless {
     encoding 'Cp1252' // except java, which will be Cp1252
 ```
 
-Line endings can also be set globally or per-format using the `lineEndings` property.  Spotless supports four line ending modes: `UNIX`, `WINDOWS`, `MAC_CLASSIC`, `PLATFORM_NATIVE`, `GIT_ATTRIBUTES`, `GIT_ATTRIBUTES_FAST_ALLSAME` and `PRESERVE`.  The default value is `GIT_ATTRIBUTES_FAST_ALLSAME`, and *we highly recommend that you* ***do not change*** *this value*.  Git has opinions about line endings, and if Spotless and git disagree, then you're going to have a bad time. `FAST_ALLSAME` just means that Spotless can assume that every file being formatted has the same line endings ([more info](https://github.com/diffplug/spotless/pull/1838)).
+Line endings can also be set globally or per-format using the `lineEndings` property.  Spotless supports
 
-You can easily set the line endings of different files using [a `.gitattributes` file](https://help.github.com/articles/dealing-with-line-endings/).  Here's an example `.gitattributes` which sets all files to unix newlines: `* text eol=lf`.
+- constant modes (`UNIX`, `WINDOWS`, `MAC_CLASSIC`)
+- simple modes (`PLATFORM_NATIVE`, `PRESERVE`)
+- and git-aware modes (`GIT_ATTRIBUTES`, `GIT_ATTRIBUTES_FAST_ALLSAME`)
+
+The default value is `GIT_ATTRIBUTES_FAST_ALLSAME`, and *we highly recommend that you* ***do not change*** *this value*.  Git has opinions about line endings, and if Spotless and git disagree, then you're going to have a bad time. `FAST_ALLSAME` just means that Spotless can assume that every file being formatted has the same line endings ([more info](https://github.com/diffplug/spotless/pull/1838)).
 
-Use `PRESERVE` in order to keep the existing line endings of a file. This policy enforces that all line endings equal the first one of the according file (no matter which line delimiter it is).
+You can easily set the line endings of different files using [a `.gitattributes` file](https://help.github.com/articles/dealing-with-line-endings/).  Here's an example `.gitattributes` which sets all files to unix newlines: `* text eol=lf`.
 
 <a name="custom"></a>
 <a name="custom-steps"></a>
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 91cf8acc51..8cbe7e1ef4 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -1784,11 +1784,15 @@ Spotless uses UTF-8 by default, but you can use [any encoding which Java support
 </configuration>
 ```
 
-Line endings can also be set globally or per-format using the `lineEndings` property.  Spotless supports four line ending modes: `UNIX`, `WINDOWS`, `MAC_CLASSIC`, `PLATFORM_NATIVE`, `GIT_ATTRIBUTES`, `GIT_ATTRIBUTES_FAST_ALLSAME` and `PRESERVE`.  The default value is `GIT_ATTRIBUTES_FAST_ALLSAME`, and *we highly recommend that you* ***do not change*** *this value*.  Git has opinions about line endings, and if Spotless and git disagree, then you're going to have a bad time. `FAST_ALLSAME` just means that Spotless can assume that every file being formatted has the same line endings ([more info](https://github.com/diffplug/spotless/pull/1838)).
+Line endings can also be set globally or per-format using the `lineEndings` property.  Spotless supports
 
-You can easily set the line endings of different files using [a `.gitattributes` file](https://help.github.com/articles/dealing-with-line-endings/).  Here's an example `.gitattributes` which sets all files to unix newlines: `* text eol=lf`.
+- constant modes (`UNIX`, `WINDOWS`, `MAC_CLASSIC`)
+- simple modes (`PLATFORM_NATIVE`, `PRESERVE`)
+- and git-aware modes (`GIT_ATTRIBUTES`, `GIT_ATTRIBUTES_FAST_ALLSAME`)
 
-Use `PRESERVE` in order to keep the existing line endings of a file. This policy enforces that all line endings equal the first one of the according file (no matter which line delimiter it is).
+The default value is `GIT_ATTRIBUTES_FAST_ALLSAME`, and *we highly recommend that you* ***do not change*** *this value*.  Git has opinions about line endings, and if Spotless and git disagree, then you're going to have a bad time. `FAST_ALLSAME` just means that Spotless can assume that every file being formatted has the same line endings ([more info](https://github.com/diffplug/spotless/pull/1838)).
+
+You can easily set the line endings of different files using [a `.gitattributes` file](https://help.github.com/articles/dealing-with-line-endings/). Here's an example `.gitattributes` which sets all files to unix newlines: `* text eol=lf`.
 
 <a name="enforceCheck"></a>
 

From 16c1cde1851b1d56a64148c4d5d2a1a9b15e9779 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 20 Oct 2024 09:53:55 -0700
Subject: [PATCH 1874/2068] (make multiline lints snapshot onto one line)

---
 .../java/com/diffplug/spotless/LintState.java | 21 +++++++++--
 .../com/diffplug/spotless/StepHarness.java    |  2 +-
 .../java/GoogleJavaFormatStepTest.java        |  6 ++--
 .../spotless/json/JsonSimpleStepTest.java     | 24 ++-----------
 .../spotless/json/gson/GsonStepTest.java      | 36 ++-----------------
 .../npm/PrettierFormatterStepTest.java        | 12 +------
 6 files changed, 28 insertions(+), 73 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/LintState.java b/lib/src/main/java/com/diffplug/spotless/LintState.java
index 2fcf18ef6c..b2b4030e93 100644
--- a/lib/src/main/java/com/diffplug/spotless/LintState.java
+++ b/lib/src/main/java/com/diffplug/spotless/LintState.java
@@ -62,7 +62,15 @@ public Map<FormatterStep, List<Lint>> getLints(Formatter formatter) {
 		return result;
 	}
 
-	public String asString(File file, Formatter formatter) {
+	public String asStringDetailed(File file, Formatter formatter) {
+		return asString(file, formatter, false);
+	}
+
+	public String asStringOneLine(File file, Formatter formatter) {
+		return asString(file, formatter, true);
+	}
+
+	private String asString(File file, Formatter formatter, boolean oneLine) {
 		if (!isHasLints()) {
 			return "(none)";
 		} else {
@@ -84,7 +92,16 @@ public String asString(File file, Formatter formatter) {
 						}
 						result.append(" ");
 						result.append(step.getName()).append("(").append(lint.getRuleId()).append(") ");
-						result.append(lint.getDetail());
+
+						int firstNewline = lint.getDetail().indexOf('\n');
+						if (firstNewline == -1) {
+							result.append(lint.getDetail());
+						} else if (oneLine) {
+							result.append(lint.getDetail(), 0, firstNewline);
+							result.append(" (...)");
+						} else {
+							result.append(lint.getDetail());
+						}
 						result.append("\n");
 					}
 				}
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarness.java b/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
index e45fd16a5b..5b5a28717b 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarness.java
@@ -98,7 +98,7 @@ public StringSelfie expectLintsOf(String before) {
 	}
 
 	static StringSelfie expectLintsOf(LintState state, Formatter formatter) {
-		String assertAgainst = state.asString(Formatter.NO_FILE_SENTINEL, formatter);
+		String assertAgainst = state.asStringOneLine(Formatter.NO_FILE_SENTINEL, formatter);
 		String cleaned = assertAgainst.replace("NO_FILE_SENTINEL:", "");
 
 		int numLines = 1;
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java
index eee49d587f..a1296d300c 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java
@@ -66,8 +66,7 @@ void versionBelowMinimumRequiredVersionIsNotAllowed() throws Exception {
 		FormatterStep step = GoogleJavaFormatStep.create("1.2", "AOSP", TestProvisioner.mavenCentral());
 		StepHarness.forStepNoRoundtrip(step)
 				.expectLintsOfResource("java/googlejavaformat/JavaCodeWithLicenseUnformatted.test")
-				.toBe("LINE_UNDEFINED google-java-format(jvm-version) You are running Spotless on JVM 21. This requires google-java-format of at least 1.17.0 (you are using 1.2).",
-						"");
+				.toBe("LINE_UNDEFINED google-java-format(jvm-version) You are running Spotless on JVM 21. This requires google-java-format of at least 1.17.0 (you are using 1.2). (...)");
 	}
 
 	@Test
@@ -76,8 +75,7 @@ void versionBelowOneDotTenIsNotAllowed() throws Exception {
 		FormatterStep step = GoogleJavaFormatStep.create("1.9", "AOSP", TestProvisioner.mavenCentral());
 		StepHarness.forStepNoRoundtrip(step)
 				.expectLintsOfResource("java/googlejavaformat/JavaCodeWithLicenseUnformatted.test")
-				.toBe("LINE_UNDEFINED google-java-format(jvm-version) You are running Spotless on JVM 21. This requires google-java-format of at least 1.17.0 (you are using 1.9).",
-						"");
+				.toBe("LINE_UNDEFINED google-java-format(jvm-version) You are running Spotless on JVM 21. This requires google-java-format of at least 1.17.0 (you are using 1.9). (...)");
 	}
 
 	@Test
diff --git a/testlib/src/test/java/com/diffplug/spotless/json/JsonSimpleStepTest.java b/testlib/src/test/java/com/diffplug/spotless/json/JsonSimpleStepTest.java
index 735ce77b53..947cb30136 100644
--- a/testlib/src/test/java/com/diffplug/spotless/json/JsonSimpleStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/json/JsonSimpleStepTest.java
@@ -73,33 +73,13 @@ void handlesObjectWithNull() {
 
 	@Test
 	void handlesInvalidJson() {
-		stepHarness.expectLintsOfResource("json/invalidJsonBefore.json").toBe("L3 jsonSimple(java.lang.IllegalArgumentException) Unable to format JSON",
-				"\tat com.diffplug.spotless.json.JsonSimpleStep$State.format(JsonSimpleStep.java:109)",
-				"\tat com.diffplug.spotless.json.JsonSimpleStep$State.lambda$toFormatter$0(JsonSimpleStep.java:94)",
-				"\tat com.diffplug.spotless.FormatterFunc.apply(FormatterFunc.java:33)",
-				"\tat com.diffplug.spotless.FormatterStepEqualityOnStateSerialization.format(FormatterStepEqualityOnStateSerialization.java:49)",
-				"\tat com.diffplug.spotless.LintState.of(LintState.java:141)",
-				"\tat com.diffplug.spotless.StepHarness.expectLintsOf(StepHarness.java:96)",
-				"\tat com.diffplug.spotless.StepHarness.expectLintsOfResource(StepHarness.java:92)",
-				"\tat com.diffplug.spotless.json.JsonSimpleStepTest.handlesInvalidJson(JsonSimpleStepTest.java:76)",
-				"\tat java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)",
-				"(... and more)");
+		stepHarness.expectLintsOfResource("json/invalidJsonBefore.json").toBe("L3 jsonSimple(java.lang.IllegalArgumentException) Unable to format JSON (...)");
 	}
 
 	@Test
 	void handlesNotJson() {
 		stepHarness.expectLintsOfResource("json/notJsonBefore.json")
-				.toBe("LINE_UNDEFINED jsonSimple(java.lang.IllegalArgumentException) Unable to determine JSON type, expected a '{' or '[' but found '#'",
-						"\tat com.diffplug.spotless.json.JsonSimpleStep$State.lambda$toFormatter$0(JsonSimpleStep.java:100)",
-						"\tat com.diffplug.spotless.FormatterFunc.apply(FormatterFunc.java:33)",
-						"\tat com.diffplug.spotless.FormatterStepEqualityOnStateSerialization.format(FormatterStepEqualityOnStateSerialization.java:49)",
-						"\tat com.diffplug.spotless.LintState.of(LintState.java:141)",
-						"\tat com.diffplug.spotless.StepHarness.expectLintsOf(StepHarness.java:96)",
-						"\tat com.diffplug.spotless.StepHarness.expectLintsOfResource(StepHarness.java:92)",
-						"\tat com.diffplug.spotless.json.JsonSimpleStepTest.handlesNotJson(JsonSimpleStepTest.java:91)",
-						"\tat java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)",
-						"\tat java.base/java.lang.reflect.Method.invoke(Method.java:580)",
-						"(... and more)");
+				.toBe("LINE_UNDEFINED jsonSimple(java.lang.IllegalArgumentException) Unable to determine JSON type, expected a '{' or '[' but found '#' (...)");
 	}
 
 	@Test
diff --git a/testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java b/testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java
index 9ac053f827..c1c0345032 100644
--- a/testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java
@@ -39,32 +39,12 @@ void handlesObjectWithNull() {
 
 	@Test
 	void handlesInvalidJson() {
-		getStepHarness().expectLintsOfResource("json/invalidJsonBefore.json").toBe("L3 gson(com.google.gson.JsonSyntaxException) java.io.EOFException: End of input at line 3 column 1 path $.a",
-				"\tat com.google.gson.Gson.fromJson(Gson.java:1370)",
-				"\tat com.google.gson.Gson.fromJson(Gson.java:1262)",
-				"\tat com.google.gson.Gson.fromJson(Gson.java:1171)",
-				"\tat com.google.gson.Gson.fromJson(Gson.java:1107)",
-				"\tat com.diffplug.spotless.glue.gson.GsonFormatterFunc.apply(GsonFormatterFunc.java:57)",
-				"\tat com.diffplug.spotless.FormatterFunc.apply(FormatterFunc.java:33)",
-				"\tat com.diffplug.spotless.FormatterStepEqualityOnStateSerialization.format(FormatterStepEqualityOnStateSerialization.java:49)",
-				"\tat com.diffplug.spotless.LintState.of(LintState.java:141)",
-				"\tat com.diffplug.spotless.StepHarness.expectLintsOf(StepHarness.java:96)",
-				"(... and more)");
+		getStepHarness().expectLintsOfResource("json/invalidJsonBefore.json").toBe("L3 gson(com.google.gson.JsonSyntaxException) java.io.EOFException: End of input at line 3 column 1 path $.a (...)");
 	}
 
 	@Test
 	void handlesNotJson() {
-		getStepHarness().expectLintsOfResource("json/notJsonBefore.json").toBe("LINE_UNDEFINED gson(java.lang.IllegalArgumentException) Unable to parse JSON",
-				"\tat com.diffplug.spotless.glue.gson.GsonFormatterFunc.apply(GsonFormatterFunc.java:59)",
-				"\tat com.diffplug.spotless.FormatterFunc.apply(FormatterFunc.java:33)",
-				"\tat com.diffplug.spotless.FormatterStepEqualityOnStateSerialization.format(FormatterStepEqualityOnStateSerialization.java:49)",
-				"\tat com.diffplug.spotless.LintState.of(LintState.java:141)",
-				"\tat com.diffplug.spotless.StepHarness.expectLintsOf(StepHarness.java:96)",
-				"\tat com.diffplug.spotless.StepHarness.expectLintsOfResource(StepHarness.java:92)",
-				"\tat com.diffplug.spotless.json.gson.GsonStepTest.handlesNotJson(GsonStepTest.java:57)",
-				"\tat java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)",
-				"\tat java.base/java.lang.reflect.Method.invoke(Method.java:580)",
-				"(... and more)");
+		getStepHarness().expectLintsOfResource("json/notJsonBefore.json").toBe("LINE_UNDEFINED gson(java.lang.IllegalArgumentException) Unable to parse JSON (...)");
 	}
 
 	@Test
@@ -97,17 +77,7 @@ void writesRawHtmlWhenHtmlEscapeDisabled() {
 	@Test
 	void handlesVersionIncompatibility() {
 		StepHarness.forStep(GsonStep.create(new GsonConfig(false, false, INDENT, "1.7"), TestProvisioner.mavenCentral()))
-				.expectLintsOf("").toBe("LINE_UNDEFINED gson(java.lang.IllegalStateException) There was a problem interacting with Gson; maybe you set an incompatible version?",
-						"\tat com.diffplug.spotless.json.gson.GsonStep$State.toFormatter(GsonStep.java:73)",
-						"\tat com.diffplug.spotless.FormatterStepSerializationRoundtrip.stateToFormatter(FormatterStepSerializationRoundtrip.java:64)",
-						"\tat com.diffplug.spotless.FormatterStepEqualityOnStateSerialization.format(FormatterStepEqualityOnStateSerialization.java:47)",
-						"\tat com.diffplug.spotless.LintState.of(LintState.java:141)",
-						"\tat com.diffplug.spotless.StepHarness.expectLintsOf(StepHarness.java:96)",
-						"\tat com.diffplug.spotless.json.gson.GsonStepTest.handlesVersionIncompatibility(GsonStepTest.java:100)",
-						"\tat java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)",
-						"\tat java.base/java.lang.reflect.Method.invoke(Method.java:580)",
-						"\tat org.junit.platform.commons.util.ReflectionUtils.invokeMethod(ReflectionUtils.java:766)",
-						"(... and more)");
+				.expectLintsOf("").toBe("LINE_UNDEFINED gson(java.lang.IllegalStateException) There was a problem interacting with Gson; maybe you set an incompatible version? (...)");
 	}
 
 	@Override
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
index ac146229db..54ce09e7e8 100644
--- a/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
@@ -137,17 +137,7 @@ void verifyPrettierErrorMessageIsRelayed() throws Exception {
 					new PrettierConfig(null, ImmutableMap.of("parser", "postcss")));
 			try (StepHarnessWithFile stepHarness = StepHarnessWithFile.forStep(this, formatterStep)) {
 				stepHarness.expectLintsOfResource("npm/prettier/filetypes/scss/scss.dirty")
-						.toBe("1-35 prettier-format(prettier-format) com.diffplug.spotless.npm.SimpleRestClient$SimpleRestResponseException: Unexpected response status code at /prettier/format [HTTP 500] -- (Error while formatting: Error: Couldn't resolve parser \"postcss\")",
-								"\tat com.diffplug.spotless.npm.SimpleRestClient.postJson(SimpleRestClient.java:72)",
-								"\tat com.diffplug.spotless.npm.SimpleRestClient.postJson(SimpleRestClient.java:46)",
-								"\tat com.diffplug.spotless.npm.PrettierRestService.format(PrettierRestService.java:46)",
-								"\tat com.diffplug.spotless.npm.PrettierFormatterStep$PrettierFilePathPassingFormatterFunc.applyWithFile(PrettierFormatterStep.java:125)",
-								"\tat com.diffplug.spotless.FormatterFunc$NeedsFile.apply(FormatterFunc.java:174)",
-								"\tat com.diffplug.spotless.FormatterFunc$Closeable$1.apply(FormatterFunc.java:73)",
-								"\tat com.diffplug.spotless.FormatterStepEqualityOnStateSerialization.format(FormatterStepEqualityOnStateSerialization.java:49)",
-								"\tat com.diffplug.spotless.LintState.of(LintState.java:135)",
-								"\tat com.diffplug.spotless.LintState.of(LintState.java:92)",
-								"(... and more)");
+						.toBe("LINE_UNDEFINED prettier-format(com.diffplug.spotless.npm.SimpleRestClient$SimpleRestResponseException) Unexpected response status code at /prettier/format [HTTP 500] -- (Error while formatting: Error: Couldn't resolve parser \"postcss\") (...)");
 			}
 		}
 	}

From 79860028f07a92fa55605c531127662d66cb819f Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 20 Oct 2024 10:05:38 -0700
Subject: [PATCH 1875/2068] Lock the jvm-version related tests down to just one
 version.

---
 .../com/diffplug/spotless/java/GoogleJavaFormatStepTest.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java
index a1296d300c..edfae1ac76 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java
@@ -17,8 +17,8 @@
 
 import static org.junit.jupiter.api.condition.JRE.JAVA_13;
 import static org.junit.jupiter.api.condition.JRE.JAVA_15;
-import static org.junit.jupiter.api.condition.JRE.JAVA_16;
 import static org.junit.jupiter.api.condition.JRE.JAVA_20;
+import static org.junit.jupiter.api.condition.JRE.JAVA_21;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledForJreRange;
@@ -62,6 +62,7 @@ void behavior() throws Exception {
 	}
 
 	@Test
+	@EnabledForJreRange(min = JAVA_21, max = JAVA_21)
 	void versionBelowMinimumRequiredVersionIsNotAllowed() throws Exception {
 		FormatterStep step = GoogleJavaFormatStep.create("1.2", "AOSP", TestProvisioner.mavenCentral());
 		StepHarness.forStepNoRoundtrip(step)
@@ -70,7 +71,7 @@ void versionBelowMinimumRequiredVersionIsNotAllowed() throws Exception {
 	}
 
 	@Test
-	@EnabledForJreRange(min = JAVA_16)
+	@EnabledForJreRange(min = JAVA_21, max = JAVA_21)
 	void versionBelowOneDotTenIsNotAllowed() throws Exception {
 		FormatterStep step = GoogleJavaFormatStep.create("1.9", "AOSP", TestProvisioner.mavenCentral());
 		StepHarness.forStepNoRoundtrip(step)

From e8b4e15633d4111018c21e7420ab4d973af9b03b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 21 Oct 2024 15:11:09 +0000
Subject: [PATCH 1876/2068] Update dependency org.junit.jupiter:junit-jupiter
 to v5.11.3

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 660a6a63a3..3d54a52d5f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -29,6 +29,6 @@ VER_SLF4J=[1.6,2.0[
 # Used in multiple places
 VER_DURIAN=1.2.0
 VER_JGIT=6.10.0.202406032230-r
-VER_JUNIT=5.11.2
+VER_JUNIT=5.11.3
 VER_ASSERTJ=3.26.3
 VER_MOCKITO=5.14.2

From f4df9563cd4d84e4d7ab286625729c5a942ebd23 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 22 Oct 2024 08:51:56 -0700
Subject: [PATCH 1877/2068] Simplify the TOC.

---
 plugin-gradle/README.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 80fcafb7bb..3ac2cc7120 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -74,11 +74,8 @@ Spotless supports all of Gradle's built-in performance features (incremental bui
   - [Gherkin](#gherkin)
   - Multiple languages
     - [Prettier](#prettier) ([plugins](#prettier-plugins), [npm detection](#npm-detection), [`.npmrc` detection](#npmrc-detection), [caching `npm install` results](#caching-results-of-npm-install))
-      - javascript, jsx, angular, vue, flow, typescript, css, less, scss, html, json, graphql, markdown, ymaml
     - [clang-format](#clang-format)
-      - c, c++, c#, objective-c, protobuf, javascript, java
     - [eclipse web tools platform](#eclipse-web-tools-platform)
-      - css, html, js, json, xml
     - [Biome](#biome) ([binary detection](#biome-binary), [config file](#biome-configuration-file), [input language](#biome-input-language))
 - **Language independent**
   - [Generic steps](#generic-steps)

From 8f43b2f45882c487aebe2339ff81a6bf90ac5ca3 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 22 Oct 2024 23:58:34 -0700
Subject: [PATCH 1878/2068] First cut at gradle docs.

---
 plugin-gradle/README.md | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 3ac2cc7120..c5adda5d2b 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -53,6 +53,7 @@ Spotless supports all of Gradle's built-in performance features (incremental bui
 
 - [**Quickstart**](#quickstart)
   - [Requirements](#requirements)
+  - [Linting](#linting)
 - **Languages**
   - [Java](#java) ([google-java-format](#google-java-format), [eclipse jdt](#eclipse-jdt), [clang-format](#clang-format), [prettier](#prettier), [palantir-java-format](#palantir-java-format), [formatAnnotations](#formatAnnotations), [cleanthat](#cleanthat))
   - [Groovy](#groovy) ([eclipse groovy](#eclipse-groovy))
@@ -139,6 +140,39 @@ Spotless requires JRE 11+ and Gradle 6.1.1 or newer.
 - If you're stuck on JRE 8, use [`id 'com.diffplug.spotless' version '6.13.0'` or older](https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md#6130---2023-01-14).
 - If you're stuck on an older version of Gradle, [`id 'com.diffplug.gradle.spotless' version '4.5.1'` supports all the way back to Gradle 2.x](https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md#451---2020-07-04).
 
+### Linting
+
+Starting in version `7.0.0`, Spotless now supports linting in addition to formatting. To Spotless, all lints are errors which must be either fixed or suppressed. Lints show up like this:
+
+```console
+user@machine repo % ./gradlew build
+:spotlessJavaCheck FAILED
+  The following files had format violations:
+  src\main\java\com\diffplug\gradle\spotless\FormatExtension.java
+    -\t\t····if·(targets.length·==·0)·{
+    +\t\tif·(targets.length·==·0)·{
+  Resolve these lints or suppress with `suppressLintsFor`
+```
+
+To suppress lints, you can do this:
+
+```gradle
+spotless {
+  suppressLintsFor { // applies to all formats
+    file = 'src/blah/blah'
+  }
+  kotlin {
+    ktfmt()
+    suppressLintsFor { // applies to only the kotlin formats
+      step = 'ktlint'
+      shortCode = 'rename'
+    }
+  }
+}
+```
+
+Spotless is primarily a formatter, _not_ a linter. In our opinion, a linter is just a broken formatter. But formatters do break sometimes, and representing these failures as lints that can be suppressed is more useful than just giving up.
+
 <a name="applying-to-java-source"></a>
 
 ## Java

From faa56fca8821531824fee361e3570be32c010b3e Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 23 Oct 2024 00:12:07 -0700
Subject: [PATCH 1879/2068] Rename `spotlessOut` to `spotlessClean`, to
 differentiate it from the coming `spotlessLint`.

---
 .../gradle/spotless/SpotlessApply.java        |  8 +--
 .../gradle/spotless/SpotlessCheck.java        | 10 ++--
 .../gradle/spotless/SpotlessTask.java         |  8 +--
 .../gradle/spotless/SpotlessTaskImpl.java     | 51 +++++++++----------
 .../gradle/spotless/SpotlessTaskService.java  |  6 +--
 .../gradle/spotless/FormatTaskTest.java       |  4 +-
 .../gradle/spotless/PaddedCellTaskTest.java   | 12 ++---
 .../gradle/spotless/SpotlessTaskImplTest.java |  4 +-
 8 files changed, 49 insertions(+), 54 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessApply.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessApply.java
index a85195fe9f..061a2496eb 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessApply.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessApply.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,11 +29,11 @@ public abstract class SpotlessApply extends SpotlessTaskService.ClientTask {
 	@TaskAction
 	public void performAction() {
 		getTaskService().get().registerApplyAlreadyRan(this);
-		ConfigurableFileTree files = getConfigCacheWorkaround().fileTree().from(getSpotlessOutDirectory().get());
-		if (files.isEmpty()) {
+		ConfigurableFileTree cleanFiles = getConfigCacheWorkaround().fileTree().from(getSpotlessCleanDirectory().get());
+		if (cleanFiles.isEmpty()) {
 			getState().setDidWork(sourceDidWork());
 		} else {
-			files.visit(new FileVisitor() {
+			cleanFiles.visit(new FileVisitor() {
 				@Override
 				public void visitDir(FileVisitDetails fileVisitDetails) {
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessCheck.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessCheck.java
index 95f051371b..bbbbf3faf5 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessCheck.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessCheck.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,15 +54,15 @@ public void performAction() throws IOException {
 	}
 
 	private void performAction(boolean isTest) throws IOException {
-		ConfigurableFileTree files = getConfigCacheWorkaround().fileTree().from(getSpotlessOutDirectory().get());
-		if (files.isEmpty()) {
+		ConfigurableFileTree cleanFiles = getConfigCacheWorkaround().fileTree().from(getSpotlessCleanDirectory().get());
+		if (cleanFiles.isEmpty()) {
 			getState().setDidWork(sourceDidWork());
 		} else if (!isTest && applyHasRun()) {
 			// if our matching apply has already run, then we don't need to do anything
 			getState().setDidWork(false);
 		} else {
 			List<File> problemFiles = new ArrayList<>();
-			files.visit(new FileVisitor() {
+			cleanFiles.visit(new FileVisitor() {
 				@Override
 				public void visitDir(FileVisitDetails fileVisitDetails) {
 
@@ -105,7 +105,7 @@ public void visitFile(FileVisitDetails fileVisitDetails) {
 						.runToFix(getRunToFixMessage().get())
 						.formatterFolder(
 								getProjectDir().get().getAsFile().toPath(),
-								getSpotlessOutDirectory().get().toPath(),
+								getSpotlessCleanDirectory().get().toPath(),
 								getEncoding().get())
 						.problemFiles(problemFiles)
 						.getMessage());
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
index e1e729e852..04b0e30b33 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
@@ -149,12 +149,12 @@ public void setTarget(Iterable<File> target) {
 		}
 	}
 
-	protected File outputDirectory = new File(getProject().getLayout().getBuildDirectory().getAsFile().get(),
-			"spotless/" + getName());
+	protected File cleanDirectory = new File(getProject().getLayout().getBuildDirectory().getAsFile().get(),
+			"spotless-clean/" + getName());
 
 	@OutputDirectory
-	public File getOutputDirectory() {
-		return outputDirectory;
+	public File getCleanDirectory() {
+		return cleanDirectory;
 	}
 
 	private final ConfigurationCacheHackList stepsInternalRoundtrip = ConfigurationCacheHackList.forRoundtrip();
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
index 17cd6c08a1..22b0c3486a 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
@@ -74,19 +74,27 @@ public void performAction(InputChanges inputs) throws Exception {
 
 		if (!inputs.isIncremental()) {
 			getLogger().info("Not incremental: removing prior outputs");
-			getFs().delete(d -> d.delete(outputDirectory));
-			Files.createDirectories(outputDirectory.toPath());
+			getFs().delete(d -> d.delete(cleanDirectory));
+			Files.createDirectories(cleanDirectory.toPath());
 		}
 
 		try (Formatter formatter = buildFormatter()) {
 			GitRatchetGradle ratchet = getRatchet();
 			for (FileChange fileChange : inputs.getFileChanges(target)) {
 				File input = fileChange.getFile();
+				String subpath = FormatExtension.relativize(getProjectDir().getAsFile().get(), input);
+				if (subpath == null) {
+					throw new IllegalArgumentException(StringPrinter.buildString(printer -> {
+						printer.println("Spotless error! All target files must be within the project dir.");
+						printer.println("  project dir: " + getProjectDir().getAsFile().get().getAbsolutePath());
+						printer.println("       target: " + input.getAbsolutePath());
+					}));
+				}
 				if (fileChange.getChangeType() == ChangeType.REMOVED) {
-					deletePreviousResults(input);
+					deletePreviousResults(cleanDirectory, subpath);
 				} else {
 					if (input.isFile()) {
-						processInputFile(ratchet, formatter, input);
+						processInputFile(ratchet, formatter, input, subpath);
 					}
 				}
 			}
@@ -94,9 +102,9 @@ public void performAction(InputChanges inputs) throws Exception {
 	}
 
 	@VisibleForTesting
-	void processInputFile(@Nullable GitRatchet ratchet, Formatter formatter, File input) throws IOException {
-		File output = getOutputFileWithBaseDir(input, outputDirectory);
-		getLogger().debug("Applying format to {} and writing to {}", input, output);
+	void processInputFile(@Nullable GitRatchet ratchet, Formatter formatter, File input, String subpath) throws IOException {
+		File cleanFile = new File(cleanDirectory, subpath);
+		getLogger().debug("Applying format to {} and writing to {}", input, cleanFile);
 		LintState lintState;
 		if (ratchet != null && ratchet.isClean(getProjectDir().get().getAsFile(), getRootTreeSha(), input)) {
 			lintState = LintState.clean();
@@ -109,20 +117,20 @@ void processInputFile(@Nullable GitRatchet ratchet, Formatter formatter, File in
 		}
 		if (lintState.getDirtyState().isClean()) {
 			// Remove previous output if it exists
-			Files.deleteIfExists(output.toPath());
+			Files.deleteIfExists(cleanFile.toPath());
 		} else if (lintState.getDirtyState().didNotConverge()) {
 			getLogger().warn("Skipping '{}' because it does not converge.  Run {@code spotlessDiagnose} to understand why", input);
 		} else {
-			Path parentDir = output.toPath().getParent();
+			Path parentDir = cleanFile.toPath().getParent();
 			if (parentDir == null) {
-				throw new IllegalStateException("Every file has a parent folder. But not: " + output);
+				throw new IllegalStateException("Every file has a parent folder. But not: " + cleanFile);
 			}
 			Files.createDirectories(parentDir);
 			// Need to copy the original file to the tmp location just to remember the file attributes
-			Files.copy(input.toPath(), output.toPath(), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.COPY_ATTRIBUTES);
+			Files.copy(input.toPath(), cleanFile.toPath(), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.COPY_ATTRIBUTES);
 
-			getLogger().info(String.format("Writing clean file: %s", output));
-			lintState.getDirtyState().writeCanonicalTo(output);
+			getLogger().info(String.format("Writing clean file: %s", cleanFile));
+			lintState.getDirtyState().writeCanonicalTo(cleanFile);
 		}
 		if (lintState.isHasLints()) {
 			var lints = lintState.getLints(formatter);
@@ -131,25 +139,12 @@ void processInputFile(@Nullable GitRatchet ratchet, Formatter formatter, File in
 		}
 	}
 
-	private void deletePreviousResults(File input) throws IOException {
-		File output = getOutputFileWithBaseDir(input, outputDirectory);
+	private void deletePreviousResults(File baseDir, String subpath) throws IOException {
+		File output = new File(baseDir, subpath);
 		if (output.isDirectory()) {
 			getFs().delete(d -> d.delete(output));
 		} else {
 			Files.deleteIfExists(output.toPath());
 		}
 	}
-
-	private File getOutputFileWithBaseDir(File input, File baseDir) {
-		File projectDir = getProjectDir().get().getAsFile();
-		String outputFileName = FormatExtension.relativize(projectDir, input);
-		if (outputFileName == null) {
-			throw new IllegalArgumentException(StringPrinter.buildString(printer -> {
-				printer.println("Spotless error! All target files must be within the project dir.");
-				printer.println("  project dir: " + projectDir.getAbsolutePath());
-				printer.println("       target: " + input.getAbsolutePath());
-			}));
-		}
-		return new File(baseDir, outputFileName);
-	}
 }
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskService.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskService.java
index b5a1300ead..d354bca1e0 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskService.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 DiffPlug
+ * Copyright 2021-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -104,7 +104,7 @@ static void usesServiceTolerateTestFailure(DefaultTask task, Provider<SpotlessTa
 
 	static abstract class ClientTask extends DefaultTask {
 		@Internal
-		abstract Property<File> getSpotlessOutDirectory();
+		abstract Property<File> getSpotlessCleanDirectory();
 
 		@Internal
 		abstract Property<SpotlessTaskService> getTaskService();
@@ -117,7 +117,7 @@ static abstract class ClientTask extends DefaultTask {
 
 		void init(SpotlessTaskImpl impl) {
 			usesServiceTolerateTestFailure(this, impl.getTaskServiceProvider());
-			getSpotlessOutDirectory().set(impl.getOutputDirectory());
+			getSpotlessCleanDirectory().set(impl.getCleanDirectory());
 			getTaskService().set(impl.getTaskService());
 			getProjectDir().set(impl.getProjectDir());
 		}
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/FormatTaskTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/FormatTaskTest.java
index 99509d51a4..0d10cf54e3 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/FormatTaskTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/FormatTaskTest.java
@@ -48,7 +48,7 @@ public BuildServiceParameters.None getParameters() {
 	@Test
 	void testLineEndings() throws Exception {
 		File testFile = setFile("testFile").toContent("\r\n");
-		File outputFile = new File(spotlessTask.getOutputDirectory(), "testFile");
+		File outputFile = new File(spotlessTask.getCleanDirectory(), "testFile");
 
 		spotlessTask.setTarget(Collections.singleton(testFile));
 		Tasks.execute(spotlessTask);
@@ -59,7 +59,7 @@ void testLineEndings() throws Exception {
 	@Test
 	void testStep() throws Exception {
 		File testFile = setFile("testFile").toContent("apple");
-		File outputFile = new File(spotlessTask.getOutputDirectory(), "testFile");
+		File outputFile = new File(spotlessTask.getCleanDirectory(), "testFile");
 		spotlessTask.setTarget(Collections.singleton(testFile));
 
 		spotlessTask.setSteps(List.of(ReplaceStep.create("double-p", "pp", "p")));
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PaddedCellTaskTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PaddedCellTaskTest.java
index 5d68db2492..e815791a31 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PaddedCellTaskTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PaddedCellTaskTest.java
@@ -49,7 +49,7 @@ public BuildServiceParameters.None getParameters() {
 			}
 		});
 		File file;
-		File outputFile;
+		File cleanFile;
 		SpotlessTaskImpl source;
 		SpotlessCheck check;
 		SpotlessApply apply;
@@ -61,7 +61,7 @@ public BuildServiceParameters.None getParameters() {
 			source = createFormatTask(name, step);
 			check = createCheckTask(name, source);
 			apply = createApplyTask(name, source);
-			outputFile = new File(source.getOutputDirectory() + "/src", file.getName());
+			cleanFile = new File(source.getCleanDirectory() + "/src", file.getName());
 		}
 
 		private SpotlessTaskImpl createFormatTask(String name, FormatterStep step) {
@@ -143,10 +143,10 @@ void paddedCellFormat() throws Exception {
 		converge.format();
 		diverge.format();
 
-		assertFile(wellbehaved.outputFile).hasContent("42");	// cycle -> first element in cycle
-		assertFile(cycle.outputFile).hasContent("A");		// cycle -> first element in cycle
-		assertFile(converge.outputFile).hasContent("");	// converge -> converges
-		assertThat(diverge.outputFile).doesNotExist();	// diverge -> no change
+		assertFile(wellbehaved.cleanFile).hasContent("42");	// cycle -> first element in cycle
+		assertFile(cycle.cleanFile).hasContent("A");		// cycle -> first element in cycle
+		assertFile(converge.cleanFile).hasContent("");	// converge -> converges
+		assertThat(diverge.cleanFile).doesNotExist();	// diverge -> no change
 	}
 
 	@Test
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessTaskImplTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessTaskImplTest.java
index fc7fab9980..a1f49c7373 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessTaskImplTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessTaskImplTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,6 +41,6 @@ public void testThrowsMessageContainsFilename() throws Exception {
 		File input = Paths.get("unitTests", "projectDir", "someInput").toFile();
 		Formatter formatter = Mockito.mock(Formatter.class);
 
-		Assertions.assertThatThrownBy(() -> task.processInputFile(null, formatter, input)).hasMessageContaining(input.toString());
+		Assertions.assertThatThrownBy(() -> task.processInputFile(null, formatter, input, "someInput")).hasMessageContaining(input.toString());
 	}
 }

From 955ed7757eec097aaac0095a85e310caa9c1e6ab Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 23 Oct 2024 13:10:42 -0700
Subject: [PATCH 1880/2068] amend prev

---
 .../diffplug/gradle/spotless/PaddedCellTaskTest.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PaddedCellTaskTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PaddedCellTaskTest.java
index e815791a31..888f11f294 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PaddedCellTaskTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PaddedCellTaskTest.java
@@ -49,7 +49,7 @@ public BuildServiceParameters.None getParameters() {
 			}
 		});
 		File file;
-		File cleanFile;
+		File outputFile;
 		SpotlessTaskImpl source;
 		SpotlessCheck check;
 		SpotlessApply apply;
@@ -61,7 +61,7 @@ public BuildServiceParameters.None getParameters() {
 			source = createFormatTask(name, step);
 			check = createCheckTask(name, source);
 			apply = createApplyTask(name, source);
-			cleanFile = new File(source.getCleanDirectory() + "/src", file.getName());
+			outputFile = new File(source.getCleanDirectory() + "/src", file.getName());
 		}
 
 		private SpotlessTaskImpl createFormatTask(String name, FormatterStep step) {
@@ -143,10 +143,10 @@ void paddedCellFormat() throws Exception {
 		converge.format();
 		diverge.format();
 
-		assertFile(wellbehaved.cleanFile).hasContent("42");	// cycle -> first element in cycle
-		assertFile(cycle.cleanFile).hasContent("A");		// cycle -> first element in cycle
-		assertFile(converge.cleanFile).hasContent("");	// converge -> converges
-		assertThat(diverge.cleanFile).doesNotExist();	// diverge -> no change
+		assertFile(wellbehaved.outputFile).hasContent("42");	// cycle -> first element in cycle
+		assertFile(cycle.outputFile).hasContent("A");		// cycle -> first element in cycle
+		assertFile(converge.outputFile).hasContent("");	// converge -> converges
+		assertThat(diverge.outputFile).doesNotExist();	// diverge -> no change
 	}
 
 	@Test

From 03493f48dc30bfb69ad07c62e3d63187bb40e397 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 23 Oct 2024 13:12:42 -0700
Subject: [PATCH 1881/2068] Replace `FormatExceptionPolicyStrict` with
 `List<LintSuppresion>`

---
 .../spotless/FormatExceptionPolicyStrict.java | 57 -----------
 .../main/java/com/diffplug/spotless/Lint.java | 24 +++++
 .../com/diffplug/spotless/LintPolicy.java     | 14 +--
 .../java/com/diffplug/spotless/LintState.java | 56 ++++++-----
 .../diffplug/spotless/LintSuppression.java    | 99 +++++++++++++++++++
 .../gradle/spotless/FormatExtension.java      | 19 +++-
 .../gradle/spotless/SpotlessApply.java        |  8 +-
 .../gradle/spotless/SpotlessCheck.java        | 98 ++++++++++--------
 .../gradle/spotless/SpotlessTask.java         | 21 ++--
 .../gradle/spotless/SpotlessTaskImpl.java     | 34 ++++---
 .../gradle/spotless/SpotlessTaskService.java  | 48 +++++++++
 11 files changed, 319 insertions(+), 159 deletions(-)
 delete mode 100644 lib/src/main/java/com/diffplug/spotless/FormatExceptionPolicyStrict.java
 create mode 100644 lib/src/main/java/com/diffplug/spotless/LintSuppression.java

diff --git a/lib/src/main/java/com/diffplug/spotless/FormatExceptionPolicyStrict.java b/lib/src/main/java/com/diffplug/spotless/FormatExceptionPolicyStrict.java
deleted file mode 100644
index 9bafc946ef..0000000000
--- a/lib/src/main/java/com/diffplug/spotless/FormatExceptionPolicyStrict.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2016-2024 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless;
-
-import java.util.Objects;
-import java.util.Set;
-import java.util.TreeSet;
-
-/**
- * A policy for handling exceptions in the format.  Any exceptions will
- * halt the build except for a specifically excluded path or step.
- */
-public class FormatExceptionPolicyStrict extends NoLambda.EqualityBasedOnSerialization {
-	private static final long serialVersionUID = 1L;
-
-	private final Set<String> excludeSteps = new TreeSet<>();
-	private final Set<String> excludePaths = new TreeSet<>();
-
-	/** Adds a step name to exclude. */
-	public void excludeStep(String stepName) {
-		excludeSteps.add(Objects.requireNonNull(stepName));
-	}
-
-	/** Adds a relative path to exclude. */
-	public void excludePath(String relativePath) {
-		excludePaths.add(Objects.requireNonNull(relativePath));
-	}
-
-	public void handleError(Throwable e, FormatterStep step, String relativePath) {
-		Objects.requireNonNull(e, "e");
-		Objects.requireNonNull(step, "step");
-		Objects.requireNonNull(relativePath, "relativePath");
-		if (excludeSteps.contains(step.getName())) {
-			LintPolicy.warning(e, step, relativePath);
-		} else {
-			if (excludePaths.contains(relativePath)) {
-				LintPolicy.warning(e, step, relativePath);
-			} else {
-				LintPolicy.error(e, step, relativePath);
-				throw ThrowingEx.asRuntimeRethrowError(e);
-			}
-		}
-	}
-}
diff --git a/lib/src/main/java/com/diffplug/spotless/Lint.java b/lib/src/main/java/com/diffplug/spotless/Lint.java
index 4384ed38ef..e3e3fa9f4b 100644
--- a/lib/src/main/java/com/diffplug/spotless/Lint.java
+++ b/lib/src/main/java/com/diffplug/spotless/Lint.java
@@ -189,4 +189,28 @@ private static String msgFrom(String message) {
 	}
 
 	public static final int LINE_UNDEFINED = -1;
+
+	public void addWarningMessageTo(StringBuilder buffer, String stepName, boolean oneLine) {
+		if (lineStart == Lint.LINE_UNDEFINED) {
+			buffer.append("LINE_UNDEFINED");
+		} else {
+			buffer.append("L");
+			buffer.append(lineStart);
+			if (lineEnd != lineStart) {
+				buffer.append("-").append(lineEnd);
+			}
+		}
+		buffer.append(" ");
+		buffer.append(stepName).append("(").append(ruleId).append(") ");
+
+		int firstNewline = detail.indexOf('\n');
+		if (firstNewline == -1) {
+			buffer.append(detail);
+		} else if (oneLine) {
+			buffer.append(detail, 0, firstNewline);
+			buffer.append(" (...)");
+		} else {
+			buffer.append(detail);
+		}
+	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/LintPolicy.java b/lib/src/main/java/com/diffplug/spotless/LintPolicy.java
index 0b28c36884..d5fb54e628 100644
--- a/lib/src/main/java/com/diffplug/spotless/LintPolicy.java
+++ b/lib/src/main/java/com/diffplug/spotless/LintPolicy.java
@@ -21,23 +21,15 @@
 import org.slf4j.LoggerFactory;
 
 class LintPolicy {
-	private static final Logger logger = LoggerFactory.getLogger(Formatter.class);
-
-	static void error(Throwable e, FormatterStep step, String relativePath) {
-		logger.error("Step '{}' found problem in '{}':\n{}", step.getName(), relativePath, e.getMessage(), e);
-	}
-
-	static void warning(Throwable e, FormatterStep step, String relativePath) {
-		logger.warn("Unable to apply step '{}' to '{}'", step.getName(), relativePath, e);
-	}
-
 	static void legacyBehavior(Formatter formatter, File file, ValuePerStep<Throwable> exceptionPerStep) {
 		for (int i = 0; i < formatter.getSteps().size(); ++i) {
 			Throwable exception = exceptionPerStep.get(i);
 			if (exception != null && exception != LintState.formatStepCausedNoChange()) {
-				LintPolicy.error(exception, formatter.getSteps().get(i), file.getName());
+				logger.error("Step '{}' found problem in '{}':\n{}", formatter.getSteps().get(i), file.getName(), exception.getMessage(), exception);
 				throw ThrowingEx.asRuntimeRethrowError(exception);
 			}
 		}
 	}
+
+	private static final Logger logger = LoggerFactory.getLogger(Formatter.class);
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/LintState.java b/lib/src/main/java/com/diffplug/spotless/LintState.java
index b2b4030e93..465cb9b580 100644
--- a/lib/src/main/java/com/diffplug/spotless/LintState.java
+++ b/lib/src/main/java/com/diffplug/spotless/LintState.java
@@ -18,9 +18,9 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 
 import javax.annotation.Nullable;
 
@@ -45,23 +45,49 @@ public boolean isClean() {
 		return dirtyState.isClean() && !isHasLints();
 	}
 
-	public Map<FormatterStep, List<Lint>> getLints(Formatter formatter) {
+	public LinkedHashMap<String, List<Lint>> getLintsByStep(Formatter formatter) {
 		if (lintsPerStep == null) {
 			throw new IllegalStateException("Check `isHasLints` first!");
 		}
 		if (lintsPerStep.size() != formatter.getSteps().size()) {
 			throw new IllegalStateException("LintState was created with a different formatter!");
 		}
-		Map<FormatterStep, List<Lint>> result = new LinkedHashMap<>();
+		LinkedHashMap<String, List<Lint>> result = new LinkedHashMap<>();
 		for (int i = 0; i < lintsPerStep.size(); i++) {
+			FormatterStep step = formatter.getSteps().get(i);
 			List<Lint> lints = lintsPerStep.get(i);
 			if (lints != null) {
-				result.put(formatter.getSteps().get(i), lints);
+				result.put(step.getName(), lints);
 			}
 		}
 		return result;
 	}
 
+	public void removeSuppressedLints(Formatter formatter, String relativePath, List<LintSuppression> suppressions) {
+		if (lintsPerStep == null) {
+			return;
+		}
+		for (int i = 0; i < lintsPerStep.size(); i++) {
+			FormatterStep step = formatter.getSteps().get(i);
+			List<Lint> lints = lintsPerStep.get(i);
+			if (lints != null) {
+				Iterator<Lint> iter = lints.iterator();
+				while (iter.hasNext()) {
+					Lint lint = iter.next();
+					for (LintSuppression suppression : suppressions) {
+						if (suppression.suppresses(relativePath, step, lint)) {
+							iter.remove();
+							break;
+						}
+					}
+				}
+				if (lints.isEmpty()) {
+					lintsPerStep.set(i, null);
+				}
+			}
+		}
+	}
+
 	public String asStringDetailed(File file, Formatter formatter) {
 		return asString(file, formatter, false);
 	}
@@ -81,27 +107,7 @@ private String asString(File file, Formatter formatter, boolean oneLine) {
 					FormatterStep step = formatter.getSteps().get(i);
 					for (Lint lint : lints) {
 						result.append(file.getName()).append(":");
-						if (lint.getLineStart() == Lint.LINE_UNDEFINED) {
-							result.append("LINE_UNDEFINED");
-						} else {
-							result.append("L");
-							result.append(lint.getLineStart());
-							if (lint.getLineEnd() != lint.getLineStart()) {
-								result.append("-").append(lint.getLineEnd());
-							}
-						}
-						result.append(" ");
-						result.append(step.getName()).append("(").append(lint.getRuleId()).append(") ");
-
-						int firstNewline = lint.getDetail().indexOf('\n');
-						if (firstNewline == -1) {
-							result.append(lint.getDetail());
-						} else if (oneLine) {
-							result.append(lint.getDetail(), 0, firstNewline);
-							result.append(" (...)");
-						} else {
-							result.append(lint.getDetail());
-						}
+						lint.addWarningMessageTo(result, step.getName(), oneLine);
 						result.append("\n");
 					}
 				}
diff --git a/lib/src/main/java/com/diffplug/spotless/LintSuppression.java b/lib/src/main/java/com/diffplug/spotless/LintSuppression.java
new file mode 100644
index 0000000000..c26eef6b1c
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/LintSuppression.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless;
+
+import java.util.Objects;
+
+public class LintSuppression implements java.io.Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private static final String ALL = "*";
+	private String file = ALL;
+	private String step = ALL;
+	private String shortCode = ALL;
+
+	public String getFile() {
+		return file;
+	}
+
+	public void setFile(String file) {
+		this.file = Objects.requireNonNull(file);
+	}
+
+	public String getStep() {
+		return step;
+	}
+
+	public void setStep(String step) {
+		this.step = Objects.requireNonNull(step);
+	}
+
+	public String getShortCode() {
+		return shortCode;
+	}
+
+	public void setShortCode(String shortCode) {
+		this.shortCode = Objects.requireNonNull(shortCode);
+	}
+
+	public boolean suppresses(String relativePath, FormatterStep step, Lint lint) {
+		return !allows(relativePath, step, lint);
+	}
+
+	private boolean allows(String relativePath, FormatterStep step, Lint lint) {
+		if (!file.equals(ALL) && !file.equals(relativePath)) {
+			return false;
+		}
+		if (!this.step.equals(ALL) && !this.step.equals(step.getName())) {
+			return false;
+		}
+		if (!this.shortCode.equals(ALL) && !this.shortCode.equals(lint.getRuleId())) {
+			return false;
+		}
+		return true;
+	}
+
+	public void ensureDoesNotSuppressAll() {
+		boolean suppressAll = file.equals(ALL) && step.equals(ALL) && shortCode.equals(ALL);
+		if (suppressAll) {
+			throw new IllegalArgumentException("You must specify a specific `file`, `step`, or `shortCode`.");
+		}
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o)
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
+		LintSuppression that = (LintSuppression) o;
+		return Objects.equals(file, that.file) && Objects.equals(step, that.step) && Objects.equals(shortCode, that.shortCode);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(file, step, shortCode);
+	}
+
+	@Override
+	public String toString() {
+		return "LintSuppression{" +
+				"file='" + file + '\'' +
+				", step='" + step + '\'' +
+				", code='" + shortCode + '\'' +
+				'}';
+	}
+}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index efb3b45bdf..68f00f5208 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -49,11 +49,11 @@
 import org.gradle.util.GradleVersion;
 
 import com.diffplug.common.base.Preconditions;
-import com.diffplug.spotless.FormatExceptionPolicyStrict;
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.LazyForwardingEquality;
 import com.diffplug.spotless.LineEnding;
+import com.diffplug.spotless.LintSuppression;
 import com.diffplug.spotless.OnMatch;
 import com.diffplug.spotless.Provisioner;
 import com.diffplug.spotless.SerializedFunction;
@@ -168,16 +168,25 @@ public void setEncoding(Charset charset) {
 		encoding = requireNonNull(charset);
 	}
 
-	final FormatExceptionPolicyStrict exceptionPolicy = new FormatExceptionPolicyStrict();
+	final List<LintSuppression> lintSuppressions = new ArrayList<>();
+
+	public void suppressLintsFor(Action<LintSuppression> lintSuppression) {
+		LintSuppression suppression = new LintSuppression();
+		lintSuppression.execute(suppression);
+		suppression.ensureDoesNotSuppressAll();
+		lintSuppressions.add(suppression);
+	}
 
 	/** Ignores errors in the given step. */
+	@Deprecated
 	public void ignoreErrorForStep(String stepName) {
-		exceptionPolicy.excludeStep(requireNonNull(stepName));
+		suppressLintsFor(it -> it.setStep(stepName));
 	}
 
 	/** Ignores errors for the given relative path. */
+	@Deprecated
 	public void ignoreErrorForPath(String relativePath) {
-		exceptionPolicy.excludePath(requireNonNull(relativePath));
+		suppressLintsFor(it -> it.setFile(relativePath));
 	}
 
 	/**
@@ -996,7 +1005,7 @@ public void toggleOffOnDisable() {
 	/** Sets up a format task according to the values in this extension. */
 	protected void setupTask(SpotlessTask task) {
 		task.setEncoding(getEncoding().name());
-		task.setExceptionPolicy(exceptionPolicy);
+		task.setLintSuppressions(lintSuppressions);
 		FileCollection totalTarget = targetExclude == null ? target : target.minus(targetExclude);
 		task.setTarget(totalTarget);
 		List<FormatterStep> steps;
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessApply.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessApply.java
index 061a2496eb..f38745a6b0 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessApply.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessApply.java
@@ -20,6 +20,7 @@
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
 
+import org.gradle.api.GradleException;
 import org.gradle.api.file.ConfigurableFileTree;
 import org.gradle.api.file.FileVisitDetails;
 import org.gradle.api.file.FileVisitor;
@@ -30,7 +31,8 @@ public abstract class SpotlessApply extends SpotlessTaskService.ClientTask {
 	public void performAction() {
 		getTaskService().get().registerApplyAlreadyRan(this);
 		ConfigurableFileTree cleanFiles = getConfigCacheWorkaround().fileTree().from(getSpotlessCleanDirectory().get());
-		if (cleanFiles.isEmpty()) {
+		ConfigurableFileTree lintsFiles = getConfigCacheWorkaround().fileTree().from(getSpotlessLintsDirectory().get());
+		if (cleanFiles.isEmpty() && lintsFiles.isEmpty()) {
 			getState().setDidWork(sourceDidWork());
 		} else {
 			cleanFiles.visit(new FileVisitor() {
@@ -51,6 +53,10 @@ public void visitFile(FileVisitDetails fileVisitDetails) {
 					}
 				}
 			});
+			if (!lintsFiles.isEmpty()) {
+				boolean detailed = false;
+				throw new GradleException(super.allLintsErrorMsgDetailed(lintsFiles, detailed));
+			}
 		}
 	}
 }
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessCheck.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessCheck.java
index bbbbf3faf5..dba219ff06 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessCheck.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessCheck.java
@@ -32,6 +32,7 @@
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.Internal;
 import org.gradle.api.tasks.TaskAction;
+import org.jetbrains.annotations.NotNull;
 
 import com.diffplug.spotless.FileSignature;
 import com.diffplug.spotless.ThrowingEx;
@@ -55,64 +56,77 @@ public void performAction() throws IOException {
 
 	private void performAction(boolean isTest) throws IOException {
 		ConfigurableFileTree cleanFiles = getConfigCacheWorkaround().fileTree().from(getSpotlessCleanDirectory().get());
-		if (cleanFiles.isEmpty()) {
+		ConfigurableFileTree lintsFiles = getConfigCacheWorkaround().fileTree().from(getSpotlessLintsDirectory().get());
+		if (cleanFiles.isEmpty() && lintsFiles.isEmpty()) {
 			getState().setDidWork(sourceDidWork());
 		} else if (!isTest && applyHasRun()) {
 			// if our matching apply has already run, then we don't need to do anything
 			getState().setDidWork(false);
 		} else {
-			List<File> problemFiles = new ArrayList<>();
-			cleanFiles.visit(new FileVisitor() {
-				@Override
-				public void visitDir(FileVisitDetails fileVisitDetails) {
-
-				}
-
-				@Override
-				public void visitFile(FileVisitDetails fileVisitDetails) {
-					String path = fileVisitDetails.getPath();
-					File originalSource = new File(getProjectDir().get().getAsFile(), path);
-					try {
-						// read the file on disk
-						byte[] userFile = Files.readAllBytes(originalSource.toPath());
-						// and the formatted version from spotlessOutDirectory
-						byte[] formatted;
-						{
-							ByteArrayOutputStream clean = new ByteArrayOutputStream();
-							fileVisitDetails.copyTo(clean);
-							formatted = clean.toByteArray();
-						}
-						// If these two are equal, it means that SpotlessTask left a file
-						// in its output directory which ought to have been removed. As
-						// best I can tell, this is a filesytem race which is very hard
-						// to trigger.  GitRatchetGradleTest can *sometimes* reproduce it
-						// but it's very erratic, and that test writes both to Gradle cache
-						// and git cache very quickly.  Either of Gradle or jgit might be
-						// caching something wrong because of the fast repeated writes.
-						if (!Arrays.equals(userFile, formatted)) {
-							// If the on-disk content is equal to the formatted content,
-							// just don't add it as a problem file. Easy!
-							problemFiles.add(originalSource);
-						}
-					} catch (IOException e) {
-						throw ThrowingEx.asRuntime(e);
-					}
-				}
-			});
-			if (!problemFiles.isEmpty()) {
-				Collections.sort(problemFiles);
+			List<File> unformattedFiles = getUncleanFiles(cleanFiles);
+			if (!unformattedFiles.isEmpty()) {
+				// if any files are unformatted, we show those
 				throw new GradleException(DiffMessageFormatter.builder()
 						.runToFix(getRunToFixMessage().get())
 						.formatterFolder(
 								getProjectDir().get().getAsFile().toPath(),
 								getSpotlessCleanDirectory().get().toPath(),
 								getEncoding().get())
-						.problemFiles(problemFiles)
+						.problemFiles(unformattedFiles)
 						.getMessage());
+			} else {
+				// We only show lints if there are no unformatted files.
+				// This is because lint line numbers are relative to the
+				// formatted content, and formatting often fixes lints.
+				boolean detailed = false;
+				throw new GradleException(super.allLintsErrorMsgDetailed(lintsFiles, detailed));
 			}
 		}
 	}
 
+	private @NotNull List<File> getUncleanFiles(ConfigurableFileTree cleanFiles) {
+		List<File> uncleanFiles = new ArrayList<>();
+		cleanFiles.visit(new FileVisitor() {
+			@Override
+			public void visitDir(FileVisitDetails fileVisitDetails) {
+
+			}
+
+			@Override
+			public void visitFile(FileVisitDetails fileVisitDetails) {
+				String path = fileVisitDetails.getPath();
+				File originalSource = new File(getProjectDir().get().getAsFile(), path);
+				try {
+					// read the file on disk
+					byte[] userFile = Files.readAllBytes(originalSource.toPath());
+					// and the formatted version from spotlessOutDirectory
+					byte[] formatted;
+					{
+						ByteArrayOutputStream clean = new ByteArrayOutputStream();
+						fileVisitDetails.copyTo(clean);
+						formatted = clean.toByteArray();
+					}
+					// If these two are equal, it means that SpotlessTask left a file
+					// in its output directory which ought to have been removed. As
+					// best I can tell, this is a filesytem race which is very hard
+					// to trigger.  GitRatchetGradleTest can *sometimes* reproduce it
+					// but it's very erratic, and that test writes both to Gradle cache
+					// and git cache very quickly.  Either of Gradle or jgit might be
+					// caching something wrong because of the fast repeated writes.
+					if (!Arrays.equals(userFile, formatted)) {
+						// If the on-disk content is equal to the formatted content,
+						// just don't add it as a problem file. Easy!
+						uncleanFiles.add(originalSource);
+					}
+				} catch (IOException e) {
+					throw ThrowingEx.asRuntime(e);
+				}
+			}
+		});
+		Collections.sort(uncleanFiles);
+		return uncleanFiles;
+	}
+
 	@Internal
 	abstract Property<String> getProjectPath();
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
index 04b0e30b33..e31be63143 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
@@ -17,6 +17,7 @@
 
 import java.io.File;
 import java.nio.charset.Charset;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
@@ -36,10 +37,10 @@
 import org.gradle.work.Incremental;
 
 import com.diffplug.spotless.ConfigurationCacheHackList;
-import com.diffplug.spotless.FormatExceptionPolicyStrict;
 import com.diffplug.spotless.Formatter;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.LineEnding;
+import com.diffplug.spotless.LintSuppression;
 import com.diffplug.spotless.extra.GitRatchet;
 
 public abstract class SpotlessTask extends DefaultTask {
@@ -121,15 +122,15 @@ public ObjectId getRatchetSha() {
 		return subtreeSha;
 	}
 
-	protected FormatExceptionPolicyStrict exceptionPolicy = new FormatExceptionPolicyStrict();
+	protected List<LintSuppression> lintSuppressions = new ArrayList<>();
 
-	public void setExceptionPolicy(FormatExceptionPolicyStrict exceptionPolicy) {
-		this.exceptionPolicy = Objects.requireNonNull(exceptionPolicy);
+	public void setLintSuppressions(List<LintSuppression> lintSuppressions) {
+		this.lintSuppressions = Objects.requireNonNull(lintSuppressions);
 	}
 
 	@Input
-	public FormatExceptionPolicyStrict getExceptionPolicy() {
-		return exceptionPolicy;
+	public List<LintSuppression> getLintSuppressions() {
+		return lintSuppressions;
 	}
 
 	protected FileCollection target;
@@ -157,6 +158,14 @@ public File getCleanDirectory() {
 		return cleanDirectory;
 	}
 
+	protected File lintsDirectory = new File(getProject().getLayout().getBuildDirectory().getAsFile().get(),
+			"spotless-lints/" + getName());
+
+	@OutputDirectory
+	public File getLintsDirectory() {
+		return lintsDirectory;
+	}
+
 	private final ConfigurationCacheHackList stepsInternalRoundtrip = ConfigurationCacheHackList.forRoundtrip();
 	private final ConfigurationCacheHackList stepsInternalEquality = ConfigurationCacheHackList.forEquality();
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
index 22b0c3486a..27879925b6 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
@@ -20,6 +20,8 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
+import java.util.LinkedHashMap;
+import java.util.List;
 
 import javax.annotation.Nullable;
 import javax.inject.Inject;
@@ -38,6 +40,7 @@
 import com.diffplug.common.annotations.VisibleForTesting;
 import com.diffplug.common.base.StringPrinter;
 import com.diffplug.spotless.Formatter;
+import com.diffplug.spotless.Lint;
 import com.diffplug.spotless.LintState;
 import com.diffplug.spotless.extra.GitRatchet;
 
@@ -75,26 +78,30 @@ public void performAction(InputChanges inputs) throws Exception {
 		if (!inputs.isIncremental()) {
 			getLogger().info("Not incremental: removing prior outputs");
 			getFs().delete(d -> d.delete(cleanDirectory));
+			getFs().delete(d -> d.delete(lintsDirectory));
 			Files.createDirectories(cleanDirectory.toPath());
+			Files.createDirectories(lintsDirectory.toPath());
 		}
 
 		try (Formatter formatter = buildFormatter()) {
 			GitRatchetGradle ratchet = getRatchet();
 			for (FileChange fileChange : inputs.getFileChanges(target)) {
 				File input = fileChange.getFile();
-				String subpath = FormatExtension.relativize(getProjectDir().getAsFile().get(), input);
-				if (subpath == null) {
+				File projectDir = getProjectDir().get().getAsFile();
+				String relativePath = FormatExtension.relativize(projectDir, input);
+				if (relativePath == null) {
 					throw new IllegalArgumentException(StringPrinter.buildString(printer -> {
 						printer.println("Spotless error! All target files must be within the project dir.");
-						printer.println("  project dir: " + getProjectDir().getAsFile().get().getAbsolutePath());
+						printer.println("  project dir: " + projectDir.getAbsolutePath());
 						printer.println("       target: " + input.getAbsolutePath());
 					}));
 				}
 				if (fileChange.getChangeType() == ChangeType.REMOVED) {
-					deletePreviousResults(cleanDirectory, subpath);
+					deletePreviousResults(cleanDirectory, relativePath);
+					deletePreviousResults(lintsDirectory, relativePath);
 				} else {
 					if (input.isFile()) {
-						processInputFile(ratchet, formatter, input, subpath);
+						processInputFile(ratchet, formatter, input, relativePath);
 					}
 				}
 			}
@@ -102,8 +109,9 @@ public void performAction(InputChanges inputs) throws Exception {
 	}
 
 	@VisibleForTesting
-	void processInputFile(@Nullable GitRatchet ratchet, Formatter formatter, File input, String subpath) throws IOException {
-		File cleanFile = new File(cleanDirectory, subpath);
+	void processInputFile(@Nullable GitRatchet ratchet, Formatter formatter, File input, String relativePath) throws IOException {
+		File cleanFile = new File(cleanDirectory, relativePath);
+		File lintFile = new File(lintsDirectory, relativePath);
 		getLogger().debug("Applying format to {} and writing to {}", input, cleanFile);
 		LintState lintState;
 		if (ratchet != null && ratchet.isClean(getProjectDir().get().getAsFile(), getRootTreeSha(), input)) {
@@ -111,6 +119,7 @@ void processInputFile(@Nullable GitRatchet ratchet, Formatter formatter, File in
 		} else {
 			try {
 				lintState = LintState.of(formatter, input);
+				lintState.removeSuppressedLints(formatter, relativePath, getLintSuppressions());
 			} catch (Throwable e) {
 				throw new IllegalArgumentException("Issue processing file: " + input, e);
 			}
@@ -119,7 +128,7 @@ void processInputFile(@Nullable GitRatchet ratchet, Formatter formatter, File in
 			// Remove previous output if it exists
 			Files.deleteIfExists(cleanFile.toPath());
 		} else if (lintState.getDirtyState().didNotConverge()) {
-			getLogger().warn("Skipping '{}' because it does not converge.  Run {@code spotlessDiagnose} to understand why", input);
+			getLogger().warn("Skipping '{}' because it does not converge.  Run {@code spotlessDiagnose} to understand why", relativePath);
 		} else {
 			Path parentDir = cleanFile.toPath().getParent();
 			if (parentDir == null) {
@@ -132,10 +141,11 @@ void processInputFile(@Nullable GitRatchet ratchet, Formatter formatter, File in
 			getLogger().info(String.format("Writing clean file: %s", cleanFile));
 			lintState.getDirtyState().writeCanonicalTo(cleanFile);
 		}
-		if (lintState.isHasLints()) {
-			var lints = lintState.getLints(formatter);
-			var first = lints.entrySet().iterator().next();
-			getExceptionPolicy().handleError(new Throwable(first.getValue().get(0).toString()), first.getKey(), FormatExtension.relativize(getProjectDir().get().getAsFile(), input));
+		if (!lintState.isHasLints()) {
+			Files.deleteIfExists(lintFile.toPath());
+		} else {
+			LinkedHashMap<String, List<Lint>> lints = lintState.getLintsByStep(formatter);
+			SerializableMisc.toFile(lints, lintFile);
 		}
 	}
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskService.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskService.java
index d354bca1e0..ce371ecd61 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskService.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskService.java
@@ -18,13 +18,20 @@
 import java.io.File;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.TreeMap;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 
 import org.gradle.api.DefaultTask;
+import org.gradle.api.file.ConfigurableFileTree;
 import org.gradle.api.file.DirectoryProperty;
+import org.gradle.api.file.FileVisitDetails;
+import org.gradle.api.file.FileVisitor;
 import org.gradle.api.model.ObjectFactory;
 import org.gradle.api.provider.Property;
 import org.gradle.api.provider.Provider;
@@ -36,6 +43,7 @@
 
 import com.diffplug.common.base.Preconditions;
 import com.diffplug.common.base.Unhandled;
+import com.diffplug.spotless.Lint;
 import com.diffplug.spotless.Provisioner;
 
 /**
@@ -106,6 +114,9 @@ static abstract class ClientTask extends DefaultTask {
 		@Internal
 		abstract Property<File> getSpotlessCleanDirectory();
 
+		@Internal
+		abstract Property<File> getSpotlessLintsDirectory();
+
 		@Internal
 		abstract Property<SpotlessTaskService> getTaskService();
 
@@ -118,6 +129,7 @@ static abstract class ClientTask extends DefaultTask {
 		void init(SpotlessTaskImpl impl) {
 			usesServiceTolerateTestFailure(this, impl.getTaskServiceProvider());
 			getSpotlessCleanDirectory().set(impl.getCleanDirectory());
+			getSpotlessLintsDirectory().set(impl.getLintsDirectory());
 			getTaskService().set(impl.getTaskService());
 			getProjectDir().set(impl.getProjectDir());
 		}
@@ -154,5 +166,41 @@ protected boolean sourceDidWork() {
 		protected boolean applyHasRun() {
 			return service().apply.containsKey(sourceTaskPath());
 		}
+
+		protected String allLintsErrorMsgDetailed(ConfigurableFileTree lintsFiles, boolean detailed) {
+			AtomicInteger total = new AtomicInteger(0);
+			TreeMap<String, LinkedHashMap<String, List<Lint>>> allLints = new TreeMap<>();
+			lintsFiles.visit(new FileVisitor() {
+				@Override
+				public void visitDir(FileVisitDetails fileVisitDetails) {
+
+				}
+
+				@Override
+				public void visitFile(FileVisitDetails fileVisitDetails) {
+					String path = fileVisitDetails.getPath();
+					getLogger().debug("Reading lints for " + path);
+					LinkedHashMap<String, List<Lint>> lints = SerializableMisc.fromFile(LinkedHashMap.class, fileVisitDetails.getFile());
+					allLints.put(path, lints);
+					lints.values().forEach(list -> total.addAndGet(list.size()));
+				}
+			});
+			StringBuilder builder = new StringBuilder();
+			builder.append("There were " + total.get() + " lint error(s), they must be fixed or suppressed.\n");
+			for (Map.Entry<String, LinkedHashMap<String, List<Lint>>> lintsPerFile : allLints.entrySet()) {
+				for (Map.Entry<String, List<Lint>> stepLints : lintsPerFile.getValue().entrySet()) {
+					String stepName = stepLints.getKey();
+					for (Lint lint : stepLints.getValue()) {
+						builder.append(lintsPerFile.getKey());
+						builder.append(":");
+						boolean oneLine = !detailed;
+						lint.addWarningMessageTo(builder, stepName, oneLine);
+						builder.append("\n");
+					}
+				}
+			}
+			builder.setLength(builder.length() - 1); // remove trailing newline
+			return builder.toString();
+		}
 	}
 }

From 11448d9b4f250904157990f82257ebe032a4237a Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 23 Oct 2024 19:32:02 -0700
Subject: [PATCH 1882/2068] Add a `LintSuppressionTest`

---
 .../diffplug/spotless/LintSuppression.java    | 22 ++---
 .../spotless/LintSuppressionTest.java         | 84 +++++++++++++++++++
 2 files changed, 92 insertions(+), 14 deletions(-)
 create mode 100644 lib/src/test/java/com/diffplug/spotless/LintSuppressionTest.java

diff --git a/lib/src/main/java/com/diffplug/spotless/LintSuppression.java b/lib/src/main/java/com/diffplug/spotless/LintSuppression.java
index c26eef6b1c..41a81ae3df 100644
--- a/lib/src/main/java/com/diffplug/spotless/LintSuppression.java
+++ b/lib/src/main/java/com/diffplug/spotless/LintSuppression.java
@@ -49,21 +49,15 @@ public void setShortCode(String shortCode) {
 		this.shortCode = Objects.requireNonNull(shortCode);
 	}
 
-	public boolean suppresses(String relativePath, FormatterStep step, Lint lint) {
-		return !allows(relativePath, step, lint);
-	}
-
-	private boolean allows(String relativePath, FormatterStep step, Lint lint) {
-		if (!file.equals(ALL) && !file.equals(relativePath)) {
-			return false;
-		}
-		if (!this.step.equals(ALL) && !this.step.equals(step.getName())) {
-			return false;
-		}
-		if (!this.shortCode.equals(ALL) && !this.shortCode.equals(lint.getRuleId())) {
-			return false;
+	public boolean suppresses(String relativePath, FormatterStep formatterStep, Lint lint) {
+		if (file.equals(ALL) || file.equals(relativePath)) {
+			if (step.equals(ALL) || formatterStep.getName().equals(this.step)) {
+				if (shortCode.equals(ALL) || lint.getRuleId().equals(this.shortCode)) {
+					return true;
+				}
+			}
 		}
-		return true;
+		return false;
 	}
 
 	public void ensureDoesNotSuppressAll() {
diff --git a/lib/src/test/java/com/diffplug/spotless/LintSuppressionTest.java b/lib/src/test/java/com/diffplug/spotless/LintSuppressionTest.java
new file mode 100644
index 0000000000..efe96bc3cb
--- /dev/null
+++ b/lib/src/test/java/com/diffplug/spotless/LintSuppressionTest.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
+
+import org.assertj.core.api.AbstractBooleanAssert;
+import org.junit.jupiter.api.Test;
+
+import com.diffplug.spotless.generic.EndWithNewlineStep;
+
+public class LintSuppressionTest {
+	private LintState dummyLintState() {
+		var lints = new ArrayList<Lint>();
+		lints.add(Lint.atLine(2, "66", "Order 66"));
+		var perStep = new ArrayList<List<Lint>>();
+		perStep.add(lints);
+		return new LintState(DirtyState.clean(), perStep);
+	}
+
+	private Formatter formatter() {
+		return Formatter.builder()
+				.lineEndingsPolicy(LineEnding.UNIX.createPolicy())
+				.encoding(StandardCharsets.UTF_8)
+				.steps(List.of(EndWithNewlineStep.create()))
+				.build();
+	}
+
+	@Test
+	public void testMatchSingle() {
+		var noSuppressions = dummyLintState();
+		noSuppressions.removeSuppressedLints(formatter(), "file", List.of());
+		assertThat(noSuppressions.isHasLints()).isTrue();
+		removesLint(s -> s.setStep("blah")).isFalse();
+		removesLint(s -> s.setStep("endWithNewline")).isTrue();
+		removesLint(s -> s.setFile("blah")).isFalse();
+		removesLint(s -> s.setFile("testFile")).isTrue();
+		removesLint(s -> s.setShortCode("blah")).isFalse();
+		removesLint(s -> s.setShortCode("66")).isTrue();
+	}
+
+	@Test
+	public void testMatchDouble() {
+		removesLint(s -> {
+			s.setStep("endWithNewline");
+			s.setShortCode("blah");
+		}).isFalse();
+		removesLint(s -> {
+			s.setStep("blah");
+			s.setShortCode("66");
+		}).isFalse();
+		removesLint(s -> {
+			s.setStep("endWithNewline");
+			s.setShortCode("66");
+		}).isTrue();
+	}
+
+	private AbstractBooleanAssert<?> removesLint(Consumer<LintSuppression> suppression) {
+		var s = new LintSuppression();
+		suppression.accept(s);
+
+		var ls = dummyLintState();
+		ls.removeSuppressedLints(formatter(), "testFile", List.of(s));
+		return assertThat(!ls.isHasLints());
+	}
+}

From b23118999c0149e11aa9055c7c26e3e0a6a540fe Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 23 Oct 2024 17:23:06 -0700
Subject: [PATCH 1883/2068] ErrorShouldRethrowTest now tests the new lint
 messages.

---
 .../java/com/diffplug/spotless/LintState.java | 12 +++-
 .../spotless/ErrorShouldRethrowTest.java      | 69 +++++++++----------
 2 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/LintState.java b/lib/src/main/java/com/diffplug/spotless/LintState.java
index 465cb9b580..fca15ce3ac 100644
--- a/lib/src/main/java/com/diffplug/spotless/LintState.java
+++ b/lib/src/main/java/com/diffplug/spotless/LintState.java
@@ -21,14 +21,15 @@
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Objects;
 
 import javax.annotation.Nullable;
 
 public class LintState {
 	private final DirtyState dirtyState;
-	private final @Nullable List<List<Lint>> lintsPerStep;
+	private @Nullable List<List<Lint>> lintsPerStep;
 
-	private LintState(DirtyState dirtyState, @Nullable List<List<Lint>> lintsPerStep) {
+	LintState(DirtyState dirtyState, @Nullable List<List<Lint>> lintsPerStep) {
 		this.dirtyState = dirtyState;
 		this.lintsPerStep = lintsPerStep;
 	}
@@ -67,6 +68,9 @@ public void removeSuppressedLints(Formatter formatter, String relativePath, List
 		if (lintsPerStep == null) {
 			return;
 		}
+		if (formatter.getSteps().size() != lintsPerStep.size()) {
+			throw new IllegalStateException("LintState was created with a different formatter!");
+		}
 		for (int i = 0; i < lintsPerStep.size(); i++) {
 			FormatterStep step = formatter.getSteps().get(i);
 			List<Lint> lints = lintsPerStep.get(i);
@@ -83,6 +87,10 @@ public void removeSuppressedLints(Formatter formatter, String relativePath, List
 				}
 				if (lints.isEmpty()) {
 					lintsPerStep.set(i, null);
+					if (lintsPerStep.stream().allMatch(Objects::isNull)) {
+						lintsPerStep = null;
+						return;
+					}
 				}
 			}
 		}
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrowTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrowTest.java
index 0c21a3644d..1068f42908 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrowTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrowTest.java
@@ -20,14 +20,11 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.assertj.core.api.Assertions;
 import org.gradle.testkit.runner.BuildResult;
-import org.gradle.testkit.runner.TaskOutcome;
 import org.junit.jupiter.api.Test;
 
-import com.diffplug.common.base.CharMatcher;
-import com.diffplug.common.base.Splitter;
-import com.diffplug.spotless.LineEnding;
+import com.diffplug.selfie.Selfie;
+import com.diffplug.selfie.StringSelfie;
 
 /** Tests the desired behavior from https://github.com/diffplug/spotless/issues/46. */
 class ErrorShouldRethrowTest extends GradleIntegrationHarness {
@@ -41,7 +38,7 @@ private void writeBuild(String... toInsert) throws IOException {
 		lines.add("    format 'misc', {");
 		lines.add("        lineEndings 'UNIX'");
 		lines.add("        target file('README.md')");
-		lines.add("        custom 'no swearing', {");
+		lines.add("        custom 'noSwearingStep', {");
 		lines.add("             if (it.toLowerCase(Locale.ROOT).contains('fubar')) {");
 		lines.add("                 throw com.diffplug.spotless.Lint.atUndefinedLine('swearing', 'No swearing!').shortcut();");
 		lines.add("             }");
@@ -56,7 +53,7 @@ void passesIfNoException() throws Exception {
 				"    } // format",
 				"}     // spotless");
 		setFile("README.md").toContent("This code is fun.");
-		runWithSuccess("> Task :spotlessMisc");
+		expectSuccess();
 	}
 
 	@Test
@@ -65,11 +62,15 @@ void anyExceptionShouldFail() throws Exception {
 				"    } // format",
 				"}     // spotless");
 		setFile("README.md").toContent("This code is fubar.");
-		runWithFailure(
-				"> Task :spotlessMisc FAILED\n" +
-						"Step 'no swearing' found problem in 'README.md':\n" +
-						"LINE_UNDEFINED: (swearing) No swearing!\n" +
-						"java.lang.Throwable: LINE_UNDEFINED: (swearing) No swearing!");
+		expectFailureAndConsoleToBe().toBe("> Task :spotlessMisc",
+				"> Task :spotlessMiscCheck FAILED",
+				"",
+				"FAILURE: Build failed with an exception.",
+				"",
+				"* What went wrong:",
+				"Execution failed for task ':spotlessMiscCheck'.",
+				"> There were 1 lint error(s), they must be fixed or suppressed.",
+				"  README.md:LINE_UNDEFINED noSwearingStep(swearing) No swearing!");
 	}
 
 	@Test
@@ -79,17 +80,17 @@ void unlessEnforceCheckIsFalse() throws Exception {
 				"    enforceCheck false",
 				"}     // spotless");
 		setFile("README.md").toContent("This code is fubar.");
-		runWithSuccess("> Task :processResources NO-SOURCE");
+		expectSuccess();
 	}
 
+	@Test
 	void unlessExemptedByStep() throws Exception {
 		writeBuild(
 				"        ignoreErrorForStep 'no swearing'",
 				"    } // format",
 				"}     // spotless");
 		setFile("README.md").toContent("This code is fubar.");
-		runWithSuccess("> Task :spotlessMisc\n" +
-				"Unable to apply step 'no swearing' to 'README.md'");
+		expectSuccess();
 	}
 
 	@Test
@@ -99,8 +100,7 @@ void unlessExemptedByPath() throws Exception {
 				"    } // format",
 				"}     // spotless");
 		setFile("README.md").toContent("This code is fubar.");
-		runWithSuccess("> Task :spotlessMisc\n" +
-				"Unable to apply step 'no swearing' to 'README.md'");
+		expectSuccess();
 	}
 
 	@Test
@@ -111,33 +111,28 @@ void failsIfNeitherStepNorFileExempted() throws Exception {
 				"    } // format",
 				"}     // spotless");
 		setFile("README.md").toContent("This code is fubar.");
-		runWithFailure("> Task :spotlessMisc FAILED\n" +
-				"Step 'no swearing' found problem in 'README.md':\n" +
-				"LINE_UNDEFINED: (swearing) No swearing!\n" +
-				"java.lang.Throwable: LINE_UNDEFINED: (swearing) No swearing!");
+		expectFailureAndConsoleToBe().toBe("> Task :spotlessMisc",
+				"> Task :spotlessMiscCheck FAILED",
+				"",
+				"FAILURE: Build failed with an exception.",
+				"",
+				"* What went wrong:",
+				"Execution failed for task ':spotlessMiscCheck'.",
+				"> There were 1 lint error(s), they must be fixed or suppressed.",
+				"  README.md:LINE_UNDEFINED noSwearingStep(swearing) No swearing!");
 	}
 
-	private void runWithSuccess(String expectedToStartWith) throws Exception {
-		BuildResult result = gradleRunner().withArguments("check").build();
-		assertResultAndMessages(result, TaskOutcome.SUCCESS, expectedToStartWith);
+	private void expectSuccess() throws Exception {
+		gradleRunner().withArguments("check", "--stacktrace").build();
 	}
 
-	private void runWithFailure(String expectedToStartWith) throws Exception {
+	private StringSelfie expectFailureAndConsoleToBe() throws Exception {
 		BuildResult result = gradleRunner().withArguments("check").buildAndFail();
-		assertResultAndMessages(result, TaskOutcome.FAILED, expectedToStartWith);
-	}
-
-	private void assertResultAndMessages(BuildResult result, TaskOutcome outcome, String expectedToStartWith) {
 		String output = result.getOutput();
 		int register = output.indexOf(":spotlessInternalRegisterDependencies");
 		int firstNewlineAfterThat = output.indexOf('\n', register + 1);
-		String useThisToMatch = output.substring(firstNewlineAfterThat);
-
-		int numNewlines = CharMatcher.is('\n').countIn(expectedToStartWith);
-		List<String> actualLines = Splitter.on('\n').splitToList(LineEnding.toUnix(useThisToMatch.trim()));
-		String actualStart = String.join("\n", actualLines.subList(0, numNewlines + 1));
-		Assertions.assertThat(actualStart).isEqualTo(expectedToStartWith);
-		Assertions.assertThat(outcomes(result, outcome).size() + outcomes(result, TaskOutcome.UP_TO_DATE).size() + outcomes(result, TaskOutcome.NO_SOURCE).size())
-				.isEqualTo(outcomes(result).size());
+		int firstTry = output.indexOf("\n* Try:");
+		String useThisToMatch = output.substring(firstNewlineAfterThat, firstTry).trim();
+		return Selfie.expectSelfie(useThisToMatch);
 	}
 }

From cbb03fa4abefed0715179bf4f0e383135bca1127 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 23 Oct 2024 20:04:05 -0700
Subject: [PATCH 1884/2068] Replace mutable `removeSuppressedLints` with
 immutable `withRemovedSuppressions`.

---
 .../java/com/diffplug/spotless/LintState.java | 29 +++++++++++--------
 .../spotless/LintSuppressionTest.java         |  6 ++--
 .../gradle/spotless/SpotlessTaskImpl.java     |  3 +-
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/LintState.java b/lib/src/main/java/com/diffplug/spotless/LintState.java
index fca15ce3ac..42de3e8d58 100644
--- a/lib/src/main/java/com/diffplug/spotless/LintState.java
+++ b/lib/src/main/java/com/diffplug/spotless/LintState.java
@@ -18,16 +18,16 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Objects;
 
 import javax.annotation.Nullable;
 
 public class LintState {
 	private final DirtyState dirtyState;
-	private @Nullable List<List<Lint>> lintsPerStep;
+	private final @Nullable List<List<Lint>> lintsPerStep;
 
 	LintState(DirtyState dirtyState, @Nullable List<List<Lint>> lintsPerStep) {
 		this.dirtyState = dirtyState;
@@ -64,36 +64,41 @@ public LinkedHashMap<String, List<Lint>> getLintsByStep(Formatter formatter) {
 		return result;
 	}
 
-	public void removeSuppressedLints(Formatter formatter, String relativePath, List<LintSuppression> suppressions) {
+	public LintState withRemovedSuppressions(Formatter formatter, String relativePath, List<LintSuppression> suppressions) {
 		if (lintsPerStep == null) {
-			return;
+			return this;
 		}
 		if (formatter.getSteps().size() != lintsPerStep.size()) {
 			throw new IllegalStateException("LintState was created with a different formatter!");
 		}
+		boolean changed = false;
+		ValuePerStep<List<Lint>> perStepFiltered = new ValuePerStep<>(formatter);
 		for (int i = 0; i < lintsPerStep.size(); i++) {
 			FormatterStep step = formatter.getSteps().get(i);
-			List<Lint> lints = lintsPerStep.get(i);
-			if (lints != null) {
+			List<Lint> lintsOriginal = lintsPerStep.get(i);
+			if (lintsOriginal != null) {
+				List<Lint> lints = new ArrayList<>(lintsOriginal);
 				Iterator<Lint> iter = lints.iterator();
 				while (iter.hasNext()) {
 					Lint lint = iter.next();
 					for (LintSuppression suppression : suppressions) {
 						if (suppression.suppresses(relativePath, step, lint)) {
+							changed = true;
 							iter.remove();
 							break;
 						}
 					}
 				}
-				if (lints.isEmpty()) {
-					lintsPerStep.set(i, null);
-					if (lintsPerStep.stream().allMatch(Objects::isNull)) {
-						lintsPerStep = null;
-						return;
-					}
+				if (!lints.isEmpty()) {
+					perStepFiltered.set(i, lints);
 				}
 			}
 		}
+		if (changed) {
+			return new LintState(dirtyState, perStepFiltered.indexOfFirstValue() == -1 ? null : perStepFiltered);
+		} else {
+			return this;
+		}
 	}
 
 	public String asStringDetailed(File file, Formatter formatter) {
diff --git a/lib/src/test/java/com/diffplug/spotless/LintSuppressionTest.java b/lib/src/test/java/com/diffplug/spotless/LintSuppressionTest.java
index efe96bc3cb..0ad9b8e29e 100644
--- a/lib/src/test/java/com/diffplug/spotless/LintSuppressionTest.java
+++ b/lib/src/test/java/com/diffplug/spotless/LintSuppressionTest.java
@@ -46,8 +46,7 @@ private Formatter formatter() {
 
 	@Test
 	public void testMatchSingle() {
-		var noSuppressions = dummyLintState();
-		noSuppressions.removeSuppressedLints(formatter(), "file", List.of());
+		var noSuppressions = dummyLintState().withRemovedSuppressions(formatter(), "file", List.of());
 		assertThat(noSuppressions.isHasLints()).isTrue();
 		removesLint(s -> s.setStep("blah")).isFalse();
 		removesLint(s -> s.setStep("endWithNewline")).isTrue();
@@ -77,8 +76,7 @@ private AbstractBooleanAssert<?> removesLint(Consumer<LintSuppression> suppressi
 		var s = new LintSuppression();
 		suppression.accept(s);
 
-		var ls = dummyLintState();
-		ls.removeSuppressedLints(formatter(), "testFile", List.of(s));
+		var ls = dummyLintState().withRemovedSuppressions(formatter(), "testFile", List.of(s));
 		return assertThat(!ls.isHasLints());
 	}
 }
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
index 27879925b6..9c8d6c49be 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
@@ -118,8 +118,7 @@ void processInputFile(@Nullable GitRatchet ratchet, Formatter formatter, File in
 			lintState = LintState.clean();
 		} else {
 			try {
-				lintState = LintState.of(formatter, input);
-				lintState.removeSuppressedLints(formatter, relativePath, getLintSuppressions());
+				lintState = LintState.of(formatter, input).withRemovedSuppressions(formatter, relativePath, getLintSuppressions());
 			} catch (Throwable e) {
 				throw new IllegalArgumentException("Issue processing file: " + input, e);
 			}

From a36b44b604a8b54038d044c334fc7a53fc7beb79 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 23 Oct 2024 20:04:14 -0700
Subject: [PATCH 1885/2068] Update tests for the new format.

---
 .../com/diffplug/gradle/spotless/BiomeIntegrationTest.java  | 6 +++---
 .../diffplug/gradle/spotless/ErrorShouldRethrowTest.java    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java
index 8391a8757e..0a8dfe7022 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java
@@ -387,11 +387,11 @@ void failureWhenNotParseable() throws Exception {
 				"}");
 		setFile("biome_test.js").toResource("biome/js/fileBefore.js");
 
-		var spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").buildAndFail();
-		assertThat(spotlessApply.getOutput()).contains("spotlessMybiome FAILED");
+		var spotlessApply = gradleRunner().withArguments("spotlessApply").buildAndFail();
+		assertThat(spotlessApply.getOutput()).contains("spotlessMybiomeApply FAILED");
 		assertFile("biome_test.js").sameAsResource("biome/js/fileBefore.js");
 		assertThat(spotlessApply.getOutput()).contains("Format with errors is disabled.");
-		assertThat(spotlessApply.getOutput()).contains("Step 'biome' found problem in 'biome_test.js'");
+		assertThat(spotlessApply.getOutput()).contains("biome_test.js:LINE_UNDEFINED biome(java.lang.RuntimeException)");
 	}
 
 	/**
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrowTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrowTest.java
index 1068f42908..eca02db2ab 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrowTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrowTest.java
@@ -86,7 +86,7 @@ void unlessEnforceCheckIsFalse() throws Exception {
 	@Test
 	void unlessExemptedByStep() throws Exception {
 		writeBuild(
-				"        ignoreErrorForStep 'no swearing'",
+				"        ignoreErrorForStep 'noSwearingStep'",
 				"    } // format",
 				"}     // spotless");
 		setFile("README.md").toContent("This code is fubar.");

From ffc7919d19122b50d69e2282b42a12ec17ef9ad9 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 23 Oct 2024 20:10:55 -0700
Subject: [PATCH 1886/2068] Delete the unneeded LintPolicy.

---
 .../com/diffplug/spotless/DirtyState.java     |  2 +-
 .../java/com/diffplug/spotless/Formatter.java | 17 ++++++++-
 .../com/diffplug/spotless/LintPolicy.java     | 35 -------------------
 3 files changed, 17 insertions(+), 37 deletions(-)
 delete mode 100644 lib/src/main/java/com/diffplug/spotless/LintPolicy.java

diff --git a/lib/src/main/java/com/diffplug/spotless/DirtyState.java b/lib/src/main/java/com/diffplug/spotless/DirtyState.java
index 964cd102e1..a5d269aa70 100644
--- a/lib/src/main/java/com/diffplug/spotless/DirtyState.java
+++ b/lib/src/main/java/com/diffplug/spotless/DirtyState.java
@@ -80,7 +80,7 @@ public static DirtyState of(Formatter formatter, File file, byte[] rawBytes) {
 	public static DirtyState of(Formatter formatter, File file, byte[] rawBytes, String raw) {
 		var valuePerStep = new ValuePerStep<Throwable>(formatter);
 		DirtyState state = of(formatter, file, rawBytes, raw, valuePerStep);
-		LintPolicy.legacyBehavior(formatter, file, valuePerStep);
+		Formatter.legacyErrorBehavior(formatter, file, valuePerStep);
 		return state;
 	}
 
diff --git a/lib/src/main/java/com/diffplug/spotless/Formatter.java b/lib/src/main/java/com/diffplug/spotless/Formatter.java
index 970d5eeeb4..9ab7008515 100644
--- a/lib/src/main/java/com/diffplug/spotless/Formatter.java
+++ b/lib/src/main/java/com/diffplug/spotless/Formatter.java
@@ -28,6 +28,9 @@
 import java.util.List;
 import java.util.Objects;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /** Formatter which performs the full formatting. */
 public final class Formatter implements Serializable, AutoCloseable {
 	private static final long serialVersionUID = 1L;
@@ -130,10 +133,22 @@ public String computeLineEndings(String unix, File file) {
 	public String compute(String unix, File file) {
 		ValuePerStep<Throwable> exceptionPerStep = new ValuePerStep<>(this);
 		String result = computeWithLint(unix, file, exceptionPerStep);
-		LintPolicy.legacyBehavior(this, file, exceptionPerStep);
+		legacyErrorBehavior(this, file, exceptionPerStep);
 		return result;
 	}
 
+	static void legacyErrorBehavior(Formatter formatter, File file, ValuePerStep<Throwable> exceptionPerStep) {
+		for (int i = 0; i < formatter.getSteps().size(); ++i) {
+			Throwable exception = exceptionPerStep.get(i);
+			if (exception != null && exception != LintState.formatStepCausedNoChange()) {
+				logger.error("Step '{}' found problem in '{}':\n{}", formatter.getSteps().get(i), file.getName(), exception.getMessage(), exception);
+				throw ThrowingEx.asRuntimeRethrowError(exception);
+			}
+		}
+	}
+
+	private static final Logger logger = LoggerFactory.getLogger(Formatter.class);
+
 	/**
 	 * Returns the result of calling all of the FormatterSteps, while also
 	 * tracking any exceptions which are thrown.
diff --git a/lib/src/main/java/com/diffplug/spotless/LintPolicy.java b/lib/src/main/java/com/diffplug/spotless/LintPolicy.java
deleted file mode 100644
index d5fb54e628..0000000000
--- a/lib/src/main/java/com/diffplug/spotless/LintPolicy.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2024 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless;
-
-import java.io.File;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-class LintPolicy {
-	static void legacyBehavior(Formatter formatter, File file, ValuePerStep<Throwable> exceptionPerStep) {
-		for (int i = 0; i < formatter.getSteps().size(); ++i) {
-			Throwable exception = exceptionPerStep.get(i);
-			if (exception != null && exception != LintState.formatStepCausedNoChange()) {
-				logger.error("Step '{}' found problem in '{}':\n{}", formatter.getSteps().get(i), file.getName(), exception.getMessage(), exception);
-				throw ThrowingEx.asRuntimeRethrowError(exception);
-			}
-		}
-	}
-
-	private static final Logger logger = LoggerFactory.getLogger(Formatter.class);
-}

From a8dcdb651617b45ecc47530bd3e29679988126a4 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 23 Oct 2024 21:18:25 -0700
Subject: [PATCH 1887/2068] Minor fixup.

---
 lib/src/main/java/com/diffplug/spotless/Formatter.java | 2 +-
 lib/src/main/java/com/diffplug/spotless/LintState.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/Formatter.java b/lib/src/main/java/com/diffplug/spotless/Formatter.java
index 9ab7008515..0635f8dfe6 100644
--- a/lib/src/main/java/com/diffplug/spotless/Formatter.java
+++ b/lib/src/main/java/com/diffplug/spotless/Formatter.java
@@ -141,7 +141,7 @@ static void legacyErrorBehavior(Formatter formatter, File file, ValuePerStep<Thr
 		for (int i = 0; i < formatter.getSteps().size(); ++i) {
 			Throwable exception = exceptionPerStep.get(i);
 			if (exception != null && exception != LintState.formatStepCausedNoChange()) {
-				logger.error("Step '{}' found problem in '{}':\n{}", formatter.getSteps().get(i), file.getName(), exception.getMessage(), exception);
+				logger.error("Step '{}' found problem in '{}':\n{}", formatter.getSteps().get(i).getName(), file.getName(), exception.getMessage(), exception);
 				throw ThrowingEx.asRuntimeRethrowError(exception);
 			}
 		}
diff --git a/lib/src/main/java/com/diffplug/spotless/LintState.java b/lib/src/main/java/com/diffplug/spotless/LintState.java
index 42de3e8d58..3068872256 100644
--- a/lib/src/main/java/com/diffplug/spotless/LintState.java
+++ b/lib/src/main/java/com/diffplug/spotless/LintState.java
@@ -55,9 +55,9 @@ public LinkedHashMap<String, List<Lint>> getLintsByStep(Formatter formatter) {
 		}
 		LinkedHashMap<String, List<Lint>> result = new LinkedHashMap<>();
 		for (int i = 0; i < lintsPerStep.size(); i++) {
-			FormatterStep step = formatter.getSteps().get(i);
 			List<Lint> lints = lintsPerStep.get(i);
 			if (lints != null) {
+				FormatterStep step = formatter.getSteps().get(i);
 				result.put(step.getName(), lints);
 			}
 		}

From 2ce9803a9110c067e985e132a87c0673a638cc93 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 23 Oct 2024 21:50:09 -0700
Subject: [PATCH 1888/2068] Improve prettier's exception to be lint-friendly.

---
 .../spotless/npm/PrettierMissingParserException.java | 12 ++++++++++--
 .../gradle/spotless/PrettierIntegrationTest.java     |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/PrettierMissingParserException.java b/lib/src/main/java/com/diffplug/spotless/npm/PrettierMissingParserException.java
index cc04c7b182..9728b61eec 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/PrettierMissingParserException.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/PrettierMissingParserException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,12 +19,15 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
 import javax.annotation.Nonnull;
 
-class PrettierMissingParserException extends RuntimeException {
+import com.diffplug.spotless.Lint;
+
+class PrettierMissingParserException extends RuntimeException implements Lint.Has {
 	private static final long serialVersionUID = 1L;
 
 	private static final Map<String, String> EXTENSIONS_TO_PLUGINS;
@@ -87,6 +90,11 @@ public PrettierMissingParserException(@Nonnull File file, Exception cause) {
 		this.file = Objects.requireNonNull(file);
 	}
 
+	@Override
+	public List<Lint> getLints() {
+		return List.of(Lint.atUndefinedLine("no-parser", "Could not infer a parser. Maybe you need to include a prettier plugin in devDependencies? e.g. " + recommendPlugin(file)));
+	}
+
 	private static String recommendPlugin(File file) {
 		String pluginName = guessPlugin(file);
 		return "A good candidate for file '" + file + "' is '" + pluginName + "\n"
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java
index 9799fbcf15..b6547204b8 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java
@@ -226,7 +226,7 @@ void suggestsMissingJavaCommunityPlugin(String prettierVersion) throws IOExcepti
 				"}");
 		setFile("JavaTest.java").toResource("npm/prettier/plugins/java-test.dirty");
 		final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").buildAndFail();
-		Assertions.assertThat(spotlessApply.getOutput()).contains("could not infer a parser");
+		Assertions.assertThat(spotlessApply.getOutput()).contains("Could not infer a parser");
 		Assertions.assertThat(spotlessApply.getOutput()).contains("prettier-plugin-java");
 	}
 

From b2a52efd5543b36e549a7df1f58de56e1dea17e2 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 23 Oct 2024 22:07:46 -0700
Subject: [PATCH 1889/2068] Fix some lint names (file -> path, ruleId ->
 shortCode)

---
 .../main/java/com/diffplug/spotless/Lint.java | 30 +++++++++----------
 .../diffplug/spotless/LintSuppression.java    | 22 +++++++-------
 .../spotless/LintSuppressionTest.java         |  4 +--
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/Lint.java b/lib/src/main/java/com/diffplug/spotless/Lint.java
index e3e3fa9f4b..b48a7bcbd2 100644
--- a/lib/src/main/java/com/diffplug/spotless/Lint.java
+++ b/lib/src/main/java/com/diffplug/spotless/Lint.java
@@ -37,28 +37,28 @@ public static Lint atLine(int line, String ruleId, String detail) {
 		return new Lint(line, ruleId, detail);
 	}
 
-	public static Lint atLineRange(int lineStart, int lineEnd, String ruleId, String detail) {
-		return new Lint(lineStart, lineEnd, ruleId, detail);
+	public static Lint atLineRange(int lineStart, int lineEnd, String shortCode, String detail) {
+		return new Lint(lineStart, lineEnd, shortCode, detail);
 	}
 
 	private static final long serialVersionUID = 1L;
 
 	private int lineStart, lineEnd; // 1-indexed, inclusive
-	private String ruleId; // e.g. CN_IDIOM https://spotbugs.readthedocs.io/en/stable/bugDescriptions.html#cn-class-implements-cloneable-but-does-not-define-or-use-clone-method-cn-idiom
+	private String shortCode; // e.g. CN_IDIOM https://spotbugs.readthedocs.io/en/stable/bugDescriptions.html#cn-class-implements-cloneable-but-does-not-define-or-use-clone-method-cn-idiom
 	private String detail;
 
-	private Lint(int lineStart, int lineEnd, String ruleId, String detail) {
+	private Lint(int lineStart, int lineEnd, String shortCode, String detail) {
 		if (lineEnd < lineStart) {
 			throw new IllegalArgumentException("lineEnd must be >= lineStart: lineStart=" + lineStart + " lineEnd=" + lineEnd);
 		}
 		this.lineStart = lineStart;
 		this.lineEnd = lineEnd;
-		this.ruleId = LineEnding.toUnix(ruleId);
+		this.shortCode = LineEnding.toUnix(shortCode);
 		this.detail = LineEnding.toUnix(detail);
 	}
 
-	private Lint(int line, String ruleId, String detail) {
-		this(line, line, ruleId, detail);
+	private Lint(int line, String shortCode, String detail) {
+		this(line, line, shortCode, detail);
 	}
 
 	public int getLineStart() {
@@ -69,8 +69,8 @@ public int getLineEnd() {
 		return lineEnd;
 	}
 
-	public String getRuleId() {
-		return ruleId;
+	public String getShortCode() {
+		return shortCode;
 	}
 
 	public String getDetail() {
@@ -115,12 +115,12 @@ public RuntimeException shortcut() {
 	public String toString() {
 		if (lineStart == lineEnd) {
 			if (lineStart == LINE_UNDEFINED) {
-				return "LINE_UNDEFINED: (" + ruleId + ") " + detail;
+				return "LINE_UNDEFINED: (" + shortCode + ") " + detail;
 			} else {
-				return "L" + lineStart + ": (" + ruleId + ") " + detail;
+				return "L" + lineStart + ": (" + shortCode + ") " + detail;
 			}
 		} else {
-			return "L" + lineStart + "-" + lineEnd + ": (" + ruleId + ") " + detail;
+			return "L" + lineStart + "-" + lineEnd + ": (" + shortCode + ") " + detail;
 		}
 	}
 
@@ -131,12 +131,12 @@ public boolean equals(Object o) {
 		if (o == null || getClass() != o.getClass())
 			return false;
 		Lint lint = (Lint) o;
-		return lineStart == lint.lineStart && lineEnd == lint.lineEnd && Objects.equals(ruleId, lint.ruleId) && Objects.equals(detail, lint.detail);
+		return lineStart == lint.lineStart && lineEnd == lint.lineEnd && Objects.equals(shortCode, lint.shortCode) && Objects.equals(detail, lint.detail);
 	}
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(lineStart, lineEnd, ruleId, detail);
+		return Objects.hash(lineStart, lineEnd, shortCode, detail);
 	}
 
 	/** Attempts to parse a line number from the given exception. */
@@ -201,7 +201,7 @@ public void addWarningMessageTo(StringBuilder buffer, String stepName, boolean o
 			}
 		}
 		buffer.append(" ");
-		buffer.append(stepName).append("(").append(ruleId).append(") ");
+		buffer.append(stepName).append("(").append(shortCode).append(") ");
 
 		int firstNewline = detail.indexOf('\n');
 		if (firstNewline == -1) {
diff --git a/lib/src/main/java/com/diffplug/spotless/LintSuppression.java b/lib/src/main/java/com/diffplug/spotless/LintSuppression.java
index 41a81ae3df..d84107bd3a 100644
--- a/lib/src/main/java/com/diffplug/spotless/LintSuppression.java
+++ b/lib/src/main/java/com/diffplug/spotless/LintSuppression.java
@@ -21,16 +21,16 @@ public class LintSuppression implements java.io.Serializable {
 	private static final long serialVersionUID = 1L;
 
 	private static final String ALL = "*";
-	private String file = ALL;
+	private String path = ALL;
 	private String step = ALL;
 	private String shortCode = ALL;
 
-	public String getFile() {
-		return file;
+	public String getPath() {
+		return path;
 	}
 
-	public void setFile(String file) {
-		this.file = Objects.requireNonNull(file);
+	public void setPath(String path) {
+		this.path = Objects.requireNonNull(path);
 	}
 
 	public String getStep() {
@@ -50,9 +50,9 @@ public void setShortCode(String shortCode) {
 	}
 
 	public boolean suppresses(String relativePath, FormatterStep formatterStep, Lint lint) {
-		if (file.equals(ALL) || file.equals(relativePath)) {
+		if (path.equals(ALL) || path.equals(relativePath)) {
 			if (step.equals(ALL) || formatterStep.getName().equals(this.step)) {
-				if (shortCode.equals(ALL) || lint.getRuleId().equals(this.shortCode)) {
+				if (shortCode.equals(ALL) || lint.getShortCode().equals(this.shortCode)) {
 					return true;
 				}
 			}
@@ -61,7 +61,7 @@ public boolean suppresses(String relativePath, FormatterStep formatterStep, Lint
 	}
 
 	public void ensureDoesNotSuppressAll() {
-		boolean suppressAll = file.equals(ALL) && step.equals(ALL) && shortCode.equals(ALL);
+		boolean suppressAll = path.equals(ALL) && step.equals(ALL) && shortCode.equals(ALL);
 		if (suppressAll) {
 			throw new IllegalArgumentException("You must specify a specific `file`, `step`, or `shortCode`.");
 		}
@@ -74,18 +74,18 @@ public boolean equals(Object o) {
 		if (o == null || getClass() != o.getClass())
 			return false;
 		LintSuppression that = (LintSuppression) o;
-		return Objects.equals(file, that.file) && Objects.equals(step, that.step) && Objects.equals(shortCode, that.shortCode);
+		return Objects.equals(path, that.path) && Objects.equals(step, that.step) && Objects.equals(shortCode, that.shortCode);
 	}
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(file, step, shortCode);
+		return Objects.hash(path, step, shortCode);
 	}
 
 	@Override
 	public String toString() {
 		return "LintSuppression{" +
-				"file='" + file + '\'' +
+				"file='" + path + '\'' +
 				", step='" + step + '\'' +
 				", code='" + shortCode + '\'' +
 				'}';
diff --git a/lib/src/test/java/com/diffplug/spotless/LintSuppressionTest.java b/lib/src/test/java/com/diffplug/spotless/LintSuppressionTest.java
index 0ad9b8e29e..1e1037a6ef 100644
--- a/lib/src/test/java/com/diffplug/spotless/LintSuppressionTest.java
+++ b/lib/src/test/java/com/diffplug/spotless/LintSuppressionTest.java
@@ -50,8 +50,8 @@ public void testMatchSingle() {
 		assertThat(noSuppressions.isHasLints()).isTrue();
 		removesLint(s -> s.setStep("blah")).isFalse();
 		removesLint(s -> s.setStep("endWithNewline")).isTrue();
-		removesLint(s -> s.setFile("blah")).isFalse();
-		removesLint(s -> s.setFile("testFile")).isTrue();
+		removesLint(s -> s.setPath("blah")).isFalse();
+		removesLint(s -> s.setPath("testFile")).isTrue();
 		removesLint(s -> s.setShortCode("blah")).isFalse();
 		removesLint(s -> s.setShortCode("66")).isTrue();
 	}

From 44b1ee4b5b179b383ae6e50d434253f900648e9f Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 23 Oct 2024 22:14:39 -0700
Subject: [PATCH 1890/2068] Add deprecation warnings and javadoc to
 `FormatExtension`.

---
 .../gradle/spotless/FormatExtension.java        | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index 68f00f5208..56cccc52c9 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -170,6 +170,7 @@ public void setEncoding(Charset charset) {
 
 	final List<LintSuppression> lintSuppressions = new ArrayList<>();
 
+	/** Suppresses any lints which meet the supplied criteria. */
 	public void suppressLintsFor(Action<LintSuppression> lintSuppression) {
 		LintSuppression suppression = new LintSuppression();
 		lintSuppression.execute(suppression);
@@ -177,16 +178,26 @@ public void suppressLintsFor(Action<LintSuppression> lintSuppression) {
 		lintSuppressions.add(suppression);
 	}
 
-	/** Ignores errors in the given step. */
+	/**
+	 * Ignores errors in the given step.
+	 *
+	 * @deprecated Use {@link #suppressLintsFor(Action)} instead.
+	 */
 	@Deprecated
 	public void ignoreErrorForStep(String stepName) {
+		System.err.println("`ignoreErrorForStep('" + stepName + "') is deprecated, use `suppressLintsFor { step = '" + stepName + "' }` instead.");
 		suppressLintsFor(it -> it.setStep(stepName));
 	}
 
-	/** Ignores errors for the given relative path. */
+	/**
+	 * Ignores errors for the given relative path.
+	 *
+	 * @deprecated Use {@link #suppressLintsFor(Action)} instead.
+	 */
 	@Deprecated
 	public void ignoreErrorForPath(String relativePath) {
-		suppressLintsFor(it -> it.setFile(relativePath));
+		System.err.println("`ignoreErrorForPath('" + relativePath + "') is deprecated, use `suppressLintsFor { path = '" + relativePath + "' }` instead.");
+		suppressLintsFor(it -> it.setPath(relativePath));
 	}
 
 	/**

From 59cdaa1fc93bcab628fa11908473a0a562379a13 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 23 Oct 2024 22:19:25 -0700
Subject: [PATCH 1891/2068] Better error message, and loop that into the
 README.

---
 plugin-gradle/README.md                        | 18 +++++++-----------
 .../gradle/spotless/SpotlessTaskService.java   |  2 +-
 .../spotless/ErrorShouldRethrowTest.java       |  6 ++++--
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index c5adda5d2b..41c1b6e1a3 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -146,11 +146,10 @@ Starting in version `7.0.0`, Spotless now supports linting in addition to format
 
 ```console
 user@machine repo % ./gradlew build
-:spotlessJavaCheck FAILED
-  The following files had format violations:
-  src\main\java\com\diffplug\gradle\spotless\FormatExtension.java
-    -\t\t····if·(targets.length·==·0)·{
-    +\t\tif·(targets.length·==·0)·{
+:spotlessKotlinCheck FAILED
+  There were 2 lint error(s), they must be fixed or suppressed.
+    src/main/kotlin/com/diffplug/Foo.kt:L7 ktlint(standard:no-wildcard-imports) Wildcard import
+    src/main/kotlin/com/diffplug/Bar.kt:L9 ktlint(standard:no-wildcard-imports) Wildcard import 
   Resolve these lints or suppress with `suppressLintsFor`
 ```
 
@@ -158,14 +157,11 @@ To suppress lints, you can do this:
 
 ```gradle
 spotless {
-  suppressLintsFor { // applies to all formats
-    file = 'src/blah/blah'
-  }
   kotlin {
-    ktfmt()
-    suppressLintsFor { // applies to only the kotlin formats
+    ktlint()
+    suppressLintsFor {
       step = 'ktlint'
-      shortCode = 'rename'
+      shortCode = 'standard:no-wildcard-imports'
     }
   }
 }
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskService.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskService.java
index ce371ecd61..b58ff9005a 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskService.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskService.java
@@ -199,7 +199,7 @@ public void visitFile(FileVisitDetails fileVisitDetails) {
 					}
 				}
 			}
-			builder.setLength(builder.length() - 1); // remove trailing newline
+			builder.append("Resolve these lints or suppress with `suppressLintsFor`");
 			return builder.toString();
 		}
 	}
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrowTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrowTest.java
index eca02db2ab..e083161a09 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrowTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrowTest.java
@@ -70,7 +70,8 @@ void anyExceptionShouldFail() throws Exception {
 				"* What went wrong:",
 				"Execution failed for task ':spotlessMiscCheck'.",
 				"> There were 1 lint error(s), they must be fixed or suppressed.",
-				"  README.md:LINE_UNDEFINED noSwearingStep(swearing) No swearing!");
+				"  README.md:LINE_UNDEFINED noSwearingStep(swearing) No swearing!",
+				"  Resolve these lints or suppress with `suppressLintsFor`");
 	}
 
 	@Test
@@ -119,7 +120,8 @@ void failsIfNeitherStepNorFileExempted() throws Exception {
 				"* What went wrong:",
 				"Execution failed for task ':spotlessMiscCheck'.",
 				"> There were 1 lint error(s), they must be fixed or suppressed.",
-				"  README.md:LINE_UNDEFINED noSwearingStep(swearing) No swearing!");
+				"  README.md:LINE_UNDEFINED noSwearingStep(swearing) No swearing!",
+				"  Resolve these lints or suppress with `suppressLintsFor`");
 	}
 
 	private void expectSuccess() throws Exception {

From 611a45d0826acf304440705acfa1f0e70d82c77b Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 23 Oct 2024 22:27:27 -0700
Subject: [PATCH 1892/2068] Update changelogs.

---
 CHANGES.md               | 2 +-
 plugin-gradle/CHANGES.md | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index bf65c5a019..fc2b6e827b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,7 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* APIs to support linting. (implemented in [#2148](https://github.com/diffplug/spotless/pull/2148) and [#2149](https://github.com/diffplug/spotless/pull/2149))
+* APIs to support linting. (implemented in [#2148](https://github.com/diffplug/spotless/pull/2148), [#2149](https://github.com/diffplug/spotless/pull/2149), [#2307](https://github.com/diffplug/spotless/pull/2307))
   * Spotless is still primarily a formatter, not a linter. But when formatting fails, it's more flexible to model those failures as lints so that the formatting can continue and ideally we can also capture the line numbers causing the failure.
   * `Lint` models a single change. A `FormatterStep` can create a lint by:
     * throwing an exception during formatting, ideally `throw Lint.atLine(127, "code", "Well what happened was...")`
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index c9bdcee643..e5f7aa36ed 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,6 +5,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Support for line ending policy `PRESERVE` which just takes the first line ending of every given file as setting (no matter if `\n`, `\r\n` or `\r`) ([#2304](https://github.com/diffplug/spotless/pull/2304))
+* New `suppressLintsFor` DSL ([docs](https://github.com/diffplug/spotless/tree/main/plugin-gradle#linting)) ([#2307](https://github.com/diffplug/spotless/pull/2307))
+  * `ignoreErrorForStep` and `ignoreErrorForPath` are now deprecated aliases of `suppressLintsFor`
+  * Spotless is still a formatter not a linter, it just models formatting failures as lints rather than stopping execution (resolves [#287](https://github.com/diffplug/spotless/issues/287))
 ### Fixed
 * `ktlint` steps now read from the `string` instead of the `file` so they don't clobber earlier steps. (fixes [#1599](https://github.com/diffplug/spotless/issues/1599))
 

From 0f8885938e1d0406ff04f30f92120f70dfaf73df Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 23 Oct 2024 23:27:25 -0700
Subject: [PATCH 1893/2068] Prepare IdeHookTest to run in configuration cache
 mode.

---
 .../com/diffplug/spotless/TestingOnly.java    | 37 +++++++++++++++++++
 .../diffplug/gradle/spotless/IdeHookTest.java |  6 +--
 2 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/TestingOnly.java

diff --git a/lib/src/main/java/com/diffplug/spotless/TestingOnly.java b/lib/src/main/java/com/diffplug/spotless/TestingOnly.java
new file mode 100644
index 0000000000..89fb791789
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/TestingOnly.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless;
+
+import java.util.Locale;
+
+/** These FormatterStep are meant to be used for testing only. */
+public class TestingOnly {
+	public static FormatterStep lowercase() {
+		return FormatterStep.create("lowercase", "lowercaseStateUnused", unused -> TestingOnly::lowercase);
+	}
+
+	private static String lowercase(String raw) {
+		return raw.toLowerCase(Locale.ROOT);
+	}
+
+	public static FormatterStep diverge() {
+		return FormatterStep.create("diverge", "divergeStateUnused", unused -> TestingOnly::diverge);
+	}
+
+	private static String diverge(String raw) {
+		return raw + " ";
+	}
+}
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/IdeHookTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/IdeHookTest.java
index f28b9f9820..9dca5c7900 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/IdeHookTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/IdeHookTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,11 +40,11 @@ void before() throws IOException {
 				"spotless {",
 				"  format 'misc', {",
 				"    target 'DIRTY.md', 'CLEAN.md'",
-				"    custom 'lowercase', { str -> str.toLowerCase(Locale.ROOT) }",
+				"    addStep com.diffplug.spotless.TestingOnly.lowercase()",
 				"  }",
 				"  format 'diverge', {",
 				"    target 'DIVERGE.md'",
-				"    custom 'diverge', { str -> str + ' ' }",
+				"    addStep com.diffplug.spotless.TestingOnly.diverge()",
 				"  }",
 				"}");
 		dirty = new File(rootFolder(), "DIRTY.md");

From ce70ea7423acd45d5c27421e19e11fe26cb520e2 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 23 Oct 2024 23:30:47 -0700
Subject: [PATCH 1894/2068] Store IDE hook state as an input on
 `SpotlessTaskImpl` so that we don't violate any configuration cache rules.

---
 .../com/diffplug/gradle/spotless/IdeHook.java | 31 ++++++++++++++++---
 .../spotless/SpotlessExtensionImpl.java       | 17 ++++------
 .../gradle/spotless/SpotlessTaskImpl.java     | 11 +++++++
 3 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/IdeHook.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/IdeHook.java
index cc767ce111..8b7253fd8c 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/IdeHook.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/IdeHook.java
@@ -19,12 +19,34 @@
 import java.io.IOException;
 import java.nio.file.Files;
 
+import javax.annotation.Nullable;
+
+import org.gradle.api.Project;
+
 import com.diffplug.common.base.Errors;
 import com.diffplug.common.io.ByteStreams;
 import com.diffplug.spotless.DirtyState;
 import com.diffplug.spotless.Formatter;
+import com.diffplug.spotless.NoLambda;
 
 class IdeHook {
+	static class State extends NoLambda.EqualityBasedOnSerialization {
+		final @Nullable String path;
+		final boolean useStdIn;
+		final boolean useStdOut;
+
+		State(Project project) {
+			path = (String) project.findProperty(PROPERTY);
+			if (path != null) {
+				useStdIn = project.hasProperty(USE_STD_IN);
+				useStdOut = project.hasProperty(USE_STD_OUT);
+			} else {
+				useStdIn = false;
+				useStdOut = false;
+			}
+		}
+	}
+
 	final static String PROPERTY = "spotlessIdeHook";
 	final static String USE_STD_IN = "spotlessIdeHookUseStdIn";
 	final static String USE_STD_OUT = "spotlessIdeHookUseStdOut";
@@ -33,9 +55,8 @@ private static void dumpIsClean() {
 		System.err.println("IS CLEAN");
 	}
 
-	static void performHook(SpotlessTaskImpl spotlessTask) {
-		String path = (String) spotlessTask.getProject().property(PROPERTY);
-		File file = new File(path);
+	static void performHook(SpotlessTaskImpl spotlessTask, IdeHook.State state) {
+		File file = new File(state.path);
 		if (!file.isAbsolute()) {
 			System.err.println("Argument passed to " + PROPERTY + " must be an absolute path");
 			return;
@@ -50,7 +71,7 @@ static void performHook(SpotlessTaskImpl spotlessTask) {
 					}
 				}
 				byte[] bytes;
-				if (spotlessTask.getProject().hasProperty(USE_STD_IN)) {
+				if (state.useStdIn) {
 					bytes = ByteStreams.toByteArray(System.in);
 				} else {
 					bytes = Files.readAllBytes(file.toPath());
@@ -63,7 +84,7 @@ static void performHook(SpotlessTaskImpl spotlessTask) {
 					System.err.println("Run 'spotlessDiagnose' for details https://github.com/diffplug/spotless/blob/main/PADDEDCELL.md");
 				} else {
 					System.err.println("IS DIRTY");
-					if (spotlessTask.getProject().hasProperty(USE_STD_OUT)) {
+					if (state.useStdOut) {
 						dirty.writeCanonicalTo(System.out);
 					} else {
 						dirty.writeCanonicalTo(file);
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtensionImpl.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtensionImpl.java
index 96474ffc4b..75168f690a 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtensionImpl.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtensionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,7 +48,7 @@ public SpotlessExtensionImpl(Project project) {
 
 	@Override
 	protected void createFormatTasks(String name, FormatExtension formatExtension) {
-		boolean isIdeHook = project.hasProperty(IdeHook.PROPERTY);
+		IdeHook.State ideHook = new IdeHook.State(project);
 		TaskContainer tasks = project.getTasks();
 
 		// create the SpotlessTask
@@ -56,7 +56,7 @@ protected void createFormatTasks(String name, FormatExtension formatExtension) {
 		TaskProvider<SpotlessTaskImpl> spotlessTask = tasks.register(taskName, SpotlessTaskImpl.class, task -> {
 			task.init(getRegisterDependenciesTask().getTaskService());
 			task.setGroup(TASK_GROUP);
-			task.setEnabled(!isIdeHook);
+			task.getIdeHookState().set(ideHook);
 			// clean removes the SpotlessCache, so we have to run after clean
 			task.mustRunAfter(BasePlugin.CLEAN_TASK_NAME);
 		});
@@ -75,23 +75,18 @@ protected void createFormatTasks(String name, FormatExtension formatExtension) {
 		TaskProvider<SpotlessApply> applyTask = tasks.register(taskName + APPLY, SpotlessApply.class, task -> {
 			task.init(spotlessTask.get());
 			task.setGroup(TASK_GROUP);
-			task.setEnabled(!isIdeHook);
+			task.setEnabled(ideHook.path == null);
 			task.dependsOn(spotlessTask);
 		});
 		rootApplyTask.configure(task -> {
-			task.dependsOn(applyTask);
-
-			if (isIdeHook) {
-				// the rootApplyTask is no longer just a marker task, now it does a bit of work itself
-				task.doLast(unused -> IdeHook.performHook(spotlessTask.get()));
-			}
+			task.dependsOn(ideHook.path == null ? applyTask : spotlessTask);
 		});
 
 		TaskProvider<SpotlessCheck> checkTask = tasks.register(taskName + CHECK, SpotlessCheck.class, task -> {
 			SpotlessTaskImpl source = spotlessTask.get();
 			task.setGroup(TASK_GROUP);
 			task.init(source);
-			task.setEnabled(!isIdeHook);
+			task.setEnabled(ideHook.path == null);
 			task.dependsOn(source);
 
 			// if the user runs both, make sure that apply happens first,
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
index 9c8d6c49be..e2199f0f28 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
@@ -29,8 +29,10 @@
 import org.gradle.api.GradleException;
 import org.gradle.api.file.DirectoryProperty;
 import org.gradle.api.file.FileSystemOperations;
+import org.gradle.api.provider.Property;
 import org.gradle.api.provider.Provider;
 import org.gradle.api.tasks.CacheableTask;
+import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.Internal;
 import org.gradle.api.tasks.TaskAction;
 import org.gradle.work.ChangeType;
@@ -46,6 +48,9 @@
 
 @CacheableTask
 public abstract class SpotlessTaskImpl extends SpotlessTask {
+	@Input
+	abstract Property<IdeHook.State> getIdeHookState();
+
 	@Internal
 	abstract DirectoryProperty getProjectDir();
 
@@ -69,6 +74,12 @@ Provider<SpotlessTaskService> getTaskServiceProvider() {
 
 	@TaskAction
 	public void performAction(InputChanges inputs) throws Exception {
+		IdeHook.State ideHook = getIdeHookState().getOrNull();
+		if (ideHook != null && ideHook.path != null) {
+			IdeHook.performHook(this, ideHook);
+			return;
+		}
+
 		SpotlessTaskService taskService = getTaskService().get();
 		taskService.registerSourceAlreadyRan(this);
 		if (target == null) {

From cfe10585ee3c017769c00182c730b7210d02bdae Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 23 Oct 2024 23:40:48 -0700
Subject: [PATCH 1895/2068] Run `IdeHookTest` with and without configuration
 cache.

---
 .../diffplug/gradle/spotless/IdeHookTest.java | 68 ++++++++++++++-----
 1 file changed, 50 insertions(+), 18 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/IdeHookTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/IdeHookTest.java
index 9dca5c7900..c38484384f 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/IdeHookTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/IdeHookTest.java
@@ -19,14 +19,19 @@
 import java.io.IOException;
 import java.io.Writer;
 import java.nio.charset.StandardCharsets;
+import java.util.stream.Stream;
 
 import org.assertj.core.api.Assertions;
+import org.gradle.testkit.runner.GradleRunner;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import com.diffplug.common.base.StringPrinter;
 import com.diffplug.common.io.Files;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class IdeHookTest extends GradleIntegrationHarness {
 	private String output, error;
 	private File dirty, clean, diverge, outofbounds;
@@ -57,12 +62,16 @@ void before() throws IOException {
 		Files.write("ABC".getBytes(StandardCharsets.UTF_8), outofbounds);
 	}
 
-	private void runWith(String... arguments) throws IOException {
+	private static Stream<Boolean> configurationCacheProvider() {
+		return Stream.of(false, true);
+	}
+
+	private void runWith(boolean configurationCache, String... arguments) throws IOException {
 		StringBuilder output = new StringBuilder();
 		StringBuilder error = new StringBuilder();
 		try (Writer outputWriter = new StringPrinter(output::append).toWriter();
 				Writer errorWriter = new StringPrinter(error::append).toWriter();) {
-			gradleRunner()
+			gradleRunner(configurationCache)
 					.withArguments(arguments)
 					.forwardStdOutput(outputWriter)
 					.forwardStdError(errorWriter)
@@ -72,37 +81,60 @@ private void runWith(String... arguments) throws IOException {
 		this.error = error.toString();
 	}
 
-	@Test
-	void dirty() throws IOException {
-		runWith("spotlessApply", "--quiet", "-PspotlessIdeHook=" + dirty.getAbsolutePath(), "-PspotlessIdeHookUseStdOut");
+	protected GradleRunner gradleRunner(boolean configurationCache) throws IOException {
+		if (configurationCache) {
+			setFile("gradle.properties").toContent("org.gradle.unsafe.configuration-cache=true");
+			setFile("settings.gradle").toContent("enableFeaturePreview(\"STABLE_CONFIGURATION_CACHE\")");
+			return super.gradleRunner().withGradleVersion(GradleVersionSupport.STABLE_CONFIGURATION_CACHE.version);
+		} else {
+			File gradleProps = new File(rootFolder(), "gradle.properties");
+			if (gradleProps.exists()) {
+				gradleProps.delete();
+			}
+			File settingsGradle = new File(rootFolder(), "settings.gradle");
+			if (settingsGradle.exists()) {
+				settingsGradle.delete();
+			}
+			return super.gradleRunner();
+		}
+	}
+
+	@ParameterizedTest
+	@MethodSource("configurationCacheProvider")
+	void dirty(boolean configurationCache) throws IOException {
+		runWith(configurationCache, "spotlessApply", "--quiet", "-PspotlessIdeHook=" + dirty.getAbsolutePath(), "-PspotlessIdeHookUseStdOut");
 		Assertions.assertThat(output).isEqualTo("abc");
 		Assertions.assertThat(error).startsWith("IS DIRTY");
 	}
 
-	@Test
-	void clean() throws IOException {
-		runWith("spotlessApply", "--quiet", "-PspotlessIdeHook=" + clean.getAbsolutePath(), "-PspotlessIdeHookUseStdOut");
+	@ParameterizedTest
+	@MethodSource("configurationCacheProvider")
+	void clean(boolean configurationCache) throws IOException {
+		runWith(configurationCache, "spotlessApply", "--quiet", "-PspotlessIdeHook=" + clean.getAbsolutePath(), "-PspotlessIdeHookUseStdOut");
 		Assertions.assertThat(output).isEmpty();
 		Assertions.assertThat(error).startsWith("IS CLEAN");
 	}
 
-	@Test
-	void diverge() throws IOException {
-		runWith("spotlessApply", "--quiet", "-PspotlessIdeHook=" + diverge.getAbsolutePath(), "-PspotlessIdeHookUseStdOut");
+	@ParameterizedTest
+	@MethodSource("configurationCacheProvider")
+	void diverge(boolean configurationCache) throws IOException {
+		runWith(configurationCache, "spotlessApply", "--quiet", "-PspotlessIdeHook=" + diverge.getAbsolutePath(), "-PspotlessIdeHookUseStdOut");
 		Assertions.assertThat(output).isEmpty();
 		Assertions.assertThat(error).startsWith("DID NOT CONVERGE");
 	}
 
-	@Test
-	void outofbounds() throws IOException {
-		runWith("spotlessApply", "--quiet", "-PspotlessIdeHook=" + outofbounds.getAbsolutePath(), "-PspotlessIdeHookUseStdOut");
+	@ParameterizedTest
+	@MethodSource("configurationCacheProvider")
+	void outofbounds(boolean configurationCache) throws IOException {
+		runWith(configurationCache, "spotlessApply", "--quiet", "-PspotlessIdeHook=" + outofbounds.getAbsolutePath(), "-PspotlessIdeHookUseStdOut");
 		Assertions.assertThat(output).isEmpty();
 		Assertions.assertThat(error).isEmpty();
 	}
 
-	@Test
-	void notAbsolute() throws IOException {
-		runWith("spotlessApply", "--quiet", "-PspotlessIdeHook=build.gradle", "-PspotlessIdeHookUseStdOut");
+	@ParameterizedTest
+	@MethodSource("configurationCacheProvider")
+	void notAbsolute(boolean configurationCache) throws IOException {
+		runWith(configurationCache, "spotlessApply", "--quiet", "-PspotlessIdeHook=build.gradle", "-PspotlessIdeHookUseStdOut");
 		Assertions.assertThat(output).isEmpty();
 		Assertions.assertThat(error).contains("Argument passed to spotlessIdeHook must be an absolute path");
 	}

From f80e9233311b465b2d37745626ec7531f7e59d4d Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 23 Oct 2024 23:55:31 -0700
Subject: [PATCH 1896/2068] Mark the `getIdeHookState` prop as optional.

---
 .../java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
index e2199f0f28..7241f018d0 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
@@ -34,6 +34,7 @@
 import org.gradle.api.tasks.CacheableTask;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.Internal;
+import org.gradle.api.tasks.Optional;
 import org.gradle.api.tasks.TaskAction;
 import org.gradle.work.ChangeType;
 import org.gradle.work.FileChange;
@@ -49,6 +50,7 @@
 @CacheableTask
 public abstract class SpotlessTaskImpl extends SpotlessTask {
 	@Input
+	@Optional
 	abstract Property<IdeHook.State> getIdeHookState();
 
 	@Internal

From 3ec8c3b11112afc7ddabc16e1e00cdc16405af12 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 24 Oct 2024 08:24:42 -0700
Subject: [PATCH 1897/2068] Bump versions to BETA4

---
 gradle/changelog.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle/changelog.gradle b/gradle/changelog.gradle
index ecbf4c61b9..ded1baf4e6 100644
--- a/gradle/changelog.gradle
+++ b/gradle/changelog.gradle
@@ -26,11 +26,11 @@ spotlessChangelog {
 	runAfterPush "gh release create ${kind}/{{version}} --title '${releaseTitle} v{{version}}' --notes-from-tag"
 
 	if (kind == 'gradle') {
-		forceNextVersion '7.0.0.BETA3'
+		forceNextVersion '7.0.0.BETA4'
 	} else if (kind == 'maven') {
-		forceNextVersion '2.44.0.BETA3'
+		forceNextVersion '2.44.0.BETA4'
 	} else {
-		forceNextVersion '3.0.0.BETA3'
+		forceNextVersion '3.0.0.BETA4'
 	}
 }
 

From 6992301bae4b44a66541c6c59491a221a52b7299 Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az585-767.vitsawovrx5upos552vgumbwsa.phxx.internal.cloudapp.net>
Date: Thu, 24 Oct 2024 15:31:27 +0000
Subject: [PATCH 1898/2068] Published lib/3.0.0.BETA4

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index fc2b6e827b..cc7c44dc33 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [3.0.0.BETA4] - 2024-10-24
 ### Added
 * APIs to support linting. (implemented in [#2148](https://github.com/diffplug/spotless/pull/2148), [#2149](https://github.com/diffplug/spotless/pull/2149), [#2307](https://github.com/diffplug/spotless/pull/2307))
   * Spotless is still primarily a formatter, not a linter. But when formatting fails, it's more flexible to model those failures as lints so that the formatting can continue and ideally we can also capture the line numbers causing the failure.

From c3e4e19d93486e4c2e17f994689ba9fed0ea4b9c Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az585-767.vitsawovrx5upos552vgumbwsa.phxx.internal.cloudapp.net>
Date: Thu, 24 Oct 2024 15:34:27 +0000
Subject: [PATCH 1899/2068] Published gradle/7.0.0.BETA4

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 62 ++++++++++++++++++++--------------------
 2 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index e5f7aa36ed..4c3956ff6b 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [7.0.0.BETA4] - 2024-10-24
 ### Added
 * Support for line ending policy `PRESERVE` which just takes the first line ending of every given file as setting (no matter if `\n`, `\r\n` or `\r`) ([#2304](https://github.com/diffplug/spotless/pull/2304))
 * New `suppressLintsFor` DSL ([docs](https://github.com/diffplug/spotless/tree/main/plugin-gradle#linting)) ([#2307](https://github.com/diffplug/spotless/pull/2307))
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 41c1b6e1a3..8761c47c5c 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -14,9 +14,9 @@ output = [
   ].join('\n');
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
-[![Changelog](https://img.shields.io/badge/changelog-7.0.0.BETA3-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-7.0.0.BETA4-blue.svg)](CHANGES.md)
 [![MavenCentral](https://img.shields.io/badge/mavencentral-here-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/index.html)
 
 [![VS Code plugin](https://img.shields.io/badge/IDE-VS_Code-blueviolet.svg)](https://marketplace.visualstudio.com/items?itemName=richardwillis.vscode-spotless-gradle)
 [![IntelliJ plugin](https://img.shields.io/badge/IDE-IntelliJ-blueviolet.svg)](https://plugins.jetbrains.com/plugin/18321-spotless-gradle)
@@ -128,10 +128,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -173,7 +173,7 @@ Spotless is primarily a formatter, _not_ a linter. In our opinion, a linter is j
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -336,8 +336,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -392,8 +392,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -482,7 +482,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -514,7 +514,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -546,7 +546,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -582,7 +582,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ### buf
 
-`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
+`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
 
 **WARNING** this step **must** be the first step in the chain, steps before it will be ignored. Thumbs up [this issue](https://github.com/bufbuild/buf/issues/1035) for a resolution, see [here](https://github.com/diffplug/spotless/pull/1208#discussion_r1264439669) for more details on the problem.
 
@@ -614,7 +614,7 @@ buf {
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -635,7 +635,7 @@ spotless {
 
 ## Flexmark
 
-`com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FlexmarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java)
+`com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FlexmarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java)
 
 [homepage](https://github.com/vsch/flexmark-java). Flexmark is a flexible Commonmark/Markdown parser that can be used to format Markdown files. It supports different [flavors of Markdown](https://github.com/vsch/flexmark-java#markdown-processor-emulation) and [many formatting options](https://github.com/vsch/flexmark-java/wiki/Markdown-Formatter#options).
 
@@ -654,7 +654,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -679,7 +679,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -717,7 +717,7 @@ sql.formatter.indent.size=4
 
 ## Maven POM
 
-`com.diffplug.gradle.spotless.PomExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/PomExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PomExtension.java)
+`com.diffplug.gradle.spotless.PomExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/PomExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PomExtension.java)
 
 ```gradle
 spotless {
@@ -766,7 +766,7 @@ spotless {
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -860,7 +860,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## Javascript
 
-- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
+- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
 
 ```gradle
 spotless {
@@ -923,7 +923,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -1043,7 +1043,7 @@ spotless {
 
 ## YAML
 
-- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
+- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
 
 ```gradle
 spotless {
@@ -1075,7 +1075,7 @@ spotless {
 
 ## Shell
 
-`com.diffplug.gradle.spotless.ShellExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/ShellExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ShellExtension.java)
+`com.diffplug.gradle.spotless.ShellExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/ShellExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ShellExtension.java)
 
 ```gradle
 spotless {
@@ -1111,7 +1111,7 @@ shfmt().pathToExe('/opt/homebrew/bin/shfmt')
 
 ## Gherkin
 
-- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
+- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
 
 ```gradle
 spotless {
@@ -1140,7 +1140,7 @@ spotless {
 
 ## CSS
 
-`com.diffplug.gradle.spotless.CssExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/CssExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CssExtension.java)
+`com.diffplug.gradle.spotless.CssExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/CssExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CssExtension.java)
 
 ```gradle
 spotless {
@@ -1541,7 +1541,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -1627,9 +1627,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -1662,11 +1662,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From 693fec42517823ece93d75944ef462f98fbf2430 Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az585-767.vitsawovrx5upos552vgumbwsa.phxx.internal.cloudapp.net>
Date: Thu, 24 Oct 2024 15:37:35 +0000
Subject: [PATCH 1900/2068] Published maven/2.44.0.BETA4

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 1ed6afb243..81ed57bc71 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.44.0.BETA4] - 2024-10-24
 ### Added
 * Support for line ending policy `PRESERVE` which just takes the first line ending of every given file as setting (no matter if `\n`, `\r\n` or `\r`) ([#2304](https://github.com/diffplug/spotless/pull/2304))
 ### Fixed
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 8cbe7e1ef4..856015de7c 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -8,8 +8,8 @@ output = [
   ].join('\n');
 -->
 [![MavenCentral](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Changelog](https://img.shields.io/badge/changelog-2.44.0.BETA3-blue.svg)](CHANGES.md)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.44.0.BETA3/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.44.0.BETA4-blue.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.44.0.BETA4/index.html)
 <!---freshmark /shields -->
 
 <!---freshmark javadoc

From 72dbc4c90a26ccc9c8e63831b2397e4a1c6f507d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 24 Oct 2024 17:03:28 +0000
Subject: [PATCH 1901/2068] Update plugin com.diffplug.spotless to v7.0.0.BETA4

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index b5750e3b0d..329cf11c39 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-	id 'com.diffplug.spotless' version '7.0.0.BETA3' apply false
+	id 'com.diffplug.spotless' version '7.0.0.BETA4' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
 	id 'com.gradle.plugin-publish' version '1.3.0' apply false
 	// https://github.com/gradle-nexus/publish-plugin/releases

From 7676b188cbef25a8ebad88257e116141091c0581 Mon Sep 17 00:00:00 2001
From: Zongle Wang <wangzongler@gmail.com>
Date: Thu, 24 Oct 2024 21:20:33 -0400
Subject: [PATCH 1902/2068] Correct release names (#2313)

---
 CHANGES.md               |  2 ++
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 62 ++++++++++++++++++++--------------------
 plugin-maven/CHANGES.md  |  2 ++
 plugin-maven/README.md   |  4 +--
 5 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index fc2b6e827b..cc7c44dc33 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [3.0.0.BETA4] - 2024-10-24
 ### Added
 * APIs to support linting. (implemented in [#2148](https://github.com/diffplug/spotless/pull/2148), [#2149](https://github.com/diffplug/spotless/pull/2149), [#2307](https://github.com/diffplug/spotless/pull/2307))
   * Spotless is still primarily a formatter, not a linter. But when formatting fails, it's more flexible to model those failures as lints so that the formatting can continue and ideally we can also capture the line numbers causing the failure.
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index e5f7aa36ed..4c3956ff6b 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [7.0.0.BETA4] - 2024-10-24
 ### Added
 * Support for line ending policy `PRESERVE` which just takes the first line ending of every given file as setting (no matter if `\n`, `\r\n` or `\r`) ([#2304](https://github.com/diffplug/spotless/pull/2304))
 * New `suppressLintsFor` DSL ([docs](https://github.com/diffplug/spotless/tree/main/plugin-gradle#linting)) ([#2307](https://github.com/diffplug/spotless/pull/2307))
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 41c1b6e1a3..8761c47c5c 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -14,9 +14,9 @@ output = [
   ].join('\n');
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
-[![Changelog](https://img.shields.io/badge/changelog-7.0.0.BETA3-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-7.0.0.BETA4-blue.svg)](CHANGES.md)
 [![MavenCentral](https://img.shields.io/badge/mavencentral-here-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/index.html)
 
 [![VS Code plugin](https://img.shields.io/badge/IDE-VS_Code-blueviolet.svg)](https://marketplace.visualstudio.com/items?itemName=richardwillis.vscode-spotless-gradle)
 [![IntelliJ plugin](https://img.shields.io/badge/IDE-IntelliJ-blueviolet.svg)](https://plugins.jetbrains.com/plugin/18321-spotless-gradle)
@@ -128,10 +128,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -173,7 +173,7 @@ Spotless is primarily a formatter, _not_ a linter. In our opinion, a linter is j
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -336,8 +336,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -392,8 +392,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -482,7 +482,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -514,7 +514,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -546,7 +546,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -582,7 +582,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ### buf
 
-`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
+`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
 
 **WARNING** this step **must** be the first step in the chain, steps before it will be ignored. Thumbs up [this issue](https://github.com/bufbuild/buf/issues/1035) for a resolution, see [here](https://github.com/diffplug/spotless/pull/1208#discussion_r1264439669) for more details on the problem.
 
@@ -614,7 +614,7 @@ buf {
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -635,7 +635,7 @@ spotless {
 
 ## Flexmark
 
-`com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FlexmarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java)
+`com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FlexmarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java)
 
 [homepage](https://github.com/vsch/flexmark-java). Flexmark is a flexible Commonmark/Markdown parser that can be used to format Markdown files. It supports different [flavors of Markdown](https://github.com/vsch/flexmark-java#markdown-processor-emulation) and [many formatting options](https://github.com/vsch/flexmark-java/wiki/Markdown-Formatter#options).
 
@@ -654,7 +654,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -679,7 +679,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -717,7 +717,7 @@ sql.formatter.indent.size=4
 
 ## Maven POM
 
-`com.diffplug.gradle.spotless.PomExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/PomExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PomExtension.java)
+`com.diffplug.gradle.spotless.PomExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/PomExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PomExtension.java)
 
 ```gradle
 spotless {
@@ -766,7 +766,7 @@ spotless {
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -860,7 +860,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## Javascript
 
-- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
+- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
 
 ```gradle
 spotless {
@@ -923,7 +923,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -1043,7 +1043,7 @@ spotless {
 
 ## YAML
 
-- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
+- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
 
 ```gradle
 spotless {
@@ -1075,7 +1075,7 @@ spotless {
 
 ## Shell
 
-`com.diffplug.gradle.spotless.ShellExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/ShellExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ShellExtension.java)
+`com.diffplug.gradle.spotless.ShellExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/ShellExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ShellExtension.java)
 
 ```gradle
 spotless {
@@ -1111,7 +1111,7 @@ shfmt().pathToExe('/opt/homebrew/bin/shfmt')
 
 ## Gherkin
 
-- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
+- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
 
 ```gradle
 spotless {
@@ -1140,7 +1140,7 @@ spotless {
 
 ## CSS
 
-`com.diffplug.gradle.spotless.CssExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/CssExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CssExtension.java)
+`com.diffplug.gradle.spotless.CssExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/CssExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CssExtension.java)
 
 ```gradle
 spotless {
@@ -1541,7 +1541,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -1627,9 +1627,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -1662,11 +1662,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA3/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 1ed6afb243..81ed57bc71 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.44.0.BETA4] - 2024-10-24
 ### Added
 * Support for line ending policy `PRESERVE` which just takes the first line ending of every given file as setting (no matter if `\n`, `\r\n` or `\r`) ([#2304](https://github.com/diffplug/spotless/pull/2304))
 ### Fixed
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 8cbe7e1ef4..856015de7c 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -8,8 +8,8 @@ output = [
   ].join('\n');
 -->
 [![MavenCentral](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Changelog](https://img.shields.io/badge/changelog-2.44.0.BETA3-blue.svg)](CHANGES.md)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.44.0.BETA3/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.44.0.BETA4-blue.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.44.0.BETA4/index.html)
 <!---freshmark /shields -->
 
 <!---freshmark javadoc

From 4bb4efb871f6c053c72027929e0173259a718f92 Mon Sep 17 00:00:00 2001
From: Zongle Wang <wangzongler@gmail.com>
Date: Thu, 24 Oct 2024 21:53:50 -0400
Subject: [PATCH 1903/2068] Bump Ktlint to 1.4.0 (#2314)

---
 CHANGES.md                                                      | 2 ++
 lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java  | 2 +-
 plugin-gradle/CHANGES.md                                        | 2 ++
 plugin-gradle/README.md                                         | 2 +-
 .../java/com/diffplug/gradle/spotless/KotlinExtensionTest.java  | 2 +-
 plugin-maven/CHANGES.md                                         | 2 ++
 plugin-maven/README.md                                          | 2 +-
 .../java/com/diffplug/spotless/maven/kotlin/KtlintTest.java     | 2 +-
 8 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index cc7c44dc33..74b3a7c873 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* Bump default `ktlint` version to latest `1.3.0` -> `1.4.0`. ([#2314](https://github.com/diffplug/spotless/pull/2314))
 
 ## [3.0.0.BETA4] - 2024-10-24
 ### Added
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index 991d082257..6e8f9e3452 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -36,7 +36,7 @@
 /** Wraps up <a href="https://github.com/pinterest/ktlint">ktlint</a> as a FormatterStep. */
 public class KtLintStep implements Serializable {
 	private static final long serialVersionUID = 1L;
-	private static final String DEFAULT_VERSION = "1.3.0";
+	private static final String DEFAULT_VERSION = "1.4.0";
 	private static final String NAME = "ktlint";
 	private static final String MAVEN_COORDINATE_0_DOT = "com.pinterest:ktlint:";
 	private static final String MAVEN_COORDINATE_1_DOT = "com.pinterest.ktlint:ktlint-cli:";
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 4c3956ff6b..a95e8d20fb 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Added
+* Bump default `ktlint` version to latest `1.3.0` -> `1.4.0`. ([#2314](https://github.com/diffplug/spotless/pull/2314))
 
 ## [7.0.0.BETA4] - 2024-10-24
 ### Added
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 8761c47c5c..90d7d6ef56 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -460,7 +460,7 @@ spotless {
       )
       .customRuleSets(
         listOf(
-          "io.nlopez.compose.rules:ktlint:0.3.3"
+          "io.nlopez.compose.rules:ktlint:0.4.16"
         )
       )
   }
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
index ff39cea174..a32ef06acd 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
@@ -178,7 +178,7 @@ void withCustomRuleSetApply() throws IOException {
 				"    kotlin {",
 				"        ktlint(\"1.0.1\")",
 				"        .customRuleSets(listOf(",
-				"            \"io.nlopez.compose.rules:ktlint:0.3.3\"",
+				"            \"io.nlopez.compose.rules:ktlint:0.4.16\"",
 				"        ))",
 				"        .editorConfigOverride(mapOf(",
 				"            \"ktlint_function_naming_ignore_when_annotated_with\" to \"Composable\"",
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 81ed57bc71..43a089e1e9 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* Bump default `ktlint` version to latest `1.3.0` -> `1.4.0`. ([#2314](https://github.com/diffplug/spotless/pull/2314))
 
 ## [2.44.0.BETA4] - 2024-10-24
 ### Added
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 856015de7c..a4787f0c45 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -430,7 +430,7 @@ Additionally, `editorConfigOverride` options will override what's supplied in `.
     <ktlint_code_style>intellij_idea</ktlint_code_style>
   </editorConfigOverride>
   <customRuleSets> <!-- optional -->
-    <value>io.nlopez.compose.rules:ktlint:0.3.3</value>
+    <value>io.nlopez.compose.rules:ktlint:0.4.16</value>
   </customRuleSets>
 </ktlint>
 ```
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
index 0f02f331aa..0c67143146 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
@@ -80,7 +80,7 @@ void testSetEditorConfigCanOverrideEditorConfigFile() throws Exception {
 	void testWithCustomRuleSetApply() throws Exception {
 		writePomWithKotlinSteps("<ktlint>\n" +
 				"  <customRuleSets>\n" +
-				"    <value>io.nlopez.compose.rules:ktlint:0.3.3</value>\n" +
+				"    <value>io.nlopez.compose.rules:ktlint:0.4.16</value>\n" +
 				"  </customRuleSets>\n" +
 				"  <editorConfigOverride>\n" +
 				"    <ktlint_function_naming_ignore_when_annotated_with>Composable</ktlint_function_naming_ignore_when_annotated_with>\n" +

From 3638f8f9272fb14148436411bf26a4fb6503d13c Mon Sep 17 00:00:00 2001
From: Zongle Wang <wangzongler@gmail.com>
Date: Thu, 24 Oct 2024 22:27:11 -0400
Subject: [PATCH 1904/2068] Changed sections (#2315)

---
 CHANGES.md               | 4 ++--
 plugin-gradle/CHANGES.md | 2 +-
 plugin-maven/CHANGES.md  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index b642c1167a..9e4d6a5de4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,7 +10,7 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
-### Changes
+### Changed
 * Bump default `ktlint` version to latest `1.3.0` -> `1.4.0`. ([#2314](https://github.com/diffplug/spotless/pull/2314))
 
 ## [3.0.0.BETA4] - 2024-10-24
@@ -21,7 +21,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
     * throwing an exception during formatting, ideally `throw Lint.atLine(127, "code", "Well what happened was...")`
     * or by implementing the `List<Lint> lint(String content, File file)` method to create multiple of them
 * Support for line ending policy `PRESERVE` which just takes the first line ending of every given file as setting (no matter if `\n`, `\r\n` or `\r`) ([#2304](https://github.com/diffplug/spotless/pull/2304))
-### Changes
+### Changed
 * **BREAKING** Moved `PaddedCell.DirtyState` to its own top-level class with new methods. ([#2148](https://github.com/diffplug/spotless/pull/2148))
   * **BREAKING** Removed `isClean`, `applyTo`, and `applyToAndReturnResultIfDirty` from `Formatter` because users should instead use `DirtyState`.
 ### Fixed
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 907c667319..f175fc25cf 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,7 +3,7 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
-### Changes
+### Changed
 * Bump default `ktlint` version to latest `1.3.0` -> `1.4.0`. ([#2314](https://github.com/diffplug/spotless/pull/2314))
 
 ## [7.0.0.BETA4] - 2024-10-24
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 77b65933d1..c441c25602 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,7 +3,7 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
-### Changes
+### Changed
 * Bump default `ktlint` version to latest `1.3.0` -> `1.4.0`. ([#2314](https://github.com/diffplug/spotless/pull/2314))
 
 ## [2.44.0.BETA4] - 2024-10-24

From 2a2960563fd2830ec96a751b2576c35f98c31311 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Rou=C3=A9l?= <andre.rouel@gmail.com>
Date: Thu, 24 Oct 2024 23:01:42 +0200
Subject: [PATCH 1905/2068] Add Sort Members functionality to Eclipse formatter

---
 lib-extra/build.gradle                        |   2 +-
 .../jdt/DefaultJavaElementComparator.java     | 369 ++++++++++++++++++
 .../glue/jdt/EclipseJdtFormatterStepImpl.java |  20 +-
 .../extra/glue/jdt/EclipseJdtSortMembers.java | 202 ++++++++++
 .../spotless/extra/glue/jdt/JdtFlags.java     |  76 ++++
 .../spotless/extra/EquoBasedStepBuilder.java  |  32 +-
 .../extra/cpp/EclipseCdtFormatterStep.java    |   3 +-
 .../extra/groovy/GrEclipseFormatterStep.java  |   3 +-
 .../extra/java/EclipseJdtFormatterStep.java   |  70 +++-
 ...clipseJdtFormatterStepSpecialCaseTest.java |  30 +-
 .../gradle/spotless/JavaExtension.java        |  26 +-
 .../eclipse/SortExample.sortMembers.clean     |  33 ++
 .../SortExample.sortMembersByVisibility.clean |  33 ++
 .../SortExample.sortMembersNoFields.clean     |  33 ++
 .../resources/java/eclipse/SortExample.test   |  28 ++
 15 files changed, 921 insertions(+), 39 deletions(-)
 create mode 100644 lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/DefaultJavaElementComparator.java
 create mode 100644 lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtSortMembers.java
 create mode 100644 lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/JdtFlags.java
 create mode 100644 testlib/src/main/resources/java/eclipse/SortExample.sortMembers.clean
 create mode 100644 testlib/src/main/resources/java/eclipse/SortExample.sortMembersByVisibility.clean
 create mode 100644 testlib/src/main/resources/java/eclipse/SortExample.sortMembersNoFields.clean
 create mode 100644 testlib/src/main/resources/java/eclipse/SortExample.test

diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index 9984ac696a..7bb686dac5 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -87,6 +87,7 @@ p2deps {
 	into 'jdtCompileOnly', {
 		p2repo 'https://download.eclipse.org/eclipse/updates/4.26/'
 		install 'org.eclipse.jdt.core'
+		install 'org.eclipse.jdt.core.manipulation'
 	}
 }
 
@@ -95,4 +96,3 @@ spotbugs {
 	// LOW|MEDIUM|DEFAULT|HIGH (low = sensitive to even minor mistakes).
 	reportLevel = com.github.spotbugs.snom.Confidence.valueOf('LOW')
 }
-
diff --git a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/DefaultJavaElementComparator.java b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/DefaultJavaElementComparator.java
new file mode 100644
index 0000000000..c42e09f5fe
--- /dev/null
+++ b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/DefaultJavaElementComparator.java
@@ -0,0 +1,369 @@
+package com.diffplug.spotless.extra.glue.jdt;
+
+import java.util.Comparator;
+import java.util.List;
+import java.util.StringTokenizer;
+
+import org.eclipse.jdt.internal.corext.dom.ASTNodes;
+
+import org.eclipse.jdt.core.Flags;
+import org.eclipse.jdt.core.dom.ASTNode;
+import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
+import org.eclipse.jdt.core.dom.AnnotationTypeMemberDeclaration;
+import org.eclipse.jdt.core.dom.BodyDeclaration;
+import org.eclipse.jdt.core.dom.EnumConstantDeclaration;
+import org.eclipse.jdt.core.dom.FieldDeclaration;
+import org.eclipse.jdt.core.dom.MethodDeclaration;
+import org.eclipse.jdt.core.dom.Modifier;
+import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
+import org.eclipse.jdt.core.dom.Type;
+import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
+import org.eclipse.jdt.core.util.CompilationUnitSorter;
+
+class DefaultJavaElementComparator implements Comparator<BodyDeclaration> {
+
+	static final int TYPE_INDEX = 0;
+	static final int CONSTRUCTORS_INDEX = 1;
+	static final int METHOD_INDEX = 2;
+	static final int FIELDS_INDEX = 3;
+	static final int INIT_INDEX = 4;
+	static final int STATIC_FIELDS_INDEX = 5;
+	static final int STATIC_INIT_INDEX = 6;
+	static final int STATIC_METHODS_INDEX = 7;
+	static final int ENUM_CONSTANTS_INDEX = 8;
+	static final int N_CATEGORIES = 9;
+	static final int PUBLIC_INDEX = 0;
+	static final int PRIVATE_INDEX = 1;
+	static final int PROTECTED_INDEX = 2;
+	static final int DEFAULT_INDEX = 3;
+	static final int N_VISIBILITIES = 4;
+
+	private final boolean doNotSortFields;
+	private final int[] memberCategoryOffsets;
+	private final boolean sortByVisibility;
+	private final int[] visibilityOffsets;
+
+	static DefaultJavaElementComparator of(
+		boolean doNotSortFields,
+		String memberCategoryPreferences,
+		boolean sortByVisibility,
+		String visibilityPreferences) {
+
+		int[] memberCategoryOffsets = new int[9];
+		boolean success = fillMemberCategoryOffsets(memberCategoryPreferences, memberCategoryOffsets);
+		if (!success) {
+			String defaultValue = "T,SF,SI,SM,F,I,C,M";
+			fillMemberCategoryOffsets(defaultValue, memberCategoryOffsets);
+		}
+
+		int[] visibilityOffsets = new int[4];
+		boolean success2 = fillVisibilityOffsets(visibilityPreferences, visibilityOffsets);
+		if (!success2) {
+			String defaultValue = "B,V,R,D";
+			fillVisibilityOffsets(defaultValue, visibilityOffsets);
+		}
+
+		return new DefaultJavaElementComparator(doNotSortFields, memberCategoryOffsets, sortByVisibility, visibilityOffsets);
+	}
+
+	DefaultJavaElementComparator(
+		boolean doNotSortFields,
+		int[] memberCategoryOffsets,
+		boolean sortByVisibility,
+		int[] visibilityOffsets) {
+
+		this.doNotSortFields = doNotSortFields;
+		this.memberCategoryOffsets = memberCategoryOffsets;
+		this.sortByVisibility = sortByVisibility;
+		this.visibilityOffsets = visibilityOffsets;
+	}
+
+	static boolean fillVisibilityOffsets(String preferencesString, int[] offsets) {
+		StringTokenizer tokenizer = new StringTokenizer(preferencesString, ",");
+		int i = 0;
+		while (tokenizer.hasMoreTokens()) {
+			String token = tokenizer.nextToken();
+			if (token != null) {
+				switch (token) {
+					case "B":
+						offsets[PUBLIC_INDEX] = i++;
+						break;
+					case "D":
+						offsets[DEFAULT_INDEX] = i++;
+						break;
+					case "R":
+						offsets[PROTECTED_INDEX] = i++;
+						break;
+					case "V":
+						offsets[PRIVATE_INDEX] = i++;
+				}
+			}
+		}
+		return i == N_VISIBILITIES;
+	}
+
+	static boolean fillMemberCategoryOffsets(String preferencesString, int[] offsets) {
+		StringTokenizer tokenizer = new StringTokenizer(preferencesString, ",");
+		int i = 0;
+		offsets[8] = i++;
+		while (tokenizer.hasMoreTokens()) {
+			String token = tokenizer.nextToken();
+			if (token != null) {
+				switch (token) {
+					case "C":
+						offsets[CONSTRUCTORS_INDEX] = i++;
+						break;
+					case "F":
+						offsets[FIELDS_INDEX] = i++;
+						break;
+					case "I":
+						offsets[INIT_INDEX] = i++;
+						break;
+					case "M":
+						offsets[METHOD_INDEX] = i++;
+						break;
+					case "T":
+						offsets[TYPE_INDEX] = i++;
+						break;
+					case "SF":
+						offsets[STATIC_FIELDS_INDEX] = i++;
+						break;
+					case "SI":
+						offsets[STATIC_INIT_INDEX] = i++;
+						break;
+					case "SM":
+						offsets[STATIC_METHODS_INDEX] = i++;
+				}
+			}
+		}
+		return i == N_CATEGORIES;
+	}
+
+	private int category(BodyDeclaration bodyDeclaration) {
+		switch (bodyDeclaration.getNodeType()) {
+			case ASTNode.METHOD_DECLARATION: {
+				MethodDeclaration method = (MethodDeclaration) bodyDeclaration;
+				if (method.isConstructor()) {
+					return CONSTRUCTORS_INDEX;
+				}
+				int flags = method.getModifiers();
+				if (Modifier.isStatic(flags))
+					return STATIC_METHODS_INDEX;
+				else
+					return METHOD_INDEX;
+			}
+			case ASTNode.FIELD_DECLARATION: {
+				if (JdtFlags.isStatic(bodyDeclaration))
+					return STATIC_FIELDS_INDEX;
+				else
+					return FIELDS_INDEX;
+			}
+			case ASTNode.INITIALIZER: {
+				int flags = bodyDeclaration.getModifiers();
+				if (Modifier.isStatic(flags))
+					return STATIC_INIT_INDEX;
+				else
+					return INIT_INDEX;
+			}
+			case ASTNode.TYPE_DECLARATION:
+			case ASTNode.ENUM_DECLARATION:
+			case ASTNode.ANNOTATION_TYPE_DECLARATION:
+				return TYPE_INDEX;
+			case ASTNode.ENUM_CONSTANT_DECLARATION:
+				return ENUM_CONSTANTS_INDEX;
+			case ASTNode.ANNOTATION_TYPE_MEMBER_DECLARATION:
+				return METHOD_INDEX; // reusing the method index
+
+		}
+		return 0; // should never happen
+	}
+
+	private int getCategoryIndex(int category) {
+		return memberCategoryOffsets[category];
+	}
+
+	private int getVisibilityIndex(int modifierFlags) {
+		int kind = 3;
+		if (Flags.isPublic(modifierFlags)) {
+			kind = 0;
+		} else if (Flags.isProtected(modifierFlags)) {
+			kind = 2;
+		} else if (Flags.isPrivate(modifierFlags)) {
+			kind = 1;
+		}
+		return this.visibilityOffsets[kind];
+	}
+
+	/**
+	 * This comparator follows the contract defined in CompilationUnitSorter.sort.
+	 *
+	 * @see Comparator#compare(java.lang.Object, java.lang.Object)
+	 * @see CompilationUnitSorter#sort(int, org.eclipse.jdt.core.ICompilationUnit, int[], java.util.Comparator, int, org.eclipse.core.runtime.IProgressMonitor)
+	 */
+	@Override
+	public int compare(BodyDeclaration bodyDeclaration1, BodyDeclaration bodyDeclaration2) {
+		boolean preserved1 = doNotSortFields && isSortPreserved(bodyDeclaration1);
+		boolean preserved2 = doNotSortFields && isSortPreserved(bodyDeclaration2);
+
+		// Bug 407759: need to use a common category for all isSortPreserved members that are to be sorted in the same group:
+		int cat1 = category(bodyDeclaration1);
+		if (preserved1) {
+			cat1 = sortPreservedCategory(cat1);
+		}
+		int cat2 = category(bodyDeclaration2);
+		if (preserved2) {
+			cat2 = sortPreservedCategory(cat2);
+		}
+
+		if (cat1 != cat2) {
+			return getCategoryIndex(cat1) - getCategoryIndex(cat2);
+		}
+
+		// cat1 == cat2 implies preserved1 == preserved2
+
+		if (preserved1) {
+			return preserveRelativeOrder(bodyDeclaration1, bodyDeclaration2);
+		}
+
+		if (sortByVisibility) {
+			int flags1 = JdtFlags.getVisibilityCode(bodyDeclaration1);
+			int flags2 = JdtFlags.getVisibilityCode(bodyDeclaration2);
+			int vis = getVisibilityIndex(flags1) - getVisibilityIndex(flags2);
+			if (vis != 0) {
+				return vis;
+			}
+		}
+
+		switch (bodyDeclaration1.getNodeType()) {
+			case ASTNode.METHOD_DECLARATION: {
+				MethodDeclaration method1 = (MethodDeclaration) bodyDeclaration1;
+				MethodDeclaration method2 = (MethodDeclaration) bodyDeclaration2;
+
+				if (sortByVisibility) {
+					int vis = getVisibilityIndex(method1.getModifiers()) - getVisibilityIndex(method2.getModifiers());
+					if (vis != 0) {
+						return vis;
+					}
+				}
+
+				String name1 = method1.getName().getIdentifier();
+				String name2 = method2.getName().getIdentifier();
+
+				// method declarations (constructors) are sorted by name
+				int cmp = name1.compareTo(name2);
+				if (cmp != 0) {
+					return cmp;
+				}
+
+				// if names equal, sort by parameter types
+				List<SingleVariableDeclaration> parameters1 = method1.parameters();
+				List<SingleVariableDeclaration> parameters2 = method2.parameters();
+				int length1 = parameters1.size();
+				int length2 = parameters2.size();
+
+				int len = Math.min(length1, length2);
+				for (int i = 0; i < len; i++) {
+					SingleVariableDeclaration param1 = parameters1.get(i);
+					SingleVariableDeclaration param2 = parameters2.get(i);
+					cmp = buildSignature(param1.getType()).compareTo(buildSignature(param2.getType()));
+					if (cmp != 0) {
+						return cmp;
+					}
+				}
+				if (length1 != length2) {
+					return length1 - length2;
+				}
+				return preserveRelativeOrder(bodyDeclaration1, bodyDeclaration2);
+			}
+			case ASTNode.FIELD_DECLARATION: {
+				FieldDeclaration field1 = (FieldDeclaration) bodyDeclaration1;
+				FieldDeclaration field2 = (FieldDeclaration) bodyDeclaration2;
+
+				String name1 = ((VariableDeclarationFragment) field1.fragments().get(0)).getName().getIdentifier();
+				String name2 = ((VariableDeclarationFragment) field2.fragments().get(0)).getName().getIdentifier();
+
+				// field declarations are sorted by name
+				return compareNames(bodyDeclaration1, bodyDeclaration2, name1, name2);
+			}
+			case ASTNode.INITIALIZER: {
+				// preserve relative order
+				return preserveRelativeOrder(bodyDeclaration1, bodyDeclaration2);
+			}
+			case ASTNode.TYPE_DECLARATION:
+			case ASTNode.ENUM_DECLARATION:
+			case ASTNode.ANNOTATION_TYPE_DECLARATION: {
+				AbstractTypeDeclaration type1 = (AbstractTypeDeclaration) bodyDeclaration1;
+				AbstractTypeDeclaration type2 = (AbstractTypeDeclaration) bodyDeclaration2;
+
+				String name1 = type1.getName().getIdentifier();
+				String name2 = type2.getName().getIdentifier();
+
+				// typedeclarations are sorted by name
+				return compareNames(bodyDeclaration1, bodyDeclaration2, name1, name2);
+			}
+			case ASTNode.ENUM_CONSTANT_DECLARATION: {
+				EnumConstantDeclaration decl1 = (EnumConstantDeclaration) bodyDeclaration1;
+				EnumConstantDeclaration decl2 = (EnumConstantDeclaration) bodyDeclaration2;
+
+				String name1 = decl1.getName().getIdentifier();
+				String name2 = decl2.getName().getIdentifier();
+
+				// enum constants declarations are sorted by name
+				return compareNames(bodyDeclaration1, bodyDeclaration2, name1, name2);
+			}
+			case ASTNode.ANNOTATION_TYPE_MEMBER_DECLARATION: {
+				AnnotationTypeMemberDeclaration decl1 = (AnnotationTypeMemberDeclaration) bodyDeclaration1;
+				AnnotationTypeMemberDeclaration decl2 = (AnnotationTypeMemberDeclaration) bodyDeclaration2;
+
+				String name1 = decl1.getName().getIdentifier();
+				String name2 = decl2.getName().getIdentifier();
+
+				// enum constants declarations are sorted by name
+				return compareNames(bodyDeclaration1, bodyDeclaration2, name1, name2);
+			}
+		}
+		return 0;
+	}
+
+	private static int sortPreservedCategory(int category) {
+		switch (category) {
+			case STATIC_FIELDS_INDEX:
+			case STATIC_INIT_INDEX:
+				return STATIC_FIELDS_INDEX;
+			case FIELDS_INDEX:
+			case INIT_INDEX:
+				return FIELDS_INDEX;
+			default:
+				return category;
+		}
+	}
+
+	private boolean isSortPreserved(BodyDeclaration bodyDeclaration) {
+		switch (bodyDeclaration.getNodeType()) {
+			case ASTNode.FIELD_DECLARATION:
+			case ASTNode.ENUM_CONSTANT_DECLARATION:
+			case ASTNode.INITIALIZER:
+				return true;
+			default:
+				return false;
+		}
+	}
+
+	private int preserveRelativeOrder(BodyDeclaration bodyDeclaration1, BodyDeclaration bodyDeclaration2) {
+		int value1 = ((Integer) bodyDeclaration1.getProperty(CompilationUnitSorter.RELATIVE_ORDER));
+		int value2 = ((Integer) bodyDeclaration2.getProperty(CompilationUnitSorter.RELATIVE_ORDER));
+		return value1 - value2;
+	}
+
+	private int compareNames(BodyDeclaration bodyDeclaration1, BodyDeclaration bodyDeclaration2, String name1, String name2) {
+		int cmp = name1.compareTo(name2);
+		if (cmp != 0) {
+			return cmp;
+		}
+		return preserveRelativeOrder(bodyDeclaration1, bodyDeclaration2);
+	}
+
+	private String buildSignature(Type type) {
+		return ASTNodes.asString(type);
+	}
+}
diff --git a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtFormatterStepImpl.java b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtFormatterStepImpl.java
index b394b6278d..76228a4011 100644
--- a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtFormatterStepImpl.java
+++ b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtFormatterStepImpl.java
@@ -34,18 +34,21 @@ public class EclipseJdtFormatterStepImpl {
 	public static final String LINE_DELIMITER = "\n";
 
 	private final CodeFormatter codeFormatter;
+	private final EclipseJdtSortMembers.SortProperties sortProperties;
 
-	public EclipseJdtFormatterStepImpl(Properties settings) {
-		Map<String, String> options = settings.entrySet().stream().collect(Collectors.toMap(
-				e -> String.valueOf(e.getKey()),
-				e -> String.valueOf(e.getValue()),
-				(prev, next) -> next,
-				HashMap::new));
+	public EclipseJdtFormatterStepImpl(Properties formatterSettings, Map<String, String> sortProperties) {
+		Map<String, String> options = formatterSettings.entrySet().stream().collect(Collectors.toMap(
+			e -> String.valueOf(e.getKey()),
+			e -> String.valueOf(e.getValue()),
+			(prev, next) -> next,
+			HashMap::new));
 		this.codeFormatter = new DefaultCodeFormatter(options);
+		this.sortProperties = EclipseJdtSortMembers.SortProperties.from(sortProperties);
 	}
 
 	/** Formatting Java string, distinguishing module-info and compilation unit by file name */
 	public String format(String raw, File file) throws Exception {
+		raw = sort(raw);
 		int kind = (file.getName().equals(IModule.MODULE_INFO_JAVA) ? CodeFormatter.K_MODULE_INFO
 				: CodeFormatter.K_COMPILATION_UNIT) | CodeFormatter.F_INCLUDE_COMMENTS;
 		TextEdit edit = codeFormatter.format(kind, raw, 0, raw.length(), 0, LINE_DELIMITER);
@@ -57,4 +60,9 @@ public String format(String raw, File file) throws Exception {
 			return doc.get();
 		}
 	}
+
+	/** Sort members in Java string */
+	public String sort(String raw) {
+		return EclipseJdtSortMembers.sortMember(raw, sortProperties);
+	}
 }
diff --git a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtSortMembers.java b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtSortMembers.java
new file mode 100644
index 0000000000..0ceb3e8284
--- /dev/null
+++ b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtSortMembers.java
@@ -0,0 +1,202 @@
+package com.diffplug.spotless.extra.glue.jdt;
+
+import java.util.Comparator;
+import java.util.Map;
+
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jdt.core.IBuffer;
+import org.eclipse.jdt.core.IBufferChangedListener;
+import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jdt.core.IOpenable;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.core.dom.AST;
+import org.eclipse.jdt.internal.core.CompilationUnit;
+import org.eclipse.jdt.internal.core.JavaProject;
+import org.eclipse.jdt.internal.core.SortElementsOperation;
+
+public class EclipseJdtSortMembers {
+
+	private static CompilationUnit compilationUnit(String code, Map<String, String> options, Map<String, String> compilerOptions) {
+		return new CompilationUnit(null, null, null) {
+			private final Buffer buffer = new Buffer(code);
+
+			@Override
+			public IBuffer getBuffer() {
+				return buffer;
+			}
+
+			@Override
+			public JavaProject getJavaProject() {
+				return new JavaProject(null, null) {
+					@Override
+					public Map<String, String> getOptions(boolean inheritJavaCoreOptions) {
+						return compilerOptions;
+					}
+				};
+			}
+
+			@Override
+			public Map<String, String> getOptions(boolean inheritJavaCoreOptions) {
+				return options;
+			}
+
+			@Override
+			public ICompilationUnit getPrimary() {
+				return this;
+			}
+		};
+	}
+
+	static String sortMember(String code, SortProperties properties) {
+		if (!properties.enabled) {
+			return code;
+		}
+
+		try {
+			CompilationUnit compilationUnit = compilationUnit(code, properties.compilationUnitOptions, properties.compilerOptions);
+			DefaultJavaElementComparator comparator = DefaultJavaElementComparator.of(properties.doNotSortFields, properties.membersOrder, properties.sortByVisibility, properties.visibilityOrder);
+			new Sorter(AST.getJLSLatest(), compilationUnit, null, comparator).sort();
+			String content = compilationUnit.getBuffer().getContents();
+			if (content != null) {
+				code = content;
+			}
+		} catch (CoreException e) {
+			throw new RuntimeException(e);
+		}
+		return code;
+	}
+
+	private static class Buffer implements IBuffer {
+
+		private String contents;
+
+		Buffer(String contents) {
+			this.contents = contents;
+		}
+
+		public void addBufferChangedListener(IBufferChangedListener listener) {
+		}
+
+		public void append(char[] text) {
+		}
+
+		public void append(String text) {
+		}
+
+		public void close() {
+		}
+
+		public char getChar(int position) {
+			return '\u0000';
+		}
+
+		public char[] getCharacters() {
+			return contents.toCharArray();
+		}
+
+		public String getContents() {
+			return contents;
+		}
+
+		public int getLength() {
+			return 0;
+		}
+
+		public IOpenable getOwner() {
+			return null;
+		}
+
+		public String getText(int offset, int length) {
+			return null;
+		}
+
+		public IResource getUnderlyingResource() {
+			return null;
+		}
+
+		public boolean hasUnsavedChanges() {
+			return false;
+		}
+
+		public boolean isClosed() {
+			return false;
+		}
+
+		public boolean isReadOnly() {
+			return true;
+		}
+
+		public void removeBufferChangedListener(IBufferChangedListener listener) {
+		}
+
+		public void replace(int position, int length, char[] text) {
+		}
+
+		public void replace(int position, int length, String text) {
+		}
+
+		public void save(IProgressMonitor progress, boolean force) {
+		}
+
+		public void setContents(char[] contents) {
+		}
+
+		public void setContents(String contents) {
+			this.contents = contents;
+		}
+	}
+
+	private static class Sorter extends SortElementsOperation {
+
+		Sorter(int level, CompilationUnit compilationUnit, int[] positions, Comparator comparator) {
+			super(level, new IJavaElement[]{compilationUnit}, positions, comparator);
+		}
+
+		void sort() throws JavaModelException {
+			executeOperation();
+		}
+	}
+
+	static class SortProperties {
+		final Map<String, String> compilationUnitOptions;
+		final Map<String, String> compilerOptions;
+		final boolean doNotSortFields;
+		final boolean enabled;
+		final String membersOrder;
+		final boolean sortByVisibility;
+		final String visibilityOrder;
+
+		SortProperties(
+			boolean enabled,
+			String membersOrder,
+			boolean doNotSortFields,
+			boolean sortByVisibility,
+			String visibilityOrder,
+			Map<String, String> compilationUnitOptions,
+			Map<String, String> compilerOptions
+		) {
+			this.enabled = enabled;
+			this.membersOrder = membersOrder;
+			this.doNotSortFields = doNotSortFields;
+			this.sortByVisibility = sortByVisibility;
+			this.visibilityOrder = visibilityOrder;
+			this.compilationUnitOptions = compilationUnitOptions;
+			this.compilerOptions = compilerOptions;
+		}
+
+		static SortProperties from(Map<String, String> properties) {
+			boolean enabled = Boolean.parseBoolean(properties.getOrDefault("members.order.enabled", "false"));
+			String membersOrder = properties.getOrDefault("members.order", "");
+			boolean doNotSortFields = Boolean.parseBoolean(properties.getOrDefault("members.doNotSortFields", "true"));
+			boolean sortByVisibility = Boolean.parseBoolean(properties.getOrDefault("visibility.order.enabled", "false"));
+			String visibilityOrder = properties.getOrDefault("visibility.order", "");
+			// At the moment we see no need for the following options, but they may become important, idk.
+			Map<String, String> compilationUnitOptions = Map.of();
+			Map<String, String> compilerOptions = Map.of();
+			return new SortProperties(enabled, membersOrder, doNotSortFields, sortByVisibility, visibilityOrder, compilationUnitOptions, compilerOptions);
+		}
+	}
+}
diff --git a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/JdtFlags.java b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/JdtFlags.java
new file mode 100644
index 0000000000..032c7f1d84
--- /dev/null
+++ b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/JdtFlags.java
@@ -0,0 +1,76 @@
+package com.diffplug.spotless.extra.glue.jdt;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.jdt.core.dom.ASTNode;
+import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
+import org.eclipse.jdt.core.dom.AnnotationTypeDeclaration;
+import org.eclipse.jdt.core.dom.BodyDeclaration;
+import org.eclipse.jdt.core.dom.EnumConstantDeclaration;
+import org.eclipse.jdt.core.dom.EnumDeclaration;
+import org.eclipse.jdt.core.dom.Modifier;
+import org.eclipse.jdt.core.dom.TypeDeclaration;
+
+class JdtFlags {
+
+	static final int VISIBILITY_CODE_INVALID= 	-1;
+
+	static boolean isStatic(BodyDeclaration bodyDeclaration) {
+		if (isNestedInterfaceOrAnnotation(bodyDeclaration))
+			return true;
+		int nodeType= bodyDeclaration.getNodeType();
+		if (nodeType != ASTNode.METHOD_DECLARATION
+				&& nodeType != ASTNode.ANNOTATION_TYPE_MEMBER_DECLARATION
+				&& isInterfaceOrAnnotationMember(bodyDeclaration))
+			return true;
+		if (bodyDeclaration instanceof EnumConstantDeclaration)
+			return true;
+		if (bodyDeclaration instanceof EnumDeclaration && bodyDeclaration.getParent() instanceof AbstractTypeDeclaration)
+			return true;
+		return Modifier.isStatic(bodyDeclaration.getModifiers());
+	}
+
+	private static boolean isPackageVisible(BodyDeclaration bodyDeclaration) {
+		return (! isPrivate(bodyDeclaration) && ! isProtected(bodyDeclaration) && ! isPublic(bodyDeclaration));
+	}
+
+	private static boolean isPrivate(BodyDeclaration bodyDeclaration) {
+		return Modifier.isPrivate(bodyDeclaration.getModifiers());
+	}
+
+	private static boolean isProtected(BodyDeclaration bodyDeclaration) {
+		return Modifier.isProtected(bodyDeclaration.getModifiers());
+	}
+
+	private static boolean isPublic(BodyDeclaration bodyDeclaration) {
+		if (isInterfaceOrAnnotationMember(bodyDeclaration))
+			return true;
+		return Modifier.isPublic(bodyDeclaration.getModifiers());
+	}
+
+	private static boolean isInterfaceOrAnnotationMember(BodyDeclaration bodyDeclaration) {
+		return isInterfaceOrAnnotation(bodyDeclaration.getParent());
+	}
+
+	private static boolean isInterfaceOrAnnotation(ASTNode node) {
+		boolean isInterface= (node instanceof TypeDeclaration) && ((TypeDeclaration) node).isInterface();
+		boolean isAnnotation= node instanceof AnnotationTypeDeclaration;
+		return isInterface || isAnnotation;
+	}
+
+	private static boolean isNestedInterfaceOrAnnotation(BodyDeclaration bodyDeclaration) {
+		return bodyDeclaration.getParent() instanceof AbstractTypeDeclaration && isInterfaceOrAnnotation(bodyDeclaration);
+	}
+
+	static int getVisibilityCode(BodyDeclaration bodyDeclaration) {
+		if (isPublic(bodyDeclaration))
+			return Modifier.PUBLIC;
+		else if (isProtected(bodyDeclaration))
+			return Modifier.PROTECTED;
+		else if (isPackageVisible(bodyDeclaration))
+			return Modifier.NONE;
+		else if (isPrivate(bodyDeclaration))
+			return Modifier.PRIVATE;
+		Assert.isTrue(false);
+		return VISIBILITY_CODE_INVALID;
+	}
+}
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 4f54e1e1bc..293797578d 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
@@ -28,6 +28,7 @@
 
 import javax.annotation.Nullable;
 
+import com.diffplug.common.collect.ImmutableMap;
 import com.diffplug.spotless.FileSignature;
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterProperties;
@@ -50,17 +51,25 @@ public abstract class EquoBasedStepBuilder {
 	private final String formatterName;
 	private final Provisioner mavenProvisioner;
 	private final SerializedFunction<State, FormatterFunc> stateToFormatter;
+	private final ImmutableMap.Builder<String, String> stepProperties;
 	private String formatterVersion;
 	private Iterable<File> settingsFiles = new ArrayList<>();
 	private Map<String, String> p2Mirrors = Map.of();
 	private File cacheDirectory;
 
 	/** Initialize valid default configuration, taking latest version */
-	public EquoBasedStepBuilder(String formatterName, Provisioner mavenProvisioner, @Nullable String defaultVersion, SerializedFunction<State, FormatterFunc> stateToFormatter) {
+	public EquoBasedStepBuilder(
+		String formatterName,
+		Provisioner mavenProvisioner,
+		@Nullable String defaultVersion,
+		SerializedFunction<State, FormatterFunc> stateToFormatter,
+		ImmutableMap.Builder<String, String> stepProperties) {
+
 		this.formatterName = formatterName;
 		this.mavenProvisioner = mavenProvisioner;
 		this.formatterVersion = defaultVersion;
 		this.stateToFormatter = stateToFormatter;
+		this.stepProperties = stepProperties;
 	}
 
 	public void setVersion(String version) {
@@ -125,7 +134,7 @@ public FormatterStep build() {
 				classpath.add(nested.getValue());
 			}
 			return JarState.preserveOrder(classpath);
-		}));
+		}), stepProperties.build());
 		return FormatterStep.create(formatterName, roundtrippableState, EquoStep::state, stateToFormatter);
 	}
 
@@ -157,15 +166,22 @@ static class EquoStep implements Serializable {
 		private final String semanticVersion;
 		private final FileSignature.Promised settingsPromise;
 		private final JarState.Promised jarPromise;
+		private final ImmutableMap<String, String> stepProperties;
+
+		EquoStep(
+			String semanticVersion,
+			FileSignature.Promised settingsPromise,
+			JarState.Promised jarPromise,
+			ImmutableMap<String, String> stepProperties) {
 
-		EquoStep(String semanticVersion, FileSignature.Promised settingsPromise, JarState.Promised jarPromise) {
 			this.semanticVersion = semanticVersion;
 			this.settingsPromise = settingsPromise;
 			this.jarPromise = jarPromise;
+			this.stepProperties = stepProperties;
 		}
 
 		private State state() {
-			return new State(semanticVersion, jarPromise.get(), settingsPromise.get());
+			return new State(semanticVersion, jarPromise.get(), settingsPromise.get(), stepProperties);
 		}
 	}
 
@@ -178,11 +194,13 @@ public static class State implements Serializable {
 		final String semanticVersion;
 		final JarState jarState;
 		final FileSignature settingsFiles;
+		final ImmutableMap<String, String> stepProperties;
 
-		public State(String semanticVersion, JarState jarState, FileSignature settingsFiles) {
+		public State(String semanticVersion, JarState jarState, FileSignature settingsFiles, ImmutableMap<String, String> stepProperties) {
 			this.semanticVersion = semanticVersion;
 			this.jarState = jarState;
 			this.settingsFiles = settingsFiles;
+			this.stepProperties = stepProperties;
 		}
 
 		public JarState getJarState() {
@@ -196,5 +214,9 @@ public String getSemanticVersion() {
 		public Properties getPreferences() {
 			return FormatterProperties.from(settingsFiles.files()).getProperties();
 		}
+
+		public ImmutableMap<String, String> getStepProperties() {
+			return stepProperties;
+		}
 	}
 }
diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java
index 8f4660b686..9fcd595aa8 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java
@@ -18,6 +18,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.Properties;
 
+import com.diffplug.common.collect.ImmutableMap;
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.Jvm;
 import com.diffplug.spotless.Provisioner;
@@ -45,7 +46,7 @@ public static String defaultVersion() {
 
 	/** Provides default configuration */
 	public static EquoBasedStepBuilder createBuilder(Provisioner provisioner) {
-		return new EquoBasedStepBuilder(NAME, provisioner, defaultVersion(), EclipseCdtFormatterStep::apply) {
+		return new EquoBasedStepBuilder(NAME, provisioner, defaultVersion(), EclipseCdtFormatterStep::apply, ImmutableMap.builder()) {
 			@Override
 			protected P2Model model(String version) {
 				var model = new P2Model();
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 4e0a98effd..4e35dceac5 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
@@ -19,6 +19,7 @@
 import java.util.List;
 import java.util.Properties;
 
+import com.diffplug.common.collect.ImmutableMap;
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.Jvm;
 import com.diffplug.spotless.Provisioner;
@@ -39,7 +40,7 @@ public static String defaultVersion() {
 	}
 
 	public static EquoBasedStepBuilder createBuilder(Provisioner provisioner) {
-		return new EquoBasedStepBuilder(NAME, provisioner, defaultVersion(), GrEclipseFormatterStep::apply) {
+		return new EquoBasedStepBuilder(NAME, provisioner, defaultVersion(), GrEclipseFormatterStep::apply, ImmutableMap.builder()) {
 			@Override
 			protected P2Model model(String version) {
 				if (!version.startsWith("4.")) {
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 b7a53bde0c..9dc463b49f 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
@@ -16,11 +16,14 @@
 package com.diffplug.spotless.extra.java;
 
 import java.io.File;
+import java.util.Map;
 import java.util.Properties;
 
+import com.diffplug.common.collect.ImmutableMap;
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.Jvm;
 import com.diffplug.spotless.Provisioner;
+import com.diffplug.spotless.SerializedFunction;
 import com.diffplug.spotless.extra.EquoBasedStepBuilder;
 
 import dev.equo.solstice.p2.P2Model;
@@ -37,34 +40,59 @@ public static String defaultVersion() {
 		return JVM_SUPPORT.getRecommendedFormatterVersion();
 	}
 
-	public static EquoBasedStepBuilder createBuilder(Provisioner provisioner) {
-		return new EquoBasedStepBuilder(NAME, provisioner, defaultVersion(), EclipseJdtFormatterStep::apply) {
-			@Override
-			protected P2Model model(String version) {
-				var model = new P2Model();
-				addPlatformRepo(model, version);
-				model.getInstall().add("org.eclipse.jdt.core");
-				return model;
-			}
-
-			@Override
-			public void setVersion(String version) {
-				if (version.endsWith(".0")) {
-					String newVersion = version.substring(0, version.length() - 2);
-					System.err.println("Recommend replacing '" + version + "' with '" + newVersion + "' for Eclipse JDT");
-					version = newVersion;
-				}
-				super.setVersion(version);
-			}
-		};
+	public static EclipseJdtFormatterStep.Builder createBuilder(Provisioner provisioner) {
+		return new EclipseJdtFormatterStep.Builder(NAME, provisioner, defaultVersion(), EclipseJdtFormatterStep::apply, ImmutableMap.builder());
 	}
 
 	private static FormatterFunc apply(EquoBasedStepBuilder.State state) throws Exception {
 		JVM_SUPPORT.assertFormatterSupported(state.getSemanticVersion());
 		Class<?> formatterClazz = state.getJarState().getClassLoader().loadClass("com.diffplug.spotless.extra.glue.jdt.EclipseJdtFormatterStepImpl");
-		var formatter = formatterClazz.getConstructor(Properties.class).newInstance(state.getPreferences());
+		var formatter = formatterClazz.getConstructor(Properties.class, Map.class).newInstance(state.getPreferences(), state.getStepProperties());
 		var method = formatterClazz.getMethod("format", String.class, File.class);
 		FormatterFunc formatterFunc = (FormatterFunc.NeedsFile) (input, file) -> (String) method.invoke(formatter, input, file);
 		return JVM_SUPPORT.suggestLaterVersionOnError(state.getSemanticVersion(), formatterFunc);
 	}
+
+	public static class Builder extends EquoBasedStepBuilder {
+		private final ImmutableMap.Builder<String, String> stepProperties;
+
+		Builder(
+			String formatterName,
+			Provisioner mavenProvisioner,
+			String defaultVersion,
+			SerializedFunction<State, FormatterFunc> stateToFormatter,
+			ImmutableMap.Builder<String, String> stepProperties) {
+			super(formatterName, mavenProvisioner, defaultVersion, stateToFormatter, stepProperties);
+			this.stepProperties = stepProperties;
+		}
+
+		@Override
+		protected P2Model model(String version) {
+			var model = new P2Model();
+			addPlatformRepo(model, version);
+			model.getInstall().add("org.eclipse.jdt.core");
+			return model;
+		}
+
+		public void setMembersOrdering(String order, boolean doNotSortFields) {
+			stepProperties.put("members.order.enabled", "true");
+			stepProperties.put("members.order", order);
+			stepProperties.put("members.doNotSortFields", Boolean.toString(doNotSortFields));
+		}
+
+		public void setVisibilityOrdering(String order) {
+			stepProperties.put("visibility.order.enabled", "true");
+			stepProperties.put("visibility.order", order);
+		}
+
+		@Override
+		public void setVersion(String version) {
+			if (version.endsWith(".0")) {
+				String newVersion = version.substring(0, version.length() - 2);
+				System.err.println("Recommend replacing '" + version + "' with '" + newVersion + "' for Eclipse JDT");
+				version = newVersion;
+			}
+			super.setVersion(version);
+		}
+	}
 }
diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java
index 21ec889ed6..ff328e1ab6 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java
@@ -33,6 +33,34 @@ public void issue_1638() {
 		EquoBasedStepBuilder builder = EclipseJdtFormatterStep.createBuilder(TestProvisioner.mavenCentral());
 		builder.setPreferences(List.of(file));
 		StepHarness.forStep(builder.build())
-				.testResource("java/eclipse/AbstractType.test", "java/eclipse/AbstractType.clean");
+			.testResource("java/eclipse/AbstractType.test", "java/eclipse/AbstractType.clean");
+	}
+
+	@Test
+	public void sort_members_no_fields() {
+		ClassLoader classLoader = getClass().getClassLoader();
+		EclipseJdtFormatterStep.Builder builder = EclipseJdtFormatterStep.createBuilder(TestProvisioner.mavenCentral());
+		builder.setMembersOrdering("SF,SI,SM,F,I,C,M,T", true);
+		StepHarness.forStep(builder.build())
+			.testResource("java/eclipse/SortExample.test", "java/eclipse/SortExample.sortMembersNoFields.clean");
+	}
+
+	@Test
+	public void sort_members() {
+		ClassLoader classLoader = getClass().getClassLoader();
+		EclipseJdtFormatterStep.Builder builder = EclipseJdtFormatterStep.createBuilder(TestProvisioner.mavenCentral());
+		builder.setMembersOrdering("SF,SI,SM,F,I,C,M,T", false);
+		StepHarness.forStep(builder.build())
+			.testResource("java/eclipse/SortExample.test", "java/eclipse/SortExample.sortMembers.clean");
+	}
+
+	@Test
+	public void sort_members_and_by_visibility() {
+		ClassLoader classLoader = getClass().getClassLoader();
+		EclipseJdtFormatterStep.Builder builder = EclipseJdtFormatterStep.createBuilder(TestProvisioner.mavenCentral());
+		builder.setMembersOrdering("SF,SI,SM,F,I,C,M,T", false);
+		builder.setVisibilityOrdering("B,R,D,V");
+		StepHarness.forStep(builder.build())
+			.testResource("java/eclipse/SortExample.test", "java/eclipse/SortExample.sortMembersByVisibility.clean");
 	}
 }
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
index db869dc4e6..223de370f9 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
@@ -282,7 +282,7 @@ private FormatterStep createStep() {
 	}
 
 	public EclipseConfig eclipse() {
-		return new EclipseConfig(EclipseJdtFormatterStep.defaultVersion());
+		return eclipse(EclipseJdtFormatterStep.defaultVersion());
 	}
 
 	public EclipseConfig eclipse(String version) {
@@ -290,7 +290,7 @@ public EclipseConfig eclipse(String version) {
 	}
 
 	public class EclipseConfig {
-		private final EquoBasedStepBuilder builder;
+		private final EclipseJdtFormatterStep.Builder builder;
 
 		EclipseConfig(String version) {
 			builder = EclipseJdtFormatterStep.createBuilder(provisioner());
@@ -298,11 +298,31 @@ public class EclipseConfig {
 			addStep(builder.build());
 		}
 
-		public void configFile(Object... configFiles) {
+		public EclipseConfig configFile(Object... configFiles) {
 			requireElementsNonNull(configFiles);
 			Project project = getProject();
 			builder.setPreferences(project.files(configFiles).getFiles());
 			replaceStep(builder.build());
+			return this;
+		}
+
+		public EclipseConfig sortMembers(String memberCategoryOrder, boolean doNotSortFields) {
+			requireElementsNonNull(memberCategoryOrder);
+			builder.setMembersOrdering(memberCategoryOrder, doNotSortFields);
+			replaceStep(builder.build());
+			return this;
+		}
+
+		public EclipseConfig sortMembers(
+			String memberCategoryOrder,
+			boolean doNotSortFields,
+			String visibilityOrder) {
+			requireElementsNonNull(memberCategoryOrder);
+			requireElementsNonNull(visibilityOrder);
+			builder.setMembersOrdering(memberCategoryOrder, doNotSortFields);
+			builder.setVisibilityOrdering(visibilityOrder);
+			replaceStep(builder.build());
+			return this;
 		}
 
 		public EclipseConfig withP2Mirrors(Map<String, String> mirrors) {
diff --git a/testlib/src/main/resources/java/eclipse/SortExample.sortMembers.clean b/testlib/src/main/resources/java/eclipse/SortExample.sortMembers.clean
new file mode 100644
index 0000000000..b129e6862e
--- /dev/null
+++ b/testlib/src/main/resources/java/eclipse/SortExample.sortMembers.clean
@@ -0,0 +1,33 @@
+package com.diffplug.spotless.extra.glue.jdt;
+
+public class SortExample {
+	private static final int A;
+	public static final int Z;
+	static {
+		Z = 1;
+		A = 0;
+	}
+	final boolean _1 = false;
+	final int a = 1;
+	public final int b = 1;
+	private final int c = 1;
+	protected final int d = 1;
+	protected final int e = 1;
+	public final int f = 1;
+	final int z = 1;
+	class Nested {
+		public static final String B = "B";
+		private static final String C = "C";
+		protected static final String D = "D";
+		void a() {
+		}
+		public void b() {
+		}
+		private void c() {
+		}
+		protected void d() {
+		}
+		void z() {
+		}
+	}
+}
diff --git a/testlib/src/main/resources/java/eclipse/SortExample.sortMembersByVisibility.clean b/testlib/src/main/resources/java/eclipse/SortExample.sortMembersByVisibility.clean
new file mode 100644
index 0000000000..aebaacb3f1
--- /dev/null
+++ b/testlib/src/main/resources/java/eclipse/SortExample.sortMembersByVisibility.clean
@@ -0,0 +1,33 @@
+package com.diffplug.spotless.extra.glue.jdt;
+
+public class SortExample {
+	public static final int Z;
+	private static final int A;
+	static {
+		Z = 1;
+		A = 0;
+	}
+	public final int b = 1;
+	public final int f = 1;
+	protected final int d = 1;
+	protected final int e = 1;
+	final boolean _1 = false;
+	final int a = 1;
+	final int z = 1;
+	private final int c = 1;
+	class Nested {
+		public static final String B = "B";
+		protected static final String D = "D";
+		private static final String C = "C";
+		public void b() {
+		}
+		protected void d() {
+		}
+		void a() {
+		}
+		void z() {
+		}
+		private void c() {
+		}
+	}
+}
diff --git a/testlib/src/main/resources/java/eclipse/SortExample.sortMembersNoFields.clean b/testlib/src/main/resources/java/eclipse/SortExample.sortMembersNoFields.clean
new file mode 100644
index 0000000000..fdad821a6c
--- /dev/null
+++ b/testlib/src/main/resources/java/eclipse/SortExample.sortMembersNoFields.clean
@@ -0,0 +1,33 @@
+package com.diffplug.spotless.extra.glue.jdt;
+
+public class SortExample {
+	public static final int Z;
+	private static final int A;
+	static {
+		Z = 1;
+		A = 0;
+	}
+	final int z = 1;
+	final int a = 1;
+	private final int c = 1;
+	protected final int e = 1;
+	protected final int d = 1;
+	public final int f = 1;
+	public final int b = 1;
+	final boolean _1 = false;
+	class Nested {
+		private static final String C = "C";
+		protected static final String D = "D";
+		public static final String B = "B";
+		void a() {
+		}
+		public void b() {
+		}
+		private void c() {
+		}
+		protected void d() {
+		}
+		void z() {
+		}
+	}
+}
diff --git a/testlib/src/main/resources/java/eclipse/SortExample.test b/testlib/src/main/resources/java/eclipse/SortExample.test
new file mode 100644
index 0000000000..88421f35f8
--- /dev/null
+++ b/testlib/src/main/resources/java/eclipse/SortExample.test
@@ -0,0 +1,28 @@
+package com.diffplug.spotless.extra.glue.jdt;
+
+public class SortExample {
+	final int z = 1;
+	final int a = 1;
+	private final int c = 1;
+	protected final int e = 1;
+	protected final int d = 1;
+	public final int f = 1;
+	public final int b = 1;
+	final boolean _1 = false;
+	class Nested {
+		void z() {}
+		private static final String C = "C";
+		protected static final String D = "D";
+		public static final String B = "B";
+		void a() {}
+		private void c() {}
+		protected void d() {}
+		public void b() {}
+	}
+	public static final int Z;
+	private static final int A;
+	static {
+		Z = 1;
+		A = 0;
+	}
+}

From 91b8222c6b3e4acdaaf05f52fc2ac5f46aa9a1f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Rou=C3=A9l?= <andre.rouel@gmail.com>
Date: Fri, 25 Oct 2024 08:53:48 +0200
Subject: [PATCH 1906/2068] Update CHANGES.md

---
 plugin-gradle/CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index f175fc25cf..7ab9a6c86e 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * New `suppressLintsFor` DSL ([docs](https://github.com/diffplug/spotless/tree/main/plugin-gradle#linting)) ([#2307](https://github.com/diffplug/spotless/pull/2307))
   * `ignoreErrorForStep` and `ignoreErrorForPath` are now deprecated aliases of `suppressLintsFor`
   * Spotless is still a formatter not a linter, it just models formatting failures as lints rather than stopping execution (resolves [#287](https://github.com/diffplug/spotless/issues/287))
+* Add _Sort Members_ feature based on Eclipse JDT implementation. ([#2312](https://github.com/diffplug/spotless/pull/2312))
 ### Fixed
 * `ktlint` steps now read from the `string` instead of the `file` so they don't clobber earlier steps. (fixes [#1599](https://github.com/diffplug/spotless/issues/1599))
 

From 51f49889274bc9c3be969eb0c0ae3e8aa699fe15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Rou=C3=A9l?= <andre.rouel@gmail.com>
Date: Fri, 25 Oct 2024 08:54:48 +0200
Subject: [PATCH 1907/2068] Remove unused properties regarding Sort Members

---
 .../extra/glue/jdt/EclipseJdtSortMembers.java | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtSortMembers.java b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtSortMembers.java
index 0ceb3e8284..f15c63295e 100644
--- a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtSortMembers.java
+++ b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtSortMembers.java
@@ -19,7 +19,7 @@
 
 public class EclipseJdtSortMembers {
 
-	private static CompilationUnit compilationUnit(String code, Map<String, String> options, Map<String, String> compilerOptions) {
+	private static CompilationUnit compilationUnit(String code) {
 		return new CompilationUnit(null, null, null) {
 			private final Buffer buffer = new Buffer(code);
 
@@ -33,14 +33,14 @@ public JavaProject getJavaProject() {
 				return new JavaProject(null, null) {
 					@Override
 					public Map<String, String> getOptions(boolean inheritJavaCoreOptions) {
-						return compilerOptions;
+						return Map.of();
 					}
 				};
 			}
 
 			@Override
 			public Map<String, String> getOptions(boolean inheritJavaCoreOptions) {
-				return options;
+				return Map.of();
 			}
 
 			@Override
@@ -56,8 +56,12 @@ static String sortMember(String code, SortProperties properties) {
 		}
 
 		try {
-			CompilationUnit compilationUnit = compilationUnit(code, properties.compilationUnitOptions, properties.compilerOptions);
-			DefaultJavaElementComparator comparator = DefaultJavaElementComparator.of(properties.doNotSortFields, properties.membersOrder, properties.sortByVisibility, properties.visibilityOrder);
+			CompilationUnit compilationUnit = compilationUnit(code);
+			DefaultJavaElementComparator comparator = DefaultJavaElementComparator.of(
+				properties.doNotSortFields,
+				properties.membersOrder,
+				properties.sortByVisibility,
+				properties.visibilityOrder);
 			new Sorter(AST.getJLSLatest(), compilationUnit, null, comparator).sort();
 			String content = compilationUnit.getBuffer().getContents();
 			if (content != null) {
@@ -161,8 +165,6 @@ void sort() throws JavaModelException {
 	}
 
 	static class SortProperties {
-		final Map<String, String> compilationUnitOptions;
-		final Map<String, String> compilerOptions;
 		final boolean doNotSortFields;
 		final boolean enabled;
 		final String membersOrder;
@@ -174,17 +176,13 @@ static class SortProperties {
 			String membersOrder,
 			boolean doNotSortFields,
 			boolean sortByVisibility,
-			String visibilityOrder,
-			Map<String, String> compilationUnitOptions,
-			Map<String, String> compilerOptions
+			String visibilityOrder
 		) {
 			this.enabled = enabled;
 			this.membersOrder = membersOrder;
 			this.doNotSortFields = doNotSortFields;
 			this.sortByVisibility = sortByVisibility;
 			this.visibilityOrder = visibilityOrder;
-			this.compilationUnitOptions = compilationUnitOptions;
-			this.compilerOptions = compilerOptions;
 		}
 
 		static SortProperties from(Map<String, String> properties) {
@@ -196,7 +194,7 @@ static SortProperties from(Map<String, String> properties) {
 			// At the moment we see no need for the following options, but they may become important, idk.
 			Map<String, String> compilationUnitOptions = Map.of();
 			Map<String, String> compilerOptions = Map.of();
-			return new SortProperties(enabled, membersOrder, doNotSortFields, sortByVisibility, visibilityOrder, compilationUnitOptions, compilerOptions);
+			return new SortProperties(enabled, membersOrder, doNotSortFields, sortByVisibility, visibilityOrder);
 		}
 	}
 }

From 893f42574cca04f78e35c9be72c74d2dc5909547 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Rou=C3=A9l?= <andre.rouel@gmail.com>
Date: Fri, 25 Oct 2024 09:26:26 +0200
Subject: [PATCH 1908/2068] Apply spotless and document origin

---
 .../jdt/DefaultJavaElementComparator.java     | 338 +++++++++---------
 .../glue/jdt/EclipseJdtFormatterStepImpl.java |  10 +-
 .../extra/glue/jdt/EclipseJdtSortMembers.java |  61 ++--
 .../spotless/extra/glue/jdt/JdtFlags.java     |  28 +-
 .../spotless/extra/EquoBasedStepBuilder.java  |  18 +-
 .../extra/java/EclipseJdtFormatterStep.java   |  10 +-
 ...clipseJdtFormatterStepSpecialCaseTest.java |  10 +-
 .../gradle/spotless/JavaExtension.java        |   7 +-
 8 files changed, 261 insertions(+), 221 deletions(-)

diff --git a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/DefaultJavaElementComparator.java b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/DefaultJavaElementComparator.java
index c42e09f5fe..ad4dcc1a68 100644
--- a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/DefaultJavaElementComparator.java
+++ b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/DefaultJavaElementComparator.java
@@ -1,11 +1,24 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.extra.glue.jdt;
 
 import java.util.Comparator;
 import java.util.List;
 import java.util.StringTokenizer;
 
-import org.eclipse.jdt.internal.corext.dom.ASTNodes;
-
 import org.eclipse.jdt.core.Flags;
 import org.eclipse.jdt.core.dom.ASTNode;
 import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
@@ -19,7 +32,11 @@
 import org.eclipse.jdt.core.dom.Type;
 import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
 import org.eclipse.jdt.core.util.CompilationUnitSorter;
+import org.eclipse.jdt.internal.corext.dom.ASTNodes;
 
+/**
+ * This class is derived and adapted code from the Eclipse JDT project (Derivative Works according to EPL 2.0 license).
+ */
 class DefaultJavaElementComparator implements Comparator<BodyDeclaration> {
 
 	static final int TYPE_INDEX = 0;
@@ -32,6 +49,7 @@ class DefaultJavaElementComparator implements Comparator<BodyDeclaration> {
 	static final int STATIC_METHODS_INDEX = 7;
 	static final int ENUM_CONSTANTS_INDEX = 8;
 	static final int N_CATEGORIES = 9;
+
 	static final int PUBLIC_INDEX = 0;
 	static final int PRIVATE_INDEX = 1;
 	static final int PROTECTED_INDEX = 2;
@@ -44,10 +62,10 @@ class DefaultJavaElementComparator implements Comparator<BodyDeclaration> {
 	private final int[] visibilityOffsets;
 
 	static DefaultJavaElementComparator of(
-		boolean doNotSortFields,
-		String memberCategoryPreferences,
-		boolean sortByVisibility,
-		String visibilityPreferences) {
+			boolean doNotSortFields,
+			String memberCategoryPreferences,
+			boolean sortByVisibility,
+			String visibilityPreferences) {
 
 		int[] memberCategoryOffsets = new int[9];
 		boolean success = fillMemberCategoryOffsets(memberCategoryPreferences, memberCategoryOffsets);
@@ -67,10 +85,10 @@ static DefaultJavaElementComparator of(
 	}
 
 	DefaultJavaElementComparator(
-		boolean doNotSortFields,
-		int[] memberCategoryOffsets,
-		boolean sortByVisibility,
-		int[] visibilityOffsets) {
+			boolean doNotSortFields,
+			int[] memberCategoryOffsets,
+			boolean sortByVisibility,
+			int[] visibilityOffsets) {
 
 		this.doNotSortFields = doNotSortFields;
 		this.memberCategoryOffsets = memberCategoryOffsets;
@@ -85,17 +103,17 @@ static boolean fillVisibilityOffsets(String preferencesString, int[] offsets) {
 			String token = tokenizer.nextToken();
 			if (token != null) {
 				switch (token) {
-					case "B":
-						offsets[PUBLIC_INDEX] = i++;
-						break;
-					case "D":
-						offsets[DEFAULT_INDEX] = i++;
-						break;
-					case "R":
-						offsets[PROTECTED_INDEX] = i++;
-						break;
-					case "V":
-						offsets[PRIVATE_INDEX] = i++;
+				case "B":
+					offsets[PUBLIC_INDEX] = i++;
+					break;
+				case "D":
+					offsets[DEFAULT_INDEX] = i++;
+					break;
+				case "R":
+					offsets[PROTECTED_INDEX] = i++;
+					break;
+				case "V":
+					offsets[PRIVATE_INDEX] = i++;
 				}
 			}
 		}
@@ -110,29 +128,29 @@ static boolean fillMemberCategoryOffsets(String preferencesString, int[] offsets
 			String token = tokenizer.nextToken();
 			if (token != null) {
 				switch (token) {
-					case "C":
-						offsets[CONSTRUCTORS_INDEX] = i++;
-						break;
-					case "F":
-						offsets[FIELDS_INDEX] = i++;
-						break;
-					case "I":
-						offsets[INIT_INDEX] = i++;
-						break;
-					case "M":
-						offsets[METHOD_INDEX] = i++;
-						break;
-					case "T":
-						offsets[TYPE_INDEX] = i++;
-						break;
-					case "SF":
-						offsets[STATIC_FIELDS_INDEX] = i++;
-						break;
-					case "SI":
-						offsets[STATIC_INIT_INDEX] = i++;
-						break;
-					case "SM":
-						offsets[STATIC_METHODS_INDEX] = i++;
+				case "C":
+					offsets[CONSTRUCTORS_INDEX] = i++;
+					break;
+				case "F":
+					offsets[FIELDS_INDEX] = i++;
+					break;
+				case "I":
+					offsets[INIT_INDEX] = i++;
+					break;
+				case "M":
+					offsets[METHOD_INDEX] = i++;
+					break;
+				case "T":
+					offsets[TYPE_INDEX] = i++;
+					break;
+				case "SF":
+					offsets[STATIC_FIELDS_INDEX] = i++;
+					break;
+				case "SI":
+					offsets[STATIC_INIT_INDEX] = i++;
+					break;
+				case "SM":
+					offsets[STATIC_METHODS_INDEX] = i++;
 				}
 			}
 		}
@@ -141,38 +159,38 @@ static boolean fillMemberCategoryOffsets(String preferencesString, int[] offsets
 
 	private int category(BodyDeclaration bodyDeclaration) {
 		switch (bodyDeclaration.getNodeType()) {
-			case ASTNode.METHOD_DECLARATION: {
-				MethodDeclaration method = (MethodDeclaration) bodyDeclaration;
-				if (method.isConstructor()) {
-					return CONSTRUCTORS_INDEX;
-				}
-				int flags = method.getModifiers();
-				if (Modifier.isStatic(flags))
-					return STATIC_METHODS_INDEX;
-				else
-					return METHOD_INDEX;
+		case ASTNode.METHOD_DECLARATION: {
+			MethodDeclaration method = (MethodDeclaration) bodyDeclaration;
+			if (method.isConstructor()) {
+				return CONSTRUCTORS_INDEX;
 			}
-			case ASTNode.FIELD_DECLARATION: {
-				if (JdtFlags.isStatic(bodyDeclaration))
-					return STATIC_FIELDS_INDEX;
-				else
-					return FIELDS_INDEX;
-			}
-			case ASTNode.INITIALIZER: {
-				int flags = bodyDeclaration.getModifiers();
-				if (Modifier.isStatic(flags))
-					return STATIC_INIT_INDEX;
-				else
-					return INIT_INDEX;
-			}
-			case ASTNode.TYPE_DECLARATION:
-			case ASTNode.ENUM_DECLARATION:
-			case ASTNode.ANNOTATION_TYPE_DECLARATION:
-				return TYPE_INDEX;
-			case ASTNode.ENUM_CONSTANT_DECLARATION:
-				return ENUM_CONSTANTS_INDEX;
-			case ASTNode.ANNOTATION_TYPE_MEMBER_DECLARATION:
-				return METHOD_INDEX; // reusing the method index
+			int flags = method.getModifiers();
+			if (Modifier.isStatic(flags))
+				return STATIC_METHODS_INDEX;
+			else
+				return METHOD_INDEX;
+		}
+		case ASTNode.FIELD_DECLARATION: {
+			if (JdtFlags.isStatic(bodyDeclaration))
+				return STATIC_FIELDS_INDEX;
+			else
+				return FIELDS_INDEX;
+		}
+		case ASTNode.INITIALIZER: {
+			int flags = bodyDeclaration.getModifiers();
+			if (Modifier.isStatic(flags))
+				return STATIC_INIT_INDEX;
+			else
+				return INIT_INDEX;
+		}
+		case ASTNode.TYPE_DECLARATION:
+		case ASTNode.ENUM_DECLARATION:
+		case ASTNode.ANNOTATION_TYPE_DECLARATION:
+			return TYPE_INDEX;
+		case ASTNode.ENUM_CONSTANT_DECLARATION:
+			return ENUM_CONSTANTS_INDEX;
+		case ASTNode.ANNOTATION_TYPE_MEMBER_DECLARATION:
+			return METHOD_INDEX; // reusing the method index
 
 		}
 		return 0; // should never happen
@@ -235,117 +253,117 @@ public int compare(BodyDeclaration bodyDeclaration1, BodyDeclaration bodyDeclara
 		}
 
 		switch (bodyDeclaration1.getNodeType()) {
-			case ASTNode.METHOD_DECLARATION: {
-				MethodDeclaration method1 = (MethodDeclaration) bodyDeclaration1;
-				MethodDeclaration method2 = (MethodDeclaration) bodyDeclaration2;
-
-				if (sortByVisibility) {
-					int vis = getVisibilityIndex(method1.getModifiers()) - getVisibilityIndex(method2.getModifiers());
-					if (vis != 0) {
-						return vis;
-					}
+		case ASTNode.METHOD_DECLARATION: {
+			MethodDeclaration method1 = (MethodDeclaration) bodyDeclaration1;
+			MethodDeclaration method2 = (MethodDeclaration) bodyDeclaration2;
+
+			if (sortByVisibility) {
+				int vis = getVisibilityIndex(method1.getModifiers()) - getVisibilityIndex(method2.getModifiers());
+				if (vis != 0) {
+					return vis;
 				}
+			}
 
-				String name1 = method1.getName().getIdentifier();
-				String name2 = method2.getName().getIdentifier();
+			String name1 = method1.getName().getIdentifier();
+			String name2 = method2.getName().getIdentifier();
 
-				// method declarations (constructors) are sorted by name
-				int cmp = name1.compareTo(name2);
+			// method declarations (constructors) are sorted by name
+			int cmp = name1.compareTo(name2);
+			if (cmp != 0) {
+				return cmp;
+			}
+
+			// if names equal, sort by parameter types
+			List<SingleVariableDeclaration> parameters1 = method1.parameters();
+			List<SingleVariableDeclaration> parameters2 = method2.parameters();
+			int length1 = parameters1.size();
+			int length2 = parameters2.size();
+
+			int len = Math.min(length1, length2);
+			for (int i = 0; i < len; i++) {
+				SingleVariableDeclaration param1 = parameters1.get(i);
+				SingleVariableDeclaration param2 = parameters2.get(i);
+				cmp = buildSignature(param1.getType()).compareTo(buildSignature(param2.getType()));
 				if (cmp != 0) {
 					return cmp;
 				}
-
-				// if names equal, sort by parameter types
-				List<SingleVariableDeclaration> parameters1 = method1.parameters();
-				List<SingleVariableDeclaration> parameters2 = method2.parameters();
-				int length1 = parameters1.size();
-				int length2 = parameters2.size();
-
-				int len = Math.min(length1, length2);
-				for (int i = 0; i < len; i++) {
-					SingleVariableDeclaration param1 = parameters1.get(i);
-					SingleVariableDeclaration param2 = parameters2.get(i);
-					cmp = buildSignature(param1.getType()).compareTo(buildSignature(param2.getType()));
-					if (cmp != 0) {
-						return cmp;
-					}
-				}
-				if (length1 != length2) {
-					return length1 - length2;
-				}
-				return preserveRelativeOrder(bodyDeclaration1, bodyDeclaration2);
 			}
-			case ASTNode.FIELD_DECLARATION: {
-				FieldDeclaration field1 = (FieldDeclaration) bodyDeclaration1;
-				FieldDeclaration field2 = (FieldDeclaration) bodyDeclaration2;
+			if (length1 != length2) {
+				return length1 - length2;
+			}
+			return preserveRelativeOrder(bodyDeclaration1, bodyDeclaration2);
+		}
+		case ASTNode.FIELD_DECLARATION: {
+			FieldDeclaration field1 = (FieldDeclaration) bodyDeclaration1;
+			FieldDeclaration field2 = (FieldDeclaration) bodyDeclaration2;
 
-				String name1 = ((VariableDeclarationFragment) field1.fragments().get(0)).getName().getIdentifier();
-				String name2 = ((VariableDeclarationFragment) field2.fragments().get(0)).getName().getIdentifier();
+			String name1 = ((VariableDeclarationFragment) field1.fragments().get(0)).getName().getIdentifier();
+			String name2 = ((VariableDeclarationFragment) field2.fragments().get(0)).getName().getIdentifier();
 
-				// field declarations are sorted by name
-				return compareNames(bodyDeclaration1, bodyDeclaration2, name1, name2);
-			}
-			case ASTNode.INITIALIZER: {
-				// preserve relative order
-				return preserveRelativeOrder(bodyDeclaration1, bodyDeclaration2);
-			}
-			case ASTNode.TYPE_DECLARATION:
-			case ASTNode.ENUM_DECLARATION:
-			case ASTNode.ANNOTATION_TYPE_DECLARATION: {
-				AbstractTypeDeclaration type1 = (AbstractTypeDeclaration) bodyDeclaration1;
-				AbstractTypeDeclaration type2 = (AbstractTypeDeclaration) bodyDeclaration2;
+			// field declarations are sorted by name
+			return compareNames(bodyDeclaration1, bodyDeclaration2, name1, name2);
+		}
+		case ASTNode.INITIALIZER: {
+			// preserve relative order
+			return preserveRelativeOrder(bodyDeclaration1, bodyDeclaration2);
+		}
+		case ASTNode.TYPE_DECLARATION:
+		case ASTNode.ENUM_DECLARATION:
+		case ASTNode.ANNOTATION_TYPE_DECLARATION: {
+			AbstractTypeDeclaration type1 = (AbstractTypeDeclaration) bodyDeclaration1;
+			AbstractTypeDeclaration type2 = (AbstractTypeDeclaration) bodyDeclaration2;
 
-				String name1 = type1.getName().getIdentifier();
-				String name2 = type2.getName().getIdentifier();
+			String name1 = type1.getName().getIdentifier();
+			String name2 = type2.getName().getIdentifier();
 
-				// typedeclarations are sorted by name
-				return compareNames(bodyDeclaration1, bodyDeclaration2, name1, name2);
-			}
-			case ASTNode.ENUM_CONSTANT_DECLARATION: {
-				EnumConstantDeclaration decl1 = (EnumConstantDeclaration) bodyDeclaration1;
-				EnumConstantDeclaration decl2 = (EnumConstantDeclaration) bodyDeclaration2;
+			// typedeclarations are sorted by name
+			return compareNames(bodyDeclaration1, bodyDeclaration2, name1, name2);
+		}
+		case ASTNode.ENUM_CONSTANT_DECLARATION: {
+			EnumConstantDeclaration decl1 = (EnumConstantDeclaration) bodyDeclaration1;
+			EnumConstantDeclaration decl2 = (EnumConstantDeclaration) bodyDeclaration2;
 
-				String name1 = decl1.getName().getIdentifier();
-				String name2 = decl2.getName().getIdentifier();
+			String name1 = decl1.getName().getIdentifier();
+			String name2 = decl2.getName().getIdentifier();
 
-				// enum constants declarations are sorted by name
-				return compareNames(bodyDeclaration1, bodyDeclaration2, name1, name2);
-			}
-			case ASTNode.ANNOTATION_TYPE_MEMBER_DECLARATION: {
-				AnnotationTypeMemberDeclaration decl1 = (AnnotationTypeMemberDeclaration) bodyDeclaration1;
-				AnnotationTypeMemberDeclaration decl2 = (AnnotationTypeMemberDeclaration) bodyDeclaration2;
+			// enum constants declarations are sorted by name
+			return compareNames(bodyDeclaration1, bodyDeclaration2, name1, name2);
+		}
+		case ASTNode.ANNOTATION_TYPE_MEMBER_DECLARATION: {
+			AnnotationTypeMemberDeclaration decl1 = (AnnotationTypeMemberDeclaration) bodyDeclaration1;
+			AnnotationTypeMemberDeclaration decl2 = (AnnotationTypeMemberDeclaration) bodyDeclaration2;
 
-				String name1 = decl1.getName().getIdentifier();
-				String name2 = decl2.getName().getIdentifier();
+			String name1 = decl1.getName().getIdentifier();
+			String name2 = decl2.getName().getIdentifier();
 
-				// enum constants declarations are sorted by name
-				return compareNames(bodyDeclaration1, bodyDeclaration2, name1, name2);
-			}
+			// enum constants declarations are sorted by name
+			return compareNames(bodyDeclaration1, bodyDeclaration2, name1, name2);
+		}
 		}
 		return 0;
 	}
 
 	private static int sortPreservedCategory(int category) {
 		switch (category) {
-			case STATIC_FIELDS_INDEX:
-			case STATIC_INIT_INDEX:
-				return STATIC_FIELDS_INDEX;
-			case FIELDS_INDEX:
-			case INIT_INDEX:
-				return FIELDS_INDEX;
-			default:
-				return category;
+		case STATIC_FIELDS_INDEX:
+		case STATIC_INIT_INDEX:
+			return STATIC_FIELDS_INDEX;
+		case FIELDS_INDEX:
+		case INIT_INDEX:
+			return FIELDS_INDEX;
+		default:
+			return category;
 		}
 	}
 
 	private boolean isSortPreserved(BodyDeclaration bodyDeclaration) {
 		switch (bodyDeclaration.getNodeType()) {
-			case ASTNode.FIELD_DECLARATION:
-			case ASTNode.ENUM_CONSTANT_DECLARATION:
-			case ASTNode.INITIALIZER:
-				return true;
-			default:
-				return false;
+		case ASTNode.FIELD_DECLARATION:
+		case ASTNode.ENUM_CONSTANT_DECLARATION:
+		case ASTNode.INITIALIZER:
+			return true;
+		default:
+			return false;
 		}
 	}
 
diff --git a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtFormatterStepImpl.java b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtFormatterStepImpl.java
index 76228a4011..39a493e63b 100644
--- a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtFormatterStepImpl.java
+++ b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtFormatterStepImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,10 +38,10 @@ public class EclipseJdtFormatterStepImpl {
 
 	public EclipseJdtFormatterStepImpl(Properties formatterSettings, Map<String, String> sortProperties) {
 		Map<String, String> options = formatterSettings.entrySet().stream().collect(Collectors.toMap(
-			e -> String.valueOf(e.getKey()),
-			e -> String.valueOf(e.getValue()),
-			(prev, next) -> next,
-			HashMap::new));
+				e -> String.valueOf(e.getKey()),
+				e -> String.valueOf(e.getValue()),
+				(prev, next) -> next,
+				HashMap::new));
 		this.codeFormatter = new DefaultCodeFormatter(options);
 		this.sortProperties = EclipseJdtSortMembers.SortProperties.from(sortProperties);
 	}
diff --git a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtSortMembers.java b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtSortMembers.java
index f15c63295e..d42b518be4 100644
--- a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtSortMembers.java
+++ b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtSortMembers.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.extra.glue.jdt;
 
 import java.util.Comparator;
@@ -58,10 +73,10 @@ static String sortMember(String code, SortProperties properties) {
 		try {
 			CompilationUnit compilationUnit = compilationUnit(code);
 			DefaultJavaElementComparator comparator = DefaultJavaElementComparator.of(
-				properties.doNotSortFields,
-				properties.membersOrder,
-				properties.sortByVisibility,
-				properties.visibilityOrder);
+					properties.doNotSortFields,
+					properties.membersOrder,
+					properties.sortByVisibility,
+					properties.visibilityOrder);
 			new Sorter(AST.getJLSLatest(), compilationUnit, null, comparator).sort();
 			String content = compilationUnit.getBuffer().getContents();
 			if (content != null) {
@@ -81,17 +96,13 @@ private static class Buffer implements IBuffer {
 			this.contents = contents;
 		}
 
-		public void addBufferChangedListener(IBufferChangedListener listener) {
-		}
+		public void addBufferChangedListener(IBufferChangedListener listener) {}
 
-		public void append(char[] text) {
-		}
+		public void append(char[] text) {}
 
-		public void append(String text) {
-		}
+		public void append(String text) {}
 
-		public void close() {
-		}
+		public void close() {}
 
 		public char getChar(int position) {
 			return '\u0000';
@@ -133,20 +144,15 @@ public boolean isReadOnly() {
 			return true;
 		}
 
-		public void removeBufferChangedListener(IBufferChangedListener listener) {
-		}
+		public void removeBufferChangedListener(IBufferChangedListener listener) {}
 
-		public void replace(int position, int length, char[] text) {
-		}
+		public void replace(int position, int length, char[] text) {}
 
-		public void replace(int position, int length, String text) {
-		}
+		public void replace(int position, int length, String text) {}
 
-		public void save(IProgressMonitor progress, boolean force) {
-		}
+		public void save(IProgressMonitor progress, boolean force) {}
 
-		public void setContents(char[] contents) {
-		}
+		public void setContents(char[] contents) {}
 
 		public void setContents(String contents) {
 			this.contents = contents;
@@ -172,12 +178,11 @@ static class SortProperties {
 		final String visibilityOrder;
 
 		SortProperties(
-			boolean enabled,
-			String membersOrder,
-			boolean doNotSortFields,
-			boolean sortByVisibility,
-			String visibilityOrder
-		) {
+				boolean enabled,
+				String membersOrder,
+				boolean doNotSortFields,
+				boolean sortByVisibility,
+				String visibilityOrder) {
 			this.enabled = enabled;
 			this.membersOrder = membersOrder;
 			this.doNotSortFields = doNotSortFields;
diff --git a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/JdtFlags.java b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/JdtFlags.java
index 032c7f1d84..819168013f 100644
--- a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/JdtFlags.java
+++ b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/JdtFlags.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.extra.glue.jdt;
 
 import org.eclipse.core.runtime.Assert;
@@ -10,14 +25,17 @@
 import org.eclipse.jdt.core.dom.Modifier;
 import org.eclipse.jdt.core.dom.TypeDeclaration;
 
+/**
+ * This class is derived and adapted code from the Eclipse JDT project (Derivative Works according to EPL 2.0 license).
+ */
 class JdtFlags {
 
-	static final int VISIBILITY_CODE_INVALID= 	-1;
+	static final int VISIBILITY_CODE_INVALID = -1;
 
 	static boolean isStatic(BodyDeclaration bodyDeclaration) {
 		if (isNestedInterfaceOrAnnotation(bodyDeclaration))
 			return true;
-		int nodeType= bodyDeclaration.getNodeType();
+		int nodeType = bodyDeclaration.getNodeType();
 		if (nodeType != ASTNode.METHOD_DECLARATION
 				&& nodeType != ASTNode.ANNOTATION_TYPE_MEMBER_DECLARATION
 				&& isInterfaceOrAnnotationMember(bodyDeclaration))
@@ -30,7 +48,7 @@ && isInterfaceOrAnnotationMember(bodyDeclaration))
 	}
 
 	private static boolean isPackageVisible(BodyDeclaration bodyDeclaration) {
-		return (! isPrivate(bodyDeclaration) && ! isProtected(bodyDeclaration) && ! isPublic(bodyDeclaration));
+		return (!isPrivate(bodyDeclaration) && !isProtected(bodyDeclaration) && !isPublic(bodyDeclaration));
 	}
 
 	private static boolean isPrivate(BodyDeclaration bodyDeclaration) {
@@ -52,8 +70,8 @@ private static boolean isInterfaceOrAnnotationMember(BodyDeclaration bodyDeclara
 	}
 
 	private static boolean isInterfaceOrAnnotation(ASTNode node) {
-		boolean isInterface= (node instanceof TypeDeclaration) && ((TypeDeclaration) node).isInterface();
-		boolean isAnnotation= node instanceof AnnotationTypeDeclaration;
+		boolean isInterface = (node instanceof TypeDeclaration) && ((TypeDeclaration) node).isInterface();
+		boolean isAnnotation = node instanceof AnnotationTypeDeclaration;
 		return isInterface || isAnnotation;
 	}
 
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 293797578d..0ac526338c 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
@@ -59,11 +59,11 @@ public abstract class EquoBasedStepBuilder {
 
 	/** Initialize valid default configuration, taking latest version */
 	public EquoBasedStepBuilder(
-		String formatterName,
-		Provisioner mavenProvisioner,
-		@Nullable String defaultVersion,
-		SerializedFunction<State, FormatterFunc> stateToFormatter,
-		ImmutableMap.Builder<String, String> stepProperties) {
+			String formatterName,
+			Provisioner mavenProvisioner,
+			@Nullable String defaultVersion,
+			SerializedFunction<State, FormatterFunc> stateToFormatter,
+			ImmutableMap.Builder<String, String> stepProperties) {
 
 		this.formatterName = formatterName;
 		this.mavenProvisioner = mavenProvisioner;
@@ -169,10 +169,10 @@ static class EquoStep implements Serializable {
 		private final ImmutableMap<String, String> stepProperties;
 
 		EquoStep(
-			String semanticVersion,
-			FileSignature.Promised settingsPromise,
-			JarState.Promised jarPromise,
-			ImmutableMap<String, String> stepProperties) {
+				String semanticVersion,
+				FileSignature.Promised settingsPromise,
+				JarState.Promised jarPromise,
+				ImmutableMap<String, String> stepProperties) {
 
 			this.semanticVersion = semanticVersion;
 			this.settingsPromise = settingsPromise;
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 9dc463b49f..aeb20d27ee 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
@@ -57,11 +57,11 @@ public static class Builder extends EquoBasedStepBuilder {
 		private final ImmutableMap.Builder<String, String> stepProperties;
 
 		Builder(
-			String formatterName,
-			Provisioner mavenProvisioner,
-			String defaultVersion,
-			SerializedFunction<State, FormatterFunc> stateToFormatter,
-			ImmutableMap.Builder<String, String> stepProperties) {
+				String formatterName,
+				Provisioner mavenProvisioner,
+				String defaultVersion,
+				SerializedFunction<State, FormatterFunc> stateToFormatter,
+				ImmutableMap.Builder<String, String> stepProperties) {
 			super(formatterName, mavenProvisioner, defaultVersion, stateToFormatter, stepProperties);
 			this.stepProperties = stepProperties;
 		}
diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java
index ff328e1ab6..f37bfe9e74 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@ public void issue_1638() {
 		EquoBasedStepBuilder builder = EclipseJdtFormatterStep.createBuilder(TestProvisioner.mavenCentral());
 		builder.setPreferences(List.of(file));
 		StepHarness.forStep(builder.build())
-			.testResource("java/eclipse/AbstractType.test", "java/eclipse/AbstractType.clean");
+				.testResource("java/eclipse/AbstractType.test", "java/eclipse/AbstractType.clean");
 	}
 
 	@Test
@@ -42,7 +42,7 @@ public void sort_members_no_fields() {
 		EclipseJdtFormatterStep.Builder builder = EclipseJdtFormatterStep.createBuilder(TestProvisioner.mavenCentral());
 		builder.setMembersOrdering("SF,SI,SM,F,I,C,M,T", true);
 		StepHarness.forStep(builder.build())
-			.testResource("java/eclipse/SortExample.test", "java/eclipse/SortExample.sortMembersNoFields.clean");
+				.testResource("java/eclipse/SortExample.test", "java/eclipse/SortExample.sortMembersNoFields.clean");
 	}
 
 	@Test
@@ -51,7 +51,7 @@ public void sort_members() {
 		EclipseJdtFormatterStep.Builder builder = EclipseJdtFormatterStep.createBuilder(TestProvisioner.mavenCentral());
 		builder.setMembersOrdering("SF,SI,SM,F,I,C,M,T", false);
 		StepHarness.forStep(builder.build())
-			.testResource("java/eclipse/SortExample.test", "java/eclipse/SortExample.sortMembers.clean");
+				.testResource("java/eclipse/SortExample.test", "java/eclipse/SortExample.sortMembers.clean");
 	}
 
 	@Test
@@ -61,6 +61,6 @@ public void sort_members_and_by_visibility() {
 		builder.setMembersOrdering("SF,SI,SM,F,I,C,M,T", false);
 		builder.setVisibilityOrdering("B,R,D,V");
 		StepHarness.forStep(builder.build())
-			.testResource("java/eclipse/SortExample.test", "java/eclipse/SortExample.sortMembersByVisibility.clean");
+				.testResource("java/eclipse/SortExample.test", "java/eclipse/SortExample.sortMembersByVisibility.clean");
 	}
 }
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
index 223de370f9..f098486fd6 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
@@ -33,7 +33,6 @@
 import org.gradle.api.tasks.SourceSet;
 
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.extra.EquoBasedStepBuilder;
 import com.diffplug.spotless.extra.java.EclipseJdtFormatterStep;
 import com.diffplug.spotless.generic.LicenseHeaderStep;
 import com.diffplug.spotless.java.CleanthatJavaStep;
@@ -314,9 +313,9 @@ public EclipseConfig sortMembers(String memberCategoryOrder, boolean doNotSortFi
 		}
 
 		public EclipseConfig sortMembers(
-			String memberCategoryOrder,
-			boolean doNotSortFields,
-			String visibilityOrder) {
+				String memberCategoryOrder,
+				boolean doNotSortFields,
+				String visibilityOrder) {
 			requireElementsNonNull(memberCategoryOrder);
 			requireElementsNonNull(visibilityOrder);
 			builder.setMembersOrdering(memberCategoryOrder, doNotSortFields);

From 8aaf0e933c9509e9f601df79638c0fa3a8dab47b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Rou=C3=A9l?= <andre.rouel@gmail.com>
Date: Fri, 25 Oct 2024 17:00:25 +0200
Subject: [PATCH 1909/2068] Remove unused test code

---
 .../extra/java/EclipseJdtFormatterStepSpecialCaseTest.java     | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java
index f37bfe9e74..20c11f6010 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java
@@ -38,7 +38,6 @@ public void issue_1638() {
 
 	@Test
 	public void sort_members_no_fields() {
-		ClassLoader classLoader = getClass().getClassLoader();
 		EclipseJdtFormatterStep.Builder builder = EclipseJdtFormatterStep.createBuilder(TestProvisioner.mavenCentral());
 		builder.setMembersOrdering("SF,SI,SM,F,I,C,M,T", true);
 		StepHarness.forStep(builder.build())
@@ -47,7 +46,6 @@ public void sort_members_no_fields() {
 
 	@Test
 	public void sort_members() {
-		ClassLoader classLoader = getClass().getClassLoader();
 		EclipseJdtFormatterStep.Builder builder = EclipseJdtFormatterStep.createBuilder(TestProvisioner.mavenCentral());
 		builder.setMembersOrdering("SF,SI,SM,F,I,C,M,T", false);
 		StepHarness.forStep(builder.build())
@@ -56,7 +54,6 @@ public void sort_members() {
 
 	@Test
 	public void sort_members_and_by_visibility() {
-		ClassLoader classLoader = getClass().getClassLoader();
 		EclipseJdtFormatterStep.Builder builder = EclipseJdtFormatterStep.createBuilder(TestProvisioner.mavenCentral());
 		builder.setMembersOrdering("SF,SI,SM,F,I,C,M,T", false);
 		builder.setVisibilityOrdering("B,R,D,V");

From d41e7af0008f3acbf5ceb877ae1a5910b6e3b656 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Rou=C3=A9l?= <andre.rouel@gmail.com>
Date: Fri, 25 Oct 2024 19:56:32 +0200
Subject: [PATCH 1910/2068] Remove unnecessary modifiers from test class

---
 .../java/EclipseJdtFormatterStepSpecialCaseTest.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java
index 20c11f6010..572fe1fc7e 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java
@@ -24,10 +24,10 @@
 import com.diffplug.spotless.TestProvisioner;
 import com.diffplug.spotless.extra.EquoBasedStepBuilder;
 
-public class EclipseJdtFormatterStepSpecialCaseTest {
+class EclipseJdtFormatterStepSpecialCaseTest {
 	/** https://github.com/diffplug/spotless/issues/1638 */
 	@Test
-	public void issue_1638() {
+	void issue_1638() {
 		ClassLoader classLoader = getClass().getClassLoader();
 		File file = new File(classLoader.getResource("eclipse_formatter_issue_1638.xml").getFile());
 		EquoBasedStepBuilder builder = EclipseJdtFormatterStep.createBuilder(TestProvisioner.mavenCentral());
@@ -37,7 +37,7 @@ public void issue_1638() {
 	}
 
 	@Test
-	public void sort_members_no_fields() {
+	void sort_members_no_fields() {
 		EclipseJdtFormatterStep.Builder builder = EclipseJdtFormatterStep.createBuilder(TestProvisioner.mavenCentral());
 		builder.setMembersOrdering("SF,SI,SM,F,I,C,M,T", true);
 		StepHarness.forStep(builder.build())
@@ -45,7 +45,7 @@ public void sort_members_no_fields() {
 	}
 
 	@Test
-	public void sort_members() {
+	void sort_members() {
 		EclipseJdtFormatterStep.Builder builder = EclipseJdtFormatterStep.createBuilder(TestProvisioner.mavenCentral());
 		builder.setMembersOrdering("SF,SI,SM,F,I,C,M,T", false);
 		StepHarness.forStep(builder.build())
@@ -53,7 +53,7 @@ public void sort_members() {
 	}
 
 	@Test
-	public void sort_members_and_by_visibility() {
+	void sort_members_by_visibility() {
 		EclipseJdtFormatterStep.Builder builder = EclipseJdtFormatterStep.createBuilder(TestProvisioner.mavenCentral());
 		builder.setMembersOrdering("SF,SI,SM,F,I,C,M,T", false);
 		builder.setVisibilityOrdering("B,R,D,V");

From 17b3e1417011d6138c0076b39caf683fdd758c90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Rou=C3=A9l?= <andre.rouel@gmail.com>
Date: Fri, 25 Oct 2024 20:17:28 +0200
Subject: [PATCH 1911/2068] Simplify `ASTNode` rendering to String

---
 lib-extra/build.gradle                                      | 1 -
 .../extra/glue/jdt/DefaultJavaElementComparator.java        | 6 ++++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index 7bb686dac5..d7e5a7ab2e 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -87,7 +87,6 @@ p2deps {
 	into 'jdtCompileOnly', {
 		p2repo 'https://download.eclipse.org/eclipse/updates/4.26/'
 		install 'org.eclipse.jdt.core'
-		install 'org.eclipse.jdt.core.manipulation'
 	}
 }
 
diff --git a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/DefaultJavaElementComparator.java b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/DefaultJavaElementComparator.java
index ad4dcc1a68..529b8265a1 100644
--- a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/DefaultJavaElementComparator.java
+++ b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/DefaultJavaElementComparator.java
@@ -32,7 +32,7 @@
 import org.eclipse.jdt.core.dom.Type;
 import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
 import org.eclipse.jdt.core.util.CompilationUnitSorter;
-import org.eclipse.jdt.internal.corext.dom.ASTNodes;
+import org.eclipse.jdt.internal.core.dom.NaiveASTFlattener;
 
 /**
  * This class is derived and adapted code from the Eclipse JDT project (Derivative Works according to EPL 2.0 license).
@@ -382,6 +382,8 @@ private int compareNames(BodyDeclaration bodyDeclaration1, BodyDeclaration bodyD
 	}
 
 	private String buildSignature(Type type) {
-		return ASTNodes.asString(type);
+		NaiveASTFlattener flattener = new NaiveASTFlattener();
+		type.accept(flattener);
+		return flattener.getResult();
 	}
 }

From 7856b0fbd3920dc048aea6bf6d693e1a27e0cc49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Rou=C3=A9l?= <andre.rouel@gmail.com>
Date: Fri, 25 Oct 2024 20:21:33 +0200
Subject: [PATCH 1912/2068] Add more member types to Sort Members test cases

---
 .../java/eclipse/SortExample.sortMembers.clean | 18 +++++++++++++++++-
 .../SortExample.sortMembersByVisibility.clean  | 18 +++++++++++++++++-
 .../SortExample.sortMembersNoFields.clean      | 18 +++++++++++++++++-
 .../resources/java/eclipse/SortExample.test    | 11 ++++++++++-
 4 files changed, 61 insertions(+), 4 deletions(-)

diff --git a/testlib/src/main/resources/java/eclipse/SortExample.sortMembers.clean b/testlib/src/main/resources/java/eclipse/SortExample.sortMembers.clean
index b129e6862e..e6f3c1dc0e 100644
--- a/testlib/src/main/resources/java/eclipse/SortExample.sortMembers.clean
+++ b/testlib/src/main/resources/java/eclipse/SortExample.sortMembers.clean
@@ -2,11 +2,21 @@ package com.diffplug.spotless.extra.glue.jdt;
 
 public class SortExample {
 	private static final int A;
+	static final int B = 1;
+	protected static final int C = 2;
 	public static final int Z;
 	static {
-		Z = 1;
+		Z = 9;
 		A = 0;
 	}
+	static void s1() {
+	}
+	private static void s2() {
+	}
+	public static void s3() {
+	}
+	protected static void s4() {
+	}
 	final boolean _1 = false;
 	final int a = 1;
 	public final int b = 1;
@@ -15,6 +25,12 @@ public class SortExample {
 	protected final int e = 1;
 	public final int f = 1;
 	final int z = 1;
+	SortExample() {
+	}
+	SortExample(int a) {
+	}
+	SortExample(int b, int c) {
+	}
 	class Nested {
 		public static final String B = "B";
 		private static final String C = "C";
diff --git a/testlib/src/main/resources/java/eclipse/SortExample.sortMembersByVisibility.clean b/testlib/src/main/resources/java/eclipse/SortExample.sortMembersByVisibility.clean
index aebaacb3f1..e5d1528ba1 100644
--- a/testlib/src/main/resources/java/eclipse/SortExample.sortMembersByVisibility.clean
+++ b/testlib/src/main/resources/java/eclipse/SortExample.sortMembersByVisibility.clean
@@ -2,11 +2,21 @@ package com.diffplug.spotless.extra.glue.jdt;
 
 public class SortExample {
 	public static final int Z;
+	protected static final int C = 2;
+	static final int B = 1;
 	private static final int A;
 	static {
-		Z = 1;
+		Z = 9;
 		A = 0;
 	}
+	public static void s3() {
+	}
+	protected static void s4() {
+	}
+	static void s1() {
+	}
+	private static void s2() {
+	}
 	public final int b = 1;
 	public final int f = 1;
 	protected final int d = 1;
@@ -15,6 +25,12 @@ public class SortExample {
 	final int a = 1;
 	final int z = 1;
 	private final int c = 1;
+	SortExample() {
+	}
+	SortExample(int a) {
+	}
+	SortExample(int b, int c) {
+	}
 	class Nested {
 		public static final String B = "B";
 		protected static final String D = "D";
diff --git a/testlib/src/main/resources/java/eclipse/SortExample.sortMembersNoFields.clean b/testlib/src/main/resources/java/eclipse/SortExample.sortMembersNoFields.clean
index fdad821a6c..499f0ef413 100644
--- a/testlib/src/main/resources/java/eclipse/SortExample.sortMembersNoFields.clean
+++ b/testlib/src/main/resources/java/eclipse/SortExample.sortMembersNoFields.clean
@@ -3,10 +3,20 @@ package com.diffplug.spotless.extra.glue.jdt;
 public class SortExample {
 	public static final int Z;
 	private static final int A;
+	static final int B = 1;
+	protected static final int C = 2;
 	static {
-		Z = 1;
+		Z = 9;
 		A = 0;
 	}
+	static void s1() {
+	}
+	private static void s2() {
+	}
+	public static void s3() {
+	}
+	protected static void s4() {
+	}
 	final int z = 1;
 	final int a = 1;
 	private final int c = 1;
@@ -15,6 +25,12 @@ public class SortExample {
 	public final int f = 1;
 	public final int b = 1;
 	final boolean _1 = false;
+	SortExample() {
+	}
+	SortExample(int a) {
+	}
+	SortExample(int b, int c) {
+	}
 	class Nested {
 		private static final String C = "C";
 		protected static final String D = "D";
diff --git a/testlib/src/main/resources/java/eclipse/SortExample.test b/testlib/src/main/resources/java/eclipse/SortExample.test
index 88421f35f8..421248e7b5 100644
--- a/testlib/src/main/resources/java/eclipse/SortExample.test
+++ b/testlib/src/main/resources/java/eclipse/SortExample.test
@@ -9,6 +9,13 @@ public class SortExample {
 	public final int f = 1;
 	public final int b = 1;
 	final boolean _1 = false;
+	static void s1() {}
+	private static void s2() {}
+	public static void s3() {}
+	protected static void s4() {}
+	SortExample(int b, int c) {}
+	SortExample(int a) {}
+	SortExample() {}
 	class Nested {
 		void z() {}
 		private static final String C = "C";
@@ -21,8 +28,10 @@ public class SortExample {
 	}
 	public static final int Z;
 	private static final int A;
+	static final int B  =1;
+	protected static final int C= 2;
 	static {
-		Z = 1;
+		Z = 9;
 		A = 0;
 	}
 }

From bc47f37a8b1313ea5864c92551307027b5d0e07f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Rou=C3=A9l?= <andre.rouel@gmail.com>
Date: Fri, 25 Oct 2024 20:56:50 +0200
Subject: [PATCH 1913/2068] Update README.md

---
 plugin-gradle/README.md | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 90d7d6ef56..bfa17ebcf8 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -264,10 +264,31 @@ spotless {
     eclipse('4.26').configFile('eclipse-prefs.xml')
     // if the access to the p2 repositories is restricted, mirrors can be
     // specified using a URI prefix map as follows:
-    eclipse().withP2Mirrors(['https://download.eclipse.org/eclipse/updates/4.29/':'https://some.internal.mirror/4-29-updates-p2/'])
-       
+    eclipse().withP2Mirrors(['https://download.eclipse.org/eclipse/updates/4.29/':'https://some.internal.mirror/4-29-updates-p2/']) 
 ```
 
+Not only can you format your code with Eclipse JDT, but you can also sort the members as you know it from Eclipse IDE.
+This ensures that the methods are always in sorted order (and thus reduces the likelihood of collisions in a version 
+control system). It is turned off by default, but you might want to consider enabling it when setting coding standards
+for the rest of the team.
+
+The format to specify the sort order follows the `outlinesortoption` and `org.eclipse.jdt.ui.visibility.order`
+properties that can be found in the workspace folder of your Eclipse IDE (look up the
+file `.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs` in your workspace directory).
+
+```gradle
+spotless {
+  java {
+    // specify the sort order of the member categories
+    // SF,SI,SM,F,I,C,M,T = Static Fields, Static Initializers, Static Methods, Fields, Initializers, Constructors, Methods, (Nested) Types
+    val memberCategoryOrder = "SF,SI,SM,F,I,C,M,T"
+    val doNotSortFields = true
+    eclipse().sortMembers(memberCategoryOrder, doNotSortFields)
+    // optional: specify ordering of members of the same category by the visibility within the category
+    // B,R,D,V = Public, Protected, Package, Private
+    val visibilityOrder = "B,R,D,V"
+    eclipse().sortMembers(membersSortOrder, doNotSortFields, visibilityOrder)
+```
 
 ### formatAnnotations
 

From 12f47f7640e2b521926c2e165463008a1a2a0f76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Rou=C3=A9l?= <andre.rouel@gmail.com>
Date: Fri, 25 Oct 2024 21:04:48 +0200
Subject: [PATCH 1914/2068] Update CHANGES.md

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 9e4d6a5de4..d1ead78c40 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changed
 * Bump default `ktlint` version to latest `1.3.0` -> `1.4.0`. ([#2314](https://github.com/diffplug/spotless/pull/2314))
+* Add _Sort Members_ feature based on [Eclipse JDT](plugin-gradle/README.md#eclipse-jdt) implementation. ([#2312](https://github.com/diffplug/spotless/pull/2312))
 
 ## [3.0.0.BETA4] - 2024-10-24
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 7ab9a6c86e..f1cdbe001b 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -12,7 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * New `suppressLintsFor` DSL ([docs](https://github.com/diffplug/spotless/tree/main/plugin-gradle#linting)) ([#2307](https://github.com/diffplug/spotless/pull/2307))
   * `ignoreErrorForStep` and `ignoreErrorForPath` are now deprecated aliases of `suppressLintsFor`
   * Spotless is still a formatter not a linter, it just models formatting failures as lints rather than stopping execution (resolves [#287](https://github.com/diffplug/spotless/issues/287))
-* Add _Sort Members_ feature based on Eclipse JDT implementation. ([#2312](https://github.com/diffplug/spotless/pull/2312))
+* Add _Sort Members_ feature based on [Eclipse JDT](README.md#eclipse-jdt) implementation. ([#2312](https://github.com/diffplug/spotless/pull/2312))
 ### Fixed
 * `ktlint` steps now read from the `string` instead of the `file` so they don't clobber earlier steps. (fixes [#1599](https://github.com/diffplug/spotless/issues/1599))
 

From 9ea2d8c1fab8e216d6051a053133b0c58d2a6092 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Rou=C3=A9l?= <andre.rouel@gmail.com>
Date: Fri, 25 Oct 2024 21:09:24 +0200
Subject: [PATCH 1915/2068] Remove unused code

---
 .../spotless/extra/glue/jdt/EclipseJdtSortMembers.java         | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtSortMembers.java b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtSortMembers.java
index d42b518be4..feeb904ec2 100644
--- a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtSortMembers.java
+++ b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtSortMembers.java
@@ -196,9 +196,6 @@ static SortProperties from(Map<String, String> properties) {
 			boolean doNotSortFields = Boolean.parseBoolean(properties.getOrDefault("members.doNotSortFields", "true"));
 			boolean sortByVisibility = Boolean.parseBoolean(properties.getOrDefault("visibility.order.enabled", "false"));
 			String visibilityOrder = properties.getOrDefault("visibility.order", "");
-			// At the moment we see no need for the following options, but they may become important, idk.
-			Map<String, String> compilationUnitOptions = Map.of();
-			Map<String, String> compilerOptions = Map.of();
 			return new SortProperties(enabled, membersOrder, doNotSortFields, sortByVisibility, visibilityOrder);
 		}
 	}

From 231b67c95554d4a080653e7040eae97aa1a57186 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Rou=C3=A9l?= <andre.rouel@gmail.com>
Date: Fri, 25 Oct 2024 21:29:55 +0200
Subject: [PATCH 1916/2068] Fix spotbugs issues

---
 .../jdt/DefaultJavaElementComparator.java     | 84 +++++++++----------
 .../extra/glue/jdt/EclipseJdtSortMembers.java | 74 ++++++++--------
 .../extra/glue/jdt/SuppressFBWarnings.java    | 26 ++++++
 3 files changed, 108 insertions(+), 76 deletions(-)
 create mode 100644 lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/SuppressFBWarnings.java

diff --git a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/DefaultJavaElementComparator.java b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/DefaultJavaElementComparator.java
index 529b8265a1..78791e240b 100644
--- a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/DefaultJavaElementComparator.java
+++ b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/DefaultJavaElementComparator.java
@@ -37,6 +37,7 @@
 /**
  * This class is derived and adapted code from the Eclipse JDT project (Derivative Works according to EPL 2.0 license).
  */
+@SuppressFBWarnings(value = "SE_COMPARATOR_SHOULD_BE_SERIALIZABLE", justification = "this comparator is not meant to be serialized")
 class DefaultJavaElementComparator implements Comparator<BodyDeclaration> {
 
 	static final int TYPE_INDEX = 0;
@@ -96,62 +97,60 @@ static DefaultJavaElementComparator of(
 		this.visibilityOffsets = visibilityOffsets;
 	}
 
+	@SuppressFBWarnings(value = "SF_SWITCH_NO_DEFAULT", justification = "we only accept valid tokens in the order string, otherwise we fall back to default value")
 	static boolean fillVisibilityOffsets(String preferencesString, int[] offsets) {
 		StringTokenizer tokenizer = new StringTokenizer(preferencesString, ",");
 		int i = 0;
 		while (tokenizer.hasMoreTokens()) {
 			String token = tokenizer.nextToken();
-			if (token != null) {
-				switch (token) {
-				case "B":
-					offsets[PUBLIC_INDEX] = i++;
-					break;
-				case "D":
-					offsets[DEFAULT_INDEX] = i++;
-					break;
-				case "R":
-					offsets[PROTECTED_INDEX] = i++;
-					break;
-				case "V":
-					offsets[PRIVATE_INDEX] = i++;
-				}
+			switch (token) {
+			case "B":
+				offsets[PUBLIC_INDEX] = i++;
+				break;
+			case "D":
+				offsets[DEFAULT_INDEX] = i++;
+				break;
+			case "R":
+				offsets[PROTECTED_INDEX] = i++;
+				break;
+			case "V":
+				offsets[PRIVATE_INDEX] = i++;
 			}
 		}
 		return i == N_VISIBILITIES;
 	}
 
-	static boolean fillMemberCategoryOffsets(String preferencesString, int[] offsets) {
-		StringTokenizer tokenizer = new StringTokenizer(preferencesString, ",");
+	@SuppressFBWarnings(value = "SF_SWITCH_NO_DEFAULT", justification = "we only accept valid tokens in the order string, otherwise we fall back to default value")
+	static boolean fillMemberCategoryOffsets(String orderString, int[] offsets) {
+		StringTokenizer tokenizer = new StringTokenizer(orderString, ",");
 		int i = 0;
 		offsets[8] = i++;
 		while (tokenizer.hasMoreTokens()) {
 			String token = tokenizer.nextToken();
-			if (token != null) {
-				switch (token) {
-				case "C":
-					offsets[CONSTRUCTORS_INDEX] = i++;
-					break;
-				case "F":
-					offsets[FIELDS_INDEX] = i++;
-					break;
-				case "I":
-					offsets[INIT_INDEX] = i++;
-					break;
-				case "M":
-					offsets[METHOD_INDEX] = i++;
-					break;
-				case "T":
-					offsets[TYPE_INDEX] = i++;
-					break;
-				case "SF":
-					offsets[STATIC_FIELDS_INDEX] = i++;
-					break;
-				case "SI":
-					offsets[STATIC_INIT_INDEX] = i++;
-					break;
-				case "SM":
-					offsets[STATIC_METHODS_INDEX] = i++;
-				}
+			switch (token) {
+			case "C":
+				offsets[CONSTRUCTORS_INDEX] = i++;
+				break;
+			case "F":
+				offsets[FIELDS_INDEX] = i++;
+				break;
+			case "I":
+				offsets[INIT_INDEX] = i++;
+				break;
+			case "M":
+				offsets[METHOD_INDEX] = i++;
+				break;
+			case "T":
+				offsets[TYPE_INDEX] = i++;
+				break;
+			case "SF":
+				offsets[STATIC_FIELDS_INDEX] = i++;
+				break;
+			case "SI":
+				offsets[STATIC_INIT_INDEX] = i++;
+				break;
+			case "SM":
+				offsets[STATIC_METHODS_INDEX] = i++;
 			}
 		}
 		return i == N_CATEGORIES;
@@ -219,6 +218,7 @@ private int getVisibilityIndex(int modifierFlags) {
 	 * @see CompilationUnitSorter#sort(int, org.eclipse.jdt.core.ICompilationUnit, int[], java.util.Comparator, int, org.eclipse.core.runtime.IProgressMonitor)
 	 */
 	@Override
+	@SuppressFBWarnings(value = "BC_UNCONFIRMED_CAST", justification = "when switching to a more recent Java version, we can avoid those unconfirmed casts")
 	public int compare(BodyDeclaration bodyDeclaration1, BodyDeclaration bodyDeclaration2) {
 		boolean preserved1 = doNotSortFields && isSortPreserved(bodyDeclaration1);
 		boolean preserved2 = doNotSortFields && isSortPreserved(bodyDeclaration2);
diff --git a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtSortMembers.java b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtSortMembers.java
index feeb904ec2..9743724013 100644
--- a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtSortMembers.java
+++ b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtSortMembers.java
@@ -28,50 +28,17 @@
 import org.eclipse.jdt.core.IOpenable;
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.internal.core.CompilationUnit;
-import org.eclipse.jdt.internal.core.JavaProject;
 import org.eclipse.jdt.internal.core.SortElementsOperation;
 
 public class EclipseJdtSortMembers {
 
-	private static CompilationUnit compilationUnit(String code) {
-		return new CompilationUnit(null, null, null) {
-			private final Buffer buffer = new Buffer(code);
-
-			@Override
-			public IBuffer getBuffer() {
-				return buffer;
-			}
-
-			@Override
-			public JavaProject getJavaProject() {
-				return new JavaProject(null, null) {
-					@Override
-					public Map<String, String> getOptions(boolean inheritJavaCoreOptions) {
-						return Map.of();
-					}
-				};
-			}
-
-			@Override
-			public Map<String, String> getOptions(boolean inheritJavaCoreOptions) {
-				return Map.of();
-			}
-
-			@Override
-			public ICompilationUnit getPrimary() {
-				return this;
-			}
-		};
-	}
-
 	static String sortMember(String code, SortProperties properties) {
 		if (!properties.enabled) {
 			return code;
 		}
 
 		try {
-			CompilationUnit compilationUnit = compilationUnit(code);
+			CompilationUnit compilationUnit = new CompilationUnit(code);
 			DefaultJavaElementComparator comparator = DefaultJavaElementComparator.of(
 					properties.doNotSortFields,
 					properties.membersOrder,
@@ -159,6 +126,45 @@ public void setContents(String contents) {
 		}
 	}
 
+	@SuppressFBWarnings(value = "EQ_DOESNT_OVERRIDE_EQUALS", justification = "the equals method shouldn't be called in the sort members use case")
+	private static class CompilationUnit extends org.eclipse.jdt.internal.core.CompilationUnit {
+		private final Buffer buffer;
+
+		CompilationUnit(String code) {
+			super(null, null, null);
+			buffer = new Buffer(code);
+		}
+
+		@Override
+		public IBuffer getBuffer() {
+			return buffer;
+		}
+
+		@Override
+		public JavaProject getJavaProject() {
+			return JavaProject.INSTANCE;
+		}
+
+		@Override
+		public Map<String, String> getOptions(boolean inheritJavaCoreOptions) {
+			return Map.of();
+		}
+
+		@Override
+		public ICompilationUnit getPrimary() {
+			return this;
+		}
+	}
+
+	private static class JavaProject extends org.eclipse.jdt.internal.core.JavaProject {
+		static final JavaProject INSTANCE = new JavaProject();
+
+		@Override
+		public Map<String, String> getOptions(boolean inheritJavaCoreOptions) {
+			return Map.of();
+		}
+	}
+
 	private static class Sorter extends SortElementsOperation {
 
 		Sorter(int level, CompilationUnit compilationUnit, int[] positions, Comparator comparator) {
diff --git a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/SuppressFBWarnings.java b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/SuppressFBWarnings.java
new file mode 100644
index 0000000000..bfcad72a23
--- /dev/null
+++ b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/SuppressFBWarnings.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.extra.glue.jdt;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.CLASS)
+@interface SuppressFBWarnings {
+	String[] value() default {};
+
+	String justification() default "";
+}

From cd045fbd8f9da516a6d0e56883b11c601523e3aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Rou=C3=A9l?= <andre.rouel@gmail.com>
Date: Fri, 25 Oct 2024 21:38:24 +0200
Subject: [PATCH 1917/2068] Update README.md

---
 plugin-gradle/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index bfa17ebcf8..d771075740 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -287,7 +287,7 @@ spotless {
     // optional: specify ordering of members of the same category by the visibility within the category
     // B,R,D,V = Public, Protected, Package, Private
     val visibilityOrder = "B,R,D,V"
-    eclipse().sortMembers(membersSortOrder, doNotSortFields, visibilityOrder)
+    eclipse().sortMembers(memberCategoryOrder, doNotSortFields, visibilityOrder)
 ```
 
 ### formatAnnotations

From 5977dbd9cb458fce7bd697b18a92f244052bc065 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Rou=C3=A9l?= <andre.rouel@gmail.com>
Date: Fri, 25 Oct 2024 22:00:55 +0200
Subject: [PATCH 1918/2068] Fix test failures

---
 .../spotless/extra/glue/jdt/EclipseJdtSortMembers.java        | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtSortMembers.java b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtSortMembers.java
index 9743724013..3c6fd49010 100644
--- a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtSortMembers.java
+++ b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtSortMembers.java
@@ -159,6 +159,10 @@ public ICompilationUnit getPrimary() {
 	private static class JavaProject extends org.eclipse.jdt.internal.core.JavaProject {
 		static final JavaProject INSTANCE = new JavaProject();
 
+		JavaProject() {
+			super(null, null);
+		}
+
 		@Override
 		public Map<String, String> getOptions(boolean inheritJavaCoreOptions) {
 			return Map.of();

From 8422374c368121642c86d3477fb490199d3b3a9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Rou=C3=A9l?= <andre.rouel@gmail.com>
Date: Fri, 25 Oct 2024 22:02:53 +0200
Subject: [PATCH 1919/2068] Update README.md

---
 plugin-gradle/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index d771075740..5c481ffbf8 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -270,7 +270,7 @@ spotless {
 Not only can you format your code with Eclipse JDT, but you can also sort the members as you know it from Eclipse IDE.
 This ensures that the methods are always in sorted order (and thus reduces the likelihood of collisions in a version 
 control system). It is turned off by default, but you might want to consider enabling it when setting coding standards
-for the rest of the team.
+for a project.
 
 The format to specify the sort order follows the `outlinesortoption` and `org.eclipse.jdt.ui.visibility.order`
 properties that can be found in the workspace folder of your Eclipse IDE (look up the

From 9171810a5448e34feeb2c2189938111c7d789bb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Rou=C3=A9l?= <andre.rouel@gmail.com>
Date: Fri, 25 Oct 2024 22:03:50 +0200
Subject: [PATCH 1920/2068] Update README.md

---
 plugin-gradle/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 5c481ffbf8..ee89335b3b 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -273,8 +273,8 @@ control system). It is turned off by default, but you might want to consider ena
 for a project.
 
 The format to specify the sort order follows the `outlinesortoption` and `org.eclipse.jdt.ui.visibility.order`
-properties that can be found in the workspace folder of your Eclipse IDE (look up the
-file `.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs` in your workspace directory).
+properties that can be found in the workspace folder of your Eclipse IDE. Look up the
+file `.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs` in your workspace directory.
 
 ```gradle
 spotless {

From 8b8ae6eae8cc7ba865ccd2c3285feb643f0353c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Rou=C3=A9l?= <andre.rouel@gmail.com>
Date: Mon, 28 Oct 2024 13:05:22 +0100
Subject: [PATCH 1921/2068] Add local properties to enable/disable certain
 features of the Sort Members functionality

---
 .../extra/glue/jdt/EclipseJdtSortMembers.java | 47 ++++++++++++++---
 ...clipseJdtFormatterStepSpecialCaseTest.java | 45 ++++++++++++++---
 plugin-gradle/README.md                       | 11 ++++
 .../SortExample.localDoNotSortFields.clean    | 50 +++++++++++++++++++
 .../SortExample.localDoNotSortFields.test     | 38 ++++++++++++++
 .../SortExample.localEnabledFalse.clean       | 50 +++++++++++++++++++
 .../SortExample.localEnabledFalse.test        | 38 ++++++++++++++
 .../SortExample.localEnabledTrue.clean        | 50 +++++++++++++++++++
 .../eclipse/SortExample.localEnabledTrue.test | 38 ++++++++++++++
 .../SortExample.localSortByVisibility.clean   | 50 +++++++++++++++++++
 .../SortExample.localSortByVisibility.test    | 38 ++++++++++++++
 11 files changed, 443 insertions(+), 12 deletions(-)
 create mode 100644 testlib/src/main/resources/java/eclipse/SortExample.localDoNotSortFields.clean
 create mode 100644 testlib/src/main/resources/java/eclipse/SortExample.localDoNotSortFields.test
 create mode 100644 testlib/src/main/resources/java/eclipse/SortExample.localEnabledFalse.clean
 create mode 100644 testlib/src/main/resources/java/eclipse/SortExample.localEnabledFalse.test
 create mode 100644 testlib/src/main/resources/java/eclipse/SortExample.localEnabledTrue.clean
 create mode 100644 testlib/src/main/resources/java/eclipse/SortExample.localEnabledTrue.test
 create mode 100644 testlib/src/main/resources/java/eclipse/SortExample.localSortByVisibility.clean
 create mode 100644 testlib/src/main/resources/java/eclipse/SortExample.localSortByVisibility.test

diff --git a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtSortMembers.java b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtSortMembers.java
index 3c6fd49010..b3eecbf597 100644
--- a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtSortMembers.java
+++ b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtSortMembers.java
@@ -17,6 +17,9 @@
 
 import java.util.Comparator;
 import java.util.Map;
+import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
@@ -32,18 +35,41 @@
 
 public class EclipseJdtSortMembers {
 
-	static String sortMember(String code, SortProperties properties) {
-		if (!properties.enabled) {
+	private static final Pattern PATTERN_DO_NOT_SORT_FIELDS = Pattern.compile("@SortMembers:doNotSortFields\\s*=\\s*(false|true)");
+	private static final Pattern PATTERN_ENABLED = Pattern.compile("@SortMembers:enabled\\s*=\\s*(false|true)");
+	private static final Pattern PATTERN_SORT_BY_VISIBILITY = Pattern.compile("@SortMembers:sortByVisibility\\s*=\\s*(false|true)");
+
+	static SortProperties localProperties(SortProperties globalProperties, String code) {
+		Optional<Boolean> localDoNotSortFields = testOverwriteProperty(PATTERN_DO_NOT_SORT_FIELDS, code);
+		Optional<Boolean> localEnabled = testOverwriteProperty(PATTERN_ENABLED, code);
+		Optional<Boolean> localSortByVisibility = testOverwriteProperty(PATTERN_SORT_BY_VISIBILITY, code);
+		if (localDoNotSortFields.isEmpty() && localEnabled.isEmpty() && localSortByVisibility.isEmpty()) {
+			return globalProperties;
+		}
+		boolean doNotSortFields = localDoNotSortFields.orElse(globalProperties.doNotSortFields);
+		boolean enabled = localEnabled.orElse(globalProperties.enabled);
+		boolean sortByVisibility = localSortByVisibility.orElse(globalProperties.sortByVisibility);
+		return new SortProperties(
+				enabled,
+				globalProperties.membersOrder,
+				doNotSortFields,
+				sortByVisibility,
+				globalProperties.visibilityOrder);
+	}
+
+	static String sortMember(String code, SortProperties globalProperties) {
+		SortProperties localProperties = localProperties(globalProperties, code);
+		if (!localProperties.enabled) {
 			return code;
 		}
 
 		try {
 			CompilationUnit compilationUnit = new CompilationUnit(code);
 			DefaultJavaElementComparator comparator = DefaultJavaElementComparator.of(
-					properties.doNotSortFields,
-					properties.membersOrder,
-					properties.sortByVisibility,
-					properties.visibilityOrder);
+					localProperties.doNotSortFields,
+					localProperties.membersOrder,
+					localProperties.sortByVisibility,
+					localProperties.visibilityOrder);
 			new Sorter(AST.getJLSLatest(), compilationUnit, null, comparator).sort();
 			String content = compilationUnit.getBuffer().getContents();
 			if (content != null) {
@@ -55,6 +81,15 @@ static String sortMember(String code, SortProperties properties) {
 		return code;
 	}
 
+	static Optional<Boolean> testOverwriteProperty(Pattern pattern, String code) {
+		Matcher matcher = pattern.matcher(code);
+		if (matcher.find()) {
+			String flag = matcher.group(1);
+			return Optional.of(Boolean.valueOf(flag));
+		}
+		return Optional.empty();
+	}
+
 	private static class Buffer implements IBuffer {
 
 		private String contents;
diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java
index 572fe1fc7e..1cc116be3a 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java
@@ -37,15 +37,16 @@ void issue_1638() {
 	}
 
 	@Test
-	void sort_members_no_fields() {
+	void sort_members_global_by_visibility() {
 		EclipseJdtFormatterStep.Builder builder = EclipseJdtFormatterStep.createBuilder(TestProvisioner.mavenCentral());
-		builder.setMembersOrdering("SF,SI,SM,F,I,C,M,T", true);
+		builder.setMembersOrdering("SF,SI,SM,F,I,C,M,T", false);
+		builder.setVisibilityOrdering("B,R,D,V");
 		StepHarness.forStep(builder.build())
-				.testResource("java/eclipse/SortExample.test", "java/eclipse/SortExample.sortMembersNoFields.clean");
+				.testResource("java/eclipse/SortExample.test", "java/eclipse/SortExample.sortMembersByVisibility.clean");
 	}
 
 	@Test
-	void sort_members() {
+	void sort_members_global_enabled() {
 		EclipseJdtFormatterStep.Builder builder = EclipseJdtFormatterStep.createBuilder(TestProvisioner.mavenCentral());
 		builder.setMembersOrdering("SF,SI,SM,F,I,C,M,T", false);
 		StepHarness.forStep(builder.build())
@@ -53,11 +54,43 @@ void sort_members() {
 	}
 
 	@Test
-	void sort_members_by_visibility() {
+	void sort_members_global_no_fields() {
+		EclipseJdtFormatterStep.Builder builder = EclipseJdtFormatterStep.createBuilder(TestProvisioner.mavenCentral());
+		builder.setMembersOrdering("SF,SI,SM,F,I,C,M,T", true);
+		StepHarness.forStep(builder.build())
+				.testResource("java/eclipse/SortExample.test", "java/eclipse/SortExample.sortMembersNoFields.clean");
+	}
+
+	@Test
+	void sort_members_local_by_visibility() {
 		EclipseJdtFormatterStep.Builder builder = EclipseJdtFormatterStep.createBuilder(TestProvisioner.mavenCentral());
 		builder.setMembersOrdering("SF,SI,SM,F,I,C,M,T", false);
 		builder.setVisibilityOrdering("B,R,D,V");
 		StepHarness.forStep(builder.build())
-				.testResource("java/eclipse/SortExample.test", "java/eclipse/SortExample.sortMembersByVisibility.clean");
+				.testResource("java/eclipse/SortExample.localSortByVisibility.test", "java/eclipse/SortExample.localSortByVisibility.clean");
+	}
+
+	@Test
+	void sort_members_local_enabled_false() {
+		EclipseJdtFormatterStep.Builder builder = EclipseJdtFormatterStep.createBuilder(TestProvisioner.mavenCentral());
+		builder.setMembersOrdering("SF,SI,SM,F,I,C,M,T", false);
+		StepHarness.forStep(builder.build())
+				.testResource("java/eclipse/SortExample.localEnabledFalse.test", "java/eclipse/SortExample.localEnabledFalse.clean");
+	}
+
+	@Test
+	void sort_members_local_no_fields() {
+		EclipseJdtFormatterStep.Builder builder = EclipseJdtFormatterStep.createBuilder(TestProvisioner.mavenCentral());
+		builder.setMembersOrdering("SF,SI,SM,F,I,C,M,T", false);
+		StepHarness.forStep(builder.build())
+				.testResource("java/eclipse/SortExample.localDoNotSortFields.test", "java/eclipse/SortExample.localDoNotSortFields.clean");
+	}
+
+
+	@Test
+	void sort_members_local_enabled_true() {
+		EclipseJdtFormatterStep.Builder builder = EclipseJdtFormatterStep.createBuilder(TestProvisioner.mavenCentral());
+		StepHarness.forStep(builder.build())
+			.testResource("java/eclipse/SortExample.localEnabledTrue.test", "java/eclipse/SortExample.localEnabledTrue.clean");
 	}
 }
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index ee89335b3b..ef9db402fb 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -267,6 +267,8 @@ spotless {
     eclipse().withP2Mirrors(['https://download.eclipse.org/eclipse/updates/4.29/':'https://some.internal.mirror/4-29-updates-p2/']) 
 ```
 
+#### Sort Members
+
 Not only can you format your code with Eclipse JDT, but you can also sort the members as you know it from Eclipse IDE.
 This ensures that the methods are always in sorted order (and thus reduces the likelihood of collisions in a version 
 control system). It is turned off by default, but you might want to consider enabling it when setting coding standards
@@ -276,6 +278,8 @@ The format to specify the sort order follows the `outlinesortoption` and `org.ec
 properties that can be found in the workspace folder of your Eclipse IDE. Look up the
 file `.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs` in your workspace directory.
 
+###### Define Sort Members settings on project level
+
 ```gradle
 spotless {
   java {
@@ -290,6 +294,13 @@ spotless {
     eclipse().sortMembers(memberCategoryOrder, doNotSortFields, visibilityOrder)
 ```
 
+###### Overwrite Sort Members settings on file level
+
+You can enable/disable the sort properties on file level by adding the following comments:
+- `// @SortMembers:enabled=false` - disable the Sort Members feature for this file
+- `// @SortMembers:doNotSortFields=true` - disable the sorting of static and instance fields
+- `// @SortMembers:sortByVisibility=false` - don't sort members by its visibility modifier
+
 ### formatAnnotations
 
 Type annotations should be on the same line as the type that they qualify.
diff --git a/testlib/src/main/resources/java/eclipse/SortExample.localDoNotSortFields.clean b/testlib/src/main/resources/java/eclipse/SortExample.localDoNotSortFields.clean
new file mode 100644
index 0000000000..d1000f3b19
--- /dev/null
+++ b/testlib/src/main/resources/java/eclipse/SortExample.localDoNotSortFields.clean
@@ -0,0 +1,50 @@
+package com.diffplug.spotless.extra.glue.jdt;
+
+// @SortMembers:doNotSortFields = true
+public class SortExample {
+	public static final int Z;
+	private static final int A;
+	static final int B = 1;
+	protected static final int C = 2;
+	static {
+		Z = 9;
+		A = 0;
+	}
+	static void s1() {
+	}
+	private static void s2() {
+	}
+	public static void s3() {
+	}
+	protected static void s4() {
+	}
+	final int z = 1;
+	final int a = 1;
+	private final int c = 1;
+	protected final int e = 1;
+	protected final int d = 1;
+	public final int f = 1;
+	public final int b = 1;
+	final boolean _1 = false;
+	SortExample() {
+	}
+	SortExample(int a) {
+	}
+	SortExample(int b, int c) {
+	}
+	class Nested {
+		private static final String C = "C";
+		protected static final String D = "D";
+		public static final String B = "B";
+		void a() {
+		}
+		public void b() {
+		}
+		private void c() {
+		}
+		protected void d() {
+		}
+		void z() {
+		}
+	}
+}
diff --git a/testlib/src/main/resources/java/eclipse/SortExample.localDoNotSortFields.test b/testlib/src/main/resources/java/eclipse/SortExample.localDoNotSortFields.test
new file mode 100644
index 0000000000..9af5447b7f
--- /dev/null
+++ b/testlib/src/main/resources/java/eclipse/SortExample.localDoNotSortFields.test
@@ -0,0 +1,38 @@
+package com.diffplug.spotless.extra.glue.jdt;
+
+// @SortMembers:doNotSortFields = true
+public class SortExample {
+	final int z = 1;
+	final int a = 1;
+	private final int c = 1;
+	protected final int e = 1;
+	protected final int d = 1;
+	public final int f = 1;
+	public final int b = 1;
+	final boolean _1 = false;
+	static void s1() {}
+	private static void s2() {}
+	public static void s3() {}
+	protected static void s4() {}
+	SortExample(int b, int c) {}
+	SortExample(int a) {}
+	SortExample() {}
+	class Nested {
+		void z() {}
+		private static final String C = "C";
+		protected static final String D = "D";
+		public static final String B = "B";
+		void a() {}
+		private void c() {}
+		protected void d() {}
+		public void b() {}
+	}
+	public static final int Z;
+	private static final int A;
+	static final int B  =1;
+	protected static final int C= 2;
+	static {
+		Z = 9;
+		A = 0;
+	}
+}
diff --git a/testlib/src/main/resources/java/eclipse/SortExample.localEnabledFalse.clean b/testlib/src/main/resources/java/eclipse/SortExample.localEnabledFalse.clean
new file mode 100644
index 0000000000..050e6b47e8
--- /dev/null
+++ b/testlib/src/main/resources/java/eclipse/SortExample.localEnabledFalse.clean
@@ -0,0 +1,50 @@
+package com.diffplug.spotless.extra.glue.jdt;
+
+// @SortMembers:enabled = false
+public class SortExample {
+	final int z = 1;
+	final int a = 1;
+	private final int c = 1;
+	protected final int e = 1;
+	protected final int d = 1;
+	public final int f = 1;
+	public final int b = 1;
+	final boolean _1 = false;
+	static void s1() {
+	}
+	private static void s2() {
+	}
+	public static void s3() {
+	}
+	protected static void s4() {
+	}
+	SortExample(int b, int c) {
+	}
+	SortExample(int a) {
+	}
+	SortExample() {
+	}
+	class Nested {
+		void z() {
+		}
+		private static final String C = "C";
+		protected static final String D = "D";
+		public static final String B = "B";
+		void a() {
+		}
+		private void c() {
+		}
+		protected void d() {
+		}
+		public void b() {
+		}
+	}
+	public static final int Z;
+	private static final int A;
+	static final int B = 1;
+	protected static final int C = 2;
+	static {
+		Z = 9;
+		A = 0;
+	}
+}
diff --git a/testlib/src/main/resources/java/eclipse/SortExample.localEnabledFalse.test b/testlib/src/main/resources/java/eclipse/SortExample.localEnabledFalse.test
new file mode 100644
index 0000000000..9c544d3250
--- /dev/null
+++ b/testlib/src/main/resources/java/eclipse/SortExample.localEnabledFalse.test
@@ -0,0 +1,38 @@
+package com.diffplug.spotless.extra.glue.jdt;
+
+// @SortMembers:enabled = false
+public class SortExample {
+	final int z = 1;
+	final int a = 1;
+	private final int c = 1;
+	protected final int e = 1;
+	protected final int d = 1;
+	public final int f = 1;
+	public final int b = 1;
+	final boolean _1 = false;
+	static void s1() {}
+	private static void s2() {}
+	public static void s3() {}
+	protected static void s4() {}
+	SortExample(int b, int c) {}
+	SortExample(int a) {}
+	SortExample() {}
+	class Nested {
+		void z() {}
+		private static final String C = "C";
+		protected static final String D = "D";
+		public static final String B = "B";
+		void a() {}
+		private void c() {}
+		protected void d() {}
+		public void b() {}
+	}
+	public static final int Z;
+	private static final int A;
+	static final int B  =1;
+	protected static final int C= 2;
+	static {
+		Z = 9;
+		A = 0;
+	}
+}
diff --git a/testlib/src/main/resources/java/eclipse/SortExample.localEnabledTrue.clean b/testlib/src/main/resources/java/eclipse/SortExample.localEnabledTrue.clean
new file mode 100644
index 0000000000..565c5ca99e
--- /dev/null
+++ b/testlib/src/main/resources/java/eclipse/SortExample.localEnabledTrue.clean
@@ -0,0 +1,50 @@
+package com.diffplug.spotless.extra.glue.jdt;
+
+// @SortMembers:enabled = true
+public class SortExample {
+	class Nested {
+		private static final String C = "C";
+		protected static final String D = "D";
+		public static final String B = "B";
+		void a() {
+		}
+		public void b() {
+		}
+		private void c() {
+		}
+		protected void d() {
+		}
+		void z() {
+		}
+	}
+	public static final int Z;
+	private static final int A;
+	static final int B = 1;
+	protected static final int C = 2;
+	static {
+		Z = 9;
+		A = 0;
+	}
+	static void s1() {
+	}
+	private static void s2() {
+	}
+	public static void s3() {
+	}
+	protected static void s4() {
+	}
+	final int z = 1;
+	final int a = 1;
+	private final int c = 1;
+	protected final int e = 1;
+	protected final int d = 1;
+	public final int f = 1;
+	public final int b = 1;
+	final boolean _1 = false;
+	SortExample() {
+	}
+	SortExample(int a) {
+	}
+	SortExample(int b, int c) {
+	}
+}
diff --git a/testlib/src/main/resources/java/eclipse/SortExample.localEnabledTrue.test b/testlib/src/main/resources/java/eclipse/SortExample.localEnabledTrue.test
new file mode 100644
index 0000000000..40735750ee
--- /dev/null
+++ b/testlib/src/main/resources/java/eclipse/SortExample.localEnabledTrue.test
@@ -0,0 +1,38 @@
+package com.diffplug.spotless.extra.glue.jdt;
+
+// @SortMembers:enabled = true
+public class SortExample {
+	final int z = 1;
+	final int a = 1;
+	private final int c = 1;
+	protected final int e = 1;
+	protected final int d = 1;
+	public final int f = 1;
+	public final int b = 1;
+	final boolean _1 = false;
+	static void s1() {}
+	private static void s2() {}
+	public static void s3() {}
+	protected static void s4() {}
+	SortExample(int b, int c) {}
+	SortExample(int a) {}
+	SortExample() {}
+	class Nested {
+		void z() {}
+		private static final String C = "C";
+		protected static final String D = "D";
+		public static final String B = "B";
+		void a() {}
+		private void c() {}
+		protected void d() {}
+		public void b() {}
+	}
+	public static final int Z;
+	private static final int A;
+	static final int B  =1;
+	protected static final int C= 2;
+	static {
+		Z = 9;
+		A = 0;
+	}
+}
diff --git a/testlib/src/main/resources/java/eclipse/SortExample.localSortByVisibility.clean b/testlib/src/main/resources/java/eclipse/SortExample.localSortByVisibility.clean
new file mode 100644
index 0000000000..6224e90517
--- /dev/null
+++ b/testlib/src/main/resources/java/eclipse/SortExample.localSortByVisibility.clean
@@ -0,0 +1,50 @@
+package com.diffplug.spotless.extra.glue.jdt;
+
+// @SortMembers:sortByVisibility = false
+public class SortExample {
+	private static final int A;
+	static final int B = 1;
+	protected static final int C = 2;
+	public static final int Z;
+	static {
+		Z = 9;
+		A = 0;
+	}
+	static void s1() {
+	}
+	private static void s2() {
+	}
+	public static void s3() {
+	}
+	protected static void s4() {
+	}
+	final boolean _1 = false;
+	final int a = 1;
+	public final int b = 1;
+	private final int c = 1;
+	protected final int d = 1;
+	protected final int e = 1;
+	public final int f = 1;
+	final int z = 1;
+	SortExample() {
+	}
+	SortExample(int a) {
+	}
+	SortExample(int b, int c) {
+	}
+	class Nested {
+		public static final String B = "B";
+		private static final String C = "C";
+		protected static final String D = "D";
+		void a() {
+		}
+		public void b() {
+		}
+		private void c() {
+		}
+		protected void d() {
+		}
+		void z() {
+		}
+	}
+}
diff --git a/testlib/src/main/resources/java/eclipse/SortExample.localSortByVisibility.test b/testlib/src/main/resources/java/eclipse/SortExample.localSortByVisibility.test
new file mode 100644
index 0000000000..e3cfb77617
--- /dev/null
+++ b/testlib/src/main/resources/java/eclipse/SortExample.localSortByVisibility.test
@@ -0,0 +1,38 @@
+package com.diffplug.spotless.extra.glue.jdt;
+
+// @SortMembers:sortByVisibility = false
+public class SortExample {
+	final int z = 1;
+	final int a = 1;
+	private final int c = 1;
+	protected final int e = 1;
+	protected final int d = 1;
+	public final int f = 1;
+	public final int b = 1;
+	final boolean _1 = false;
+	static void s1() {}
+	private static void s2() {}
+	public static void s3() {}
+	protected static void s4() {}
+	SortExample(int b, int c) {}
+	SortExample(int a) {}
+	SortExample() {}
+	class Nested {
+		void z() {}
+		private static final String C = "C";
+		protected static final String D = "D";
+		public static final String B = "B";
+		void a() {}
+		private void c() {}
+		protected void d() {}
+		public void b() {}
+	}
+	public static final int Z;
+	private static final int A;
+	static final int B  =1;
+	protected static final int C= 2;
+	static {
+		Z = 9;
+		A = 0;
+	}
+}

From 7a4dc775c0f85e2e1c948947af05a3b853cc3e04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Rou=C3=A9l?= <andre.rouel@gmail.com>
Date: Mon, 28 Oct 2024 16:02:42 +0100
Subject: [PATCH 1922/2068] Fix code formatting in
 `EclipseJdtFormatterStepSpecialCaseTest`

---
 .../extra/java/EclipseJdtFormatterStepSpecialCaseTest.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java
index 1cc116be3a..16afa733c2 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java
@@ -86,11 +86,10 @@ void sort_members_local_no_fields() {
 				.testResource("java/eclipse/SortExample.localDoNotSortFields.test", "java/eclipse/SortExample.localDoNotSortFields.clean");
 	}
 
-
 	@Test
 	void sort_members_local_enabled_true() {
 		EclipseJdtFormatterStep.Builder builder = EclipseJdtFormatterStep.createBuilder(TestProvisioner.mavenCentral());
 		StepHarness.forStep(builder.build())
-			.testResource("java/eclipse/SortExample.localEnabledTrue.test", "java/eclipse/SortExample.localEnabledTrue.clean");
+				.testResource("java/eclipse/SortExample.localEnabledTrue.test", "java/eclipse/SortExample.localEnabledTrue.clean");
 	}
 }

From e0306b3a079284cf617622da628dd91e773227c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Rou=C3=A9l?= <andre.rouel@gmail.com>
Date: Mon, 28 Oct 2024 16:22:25 +0100
Subject: [PATCH 1923/2068] Rework step mapping of Eclipse JDT formatter

---
 .../extra/glue/jdt/EclipseJdtSortMembers.java | 10 ++---
 .../extra/java/EclipseJdtFormatterStep.java   | 32 +++++++++-----
 ...clipseJdtFormatterStepSpecialCaseTest.java | 30 +++++++++----
 plugin-gradle/README.md                       | 26 ++++++-----
 .../gradle/spotless/JavaExtension.java        | 35 ++++++++++-----
 plugin-maven/README.md                        | 43 ++++++++++++++++++-
 .../diffplug/spotless/maven/java/Eclipse.java | 36 +++++++++++++++-
 7 files changed, 162 insertions(+), 50 deletions(-)

diff --git a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtSortMembers.java b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtSortMembers.java
index b3eecbf597..05498b1caf 100644
--- a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtSortMembers.java
+++ b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtSortMembers.java
@@ -236,11 +236,11 @@ static class SortProperties {
 		}
 
 		static SortProperties from(Map<String, String> properties) {
-			boolean enabled = Boolean.parseBoolean(properties.getOrDefault("members.order.enabled", "false"));
-			String membersOrder = properties.getOrDefault("members.order", "");
-			boolean doNotSortFields = Boolean.parseBoolean(properties.getOrDefault("members.doNotSortFields", "true"));
-			boolean sortByVisibility = Boolean.parseBoolean(properties.getOrDefault("visibility.order.enabled", "false"));
-			String visibilityOrder = properties.getOrDefault("visibility.order", "");
+			boolean enabled = Boolean.parseBoolean(properties.getOrDefault("sp_cleanup.sort_members", "false"));
+			String membersOrder = properties.getOrDefault("outlinesortoption", "");
+			boolean doNotSortFields = !Boolean.parseBoolean(properties.getOrDefault("sp_cleanup.sort_members_all", "false"));
+			boolean sortByVisibility = Boolean.parseBoolean(properties.getOrDefault("org.eclipse.jdt.ui.enable.visibility.order", "false"));
+			String visibilityOrder = properties.getOrDefault("org.eclipse.jdt.ui.visibility.order", "");
 			return new SortProperties(enabled, membersOrder, doNotSortFields, sortByVisibility, visibilityOrder);
 		}
 	}
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 aeb20d27ee..2e3e190773 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
@@ -74,17 +74,6 @@ protected P2Model model(String version) {
 			return model;
 		}
 
-		public void setMembersOrdering(String order, boolean doNotSortFields) {
-			stepProperties.put("members.order.enabled", "true");
-			stepProperties.put("members.order", order);
-			stepProperties.put("members.doNotSortFields", Boolean.toString(doNotSortFields));
-		}
-
-		public void setVisibilityOrdering(String order) {
-			stepProperties.put("visibility.order.enabled", "true");
-			stepProperties.put("visibility.order", order);
-		}
-
 		@Override
 		public void setVersion(String version) {
 			if (version.endsWith(".0")) {
@@ -94,5 +83,26 @@ public void setVersion(String version) {
 			}
 			super.setVersion(version);
 		}
+
+		public void sortMembersDoNotSortFields(boolean doNotSortFields) {
+			boolean sortAllMembers = !doNotSortFields;
+			stepProperties.put("sp_cleanup.sort_members_all", String.valueOf(sortAllMembers));
+		}
+
+		public void sortMembersEnabled(boolean enabled) {
+			stepProperties.put("sp_cleanup.sort_members", String.valueOf(enabled));
+		}
+
+		public void sortMembersOrder(String order) {
+			stepProperties.put("outlinesortoption", order);
+		}
+
+		public void sortMembersVisibilityOrder(String order) {
+			stepProperties.put("org.eclipse.jdt.ui.visibility.order", order);
+		}
+
+		public void sortMembersVisibilityOrderEnabled(boolean enabled) {
+			stepProperties.put("org.eclipse.jdt.ui.enable.visibility.order", String.valueOf(enabled));
+		}
 	}
 }
diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java
index 16afa733c2..027e562291 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java
@@ -39,8 +39,11 @@ void issue_1638() {
 	@Test
 	void sort_members_global_by_visibility() {
 		EclipseJdtFormatterStep.Builder builder = EclipseJdtFormatterStep.createBuilder(TestProvisioner.mavenCentral());
-		builder.setMembersOrdering("SF,SI,SM,F,I,C,M,T", false);
-		builder.setVisibilityOrdering("B,R,D,V");
+		builder.sortMembersEnabled(true);
+		builder.sortMembersOrder("SF,SI,SM,F,I,C,M,T");
+		builder.sortMembersDoNotSortFields(false);
+		builder.sortMembersVisibilityOrderEnabled(true);
+		builder.sortMembersVisibilityOrder("B,R,D,V");
 		StepHarness.forStep(builder.build())
 				.testResource("java/eclipse/SortExample.test", "java/eclipse/SortExample.sortMembersByVisibility.clean");
 	}
@@ -48,7 +51,9 @@ void sort_members_global_by_visibility() {
 	@Test
 	void sort_members_global_enabled() {
 		EclipseJdtFormatterStep.Builder builder = EclipseJdtFormatterStep.createBuilder(TestProvisioner.mavenCentral());
-		builder.setMembersOrdering("SF,SI,SM,F,I,C,M,T", false);
+		builder.sortMembersEnabled(true);
+		builder.sortMembersOrder("SF,SI,SM,F,I,C,M,T");
+		builder.sortMembersDoNotSortFields(false);
 		StepHarness.forStep(builder.build())
 				.testResource("java/eclipse/SortExample.test", "java/eclipse/SortExample.sortMembers.clean");
 	}
@@ -56,7 +61,9 @@ void sort_members_global_enabled() {
 	@Test
 	void sort_members_global_no_fields() {
 		EclipseJdtFormatterStep.Builder builder = EclipseJdtFormatterStep.createBuilder(TestProvisioner.mavenCentral());
-		builder.setMembersOrdering("SF,SI,SM,F,I,C,M,T", true);
+		builder.sortMembersEnabled(true);
+		builder.sortMembersOrder("SF,SI,SM,F,I,C,M,T");
+		builder.sortMembersDoNotSortFields(true);
 		StepHarness.forStep(builder.build())
 				.testResource("java/eclipse/SortExample.test", "java/eclipse/SortExample.sortMembersNoFields.clean");
 	}
@@ -64,8 +71,11 @@ void sort_members_global_no_fields() {
 	@Test
 	void sort_members_local_by_visibility() {
 		EclipseJdtFormatterStep.Builder builder = EclipseJdtFormatterStep.createBuilder(TestProvisioner.mavenCentral());
-		builder.setMembersOrdering("SF,SI,SM,F,I,C,M,T", false);
-		builder.setVisibilityOrdering("B,R,D,V");
+		builder.sortMembersEnabled(true);
+		builder.sortMembersOrder("SF,SI,SM,F,I,C,M,T");
+		builder.sortMembersDoNotSortFields(false);
+		builder.sortMembersVisibilityOrderEnabled(true);
+		builder.sortMembersVisibilityOrder("B,R,D,V");
 		StepHarness.forStep(builder.build())
 				.testResource("java/eclipse/SortExample.localSortByVisibility.test", "java/eclipse/SortExample.localSortByVisibility.clean");
 	}
@@ -73,7 +83,9 @@ void sort_members_local_by_visibility() {
 	@Test
 	void sort_members_local_enabled_false() {
 		EclipseJdtFormatterStep.Builder builder = EclipseJdtFormatterStep.createBuilder(TestProvisioner.mavenCentral());
-		builder.setMembersOrdering("SF,SI,SM,F,I,C,M,T", false);
+		builder.sortMembersEnabled(true);
+		builder.sortMembersOrder("SF,SI,SM,F,I,C,M,T");
+		builder.sortMembersDoNotSortFields(false);
 		StepHarness.forStep(builder.build())
 				.testResource("java/eclipse/SortExample.localEnabledFalse.test", "java/eclipse/SortExample.localEnabledFalse.clean");
 	}
@@ -81,7 +93,9 @@ void sort_members_local_enabled_false() {
 	@Test
 	void sort_members_local_no_fields() {
 		EclipseJdtFormatterStep.Builder builder = EclipseJdtFormatterStep.createBuilder(TestProvisioner.mavenCentral());
-		builder.setMembersOrdering("SF,SI,SM,F,I,C,M,T", false);
+		builder.sortMembersEnabled(true);
+		builder.sortMembersOrder("SF,SI,SM,F,I,C,M,T");
+		builder.sortMembersDoNotSortFields(false);
 		StepHarness.forStep(builder.build())
 				.testResource("java/eclipse/SortExample.localDoNotSortFields.test", "java/eclipse/SortExample.localDoNotSortFields.clean");
 	}
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index ef9db402fb..2bfc70ecba 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -275,7 +275,7 @@ control system). It is turned off by default, but you might want to consider ena
 for a project.
 
 The format to specify the sort order follows the `outlinesortoption` and `org.eclipse.jdt.ui.visibility.order`
-properties that can be found in the workspace folder of your Eclipse IDE. Look up the
+properties that can be found in the workspace folder of your Eclipse IDE. You can look at the
 file `.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs` in your workspace directory.
 
 ###### Define Sort Members settings on project level
@@ -283,20 +283,24 @@ file `.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs` in y
 ```gradle
 spotless {
   java {
-    // specify the sort order of the member categories
-    // SF,SI,SM,F,I,C,M,T = Static Fields, Static Initializers, Static Methods, Fields, Initializers, Constructors, Methods, (Nested) Types
-    val memberCategoryOrder = "SF,SI,SM,F,I,C,M,T"
-    val doNotSortFields = true
-    eclipse().sortMembers(memberCategoryOrder, doNotSortFields)
-    // optional: specify ordering of members of the same category by the visibility within the category
-    // B,R,D,V = Public, Protected, Package, Private
-    val visibilityOrder = "B,R,D,V"
-    eclipse().sortMembers(memberCategoryOrder, doNotSortFields, visibilityOrder)
+    eclipse()
+      // Optional: Enable the Sort Members feature globally. (default: false)
+      .sortMembersEnabled(true)
+      // Optional: Specify the sort order of the member categories. (default: T,SF,SI,SM,F,I,C,M)
+      //   SF,SI,SM,F,I,C,M,T = Static Fields, Static Initializers, Static Methods, Fields, Initializers, Constructors, Methods, (Nested) Types
+      .sortMembersOrder("SF,SI,SM,F,I,C,M,T")
+      // Optional: Enable the reordering of fields, enum constants, and initializers. (default: true)
+      .sortMembersDoNotSortFields(false)
+      // Optional: Enable reordering of members of the same category by the visibility within the category. (default: false)
+      .sortMembersVisibilityOrderEnabled(true)
+      // Optional: Specify the ordering of members of the same category by the visibility within the category. (default: B,V,R,D)
+      //   B,R,D,V = Public, Protected, Package, Private
+      .sortMembersVisibilityOrder("B,R,D,V")
 ```
 
 ###### Overwrite Sort Members settings on file level
 
-You can enable/disable the sort properties on file level by adding the following comments:
+You can enable/disable the globally defined sort properties on file level by adding the following comments:
 - `// @SortMembers:enabled=false` - disable the Sort Members feature for this file
 - `// @SortMembers:doNotSortFields=true` - disable the sorting of static and instance fields
 - `// @SortMembers:sortByVisibility=false` - don't sort members by its visibility modifier
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
index f098486fd6..c7495ec396 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
@@ -305,21 +305,34 @@ public EclipseConfig configFile(Object... configFiles) {
 			return this;
 		}
 
-		public EclipseConfig sortMembers(String memberCategoryOrder, boolean doNotSortFields) {
-			requireElementsNonNull(memberCategoryOrder);
-			builder.setMembersOrdering(memberCategoryOrder, doNotSortFields);
+		public EclipseConfig sortMembersDoNotSortFields(boolean doNotSortFields) {
+			builder.sortMembersDoNotSortFields(doNotSortFields);
 			replaceStep(builder.build());
 			return this;
 		}
 
-		public EclipseConfig sortMembers(
-				String memberCategoryOrder,
-				boolean doNotSortFields,
-				String visibilityOrder) {
-			requireElementsNonNull(memberCategoryOrder);
-			requireElementsNonNull(visibilityOrder);
-			builder.setMembersOrdering(memberCategoryOrder, doNotSortFields);
-			builder.setVisibilityOrdering(visibilityOrder);
+		public EclipseConfig sortMembersEnabled(boolean enabled) {
+			builder.sortMembersEnabled(enabled);
+			replaceStep(builder.build());
+			return this;
+		}
+
+		public EclipseConfig sortMembersOrder(String order) {
+			requireElementsNonNull(order);
+			builder.sortMembersOrder(order);
+			replaceStep(builder.build());
+			return this;
+		}
+
+		public EclipseConfig sortMembersVisibilityOrder(String order) {
+			requireElementsNonNull(order);
+			builder.sortMembersVisibilityOrder(order);
+			replaceStep(builder.build());
+			return this;
+		}
+
+		public EclipseConfig sortMembersVisibilityOrderEnabled(boolean enabled) {
+			builder.sortMembersVisibilityOrderEnabled(enabled);
 			replaceStep(builder.build());
 			return this;
 		}
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index a4787f0c45..f5cba26993 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -261,11 +261,50 @@ any other maven phase (i.e. compile) then it can be configured as below;
 
 ```xml
 <eclipse>
-  <version>4.26</version>                     <!-- optional version of Eclipse Formatter -->
-  <file>${project.basedir}/eclipse-formatter.xml</file> <!-- optional -->
+  <!-- Optional: Specify the Eclipse JDT version to use. -->
+  <version>4.26</version>
+  <!-- Optional: Specify a file which contains all formatting options. -->
+  <file>${project.basedir}/eclipse-formatter.xml</file>
 </eclipse>
 ```
 
+#### Sort Members
+
+Not only can you format your code with Eclipse JDT, but you can also sort the members as you know it from Eclipse IDE.
+This ensures that the methods are always in sorted order (and thus reduces the likelihood of collisions in a version
+control system). It is turned off by default, but you might want to consider enabling it when setting coding standards
+for a project.
+
+The format to specify the sort order follows the `outlinesortoption` and `org.eclipse.jdt.ui.visibility.order`
+properties that can be found in the workspace folder of your Eclipse IDE. You can look at the
+file `.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs` in your workspace directory.
+
+###### Define Sort Members settings on project level
+
+```xml
+<eclipse>
+  <!-- Optional: Enable the Sort Members feature globally. (default: false) -->
+  <sortMembersEnabled>true</sortMembersEnabled>
+  <!-- Optional: Specify the sort order of the member categories. (default: T,SF,SI,SM,F,I,C,M)
+       SF,SI,SM,F,I,C,M,T = Static Fields, Static Initializers, Static Methods, Fields, Initializers, Constructors, Methods, (Nested) Types -->
+  <sortMembersOrder>SF,SI,SM,F,I,C,M,T</sortMembersOrder>
+  <!-- Optional: Enable the reordering of fields, enum constants, and initializers. (default: true) -->
+  <sortMembersDoNotSortFields>false</sortMembersDoNotSortFields>
+  <!-- Optional: Enable reordering of members of the same category by the visibility within the category. (default: false) -->
+  <sortMembersVisibilityOrderEnabled>true</sortMembersVisibilityOrderEnabled>
+  <!-- Optional: Specify the ordering of members of the same category by the visibility within the category. (default: B,V,R,D)
+       B,R,D,V = Public, Protected, Package, Private -->
+  <sortMembersVisibilityOrder>B,R,D,V</sortMembersVisibilityOrder>
+</eclipse>
+```
+
+###### Overwrite Sort Members settings on file level
+
+You can enable/disable the globally defined sort properties on file level by adding the following comments:
+- `// @SortMembers:enabled=false` - disable the Sort Members feature for this file
+- `// @SortMembers:doNotSortFields=true` - disable the sorting of static and instance fields
+- `// @SortMembers:sortByVisibility=false` - don't sort members by its visibility modifier
+
 ### formatAnnotations
 
 Type annotations should be on the same line as the type that they qualify.
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Eclipse.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Eclipse.java
index 9e3b41dbc0..5e795ac93f 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Eclipse.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Eclipse.java
@@ -24,7 +24,6 @@
 import org.eclipse.aether.RepositorySystemSession;
 
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.extra.EquoBasedStepBuilder;
 import com.diffplug.spotless.extra.P2Mirror;
 import com.diffplug.spotless.extra.java.EclipseJdtFormatterStep;
 import com.diffplug.spotless.maven.FormatterStepConfig;
@@ -41,11 +40,26 @@ public class Eclipse implements FormatterStepFactory {
 	@Parameter
 	private List<P2Mirror> p2Mirrors = new ArrayList<>();
 
+	@Parameter
+	private Boolean sortMembersDoNotSortFields = true;
+
+	@Parameter
+	private Boolean sortMembersEnabled = false;
+
+	@Parameter
+	private String sortMembersOrder;
+
+	@Parameter
+	private String sortMembersVisibilityOrder;
+
+	@Parameter
+	private Boolean sortMembersVisibilityOrderEnabled = false;
+
 	private File cacheDirectory;
 
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
-		EquoBasedStepBuilder eclipseConfig = EclipseJdtFormatterStep.createBuilder(stepConfig.getProvisioner());
+		EclipseJdtFormatterStep.Builder eclipseConfig = EclipseJdtFormatterStep.createBuilder(stepConfig.getProvisioner());
 		eclipseConfig.setVersion(version == null ? EclipseJdtFormatterStep.defaultVersion() : version);
 		if (null != file) {
 			File settingsFile = stepConfig.getFileLocator().locateFile(file);
@@ -55,6 +69,24 @@ public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 		if (null != cacheDirectory) {
 			eclipseConfig.setCacheDirectory(cacheDirectory);
 		}
+		if (null != sortMembersEnabled) {
+			eclipseConfig.sortMembersEnabled(sortMembersEnabled);
+		}
+		if (null != sortMembersOrder) {
+			eclipseConfig.sortMembersOrder(sortMembersOrder);
+		}
+		if (null != sortMembersDoNotSortFields) {
+			eclipseConfig.sortMembersDoNotSortFields(sortMembersDoNotSortFields);
+		}
+		if (null != sortMembersVisibilityOrder) {
+			eclipseConfig.sortMembersVisibilityOrder(sortMembersVisibilityOrder);
+		}
+		if (null != sortMembersVisibilityOrderEnabled) {
+			eclipseConfig.sortMembersVisibilityOrderEnabled(sortMembersVisibilityOrderEnabled);
+		}
+		if (null != cacheDirectory) {
+			eclipseConfig.setCacheDirectory(cacheDirectory);
+		}
 		return eclipseConfig.build();
 	}
 

From 482985f9717e4c842729cd12293695e23057ffde Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 1 Nov 2024 10:30:36 +0800
Subject: [PATCH 1924/2068] Update dependency com.facebook:ktfmt to v0.53
 (#2320)

* Update dependency com.facebook:ktfmt to v0.53

* Unify ktfmt versions

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Goooler <wangzongler@gmail.com>
---
 CHANGES.md                                                    | 1 +
 lib/build.gradle                                              | 2 +-
 lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java | 2 +-
 plugin-gradle/CHANGES.md                                      | 1 +
 plugin-maven/CHANGES.md                                       | 1 +
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 9e4d6a5de4..292c692bb2 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changed
 * Bump default `ktlint` version to latest `1.3.0` -> `1.4.0`. ([#2314](https://github.com/diffplug/spotless/pull/2314))
+* Bump default `ktfmt` version to latest `0.52` -> `0.53`. ([#2320](https://github.com/diffplug/spotless/pull/2320)
 
 ## [3.0.0.BETA4] - 2024-10-24
 ### Added
diff --git a/lib/build.gradle b/lib/build.gradle
index 563e964e5f..f7471ce184 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -101,7 +101,7 @@ dependencies {
 	jacksonCompileOnly "com.fasterxml.jackson.core:jackson-databind:$VER_JACKSON"
 	jacksonCompileOnly "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$VER_JACKSON"
 	// ktfmt
-	ktfmtCompileOnly "com.facebook:ktfmt:0.52"
+	ktfmtCompileOnly "com.facebook:ktfmt:0.53"
 	ktfmtCompileOnly("com.google.googlejavaformat:google-java-format") {
 		version {
 			strictly '1.7' // for JDK 8 compatibility
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
index fcb4397c3b..2120dc144a 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
@@ -39,7 +39,7 @@
  */
 public class KtfmtStep implements Serializable {
 	private static final long serialVersionUID = 1L;
-	private static final String DEFAULT_VERSION = "0.52";
+	private static final String DEFAULT_VERSION = "0.53";
 	private static final String NAME = "ktfmt";
 	private static final String MAVEN_COORDINATE = "com.facebook:ktfmt:";
 
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index f175fc25cf..5f19f9b0f0 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changed
 * Bump default `ktlint` version to latest `1.3.0` -> `1.4.0`. ([#2314](https://github.com/diffplug/spotless/pull/2314))
+* Bump default `ktfmt` version to latest `0.52` -> `0.53`. ([#2320](https://github.com/diffplug/spotless/pull/2320)
 
 ## [7.0.0.BETA4] - 2024-10-24
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index c441c25602..b06b162cb6 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changed
 * Bump default `ktlint` version to latest `1.3.0` -> `1.4.0`. ([#2314](https://github.com/diffplug/spotless/pull/2314))
+* Bump default `ktfmt` version to latest `0.52` -> `0.53`. ([#2320](https://github.com/diffplug/spotless/pull/2320)
 
 ## [2.44.0.BETA4] - 2024-10-24
 ### Added

From 2e414156e958e5b9eb15b0e9fea28b030f82925b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 1 Nov 2024 02:42:19 +0000
Subject: [PATCH 1925/2068] Update jackson monorepo to v2.18.1 (#2319)

* Update jackson monorepo to v2.18.1

* Unify jackson versions

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Goooler <wangzongler@gmail.com>
---
 CHANGES.md                                                      | 1 +
 lib/build.gradle                                                | 2 +-
 .../main/java/com/diffplug/spotless/json/JacksonJsonStep.java   | 2 +-
 plugin-gradle/CHANGES.md                                        | 1 +
 plugin-maven/CHANGES.md                                         | 1 +
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 292c692bb2..ea71d1762d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changed
 * Bump default `ktlint` version to latest `1.3.0` -> `1.4.0`. ([#2314](https://github.com/diffplug/spotless/pull/2314))
+* Bump default `jackson` version to latest `2.18.0` -> `2.18.1`. ([#2319](https://github.com/diffplug/spotless/pull/2319))
 * Bump default `ktfmt` version to latest `0.52` -> `0.53`. ([#2320](https://github.com/diffplug/spotless/pull/2320)
 
 ## [3.0.0.BETA4] - 2024-10-24
diff --git a/lib/build.gradle b/lib/build.gradle
index f7471ce184..f5802893b0 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -97,7 +97,7 @@ dependencies {
 	// gson
 	gsonCompileOnly 'com.google.code.gson:gson:2.11.0'
 	// jackson
-	String VER_JACKSON='2.18.0'
+	String VER_JACKSON='2.18.1'
 	jacksonCompileOnly "com.fasterxml.jackson.core:jackson-databind:$VER_JACKSON"
 	jacksonCompileOnly "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$VER_JACKSON"
 	// ktfmt
diff --git a/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java b/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java
index d6e50bf4c4..a4d264b4f0 100644
--- a/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java
@@ -32,7 +32,7 @@
 public class JacksonJsonStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String MAVEN_COORDINATE = "com.fasterxml.jackson.core:jackson-databind:";
-	private static final String DEFAULT_VERSION = "2.18.0";
+	private static final String DEFAULT_VERSION = "2.18.1";
 	public static final String NAME = "jacksonJson";
 
 	private final JarState.Promised jarState;
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 5f19f9b0f0..b028d3736b 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changed
 * Bump default `ktlint` version to latest `1.3.0` -> `1.4.0`. ([#2314](https://github.com/diffplug/spotless/pull/2314))
+* Bump default `jackson` version to latest `2.18.0` -> `2.18.1`. ([#2319](https://github.com/diffplug/spotless/pull/2319))
 * Bump default `ktfmt` version to latest `0.52` -> `0.53`. ([#2320](https://github.com/diffplug/spotless/pull/2320)
 
 ## [7.0.0.BETA4] - 2024-10-24
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index b06b162cb6..c4e48e5d51 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changed
 * Bump default `ktlint` version to latest `1.3.0` -> `1.4.0`. ([#2314](https://github.com/diffplug/spotless/pull/2314))
+* Bump default `jackson` version to latest `2.18.0` -> `2.18.1`. ([#2319](https://github.com/diffplug/spotless/pull/2319))
 * Bump default `ktfmt` version to latest `0.52` -> `0.53`. ([#2320](https://github.com/diffplug/spotless/pull/2320)
 
 ## [2.44.0.BETA4] - 2024-10-24

From 1c6687ad20370fe7f697162f44362ac419ebcf1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jens=20Teglhus=20M=C3=B8ller?= <jtm@mostlyharmless.dk>
Date: Fri, 1 Nov 2024 10:57:00 +0100
Subject: [PATCH 1926/2068] fix: copy-pasto in YamlExtension javadoc link

---
 plugin-gradle/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 90d7d6ef56..d86fd95e29 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -1043,7 +1043,7 @@ spotless {
 
 ## YAML
 
-- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
+- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/YamlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
 
 ```gradle
 spotless {

From 1769779297e73b65706027d82d9c9c2a5dd9c827 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 3 Nov 2024 09:14:45 +0800
Subject: [PATCH 1927/2068] Update plugin com.github.spotbugs to v6.0.26
 (#2324)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 329cf11c39..c66d12f0fc 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,7 +12,7 @@ plugins {
 	// https://github.com/gradle-nexus/publish-plugin/releases
 	id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
-	id 'com.github.spotbugs' version '6.0.25' apply false
+	id 'com.github.spotbugs' version '6.0.26' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
 	id 'com.diffplug.spotless-changelog' version '3.1.2' apply false
 	// https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md

From c9dbccb17dfad0b886d19b858df31f1259f89658 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 3 Nov 2024 13:19:58 +0000
Subject: [PATCH 1928/2068] Update mikepenz/action-junit-report action to v5

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ab3964d61c..f7cbb3377c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -92,7 +92,7 @@ jobs:
         if: matrix.kind == 'shfmt'
         run: ./gradlew testShfmt
       - name: junit result
-        uses: mikepenz/action-junit-report@v4
+        uses: mikepenz/action-junit-report@v5
         if: always() # always run even if the previous step fails
         with:
           check_name: JUnit ${{ matrix.kind }} ${{ matrix.jre }} ${{ matrix.os }}

From f1a974958a3e30d4ecd3cd7472ed67eda6dd626f Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 3 Nov 2024 10:28:02 -0800
Subject: [PATCH 1929/2068] Remove `h6` headers in the docs.

---
 plugin-gradle/README.md | 4 ----
 plugin-maven/README.md  | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 2bfc70ecba..30dccb9fad 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -278,8 +278,6 @@ The format to specify the sort order follows the `outlinesortoption` and `org.ec
 properties that can be found in the workspace folder of your Eclipse IDE. You can look at the
 file `.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs` in your workspace directory.
 
-###### Define Sort Members settings on project level
-
 ```gradle
 spotless {
   java {
@@ -298,8 +296,6 @@ spotless {
       .sortMembersVisibilityOrder("B,R,D,V")
 ```
 
-###### Overwrite Sort Members settings on file level
-
 You can enable/disable the globally defined sort properties on file level by adding the following comments:
 - `// @SortMembers:enabled=false` - disable the Sort Members feature for this file
 - `// @SortMembers:doNotSortFields=true` - disable the sorting of static and instance fields
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index f5cba26993..3f27aa1085 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -279,8 +279,6 @@ The format to specify the sort order follows the `outlinesortoption` and `org.ec
 properties that can be found in the workspace folder of your Eclipse IDE. You can look at the
 file `.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs` in your workspace directory.
 
-###### Define Sort Members settings on project level
-
 ```xml
 <eclipse>
   <!-- Optional: Enable the Sort Members feature globally. (default: false) -->
@@ -298,8 +296,6 @@ file `.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs` in y
 </eclipse>
 ```
 
-###### Overwrite Sort Members settings on file level
-
 You can enable/disable the globally defined sort properties on file level by adding the following comments:
 - `// @SortMembers:enabled=false` - disable the Sort Members feature for this file
 - `// @SortMembers:doNotSortFields=true` - disable the sorting of static and instance fields

From ffecafb7c8db0088c631f80b5c953341ea04c2b9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 4 Nov 2024 01:49:21 +0000
Subject: [PATCH 1930/2068] fix(deps): update dependency
 org.codehaus.plexus:plexus-resources to v1.3.0

---
 plugin-maven/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-maven/build.gradle b/plugin-maven/build.gradle
index 9f7a04703b..edef810a62 100644
--- a/plugin-maven/build.gradle
+++ b/plugin-maven/build.gradle
@@ -28,7 +28,7 @@ tasks.withType(GenerateHelpMojoSourcesTask).configureEach {
 
 String VER_MAVEN_API = '3.0'
 String VER_ECLIPSE_AETHER = '1.1.0'
-String VER_PLEXUS_RESOURCES = '1.2.0'
+String VER_PLEXUS_RESOURCES = '1.3.0'
 dependencies {
 	implementation projects.lib
 	implementation projects.libExtra

From 3cbfbd23f6228f11067ce0f9d40cfe941bc94e9b Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 3 Nov 2024 17:53:16 -0800
Subject: [PATCH 1931/2068] Make sure that the `removeUnusedImports` step isn't
 named `google-java-format`.

---
 .../com/diffplug/spotless/java/GoogleJavaFormatStep.java    | 6 +++---
 .../com/diffplug/spotless/java/RemoveUnusedImportsStep.java | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
index cdf44a2b28..703bf16d6b 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
@@ -87,14 +87,14 @@ public static FormatterStep create(String groupArtifact, String version, String
 
 	/** Creates a step which formats everything - groupArtifact, code, import order, and unused imports - and optionally reflows long strings. */
 	public static FormatterStep create(String groupArtifact, String version, String style, Provisioner provisioner, boolean reflowLongStrings, boolean reorderImports, boolean formatJavadoc) {
-		return createInternally(groupArtifact, version, style, provisioner, reflowLongStrings, reorderImports, formatJavadoc, false);
+		return createInternally(NAME, groupArtifact, version, style, provisioner, reflowLongStrings, reorderImports, formatJavadoc, false);
 	}
 
 	static FormatterStep createRemoveUnusedImportsOnly(Provisioner provisioner) {
-		return createInternally(MAVEN_COORDINATE, defaultVersion(), defaultStyle(), provisioner, defaultReflowLongStrings(), defaultReorderImports(), defaultFormatJavadoc(), true);
+		return createInternally(RemoveUnusedImportsStep.NAME, MAVEN_COORDINATE, defaultVersion(), defaultStyle(), provisioner, defaultReflowLongStrings(), defaultReorderImports(), defaultFormatJavadoc(), true);
 	}
 
-	private static FormatterStep createInternally(String groupArtifact, String version, String style, Provisioner provisioner, boolean reflowLongStrings, boolean reorderImports, boolean formatJavadoc, boolean removeImports) {
+	private static FormatterStep createInternally(String name, String groupArtifact, String version, String style, Provisioner provisioner, boolean reflowLongStrings, boolean reorderImports, boolean formatJavadoc, boolean removeImports) {
 		Objects.requireNonNull(groupArtifact, "groupArtifact");
 		if (groupArtifact.chars().filter(ch -> ch == ':').count() != 1) {
 			throw new IllegalArgumentException("groupArtifact must be in the form 'groupId:artifactId'");
diff --git a/lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java b/lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java
index 65a5b3216a..dd2e3fe038 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java
@@ -25,7 +25,7 @@
 /** Uses google-java-format or cleanthat.UnnecessaryImport, but only to remove unused imports. */
 public class RemoveUnusedImportsStep implements Serializable {
 	private static final long serialVersionUID = 1L;
-	private static final String NAME = "removeUnusedImports";
+	static final String NAME = "removeUnusedImports";
 
 	static final String GJF = "google-java-format";
 	static final String CLEANTHAT = "cleanthat-javaparser-unnecessaryimport";

From 210b8663d40ccd42ba3fea3edbea990bd11f4a13 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 4 Nov 2024 10:09:19 -0800
Subject: [PATCH 1932/2068] Make sure that the `removeUnusedImports` step isn't
 named `cleanthat`.

---
 .../spotless/java/CleanthatJavaStep.java       | 18 +++++++++++++++---
 .../spotless/java/RemoveUnusedImportsStep.java |  2 +-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
index 9584830988..2762bbeaf9 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
@@ -74,7 +74,7 @@ public static FormatterStep create(Provisioner provisioner) {
 
 	/** Creates a step that applies default CleanThat mutators. */
 	public static FormatterStep create(String version, Provisioner provisioner) {
-		return create(MAVEN_COORDINATE, version, defaultSourceJdk(), defaultMutators(), defaultExcludedMutators(), defaultIncludeDraft(), provisioner);
+		return createWithStepName(NAME, MAVEN_COORDINATE, version, defaultSourceJdk(), defaultMutators(), defaultExcludedMutators(), defaultIncludeDraft(), provisioner);
 	}
 
 	public static String defaultSourceJdk() {
@@ -101,7 +101,8 @@ public static boolean defaultIncludeDraft() {
 	}
 
 	/** Creates a step that applies selected CleanThat mutators. */
-	public static FormatterStep create(String groupArtifact,
+	static FormatterStep createWithStepName(String stepName,
+			String groupArtifact,
 			String version,
 			String sourceJdkVersion,
 			List<String> included,
@@ -114,12 +115,23 @@ public static FormatterStep create(String groupArtifact,
 		}
 		Objects.requireNonNull(version, "version");
 		Objects.requireNonNull(provisioner, "provisioner");
-		return FormatterStep.create(NAME,
+		return FormatterStep.create(stepName,
 				new CleanthatJavaStep(JarState.promise(() -> JarState.from(groupArtifact + ":" + version, provisioner)), version, sourceJdkVersion, included, excluded, includeDraft),
 				CleanthatJavaStep::equalityState,
 				State::createFormat);
 	}
 
+	/** Creates a step that applies selected CleanThat mutators. */
+	public static FormatterStep create(String groupArtifact,
+			String version,
+			String sourceJdkVersion,
+			List<String> included,
+			List<String> excluded,
+			boolean includeDraft,
+			Provisioner provisioner) {
+		return createWithStepName(NAME, groupArtifact, version, sourceJdkVersion, included, excluded, includeDraft, provisioner);
+	}
+
 	/** Get default formatter version */
 	public static String defaultVersion() {
 		return Objects.requireNonNull(JVM_SUPPORT.getRecommendedFormatterVersion());
diff --git a/lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java b/lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java
index dd2e3fe038..753678a86b 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java
@@ -51,7 +51,7 @@ public static FormatterStep create(String unusedImportRemover, Provisioner provi
 		case GJF:
 			return GoogleJavaFormatStep.createRemoveUnusedImportsOnly(provisioner);
 		case CLEANTHAT:
-			return CleanthatJavaStep.create(CleanthatJavaStep.defaultGroupArtifact(), CleanthatJavaStep.defaultVersion(), "99.9", List.of(CLEANTHAT_MUTATOR), List.of(), false, provisioner);
+			return CleanthatJavaStep.createWithStepName(NAME, CleanthatJavaStep.defaultGroupArtifact(), CleanthatJavaStep.defaultVersion(), "99.9", List.of(CLEANTHAT_MUTATOR), List.of(), false, provisioner);
 		default:
 			throw new IllegalArgumentException("Invalid unusedImportRemover: " + unusedImportRemover);
 		}

From ad4501e7574269cd70a7b4e6c667b2ced0431452 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 4 Nov 2024 10:46:36 -0800
Subject: [PATCH 1933/2068] Update changelogs.

---
 CHANGES.md               | 2 ++
 plugin-gradle/CHANGES.md | 2 ++
 plugin-maven/CHANGES.md  | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 57d800170e..0fe2802748 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,6 +15,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Add _Sort Members_ feature based on [Eclipse JDT](plugin-gradle/README.md#eclipse-jdt) implementation. ([#2312](https://github.com/diffplug/spotless/pull/2312))
 * Bump default `jackson` version to latest `2.18.0` -> `2.18.1`. ([#2319](https://github.com/diffplug/spotless/pull/2319))
 * Bump default `ktfmt` version to latest `0.52` -> `0.53`. ([#2320](https://github.com/diffplug/spotless/pull/2320)
+### Fixed
+* You can now use `removeUnusedImports` and `googleJavaFormat` at the same time again. (fixes [#2159](https://github.com/diffplug/spotless/issues/2159))
 
 ## [3.0.0.BETA4] - 2024-10-24
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index fd90e8da82..390f387597 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -7,6 +7,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktlint` version to latest `1.3.0` -> `1.4.0`. ([#2314](https://github.com/diffplug/spotless/pull/2314))
 * Bump default `jackson` version to latest `2.18.0` -> `2.18.1`. ([#2319](https://github.com/diffplug/spotless/pull/2319))
 * Bump default `ktfmt` version to latest `0.52` -> `0.53`. ([#2320](https://github.com/diffplug/spotless/pull/2320)
+### Fixed
+* You can now use `removeUnusedImports` and `googleJavaFormat` at the same time again. (fixes [#2159](https://github.com/diffplug/spotless/issues/2159))
 
 ## [7.0.0.BETA4] - 2024-10-24
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index c4e48e5d51..9c33574f5a 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -7,6 +7,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktlint` version to latest `1.3.0` -> `1.4.0`. ([#2314](https://github.com/diffplug/spotless/pull/2314))
 * Bump default `jackson` version to latest `2.18.0` -> `2.18.1`. ([#2319](https://github.com/diffplug/spotless/pull/2319))
 * Bump default `ktfmt` version to latest `0.52` -> `0.53`. ([#2320](https://github.com/diffplug/spotless/pull/2320)
+### Fixed
+* You can now use `removeUnusedImports` and `googleJavaFormat` at the same time again. (fixes [#2159](https://github.com/diffplug/spotless/issues/2159))
 
 ## [2.44.0.BETA4] - 2024-10-24
 ### Added

From 3c8916568e228dc28b40eff2660501e29b37d645 Mon Sep 17 00:00:00 2001
From: Jesper Skov <jskov@mada.dk>
Date: Sun, 10 Nov 2024 11:57:47 +0100
Subject: [PATCH 1934/2068] Add (jakarta validation) Valid as a type annotation

---
 .../java/com/diffplug/spotless/java/FormatAnnotationsStep.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java b/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java
index c418ab8f36..87a390b48e 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java
@@ -381,6 +381,7 @@ public final class FormatAnnotationsStep implements Serializable {
 					"UpperBoundBottom",
 					"UpperBoundLiteral",
 					"UpperBoundUnknown",
+					"Valid",
 					"ValueTypeAnno",
 					"VariableNameDefaultBottom",
 					"VariableNameDefaultMiddle",

From bbbd960f3229468521ebf4a72144639c2179d715 Mon Sep 17 00:00:00 2001
From: Jesper Skov <jskov@mada.dk>
Date: Sun, 10 Nov 2024 12:29:06 +0100
Subject: [PATCH 1935/2068] Add CHANGES notes

---
 CHANGES.md               | 3 ++-
 plugin-gradle/CHANGES.md | 3 ++-
 plugin-maven/CHANGES.md  | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 0fe2802748..08bf30378e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -14,9 +14,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktlint` version to latest `1.3.0` -> `1.4.0`. ([#2314](https://github.com/diffplug/spotless/pull/2314))
 * Add _Sort Members_ feature based on [Eclipse JDT](plugin-gradle/README.md#eclipse-jdt) implementation. ([#2312](https://github.com/diffplug/spotless/pull/2312))
 * Bump default `jackson` version to latest `2.18.0` -> `2.18.1`. ([#2319](https://github.com/diffplug/spotless/pull/2319))
-* Bump default `ktfmt` version to latest `0.52` -> `0.53`. ([#2320](https://github.com/diffplug/spotless/pull/2320)
+* Bump default `ktfmt` version to latest `0.52` -> `0.53`. ([#2320](https://github.com/diffplug/spotless/pull/2320))
 ### Fixed
 * You can now use `removeUnusedImports` and `googleJavaFormat` at the same time again. (fixes [#2159](https://github.com/diffplug/spotless/issues/2159))
+* The default list of type annotations used by `formatAnnotations` now includes `Valid` (fixes [#2334]https://github.com/diffplug/spotless/issues/2334)
 
 ## [3.0.0.BETA4] - 2024-10-24
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 390f387597..29c2d53397 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -6,9 +6,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changed
 * Bump default `ktlint` version to latest `1.3.0` -> `1.4.0`. ([#2314](https://github.com/diffplug/spotless/pull/2314))
 * Bump default `jackson` version to latest `2.18.0` -> `2.18.1`. ([#2319](https://github.com/diffplug/spotless/pull/2319))
-* Bump default `ktfmt` version to latest `0.52` -> `0.53`. ([#2320](https://github.com/diffplug/spotless/pull/2320)
+* Bump default `ktfmt` version to latest `0.52` -> `0.53`. ([#2320](https://github.com/diffplug/spotless/pull/2320))
 ### Fixed
 * You can now use `removeUnusedImports` and `googleJavaFormat` at the same time again. (fixes [#2159](https://github.com/diffplug/spotless/issues/2159))
+* The default list of type annotations used by `formatAnnotations` now includes `Valid` (fixes [#2334]https://github.com/diffplug/spotless/issues/2334))
 
 ## [7.0.0.BETA4] - 2024-10-24
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 9c33574f5a..d734a7dbcb 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -6,9 +6,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changed
 * Bump default `ktlint` version to latest `1.3.0` -> `1.4.0`. ([#2314](https://github.com/diffplug/spotless/pull/2314))
 * Bump default `jackson` version to latest `2.18.0` -> `2.18.1`. ([#2319](https://github.com/diffplug/spotless/pull/2319))
-* Bump default `ktfmt` version to latest `0.52` -> `0.53`. ([#2320](https://github.com/diffplug/spotless/pull/2320)
+* Bump default `ktfmt` version to latest `0.52` -> `0.53`. ([#2320](https://github.com/diffplug/spotless/pull/2320))
 ### Fixed
 * You can now use `removeUnusedImports` and `googleJavaFormat` at the same time again. (fixes [#2159](https://github.com/diffplug/spotless/issues/2159))
+* The default list of type annotations used by `formatAnnotations` now includes `Valid` (fixes [#2334]https://github.com/diffplug/spotless/issues/2334)
 
 ## [2.44.0.BETA4] - 2024-10-24
 ### Added

From 3adf5fd0970d6feb00b33d13f434a621aa15c4d3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 11 Nov 2024 17:45:03 +0000
Subject: [PATCH 1936/2068] chore(deps): update dependency gradle to v8.11

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index df97d72b8b..94113f200e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

From daff7b1f4bfe53ebb46e6ebd4b3ecf1722a461e0 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 13 Nov 2024 12:43:06 +0000
Subject: [PATCH 1937/2068] chore(deps): update plugin com.gradle.develocity to
 v3.18.2

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index c66d12f0fc..1622334690 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -20,7 +20,7 @@ plugins {
 	// https://github.com/davidburstrom/version-compatibility-gradle-plugin/tags
 	id 'io.github.davidburstrom.version-compatibility' version '0.5.0' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.develocity
-	id 'com.gradle.develocity' version '3.18.1'
+	id 'com.gradle.develocity' version '3.18.2'
 	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
 	id 'dev.equo.ide' version '1.7.7' apply false
 }

From 4c3d0c759d95932560b8ce6dfb0db3a8e745904d Mon Sep 17 00:00:00 2001
From: Jesper Skov <jskov@mada.dk>
Date: Thu, 14 Nov 2024 18:50:40 +0100
Subject: [PATCH 1938/2068] Add remaining Validation constraint annotations

---
 .../spotless/java/FormatAnnotationsStep.java  | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java b/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java
index 87a390b48e..998c147ef5 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java
@@ -71,6 +71,8 @@ public final class FormatAnnotationsStep implements Serializable {
 					"ArrayLen",
 					"ArrayLenRange",
 					"ArrayWithoutPackage",
+					"AssertFalse",
+					"AssertTrue",
 					"AwtAlphaCompositingRule",
 					"AwtColorSpace",
 					"AwtCursorType",
@@ -108,14 +110,18 @@ public final class FormatAnnotationsStep implements Serializable {
 					"Critical",
 					"Current",
 					"D",
+					"DecimalMax",
+					"DecimalMin",
 					"DefaultType",
 					"degrees",
 					"Det",
+					"Digits",
 					"DoesNotMatchRegex",
 					"DotSeparatedIdentifiers",
 					"DotSeparatedIdentifiersOrPrimitiveType",
 					"DoubleVal",
 					"E",
+					"Email",
 					"Encrypted",
 					"EnhancedRegex",
 					"EnumVal",
@@ -139,6 +145,8 @@ public final class FormatAnnotationsStep implements Serializable {
 					"FqBinaryName",
 					"Frequency",
 					"FullyQualifiedName",
+					"Future",
+					"FutureOrPresent",
 					"g",
 					"GTENegativeOne",
 					"GuardedBy",
@@ -213,6 +221,7 @@ public final class FormatAnnotationsStep implements Serializable {
 					"m3",
 					"Mass",
 					"MatchesRegex",
+					"Max",
 					"MaybeAliased",
 					"MaybeDerivedFromConstant",
 					"MaybePresent",
@@ -221,6 +230,7 @@ public final class FormatAnnotationsStep implements Serializable {
 					"MethodVal",
 					"MethodValBottom",
 					"min",
+					"Min",
 					"MinLen",
 					"mm",
 					"mm2",
@@ -235,7 +245,9 @@ public final class FormatAnnotationsStep implements Serializable {
 					"MustCallAlias",
 					"MustCallUnknown",
 					"N",
+					"Negative",
 					"NegativeIndexFor",
+					"NegativeOrZero",
 					"NewObject",
 					"NonConstant",
 					"NonDet",
@@ -244,19 +256,25 @@ public final class FormatAnnotationsStep implements Serializable {
 					"NonNull",
 					"NonNullType",
 					"NonRaw",
+					"NotBlank",
 					"NotCalledMethods",
+					"NotEmpty",
 					"NotNull",
 					"NotQualifier",
 					"NTDBottom",
 					"NTDMiddle",
 					"NTDSide",
 					"NTDTop",
+					"Null",
 					"Nullable",
 					"NullableType",
 					"Odd",
 					"OptionalBottom",
 					"OrderNonDet",
 					"Parent",
+					"Past",
+					"PastOrPresent",
+					"Pattern",
 					"PatternA",
 					"PatternAB",
 					"PatternAC",
@@ -297,6 +315,7 @@ public final class FormatAnnotationsStep implements Serializable {
 					"PolyValue",
 					"PolyVariableNameDefault",
 					"Positive",
+					"PositiveOrZero",
 					"Present",
 					"PrimitiveType",
 					"PropertyKey",
@@ -326,6 +345,7 @@ public final class FormatAnnotationsStep implements Serializable {
 					"SignednessGlb",
 					"SignedPositive",
 					"SignedPositiveFromUnsigned",
+					"Size",
 					"Speed",
 					"StringVal",
 					"SubQual",

From 649eb594f00a061f659a216492b5173970c830d6 Mon Sep 17 00:00:00 2001
From: Jesper Skov <jskov@mada.dk>
Date: Thu, 14 Nov 2024 18:56:17 +0100
Subject: [PATCH 1939/2068] Update changes

---
 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 08bf30378e..a0c411e222 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,7 +17,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktfmt` version to latest `0.52` -> `0.53`. ([#2320](https://github.com/diffplug/spotless/pull/2320))
 ### Fixed
 * You can now use `removeUnusedImports` and `googleJavaFormat` at the same time again. (fixes [#2159](https://github.com/diffplug/spotless/issues/2159))
-* The default list of type annotations used by `formatAnnotations` now includes `Valid` (fixes [#2334]https://github.com/diffplug/spotless/issues/2334)
+* The default list of type annotations used by `formatAnnotations` now includes Jakarta Validation's `Valid` and constraints validations (fixes [#2334](https://github.com/diffplug/spotless/issues/2334))
 
 ## [3.0.0.BETA4] - 2024-10-24
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 29c2d53397..8c9265bdac 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -9,7 +9,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktfmt` version to latest `0.52` -> `0.53`. ([#2320](https://github.com/diffplug/spotless/pull/2320))
 ### Fixed
 * You can now use `removeUnusedImports` and `googleJavaFormat` at the same time again. (fixes [#2159](https://github.com/diffplug/spotless/issues/2159))
-* The default list of type annotations used by `formatAnnotations` now includes `Valid` (fixes [#2334]https://github.com/diffplug/spotless/issues/2334))
+* The default list of type annotations used by `formatAnnotations` now includes Jakarta Validation's `Valid` and constraints validations (fixes [#2334](https://github.com/diffplug/spotless/issues/2334))
 
 ## [7.0.0.BETA4] - 2024-10-24
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index d734a7dbcb..4669b319e8 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -9,7 +9,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktfmt` version to latest `0.52` -> `0.53`. ([#2320](https://github.com/diffplug/spotless/pull/2320))
 ### Fixed
 * You can now use `removeUnusedImports` and `googleJavaFormat` at the same time again. (fixes [#2159](https://github.com/diffplug/spotless/issues/2159))
-* The default list of type annotations used by `formatAnnotations` now includes `Valid` (fixes [#2334]https://github.com/diffplug/spotless/issues/2334)
+* The default list of type annotations used by `formatAnnotations` now includes Jakarta Validation's `Valid` and constraints validations (fixes [#2334](https://github.com/diffplug/spotless/issues/2334))
 
 ## [2.44.0.BETA4] - 2024-10-24
 ### Added

From b79dfad91ffb64653688d4f4ee5225e08aceb832 Mon Sep 17 00:00:00 2001
From: Tomas Bjerre <tomas.bjerre85@gmail.com>
Date: Sun, 10 Nov 2024 17:23:04 +0100
Subject: [PATCH 1940/2068] feat: supply Eclipse config from string

---
 CHANGES.md                                    |  1 +
 .../spotless/extra/EquoBasedStepBuilder.java  | 21 +++++--
 .../spotless/FormatterProperties.java         | 23 ++++++-
 plugin-gradle/CHANGES.md                      |  1 +
 plugin-gradle/README.md                       | 12 ++++
 .../gradle/spotless/BaseGroovyExtension.java  |  8 +++
 .../gradle/spotless/CppExtension.java         |  9 +++
 .../gradle/spotless/JavaExtension.java        |  7 +++
 .../gradle/spotless/JavaEclipseTest.java      | 40 ++++++++++++
 .../spotless/FormatterPropertiesTest.java     | 61 ++++++++++++++++++-
 10 files changed, 177 insertions(+), 6 deletions(-)
 create mode 100644 plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavaEclipseTest.java

diff --git a/CHANGES.md b/CHANGES.md
index a0c411e222..f3db4ab4f2 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,6 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Changed
+* Allow setting Eclipse config from a string, not only from files ([#2337](https://github.com/diffplug/spotless/pull/2337))
 * Bump default `ktlint` version to latest `1.3.0` -> `1.4.0`. ([#2314](https://github.com/diffplug/spotless/pull/2314))
 * Add _Sort Members_ feature based on [Eclipse JDT](plugin-gradle/README.md#eclipse-jdt) implementation. ([#2312](https://github.com/diffplug/spotless/pull/2312))
 * Bump default `jackson` version to latest `2.18.0` -> `2.18.1`. ([#2319](https://github.com/diffplug/spotless/pull/2319))
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 0ac526338c..df3824e9ca 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
@@ -24,6 +24,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Properties;
 
 import javax.annotation.Nullable;
@@ -54,6 +55,7 @@ public abstract class EquoBasedStepBuilder {
 	private final ImmutableMap.Builder<String, String> stepProperties;
 	private String formatterVersion;
 	private Iterable<File> settingsFiles = new ArrayList<>();
+	private List<String> settingProperties = new ArrayList<>();
 	private Map<String, String> p2Mirrors = Map.of();
 	private File cacheDirectory;
 
@@ -80,6 +82,10 @@ public void setPreferences(Iterable<File> settingsFiles) {
 		this.settingsFiles = settingsFiles;
 	}
 
+	public void setPropertyPreferences(List<String> propertyPreferences) {
+		this.settingProperties = propertyPreferences;
+	}
+
 	public void setP2Mirrors(Map<String, String> p2Mirrors) {
 		this.p2Mirrors = Map.copyOf(p2Mirrors);
 	}
@@ -113,7 +119,7 @@ protected void addPlatformRepo(P2Model model, String version) {
 
 	/** Returns the FormatterStep (whose state will be calculated lazily). */
 	public FormatterStep build() {
-		var roundtrippableState = new EquoStep(formatterVersion, FileSignature.promise(settingsFiles), JarState.promise(() -> {
+		var roundtrippableState = new EquoStep(formatterVersion, settingProperties, FileSignature.promise(settingsFiles), JarState.promise(() -> {
 			P2QueryResult query;
 			try {
 				if (null != cacheDirectory) {
@@ -167,21 +173,24 @@ static class EquoStep implements Serializable {
 		private final FileSignature.Promised settingsPromise;
 		private final JarState.Promised jarPromise;
 		private final ImmutableMap<String, String> stepProperties;
+		private List<String> settingProperties;
 
 		EquoStep(
 				String semanticVersion,
+				List<String> settingProperties,
 				FileSignature.Promised settingsPromise,
 				JarState.Promised jarPromise,
 				ImmutableMap<String, String> stepProperties) {
 
 			this.semanticVersion = semanticVersion;
+			this.settingProperties = Optional.ofNullable(settingProperties).orElse(new ArrayList<>());
 			this.settingsPromise = settingsPromise;
 			this.jarPromise = jarPromise;
 			this.stepProperties = stepProperties;
 		}
 
 		private State state() {
-			return new State(semanticVersion, jarPromise.get(), settingsPromise.get(), stepProperties);
+			return new State(semanticVersion, jarPromise.get(), settingProperties, settingsPromise.get(), stepProperties);
 		}
 	}
 
@@ -195,10 +204,12 @@ public static class State implements Serializable {
 		final JarState jarState;
 		final FileSignature settingsFiles;
 		final ImmutableMap<String, String> stepProperties;
+		private List<String> settingProperties;
 
-		public State(String semanticVersion, JarState jarState, FileSignature settingsFiles, ImmutableMap<String, String> stepProperties) {
+		public State(String semanticVersion, JarState jarState, List<String> settingProperties, FileSignature settingsFiles, ImmutableMap<String, String> stepProperties) {
 			this.semanticVersion = semanticVersion;
 			this.jarState = jarState;
+			this.settingProperties = Optional.ofNullable(settingProperties).orElse(new ArrayList<>());
 			this.settingsFiles = settingsFiles;
 			this.stepProperties = stepProperties;
 		}
@@ -212,7 +223,9 @@ public String getSemanticVersion() {
 		}
 
 		public Properties getPreferences() {
-			return FormatterProperties.from(settingsFiles.files()).getProperties();
+			FormatterProperties fromFiles = FormatterProperties.from(settingsFiles.files());
+			FormatterProperties fromPropertiesContent = FormatterProperties.fromPropertiesContent(settingProperties);
+			return FormatterProperties.merge(fromFiles.getProperties(), fromPropertiesContent.getProperties()).getProperties();
 		}
 
 		public ImmutableMap<String, String> getStepProperties() {
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterProperties.java b/lib/src/main/java/com/diffplug/spotless/FormatterProperties.java
index 81fa6a93cf..5ea32f8f99 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterProperties.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,10 +17,12 @@
 
 import static com.diffplug.spotless.MoreIterables.toNullHostileList;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
@@ -75,6 +77,25 @@ public static FormatterProperties from(Iterable<File> files) throws IllegalArgum
 		return properties;
 	}
 
+	public static FormatterProperties fromPropertiesContent(Iterable<String> content) throws IllegalArgumentException {
+		List<String> nonNullElements = toNullHostileList(content);
+		FormatterProperties properties = new FormatterProperties();
+		nonNullElements.forEach(contentElement -> {
+			try (InputStream is = new ByteArrayInputStream(contentElement.getBytes(StandardCharsets.UTF_8))) {
+				properties.properties.load(is);
+			} catch (IOException e) {
+				throw new IllegalArgumentException("Unable to load properties: " + contentElement);
+			}
+		});
+		return properties;
+	}
+
+	public static FormatterProperties merge(Properties... properties) {
+		FormatterProperties merged = new FormatterProperties();
+		List.of(properties).stream().forEach((source) -> merged.properties.putAll(source));
+		return merged;
+	}
+
 	/**
 	 * Import settings from given file. New settings (with the same ID/key)
 	 * override existing once.
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 8c9265bdac..e62456e6cb 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -4,6 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Changed
+* Allow setting Eclipse config from a string, not only from files ([#2337](https://github.com/diffplug/spotless/pull/2337))
 * Bump default `ktlint` version to latest `1.3.0` -> `1.4.0`. ([#2314](https://github.com/diffplug/spotless/pull/2314))
 * Bump default `jackson` version to latest `2.18.0` -> `2.18.1`. ([#2319](https://github.com/diffplug/spotless/pull/2319))
 * Bump default `ktfmt` version to latest `0.52` -> `0.53`. ([#2320](https://github.com/diffplug/spotless/pull/2320))
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 088207a1ff..694462f8d2 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -262,6 +262,10 @@ spotless {
     eclipse()
     // optional: you can specify a specific version and/or config file
     eclipse('4.26').configFile('eclipse-prefs.xml')
+    // Or supply the configuration as a string
+    eclipse('4.26').configProperties("""
+    ...
+    """)
     // if the access to the p2 repositories is restricted, mirrors can be
     // specified using a URI prefix map as follows:
     eclipse().withP2Mirrors(['https://download.eclipse.org/eclipse/updates/4.29/':'https://some.internal.mirror/4-29-updates-p2/']) 
@@ -418,6 +422,10 @@ spotless {
     greclipse()
     // optional: you can specify a specific version or config file(s), version matches the Eclipse Platform
     greclipse('4.26').configFile('spotless.eclipseformat.xml', 'org.codehaus.groovy.eclipse.ui.prefs')
+    // Or supply the configuration as a string
+    greclipse('4.26').configProperties("""
+    ...
+    """)
 ```
 
 Groovy-Eclipse formatting errors/warnings lead per default to a build failure. This behavior can be changed by adding the property/key value `ignoreFormatterProblems=true` to a configuration file. In this scenario, files causing problems, will not be modified by this formatter step.
@@ -572,6 +580,10 @@ spotles {
   cpp {
     // version and configFile are both optional
     eclipseCdt('4.13.0').configFile('eclipse-cdt.xml')
+    // Or supply the configuration as a string
+    eclipseCdt('4.13.0').configProperties("""
+    ...
+    """)
   }
 }
 ```
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseGroovyExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseGroovyExtension.java
index 6e8b141e49..83d678c46c 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseGroovyExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseGroovyExtension.java
@@ -17,6 +17,7 @@
 
 import static com.diffplug.gradle.spotless.PluginGradlePreconditions.requireElementsNonNull;
 
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
@@ -72,6 +73,13 @@ public GrEclipseConfig configFile(Object... configFiles) {
 			return this;
 		}
 
+		public GrEclipseConfig configProperties(String... configs) {
+			requireElementsNonNull(configs);
+			builder.setPropertyPreferences(List.of(configs));
+			extension.replaceStep(builder.build());
+			return this;
+		}
+
 		public GrEclipseConfig withP2Mirrors(Map<String, String> mirrors) {
 			builder.setP2Mirrors(mirrors);
 			extension.replaceStep(builder.build());
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java
index 677f5f1bc3..f2d6ee91bb 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java
@@ -17,12 +17,14 @@
 
 import static com.diffplug.gradle.spotless.PluginGradlePreconditions.requireElementsNonNull;
 
+import java.util.List;
 import java.util.Map;
 
 import javax.inject.Inject;
 
 import org.gradle.api.Project;
 
+import com.diffplug.gradle.spotless.JavaExtension.EclipseConfig;
 import com.diffplug.spotless.cpp.CppDefaults;
 import com.diffplug.spotless.extra.EquoBasedStepBuilder;
 import com.diffplug.spotless.extra.cpp.EclipseCdtFormatterStep;
@@ -60,6 +62,13 @@ public EclipseConfig configFile(Object... configFiles) {
 			return this;
 		}
 
+		public EclipseConfig configProperties(String... configs) {
+			requireElementsNonNull(configs);
+			builder.setPropertyPreferences(List.of(configs));
+			replaceStep(builder.build());
+			return this;
+		}
+
 		public EclipseConfig withP2Mirrors(Map<String, String> mirrors) {
 			builder.setP2Mirrors(mirrors);
 			replaceStep(builder.build());
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
index c7495ec396..b7d3c84304 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
@@ -305,6 +305,13 @@ public EclipseConfig configFile(Object... configFiles) {
 			return this;
 		}
 
+		public EclipseConfig configProperties(String... configs) {
+			requireElementsNonNull(configs);
+			builder.setPropertyPreferences(List.of(configs));
+			replaceStep(builder.build());
+			return this;
+		}
+
 		public EclipseConfig sortMembersDoNotSortFields(boolean doNotSortFields) {
 			builder.sortMembersDoNotSortFields(doNotSortFields);
 			replaceStep(builder.build());
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavaEclipseTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavaEclipseTest.java
new file mode 100644
index 0000000000..c102b7abe1
--- /dev/null
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavaEclipseTest.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2016-2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.gradle.spotless;
+
+import java.io.IOException;
+
+import org.junit.jupiter.api.Test;
+
+class JavaEclipseTest extends GradleIntegrationHarness {
+	@Test
+	void settingsWithContentWithoutFile() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"  id 'com.diffplug.spotless'",
+				"  id 'java'",
+				"}",
+				"repositories { mavenCentral() }",
+				"",
+				"spotless {",
+				"  java {  eclipse().configProperties(\"\"\"",
+				"valid_line_oriented.prefs.string=string",
+				"\"\"\")  }",
+				"}");
+
+		gradleRunner().withArguments("spotlessApply").build();
+	}
+}
diff --git a/testlib/src/test/java/com/diffplug/spotless/FormatterPropertiesTest.java b/testlib/src/test/java/com/diffplug/spotless/FormatterPropertiesTest.java
index 5e47e9ad1a..8333fcc41d 100644
--- a/testlib/src/test/java/com/diffplug/spotless/FormatterPropertiesTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/FormatterPropertiesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,9 +19,12 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
 import java.util.Collection;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.Properties;
+import java.util.stream.Collectors;
 
 import org.assertj.core.api.AbstractAssert;
 import org.assertj.core.api.Assertions;
@@ -45,6 +48,14 @@ class FormatterPropertiesTest extends ResourceHarness {
 			RESOURCES_ROOT_DIR + "invalid_xml_properties.xml"
 	};
 
+	private List<String> validPropertiesResources() {
+		return List.of(VALID_SETTINGS_RESOURCES).stream().filter(it -> !it.endsWith(".xml")).collect(Collectors.toList());
+	}
+
+	private List<String> invalidPropertiesResources() {
+		return List.of(INVALID_SETTINGS_RESOURCES).stream().filter(it -> !it.endsWith(".xml")).collect(Collectors.toList());
+	}
+
 	private static final String[] VALID_VALUES = {
 			"string",
 			"true",
@@ -63,6 +74,18 @@ void differentPropertyFileTypes() throws IOException {
 		}
 	}
 
+	@Test
+	void differentPropertyFileTypes_content_properties() throws IOException {
+		for (String settingsResource : validPropertiesResources()) {
+			File settingsFile = createTestFile(settingsResource);
+			String content = Files.readString(settingsFile.toPath());
+			FormatterProperties preferences = FormatterProperties.fromPropertiesContent(List.of(content));
+			assertFor(preferences)
+					.containsSpecificValuesOf(settingsFile)
+					.containsCommonValueOf(settingsFile);
+		}
+	}
+
 	@Test
 	void multiplePropertyFiles() throws IOException {
 		LinkedList<File> settingsFiles = new LinkedList<>();
@@ -77,6 +100,22 @@ void multiplePropertyFiles() throws IOException {
 				.containsCommonValueOf(settingsFiles.getLast());
 	}
 
+	@Test
+	void multiplePropertyFiles_content_properties() throws IOException {
+		LinkedList<File> settingsFiles = new LinkedList<>();
+		LinkedList<String> content = new LinkedList<>();
+		for (String settingsResource : validPropertiesResources()) {
+			File settingsFile = createTestFile(settingsResource);
+			content.add(Files.readString(settingsFile.toPath()));
+			settingsFiles.add(settingsFile);
+		}
+		FormatterProperties preferences = FormatterProperties.fromPropertiesContent(content);
+		/* Settings are loaded / overridden in the sequence they are configured. */
+		assertFor(preferences)
+				.containsSpecificValuesOf(settingsFiles)
+				.containsCommonValueOf(settingsFiles.getLast());
+	}
+
 	@Test
 	void invalidPropertyFiles() throws IOException {
 		for (String settingsResource : INVALID_SETTINGS_RESOURCES) {
@@ -96,6 +135,26 @@ void invalidPropertyFiles() throws IOException {
 		}
 	}
 
+	@Test
+	void invalidPropertyFiles_content_properties() throws IOException {
+		for (String settingsResource : invalidPropertiesResources()) {
+			File settingsFile = createTestFile(settingsResource);
+			String content = Files.readString(settingsFile.toPath());
+			boolean exceptionCaught = false;
+			try {
+				FormatterProperties.fromPropertiesContent(List.of(content));
+			} catch (IllegalArgumentException ex) {
+				exceptionCaught = true;
+				assertThat(ex.getMessage())
+						.as("IllegalArgumentException does not contain absolute path of file '%s'", settingsFile.getName())
+						.contains(settingsFile.getAbsolutePath());
+			}
+			assertThat(exceptionCaught)
+					.as("No IllegalArgumentException thrown when parsing '%s'", settingsFile.getName())
+					.isTrue();
+		}
+	}
+
 	@Test
 	void nonExistingFile() throws IOException {
 		String filePath = FileSignature.pathUnixToNative("does/not/exist.properties");

From 80d2bce30cad3b430a96c2f28fd3e791951965f0 Mon Sep 17 00:00:00 2001
From: j-roskopf <joebrothehobo@gmail.com>
Date: Mon, 18 Nov 2024 14:21:51 -0600
Subject: [PATCH 1941/2068] Update README.md with another real world project

Add Compose Guard to real world projects section
---
 plugin-gradle/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 088207a1ff..10bb9234da 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -1791,6 +1791,7 @@ If you use this feature, you will get an error if you use a formatter in a subpr
 * [Goomph](https://github.com/diffplug/goomph) ([direct link to spotless section in its build.gradle](https://github.com/diffplug/goomph/blob/v1.0.0/build.gradle#L78-L99))
 * [FreshMark](https://github.com/diffplug/freshmark) ([direct link to spotless section in its build.gradle](https://github.com/diffplug/freshmark/blob/v1.3.0/build.gradle#L52-L73))
 * [JScriptBox](https://github.com/diffplug/jscriptbox) ([direct link to spotless section in its build.gradle](https://github.com/diffplug/jscriptbox/blob/v3.0.0/build.gradle#L45-L65))
+* [Compose Guard](https://github.com/j-roskopf/ComposeGuard) ([direct link to spotless section in its build.gradle.kts](https://github.com/j-roskopf/ComposeGuard/blob/main/compose-guard/build.gradle.kts#L24-L36))
 * (Your project here)
 
 <!---freshmark /javadoc -->

From 8b1f600d6ab2e3a1c8e3db76ae4b5313310d5444 Mon Sep 17 00:00:00 2001
From: j-roskopf <joebrothehobo@gmail.com>
Date: Mon, 18 Nov 2024 22:38:32 -0600
Subject: [PATCH 1942/2068] Update README.md

add correct line numbers for compose guard spotless config
---
 plugin-gradle/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 10bb9234da..89c260085b 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -1791,7 +1791,7 @@ If you use this feature, you will get an error if you use a formatter in a subpr
 * [Goomph](https://github.com/diffplug/goomph) ([direct link to spotless section in its build.gradle](https://github.com/diffplug/goomph/blob/v1.0.0/build.gradle#L78-L99))
 * [FreshMark](https://github.com/diffplug/freshmark) ([direct link to spotless section in its build.gradle](https://github.com/diffplug/freshmark/blob/v1.3.0/build.gradle#L52-L73))
 * [JScriptBox](https://github.com/diffplug/jscriptbox) ([direct link to spotless section in its build.gradle](https://github.com/diffplug/jscriptbox/blob/v3.0.0/build.gradle#L45-L65))
-* [Compose Guard](https://github.com/j-roskopf/ComposeGuard) ([direct link to spotless section in its build.gradle.kts](https://github.com/j-roskopf/ComposeGuard/blob/main/compose-guard/build.gradle.kts#L24-L36))
+* [Compose Guard](https://github.com/j-roskopf/ComposeGuard) ([direct link to spotless section in its build.gradle.kts](https://github.com/j-roskopf/ComposeGuard/blob/main/compose-guard/build.gradle.kts#L28-L48))
 * (Your project here)
 
 <!---freshmark /javadoc -->

From 3a082effb80533f9f2a9cd15de35c5b2445f576e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 22 Nov 2024 13:17:10 +0800
Subject: [PATCH 1943/2068] chore(deps): update dependency gradle to v8.11.1
 (#2346)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 94113f200e..e2847c8200 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

From 8a11dd534d7ab8fe04593fe7f7352c5cd4936005 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Wed, 27 Nov 2024 20:15:10 +0100
Subject: [PATCH 1944/2068] feat: add new api for indentation spaces vs. tabs

add deprecation warning for old api but keep supporting it

Refs: #794, #2311
---
 .../gradle/spotless/FormatExtension.java      | 41 +++++++++++++++++--
 1 file changed, 37 insertions(+), 4 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index 56cccc52c9..59898cbf56 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -47,6 +47,8 @@
 import org.gradle.api.plugins.BasePlugin;
 import org.gradle.api.tasks.TaskProvider;
 import org.gradle.util.GradleVersion;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.diffplug.common.base.Preconditions;
 import com.diffplug.spotless.FormatterFunc;
@@ -77,6 +79,9 @@
 
 /** Adds a {@code spotless{Name}Check} and {@code spotless{Name}Apply} task. */
 public class FormatExtension {
+
+	private static final Logger logger = LoggerFactory.getLogger(FormatExtension.class);
+
 	final SpotlessExtension spotless;
 	final List<Action<FormatExtension>> lazyActions = new ArrayList<>();
 
@@ -505,25 +510,53 @@ public void endWithNewline() {
 	}
 
 	/** Ensures that the files are indented using spaces. */
+	public void leadingTabsToSpaces(int spacesPerTab) {
+		addStep(IndentStep.Type.SPACE.create(spacesPerTab));
+	}
+
+	@Deprecated
 	public void indentWithSpaces(int numSpacesPerTab) {
-		addStep(IndentStep.Type.SPACE.create(numSpacesPerTab));
+		logDeprecation("indentWithSpaces", "leadingTabsToSpaces");
+		leadingTabsToSpaces(numSpacesPerTab);
 	}
 
 	/** Ensures that the files are indented using spaces. */
-	public void indentWithSpaces() {
+	public void leadingTabsToSpaces() {
 		addStep(IndentStep.Type.SPACE.create());
 	}
 
+	@Deprecated
+	public void indentWithSpaces() {
+		logDeprecation("indentWithSpaces", "leadingTabsToSpaces");
+		leadingTabsToSpaces();
+	}
+
 	/** Ensures that the files are indented using tabs. */
+	public void leadingSpacesToTabs(int spacesPerTab) {
+		addStep(IndentStep.Type.TAB.create(spacesPerTab));
+	}
+
+	@Deprecated
 	public void indentWithTabs(int tabToSpaces) {
-		addStep(IndentStep.Type.TAB.create(tabToSpaces));
+		logDeprecation("indentWithTabs", "leadingSpacesToTabs");
+		leadingSpacesToTabs(tabToSpaces);
 	}
 
 	/** Ensures that the files are indented using tabs. */
-	public void indentWithTabs() {
+	public void leadingSpacesToTabs() {
 		addStep(IndentStep.Type.TAB.create());
 	}
 
+	@Deprecated
+	public void indentWithTabs() {
+		logDeprecation("indentWithTabs", "leadingSpacesToTabs");
+		leadingSpacesToTabs();
+	}
+
+	private static void logDeprecation(String methodName, String replacement) {
+		logger.warn("'{}' is deprecated, use '{}' in your gradle build script instead.", methodName, replacement);
+	}
+
 	/** Ensures formatting of files via native binary. */
 	public void nativeCmd(String name, String pathToExe, List<String> arguments) {
 		addStep(NativeCmdStep.create(name, new File(pathToExe), arguments));

From 8dde43f3cdde071369946b779edc8d2730ecf823 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Wed, 27 Nov 2024 20:43:18 +0100
Subject: [PATCH 1945/2068] feat: test new api for indentation spaces vs. tabs

- check for deprecation warnings but retained functionality of old api
- check functionality of new api

Refs: #794, #2311
---
 .../spotless/IndentIntegrationTest.java       | 90 +++++++++++++++++++
 .../main/resources/indent/IndentedMixed.test  | 37 ++++++++
 2 files changed, 127 insertions(+)
 create mode 100644 plugin-gradle/src/test/java/com/diffplug/gradle/spotless/IndentIntegrationTest.java
 create mode 100644 testlib/src/main/resources/indent/IndentedMixed.test

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/IndentIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/IndentIntegrationTest.java
new file mode 100644
index 0000000000..fc883b41e9
--- /dev/null
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/IndentIntegrationTest.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2021-2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.gradle.spotless;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.util.stream.Stream;
+
+import org.gradle.testkit.runner.BuildResult;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
+
+class IndentIntegrationTest extends GradleIntegrationHarness {
+
+	@ParameterizedTest
+	@ValueSource(strings = {"indentWithSpaces", "indentWithTabs"})
+	void oldIndentApiLogsDeprecationWarning(String indentationMethodName) throws IOException {
+		BuildResult result = runIndentFormatter(indentationMethodName);
+		assertThat(result.getOutput()).containsPattern(".*" + indentationMethodName + ".*deprecated.*");
+	}
+
+	@ParameterizedTest
+	@ValueSource(strings = {"leadingTabsToSpaces", "leadingSpacesToTabs"})
+	void newIndentApiDoesNotLogDeprecationWarning(String indentationMethodName) throws IOException {
+		BuildResult result = runIndentFormatter(indentationMethodName);
+		assertThat(result.getOutput()).doesNotContainPattern(".*" + indentationMethodName + ".*deprecated.*");
+	}
+
+	@ParameterizedTest(name = "{0}")
+	@MethodSource("indentationCombinations")
+	void indentationCombinations(String testName, String indentationMethodName, String actualResource, String expectedResultResource) throws IOException {
+		runIndentFormatter(indentationMethodName, actualResource);
+		assertFile("test.txt").sameAsResource(expectedResultResource);
+	}
+
+	private static Stream<Arguments> indentationCombinations() {
+		return Stream.of(
+				// new API
+				Arguments.of("tabsToTabs", "leadingSpacesToTabs", "indent/IndentedWithTab.test", "indent/IndentedWithTab.test"),
+				Arguments.of("spacesToSpaces", "leadingTabsToSpaces", "indent/IndentedWithSpace.test", "indent/IndentedWithSpace.test"),
+				Arguments.of("spacesToTabs", "leadingSpacesToTabs", "indent/IndentedWithSpace.test", "indent/IndentedWithTab.test"),
+				Arguments.of("tabsToSpaces", "leadingTabsToSpaces", "indent/IndentedWithTab.test", "indent/IndentedWithSpace.test"),
+				Arguments.of("mixedToTabs", "leadingSpacesToTabs", "indent/IndentedMixed.test", "indent/IndentedWithTab.test"),
+				Arguments.of("mixedToSpaces", "leadingTabsToSpaces", "indent/IndentedMixed.test", "indent/IndentedWithSpace.test"),
+				// legacy API
+				Arguments.of("legacy: tabsToTabs", "indentWithTabs", "indent/IndentedWithTab.test", "indent/IndentedWithTab.test"),
+				Arguments.of("legacy: spacesToSpaces", "indentWithSpaces", "indent/IndentedWithSpace.test", "indent/IndentedWithSpace.test"),
+				Arguments.of("legacy: spacesToTabs", "indentWithTabs", "indent/IndentedWithSpace.test", "indent/IndentedWithTab.test"),
+				Arguments.of("legacy: tabsToSpaces", "indentWithSpaces", "indent/IndentedWithTab.test", "indent/IndentedWithSpace.test"),
+				Arguments.of("legacy: mixedToTabs", "indentWithTabs", "indent/IndentedMixed.test", "indent/IndentedWithTab.test"),
+				Arguments.of("legacy: mixedToSpaces", "indentWithSpaces", "indent/IndentedMixed.test", "indent/IndentedWithSpace.test"));
+	}
+
+	private BuildResult runIndentFormatter(String indentationMethodName) throws IOException {
+		return runIndentFormatter(indentationMethodName, "indent/IndentedMixed.test");
+	}
+
+	private BuildResult runIndentFormatter(String indentationMethodName, String resourceFile) throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"  id 'com.diffplug.spotless'",
+				"}",
+				"spotless {",
+				"  format 'test', {",
+				"    target '**/*.txt'",
+				"    " + indentationMethodName + "()",
+				"  }",
+				"}");
+		setFile("test.txt").toResource(resourceFile);
+		BuildResult result = gradleRunner().withArguments("spotlessApply").build();
+		return result;
+	}
+
+}
diff --git a/testlib/src/main/resources/indent/IndentedMixed.test b/testlib/src/main/resources/indent/IndentedMixed.test
new file mode 100644
index 0000000000..37c108c1df
--- /dev/null
+++ b/testlib/src/main/resources/indent/IndentedMixed.test
@@ -0,0 +1,37 @@
+package com.github.youribonnaffe.gradle.format;
+
+import java.util.function.Function;
+
+/**
+ * Test class.
+ */
+public class Java8Test {
+    /**
+     * Test method.
+     */
+    public void doStuff() throws Exception {
+        Function<String, Integer> example = Integer::parseInt;
+        example.andThen(val -> {
+            return val + 2;
+        } );
+        SimpleEnum val = SimpleEnum.A;
+        switch (val) {
+            case A:
+                break;
+            case B:
+                break;
+            case C:
+                break;
+            default:
+                throw new Exception();
+        }
+    }
+
+	/** Test enum
+	* with weirdly formatted javadoc
+	* which IndentStep should not change
+	*/
+	public enum SimpleEnum {
+		A, B, C;
+	}
+}

From 31aa59bdee20968691b4e267bd495cac66b31674 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Wed, 27 Nov 2024 20:54:43 +0100
Subject: [PATCH 1946/2068] doc: add documentation for new api

Refs: #794, #2311
---
 plugin-gradle/CHANGES.md | 1 +
 plugin-gradle/README.md  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 8c9265bdac..29f72b23da 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -10,6 +10,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * You can now use `removeUnusedImports` and `googleJavaFormat` at the same time again. (fixes [#2159](https://github.com/diffplug/spotless/issues/2159))
 * The default list of type annotations used by `formatAnnotations` now includes Jakarta Validation's `Valid` and constraints validations (fixes [#2334](https://github.com/diffplug/spotless/issues/2334))
+* The API for generic indentation has been clarified. We deprecated `indentWithSpaces` and `indentWithTabs` in favor of `leadingTabsToSpaces` and `leadingSpacesToTabs`. ([#794](https://github.com/diffplug/spotless/issues/794), [#2350](https://github.com/diffplug/spotless/pull/2350))
 
 ## [7.0.0.BETA4] - 2024-10-24
 ### Added
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 89c260085b..90078f191d 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -109,7 +109,7 @@ spotless {
 
     // define the steps to apply to those files
     trimTrailingWhitespace()
-    indentWithTabs() // or spaces. Takes an integer argument if you don't like 4
+    leadingSpacesToTabs() // or leadingTabsToSpaces. Takes an integer argument if you don't like 4
     endWithNewline()
   }
   java {

From f23834c53a1bc45c1265d5a182356a4db1b346d1 Mon Sep 17 00:00:00 2001
From: Zongle Wang <wangzongler@gmail.com>
Date: Wed, 4 Dec 2024 20:52:52 -0500
Subject: [PATCH 1947/2068] Bump Ktlint to 1.5.0 (#2354)

---
 CHANGES.md                                                     | 1 +
 lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java | 2 +-
 plugin-gradle/CHANGES.md                                       | 1 +
 plugin-maven/CHANGES.md                                        | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index a0c411e222..d7d045bba6 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,6 +15,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Add _Sort Members_ feature based on [Eclipse JDT](plugin-gradle/README.md#eclipse-jdt) implementation. ([#2312](https://github.com/diffplug/spotless/pull/2312))
 * Bump default `jackson` version to latest `2.18.0` -> `2.18.1`. ([#2319](https://github.com/diffplug/spotless/pull/2319))
 * Bump default `ktfmt` version to latest `0.52` -> `0.53`. ([#2320](https://github.com/diffplug/spotless/pull/2320))
+* Bump default `ktlint` version to latest `1.4.0` -> `1.5.0`. ([#2354](https://github.com/diffplug/spotless/pull/2354))
 ### Fixed
 * You can now use `removeUnusedImports` and `googleJavaFormat` at the same time again. (fixes [#2159](https://github.com/diffplug/spotless/issues/2159))
 * The default list of type annotations used by `formatAnnotations` now includes Jakarta Validation's `Valid` and constraints validations (fixes [#2334](https://github.com/diffplug/spotless/issues/2334))
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index 6e8f9e3452..2d0929f60e 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -36,7 +36,7 @@
 /** Wraps up <a href="https://github.com/pinterest/ktlint">ktlint</a> as a FormatterStep. */
 public class KtLintStep implements Serializable {
 	private static final long serialVersionUID = 1L;
-	private static final String DEFAULT_VERSION = "1.4.0";
+	private static final String DEFAULT_VERSION = "1.5.0";
 	private static final String NAME = "ktlint";
 	private static final String MAVEN_COORDINATE_0_DOT = "com.pinterest:ktlint:";
 	private static final String MAVEN_COORDINATE_1_DOT = "com.pinterest.ktlint:ktlint-cli:";
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 8c9265bdac..becceb0b0c 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -7,6 +7,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktlint` version to latest `1.3.0` -> `1.4.0`. ([#2314](https://github.com/diffplug/spotless/pull/2314))
 * Bump default `jackson` version to latest `2.18.0` -> `2.18.1`. ([#2319](https://github.com/diffplug/spotless/pull/2319))
 * Bump default `ktfmt` version to latest `0.52` -> `0.53`. ([#2320](https://github.com/diffplug/spotless/pull/2320))
+* Bump default `ktlint` version to latest `1.4.0` -> `1.5.0`. ([#2354](https://github.com/diffplug/spotless/pull/2354))
 ### Fixed
 * You can now use `removeUnusedImports` and `googleJavaFormat` at the same time again. (fixes [#2159](https://github.com/diffplug/spotless/issues/2159))
 * The default list of type annotations used by `formatAnnotations` now includes Jakarta Validation's `Valid` and constraints validations (fixes [#2334](https://github.com/diffplug/spotless/issues/2334))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 4669b319e8..d6250d110e 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 (
 * Bump default `ktlint` version to latest `1.3.0` -> `1.4.0`. ([#2314](https://github.com/diffplug/spotless/pull/2314))
 * Bump default `jackson` version to latest `2.18.0` -> `2.18.1`. ([#2319](https://github.com/diffplug/spotless/pull/2319))
 * Bump default `ktfmt` version to latest `0.52` -> `0.53`. ([#2320](https://github.com/diffplug/spotless/pull/2320))
+* Bump default `ktlint` version to latest `1.4.0` -> `1.5.0`. ([#2354](https://github.com/diffplug/spotless/pull/2354))
 ### Fixed
 * You can now use `removeUnusedImports` and `googleJavaFormat` at the same time again. (fixes [#2159](https://github.com/diffplug/spotless/issues/2159))
 * The default list of type annotations used by `formatAnnotations` now includes Jakarta Validation's `Valid` and constraints validations (fixes [#2334](https://github.com/diffplug/spotless/issues/2334))

From 263609e5c0d81f48f3c9aaea78dda4ff991018c1 Mon Sep 17 00:00:00 2001
From: Zongle Wang <wangzongler@gmail.com>
Date: Wed, 4 Dec 2024 21:02:35 -0500
Subject: [PATCH 1948/2068] Add Java 23 into test matrix (#2264)

---
 .github/workflows/ci.yml                                     | 2 +-
 .../diffplug/gradle/spotless/GradleIntegrationHarness.java   | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f7cbb3377c..e5de52b4d9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -41,7 +41,7 @@ jobs:
       matrix:
         kind: [maven, gradle]
         # Test on the latest Java version once Gradle & Maven support it.
-        jre: [11, 17, 21, 22]
+        jre: [11, 17, 21, 23]
         os: [ubuntu-latest]
         include:
           # test windows at the diagonals of the above matrix
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
index 0084893274..3621c2a0f6 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
@@ -54,8 +54,11 @@ public enum GradleVersionSupport {
 		GradleVersionSupport(String version) {
 			String minVersionForRunningJRE;
 			switch (Jvm.version()) {
-			case 23:
+			case 24:
 				// TODO: https://docs.gradle.org/current/userguide/compatibility.html
+			case 23:
+				minVersionForRunningJRE = "8.10";
+				break;
 			case 22:
 				minVersionForRunningJRE = "8.8";
 				break;

From 629fc32d72a5344490a3cc997036e7057f62548b Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 8 Dec 2024 08:29:13 -0800
Subject: [PATCH 1949/2068] Condense the changelog.

---
 plugin-gradle/CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 29f72b23da..7478bce471 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 (
 ### Fixed
 * You can now use `removeUnusedImports` and `googleJavaFormat` at the same time again. (fixes [#2159](https://github.com/diffplug/spotless/issues/2159))
 * The default list of type annotations used by `formatAnnotations` now includes Jakarta Validation's `Valid` and constraints validations (fixes [#2334](https://github.com/diffplug/spotless/issues/2334))
-* The API for generic indentation has been clarified. We deprecated `indentWithSpaces` and `indentWithTabs` in favor of `leadingTabsToSpaces` and `leadingSpacesToTabs`. ([#794](https://github.com/diffplug/spotless/issues/794), [#2350](https://github.com/diffplug/spotless/pull/2350))
+* `indentWith[Spaces|Tabs]` has been deprecated in favor of `leadingTabsToSpaces` and `leadingSpacesToTabs`. ([#2350](https://github.com/diffplug/spotless/pull/2350) fixes [#794](https://github.com/diffplug/spotless/issues/794))
 
 ## [7.0.0.BETA4] - 2024-10-24
 ### Added

From ffeb302ca2bc3a20ad1ab14b24321fbe0f71162a Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 8 Dec 2024 08:39:30 -0800
Subject: [PATCH 1950/2068] Bump the OSGi dep to fix a CVE in the default one.

---
 lib-extra/build.gradle | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index d7e5a7ab2e..577954fd3a 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -18,6 +18,10 @@ dependencies {
 	implementation "com.googlecode.concurrent-trees:concurrent-trees:2.6.1"
 	// for eclipse
 	implementation "dev.equo.ide:solstice:${VER_SOLSTICE}"
+	// the osgi dep is included in solstice, but it has some CVE's against it.
+	// 3.18.500 is the oldest, most-compatible version with no CVE's
+	// https://central.sonatype.com/artifact/org.eclipse.platform/org.eclipse.osgi/versions
+	implementation "org.eclipse.platform:org.eclipse.osgi:3.18.500"
 
 	// testing
 	testImplementation projects.testlib

From b9403027e474feca0f971b0170f5229fcdcbab99 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 8 Dec 2024 10:20:03 -0800
Subject: [PATCH 1951/2068] Make the Gradle testing methods public, to allow
 easier parameterized testing.

---
 .../spotless/ConfigurationCacheTest.java      |  2 +-
 .../gradle/spotless/GitRatchetGradleTest.java |  2 +-
 .../spotless/GradleIntegrationHarness.java    | 24 +++++++-------
 .../diffplug/spotless/ResourceHarness.java    | 32 +++++++++----------
 4 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ConfigurationCacheTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ConfigurationCacheTest.java
index 0306f087ac..e76585fe54 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ConfigurationCacheTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ConfigurationCacheTest.java
@@ -22,7 +22,7 @@
 
 public class ConfigurationCacheTest extends GradleIntegrationHarness {
 	@Override
-	protected GradleRunner gradleRunner() throws IOException {
+	public GradleRunner gradleRunner() throws IOException {
 		setFile("gradle.properties").toContent("org.gradle.unsafe.configuration-cache=true");
 		setFile("settings.gradle").toContent("enableFeaturePreview(\"STABLE_CONFIGURATION_CACHE\")");
 		return super.gradleRunner().withGradleVersion(GradleVersionSupport.STABLE_CONFIGURATION_CACHE.version);
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GitRatchetGradleTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GitRatchetGradleTest.java
index d63efd9e57..e4c1d31615 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GitRatchetGradleTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GitRatchetGradleTest.java
@@ -52,7 +52,7 @@ private Git initRepo() throws IllegalStateException, GitAPIException, IOExceptio
 	}
 
 	@Override
-	protected GradleRunner gradleRunner() throws IOException {
+	public GradleRunner gradleRunner() throws IOException {
 		return super.gradleRunner().withGradleVersion(GradleVersionSupport.CUSTOM_STEPS.version);
 	}
 
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
index 3621c2a0f6..100bdefc50 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
@@ -121,7 +121,7 @@ void gitAttributes() throws IOException {
 		setFile(".gitattributes").toContent("* text eol=lf");
 	}
 
-	protected GradleRunner gradleRunner() throws IOException {
+	public GradleRunner gradleRunner() throws IOException {
 		GradleVersionSupport version;
 		if (newFile("build.gradle").exists() && read("build.gradle").contains("custom")) {
 			version = GradleVersionSupport.CUSTOM_STEPS;
@@ -136,11 +136,11 @@ protected GradleRunner gradleRunner() throws IOException {
 	}
 
 	/** Dumps the complete file contents of the folder to the console. */
-	protected String getContents() {
+	public String getContents() {
 		return getContents(subPath -> !subPath.startsWith(".gradle"));
 	}
 
-	protected String getContents(Predicate<String> subpathsToInclude) {
+	public String getContents(Predicate<String> subpathsToInclude) {
 		return StringPrinter.buildString(printer -> Errors.rethrow().run(() -> iterateFiles(subpathsToInclude, (subpath, file) -> {
 			printer.println("### " + subpath + " ###");
 			try {
@@ -152,18 +152,18 @@ protected String getContents(Predicate<String> subpathsToInclude) {
 	}
 
 	/** Dumps the filtered file listing of the folder to the console. */
-	protected String listFiles(Predicate<String> subpathsToInclude) {
+	public String listFiles(Predicate<String> subpathsToInclude) {
 		return StringPrinter.buildString(printer -> iterateFiles(subpathsToInclude, (subPath, file) -> {
 			printer.println(subPath + " [" + getFileAttributes(file) + "]");
 		}));
 	}
 
 	/** Dumps the file listing of the folder to the console. */
-	protected String listFiles() {
+	public String listFiles() {
 		return listFiles(subPath -> !subPath.startsWith(".gradle"));
 	}
 
-	protected void iterateFiles(Predicate<String> subpathsToInclude, BiConsumer<String, File> consumer) {
+	public void iterateFiles(Predicate<String> subpathsToInclude, BiConsumer<String, File> consumer) {
 		TreeDef<File> treeDef = TreeDef.forFile(Errors.rethrow());
 		List<File> files = TreeStream.depthFirst(treeDef, rootFolder())
 				.filter(File::isFile)
@@ -180,20 +180,20 @@ protected void iterateFiles(Predicate<String> subpathsToInclude, BiConsumer<Stri
 		}
 	}
 
-	protected String getFileAttributes(File file) {
+	public String getFileAttributes(File file) {
 		return (file.canRead() ? "r" : "-") + (file.canWrite() ? "w" : "-") + (file.canExecute() ? "x" : "-");
 	}
 
-	protected void checkRunsThenUpToDate() throws IOException {
+	public void checkRunsThenUpToDate() throws IOException {
 		checkIsUpToDate(false);
 		checkIsUpToDate(true);
 	}
 
-	protected void applyIsUpToDate(boolean upToDate) throws IOException {
+	public void applyIsUpToDate(boolean upToDate) throws IOException {
 		taskIsUpToDate("spotlessApply", upToDate);
 	}
 
-	protected void checkIsUpToDate(boolean upToDate) throws IOException {
+	public void checkIsUpToDate(boolean upToDate) throws IOException {
 		taskIsUpToDate("spotlessCheck", upToDate);
 	}
 
@@ -215,13 +215,13 @@ private void taskIsUpToDate(String task, boolean upToDate) throws IOException {
 		}
 	}
 
-	protected static List<String> outcomes(BuildResult build, TaskOutcome outcome) {
+	public static List<String> outcomes(BuildResult build, TaskOutcome outcome) {
 		return build.taskPaths(outcome).stream()
 				.filter(s -> !s.equals(":spotlessInternalRegisterDependencies"))
 				.collect(Collectors.toList());
 	}
 
-	protected static List<BuildTask> outcomes(BuildResult build) {
+	public static List<BuildTask> outcomes(BuildResult build) {
 		return build.getTasks().stream()
 				.filter(t -> !t.getPath().equals(":spotlessInternalRegisterDependencies"))
 				.collect(Collectors.toList());
diff --git a/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java b/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java
index 93d08ea157..8d5cdff79f 100644
--- a/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java
+++ b/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java
@@ -53,17 +53,17 @@ public class ResourceHarness {
 	File folderDontUseDirectly;
 
 	/** Returns the root folder (canonicalized to fix OS X issue) */
-	protected File rootFolder() {
+	public File rootFolder() {
 		return Errors.rethrow().get(() -> folderDontUseDirectly.getCanonicalFile());
 	}
 
 	/** Returns a new child of the root folder. */
-	protected File newFile(String subpath) {
+	public File newFile(String subpath) {
 		return new File(rootFolder(), subpath);
 	}
 
 	/** Creates and returns a new child-folder of the root folder. */
-	protected File newFolder(String subpath) throws IOException {
+	public File newFolder(String subpath) throws IOException {
 		File targetDir = newFile(subpath);
 		if (!targetDir.mkdir()) {
 			throw new IOException("Failed to create " + targetDir);
@@ -77,7 +77,7 @@ protected File newFolder(String subpath) throws IOException {
 	 * @return the list of resources in that directory on the classpath, unix-style file separators
 	 * @throws IOException
 	 */
-	protected List<String> listTestResources(String path) throws IOException {
+	public List<String> listTestResources(String path) throws IOException {
 		// add leading slash if required, otherwise resources won't be found
 		if (!path.startsWith("/")) {
 			path = path + "/";
@@ -102,19 +102,19 @@ protected List<String> listTestResources(String path) throws IOException {
 		return filenames;
 	}
 
-	protected String relativeToRoot(String path) {
+	public String relativeToRoot(String path) {
 		return new File(path).toPath().relativize(rootFolder().toPath()).toString();
 	}
 
-	protected String read(String path) throws IOException {
+	public String read(String path) throws IOException {
 		return read(newFile(path).toPath(), StandardCharsets.UTF_8);
 	}
 
-	protected String read(Path path, Charset encoding) throws IOException {
+	public String read(Path path, Charset encoding) throws IOException {
 		return new String(Files.readAllBytes(path), encoding);
 	}
 
-	protected void replace(String path, String toReplace, String replaceWith) throws IOException {
+	public void replace(String path, String toReplace, String replaceWith) throws IOException {
 		String before = read(path);
 		String after = before.replace(toReplace, replaceWith);
 		if (before.equals(after)) {
@@ -124,7 +124,7 @@ protected void replace(String path, String toReplace, String replaceWith) throws
 	}
 
 	/** Returns the contents of the given file from the src/test/resources directory. */
-	protected static String getTestResource(String filename) {
+	public static String getTestResource(String filename) {
 		Optional<URL> resourceUrl = getTestResourceUrl(filename);
 		if (resourceUrl.isPresent()) {
 			return ThrowingEx.get(() -> LineEnding.toUnix(Resources.toString(resourceUrl.get(), StandardCharsets.UTF_8)));
@@ -132,7 +132,7 @@ protected static String getTestResource(String filename) {
 		throw new IllegalArgumentException("No such resource " + filename);
 	}
 
-	protected static boolean existsTestResource(String filename) {
+	public static boolean existsTestResource(String filename) {
 		return getTestResourceUrl(filename).isPresent();
 	}
 
@@ -142,7 +142,7 @@ private static Optional<URL> getTestResourceUrl(String filename) {
 	}
 
 	/** Returns Files (in a temporary folder) which has the contents of the given file from the src/test/resources directory. */
-	protected List<File> createTestFiles(String... filenames) {
+	public List<File> createTestFiles(String... filenames) {
 		List<File> files = new ArrayList<>(filenames.length);
 		for (String filename : filenames) {
 			files.add(createTestFile(filename));
@@ -151,7 +151,7 @@ protected List<File> createTestFiles(String... filenames) {
 	}
 
 	/** Returns a File (in a temporary folder) which has the contents of the given file from the src/test/resources directory. */
-	protected File createTestFile(String filename) {
+	public File createTestFile(String filename) {
 		return createTestFile(filename, UnaryOperator.identity());
 	}
 
@@ -159,7 +159,7 @@ protected File createTestFile(String filename) {
 	 * Returns a File (in a temporary folder) which has the contents, possibly processed, of the given file from the
 	 * src/test/resources directory.
 	 */
-	protected File createTestFile(String filename, UnaryOperator<String> fileContentsProcessor) {
+	public File createTestFile(String filename, UnaryOperator<String> fileContentsProcessor) {
 		int lastSlash = filename.lastIndexOf('/');
 		String name = lastSlash >= 0 ? filename.substring(lastSlash) : filename;
 		File file = newFile(name);
@@ -169,12 +169,12 @@ protected File createTestFile(String filename, UnaryOperator<String> fileContent
 	}
 
 	@CheckReturnValue
-	protected ReadAsserter assertFile(String path) {
+	public ReadAsserter assertFile(String path) {
 		return new ReadAsserter(newFile(path));
 	}
 
 	@CheckReturnValue
-	protected ReadAsserter assertFile(File file) {
+	public ReadAsserter assertFile(File file) {
 		return new ReadAsserter(file);
 	}
 
@@ -207,7 +207,7 @@ public void matches(Consumer<AbstractCharSequenceAssert<?, String>> conditions)
 		}
 	}
 
-	protected WriteAsserter setFile(String path) {
+	public WriteAsserter setFile(String path) {
 		return new WriteAsserter(newFile(path));
 	}
 

From 04f6bf044adde76624923ee996100e656540a9d7 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 8 Dec 2024 10:23:27 -0800
Subject: [PATCH 1952/2068] Fix.

---
 .../gradle/spotless/BumpThisNumberIfACustomStepChangesTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BumpThisNumberIfACustomStepChangesTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BumpThisNumberIfACustomStepChangesTest.java
index 28351bd9b7..25a6b18bca 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BumpThisNumberIfACustomStepChangesTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BumpThisNumberIfACustomStepChangesTest.java
@@ -39,7 +39,7 @@ private void writeContentWithBadFormatting() throws IOException {
 	}
 
 	@Override
-	protected void applyIsUpToDate(boolean upToDate) throws IOException {
+	public void applyIsUpToDate(boolean upToDate) throws IOException {
 		super.applyIsUpToDate(upToDate);
 		assertFile("README.md").hasContent("abc");
 	}

From 77379b4f5ab88531e951accbcf7d14fd98baf80c Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 8 Dec 2024 10:51:43 -0800
Subject: [PATCH 1953/2068] Temporarily disable test that needs npm repo b/c
 it's down right now.

---
 .../gradle/spotless/NpmTestsWithoutNpmInstallationTest.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
index d01d1ab006..50ea620778 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,10 +17,12 @@
 
 import org.assertj.core.api.Assertions;
 import org.gradle.testkit.runner.BuildResult;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.common.base.Predicates;
 
+@Disabled("https://status.npmjs.org/ shows npm services down on 12/8/2024, should undisable this later")
 class NpmTestsWithoutNpmInstallationTest extends GradleIntegrationHarness {
 
 	@Test

From 70cc4916c881b3da9229b09070c651da3c6ab393 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 8 Dec 2024 10:28:29 -0800
Subject: [PATCH 1954/2068] Run the NativeCmd integration test with and without
 the configuration cache to reproduce #2347.

---
 .../spotless/NativeCmdIntegrationTest.java    | 30 ++++++++++++++-----
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NativeCmdIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NativeCmdIntegrationTest.java
index a4f8d6205c..fa08d3b5f0 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NativeCmdIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NativeCmdIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,26 +20,40 @@
 import java.io.File;
 import java.io.IOException;
 
+import org.gradle.testkit.runner.GradleRunner;
 import org.junit.jupiter.api.Test;
 
-class NativeCmdIntegrationTest extends GradleIntegrationHarness {
+interface NativeCmdIntegrationTest {
 	@Test
-	void nativeCmd() throws IOException {
+	default void nativeCmd() throws IOException {
 		// This will only work if /usr/bin/sed is available
 		assumeThat(new File("/usr/bin/sed")).exists();
 
-		setFile("build.gradle").toLines(
+		GradleIntegrationHarness harness = (GradleIntegrationHarness) this;
+		harness.setFile("build.gradle").toLines(
 				"plugins {",
 				"  id 'com.diffplug.spotless'",
 				"}",
 				"spotless {",
+				"  lineEndings 'UNIX'",
 				"  format 'test', {",
-				"    target '**/*.txt'",
+				"    target '*.txt'",
 				"    nativeCmd('sed', '/usr/bin/sed', ['s/placeholder/replaced/g'])",
 				"  }",
 				"}");
-		setFile("test.txt").toResource("native_cmd/dirty.txt");
-		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("test.txt").sameAsResource("native_cmd/clean.txt");
+		harness.setFile("test.txt").toResource("native_cmd/dirty.txt");
+		harness.gradleRunner().withArguments("spotlessApply", "--stacktrace").build();
+		harness.assertFile("test.txt").sameAsResource("native_cmd/clean.txt");
+	}
+
+	class NativeCmdWithoutConfigCacheTest extends GradleIntegrationHarness implements NativeCmdIntegrationTest {}
+
+	class NativeCmdWithConfigCacheTest extends GradleIntegrationHarness implements NativeCmdIntegrationTest {
+		@Override
+		public GradleRunner gradleRunner() throws IOException {
+			setFile("gradle.properties").toContent("org.gradle.unsafe.configuration-cache=true");
+			setFile("settings.gradle").toContent("enableFeaturePreview(\"STABLE_CONFIGURATION_CACHE\")");
+			return super.gradleRunner().withGradleVersion(GradleVersionSupport.CONFIGURATION_CACHE.version);
+		}
 	}
 }

From b0837a2b7c15997d5367187d6c0306507617e7df Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 8 Dec 2024 10:16:43 -0800
Subject: [PATCH 1955/2068] It seems that Gradle's custom serialization doesn't
 support the `List.of()` stuff introduced in recent JDKs....

---
 lib/src/main/java/com/diffplug/spotless/FileSignature.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/FileSignature.java b/lib/src/main/java/com/diffplug/spotless/FileSignature.java
index 3d37ec2983..0d26d86ff8 100644
--- a/lib/src/main/java/com/diffplug/spotless/FileSignature.java
+++ b/lib/src/main/java/com/diffplug/spotless/FileSignature.java
@@ -126,7 +126,7 @@ public static Promised promise(Iterable<File> files) {
 	}
 
 	public static Promised promise(File file) {
-		return new Promised(List.of(file), null);
+		return new Promised(MoreIterables.toNullHostileList(List.of(file)), null);
 	}
 
 	/** Returns all of the files in this signature, throwing an exception if there are more or less than 1 file. */

From bcfe83fccbca9e03b635357fe10b3d56d57074a8 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 9 Dec 2024 08:09:15 -0800
Subject: [PATCH 1956/2068] Stop using `STABLE_CONFIGURATION_CACHE` because it
 causes error in some versions of Gradle.

---
 .../com/diffplug/gradle/spotless/NativeCmdIntegrationTest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NativeCmdIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NativeCmdIntegrationTest.java
index fa08d3b5f0..418bded954 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NativeCmdIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NativeCmdIntegrationTest.java
@@ -52,7 +52,7 @@ class NativeCmdWithConfigCacheTest extends GradleIntegrationHarness implements N
 		@Override
 		public GradleRunner gradleRunner() throws IOException {
 			setFile("gradle.properties").toContent("org.gradle.unsafe.configuration-cache=true");
-			setFile("settings.gradle").toContent("enableFeaturePreview(\"STABLE_CONFIGURATION_CACHE\")");
+			setFile("gradle.properties").toContent("org.gradle.configuration-cache=true");
 			return super.gradleRunner().withGradleVersion(GradleVersionSupport.CONFIGURATION_CACHE.version);
 		}
 	}

From 4938c84e34a6f45a2c4e08ce70236e8972562ee3 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 9 Dec 2024 10:55:44 -0800
Subject: [PATCH 1957/2068] Undisable the npm test now that status.npmjs is
 happy again.

---
 .../gradle/spotless/NpmTestsWithoutNpmInstallationTest.java     | 2 --
 1 file changed, 2 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
index 50ea620778..22fe466dbe 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
@@ -17,12 +17,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.gradle.testkit.runner.BuildResult;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.common.base.Predicates;
 
-@Disabled("https://status.npmjs.org/ shows npm services down on 12/8/2024, should undisable this later")
 class NpmTestsWithoutNpmInstallationTest extends GradleIntegrationHarness {
 
 	@Test

From 9622652306e6a0648fa15b11b8fb24af3aaa721e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 12 Dec 2024 14:14:26 +0000
Subject: [PATCH 1958/2068] chore(deps): update plugin com.gradle.develocity to
 v3.19

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 1622334690..9ad8043d93 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -20,7 +20,7 @@ plugins {
 	// https://github.com/davidburstrom/version-compatibility-gradle-plugin/tags
 	id 'io.github.davidburstrom.version-compatibility' version '0.5.0' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.develocity
-	id 'com.gradle.develocity' version '3.18.2'
+	id 'com.gradle.develocity' version '3.19'
 	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
 	id 'dev.equo.ide' version '1.7.7' apply false
 }

From f60191692f5f0b8537660cd0fe174e05d172acf9 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 12 Dec 2024 21:59:31 -0800
Subject: [PATCH 1959/2068] Disable a long-failing test.

---
 .../spotless/maven/npm/NpmStepsWithNpmInstallCacheTest.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/npm/NpmStepsWithNpmInstallCacheTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/npm/NpmStepsWithNpmInstallCacheTest.java
index aae587aadb..eabdd5c5fc 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/npm/NpmStepsWithNpmInstallCacheTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/npm/NpmStepsWithNpmInstallCacheTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@
 import java.nio.file.attribute.BasicFileAttributes;
 
 import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.ProcessRunner.Result;
@@ -67,6 +68,7 @@ void prettierTypescriptWithDefaultCache() throws Exception {
 				.doesNotContain("Using cached node_modules for");
 	}
 
+	@Disabled
 	@Test
 	void prettierTypescriptWithDefaultCacheIsReusedOnSecondRun() throws Exception {
 		String suffix = "ts";
@@ -109,6 +111,7 @@ void prettierTypescriptWithSpecificCache() throws Exception {
 				.doesNotContain("Using cached node_modules for");
 	}
 
+	@Disabled
 	@Test
 	void prettierTypescriptWithSpecificCacheIsUsedOnSecondRun() throws Exception {
 		String suffix = "ts";

From 3ddb27f7141fb51f349f38a269ae2e8918fe334d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 17 Dec 2024 10:29:16 +0800
Subject: [PATCH 1960/2068] fix(deps): update dependency
 org.junit.jupiter:junit-jupiter to v5.11.4 (#2367)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 7a013b69b0..b0fd9c0a14 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -29,7 +29,7 @@ VER_SLF4J=[1.6,2.0[
 # Used in multiple places
 VER_DURIAN=1.2.0
 VER_JGIT=6.10.0.202406032230-r
-VER_JUNIT=5.11.3
+VER_JUNIT=5.11.4
 VER_ASSERTJ=3.26.3
 VER_MOCKITO=5.14.2
 VER_SELFIE=2.4.1
\ No newline at end of file

From 433ed77bd7c581a73ff9e1def0c2ce040753623e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 19 Dec 2024 05:09:38 +0000
Subject: [PATCH 1961/2068] chore(deps): update plugin com.github.spotbugs to
 v6.0.27

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 9ad8043d93..2f4e775113 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,7 +12,7 @@ plugins {
 	// https://github.com/gradle-nexus/publish-plugin/releases
 	id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
-	id 'com.github.spotbugs' version '6.0.26' apply false
+	id 'com.github.spotbugs' version '6.0.27' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
 	id 'com.diffplug.spotless-changelog' version '3.1.2' apply false
 	// https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md

From f18f031e9f8ebed371c657d1629b4d956b68a89e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 21 Dec 2024 15:29:25 +0800
Subject: [PATCH 1962/2068] chore(deps): update dependency gradle to v8.12
 (#2370)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 gradlew                                  | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e2847c8200..cea7a793a8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index f5feea6d6b..f3b75f3b0d 100755
--- a/gradlew
+++ b/gradlew
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

From 93bbdd0664f2258aaaf5c4ce9c0ea8d5ecf441b2 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 1 Jan 2025 10:51:10 -0800
Subject: [PATCH 1963/2068] Remove support for Eclipse CDT 10.7, since it has
 been archived by Eclipse.org.

---
 lib-extra/build.gradle                                        | 2 +-
 .../diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index 577954fd3a..a9e50d7d97 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -77,7 +77,7 @@ p2deps {
 	// (alphabetic order please)
 	into 'cdtCompileOnly', {
 		p2repo 'https://download.eclipse.org/eclipse/updates/4.26/'
-		p2repo 'https://download.eclipse.org/tools/cdt/releases/10.7/'
+		p2repo 'https://download.eclipse.org/tools/cdt/releases/11.0/'
 		install 'org.eclipse.cdt.core'
 	}
 	into 'groovyCompileOnly', {
diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java
index 9fcd595aa8..81c4f9dc85 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@ public final class EclipseCdtFormatterStep {
 	private EclipseCdtFormatterStep() {}
 
 	private static final String NAME = "eclipse cdt formatter";
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "10.7").add(17, "11.6");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "11.0").add(17, "11.6");
 
 	public static String defaultVersion() {
 		return JVM_SUPPORT.getRecommendedFormatterVersion();

From 7b8783365b292ce96fba297380bc39a1289bf83a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 1 Jan 2025 18:55:05 +0000
Subject: [PATCH 1964/2068] fix(deps): update ver_selfie to v2.4.2

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index b0fd9c0a14..0b25c9c47e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -32,4 +32,4 @@ VER_JGIT=6.10.0.202406032230-r
 VER_JUNIT=5.11.4
 VER_ASSERTJ=3.26.3
 VER_MOCKITO=5.14.2
-VER_SELFIE=2.4.1
\ No newline at end of file
+VER_SELFIE=2.4.2
\ No newline at end of file

From af00c5b3d4cd18b920ce1b27f44556bae49f7a88 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 1 Jan 2025 18:56:42 +0000
Subject: [PATCH 1965/2068] fix(deps): update dependency
 org.assertj:assertj-core to v3.27.1

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index b0fd9c0a14..9e2fc0f9d0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -30,6 +30,6 @@ VER_SLF4J=[1.6,2.0[
 VER_DURIAN=1.2.0
 VER_JGIT=6.10.0.202406032230-r
 VER_JUNIT=5.11.4
-VER_ASSERTJ=3.26.3
+VER_ASSERTJ=3.27.1
 VER_MOCKITO=5.14.2
 VER_SELFIE=2.4.1
\ No newline at end of file

From eb31e75766fe2a7a91302a00fa78d13e3be5a5a7 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 1 Jan 2025 10:57:15 -0800
Subject: [PATCH 1966/2068] Update changelog.

---
 CHANGES.md               | 2 ++
 plugin-gradle/CHANGES.md | 1 +
 plugin-maven/CHANGES.md  | 1 +
 3 files changed, 4 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 22b2b73e27..552dbab317 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,10 +17,12 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `jackson` version to latest `2.18.0` -> `2.18.1`. ([#2319](https://github.com/diffplug/spotless/pull/2319))
 * Bump default `ktfmt` version to latest `0.52` -> `0.53`. ([#2320](https://github.com/diffplug/spotless/pull/2320))
 * Bump default `ktlint` version to latest `1.4.0` -> `1.5.0`. ([#2354](https://github.com/diffplug/spotless/pull/2354))
+* Bump minimum `eclipse-cdt` version to `11.0` (removed support for `10.7`). ([#2373](https://github.com/diffplug/spotless/pull/2373))
 ### Fixed
 * You can now use `removeUnusedImports` and `googleJavaFormat` at the same time again. (fixes [#2159](https://github.com/diffplug/spotless/issues/2159))
 * The default list of type annotations used by `formatAnnotations` now includes Jakarta Validation's `Valid` and constraints validations (fixes [#2334](https://github.com/diffplug/spotless/issues/2334))
 
+
 ## [3.0.0.BETA4] - 2024-10-24
 ### Added
 * APIs to support linting. (implemented in [#2148](https://github.com/diffplug/spotless/pull/2148), [#2149](https://github.com/diffplug/spotless/pull/2149), [#2307](https://github.com/diffplug/spotless/pull/2307))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 75dda49f56..109ffff68c 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -9,6 +9,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `jackson` version to latest `2.18.0` -> `2.18.1`. ([#2319](https://github.com/diffplug/spotless/pull/2319))
 * Bump default `ktfmt` version to latest `0.52` -> `0.53`. ([#2320](https://github.com/diffplug/spotless/pull/2320))
 * Bump default `ktlint` version to latest `1.4.0` -> `1.5.0`. ([#2354](https://github.com/diffplug/spotless/pull/2354))
+* Bump minimum `eclipse-cdt` version to `11.0` (removed support for `10.7`). ([#2373](https://github.com/diffplug/spotless/pull/2373))
 ### Fixed
 * You can now use `removeUnusedImports` and `googleJavaFormat` at the same time again. (fixes [#2159](https://github.com/diffplug/spotless/issues/2159))
 * The default list of type annotations used by `formatAnnotations` now includes Jakarta Validation's `Valid` and constraints validations (fixes [#2334](https://github.com/diffplug/spotless/issues/2334))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index d6250d110e..b675af15f1 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -8,6 +8,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `jackson` version to latest `2.18.0` -> `2.18.1`. ([#2319](https://github.com/diffplug/spotless/pull/2319))
 * Bump default `ktfmt` version to latest `0.52` -> `0.53`. ([#2320](https://github.com/diffplug/spotless/pull/2320))
 * Bump default `ktlint` version to latest `1.4.0` -> `1.5.0`. ([#2354](https://github.com/diffplug/spotless/pull/2354))
+* Bump minimum `eclipse-cdt` version to `11.0` (removed support for `10.7`). ([#2373](https://github.com/diffplug/spotless/pull/2373))
 ### Fixed
 * You can now use `removeUnusedImports` and `googleJavaFormat` at the same time again. (fixes [#2159](https://github.com/diffplug/spotless/issues/2159))
 * The default list of type annotations used by `formatAnnotations` now includes Jakarta Validation's `Valid` and constraints validations (fixes [#2334](https://github.com/diffplug/spotless/issues/2334))

From aab831cc5d3c054d0493fcff41e3689309f6dce2 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 1 Jan 2025 11:12:24 -0800
Subject: [PATCH 1967/2068] Remove the Eclipse CDT stuff from the build and
 tests on Java 11. We can remove this complexity if we remove support for Java
 11 (see #2375)

---
 lib-extra/build.gradle                             | 14 +++++++++-----
 .../extra/cpp/EclipseCdtFormatterStep.java         |  2 +-
 .../extra/cpp/EclipseCdtFormatterStepTest.java     |  8 ++++++--
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index a9e50d7d97..5e056a8384 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -50,6 +50,9 @@ def NEEDS_P2_DEPS = [
 	'groovy',
 	'jdt'
 ]
+if (!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
+	NEEDS_P2_DEPS.remove('cdt')
+}
 for (needsP2 in NEEDS_P2_DEPS) {
 	sourceSets.register(needsP2) {
 		compileClasspath += sourceSets.main.output
@@ -74,11 +77,12 @@ tasks.withType(Test).configureEach {
 
 apply plugin: 'dev.equo.p2deps'
 p2deps {
-	// (alphabetic order please)
-	into 'cdtCompileOnly', {
-		p2repo 'https://download.eclipse.org/eclipse/updates/4.26/'
-		p2repo 'https://download.eclipse.org/tools/cdt/releases/11.0/'
-		install 'org.eclipse.cdt.core'
+	if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
+		into 'cdtCompileOnly', {
+			p2repo 'https://download.eclipse.org/eclipse/updates/4.26/'
+			p2repo 'https://download.eclipse.org/tools/cdt/releases/11.0/'
+			install 'org.eclipse.cdt.core'
+		}
 	}
 	into 'groovyCompileOnly', {
 		p2repo 'https://download.eclipse.org/eclipse/updates/4.26/'
diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java
index 81c4f9dc85..9582eeed31 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java
@@ -38,7 +38,7 @@ public final class EclipseCdtFormatterStep {
 	private EclipseCdtFormatterStep() {}
 
 	private static final String NAME = "eclipse cdt formatter";
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "11.0").add(17, "11.6");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(17, "11.6");
 
 	public static String defaultVersion() {
 		return JVM_SUPPORT.getRecommendedFormatterVersion();
diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStepTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStepTest.java
index 144310b654..c2a1c4703f 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStepTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,11 @@
  */
 package com.diffplug.spotless.extra.cpp;
 
+import static org.junit.jupiter.api.condition.JRE.JAVA_17;
+
 import java.util.stream.Stream;
 
+import org.junit.jupiter.api.condition.EnabledForJreRange;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
@@ -30,6 +33,7 @@ public EclipseCdtFormatterStepTest() {
 
 	@ParameterizedTest
 	@MethodSource
+	@EnabledForJreRange(min = JAVA_17)
 	void formatWithVersion(String version) throws Exception {
 		harnessFor(version).test("main.c",
 				"#include <a.h>;\nint main(int argc,   \nchar *argv[]) {}",
@@ -37,6 +41,6 @@ void formatWithVersion(String version) throws Exception {
 	}
 
 	private static Stream<String> formatWithVersion() {
-		return Stream.of("10.6", "10.7", EclipseCdtFormatterStep.defaultVersion());
+		return Stream.of("11.0", "11.6", EclipseCdtFormatterStep.defaultVersion());
 	}
 }

From 888949f4ba01a118116150352bf988cb5cdc3e8b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 2 Jan 2025 20:29:18 +0000
Subject: [PATCH 1968/2068] fix(deps): update dependency
 org.mockito:mockito-core to v5.15.2

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index d8aff9b6a5..c773948ca2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -31,5 +31,5 @@ VER_DURIAN=1.2.0
 VER_JGIT=6.10.0.202406032230-r
 VER_JUNIT=5.11.4
 VER_ASSERTJ=3.27.1
-VER_MOCKITO=5.14.2
+VER_MOCKITO=5.15.2
 VER_SELFIE=2.4.2
\ No newline at end of file

From e0fd3a9ea3e0fc1ae2f7350e6665cdef6894832c Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 2 Jan 2025 09:47:19 -0800
Subject: [PATCH 1969/2068] Test `toggleOffOn` with and without configuration
 cache.

---
 .../gradle/spotless/ToggleOffOnTest.java      | 79 +++++++++++++++++--
 1 file changed, 74 insertions(+), 5 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ToggleOffOnTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ToggleOffOnTest.java
index 9b9e887749..8ed5703504 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ToggleOffOnTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ToggleOffOnTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 DiffPlug
+ * Copyright 2020-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,17 +17,48 @@
 
 import java.io.IOException;
 
+import org.gradle.testkit.runner.GradleRunner;
 import org.junit.jupiter.api.Test;
 
-class ToggleOffOnTest extends GradleIntegrationHarness {
+abstract class ToggleOffOnTest extends GradleIntegrationHarness {
+	private boolean useConfigCache;
+
+	ToggleOffOnTest(boolean useConfigCache) {
+		this.useConfigCache = useConfigCache;
+	}
+
+	static class WithConfigCache extends ToggleOffOnTest {
+		WithConfigCache() {
+			super(true);
+		}
+	}
+
+	static class WithoutConfigCache extends ToggleOffOnTest {
+		WithoutConfigCache() {
+			super(false);
+		}
+	}
+
+	@Override
+	public GradleRunner gradleRunner() throws IOException {
+		if (useConfigCache) {
+			setFile("gradle.properties").toLines("org.gradle.unsafe.configuration-cache=true",
+					"org.gradle.configuration-cache=true");
+			return super.gradleRunner().withGradleVersion(GradleVersionSupport.CONFIGURATION_CACHE.version);
+		} else {
+			return super.gradleRunner();
+		}
+	}
+
 	@Test
-	void toggleOffOn() throws IOException {
+	void lowercase() throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins { id 'com.diffplug.spotless' }",
 				"spotless {",
+				"  lineEndings 'UNIX'",
 				"  format 'toLower', {",
 				"    target '**/*.md'",
-				"    custom 'lowercase', { str -> str.toLowerCase() }",
+				"    addStep(com.diffplug.spotless.TestingOnly.lowercase())",
 				"    toggleOffOn()",
 				"  }",
 				"}");
@@ -37,7 +68,23 @@ void toggleOffOn() throws IOException {
 				"D E F",
 				"spotless:on",
 				"G H I");
-		gradleRunner().withArguments("spotlessApply").build();
+		gradleRunner().withArguments("spotlessApply", "--stacktrace").build();
+		assertFile("test.md").hasLines(
+				"a b c",
+				"spotless:off",
+				"D E F",
+				"spotless:on",
+				"g h i");
+		gradleRunner().withArguments("spotlessApply", "--stacktrace").build();
+		gradleRunner().withArguments("spotlessApply", "--stacktrace").build();
+		gradleRunner().withArguments("spotlessApply", "--stacktrace").build();
+		setFile("test.md").toLines(
+				"A B C",
+				"spotless:off",
+				"D E F",
+				"spotless:on",
+				"G H I");
+		gradleRunner().withArguments("spotlessApply", "--stacktrace").build();
 		assertFile("test.md").hasLines(
 				"a b c",
 				"spotless:off",
@@ -45,4 +92,26 @@ void toggleOffOn() throws IOException {
 				"spotless:on",
 				"g h i");
 	}
+
+	@Test
+	void gjf() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"",
+				"spotless {",
+				"    java {",
+				"        target file('test.java')",
+				"        googleJavaFormat('1.17.0')",
+				"        toggleOffOn()",
+				"    }",
+				"}");
+
+		setFile("test.java").toResource("java/googlejavaformat/JavaCodeUnformatted.test");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("test.java").sameAsResource("java/googlejavaformat/JavaCodeFormatted.test");
+		gradleRunner().withArguments("spotlessCheck").build();
+	}
 }

From 02e0140ef139fa38d73e9677ac02a9cdc06f66f5 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 2 Jan 2025 14:33:37 -0800
Subject: [PATCH 1970/2068] Make the `FormatterStep` arguments a little bit
 more forgiving.

---
 lib/src/main/java/com/diffplug/spotless/FormatterStep.java  | 6 +++---
 .../spotless/FormatterStepSerializationRoundtrip.java       | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
index 870ef0ee18..a26ade4a41 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -106,7 +106,7 @@ static <RoundtripState extends Serializable, EqualityState extends Serializable>
 			String name,
 			ThrowingEx.Supplier<RoundtripState> roundtripInit,
 			SerializedFunction<RoundtripState, EqualityState> equalityFunc,
-			SerializedFunction<EqualityState, FormatterFunc> formatterFunc) {
+			SerializedFunction<EqualityState, ? extends FormatterFunc> formatterFunc) {
 		return new FormatterStepSerializationRoundtrip<>(name, roundtripInit, equalityFunc, formatterFunc);
 	}
 
@@ -128,7 +128,7 @@ static <RoundtripState extends Serializable, EqualityState extends Serializable>
 			String name,
 			RoundtripState roundTrip,
 			SerializedFunction<RoundtripState, EqualityState> equalityFunc,
-			SerializedFunction<EqualityState, FormatterFunc> formatterFunc) {
+			SerializedFunction<EqualityState, ? extends FormatterFunc> formatterFunc) {
 		return createLazy(name, () -> roundTrip, equalityFunc, formatterFunc);
 	}
 
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java b/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java
index f7f95076c2..f577760b74 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStepSerializationRoundtrip.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 DiffPlug
+ * Copyright 2023-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,9 +30,9 @@ final class FormatterStepSerializationRoundtrip<RoundtripState extends Serializa
 	private @Nullable RoundtripState roundtripStateInternal;
 	private @Nullable EqualityState equalityStateInternal;
 	private final SerializedFunction<RoundtripState, EqualityState> equalityStateExtractor;
-	private final SerializedFunction<EqualityState, FormatterFunc> equalityStateToFormatter;
+	private final SerializedFunction<EqualityState, ? extends FormatterFunc> equalityStateToFormatter;
 
-	FormatterStepSerializationRoundtrip(String name, ThrowingEx.Supplier<RoundtripState> initializer, SerializedFunction<RoundtripState, EqualityState> equalityStateExtractor, SerializedFunction<EqualityState, FormatterFunc> equalityStateToFormatter) {
+	FormatterStepSerializationRoundtrip(String name, ThrowingEx.Supplier<RoundtripState> initializer, SerializedFunction<RoundtripState, EqualityState> equalityStateExtractor, SerializedFunction<EqualityState, ? extends FormatterFunc> equalityStateToFormatter) {
 		this.name = name;
 		this.initializer = initializer;
 		this.equalityStateExtractor = equalityStateExtractor;

From d8735bab618909945adda7775a9739519587488e Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 2 Jan 2025 14:36:54 -0800
Subject: [PATCH 1971/2068] Update `FenceStep` so that it uses
 `FormatterStep.createLazy`

---
 .../diffplug/spotless/generic/FenceStep.java  | 156 ++++++++----------
 1 file changed, 68 insertions(+), 88 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java b/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
index 71b48159cd..1359053335 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 DiffPlug
+ * Copyright 2020-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,9 +24,9 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.annotation.Nullable;
-
+import com.diffplug.spotless.ConfigurationCacheHackList;
 import com.diffplug.spotless.Formatter;
+import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.LineEnding;
 import com.diffplug.spotless.Lint;
@@ -80,8 +80,7 @@ private void assertRegexSet() {
 
 	/** Returns a step which will apply the given steps but preserve the content selected by the regex / openClose pair. */
 	public FormatterStep preserveWithin(List<FormatterStep> steps) {
-		assertRegexSet();
-		return new PreserveWithin(name, regex, steps);
+		return createStep(Kind.PRESERVE, steps);
 	}
 
 	/**
@@ -89,85 +88,74 @@ public FormatterStep preserveWithin(List<FormatterStep> steps) {
 	 * Linting within the substeps is not supported.
 	 */
 	public FormatterStep applyWithin(List<FormatterStep> steps) {
+		return createStep(Kind.APPLY, steps);
+	}
+
+	private FormatterStep createStep(Kind kind, List<FormatterStep> steps) {
 		assertRegexSet();
-		return new ApplyWithin(name, regex, steps);
+		return FormatterStep.createLazy(name, () -> new RoundtripAndEqualityState(kind, regex, steps, false),
+				RoundtripAndEqualityState::toEqualityState,
+				RoundtripAndEqualityState::toFormatterFunc);
 	}
 
-	static class ApplyWithin extends BaseStep {
-		private static final long serialVersionUID = 17061466531957339L;
+	private enum Kind {
+		APPLY, PRESERVE
+	}
 
-		ApplyWithin(String name, Pattern regex, List<FormatterStep> steps) {
-			super(name, regex, steps);
-		}
+	private static class RoundtripAndEqualityState implements Serializable {
+		final String regexPattern;
+		final int regexFlags;
+		final Kind kind;
+		final ConfigurationCacheHackList steps;
 
-		@Override
-		protected String applySubclass(Formatter formatter, String unix, File file) {
-			List<String> groups = groupsZeroed();
-			Matcher matcher = regex.matcher(unix);
-			while (matcher.find()) {
-				// apply the formatter to each group
-				groups.add(formatter.compute(matcher.group(1), file));
-			}
-			// and then assemble the result right away
-			return assembleGroups(unix);
+		/** Roundtrip state. */
+		private RoundtripAndEqualityState(Kind kind, Pattern regex, List<FormatterStep> steps, boolean optimizeForEquality) {
+			this.kind = kind;
+			this.regexPattern = regex.pattern();
+			this.regexFlags = regex.flags();
+			this.steps = optimizeForEquality ? ConfigurationCacheHackList.forEquality() : ConfigurationCacheHackList.forRoundtrip();
+			this.steps.addAll(steps);
 		}
-	}
 
-	static class PreserveWithin extends BaseStep {
-		private static final long serialVersionUID = -8676786492305178343L;
+		private Pattern regex() {
+			return Pattern.compile(regexPattern, regexFlags);
+		}
 
-		PreserveWithin(String name, Pattern regex, List<FormatterStep> steps) {
-			super(name, regex, steps);
+		private List<FormatterStep> steps() {
+			return steps.getSteps();
 		}
 
-		private void storeGroups(String unix) {
-			List<String> groups = groupsZeroed();
-			Matcher matcher = regex.matcher(unix);
-			while (matcher.find()) {
-				// store whatever is within the open/close tags
-				groups.add(matcher.group(1));
-			}
+		public RoundtripAndEqualityState toEqualityState() {
+			return new RoundtripAndEqualityState(kind, regex(), steps(), true);
 		}
 
-		@Override
-		protected String applySubclass(Formatter formatter, String unix, File file) {
-			storeGroups(unix);
-			String formatted = formatter.compute(unix, file);
-			return assembleGroups(formatted);
+		public BaseFormatter toFormatterFunc() {
+			return new BaseFormatter(kind, this);
 		}
 	}
 
 	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
-	private static abstract class BaseStep implements Serializable, FormatterStep {
-		final String name;
-		private static final long serialVersionUID = -2301848328356559915L;
+	private static class BaseFormatter implements FormatterFunc.NeedsFile, FormatterFunc.Closeable {
+		final Kind kind;
 		final Pattern regex;
 		final List<FormatterStep> steps;
 
-		transient ArrayList<String> groups = new ArrayList<>();
-		transient StringBuilder builderInternal;
+		final ArrayList<String> groups = new ArrayList<>();
+		final StringBuilder builderInternal = new StringBuilder();
 
-		public BaseStep(String name, Pattern regex, List<FormatterStep> steps) {
-			this.name = name;
-			this.regex = regex;
-			this.steps = steps;
+		public BaseFormatter(Kind kind, RoundtripAndEqualityState state) {
+			this.kind = kind;
+			this.regex = state.regex();
+			this.steps = state.steps();
 		}
 
 		protected ArrayList<String> groupsZeroed() {
-			if (groups == null) {
-				groups = new ArrayList<>();
-			} else {
-				groups.clear();
-			}
+			groups.clear();
 			return groups;
 		}
 
 		private StringBuilder builderZeroed() {
-			if (builderInternal == null) {
-				builderInternal = new StringBuilder();
-			} else {
-				builderInternal.setLength(0);
-			}
+			builderInternal.setLength(0);
 			return builderInternal;
 		}
 
@@ -215,41 +203,33 @@ protected String assembleGroups(String unix) {
 			}
 		}
 
-		@Override
-		public String getName() {
-			return name;
-		}
+		private Formatter formatter;
 
-		private transient Formatter formatter;
-
-		private String apply(String rawUnix, File file) throws Exception {
+		@Override
+		public String applyWithFile(String unix, File file) throws Exception {
 			if (formatter == null) {
 				formatter = buildFormatter();
 			}
-			return applySubclass(formatter, rawUnix, file);
-		}
-
-		@Nullable
-		@Override
-		public String format(String rawUnix, File file) throws Exception {
-			return apply(rawUnix, file);
-		}
-
-		protected abstract String applySubclass(Formatter formatter, String unix, File file) throws Exception;
-
-		@Override
-		public boolean equals(Object o) {
-			if (this == o)
-				return true;
-			if (o == null || getClass() != o.getClass())
-				return false;
-			BaseStep step = (BaseStep) o;
-			return name.equals(step.name) && regex.pattern().equals(step.regex.pattern()) && regex.flags() == step.regex.flags() && steps.equals(step.steps);
-		}
-
-		@Override
-		public int hashCode() {
-			return Objects.hash(name, regex.pattern(), regex.flags(), steps);
+			List<String> groups = groupsZeroed();
+			Matcher matcher = regex.matcher(unix);
+			switch (kind) {
+			case APPLY:
+				while (matcher.find()) {
+					// apply the formatter to each group
+					groups.add(formatter.compute(matcher.group(1), file));
+				}
+				// and then assemble the result right away
+				return assembleGroups(unix);
+			case PRESERVE:
+				while (matcher.find()) {
+					// store whatever is within the open/close tags
+					groups.add(matcher.group(1));
+				}
+				String formatted = formatter.compute(unix, file);
+				return assembleGroups(formatted);
+			default:
+				throw new Error();
+			}
 		}
 
 		@Override

From f830b2d6f563632b1c9ad430c9a67258f7511f16 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 2 Jan 2025 17:43:25 -0800
Subject: [PATCH 1972/2068] Update changelogs.

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 552dbab317..9bb962e902 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -34,6 +34,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changed
 * **BREAKING** Moved `PaddedCell.DirtyState` to its own top-level class with new methods. ([#2148](https://github.com/diffplug/spotless/pull/2148))
   * **BREAKING** Removed `isClean`, `applyTo`, and `applyToAndReturnResultIfDirty` from `Formatter` because users should instead use `DirtyState`.
+* `FenceStep` now uses `ConfigurationCacheHack`. ([#2378](https://github.com/diffplug/spotless/pull/2378) fixes [#2317](https://github.com/diffplug/spotless/issues/2317))  
 ### Fixed
 * `ktlint` steps now read from the `string` instead of the `file` so they don't clobber earlier steps. (fixes [#1599](https://github.com/diffplug/spotless/issues/1599))
 
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 109ffff68c..cd77663c4d 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -11,6 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktlint` version to latest `1.4.0` -> `1.5.0`. ([#2354](https://github.com/diffplug/spotless/pull/2354))
 * Bump minimum `eclipse-cdt` version to `11.0` (removed support for `10.7`). ([#2373](https://github.com/diffplug/spotless/pull/2373))
 ### Fixed
+* `toggleOffOn` now works with the configuration cache. ([#2378](https://github.com/diffplug/spotless/pull/2378) fixes [#2317](https://github.com/diffplug/spotless/issues/2317))
 * You can now use `removeUnusedImports` and `googleJavaFormat` at the same time again. (fixes [#2159](https://github.com/diffplug/spotless/issues/2159))
 * The default list of type annotations used by `formatAnnotations` now includes Jakarta Validation's `Valid` and constraints validations (fixes [#2334](https://github.com/diffplug/spotless/issues/2334))
 * `indentWith[Spaces|Tabs]` has been deprecated in favor of `leadingTabsToSpaces` and `leadingSpacesToTabs`. ([#2350](https://github.com/diffplug/spotless/pull/2350) fixes [#794](https://github.com/diffplug/spotless/issues/794))

From 2264f118c2592f0d1f2efc01c4351a02c4252733 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 2 Jan 2025 17:43:29 -0800
Subject: [PATCH 1973/2068] Fix spotbugs.

---
 lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java b/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
index 1359053335..7d98219231 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
@@ -103,6 +103,7 @@ private enum Kind {
 	}
 
 	private static class RoundtripAndEqualityState implements Serializable {
+		private static final long serialVersionUID = 272603249547598947L;
 		final String regexPattern;
 		final int regexFlags;
 		final Kind kind;

From c8d5ceeb51593a5f7e084895f6197020ee73eaa0 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 3 Jan 2025 13:45:58 -0800
Subject: [PATCH 1974/2068] Fix the name of GJF steps.

---
 .../java/com/diffplug/spotless/java/GoogleJavaFormatStep.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
index 703bf16d6b..d73f97cb5c 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
@@ -105,12 +105,12 @@ private static FormatterStep createInternally(String name, String groupArtifact,
 
 		GoogleJavaFormatStep step = new GoogleJavaFormatStep(JarState.promise(() -> JarState.from(groupArtifact + ":" + version, provisioner)), version, style, reflowLongStrings, reorderImports, formatJavadoc);
 		if (removeImports) {
-			return FormatterStep.create(NAME,
+			return FormatterStep.create(name,
 					step,
 					GoogleJavaFormatStep::equalityState,
 					State::createRemoveUnusedImportsOnly);
 		} else {
-			return FormatterStep.create(NAME,
+			return FormatterStep.create(name,
 					step,
 					GoogleJavaFormatStep::equalityState,
 					State::createFormat);

From 71d49b0c2fd50abb9fdbad65d10aa720bc507990 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 3 Jan 2025 13:46:32 -0800
Subject: [PATCH 1975/2068] Make `ConfigurationCacheHackList` safe from Java's
 object serialization foibles.

---
 .../spotless/ConfigurationCacheHackList.java  | 27 ++++++++++++++++---
 .../spotless/LazyForwardingEquality.java      | 12 ++++++++-
 .../spotless/java/GoogleJavaFormatStep.java   |  2 +-
 .../spotless/StepHarnessWithFile.java         | 12 ++++++++-
 .../spotless/generic/FenceStepTest.java       |  5 ++--
 5 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/ConfigurationCacheHackList.java b/lib/src/main/java/com/diffplug/spotless/ConfigurationCacheHackList.java
index 6bbc6ff2a6..da12f041ba 100644
--- a/lib/src/main/java/com/diffplug/spotless/ConfigurationCacheHackList.java
+++ b/lib/src/main/java/com/diffplug/spotless/ConfigurationCacheHackList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 DiffPlug
+ * Copyright 2024-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
  */
 package com.diffplug.spotless;
 
+import java.io.IOException;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -48,8 +50,27 @@
  */
 public class ConfigurationCacheHackList implements java.io.Serializable {
 	private static final long serialVersionUID = 1L;
-	private final boolean optimizeForEquality;
-	private final ArrayList<Object> backingList = new ArrayList<>();
+	private boolean optimizeForEquality;
+	public ArrayList<Object> backingList = new ArrayList<>();
+
+	private void writeObject(java.io.ObjectOutputStream out) throws IOException {
+		out.writeBoolean(optimizeForEquality);
+		out.writeInt(backingList.size());
+		for (Object obj : backingList) {
+			// if write out the list on its own, we'll get java's non-deterministic object-graph serialization
+			// by writing each object to raw bytes independently, we avoid this
+			out.writeObject(LazyForwardingEquality.toBytes((Serializable) obj));
+		}
+	}
+
+	private void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException {
+		optimizeForEquality = in.readBoolean();
+		backingList = new ArrayList<>();
+		int size = in.readInt();
+		for (int i = 0; i < size; i++) {
+			backingList.add(LazyForwardingEquality.fromBytes((byte[]) in.readObject()));
+		}
+	}
 
 	public static ConfigurationCacheHackList forEquality() {
 		return new ConfigurationCacheHackList(true);
diff --git a/lib/src/main/java/com/diffplug/spotless/LazyForwardingEquality.java b/lib/src/main/java/com/diffplug/spotless/LazyForwardingEquality.java
index 8727be3a3c..f81570cedf 100644
--- a/lib/src/main/java/com/diffplug/spotless/LazyForwardingEquality.java
+++ b/lib/src/main/java/com/diffplug/spotless/LazyForwardingEquality.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 package com.diffplug.spotless;
 
+import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -112,6 +113,15 @@ static byte[] toBytes(Serializable obj) {
 		return byteOutput.toByteArray();
 	}
 
+	static Object fromBytes(byte[] bytes) {
+		ByteArrayInputStream byteOutput = new ByteArrayInputStream(bytes);
+		try (ObjectInputStream objectOutput = new ObjectInputStream(byteOutput)) {
+			return objectOutput.readObject();
+		} catch (IOException | ClassNotFoundException e) {
+			throw ThrowingEx.asRuntime(e);
+		}
+	}
+
 	/** Ensures that the lazy state has been evaluated. */
 	public static void unlazy(Object in) {
 		if (in instanceof LazyForwardingEquality) {
diff --git a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
index d73f97cb5c..5d63952e2c 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java b/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java
index f833939bbe..519fe3037f 100644
--- a/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java
+++ b/testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -98,4 +98,14 @@ public StringSelfie expectLintsOfResource(String filename, String resource) {
 			throw new AssertionError(e);
 		}
 	}
+
+	public StringSelfie expectLintsOfFileAndContent(String filename, String content) {
+		try {
+			File file = harness.setFile(filename).toContent(content);
+			LintState state = LintState.of(formatter(), file);
+			return StepHarness.expectLintsOf(state, formatter());
+		} catch (IOException e) {
+			throw new AssertionError(e);
+		}
+	}
 }
diff --git a/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java b/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java
index 95b504c15f..cf9b9c2ea4 100644
--- a/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 DiffPlug
+ * Copyright 2020-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.ResourceHarness;
 import com.diffplug.spotless.StepHarness;
+import com.diffplug.spotless.StepHarnessWithFile;
 
 class FenceStepTest extends ResourceHarness {
 	@Test
@@ -85,7 +86,7 @@ void broken() {
 		FormatterStep fence = FenceStep.named("fence").openClose("spotless:off", "spotless:on")
 				.preserveWithin(Arrays.asList(ReplaceStep.create("replace", "spotless:on", "REMOVED")));
 		// this fails because uppercase turns spotless:off into SPOTLESS:OFF, etc
-		StepHarness.forStep(fence).expectLintsOf(StringPrinter.buildStringFromLines("A B C",
+		StepHarnessWithFile.forStep(this, fence).expectLintsOfFileAndContent("README.md", StringPrinter.buildStringFromLines("A B C",
 				"spotless:off",
 				"D E F",
 				"spotless:on",

From 230f5664debe4586d6b6c57170e427e7fd8bbdad Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 3 Jan 2025 14:07:50 -0800
Subject: [PATCH 1976/2068] Fix spotbugs issues.

---
 .../com/diffplug/spotless/ConfigurationCacheHackList.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/ConfigurationCacheHackList.java b/lib/src/main/java/com/diffplug/spotless/ConfigurationCacheHackList.java
index da12f041ba..52479bf6ae 100644
--- a/lib/src/main/java/com/diffplug/spotless/ConfigurationCacheHackList.java
+++ b/lib/src/main/java/com/diffplug/spotless/ConfigurationCacheHackList.java
@@ -22,6 +22,8 @@
 import java.util.List;
 import java.util.Objects;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 /**
  * Gradle requires three things:
  * - Gradle defines cache equality based on your serialized representation
@@ -51,7 +53,7 @@
 public class ConfigurationCacheHackList implements java.io.Serializable {
 	private static final long serialVersionUID = 1L;
 	private boolean optimizeForEquality;
-	public ArrayList<Object> backingList = new ArrayList<>();
+	private ArrayList<Object> backingList = new ArrayList<>();
 
 	private void writeObject(java.io.ObjectOutputStream out) throws IOException {
 		out.writeBoolean(optimizeForEquality);
@@ -63,6 +65,7 @@ private void writeObject(java.io.ObjectOutputStream out) throws IOException {
 		}
 	}
 
+	@SuppressFBWarnings("MC_OVERRIDABLE_METHOD_CALL_IN_READ_OBJECT")
 	private void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException {
 		optimizeForEquality = in.readBoolean();
 		backingList = new ArrayList<>();

From c12aff303c1880d3108b896d29f1698143ada51b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 4 Jan 2025 13:35:36 +0000
Subject: [PATCH 1977/2068] fix(deps): update dependency
 org.assertj:assertj-core to v3.27.2

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index c773948ca2..091aa47e50 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -30,6 +30,6 @@ VER_SLF4J=[1.6,2.0[
 VER_DURIAN=1.2.0
 VER_JGIT=6.10.0.202406032230-r
 VER_JUNIT=5.11.4
-VER_ASSERTJ=3.27.1
+VER_ASSERTJ=3.27.2
 VER_MOCKITO=5.15.2
 VER_SELFIE=2.4.2
\ No newline at end of file

From 7dbf0818721c78c2b4acd067fc27d005fb7e34a3 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 5 Jan 2025 22:31:54 -0800
Subject: [PATCH 1978/2068] Put `ToggleOffOnTest` on the
 `STABLE_CONFIGURATION_CACHE`

---
 .../test/java/com/diffplug/gradle/spotless/ToggleOffOnTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ToggleOffOnTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ToggleOffOnTest.java
index 8ed5703504..11850a5cff 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ToggleOffOnTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ToggleOffOnTest.java
@@ -44,7 +44,7 @@ public GradleRunner gradleRunner() throws IOException {
 		if (useConfigCache) {
 			setFile("gradle.properties").toLines("org.gradle.unsafe.configuration-cache=true",
 					"org.gradle.configuration-cache=true");
-			return super.gradleRunner().withGradleVersion(GradleVersionSupport.CONFIGURATION_CACHE.version);
+			return super.gradleRunner().withGradleVersion(GradleVersionSupport.STABLE_CONFIGURATION_CACHE.version);
 		} else {
 			return super.gradleRunner();
 		}

From 99a32ff852cae98ef25577b1d4892ea21409b70c Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 5 Jan 2025 22:33:50 -0800
Subject: [PATCH 1979/2068] Fix an oversight in `NativeCmdIntegrationTest`.

---
 .../diffplug/gradle/spotless/NativeCmdIntegrationTest.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NativeCmdIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NativeCmdIntegrationTest.java
index 418bded954..94ecf6c076 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NativeCmdIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NativeCmdIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 DiffPlug
+ * Copyright 2024-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,8 +51,8 @@ class NativeCmdWithoutConfigCacheTest extends GradleIntegrationHarness implement
 	class NativeCmdWithConfigCacheTest extends GradleIntegrationHarness implements NativeCmdIntegrationTest {
 		@Override
 		public GradleRunner gradleRunner() throws IOException {
-			setFile("gradle.properties").toContent("org.gradle.unsafe.configuration-cache=true");
-			setFile("gradle.properties").toContent("org.gradle.configuration-cache=true");
+			setFile("gradle.properties").toLines("org.gradle.unsafe.configuration-cache=true",
+					"org.gradle.configuration-cache=true");
 			return super.gradleRunner().withGradleVersion(GradleVersionSupport.CONFIGURATION_CACHE.version);
 		}
 	}

From c3a8c822cadff1f0ff453e9a0647fd7d0da95c3f Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 2 Jan 2025 17:44:49 -0800
Subject: [PATCH 1980/2068] Gradle custom step test now runs with and without
 configuration cache.

---
 ...umpThisNumberIfACustomStepChangesTest.java | 41 +++++++++++++++++--
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BumpThisNumberIfACustomStepChangesTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BumpThisNumberIfACustomStepChangesTest.java
index 25a6b18bca..dbcb2cf720 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BumpThisNumberIfACustomStepChangesTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BumpThisNumberIfACustomStepChangesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,9 +17,39 @@
 
 import java.io.IOException;
 
+import org.gradle.testkit.runner.GradleRunner;
 import org.junit.jupiter.api.Test;
 
-class BumpThisNumberIfACustomStepChangesTest extends GradleIntegrationHarness {
+abstract class BumpThisNumberIfACustomStepChangesTest extends GradleIntegrationHarness {
+	private boolean useConfigCache;
+
+	BumpThisNumberIfACustomStepChangesTest(boolean useConfigCache) {
+		this.useConfigCache = useConfigCache;
+	}
+
+	static class WithConfigCache extends BumpThisNumberIfACustomStepChangesTest {
+		WithConfigCache() {
+			super(true);
+		}
+	}
+
+	static class WithoutConfigCache extends BumpThisNumberIfACustomStepChangesTest {
+		WithoutConfigCache() {
+			super(false);
+		}
+	}
+
+	@Override
+	public GradleRunner gradleRunner() throws IOException {
+		if (useConfigCache) {
+			setFile("gradle.properties").toLines("org.gradle.unsafe.configuration-cache=true",
+					"org.gradle.configuration-cache=true");
+			return super.gradleRunner().withGradleVersion(GradleVersionSupport.CONFIGURATION_CACHE.version);
+		} else {
+			return super.gradleRunner();
+		}
+	}
+
 	private void writeBuildFile(String toInsert) throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
@@ -50,7 +80,12 @@ void customRuleNeverUpToDate() throws IOException {
 		writeContentWithBadFormatting();
 		applyIsUpToDate(false);
 		checkIsUpToDate(false);
-		checkIsUpToDate(false);
+		if (useConfigCache) {
+			// if the config cache is in-effect, then it's okay for custom rules to become "up-to-date"
+			checkIsUpToDate(true);
+		} else {
+			checkIsUpToDate(false);
+		}
 	}
 
 	@Test

From 3572a5e8625702add941ad9e3790a1e1efaf01a3 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 2 Jan 2025 17:46:49 -0800
Subject: [PATCH 1981/2068] Using `custom` in a gradle script now works with
 and without the configuration cache.

---
 .../diffplug/gradle/spotless/FormatExtension.java | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index 59898cbf56..69150724c1 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -457,12 +457,11 @@ protected Integer calculateState() throws Exception {
 	 */
 	public void custom(String name, Closure<String> formatter) {
 		requireNonNull(formatter, "formatter");
-		Closure<String> dehydrated = formatter.dehydrate();
-		custom(name, new ClosureFormatterFunc(dehydrated));
+		custom(name, new ClosureFormatterFunc(formatter));
 	}
 
 	static class ClosureFormatterFunc implements FormatterFunc, Serializable {
-		private final Closure<String> closure;
+		private Closure<String> closure;
 
 		ClosureFormatterFunc(Closure<String> closure) {
 			this.closure = closure;
@@ -472,6 +471,14 @@ static class ClosureFormatterFunc implements FormatterFunc, Serializable {
 		public String apply(String unixNewlines) {
 			return closure.call(unixNewlines);
 		}
+
+		private void writeObject(java.io.ObjectOutputStream stream) throws java.io.IOException {
+			stream.writeObject(closure.dehydrate());
+		}
+
+		private void readObject(java.io.ObjectInputStream stream) throws java.io.IOException, ClassNotFoundException {
+			this.closure = (Closure<String>) stream.readObject();
+		}
 	}
 
 	/**

From 1b7189df71560e1b3fe85e2586d2ae26a2c3fabb Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 2 Jan 2025 17:50:15 -0800
Subject: [PATCH 1982/2068] Update changelog.

---
 plugin-gradle/CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index cd77663c4d..54e21d250c 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -11,6 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktlint` version to latest `1.4.0` -> `1.5.0`. ([#2354](https://github.com/diffplug/spotless/pull/2354))
 * Bump minimum `eclipse-cdt` version to `11.0` (removed support for `10.7`). ([#2373](https://github.com/diffplug/spotless/pull/2373))
 ### Fixed
+* Using `custom` with a Groovy closure now works with and without configuration cache. ([#2376](https://github.com/diffplug/spotless/pull/2376))
 * `toggleOffOn` now works with the configuration cache. ([#2378](https://github.com/diffplug/spotless/pull/2378) fixes [#2317](https://github.com/diffplug/spotless/issues/2317))
 * You can now use `removeUnusedImports` and `googleJavaFormat` at the same time again. (fixes [#2159](https://github.com/diffplug/spotless/issues/2159))
 * The default list of type annotations used by `formatAnnotations` now includes Jakarta Validation's `Valid` and constraints validations (fixes [#2334](https://github.com/diffplug/spotless/issues/2334))

From 31aa006a5d310d9da4f4123c712c30da2c80f01f Mon Sep 17 00:00:00 2001
From: Jochen Berger <fooberger@gmail.com>
Date: Tue, 1 Oct 2024 07:24:14 +0200
Subject: [PATCH 1983/2068] update default versions for Eclipse Java and Groovy
 formatters

---
 CHANGES.md                                                    | 3 +++
 .../spotless/extra/groovy/GrEclipseFormatterStep.java         | 4 ++--
 .../diffplug/spotless/extra/java/EclipseJdtFormatterStep.java | 4 ++--
 plugin-gradle/CHANGES.md                                      | 2 ++
 plugin-maven/CHANGES.md                                       | 2 ++
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 9bb962e902..88cd27018f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -18,6 +18,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktfmt` version to latest `0.52` -> `0.53`. ([#2320](https://github.com/diffplug/spotless/pull/2320))
 * Bump default `ktlint` version to latest `1.4.0` -> `1.5.0`. ([#2354](https://github.com/diffplug/spotless/pull/2354))
 * Bump minimum `eclipse-cdt` version to `11.0` (removed support for `10.7`). ([#2373](https://github.com/diffplug/spotless/pull/2373))
+* Bump default `eclipse` version to latest `4.32` -> `4.34`. ([#2381](https://github.com/diffplug/spotless/pull/2381))
+* Bump default `greclipse` version to latest `4.32` -> `4.34`. ([#2381](https://github.com/diffplug/spotless/pull/2381))
+
 ### Fixed
 * You can now use `removeUnusedImports` and `googleJavaFormat` at the same time again. (fixes [#2159](https://github.com/diffplug/spotless/issues/2159))
 * The default list of type annotations used by `formatAnnotations` now includes Jakarta Validation's `Valid` and constraints validations (fixes [#2334](https://github.com/diffplug/spotless/issues/2334))
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 4e35dceac5..4f04c96a94 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@ public final class GrEclipseFormatterStep {
 	private GrEclipseFormatterStep() {}
 
 	private static final String NAME = "eclipse groovy formatter";
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "4.26").add(17, "4.32");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "4.26").add(17, "4.34");
 
 	public static String defaultVersion() {
 		return JVM_SUPPORT.getRecommendedFormatterVersion();
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 2e3e190773..396065d69a 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ public final class EclipseJdtFormatterStep {
 	private EclipseJdtFormatterStep() {}
 
 	private static final String NAME = "eclipse jdt formatter";
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "4.26").add(17, "4.32");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "4.26").add(17, "4.34");
 
 	public static String defaultVersion() {
 		return JVM_SUPPORT.getRecommendedFormatterVersion();
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index cd77663c4d..22263d3c08 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 (
 * Bump default `ktfmt` version to latest `0.52` -> `0.53`. ([#2320](https://github.com/diffplug/spotless/pull/2320))
 * Bump default `ktlint` version to latest `1.4.0` -> `1.5.0`. ([#2354](https://github.com/diffplug/spotless/pull/2354))
 * Bump minimum `eclipse-cdt` version to `11.0` (removed support for `10.7`). ([#2373](https://github.com/diffplug/spotless/pull/2373))
+* Bump default `eclipse` version to latest `4.32` -> `4.34`. ([#2381](https://github.com/diffplug/spotless/pull/2381))
+* Bump default `greclipse` version to latest `4.32` -> `4.34`. ([#2381](https://github.com/diffplug/spotless/pull/2381))
 ### Fixed
 * `toggleOffOn` now works with the configuration cache. ([#2378](https://github.com/diffplug/spotless/pull/2378) fixes [#2317](https://github.com/diffplug/spotless/issues/2317))
 * You can now use `removeUnusedImports` and `googleJavaFormat` at the same time again. (fixes [#2159](https://github.com/diffplug/spotless/issues/2159))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index b675af15f1..f6ed1ec5f0 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -9,6 +9,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktfmt` version to latest `0.52` -> `0.53`. ([#2320](https://github.com/diffplug/spotless/pull/2320))
 * Bump default `ktlint` version to latest `1.4.0` -> `1.5.0`. ([#2354](https://github.com/diffplug/spotless/pull/2354))
 * Bump minimum `eclipse-cdt` version to `11.0` (removed support for `10.7`). ([#2373](https://github.com/diffplug/spotless/pull/2373))
+* Bump default `eclipse` version to latest `4.32` -> `4.34`. ([#2381](https://github.com/diffplug/spotless/pull/2381))
+* Bump default `greclipse` version to latest `4.32` -> `4.34`. ([#2381](https://github.com/diffplug/spotless/pull/2381))
 ### Fixed
 * You can now use `removeUnusedImports` and `googleJavaFormat` at the same time again. (fixes [#2159](https://github.com/diffplug/spotless/issues/2159))
 * The default list of type annotations used by `formatAnnotations` now includes Jakarta Validation's `Valid` and constraints validations (fixes [#2334](https://github.com/diffplug/spotless/issues/2334))

From 9c9cac01a1fa27e214094814a8ce046170655846 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 6 Jan 2025 08:37:58 -0800
Subject: [PATCH 1984/2068] If we undo the fix from #2378, then the custom
 steps work. Ugh.

---
 .../com/diffplug/spotless/ConfigurationCacheHackList.java    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/ConfigurationCacheHackList.java b/lib/src/main/java/com/diffplug/spotless/ConfigurationCacheHackList.java
index 52479bf6ae..520eab3f39 100644
--- a/lib/src/main/java/com/diffplug/spotless/ConfigurationCacheHackList.java
+++ b/lib/src/main/java/com/diffplug/spotless/ConfigurationCacheHackList.java
@@ -16,7 +16,6 @@
 package com.diffplug.spotless;
 
 import java.io.IOException;
-import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -61,7 +60,7 @@ private void writeObject(java.io.ObjectOutputStream out) throws IOException {
 		for (Object obj : backingList) {
 			// if write out the list on its own, we'll get java's non-deterministic object-graph serialization
 			// by writing each object to raw bytes independently, we avoid this
-			out.writeObject(LazyForwardingEquality.toBytes((Serializable) obj));
+			out.writeObject(obj);
 		}
 	}
 
@@ -71,7 +70,7 @@ private void readObject(java.io.ObjectInputStream in) throws IOException, ClassN
 		backingList = new ArrayList<>();
 		int size = in.readInt();
 		for (int i = 0; i < size; i++) {
-			backingList.add(LazyForwardingEquality.fromBytes((byte[]) in.readObject()));
+			backingList.add(in.readObject());
 		}
 	}
 

From e5a6f2be41bf6c5c1f3c317fd77d3d111dfa4b5a Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 6 Jan 2025 08:55:21 -0800
Subject: [PATCH 1985/2068] Turn off the error message for requiring a certain
 version to use a custom step, let CI tell us how it goes.

---
 .../com/diffplug/gradle/spotless/FormatExtension.java    | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index 69150724c1..340953c15d 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -16,8 +16,6 @@
 package com.diffplug.gradle.spotless;
 
 import static com.diffplug.gradle.spotless.PluginGradlePreconditions.requireElementsNonNull;
-import static com.diffplug.gradle.spotless.SpotlessPluginRedirect.badSemver;
-import static com.diffplug.gradle.spotless.SpotlessPluginRedirect.badSemverOfGradle;
 import static java.util.Objects.requireNonNull;
 
 import java.io.File;
@@ -46,7 +44,6 @@
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.plugins.BasePlugin;
 import org.gradle.api.tasks.TaskProvider;
-import org.gradle.util.GradleVersion;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -487,12 +484,6 @@ private void readObject(java.io.ObjectInputStream stream) throws java.io.IOExcep
 	 */
 	public void custom(String name, FormatterFunc formatter) {
 		requireNonNull(formatter, "formatter");
-		if (badSemverOfGradle() < badSemver(SpotlessPlugin.VER_GRADLE_minVersionForCustom)) {
-			throw new GradleException("The 'custom' method is only available if you are using Gradle "
-					+ SpotlessPlugin.VER_GRADLE_minVersionForCustom
-					+ " or newer, this is "
-					+ GradleVersion.current().getVersion());
-		}
 		addStep(FormatterStep.createLazy(name, () -> globalState, SerializedFunction.alwaysReturns(formatter)));
 	}
 

From 168e5978bf4036893500115ca34acf38034fed49 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 6 Jan 2025 09:34:50 -0800
Subject: [PATCH 1986/2068] Add a sentinel step which triggers the "serialize
 to byte array hack"

---
 .../spotless/ConfigurationCacheHackList.java  | 25 +++++++++--
 .../yaml/SerializeToByteArrayHack.java        | 42 +++++++++++++++++++
 .../combined/CombinedJavaFormatStepTest.java  |  4 +-
 3 files changed, 67 insertions(+), 4 deletions(-)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/yaml/SerializeToByteArrayHack.java

diff --git a/lib/src/main/java/com/diffplug/spotless/ConfigurationCacheHackList.java b/lib/src/main/java/com/diffplug/spotless/ConfigurationCacheHackList.java
index 520eab3f39..39be0d9559 100644
--- a/lib/src/main/java/com/diffplug/spotless/ConfigurationCacheHackList.java
+++ b/lib/src/main/java/com/diffplug/spotless/ConfigurationCacheHackList.java
@@ -16,11 +16,14 @@
 package com.diffplug.spotless;
 
 import java.io.IOException;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
 
+import com.diffplug.spotless.yaml.SerializeToByteArrayHack;
+
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -50,27 +53,43 @@
  * to make Spotless work with all of Gradle's cache systems at once.
  */
 public class ConfigurationCacheHackList implements java.io.Serializable {
-	private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 6914178791997323870L;
+
 	private boolean optimizeForEquality;
 	private ArrayList<Object> backingList = new ArrayList<>();
 
+	private boolean shouldWeSerializeToByteArrayFirst() {
+		return backingList.stream().anyMatch(step -> step instanceof SerializeToByteArrayHack);
+	}
+
 	private void writeObject(java.io.ObjectOutputStream out) throws IOException {
+		boolean serializeToByteArrayFirst = shouldWeSerializeToByteArrayFirst();
+		out.writeBoolean(serializeToByteArrayFirst);
 		out.writeBoolean(optimizeForEquality);
 		out.writeInt(backingList.size());
 		for (Object obj : backingList) {
 			// if write out the list on its own, we'll get java's non-deterministic object-graph serialization
 			// by writing each object to raw bytes independently, we avoid this
-			out.writeObject(obj);
+			if (serializeToByteArrayFirst) {
+				out.writeObject(LazyForwardingEquality.toBytes((Serializable) obj));
+			} else {
+				out.writeObject(obj);
+			}
 		}
 	}
 
 	@SuppressFBWarnings("MC_OVERRIDABLE_METHOD_CALL_IN_READ_OBJECT")
 	private void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException {
+		boolean serializeToByteArrayFirst = in.readBoolean();
 		optimizeForEquality = in.readBoolean();
 		backingList = new ArrayList<>();
 		int size = in.readInt();
 		for (int i = 0; i < size; i++) {
-			backingList.add(in.readObject());
+			if (serializeToByteArrayFirst) {
+				backingList.add(LazyForwardingEquality.fromBytes((byte[]) in.readObject()));
+			} else {
+				backingList.add(in.readObject());
+			}
 		}
 	}
 
diff --git a/lib/src/main/java/com/diffplug/spotless/yaml/SerializeToByteArrayHack.java b/lib/src/main/java/com/diffplug/spotless/yaml/SerializeToByteArrayHack.java
new file mode 100644
index 0000000000..42d21c8997
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/yaml/SerializeToByteArrayHack.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2025 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.yaml;
+
+import java.io.File;
+
+import javax.annotation.Nullable;
+
+import com.diffplug.spotless.FormatterStep;
+
+public class SerializeToByteArrayHack implements FormatterStep {
+	private static final long serialVersionUID = 8071047581828362545L;
+
+	@Override
+	public String getName() {
+		return "hack to force serializing objects to byte array";
+	}
+
+	@Nullable
+	@Override
+	public String format(String rawUnix, File file) throws Exception {
+		return null;
+	}
+
+	@Override
+	public void close() throws Exception {
+
+	}
+}
diff --git a/testlib/src/test/java/com/diffplug/spotless/combined/CombinedJavaFormatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/combined/CombinedJavaFormatStepTest.java
index 8d91d7ca6e..086103ce15 100644
--- a/testlib/src/test/java/com/diffplug/spotless/combined/CombinedJavaFormatStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/combined/CombinedJavaFormatStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 DiffPlug
+ * Copyright 2023-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@
 import com.diffplug.spotless.java.GoogleJavaFormatStep;
 import com.diffplug.spotless.java.ImportOrderStep;
 import com.diffplug.spotless.java.RemoveUnusedImportsStep;
+import com.diffplug.spotless.yaml.SerializeToByteArrayHack;
 
 public class CombinedJavaFormatStepTest extends ResourceHarness {
 
@@ -45,6 +46,7 @@ void checkIssue1679() {
 		FenceStep toggleOffOnPair = FenceStep.named(FenceStep.defaultToggleName()).openClose("formatting:off", "formatting:on");
 		try (StepHarness formatter = StepHarness.forSteps(
 				toggleOffOnPair.preserveWithin(List.of(
+						new SerializeToByteArrayHack(),
 						gjf,
 						indentWithSpaces,
 						importOrder,

From e398c35b7fab516e70b7a325090811545eb4f43a Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 6 Jan 2025 10:04:31 -0800
Subject: [PATCH 1987/2068] Yup, custom still needs Gradle 8.0+, bring that
 back.

---
 .../com/diffplug/gradle/spotless/FormatExtension.java    | 9 +++++++++
 .../spotless/BumpThisNumberIfACustomStepChangesTest.java | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index 340953c15d..69150724c1 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -16,6 +16,8 @@
 package com.diffplug.gradle.spotless;
 
 import static com.diffplug.gradle.spotless.PluginGradlePreconditions.requireElementsNonNull;
+import static com.diffplug.gradle.spotless.SpotlessPluginRedirect.badSemver;
+import static com.diffplug.gradle.spotless.SpotlessPluginRedirect.badSemverOfGradle;
 import static java.util.Objects.requireNonNull;
 
 import java.io.File;
@@ -44,6 +46,7 @@
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.plugins.BasePlugin;
 import org.gradle.api.tasks.TaskProvider;
+import org.gradle.util.GradleVersion;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -484,6 +487,12 @@ private void readObject(java.io.ObjectInputStream stream) throws java.io.IOExcep
 	 */
 	public void custom(String name, FormatterFunc formatter) {
 		requireNonNull(formatter, "formatter");
+		if (badSemverOfGradle() < badSemver(SpotlessPlugin.VER_GRADLE_minVersionForCustom)) {
+			throw new GradleException("The 'custom' method is only available if you are using Gradle "
+					+ SpotlessPlugin.VER_GRADLE_minVersionForCustom
+					+ " or newer, this is "
+					+ GradleVersion.current().getVersion());
+		}
 		addStep(FormatterStep.createLazy(name, () -> globalState, SerializedFunction.alwaysReturns(formatter)));
 	}
 
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BumpThisNumberIfACustomStepChangesTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BumpThisNumberIfACustomStepChangesTest.java
index dbcb2cf720..25ed3cab8b 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BumpThisNumberIfACustomStepChangesTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BumpThisNumberIfACustomStepChangesTest.java
@@ -44,7 +44,7 @@ public GradleRunner gradleRunner() throws IOException {
 		if (useConfigCache) {
 			setFile("gradle.properties").toLines("org.gradle.unsafe.configuration-cache=true",
 					"org.gradle.configuration-cache=true");
-			return super.gradleRunner().withGradleVersion(GradleVersionSupport.CONFIGURATION_CACHE.version);
+			return super.gradleRunner().withGradleVersion(GradleVersionSupport.CUSTOM_STEPS.version);
 		} else {
 			return super.gradleRunner();
 		}

From 04cc97253bd5c9cbc426762feff92b51295b030d Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 6 Jan 2025 10:28:12 -0800
Subject: [PATCH 1988/2068] Bump the req for `custom` from `8.0` to `8.4`

---
 .../java/com/diffplug/gradle/spotless/SpotlessPlugin.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPlugin.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPlugin.java
index 8b58e3eaca..24bea9d90b 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPlugin.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@ public class SpotlessPlugin implements Plugin<Project> {
 	static final String SPOTLESS_MODERN = "spotlessModern";
 	static final String VER_GRADLE_min = "6.1.1";
 	static final String VER_GRADLE_javaPluginExtension = "7.1";
-	static final String VER_GRADLE_minVersionForCustom = "8.0";
+	static final String VER_GRADLE_minVersionForCustom = "8.4";
 	private static final int MINIMUM_JRE = 11;
 
 	@Override

From 0c66cb027d4d190ae27676ed04afe0327c348c07 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 6 Jan 2025 11:45:35 -0800
Subject: [PATCH 1989/2068] Zero-out the global .gitconfig to fix issue which
 is only happening on Java 11?

---
 .../com/diffplug/spotless/extra/GitAttributesLineEndings.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
index 93a95bd6ac..cf4432f2f1 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -193,6 +193,7 @@ static class RuntimeInit {
 			/////////////////////////////////
 			// USER AND SYSTEM-WIDE VALUES //
 			/////////////////////////////////
+			FS.DETECTED.setGitSystemConfig(new File("no-global-git-config-for-spotless"));
 			systemConfig = SystemReader.getInstance().openSystemConfig(null, FS.DETECTED);
 			Errors.log().run(systemConfig::load);
 			userConfig = SystemReader.getInstance().openUserConfig(systemConfig, FS.DETECTED);

From 7408f384d9b2e0633c163ea6eba2705888784776 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 6 Jan 2025 12:44:45 -0800
Subject: [PATCH 1990/2068] Add docs for the `SerializeToByteArrayHack`.

---
 .../spotless/yaml/SerializeToByteArrayHack.java   | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/lib/src/main/java/com/diffplug/spotless/yaml/SerializeToByteArrayHack.java b/lib/src/main/java/com/diffplug/spotless/yaml/SerializeToByteArrayHack.java
index 42d21c8997..c63b6d918b 100644
--- a/lib/src/main/java/com/diffplug/spotless/yaml/SerializeToByteArrayHack.java
+++ b/lib/src/main/java/com/diffplug/spotless/yaml/SerializeToByteArrayHack.java
@@ -21,6 +21,21 @@
 
 import com.diffplug.spotless.FormatterStep;
 
+/**
+ * This step is a flag which marks that `ConfigurationCacheHackList` should
+ * serialize each item individually into `byte[]` array, rather than using normal
+ * serialization.
+ *
+ * The reason to use this is if you are using `toggleOffOn` *and* two kinds of
+ * google-java-format (e.g. one for format and the other for imports), then
+ * problems with Java's handling of object graphs will cause your up-to-date checks
+ * to always fail. `CombinedJavaFormatStepTest` recreates this situation. By adding
+ * this step, it will trigger this workaround which fixes the up-to-dateness bug.
+ *
+ * But, turning it on will break all `custom` steps that use Groovy closures. So
+ * by default you get regular serialization. If you're using `toggleOffOn` and having
+ * problems with up-to-dateness, then adding this step can be a workaround.
+ */
 public class SerializeToByteArrayHack implements FormatterStep {
 	private static final long serialVersionUID = 8071047581828362545L;
 

From 922c7ea4ced2347587fa7c1884c5b35f7e3cf3e3 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 6 Jan 2025 12:46:27 -0800
Subject: [PATCH 1991/2068] Update changelog.

---
 plugin-gradle/CHANGES.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 54e21d250c..eb789bde91 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -11,8 +11,11 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktlint` version to latest `1.4.0` -> `1.5.0`. ([#2354](https://github.com/diffplug/spotless/pull/2354))
 * Bump minimum `eclipse-cdt` version to `11.0` (removed support for `10.7`). ([#2373](https://github.com/diffplug/spotless/pull/2373))
 ### Fixed
-* Using `custom` with a Groovy closure now works with and without configuration cache. ([#2376](https://github.com/diffplug/spotless/pull/2376))
 * `toggleOffOn` now works with the configuration cache. ([#2378](https://github.com/diffplug/spotless/pull/2378) fixes [#2317](https://github.com/diffplug/spotless/issues/2317))
+* Using `custom` with a Groovy closure now works with and without configuration cache. ([#2376](https://github.com/diffplug/spotless/pull/2376))
+  * Minimum required Gradle version for this to work has bumped from `8.0` to `8.4`.
+  * The global git system config is now ignored for line-ending purposes.
+  * Added `SerializeToByteArrayHack` as a flag for a limitation at the intersection of `toggleOffOn` and `custom`. 
 * You can now use `removeUnusedImports` and `googleJavaFormat` at the same time again. (fixes [#2159](https://github.com/diffplug/spotless/issues/2159))
 * The default list of type annotations used by `formatAnnotations` now includes Jakarta Validation's `Valid` and constraints validations (fixes [#2334](https://github.com/diffplug/spotless/issues/2334))
 * `indentWith[Spaces|Tabs]` has been deprecated in favor of `leadingTabsToSpaces` and `leadingSpacesToTabs`. ([#2350](https://github.com/diffplug/spotless/pull/2350) fixes [#794](https://github.com/diffplug/spotless/issues/794))

From 7a985fb36f16d751921e5a620bd86360937ca98c Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 6 Jan 2025 12:48:03 -0800
Subject: [PATCH 1992/2068] Add an explanatory comment on why we are zeroing
 out the global .gitconfig.

---
 .../com/diffplug/spotless/extra/GitAttributesLineEndings.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
index cf4432f2f1..0e058566f2 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
@@ -193,7 +193,8 @@ static class RuntimeInit {
 			/////////////////////////////////
 			// USER AND SYSTEM-WIDE VALUES //
 			/////////////////////////////////
-			FS.DETECTED.setGitSystemConfig(new File("no-global-git-config-for-spotless"));
+			FS.DETECTED.setGitSystemConfig(new File("no-global-git-config-for-spotless")); // this fixes a problem
+			// that was only occurring on Java 11. If we remove support for Java 11, we could probably remove it.
 			systemConfig = SystemReader.getInstance().openSystemConfig(null, FS.DETECTED);
 			Errors.log().run(systemConfig::load);
 			userConfig = SystemReader.getInstance().openUserConfig(systemConfig, FS.DETECTED);

From bd03fa076bd04f7c50b6f4718a83171422a2ffbb Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 6 Jan 2025 13:15:39 -0800
Subject: [PATCH 1993/2068] Prepare to publish non-beta. Huzzah!

---
 gradle/changelog.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle/changelog.gradle b/gradle/changelog.gradle
index ded1baf4e6..107c6f5e0b 100644
--- a/gradle/changelog.gradle
+++ b/gradle/changelog.gradle
@@ -26,11 +26,11 @@ spotlessChangelog {
 	runAfterPush "gh release create ${kind}/{{version}} --title '${releaseTitle} v{{version}}' --notes-from-tag"
 
 	if (kind == 'gradle') {
-		forceNextVersion '7.0.0.BETA4'
+		forceNextVersion '7.0.0'
 	} else if (kind == 'maven') {
-		forceNextVersion '2.44.0.BETA4'
+		forceNextVersion '2.44.0'
 	} else {
-		forceNextVersion '3.0.0.BETA4'
+		forceNextVersion '3.0.0'
 	}
 }
 

From 1b8dd4e5a370554262d4477e078901c18439d540 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 6 Jan 2025 13:18:27 -0800
Subject: [PATCH 1994/2068] Revert the Greclipse version bump.

---
 .../spotless/extra/groovy/GrEclipseFormatterStep.java         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 4f04c96a94..4e35dceac5 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2025 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@ public final class GrEclipseFormatterStep {
 	private GrEclipseFormatterStep() {}
 
 	private static final String NAME = "eclipse groovy formatter";
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "4.26").add(17, "4.34");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "4.26").add(17, "4.32");
 
 	public static String defaultVersion() {
 		return JVM_SUPPORT.getRecommendedFormatterVersion();

From 83bc8f3876359b7b2d3c0b5f3c802599d978647c Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 6 Jan 2025 13:18:40 -0800
Subject: [PATCH 1995/2068] Update changelogs.

---
 CHANGES.md               | 1 -
 plugin-gradle/CHANGES.md | 1 -
 plugin-maven/CHANGES.md  | 1 -
 3 files changed, 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 88cd27018f..6c020315be 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -19,7 +19,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktlint` version to latest `1.4.0` -> `1.5.0`. ([#2354](https://github.com/diffplug/spotless/pull/2354))
 * Bump minimum `eclipse-cdt` version to `11.0` (removed support for `10.7`). ([#2373](https://github.com/diffplug/spotless/pull/2373))
 * Bump default `eclipse` version to latest `4.32` -> `4.34`. ([#2381](https://github.com/diffplug/spotless/pull/2381))
-* Bump default `greclipse` version to latest `4.32` -> `4.34`. ([#2381](https://github.com/diffplug/spotless/pull/2381))
 
 ### Fixed
 * You can now use `removeUnusedImports` and `googleJavaFormat` at the same time again. (fixes [#2159](https://github.com/diffplug/spotless/issues/2159))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 9131e1d86c..017668a7f1 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -11,7 +11,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktlint` version to latest `1.4.0` -> `1.5.0`. ([#2354](https://github.com/diffplug/spotless/pull/2354))
 * Bump minimum `eclipse-cdt` version to `11.0` (removed support for `10.7`). ([#2373](https://github.com/diffplug/spotless/pull/2373))
 * Bump default `eclipse` version to latest `4.32` -> `4.34`. ([#2381](https://github.com/diffplug/spotless/pull/2381))
-* Bump default `greclipse` version to latest `4.32` -> `4.34`. ([#2381](https://github.com/diffplug/spotless/pull/2381))
 ### Fixed
 * `toggleOffOn` now works with the configuration cache. ([#2378](https://github.com/diffplug/spotless/pull/2378) fixes [#2317](https://github.com/diffplug/spotless/issues/2317))
 * Using `custom` with a Groovy closure now works with and without configuration cache. ([#2376](https://github.com/diffplug/spotless/pull/2376))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index f6ed1ec5f0..ef1ffc9d17 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -10,7 +10,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktlint` version to latest `1.4.0` -> `1.5.0`. ([#2354](https://github.com/diffplug/spotless/pull/2354))
 * Bump minimum `eclipse-cdt` version to `11.0` (removed support for `10.7`). ([#2373](https://github.com/diffplug/spotless/pull/2373))
 * Bump default `eclipse` version to latest `4.32` -> `4.34`. ([#2381](https://github.com/diffplug/spotless/pull/2381))
-* Bump default `greclipse` version to latest `4.32` -> `4.34`. ([#2381](https://github.com/diffplug/spotless/pull/2381))
 ### Fixed
 * You can now use `removeUnusedImports` and `googleJavaFormat` at the same time again. (fixes [#2159](https://github.com/diffplug/spotless/issues/2159))
 * The default list of type annotations used by `formatAnnotations` now includes Jakarta Validation's `Valid` and constraints validations (fixes [#2334](https://github.com/diffplug/spotless/issues/2334))

From 771b6288738874d176b5c3a5a99f1a8bf36b5dcb Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 6 Jan 2025 14:08:24 -0800
Subject: [PATCH 1996/2068] Update changelogs.

---
 CHANGES.md               | 3 +++
 plugin-gradle/CHANGES.md | 4 ++++
 plugin-maven/CHANGES.md  | 4 ++++
 3 files changed, 11 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 6c020315be..be27e0a413 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,9 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+## Headline changes
+- All steps now support roundtrip serialization (end of [#987](https://github.com/diffplug/spotless/issues/987)).
+- Spotless now supports [linting](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#lints) in addition to formatting.
 ### Changed
 * Allow setting Eclipse config from a string, not only from files ([#2337](https://github.com/diffplug/spotless/pull/2337))
 * Bump default `ktlint` version to latest `1.3.0` -> `1.4.0`. ([#2314](https://github.com/diffplug/spotless/pull/2314))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 017668a7f1..3c6a994e83 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,10 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+## Headline changes
+- The long `7.0.0.BETAX` period is finally over, Spotless for Gradle 7.0 is here!
+- Full, no asterisk support for configuration cache (end of [#987](https://github.com/diffplug/spotless/issues/987))
+- Spotless now supports [linting](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#lints) in addition to formatting.
 ### Changed
 * Allow setting Eclipse config from a string, not only from files ([#2337](https://github.com/diffplug/spotless/pull/2337))
 * Bump default `ktlint` version to latest `1.3.0` -> `1.4.0`. ([#2314](https://github.com/diffplug/spotless/pull/2314))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index ef1ffc9d17..573080a102 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,10 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+## Headline changes
+- The long `2.44.0.BETAX` period is finally over (sorry, there was [a problem in Gradle land](https://github.com/diffplug/spotless/issues/987)).
+- Spotless now supports [linting](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#lints) in addition to formatting.
+  - help wanted: [maven api to suppress lints](https://github.com/diffplug/spotless/issues/2309)
 ### Changed
 * Bump default `ktlint` version to latest `1.3.0` -> `1.4.0`. ([#2314](https://github.com/diffplug/spotless/pull/2314))
 * Bump default `jackson` version to latest `2.18.0` -> `2.18.1`. ([#2319](https://github.com/diffplug/spotless/pull/2319))

From 1c2435bf26f29b083d4adc1bb8c81e2cf7c60c00 Mon Sep 17 00:00:00 2001
From: runner <runner@fv-az1927-693>
Date: Mon, 6 Jan 2025 22:13:05 +0000
Subject: [PATCH 1997/2068] Published lib/3.0.0

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index be27e0a413..39856a6c80 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [3.0.0] - 2025-01-06
 ## Headline changes
 - All steps now support roundtrip serialization (end of [#987](https://github.com/diffplug/spotless/issues/987)).
 - Spotless now supports [linting](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#lints) in addition to formatting.

From 23d98d203736b344f1853f652a6eb2f0c6a7f659 Mon Sep 17 00:00:00 2001
From: runner <runner@fv-az1927-693>
Date: Mon, 6 Jan 2025 22:18:20 +0000
Subject: [PATCH 1998/2068] Published gradle/7.0.0

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 62 ++++++++++++++++++++--------------------
 2 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 3c6a994e83..64b6474ad1 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [7.0.0] - 2025-01-06
 ## Headline changes
 - The long `7.0.0.BETAX` period is finally over, Spotless for Gradle 7.0 is here!
 - Full, no asterisk support for configuration cache (end of [#987](https://github.com/diffplug/spotless/issues/987))
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 58db554e66..c152dc4dc2 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -14,9 +14,9 @@ output = [
   ].join('\n');
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
-[![Changelog](https://img.shields.io/badge/changelog-7.0.0.BETA4-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-7.0.0-blue.svg)](CHANGES.md)
 [![MavenCentral](https://img.shields.io/badge/mavencentral-here-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/index.html)
 
 [![VS Code plugin](https://img.shields.io/badge/IDE-VS_Code-blueviolet.svg)](https://marketplace.visualstudio.com/items?itemName=richardwillis.vscode-spotless-gradle)
 [![IntelliJ plugin](https://img.shields.io/badge/IDE-IntelliJ-blueviolet.svg)](https://plugins.jetbrains.com/plugin/18321-spotless-gradle)
@@ -128,10 +128,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -173,7 +173,7 @@ Spotless is primarily a formatter, _not_ a linter. In our opinion, a linter is j
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -372,8 +372,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -432,8 +432,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -522,7 +522,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -554,7 +554,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -590,7 +590,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -626,7 +626,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ### buf
 
-`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
+`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
 
 **WARNING** this step **must** be the first step in the chain, steps before it will be ignored. Thumbs up [this issue](https://github.com/bufbuild/buf/issues/1035) for a resolution, see [here](https://github.com/diffplug/spotless/pull/1208#discussion_r1264439669) for more details on the problem.
 
@@ -658,7 +658,7 @@ buf {
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -679,7 +679,7 @@ spotless {
 
 ## Flexmark
 
-`com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FlexmarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java)
+`com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/FlexmarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java)
 
 [homepage](https://github.com/vsch/flexmark-java). Flexmark is a flexible Commonmark/Markdown parser that can be used to format Markdown files. It supports different [flavors of Markdown](https://github.com/vsch/flexmark-java#markdown-processor-emulation) and [many formatting options](https://github.com/vsch/flexmark-java/wiki/Markdown-Formatter#options).
 
@@ -698,7 +698,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -723,7 +723,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -761,7 +761,7 @@ sql.formatter.indent.size=4
 
 ## Maven POM
 
-`com.diffplug.gradle.spotless.PomExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/PomExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PomExtension.java)
+`com.diffplug.gradle.spotless.PomExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/PomExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PomExtension.java)
 
 ```gradle
 spotless {
@@ -810,7 +810,7 @@ spotless {
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -904,7 +904,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## Javascript
 
-- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
+- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
 
 ```gradle
 spotless {
@@ -967,7 +967,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -1087,7 +1087,7 @@ spotless {
 
 ## YAML
 
-- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/YamlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
+- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/YamlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
 
 ```gradle
 spotless {
@@ -1119,7 +1119,7 @@ spotless {
 
 ## Shell
 
-`com.diffplug.gradle.spotless.ShellExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/ShellExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ShellExtension.java)
+`com.diffplug.gradle.spotless.ShellExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/ShellExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ShellExtension.java)
 
 ```gradle
 spotless {
@@ -1155,7 +1155,7 @@ shfmt().pathToExe('/opt/homebrew/bin/shfmt')
 
 ## Gherkin
 
-- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
+- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
 
 ```gradle
 spotless {
@@ -1184,7 +1184,7 @@ spotless {
 
 ## CSS
 
-`com.diffplug.gradle.spotless.CssExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/CssExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CssExtension.java)
+`com.diffplug.gradle.spotless.CssExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/CssExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CssExtension.java)
 
 ```gradle
 spotless {
@@ -1585,7 +1585,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -1671,9 +1671,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -1706,11 +1706,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0.BETA4/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From da87a221a5a7950ce711d157accf368702a88152 Mon Sep 17 00:00:00 2001
From: runner <runner@fv-az1927-693>
Date: Mon, 6 Jan 2025 22:21:06 +0000
Subject: [PATCH 1999/2068] Published maven/2.44.0

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 573080a102..079881e0c4 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.44.0] - 2025-01-06
 ## Headline changes
 - The long `2.44.0.BETAX` period is finally over (sorry, there was [a problem in Gradle land](https://github.com/diffplug/spotless/issues/987)).
 - Spotless now supports [linting](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#lints) in addition to formatting.
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 3f27aa1085..914c85b266 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -8,8 +8,8 @@ output = [
   ].join('\n');
 -->
 [![MavenCentral](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Changelog](https://img.shields.io/badge/changelog-2.44.0.BETA4-blue.svg)](CHANGES.md)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.44.0.BETA4/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.44.0-blue.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.44.0/index.html)
 <!---freshmark /shields -->
 
 <!---freshmark javadoc

From cbbdee50a1463105add4ad02f545f71c5d320e0a Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 6 Jan 2025 16:06:24 -0800
Subject: [PATCH 2000/2068] Versions can float again.

---
 gradle/changelog.gradle | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/gradle/changelog.gradle b/gradle/changelog.gradle
index 107c6f5e0b..994e3558dc 100644
--- a/gradle/changelog.gradle
+++ b/gradle/changelog.gradle
@@ -24,14 +24,6 @@ spotlessChangelog {
 	commitMessage "Published ${kind}/{{version}}" // {{version}} will be replaced
 	tagMessage "{{changes}}"
 	runAfterPush "gh release create ${kind}/{{version}} --title '${releaseTitle} v{{version}}' --notes-from-tag"
-
-	if (kind == 'gradle') {
-		forceNextVersion '7.0.0'
-	} else if (kind == 'maven') {
-		forceNextVersion '2.44.0'
-	} else {
-		forceNextVersion '3.0.0'
-	}
 }
 
 if (project == rootProject) {

From 6aa512e1b1f24b7300019acf4eb3a3dc57eb1f25 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 7 Jan 2025 00:09:06 +0000
Subject: [PATCH 2001/2068] Update plugin com.diffplug.spotless to v7.0.0

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 2f4e775113..c64b5a9c31 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-	id 'com.diffplug.spotless' version '7.0.0.BETA4' apply false
+	id 'com.diffplug.spotless' version '7.0.0' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
 	id 'com.gradle.plugin-publish' version '1.3.0' apply false
 	// https://github.com/gradle-nexus/publish-plugin/releases

From da5549b4e52768a380a88bea546eb14111498147 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 7 Jan 2025 08:17:54 -0800
Subject: [PATCH 2002/2068] Run deployment on Java 17 (fixes #2384)

---
 .github/workflows/deploy.yml | 2 +-
 CHANGES.md                   | 6 ++++--
 plugin-gradle/CHANGES.md     | 8 +++++---
 plugin-maven/CHANGES.md      | 8 +++++---
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 82f01dd4a4..ffc164a461 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -41,7 +41,7 @@ jobs:
       - name: jdk 11
         uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'temurin'
       - name: gradle caching
         uses: gradle/actions/setup-gradle@v4
diff --git a/CHANGES.md b/CHANGES.md
index 39856a6c80..3eaa48d124 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,11 +10,13 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Deployment was missing part of the CDT formatter, now fixed. ([#2384](https://github.com/diffplug/spotless/issues/2384))
 
 ## [3.0.0] - 2025-01-06
 ## Headline changes
-- All steps now support roundtrip serialization (end of [#987](https://github.com/diffplug/spotless/issues/987)).
-- Spotless now supports [linting](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#lints) in addition to formatting.
+* All steps now support roundtrip serialization (end of [#987](https://github.com/diffplug/spotless/issues/987)).
+* Spotless now supports [linting](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#lints) in addition to formatting.
 ### Changed
 * Allow setting Eclipse config from a string, not only from files ([#2337](https://github.com/diffplug/spotless/pull/2337))
 * Bump default `ktlint` version to latest `1.3.0` -> `1.4.0`. ([#2314](https://github.com/diffplug/spotless/pull/2314))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 64b6474ad1..dc92122dbc 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,12 +3,14 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Deployment was missing part of the CDT formatter, now fixed. ([#2384](https://github.com/diffplug/spotless/issues/2384))
 
 ## [7.0.0] - 2025-01-06
 ## Headline changes
-- The long `7.0.0.BETAX` period is finally over, Spotless for Gradle 7.0 is here!
-- Full, no asterisk support for configuration cache (end of [#987](https://github.com/diffplug/spotless/issues/987))
-- Spotless now supports [linting](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#lints) in addition to formatting.
+* The long `7.0.0.BETAX` period is finally over, Spotless for Gradle 7.0 is here!
+* Full, no asterisk support for configuration cache (end of [#987](https://github.com/diffplug/spotless/issues/987))
+* Spotless now supports [linting](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#lints) in addition to formatting.
 ### Changed
 * Allow setting Eclipse config from a string, not only from files ([#2337](https://github.com/diffplug/spotless/pull/2337))
 * Bump default `ktlint` version to latest `1.3.0` -> `1.4.0`. ([#2314](https://github.com/diffplug/spotless/pull/2314))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 079881e0c4..4ce9128ebd 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,12 +3,14 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Deployment was missing part of the CDT formatter, now fixed. ([#2384](https://github.com/diffplug/spotless/issues/2384))
 
 ## [2.44.0] - 2025-01-06
 ## Headline changes
-- The long `2.44.0.BETAX` period is finally over (sorry, there was [a problem in Gradle land](https://github.com/diffplug/spotless/issues/987)).
-- Spotless now supports [linting](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#lints) in addition to formatting.
-  - help wanted: [maven api to suppress lints](https://github.com/diffplug/spotless/issues/2309)
+* The long `2.44.0.BETAX` period is finally over (sorry, there was [a problem in Gradle land](https://github.com/diffplug/spotless/issues/987)).
+* Spotless now supports [linting](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#lints) in addition to formatting.
+  * help wanted: [maven api to suppress lints](https://github.com/diffplug/spotless/issues/2309)
 ### Changed
 * Bump default `ktlint` version to latest `1.3.0` -> `1.4.0`. ([#2314](https://github.com/diffplug/spotless/pull/2314))
 * Bump default `jackson` version to latest `2.18.0` -> `2.18.1`. ([#2319](https://github.com/diffplug/spotless/pull/2319))

From 3dad81e9517150d13119ba30be24ca3c487e7124 Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az1673-529.lb1qojfxm3genb4ph43ig2eqrc.cx.internal.cloudapp.net>
Date: Tue, 7 Jan 2025 16:27:25 +0000
Subject: [PATCH 2003/2068] Published lib/3.0.1

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 3eaa48d124..1a32103bf0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [3.0.1] - 2025-01-07
 ### Fixed
 * Deployment was missing part of the CDT formatter, now fixed. ([#2384](https://github.com/diffplug/spotless/issues/2384))
 

From f0d72c3273fbd40e2a561c5f7cb80874d21053ae Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az1673-529.lb1qojfxm3genb4ph43ig2eqrc.cx.internal.cloudapp.net>
Date: Tue, 7 Jan 2025 16:30:17 +0000
Subject: [PATCH 2004/2068] Published gradle/7.0.1

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 62 ++++++++++++++++++++--------------------
 2 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index dc92122dbc..6b9b44181f 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [7.0.1] - 2025-01-07
 ### Fixed
 * Deployment was missing part of the CDT formatter, now fixed. ([#2384](https://github.com/diffplug/spotless/issues/2384))
 
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index c152dc4dc2..dd06c0e13f 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -14,9 +14,9 @@ output = [
   ].join('\n');
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
-[![Changelog](https://img.shields.io/badge/changelog-7.0.0-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-7.0.1-blue.svg)](CHANGES.md)
 [![MavenCentral](https://img.shields.io/badge/mavencentral-here-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/index.html)
 
 [![VS Code plugin](https://img.shields.io/badge/IDE-VS_Code-blueviolet.svg)](https://marketplace.visualstudio.com/items?itemName=richardwillis.vscode-spotless-gradle)
 [![IntelliJ plugin](https://img.shields.io/badge/IDE-IntelliJ-blueviolet.svg)](https://plugins.jetbrains.com/plugin/18321-spotless-gradle)
@@ -128,10 +128,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -173,7 +173,7 @@ Spotless is primarily a formatter, _not_ a linter. In our opinion, a linter is j
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -372,8 +372,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -432,8 +432,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -522,7 +522,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -554,7 +554,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -590,7 +590,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -626,7 +626,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ### buf
 
-`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
+`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
 
 **WARNING** this step **must** be the first step in the chain, steps before it will be ignored. Thumbs up [this issue](https://github.com/bufbuild/buf/issues/1035) for a resolution, see [here](https://github.com/diffplug/spotless/pull/1208#discussion_r1264439669) for more details on the problem.
 
@@ -658,7 +658,7 @@ buf {
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -679,7 +679,7 @@ spotless {
 
 ## Flexmark
 
-`com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/FlexmarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java)
+`com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/FlexmarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java)
 
 [homepage](https://github.com/vsch/flexmark-java). Flexmark is a flexible Commonmark/Markdown parser that can be used to format Markdown files. It supports different [flavors of Markdown](https://github.com/vsch/flexmark-java#markdown-processor-emulation) and [many formatting options](https://github.com/vsch/flexmark-java/wiki/Markdown-Formatter#options).
 
@@ -698,7 +698,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -723,7 +723,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -761,7 +761,7 @@ sql.formatter.indent.size=4
 
 ## Maven POM
 
-`com.diffplug.gradle.spotless.PomExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/PomExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PomExtension.java)
+`com.diffplug.gradle.spotless.PomExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/PomExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PomExtension.java)
 
 ```gradle
 spotless {
@@ -810,7 +810,7 @@ spotless {
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -904,7 +904,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## Javascript
 
-- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
+- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
 
 ```gradle
 spotless {
@@ -967,7 +967,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -1087,7 +1087,7 @@ spotless {
 
 ## YAML
 
-- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/YamlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
+- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/YamlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
 
 ```gradle
 spotless {
@@ -1119,7 +1119,7 @@ spotless {
 
 ## Shell
 
-`com.diffplug.gradle.spotless.ShellExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/ShellExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ShellExtension.java)
+`com.diffplug.gradle.spotless.ShellExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/ShellExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ShellExtension.java)
 
 ```gradle
 spotless {
@@ -1155,7 +1155,7 @@ shfmt().pathToExe('/opt/homebrew/bin/shfmt')
 
 ## Gherkin
 
-- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
+- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
 
 ```gradle
 spotless {
@@ -1184,7 +1184,7 @@ spotless {
 
 ## CSS
 
-`com.diffplug.gradle.spotless.CssExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/CssExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CssExtension.java)
+`com.diffplug.gradle.spotless.CssExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/CssExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CssExtension.java)
 
 ```gradle
 spotless {
@@ -1585,7 +1585,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -1671,9 +1671,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -1706,11 +1706,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From c442e3a507400bd9ae271e5d0df56ecd11d711e3 Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az1673-529.lb1qojfxm3genb4ph43ig2eqrc.cx.internal.cloudapp.net>
Date: Tue, 7 Jan 2025 16:33:06 +0000
Subject: [PATCH 2005/2068] Published maven/2.44.1

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 4ce9128ebd..8a3409e6c7 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.44.1] - 2025-01-07
 ### Fixed
 * Deployment was missing part of the CDT formatter, now fixed. ([#2384](https://github.com/diffplug/spotless/issues/2384))
 
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 914c85b266..d8b22465f8 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -8,8 +8,8 @@ output = [
   ].join('\n');
 -->
 [![MavenCentral](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Changelog](https://img.shields.io/badge/changelog-2.44.0-blue.svg)](CHANGES.md)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.44.0/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.44.1-blue.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.44.1/index.html)
 <!---freshmark /shields -->
 
 <!---freshmark javadoc

From 7c8ecc69d5ea500722d84904bc6000f71aa94198 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 7 Jan 2025 22:01:52 +0000
Subject: [PATCH 2006/2068] Update plugin com.diffplug.spotless to v7.0.1

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index c64b5a9c31..9417dcde6b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-	id 'com.diffplug.spotless' version '7.0.0' apply false
+	id 'com.diffplug.spotless' version '7.0.1' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
 	id 'com.gradle.plugin-publish' version '1.3.0' apply false
 	// https://github.com/gradle-nexus/publish-plugin/releases

From e15778e343d744d9864d4e9637e0fc601688f58c Mon Sep 17 00:00:00 2001
From: Joshua Gleitze <joshua.gleitze@goto.com>
Date: Wed, 8 Jan 2025 13:45:11 +0100
Subject: [PATCH 2007/2068] test: test case reproducing the npm configuration
 cache issue #2372

---
 .../spotless/NpmTestsWithoutNpmInstallationTest.java     | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
index 22fe466dbe..8d78df006d 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
@@ -177,4 +177,13 @@ void useNpmNextToConfiguredNodePluginFromNodeGradlePlugin() throws Exception {
 			throw e;
 		}
 	}
+
+	@Test
+	public void supportsConfigurationCache() throws Exception {
+		setFile("build.gradle").toResource("com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest_gradle_node_plugin_example_1.gradle");
+		setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
+		final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "--configuration-cache", "spotlessApply").build();
+		Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile_prettier_2.clean");
+	}
 }

From 078945d6e8298a84a17c55d178d801b12ac376aa Mon Sep 17 00:00:00 2001
From: Joshua Gleitze <joshua.gleitze@goto.com>
Date: Wed, 8 Jan 2025 13:47:12 +0100
Subject: [PATCH 2008/2068] fix: repair the configuration cache for NPM tasks
 by using a mutable instead of an immutable list

workaround for #2372
---
 .../main/java/com/diffplug/spotless/npm/NpmPathResolver.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmPathResolver.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmPathResolver.java
index 317c2a479b..afb0215114 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmPathResolver.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmPathResolver.java
@@ -17,6 +17,7 @@
 
 import java.io.File;
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
@@ -35,7 +36,9 @@ public NpmPathResolver(File explicitNpmExecutable, File explicitNodeExecutable,
 		this.explicitNpmExecutable = explicitNpmExecutable;
 		this.explicitNodeExecutable = explicitNodeExecutable;
 		this.explicitNpmrcFile = explicitNpmrcFile;
-		this.additionalNpmrcLocations = List.copyOf(additionalNpmrcLocations);
+		// We must not use an immutable list (e.g. List.copyOf) here, because immutable lists cannot be restored
+		// from Gradle’s serialisation. See https://github.com/diffplug/spotless/issues/2372
+		this.additionalNpmrcLocations = new ArrayList<>(additionalNpmrcLocations);
 	}
 
 	/**

From 6571ab11164266fe4d74501f7c0c279ff679d027 Mon Sep 17 00:00:00 2001
From: Joshua Gleitze <joshua.gleitze@goto.com>
Date: Wed, 8 Jan 2025 14:21:11 +0100
Subject: [PATCH 2009/2068] docs: document fix of #2372

---
 plugin-gradle/CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 6b9b44181f..077f18125d 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Fixed
+ * Node.JS-based tasks now work with the configuration cache ([#2372](https://github.com/diffplug/spotless/issues/2372))
 
 ## [7.0.1] - 2025-01-07
 ### Fixed

From 87ac6a1a596c1c819c4da9fcd2274ce741fc630e Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 8 Jan 2025 10:38:18 -0800
Subject: [PATCH 2010/2068] Update lib changelog.

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 1a32103bf0..c714552607 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Node.JS-based tasks now work with the configuration cache ([#2372](https://github.com/diffplug/spotless/issues/2372))
 
 ## [3.0.1] - 2025-01-07
 ### Fixed

From 6e2b09334a711c53a66ea08728d4b8fa74685056 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 8 Jan 2025 10:43:38 -0800
Subject: [PATCH 2011/2068] spotlessApply

---
 .../main/java/com/diffplug/spotless/npm/NpmPathResolver.java    | 2 +-
 .../gradle/spotless/NpmTestsWithoutNpmInstallationTest.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmPathResolver.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmPathResolver.java
index afb0215114..f62340f074 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmPathResolver.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmPathResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 DiffPlug
+ * Copyright 2020-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
index 8d78df006d..1d782120de 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From feaac904e8e01015c8aa267a9a049e94f9650470 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 8 Jan 2025 13:26:06 -0800
Subject: [PATCH 2012/2068] Make sure we use a recent version of `gradleRunner`

---
 .../gradle/spotless/NpmTestsWithoutNpmInstallationTest.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
index 1d782120de..6abbc108fa 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
@@ -182,7 +182,9 @@ void useNpmNextToConfiguredNodePluginFromNodeGradlePlugin() throws Exception {
 	public void supportsConfigurationCache() throws Exception {
 		setFile("build.gradle").toResource("com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest_gradle_node_plugin_example_1.gradle");
 		setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
-		final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "--configuration-cache", "spotlessApply").build();
+		BuildResult spotlessApply = gradleRunner()
+				.withGradleVersion(GradleVersionSupport.STABLE_CONFIGURATION_CACHE.version)
+				.withArguments("--stacktrace", "--configuration-cache", "spotlessApply").build();
 		Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
 		assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile_prettier_2.clean");
 	}

From 4c9e39a10b388286684f849db45a455232f74362 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 10 Jan 2025 10:34:47 +0000
Subject: [PATCH 2013/2068] Update plugin com.github.spotbugs to v6.1.0

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 9417dcde6b..76e667f42d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,7 +12,7 @@ plugins {
 	// https://github.com/gradle-nexus/publish-plugin/releases
 	id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
-	id 'com.github.spotbugs' version '6.0.27' apply false
+	id 'com.github.spotbugs' version '6.1.0' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
 	id 'com.diffplug.spotless-changelog' version '3.1.2' apply false
 	// https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md

From 77c480e8844ceb44e8801ffff67553b4adb161f5 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 14 Jan 2025 12:39:38 -0800
Subject: [PATCH 2014/2068] Bump equo versions to latest, which fixes parallel
 downloads.

---
 lib-extra/build.gradle                                      | 2 +-
 .../com/diffplug/spotless/extra/EquoBasedStepBuilder.java   | 6 +++---
 settings.gradle                                             | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index 5e056a8384..68862448b6 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -7,7 +7,7 @@ version = rootProject.spotlessChangelog.versionNext
 apply from: rootProject.file('gradle/java-setup.gradle')
 apply from: rootProject.file('gradle/java-publish.gradle')
 
-String VER_SOLSTICE = '1.8.0'
+String VER_SOLSTICE = '1.8.1'
 dependencies {
 	api projects.lib
 	// misc useful utilities
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 df3824e9ca..fa68bc5391 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -131,8 +131,8 @@ public FormatterStep build() {
 			}
 			var classpath = new ArrayList<File>();
 			var mavenDeps = new ArrayList<String>();
-			mavenDeps.add("dev.equo.ide:solstice:1.8.0");
-			mavenDeps.add("com.diffplug.durian:durian-swt.os:4.2.0");
+			mavenDeps.add("dev.equo.ide:solstice:1.8.1");
+			mavenDeps.add("com.diffplug.durian:durian-swt.os:4.3.1");
 			mavenDeps.addAll(query.getJarsOnMavenCentral());
 			classpath.addAll(mavenProvisioner.provisionWithTransitives(false, mavenDeps));
 			classpath.addAll(query.getJarsNotOnMavenCentral());
diff --git a/settings.gradle b/settings.gradle
index 76e667f42d..eb94d63dab 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -22,7 +22,7 @@ plugins {
 	// https://plugins.gradle.org/plugin/com.gradle.develocity
 	id 'com.gradle.develocity' version '3.19'
 	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
-	id 'dev.equo.ide' version '1.7.7' apply false
+	id 'dev.equo.ide' version '1.7.8' apply false
 }
 
 dependencyResolutionManagement {

From 3727dfae92d22b806b4525622061b012b34a8151 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 14 Jan 2025 12:40:07 -0800
Subject: [PATCH 2015/2068] Fix deprecations in the Spotless build.

---
 build.gradle                     | 2 +-
 gradle/spotless-freshmark.gradle | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0ae84bd9c4..fafd6abe43 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,7 +22,7 @@ spotless {
 	}
 	format 'dotfiles', {
 		target '.gitignore', '.gitattributes', '.editorconfig'
-		indentWithSpaces(2)
+		leadingTabsToSpaces(2)
 		trimTrailingWhitespace()
 		endWithNewline()
 	}
diff --git a/gradle/spotless-freshmark.gradle b/gradle/spotless-freshmark.gradle
index 54623eb05a..ddaedcfa3e 100644
--- a/gradle/spotless-freshmark.gradle
+++ b/gradle/spotless-freshmark.gradle
@@ -10,7 +10,7 @@ Action<FreshMarkExtension> freshmarkSetup = {
 		it.put('yes', ':+1:')
 		it.put('no', ':white_large_square:')
 	}
-	it.indentWithSpaces(2)
+	it.leadingTabsToSpaces(2)
 	it.endWithNewline()
 }
 

From b401228e2bb7286f03eed7509f6ef358982018a8 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 14 Jan 2025 12:40:12 -0800
Subject: [PATCH 2016/2068] Update changelogs.

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 3 ++-
 plugin-maven/CHANGES.md  | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index c714552607..3cda61bce4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Fixed
 * Node.JS-based tasks now work with the configuration cache ([#2372](https://github.com/diffplug/spotless/issues/2372))
+* Eclipse-based tasks can now handle parallel configuration ([#2389](https://github.com/diffplug/spotless/issues/2389))
 
 ## [3.0.1] - 2025-01-07
 ### Fixed
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 077f18125d..84e6a72a95 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -4,7 +4,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Fixed
- * Node.JS-based tasks now work with the configuration cache ([#2372](https://github.com/diffplug/spotless/issues/2372))
+* Node.JS-based tasks now work with the configuration cache ([#2372](https://github.com/diffplug/spotless/issues/2372))
+* Eclipse-based tasks can now handle parallel configuration ([#2389](https://github.com/diffplug/spotless/issues/2389))
 
 ## [7.0.1] - 2025-01-07
 ### Fixed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 8a3409e6c7..c4c6d57eb9 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,7 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+* Eclipse-based tasks can now handle parallel configuration ([#2389](https://github.com/diffplug/spotless/issues/2389))
 
 ## [2.44.1] - 2025-01-07
 ### Fixed

From 37c85b8b76de434625e70b4ac194f9483c35d572 Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az1938-596.vfauej4skqkeff2vnl2tg2wrza.cx.internal.cloudapp.net>
Date: Tue, 14 Jan 2025 21:04:52 +0000
Subject: [PATCH 2017/2068] Published lib/3.0.2

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 3cda61bce4..20814e87f1 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [3.0.2] - 2025-01-14
 ### Fixed
 * Node.JS-based tasks now work with the configuration cache ([#2372](https://github.com/diffplug/spotless/issues/2372))
 * Eclipse-based tasks can now handle parallel configuration ([#2389](https://github.com/diffplug/spotless/issues/2389))

From 20e2f5a218a216abe108889fb1a75621b92eecc1 Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az1938-596.vfauej4skqkeff2vnl2tg2wrza.cx.internal.cloudapp.net>
Date: Tue, 14 Jan 2025 21:10:40 +0000
Subject: [PATCH 2018/2068] Published gradle/7.0.2

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 62 ++++++++++++++++++++--------------------
 2 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 84e6a72a95..8bd24914b1 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [7.0.2] - 2025-01-14
 ### Fixed
 * Node.JS-based tasks now work with the configuration cache ([#2372](https://github.com/diffplug/spotless/issues/2372))
 * Eclipse-based tasks can now handle parallel configuration ([#2389](https://github.com/diffplug/spotless/issues/2389))
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index dd06c0e13f..f1dd242a8e 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -14,9 +14,9 @@ output = [
   ].join('\n');
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
-[![Changelog](https://img.shields.io/badge/changelog-7.0.1-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-7.0.2-blue.svg)](CHANGES.md)
 [![MavenCentral](https://img.shields.io/badge/mavencentral-here-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/index.html)
 
 [![VS Code plugin](https://img.shields.io/badge/IDE-VS_Code-blueviolet.svg)](https://marketplace.visualstudio.com/items?itemName=richardwillis.vscode-spotless-gradle)
 [![IntelliJ plugin](https://img.shields.io/badge/IDE-IntelliJ-blueviolet.svg)](https://plugins.jetbrains.com/plugin/18321-spotless-gradle)
@@ -128,10 +128,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -173,7 +173,7 @@ Spotless is primarily a formatter, _not_ a linter. In our opinion, a linter is j
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -372,8 +372,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -432,8 +432,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -522,7 +522,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -554,7 +554,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -590,7 +590,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -626,7 +626,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ### buf
 
-`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
+`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
 
 **WARNING** this step **must** be the first step in the chain, steps before it will be ignored. Thumbs up [this issue](https://github.com/bufbuild/buf/issues/1035) for a resolution, see [here](https://github.com/diffplug/spotless/pull/1208#discussion_r1264439669) for more details on the problem.
 
@@ -658,7 +658,7 @@ buf {
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -679,7 +679,7 @@ spotless {
 
 ## Flexmark
 
-`com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/FlexmarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java)
+`com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/FlexmarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java)
 
 [homepage](https://github.com/vsch/flexmark-java). Flexmark is a flexible Commonmark/Markdown parser that can be used to format Markdown files. It supports different [flavors of Markdown](https://github.com/vsch/flexmark-java#markdown-processor-emulation) and [many formatting options](https://github.com/vsch/flexmark-java/wiki/Markdown-Formatter#options).
 
@@ -698,7 +698,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -723,7 +723,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -761,7 +761,7 @@ sql.formatter.indent.size=4
 
 ## Maven POM
 
-`com.diffplug.gradle.spotless.PomExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/PomExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PomExtension.java)
+`com.diffplug.gradle.spotless.PomExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/PomExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PomExtension.java)
 
 ```gradle
 spotless {
@@ -810,7 +810,7 @@ spotless {
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -904,7 +904,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## Javascript
 
-- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
+- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
 
 ```gradle
 spotless {
@@ -967,7 +967,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -1087,7 +1087,7 @@ spotless {
 
 ## YAML
 
-- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/YamlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
+- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/YamlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
 
 ```gradle
 spotless {
@@ -1119,7 +1119,7 @@ spotless {
 
 ## Shell
 
-`com.diffplug.gradle.spotless.ShellExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/ShellExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ShellExtension.java)
+`com.diffplug.gradle.spotless.ShellExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/ShellExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ShellExtension.java)
 
 ```gradle
 spotless {
@@ -1155,7 +1155,7 @@ shfmt().pathToExe('/opt/homebrew/bin/shfmt')
 
 ## Gherkin
 
-- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
+- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
 
 ```gradle
 spotless {
@@ -1184,7 +1184,7 @@ spotless {
 
 ## CSS
 
-`com.diffplug.gradle.spotless.CssExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/CssExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CssExtension.java)
+`com.diffplug.gradle.spotless.CssExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/CssExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CssExtension.java)
 
 ```gradle
 spotless {
@@ -1585,7 +1585,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -1671,9 +1671,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -1706,11 +1706,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.1/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From 6d03aed509e72e167d04978a72a66ab4e9aa248b Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az1938-596.vfauej4skqkeff2vnl2tg2wrza.cx.internal.cloudapp.net>
Date: Tue, 14 Jan 2025 21:17:59 +0000
Subject: [PATCH 2019/2068] Published maven/2.44.2

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index c4c6d57eb9..1d63ed362e 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.44.2] - 2025-01-14
 * Eclipse-based tasks can now handle parallel configuration ([#2389](https://github.com/diffplug/spotless/issues/2389))
 
 ## [2.44.1] - 2025-01-07
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index d8b22465f8..4c81cc289e 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -8,8 +8,8 @@ output = [
   ].join('\n');
 -->
 [![MavenCentral](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Changelog](https://img.shields.io/badge/changelog-2.44.1-blue.svg)](CHANGES.md)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.44.1/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.44.2-blue.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.44.2/index.html)
 <!---freshmark /shields -->
 
 <!---freshmark javadoc

From eb5af32c0d2ff023c74c555ba644fe083f8c5887 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 16 Jan 2025 15:50:32 +0800
Subject: [PATCH 2020/2068] chore(deps): update plugin com.diffplug.spotless to
 v7.0.2 (#2399)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index eb94d63dab..ada3768759 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-	id 'com.diffplug.spotless' version '7.0.1' apply false
+	id 'com.diffplug.spotless' version '7.0.2' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
 	id 'com.gradle.plugin-publish' version '1.3.0' apply false
 	// https://github.com/gradle-nexus/publish-plugin/releases

From ecd1f1615e95d3a19efcff30c2c9fc355ec4a46c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 19 Jan 2025 10:50:35 +0800
Subject: [PATCH 2021/2068] fix(deps): update dependency
 org.assertj:assertj-core to v3.27.3 (#2405)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 091aa47e50..3ed73f7fa1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -30,6 +30,6 @@ VER_SLF4J=[1.6,2.0[
 VER_DURIAN=1.2.0
 VER_JGIT=6.10.0.202406032230-r
 VER_JUNIT=5.11.4
-VER_ASSERTJ=3.27.2
+VER_ASSERTJ=3.27.3
 VER_MOCKITO=5.15.2
 VER_SELFIE=2.4.2
\ No newline at end of file

From 7d1fe1fabba0606a686576747da3f4730f8eaa12 Mon Sep 17 00:00:00 2001
From: zashroof <a.saleh@celonis.com>
Date: Wed, 22 Jan 2025 16:29:30 -0500
Subject: [PATCH 2022/2068] port clang-format to maven plugin

---
 .../diffplug/spotless/maven/cpp/Clang.java    | 50 +++++++++++++++++++
 .../com/diffplug/spotless/maven/cpp/Cpp.java  |  6 ++-
 .../spotless/maven/protobuf/Protobuf.java     |  7 ++-
 .../maven/cpp/ClangMavenIntegrationTest.java  | 46 +++++++++++++++++
 4 files changed, 107 insertions(+), 2 deletions(-)
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/cpp/Clang.java
 create mode 100644 plugin-maven/src/test/java/com/diffplug/spotless/maven/cpp/ClangMavenIntegrationTest.java

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/cpp/Clang.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/cpp/Clang.java
new file mode 100644
index 0000000000..f4db16049a
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/cpp/Clang.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2024-2025 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.cpp;
+
+import org.apache.maven.plugins.annotations.Parameter;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.cpp.ClangFormatStep;
+import com.diffplug.spotless.maven.FormatterStepConfig;
+import com.diffplug.spotless.maven.FormatterStepFactory;
+
+public class Clang implements FormatterStepFactory {
+	@Parameter
+	private String version;
+
+	@Parameter
+	private String pathToExe;
+
+	@Parameter
+	private String style;
+
+	@Override
+	public FormatterStep newFormatterStep(FormatterStepConfig config) {
+		ClangFormatStep clang = ClangFormatStep.withVersion(version == null ? ClangFormatStep.defaultVersion() : version);
+
+		if (pathToExe != null) {
+			clang = clang.withPathToExe(pathToExe);
+		}
+
+		if (style != null) {
+			clang = clang.withStyle(style);
+		}
+
+		return clang.create();
+	}
+
+}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/cpp/Cpp.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/cpp/Cpp.java
index 44940ae4d8..8739a1c717 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/cpp/Cpp.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/cpp/Cpp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,6 +40,10 @@ public void addEclipseCdt(EclipseCdt eclipse) {
 		addStepFactory(eclipse);
 	}
 
+	public void addClangFormat(Clang clang) {
+		addStepFactory(clang);
+	}
+
 	@Override
 	public String licenseHeaderDelimiter() {
 		return CppDefaults.DELIMITER_EXPR;
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/protobuf/Protobuf.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/protobuf/Protobuf.java
index 3362ea2ad3..78d60f4bde 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/protobuf/Protobuf.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/protobuf/Protobuf.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 
 import com.diffplug.common.collect.ImmutableSet;
 import com.diffplug.spotless.maven.FormatterFactory;
+import com.diffplug.spotless.maven.cpp.Clang;
 import com.diffplug.spotless.maven.generic.LicenseHeader;
 
 /**
@@ -49,4 +50,8 @@ public String licenseHeaderDelimiter() {
 	public void addBuf(Buf buf) {
 		addStepFactory(buf);
 	}
+
+	public void addClang(Clang clang) {
+		addStepFactory(clang);
+	}
 }
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/cpp/ClangMavenIntegrationTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/cpp/ClangMavenIntegrationTest.java
new file mode 100644
index 0000000000..f068cebc45
--- /dev/null
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/cpp/ClangMavenIntegrationTest.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2024-2025 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.cpp;
+
+import org.junit.jupiter.api.Test;
+
+import com.diffplug.spotless.maven.MavenIntegrationHarness;
+import com.diffplug.spotless.tag.ClangTest;
+
+@ClangTest
+class ClangMavenIntegrationTest extends MavenIntegrationHarness {
+
+	@Test
+	@ClangTest
+	void csharp() throws Exception {
+		writePomWithCppSteps("<includes>", "<include>", "src/**/*.cs", "</include>", "</includes>",
+				"<clangFormat>", "<version>", "14.0.0-1ubuntu1.1", "</version>", "</clangFormat>");
+		setFile("src/test.cs").toResource("clang/example.cs");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("src/test.cs").sameAsResource("clang/example.cs.clean");
+	}
+
+	@Test
+	@ClangTest
+	void proto() throws Exception {
+		writePomWithCppSteps("<includes>", "<include>", "**/*.proto", "</include>", "</includes>",
+				"<clangFormat>", "<version>", "14.0.0-1ubuntu1.1", "</version>", "</clangFormat>");
+		setFile("buf.proto").toResource("protobuf/buf/buf.proto");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile("buf.proto").sameAsResource("protobuf/buf/buf.proto.clean");
+	}
+
+}

From a498d338b17b84fb578353fd433e2e411fd9de2f Mon Sep 17 00:00:00 2001
From: zashroof <a.saleh@celonis.com>
Date: Wed, 22 Jan 2025 16:34:29 -0500
Subject: [PATCH 2023/2068] Update changes.md and README files

---
 CHANGES.md              |  1 +
 plugin-maven/CHANGES.md |  1 +
 plugin-maven/README.md  | 30 +++++++++++++++++++++---------
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 20814e87f1..b170b7086d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,7 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+* Support for`clang-format` on maven-plugin ([#2406](https://github.com/diffplug/spotless/pull/2406))
 
 ## [3.0.2] - 2025-01-14
 ### Fixed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 1d63ed362e..aacb203c53 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,7 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+* Support for `clang-format` ([#2406](https://github.com/diffplug/spotless/pull/2406))
 
 ## [2.44.2] - 2025-01-14
 * Eclipse-based tasks can now handle parallel configuration ([#2389](https://github.com/diffplug/spotless/issues/2389))
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 4c81cc289e..459dd9f1d7 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -43,7 +43,7 @@ user@machine repo % mvn spotless:check
   - [Groovy](#groovy) ([eclipse groovy](#eclipse-groovy))
   - [Kotlin](#kotlin) ([ktfmt](#ktfmt), [ktlint](#ktlint), [diktat](#diktat), [prettier](#prettier))
   - [Scala](#scala) ([scalafmt](#scalafmt))
-  - [C/C++](#cc) ([eclipse cdt](#eclipse-cdt))
+  - [C/C++](#cc) ([eclipse cdt](#eclipse-cdt), [clang-format](#clang-format))
   - [Python](#python) ([black](#black))
   - [Antlr4](#antlr4) ([antlr4formatter](#antlr4formatter))
   - [Sql](#sql) ([dbeaver](#dbeaver))
@@ -56,7 +56,7 @@ user@machine repo % mvn spotless:check
   - [Gherkin](#gherkin)
   - [Go](#go)
   - [RDF](#RDF)
-  - [Protobuf](#protobuf) ([buf](#buf))
+  - [Protobuf](#protobuf) ([buf](#buf), [clang-format](#clang))
   - Multiple languages
     - [Prettier](#prettier) ([plugins](#prettier-plugins), [npm detection](#npm-detection), [`.npmrc` detection](#npmrc-detection), [caching `npm install` results](#caching-results-of-npm-install))
     - [eclipse web tools platform](#eclipse-web-tools-platform)
@@ -558,6 +558,18 @@ Additionally, `editorConfigOverride` options will override what's supplied in `.
 </eclipseCdt>
 ```
 
+### clang-format
+
+[homepage](https://clang.llvm.org/docs/ClangFormat.html). [changelog](https://releases.llvm.org/download.html). `clang-format` is a formatter for c, c++, c#, objective-c, protobuf, javascript, and java. You can use clang-format in any language-specific format, but usually you will be creating a generic format.
+
+```xml
+<clangFormat>
+  <version>14.0.0-1ubuntu1.1</version> <!-- optional version of clang-format -->
+  <pathToExe>/path/to/buf</pathToExe>  <!-- optional: if clang-format isn't in your path -->
+  <style>LLVM</style>  <!-- optional: can be LLVM, Google, Chromium, Mozilla, WebKit -->
+</clangFormat>
+```
+
 ## Python
 
 [code](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/python/Python.java). [available steps](https://github.com/diffplug/spotless/tree/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/python/Black.java).
@@ -1218,17 +1230,17 @@ RDF parsing is done via [Apache Jena](https://jena.apache.org/) in the version t
 [code](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/protobuf/Protobuf.java). [available steps](https://github.com/diffplug/spotless/tree/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/protobuf).
 ```xml
 <configuration>
-  <includes>  <!-- optiona: default is **/*.proto -->
-    <include>proto/*.proto<include>
-  <includes>
+  <includes>  <!-- optional: default is **/*.proto -->
+    <include>proto/*.proto</include>
+  </includes>
 
-  <excludes>  <!-- optiona: if you want to ignore auto generated protos -->
-    <include>target/**/<include>
-  <excludes>
+  <excludes>  <!-- optional: if you want to ignore auto generated protos -->
+    <exclude>target/**/<exclude>
+  </excludes>
   
   <protobuf>
     <buf />  <!-- has its own section below -->
-  </css>
+  </protobuf>
 </configuration>
 ```
 

From d6d42c13804a625b6c17aa7051bccbbfb0c8d786 Mon Sep 17 00:00:00 2001
From: zashroof <a.saleh@celonis.com>
Date: Wed, 22 Jan 2025 16:36:42 -0500
Subject: [PATCH 2024/2068] Update homepage README

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a40b9edb0d..5ed1de0187 100644
--- a/README.md
+++ b/README.md
@@ -131,7 +131,7 @@ lib('yaml.JacksonYamlStep')                      +'{{yes}}       | {{yes}}
 | [`generic.TrimTrailingWhitespaceStep`](lib/src/main/java/com/diffplug/spotless/generic/TrimTrailingWhitespaceStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`antlr4.Antlr4FormatterStep`](lib/src/main/java/com/diffplug/spotless/antlr4/Antlr4FormatterStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`biome.BiomeStep`](lib/src/main/java/com/diffplug/spotless/biome/BiomeStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
-| [`cpp.ClangFormatStep`](lib/src/main/java/com/diffplug/spotless/cpp/ClangFormatStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
+| [`cpp.ClangFormatStep`](lib/src/main/java/com/diffplug/spotless/cpp/ClangFormatStep.java) | :+1:       | :+1:       | :white_large_square:       | :white_large_square:  |
 | [`cpp.EclipseFormatterStep`](lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseFormatterStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`go.GofmtFormatStep`](lib/src/main/java/com/diffplug/spotless/go/GofmtFormatStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
 | [`gherkin.GherkinUtilsStep`](lib/src/main/java/com/diffplug/spotless/gherkin/GherkinUtilsStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
@@ -156,7 +156,7 @@ lib('yaml.JacksonYamlStep')                      +'{{yes}}       | {{yes}}
 | [`npm.PrettierFormatterStep`](lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`npm.TsFmtFormatterStep`](lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`pom.SortPomStep`](lib/src/main/java/com/diffplug/spotless/pom/SortPomStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
-| [`protobuf.BufStep`](lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
+| [`protobuf.BufStep`](lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`python.BlackStep`](lib/src/main/java/com/diffplug/spotless/python/BlackStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
 | [`rdf.RdfFormatterStep`](lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterStep.java) | :white_large_square:        | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`scala.ScalaFmtStep`](lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |

From 2c7656075e75f887ee65009b52a643581f6778ff Mon Sep 17 00:00:00 2001
From: zashroof <a.saleh@celonis.com>
Date: Wed, 22 Jan 2025 16:48:23 -0500
Subject: [PATCH 2025/2068] Fix README style

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 5ed1de0187..a40b9edb0d 100644
--- a/README.md
+++ b/README.md
@@ -131,7 +131,7 @@ lib('yaml.JacksonYamlStep')                      +'{{yes}}       | {{yes}}
 | [`generic.TrimTrailingWhitespaceStep`](lib/src/main/java/com/diffplug/spotless/generic/TrimTrailingWhitespaceStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`antlr4.Antlr4FormatterStep`](lib/src/main/java/com/diffplug/spotless/antlr4/Antlr4FormatterStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`biome.BiomeStep`](lib/src/main/java/com/diffplug/spotless/biome/BiomeStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
-| [`cpp.ClangFormatStep`](lib/src/main/java/com/diffplug/spotless/cpp/ClangFormatStep.java) | :+1:       | :+1:       | :white_large_square:       | :white_large_square:  |
+| [`cpp.ClangFormatStep`](lib/src/main/java/com/diffplug/spotless/cpp/ClangFormatStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
 | [`cpp.EclipseFormatterStep`](lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseFormatterStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`go.GofmtFormatStep`](lib/src/main/java/com/diffplug/spotless/go/GofmtFormatStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
 | [`gherkin.GherkinUtilsStep`](lib/src/main/java/com/diffplug/spotless/gherkin/GherkinUtilsStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
@@ -156,7 +156,7 @@ lib('yaml.JacksonYamlStep')                      +'{{yes}}       | {{yes}}
 | [`npm.PrettierFormatterStep`](lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`npm.TsFmtFormatterStep`](lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`pom.SortPomStep`](lib/src/main/java/com/diffplug/spotless/pom/SortPomStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
-| [`protobuf.BufStep`](lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
+| [`protobuf.BufStep`](lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
 | [`python.BlackStep`](lib/src/main/java/com/diffplug/spotless/python/BlackStep.java) | :+1:       | :white_large_square:       | :white_large_square:       | :white_large_square:  |
 | [`rdf.RdfFormatterStep`](lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterStep.java) | :white_large_square:        | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`scala.ScalaFmtStep`](lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |

From 5a8069373a89d4e1cfe4f15c21171938875d0a22 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 24 Jan 2025 09:42:18 +0800
Subject: [PATCH 2026/2068] chore(deps): update plugin com.gradle.develocity to
 v3.19.1 (#2407)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index ada3768759..16a7ef904f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -20,7 +20,7 @@ plugins {
 	// https://github.com/davidburstrom/version-compatibility-gradle-plugin/tags
 	id 'io.github.davidburstrom.version-compatibility' version '0.5.0' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.develocity
-	id 'com.gradle.develocity' version '3.19'
+	id 'com.gradle.develocity' version '3.19.1'
 	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
 	id 'dev.equo.ide' version '1.7.8' apply false
 }

From 29f88a498bb46a374c79fe493958dfb7e79620f5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 25 Jan 2025 18:18:47 +0800
Subject: [PATCH 2027/2068] chore(deps): update dependency gradle to v8.12.1
 (#2411)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index cea7a793a8..e18bc253b8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

From 662da8c339848f0f79dab11dd69fbe1dd22c89a7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 27 Jan 2025 20:34:03 +0800
Subject: [PATCH 2028/2068] chore(deps): update plugin com.github.spotbugs to
 v6.1.3 (#2401)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 16a7ef904f..df67386b1d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,7 +12,7 @@ plugins {
 	// https://github.com/gradle-nexus/publish-plugin/releases
 	id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
-	id 'com.github.spotbugs' version '6.1.0' apply false
+	id 'com.github.spotbugs' version '6.1.3' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
 	id 'com.diffplug.spotless-changelog' version '3.1.2' apply false
 	// https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md

From 1e69a03fa32cc589ae9097e89fe6b60f2622c456 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 1 Feb 2025 10:52:45 +0800
Subject: [PATCH 2029/2068] chore(deps): update plugin
 com.gradle.plugin-publish to v1.3.1 (#2415)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index df67386b1d..2ca7c46cf4 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -8,7 +8,7 @@ pluginManagement {
 plugins {
 	id 'com.diffplug.spotless' version '7.0.2' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
-	id 'com.gradle.plugin-publish' version '1.3.0' apply false
+	id 'com.gradle.plugin-publish' version '1.3.1' apply false
 	// https://github.com/gradle-nexus/publish-plugin/releases
 	id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases

From 5a5db69db6254de76c2b33ca4c1f76d3da5d62b3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 1 Feb 2025 10:56:59 +0000
Subject: [PATCH 2030/2068] chore(config): migrate renovate config (#2417)

* chore(config): migrate config renovate.json

* Update and rename renovate.json to .github/renovate.json5

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Zongle Wang <wangzongler@gmail.com>
---
 renovate.json => .github/renovate.json5 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename renovate.json => .github/renovate.json5 (67%)

diff --git a/renovate.json b/.github/renovate.json5
similarity index 67%
rename from renovate.json
rename to .github/renovate.json5
index 2b278dfe17..ef44cb00f9 100644
--- a/renovate.json
+++ b/.github/renovate.json5
@@ -1,14 +1,14 @@
 {
 	"$schema": "https://docs.renovatebot.com/renovate-schema.json",
 	"extends": [
-		"config:base"
+		"config:recommended",
 	],
 	"packageRules": [
 		{
 			"groupName": "Ktlint",
 			"enabled": false,
-			"matchPackagePatterns": [
-				"com.pinterest.ktlint:*"
+			"matchPackageNames": [
+				"/com.pinterest.ktlint:*/",
 			]
 		}
 	]

From 9a44f536fe2e7acc3f9c706ce620a6686d0b262b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 11 Feb 2025 15:34:31 +0800
Subject: [PATCH 2031/2068] chore(deps): update plugin com.github.spotbugs to
 v6.1.4 (#2420)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 2ca7c46cf4..62aec6d7c7 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,7 +12,7 @@ plugins {
 	// https://github.com/gradle-nexus/publish-plugin/releases
 	id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
-	id 'com.github.spotbugs' version '6.1.3' apply false
+	id 'com.github.spotbugs' version '6.1.4' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
 	id 'com.diffplug.spotless-changelog' version '3.1.2' apply false
 	// https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md

From 5cf14e657847f115c95f356119c9e00437fcfd7e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 14 Feb 2025 14:08:46 +0800
Subject: [PATCH 2032/2068] chore(deps): update plugin com.github.spotbugs to
 v6.1.5 (#2422)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 62aec6d7c7..d666da242b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,7 +12,7 @@ plugins {
 	// https://github.com/gradle-nexus/publish-plugin/releases
 	id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
-	id 'com.github.spotbugs' version '6.1.4' apply false
+	id 'com.github.spotbugs' version '6.1.5' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
 	id 'com.diffplug.spotless-changelog' version '3.1.2' apply false
 	// https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md

From e4c3bc7077404949607eccd048ff1dae074a49b4 Mon Sep 17 00:00:00 2001
From: luc0001r <riccardo.lucentini@prosiebensat1.com>
Date: Fri, 14 Feb 2025 20:37:55 +0100
Subject: [PATCH 2033/2068] use latest maven-plugin-development from GradleX

---
 plugin-maven/build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugin-maven/build.gradle b/plugin-maven/build.gradle
index edef810a62..f0b1b29508 100644
--- a/plugin-maven/build.gradle
+++ b/plugin-maven/build.gradle
@@ -1,9 +1,9 @@
-import de.benediktritter.maven.plugin.development.task.GenerateHelpMojoSourcesTask
-import de.benediktritter.maven.plugin.development.task.GenerateMavenPluginDescriptorTask
+import org.gradlex.maven.plugin.development.task.GenerateHelpMojoSourcesTask
+import org.gradlex.maven.plugin.development.task.GenerateMavenPluginDescriptorTask
 
 plugins {
-	// https://www.benediktritter.de/maven-plugin-development/#release-history
-	id 'de.benediktritter.maven-plugin-development' version '0.4.3'
+	// https://github.com/gradlex-org/maven-plugin-development
+	id 'org.gradlex.maven-plugin-development' version '1.0.3'
 }
 
 apply from: rootProject.file('gradle/changelog.gradle')

From 1fb5d3378967d17a0171f7b2d762d667df313ec8 Mon Sep 17 00:00:00 2001
From: luc0001r <riccardo.lucentini@prosiebensat1.com>
Date: Fri, 14 Feb 2025 20:38:32 +0100
Subject: [PATCH 2034/2068] make configuration cache works without issues

---
 gradle/java-publish.gradle | 24 ++++++++++++++----------
 plugin-maven/build.gradle  |  7 -------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/gradle/java-publish.gradle b/gradle/java-publish.gradle
index d6f0afa5a0..08f2a41417 100644
--- a/gradle/java-publish.gradle
+++ b/gradle/java-publish.gradle
@@ -107,17 +107,22 @@ model {
 				artifactId project.ext.artifactId
 				version project.version
 
+				def projectExtArtifactId = project.ext.artifactId
+				def projectDescription = project.description
+				def projectOrg = project.org
+				def rootProjectName = rootProject.name
+
 				pom.withXml {
 					// add MavenCentral requirements to the POM
 					asNode().children().last() + {
 						resolveStrategy = Closure.DELEGATE_FIRST
-						name project.ext.artifactId
-						description project.description
-						url "https://github.com/${project.org}/${rootProject.name}"
+						name projectExtArtifactId
+						description projectDescription
+						url "https://github.com/${projectOrg}/${rootProjectName}"
 						scm {
-							url "https://github.com/${project.org}/${rootProject.name}"
-							connection "scm:git:https://github.com/${project.org}/${rootProject.name}.git"
-							developerConnection "scm:git:ssh:git@github.com/${project.org}/${rootProject.name}.git"
+							url "https://github.com/${projectOrg}/${rootProjectName}"
+							connection "scm:git:https://github.com/${projectOrg}/${rootProjectName}.git"
+							developerConnection "scm:git:ssh:git@github.com/${projectOrg}/${rootProjectName}.git"
 						}
 						licenses {
 							if (isExt) {
@@ -188,13 +193,12 @@ if (System.env['JITPACK'] == 'true' || version.endsWith('-SNAPSHOT')) {
 		dependsOn changelogTasks.named('changelogCheck')
 	}
 	// ensures that changelog bump and push only happens if the publish was successful
-	def thisProj = project
 	changelogTasks.named('changelogBump').configure {
-		dependsOn ":${thisProj.path}:publishPluginMavenPublicationToSonatypeRepository"
+		dependsOn project.path + ":publishPluginMavenPublicationToSonatypeRepository"
 		dependsOn ":closeAndReleaseSonatypeStagingRepository"
 		// if we have a Gradle plugin, we need to push it up to the plugin portal too
-		if (thisProj.tasks.names.contains('publishPlugins')) {
-			dependsOn thisProj.tasks.named('publishPlugins')
+		if (project.tasks.names.contains('publishPlugins')) {
+			dependsOn project.tasks.named('publishPlugins')
 		}
 	}
 }
diff --git a/plugin-maven/build.gradle b/plugin-maven/build.gradle
index f0b1b29508..7932d4a007 100644
--- a/plugin-maven/build.gradle
+++ b/plugin-maven/build.gradle
@@ -19,13 +19,6 @@ mavenPlugin {
 	description = project.description
 }
 
-tasks.withType(GenerateMavenPluginDescriptorTask).configureEach {
-	notCompatibleWithConfigurationCache('https://github.com/britter/maven-plugin-development/issues/8')
-}
-tasks.withType(GenerateHelpMojoSourcesTask).configureEach {
-	notCompatibleWithConfigurationCache('https://github.com/britter/maven-plugin-development/issues/8')
-}
-
 String VER_MAVEN_API = '3.0'
 String VER_ECLIPSE_AETHER = '1.1.0'
 String VER_PLEXUS_RESOURCES = '1.3.0'

From d6154e3fd1af0cd17c0f7013ef15f2f3003092b6 Mon Sep 17 00:00:00 2001
From: luc0001r <riccardo.lucentini@prosiebensat1.com>
Date: Fri, 14 Feb 2025 20:49:30 +0100
Subject: [PATCH 2035/2068] added changelog info

---
 CHANGES.md                 | 1 +
 gradle/java-publish.gradle | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index b170b7086d..41990c2fd4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,6 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 * Support for`clang-format` on maven-plugin ([#2406](https://github.com/diffplug/spotless/pull/2406))
+* Adopt new version of `maven-plugin-development` from GradleX ([#2395](https://github.com/diffplug/spotless/pull/2395))
 
 ## [3.0.2] - 2025-01-14
 ### Fixed
diff --git a/gradle/java-publish.gradle b/gradle/java-publish.gradle
index 08f2a41417..99879e6b2e 100644
--- a/gradle/java-publish.gradle
+++ b/gradle/java-publish.gradle
@@ -193,12 +193,13 @@ if (System.env['JITPACK'] == 'true' || version.endsWith('-SNAPSHOT')) {
 		dependsOn changelogTasks.named('changelogCheck')
 	}
 	// ensures that changelog bump and push only happens if the publish was successful
+	def thisProj = project
 	changelogTasks.named('changelogBump').configure {
-		dependsOn project.path + ":publishPluginMavenPublicationToSonatypeRepository"
+		dependsOn ":${thisProj.path}:publishPluginMavenPublicationToSonatypeRepository"
 		dependsOn ":closeAndReleaseSonatypeStagingRepository"
 		// if we have a Gradle plugin, we need to push it up to the plugin portal too
-		if (project.tasks.names.contains('publishPlugins')) {
-			dependsOn project.tasks.named('publishPlugins')
+		if (thisProj.tasks.names.contains('publishPlugins')) {
+			dependsOn thisProj.tasks.named('publishPlugins')
 		}
 	}
 }

From cdb609ea190bb3203800829e8ccbcb0eadfd900b Mon Sep 17 00:00:00 2001
From: luc0001r <riccardo.lucentini@prosiebensat1.com>
Date: Fri, 14 Feb 2025 20:52:04 +0100
Subject: [PATCH 2036/2068] added changelog info in the right place

---
 CHANGES.md              | 1 -
 plugin-maven/CHANGES.md | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 41990c2fd4..b170b7086d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,7 +11,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 * Support for`clang-format` on maven-plugin ([#2406](https://github.com/diffplug/spotless/pull/2406))
-* Adopt new version of `maven-plugin-development` from GradleX ([#2395](https://github.com/diffplug/spotless/pull/2395))
 
 ## [3.0.2] - 2025-01-14
 ### Fixed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index aacb203c53..c737b29a43 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -4,6 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 * Support for `clang-format` ([#2406](https://github.com/diffplug/spotless/pull/2406))
+* Adopt new version of `maven-plugin-development` from GradleX ([#2395](https://github.com/diffplug/spotless/pull/2395))
 
 ## [2.44.2] - 2025-01-14
 * Eclipse-based tasks can now handle parallel configuration ([#2389](https://github.com/diffplug/spotless/issues/2389))

From fd5970c17f51b88d1644db275ac4d3991174b3b5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 19 Feb 2025 15:03:56 +0800
Subject: [PATCH 2037/2068] chore(deps): update plugin com.gradle.develocity to
 v3.19.2 (#2425)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index d666da242b..da86467edd 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -20,7 +20,7 @@ plugins {
 	// https://github.com/davidburstrom/version-compatibility-gradle-plugin/tags
 	id 'io.github.davidburstrom.version-compatibility' version '0.5.0' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.develocity
-	id 'com.gradle.develocity' version '3.19.1'
+	id 'com.gradle.develocity' version '3.19.2'
 	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
 	id 'dev.equo.ide' version '1.7.8' apply false
 }

From f519ed36a2c5ad5d90976e9b93697b2fe5dde914 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Thu, 20 Feb 2025 13:31:55 +0100
Subject: [PATCH 2038/2068] feat: allow overriding classLoader for jarstate

Opening up usage of spotless-lib in `spotless-cli`
---
 .../java/com/diffplug/spotless/JarState.java  | 38 +++++++++++++++++--
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/JarState.java b/lib/src/main/java/com/diffplug/spotless/JarState.java
index 8680932b9e..76dee4f438 100644
--- a/lib/src/main/java/com/diffplug/spotless/JarState.java
+++ b/lib/src/main/java/com/diffplug/spotless/JarState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,6 +28,11 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import javax.annotation.Nullable;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * Grabs a jar and its dependencies from maven,
  * and makes it easy to access the collection in
@@ -37,6 +42,21 @@
  * catch changes in a SNAPSHOT version.
  */
 public final class JarState implements Serializable {
+
+	private static final Logger logger = LoggerFactory.getLogger(JarState.class);
+
+	// Let the classloader be overridden for tools using different approaches to classloading
+	@Nullable
+	private static ClassLoader forcedClassLoader = null;
+
+	/** Overrides the classloader used by all JarStates. */
+	public static void setForcedClassLoader(@Nullable ClassLoader forcedClassLoader) {
+		if (!Objects.equals(JarState.forcedClassLoader, forcedClassLoader)) {
+			logger.info("Overriding the forced classloader for JarState from {} to {}", JarState.forcedClassLoader, forcedClassLoader);
+		}
+		JarState.forcedClassLoader = forcedClassLoader;
+	}
+
 	/** A lazily evaluated JarState, which becomes a set of files when serialized. */
 	public static class Promised implements Serializable {
 		private static final long serialVersionUID = 1L;
@@ -125,26 +145,36 @@ URL[] jarUrls() {
 	}
 
 	/**
-	 * Returns a classloader containing the only jars in this JarState.
+	 * Returns either a forcedClassloader ({@code JarState.setForcedClassLoader()}) or a classloader containing the only jars in this JarState.
 	 * Look-up of classes in the {@code org.slf4j} package
 	 * are not taken from the JarState, but instead redirected to the class loader of this class to enable
 	 * passthrough logging.
 	 * <br/>
 	 * The lifetime of the underlying cacheloader is controlled by {@link SpotlessCache}.
+	 *
+	 * @see com.diffplug.spotless.JarState#setForcedClassLoader(ClassLoader)
 	 */
 	public ClassLoader getClassLoader() {
+		if (forcedClassLoader != null) {
+			return forcedClassLoader;
+		}
 		return SpotlessCache.instance().classloader(this);
 	}
 
 	/**
-	 * Returns a classloader containing the only jars in this JarState.
+	 * Returns either a forcedClassloader ({@code JarState.setForcedClassLoader}) or a classloader containing the only jars in this JarState.
 	 * Look-up of classes in the {@code org.slf4j} package
 	 * are not taken from the JarState, but instead redirected to the class loader of this class to enable
 	 * passthrough logging.
 	 * <br/>
-	 * The lifetime of the underlying cacheloader is controlled by {@link SpotlessCache}.
+	 * The lifetime of the underlying cacheloader is controlled by {@link SpotlessCache}
+	 *
+	 * @see com.diffplug.spotless.JarState#setForcedClassLoader(ClassLoader)
 	 */
 	public ClassLoader getClassLoader(Serializable key) {
+		if (forcedClassLoader != null) {
+			return forcedClassLoader;
+		}
 		return SpotlessCache.instance().classloader(key, this);
 	}
 }

From 88d3c318a06a48e20e5d843930a638ff75ae7a27 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Thu, 20 Feb 2025 13:35:02 +0100
Subject: [PATCH 2039/2068] chore: update changelog for reflecting overridable
 classLoader in JarState

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index b170b7086d..d7abd321fa 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,7 +10,9 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
 * Support for`clang-format` on maven-plugin ([#2406](https://github.com/diffplug/spotless/pull/2406))
+* Allow overriding classLoader for all `JarState`s to enable spotless-cli ([#xxx](https://github.com/diffplug/spotless/pull/XXX))
 
 ## [3.0.2] - 2025-01-14
 ### Fixed

From 8ee1dfe45e3ca426ed82376c61be5f7af7144352 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Thu, 20 Feb 2025 16:16:12 +0100
Subject: [PATCH 2040/2068] chore: provide test to make sure overriding
 classloader works

---
 .../com/diffplug/spotless/JarStateTest.java   | 107 ++++++++++++++++++
 1 file changed, 107 insertions(+)
 create mode 100644 lib/src/test/java/com/diffplug/spotless/JarStateTest.java

diff --git a/lib/src/test/java/com/diffplug/spotless/JarStateTest.java b/lib/src/test/java/com/diffplug/spotless/JarStateTest.java
new file mode 100644
index 0000000000..f44aa4a0b3
--- /dev/null
+++ b/lib/src/test/java/com/diffplug/spotless/JarStateTest.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2025 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.net.URLClassLoader;
+import java.nio.file.Files;
+import java.util.stream.Collectors;
+
+import org.assertj.core.api.SoftAssertions;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+class JarStateTest {
+
+	@TempDir
+	java.nio.file.Path tempDir;
+
+	File a;
+
+	File b;
+
+	Provisioner provisioner = (withTransitives, deps) -> deps.stream().map(name -> name.equals("a") ? a : b).collect(Collectors.toSet());
+
+	@BeforeEach
+	void setUp() throws IOException {
+		a = Files.createTempFile(tempDir, "a", ".class").toFile();
+		Files.writeString(a.toPath(), "a");
+		b = Files.createTempFile(tempDir, "b", ".class").toFile();
+		Files.writeString(b.toPath(), "b");
+	}
+
+	@AfterEach
+	void tearDown() {
+		JarState.setForcedClassLoader(null);
+	}
+
+	@Test
+	void itCreatesClassloaderWhenForcedClassLoaderNotSet() throws IOException {
+		JarState state1 = JarState.from(a.getName(), provisioner);
+		JarState state2 = JarState.from(b.getName(), provisioner);
+
+		SoftAssertions.assertSoftly(softly -> {
+			softly.assertThat(state1.getClassLoader()).isNotNull();
+			softly.assertThat(state2.getClassLoader()).isNotNull();
+		});
+	}
+
+	@Test
+	void itReturnsForcedClassloaderIfSetNoMatterIfSetBeforeOrAfterCreation() throws IOException {
+		JarState stateA = JarState.from(a.getName(), provisioner);
+		ClassLoader forcedClassLoader = new URLClassLoader(new java.net.URL[0]);
+		JarState.setForcedClassLoader(forcedClassLoader);
+		JarState stateB = JarState.from(b.getName(), provisioner);
+
+		SoftAssertions.assertSoftly(softly -> {
+			softly.assertThat(stateA.getClassLoader()).isSameAs(forcedClassLoader);
+			softly.assertThat(stateB.getClassLoader()).isSameAs(forcedClassLoader);
+		});
+	}
+
+	@Test
+	void itReturnsForcedClassloaderEvenWhenRountripSerialized() throws IOException, ClassNotFoundException {
+		JarState stateA = JarState.from(a.getName(), provisioner);
+		ClassLoader forcedClassLoader = new URLClassLoader(new java.net.URL[0]);
+		JarState.setForcedClassLoader(forcedClassLoader);
+		JarState stateB = JarState.from(b.getName(), provisioner);
+
+		JarState stateARoundtripSerialized = roundtripSerialize(stateA);
+		JarState stateBRoundtripSerialized = roundtripSerialize(stateB);
+
+		SoftAssertions.assertSoftly(softly -> {
+			softly.assertThat(stateARoundtripSerialized.getClassLoader()).isSameAs(forcedClassLoader);
+			softly.assertThat(stateBRoundtripSerialized.getClassLoader()).isSameAs(forcedClassLoader);
+		});
+	}
+
+	private JarState roundtripSerialize(JarState state) throws IOException, ClassNotFoundException {
+		ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+		try (ObjectOutputStream oOut = new ObjectOutputStream(outputStream)) {
+			oOut.writeObject(state);
+		}
+		try (ObjectInputStream oIn = new ObjectInputStream(new java.io.ByteArrayInputStream(outputStream.toByteArray()))) {
+			return (JarState) oIn.readObject();
+		}
+	}
+
+}

From 06c6ca8ba332472c41a92dffcc2b436b3d4b5a6e Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Thu, 20 Feb 2025 16:19:34 +0100
Subject: [PATCH 2041/2068] chore: insert created PR#

---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index d7abd321fa..6e706fc8e4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,7 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Support for`clang-format` on maven-plugin ([#2406](https://github.com/diffplug/spotless/pull/2406))
-* Allow overriding classLoader for all `JarState`s to enable spotless-cli ([#xxx](https://github.com/diffplug/spotless/pull/XXX))
+* Allow overriding classLoader for all `JarState`s to enable spotless-cli ([#2427](https://github.com/diffplug/spotless/pull/2427))
 
 ## [3.0.2] - 2025-01-14
 ### Fixed

From 62eff174ee9faa4ce5ccbb52332085b0fa525323 Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az1970-919.jylfb2lvhi2edjyxod04kr2g0d.cx.internal.cloudapp.net>
Date: Thu, 20 Feb 2025 18:31:42 +0000
Subject: [PATCH 2042/2068] Published lib/3.1.0

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 6e706fc8e4..eaebe45744 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [3.1.0] - 2025-02-20
 ### Added
 * Support for`clang-format` on maven-plugin ([#2406](https://github.com/diffplug/spotless/pull/2406))
 * Allow overriding classLoader for all `JarState`s to enable spotless-cli ([#2427](https://github.com/diffplug/spotless/pull/2427))

From 4dd0095437906713fc6bad3a2e160646e11b419a Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az1971-844.uviqhynusljuvnxuh24jnoaoob.cx.internal.cloudapp.net>
Date: Thu, 20 Feb 2025 23:03:51 +0000
Subject: [PATCH 2043/2068] Published maven/2.44.3

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index c737b29a43..8b036b98f2 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.44.3] - 2025-02-20
 * Support for `clang-format` ([#2406](https://github.com/diffplug/spotless/pull/2406))
 * Adopt new version of `maven-plugin-development` from GradleX ([#2395](https://github.com/diffplug/spotless/pull/2395))
 
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 459dd9f1d7..e04085d965 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -8,8 +8,8 @@ output = [
   ].join('\n');
 -->
 [![MavenCentral](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Changelog](https://img.shields.io/badge/changelog-2.44.2-blue.svg)](CHANGES.md)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.44.2/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.44.3-blue.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.44.3/index.html)
 <!---freshmark /shields -->
 
 <!---freshmark javadoc

From f18578bb383848c6b6c72c32728314ec2b8349b0 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 23 Feb 2025 14:17:47 +0800
Subject: [PATCH 2044/2068] fix(deps): update dependency
 org.junit.jupiter:junit-jupiter to v5.12.0 (#2430)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 3ed73f7fa1..0509f332e0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -29,7 +29,7 @@ VER_SLF4J=[1.6,2.0[
 # Used in multiple places
 VER_DURIAN=1.2.0
 VER_JGIT=6.10.0.202406032230-r
-VER_JUNIT=5.11.4
+VER_JUNIT=5.12.0
 VER_ASSERTJ=3.27.3
 VER_MOCKITO=5.15.2
 VER_SELFIE=2.4.2
\ No newline at end of file

From 49419201d87e5ff4bb20cbe21798acaa7caa239e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 25 Feb 2025 10:45:13 +0000
Subject: [PATCH 2045/2068] chore(deps): update dependency gradle to v8.13

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 43583 -> 43705 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 gradlew                                  |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index a4b76b9530d66f5e68d973ea569d8e19de379189..9bbc975c742b298b441bfb90dbc124400a3751b9 100644
GIT binary patch
delta 34744
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

delta 34727
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
a%EQ2*fnt2><os0*Ttd7I4B~S^wgLca-h3he

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e18bc253b8..37f853b1c8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index f3b75f3b0d..faf93008b7 100755
--- a/gradlew
+++ b/gradlew
@@ -205,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.

From 9ba0d41c062e63bbe6970a30c0da79838696f3d1 Mon Sep 17 00:00:00 2001
From: Zongle Wang <wangzongler@gmail.com>
Date: Wed, 26 Feb 2025 11:52:27 +0800
Subject: [PATCH 2046/2068] Delete
 .github/workflows/gradle-wrapper-validation.yml

---
 .../workflows/gradle-wrapper-validation.yml   | 23 -------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 .github/workflows/gradle-wrapper-validation.yml

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
deleted file mode 100644
index 8d5a16db70..0000000000
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: "Validate Gradle Wrapper"
-on:
-  push:
-    paths:
-      - 'gradlew'
-      - 'gradlew.bat'
-      - 'gradle/wrapper/'
-  pull_request:
-    paths:
-      - 'gradlew'
-      - 'gradlew.bat'
-      - 'gradle/wrapper/'
-
-permissions:
-  contents: read
-
-jobs:
-  validation:
-    name: "Validation"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: gradle/wrapper-validation-action@v3

From c1718fa7f19c10643c01814cad753db7076d0217 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 26 Feb 2025 04:18:12 +0000
Subject: [PATCH 2047/2068] fix(deps): update dependency org.slf4j:slf4j-api to
 v2.0.17 (#2434)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 lib/build.gradle | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index f5802893b0..fcf59cd414 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -68,8 +68,8 @@ tasks.named("check").configure {
 }
 
 dependencies {
-	compileOnly 'org.slf4j:slf4j-api:2.0.16'
-	testCommonImplementation 'org.slf4j:slf4j-api:2.0.16'
+	compileOnly 'org.slf4j:slf4j-api:2.0.17'
+	testCommonImplementation 'org.slf4j:slf4j-api:2.0.17'
 
 	// zero runtime reqs is a hard requirements for spotless-lib
 	// if you need a dep, put it in lib-extra
@@ -91,7 +91,7 @@ dependencies {
 	flexmarkCompileOnly 'com.vladsch.flexmark:flexmark-all:0.64.8'
 	// gherkin
 	gherkinCompileOnly 'io.cucumber:gherkin-utils:9.0.0'
-	gherkinCompileOnly 'org.slf4j:slf4j-api:2.0.16'
+	gherkinCompileOnly 'org.slf4j:slf4j-api:2.0.17'
 	// googleJavaFormat
 	googleJavaFormatCompileOnly 'com.google.googlejavaformat:google-java-format:1.24.0'
 	// gson
@@ -114,22 +114,22 @@ dependencies {
 	// ktlint previous supported version
 	compatKtLint0Dot49Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-rule-engine:0.49.0'
 	compatKtLint0Dot49Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.49.0'
-	compatKtLint0Dot49Dot0CompileAndTestOnly 'org.slf4j:slf4j-api:2.0.16'
+	compatKtLint0Dot49Dot0CompileAndTestOnly 'org.slf4j:slf4j-api:2.0.17'
 	// ktlint previous supported version
 	compatKtLint0Dot50Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-rule-engine:0.50.0'
 	compatKtLint0Dot50Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.50.0'
-	compatKtLint0Dot50Dot0CompileAndTestOnly 'org.slf4j:slf4j-api:2.0.16'
+	compatKtLint0Dot50Dot0CompileAndTestOnly 'org.slf4j:slf4j-api:2.0.17'
 	// ktlint latest supported version
 	compatKtLint1Dot0Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-rule-engine:1.0.0'
 	compatKtLint1Dot0Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:1.0.0'
-	compatKtLint1Dot0Dot0CompileAndTestOnly 'org.slf4j:slf4j-api:2.0.16'
+	compatKtLint1Dot0Dot0CompileAndTestOnly 'org.slf4j:slf4j-api:2.0.17'
 	// palantirJavaFormat
 	palantirJavaFormatCompileOnly 'com.palantir.javaformat:palantir-java-format:1.1.0' 	// this version needs to stay compilable against Java 8 for CI Job testNpm
 	// scalafmt
 	scalafmtCompileOnly "org.scalameta:scalafmt-core_2.13:3.8.1"
 	// sortPom
 	sortPomCompileOnly 'com.github.ekryd.sortpom:sortpom-sorter:4.0.0'
-	sortPomCompileOnly 'org.slf4j:slf4j-api:2.0.16'
+	sortPomCompileOnly 'org.slf4j:slf4j-api:2.0.17'
 	// zjsonPatch
 	zjsonPatchCompileOnly 'com.flipkart.zjsonpatch:zjsonpatch:0.4.16'
 }

From 9bc2c67219b842392b947959bb1574a3e939dcb2 Mon Sep 17 00:00:00 2001
From: ColtonIdle <31751141+ColtonIdle@users.noreply.github.com>
Date: Wed, 26 Feb 2025 10:19:26 -0500
Subject: [PATCH 2048/2068] Update README.md for android kotlin callouts

---
 plugin-gradle/README.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index f1dd242a8e..7c067adb73 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -435,6 +435,20 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 - `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
 - `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
+> [!WARNING]
+> The target is usually inferred automatically from the java source sets. However, Spotless cannot automatically detect [android](https://github.com/diffplug/spotless/issues/111) or [java-gradle-plugin](https://github.com/diffplug/spotless/issues/437) sources, but you can fix this easily:
+> 
+> ```gradle
+> spotless {
+>  kotlin {
+>    target 'src/*/kotlin/**/*.kt'
+>    target 'src/*/java/**/*.kt'
+>  }
+>  kotlinGradle {
+>    target '**/*.kts'
+>  }
+> ```
+
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
            // configure<com.diffplug.gradle.spotless.SpotlessExtension> {

From 34b8ef8275569eb2058710b3535b366de39cc4bd Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 27 Feb 2025 10:02:08 +0800
Subject: [PATCH 2049/2068] chore(deps): update plugin com.github.spotbugs to
 v6.1.6 (#2439)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index da86467edd..6a8c76d82a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,7 +12,7 @@ plugins {
 	// https://github.com/gradle-nexus/publish-plugin/releases
 	id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
-	id 'com.github.spotbugs' version '6.1.5' apply false
+	id 'com.github.spotbugs' version '6.1.6' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
 	id 'com.diffplug.spotless-changelog' version '3.1.2' apply false
 	// https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md

From f93ef15f80f32831e98dcdea2b8395ac92f24424 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 4 Mar 2025 11:05:46 +0800
Subject: [PATCH 2050/2068] fix(deps): update dependency
 org.mockito:mockito-core to v5.16.0 (#2440)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 0509f332e0..1da5b0337b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -31,5 +31,5 @@ VER_DURIAN=1.2.0
 VER_JGIT=6.10.0.202406032230-r
 VER_JUNIT=5.12.0
 VER_ASSERTJ=3.27.3
-VER_MOCKITO=5.15.2
+VER_MOCKITO=5.16.0
 VER_SELFIE=2.4.2
\ No newline at end of file

From 2baab0c62dcec9861109a63c1f97955736d76c70 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 6 Mar 2025 14:19:28 +0800
Subject: [PATCH 2051/2068] chore(deps): update plugin com.github.spotbugs to
 v6.1.7 (#2442)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 6a8c76d82a..a3d37f3639 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,7 +12,7 @@ plugins {
 	// https://github.com/gradle-nexus/publish-plugin/releases
 	id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
-	id 'com.github.spotbugs' version '6.1.6' apply false
+	id 'com.github.spotbugs' version '6.1.7' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
 	id 'com.diffplug.spotless-changelog' version '3.1.2' apply false
 	// https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md

From 519a03767048ff18cff89801a621db71c53c1b1d Mon Sep 17 00:00:00 2001
From: Kacper Lipowicz <83464232+PrivateerPrime@users.noreply.github.com>
Date: Sat, 8 Mar 2025 13:21:10 +0100
Subject: [PATCH 2052/2068] Update documentation for eclipse jdt (p2-mirrors)
 in maven-plugin

---
 plugin-maven/README.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index e04085d965..6c2b4b0491 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -265,6 +265,13 @@ any other maven phase (i.e. compile) then it can be configured as below;
   <version>4.26</version>
   <!-- Optional: Specify a file which contains all formatting options. -->
   <file>${project.basedir}/eclipse-formatter.xml</file>
+  <!-- If the access to the p2 repositories is restricted, mirrors can be pecified using a URI prefix map as follows:-->
+  <p2Mirrors>
+    <p2Mirror>
+      <prefix>https://download.eclipse.org/eclipse/updates/4.26/</prefix>
+      <url>https://some.internal.mirror/4-26-updates-p2/</url>
+    </p2Mirror>
+  </p2Mirrors>
 </eclipse>
 ```
 

From 519d36c1177b28865181dbcca606ac3b3b369e79 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 11 Mar 2025 14:03:46 +0800
Subject: [PATCH 2053/2068] fix(deps): update dependency
 org.eclipse.platform:org.eclipse.osgi to v3.23.0 (#2446)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 lib-extra/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index 68862448b6..880830740b 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -21,7 +21,7 @@ dependencies {
 	// the osgi dep is included in solstice, but it has some CVE's against it.
 	// 3.18.500 is the oldest, most-compatible version with no CVE's
 	// https://central.sonatype.com/artifact/org.eclipse.platform/org.eclipse.osgi/versions
-	implementation "org.eclipse.platform:org.eclipse.osgi:3.18.500"
+	implementation "org.eclipse.platform:org.eclipse.osgi:3.23.0"
 
 	// testing
 	testImplementation projects.testlib

From f6da1c494e818bb0a6279e2db512e0bc874b1c2a Mon Sep 17 00:00:00 2001
From: Mattias Severson <matsev@gmail.com>
Date: Fri, 14 Mar 2025 06:38:15 +0100
Subject: [PATCH 2054/2068] Use palantir-java-format 2.57.0 on Java 21 (#2447)

* bump palantir to version 2.57.0

improved code formatting for Java 21
ref: https://github.com/palantir/palantir-java-format/issues/952

* update readme files with changes

* update copyright year in modified files

* add "changed" labels
---
 CHANGES.md                                                    | 2 ++
 .../com/diffplug/spotless/java/PalantirJavaFormatStep.java    | 4 ++--
 plugin-gradle/CHANGES.md                                      | 2 ++
 plugin-maven/CHANGES.md                                       | 2 ++
 .../diffplug/spotless/java/PalantirJavaFormatStepTest.java    | 4 ++--
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index eaebe45744..9c7f3e0d39 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Changed
+* Use palantir-java-format 2.57.0 on Java 21. ([#2447](https://github.com/diffplug/spotless/pull/2447))
 
 ## [3.1.0] - 2025-02-20
 ### Added
diff --git a/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
index 3b7d7c17a9..7745f6e879 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@ public class PalantirJavaFormatStep implements Serializable {
 	private static final String DEFAULT_STYLE = "PALANTIR";
 	private static final String NAME = "palantir-java-format";
 	public static final String MAVEN_COORDINATE = "com.palantir.javaformat:palantir-java-format:";
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(8, "1.1.0").add(11, "2.28.0").add(21, "2.39.0");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(8, "1.1.0").add(11, "2.28.0").add(21, "2.57.0");
 
 	/** The jar that contains the formatter. */
 	private final JarState.Promised jarState;
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 8bd24914b1..59b829359f 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Changed
+* Use palantir-java-format 2.57.0 on Java 21. ([#2447](https://github.com/diffplug/spotless/pull/2447))
 
 ## [7.0.2] - 2025-01-14
 ### Fixed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 8b036b98f2..addbe10424 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Changed
+* Use palantir-java-format 2.57.0 on Java 21. ([#2447](https://github.com/diffplug/spotless/pull/2447))
 
 ## [2.44.3] - 2025-02-20
 * Support for `clang-format` ([#2406](https://github.com/diffplug/spotless/pull/2406))
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/PalantirJavaFormatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/PalantirJavaFormatStepTest.java
index cb8777728b..6e197dc8fa 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/PalantirJavaFormatStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/PalantirJavaFormatStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 DiffPlug
+ * Copyright 2022-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,7 +56,7 @@ void behavior() throws Exception {
 
 	@Test
 	void formatJavadoc() throws Exception {
-		FormatterStep step = PalantirJavaFormatStep.create("2.39.0", "PALANTIR", true, TestProvisioner.mavenCentral());
+		FormatterStep step = PalantirJavaFormatStep.create("2.57.0", "PALANTIR", true, TestProvisioner.mavenCentral());
 		StepHarness.forStep(step)
 				.testResource("java/palantirjavaformat/JavaCodeWithJavaDocUnformatted.test", "java/palantirjavaformat/JavaCodeWithJavaDocFormatted.test")
 				.testResource("java/palantirjavaformat/JavaCodeWithPackageUnformatted.test", "java/palantirjavaformat/JavaCodeWithPackageFormatted.test");

From 1e628a1f215fd5ba679a82a8d02c462486159c07 Mon Sep 17 00:00:00 2001
From: Joshua Gleitze <joshua.gleitze@goto.com>
Date: Fri, 14 Mar 2025 11:04:50 +0100
Subject: [PATCH 2055/2068] fix: try online install after ERESOLVE (#2448)

---
 .../com/diffplug/spotless/npm/NodeApp.java     | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NodeApp.java b/lib/src/main/java/com/diffplug/spotless/npm/NodeApp.java
index 932a148626..19eb584c57 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NodeApp.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NodeApp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -98,18 +98,28 @@ private void optimizedNpmInstall() {
 			if (!offlineInstallFailed(e.getResult())) {
 				throw e; // pass through
 			}
-			// if the npm install fails with message "No matching version found for <package>@<version>", we try again without the offline flag
+			// if the npm install fails in a way that might be caused by missing dependency information, we try again without the offline flag
 			npmProcessFactory.createNpmInstallProcess(nodeServerLayout, formatterStepLocations, PREFER_ONLINE).waitFor();
 		}
 	}
 
-	private boolean offlineInstallFailed(ProcessRunner.Result result) {
+	private static boolean offlineInstallFailed(ProcessRunner.Result result) {
 		if (result == null) {
 			return false; // no result, something else must have happened
 		}
 		if (result.exitCode() == 0) {
 			return false; // all is well
 		}
-		return result.stdOutUtf8().contains("code ETARGET") && result.stdOutUtf8().contains("No matching version found for"); // offline install failed, needs online install
+		var installOutput = result.stdOutUtf8();
+		// offline install failed, needs online install
+		return isNoMatchingVersionFound(installOutput) || isCannotResolveDependencyTree(installOutput);
+	}
+
+	private static boolean isNoMatchingVersionFound(String installOutput) {
+		return installOutput.contains("code ETARGET") && installOutput.contains("No matching version found for");
+	}
+
+	private static boolean isCannotResolveDependencyTree(String installOutput) {
+		return installOutput.contains("code ERESOLVE") && installOutput.contains("unable to resolve dependency tree");
 	}
 }

From b6bf416dda59d7db56c2074caf5fd85d5808eaba Mon Sep 17 00:00:00 2001
From: Joshua Gleitze <joshua.gleitze@goto.com>
Date: Fri, 14 Mar 2025 11:08:03 +0100
Subject: [PATCH 2056/2068] docs: document ERESOLVE fix

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 1 +
 plugin-maven/CHANGES.md  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 9c7f3e0d39..7d16300cce 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changed
 * Use palantir-java-format 2.57.0 on Java 21. ([#2447](https://github.com/diffplug/spotless/pull/2447))
+* Re-try `npm install` with `--prefer-online` after `ERESOLVE` error. ([#2448](https://github.com/diffplug/spotless/pull/2448))
 
 ## [3.1.0] - 2025-02-20
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 59b829359f..b40b63b4c8 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changed
 * Use palantir-java-format 2.57.0 on Java 21. ([#2447](https://github.com/diffplug/spotless/pull/2447))
+* Re-try `npm install` with `--prefer-online` after `ERESOLVE` error. ([#2448](https://github.com/diffplug/spotless/pull/2448))
 
 ## [7.0.2] - 2025-01-14
 ### Fixed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index addbe10424..483258c36a 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changed
 * Use palantir-java-format 2.57.0 on Java 21. ([#2447](https://github.com/diffplug/spotless/pull/2447))
+* Re-try `npm install` with `--prefer-online` after `ERESOLVE` error. ([#2448](https://github.com/diffplug/spotless/pull/2448))
 
 ## [2.44.3] - 2025-02-20
 * Support for `clang-format` ([#2406](https://github.com/diffplug/spotless/pull/2406))

From 8095512f521772b621898891eb56817507c0100f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 14 Mar 2025 14:52:11 +0000
Subject: [PATCH 2057/2068] fix(deps): update dependency
 org.junit.jupiter:junit-jupiter to v5.12.1

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 1da5b0337b..6ab7b9b519 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -29,7 +29,7 @@ VER_SLF4J=[1.6,2.0[
 # Used in multiple places
 VER_DURIAN=1.2.0
 VER_JGIT=6.10.0.202406032230-r
-VER_JUNIT=5.12.0
+VER_JUNIT=5.12.1
 VER_ASSERTJ=3.27.3
 VER_MOCKITO=5.16.0
 VER_SELFIE=2.4.2
\ No newline at end of file

From 822b52da39d36dcd53cc61bbec27bc49d14f44e8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 16 Mar 2025 14:53:14 +0800
Subject: [PATCH 2058/2068] fix(deps): update dependency
 org.mockito:mockito-core to v5.16.1 (#2452)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 6ab7b9b519..5e3200d34b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -31,5 +31,5 @@ VER_DURIAN=1.2.0
 VER_JGIT=6.10.0.202406032230-r
 VER_JUNIT=5.12.1
 VER_ASSERTJ=3.27.3
-VER_MOCKITO=5.16.0
+VER_MOCKITO=5.16.1
 VER_SELFIE=2.4.2
\ No newline at end of file

From 668ce10128cbbf983222a11a61a81d7a163235b2 Mon Sep 17 00:00:00 2001
From: Paul Merlin <paul@gradle.com>
Date: Sat, 22 Mar 2025 03:53:20 +0100
Subject: [PATCH 2059/2068] Enable :gradle-plugin strict validation

Enable Gradle Plugin types strict validation by the :gradle-plugin:validatePlugins task. The task now applies more rules for plugin types.

Add missing mandatory cacheability annotations on SpotlessTask, SpotlessApply, SpotlessCheck and SpotlessDiagnoseTask.
---
 plugin-gradle/build.gradle                                    | 3 +++
 .../main/java/com/diffplug/gradle/spotless/SpotlessApply.java | 4 +++-
 .../main/java/com/diffplug/gradle/spotless/SpotlessCheck.java | 4 +++-
 .../com/diffplug/gradle/spotless/SpotlessDiagnoseTask.java    | 4 +++-
 .../main/java/com/diffplug/gradle/spotless/SpotlessTask.java  | 4 +++-
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/plugin-gradle/build.gradle b/plugin-gradle/build.gradle
index 4f82f713bf..5211428f8b 100644
--- a/plugin-gradle/build.gradle
+++ b/plugin-gradle/build.gradle
@@ -33,6 +33,9 @@ apply from: rootProject.file('gradle/special-tests.gradle')
 tasks.withType(Test).configureEach {
 	testLogging.showStandardStreams = true
 }
+tasks.validatePlugins {
+	enableStricterValidation = true
+}
 
 //////////////////////////
 // GRADLE PLUGIN PORTAL //
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessApply.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessApply.java
index f38745a6b0..c623669ab1 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessApply.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessApply.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,9 @@
 import org.gradle.api.file.FileVisitDetails;
 import org.gradle.api.file.FileVisitor;
 import org.gradle.api.tasks.TaskAction;
+import org.gradle.work.DisableCachingByDefault;
 
+@DisableCachingByDefault(because = "not worth caching")
 public abstract class SpotlessApply extends SpotlessTaskService.ClientTask {
 	@TaskAction
 	public void performAction() {
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessCheck.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessCheck.java
index dba219ff06..175a828a66 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessCheck.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessCheck.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,12 +32,14 @@
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.Internal;
 import org.gradle.api.tasks.TaskAction;
+import org.gradle.work.DisableCachingByDefault;
 import org.jetbrains.annotations.NotNull;
 
 import com.diffplug.spotless.FileSignature;
 import com.diffplug.spotless.ThrowingEx;
 import com.diffplug.spotless.extra.integration.DiffMessageFormatter;
 
+@DisableCachingByDefault(because = "not worth caching")
 public abstract class SpotlessCheck extends SpotlessTaskService.ClientTask {
 	@Internal
 	public abstract Property<String> getEncoding();
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessDiagnoseTask.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessDiagnoseTask.java
index 6dcba72864..68f6e63e75 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessDiagnoseTask.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessDiagnoseTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,12 +25,14 @@
 import org.gradle.api.DefaultTask;
 import org.gradle.api.tasks.Internal;
 import org.gradle.api.tasks.TaskAction;
+import org.gradle.api.tasks.UntrackedTask;
 
 import com.diffplug.spotless.Formatter;
 import com.diffplug.spotless.PaddedCell;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
+@UntrackedTask(because = "undeclared inputs/outputs")
 public class SpotlessDiagnoseTask extends DefaultTask {
 	SpotlessTask source;
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
index e31be63143..713c9a2e86 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 DiffPlug
+ * Copyright 2020-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,6 +34,7 @@
 import org.gradle.api.tasks.OutputDirectory;
 import org.gradle.api.tasks.PathSensitive;
 import org.gradle.api.tasks.PathSensitivity;
+import org.gradle.work.DisableCachingByDefault;
 import org.gradle.work.Incremental;
 
 import com.diffplug.spotless.ConfigurationCacheHackList;
@@ -43,6 +44,7 @@
 import com.diffplug.spotless.LintSuppression;
 import com.diffplug.spotless.extra.GitRatchet;
 
+@DisableCachingByDefault(because = "abstract definition")
 public abstract class SpotlessTask extends DefaultTask {
 	@Internal
 	abstract Property<SpotlessTaskService> getTaskService();

From fc0ec004f0b52ca33e5030efc0b2ddfb8e1b4990 Mon Sep 17 00:00:00 2001
From: Paul Merlin <paul@gradle.com>
Date: Sat, 22 Mar 2025 04:46:28 +0100
Subject: [PATCH 2060/2068] Update CHANGES.md for enabling Gradle's stricter
 plugin types validation

---
 plugin-gradle/CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index b40b63b4c8..5d2cb19742 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -6,6 +6,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changed
 * Use palantir-java-format 2.57.0 on Java 21. ([#2447](https://github.com/diffplug/spotless/pull/2447))
 * Re-try `npm install` with `--prefer-online` after `ERESOLVE` error. ([#2448](https://github.com/diffplug/spotless/pull/2448))
+* Apply Gradle's strict plugin types validation to the Spotless plugin. ([#2454](https://github.com/diffplug/spotless/pull/2454))
 
 ## [7.0.2] - 2025-01-14
 ### Fixed

From 81f2f8bb742a98c2f7e69bc7e2e10fb6b2d6c75c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 4 Apr 2025 19:00:30 +0000
Subject: [PATCH 2061/2068] fix(deps): update dependency
 org.mockito:mockito-core to v5.17.0

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 5e3200d34b..10de201dab 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -31,5 +31,5 @@ VER_DURIAN=1.2.0
 VER_JGIT=6.10.0.202406032230-r
 VER_JUNIT=5.12.1
 VER_ASSERTJ=3.27.3
-VER_MOCKITO=5.16.1
+VER_MOCKITO=5.17.0
 VER_SELFIE=2.4.2
\ No newline at end of file

From 60993fdedff91eeebf2ef016893b1ee433811a3f Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 7 Apr 2025 13:05:19 -0700
Subject: [PATCH 2062/2068] Fix the Android Kotlin warning and adjust its
 position.

---
 plugin-gradle/README.md | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 7c067adb73..2067222fbf 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -435,19 +435,6 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 - `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
 - `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
-> [!WARNING]
-> The target is usually inferred automatically from the java source sets. However, Spotless cannot automatically detect [android](https://github.com/diffplug/spotless/issues/111) or [java-gradle-plugin](https://github.com/diffplug/spotless/issues/437) sources, but you can fix this easily:
-> 
-> ```gradle
-> spotless {
->  kotlin {
->    target 'src/*/kotlin/**/*.kt'
->    target 'src/*/java/**/*.kt'
->  }
->  kotlinGradle {
->    target '**/*.kts'
->  }
-> ```
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -467,6 +454,16 @@ spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
 }
 ```
 
+> [!WARNING]
+> The target is usually inferred automatically from the java source sets. However, Spotless cannot automatically detect [android](https://github.com/diffplug/spotless/issues/111) or [java-gradle-plugin](https://github.com/diffplug/spotless/issues/437) sources, but you can fix this easily:
+> 
+> ```gradle
+> spotless {
+>  kotlin {
+>    target 'src/*/kotlin/**/*.kt', 'src/*/java/**/*.kt'
+> ...
+> ```
+
 ### ktfmt
 
 [homepage](https://github.com/facebook/ktfmt). [changelog](https://github.com/facebook/ktfmt/releases).

From fa3fd1e6cb99a6bb3b2a9c8b262db4666edf6ca7 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 7 Apr 2025 13:07:04 -0700
Subject: [PATCH 2063/2068] Add the cool blockquote warning trick to the other
 Android spot.

---
 plugin-gradle/README.md | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 2067222fbf..ecd85930fc 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -207,13 +207,14 @@ spotless {
 
 <a name="applying-to-android-java-source"></a>
 
-The target is usually inferred automatically from the java source sets. However, Spotless cannot automatically detect [android](https://github.com/diffplug/spotless/issues/111) or [java-gradle-plugin](https://github.com/diffplug/spotless/issues/437) sources, but you can fix this easily:
-
-```gradle
-spotless {
-  java {
-    target 'src/*/java/**/*.java'
-```
+> [!WARNING]
+> The target is usually inferred automatically from the java source sets. However, Spotless cannot automatically detect [android](https://github.com/diffplug/spotless/issues/111) or [java-gradle-plugin](https://github.com/diffplug/spotless/issues/437) sources, but you can fix this easily:
+>
+> ```gradle
+> spotless {
+>   java {
+>     target 'src/*/java/**/*.java'
+> ```
 
 ### removeUnusedImports
 

From d25f04de3e75030c91962739bc99ea7d377d7678 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 7 Apr 2025 13:08:28 -0700
Subject: [PATCH 2064/2068] Minor tweak.

---
 plugin-gradle/README.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index ecd85930fc..ef7b6be888 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -460,9 +460,8 @@ spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
 > 
 > ```gradle
 > spotless {
->  kotlin {
->    target 'src/*/kotlin/**/*.kt', 'src/*/java/**/*.kt'
-> ...
+>   kotlin {
+>     target 'src/*/kotlin/**/*.kt', 'src/*/java/**/*.kt'
 > ```
 
 ### ktfmt

From 0fa3cabc9ed5780f8d9033b0c1d27d81c1d750c2 Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az1692-384.1ofan0iq0ufejkuymfg44m4jgb.ex.internal.cloudapp.net>
Date: Mon, 7 Apr 2025 22:46:21 +0000
Subject: [PATCH 2065/2068] Published lib/3.1.1

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 7d16300cce..0a043ffa24 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [3.1.1] - 2025-04-07
 ### Changed
 * Use palantir-java-format 2.57.0 on Java 21. ([#2447](https://github.com/diffplug/spotless/pull/2447))
 * Re-try `npm install` with `--prefer-online` after `ERESOLVE` error. ([#2448](https://github.com/diffplug/spotless/pull/2448))

From 1b1a4fbbb446585627f9da03eab5986d73afa457 Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az1692-384.1ofan0iq0ufejkuymfg44m4jgb.ex.internal.cloudapp.net>
Date: Mon, 7 Apr 2025 22:47:49 +0000
Subject: [PATCH 2066/2068] Published gradle/7.0.3

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 62 ++++++++++++++++++++--------------------
 2 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 5d2cb19742..1ddd31cc52 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [7.0.3] - 2025-04-07
 ### Changed
 * Use palantir-java-format 2.57.0 on Java 21. ([#2447](https://github.com/diffplug/spotless/pull/2447))
 * Re-try `npm install` with `--prefer-online` after `ERESOLVE` error. ([#2448](https://github.com/diffplug/spotless/pull/2448))
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index ef7b6be888..da51e31244 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -14,9 +14,9 @@ output = [
   ].join('\n');
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
-[![Changelog](https://img.shields.io/badge/changelog-7.0.2-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-7.0.3-blue.svg)](CHANGES.md)
 [![MavenCentral](https://img.shields.io/badge/mavencentral-here-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.3/index.html)
 
 [![VS Code plugin](https://img.shields.io/badge/IDE-VS_Code-blueviolet.svg)](https://marketplace.visualstudio.com/items?itemName=richardwillis.vscode-spotless-gradle)
 [![IntelliJ plugin](https://img.shields.io/badge/IDE-IntelliJ-blueviolet.svg)](https://plugins.jetbrains.com/plugin/18321-spotless-gradle)
@@ -128,10 +128,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.3/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.3/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.3/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.3/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.3/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.3/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.3/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.3/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.3/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.3/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -173,7 +173,7 @@ Spotless is primarily a formatter, _not_ a linter. In our opinion, a linter is j
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.3/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -373,8 +373,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.3/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.3/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -433,8 +433,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.3/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.3/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 
 ```gradle
@@ -533,7 +533,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.3/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -565,7 +565,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.3/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -601,7 +601,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.3/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -637,7 +637,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ### buf
 
-`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
+`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.3/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
 
 **WARNING** this step **must** be the first step in the chain, steps before it will be ignored. Thumbs up [this issue](https://github.com/bufbuild/buf/issues/1035) for a resolution, see [here](https://github.com/diffplug/spotless/pull/1208#discussion_r1264439669) for more details on the problem.
 
@@ -669,7 +669,7 @@ buf {
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.3/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -690,7 +690,7 @@ spotless {
 
 ## Flexmark
 
-`com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/FlexmarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java)
+`com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.3/com/diffplug/gradle/spotless/FlexmarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java)
 
 [homepage](https://github.com/vsch/flexmark-java). Flexmark is a flexible Commonmark/Markdown parser that can be used to format Markdown files. It supports different [flavors of Markdown](https://github.com/vsch/flexmark-java#markdown-processor-emulation) and [many formatting options](https://github.com/vsch/flexmark-java/wiki/Markdown-Formatter#options).
 
@@ -709,7 +709,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.3/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -734,7 +734,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.3/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -772,7 +772,7 @@ sql.formatter.indent.size=4
 
 ## Maven POM
 
-`com.diffplug.gradle.spotless.PomExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/PomExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PomExtension.java)
+`com.diffplug.gradle.spotless.PomExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.3/com/diffplug/gradle/spotless/PomExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PomExtension.java)
 
 ```gradle
 spotless {
@@ -821,7 +821,7 @@ spotless {
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.3/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -915,7 +915,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## Javascript
 
-- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
+- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.3/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
 
 ```gradle
 spotless {
@@ -978,7 +978,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.3/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -1098,7 +1098,7 @@ spotless {
 
 ## YAML
 
-- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/YamlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
+- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.3/com/diffplug/gradle/spotless/YamlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
 
 ```gradle
 spotless {
@@ -1130,7 +1130,7 @@ spotless {
 
 ## Shell
 
-`com.diffplug.gradle.spotless.ShellExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/ShellExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ShellExtension.java)
+`com.diffplug.gradle.spotless.ShellExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.3/com/diffplug/gradle/spotless/ShellExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ShellExtension.java)
 
 ```gradle
 spotless {
@@ -1166,7 +1166,7 @@ shfmt().pathToExe('/opt/homebrew/bin/shfmt')
 
 ## Gherkin
 
-- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
+- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.3/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
 
 ```gradle
 spotless {
@@ -1195,7 +1195,7 @@ spotless {
 
 ## CSS
 
-`com.diffplug.gradle.spotless.CssExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/CssExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CssExtension.java)
+`com.diffplug.gradle.spotless.CssExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.3/com/diffplug/gradle/spotless/CssExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CssExtension.java)
 
 ```gradle
 spotless {
@@ -1596,7 +1596,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.3/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -1682,9 +1682,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.3/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.3/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -1717,11 +1717,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.3/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.3/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From 0ca99e5315d8fe4ff599e61fa1673e4f10354d53 Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az1692-384.1ofan0iq0ufejkuymfg44m4jgb.ex.internal.cloudapp.net>
Date: Mon, 7 Apr 2025 22:49:46 +0000
Subject: [PATCH 2067/2068] Published maven/2.44.4

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 483258c36a..abf33d63fb 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.44.4] - 2025-04-07
 ### Changed
 * Use palantir-java-format 2.57.0 on Java 21. ([#2447](https://github.com/diffplug/spotless/pull/2447))
 * Re-try `npm install` with `--prefer-online` after `ERESOLVE` error. ([#2448](https://github.com/diffplug/spotless/pull/2448))
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 6c2b4b0491..c1a346926b 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -8,8 +8,8 @@ output = [
   ].join('\n');
 -->
 [![MavenCentral](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Changelog](https://img.shields.io/badge/changelog-2.44.3-blue.svg)](CHANGES.md)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.44.3/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.44.4-blue.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.44.4/index.html)
 <!---freshmark /shields -->
 
 <!---freshmark javadoc

From 0b35666f9b3debb3f479a299ba8f7e8d170db189 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 9 Apr 2025 11:07:06 +0800
Subject: [PATCH 2068/2068] chore(deps): update plugin com.diffplug.spotless to
 v7.0.3 (#2463)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index a3d37f3639..eb1c77e4ee 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-	id 'com.diffplug.spotless' version '7.0.2' apply false
+	id 'com.diffplug.spotless' version '7.0.3' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
 	id 'com.gradle.plugin-publish' version '1.3.1' apply false
 	// https://github.com/gradle-nexus/publish-plugin/releases